August 2020 - Linux-stable-mirror

FAILED: patch "[PATCH] remoteproc: qcom_q6v5_mss: Validate MBA firmware size before" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From e013f455d95add874f310dc47c608e8c70692ae5 Mon Sep 17 00:00:00 2001 From: Sibi Sankar <sibis(a)codeaurora.org> Date: Thu, 23 Jul 2020 01:40:45 +0530 Subject: [PATCH] remoteproc: qcom_q6v5_mss: Validate MBA firmware size before load The following mem abort is observed when the mba firmware size exceeds the allocated mba region. MBA firmware size is restricted to a maximum size of 1M and remaining memory region is used by modem debug policy firmware when available. Hence verify whether the MBA firmware size lies within the allocated memory region and is not greater than 1M before loading. Err Logs: Unable to handle kernel paging request at virtual address Mem abort info: ... Call trace: __memcpy+0x110/0x180 rproc_start+0x40/0x218 rproc_boot+0x5b4/0x608 state_store+0x54/0xf8 dev_attr_store+0x44/0x60 sysfs_kf_write+0x58/0x80 kernfs_fop_write+0x140/0x230 vfs_write+0xc4/0x208 ksys_write+0x74/0xf8 __arm64_sys_write+0x24/0x30 ... Reviewed-by: Bjorn Andersson <bjorn.andersson(a)linaro.org> Fixes: 051fb70fd4ea4 ("remoteproc: qcom: Driver for the self-authenticating Hexagon v5") Cc: stable(a)vger.kernel.org Signed-off-by: Sibi Sankar <sibis(a)codeaurora.org> Link: https://lore.kernel.org/r/20200722201047.12975-2-sibis@codeaurora.org Signed-off-by: Bjorn Andersson <bjorn.andersson(a)linaro.org> diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c index 03d7f3d702b3..7826f229957d 100644 --- a/drivers/remoteproc/qcom_q6v5_mss.c +++ b/drivers/remoteproc/qcom_q6v5_mss.c @@ -411,6 +411,12 @@ static int q6v5_load(struct rproc *rproc, const struct firmware *fw) { struct q6v5 *qproc = rproc->priv; + /* MBA is restricted to a maximum size of 1M */ + if (fw->size > qproc->mba_size || fw->size > SZ_1M) { + dev_err(qproc->dev, "MBA firmware load failed\n"); + return -EINVAL; + } + memcpy(qproc->mba_region, fw->data, fw->size); return 0;

3 years, 2 months

3
2
0 0

FAILED: patch "[PATCH] remoteproc: qcom_q6v5_mss: Validate modem blob firmware size" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 135b9e8d1cd8ba5ac9ad9bcf24b464b7b052e5b8 Mon Sep 17 00:00:00 2001 From: Sibi Sankar <sibis(a)codeaurora.org> Date: Thu, 23 Jul 2020 01:40:46 +0530 Subject: [PATCH] remoteproc: qcom_q6v5_mss: Validate modem blob firmware size before load The following mem abort is observed when one of the modem blob firmware size exceeds the allocated mpss region. Fix this by restricting the copy size to segment size using request_firmware_into_buf before load. Err Logs: Unable to handle kernel paging request at virtual address Mem abort info: ... Call trace: __memcpy+0x110/0x180 rproc_start+0xd0/0x190 rproc_boot+0x404/0x550 state_store+0x54/0xf8 dev_attr_store+0x44/0x60 sysfs_kf_write+0x58/0x80 kernfs_fop_write+0x140/0x230 vfs_write+0xc4/0x208 ksys_write+0x74/0xf8 ... Reviewed-by: Bjorn Andersson <bjorn.andersson(a)linaro.org> Fixes: 051fb70fd4ea4 ("remoteproc: qcom: Driver for the self-authenticating Hexagon v5") Cc: stable(a)vger.kernel.org Signed-off-by: Sibi Sankar <sibis(a)codeaurora.org> Link: https://lore.kernel.org/r/20200722201047.12975-3-sibis@codeaurora.org Signed-off-by: Bjorn Andersson <bjorn.andersson(a)linaro.org> diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c index 7826f229957d..8199d9f59209 100644 --- a/drivers/remoteproc/qcom_q6v5_mss.c +++ b/drivers/remoteproc/qcom_q6v5_mss.c @@ -1173,15 +1173,14 @@ static int q6v5_mpss_load(struct q6v5 *qproc) } else if (phdr->p_filesz) { /* Replace "xxx.xxx" with "xxx.bxx" */ sprintf(fw_name + fw_name_len - 3, "b%02d", i); - ret = request_firmware(&seg_fw, fw_name, qproc->dev); + ret = request_firmware_into_buf(&seg_fw, fw_name, qproc->dev, + ptr, phdr->p_filesz); if (ret) { dev_err(qproc->dev, "failed to load %s\n", fw_name); iounmap(ptr); goto release_firmware; } - memcpy(ptr, seg_fw->data, seg_fw->size); - release_firmware(seg_fw); }

3 years, 2 months

2
1
0 0

[PATCH 5.4 000/142] 5.4.44-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.4.44 release. There are 142 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 Wed, 03 Jun 2020 17:38:19 +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.44-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.44-rc1 Changbin Du <changbin.du(a)intel.com> perf: Make perf able to build with latest libbfd Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_conntrack_pptp: fix compilation warning with W=1 build Nathan Chancellor <natechancellor(a)gmail.com> netfilter: conntrack: Pass value of ctinfo to __nf_conntrack_update Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: conntrack: comparison of unsigned in cthelper confirmation Dmitry Torokhov <dmitry.torokhov(a)gmail.com> Revert "Input: i8042 - add ThinkPad S230u to i8042 nomux list" Qiushi Wu <wu000273(a)umn.edu> bonding: Fix reference count leak in bond_sysfs_slave_add. Vladimir Oltean <vladimir.oltean(a)nxp.com> net: dsa: declare lockless TX feature for slave ports David Ahern <dsahern(a)gmail.com> ipv4: nexthop version of fib_info_nh_uses_dev David Ahern <dsahern(a)gmail.com> nexthop: Expand nexthop_is_multipath in a few places Nikolay Aleksandrov <nikolay(a)cumulusnetworks.com> nexthops: don't modify published nexthop groups David Ahern <dsahern(a)gmail.com> nexthops: Move code from remove_nexthop_from_groups to remove_nh_grp_entry Eric Dumazet <edumazet(a)google.com> crypto: chelsio/chtls: properly set tp->lsndtime Qiushi Wu <wu000273(a)umn.edu> qlcnic: fix missing release in qlcnic_83xx_interrupt_test. Björn Töpel <bjorn.topel(a)intel.com> xsk: Add overflow check for u64 division, stored into u32 Pradeep Kumar Chitrapu <pradeepc(a)codeaurora.org> ieee80211: Fix incorrect mask for default PE duration Michael Chan <michael.chan(a)broadcom.com> bnxt_en: Fix accumulation of bp->net_stats_prev. Xin Long <lucien.xin(a)gmail.com> esp6: get the right proto for transport mode in esp6_gso_encap Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_conntrack_pptp: prevent buffer overflows in debug code Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nfnetlink_cthelper: unbreak userspace helper support Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: conntrack: make conntrack userspace helpers work again Phil Sutter <phil(a)nwl.cc> netfilter: ipset: Fix subcounter update skip Michael Braun <michael-dev(a)fami-braun.de> netfilter: nft_reject_bridge: enable reject with bridge vlan Xin Long <lucien.xin(a)gmail.com> ip_vti: receive ipip packet by calling ip_tunnel_rcv Antony Antony <antony(a)phenome.org> xfrm: fix error in comment Xin Long <lucien.xin(a)gmail.com> xfrm: fix a NULL-ptr deref in xfrm_local_error Xin Long <lucien.xin(a)gmail.com> xfrm: fix a warning in xfrm_policy_insert_list Nicolas Dichtel <nicolas.dichtel(a)6wind.com> xfrm interface: fix oops when deleting a x-netns interface Xin Long <lucien.xin(a)gmail.com> xfrm: call xfrm_output_gso when inner_protocol is set in xfrm_output Xin Long <lucien.xin(a)gmail.com> xfrm: remove the xfrm_state_put call becofe going to out_reset Xin Long <lucien.xin(a)gmail.com> xfrm: do pskb_pull properly in __xfrm_transport_prep Xin Long <lucien.xin(a)gmail.com> xfrm: allow to accept packets with ipv6 NEXTHDR_HOP in xfrm_input Al Viro <viro(a)zeniv.linux.org.uk> copy_xstate_to_kernel(): don't leave parts of destination uninitialized Alexander Dahl <post(a)lespocky.de> x86/dma: Fix max PFN arithmetic overflow on 32 bit systems Linus Lüssing <ll(a)simonwunderlich.de> mac80211: mesh: fix discovery timer re-arming issue / crash Andy Lutomirski <luto(a)kernel.org> x86/syscalls: Revert "x86/syscalls: Make __X32_SYSCALL_BIT be unsigned long" Johannes Berg <johannes.berg(a)intel.com> cfg80211: fix debugfs rename crash Helge Deller <deller(a)gmx.de> parisc: Fix kernel panic in mem_init() Qiushi Wu <wu000273(a)umn.edu> iommu: Fix reference count leak in iommu_group_alloc. Linus Walleij <linus.walleij(a)linaro.org> gpio: fix locking open drain IRQ lines Jens Axboe <axboe(a)kernel.dk> Revert "block: end bio with BLK_STS_AGAIN in case of non-mq devs and REQ_NOWAIT" Arnd Bergmann <arnd(a)arndb.de> include/asm-generic/topology.h: guard cpumask_of_node() macro argument Alexander Potapenko <glider(a)google.com> fs/binfmt_elf.c: allocate initialized memory in fill_thread_core_info() Konstantin Khlebnikov <khlebnikov(a)yandex-team.ru> mm: remove VM_BUG_ON(PageSlab()) from page_mapcount() Hugh Dickins <hughd(a)google.com> mm,thp: stop leaking unreleased file pages Valentine Fatiev <valentinef(a)mellanox.com> IB/ipoib: Fix double free of skb in case of multicast traffic in CM mode Simon Ser <contact(a)emersion.fr> drm/amd/display: drop cursor position check in atomic test Jason Gunthorpe <jgg(a)ziepe.ca> RDMA/core: Fix double destruction of uobject Jeff Layton <jlayton(a)kernel.org> ceph: flush release queue when handling caps for unknown inode Jerry Lee <leisurelysw24(a)gmail.com> libceph: ignore pool overlay and cache logic on redirects Kailang Yang <kailang(a)realtek.com> ALSA: hda/realtek - Add new codec supported for ALC287 Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Quirks for Gigabyte TRX40 Aorus Master onboard audio Vinod Koul <vkoul(a)kernel.org> clk: qcom: gcc: Fix parent for gpll0_out_even Eric W. Biederman <ebiederm(a)xmission.com> exec: Always set cap_ambient in cap_bprm_set_creds Chris Chiu <chiu(a)endlessm.com> ALSA: usb-audio: mixer: volume quirk for ESS Technology Asus USB DAC Takashi Iwai <tiwai(a)suse.de> ALSA: hda/realtek - Add a model for Thinkpad T570 without DAC workaround Changming Liu <liu.changm(a)northeastern.edu> ALSA: hwdep: fix a left shifting 1 by 31 UB bug Qiushi Wu <wu000273(a)umn.edu> RDMA/pvrdma: Fix missing pci disable in pvrdma_pci_probe() Tiezhu Yang <yangtiezhu(a)loongson.cn> gpio: bcm-kona: Fix return value of bcm_kona_gpio_probe() Tiezhu Yang <yangtiezhu(a)loongson.cn> gpio: pxa: Fix return value of pxa_gpio_probe() Peng Hao <richard.peng(a)oppo.com> mmc: block: Fix use-after-free issue for rpmb Hamish Martin <hamish.martin(a)alliedtelesis.co.nz> ARM: dts: bcm: HR2: Fix PPI interrupt types Vincent Stehlé <vincent.stehle(a)laposte.net> ARM: dts: bcm2835-rpi-zero-w: Fix led polarity Robert Beckett <bob.beckett(a)collabora.com> ARM: dts/imx6q-bx50v3: Set display interface clock parents Kaike Wan <kaike.wan(a)intel.com> IB/qib: Call kobject_put() when kobject_init_and_add() fails Paul Cercueil <paul(a)crapouillou.net> gpu/drm: Ingenic: Fix opaque pointer casted to wrong type Dennis YC Hsieh <dennis-yc.hsieh(a)mediatek.com> soc: mediatek: cmdq: return send msg error code Hsin-Yi Wang <hsinyi(a)chromium.org> arm64: dts: mt8173: fix vcodec-enc clock Takashi Iwai <tiwai(a)suse.de> gpio: exar: Fix bad handling for ida_simple_get error path Russell King <rmk+kernel(a)armlinux.org.uk> ARM: uaccess: fix DACR mismatch with nested exceptions Russell King <rmk+kernel(a)armlinux.org.uk> ARM: uaccess: integrate uaccess_save and uaccess_restore Russell King <rmk+kernel(a)armlinux.org.uk> ARM: uaccess: consolidate uaccess asm to asm/uaccess-asm.h Łukasz Stelmach <l.stelmach(a)samsung.com> ARM: 8970/1: decompressor: increase tag size Wei Yongjun <weiyongjun1(a)huawei.com> Input: synaptics-rmi4 - fix error return code in rmi_driver_probe() Evan Green <evgreen(a)chromium.org> Input: synaptics-rmi4 - really fix attn_data use-after-free Kevin Locke <kevin(a)kevinlocke.name> Input: i8042 - add ThinkPad S230u to i8042 reset list Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> Input: dlink-dir685-touchkeys - fix a typo in driver name Łukasz Patron <priv.luk(a)gmail.com> Input: xpad - add custom init packet for Xbox One S controllers Brendan Shanks <bshanks(a)codeweavers.com> Input: evdev - call input_flush_device() on release(), not flush() Kevin Locke <kevin(a)kevinlocke.name> Input: i8042 - add ThinkPad S230u to i8042 nomux list James Hilliard <james.hilliard1(a)gmail.com> Input: usbtouchscreen - add support for BonXeon TP Madhuparna Bhowmik <madhuparnabhowmik10(a)gmail.com> drivers: net: hamradio: Fix suspicious RCU usage warning in bpqether.c Matteo Croce <mcroce(a)redhat.com> samples: bpf: Fix build error Al Viro <viro(a)zeniv.linux.org.uk> csky: Fixup raw_copy_from_user() Steve French <stfrench(a)microsoft.com> cifs: Fix null pointer check in cifs_read Amy Shih <amy.shih(a)advantech.com.tw> hwmon: (nct7904) Fix incorrect range of temperature limit registers Liu Yibin <jiulong(a)linux.alibaba.com> csky: Fixup remove duplicate irq_disable Mao Han <han_mao(a)linux.alibaba.com> csky: Fixup perf callchain unwind Liu Yibin <jiulong(a)linux.alibaba.com> csky: Fixup msa highest 3 bits mask Tero Kristo <t-kristo(a)ti.com> clk: ti: am33xx: fix RTC clock parent Kefeng Wang <wangkefeng.wang(a)huawei.com> riscv: stacktrace: Fix undefined reference to `walk_stackframe' Denis V. Lunev <den(a)openvz.org> IB/i40iw: Remove bogus call to netdev_master_upper_dev_get() Arnd Bergmann <arnd(a)arndb.de> net: freescale: select CONFIG_FIXED_PHY where needed Masahiro Yamada <masahiroy(a)kernel.org> usb: gadget: legacy: fix redundant initialization warnings Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> usb: phy: twl6030-usb: Fix a resource leak in an error handling path in 'twl6030_usb_probe()' Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> usb: dwc3: pci: Enable extcon driver for Intel Merrifield Lei Xue <carmark.dlut(a)gmail.com> cachefiles: Fix race between read_waiter and read_copier involving op->to_do Felix Kuehling <Felix.Kuehling(a)amd.com> drm/amdgpu: Use GEM obj reference for KFD BOs Evan Quan <evan.quan(a)amd.com> drm/amd/powerplay: perform PG ungate prior to CG ungate Evan Quan <evan.quan(a)amd.com> drm/amdgpu: drop unnecessary cancel_delayed_work_sync on PG ungate Andreas Gruenbacher <agruenba(a)redhat.com> gfs2: Grab glock reference sooner in gfs2_add_revoke Bob Peterson <rpeterso(a)redhat.com> gfs2: don't call quota_unhold if quotas are not locked Bob Peterson <rpeterso(a)redhat.com> gfs2: move privileged user check to gfs2_quota_lock_check Chuhong Yuan <hslester96(a)gmail.com> net: microchip: encx24j600: add missed kthread_stop Andrew Oakley <andrew(a)adoakley.name> ALSA: usb-audio: add mapping for ASRock TRX40 Creator Stephen Warren <swarren(a)nvidia.com> gpio: tegra: mask GPIO IRQs during IRQ shutdown Johan Jonker <jbx6244(a)gmail.com> ARM: dts: rockchip: fix pinctrl sub nodename for spi in rk322x.dtsi Johan Jonker <jbx6244(a)gmail.com> ARM: dts: rockchip: swap clock-names of gpu nodes Johan Jonker <jbx6244(a)gmail.com> arm64: dts: rockchip: swap interrupts interrupt-names rk3399 gpu node Johan Jonker <jbx6244(a)gmail.com> arm64: dts: rockchip: fix status for &gmac2phy in rk3328-evb.dts Johan Jonker <jbx6244(a)gmail.com> ARM: dts: rockchip: fix phy nodename for rk3229-xms6 Johan Jonker <jbx6244(a)gmail.com> ARM: dts: rockchip: fix phy nodename for rk3228-evb Jiri Pirko <jiri(a)mellanox.com> mlxsw: spectrum: Fix use-after-free of split/unsplit/type_set in case reload fails Qiushi Wu <wu000273(a)umn.edu> net/mlx4_core: fix a memory leak bug. Qiushi Wu <wu000273(a)umn.edu> net: sun: fix missing release regions in cas_init_one(). Vadim Fedorenko <vfedorenko(a)novek.ru> net/tls: free record only on encryption error Vadim Fedorenko <vfedorenko(a)novek.ru> net/tls: fix encryption error checking Roi Dayan <roid(a)mellanox.com> net/mlx5: Annotate mutex destroy for root ns Shay Drory <shayd(a)mellanox.com> net/mlx5: Fix error flow in case of function_setup failure Moshe Shemesh <moshe(a)mellanox.com> net/mlx5e: Update netdev txq on completions during closure Moshe Shemesh <moshe(a)mellanox.com> net/mlx5: Fix memory leak in mlx5_events_init Roi Dayan <roid(a)mellanox.com> net/mlx5e: Fix inner tirs handling Tariq Toukan <tariqt(a)mellanox.com> net/mlx5e: kTLS, Destroy key object after destroying the TIS Eric Dumazet <edumazet(a)google.com> tipc: block BH before using dst_cache Jere Leppänen <jere.leppanen(a)nokia.com> sctp: Start shutdown on association restart if in SHUTDOWN-SENT state and socket is closed Neil Horman <nhorman(a)tuxdriver.com> sctp: Don't add the shutdown timer if its already been added Marc Payne <marc.payne(a)mdpsys.co.uk> r8152: support additional Microsoft Surface Ethernet Adapter variant David Ahern <dsahern(a)gmail.com> nexthop: Fix attribute checking for groups Vinay Kumar Yadav <vinay.yadav(a)chelsio.com> net/tls: fix race condition causing kernel panic Roman Mashak <mrv(a)mojatatu.com> net sched: fix reporting the first-time use timestamp Yuqi Jin <jinyuqi(a)huawei.com> net: revert "net: get rid of an signed integer overflow in ip_idents_reserve()" Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org> net: qrtr: Fix passing invalid reference to qrtr_local_enqueue() Stephen Worley <sworley(a)cumulusnetworks.com> net: nlmsg_cancel() if put fails for nhmsg Russell King <rmk+kernel(a)armlinux.org.uk> net: mvpp2: fix RX hashing for non-10G ports Moshe Shemesh <moshe(a)mellanox.com> net/mlx5: Add command entry handling completion Vadim Fedorenko <vfedorenko(a)novek.ru> net: ipip: fix wrong address family in init error path Martin KaFai Lau <kafai(a)fb.com> net: inet_csk: Fix so_reuseport bind-address cache in tb->fast* Boris Sukholitko <boris.sukholitko(a)broadcom.com> __netif_receive_skb_core: pass skb by reference Grygorii Strashko <grygorii.strashko(a)ti.com> net: ethernet: ti: cpsw: fix ASSERT_RTNL() warning during suspend DENG Qingfang <dqfext(a)gmail.com> net: dsa: mt7530: fix roaming from DSA user ports Sabrina Dubroca <sd(a)queasysnail.net> net: don't return invalid table id error when we fall back to PF_UNSPEC Vladimir Oltean <vladimir.oltean(a)nxp.com> dpaa_eth: fix usage as DSA master, try 3 Eric Dumazet <edumazet(a)google.com> ax25: fix setsockopt(SO_BINDTODEVICE) ------------- Diffstat: Makefile | 4 +- arch/arm/boot/compressed/vmlinux.lds.S | 2 +- arch/arm/boot/dts/bcm-hr2.dtsi | 6 +- arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 2 +- arch/arm/boot/dts/imx6q-b450v3.dts | 7 -- arch/arm/boot/dts/imx6q-b650v3.dts | 7 -- arch/arm/boot/dts/imx6q-b850v3.dts | 11 -- arch/arm/boot/dts/imx6q-bx50v3.dtsi | 15 +++ arch/arm/boot/dts/rk3036.dtsi | 2 +- arch/arm/boot/dts/rk3228-evb.dts | 2 +- arch/arm/boot/dts/rk3229-xms6.dts | 2 +- arch/arm/boot/dts/rk322x.dtsi | 6 +- arch/arm/boot/dts/rk3xxx.dtsi | 2 +- arch/arm/include/asm/assembler.h | 75 +------------ arch/arm/include/asm/uaccess-asm.h | 117 +++++++++++++++++++++ arch/arm/kernel/entry-armv.S | 11 +- arch/arm/kernel/entry-header.S | 9 +- arch/arm64/boot/dts/mediatek/mt8173.dtsi | 4 +- arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 8 +- arch/csky/abiv1/inc/abi/entry.h | 4 +- arch/csky/abiv2/inc/abi/entry.h | 4 +- arch/csky/include/asm/uaccess.h | 49 +++++---- arch/csky/kernel/entry.S | 2 - arch/csky/kernel/perf_callchain.c | 9 +- arch/csky/lib/usercopy.c | 8 +- arch/parisc/mm/init.c | 2 +- arch/riscv/kernel/stacktrace.c | 2 +- arch/x86/include/asm/dma.h | 2 +- arch/x86/include/uapi/asm/unistd.h | 11 +- arch/x86/kernel/fpu/xstate.c | 86 ++++++++------- block/blk-core.c | 11 +- drivers/clk/qcom/gcc-sm8150.c | 3 +- drivers/clk/ti/clk-33xx.c | 2 +- drivers/crypto/chelsio/chtls/chtls_io.c | 2 +- drivers/gpio/gpio-bcm-kona.c | 2 +- drivers/gpio/gpio-exar.c | 7 +- drivers/gpio/gpio-pxa.c | 4 +- drivers/gpio/gpio-tegra.c | 1 + drivers/gpio/gpiolib.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 5 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 6 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 12 +-- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 7 -- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 6 +- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 6 +- drivers/gpu/drm/ingenic/ingenic-drm.c | 2 +- drivers/hwmon/nct7904.c | 4 +- drivers/infiniband/core/rdma_core.c | 20 ++-- drivers/infiniband/hw/i40iw/i40iw_cm.c | 8 -- drivers/infiniband/hw/qib/qib_sysfs.c | 9 +- drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 2 +- drivers/infiniband/ulp/ipoib/ipoib.h | 4 + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 15 +-- drivers/infiniband/ulp/ipoib/ipoib_ib.c | 9 +- drivers/infiniband/ulp/ipoib/ipoib_main.c | 10 +- drivers/input/evdev.c | 19 +--- drivers/input/joystick/xpad.c | 12 +++ drivers/input/keyboard/dlink-dir685-touchkeys.c | 2 +- drivers/input/rmi4/rmi_driver.c | 5 +- drivers/input/serio/i8042-x86ia64io.h | 7 ++ drivers/input/touchscreen/usbtouchscreen.c | 1 + drivers/iommu/iommu.c | 2 +- drivers/mmc/core/block.c | 2 +- drivers/net/bonding/bond_sysfs_slave.c | 4 +- drivers/net/dsa/mt7530.c | 9 +- drivers/net/dsa/mt7530.h | 1 + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- drivers/net/ethernet/freescale/Kconfig | 2 + drivers/net/ethernet/freescale/dpaa/Kconfig | 1 + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +- drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c | 2 +- drivers/net/ethernet/mellanox/mlx4/fw.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 14 +++ drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +- .../ethernet/mellanox/mlx5/core/en_accel/ktls.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 12 ++- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 9 +- drivers/net/ethernet/mellanox/mlx5/core/events.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 6 ++ .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 3 +- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 14 ++- drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 8 ++ drivers/net/ethernet/microchip/encx24j600.c | 5 +- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 4 +- drivers/net/ethernet/sun/cassini.c | 3 +- drivers/net/ethernet/ti/cpsw.c | 4 + drivers/net/hamradio/bpqether.c | 3 +- drivers/net/usb/cdc_ether.c | 11 +- drivers/net/usb/r8152.c | 1 + drivers/soc/mediatek/mtk-cmdq-helper.c | 4 +- drivers/usb/dwc3/dwc3-pci.c | 1 + drivers/usb/gadget/legacy/inode.c | 3 +- drivers/usb/phy/phy-twl6030-usb.c | 12 ++- fs/binfmt_elf.c | 2 +- fs/cachefiles/rdwr.c | 2 +- fs/ceph/caps.c | 2 +- fs/cifs/file.c | 2 +- fs/gfs2/log.c | 6 +- fs/gfs2/quota.c | 6 +- fs/gfs2/quota.h | 3 +- include/asm-generic/topology.h | 2 +- include/linux/ieee80211.h | 2 +- include/linux/mlx5/driver.h | 1 + include/linux/mm.h | 15 ++- include/linux/netfilter/nf_conntrack_pptp.h | 2 +- include/net/act_api.h | 3 +- include/net/ip_fib.h | 11 +- include/net/nexthop.h | 67 +++++++++--- include/net/tls.h | 4 + include/rdma/uverbs_std_types.h | 2 +- include/uapi/linux/xfrm.h | 2 +- mm/khugepaged.c | 1 + net/ax25/af_ax25.c | 6 +- net/bridge/netfilter/nft_reject_bridge.c | 6 ++ net/ceph/osd_client.c | 4 +- net/core/dev.c | 20 +++- net/dsa/slave.c | 1 + net/dsa/tag_mtk.c | 15 +++ net/ipv4/esp4_offload.c | 4 +- net/ipv4/fib_frontend.c | 22 ++-- net/ipv4/inet_connection_sock.c | 43 ++++---- net/ipv4/ip_vti.c | 23 +++- net/ipv4/ipip.c | 2 +- net/ipv4/ipmr.c | 2 +- net/ipv4/netfilter/nf_nat_pptp.c | 7 +- net/ipv4/nexthop.c | 105 +++++++++++------- net/ipv4/route.c | 14 ++- net/ipv6/esp6_offload.c | 13 ++- net/ipv6/ip6_fib.c | 2 +- net/ipv6/ip6mr.c | 2 +- net/mac80211/mesh_hwmp.c | 7 ++ net/netfilter/ipset/ip_set_list_set.c | 2 +- net/netfilter/nf_conntrack_core.c | 80 ++++++++++++-- net/netfilter/nf_conntrack_pptp.c | 62 ++++++----- net/netfilter/nfnetlink_cthelper.c | 3 +- net/qrtr/qrtr.c | 2 +- net/sctp/sm_sideeffect.c | 14 ++- net/sctp/sm_statefuns.c | 9 +- net/tipc/udp_media.c | 6 +- net/tls/tls_sw.c | 50 ++++++--- net/wireless/core.c | 2 +- net/xdp/xdp_umem.c | 8 +- net/xfrm/xfrm_device.c | 8 +- net/xfrm/xfrm_input.c | 2 +- net/xfrm/xfrm_interface.c | 21 ++++ net/xfrm/xfrm_output.c | 15 +-- net/xfrm/xfrm_policy.c | 7 +- samples/bpf/lwt_len_hist_user.c | 2 - security/commoncap.c | 1 + sound/core/hwdep.c | 4 +- sound/pci/hda/patch_realtek.c | 39 +++++-- sound/usb/mixer.c | 8 ++ sound/usb/mixer_maps.c | 24 +++++ sound/usb/quirks-table.h | 26 +++++ tools/arch/x86/include/uapi/asm/unistd.h | 2 +- tools/perf/util/srcline.c | 16 ++- 159 files changed, 1101 insertions(+), 594 deletions(-)

3 years, 2 months

5
152
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, 2 months

5
140
0 0

[PATCH v3] riscv: set max_pfn to the PFN of the last page

by Vincent Chen

The current max_pfn equals to zero. In this case, I found it caused users cannot get some page information through /proc such as kpagecount in v5.6 kernel because of new sanity checks. The following message is displayed by stress-ng test suite with the command "stress-ng --verbose --physpage 1 -t 1" on HiFive unleashed board. # stress-ng --verbose --physpage 1 -t 1 stress-ng: debug: [109] 4 processors online, 4 processors configured stress-ng: info: [109] dispatching hogs: 1 physpage stress-ng: debug: [109] cache allocate: reducing cache level from L3 (too high) to L0 stress-ng: debug: [109] get_cpu_cache: invalid cache_level: 0 stress-ng: info: [109] cache allocate: using built-in defaults as no suitable cache found stress-ng: debug: [109] cache allocate: default cache size: 2048K stress-ng: debug: [109] starting stressors stress-ng: debug: [109] 1 stressor spawned stress-ng: debug: [110] stress-ng-physpage: started [110] (instance 0) stress-ng: error: [110] stress-ng-physpage: cannot read page count for address 0x3fd34de000 in /proc/kpagecount, errno=0 (Success) stress-ng: error: [110] stress-ng-physpage: cannot read page count for address 0x3fd32db078 in /proc/kpagecount, errno=0 (Success) ... stress-ng: error: [110] stress-ng-physpage: cannot read page count for address 0x3fd32db078 in /proc/kpagecount, errno=0 (Success) stress-ng: debug: [110] stress-ng-physpage: exited [110] (instance 0) stress-ng: debug: [109] process [110] terminated stress-ng: info: [109] successful run completed in 1.00s # After applying this patch, the kernel can pass the test. # stress-ng --verbose --physpage 1 -t 1 stress-ng: debug: [104] 4 processors online, 4 processors configured stress-ng: info: [104] dispatching hogs: 1 physpage stress-ng: info: [104] cache allocate: using defaults, can't determine cache details from sysfs stress-ng: debug: [104] cache allocate: default cache size: 2048K stress-ng: debug: [104] starting stressors stress-ng: debug: [104] 1 stressor spawned stress-ng: debug: [105] stress-ng-physpage: started [105] (instance 0) stress-ng: debug: [105] stress-ng-physpage: exited [105] (instance 0) stress-ng: debug: [104] process [105] terminated stress-ng: info: [104] successful run completed in 1.01s # Fixes: 0651c263c8e3 (RISC-V: Move setup_bootmem() to mm/init.c) Cc: stable(a)vger.kernel.org Signed-off-by: Vincent Chen <vincent.chen(a)sifive.com> Reviewed-by: Anup Patel <anup(a)brainfault.org> Reviewed-by: Yash Shah <yash.shah(a)sifive.com> Tested-by: Yash Shah <yash.shah(a)sifive.com> Changes since v1: 1. Add Fixes line and Cc stable kernel Changes since v2: 1. Fix typo in Anup email address --- arch/riscv/mm/init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index fab855963c73..157924baa191 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -149,7 +149,8 @@ void __init setup_bootmem(void) memblock_reserve(vmlinux_start, vmlinux_end - vmlinux_start); set_max_mapnr(PFN_DOWN(mem_size)); - max_low_pfn = PFN_DOWN(memblock_end_of_DRAM()); + max_pfn = PFN_DOWN(memblock_end_of_DRAM()); + max_low_pfn = max_pfn; #ifdef CONFIG_BLK_DEV_INITRD setup_initrd(); -- 2.7.4

3 years, 2 months

3
2
0 0

[PATCH AUTOSEL 5.7 01/30] drm/msm: fix potential memleak in error branch

by Sasha Levin

From: Bernard Zhao <bernard(a)vivo.com> [ Upstream commit 177d3819633cd520e3f95df541a04644aab4c657 ] In function msm_submitqueue_create, the queue is a local variable, in return -EINVAL branch, queue didn`t add to ctx`s list yet, and also didn`t kfree, this maybe bring in potential memleak. Signed-off-by: Bernard Zhao <bernard(a)vivo.com> [trivial commit msg fixup] Signed-off-by: Rob Clark <robdclark(a)chromium.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- drivers/gpu/drm/msm/msm_submitqueue.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/msm_submitqueue.c b/drivers/gpu/drm/msm/msm_submitqueue.c index 001fbf537440a..a1d94be7883a0 100644 --- a/drivers/gpu/drm/msm/msm_submitqueue.c +++ b/drivers/gpu/drm/msm/msm_submitqueue.c @@ -71,8 +71,10 @@ int msm_submitqueue_create(struct drm_device *drm, struct msm_file_private *ctx, queue->flags = flags; if (priv->gpu) { - if (prio >= priv->gpu->nr_rings) + if (prio >= priv->gpu->nr_rings) { + kfree(queue); return -EINVAL; + } queue->prio = prio; } -- 2.25.1

3 years, 3 months

5
27
0 0

[PATCH 1/3] bfq: Avoid false bfq queue merging

by Jan Kara

bfq_setup_cooperator() uses bfqd->in_serv_last_pos so detect whether it makes sense to merge current bfq queue with the in-service queue. However if the in-service queue is freshly scheduled and didn't dispatch any requests yet, bfqd->in_serv_last_pos is stale and contains value from the previously scheduled bfq queue which can thus result in a bogus decision that the two queues should be merged. This bug can be observed for example with the following fio jobfile: [global] direct=0 ioengine=sync invalidate=1 size=1g rw=read [reader] numjobs=4 directory=/mnt where the 4 processes will end up in the one shared bfq queue although they do IO to physically very distant files (for some reason I was able to observe this only with slice_idle=1ms setting). Fix the problem by invalidating bfqd->in_serv_last_pos when switching in-service queue. Fixes: 058fdecc6de7 ("block, bfq: fix in-service-queue check for queue merging") CC: stable(a)vger.kernel.org Signed-off-by: Jan Kara <jack(a)suse.cz> --- block/bfq-iosched.c | 1 + 1 file changed, 1 insertion(+) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 3d411716d7ee..50017275915f 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -2937,6 +2937,7 @@ static void __bfq_set_in_service_queue(struct bfq_data *bfqd, } bfqd->in_service_queue = bfqq; + bfqd->in_serv_last_pos = 0; } /* -- 2.16.4

3 years, 3 months

2
4
0 0

[BACKPORT] xen/pvh: correctly setup the PV EFI interface for dom0

by Roger Pau Monne

commit 72813bfbf0276a97c82af038efb5f02dcdd9e310 upstream This involves initializing the boot params EFI related fields and the efi global variable. Without this fix a PVH dom0 doesn't detect when booted from EFI, and thus doesn't support accessing any of the EFI related data. Reported-by: PGNet Dev <pgnet.dev(a)gmail.com> Signed-off-by: Roger Pau Monné <roger.pau(a)citrix.com> Reviewed-by: Boris Ostrovsky <boris.ostrovsky(a)oracle.com> Signed-off-by: Boris Ostrovsky <boris.ostrovsky(a)oracle.com> Cc: stable(a)vger.kernel.org # 4.19+ --- arch/x86/xen/efi.c | 12 ++++++------ arch/x86/xen/enlighten_pv.c | 2 +- arch/x86/xen/enlighten_pvh.c | 4 ++++ arch/x86/xen/xen-ops.h | 4 ++-- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/arch/x86/xen/efi.c b/arch/x86/xen/efi.c index 1804b27f9632..30edb9bc58e2 100644 --- a/arch/x86/xen/efi.c +++ b/arch/x86/xen/efi.c @@ -170,7 +170,7 @@ static enum efi_secureboot_mode xen_efi_get_secureboot(void) return efi_secureboot_mode_unknown; } -void __init xen_efi_init(void) +void __init xen_efi_init(struct boot_params *boot_params) { efi_system_table_t *efi_systab_xen; @@ -179,12 +179,12 @@ void __init xen_efi_init(void) if (efi_systab_xen == NULL) return; - strncpy((char *)&boot_params.efi_info.efi_loader_signature, "Xen", - sizeof(boot_params.efi_info.efi_loader_signature)); - boot_params.efi_info.efi_systab = (__u32)__pa(efi_systab_xen); - boot_params.efi_info.efi_systab_hi = (__u32)(__pa(efi_systab_xen) >> 32); + strncpy((char *)&boot_params->efi_info.efi_loader_signature, "Xen", + sizeof(boot_params->efi_info.efi_loader_signature)); + boot_params->efi_info.efi_systab = (__u32)__pa(efi_systab_xen); + boot_params->efi_info.efi_systab_hi = (__u32)(__pa(efi_systab_xen) >> 32); - boot_params.secure_boot = xen_efi_get_secureboot(); + boot_params->secure_boot = xen_efi_get_secureboot(); set_bit(EFI_BOOT, &efi.flags); set_bit(EFI_PARAVIRT, &efi.flags); diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c index 782f98b332f0..0f8da4aebe7b 100644 --- a/arch/x86/xen/enlighten_pv.c +++ b/arch/x86/xen/enlighten_pv.c @@ -1399,7 +1399,7 @@ asmlinkage __visible void __init xen_start_kernel(void) /* We need this for printk timestamps */ xen_setup_runstate_info(0); - xen_efi_init(); + xen_efi_init(&boot_params); /* Start the world */ #ifdef CONFIG_X86_32 diff --git a/arch/x86/xen/enlighten_pvh.c b/arch/x86/xen/enlighten_pvh.c index dab07827d25e..f04d22bcf08d 100644 --- a/arch/x86/xen/enlighten_pvh.c +++ b/arch/x86/xen/enlighten_pvh.c @@ -14,6 +14,8 @@ #include <xen/interface/memory.h> #include <xen/interface/hvm/start_info.h> +#include "xen-ops.h" + /* * PVH variables. * @@ -79,6 +81,8 @@ static void __init init_pvh_bootparams(void) pvh_bootparams.hdr.type_of_loader = (9 << 4) | 0; /* Xen loader */ x86_init.acpi.get_root_pointer = pvh_get_root_pointer; + + xen_efi_init(&pvh_bootparams); } /* diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h index 0e60bd918695..2f111f47ba98 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h @@ -122,9 +122,9 @@ static inline void __init xen_init_vga(const struct dom0_vga_console_info *info, void __init xen_init_apic(void); #ifdef CONFIG_XEN_EFI -extern void xen_efi_init(void); +extern void xen_efi_init(struct boot_params *boot_params); #else -static inline void __init xen_efi_init(void) +static inline void __init xen_efi_init(struct boot_params *boot_params) { } #endif -- 2.20.1 (Apple Git-117)

3 years, 3 months

3
2
0 0

[PATCH v3 0/6] Memory corruption may occur due to incorrent tlb flush

by Santosh Sivaraj

The TLB flush optimisation (a46cc7a90f: powerpc/mm/radix: Improve TLB/PWC flushes) may result in random memory corruption. Any concurrent page-table walk could end up with a Use-after-Free. Even on UP this might give issues, since mmu_gather is preemptible these days. An interrupt or preempted task accessing user pages might stumble into the free page if the hardware caches page directories. The series is a backport of the fix sent by Peter [1]. The first three patches are dependencies for the last patch (avoid potential double flush). If the performance impact due to double flush is considered trivial then the first three patches and last patch may be dropped. This is only for v4.19 stable. [1] https://patchwork.kernel.org/cover/11284843/ -- Changelog: v2: Send the patches with the correct format (commit sha1 upstream) for stable v3: Fix compilation issue on ppc40x_defconfig and ppc44x_defconfig -- Aneesh Kumar K.V (1): powerpc/mmu_gather: enable RCU_TABLE_FREE even for !SMP case Peter Zijlstra (4): asm-generic/tlb: Track freeing of page-table directories in struct mmu_gather asm-generic/tlb, arch: Invert CONFIG_HAVE_RCU_TABLE_INVALIDATE mm/mmu_gather: invalidate TLB correctly on batch allocation failure and flush asm-generic/tlb: avoid potential double flush Will Deacon (1): asm-generic/tlb: Track which levels of the page tables have been cleared arch/Kconfig | 3 - arch/powerpc/Kconfig | 2 +- arch/powerpc/include/asm/book3s/32/pgalloc.h | 8 -- arch/powerpc/include/asm/book3s/64/pgalloc.h | 2 - arch/powerpc/include/asm/nohash/32/pgalloc.h | 8 -- arch/powerpc/include/asm/nohash/64/pgalloc.h | 9 +- arch/powerpc/include/asm/tlb.h | 11 ++ arch/powerpc/mm/pgtable-book3s64.c | 7 -- arch/sparc/include/asm/tlb_64.h | 9 ++ arch/x86/Kconfig | 1 - include/asm-generic/tlb.h | 103 ++++++++++++++++--- mm/memory.c | 20 ++-- 12 files changed, 123 insertions(+), 60 deletions(-) -- 2.24.1

3 years, 3 months

2
8
0 0

[PATCH 4.19 1/7] mm: drop meminit_pfn_in_nid as it is redundant

by Pavel Tatashin

From: Alexander Duyck <alexander.h.duyck(a)linux.intel.com> From: Alexander Duyck <alexander.h.duyck(a)linux.intel.com> commit 56ec43d8b02719402c9fcf984feb52ec2300f8a5 upstream. As best as I can tell the meminit_pfn_in_nid call is completely redundant. The deferred memory initialization is already making use of for_each_free_mem_range which in turn will call into __next_mem_range which will only return a memory range if it matches the node ID provided assuming it is not NUMA_NO_NODE. I am operating on the assumption that there are no zones or pgdata_t structures that have a NUMA node of NUMA_NO_NODE associated with them. If that is the case then __next_mem_range will never return a memory range that doesn't match the zone's node ID and as such the check is redundant. So one piece I would like to verify on this is if this works for ia64. Technically it was using a different approach to get the node ID, but it seems to have the node ID also encoded into the memblock. So I am assuming this is okay, but would like to get confirmation on that. On my x86_64 test system with 384GB of memory per node I saw a reduction in initialization time from 2.80s to 1.85s as a result of this patch. Link: http://lkml.kernel.org/r/20190405221219.12227.93957.stgit@localhost.localdo… Signed-off-by: Alexander Duyck <alexander.h.duyck(a)linux.intel.com> Reviewed-by: Pavel Tatashin <pavel.tatashin(a)microsoft.com> Acked-by: Michal Hocko <mhocko(a)suse.com> Cc: Mike Rapoport <rppt(a)linux.ibm.com> Cc: Dan Williams <dan.j.williams(a)intel.com> Cc: Dave Jiang <dave.jiang(a)intel.com> Cc: David S. Miller <davem(a)davemloft.net> Cc: Ingo Molnar <mingo(a)kernel.org> Cc: Khalid Aziz <khalid.aziz(a)oracle.com> Cc: "Kirill A. Shutemov" <kirill.shutemov(a)linux.intel.com> Cc: Laurent Dufour <ldufour(a)linux.vnet.ibm.com> Cc: Matthew Wilcox <willy(a)infradead.org> Cc: Mel Gorman <mgorman(a)techsingularity.net> Cc: Mike Rapoport <rppt(a)linux.vnet.ibm.com> Cc: Pavel Tatashin <pasha.tatashin(a)soleen.com> Cc: Vlastimil Babka <vbabka(a)suse.cz> Cc: <yi.z.zhang(a)linux.intel.com> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> Signed-off-by: Pavel Tatashin <pasha.tatashin(a)soleen.com> --- mm/page_alloc.c | 51 ++++++++++++++----------------------------------- 1 file changed, 14 insertions(+), 37 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index d8c3051387d1..c86a117acb5b 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1321,36 +1321,22 @@ int __meminit early_pfn_to_nid(unsigned long pfn) #endif #ifdef CONFIG_NODES_SPAN_OTHER_NODES -static inline bool __meminit __maybe_unused -meminit_pfn_in_nid(unsigned long pfn, int node, - struct mminit_pfnnid_cache *state) +/* Only safe to use early in boot when initialisation is single-threaded */ +static inline bool __meminit early_pfn_in_nid(unsigned long pfn, int node) { int nid; - nid = __early_pfn_to_nid(pfn, state); + nid = __early_pfn_to_nid(pfn, &early_pfnnid_cache); if (nid >= 0 && nid != node) return false; return true; } -/* Only safe to use early in boot when initialisation is single-threaded */ -static inline bool __meminit early_pfn_in_nid(unsigned long pfn, int node) -{ - return meminit_pfn_in_nid(pfn, node, &early_pfnnid_cache); -} - #else - static inline bool __meminit early_pfn_in_nid(unsigned long pfn, int node) { return true; } -static inline bool __meminit __maybe_unused -meminit_pfn_in_nid(unsigned long pfn, int node, - struct mminit_pfnnid_cache *state) -{ - return true; -} #endif @@ -1480,21 +1466,13 @@ static inline void __init pgdat_init_report_one_done(void) * * Then, we check if a current large page is valid by only checking the validity * of the head pfn. - * - * Finally, meminit_pfn_in_nid is checked on systems where pfns can interleave - * within a node: a pfn is between start and end of a node, but does not belong - * to this memory node. */ -static inline bool __init -deferred_pfn_valid(int nid, unsigned long pfn, - struct mminit_pfnnid_cache *nid_init_state) +static inline bool __init deferred_pfn_valid(unsigned long pfn) { if (!pfn_valid_within(pfn)) return false; if (!(pfn & (pageblock_nr_pages - 1)) && !pfn_valid(pfn)) return false; - if (!meminit_pfn_in_nid(pfn, nid, nid_init_state)) - return false; return true; } @@ -1502,15 +1480,14 @@ deferred_pfn_valid(int nid, unsigned long pfn, * Free pages to buddy allocator. Try to free aligned pages in * pageblock_nr_pages sizes. */ -static void __init deferred_free_pages(int nid, int zid, unsigned long pfn, +static void __init deferred_free_pages(unsigned long pfn, unsigned long end_pfn) { - struct mminit_pfnnid_cache nid_init_state = { }; unsigned long nr_pgmask = pageblock_nr_pages - 1; unsigned long nr_free = 0; for (; pfn < end_pfn; pfn++) { - if (!deferred_pfn_valid(nid, pfn, &nid_init_state)) { + if (!deferred_pfn_valid(pfn)) { deferred_free_range(pfn - nr_free, nr_free); nr_free = 0; } else if (!(pfn & nr_pgmask)) { @@ -1530,17 +1507,18 @@ static void __init deferred_free_pages(int nid, int zid, unsigned long pfn, * by performing it only once every pageblock_nr_pages. * Return number of pages initialized. */ -static unsigned long __init deferred_init_pages(int nid, int zid, +static unsigned long __init deferred_init_pages(struct zone *zone, unsigned long pfn, unsigned long end_pfn) { - struct mminit_pfnnid_cache nid_init_state = { }; unsigned long nr_pgmask = pageblock_nr_pages - 1; + int nid = zone_to_nid(zone); unsigned long nr_pages = 0; + int zid = zone_idx(zone); struct page *page = NULL; for (; pfn < end_pfn; pfn++) { - if (!deferred_pfn_valid(nid, pfn, &nid_init_state)) { + if (!deferred_pfn_valid(pfn)) { page = NULL; continue; } else if (!page || !(pfn & nr_pgmask)) { @@ -1603,12 +1581,12 @@ static int __init deferred_init_memmap(void *data) for_each_free_mem_range(i, nid, MEMBLOCK_NONE, &spa, &epa, NULL) { spfn = max_t(unsigned long, first_init_pfn, PFN_UP(spa)); epfn = min_t(unsigned long, zone_end_pfn(zone), PFN_DOWN(epa)); - nr_pages += deferred_init_pages(nid, zid, spfn, epfn); + nr_pages += deferred_init_pages(zone, spfn, epfn); } for_each_free_mem_range(i, nid, MEMBLOCK_NONE, &spa, &epa, NULL) { spfn = max_t(unsigned long, first_init_pfn, PFN_UP(spa)); epfn = min_t(unsigned long, zone_end_pfn(zone), PFN_DOWN(epa)); - deferred_free_pages(nid, zid, spfn, epfn); + deferred_free_pages(spfn, epfn); } pgdat_resize_unlock(pgdat, &flags); @@ -1640,7 +1618,6 @@ static int __init deferred_init_memmap(void *data) static noinline bool __init deferred_grow_zone(struct zone *zone, unsigned int order) { - int zid = zone_idx(zone); int nid = zone_to_nid(zone); pg_data_t *pgdat = NODE_DATA(nid); unsigned long nr_pages_needed = ALIGN(1 << order, PAGES_PER_SECTION); @@ -1690,7 +1667,7 @@ deferred_grow_zone(struct zone *zone, unsigned int order) while (spfn < epfn && nr_pages < nr_pages_needed) { t = ALIGN(spfn + PAGES_PER_SECTION, PAGES_PER_SECTION); first_deferred_pfn = min(t, epfn); - nr_pages += deferred_init_pages(nid, zid, spfn, + nr_pages += deferred_init_pages(zone, spfn, first_deferred_pfn); spfn = first_deferred_pfn; } @@ -1702,7 +1679,7 @@ deferred_grow_zone(struct zone *zone, unsigned int order) for_each_free_mem_range(i, nid, MEMBLOCK_NONE, &spa, &epa, NULL) { spfn = max_t(unsigned long, first_init_pfn, PFN_UP(spa)); epfn = min_t(unsigned long, first_deferred_pfn, PFN_DOWN(epa)); - deferred_free_pages(nid, zid, spfn, epfn); + deferred_free_pages(spfn, epfn); if (first_deferred_pfn == epfn) break; -- 2.25.1

3 years, 3 months

2
7
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror August 2020