November 2021 - Linux-stable-mirror

[PATCH v2] x86/sgx: Free backing memory after faulting the enclave page

by Jarkko Sakkinen

There is a limited amount of SGX memory (EPC) on each system. When that memory is used up, SGX has its own swapping mechanism which is similar in concept but totally separate from the core mm/* code. Instead of swapping to disk, SGX swaps from EPC to normal RAM. That normal RAM comes from a shared memory pseudo-file and can itself be swapped by the core mm code. There is a hierarchy like this: EPC <-> shmem <-> disk After data is swapped back in from shmem to EPC, the shmem backing storage needs to be freed. Currently, the backing shmem is not freed. This effectively wastes the shmem while the enclave is running. The memory is recovered when the enclave is destroyed and the backing storage freed. Sort this out by freeing memory with shmem_truncate_range(), as soon as a page is faulted back to the EPC. In addition, free the memory for PCMD pages as soon as all PCMD's in a page have been marked as unused by zeroing its contents. Reported-by: Dave Hansen <dave.hansen(a)linux.intel.com> Cc: stable(a)vger.kernel.org Fixes: 1728ab54b4be ("x86/sgx: Add a page reclaimer") Signed-off-by: Jarkko Sakkinen <jarkko(a)kernel.org> --- v2: * Rewrite commit message as proposed by Dave. * Truncate PCMD pages (Dave). --- arch/x86/kernel/cpu/sgx/encl.c | 48 +++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/cpu/sgx/encl.c b/arch/x86/kernel/cpu/sgx/encl.c index 001808e3901c..ea43c10e5458 100644 --- a/arch/x86/kernel/cpu/sgx/encl.c +++ b/arch/x86/kernel/cpu/sgx/encl.c @@ -12,6 +12,27 @@ #include "encls.h" #include "sgx.h" + +/* + * Get the page number of the page in the backing storage, which stores the PCMD + * of the enclave page in the given page index. PCMD pages are located after + * the backing storage for the visible enclave pages and SECS. + */ +static inline pgoff_t sgx_encl_get_backing_pcmd_nr(struct sgx_encl *encl, pgoff_t index) +{ + return PFN_DOWN(encl->size) + 1 + (index / sizeof(struct sgx_pcmd)); +} + +/* + * Free a page from the backing storage in the given page index. + */ +static inline void sgx_encl_truncate_backing_page(struct sgx_encl *encl, pgoff_t index) +{ + struct inode *inode = file_inode(encl->backing); + + shmem_truncate_range(inode, PFN_PHYS(index), PFN_PHYS(index) + PAGE_SIZE - 1); +} + /* * ELDU: Load an EPC page as unblocked. For more info, see "OS Management of EPC * Pages" in the SDM. @@ -24,7 +45,10 @@ static int __sgx_encl_eldu(struct sgx_encl_page *encl_page, struct sgx_encl *encl = encl_page->encl; struct sgx_pageinfo pginfo; struct sgx_backing b; + bool pcmd_page_empty; pgoff_t page_index; + pgoff_t pcmd_index; + u8 *pcmd_page; int ret; if (secs_page) @@ -38,8 +62,8 @@ static int __sgx_encl_eldu(struct sgx_encl_page *encl_page, pginfo.addr = encl_page->desc & PAGE_MASK; pginfo.contents = (unsigned long)kmap_atomic(b.contents); - pginfo.metadata = (unsigned long)kmap_atomic(b.pcmd) + - b.pcmd_offset; + pcmd_page = kmap_atomic(b.pcmd); + pginfo.metadata = (unsigned long)pcmd_page + b.pcmd_offset; if (secs_page) pginfo.secs = (u64)sgx_get_epc_virt_addr(secs_page); @@ -55,11 +79,27 @@ static int __sgx_encl_eldu(struct sgx_encl_page *encl_page, ret = -EFAULT; } - kunmap_atomic((void *)(unsigned long)(pginfo.metadata - b.pcmd_offset)); + memset(pcmd_page + b.pcmd_offset, 0, sizeof(struct sgx_pcmd)); + + /* + * The area for the PCMD in the page was zeroed above. Check if the + * whole page is now empty meaning that all PCMD's have been zeroed: + */ + pcmd_page_empty = !memchr_inv(pcmd_page, 0, PAGE_SIZE); + + kunmap_atomic(pcmd_page); kunmap_atomic((void *)(unsigned long)pginfo.contents); sgx_encl_put_backing(&b, false); + /* Free the backing memory. */ + sgx_encl_truncate_backing_page(encl, page_index); + + if (pcmd_page_empty) { + pcmd_index = sgx_encl_get_backing_pcmd_nr(encl, page_index); + sgx_encl_truncate_backing_page(encl, pcmd_index); + } + return ret; } @@ -577,7 +617,7 @@ static struct page *sgx_encl_get_backing_page(struct sgx_encl *encl, int sgx_encl_get_backing(struct sgx_encl *encl, unsigned long page_index, struct sgx_backing *backing) { - pgoff_t pcmd_index = PFN_DOWN(encl->size) + 1 + (page_index >> 5); + pgoff_t pcmd_index = sgx_encl_get_backing_pcmd_nr(encl, page_index); struct page *contents; struct page *pcmd; -- 2.32.0

2 years, 5 months

1
1
0 0

[PATCH AUTOSEL 4.4 1/9] xen/privcmd: make option visible in Kconfig

by Sasha Levin

From: Juergen Gross <jgross(a)suse.com> [ Upstream commit 897919ad8b42eb8222553838ab82414a924694aa ] This configuration option provides a misc device as an API to userspace. Make this API usable without having to select the module as a transitive dependency. This also fixes an issue where localyesconfig would select CONFIG_XEN_PRIVCMD=m because it was not visible and defaulted to building as module. [boris: clarified help message per Jan's suggestion] Based-on-patch-by: Thomas Weißschuh <linux(a)weissschuh.net> Signed-off-by: Juergen Gross <jgross(a)suse.com> Link: https://lore.kernel.org/r/20211116143323.18866-1-jgross@suse.com Reviewed-by: Jan Beulich <jbeulich(a)suse.com> Reviewed-by: Thomas Weißschuh <linux(a)weissschuh.net> Signed-off-by: Boris Ostrovsky <boris.ostrovsky(a)oracle.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- drivers/xen/Kconfig | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig index 3a14948269b1e..59f862350a6ec 100644 --- a/drivers/xen/Kconfig +++ b/drivers/xen/Kconfig @@ -199,9 +199,15 @@ config XEN_SCSI_BACKEND if guests need generic access to SCSI devices. config XEN_PRIVCMD - tristate + tristate "Xen hypercall passthrough driver" depends on XEN default m + help + The hypercall passthrough driver allows privileged user programs to + perform Xen hypercalls. This driver is normally required for systems + running as Dom0 to perform privileged operations, but in some + disaggregated Xen setups this driver might be needed for other + domains, too. config XEN_STUB bool "Xen stub drivers" -- 2.33.0

2 years, 5 months

3
12
0 0

[PATCH AUTOSEL 5.15 01/68] ASoC: mediatek: mt8173-rt5650: Rename Speaker control to Ext Spk

by Sasha Levin

From: AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com> [ Upstream commit 0a8facac0d1e38dc8b86ade6d3f0d8b33dae7c58 ] Some RT5645 and RT5650 powered platforms are using "Ext Spk" instead of "Speaker", and this is also reflected in alsa-lib configurations for the generic RT5645 usecase manager configs. Rename the "Speaker" control to "Ext Spk" in order to be able to make the userspace reuse/inherit the same configurations also for this machine, along with the others. Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com> Link: https://lore.kernel.org/r/20211105152013.75252-1-angelogioacchino.delregno@… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/mediatek/mt8173/mt8173-rt5650.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650.c b/sound/soc/mediatek/mt8173/mt8173-rt5650.c index c28ebf891cb05..2cbf679f5c74b 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650.c @@ -30,15 +30,15 @@ static struct mt8173_rt5650_platform_data mt8173_rt5650_priv = { }; static const struct snd_soc_dapm_widget mt8173_rt5650_widgets[] = { - SND_SOC_DAPM_SPK("Speaker", NULL), + SND_SOC_DAPM_SPK("Ext Spk", NULL), SND_SOC_DAPM_MIC("Int Mic", NULL), SND_SOC_DAPM_HP("Headphone", NULL), SND_SOC_DAPM_MIC("Headset Mic", NULL), }; static const struct snd_soc_dapm_route mt8173_rt5650_routes[] = { - {"Speaker", NULL, "SPOL"}, - {"Speaker", NULL, "SPOR"}, + {"Ext Spk", NULL, "SPOL"}, + {"Ext Spk", NULL, "SPOR"}, {"DMIC L1", NULL, "Int Mic"}, {"DMIC R1", NULL, "Int Mic"}, {"Headphone", NULL, "HPOL"}, @@ -48,7 +48,7 @@ static const struct snd_soc_dapm_route mt8173_rt5650_routes[] = { }; static const struct snd_kcontrol_new mt8173_rt5650_controls[] = { - SOC_DAPM_PIN_SWITCH("Speaker"), + SOC_DAPM_PIN_SWITCH("Ext Spk"), SOC_DAPM_PIN_SWITCH("Int Mic"), SOC_DAPM_PIN_SWITCH("Headphone"), SOC_DAPM_PIN_SWITCH("Headset Mic"), -- 2.33.0

2 years, 5 months

4
70
0 0

[PATCH 4.19 000/323] 4.19.218-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.19.218 release. There are 323 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 Fri, 26 Nov 2021 11:56:36 +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/v4.x/stable-review/patch-4.19.218-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.19.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.19.218-rc1 Nadav Amit <namit(a)vmware.com> hugetlbfs: flush TLBs correctly after huge_pmd_unshare Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> usb: max-3421: Use driver data instead of maintaining a list of bound devices Takashi Iwai <tiwai(a)suse.de> ASoC: DAPM: Cover regression by kctl change notification fix Leon Romanovsky <leonro(a)nvidia.com> RDMA/netlink: Add __maybe_unused to static inline in C file Sven Eckelmann <sven(a)narfation.org> batman-adv: Don't always reallocate the fragmentation skb head Sven Eckelmann <sven(a)narfation.org> batman-adv: Reserve needed_*room for fragments Sven Eckelmann <sven(a)narfation.org> batman-adv: Consider fragmentation for needed_headroom Linus Lüssing <linus.luessing(a)c0d3.blue> batman-adv: mcast: fix duplicate mcast packets in BLA backbone from LAN Greg Thelen <gthelen(a)google.com> perf/core: Avoid put_page() when GUP fails hongao <hongao(a)uniontech.com> drm/amdgpu: fix set scaling mode Full/Full aspect/Center not works on vga and dvi connectors Johan Hovold <johan(a)kernel.org> drm/udl: fix control-message timeout Nguyen Dinh Phi <phind.uet(a)gmail.com> cfg80211: call cfg80211_stop_ap when switch from P2P_GO type Sven Schnelle <svens(a)stackframe.org> parisc/sticon: fix reverse colors Nikolay Borisov <nborisov(a)suse.com> btrfs: fix memory ordering between normal and ordered work functions Jan Kara <jack(a)suse.cz> udf: Fix crash after seekdir Sean Christopherson <seanjc(a)google.com> x86/hyperv: Fix NULL deref in set_hv_tscchange_cb() if Hyper-V setup fails Rustam Kovhaev <rkovhaev(a)gmail.com> mm: kmemleak: slob: respect SLAB_NOLEAKTRACE flag Alexander Mikhalitsyn <alexander.mikhalitsyn(a)virtuozzo.com> ipc: WARN if trying to remove ipc object which is absent Nathan Chancellor <nathan(a)kernel.org> hexagon: export raw I/O routines for modules Nicolas Dichtel <nicolas.dichtel(a)6wind.com> tun: fix bonding active backup with arp monitoring Alexander Antonov <alexander.antonov(a)linux.intel.com> perf/x86/intel/uncore: Fix IIO event constraints for Skylake Server Alexander Antonov <alexander.antonov(a)linux.intel.com> perf/x86/intel/uncore: Fix filter_tid mask for CHA events on Skylake Server Sohaib Mohamed <sohaib.amhmd(a)gmail.com> perf bench: Fix two memory leaks detected with ASan Lin Ma <linma(a)zju.edu.cn> NFC: reorder the logic in nfc_{un,}register_device Lin Ma <linma(a)zju.edu.cn> NFC: reorganize the functions in nci_request Grzegorz Szczurek <grzegorzx.szczurek(a)intel.com> i40e: Fix display error code in dmesg Eryk Rybak <eryk.roch.rybak(a)intel.com> i40e: Fix changing previously set num_queue_pairs for PFs Michal Maloszewski <michal.maloszewski(a)intel.com> i40e: Fix NULL ptr dereference on VSI filter sync Eryk Rybak <eryk.roch.rybak(a)intel.com> i40e: Fix correct max_pkt_size on VF RX queue Jonathan Davies <jonathan.davies(a)nutanix.com> net: virtio_net_hdr_to_skb: count transport header in UFO Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> platform/x86: hp_accel: Fix an error handling path in 'lis3lv02d_probe()' Randy Dunlap <rdunlap(a)infradead.org> mips: lantiq: add support for clk_get_parent() Randy Dunlap <rdunlap(a)infradead.org> mips: bcm63xx: add support for clk_get_parent() Colin Ian King <colin.i.king(a)googlemail.com> MIPS: generic/yamon-dt: fix uninitialized variable error Surabhi Boob <surabhi.boob(a)intel.com> iavf: Fix for the false positive ASQ/ARQ errors while issuing VF reset Nicholas Nunley <nicholas.d.nunley(a)intel.com> iavf: check for null in iavf_fix_features Pavel Skripkin <paskripkin(a)gmail.com> net: bnx2x: fix variable dereferenced before check Hans Verkuil <hverkuil-cisco(a)xs4all.nl> drm/nouveau: hdmigv100.c: fix corrupted HDMI Vendor InfoFrame Vincent Donnefort <vincent.donnefort(a)arm.com> sched/core: Mitigate race cpus_share_cache()/update_top_cache_domain() Randy Dunlap <rdunlap(a)infradead.org> mips: BCM63XX: ensure that CPU_SUPPORTS_32BIT_KERNEL is set Randy Dunlap <rdunlap(a)infradead.org> sh: define __BIG_ENDIAN for math-emu Randy Dunlap <rdunlap(a)infradead.org> sh: fix kconfig unmet dependency warning for FRAME_POINTER Gao Xiang <hsiangkao(a)linux.alibaba.com> f2fs: fix up f2fs_lookup tracepoints Lu Wei <luwei32(a)huawei.com> maple: fix wrong return value of maple_bus_init(). Nick Desaulniers <ndesaulniers(a)google.com> sh: check return code of request_irq Michael Ellerman <mpe(a)ellerman.id.au> powerpc/dcr: Use cmplwi instead of 3-argument cmpli Chengfeng Ye <cyeaa(a)connect.ust.hk> ALSA: gus: fix null pointer dereference on pointer block Anatolij Gustschin <agust(a)denx.de> powerpc/5200: dts: fix memory node unit name Mike Christie <michael.christie(a)oracle.com> scsi: target: Fix alua_tg_pt_gps_count tracking Mike Christie <michael.christie(a)oracle.com> scsi: target: Fix ordered tag handling Bart Van Assche <bvanassche(a)acm.org> MIPS: sni: Fix the build Guanghui Feng <guanghuifeng(a)linux.alibaba.com> tty: tty_buffer: Fix the softlockup issue in flush_to_ldisc Randy Dunlap <rdunlap(a)infradead.org> ALSA: ISA: not for M68K Yang Yingliang <yangyingliang(a)huawei.com> usb: host: ohci-tmio: check return value after calling platform_get_resource() Roger Quadros <rogerq(a)kernel.org> ARM: dts: omap: fix gpmc,mux-add-data type Luis Chamberlain <mcgrof(a)kernel.org> firmware_loader: fix pre-allocated buf built-in firmware use Guo Zhi <qtxuning1999(a)sjtu.edu.cn> scsi: advansys: Fix kernel pointer leak Hans de Goede <hdegoede(a)redhat.com> ASoC: nau8824: Add DMI quirk mechanism for active-high jack-detect Michael Walle <michael(a)walle.cc> arm64: dts: freescale: fix arm,sp805 compatible string Sven Peter <sven(a)svenpeter.dev> usb: typec: tipd: Remove WARN_ON in tps6598x_block_read Yang Yingliang <yangyingliang(a)huawei.com> usb: musb: tusb6010: check return value after calling platform_get_resource() Michael Walle <michael(a)walle.cc> arm64: dts: hisilicon: fix arm,sp805 compatible string James Smart <jsmart2021(a)gmail.com> scsi: lpfc: Fix list_add() corruption in lpfc_drain_txq() Michal Simek <michal.simek(a)xilinx.com> arm64: zynqmp: Fix serial compatible string Amit Kumar Mahapatra <amit.kumar-mahapatra(a)xilinx.com> arm64: zynqmp: Do not duplicate flash partition label property Gao Xiang <hsiangkao(a)linux.alibaba.com> erofs: fix unsafe pagevec reuse of hooked pclusters Yue Hu <huyue2(a)yulong.com> erofs: remove the occupied parameter from z_erofs_pagevec_enqueue() Marc Zyngier <maz(a)kernel.org> PCI: Add MSI masking quirk for Nvidia ION AHCI Marc Zyngier <maz(a)kernel.org> PCI/MSI: Deal with devices lying about their MSI mask capability Thomas Gleixner <tglx(a)linutronix.de> PCI/MSI: Destroy sysfs before freeing entries Sven Schnelle <svens(a)stackframe.org> parisc/entry: fix trace test in syscall exit path Kees Cook <keescook(a)chromium.org> fortify: Explicitly disable Clang support Shaoying Xu <shaoyi(a)amazon.com> ext4: fix lazy initialization next schedule time computation in more granular unit Jane Malalane <jane.malalane(a)citrix.com> x86/cpu: Fix migration safety with X86_BUG_NULL_SEL Miklos Szeredi <mszeredi(a)redhat.com> fuse: truncate pagecache on atomic_o_trunc Pali Rohár <pali(a)kernel.org> PCI: Add PCI_EXP_DEVCTL_PAYLOAD_* macros Sven Schnelle <svens(a)linux.ibm.com> s390/tape: fix timer initialization in tape_std_assign() Vineeth Vijayan <vneethv(a)linux.ibm.com> s390/cio: check the subchannel validity for dev_busid Marek Vasut <marex(a)denx.de> video: backlight: Drop maximum brightness override for brightness zero Peter Ujfalusi <peter.ujfalusi(a)ti.com> backlight: gpio-backlight: Correct initial power state handling Michal Hocko <mhocko(a)suse.com> mm, oom: do not trigger out_of_memory from the #PF Vasily Averin <vvs(a)virtuozzo.com> mm, oom: pagefault_out_of_memory: don't force global OOM for dying tasks Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com> powerpc/bpf: Emit stf barrier instruction sequences for BPF_NOSPEC Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com> powerpc/security: Add a helper to query stf_barrier type Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com> powerpc/bpf: Fix BPF_SUB when imm == 0x80000000 Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com> powerpc/bpf: Validate branch ranges Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com> powerpc/lib: Add helper to check if offset is within conditional branch range Dominique Martinet <asmadeus(a)codewreck.org> 9p/net: fix missing error check in p9_check_errors Jaegeuk Kim <jaegeuk(a)kernel.org> f2fs: should use GFP_NOFS for directory inodes Arnd Bergmann <arnd(a)arndb.de> ARM: 9156/1: drop cc-option fallbacks for architecture selection Michał Mirosław <mirq-linux(a)rere.qmqm.pl> ARM: 9155/1: fix early early_iounmap() Johan Hovold <johan(a)kernel.org> USB: chipidea: fix interrupt deadlock Rahul Lakkireddy <rahul.lakkireddy(a)chelsio.com> cxgb4: fix eeprom len when diagnostics not implemented Eiichi Tsukata <eiichi.tsukata(a)nutanix.com> vsock: prevent unnecessary refcnt inc for nonblocking connect Arnd Bergmann <arnd(a)arndb.de> arm64: pgtable: make __pte_to_phys/__phys_to_pte_val inline functions Chengfeng Ye <cyeaa(a)connect.ust.hk> nfc: pn533: Fix double free when pn533_fill_fragment_skbs() fails Eric Dumazet <edumazet(a)google.com> llc: fix out-of-bound array index in llc_sk_dev_hash() Dan Carpenter <dan.carpenter(a)oracle.com> zram: off by one in read_block_state() Miaohe Lin <linmiaohe(a)huawei.com> mm/zsmalloc.c: close race window between zs_pool_dec_isolated() and zs_unregister_migration() Huang Guobin <huangguobin4(a)huawei.com> bonding: Fix a use-after-free problem when bond_sysfs_slave_add() failed Hans de Goede <hdegoede(a)redhat.com> ACPI: PMIC: Fix intel_pmic_regs_handler() read accesses Ziyang Xuan <william.xuanziyang(a)huawei.com> net: vlan: fix a UAF in vlan_dev_real_dev() Maxim Kiselev <bigunclemax(a)gmail.com> net: davinci_emac: Fix interrupt pacing disable YueHaibing <yuehaibing(a)huawei.com> xen-pciback: Fix return in pm_ctrl_init() Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> i2c: xlr: Fix a resource leak in the error handling path of 'xlr_i2c_probe()' Quinn Tran <qutran(a)marvell.com> scsi: qla2xxx: Turn off target reset during issue_lip Quinn Tran <qutran(a)marvell.com> scsi: qla2xxx: Fix gnl list corruption Jackie Liu <liuyun01(a)kylinos.cn> ar7: fix kernel builds for compiler test Ahmad Fatoum <a.fatoum(a)pengutronix.de> watchdog: f71808e_wdt: fix inaccurate report in WDIOC_GETTIMEOUT Randy Dunlap <rdunlap(a)infradead.org> m68k: set a default value for MEMORY_RESERVE Lars-Peter Clausen <lars(a)metafoo.de> dmaengine: dmaengine_desc_callback_valid(): Check for `callback_result` Florian Westphal <fw(a)strlen.de> netfilter: nfnetlink_queue: fix OOB when mac header was cleared Geert Uytterhoeven <geert(a)linux-m68k.org> auxdisplay: ht16k33: Fix frame buffer device blanking Geert Uytterhoeven <geert(a)linux-m68k.org> auxdisplay: ht16k33: Connect backlight to fbdev Geert Uytterhoeven <geert(a)linux-m68k.org> auxdisplay: img-ascii-lcd: Fix lock-up when displaying empty string Claudiu Beznea <claudiu.beznea(a)microchip.com> dmaengine: at_xdmac: fix AT_XDMAC_CC_PERID() macro Evgeny Novikov <novikov(a)ispras.ru> mtd: spi-nor: hisi-sfc: Remove excessive clk_disable_unprepare() Jia-Ju Bai <baijiaju1990(a)gmail.com> fs: orangefs: fix error return code of orangefs_revalidate_lookup() Trond Myklebust <trond.myklebust(a)hammerspace.com> NFS: Fix deadlocks in nfs_scan_commit_list() Marek Behún <kabel(a)kernel.org> PCI: aardvark: Don't spam about PIO Response Status Alex Xu (Hello71) <alex_y_xu(a)yahoo.ca> drm/plane-helper: fix uninitialized variable reference Baptiste Lepers <baptiste.lepers(a)gmail.com> pnfs/flexfiles: Fix misplaced barrier in nfs4_ff_layout_prepare_ds Arnaud Pouliquen <arnaud.pouliquen(a)foss.st.com> rpmsg: Fix rpmsg_create_ept return when RPMSG config is not defined Tom Rix <trix(a)redhat.com> apparmor: fix error check Hans de Goede <hdegoede(a)redhat.com> power: supply: bq27xxx: Fix kernel crash on IRQ handler register error Geert Uytterhoeven <geert+renesas(a)glider.be> mips: cm: Convert to bitfield API to fix out-of-bounds access Anssi Hannula <anssi.hannula(a)bitwise.fi> serial: xilinx_uartps: Fix race condition causing stuck TX Vladimir Zapolskiy <vladimir.zapolskiy(a)linaro.org> phy: qcom-qusb2: Fix a memory leak on probe Richard Fitzgerald <rf(a)opensource.cirrus.com> ASoC: cs42l42: Defer probe if request_threaded_irq() returns EPROBE_DEFER Richard Fitzgerald <rf(a)opensource.cirrus.com> ASoC: cs42l42: Correct some register default values Leon Romanovsky <leonro(a)nvidia.com> RDMA/mlx4: Return missed an error if device doesn't support steering Dan Carpenter <dan.carpenter(a)oracle.com> scsi: csiostor: Uninitialized data in csio_ln_vnp_read_cbfn() Jakob Hauser <jahau(a)rocketmail.com> power: supply: rt5033_battery: Change voltage values to µV Dan Carpenter <dan.carpenter(a)oracle.com> usb: gadget: hid: fix error code in do_config() Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> serial: 8250_dw: Drop wrong use of ACPI_PTR() Christophe Leroy <christophe.leroy(a)csgroup.eu> video: fbdev: chipsfb: use memset_io() instead of memset() Dongliang Mu <mudongliangabcd(a)gmail.com> memory: fsl_ifc: fix leak of irq and nand_irq in fsl_ifc_ctrl_probe Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> soc/tegra: Fix an error handling path in tegra_powergate_power_up() Andreas Kemnade <andreas(a)kemnade.info> arm: dts: omap3-gta04a4: accelerometer irq fix Takashi Iwai <tiwai(a)suse.de> ALSA: hda: Reduce udelay() at SKL+ position reporting Dongliang Mu <mudongliangabcd(a)gmail.com> JFS: fix memleak in jfs_mount Jackie Liu <liuyun01(a)kylinos.cn> MIPS: loongson64: make CPU_LOONGSON64 depends on MIPS_FP_SUPPORT Tong Zhang <ztong0001(a)gmail.com> scsi: dc395: Fix error case unwinding Peter Rosin <peda(a)axentia.se> ARM: dts: at91: tse850: the emac<->phy interface is rmii Selvin Xavier <selvin.xavier(a)broadcom.com> RDMA/bnxt_re: Fix query SRQ failure Alex Bee <knaerzche(a)gmail.com> arm64: dts: rockchip: Fix GPU register width for RK3328 Jackie Liu <liuyun01(a)kylinos.cn> ARM: s3c: irq-s3c24xx: Fix return value check for s3c24xx_init_intc() Junji Wei <weijunji(a)bytedance.com> RDMA/rxe: Fix wrong port_cap_flags Sukadev Bhattiprolu <sukadev(a)linux.ibm.com> ibmvnic: Process crqs after enabling interrupts Andrea Righi <andrea.righi(a)canonical.com> selftests/bpf: Fix fclose/pclose mismatch in test_progs Daniel Jordan <daniel.m.jordan(a)oracle.com> crypto: pcrypt - Delay write to padata->info Russell King (Oracle) <rmk+kernel(a)armlinux.org.uk> net: phylink: avoid mvneta warning when setting pause parameters Shyam Sundar S K <Shyam-sundar.S-k(a)amd.com> net: amd-xgbe: Toggle PLL settings during rate change Benjamin Li <benl(a)squareup.com> wcn36xx: add proper DMA memory barriers in rx path Wang Hai <wanghai38(a)huawei.com> libertas: Fix possible memory leak in probe and disconnect Wang Hai <wanghai38(a)huawei.com> libertas_tf: Fix possible memory leak in probe and disconnect Janis Schoetterl-Glausch <scgl(a)linux.ibm.com> KVM: s390: Fix handle_sske page fault handling Tiezhu Yang <yangtiezhu(a)loongson.cn> samples/kretprobes: Fix return value if register_kretprobe() failed Jon Maxwell <jmaxwell37(a)gmail.com> tcp: don't free a FIN sk_buff in tcp_remove_empty_skb() Mark Rutland <mark.rutland(a)arm.com> irq: mips: avoid nested irq_enter() David Hildenbrand <david(a)redhat.com> s390/gmap: don't unconditionally call pte_unmap_unlock() in __gmap_zap() Tetsuo Handa <penguin-kernel(a)i-love.sakura.ne.jp> smackfs: use netlbl_cfg_cipsov4_del() for deleting cipso_v4_doi Jessica Zhang <jesszhan(a)codeaurora.org> drm/msm: Fix potential NULL dereference in DPU SSPP Kees Cook <keescook(a)chromium.org> clocksource/drivers/timer-ti-dm: Select TIMER_OF Anders Roxell <anders.roxell(a)linaro.org> PM: hibernate: fix sparse warnings Max Gurtovoy <mgurtovoy(a)nvidia.com> nvme-rdma: fix error code in nvme_rdma_setup_ctrl Stefan Agner <stefan(a)agner.ch> phy: micrel: ksz8041nl: do not use power down mode Jonas Dreßler <verdre(a)v0yd.nl> mwifiex: Send DELBA requests according to spec Ziyang Xuan <william.xuanziyang(a)huawei.com> rsi: stop thread firstly in rsi_91x_init() error handling Nathan Chancellor <nathan(a)kernel.org> platform/x86: thinkpad_acpi: Fix bitwise vs. logical warning Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> mmc: mxs-mmc: disable regulator on error and in the remove function Jakub Kicinski <kuba(a)kernel.org> net: stream: don't purge sk_error_queue in sk_stream_kill_queues() Dan Carpenter <dan.carpenter(a)oracle.com> drm/msm: uninitialized variable in msm_gem_import() Sven Eckelmann <seckelmann(a)datto.com> ath10k: fix max antenna gain unit Zev Weiss <zev(a)bewilderbeest.net> hwmon: (pmbus/lm25066) Let compiler determine outer dimension of lm25066_coeff Yang Yingliang <yangyingliang(a)huawei.com> hwmon: Fix possible memleak in __hwmon_device_register() Dan Carpenter <dan.carpenter(a)oracle.com> memstick: jmb38x_ms: use appropriate free function in jmb38x_ms_alloc_host() Arnd Bergmann <arnd(a)arndb.de> memstick: avoid out-of-range warning Tony Lindgren <tony(a)atomide.com> mmc: sdhci-omap: Fix NULL pointer exception if regulator is not configured Dan Carpenter <dan.carpenter(a)oracle.com> b43: fix a lower bounds test Dan Carpenter <dan.carpenter(a)oracle.com> b43legacy: fix a lower bounds test Markus Schneider-Pargmann <msp(a)baylibre.com> hwrng: mtk - Force runtime pm ops for sleep ops Giovanni Cabiddu <giovanni.cabiddu(a)intel.com> crypto: qat - disregard spurious PFVF interrupts Giovanni Cabiddu <giovanni.cabiddu(a)intel.com> crypto: qat - detect PFVF collision after ACK Evgeny Novikov <novikov(a)ispras.ru> media: dvb-frontends: mn88443x: Handle errors of clk_prepare_enable() Linus Lüssing <ll(a)simonwunderlich.de> ath9k: Fix potential interrupt storm on queue reset Colin Ian King <colin.king(a)canonical.com> media: em28xx: Don't use ops->suspend if it is NULL Anel Orazgaliyeva <anelkz(a)amazon.de> cpuidle: Fix kobject memory leaks in error paths Colin Ian King <colin.king(a)canonical.com> media: cx23885: Fix snd_card_free call on null card pointer Kees Cook <keescook(a)chromium.org> media: si470x: Avoid card name truncation Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> media: mtk-vpu: Fix a resource leak in the error handling path of 'mtk_vpu_probe()' Pavel Skripkin <paskripkin(a)gmail.com> media: dvb-usb: fix ununit-value in az6027_rc_query Pavel Skripkin <paskripkin(a)gmail.com> media: em28xx: add missing em28xx_close_extension Arnd Bergmann <arnd(a)arndb.de> drm/amdgpu: fix warning for overflow check Linus Walleij <linus.walleij(a)linaro.org> net: dsa: rtl8366rb: Fix off-by-one bug Waiman Long <longman(a)redhat.com> cgroup: Make rebind_subsystems() disable v2 controllers all at once Desmond Cheong Zhi Xi <desmondcheongzx(a)gmail.com> Bluetooth: fix init and cleanup of sco_conn.timeout_work Sven Schnelle <svens(a)stackframe.org> parisc/kgdb: add kgdb_roundup() to make kgdb work with idle polling Sven Schnelle <svens(a)stackframe.org> parisc/unwind: fix unwinder when CONFIG_64BIT is enabled Helge Deller <deller(a)gmx.de> task_stack: Fix end_of_stack() for architectures with upwards-growing stack Sven Schnelle <svens(a)stackframe.org> parisc: fix warning in flush_tlb_all Vitaly Kuznetsov <vkuznets(a)redhat.com> x86/hyperv: Protect set_hv_tscchange_cb() against getting preempted Yang Yingliang <yangyingliang(a)huawei.com> spi: bcm-qspi: Fix missing clk_disable_unprepare() on error in bcm_qspi_probe() Arnd Bergmann <arnd(a)arndb.de> ARM: 9136/1: ARMv7-M uses BE-8, not BE-32 Stephen Suryaputra <ssuryaextr(a)gmail.com> gre/sit: Don't generate link-local addr if addr_gen_mode is IN6_ADDR_GEN_MODE_NONE Masami Hiramatsu <mhiramat(a)kernel.org> ARM: clang: Do not rely on lr register for stacktrace Tetsuo Handa <penguin-kernel(a)i-love.sakura.ne.jp> smackfs: use __GFP_NOFAIL for smk_cipso_doi() Johannes Berg <johannes.berg(a)intel.com> iwlwifi: mvm: disable RX-diversity in powersave Ye Bin <yebin10(a)huawei.com> PM: hibernate: Get block device exclusively in swsusp_check() Zheyu Ma <zheyuma97(a)gmail.com> mwl8k: Fix use-after-free in mwl8k_fw_state_machine() Kalesh Singh <kaleshsingh(a)google.com> tracing/cfi: Fix cmp_entries_* functions signature mismatch Menglong Dong <imagedong(a)tencent.com> workqueue: make sysfs of unbound kworker cpumask more clever Lasse Collin <lasse.collin(a)tukaani.org> lib/xz: Validate the value before assigning it to an enum variable Lasse Collin <lasse.collin(a)tukaani.org> lib/xz: Avoid overlapping memcpy() with invalid input with in-place decompression Zheyu Ma <zheyuma97(a)gmail.com> memstick: r592: Fix a UAF bug when removing the driver Kees Cook <keescook(a)chromium.org> leaking_addresses: Always print a trailing newline André Almeida <andrealmeid(a)collabora.com> ACPI: battery: Accept charges over the design capacity as full Tuo Li <islituo(a)gmail.com> ath: dfs_pattern_detector: Fix possible null-pointer dereference in channel_detector_create() Steven Rostedt (VMware) <rostedt(a)goodmis.org> tracefs: Have tracefs directories not set OTH permission bits by default Anant Thazhemadam <anant.thazhemadam(a)gmail.com> media: usb: dvd-usb: fix uninit-value bug in dibusb_read_eeprom_byte() Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> ACPICA: Avoid evaluating methods too early during system resume Nadezda Lutovinova <lutovinova(a)ispras.ru> media: rcar-csi2: Add checking to rcsi2_start_receiver() Randy Dunlap <rdunlap(a)infradead.org> ia64: don't do IA64_CMPXCHG_DEBUG without CONFIG_PRINTK Rajat Asthana <rajatasthana4(a)gmail.com> media: mceusb: return without resubmitting URB in case of -EPROTO error. Nadezda Lutovinova <lutovinova(a)ispras.ru> media: s5p-mfc: Add checking to s5p_mfc_probe(). Tuo Li <islituo(a)gmail.com> media: s5p-mfc: fix possible null-pointer dereference in s5p_mfc_probe() Ricardo Ribalda <ribalda(a)chromium.org> media: uvcvideo: Return -EIO for control errors Ricardo Ribalda <ribalda(a)chromium.org> media: uvcvideo: Set capability in s_param Zheyu Ma <zheyuma97(a)gmail.com> media: netup_unidvb: handle interrupt properly according to the firmware Dirk Bender <d.bender(a)phytec.de> media: mt9p031: Fix corrupted frame after restarting stream Jonas Dreßler <verdre(a)v0yd.nl> mwifiex: Properly initialize private structure on interface type changes Jonas Dreßler <verdre(a)v0yd.nl> mwifiex: Run SET_BSS_MODE when changing from P2P to STATION vif-type Peter Zijlstra <peterz(a)infradead.org> x86: Increase exception stack sizes Pawan Gupta <pawan.kumar.gupta(a)linux.intel.com> smackfs: Fix use-after-free in netlbl_catmap_walk() Jakub Kicinski <kuba(a)kernel.org> net: sched: update default qdisc visibility after Tx queue cnt changes Peter Zijlstra <peterz(a)infradead.org> locking/lockdep: Avoid RCU-induced noinstr fail Aleksander Jan Bajkowski <olek2(a)wp.pl> MIPS: lantiq: dma: reset correct number of channel Aleksander Jan Bajkowski <olek2(a)wp.pl> MIPS: lantiq: dma: add small delay after reset Barnabás Pőcze <pobrn(a)protonmail.com> platform/x86: wmi: do not fail if disabling fails Wang ShaoBo <bobo.shaobowang(a)huawei.com> Bluetooth: fix use-after-free error in lock_sock_nested() Takashi Iwai <tiwai(a)suse.de> Bluetooth: sco: Fix lock_sock() blockage by memcpy_from_msg() Hans de Goede <hdegoede(a)redhat.com> drm: panel-orientation-quirks: Add quirk for KD Kurio Smart C15200 2-in-1 Johan Hovold <johan(a)kernel.org> USB: iowarrior: fix control-message timeouts Wang Hai <wanghai38(a)huawei.com> USB: serial: keyspan: fix memleak on probe errors Pekka Korpinen <pekka.korpinen(a)iki.fi> iio: dac: ad5446: Fix ad5622_write() return value Yang Yingliang <yangyingliang(a)huawei.com> pinctrl: core: fix possible memory leak in pinctrl_enable() Zhang Yi <yi.zhang(a)huawei.com> quota: correct error number in free_dqentry() Zhang Yi <yi.zhang(a)huawei.com> quota: check block number when reading the block in quota file Marek Behún <kabel(a)kernel.org> PCI: aardvark: Read all 16-bits from PCIE_MSI_PAYLOAD_REG Marek Behún <kabel(a)kernel.org> PCI: aardvark: Fix return value of MSI domain .alloc() method Pali Rohár <pali(a)kernel.org> PCI: aardvark: Do not unmask unused interrupts Pali Rohár <pali(a)kernel.org> PCI: aardvark: Do not clear status bits of masked interrupts Juergen Gross <jgross(a)suse.com> xen/balloon: add late_initcall_sync() for initial ballooning done Pavel Skripkin <paskripkin(a)gmail.com> ALSA: mixer: fix deadlock in snd_mixer_oss_set_volume Takashi Iwai <tiwai(a)suse.de> ALSA: mixer: oss: Fix racy access to slots Pali Rohár <pali(a)kernel.org> serial: core: Fix initializing and restoring termios speed Xiaoming Ni <nixiaoming(a)huawei.com> powerpc/85xx: Fix oops when mpc85xx_smp_guts_ids node cannot be found Henrik Grimler <henrik(a)grimler.se> power: supply: max17042_battery: use VFSOC for capacity when no rsns Sebastian Krzyszkowiak <sebastian.krzyszkowiak(a)puri.sm> power: supply: max17042_battery: Prevent int underflow in set_soc_threshold Eric W. Biederman <ebiederm(a)xmission.com> signal/mips: Update (_save|_restore)_fp_context to fail with -EFAULT Eric W. Biederman <ebiederm(a)xmission.com> signal: Remove the bogus sigkill_pending in ptrace_stop Alok Prasad <palok(a)marvell.com> RDMA/qedr: Fix NULL deref for query_qp on the GSI QP Marek Vasut <marex(a)denx.de> rsi: Fix module dev_oper_mode parameter description Martin Fuzzey <martin.fuzzey(a)flowbird.group> rsi: fix rate mask set leading to P2P failure Martin Fuzzey <martin.fuzzey(a)flowbird.group> rsi: fix key enabled check causing unwanted encryption for vap_id > 0 Martin Fuzzey <martin.fuzzey(a)flowbird.group> rsi: fix occasional initialisation failure with BT coex Benjamin Li <benl(a)squareup.com> wcn36xx: handle connection loss indication Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> libata: fix checking of DMA state Jonas Dreßler <verdre(a)v0yd.nl> mwifiex: Read a PCI register after writing the TX ring write pointer Loic Poulain <loic.poulain(a)linaro.org> wcn36xx: Fix HT40 capability for 2Ghz band Austin Kim <austin.kim(a)lge.com> evm: mark evm_fixmode as __ro_after_init Johan Hovold <johan(a)kernel.org> rtl8187: fix control-message timeouts Ingmar Klein <ingmar_klein(a)web.de> PCI: Mark Atheros QCA6174 to avoid bus reset Johan Hovold <johan(a)kernel.org> ath10k: fix division by zero in send path Johan Hovold <johan(a)kernel.org> ath10k: fix control-message timeout Johan Hovold <johan(a)kernel.org> ath6kl: fix control-message timeout Johan Hovold <johan(a)kernel.org> ath6kl: fix division by zero in send path Johan Hovold <johan(a)kernel.org> mwifiex: fix division by zero in fw download path Eric Badger <ebadger(a)purestorage.com> EDAC/sb_edac: Fix top-of-high-memory value for Broadwell/Haswell Krzysztof Kozlowski <krzysztof.kozlowski(a)canonical.com> regulator: dt-bindings: samsung,s5m8767: correct s5m8767,pmic-buck-default-dvs-idx property Krzysztof Kozlowski <krzysztof.kozlowski(a)canonical.com> regulator: s5m8767: do not use reset value as DVS voltage if GPIO DVS is disabled Zev Weiss <zev(a)bewilderbeest.net> hwmon: (pmbus/lm25066) Add offset coefficients Masami Hiramatsu <mhiramat(a)kernel.org> ia64: kprobes: Fix to pass correct trampoline address to the handler Anand Jain <anand.jain(a)oracle.com> btrfs: call btrfs_check_rw_degradable only if there is a missing device Filipe Manana <fdmanana(a)suse.com> btrfs: fix lost error handling when replaying directory deletes Li Zhang <zhanglikernel(a)gmail.com> btrfs: clear MISSING device status bit in btrfs_close_one_device Dongli Zhang <dongli.zhang(a)oracle.com> vmxnet3: do not stop tx queues after netif_device_detach() Walter Stoll <walter.stoll(a)duagon.com> watchdog: Fix OMAP watchdog early handling Thomas Perrot <thomas.perrot(a)bootlin.com> spi: spl022: fix Microwire full duplex mode Dongli Zhang <dongli.zhang(a)oracle.com> xen/netfront: stop tx queues during live migration Lorenz Bauer <lmb(a)cloudflare.com> bpf: Prevent increasing bpf_jit_limit above max Bryant Mairs <bryant(a)mai.rs> drm: panel-orientation-quirks: Add quirk for Aya Neo 2021 Randy Dunlap <rdunlap(a)infradead.org> mmc: winbond: don't build on M68K Arnd Bergmann <arnd(a)arndb.de> hyperv/vmbus: include linux/bitops.h Erik Ekman <erik(a)kryo.se> sfc: Don't use netif_info before net_device setup Zheyu Ma <zheyuma97(a)gmail.com> cavium: Fix return values of the probe function Dmitry Bogdanov <d.bogdanov(a)yadro.com> scsi: qla2xxx: Fix unmap of already freed sgl Zheyu Ma <zheyuma97(a)gmail.com> cavium: Return negative value when pci_alloc_irq_vectors() fails Sean Christopherson <seanjc(a)google.com> x86/irq: Ensure PI wakeup handler is unregistered before module unload Tom Lendacky <thomas.lendacky(a)amd.com> x86/sme: Use #define USE_EARLY_PGTABLE_L5 in mem_encrypt_identity.c Miklos Szeredi <mszeredi(a)redhat.com> fuse: fix page stealing Takashi Iwai <tiwai(a)suse.de> ALSA: timer: Unconditionally unlink slave instances, too Wang Wensheng <wangwensheng4(a)huawei.com> ALSA: timer: Fix use-after-free problem Austin Kim <austin.kim(a)lge.com> ALSA: synth: missing check for possible NULL after the call to kstrdup Alexander Tsoy <alexander(a)tsoy.me> ALSA: usb-audio: Add registration quirk for JBL Quantum 400 Johan Hovold <johan(a)kernel.org> ALSA: line6: fix control and interrupt message timeouts Johan Hovold <johan(a)kernel.org> ALSA: 6fire: fix control and bulk message timeouts Johan Hovold <johan(a)kernel.org> ALSA: ua101: fix division by zero at probe Tim Crawford <tcrawford(a)system76.com> ALSA: hda/realtek: Add quirk for Clevo PC70HS Sean Young <sean(a)mess.org> media: ir-kbd-i2c: improve responsiveness of hauppauge zilog receivers Sean Young <sean(a)mess.org> media: ite-cir: IR receiver stop working after receive overflow Tang Bin <tangbin(a)cmss.chinamobile.com> crypto: s5p-sss - Add error handling in s5p_aes_probe() jing yangyang <cgel.zte(a)gmail.com> firmware/psci: fix application of sizeof to pointer Dan Carpenter <dan.carpenter(a)oracle.com> tpm: Check for integer overflow in tpm2_map_response_body() Helge Deller <deller(a)gmx.de> parisc: Fix ptrace check on syscall return Christian Löhle <CLoehle(a)hyperstone.com> mmc: dw_mmc: Dont wait for DRTO on Write RSP error Jan Kara <jack(a)suse.cz> ocfs2: fix data corruption on truncate Damien Le Moal <damien.lemoal(a)opensource.wdc.com> libata: fix read log timeout value Takashi Iwai <tiwai(a)suse.de> Input: i8042 - Add quirk for Fujitsu Lifebook T725 Phoenix Huang <phoenix(a)emc.com.tw> Input: elantench - fix misreporting trackpoint coordinates Todd Kjos <tkjos(a)google.com> binder: use cred instead of task for selinux checks Todd Kjos <tkjos(a)google.com> binder: use euid from cred instead of using task Mathias Nyman <mathias.nyman(a)linux.intel.com> xhci: Fix USB 3.1 enumeration issues by increasing roothub power-on-good delay ------------- Diffstat: Documentation/admin-guide/kernel-parameters.txt | 7 ++ .../bindings/regulator/samsung,s5m8767.txt | 23 +++--- Makefile | 4 +- arch/arm/Makefile | 22 ++--- arch/arm/boot/dts/at91-tse850-3.dts | 2 +- arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi | 2 +- arch/arm/boot/dts/omap3-gta04.dtsi | 2 +- arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi | 2 +- arch/arm/kernel/stacktrace.c | 3 +- arch/arm/mm/Kconfig | 2 +- arch/arm/mm/mmu.c | 4 +- arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 16 ++-- arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 16 ++-- arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 4 +- arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +- .../boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 4 +- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 4 +- arch/arm64/include/asm/pgtable.h | 12 ++- arch/hexagon/lib/io.c | 4 + arch/ia64/Kconfig.debug | 2 +- arch/ia64/kernel/kprobes.c | 9 ++- arch/m68k/Kconfig.machine | 1 + arch/mips/Kconfig | 4 + arch/mips/bcm63xx/clk.c | 6 ++ arch/mips/generic/yamon-dt.c | 2 +- arch/mips/include/asm/mips-cm.h | 12 +-- arch/mips/kernel/mips-cm.c | 21 +++-- arch/mips/kernel/r2300_fpu.S | 4 +- arch/mips/kernel/syscall.c | 9 --- arch/mips/lantiq/clk.c | 6 ++ arch/mips/lantiq/xway/dma.c | 14 ++-- arch/mips/sni/time.c | 4 +- arch/parisc/kernel/entry.S | 4 +- arch/parisc/kernel/smp.c | 19 ++++- arch/parisc/kernel/unwind.c | 21 +++-- arch/parisc/mm/init.c | 4 +- arch/powerpc/boot/dts/charon.dts | 2 +- arch/powerpc/boot/dts/digsy_mtc.dts | 2 +- arch/powerpc/boot/dts/lite5200.dts | 2 +- arch/powerpc/boot/dts/lite5200b.dts | 2 +- arch/powerpc/boot/dts/media5200.dts | 2 +- arch/powerpc/boot/dts/mpc5200b.dtsi | 2 +- arch/powerpc/boot/dts/o2d.dts | 2 +- arch/powerpc/boot/dts/o2d.dtsi | 2 +- arch/powerpc/boot/dts/o2dnt2.dts | 2 +- arch/powerpc/boot/dts/o3dnt.dts | 2 +- arch/powerpc/boot/dts/pcm032.dts | 2 +- arch/powerpc/boot/dts/tqm5200.dts | 2 +- arch/powerpc/include/asm/code-patching.h | 1 + arch/powerpc/include/asm/security_features.h | 5 ++ arch/powerpc/kernel/security.c | 5 ++ arch/powerpc/lib/code-patching.c | 7 +- arch/powerpc/net/bpf_jit.h | 33 +++++--- arch/powerpc/net/bpf_jit64.h | 8 +- arch/powerpc/net/bpf_jit_comp64.c | 93 ++++++++++++++++++---- arch/powerpc/platforms/85xx/mpc85xx_pm_ops.c | 3 +- arch/powerpc/sysdev/dcr-low.S | 2 +- arch/s390/kvm/priv.c | 2 + arch/s390/mm/gmap.c | 5 +- arch/sh/Kconfig.debug | 1 + arch/sh/include/asm/sfp-machine.h | 8 ++ arch/sh/kernel/cpu/sh4a/smp-shx3.c | 5 +- arch/x86/events/intel/uncore_snbep.c | 4 + arch/x86/hyperv/hv_init.c | 8 +- arch/x86/include/asm/page_64_types.h | 2 +- arch/x86/kernel/cpu/amd.c | 2 + arch/x86/kernel/cpu/common.c | 44 ++++++++-- arch/x86/kernel/cpu/cpu.h | 1 + arch/x86/kernel/irq.c | 4 +- arch/x86/mm/mem_encrypt_identity.c | 9 +++ crypto/pcrypt.c | 12 ++- drivers/acpi/acpica/acglobal.h | 2 + drivers/acpi/acpica/hwesleep.c | 8 +- drivers/acpi/acpica/hwsleep.c | 11 +-- drivers/acpi/acpica/hwxfsleep.c | 7 ++ drivers/acpi/battery.c | 2 +- drivers/acpi/pmic/intel_pmic.c | 51 ++++++------ drivers/android/binder.c | 20 +++-- drivers/ata/libata-core.c | 2 +- drivers/ata/libata-eh.c | 8 ++ drivers/auxdisplay/ht16k33.c | 66 ++++++++------- drivers/auxdisplay/img-ascii-lcd.c | 10 +++ drivers/base/firmware_loader/main.c | 13 +-- drivers/block/zram/zram_drv.c | 2 +- drivers/char/hw_random/mtk-rng.c | 9 ++- drivers/char/tpm/tpm2-space.c | 3 + drivers/clocksource/Kconfig | 1 + drivers/cpuidle/sysfs.c | 5 +- drivers/crypto/qat/qat_common/adf_pf2vf_msg.c | 13 +++ drivers/crypto/qat/qat_common/adf_vf_isr.c | 6 ++ drivers/crypto/s5p-sss.c | 2 + drivers/dma/at_xdmac.c | 2 +- drivers/dma/dmaengine.h | 2 +- drivers/edac/sb_edac.c | 2 +- drivers/firmware/psci_checker.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 1 + drivers/gpu/drm/drm_panel_orientation_quirks.c | 13 +++ drivers/gpu/drm/drm_plane_helper.c | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 8 +- drivers/gpu/drm/msm/msm_gem.c | 4 +- .../gpu/drm/nouveau/nvkm/engine/disp/hdmigv100.c | 1 - drivers/gpu/drm/udl/udl_connector.c | 2 +- drivers/hv/hyperv_vmbus.h | 1 + drivers/hwmon/hwmon.c | 6 +- drivers/hwmon/pmbus/lm25066.c | 25 +++++- drivers/i2c/busses/i2c-xlr.c | 6 +- drivers/iio/dac/ad5446.c | 9 ++- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 3 +- drivers/infiniband/hw/mlx4/qp.c | 4 +- drivers/infiniband/hw/qedr/verbs.c | 15 ++-- drivers/infiniband/sw/rxe/rxe_param.h | 2 +- drivers/input/mouse/elantech.c | 13 +++ drivers/input/serio/i8042-x86ia64io.h | 14 ++++ drivers/irqchip/irq-bcm6345-l1.c | 2 +- drivers/irqchip/irq-s3c24xx.c | 22 ++++- drivers/media/dvb-frontends/mn88443x.c | 18 ++++- drivers/media/i2c/ir-kbd-i2c.c | 1 + drivers/media/i2c/mt9p031.c | 28 ++++++- drivers/media/pci/cx23885/cx23885-alsa.c | 3 +- drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 27 ++++--- drivers/media/platform/mtk-vpu/mtk_vpu.c | 5 +- drivers/media/platform/rcar-vin/rcar-csi2.c | 2 + drivers/media/platform/s5p-mfc/s5p_mfc.c | 6 +- drivers/media/radio/si470x/radio-si470x-i2c.c | 2 +- drivers/media/radio/si470x/radio-si470x-usb.c | 2 +- drivers/media/rc/ite-cir.c | 2 +- drivers/media/rc/mceusb.c | 1 + drivers/media/usb/dvb-usb/az6027.c | 1 + drivers/media/usb/dvb-usb/dibusb-common.c | 2 +- drivers/media/usb/em28xx/em28xx-cards.c | 5 +- drivers/media/usb/em28xx/em28xx-core.c | 5 +- drivers/media/usb/uvc/uvc_v4l2.c | 7 +- drivers/media/usb/uvc/uvc_video.c | 5 ++ drivers/memory/fsl_ifc.c | 13 ++- drivers/memstick/core/ms_block.c | 2 +- drivers/memstick/host/jmb38x_ms.c | 2 +- drivers/memstick/host/r592.c | 8 +- drivers/mmc/host/Kconfig | 2 +- drivers/mmc/host/dw_mmc.c | 3 +- drivers/mmc/host/mxs-mmc.c | 10 +++ drivers/mmc/host/sdhci-omap.c | 3 +- drivers/mtd/spi-nor/hisi-sfc.c | 1 - drivers/net/bonding/bond_sysfs_slave.c | 36 +++------ drivers/net/dsa/rtl8366rb.c | 2 +- drivers/net/ethernet/amd/xgbe/xgbe-common.h | 8 ++ drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 20 ++++- .../net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h | 4 +- drivers/net/ethernet/cavium/thunder/nic_main.c | 2 +- drivers/net/ethernet/cavium/thunder/nicvf_main.c | 4 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 7 +- drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 2 + drivers/net/ethernet/ibm/ibmvnic.c | 3 + drivers/net/ethernet/intel/i40e/i40e.h | 1 + drivers/net/ethernet/intel/i40e/i40e_main.c | 45 +++++++---- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 53 +++--------- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 5 +- drivers/net/ethernet/sfc/ptp.c | 4 +- drivers/net/ethernet/sfc/siena_sriov.c | 2 +- drivers/net/ethernet/ti/davinci_emac.c | 16 +++- drivers/net/phy/micrel.c | 5 +- drivers/net/phy/phylink.c | 2 +- drivers/net/tun.c | 5 ++ drivers/net/vmxnet3/vmxnet3_drv.c | 1 - drivers/net/wireless/ath/ath10k/mac.c | 6 +- drivers/net/wireless/ath/ath10k/usb.c | 7 +- drivers/net/wireless/ath/ath10k/wmi.h | 3 + drivers/net/wireless/ath/ath6kl/usb.c | 7 +- drivers/net/wireless/ath/ath9k/main.c | 4 +- drivers/net/wireless/ath/dfs_pattern_detector.c | 10 ++- drivers/net/wireless/ath/wcn36xx/dxe.c | 12 ++- drivers/net/wireless/ath/wcn36xx/main.c | 4 +- drivers/net/wireless/ath/wcn36xx/smd.c | 44 +++++++--- drivers/net/wireless/broadcom/b43/phy_g.c | 2 +- drivers/net/wireless/broadcom/b43legacy/radio.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 3 + drivers/net/wireless/marvell/libertas/if_usb.c | 2 + drivers/net/wireless/marvell/libertas_tf/if_usb.c | 2 + drivers/net/wireless/marvell/mwifiex/11n.c | 5 +- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 32 +++----- drivers/net/wireless/marvell/mwifiex/pcie.c | 8 ++ drivers/net/wireless/marvell/mwifiex/usb.c | 16 ++++ drivers/net/wireless/marvell/mwl8k.c | 2 +- .../net/wireless/realtek/rtl818x/rtl8187/rtl8225.c | 14 ++-- drivers/net/wireless/rsi/rsi_91x_core.c | 2 + drivers/net/wireless/rsi/rsi_91x_hal.c | 10 ++- drivers/net/wireless/rsi/rsi_91x_mac80211.c | 74 +++++------------ drivers/net/wireless/rsi/rsi_91x_main.c | 17 +++- drivers/net/wireless/rsi/rsi_91x_mgmt.c | 24 ++++-- drivers/net/wireless/rsi/rsi_91x_sdio.c | 5 +- drivers/net/wireless/rsi/rsi_91x_usb.c | 5 +- drivers/net/wireless/rsi/rsi_hal.h | 11 +++ drivers/net/wireless/rsi/rsi_main.h | 15 +++- drivers/net/xen-netfront.c | 8 ++ drivers/nfc/pn533/pn533.c | 6 +- drivers/nvme/host/rdma.c | 2 + drivers/pci/controller/pci-aardvark.c | 23 +++--- drivers/pci/msi.c | 27 ++++--- drivers/pci/quirks.c | 7 ++ drivers/phy/qualcomm/phy-qcom-qusb2.c | 16 ++-- drivers/pinctrl/core.c | 2 + drivers/platform/x86/hp_accel.c | 2 + drivers/platform/x86/thinkpad_acpi.c | 2 +- drivers/platform/x86/wmi.c | 9 ++- drivers/power/supply/bq27xxx_battery_i2c.c | 3 +- drivers/power/supply/max17042_battery.c | 8 +- drivers/power/supply/rt5033_battery.c | 2 +- drivers/regulator/s5m8767.c | 21 +++-- drivers/s390/char/tape_std.c | 3 +- drivers/s390/cio/css.c | 4 +- drivers/scsi/advansys.c | 4 +- drivers/scsi/csiostor/csio_lnode.c | 2 +- drivers/scsi/dc395x.c | 1 + drivers/scsi/lpfc/lpfc_sli.c | 1 + drivers/scsi/qla2xxx/qla_gbl.h | 2 - drivers/scsi/qla2xxx/qla_init.c | 4 +- drivers/scsi/qla2xxx/qla_mr.c | 23 ------ drivers/scsi/qla2xxx/qla_os.c | 27 +------ drivers/scsi/qla2xxx/qla_target.c | 14 ++-- drivers/sh/maple/maple.c | 5 +- drivers/soc/tegra/pmc.c | 2 +- drivers/spi/spi-bcm-qspi.c | 5 +- drivers/spi/spi-pl022.c | 5 +- drivers/staging/erofs/unzip_pagevec.h | 14 ++-- drivers/staging/erofs/unzip_vle.c | 19 +++-- drivers/target/target_core_alua.c | 1 - drivers/target/target_core_device.c | 2 + drivers/target/target_core_internal.h | 1 + drivers/target/target_core_transport.c | 76 +++++++++++++----- drivers/tty/serial/8250/8250_dw.c | 2 +- drivers/tty/serial/serial_core.c | 16 +++- drivers/tty/serial/xilinx_uartps.c | 3 +- drivers/tty/tty_buffer.c | 3 + drivers/usb/chipidea/core.c | 19 +++-- drivers/usb/gadget/legacy/hid.c | 4 +- drivers/usb/host/max3421-hcd.c | 25 ++---- drivers/usb/host/ohci-tmio.c | 2 +- drivers/usb/host/xhci-hub.c | 3 +- drivers/usb/misc/iowarrior.c | 8 +- drivers/usb/musb/tusb6010.c | 5 ++ drivers/usb/serial/keyspan.c | 15 ++-- drivers/usb/typec/tps6598x.c | 2 +- drivers/video/backlight/backlight.c | 6 -- drivers/video/backlight/gpio_backlight.c | 24 +++++- drivers/video/console/sticon.c | 12 +-- drivers/video/fbdev/chipsfb.c | 2 +- drivers/watchdog/Kconfig | 2 +- drivers/watchdog/f71808e_wdt.c | 4 +- drivers/watchdog/omap_wdt.c | 6 +- drivers/xen/balloon.c | 86 ++++++++++++++------ drivers/xen/xen-pciback/conf_space_capability.c | 2 +- fs/btrfs/async-thread.c | 14 ++++ fs/btrfs/disk-io.c | 3 +- fs/btrfs/tree-log.c | 4 +- fs/btrfs/volumes.c | 4 +- fs/ext4/super.c | 9 +-- fs/f2fs/inode.c | 2 +- fs/f2fs/namei.c | 2 +- fs/fuse/dev.c | 14 +++- fs/fuse/file.c | 7 +- fs/jfs/jfs_mount.c | 51 +++++------- fs/nfs/flexfilelayout/flexfilelayoutdev.c | 4 +- fs/nfs/pnfs_nfs.c | 4 +- fs/nfs/write.c | 17 +--- fs/ocfs2/file.c | 8 +- fs/orangefs/dcache.c | 4 +- fs/quota/quota_tree.c | 15 ++++ fs/tracefs/inode.c | 3 +- fs/udf/dir.c | 32 +++++++- fs/udf/namei.c | 3 + fs/udf/super.c | 2 + include/asm-generic/tlb.h | 6 ++ include/linux/console.h | 2 + include/linux/filter.h | 1 + include/linux/libata.h | 2 +- include/linux/lsm_hooks.h | 28 +++---- include/linux/pci.h | 2 + include/linux/rpmsg.h | 2 +- include/linux/sched/task_stack.h | 4 + include/linux/security.h | 28 +++---- include/linux/virtio_net.h | 7 +- include/net/llc.h | 4 +- include/net/sch_generic.h | 4 + include/rdma/rdma_netlink.h | 2 +- include/target/target_core_base.h | 6 +- include/trace/events/f2fs.h | 12 +-- include/uapi/linux/pci_regs.h | 6 ++ ipc/util.c | 6 +- kernel/bpf/core.c | 4 +- kernel/cgroup/cgroup.c | 31 +++++++- kernel/events/core.c | 10 +-- kernel/locking/lockdep.c | 2 +- kernel/power/swap.c | 7 +- kernel/sched/core.c | 3 + kernel/signal.c | 18 +---- kernel/trace/tracing_map.c | 40 ++++++---- kernel/workqueue.c | 15 +++- lib/decompress_unxz.c | 2 +- lib/xz/xz_dec_lzma2.c | 21 ++++- lib/xz/xz_dec_stream.c | 6 +- mm/hugetlb.c | 23 +++++- mm/oom_kill.c | 23 +++--- mm/slab.h | 2 +- mm/zsmalloc.c | 7 +- net/8021q/vlan.c | 3 - net/8021q/vlan_dev.c | 3 + net/9p/client.c | 2 + net/batman-adv/fragmentation.c | 26 +++--- net/batman-adv/hard-interface.c | 3 + net/batman-adv/multicast.c | 31 ++++++++ net/batman-adv/multicast.h | 15 ++++ net/batman-adv/soft-interface.c | 5 +- net/bluetooth/l2cap_sock.c | 10 ++- net/bluetooth/sco.c | 33 +++++--- net/core/dev.c | 2 + net/core/stream.c | 3 - net/core/sysctl_net_core.c | 2 +- net/ipv4/tcp.c | 2 +- net/ipv6/addrconf.c | 3 + net/netfilter/nfnetlink_queue.c | 2 +- net/nfc/core.c | 32 ++++---- net/nfc/nci/core.c | 11 ++- net/sched/sch_generic.c | 9 +++ net/sched/sch_mq.c | 24 ++++++ net/sched/sch_mqprio.c | 23 ++++++ net/vmw_vsock/af_vsock.c | 2 + net/wireless/util.c | 1 + samples/kprobes/kretprobe_example.c | 2 +- scripts/leaking_addresses.pl | 3 +- security/Kconfig | 3 + security/apparmor/label.c | 4 +- security/integrity/evm/evm_main.c | 2 +- security/security.c | 14 ++-- security/selinux/hooks.c | 36 ++++----- security/smack/smackfs.c | 11 +-- sound/core/Makefile | 2 + sound/core/oss/mixer_oss.c | 43 +++++++--- sound/core/timer.c | 17 ++-- sound/isa/Kconfig | 2 +- sound/isa/gus/gus_dma.c | 2 + sound/pci/Kconfig | 1 + sound/pci/hda/hda_intel.c | 28 +++++-- sound/pci/hda/patch_realtek.c | 1 + sound/soc/codecs/cs42l42.c | 9 ++- sound/soc/codecs/nau8824.c | 40 ++++++++++ sound/soc/soc-dapm.c | 29 +++++-- sound/synth/emux/emux.c | 2 +- sound/usb/6fire/comm.c | 2 +- sound/usb/6fire/firmware.c | 6 +- sound/usb/line6/driver.c | 14 ++-- sound/usb/line6/driver.h | 2 +- sound/usb/line6/podhd.c | 6 +- sound/usb/line6/toneport.c | 2 +- sound/usb/misc/ua101.c | 4 +- sound/usb/quirks.c | 1 + tools/perf/bench/sched-messaging.c | 4 + tools/testing/selftests/bpf/test_progs.c | 4 +- 359 files changed, 2225 insertions(+), 1173 deletions(-)

2 years, 5 months

6
339
0 0

[PATCH AUTOSEL 5.10 01/28] gfs2: release iopen glock early in evict

by Sasha Levin

From: Bob Peterson <rpeterso(a)redhat.com> [ Upstream commit 49462e2be119d38c5eb5759d0d1b712df3a41239 ] Before this patch, evict would clear the iopen glock's gl_object after releasing the inode glock. In the meantime, another process could reuse the same block and thus glocks for a new inode. It would lock the inode glock (exclusively), and then the iopen glock (shared). The shared locking mode doesn't provide any ordering against the evict, so by the time the iopen glock is reused, evict may not have gotten to setting gl_object to NULL. Fix that by releasing the iopen glock before the inode glock in gfs2_evict_inode. Signed-off-by: Bob Peterson <rpeterso(a)redhat.com>gl_object Signed-off-by: Andreas Gruenbacher <agruenba(a)redhat.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- fs/gfs2/super.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index 6a355e1347d7f..d2b7ecbd1b150 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c @@ -1438,13 +1438,6 @@ static void gfs2_evict_inode(struct inode *inode) gfs2_ordered_del_inode(ip); clear_inode(inode); gfs2_dir_hash_inval(ip); - if (ip->i_gl) { - glock_clear_object(ip->i_gl, ip); - wait_on_bit_io(&ip->i_flags, GIF_GLOP_PENDING, TASK_UNINTERRUPTIBLE); - gfs2_glock_add_to_lru(ip->i_gl); - gfs2_glock_put_eventually(ip->i_gl); - ip->i_gl = NULL; - } if (gfs2_holder_initialized(&ip->i_iopen_gh)) { struct gfs2_glock *gl = ip->i_iopen_gh.gh_gl; @@ -1457,6 +1450,13 @@ static void gfs2_evict_inode(struct inode *inode) gfs2_holder_uninit(&ip->i_iopen_gh); gfs2_glock_put_eventually(gl); } + if (ip->i_gl) { + glock_clear_object(ip->i_gl, ip); + wait_on_bit_io(&ip->i_flags, GIF_GLOP_PENDING, TASK_UNINTERRUPTIBLE); + gfs2_glock_add_to_lru(ip->i_gl); + gfs2_glock_put_eventually(ip->i_gl); + ip->i_gl = NULL; + } } static struct inode *gfs2_alloc_inode(struct super_block *sb) -- 2.33.0

2 years, 5 months

2
30
0 0

[PATCH AUTOSEL 5.15 01/39] gfs2: release iopen glock early in evict

by Sasha Levin

From: Bob Peterson <rpeterso(a)redhat.com> [ Upstream commit 49462e2be119d38c5eb5759d0d1b712df3a41239 ] Before this patch, evict would clear the iopen glock's gl_object after releasing the inode glock. In the meantime, another process could reuse the same block and thus glocks for a new inode. It would lock the inode glock (exclusively), and then the iopen glock (shared). The shared locking mode doesn't provide any ordering against the evict, so by the time the iopen glock is reused, evict may not have gotten to setting gl_object to NULL. Fix that by releasing the iopen glock before the inode glock in gfs2_evict_inode. Signed-off-by: Bob Peterson <rpeterso(a)redhat.com>gl_object Signed-off-by: Andreas Gruenbacher <agruenba(a)redhat.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- fs/gfs2/super.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index 6e00d15ef0a82..cc51b5f5f52d8 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c @@ -1402,13 +1402,6 @@ static void gfs2_evict_inode(struct inode *inode) gfs2_ordered_del_inode(ip); clear_inode(inode); gfs2_dir_hash_inval(ip); - if (ip->i_gl) { - glock_clear_object(ip->i_gl, ip); - wait_on_bit_io(&ip->i_flags, GIF_GLOP_PENDING, TASK_UNINTERRUPTIBLE); - gfs2_glock_add_to_lru(ip->i_gl); - gfs2_glock_put_eventually(ip->i_gl); - ip->i_gl = NULL; - } if (gfs2_holder_initialized(&ip->i_iopen_gh)) { struct gfs2_glock *gl = ip->i_iopen_gh.gh_gl; @@ -1421,6 +1414,13 @@ static void gfs2_evict_inode(struct inode *inode) gfs2_holder_uninit(&ip->i_iopen_gh); gfs2_glock_put_eventually(gl); } + if (ip->i_gl) { + glock_clear_object(ip->i_gl, ip); + wait_on_bit_io(&ip->i_flags, GIF_GLOP_PENDING, TASK_UNINTERRUPTIBLE); + gfs2_glock_add_to_lru(ip->i_gl); + gfs2_glock_put_eventually(ip->i_gl); + ip->i_gl = NULL; + } } static struct inode *gfs2_alloc_inode(struct super_block *sb) -- 2.33.0

2 years, 5 months

4
44
0 0

[PATCH v2] x86/sme: Explicitly map new EFI memmap table as encrypted

by Tom Lendacky

Reserving memory using efi_mem_reserve() calls into the x86 efi_arch_mem_reserve() function. This function will insert a new EFI memory descriptor into the EFI memory map representing the area of memory to be reserved and marking it as EFI runtime memory. As part of adding this new entry, a new EFI memory map is allocated and mapped. The mapping is where a problem can occur. This new EFI memory map is mapped using early_memremap(). If the allocated memory comes from an area that is marked as EFI_BOOT_SERVICES_DATA memory in the current EFI memory map, then it will be mapped unencrypted (see memremap_is_efi_data() and the call to efi_mem_type()). However, during replacement of the old EFI memory map with the new EFI memory map, efi_mem_type() is disabled, resulting in the new EFI memory map always being mapped encrypted in efi.memmap. This will cause a kernel crash later in the boot. Since it is known that the new EFI memory map will always be mapped encrypted when efi_memmap_install() is called, explicitly map the new EFI memory map as encrypted (using early_memremap_prot()) when inserting the new memory map entry. Cc: <stable(a)vger.kernel.org> # 4.14.x Fixes: 8f716c9b5feb ("x86/mm: Add support to access boot related data in the clear") Acked-by: Ard Biesheuvel <ardb(a)kernel.org> Signed-off-by: Tom Lendacky <thomas.lendacky(a)amd.com> --- Changes for v2: - Update/expand commit message to (hopefully) make it easier to read and understand - Add a comment around the use of the early_memremap_prot() call --- arch/x86/platform/efi/quirks.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c index b15ebfe40a73..14f8f20d727a 100644 --- a/arch/x86/platform/efi/quirks.c +++ b/arch/x86/platform/efi/quirks.c @@ -277,7 +277,19 @@ void __init efi_arch_mem_reserve(phys_addr_t addr, u64 size) return; } - new = early_memremap(data.phys_map, data.size); + /* + * When SME is active, early_memremap() can map the memory unencrypted + * if the allocation came from EFI_BOOT_SERVICES_DATA (see + * memremap_is_efi_data() and the call to efi_mem_type()). However, + * when efi_memmap_install() is called to replace the memory map, + * efi_mem_type() is "disabled" and so the memory will always be mapped + * encrypted. To avoid this possible mismatch between the mappings, + * always map the newly allocated memmap memory as encrypted. + * + * When SME is not active, this behaves just like early_memremap(). + */ + new = early_memremap_prot(data.phys_map, data.size, + pgprot_val(pgprot_encrypted(FIXMAP_PAGE_NORMAL))); if (!new) { pr_err("Failed to map new boot services memmap\n"); return; -- 2.33.1

2 years, 5 months

3
9
0 0

Re: [PATCH v2 2/2] powerpc:85xx: fix timebase sync issue when CONFIG_HOTPLUG_CPU=n

by Martin Kennedy

Hi there, I have bisected OpenWrt master, and then the Linux kernel down to this change, to confirm that this change causes a kernel panic on my P1020RDB-based, dual-core Aerohive HiveAP 370, at initialization of the second CPU: : [ 0.000000] Linux version 5.10.80 (labby@lobon) (powerpc-openwrt-linux-musl-gcc (OpenWrt GCC 11.2.0 r18111+1-ebb6f9287e) 11.2.0, GNU ld (GNU Binutils) 2.37) #0 SMP Thu Nov 25 02:49:35 2021 [ 0.000000] Using P1020 RDB machine description : [ 0.627233] smp: Bringing up secondary CPUs ... [ 0.681659] kernel tried to execute user page (0) - exploit attempt? (uid: 0) [ 0.766618] BUG: Unable to handle kernel instruction fetch (NULL pointer?) [ 0.848899] Faulting instruction address: 0x00000000 [ 0.908273] Oops: Kernel access of bad area, sig: 11 [#1] [ 0.972851] BE PAGE_SIZE=4K SMP NR_CPUS=2 P1020 RDB [ 1.031179] Modules linked in: [ 1.067640] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.10.80 #0 [ 1.139507] NIP: 00000000 LR: c0021d2c CTR: 00000000 [ 1.199921] REGS: c1051cf0 TRAP: 0400 Not tainted (5.10.80) [ 1.269705] MSR: 00021000 <CE,ME> CR: 84020202 XER: 00000000 [ 1.340534] [ 1.340534] GPR00: c0021cb8 c1051da8 c1048000 00000001 00029000 00000000 00000001 00000000 [ 1.340534] GPR08: 00000001 00000000 c08b0000 00000040 22000208 00000000 c00032c4 00000000 [ 1.340534] GPR16: 00000000 00000000 00000000 00000000 00000000 00000000 00029000 00000001 [ 1.340534] GPR24: 1ffff240 20000000 dffff240 c080a1f4 00000001 c08ae0a8 00000001 dffff240 [ 1.758220] NIP [00000000] 0x0 [ 1.794688] LR [c0021d2c] smp_85xx_kick_cpu+0xe8/0x568 [ 1.856126] Call Trace: [ 1.885295] [c1051da8] [c0021cb8] smp_85xx_kick_cpu+0x74/0x568 (unreliable) [ 1.968633] [c1051de8] [c0011460] __cpu_up+0xc0/0x228 [ 2.029038] [c1051e18] [c0031bbc] bringup_cpu+0x30/0x224 [ 2.092572] [c1051e48] [c0031f3c] cpu_up.constprop.0+0x180/0x33c [ 2.164443] [c1051e88] [c00322e8] bringup_nonboot_cpus+0x88/0xc8 [ 2.236326] [c1051eb8] [c07e67bc] smp_init+0x30/0x78 [ 2.295698] [c1051ed8] [c07d9e28] kernel_init_freeable+0x118/0x2a8 [ 2.369641] [c1051f18] [c00032d8] kernel_init+0x14/0x124 [ 2.433176] [c1051f38] [c0010278] ret_from_kernel_thread+0x14/0x1c [ 2.507125] Instruction dump: [ 2.542541] XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX [ 2.635242] XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX [ 2.727952] ---[ end trace 9b796a4bafb6bc14 ]--- [ 2.783149] [ 3.800879] Kernel panic - not syncing: Fatal exception [ 3.862353] Rebooting in 1 seconds.. [ 5.905097] System Halted, OK to turn off power Without this patch, the kernel no longer panics: [ 0.627232] smp: Bringing up secondary CPUs ... [ 0.681857] smp: Brought up 1 node, 2 CPUs Here is the kernel configuration for this built kernel: https://git.openwrt.org/?p=openwrt/openwrt.git;a=blob_plain;f=target/linux/… In case a force-push is needed for the source repository (https://github.com/Hurricos/openwrt/commit/ad19bdfc77d60ee1c52b41bb4345fdd0…), here is the device tree for this board: https://paste.c-net.org/TrousersSliced Martin

2 years, 5 months

3
5
0 0

[PATCH] media: uvcvideo: fix division by zero at stream start

by Johan Hovold

Add the missing bulk-endpoint max-packet sanity check to probe() to avoid division by zero in uvc_alloc_urb_buffers() in case a malicious device has broken descriptors (or when doing descriptor fuzz testing). Note that USB core will reject URBs submitted for endpoints with zero wMaxPacketSize but that drivers doing packet-size calculations still need to handle this (cf. commit 2548288b4fb0 ("USB: Fix: Don't skip endpoint descriptors with maxpacket=0")). Fixes: c0efd232929c ("V4L/DVB (8145a): USB Video Class driver") Cc: stable(a)vger.kernel.org # 2.6.26 Signed-off-by: Johan Hovold <johan(a)kernel.org> --- drivers/media/usb/uvc/uvc_video.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index e16464606b14..85ac5c1081b6 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -1958,6 +1958,10 @@ static int uvc_video_start_transfer(struct uvc_streaming *stream, if (ep == NULL) return -EIO; + /* Reject broken descriptors. */ + if (usb_endpoint_maxp(&ep->desc) == 0) + return -EIO; + ret = uvc_init_video_bulk(stream, ep, gfp_flags); } -- 2.32.0

2 years, 5 months

3
8
0 0

[PATCH] clk: qcom: regmap-mux: fix parent clock lookup

by Dmitry Baryshkov

The function mux_get_parent() uses qcom_find_src_index() to find the parent clock index, which is incorrect: qcom_find_src_index() uses src enum for the lookup, while mux_get_parent() should use cfg field (which corresponds to the register value). Add qcom_find_cfg_index() function doing this kind of lookup and use it for mux parent lookup. Fixes: df964016490b ("clk: qcom: add parent map for regmap mux") Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> --- drivers/clk/qcom/clk-regmap-mux.c | 2 +- drivers/clk/qcom/common.c | 12 ++++++++++++ drivers/clk/qcom/common.h | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/clk/qcom/clk-regmap-mux.c b/drivers/clk/qcom/clk-regmap-mux.c index b2d00b451963..45d9cca28064 100644 --- a/drivers/clk/qcom/clk-regmap-mux.c +++ b/drivers/clk/qcom/clk-regmap-mux.c @@ -28,7 +28,7 @@ static u8 mux_get_parent(struct clk_hw *hw) val &= mask; if (mux->parent_map) - return qcom_find_src_index(hw, mux->parent_map, val); + return qcom_find_cfg_index(hw, mux->parent_map, val); return val; } diff --git a/drivers/clk/qcom/common.c b/drivers/clk/qcom/common.c index 60d2a78d1395..2af04fc4abfa 100644 --- a/drivers/clk/qcom/common.c +++ b/drivers/clk/qcom/common.c @@ -69,6 +69,18 @@ int qcom_find_src_index(struct clk_hw *hw, const struct parent_map *map, u8 src) } EXPORT_SYMBOL_GPL(qcom_find_src_index); +int qcom_find_cfg_index(struct clk_hw *hw, const struct parent_map *map, u8 cfg) +{ + int i, num_parents = clk_hw_get_num_parents(hw); + + for (i = 0; i < num_parents; i++) + if (cfg == map[i].cfg) + return i; + + return -ENOENT; +} +EXPORT_SYMBOL_GPL(qcom_find_cfg_index); + struct regmap * qcom_cc_map(struct platform_device *pdev, const struct qcom_cc_desc *desc) { diff --git a/drivers/clk/qcom/common.h b/drivers/clk/qcom/common.h index bb39a7e106d8..9c8f7b798d9f 100644 --- a/drivers/clk/qcom/common.h +++ b/drivers/clk/qcom/common.h @@ -49,6 +49,8 @@ extern void qcom_pll_set_fsm_mode(struct regmap *m, u32 reg, u8 bias_count, u8 lock_count); extern int qcom_find_src_index(struct clk_hw *hw, const struct parent_map *map, u8 src); +extern int qcom_find_cfg_index(struct clk_hw *hw, const struct parent_map *map, + u8 cfg); extern int qcom_cc_register_board_clk(struct device *dev, const char *path, const char *name, unsigned long rate); -- 2.33.0

2 years, 5 months

3
2
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror November 2021