January 2021 - Linux-stable-mirror

[PATCH 2/2] io_uring: fix sqo ownership false positive warning

by Pavel Begunkov

WARNING: CPU: 0 PID: 21359 at fs/io_uring.c:9042 io_uring_cancel_task_requests+0xe55/0x10c0 fs/io_uring.c:9042 Call Trace: io_uring_flush+0x47b/0x6e0 fs/io_uring.c:9227 filp_close+0xb4/0x170 fs/open.c:1295 close_files fs/file.c:403 [inline] put_files_struct fs/file.c:418 [inline] put_files_struct+0x1cc/0x350 fs/file.c:415 exit_files+0x7e/0xa0 fs/file.c:435 do_exit+0xc22/0x2ae0 kernel/exit.c:820 do_group_exit+0x125/0x310 kernel/exit.c:922 get_signal+0x427/0x20f0 kernel/signal.c:2773 arch_do_signal_or_restart+0x2a8/0x1eb0 arch/x86/kernel/signal.c:811 handle_signal_work kernel/entry/common.c:147 [inline] exit_to_user_mode_loop kernel/entry/common.c:171 [inline] exit_to_user_mode_prepare+0x148/0x250 kernel/entry/common.c:201 __syscall_exit_to_user_mode_work kernel/entry/common.c:291 [inline] syscall_exit_to_user_mode+0x19/0x50 kernel/entry/common.c:302 entry_SYSCALL_64_after_hwframe+0x44/0xa9 Now io_uring_cancel_task_requests() can be called not through file notes but directly, remove a WARN_ONCE() there that give us false positives. That check is not very important and we catch it in other places. Fixes: 84965ff8a84f0 ("io_uring: if we see flush on exit, cancel related tasks") Cc: stable(a)vger.kernel.org # 5.9+ Reported-by: syzbot+3e3d9bd0c6ce9efbc3ef(a)syzkaller.appspotmail.com Signed-off-by: Pavel Begunkov <asml.silence(a)gmail.com> --- fs/io_uring.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 39ae1f821cef..12bf7180c0f1 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -8967,8 +8967,6 @@ static void io_uring_cancel_task_requests(struct io_ring_ctx *ctx, struct task_struct *task = current; if ((ctx->flags & IORING_SETUP_SQPOLL) && ctx->sq_data) { - /* for SQPOLL only sqo_task has task notes */ - WARN_ON_ONCE(ctx->sqo_task != current); io_disable_sqo_submit(ctx); task = ctx->sq_data->thread; atomic_inc(&task->io_uring->in_idle); -- 2.24.0

3 years, 5 months

1
0
0 0

[PATCH 1/2] io_uring: fix list corruption for splice file_get

by Pavel Begunkov

kernel BUG at lib/list_debug.c:29! Call Trace: __list_add include/linux/list.h:67 [inline] list_add include/linux/list.h:86 [inline] io_file_get+0x8cc/0xdb0 fs/io_uring.c:6466 __io_splice_prep+0x1bc/0x530 fs/io_uring.c:3866 io_splice_prep fs/io_uring.c:3920 [inline] io_req_prep+0x3546/0x4e80 fs/io_uring.c:6081 io_queue_sqe+0x609/0x10d0 fs/io_uring.c:6628 io_submit_sqe fs/io_uring.c:6705 [inline] io_submit_sqes+0x1495/0x2720 fs/io_uring.c:6953 __do_sys_io_uring_enter+0x107d/0x1f30 fs/io_uring.c:9353 do_syscall_64+0x2d/0x70 arch/x86/entry/common.c:46 entry_SYSCALL_64_after_hwframe+0x44/0xa9 io_file_get() may be called from splice, and so REQ_F_INFLIGHT may already be set. Fixes: 02a13674fa0e8 ("io_uring: account io_uring internal files as REQ_F_INFLIGHT") Cc: stable(a)vger.kernel.org # 5.9+ Reported-by: syzbot+6879187cf57845801267(a)syzkaller.appspotmail.com Signed-off-by: Pavel Begunkov <asml.silence(a)gmail.com> --- fs/io_uring.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index ae388cc52843..39ae1f821cef 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -6460,7 +6460,8 @@ static struct file *io_file_get(struct io_submit_state *state, file = __io_file_get(state, fd); } - if (file && file->f_op == &io_uring_fops) { + if (file && file->f_op == &io_uring_fops && + !(req->flags & REQ_F_INFLIGHT)) { io_req_init_async(req); req->flags |= REQ_F_INFLIGHT; -- 2.24.0

3 years, 5 months

1
0
0 0

Re: [PATCH] KVM: x86: Allow guests to see MSR_IA32_TSX_CTRL even if tsx=off

by Sean Christopherson

On Thu, Jan 28, 2021, Paolo Bonzini wrote: > On 28/01/21 18:56, Sean Christopherson wrote: > > On Thu, Jan 28, 2021, Paolo Bonzini wrote: > > > - vmx->guest_uret_msrs[j].mask = ~(u64)TSX_CTRL_CPUID_CLEAR; > > > + if (boot_cpu_has(X86_FEATURE_RTM)) > > > + vmx->guest_uret_msrs[j].mask = ~(u64)TSX_CTRL_CPUID_CLEAR; > > > + else > > > + vmx->guest_uret_msrs[j].mask = 0; > > > > IMO, this is an unnecessarily confusing way to "remove" the user return MSR. > > Changing the ordering to do a 'continue' would also provide a separate chunk of > > code for the new comment. And maybe replace the switch with an if-statement to > > avoid a 'continue' buried in a switch? > > You still need the slot in vmx->guest_uret_msrs to store the guest value, > even though the two available bits are both no-ops. It's ugly but it makes > sense: you don't want to ever re-enable TSX, so you use the ignore the guest > value and run unconditionally with the host value. Ugh, didn't think about the guest wanting to read back the value it wrote. > I'll rephrase everything and resend. Thanks!

3 years, 5 months

1
0
0 0

[PATCH] KVM: x86: Allow guests to see MSR_IA32_TSX_CTRL even if tsx=off

by Paolo Bonzini

Userspace that does not know about KVM_GET_MSR_FEATURE_INDEX_LIST will generally use the default value for MSR_IA32_ARCH_CAPABILITIES. When this happens and the host has tsx=on, it is possible to end up with virtual machines that have HLE and RTM disabled, but TSX_CTRL disabled. If the fleet is then switched to tsx=off, kvm_get_arch_capabilities() will clear the ARCH_CAP_TSX_CTRL_MSR bit and it will not be possible to use the tsx=off as migration destinations, even though the guests indeed do not have TSX enabled. When tsx=off is used, however, we know that guests will not have HLE and RTM (or if userspace sets bogus CPUID data, we do not expect HLE and RTM to work in guests). Therefore we can keep TSX_CTRL_RTM_DISABLE set for the entire life of the guests and save MSR reads and writes on KVM_RUN and in the user return notifiers. Cc: stable(a)vger.kernel.org Fixes: cbbaa2727aa3 ("KVM: x86: fix presentation of TSX feature in ARCH_CAPABILITIES") Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> --- arch/x86/kvm/vmx/vmx.c | 12 +++++++++++- arch/x86/kvm/x86.c | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index cc60b1fc3ee7..80491a729408 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -6863,8 +6863,18 @@ static int vmx_create_vcpu(struct kvm_vcpu *vcpu) * No need to pass TSX_CTRL_CPUID_CLEAR through, so * let's avoid changing CPUID bits under the host * kernel's feet. + * + * If the host disabled RTM, we may still need TSX_CTRL + * to be supported in the guest; for example the guest + * could have been created on a tsx=on host with hle=0, + * rtm=0, tsx_ctrl=1 and later migrate to a tsx=off host. + * In that case however do not change the value on the host, + * so that TSX remains always disabled. */ - vmx->guest_uret_msrs[j].mask = ~(u64)TSX_CTRL_CPUID_CLEAR; + if (boot_cpu_has(X86_FEATURE_RTM)) + vmx->guest_uret_msrs[j].mask = ~(u64)TSX_CTRL_CPUID_CLEAR; + else + vmx->guest_uret_msrs[j].mask = 0; break; default: vmx->guest_uret_msrs[j].mask = -1ull; diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 76bce832cade..15733013b266 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1401,7 +1401,7 @@ static u64 kvm_get_arch_capabilities(void) * This lets the guest use VERW to clear CPU buffers. */ if (!boot_cpu_has(X86_FEATURE_RTM)) - data &= ~(ARCH_CAP_TAA_NO | ARCH_CAP_TSX_CTRL_MSR); + data &= ~ARCH_CAP_TAA_NO; else if (!boot_cpu_has_bug(X86_BUG_TAA)) data |= ARCH_CAP_TAA_NO; -- 2.26.2

3 years, 5 months

2
1
0 0

[PATCH 5.4 000/134] 5.4.47-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.4.47 release. There are 134 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Thu, 18 Jun 2020 15:30:25 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.47-rc1… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.4.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.4.47-rc1 Marc Zyngier <maz(a)kernel.org> KVM: arm64: Save the host's PtrAuth keys in non-preemptible context Marc Zyngier <maz(a)kernel.org> KVM: arm64: Synchronize sysreg state on injecting an AArch32 exception Juergen Gross <jgross(a)suse.com> xen/pvcalls-back: test for errors when calling backend_connect() Jiri Kosina <jkosina(a)suse.cz> block/floppy: fix contended case in floppy_queue_rq() Ulf Hansson <ulf.hansson(a)linaro.org> mmc: sdio: Fix several potential memory leaks in mmc_sdio_init_card() Ulf Hansson <ulf.hansson(a)linaro.org> mmc: sdio: Fix potential NULL pointer error in mmc_sdio_init_card() Ludovic Desroches <ludovic.desroches(a)microchip.com> ARM: dts: at91: sama5d2_ptc_ek: fix sdmmc0 node description Masahiro Yamada <yamada.masahiro(a)socionext.com> mmc: uniphier-sd: call devm_request_irq() after tmio_mmc_host_probe() Ulf Hansson <ulf.hansson(a)linaro.org> mmc: tmio: Further fixup runtime PM management at remove Ludovic Barre <ludovic.barre(a)st.com> mmc: mmci_sdmmc: fix DMA API warning overlapping mappings Veerabhadrarao Badiganti <vbadigan(a)codeaurora.org> mmc: sdhci-msm: Clear tuning done flag while hs400 tuning Chris Wilson <chris(a)chris-wilson.co.uk> agp/intel: Reinforce the barrier after GTT updates Barret Rhoden <brho(a)google.com> perf: Add cond_resched() to task_function_call() OGAWA Hirofumi <hirofumi(a)mail.parknet.co.jp> fat: don't allow to mount if the FAT length == 0 Wang Hai <wanghai38(a)huawei.com> mm/slub: fix a memory leak in sysfs_slab_add() Ezequiel Garcia <ezequiel(a)collabora.com> drm/vkms: Hold gem object while still in-use Casey Schaufler <casey(a)schaufler-ca.com> Smack: slab-out-of-bounds in vsscanf Qiujun Huang <hqjagain(a)gmail.com> ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb Qiujun Huang <hqjagain(a)gmail.com> ath9x: Fix stack-out-of-bounds Write in ath9k_hif_usb_rx_cb Qiujun Huang <hqjagain(a)gmail.com> ath9k: Fix use-after-free Write in ath9k_htc_rx_msg Qiujun Huang <hqjagain(a)gmail.com> ath9k: Fix use-after-free Read in ath9k_wmi_ctrl_rx Qiujun Huang <hqjagain(a)gmail.com> ath9k: Fix use-after-free Read in htc_connect_service Masami Hiramatsu <mhiramat(a)kernel.org> selftests/ftrace: Return unsupported if no error_log file Dick Kennedy <dick.kennedy(a)broadcom.com> scsi: lpfc: Fix negation of else clause in lpfc_prep_node_fc4type Sumit Saxena <sumit.saxena(a)broadcom.com> scsi: megaraid_sas: TM command refire leads to controller firmware crash Marc Zyngier <maz(a)kernel.org> KVM: arm64: Make vcpu_cp1x() work on Big Endian hosts James Morse <james.morse(a)arm.com> KVM: arm64: Stop writing aarch32's CSSELR into ACTLR Xing Li <lixing(a)loongson.cn> KVM: MIPS: Fix VPN2_MASK definition for variable cpu_vmbits Xing Li <lixing(a)loongson.cn> KVM: MIPS: Define KVM_ENTRYHI_ASID to cpu_asid_mask(&boot_cpu_data) Sean Christopherson <sean.j.christopherson(a)intel.com> KVM: nVMX: Consult only the "basic" exit reason when routing nested exit Paolo Bonzini <pbonzini(a)redhat.com> KVM: nSVM: leave ASID aside in copy_vmcb_control_area Paolo Bonzini <pbonzini(a)redhat.com> KVM: nSVM: fix condition for filtering async PF Sean Christopherson <sean.j.christopherson(a)intel.com> KVM: nVMX: Skip IBPB when switching between vmcs01 and vmcs02 Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> video: fbdev: w100fb: Fix a potential double free. Sam Ravnborg <sam(a)ravnborg.org> video: vt8500lcdfb: fix fallthrough warning Qiuxu Zhuo <qiuxu.zhuo(a)intel.com> EDAC/skx: Use the mcmtr register to retrieve close_pg/bank_xor_enable Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> cpufreq: Fix up cpufreq_boost_set_sw() Suman Anna <s-anna(a)ti.com> remoteproc: Fix and restore the parenting hierarchy for vdev Tero Kristo <t-kristo(a)ti.com> remoteproc: Fall back to using parent memory pool if no dedicated available Eric W. Biederman <ebiederm(a)xmission.com> proc: Use new_inode not new_inode_pseudo Yuxuan Shui <yshuiv7(a)gmail.com> ovl: initialize error in ovl_copy_xattr Maxim Mikityanskiy <maximmi(a)mellanox.com> net/mlx5e: Fix repeated XSK usage on one channel Shay Drory <shayd(a)mellanox.com> net/mlx5: Fix fatal error handling during device load Shay Drory <shayd(a)mellanox.com> net/mlx5: drain health workqueue in case of driver load error tannerlove <tannerlove(a)google.com> selftests/net: in rxtimestamp getopt_long needs terminating null entry Wang Hai <wanghai38(a)huawei.com> dccp: Fix possible memleak in dccp_init and dccp_fini Longpeng(Mike) <longpeng2(a)huawei.com> crypto: virtio: Fix dest length calculation in __virtio_crypto_skcipher_do_req() Longpeng(Mike) <longpeng2(a)huawei.com> crypto: virtio: Fix src/dst scatterlist calculation in __virtio_crypto_skcipher_do_req() Longpeng(Mike) <longpeng2(a)huawei.com> crypto: virtio: Fix use-after-free in virtio_crypto_skcipher_finalize_req() Franck LENORMAND <franck.lenormand(a)nxp.com> firmware: imx: scu: Fix corruption of header Peng Fan <peng.fan(a)nxp.com> firmware: imx-scu: Support one TX and one RX Leonard Crestez <leonard.crestez(a)nxp.com> firmware: imx: warn on unexpected RX Tony Luck <tony.luck(a)intel.com> x86/{mce,mm}: Unmap the entire page if the whole page is affected and poisoned Wei Yongjun <weiyongjun1(a)huawei.com> crypto: drbg - fix error return code in drbg_alloc_state() Eric Biggers <ebiggers(a)google.com> crypto: algapi - Avoid spurious modprobe on LOADED Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> crypto: cavium/nitrox - Fix 'nitrox_get_first_device()' when ndevlist is fully iterated Linus Torvalds <torvalds(a)linux-foundation.org> gup: document and work around "COW can break either way" issue Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> PM: runtime: clk: Fix clk_pm_runtime_get() error path Justin Chen <justinpopo6(a)gmail.com> spi: bcm-qspi: when tx/rx buffer is NULL set to 0 Florian Fainelli <f.fainelli(a)gmail.com> spi: bcm-qspi: Handle clock probe deferral Lukas Wunner <lukas(a)wunner.de> spi: bcm2835aux: Fix controller unregister order Lukas Wunner <lukas(a)wunner.de> spi: bcm2835: Fix controller unregister order Lukas Wunner <lukas(a)wunner.de> spi: pxa2xx: Fix runtime PM ref imbalance on probe error Lukas Wunner <lukas(a)wunner.de> spi: pxa2xx: Fix controller unregister order Lukas Wunner <lukas(a)wunner.de> spi: Fix controller unregister order Lukas Wunner <lukas(a)wunner.de> spi: dw: Fix controller unregister order Ryusuke Konishi <konishi.ryusuke(a)gmail.com> nilfs2: fix null pointer dereference at nilfs_segctor_do_construct() Dave Rodgman <dave.rodgman(a)arm.com> lib/lzo: fix ambiguous encoding bug in lzo-rle Nick Desaulniers <ndesaulniers(a)google.com> arm64: acpi: fix UBSAN warning Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> ACPI: PM: Avoid using power resources if there are none for D0 Ard Biesheuvel <ardb(a)kernel.org> ACPI: GED: add support for _Exx / _Lxx handler methods Qiushi Wu <wu000273(a)umn.edu> ACPI: CPPC: Fix reference count leak in acpi_cppc_processor_probe() Qiushi Wu <wu000273(a)umn.edu> ACPI: sysfs: Fix reference count leak in acpi_sysfs_add_hotplug_profile() Kai-Heng Feng <kai.heng.feng(a)canonical.com> ALSA: usb-audio: Add vendor, product and profile name for HP Thunderbolt Dock Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Fix inconsistent card PM state after resume Michał Mirosław <mirq-linux(a)rere.qmqm.pl> ALSA: pcm: fix snd_pcm_link() lockdep splat Michał Mirosław <mirq-linux(a)rere.qmqm.pl> ALSA: pcm: disallow linking stream to itself Hui Wang <hui.wang(a)canonical.com> ALSA: hda/realtek - add a pintbl quirk for several Lenovo machines Takashi Sakamoto <o-takashi(a)sakamocchi.jp> ALSA: fireface: fix configuration error for nominal sampling transfer frequency Chuhong Yuan <hslester96(a)gmail.com> ALSA: es1688: Add the missed snd_card_free() Fabio Estevam <festevam(a)gmail.com> watchdog: imx_sc_wdt: Fix reboot on crash Namjae Jeon <namjae.jeon(a)samsung.com> smb3: add indatalen that can be a non-zero value to calculation of credit charge in smb2 ioctl Steve French <stfrench(a)microsoft.com> smb3: fix incorrect number of credits when ioctl MaxOutputResponse > 64K Ard Biesheuvel <ardb(a)kernel.org> efi/efivars: Add missing kobject_put() in sysfs entry creation error path Denis Efremov <efremov(a)linux.com> io_uring: use kvfree() in io_sqe_buffer_register() Pavel Dobias <dobias(a)2n.cz> ASoC: max9867: fix volume controls Christophe Leroy <christophe.leroy(a)csgroup.eu> powerpc/ptdump: Properly handle non standard page size Eiichi Tsukata <eiichi.tsukata(a)nutanix.com> KVM: x86: Fix APIC page invalidation race Felipe Franciosi <felipe(a)nutanix.com> KVM: x86: respect singlestep when emulating instruction Sean Christopherson <sean.j.christopherson(a)intel.com> KVM: x86/mmu: Set mmio_value to '0' if reserved #PF can't be generated Kan Liang <kan.liang(a)linux.intel.com> perf/x86/intel: Add more available bits for OFFCORE_RESPONSE of Intel Tremont Hill Ma <maahiuzeon(a)gmail.com> x86/reboot/quirks: Add MacBook6,1 reboot quirk Anthony Steinhauser <asteinhauser(a)google.com> x86/speculation: PR_SPEC_FORCE_DISABLE enforcement for indirect branches. Anthony Steinhauser <asteinhauser(a)google.com> x86/speculation: Avoid force-disabling IBPB based on STIBP and enhanced IBRS. Anthony Steinhauser <asteinhauser(a)google.com> x86/speculation: Prevent rogue cross-process SSBD shutdown Xiaochun Lee <lixc17(a)lenovo.com> x86/PCI: Mark Intel C620 MROMs as having non-compliant BARs Bob Haarman <inglorion(a)google.com> x86_64: Fix jiffies ODR violation Qiujun Huang <hqjagain(a)gmail.com> sctp: fix refcount bug in sctp_wfree Marcelo Ricardo Leitner <marcelo.leitner(a)gmail.com> sctp: fix possibly using a bad saddr with a given dst Luca Coelho <luciano.coelho(a)intel.com> iwlwifi: mvm: fix NVM check for 3168 devices Qian Cai <cai(a)lca.pw> ipv4: fix a RCU-list lock in fib_triestat_seq_show Miklos Szeredi <mszeredi(a)redhat.com> aio: fix async fsync creds Amir Goldstein <amir73il(a)gmail.com> fanotify: fix ignore mask logic for events on child and on dir Vlad Buslov <vladbu(a)mellanox.com> selftests: fix flower parent qdisc Waiman Long <longman(a)redhat.com> mm: add kvfree_sensitive() for freeing sensitive data objects Masami Hiramatsu <mhiramat(a)kernel.org> perf probe: Accept the instance number of kretprobe event Heikki Krogerus <heikki.krogerus(a)linux.intel.com> kobject: Make sure the parent does not get released before its children Bjorn Helgaas <bhelgaas(a)google.com> PCI/PM: Adjust pcie_wait_for_link_delay() for caller delay Paolo Bonzini <pbonzini(a)redhat.com> KVM: x86: only do L1TF workaround on affected processors Kim Phillips <kim.phillips(a)amd.com> x86/cpu/amd: Make erratum #1054 a legacy erratum Petr Tesarik <ptesarik(a)suse.com> s390/pci: Log new handle in clp_disable_fh() Daniel Jordan <daniel.m.jordan(a)oracle.com> padata: add separate cpuhp node for CPUHP_PADATA_DEAD Jason Gunthorpe <jgg(a)ziepe.ca> RDMA/uverbs: Make the event_queue fds return POLLERR when disassociated Arnd Bergmann <arnd(a)arndb.de> smack: avoid unused 'sip' variable warning Masashi Honma <masashi.honma(a)gmail.com> ath9k_htc: Silence undersized packet warnings Sasha Levin <sashal(a)kernel.org> spi: dw: Fix native CS being unset Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> ASoC: SOF: imx: fix undefined reference issue YueHaibing <yuehaibing(a)huawei.com> ASoC: SOF: imx8: Fix randbuild error Cédric Le Goater <clg(a)kaod.org> powerpc/xive: Clear the page tables for the ESB IO mapping Thomas Falcon <tlfalcon(a)linux.ibm.com> drivers/net/ibmvnic: Update VNIC protocol version reporting Andreas Gruenbacher <agruenba(a)redhat.com> gfs2: Even more gfs2_find_jhead fixes Guo Ren <guoren(a)linux.alibaba.com> csky: Fixup abiv2 syscall_trace break a4 & a5 Dennis Kadioglu <denk(a)eclipso.email> Input: synaptics - add a second working PNP_ID for Lenovo T470s Jens Axboe <axboe(a)kernel.dk> sched/fair: Don't NUMA balance for kthreads Fredrik Strupe <fredrik(a)strupe.net> ARM: 8977/1: ptrace: Fix mask for thumb breakpoint hook Stephan Gerhold <stephan(a)gerhold.net> Input: mms114 - fix handling of mms345l Nick Desaulniers <ndesaulniers(a)google.com> elfnote: mark all .note sections SHF_ALLOC Fangrui Song <maskray(a)google.com> bpf: Support llvm-objcopy for vmlinux BTF Ido Schimmel <idosch(a)mellanox.com> vxlan: Avoid infinite loop when suppressing NS messages with invalid options Ido Schimmel <idosch(a)mellanox.com> bridge: Avoid infinite loop when suppressing NS messages with invalid options Willem de Bruijn <willemb(a)google.com> tun: correct header offsets in napi frags mode Vasily Averin <vvs(a)virtuozzo.com> net_failover: fixed rollback in net_failover_open() Vadim Pasternak <vadimp(a)mellanox.com> mlxsw: core: Use different get_trend() callbacks for different thermal zones Hangbin Liu <liuhangbin(a)gmail.com> ipv6: fix IPV6_ADDRFORM operation logic ------------- Diffstat: Documentation/lzo.txt | 8 +- Makefile | 4 +- arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts | 2 - arch/arm/include/asm/kvm_emulate.h | 3 +- arch/arm/include/asm/kvm_host.h | 2 + arch/arm/kernel/ptrace.c | 4 +- arch/arm64/include/asm/acpi.h | 5 +- arch/arm64/include/asm/kvm_emulate.h | 6 -- arch/arm64/include/asm/kvm_host.h | 8 +- arch/arm64/kvm/handle_exit.c | 19 +---- arch/arm64/kvm/sys_regs.c | 10 ++- arch/csky/abiv2/inc/abi/entry.h | 2 + arch/csky/kernel/entry.S | 6 +- arch/mips/include/asm/kvm_host.h | 6 +- arch/powerpc/kernel/vmlinux.lds.S | 6 -- arch/powerpc/mm/ptdump/ptdump.c | 21 ++--- arch/powerpc/sysdev/xive/common.c | 5 ++ arch/s390/pci/pci_clp.c | 3 +- arch/x86/events/intel/core.c | 4 +- arch/x86/include/asm/set_memory.h | 19 +++-- arch/x86/kernel/cpu/amd.c | 3 +- arch/x86/kernel/cpu/bugs.c | 92 +++++++++++++--------- arch/x86/kernel/cpu/mce/core.c | 11 ++- arch/x86/kernel/process.c | 28 +++---- arch/x86/kernel/reboot.c | 8 ++ arch/x86/kernel/time.c | 4 - arch/x86/kernel/vmlinux.lds.S | 4 +- arch/x86/kvm/mmu.c | 46 +++++------ arch/x86/kvm/svm.c | 6 +- arch/x86/kvm/vmx/nested.c | 4 +- arch/x86/kvm/vmx/vmx.c | 18 ++++- arch/x86/kvm/vmx/vmx.h | 3 +- arch/x86/kvm/x86.c | 9 +-- arch/x86/pci/fixup.c | 4 + crypto/algapi.c | 2 +- crypto/drbg.c | 4 +- drivers/acpi/cppc_acpi.c | 1 + drivers/acpi/device_pm.c | 2 +- drivers/acpi/evged.c | 22 +++++- drivers/acpi/scan.c | 28 ++++--- drivers/acpi/sysfs.c | 4 +- drivers/block/floppy.c | 10 +-- drivers/char/agp/intel-gtt.c | 4 +- drivers/clk/clk.c | 6 +- drivers/cpufreq/cpufreq.c | 11 +-- drivers/crypto/cavium/nitrox/nitrox_main.c | 4 +- drivers/crypto/virtio/virtio_crypto_algs.c | 21 +++-- drivers/edac/i10nm_base.c | 2 +- drivers/edac/skx_base.c | 20 ++--- drivers/edac/skx_common.c | 6 +- drivers/edac/skx_common.h | 2 +- drivers/firmware/efi/efivars.c | 4 +- drivers/firmware/imx/imx-scu.c | 72 +++++++++++++---- drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 8 ++ drivers/gpu/drm/vkms/vkms_drv.h | 5 -- drivers/gpu/drm/vkms/vkms_gem.c | 11 +-- drivers/infiniband/core/uverbs_main.c | 2 + drivers/input/mouse/synaptics.c | 1 + drivers/input/touchscreen/mms114.c | 12 ++- drivers/mmc/core/sdio.c | 61 +++++++------- drivers/mmc/host/mmci_stm32_sdmmc.c | 3 + drivers/mmc/host/sdhci-msm.c | 6 ++ drivers/mmc/host/tmio_mmc_core.c | 6 +- drivers/mmc/host/uniphier-sd.c | 12 +-- drivers/net/ethernet/ibm/ibmvnic.c | 8 +- .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 4 + drivers/net/ethernet/mellanox/mlx5/core/health.c | 14 +++- drivers/net/ethernet/mellanox/mlx5/core/main.c | 5 ++ drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 23 +++++- drivers/net/net_failover.c | 3 +- drivers/net/tun.c | 14 +++- drivers/net/vxlan.c | 4 + drivers/net/wireless/ath/ath9k/hif_usb.c | 58 +++++++++++--- drivers/net/wireless/ath/ath9k/hif_usb.h | 6 ++ drivers/net/wireless/ath/ath9k/htc_drv_init.c | 10 ++- drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 6 +- drivers/net/wireless/ath/ath9k/htc_hst.c | 6 +- drivers/net/wireless/ath/ath9k/wmi.c | 6 +- drivers/net/wireless/ath/ath9k/wmi.h | 3 +- drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 2 +- drivers/pci/pci.c | 4 +- drivers/remoteproc/remoteproc_core.c | 2 +- drivers/remoteproc/remoteproc_virtio.c | 12 +++ drivers/scsi/lpfc/lpfc_ct.c | 1 - drivers/scsi/megaraid/megaraid_sas_fusion.c | 7 +- drivers/spi/spi-bcm-qspi.c | 20 +++-- drivers/spi/spi-bcm2835.c | 4 +- drivers/spi/spi-bcm2835aux.c | 4 +- drivers/spi/spi-dw.c | 14 +++- drivers/spi/spi-pxa2xx.c | 5 +- drivers/spi/spi.c | 3 +- drivers/video/fbdev/vt8500lcdfb.c | 1 + drivers/video/fbdev/w100fb.c | 2 + drivers/watchdog/imx_sc_wdt.c | 5 ++ drivers/xen/pvcalls-back.c | 3 +- fs/aio.c | 8 ++ fs/cifs/smb2pdu.c | 4 +- fs/fat/inode.c | 6 ++ fs/gfs2/lops.c | 15 ++-- fs/io_uring.c | 4 +- fs/nilfs2/segment.c | 2 + fs/notify/fanotify/fanotify.c | 5 +- fs/overlayfs/copy_up.c | 2 +- fs/proc/inode.c | 2 +- fs/proc/self.c | 2 +- fs/proc/thread_self.c | 2 +- include/asm-generic/vmlinux.lds.h | 22 +++++- include/linux/elfnote.h | 2 +- include/linux/kvm_host.h | 4 +- include/linux/mm.h | 1 + include/linux/padata.h | 6 +- include/linux/set_memory.h | 2 +- include/net/inet_hashtables.h | 6 ++ kernel/bpf/sysfs_btf.c | 11 ++- kernel/events/core.c | 23 +++--- kernel/padata.c | 14 ++-- kernel/sched/fair.c | 2 +- lib/kobject.c | 30 ++++--- lib/lzo/lzo1x_compress.c | 13 +++ mm/gup.c | 44 +++++++++-- mm/huge_memory.c | 7 +- mm/slub.c | 4 +- mm/util.c | 18 +++++ net/bridge/br_arp_nd_proxy.c | 4 + net/dccp/proto.c | 7 +- net/ipv4/fib_trie.c | 3 + net/ipv6/ipv6_sockglue.c | 13 +-- net/sctp/ipv6.c | 20 +++-- net/sctp/protocol.c | 28 ++++--- net/sctp/socket.c | 31 ++++++-- scripts/link-vmlinux.sh | 24 +++--- security/keys/internal.h | 11 --- security/keys/keyctl.c | 16 ++-- security/smack/smack.h | 6 -- security/smack/smack_lsm.c | 25 ++---- security/smack/smackfs.c | 10 +++ sound/core/pcm_native.c | 20 ++++- sound/firewire/fireface/ff-protocol-latter.c | 12 +-- sound/isa/es1688/es1688.c | 4 +- sound/pci/hda/patch_realtek.c | 6 ++ sound/soc/codecs/max9867.c | 4 +- sound/soc/sof/imx/Kconfig | 17 +++- sound/usb/card.c | 19 +++-- sound/usb/quirks-table.h | 20 +++++ sound/usb/usbaudio.h | 2 +- tools/perf/util/probe-event.c | 3 +- .../ftrace/test.d/ftrace/tracing-error-log.tc | 2 + .../networking/timestamping/rxtimestamp.c | 1 + .../tc-testing/tc-tests/filters/tests.json | 6 +- tools/testing/selftests/tc-testing/tdc_batch.py | 6 +- virt/kvm/arm/aarch32.c | 28 +++++++ virt/kvm/arm/arm.c | 22 +++++- virt/kvm/kvm_main.c | 26 +++--- 153 files changed, 1079 insertions(+), 572 deletions(-)

3 years, 5 months

5
140
0 0

Re: linux-5.10.11 build failure

by Thomas Backlund

Den 28.1.2021 kl. 12:05, skrev Chris Clayton: > > On 28/01/2021 09:34, Greg Kroah-Hartman wrote: >> On Thu, Jan 28, 2021 at 09:17:10AM +0000, Chris Clayton wrote: >>> Hi, >>> >>> Building 5.10.11 fails on my (x86-64) laptop thusly: >>> >>> .. >>> >>> AS arch/x86/entry/thunk_64.o >>> CC arch/x86/entry/vsyscall/vsyscall_64.o >>> AS arch/x86/realmode/rm/header.o >>> CC arch/x86/mm/pat/set_memory.o >>> CC arch/x86/events/amd/core.o >>> CC arch/x86/kernel/fpu/init.o >>> CC arch/x86/entry/vdso/vma.o >>> CC kernel/sched/core.o >>> arch/x86/entry/thunk_64.o: warning: objtool: missing symbol for insn at offset 0x3e >>> >>> AS arch/x86/realmode/rm/trampoline_64.o >>> make[2]: *** [scripts/Makefile.build:360: arch/x86/entry/thunk_64.o] Error 255 >>> make[2]: *** Deleting file 'arch/x86/entry/thunk_64.o' >>> make[2]: *** Waiting for unfinished jobs.... >>> >>> .. >>> >>> Compiler is latest snapshot of gcc-10. >>> >>> Happy to test the fix but please cc me as I'm not subscribed >> >> Can you do 'git bisect' to track down the offending commit? >> > > Sure, but I'll hold that request for a while. I updated to binutils-2.36 on Monday and I'm pretty sure that is a feature > of this build fail. I've reverted binutils to 2.35.1, and the build succeeds. Updated to 2.36 again and, surprise, > surprise, the kernel build fails again. > > I've had a glance at the binutils ML and there are all sorts of issues being reported, but it's beyond my knowledge to > assess if this build error is related to any of them. > > I'll stick with binutils-2.35.1 for the time being. > >> And what exact gcc version are you using? >> > > It's built from the 10-20210123 snapshot tarball. > > I can report this to the binutils folks, but might it be better if the objtool maintainer looks at it first? The > binutils change might just have opened the gate to a bug in objtool. > >> thanks, >> >> greg k-h >> > AFAIK you need this in stable trees: From 1d489151e9f9d1647110277ff77282fe4d96d09b Mon Sep 17 00:00:00 2001 From: Josh Poimboeuf <jpoimboe(a)redhat.com> Date: Thu, 14 Jan 2021 16:14:01 -0600 Subject: [PATCH] objtool: Don't fail on missing symbol table -- Thomas

3 years, 5 months

4
6
0 0

[PATCH] bcache: only check feature sets when sb->version >= BCACHE_SB_VERSION_CDEV_WITH_FEATURES

by Coly Li

For super block version < BCACHE_SB_VERSION_CDEV_WITH_FEATURES, it doesn't make sense to check the feature sets. This patch checks super block version in bch_has_feature_* routines, if the version doesn't have feature sets yet, returns 0 (false) to the caller. Fixes: 5342fd425502 ("bcache: set bcache device into read-only mode for BCH_FEATURE_INCOMPAT_OBSO_LARGE_BUCKET") Fixes: ffa470327572 ("bcache: add bucket_size_hi into struct cache_sb_disk for large bucket") Cc: stable(a)vger.kernel.org # 5.9+ Reported-and-tested-by: Bockholdt Arne <a.bockholdt(a)precitec-optronik.de> Signed-off-by: Coly Li <colyli(a)suse.de> --- drivers/md/bcache/features.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/md/bcache/features.h b/drivers/md/bcache/features.h index 84fc2c0f0101..d1c8fd3977fc 100644 --- a/drivers/md/bcache/features.h +++ b/drivers/md/bcache/features.h @@ -33,6 +33,8 @@ #define BCH_FEATURE_COMPAT_FUNCS(name, flagname) \ static inline int bch_has_feature_##name(struct cache_sb *sb) \ { \ + if (sb->version < BCACHE_SB_VERSION_CDEV_WITH_FEATURES) \ + return 0; \ return (((sb)->feature_compat & \ BCH##_FEATURE_COMPAT_##flagname) != 0); \ } \ @@ -50,6 +52,8 @@ static inline void bch_clear_feature_##name(struct cache_sb *sb) \ #define BCH_FEATURE_RO_COMPAT_FUNCS(name, flagname) \ static inline int bch_has_feature_##name(struct cache_sb *sb) \ { \ + if (sb->version < BCACHE_SB_VERSION_CDEV_WITH_FEATURES) \ + return 0; \ return (((sb)->feature_ro_compat & \ BCH##_FEATURE_RO_COMPAT_##flagname) != 0); \ } \ @@ -67,6 +71,8 @@ static inline void bch_clear_feature_##name(struct cache_sb *sb) \ #define BCH_FEATURE_INCOMPAT_FUNCS(name, flagname) \ static inline int bch_has_feature_##name(struct cache_sb *sb) \ { \ + if (sb->version < BCACHE_SB_VERSION_CDEV_WITH_FEATURES) \ + return 0; \ return (((sb)->feature_incompat & \ BCH##_FEATURE_INCOMPAT_##flagname) != 0); \ } \ -- 2.26.2

3 years, 5 months

2
2
0 0

[PATCH 1/2] drm/dp/mst: Export drm_dp_get_vc_payload_bw()

by Imre Deak

This function will be needed by the next patch where the driver calculates the BW based on driver specific parameters, so export it. At the same time sanitize the function params, passing the more natural link rate instead of the encoding of the same rate. Cc: Lyude Paul <lyude(a)redhat.com> Cc: Ville Syrjala <ville.syrjala(a)intel.com> Cc: <stable(a)vger.kernel.org> Cc: dri-devel(a)lists.freedesktop.org Signed-off-by: Imre Deak <imre.deak(a)intel.com> --- drivers/gpu/drm/drm_dp_mst_topology.c | 24 ++++++++++++++++++------ include/drm/drm_dp_mst_helper.h | 1 + 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 475939138b21..dc96cbf78cc6 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -3629,14 +3629,26 @@ static int drm_dp_send_up_ack_reply(struct drm_dp_mst_topology_mgr *mgr, return 0; } -static int drm_dp_get_vc_payload_bw(u8 dp_link_bw, u8 dp_link_count) +/** + * drm_dp_get_vc_payload_bw - get the VC payload BW for an MST link + * @rate: link rate in 10kbits/s units + * @lane_count: lane count + * + * Calculate the toal bandwidth of a MultiStream Transport link. The returned + * value is in units of PBNs/(timeslots/1 MTP). This value can be used to + * convert the number of PBNs required for a given stream to the number of + * timeslots this stream requires in each MTP. + */ +int drm_dp_get_vc_payload_bw(int link_rate, int link_lane_count) { - if (dp_link_bw == 0 || dp_link_count == 0) - DRM_DEBUG_KMS("invalid link bandwidth in DPCD: %x (link count: %d)\n", - dp_link_bw, dp_link_count); + if (link_rate == 0 || link_lane_count == 0) + DRM_DEBUG_KMS("invalid link rate/lane count: (%d / %d)\n", + link_rate, link_lane_count); - return dp_link_bw * dp_link_count / 2; + /* See DP v2.0 2.6.4.2, VCPayload_Bandwidth_for_OneTimeSlotPer_MTP_Allocation */ + return link_rate * link_lane_count / 54000; } +EXPORT_SYMBOL(drm_dp_get_vc_payload_bw); /** * drm_dp_read_mst_cap() - check whether or not a sink supports MST @@ -3692,7 +3704,7 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms goto out_unlock; } - mgr->pbn_div = drm_dp_get_vc_payload_bw(mgr->dpcd[1], + mgr->pbn_div = drm_dp_get_vc_payload_bw(drm_dp_bw_code_to_link_rate(mgr->dpcd[1]), mgr->dpcd[2] & DP_MAX_LANE_COUNT_MASK); if (mgr->pbn_div == 0) { ret = -EINVAL; diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h index f5e92fe9151c..bd1c39907b92 100644 --- a/include/drm/drm_dp_mst_helper.h +++ b/include/drm/drm_dp_mst_helper.h @@ -783,6 +783,7 @@ drm_dp_mst_detect_port(struct drm_connector *connector, struct edid *drm_dp_mst_get_edid(struct drm_connector *connector, struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port); +int drm_dp_get_vc_payload_bw(int link_rate, int link_lane_count); int drm_dp_calc_pbn_mode(int clock, int bpp, bool dsc); -- 2.25.1

3 years, 5 months

3
7
0 0

patch "w1: w1_therm: Fix conversion result for negative temperatures" added to char-misc-next

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled w1: w1_therm: Fix conversion result for negative temperatures to my char-misc git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git in the char-misc-next branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will also be merged in the next major kernel release during the merge window. If you have any questions about this process, please let me know. >From 2f6055c26f1913763eabc66c7c27d0693561e966 Mon Sep 17 00:00:00 2001 From: Ivan Zaentsev <ivan.zaentsev(a)wirenboard.ru> Date: Thu, 21 Jan 2021 12:30:21 +0300 Subject: w1: w1_therm: Fix conversion result for negative temperatures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DS18B20 device driver returns an incorrect value for negative temperatures due to a missing sign-extension in w1_DS18B20_convert_temp(). Fix by using s16 temperature value when converting to int. Fixes: 9ace0b4dab1c (w1: w1_therm: Add support for GXCAS GX20MH01 device.) Cc: stable <stable(a)vger.kernel.org> Reported-by: Paweł Marciniak <sunwire(a)gmail.com> Signed-off-by: Ivan Zaentsev <ivan.zaentsev(a)wirenboard.ru> Link: https://lore.kernel.org/r/20210121093021.224764-1-ivan.zaentsev@wirenboard.… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/w1/slaves/w1_therm.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c index 3712b1e6dc71..976eea28f268 100644 --- a/drivers/w1/slaves/w1_therm.c +++ b/drivers/w1/slaves/w1_therm.c @@ -667,28 +667,24 @@ static inline int w1_DS18B20_get_resolution(struct w1_slave *sl) */ static inline int w1_DS18B20_convert_temp(u8 rom[9]) { - int t; - u32 bv; + u16 bv; + s16 t; + + /* Signed 16-bit value to unsigned, cpu order */ + bv = le16_to_cpup((__le16 *)rom); /* Config register bit R2 = 1 - GX20MH01 in 13 or 14 bit resolution mode */ if (rom[4] & 0x80) { - /* Signed 16-bit value to unsigned, cpu order */ - bv = le16_to_cpup((__le16 *)rom); - /* Insert two temperature bits from config register */ /* Avoid arithmetic shift of signed value */ bv = (bv << 2) | (rom[4] & 3); - - t = (int) sign_extend32(bv, 17); /* Degrees, lowest bit is 2^-6 */ - return (t*1000)/64; /* Millidegrees */ + t = (s16) bv; /* Degrees, lowest bit is 2^-6 */ + return (int)t * 1000 / 64; /* Sign-extend to int; millidegrees */ } - - t = (int)le16_to_cpup((__le16 *)rom); - return t*1000/16; + t = (s16)bv; /* Degrees, lowest bit is 2^-4 */ + return (int)t * 1000 / 16; /* Sign-extend to int; millidegrees */ } - - /** * w1_DS18S20_convert_temp() - temperature computation for DS18S20 * @rom: data read from device RAM (8 data bytes + 1 CRC byte) -- 2.30.0

3 years, 5 months

1
0
0 0

patch "virt: vbox: Do not use wait_event_interruptible when called from" added to char-misc-next

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled virt: vbox: Do not use wait_event_interruptible when called from to my char-misc git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git in the char-misc-next branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will also be merged in the next major kernel release during the merge window. If you have any questions about this process, please let me know. >From c35901b39ddc20077f4ae7b9f7bf344487f62212 Mon Sep 17 00:00:00 2001 From: Hans de Goede <hdegoede(a)redhat.com> Date: Thu, 21 Jan 2021 16:07:54 +0100 Subject: virt: vbox: Do not use wait_event_interruptible when called from kernel context Do not use wait_event_interruptible when vbg_hgcm_call() gets called from kernel-context, such as it being called by the vboxsf filesystem code. This fixes some filesystem related system calls on shared folders unexpectedly failing with -EINTR. Fixes: 0532a1b0d045 ("virt: vbox: Implement passing requestor info to the host for VirtualBox 6.0.x") Reported-by: Ludovic Pouzenc <bugreports(a)pouzenc.fr> Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> Cc: stable <stable(a)vger.kernel.org> Link: https://lore.kernel.org/r/20210121150754.147598-1-hdegoede@redhat.com Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/virt/vboxguest/vboxguest_utils.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/virt/vboxguest/vboxguest_utils.c b/drivers/virt/vboxguest/vboxguest_utils.c index ea05af41ec69..8d195e3f8301 100644 --- a/drivers/virt/vboxguest/vboxguest_utils.c +++ b/drivers/virt/vboxguest/vboxguest_utils.c @@ -468,7 +468,7 @@ static int hgcm_cancel_call(struct vbg_dev *gdev, struct vmmdev_hgcm_call *call) * Cancellation fun. */ static int vbg_hgcm_do_call(struct vbg_dev *gdev, struct vmmdev_hgcm_call *call, - u32 timeout_ms, bool *leak_it) + u32 timeout_ms, bool interruptible, bool *leak_it) { int rc, cancel_rc, ret; long timeout; @@ -495,10 +495,15 @@ static int vbg_hgcm_do_call(struct vbg_dev *gdev, struct vmmdev_hgcm_call *call, else timeout = msecs_to_jiffies(timeout_ms); - timeout = wait_event_interruptible_timeout( - gdev->hgcm_wq, - hgcm_req_done(gdev, &call->header), - timeout); + if (interruptible) { + timeout = wait_event_interruptible_timeout(gdev->hgcm_wq, + hgcm_req_done(gdev, &call->header), + timeout); + } else { + timeout = wait_event_timeout(gdev->hgcm_wq, + hgcm_req_done(gdev, &call->header), + timeout); + } /* timeout > 0 means hgcm_req_done has returned true, so success */ if (timeout > 0) @@ -631,7 +636,8 @@ int vbg_hgcm_call(struct vbg_dev *gdev, u32 requestor, u32 client_id, hgcm_call_init_call(call, client_id, function, parms, parm_count, bounce_bufs); - ret = vbg_hgcm_do_call(gdev, call, timeout_ms, &leak_it); + ret = vbg_hgcm_do_call(gdev, call, timeout_ms, + requestor & VMMDEV_REQUESTOR_USERMODE, &leak_it); if (ret == 0) { *vbox_status = call->header.result; ret = hgcm_call_copy_back_result(call, parms, parm_count, -- 2.30.0

3 years, 5 months

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror January 2021