Linux-stable-mirror

linux-stable-mirror@lists.linaro.org

317 participants
124221 discussions

[PATCH v2] media: vsp1: dl: Fix NULL pointer dereference on unbind

by Eugeniu Rosca

In commit f3b98e3c4d2e16 ("media: vsp1: Provide support for extended command pools"), the vsp pointer used for referencing the VSP1 device structure from a command pool during vsp1_dl_ext_cmd_pool_destroy() was not populated. Correctly assign the pointer to prevent the following null-pointer-dereference when removing the device: [*] h3ulcb-kf #> echo fea28000.vsp > /sys/bus/platform/devices/fea28000.vsp/driver/unbind Unable to handle kernel NULL pointer dereference at virtual address 0000000000000028 Mem abort info: ESR = 0x96000006 EC = 0x25: DABT (current EL), IL = 32 bits SET = 0, FnV = 0 EA = 0, S1PTW = 0 Data abort info: ISV = 0, ISS = 0x00000006 CM = 0, WnR = 0 user pgtable: 4k pages, 48-bit VAs, pgdp=00000007318be000 [0000000000000028] pgd=00000007333a1003, pud=00000007333a6003, pmd=0000000000000000 Internal error: Oops: 96000006 [#1] PREEMPT SMP Modules linked in: CPU: 1 PID: 486 Comm: sh Not tainted 5.7.0-rc6-arm64-renesas-00118-ge644645abf47 #185 Hardware name: Renesas H3ULCB Kingfisher board based on r8a77951 (DT) pstate: 40000005 (nZcv daif -PAN -UAO) pc : vsp1_dlm_destroy+0xe4/0x11c lr : vsp1_dlm_destroy+0xc8/0x11c sp : ffff800012963b60 x29: ffff800012963b60 x28: ffff0006f83fc440 x27: 0000000000000000 x26: ffff0006f5e13e80 x25: ffff0006f5e13ed0 x24: ffff0006f5e13ed0 x23: ffff0006f5e13ed0 x22: dead000000000122 x21: ffff0006f5e3a080 x20: ffff0006f5df2938 x19: ffff0006f5df2980 x18: 0000000000000003 x17: 0000000000000000 x16: 0000000000000016 x15: 0000000000000003 x14: 00000000000393c0 x13: ffff800011a5ec18 x12: ffff800011d8d000 x11: ffff0006f83fcc68 x10: ffff800011a53d70 x9 : ffff8000111f3000 x8 : 0000000000000000 x7 : 0000000000210d00 x6 : 0000000000000000 x5 : ffff800010872e60 x4 : 0000000000000004 x3 : 0000000078068000 x2 : ffff800012781000 x1 : 0000000000002c00 x0 : 0000000000000000 Call trace: vsp1_dlm_destroy+0xe4/0x11c vsp1_wpf_destroy+0x10/0x20 vsp1_entity_destroy+0x24/0x4c vsp1_destroy_entities+0x54/0x130 vsp1_remove+0x1c/0x40 platform_drv_remove+0x28/0x50 __device_release_driver+0x178/0x220 device_driver_detach+0x44/0xc0 unbind_store+0xe0/0x104 drv_attr_store+0x20/0x30 sysfs_kf_write+0x48/0x70 kernfs_fop_write+0x148/0x230 __vfs_write+0x18/0x40 vfs_write+0xdc/0x1c4 ksys_write+0x68/0xf0 __arm64_sys_write+0x18/0x20 el0_svc_common.constprop.0+0x70/0x170 do_el0_svc+0x20/0x80 el0_sync_handler+0x134/0x1b0 el0_sync+0x140/0x180 Code: b40000c2 f9403a60 d2800084 a9400663 (f9401400) ---[ end trace 3875369841fb288a ]--- Fixes: f3b98e3c4d2e16 ("media: vsp1: Provide support for extended command pools") Cc: stable(a)vger.kernel.org # v4.19+ Signed-off-by: Eugeniu Rosca <erosca(a)de.adit-jv.com> Reviewed-by: Kieran Bingham <kieran.bingham+renesas(a)ideasonboard.com> Tested-by: Kieran Bingham <kieran.bingham+renesas(a)ideasonboard.com> --- Changes in v2: - Rephrased the description based on Kieran's proposal - Added the Reviewed-by/Tested-by signatures - No change in the contents --- drivers/media/platform/vsp1/vsp1_dl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/media/platform/vsp1/vsp1_dl.c b/drivers/media/platform/vsp1/vsp1_dl.c index d7b43037e500..e07b135613eb 100644 --- a/drivers/media/platform/vsp1/vsp1_dl.c +++ b/drivers/media/platform/vsp1/vsp1_dl.c @@ -431,6 +431,8 @@ vsp1_dl_cmd_pool_create(struct vsp1_device *vsp1, enum vsp1_extcmd_type type, if (!pool) return NULL; + pool->vsp1 = vsp1; + spin_lock_init(&pool->lock); INIT_LIST_HEAD(&pool->free); -- 2.26.2

5 years, 7 months

[PATCH v5 07/11] PCI: qcom: Define some PARF params needed for ipq8064 SoC

by Ansuel Smith

Set some specific value for Tx De-Emphasis, Tx Swing and Rx equalization needed on some ipq8064 based device (Netgear R7800 for example). Without this the system locks on kernel load. Fixes: 82a823833f4e ("PCI: qcom: Add Qualcomm PCIe controller driver") Signed-off-by: Ansuel Smith <ansuelsmth(a)gmail.com> Cc: stable(a)vger.kernel.org # v4.5+ Reviewed-by: Rob Herring <robh(a)kernel.org> --- drivers/pci/controller/dwc/pcie-qcom.c | 27 ++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index f2ea1ab6f584..f5398b0d270c 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -46,6 +46,9 @@ #define PCIE20_PARF_PHY_CTRL 0x40 #define PCIE20_PARF_PHY_REFCLK 0x4C +#define PHY_REFCLK_SSP_EN BIT(16) +#define PHY_REFCLK_USE_PAD BIT(12) + #define PCIE20_PARF_DBI_BASE_ADDR 0x168 #define PCIE20_PARF_SLV_ADDR_SPACE_SIZE 0x16C #define PCIE20_PARF_MHI_CLOCK_RESET_CTRL 0x174 @@ -77,6 +80,18 @@ #define DBI_RO_WR_EN 1 #define PERST_DELAY_US 1000 +/* PARF registers */ +#define PCIE20_PARF_PCS_DEEMPH 0x34 +#define PCS_DEEMPH_TX_DEEMPH_GEN1(x) ((x) << 16) +#define PCS_DEEMPH_TX_DEEMPH_GEN2_3_5DB(x) ((x) << 8) +#define PCS_DEEMPH_TX_DEEMPH_GEN2_6DB(x) ((x) << 0) + +#define PCIE20_PARF_PCS_SWING 0x38 +#define PCS_SWING_TX_SWING_FULL(x) ((x) << 8) +#define PCS_SWING_TX_SWING_LOW(x) ((x) << 0) + +#define PCIE20_PARF_CONFIG_BITS 0x50 +#define PHY_RX0_EQ(x) ((x) << 24) #define PCIE20_v3_PARF_SLV_ADDR_SPACE_SIZE 0x358 #define SLV_ADDR_SPACE_SZ 0x10000000 @@ -293,6 +308,7 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie) struct qcom_pcie_resources_2_1_0 *res = &pcie->res.v2_1_0; struct dw_pcie *pci = pcie->pci; struct device *dev = pci->dev; + struct device_node *node = dev->of_node; u32 val; int ret; @@ -347,6 +363,17 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie) val &= ~BIT(0); writel(val, pcie->parf + PCIE20_PARF_PHY_CTRL); + if (of_device_is_compatible(node, "qcom,pcie-ipq8064")) { + writel(PCS_DEEMPH_TX_DEEMPH_GEN1(24) | + PCS_DEEMPH_TX_DEEMPH_GEN2_3_5DB(24) | + PCS_DEEMPH_TX_DEEMPH_GEN2_6DB(34), + pcie->parf + PCIE20_PARF_PCS_DEEMPH); + writel(PCS_SWING_TX_SWING_FULL(120) | + PCS_SWING_TX_SWING_LOW(120), + pcie->parf + PCIE20_PARF_PCS_SWING); + writel(PHY_RX0_EQ(4), pcie->parf + PCIE20_PARF_CONFIG_BITS); + } + /* enable external reference clock */ val = readl(pcie->parf + PCIE20_PARF_PHY_REFCLK); val |= BIT(16); -- 2.25.1

5 years, 7 months

[PATCH 5.4 00/38] 5.4.45-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.4.45 release. There are 38 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 Sun, 07 Jun 2020 13:54:56 +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.45-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.45-rc1 Dinghao Liu <dinghao.liu(a)zju.edu.cn> net: smsc911x: Fix runtime PM imbalance on error Amit Cohen <amitc(a)mellanox.com> selftests: mlxsw: qos_mc_aware: Specify arping timeout as an integer Jonathan McDowell <noodles(a)earth.li> net: ethernet: stmmac: Enable interface clocks on probe for IPQ806x Valentin Longchamp <valentin(a)longchamp.me> net/ethernet/freescale: rework quiesce/activate for ucc_geth Chaitanya Kulkarni <chaitanya.kulkarni(a)wdc.com> null_blk: return error for invalid zone size Gerald Schaefer <gerald.schaefer(a)de.ibm.com> s390/mm: fix set_huge_pte_at() for empty ptes Jan Schmidt <jan(a)centricular.com> drm/edid: Add Oculus Rift S to non-desktop list Jeremy Kerr <jk(a)ozlabs.org> net: bmac: Fix read of MAC address from ROM Nathan Chancellor <natechancellor(a)gmail.com> x86/mmiotrace: Use cpumask_available() for cpumask_var_t variables Jens Axboe <axboe(a)kernel.dk> io_uring: initialize ctx->sqo_wait earlier Atsushi Nemoto <atsushi.nemoto(a)sord.co.jp> i2c: altera: Fix race between xfer_msg and isr thread Can Guo <cang(a)codeaurora.org> scsi: pm: Balance pm_only counter of request queue during system resume Madhuparna Bhowmik <madhuparnabhowmik10(a)gmail.com> evm: Fix RCU list related warnings Vineet Gupta <vgupta(a)synopsys.com> ARC: [plat-eznps]: Restrict to CONFIG_ISA_ARCOMPACT Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> ARC: Fix ICCM & DCCM runtime size checks Michal Kalderon <michal.kalderon(a)marvell.com> RDMA/qedr: Fix synchronization methods and memory leaks in qedr Michal Kalderon <michal.kalderon(a)marvell.com> RDMA/qedr: Fix qpids xarray api used Vasily Gorbik <gor(a)linux.ibm.com> s390/ftrace: save traced function caller Jaroslav Kysela <perex(a)perex.cz> ASoC: intel - fix the card names Xinwei Kong <kong.kongxinwei(a)hisilicon.com> spi: dw: use "smp_mb()" to avoid sending spi data error Christopher M. Riedl <cmr(a)informatik.wtf> powerpc/xmon: Restrict when kernel is locked down Anju T Sudhakar <anju(a)linux.vnet.ibm.com> powerpc/powernv: Avoid re-registration of imc debugfs directory Xiang Chen <chenxiang66(a)hisilicon.com> scsi: hisi_sas: Check sas_port before using it Lucas De Marchi <lucas.demarchi(a)intel.com> drm/i915: fix port checks for MST support on gen >= 11 Dan Carpenter <dan.carpenter(a)oracle.com> airo: Fix read overflows sending packets DENG Qingfang <dqfext(a)gmail.com> net: dsa: mt7530: set CPU port to fallback mode Can Guo <cang(a)codeaurora.org> scsi: ufs: Release clock if DMA map fails Sakari Ailus <sakari.ailus(a)linux.intel.com> media: staging: ipu3-imgu: Move alignment attribute to field Sakari Ailus <sakari.ailus(a)linux.intel.com> media: Revert "staging: imgu: Address a compiler warning on alignment" Jérôme Pouiller <jerome.pouiller(a)silabs.com> mmc: fix compilation of user API Daniel Axtens <dja(a)axtens.net> kernel/relay.c: handle alloc_percpu returning NULL in relay_open Matthew Garrett <matthewgarrett(a)google.com> mt76: mt76x02u: Add support for newer versions of the XBox One wifi adapter Giuseppe Marco Randazzo <gmrandazzo(a)gmail.com> p54usb: add AirVasT USB stick device-id Julian Sax <jsbc(a)gmx.de> HID: i2c-hid: add Schneider SCL142ALM to descriptor override Benjamin Tissoires <benjamin.tissoires(a)redhat.com> HID: multitouch: enable multi-input as a quirk for some devices Scott Shumate <scott.shumate(a)gmail.com> HID: sony: Fix for broken buttons on DS3 USB dongles Fan Yang <Fan_Yang(a)sjtu.edu.cn> mm: Fix mremap not considering huge pmd devmap Tejun Heo <tj(a)kernel.org> Revert "cgroup: Add memory barriers to plug cgroup_rstat_updated() race window" ------------- Diffstat: Makefile | 4 +- arch/arc/kernel/setup.c | 5 +- arch/arc/plat-eznps/Kconfig | 1 + arch/powerpc/platforms/powernv/opal-imc.c | 39 +++--- arch/powerpc/xmon/xmon.c | 103 +++++++++++--- arch/s390/kernel/mcount.S | 1 + arch/s390/mm/hugetlbpage.c | 9 +- arch/x86/include/asm/pgtable.h | 1 + arch/x86/mm/mmio-mod.c | 4 +- drivers/block/null_blk_zoned.c | 4 + drivers/gpu/drm/drm_edid.c | 3 +- drivers/gpu/drm/i915/display/intel_dp.c | 7 +- drivers/gpu/drm/i915/display/intel_dp_mst.c | 22 ++- drivers/hid/hid-multitouch.c | 26 ++++ drivers/hid/hid-sony.c | 17 +++ drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 8 ++ drivers/i2c/busses/i2c-altera.c | 10 +- drivers/infiniband/hw/qedr/main.c | 2 +- drivers/infiniband/hw/qedr/qedr.h | 23 +++- drivers/infiniband/hw/qedr/qedr_iw_cm.c | 148 ++++++++++++++------- drivers/infiniband/hw/qedr/verbs.c | 64 +++++---- drivers/net/dsa/mt7530.c | 11 +- drivers/net/dsa/mt7530.h | 6 + drivers/net/ethernet/apple/bmac.c | 2 +- drivers/net/ethernet/freescale/ucc_geth.c | 13 +- drivers/net/ethernet/smsc/smsc911x.c | 9 +- .../net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 13 ++ drivers/net/wireless/cisco/airo.c | 12 ++ drivers/net/wireless/intersil/p54/p54usb.c | 1 + drivers/net/wireless/mediatek/mt76/mt76x02.h | 1 + drivers/net/wireless/mediatek/mt76/mt76x2/usb.c | 1 + drivers/scsi/hisi_sas/hisi_sas_main.c | 3 +- drivers/scsi/scsi_pm.c | 10 +- drivers/scsi/ufs/ufshcd.c | 1 + drivers/spi/spi-dw.c | 3 + drivers/staging/media/ipu3/include/intel-ipu3.h | 7 +- fs/io_uring.c | 2 +- include/linux/security.h | 2 + include/uapi/linux/mmc/ioctl.h | 1 + kernel/cgroup/rstat.c | 16 +-- kernel/relay.c | 5 + mm/mremap.c | 2 +- security/integrity/evm/evm_crypto.c | 2 +- security/integrity/evm/evm_main.c | 4 +- security/integrity/evm/evm_secfs.c | 9 +- security/lockdown/lockdown.c | 2 + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +- sound/soc/intel/boards/skl_hda_dsp_generic.c | 2 +- sound/soc/intel/boards/sof_rt5682.c | 2 +- .../selftests/drivers/net/mlxsw/qos_mc_aware.sh | 2 +- 50 files changed, 461 insertions(+), 186 deletions(-)

5 years, 7 months

[PATCH 5.6 00/43] 5.6.17-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.6.17 release. There are 43 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 Sun, 07 Jun 2020 13:54:56 +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.6.17-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.6.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.6.17-rc1 Dan Carpenter <dan.carpenter(a)oracle.com> airo: Fix read overflows sending packets DENG Qingfang <dqfext(a)gmail.com> net: dsa: mt7530: set CPU port to fallback mode Sakari Ailus <sakari.ailus(a)linux.intel.com> media: staging: ipu3-imgu: Move alignment attribute to field Sakari Ailus <sakari.ailus(a)linux.intel.com> media: Revert "staging: imgu: Address a compiler warning on alignment" Jérôme Pouiller <jerome.pouiller(a)silabs.com> mmc: fix compilation of user API Daniel Axtens <dja(a)axtens.net> kernel/relay.c: handle alloc_percpu returning NULL in relay_open Herbert Xu <herbert(a)gondor.apana.org.au> crypto: api - Fix use-after-free and race in crypto_spawn_alg Matthew Garrett <matthewgarrett(a)google.com> mt76: mt76x02u: Add support for newer versions of the XBox One wifi adapter Giuseppe Marco Randazzo <gmrandazzo(a)gmail.com> p54usb: add AirVasT USB stick device-id Julian Sax <jsbc(a)gmx.de> HID: i2c-hid: add Schneider SCL142ALM to descriptor override Benjamin Tissoires <benjamin.tissoires(a)redhat.com> HID: multitouch: enable multi-input as a quirk for some devices Scott Shumate <scott.shumate(a)gmail.com> HID: sony: Fix for broken buttons on DS3 USB dongles Fan Yang <Fan_Yang(a)sjtu.edu.cn> mm: Fix mremap not considering huge pmd devmap Dinghao Liu <dinghao.liu(a)zju.edu.cn> net: smsc911x: Fix runtime PM imbalance on error Tiezhu Yang <yangtiezhu(a)loongson.cn> net: Fix return value about devm_platform_ioremap_resource() Amit Cohen <amitc(a)mellanox.com> selftests: mlxsw: qos_mc_aware: Specify arping timeout as an integer Jonathan McDowell <noodles(a)earth.li> net: ethernet: stmmac: Enable interface clocks on probe for IPQ806x Valentin Longchamp <valentin(a)longchamp.me> net/ethernet/freescale: rework quiesce/activate for ucc_geth Wei Yongjun <weiyongjun1(a)huawei.com> net: ethernet: ti: fix some return value check of cpsw_ale_create() Chaitanya Kulkarni <chaitanya.kulkarni(a)wdc.com> null_blk: return error for invalid zone size Jason A. Donenfeld <Jason(a)zx2c4.com> wireguard: selftests: use newer iproute2 for gcc-10 Kefeng Wang <wangkefeng.wang(a)huawei.com> riscv: Fix print_vm_layout build error if NOMMU Vladimir Stempen <vladimir.stempen(a)amd.com> drm/amd/display: DP training to set properly SCRAMBLING_DISABLE Xiaoguang Wang <xiaoguang.wang(a)linux.alibaba.com> io_uring: reset -EBUSY error when io sq thread is waken up Gerald Schaefer <gerald.schaefer(a)de.ibm.com> s390/mm: fix set_huge_pte_at() for empty ptes Jan Schmidt <jan(a)centricular.com> drm/edid: Add Oculus Rift S to non-desktop list Jeremy Kerr <jk(a)ozlabs.org> net: bmac: Fix read of MAC address from ROM Nathan Chancellor <natechancellor(a)gmail.com> x86/mmiotrace: Use cpumask_available() for cpumask_var_t variables Leon Romanovsky <leon(a)kernel.org> net: phy: propagate an error back to the callers of phy_sfp_probe Pavel Begunkov <asml.silence(a)gmail.com> io_uring: fix FORCE_ASYNC req preparation Pavel Begunkov <asml.silence(a)gmail.com> io_uring: don't prepare DRAIN reqs twice Jens Axboe <axboe(a)kernel.dk> io_uring: initialize ctx->sqo_wait earlier Atsushi Nemoto <atsushi.nemoto(a)sord.co.jp> i2c: altera: Fix race between xfer_msg and isr thread Peter Ujfalusi <peter.ujfalusi(a)ti.com> dmaengine: ti: k3-udma: Fix TR mode flags for slave_sg and memcpy Vitaly Kuznetsov <vkuznets(a)redhat.com> x86/hyperv: Properly suspend/resume reenlightenment notifications Dave Young <dyoung(a)redhat.com> efi/earlycon: Fix early printk for wider fonts Can Guo <cang(a)codeaurora.org> scsi: pm: Balance pm_only counter of request queue during system resume Madhuparna Bhowmik <madhuparnabhowmik10(a)gmail.com> evm: Fix RCU list related warnings Heinrich Schuchardt <xypron.glpk(a)gmx.de> efi/libstub: Avoid returning uninitialized data from setup_graphics() Vineet Gupta <vgupta(a)synopsys.com> ARC: [plat-eznps]: Restrict to CONFIG_ISA_ARCOMPACT Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> ARC: Fix ICCM & DCCM runtime size checks Tejun Heo <tj(a)kernel.org> Revert "cgroup: Add memory barriers to plug cgroup_rstat_updated() race window" Andy Lutomirski <luto(a)kernel.org> x86/syscalls: Revert "x86/syscalls: Make __X32_SYSCALL_BIT be unsigned long" ------------- Diffstat: Makefile | 4 ++-- arch/arc/kernel/setup.c | 5 ++-- arch/arc/plat-eznps/Kconfig | 1 + arch/riscv/mm/init.c | 2 +- arch/s390/mm/hugetlbpage.c | 9 ++++--- arch/x86/hyperv/hv_init.c | 19 +++++++++++++-- arch/x86/include/asm/pgtable.h | 1 + arch/x86/include/uapi/asm/unistd.h | 11 +++++++-- arch/x86/mm/mmio-mod.c | 4 ++-- crypto/algapi.c | 22 ++++++++++++----- crypto/api.c | 3 ++- crypto/internal.h | 1 + drivers/block/null_blk_zoned.c | 4 ++++ drivers/dma/ti/k3-udma.c | 6 +++-- drivers/firmware/efi/earlycon.c | 14 ++++++----- drivers/firmware/efi/libstub/arm-stub.c | 6 ++++- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 27 +++++++++++++++++++++ drivers/gpu/drm/drm_edid.c | 3 ++- drivers/hid/hid-multitouch.c | 26 ++++++++++++++++++++ drivers/hid/hid-sony.c | 17 +++++++++++++ drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 8 +++++++ drivers/i2c/busses/i2c-altera.c | 10 +++++++- drivers/net/can/ifi_canfd/ifi_canfd.c | 5 +++- drivers/net/can/sun4i_can.c | 2 +- drivers/net/dsa/b53/b53_srab.c | 2 +- drivers/net/dsa/mt7530.c | 11 ++++++--- drivers/net/dsa/mt7530.h | 6 +++++ drivers/net/ethernet/apple/bmac.c | 2 +- drivers/net/ethernet/freescale/ucc_geth.c | 13 +++++----- drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- drivers/net/ethernet/smsc/smsc911x.c | 9 +++---- .../net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 13 ++++++++++ drivers/net/ethernet/ti/cpsw_ale.c | 2 +- drivers/net/ethernet/ti/cpsw_priv.c | 4 ++-- drivers/net/ethernet/ti/netcp_ethss.c | 4 ++-- drivers/net/phy/phy_device.c | 4 ++-- drivers/net/wireless/cisco/airo.c | 12 ++++++++++ drivers/net/wireless/intersil/p54/p54usb.c | 1 + drivers/net/wireless/mediatek/mt76/mt76x02.h | 1 + drivers/net/wireless/mediatek/mt76/mt76x2/usb.c | 1 + drivers/scsi/scsi_pm.c | 10 ++++++-- drivers/staging/media/ipu3/include/intel-ipu3.h | 7 +++--- fs/io_uring.c | 28 ++++++++++++++-------- include/uapi/linux/mmc/ioctl.h | 1 + kernel/cgroup/rstat.c | 16 +++---------- kernel/relay.c | 5 ++++ mm/mremap.c | 2 +- security/integrity/evm/evm_crypto.c | 2 +- security/integrity/evm/evm_main.c | 4 ++-- security/integrity/evm/evm_secfs.c | 9 ++++++- tools/arch/x86/include/uapi/asm/unistd.h | 2 +- .../selftests/drivers/net/mlxsw/qos_mc_aware.sh | 2 +- tools/testing/selftests/wireguard/qemu/Makefile | 2 +- 53 files changed, 294 insertions(+), 93 deletions(-)

5 years, 7 months

[PATCH v2] ACPI: Drop rcu usage for MMIO mappings

by Dan Williams

Recently a performance problem was reported for a process invoking a non-trival ASL program. The method call in this case ends up repetitively triggering a call path like: acpi_ex_store acpi_ex_store_object_to_node acpi_ex_write_data_to_field acpi_ex_insert_into_field acpi_ex_write_with_update_rule acpi_ex_field_datum_io acpi_ex_access_region acpi_ev_address_space_dispatch acpi_ex_system_memory_space_handler acpi_os_map_cleanup.part.14 _synchronize_rcu_expedited.constprop.89 schedule The end result of frequent synchronize_rcu_expedited() invocation is tiny sub-millisecond spurts of execution where the scheduler freely migrates this apparently sleepy task. The overhead of frequent scheduler invocation multiplies the execution time by a factor of 2-3X. For example, performance improves from 16 minutes to 7 minutes for a firmware update procedure across 24 devices. Perhaps the rcu usage was intended to allow for not taking a sleeping lock in the acpi_os_{read,write}_memory() path which ostensibly could be called from an APEI NMI error interrupt? Neither rcu_read_lock() nor ioremap() are interrupt safe, so add a WARN_ONCE() to validate that rcu was not serving as a mechanism to avoid direct calls to ioremap(). Even the original implementation had a spin_lock_irqsave(), but that is not NMI safe. APEI itself already has some concept of avoiding ioremap() from interrupt context (see erst_exec_move_data()), if the new warning triggers it means that APEI either needs more instrumentation like that to pre-emptively fail, or more infrastructure to arrange for pre-mapping the resources it needs in NMI context. Cc: <stable(a)vger.kernel.org> Fixes: 620242ae8c3d ("ACPI: Maintain a list of ACPI memory mapped I/O remappings") Cc: Len Brown <lenb(a)kernel.org> Cc: Borislav Petkov <bp(a)alien8.de> Cc: Ira Weiny <ira.weiny(a)intel.com> Cc: James Morse <james.morse(a)arm.com> Cc: Erik Kaneda <erik.kaneda(a)intel.com> Cc: Myron Stowe <myron.stowe(a)redhat.com> Cc: "Rafael J. Wysocki" <rjw(a)rjwysocki.net> Cc: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> Signed-off-by: Dan Williams <dan.j.williams(a)intel.com> --- Changes since v1 [1]: - Actually cc: the most important list for ACPI changes (Rafael) - Cleanup unnecessary variable initialization (Andy) Link: https://lore.kernel.org/linux-nvdimm/158880834905.2183490.15616329469420234… drivers/acpi/osl.c | 117 +++++++++++++++++++++++++--------------------------- 1 file changed, 57 insertions(+), 60 deletions(-) diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 762c5d50b8fe..a44b75aac5d0 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -214,13 +214,13 @@ acpi_physical_address __init acpi_os_get_root_pointer(void) return pa; } -/* Must be called with 'acpi_ioremap_lock' or RCU read lock held. */ static struct acpi_ioremap * acpi_map_lookup(acpi_physical_address phys, acpi_size size) { struct acpi_ioremap *map; - list_for_each_entry_rcu(map, &acpi_ioremaps, list, acpi_ioremap_lock_held()) + lockdep_assert_held(&acpi_ioremap_lock); + list_for_each_entry(map, &acpi_ioremaps, list) if (map->phys <= phys && phys + size <= map->phys + map->size) return map; @@ -228,7 +228,6 @@ acpi_map_lookup(acpi_physical_address phys, acpi_size size) return NULL; } -/* Must be called with 'acpi_ioremap_lock' or RCU read lock held. */ static void __iomem * acpi_map_vaddr_lookup(acpi_physical_address phys, unsigned int size) { @@ -263,7 +262,8 @@ acpi_map_lookup_virt(void __iomem *virt, acpi_size size) { struct acpi_ioremap *map; - list_for_each_entry_rcu(map, &acpi_ioremaps, list, acpi_ioremap_lock_held()) + lockdep_assert_held(&acpi_ioremap_lock); + list_for_each_entry(map, &acpi_ioremaps, list) if (map->virt <= virt && virt + size <= map->virt + map->size) return map; @@ -360,7 +360,7 @@ void __iomem __ref map->size = pg_sz; map->refcount = 1; - list_add_tail_rcu(&map->list, &acpi_ioremaps); + list_add_tail(&map->list, &acpi_ioremaps); out: mutex_unlock(&acpi_ioremap_lock); @@ -374,20 +374,13 @@ void *__ref acpi_os_map_memory(acpi_physical_address phys, acpi_size size) } EXPORT_SYMBOL_GPL(acpi_os_map_memory); -/* Must be called with mutex_lock(&acpi_ioremap_lock) */ -static unsigned long acpi_os_drop_map_ref(struct acpi_ioremap *map) -{ - unsigned long refcount = --map->refcount; - - if (!refcount) - list_del_rcu(&map->list); - return refcount; -} - -static void acpi_os_map_cleanup(struct acpi_ioremap *map) +static void acpi_os_drop_map_ref(struct acpi_ioremap *map) { - synchronize_rcu_expedited(); + lockdep_assert_held(&acpi_ioremap_lock); + if (--map->refcount > 0) + return; acpi_unmap(map->phys, map->virt); + list_del(&map->list); kfree(map); } @@ -408,7 +401,6 @@ static void acpi_os_map_cleanup(struct acpi_ioremap *map) void __ref acpi_os_unmap_iomem(void __iomem *virt, acpi_size size) { struct acpi_ioremap *map; - unsigned long refcount; if (!acpi_permanent_mmap) { __acpi_unmap_table(virt, size); @@ -422,11 +414,8 @@ void __ref acpi_os_unmap_iomem(void __iomem *virt, acpi_size size) WARN(true, PREFIX "%s: bad address %p\n", __func__, virt); return; } - refcount = acpi_os_drop_map_ref(map); + acpi_os_drop_map_ref(map); mutex_unlock(&acpi_ioremap_lock); - - if (!refcount) - acpi_os_map_cleanup(map); } EXPORT_SYMBOL_GPL(acpi_os_unmap_iomem); @@ -461,7 +450,6 @@ void acpi_os_unmap_generic_address(struct acpi_generic_address *gas) { u64 addr; struct acpi_ioremap *map; - unsigned long refcount; if (gas->space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) return; @@ -477,11 +465,8 @@ void acpi_os_unmap_generic_address(struct acpi_generic_address *gas) mutex_unlock(&acpi_ioremap_lock); return; } - refcount = acpi_os_drop_map_ref(map); + acpi_os_drop_map_ref(map); mutex_unlock(&acpi_ioremap_lock); - - if (!refcount) - acpi_os_map_cleanup(map); } EXPORT_SYMBOL(acpi_os_unmap_generic_address); @@ -700,55 +685,71 @@ int acpi_os_read_iomem(void __iomem *virt_addr, u64 *value, u32 width) return 0; } +static void __iomem *acpi_os_rw_map(acpi_physical_address phys_addr, + unsigned int size, bool *did_fallback) +{ + void __iomem *virt_addr; + + if (WARN_ONCE(in_interrupt(), "ioremap in interrupt context\n")) + return NULL; + + /* Try to use a cached mapping and fallback otherwise */ + *did_fallback = false; + mutex_lock(&acpi_ioremap_lock); + virt_addr = acpi_map_vaddr_lookup(phys_addr, size); + if (virt_addr) + return virt_addr; + mutex_unlock(&acpi_ioremap_lock); + + virt_addr = acpi_os_ioremap(phys_addr, size); + *did_fallback = true; + + return virt_addr; +} + +static void acpi_os_rw_unmap(void __iomem *virt_addr, bool did_fallback) +{ + if (did_fallback) { + /* in the fallback case no lock is held */ + iounmap(virt_addr); + return; + } + + mutex_unlock(&acpi_ioremap_lock); +} + acpi_status acpi_os_read_memory(acpi_physical_address phys_addr, u64 *value, u32 width) { - void __iomem *virt_addr; unsigned int size = width / 8; - bool unmap = false; + bool did_fallback = false; + void __iomem *virt_addr; u64 dummy; int error; - rcu_read_lock(); - virt_addr = acpi_map_vaddr_lookup(phys_addr, size); - if (!virt_addr) { - rcu_read_unlock(); - virt_addr = acpi_os_ioremap(phys_addr, size); - if (!virt_addr) - return AE_BAD_ADDRESS; - unmap = true; - } - + virt_addr = acpi_os_rw_map(phys_addr, size, &did_fallback); + if (!virt_addr) + return AE_BAD_ADDRESS; if (!value) value = &dummy; error = acpi_os_read_iomem(virt_addr, value, width); BUG_ON(error); - if (unmap) - iounmap(virt_addr); - else - rcu_read_unlock(); - + acpi_os_rw_unmap(virt_addr, did_fallback); return AE_OK; } acpi_status acpi_os_write_memory(acpi_physical_address phys_addr, u64 value, u32 width) { - void __iomem *virt_addr; unsigned int size = width / 8; - bool unmap = false; + bool did_fallback = false; + void __iomem *virt_addr; - rcu_read_lock(); - virt_addr = acpi_map_vaddr_lookup(phys_addr, size); - if (!virt_addr) { - rcu_read_unlock(); - virt_addr = acpi_os_ioremap(phys_addr, size); - if (!virt_addr) - return AE_BAD_ADDRESS; - unmap = true; - } + virt_addr = acpi_os_rw_map(phys_addr, size, &did_fallback); + if (!virt_addr) + return AE_BAD_ADDRESS; switch (width) { case 8: @@ -767,11 +768,7 @@ acpi_os_write_memory(acpi_physical_address phys_addr, u64 value, u32 width) BUG(); } - if (unmap) - iounmap(virt_addr); - else - rcu_read_unlock(); - + acpi_os_rw_unmap(virt_addr, did_fallback); return AE_OK; }

5 years, 7 months

✅ PASS: Test report for kernel 5.6.17-rc1-cb5634c.cki (stable)

by CKI Project

Hello, We ran automated tests on a recent commit from this kernel tree: Kernel repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Commit: cb5634cad7d5 - Linux 5.6.17-rc1 The results of these automated tests are provided below. Overall result: PASSED Merge: OK Compile: OK Tests: OK All kernel binaries, config files, and logs are available for download here: https://cki-artifacts.s3.us-east-2.amazonaws.com/index.html?prefix=dataware… Please reply to this email if you have any questions about the tests that we ran or if you have any suggestions on how to make future tests more effective. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' ______________________________________________________________________________ Compile testing --------------- We compiled the kernel for 4 architectures: aarch64: make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg ppc64le: make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg s390x: make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg x86_64: make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg Hardware testing ---------------- We booted each kernel and ran the following tests: aarch64: Host 1: ✅ Boot test ✅ Podman system integration test - as root ✅ Podman system integration test - as user ✅ LTP ✅ Loopdev Sanity ✅ Memory function: memfd_create ✅ AMTU (Abstract Machine Test Utility) ✅ Networking bridge: sanity ✅ Ethernet drivers sanity ✅ Networking socket: fuzz ✅ Networking: igmp conformance test ✅ Networking route: pmtu ✅ Networking route_func - local ✅ Networking route_func - forward ✅ Networking TCP: keepalive test ✅ Networking UDP: socket ✅ Networking tunnel: geneve basic test ✅ Networking tunnel: gre basic ✅ L2TP basic test ✅ Networking tunnel: vxlan basic ✅ Networking ipsec: basic netns - transport ✅ Networking ipsec: basic netns - tunnel ✅ Libkcapi AF_ALG test ✅ pciutils: update pci ids test ✅ ALSA PCM loopback test ✅ ALSA Control (mixer) Userspace Element test ✅ storage: SCSI VPD 🚧 ✅ CIFS Connectathon 🚧 ✅ POSIX pjd-fstest suites 🚧 ✅ jvm - DaCapo Benchmark Suite 🚧 ✅ jvm - jcstress tests 🚧 ✅ Memory function: kaslr 🚧 ✅ Networking firewall: basic netfilter test 🚧 ✅ audit: audit testsuite test 🚧 ✅ trace: ftrace/tracer 🚧 ✅ kdump - kexec_boot Host 2: ✅ Boot test ✅ xfstests - ext4 ✅ xfstests - xfs ✅ selinux-policy: serge-testsuite ✅ storage: software RAID testing 🚧 ✅ IPMI driver test 🚧 ✅ IPMItool loop stress test 🚧 ✅ Storage blktests ppc64le: Host 1: ✅ Boot test ✅ Podman system integration test - as root ✅ Podman system integration test - as user ✅ LTP ✅ Loopdev Sanity ✅ Memory function: memfd_create ✅ AMTU (Abstract Machine Test Utility) ✅ Networking bridge: sanity ✅ Ethernet drivers sanity ✅ Networking socket: fuzz ✅ Networking route: pmtu ✅ Networking route_func - local ✅ Networking route_func - forward ✅ Networking TCP: keepalive test ✅ Networking UDP: socket ✅ Networking tunnel: geneve basic test ✅ Networking tunnel: gre basic ✅ L2TP basic test ✅ Networking tunnel: vxlan basic ✅ Networking ipsec: basic netns - tunnel ✅ Libkcapi AF_ALG test ✅ pciutils: update pci ids test ✅ ALSA PCM loopback test ✅ ALSA Control (mixer) Userspace Element test 🚧 ✅ CIFS Connectathon 🚧 ✅ POSIX pjd-fstest suites 🚧 ✅ jvm - DaCapo Benchmark Suite 🚧 ✅ jvm - jcstress tests 🚧 ✅ Memory function: kaslr 🚧 ✅ Networking firewall: basic netfilter test 🚧 ✅ audit: audit testsuite test 🚧 ✅ trace: ftrace/tracer Host 2: ✅ Boot test 🚧 ✅ kdump - sysrq-c Host 3: ✅ Boot test ✅ xfstests - ext4 ✅ xfstests - xfs ✅ selinux-policy: serge-testsuite ✅ storage: software RAID testing 🚧 ✅ IPMI driver test 🚧 ✅ IPMItool loop stress test 🚧 ✅ Storage blktests s390x: Host 1: ✅ Boot test 🚧 ✅ kdump - sysrq-c Host 2: ✅ Boot test ✅ selinux-policy: serge-testsuite ✅ stress: stress-ng 🚧 ✅ Storage blktests Host 3: ⚡ Internal infrastructure issues prevented one or more tests (marked with ⚡⚡⚡) from running on this architecture. This is not the fault of the kernel that was tested. ✅ Boot test ✅ Podman system integration test - as root ✅ Podman system integration test - as user ⚡⚡⚡ LTP ⚡⚡⚡ Loopdev Sanity ⚡⚡⚡ Memory function: memfd_create ⚡⚡⚡ Networking bridge: sanity ⚡⚡⚡ Ethernet drivers sanity ⚡⚡⚡ Networking route: pmtu ⚡⚡⚡ Networking route_func - local ⚡⚡⚡ Networking route_func - forward ⚡⚡⚡ Networking TCP: keepalive test ⚡⚡⚡ Networking UDP: socket ⚡⚡⚡ Networking tunnel: geneve basic test ⚡⚡⚡ Networking tunnel: gre basic ⚡⚡⚡ L2TP basic test ⚡⚡⚡ Networking tunnel: vxlan basic ⚡⚡⚡ Networking ipsec: basic netns - transport ⚡⚡⚡ Networking ipsec: basic netns - tunnel ⚡⚡⚡ Libkcapi AF_ALG test 🚧 ⚡⚡⚡ CIFS Connectathon 🚧 ⚡⚡⚡ POSIX pjd-fstest suites 🚧 ⚡⚡⚡ jvm - DaCapo Benchmark Suite 🚧 ⚡⚡⚡ jvm - jcstress tests 🚧 ⚡⚡⚡ Memory function: kaslr 🚧 ⚡⚡⚡ Networking firewall: basic netfilter test 🚧 ⚡⚡⚡ audit: audit testsuite test 🚧 ⚡⚡⚡ trace: ftrace/tracer 🚧 ⚡⚡⚡ kdump - kexec_boot Host 4: ⚡ Internal infrastructure issues prevented one or more tests (marked with ⚡⚡⚡) from running on this architecture. This is not the fault of the kernel that was tested. ✅ Boot test ✅ Podman system integration test - as root ✅ Podman system integration test - as user ✅ LTP ✅ Loopdev Sanity ✅ Memory function: memfd_create ✅ Networking bridge: sanity ✅ Ethernet drivers sanity ✅ Networking route: pmtu ✅ Networking route_func - local ✅ Networking route_func - forward ✅ Networking TCP: keepalive test ✅ Networking UDP: socket ✅ Networking tunnel: geneve basic test ✅ Networking tunnel: gre basic ✅ L2TP basic test ✅ Networking tunnel: vxlan basic ✅ Networking ipsec: basic netns - transport ✅ Networking ipsec: basic netns - tunnel ✅ Libkcapi AF_ALG test 🚧 ✅ CIFS Connectathon 🚧 ✅ POSIX pjd-fstest suites 🚧 ✅ jvm - DaCapo Benchmark Suite 🚧 ✅ jvm - jcstress tests 🚧 ✅ Memory function: kaslr 🚧 ✅ Networking firewall: basic netfilter test 🚧 ⚡⚡⚡ audit: audit testsuite test 🚧 ✅ trace: ftrace/tracer 🚧 ✅ kdump - kexec_boot x86_64: Host 1: ✅ Boot test 🚧 ✅ kdump - sysrq-c Host 2: ✅ Boot test ✅ xfstests - ext4 ✅ xfstests - xfs ✅ selinux-policy: serge-testsuite ✅ storage: software RAID testing ✅ stress: stress-ng 🚧 ✅ CPU: Frequency Driver Test 🚧 ✅ CPU: Idle Test 🚧 ✅ IOMMU boot test 🚧 ✅ IPMI driver test 🚧 ✅ IPMItool loop stress test 🚧 ✅ Storage blktests Host 3: ✅ Boot test ✅ Podman system integration test - as root ✅ Podman system integration test - as user ✅ LTP ✅ Loopdev Sanity ✅ Memory function: memfd_create ✅ AMTU (Abstract Machine Test Utility) ✅ Networking bridge: sanity ✅ Ethernet drivers sanity ✅ Networking socket: fuzz ✅ Networking: igmp conformance test ✅ Networking route: pmtu ✅ Networking route_func - local ✅ Networking route_func - forward ✅ Networking TCP: keepalive test ✅ Networking UDP: socket ✅ Networking tunnel: geneve basic test ✅ Networking tunnel: gre basic ✅ L2TP basic test ✅ Networking tunnel: vxlan basic ✅ Networking ipsec: basic netns - transport ✅ Networking ipsec: basic netns - tunnel ✅ Libkcapi AF_ALG test ✅ pciutils: sanity smoke test ✅ pciutils: update pci ids test ✅ ALSA PCM loopback test ✅ ALSA Control (mixer) Userspace Element test ✅ storage: SCSI VPD 🚧 ✅ CIFS Connectathon 🚧 ✅ POSIX pjd-fstest suites 🚧 ✅ jvm - DaCapo Benchmark Suite 🚧 ✅ jvm - jcstress tests 🚧 ✅ Memory function: kaslr 🚧 ✅ Networking firewall: basic netfilter test 🚧 ✅ audit: audit testsuite test 🚧 ✅ trace: ftrace/tracer 🚧 ✅ kdump - kexec_boot Test sources: https://github.com/CKI-project/tests-beaker 💚 Pull requests are welcome for new tests or improvements to existing tests! Aborted tests ------------- Tests that didn't complete running successfully are marked with ⚡⚡⚡. If this was caused by an infrastructure issue, we try to mark that explicitly in the report. Waived tests ------------ If the test run included waived tests, they are marked with 🚧. Such tests are executed but their results are not taken into account. Tests are waived when their results are not reliable enough, e.g. when they're just introduced or are being fixed. Testing timeout --------------- We aim to provide a report within reasonable timeframe. Tests that haven't finished running yet are marked with ⏱.

5 years, 7 months

stable-rc/linux-4.19.y baseline: 61 runs, 1 regressions (v4.19.126-29-g65151bf9f715)

by kernelci.org bot

stable-rc/linux-4.19.y baseline: 61 runs, 1 regressions (v4.19.126-29-g65151bf9f715) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | results ------------+------+---------------+----------+---------------------+-------- omap4-panda | arm | lab-collabora | gcc-8 | omap2plus_defconfig | 4/5 Details: https://kernelci.org/test/job/stable-rc/branch/linux-4.19.y/kernel/v4.19.12… Test: baseline Tree: stable-rc Branch: linux-4.19.y Describe: v4.19.126-29-g65151bf9f715 URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: 65151bf9f715983d62613a4d9196525eb64dda53 Test Regressions ---------------- platform | arch | lab | compiler | defconfig | results ------------+------+---------------+----------+---------------------+-------- omap4-panda | arm | lab-collabora | gcc-8 | omap2plus_defconfig | 4/5 Details: https://kernelci.org/test/plan/id/5edab2d8d39c317b9097bf13 Results: 4 PASS, 1 FAIL, 0 SKIP Full config: omap2plus_defconfig Compiler: gcc-8 (arm-linux-gnueabihf-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/linux-4.19.y/v4.19.126-29-g65151bf9… HTML log: https://storage.kernelci.org//stable-rc/linux-4.19.y/v4.19.126-29-g65151bf9… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2019.02-11-g17e793f… * baseline.dmesg.emerg: https://kernelci.org/test/case/id/5edab2d8d39c317b9097bf18 new failure (last pass: v4.19.126) 2 lines

5 years, 7 months

[PATCH] kbuild: force to build vmlinux if CONFIG_MODVERSION=y

by Masahiro Yamada

This code does not work as stated in the comment. $(CONFIG_MODVERSIONS) is always empty because it is expanded before include/config/auto.conf is included. Hence, 'make modules' with CONFIG_MODVERSION=y cannot record the version CRCs. This has been broken since 2003, commit ("kbuild: Enable modules to be build using the "make dir/" syntax"). [1] [1]: https://git.kernel.org/pub/scm/linux/kernel/git/history/history.git/commit/… Cc: linux-stable <stable(a)vger.kernel.org> # v2.5.71+ Signed-off-by: Masahiro Yamada <masahiroy(a)kernel.org> --- Makefile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 2df903429d31..b856f84e28c9 100644 --- a/Makefile +++ b/Makefile @@ -619,12 +619,8 @@ KBUILD_MODULES := KBUILD_BUILTIN := 1 # If we have only "make modules", don't compile built-in objects. -# When we're building modules with modversions, we need to consider -# the built-in objects during the descend as well, in order to -# make sure the checksums are up to date before we record them. - ifeq ($(MAKECMDGOALS),modules) - KBUILD_BUILTIN := $(if $(CONFIG_MODVERSIONS),1) + KBUILD_BUILTIN := endif # If we have "make <whatever> modules", compile modules @@ -1337,6 +1333,13 @@ ifdef CONFIG_MODULES all: modules +# When we're building modules with modversions, we need to consider +# the built-in objects during the descend as well, in order to +# make sure the checksums are up to date before we record them. +ifdef CONFIG_MODVERSIONS + KBUILD_BUILTIN := 1 +endif + # Build modules # # A module can be listed more than once in obj-m resulting in -- 2.25.1

5 years, 7 months

stable-rc/linux-5.4.y baseline: 118 runs, 3 regressions (v5.4.44-39-g0e4e419d5fc3)

by kernelci.org bot

stable-rc/linux-5.4.y baseline: 118 runs, 3 regressions (v5.4.44-39-g0e4e419d5fc3) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | results -----------------------------+-------+--------------+----------+-----------------+-------- at91-sama5d4_xplained | arm | lab-baylibre | gcc-8 | sama5_defconfig | 0/1 bcm2837-rpi-3-b | arm64 | lab-baylibre | gcc-8 | defconfig | 4/5 meson-gxl-s805x-libretech-ac | arm64 | lab-baylibre | gcc-8 | defconfig | 4/5 Details: https://kernelci.org/test/job/stable-rc/branch/linux-5.4.y/kernel/v5.4.44-3… Test: baseline Tree: stable-rc Branch: linux-5.4.y Describe: v5.4.44-39-g0e4e419d5fc3 URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: 0e4e419d5fc3f776cc5ac829737dd6020f89f2a6 Test Regressions ---------------- platform | arch | lab | compiler | defconfig | results -----------------------------+-------+--------------+----------+-----------------+-------- at91-sama5d4_xplained | arm | lab-baylibre | gcc-8 | sama5_defconfig | 0/1 Details: https://kernelci.org/test/plan/id/5eda977d64cb52356897bf09 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: sama5_defconfig Compiler: gcc-8 (arm-linux-gnueabihf-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/linux-5.4.y/v5.4.44-39-g0e4e419d5fc… HTML log: https://storage.kernelci.org//stable-rc/linux-5.4.y/v5.4.44-39-g0e4e419d5fc… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2019.02-11-g17e793f… * baseline.login: https://kernelci.org/test/case/id/5eda977d64cb52356897bf0a failing since 55 days (last pass: v5.4.30-54-g6f04e8ca5355, first fail: v5.4.30-81-gf163418797b9) platform | arch | lab | compiler | defconfig | results -----------------------------+-------+--------------+----------+-----------------+-------- bcm2837-rpi-3-b | arm64 | lab-baylibre | gcc-8 | defconfig | 4/5 Details: https://kernelci.org/test/plan/id/5eda9fa64cc47b33de97bf29 Results: 4 PASS, 1 FAIL, 0 SKIP Full config: defconfig Compiler: gcc-8 (aarch64-linux-gnu-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/linux-5.4.y/v5.4.44-39-g0e4e419d5fc… HTML log: https://storage.kernelci.org//stable-rc/linux-5.4.y/v5.4.44-39-g0e4e419d5fc… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2019.02-11-g17e793f… * baseline.dmesg.crit: https://kernelci.org/test/case/id/5eda9fa64cc47b33de97bf2c new failure (last pass: v5.4.44) 1 lines platform | arch | lab | compiler | defconfig | results -----------------------------+-------+--------------+----------+-----------------+-------- meson-gxl-s805x-libretech-ac | arm64 | lab-baylibre | gcc-8 | defconfig | 4/5 Details: https://kernelci.org/test/plan/id/5eda9ff4077dbb478c97bf40 Results: 4 PASS, 1 FAIL, 0 SKIP Full config: defconfig Compiler: gcc-8 (aarch64-linux-gnu-gcc (Debian 8.3.0-2) 8.3.0) Plain log: https://storage.kernelci.org//stable-rc/linux-5.4.y/v5.4.44-39-g0e4e419d5fc… HTML log: https://storage.kernelci.org//stable-rc/linux-5.4.y/v5.4.44-39-g0e4e419d5fc… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/kci-2019.02-11-g17e793f… * baseline.dmesg.emerg: https://kernelci.org/test/case/id/5eda9ff4077dbb478c97bf45 new failure (last pass: v5.4.44) 2 lines

5 years, 7 months

[PATCH] shmem, memcg: enable memcg aware shrinker

by Greg Thelen

Since v4.19 commit b0dedc49a2da ("mm/vmscan.c: iterate only over charged shrinkers during memcg shrink_slab()") a memcg aware shrinker is only called when the per-memcg per-node shrinker_map indicates that the shrinker may have objects to release to the memcg and node. shmem_unused_huge_count and shmem_unused_huge_scan support the per-tmpfs shrinker which advertises per memcg and numa awareness. The shmem shrinker releases memory by splitting hugepages that extend beyond i_size. Shmem does not currently set bits in shrinker_map. So, starting with b0dedc49a2da, memcg reclaim avoids calling the shmem shrinker under pressure. This leads to undeserved memcg OOM kills. Example that reliably sees memcg OOM kill in unpatched kernel: FS=/tmp/fs CONTAINER=/cgroup/memory/tmpfs_shrinker mkdir -p $FS mount -t tmpfs -o huge=always nodev $FS # Create 1000 MB container, which shouldn't suffer OOM. mkdir $CONTAINER echo 1000M > $CONTAINER/memory.limit_in_bytes echo $BASHPID >> $CONTAINER/cgroup.procs # Create 4000 files. Ideally each file uses 4k data page + a little # metadata. Assume 8k total per-file, 32MB (4000*8k) should easily # fit within container's 1000 MB. But if data pages use 2MB # hugepages (due to aggressive huge=always) then files consume 8GB, # which hits memcg 1000 MB limit. for i in {1..4000}; do echo . > $FS/$i done v5.4 commit 87eaceb3faa5 ("mm: thp: make deferred split shrinker memcg aware") maintains the per-node per-memcg shrinker bitmap for THP shrinker. But there's no such logic in shmem. Make shmem set the per-memcg per-node shrinker bits when it modifies inodes to have shrinkable pages. Fixes: b0dedc49a2da ("mm/vmscan.c: iterate only over charged shrinkers during memcg shrink_slab()") Cc: <stable(a)vger.kernel.org> # 4.19+ Signed-off-by: Greg Thelen <gthelen(a)google.com> --- mm/shmem.c | 61 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 26 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index bd8840082c94..e11090f78cb5 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1002,6 +1002,33 @@ static int shmem_getattr(const struct path *path, struct kstat *stat, return 0; } +/* + * Expose inode and optional page to shrinker as having a possibly splittable + * hugepage that reaches beyond i_size. + */ +static void shmem_shrinker_add(struct shmem_sb_info *sbinfo, + struct inode *inode, struct page *page) +{ + struct shmem_inode_info *info = SHMEM_I(inode); + + spin_lock(&sbinfo->shrinklist_lock); + /* + * _careful to defend against unlocked access to ->shrink_list in + * shmem_unused_huge_shrink() + */ + if (list_empty_careful(&info->shrinklist)) { + list_add_tail(&info->shrinklist, &sbinfo->shrinklist); + sbinfo->shrinklist_len++; + } + spin_unlock(&sbinfo->shrinklist_lock); + +#ifdef CONFIG_MEMCG + if (page && PageTransHuge(page)) + memcg_set_shrinker_bit(page->mem_cgroup, page_to_nid(page), + inode->i_sb->s_shrink.id); +#endif +} + static int shmem_setattr(struct dentry *dentry, struct iattr *attr) { struct inode *inode = d_inode(dentry); @@ -1048,17 +1075,13 @@ static int shmem_setattr(struct dentry *dentry, struct iattr *attr) * to shrink under memory pressure. */ if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) { - spin_lock(&sbinfo->shrinklist_lock); - /* - * _careful to defend against unlocked access to - * ->shrink_list in shmem_unused_huge_shrink() - */ - if (list_empty_careful(&info->shrinklist)) { - list_add_tail(&info->shrinklist, - &sbinfo->shrinklist); - sbinfo->shrinklist_len++; - } - spin_unlock(&sbinfo->shrinklist_lock); + struct page *page; + + page = find_get_page(inode->i_mapping, + (newsize & HPAGE_PMD_MASK) >> PAGE_SHIFT); + shmem_shrinker_add(sbinfo, inode, page); + if (page) + put_page(page); } } } @@ -1889,21 +1912,7 @@ static int shmem_getpage_gfp(struct inode *inode, pgoff_t index, if (PageTransHuge(page) && DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE) < hindex + HPAGE_PMD_NR - 1) { - /* - * Part of the huge page is beyond i_size: subject - * to shrink under memory pressure. - */ - spin_lock(&sbinfo->shrinklist_lock); - /* - * _careful to defend against unlocked access to - * ->shrink_list in shmem_unused_huge_shrink() - */ - if (list_empty_careful(&info->shrinklist)) { - list_add_tail(&info->shrinklist, - &sbinfo->shrinklist); - sbinfo->shrinklist_len++; - } - spin_unlock(&sbinfo->shrinklist_lock); + shmem_shrinker_add(sbinfo, inode, page); } /* -- 2.27.0.rc0.183.gde8f92d652-goog

5 years, 7 months

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror