October 2022 - Linux-stable-mirror

[PATCH v2 2/5] tools: PCI: Fix parsing the return value of IOCTLs

by Manivannan Sadhasivam

"pci_endpoint_test" driver now returns 0 for success and negative error code for failure. So adapt to the change by reporting FAILURE if the return value is < 0, and SUCCESS otherwise. Cc: stable(a)vger.kernel.org #5.10 Fixes: 3f2ed8134834 ("tools: PCI: Add a userspace tool to test PCI endpoint") Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org> --- tools/pci/pcitest.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/tools/pci/pcitest.c b/tools/pci/pcitest.c index 441b54234635..a4e5b17cc3b5 100644 --- a/tools/pci/pcitest.c +++ b/tools/pci/pcitest.c @@ -18,7 +18,6 @@ #define BILLION 1E9 -static char *result[] = { "NOT OKAY", "OKAY" }; static char *irq[] = { "LEGACY", "MSI", "MSI-X" }; struct pci_test { @@ -54,9 +53,9 @@ static int run_test(struct pci_test *test) ret = ioctl(fd, PCITEST_BAR, test->barnum); fprintf(stdout, "BAR%d:\t\t", test->barnum); if (ret < 0) - fprintf(stdout, "TEST FAILED\n"); + fprintf(stdout, "FAILED\n"); else - fprintf(stdout, "%s\n", result[ret]); + fprintf(stdout, "SUCCESS\n"); } if (test->set_irqtype) { @@ -65,16 +64,18 @@ static int run_test(struct pci_test *test) if (ret < 0) fprintf(stdout, "FAILED\n"); else - fprintf(stdout, "%s\n", result[ret]); + fprintf(stdout, "SUCCESS\n"); } if (test->get_irqtype) { ret = ioctl(fd, PCITEST_GET_IRQTYPE); fprintf(stdout, "GET IRQ TYPE:\t\t"); - if (ret < 0) + if (ret < 0) { fprintf(stdout, "FAILED\n"); - else + } else { fprintf(stdout, "%s\n", irq[ret]); + ret = 0; + } } if (test->clear_irq) { @@ -83,34 +84,34 @@ static int run_test(struct pci_test *test) if (ret < 0) fprintf(stdout, "FAILED\n"); else - fprintf(stdout, "%s\n", result[ret]); + fprintf(stdout, "SUCCESS\n"); } if (test->legacyirq) { ret = ioctl(fd, PCITEST_LEGACY_IRQ, 0); fprintf(stdout, "LEGACY IRQ:\t"); if (ret < 0) - fprintf(stdout, "TEST FAILED\n"); + fprintf(stdout, "FAILED\n"); else - fprintf(stdout, "%s\n", result[ret]); + fprintf(stdout, "SUCCESS\n"); } if (test->msinum > 0 && test->msinum <= 32) { ret = ioctl(fd, PCITEST_MSI, test->msinum); fprintf(stdout, "MSI%d:\t\t", test->msinum); if (ret < 0) - fprintf(stdout, "TEST FAILED\n"); + fprintf(stdout, "FAILED\n"); else - fprintf(stdout, "%s\n", result[ret]); + fprintf(stdout, "SUCCESS\n"); } if (test->msixnum > 0 && test->msixnum <= 2048) { ret = ioctl(fd, PCITEST_MSIX, test->msixnum); fprintf(stdout, "MSI-X%d:\t\t", test->msixnum); if (ret < 0) - fprintf(stdout, "TEST FAILED\n"); + fprintf(stdout, "FAILED\n"); else - fprintf(stdout, "%s\n", result[ret]); + fprintf(stdout, "SUCCESS\n"); } if (test->write) { @@ -120,9 +121,9 @@ static int run_test(struct pci_test *test) ret = ioctl(fd, PCITEST_WRITE, &param); fprintf(stdout, "WRITE (%7ld bytes):\t\t", test->size); if (ret < 0) - fprintf(stdout, "TEST FAILED\n"); + fprintf(stdout, "FAILED\n"); else - fprintf(stdout, "%s\n", result[ret]); + fprintf(stdout, "SUCCESS\n"); } if (test->read) { @@ -132,9 +133,9 @@ static int run_test(struct pci_test *test) ret = ioctl(fd, PCITEST_READ, &param); fprintf(stdout, "READ (%7ld bytes):\t\t", test->size); if (ret < 0) - fprintf(stdout, "TEST FAILED\n"); + fprintf(stdout, "FAILED\n"); else - fprintf(stdout, "%s\n", result[ret]); + fprintf(stdout, "SUCCESS\n"); } if (test->copy) { @@ -144,14 +145,14 @@ static int run_test(struct pci_test *test) ret = ioctl(fd, PCITEST_COPY, &param); fprintf(stdout, "COPY (%7ld bytes):\t\t", test->size); if (ret < 0) - fprintf(stdout, "TEST FAILED\n"); + fprintf(stdout, "FAILED\n"); else - fprintf(stdout, "%s\n", result[ret]); + fprintf(stdout, "SUCCESS\n"); } fflush(stdout); close(fd); - return (ret < 0) ? ret : 1 - ret; /* return 0 if test succeeded */ + return ret; } int main(int argc, char **argv) -- 2.25.1

3 years, 1 month

2
4
0 0

[PATCH 4.19 000/229] 4.19.262-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.19.262 release. There are 229 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, 26 Oct 2022 11:29:24 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.262-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.19.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.19.262-rc1 Martin Liska <mliska(a)suse.cz> gcov: support GCC 12.1 and newer compilers Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> thermal: intel_powerclamp: Use first online CPU as control_cpu Eric Dumazet <edumazet(a)google.com> inet: fully convert sk->sk_rx_dst to RCU rules Ard Biesheuvel <ardb(a)kernel.org> efi: libstub: drop pointless get_memory_map() call Saurabh Sengar <ssengar(a)linux.microsoft.com> md: Replace snprintf with scnprintf Jerry Lee 李修賢 <jerrylee(a)qnap.com> ext4: continue to expand file system when the target size doesn't reach Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> net/ieee802154: don't warn zero-sized raw_sendmsg() Alexander Aring <aahringo(a)redhat.com> net: ieee802154: return -EINVAL for unknown addr type Adrian Hunter <adrian.hunter(a)intel.com> perf intel-pt: Fix segfault in intel_pt_print_info() with uClibc Maxime Ripard <maxime(a)cerno.tech> clk: bcm2835: Make peripheral PLLC critical Dongliang Mu <mudongliangabcd(a)gmail.com> usb: idmouse: fix an uninit-value in idmouse_open Keith Busch <kbusch(a)kernel.org> nvme: copy firmware_rev on each init sunghwan jung <onenowy(a)gmail.com> Revert "usb: storage: Add quirk for Samsung Fit flash" Robin Guo <guoweibin(a)inspur.com> usb: musb: Fix musb_gadget.c rxstate overflow bug Jianglei Nie <niejianglei2021(a)163.com> usb: host: xhci: Fix potential memory leak in xhci_alloc_stream_info() Logan Gunthorpe <logang(a)deltatee.com> md/raid5: Wait for MD_SB_CHANGE_PENDING in raid5d Hyunwoo Kim <imv4bel(a)gmail.com> HID: roccat: Fix use-after-free in roccat_read() Serge Semin <Sergey.Semin(a)baikalelectronics.ru> ata: libahci_platform: Sanity check the DT child nodes number Nam Cao <namcaov(a)gmail.com> staging: vt6655: fix potential memory leak Wei Yongjun <weiyongjun1(a)huawei.com> power: supply: adp5061: fix out-of-bounds read in adp5061_get_chg_type() Shigeru Yoshida <syoshida(a)redhat.com> nbd: Fix hung when signal interrupts nbd_start_device_ioctl() Letu Ren <fantasquex(a)gmail.com> scsi: 3w-9xxx: Avoid disabling device if failing to enable it Zheyu Ma <zheyuma97(a)gmail.com> media: cx88: Fix a null-ptr-deref bug in buffer_prepare() Alexander Stein <alexander.stein(a)ew.tq-group.com> ARM: dts: imx6sx: add missing properties for sram Alexander Stein <alexander.stein(a)ew.tq-group.com> ARM: dts: imx6sll: add missing properties for sram Alexander Stein <alexander.stein(a)ew.tq-group.com> ARM: dts: imx6sl: add missing properties for sram Alexander Stein <alexander.stein(a)ew.tq-group.com> ARM: dts: imx6qp: add missing properties for sram Alexander Stein <alexander.stein(a)ew.tq-group.com> ARM: dts: imx6dl: add missing properties for sram Alexander Stein <alexander.stein(a)ew.tq-group.com> ARM: dts: imx6q: add missing properties for sram Haibo Chen <haibo.chen(a)nxp.com> ARM: dts: imx7d-sdb: config the max pressure for tsc2046 hongao <hongao(a)uniontech.com> drm/amdgpu: fix initial connector audio value Hans de Goede <hdegoede(a)redhat.com> platform/x86: msi-laptop: Change DMI match / alias strings to fix module autoloading Maya Matuszczyk <maccraft123mc(a)gmail.com> drm: panel-orientation-quirks: Add quirk for Anbernic Win600 Mateusz Kwiatkowski <kfyatek+publicgit(a)gmail.com> drm/vc4: vec: Fix timings for VEC modes David Gow <davidgow(a)google.com> drm/amd/display: fix overflow on MIN_I64 definition Javier Martinez Canillas <javierm(a)redhat.com> drm: Prevent drm_copy_field() to attempt copying a NULL pointer Javier Martinez Canillas <javierm(a)redhat.com> drm: Use size_t type for len variable in drm_copy_field() Andrew Gaul <gaul(a)gaul.org> r8152: Rate limit overflow messages Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com> Bluetooth: L2CAP: Fix user-after-free Liu Jian <liujian56(a)huawei.com> net: If sock is dead don't access sock's sk_wq in sk_stream_wait_memory Daniel Golle <daniel(a)makrotopia.org> wifi: rt2x00: correctly set BBP register 86 for MT7620 Daniel Golle <daniel(a)makrotopia.org> wifi: rt2x00: set SoC wmac clock register Daniel Golle <daniel(a)makrotopia.org> wifi: rt2x00: set correct TX_SW_CFG1 MAC register for MT7620 Daniel Golle <daniel(a)makrotopia.org> wifi: rt2x00: don't run Rt5592 IQ calibration on MT7620 Ziyang Xuan <william.xuanziyang(a)huawei.com> can: bcm: check the result of can_send() in bcm_can_tx() Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com> Bluetooth: hci_sysfs: Fix attempting to call device_add multiple times Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> Bluetooth: L2CAP: initialize delayed works at l2cap_chan_create() Alexander Coffin <alex.coffin(a)matician.com> wifi: brcmfmac: fix use-after-free bug in brcmf_netdev_start_xmit() Khalid Masum <khalid.masum.92(a)gmail.com> xfrm: Update ipcomp_scratches with NULL when freed Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> wifi: ath9k: avoid uninit memory read in ath9k_htc_rx_msg() Eric Dumazet <edumazet(a)google.com> tcp: annotate data-race around tcp_md5sig_pool_populated Mike Pattrick <mkp(a)redhat.com> openvswitch: Fix overreporting of drops in dropwatch Mike Pattrick <mkp(a)redhat.com> openvswitch: Fix double reporting of drops in dropwatch Wright Feng <wright.feng(a)cypress.com> wifi: brcmfmac: fix invalid address access when enabling SCAN log level Anna Schumaker <Anna.Schumaker(a)Netapp.com> NFSD: Return nfserr_serverfault if splice_ok but buf->pages have data Kees Cook <keescook(a)chromium.org> x86/entry: Work around Clang __bdos() bug Srinivas Pandruvada <srinivas.pandruvada(a)linux.intel.com> thermal: intel_powerclamp: Use get_cpu() instead of smp_processor_id() to avoid crash Chao Qin <chao.qin(a)intel.com> powercap: intel_rapl: fix UBSAN shift-out-of-bounds issue Kees Cook <keescook(a)chromium.org> MIPS: BCM47XX: Cast memcmp() of function to (void *) Arvid Norlander <lkml(a)vorpal.se> ACPI: video: Add Toshiba Satellite/Portege Z830 quirk Zhang Qilong <zhangqilong3(a)huawei.com> f2fs: fix race condition on setting FI_NO_EXTENT flag Dan Carpenter <dan.carpenter(a)oracle.com> crypto: cavium - prevent integer overflow loading firmware Robin Murphy <robin.murphy(a)arm.com> iommu/iova: Fix module config properly Dan Carpenter <dan.carpenter(a)oracle.com> iommu/omap: Fix buffer overflow in debugfs Pali Rohár <pali(a)kernel.org> powerpc: Fix SPE Power ISA properties for e500v1 platforms Nicholas Piggin <npiggin(a)gmail.com> powerpc/64s: Fix GENERIC_CPU build flags for PPC970 / G5 Vitaly Kuznetsov <vkuznets(a)redhat.com> x86/hyperv: Fix 'struct hv_enlightened_vmcs' definition Zheng Yongjun <zhengyongjun3(a)huawei.com> powerpc/powernv: add missing of_node_put() in opal_export_attrs() Liang He <windhl(a)126.com> powerpc/pci_dn: Add missing of_node_put() Liang He <windhl(a)126.com> powerpc/sysdev/fsl_msi: Add missing of_node_put() Nathan Chancellor <nathan(a)kernel.org> powerpc/math_emu/efp: Include module.h Jack Wang <jinpu.wang(a)ionos.com> mailbox: bcm-ferxrm-mailbox: Fix error check for dma_map_sg Miaoqian Lin <linmq006(a)gmail.com> clk: ti: dra7-atl: Fix reference leak in of_dra7_atl_clk_probe Stefan Wahren <stefan.wahren(a)i2se.com> clk: bcm2835: fix bcm2835_clock_rate_from_divisor declaration David Collins <collinsd(a)codeaurora.org> spmi: pmic-arb: correct duplicate APID to PPID mapping logic Dave Jiang <dave.jiang(a)intel.com> dmaengine: ioat: stop mod_timer from resurrecting deleted timer in __cleanup() Jiasheng Jiang <jiasheng(a)iscas.ac.cn> mfd: sm501: Add check for platform_driver_register() Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> mfd: lp8788: Fix an error handling path in lp8788_irq_init() and lp8788_irq_init() Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> mfd: lp8788: Fix an error handling path in lp8788_probe() Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> mfd: fsl-imx25: Fix an error handling path in mx25_tsadc_setup_irq() Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> mfd: intel_soc_pmic: Fix an error handling path in intel_soc_pmic_i2c_probe() Jiasheng Jiang <jiasheng(a)iscas.ac.cn> fsi: core: Check error number after calling ida_simple_get Pali Rohár <pali(a)kernel.org> serial: 8250: Fix restoring termios speed after suspend Guilherme G. Piccoli <gpiccoli(a)igalia.com> firmware: google: Test spinlock on panic path to avoid lockups Nam Cao <namcaov(a)gmail.com> staging: vt6655: fix some erroneous memory clean-up loops Dongliang Mu <mudongliangabcd(a)gmail.com> phy: qualcomm: call clk_disable_unprepare in the error handling Dan Carpenter <dan.carpenter(a)oracle.com> drivers: serial: jsm: fix some leaks in probe Albert Briscoe <albertsbriscoe(a)gmail.com> usb: gadget: function: fix dangling pnp_string in f_printer.c Mario Limonciello <mario.limonciello(a)amd.com> xhci: Don't show warning for reinit on known broken suspend Logan Gunthorpe <logang(a)deltatee.com> md/raid5: Ensure stripe_fill happens on non-read IO with journal Niklas Cassel <niklas.cassel(a)wdc.com> ata: fix ata_id_has_dipm() Niklas Cassel <niklas.cassel(a)wdc.com> ata: fix ata_id_has_ncq_autosense() Niklas Cassel <niklas.cassel(a)wdc.com> ata: fix ata_id_has_devslp() Niklas Cassel <niklas.cassel(a)wdc.com> ata: fix ata_id_sense_reporting_enabled() and ata_id_has_sense_reporting() William Dean <williamsukatube(a)gmail.com> mtd: devices: docg3: check the return value of devm_ioremap() in the probe Jim Cromie <jim.cromie(a)gmail.com> dyndbg: let query-modname override actual module name Jim Cromie <jim.cromie(a)gmail.com> dyndbg: fix module.dyndbg handling Zhu Yanjun <yanjun.zhu(a)linux.dev> RDMA/rxe: Fix the error caused by qp->sk Zhu Yanjun <yanjun.zhu(a)linux.dev> RDMA/rxe: Fix "kernel NULL pointer dereference" error Miaoqian Lin <linmq006(a)gmail.com> media: xilinx: vipp: Fix refcount leak in xvip_graph_dma_init Shubhrajyoti Datta <shubhrajyoti.datta(a)xilinx.com> tty: xilinx_uartps: Fix the ignore_status Liang He <windhl(a)126.com> media: exynos4-is: fimc-is: Add of_node_put() when breaking out of loop Jack Wang <jinpu.wang(a)ionos.com> HSI: omap_ssi_port: Fix dma_map_sg error check Miaoqian Lin <linmq006(a)gmail.com> HSI: omap_ssi: Fix refcount leak in ssi_probe Miaoqian Lin <linmq006(a)gmail.com> clk: tegra20: Fix refcount leak in tegra20_clock_init Miaoqian Lin <linmq006(a)gmail.com> clk: tegra: Fix refcount leak in tegra114_clock_init Miaoqian Lin <linmq006(a)gmail.com> clk: tegra: Fix refcount leak in tegra210_clock_init Liang He <windhl(a)126.com> clk: berlin: Add of_node_put() for of_get_parent() Liang He <windhl(a)126.com> clk: oxnas: Hold reference returned by of_get_parent() Jonathan Cameron <Jonathan.Cameron(a)huawei.com> iio: ABI: Fix wrong format of differential capacitance channel ABI. Nuno Sá <nuno.sa(a)analog.com> iio: inkern: only release the device node when done with it Claudiu Beznea <claudiu.beznea(a)microchip.com> iio: adc: at91-sama5d2_adc: check return status for pressure and touch Claudiu Beznea <claudiu.beznea(a)microchip.com> iio: adc: at91-sama5d2_adc: fix AT91_SAMA5D2_MR_TRACKTIM_MAX Dmitry Torokhov <dmitry.torokhov(a)gmail.com> ARM: dts: exynos: fix polarity of VBUS GPIO of Origen Geert Uytterhoeven <geert+renesas(a)glider.be> ARM: Drop CMDLINE_* dependency on ATAGS Dmitry Torokhov <dmitry.torokhov(a)gmail.com> ARM: dts: exynos: correct s5k6a3 reset polarity on Midas family Michael Walle <michael(a)walle.cc> ARM: dts: kirkwood: lsxl: remove first ethernet port Michael Walle <michael(a)walle.cc> ARM: dts: kirkwood: lsxl: fix serial line Marek Behún <kabel(a)kernel.org> ARM: dts: turris-omnia: Fix mpp26 pin name and comment Liang He <windhl(a)126.com> soc: qcom: smem_state: Add refcounting for the 'state->of_node' Liang He <windhl(a)126.com> soc: qcom: smsm: Fix refcount leak bugs in qcom_smsm_probe() Liang He <windhl(a)126.com> memory: of: Fix refcount leak bug in of_get_ddr_timings() Zhang Qilong <zhangqilong3(a)huawei.com> ASoC: wm5102: Fix PM disable depth imbalance in wm5102_probe Zhang Qilong <zhangqilong3(a)huawei.com> ASoC: wm5110: Fix PM disable depth imbalance in wm5110_probe Zhang Qilong <zhangqilong3(a)huawei.com> ASoC: wm8997: Fix PM disable depth imbalance in wm8997_probe Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> mmc: wmt-sdmmc: Fix an error handling path in wmt_mci_probe() Andreas Pape <apape(a)de.adit-jv.com> ALSA: dmaengine: increment buffer pointer atomically Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> drm/msm/dpu: index dpu_kms->hw_vbif using vbif_idx Liang He <windhl(a)126.com> ASoC: eureka-tlv320: Hold reference returned from of_find_xxx API Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> mmc: au1xmmc: Fix an error handling path in au1xmmc_probe() Zheyu Ma <zheyuma97(a)gmail.com> drm/bridge: megachips: Fix a null pointer dereference bug Hans de Goede <hdegoede(a)redhat.com> platform/x86: msi-laptop: Fix resource cleanup Hans de Goede <hdegoede(a)redhat.com> platform/x86: msi-laptop: Fix old-ec check for backlight registering Rustam Subkhankulov <subkhankulov(a)ispras.ru> platform/chrome: fix double-free in chromeos_laptop_prepare() Maxime Ripard <maxime(a)cerno.tech> drm/mipi-dsi: Detach devices when removing the host Alvin Šipraga <alsi(a)bang-olufsen.dk> drm: bridge: adv7511: fix CEC power down control register offset Russell King (Oracle) <rmk+kernel(a)armlinux.org.uk> net: mvpp2: fix mvpp2 debugfs leak Eric Dumazet <edumazet(a)google.com> once: add DO_ONCE_SLOW() for sleepable contexts Jianglei Nie <niejianglei2021(a)163.com> bnx2x: fix potential memory leak in bnx2x_tpa_stop() Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> net: rds: don't hold sock lock when cancelling work from rds_tcp_reset_callbacks() Neal Cardwell <ncardwell(a)google.com> tcp: fix tcp_cwnd_validate() to not forget is_cwnd_limited Xin Long <lucien.xin(a)gmail.com> sctp: handle the error returned from sctp_auth_asoc_init_active_key Duoming Zhou <duoming(a)zju.edu.cn> mISDN: fix use-after-free bugs in l1oip timer handlers Junichi Uekawa <uekawa(a)chromium.org> vhost/vsock: Use kvmalloc/kvfree for larger packets. Vincent Whitchurch <vincent.whitchurch(a)axis.com> spi: s3c64xx: Fix large transfers with DMA Phil Sutter <phil(a)nwl.cc> netfilter: nft_fib: Fix for rpath check with VRF devices Zhang Qilong <zhangqilong3(a)huawei.com> spi/omap100k:Fix PM disable depth imbalance in omap1_spi100k_probe Lee Jones <lee(a)kernel.org> bpf: Ensure correct locking around vulnerable function find_vpid() Zheng Yongjun <zhengyongjun3(a)huawei.com> net: fs_enet: Fix wrong check in do_pd_setup Bitterblue Smith <rtl8821cerfe2(a)gmail.com> wifi: rtl8xxxu: gen2: Fix mistake in path B IQ calibration Lorenz Bauer <oss(a)lmb.io> bpf: btf: fix truncated last_member_type_id in btf_struct_resolve Bitterblue Smith <rtl8821cerfe2(a)gmail.com> wifi: rtl8xxxu: Fix skb misuse in TX queue selection Xu Qiang <xuqiang36(a)huawei.com> spi: qup: add missing clk_disable_unprepare on error in spi_qup_pm_resume_runtime() Xu Qiang <xuqiang36(a)huawei.com> spi: qup: add missing clk_disable_unprepare on error in spi_qup_resume() Dan Carpenter <dan.carpenter(a)oracle.com> wifi: rtl8xxxu: tighten bounds checking in rtl8xxxu_read_efuse() Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> spi: mt7621: Fix an error message in mt7621_spi_probe() Lam Thai <lamthai(a)arista.com> bpftool: Fix a wrong type cast in btf_dumper_int Hari Chandrakanthan <quic_haric(a)quicinc.com> wifi: mac80211: allow bw change during channel switch in mesh Wen Gong <quic_wgong(a)quicinc.com> wifi: ath10k: add peer map clean up for peer delete in ath10k_sta_state() Kees Cook <keescook(a)chromium.org> sh: machvec: Use char[] for section boundaries Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> selinux: use "grep -E" instead of "egrep" Sean Christopherson <seanjc(a)google.com> KVM: nVMX: Unconditionally purge queued/injected events on nested "exit" Michal Luczaj <mhal(a)rbox.co> KVM: x86/emulator: Fix handing of POP SS to correctly set interruptibility Steven Rostedt (Google) <rostedt(a)goodmis.org> ring-buffer: Fix race between reset page and reading page Steven Rostedt (Google) <rostedt(a)goodmis.org> ring-buffer: Check pending waiters when doing wake ups as well Steven Rostedt (Google) <rostedt(a)goodmis.org> ring-buffer: Allow splice to read previous partially read pages Zheng Yejian <zhengyejian1(a)huawei.com> ftrace: Properly unset FTRACE_HASH_FL_MOD Rik van Riel <riel(a)surriel.com> livepatch: fix race between fork and KLP transition Jinke Han <hanjinke.666(a)bytedance.com> ext4: place buffer head allocation before handle start Lalith Rajendran <lalithkraj(a)google.com> ext4: make ext4_lazyinit_thread freezable Baokun Li <libaokun1(a)huawei.com> ext4: fix null-ptr-deref in ext4_write_info Jan Kara <jack(a)suse.cz> ext4: avoid crash when inline data creation follows DIO write Ryusuke Konishi <konishi.ryusuke(a)gmail.com> nilfs2: fix use-after-free bug of struct nilfs_root Aurelien Jarno <aurelien(a)aurel32.net> riscv: fix build with binutils 2.38 Filipe Manana <fdmanana(a)suse.com> btrfs: fix race between quota enable and quota rescan ioctl Hyunwoo Kim <imv4bel(a)gmail.com> fbdev: smscufx: Fix use-after-free in ufx_ops_open() Maciej W. Rozycki <macro(a)orcam.me.uk> PCI: Sanitise firmware BAR assignments behind a PCI-PCI bridge Huacai Chen <chenhuacai(a)loongson.cn> UM: cpuinfo: Fix a warning for CONFIG_CPUMASK_OFFSTACK Andrew Bresticker <abrestic(a)rivosinc.com> riscv: Allow PROT_WRITE-only mmap() Helge Deller <deller(a)gmx.de> parisc: fbdev/stifb: Align graphics memory size to 4MB Sasha Levin <sashal(a)kernel.org> Revert "fs: check FMODE_LSEEK to control internal pipe splicing" Linus Walleij <linus.walleij(a)linaro.org> regulator: qcom_rpm: Fix circular deferral regression Zhihao Cheng <chengzhihao1(a)huawei.com> quota: Check next/prev free block number after reading from quota file Andri Yngvason <andri(a)yngvason.is> HID: multitouch: Add memory barriers Alexander Aring <aahringo(a)redhat.com> fs: dlm: handle -EBUSY first in lock arg validation Alexander Aring <aahringo(a)redhat.com> fs: dlm: fix race between test_bit() and queue_work() Anssi Hannula <anssi.hannula(a)bitwise.fi> can: kvaser_usb_leaf: Fix CAN state after restart Anssi Hannula <anssi.hannula(a)bitwise.fi> can: kvaser_usb_leaf: Fix TX queue out of sync after restart Anssi Hannula <anssi.hannula(a)bitwise.fi> can: kvaser_usb_leaf: Fix overread with an invalid command Anssi Hannula <anssi.hannula(a)bitwise.fi> can: kvaser_usb: Fix use of uninitialized completion Jean-Francois Le Fillatre <jflf_kernel(a)gmx.com> usb: add quirks for Lenovo OneLink+ Dock Michael Hennerich <michael.hennerich(a)analog.com> iio: dac: ad5593r: Fix i2c read protocol requirements Tudor Ambarus <tudor.ambarus(a)microchip.com> mtd: rawnand: atmel: Unmap streaming DMA mappings Callum Osmotherly <callum.osmotherly(a)gmail.com> ALSA: hda/realtek: remove ALC289_FIXUP_DUAL_SPK for Dell 5530 Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Fix NULL dererence at error path Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Fix potential memory leaks Takashi Iwai <tiwai(a)suse.de> ALSA: rawmidi: Drop register_mutex in snd_rawmidi_free() Takashi Iwai <tiwai(a)suse.de> ALSA: oss: Fix potential deadlock at unregistration Cameron Gutman <aicommander(a)gmail.com> Input: xpad - fix wireless 360 controller breaking after suspend Pavel Rojtberg <rojtberg(a)gmail.com> Input: xpad - add supported devices as contributed on github Johannes Berg <johannes.berg(a)intel.com> wifi: mac80211_hwsim: avoid mac80211 warning on bad rate Jason A. Donenfeld <Jason(a)zx2c4.com> random: use expired timer rather than wq for mixing fast pool Jason A. Donenfeld <Jason(a)zx2c4.com> random: avoid reading two cache lines on irq randomness Jason A. Donenfeld <Jason(a)zx2c4.com> random: restore O_NONBLOCK support Frank Wunderlich <frank-w(a)public-files.de> USB: serial: qcserial: add new usb-id for Dell branded EM7455 Linus Torvalds <torvalds(a)linux-foundation.org> scsi: stex: Properly zero out the passthrough command structure Takashi Iwai <tiwai(a)suse.de> ALSA: hda: Fix position reporting on Poulsbo Jason A. Donenfeld <Jason(a)zx2c4.com> random: clamp credited irq bits to maximum mixed Hu Weiwen <sehuww(a)mail.scut.edu.cn> ceph: don't truncate file in atomic_open Ryusuke Konishi <konishi.ryusuke(a)gmail.com> nilfs2: replace WARN_ONs by nilfs_error for checkpoint acquisition failure Ryusuke Konishi <konishi.ryusuke(a)gmail.com> nilfs2: fix leak of nilfs_root in case of writer thread creation failure Ryusuke Konishi <konishi.ryusuke(a)gmail.com> nilfs2: fix NULL pointer dereference at nilfs_bmap_lookup_at_level() Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> rpmsg: qcom: glink: replace strncpy() with strscpy_pad() Brian Norris <briannorris(a)chromium.org> mmc: core: Terminate infinite loop in SD-UHS voltage switch ChanWoo Lee <cw9316.lee(a)samsung.com> mmc: core: Replace with already defined values for readability Johan Hovold <johan(a)kernel.org> USB: serial: ftdi_sio: fix 300 bps rate for SIO Tadeusz Struk <tadeusz.struk(a)linaro.org> usb: mon: make mmapped memory read only Lukas Straub <lukasstraub2(a)web.de> um: Cleanup compiler warning in arch/x86/um/tls_32.c Lukas Straub <lukasstraub2(a)web.de> um: Cleanup syscall_handler_t cast in syscalls_32.h Haimin Zhang <tcs.kernel(a)gmail.com> net/ieee802154: fix uninit value bug in dgram_sendmsg Letu Ren <fantasquex(a)gmail.com> scsi: qedf: Fix a UAF bug in __qedf_probe() Sergei Antonov <saproj(a)gmail.com> ARM: dts: fix Moxa SDIO 'compatible', remove 'sdhci' misnomer Swati Agarwal <swati.agarwal(a)xilinx.com> dmaengine: xilinx_dma: Report error in case of dma_set_mask_and_coherent API failure Swati Agarwal <swati.agarwal(a)xilinx.com> dmaengine: xilinx_dma: cleanup for fetching xlnx,num-fstores property Cristian Marussi <cristian.marussi(a)arm.com> firmware: arm_scmi: Add SCMI PM driver remove routine Dongliang Mu <mudongliangabcd(a)gmail.com> fs: fix UAF/GPF bug in nilfs_mdt_destroy Russell King <rmk+kernel(a)armlinux.org.uk> ARM: fix function graph tracer and unwinder dependencies Shuah Khan <skhan(a)linuxfoundation.org> docs: update mediator information in CoC docs Sami Tolvanen <samitolvanen(a)google.com> Makefile.extrawarn: Move -Wcast-function-type-strict to W=1 ------------- Diffstat: Documentation/ABI/testing/sysfs-bus-iio | 2 +- .../devicetree/bindings/dma/moxa,moxart-dma.txt | 4 +- .../process/code-of-conduct-interpretation.rst | 2 +- Makefile | 4 +- arch/arm/Kconfig | 3 +- arch/arm/Kconfig.debug | 6 +- arch/arm/boot/dts/armada-385-turris-omnia.dts | 4 +- arch/arm/boot/dts/exynos4412-midas.dtsi | 2 +- arch/arm/boot/dts/exynos4412-origen.dts | 2 +- arch/arm/boot/dts/imx6dl.dtsi | 3 + arch/arm/boot/dts/imx6q.dtsi | 3 + arch/arm/boot/dts/imx6qp.dtsi | 6 ++ arch/arm/boot/dts/imx6sl.dtsi | 3 + arch/arm/boot/dts/imx6sll.dtsi | 3 + arch/arm/boot/dts/imx6sx.dtsi | 6 ++ arch/arm/boot/dts/imx7d-sdb.dts | 7 +- arch/arm/boot/dts/kirkwood-lsxl.dtsi | 16 ++--- arch/arm/boot/dts/moxart-uc7112lx.dts | 2 +- arch/arm/boot/dts/moxart.dtsi | 4 +- arch/mips/bcm47xx/prom.c | 4 +- arch/powerpc/Makefile | 2 +- arch/powerpc/boot/dts/fsl/e500v1_power_isa.dtsi | 51 ++++++++++++++ arch/powerpc/boot/dts/fsl/mpc8540ads.dts | 2 +- arch/powerpc/boot/dts/fsl/mpc8541cds.dts | 2 +- arch/powerpc/boot/dts/fsl/mpc8555cds.dts | 2 +- arch/powerpc/boot/dts/fsl/mpc8560ads.dts | 2 +- arch/powerpc/kernel/pci_dn.c | 1 + arch/powerpc/math-emu/math_efp.c | 1 + arch/powerpc/platforms/powernv/opal.c | 1 + arch/powerpc/sysdev/fsl_msi.c | 2 + arch/riscv/Makefile | 11 ++- arch/riscv/kernel/sys_riscv.c | 3 - arch/sh/include/asm/sections.h | 2 +- arch/sh/kernel/machvec.c | 10 +-- arch/um/kernel/um_arch.c | 2 +- arch/x86/include/asm/hyperv-tlfs.h | 4 +- arch/x86/kvm/emulate.c | 2 +- arch/x86/kvm/vmx.c | 19 +++--- arch/x86/um/shared/sysdep/syscalls_32.h | 5 +- arch/x86/um/tls_32.c | 6 -- arch/x86/xen/enlighten_pv.c | 3 +- drivers/acpi/acpi_video.c | 16 +++++ drivers/ata/libahci_platform.c | 14 +++- drivers/block/nbd.c | 6 +- drivers/char/mem.c | 4 +- drivers/char/random.c | 25 ++++--- drivers/clk/bcm/clk-bcm2835.c | 8 +-- drivers/clk/berlin/bg2.c | 5 +- drivers/clk/berlin/bg2q.c | 6 +- drivers/clk/clk-oxnas.c | 6 +- drivers/clk/tegra/clk-tegra114.c | 1 + drivers/clk/tegra/clk-tegra20.c | 1 + drivers/clk/tegra/clk-tegra210.c | 1 + drivers/clk/ti/clk-dra7-atl.c | 9 ++- drivers/crypto/cavium/cpt/cptpf_main.c | 6 +- drivers/dma/ioat/dma.c | 6 +- drivers/dma/xilinx/xilinx_dma.c | 8 ++- drivers/firmware/arm_scmi/scmi_pm_domain.c | 20 ++++++ drivers/firmware/efi/libstub/fdt.c | 8 --- drivers/firmware/google/gsmi.c | 9 +++ drivers/fsi/fsi-core.c | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 7 +- drivers/gpu/drm/amd/display/dc/calcs/bw_fixed.c | 6 +- drivers/gpu/drm/bridge/adv7511/adv7511.h | 5 +- drivers/gpu/drm/bridge/adv7511/adv7511_cec.c | 4 +- .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 4 +- drivers/gpu/drm/drm_ioctl.c | 8 ++- drivers/gpu/drm/drm_mipi_dsi.c | 1 + drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 12 ++-- drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 29 ++++---- drivers/gpu/drm/vc4/vc4_vec.c | 4 +- drivers/hid/hid-multitouch.c | 8 +-- drivers/hid/hid-roccat.c | 4 ++ drivers/hsi/controllers/omap_ssi_core.c | 1 + drivers/hsi/controllers/omap_ssi_port.c | 8 +-- drivers/iio/adc/at91-sama5d2_adc.c | 10 ++- drivers/iio/dac/ad5593r.c | 46 +++++++------ drivers/iio/inkern.c | 6 +- drivers/infiniband/sw/rxe/rxe_qp.c | 10 ++- drivers/input/joystick/xpad.c | 20 +++++- drivers/iommu/omap-iommu-debug.c | 6 +- drivers/isdn/mISDN/l1oip.h | 1 + drivers/isdn/mISDN/l1oip_core.c | 13 ++-- drivers/mailbox/bcm-flexrm-mailbox.c | 8 +-- drivers/md/raid0.c | 4 +- drivers/md/raid5.c | 14 +++- drivers/media/pci/cx88/cx88-vbi.c | 9 ++- drivers/media/pci/cx88/cx88-video.c | 43 ++++++------ drivers/media/platform/exynos4-is/fimc-is.c | 1 + drivers/media/platform/xilinx/xilinx-vipp.c | 9 +-- drivers/memory/of_memory.c | 1 + drivers/mfd/fsl-imx25-tsadc.c | 32 ++++++--- drivers/mfd/intel_soc_pmic_core.c | 1 + drivers/mfd/lp8788-irq.c | 3 + drivers/mfd/lp8788.c | 12 +++- drivers/mfd/sm501.c | 7 +- drivers/mmc/core/sd.c | 3 +- drivers/mmc/host/au1xmmc.c | 3 +- drivers/mmc/host/wmt-sdmmc.c | 5 +- drivers/mtd/devices/docg3.c | 7 +- drivers/mtd/nand/raw/atmel/nand-controller.c | 1 + drivers/net/can/usb/kvaser_usb/kvaser_usb.h | 2 + drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 3 +- drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 2 +- drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 79 ++++++++++++++++++++++ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 1 + drivers/net/ethernet/freescale/fs_enet/mac-fec.c | 2 +- drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 1 + drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c | 10 ++- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 13 +++- drivers/net/usb/r8152.c | 4 +- drivers/net/wireless/ath/ath10k/mac.c | 54 ++++++++------- drivers/net/wireless/ath/ath9k/htc_hst.c | 43 ++++++++---- .../wireless/broadcom/brcm80211/brcmfmac/core.c | 3 +- .../net/wireless/broadcom/brcm80211/brcmfmac/pno.c | 12 ++-- drivers/net/wireless/mac80211_hwsim.c | 2 + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 31 ++++++++- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 21 +++--- drivers/nvme/host/core.c | 3 +- drivers/pci/setup-res.c | 11 +++ drivers/phy/qualcomm/phy-qcom-usb-hsic.c | 6 +- drivers/platform/chrome/chromeos_laptop.c | 24 ++++--- drivers/platform/x86/msi-laptop.c | 14 ++-- drivers/power/supply/adp5061.c | 6 +- drivers/powercap/intel_rapl.c | 3 + drivers/regulator/qcom_rpm-regulator.c | 24 +++---- drivers/rpmsg/qcom_glink_native.c | 2 +- drivers/rpmsg/qcom_smd.c | 4 +- drivers/scsi/3w-9xxx.c | 2 +- drivers/scsi/qedf/qedf_main.c | 5 -- drivers/scsi/stex.c | 17 ++--- drivers/soc/qcom/smem_state.c | 3 +- drivers/soc/qcom/smsm.c | 20 ++++-- drivers/spi/spi-omap-100k.c | 1 + drivers/spi/spi-qup.c | 21 ++++-- drivers/spi/spi-s3c64xx.c | 9 +++ drivers/spmi/spmi-pmic-arb.c | 13 ++-- drivers/staging/mt7621-spi/spi-mt7621.c | 8 +-- drivers/staging/vt6655/device_main.c | 8 +-- drivers/thermal/intel_powerclamp.c | 4 +- drivers/tty/serial/8250/8250_port.c | 7 +- drivers/tty/serial/jsm/jsm_driver.c | 3 +- drivers/tty/serial/xilinx_uartps.c | 2 + drivers/usb/core/quirks.c | 4 ++ drivers/usb/gadget/function/f_printer.c | 12 ++-- drivers/usb/host/xhci-mem.c | 7 +- drivers/usb/host/xhci.c | 3 +- drivers/usb/misc/idmouse.c | 8 +-- drivers/usb/mon/mon_bin.c | 5 ++ drivers/usb/musb/musb_gadget.c | 3 + drivers/usb/serial/ftdi_sio.c | 3 +- drivers/usb/serial/qcserial.c | 1 + drivers/usb/storage/unusual_devs.h | 6 -- drivers/vhost/vsock.c | 2 +- drivers/video/fbdev/smscufx.c | 14 +++- drivers/video/fbdev/stifb.c | 2 +- fs/btrfs/qgroup.c | 15 ++++ fs/ceph/file.c | 10 ++- fs/dlm/ast.c | 6 +- fs/dlm/lock.c | 16 ++--- fs/ext4/file.c | 6 ++ fs/ext4/inode.c | 7 ++ fs/ext4/resize.c | 2 +- fs/ext4/super.c | 3 +- fs/f2fs/extent_cache.c | 3 +- fs/inode.c | 7 +- fs/nfsd/nfs4xdr.c | 2 +- fs/nilfs2/inode.c | 20 +++++- fs/nilfs2/segment.c | 21 +++--- fs/quota/quota_tree.c | 38 +++++++++++ fs/splice.c | 10 +-- include/linux/ata.h | 39 ++++++----- include/linux/dynamic_debug.h | 2 +- include/linux/iova.h | 2 +- include/linux/once.h | 28 ++++++++ include/linux/tcp.h | 2 +- include/net/ieee802154_netdev.h | 43 ++++++++++++ include/net/sock.h | 2 +- include/net/tcp.h | 5 +- include/scsi/scsi_cmnd.h | 2 +- kernel/bpf/btf.c | 2 +- kernel/bpf/syscall.c | 2 + kernel/gcov/gcc_4_7.c | 18 ++++- kernel/livepatch/transition.c | 18 ++++- kernel/trace/ftrace.c | 8 ++- kernel/trace/ring_buffer.c | 46 ++++++++++++- lib/dynamic_debug.c | 11 +-- lib/once.c | 30 ++++++++ net/bluetooth/hci_sysfs.c | 3 + net/bluetooth/l2cap_core.c | 17 +++-- net/can/bcm.c | 7 +- net/core/stream.c | 3 +- net/ieee802154/socket.c | 46 +++++++------ net/ipv4/af_inet.c | 2 +- net/ipv4/inet_hashtables.c | 4 +- net/ipv4/netfilter/nft_fib_ipv4.c | 3 + net/ipv4/tcp.c | 19 ++++-- net/ipv4/tcp_input.c | 2 +- net/ipv4/tcp_ipv4.c | 11 +-- net/ipv4/tcp_output.c | 19 ++++-- net/ipv4/udp.c | 6 +- net/ipv6/netfilter/nft_fib_ipv6.c | 6 +- net/ipv6/tcp_ipv6.c | 11 +-- net/ipv6/udp.c | 4 +- net/mac80211/cfg.c | 3 - net/openvswitch/datapath.c | 18 +++-- net/rds/tcp.c | 2 +- net/sctp/auth.c | 18 +++-- net/vmw_vsock/virtio_transport_common.c | 2 +- net/xfrm/xfrm_ipcomp.c | 1 + scripts/Makefile.extrawarn | 1 + scripts/selinux/install_policy.sh | 2 +- sound/core/pcm_dmaengine.c | 8 ++- sound/core/rawmidi.c | 2 - sound/core/sound_oss.c | 13 ++-- sound/pci/hda/hda_intel.c | 3 +- sound/pci/hda/patch_realtek.c | 1 - sound/soc/codecs/wm5102.c | 6 +- sound/soc/codecs/wm5110.c | 6 +- sound/soc/codecs/wm8997.c | 6 +- sound/soc/fsl/eukrea-tlv320.c | 8 ++- sound/usb/endpoint.c | 6 +- tools/bpf/bpftool/btf_dumper.c | 2 +- tools/perf/util/intel-pt.c | 9 ++- 225 files changed, 1444 insertions(+), 598 deletions(-)

3 years, 1 month

7
242
0 0

[PATCH] can: rcar_canfd: rcar_canfd_handle_global_receive(): fix IRQ storm on global FIFO receive

by Biju Das

commit 702de2c21eed04c67cefaaedc248ef16e5f6b293 upstream. We are seeing an IRQ storm on the global receive IRQ line under heavy CAN bus load conditions with both CAN channels enabled. Conditions: The global receive IRQ line is shared between can0 and can1, either of the channels can trigger interrupt while the other channel's IRQ line is disabled (RFIE). When global a receive IRQ interrupt occurs, we mask the interrupt in the IRQ handler. Clearing and unmasking of the interrupt is happening in rx_poll(). There is a race condition where rx_poll() unmasks the interrupt, but the next IRQ handler does not mask the IRQ due to NAPIF_STATE_MISSED flag (e.g.: can0 RX FIFO interrupt is disabled and can1 is triggering RX interrupt, the delay in rx_poll() processing results in setting NAPIF_STATE_MISSED flag) leading to an IRQ storm. This patch fixes the issue by checking IRQ active and enabled before handling the IRQ on a particular channel. Fixes: dd3bd23eb438 ("can: rcar_canfd: Add Renesas R-Car CAN FD driver") Suggested-by: Marc Kleine-Budde <mkl(a)pengutronix.de> Signed-off-by: Biju Das <biju.das.jz(a)bp.renesas.com> Link: https://lore.kernel.org/all/20221025155657.1426948-2-biju.das.jz@bp.renesas… Cc: stable(a)vger.kernel.org#5.15.y [mkl: adjust commit message] Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> [biju: removed gpriv from RCANFD_RFCC_RFIE macro] Signed-off-by: Biju Das <biju.das.jz(a)bp.renesas.com> --- Resending to 5.15 with confilcts[1] fixed [1] https://lore.kernel.org/stable/1667194204110137@kroah.com/T/#u --- drivers/net/can/rcar/rcar_canfd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_canfd.c index 2f44c567ebd7..9991bb475ae1 100644 --- a/drivers/net/can/rcar/rcar_canfd.c +++ b/drivers/net/can/rcar/rcar_canfd.c @@ -1106,11 +1106,13 @@ static void rcar_canfd_handle_global_receive(struct rcar_canfd_global *gpriv, u3 { struct rcar_canfd_channel *priv = gpriv->ch[ch]; u32 ridx = ch + RCANFD_RFFIFO_IDX; - u32 sts; + u32 sts, cc; /* Handle Rx interrupts */ sts = rcar_canfd_read(priv->base, RCANFD_RFSTS(ridx)); - if (likely(sts & RCANFD_RFSTS_RFIF)) { + cc = rcar_canfd_read(priv->base, RCANFD_RFCC(ridx)); + if (likely(sts & RCANFD_RFSTS_RFIF && + cc & RCANFD_RFCC_RFIE)) { if (napi_schedule_prep(&priv->napi)) { /* Disable Rx FIFO interrupts */ rcar_canfd_clear_bit(priv->base, -- 2.25.1

3 years, 1 month

4
4
0 0

[PATCH 4.14 00/34] 4.14.297-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.14.297 release. There are 34 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, 02 Nov 2022 07:01:32 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.297-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.14.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.14.297-rc1 Daniel Sneddon <daniel.sneddon(a)linux.intel.com> x86/speculation: Add RSB VM Exit protections Pawan Gupta <pawan.kumar.gupta(a)linux.intel.com> x86/bugs: Warn when "ibrs" mitigation is selected on Enhanced IBRS parts Nathan Chancellor <nathan(a)kernel.org> x86/speculation: Use DECLARE_PER_CPU for x86_spec_ctrl_current Pawan Gupta <pawan.kumar.gupta(a)linux.intel.com> x86/speculation: Disable RRSBA behavior Pawan Gupta <pawan.kumar.gupta(a)linux.intel.com> x86/bugs: Add Cannon lake to RETBleed affected CPU list Andrew Cooper <andrew.cooper3(a)citrix.com> x86/cpu/amd: Enumerate BTC_NO Peter Zijlstra <peterz(a)infradead.org> x86/common: Stamp out the stepping madness Josh Poimboeuf <jpoimboe(a)kernel.org> x86/speculation: Fill RSB on vmexit for IBRS Josh Poimboeuf <jpoimboe(a)kernel.org> KVM: VMX: Fix IBRS handling after vmexit Josh Poimboeuf <jpoimboe(a)kernel.org> KVM: VMX: Prevent guest RSB poisoning attacks with eIBRS Josh Poimboeuf <jpoimboe(a)kernel.org> x86/speculation: Remove x86_spec_ctrl_mask Josh Poimboeuf <jpoimboe(a)kernel.org> x86/speculation: Use cached host SPEC_CTRL value for guest entry/exit Josh Poimboeuf <jpoimboe(a)kernel.org> x86/speculation: Fix SPEC_CTRL write on SMT state change Josh Poimboeuf <jpoimboe(a)kernel.org> x86/speculation: Fix firmware entry SPEC_CTRL handling Josh Poimboeuf <jpoimboe(a)kernel.org> x86/speculation: Fix RSB filling with CONFIG_RETPOLINE=n Pawan Gupta <pawan.kumar.gupta(a)linux.intel.com> x86/speculation: Add LFENCE to RSB fill sequence Peter Zijlstra <peterz(a)infradead.org> x86/speculation: Change FILL_RETURN_BUFFER to work with objtool Peter Zijlstra <peterz(a)infradead.org> entel_idle: Disable IBRS during long idle Peter Zijlstra <peterz(a)infradead.org> x86/bugs: Report Intel retbleed vulnerability Peter Zijlstra <peterz(a)infradead.org> x86/bugs: Split spectre_v2_select_mitigation() and spectre_v2_user_select_mitigation() Pawan Gupta <pawan.kumar.gupta(a)linux.intel.com> x86/speculation: Add spectre_v2=ibrs option to support Kernel IBRS Peter Zijlstra <peterz(a)infradead.org> x86/bugs: Optimize SPEC_CTRL MSR writes Thadeu Lima de Souza Cascardo <cascardo(a)canonical.com> x86/entry: Add kernel IBRS implementation Peter Zijlstra <peterz(a)infradead.org> x86/bugs: Keep a per-CPU IA32_SPEC_CTRL value Alexandre Chartre <alexandre.chartre(a)oracle.com> x86/bugs: Add AMD retbleed= boot parameter Alexandre Chartre <alexandre.chartre(a)oracle.com> x86/bugs: Report AMD retbleed vulnerability Peter Zijlstra <peterz(a)infradead.org> x86/cpufeatures: Move RETPOLINE flags to word 11 Peter Zijlstra <peterz(a)infradead.org> x86/entry: Remove skip_r11rcx Mark Gross <mgross(a)linux.intel.com> x86/cpu: Add a steppings field to struct x86_cpu_id Thomas Gleixner <tglx(a)linutronix.de> x86/cpu: Add consistent CPU match macros Thomas Gleixner <tglx(a)linutronix.de> x86/devicetable: Move x86 specific macro out of generic code Ingo Molnar <mingo(a)kernel.org> x86/cpufeature: Fix various quality problems in the <asm/cpu_device_hd.h> header Kan Liang <kan.liang(a)linux.intel.com> x86/cpufeature: Add facility to check for min microcode revisions Suraj Jitindar Singh <surajjs(a)amazon.com> Revert "x86/cpu: Add a steppings field to struct x86_cpu_id" ------------- Diffstat: Documentation/admin-guide/hw-vuln/spectre.rst | 8 + Documentation/admin-guide/kernel-parameters.txt | 13 + Makefile | 4 +- arch/x86/entry/calling.h | 68 +++- arch/x86/entry/entry_32.S | 2 - arch/x86/entry/entry_64.S | 38 ++- arch/x86/entry/entry_64_compat.S | 12 +- arch/x86/include/asm/cpu_device_id.h | 168 +++++++++- arch/x86/include/asm/cpufeatures.h | 16 +- arch/x86/include/asm/intel-family.h | 6 + arch/x86/include/asm/msr-index.h | 14 + arch/x86/include/asm/nospec-branch.h | 48 +-- arch/x86/kernel/cpu/amd.c | 21 +- arch/x86/kernel/cpu/bugs.c | 415 ++++++++++++++++++++---- arch/x86/kernel/cpu/common.c | 68 ++-- arch/x86/kernel/cpu/match.c | 44 ++- arch/x86/kernel/cpu/scattered.c | 1 + arch/x86/kernel/process.c | 2 +- arch/x86/kvm/svm.c | 1 + arch/x86/kvm/vmx.c | 51 ++- drivers/base/cpu.c | 8 + drivers/cpufreq/acpi-cpufreq.c | 1 + drivers/cpufreq/amd_freq_sensitivity.c | 1 + drivers/idle/intel_idle.c | 45 ++- include/linux/cpu.h | 2 + include/linux/mod_devicetable.h | 4 +- tools/arch/x86/include/asm/cpufeatures.h | 1 + 27 files changed, 899 insertions(+), 163 deletions(-)

3 years, 1 month

3
36
0 0

[PATCH 6.0 00/20] 6.0.4-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 6.0.4 release. There are 20 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, 26 Oct 2022 11:29:24 +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/v6.x/stable-review/patch-6.0.4-rc1.… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.0.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 6.0.4-rc1 Thomas Zimmermann <tzimmermann(a)suse.de> fbdev/core: Remove remove_conflicting_pci_framebuffers() Mel Gorman <mgorman(a)techsingularity.net> mm/huge_memory: do not clobber swp_entry_t during THP split Rafael Mendonca <rafaelmendsr(a)gmail.com> io-wq: Fix memory leak in worker creation Martin Liska <mliska(a)suse.cz> gcov: support GCC 12.1 and newer compilers Ard Biesheuvel <ardb(a)kernel.org> efi: ssdt: Don't free memory if ACPI table was loaded successfully Ard Biesheuvel <ardb(a)kernel.org> efi: efivars: Fix variable writes without query_variable_store() Nikos Tsironis <ntsironis(a)arrikto.com> dm clone: Fix typo in block_device format specifier Tim Huang <tim.huang(a)amd.com> drm/amd/pm: update SMU IP v13.0.4 driver interface version Evan Quan <evan.quan(a)amd.com> drm/amd/pm: fulfill SMU13.0.0 cstate control interface Evan Quan <evan.quan(a)amd.com> drm/amd/pm: disable cstate feature for gpu reset scenario Tim Huang <tim.huang(a)amd.com> drm/amd/pm: add SMU IP v13.0.4 IF version define to V7 Evan Quan <evan.quan(a)amd.com> drm/amd/pm: fulfill SMU13.0.7 cstate control interface Pavel Begunkov <asml.silence(a)gmail.com> net: flag sockets supporting msghdr originated zerocopy Roderick Colenbrander <roderick(a)gaikai.com> HID: playstation: add initial DualSense Edge controller support Roderick Colenbrander <roderick(a)gaikai.com> HID: playstation: stop DualSense output work on remove. Pavel Begunkov <asml.silence(a)gmail.com> io_uring/net: fail zc send when unsupported by socket Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> thermal: intel_powerclamp: Use first online CPU as control_cpu Basavaraj Natikar <Basavaraj.Natikar(a)amd.com> pinctrl: amd: change dev_warn to dev_dbg for additional feature support Ville Syrjälä <ville.syrjala(a)linux.intel.com> drm/i915/bios: Use hardcoded fp_timing size for generating LFP data pointers Ville Syrjälä <ville.syrjala(a)linux.intel.com> drm/i915/bios: Validate fp_timing terminator presence ------------- Diffstat: Makefile | 4 +- drivers/firmware/efi/efi.c | 2 + drivers/firmware/efi/vars.c | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 ++ .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_4.h | 17 +++- drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 2 +- drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 8 ++ drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 9 ++ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 11 +++ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 12 +++ drivers/gpu/drm/i915/display/intel_bios.c | 106 ++++++++++----------- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-playstation.c | 46 +++++++-- drivers/md/dm-clone-target.c | 2 +- drivers/pinctrl/pinctrl-amd.c | 4 +- drivers/thermal/intel/intel_powerclamp.c | 6 +- drivers/video/aperture.c | 30 +++--- drivers/video/fbdev/core/fbmem.c | 48 ---------- fs/efivarfs/vars.c | 16 ---- include/linux/efi.h | 3 - include/linux/fb.h | 2 - include/linux/net.h | 1 + io_uring/io-wq.c | 2 +- io_uring/net.c | 2 + kernel/gcov/gcc_4_7.c | 18 +++- mm/huge_memory.c | 11 ++- net/ipv4/tcp.c | 1 + net/ipv4/udp.c | 1 + 28 files changed, 218 insertions(+), 165 deletions(-)

3 years, 1 month

17
41
0 0

[PATCH] wifi: wilc1000: sdio: fix module autoloading

by Michael Walle

There are no SDIO module aliases included in the driver, therefore, module autoloading isn't working. Add the proper MODULE_DEVICE_TABLE(). Cc: stable(a)vger.kernel.org Signed-off-by: Michael Walle <michael(a)walle.cc> --- drivers/net/wireless/microchip/wilc1000/sdio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/wireless/microchip/wilc1000/sdio.c b/drivers/net/wireless/microchip/wilc1000/sdio.c index 7390f94cd4ca..a05bda7b9a3b 100644 --- a/drivers/net/wireless/microchip/wilc1000/sdio.c +++ b/drivers/net/wireless/microchip/wilc1000/sdio.c @@ -20,6 +20,7 @@ static const struct sdio_device_id wilc_sdio_ids[] = { { SDIO_DEVICE(SDIO_VENDOR_ID_MICROCHIP_WILC, SDIO_DEVICE_ID_MICROCHIP_WILC1000) }, { }, }; +MODULE_DEVICE_TABLE(sdio, wilc_sdio_ids); #define WILC_SDIO_BLOCK_SIZE 512 -- 2.30.2

3 years, 1 month

2
1
0 0

[PATCH] platform/x86/amd: pmc: remove CONFIG_DEBUG_FS checks

by Nils Freydank

commit b37fe34c83099ba5105115f8287c5546af1f0a05 upstream. This fixes a compilation bug introduced in commit e9847175b266f12365160e124a207907da3dbe8e (platform/x86/amd: pmc: Read SMU version during suspend on Cezanne systems). Signed-off-by: Nils Freydank <nils.freydank(a)posteo.de> --- Backport patch applies and compiles with linux 6.0.6. Feel free to use the whole patch or any parts of it at your discretion. drivers/platform/x86/amd/pmc.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/drivers/platform/x86/amd/pmc.c b/drivers/platform/x86/amd/pmc.c index fc326fdf4..6ccb9b384 100644 --- a/drivers/platform/x86/amd/pmc.c +++ b/drivers/platform/x86/amd/pmc.c @@ -151,9 +151,7 @@ struct amd_pmc_dev { struct device *dev; struct pci_dev *rdev; struct mutex lock; /* generic mutex lock */ -#if IS_ENABLED(CONFIG_DEBUG_FS) struct dentry *dbgfs_dir; -#endif /* CONFIG_DEBUG_FS */ }; static bool enable_stb; @@ -369,7 +367,6 @@ static void amd_pmc_validate_deepest(struct amd_pmc_dev *pdev) } #endif -#ifdef CONFIG_DEBUG_FS static int smu_fw_info_show(struct seq_file *s, void *unused) { struct amd_pmc_dev *dev = s->private; @@ -504,15 +501,6 @@ static void amd_pmc_dbgfs_register(struct amd_pmc_dev *dev) &amd_pmc_stb_debugfs_fops); } } -#else -static inline void amd_pmc_dbgfs_register(struct amd_pmc_dev *dev) -{ -} - -static inline void amd_pmc_dbgfs_unregister(struct amd_pmc_dev *dev) -{ -} -#endif /* CONFIG_DEBUG_FS */ static void amd_pmc_dump_registers(struct amd_pmc_dev *dev) { -- 2.38.1

3 years, 1 month

2
2
0 0

+ hugetlb-dont-delete-vma_lock-in-hugetlb-madv_dontneed-processing.patch added to mm-hotfixes-unstable branch

by Andrew Morton

The patch titled Subject: hugetlb: don't delete vma_lock in hugetlb MADV_DONTNEED processing has been added to the -mm mm-hotfixes-unstable branch. Its filename is hugetlb-dont-delete-vma_lock-in-hugetlb-madv_dontneed-processing.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patche… This patch will later appear in the mm-hotfixes-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Mike Kravetz <mike.kravetz(a)oracle.com> Subject: hugetlb: don't delete vma_lock in hugetlb MADV_DONTNEED processing Date: Mon, 31 Oct 2022 15:34:40 -0700 madvise(MADV_DONTNEED) ends up calling zap_page_range() to clear the page tables associated with the address range. For hugetlb vmas, zap_page_range will call __unmap_hugepage_range_final. However, __unmap_hugepage_range_final assumes the passed vma is about to be removed and deletes the vma_lock to prevent pmd sharing as the vma is on the way out. In the case of madvise(MADV_DONTNEED) the vma remains, but the missing vma_lock prevents pmd sharing and could potentially lead to issues with truncation/fault races. This issue was originally reported here [1] as a BUG triggered in page_try_dup_anon_rmap. Prior to the introduction of the hugetlb vma_lock, __unmap_hugepage_range_final cleared the VM_MAYSHARE flag to prevent pmd sharing. Subsequent faults on this vma were confused as VM_MAYSHARE indicates a sharable vma, but was not set so page_mapping was not set in new pages added to the page table. This resulted in pages that appeared anonymous in a VM_SHARED vma and triggered the BUG. Create a new routine clear_hugetlb_page_range() that can be called from madvise(MADV_DONTNEED) for hugetlb vmas. It has the same setup as zap_page_range, but does not delete the vma_lock. Also, add a new zap flag ZAP_FLAG_UNMAP to indicate an unmap call from unmap_vmas(). This is used to indicate the 'final' unmapping of a vma. The routine __unmap_hugepage_range to take a notification_needed argument. This is used to prevent duplicate notifications. [1] https://lore.kernel.org/lkml/CAO4mrfdLMXsao9RF4fUE8-Wfde8xmjsKrTNMNC9wjUb6J… Link: https://lkml.kernel.org/r/20221031223440.285187-1-mike.kravetz@oracle.com Fixes: 90e7e7f5ef3f ("mm: enable MADV_DONTNEED for hugetlb mappings") Signed-off-by: Mike Kravetz <mike.kravetz(a)oracle.com> Reported-by: Wei Chen <harperchen1110(a)gmail.com> Cc: Axel Rasmussen <axelrasmussen(a)google.com> Cc: David Hildenbrand <david(a)redhat.com> Cc: Matthew Wilcox (Oracle) <willy(a)infradead.org> Cc: Mina Almasry <almasrymina(a)google.com> Cc: Nadav Amit <nadav.amit(a)gmail.com> Cc: Naoya Horiguchi <naoya.horiguchi(a)linux.dev> Cc: Peter Xu <peterx(a)redhat.com> Cc: Rik van Riel <riel(a)surriel.com> Cc: Vlastimil Babka <vbabka(a)suse.cz> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- include/linux/hugetlb.h | 7 +++ include/linux/mm.h | 3 + mm/hugetlb.c | 80 ++++++++++++++++++++++++++++---------- mm/memory.c | 18 +++++--- 4 files changed, 82 insertions(+), 26 deletions(-) --- a/include/linux/hugetlb.h~hugetlb-dont-delete-vma_lock-in-hugetlb-madv_dontneed-processing +++ a/include/linux/hugetlb.h @@ -156,6 +156,8 @@ long follow_hugetlb_page(struct mm_struc void unmap_hugepage_range(struct vm_area_struct *, unsigned long, unsigned long, struct page *, zap_flags_t); +void clear_hugetlb_page_range(struct vm_area_struct *vma, + unsigned long start, unsigned long end); void __unmap_hugepage_range_final(struct mmu_gather *tlb, struct vm_area_struct *vma, unsigned long start, unsigned long end, @@ -460,6 +462,11 @@ static inline void __unmap_hugepage_rang BUG(); } +static void __maybe_unused clear_hugetlb_page_range(struct vm_area_struct *vma, + unsigned long start, unsigned long end) +{ +} + static inline vm_fault_t hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long address, unsigned int flags) --- a/include/linux/mm.h~hugetlb-dont-delete-vma_lock-in-hugetlb-madv_dontneed-processing +++ a/include/linux/mm.h @@ -3475,4 +3475,7 @@ madvise_set_anon_name(struct mm_struct * */ #define ZAP_FLAG_DROP_MARKER ((__force zap_flags_t) BIT(0)) +/* Set in unmap_vmas() to indicate an unmap call. Only used by hugetlb */ +#define ZAP_FLAG_UNMAP ((__force zap_flags_t) BIT(1)) + #endif /* _LINUX_MM_H */ --- a/mm/hugetlb.c~hugetlb-dont-delete-vma_lock-in-hugetlb-madv_dontneed-processing +++ a/mm/hugetlb.c @@ -5064,7 +5064,6 @@ static void __unmap_hugepage_range(struc struct page *page; struct hstate *h = hstate_vma(vma); unsigned long sz = huge_page_size(h); - struct mmu_notifier_range range; unsigned long last_addr_mask; bool force_flush = false; @@ -5079,13 +5078,6 @@ static void __unmap_hugepage_range(struc tlb_change_page_size(tlb, sz); tlb_start_vma(tlb, vma); - /* - * If sharing possible, alert mmu notifiers of worst case. - */ - mmu_notifier_range_init(&range, MMU_NOTIFY_UNMAP, 0, vma, mm, start, - end); - adjust_range_if_pmd_sharing_possible(vma, &range.start, &range.end); - mmu_notifier_invalidate_range_start(&range); last_addr_mask = hugetlb_mask_last_page(h); address = start; for (; address < end; address += sz) { @@ -5174,7 +5166,6 @@ static void __unmap_hugepage_range(struc if (ref_page) break; } - mmu_notifier_invalidate_range_end(&range); tlb_end_vma(tlb, vma); /* @@ -5194,37 +5185,86 @@ static void __unmap_hugepage_range(struc tlb_flush_mmu_tlbonly(tlb); } -void __unmap_hugepage_range_final(struct mmu_gather *tlb, +static void __unmap_hugepage_range_locking(struct mmu_gather *tlb, struct vm_area_struct *vma, unsigned long start, unsigned long end, struct page *ref_page, zap_flags_t zap_flags) { + bool final = zap_flags & ZAP_FLAG_UNMAP; + hugetlb_vma_lock_write(vma); i_mmap_lock_write(vma->vm_file->f_mapping); __unmap_hugepage_range(tlb, vma, start, end, ref_page, zap_flags); - /* - * Unlock and free the vma lock before releasing i_mmap_rwsem. When - * the vma_lock is freed, this makes the vma ineligible for pmd - * sharing. And, i_mmap_rwsem is required to set up pmd sharing. - * This is important as page tables for this unmapped range will - * be asynchrously deleted. If the page tables are shared, there - * will be issues when accessed by someone else. - */ - __hugetlb_vma_unlock_write_free(vma); + if (final) { + /* + * Unlock and free the vma lock before releasing i_mmap_rwsem. + * When the vma_lock is freed, this makes the vma ineligible + * for pmd sharing. And, i_mmap_rwsem is required to set up + * pmd sharing. This is important as page tables for this + * unmapped range will be asynchrously deleted. If the page + * tables are shared, there will be issues when accessed by + * someone else. + */ + __hugetlb_vma_unlock_write_free(vma); + i_mmap_unlock_write(vma->vm_file->f_mapping); + } else { + i_mmap_unlock_write(vma->vm_file->f_mapping); + hugetlb_vma_unlock_write(vma); + } +} + +void __unmap_hugepage_range_final(struct mmu_gather *tlb, + struct vm_area_struct *vma, unsigned long start, + unsigned long end, struct page *ref_page, + zap_flags_t zap_flags) +{ + __unmap_hugepage_range_locking(tlb, vma, start, end, ref_page, + zap_flags); +} + +#ifdef CONFIG_ADVISE_SYSCALLS +/* + * Similar setup as in zap_page_range(). madvise(MADV_DONTNEED) can not call + * zap_page_range for hugetlb vmas as __unmap_hugepage_range_final will delete + * the associated vma_lock. + */ +void clear_hugetlb_page_range(struct vm_area_struct *vma, unsigned long start, + unsigned long end) +{ + struct mmu_notifier_range range; + struct mmu_gather tlb; + + mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, vma, vma->vm_mm, + start, end); + adjust_range_if_pmd_sharing_possible(vma, &range.start, &range.end); + tlb_gather_mmu(&tlb, vma->vm_mm); + update_hiwater_rss(vma->vm_mm); + mmu_notifier_invalidate_range_start(&range); - i_mmap_unlock_write(vma->vm_file->f_mapping); + __unmap_hugepage_range_locking(&tlb, vma, start, end, NULL, 0); + + mmu_notifier_invalidate_range_end(&range); + tlb_finish_mmu(&tlb); } +#endif void unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start, unsigned long end, struct page *ref_page, zap_flags_t zap_flags) { + struct mmu_notifier_range range; struct mmu_gather tlb; + mmu_notifier_range_init(&range, MMU_NOTIFY_UNMAP, 0, vma, vma->vm_mm, + start, end); + adjust_range_if_pmd_sharing_possible(vma, &range.start, &range.end); tlb_gather_mmu(&tlb, vma->vm_mm); + __unmap_hugepage_range(&tlb, vma, start, end, ref_page, zap_flags); + + mmu_notifier_invalidate_range_end(&range); tlb_finish_mmu(&tlb); } --- a/mm/memory.c~hugetlb-dont-delete-vma_lock-in-hugetlb-madv_dontneed-processing +++ a/mm/memory.c @@ -1720,7 +1720,7 @@ void unmap_vmas(struct mmu_gather *tlb, { struct mmu_notifier_range range; struct zap_details details = { - .zap_flags = ZAP_FLAG_DROP_MARKER, + .zap_flags = ZAP_FLAG_DROP_MARKER | ZAP_FLAG_UNMAP, /* Careful - we need to zap private pages too! */ .even_cows = true, }; @@ -1753,15 +1753,21 @@ void zap_page_range(struct vm_area_struc MA_STATE(mas, mt, vma->vm_end, vma->vm_end); lru_add_drain(); - mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, vma, vma->vm_mm, - start, start + size); tlb_gather_mmu(&tlb, vma->vm_mm); update_hiwater_rss(vma->vm_mm); - mmu_notifier_invalidate_range_start(&range); do { - unmap_single_vma(&tlb, vma, start, range.end, NULL); + mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, vma, + vma->vm_mm, + max(start, vma->vm_start), + min(start + size, vma->vm_end)); + if (is_vm_hugetlb_page(vma)) + adjust_range_if_pmd_sharing_possible(vma, + &range.start, + &range.end); + mmu_notifier_invalidate_range_start(&range); + unmap_single_vma(&tlb, vma, start, start + size, NULL); + mmu_notifier_invalidate_range_end(&range); } while ((vma = mas_find(&mas, end - 1)) != NULL); - mmu_notifier_invalidate_range_end(&range); tlb_finish_mmu(&tlb); } _ Patches currently in -mm which might be from mike.kravetz(a)oracle.com are hugetlb-dont-delete-vma_lock-in-hugetlb-madv_dontneed-processing.patch hugetlb-simplify-hugetlb-handling-in-follow_page_mask.patch hugetlb-simplify-hugetlb-handling-in-follow_page_mask-v4.patch

3 years, 1 month

2
1
0 0

[PATCH v6] hugetlb: don't delete vma_lock in hugetlb MADV_DONTNEED processing

by Mike Kravetz

madvise(MADV_DONTNEED) ends up calling zap_page_range() to clear the page tables associated with the address range. For hugetlb vmas, zap_page_range will call __unmap_hugepage_range_final. However, __unmap_hugepage_range_final assumes the passed vma is about to be removed and deletes the vma_lock to prevent pmd sharing as the vma is on the way out. In the case of madvise(MADV_DONTNEED) the vma remains, but the missing vma_lock prevents pmd sharing and could potentially lead to issues with truncation/fault races. This issue was originally reported here [1] as a BUG triggered in page_try_dup_anon_rmap. Prior to the introduction of the hugetlb vma_lock, __unmap_hugepage_range_final cleared the VM_MAYSHARE flag to prevent pmd sharing. Subsequent faults on this vma were confused as VM_MAYSHARE indicates a sharable vma, but was not set so page_mapping was not set in new pages added to the page table. This resulted in pages that appeared anonymous in a VM_SHARED vma and triggered the BUG. Create a new routine clear_hugetlb_page_range() that can be called from madvise(MADV_DONTNEED) for hugetlb vmas. It has the same setup as zap_page_range, but does not delete the vma_lock. Also, add a new zap flag ZAP_FLAG_UNMAP to indicate an unmap call from unmap_vmas(). This is used to indicate the 'final' unmapping of a vma. The routine __unmap_hugepage_range to take a notification_needed argument. This is used to prevent duplicate notifications. [1] https://lore.kernel.org/lkml/CAO4mrfdLMXsao9RF4fUE8-Wfde8xmjsKrTNMNC9wjUb6J… Fixes: 90e7e7f5ef3f ("mm: enable MADV_DONTNEED for hugetlb mappings") Signed-off-by: Mike Kravetz <mike.kravetz(a)oracle.com> Reported-by: Wei Chen <harperchen1110(a)gmail.com> Cc: <stable(a)vger.kernel.org> --- include/linux/hugetlb.h | 7 ++++ include/linux/mm.h | 3 ++ mm/hugetlb.c | 80 ++++++++++++++++++++++++++++++----------- mm/memory.c | 18 ++++++---- 4 files changed, 82 insertions(+), 26 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 3568b90b397d..badcb277603d 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -158,6 +158,8 @@ long follow_hugetlb_page(struct mm_struct *, struct vm_area_struct *, void unmap_hugepage_range(struct vm_area_struct *, unsigned long, unsigned long, struct page *, zap_flags_t); +void clear_hugetlb_page_range(struct vm_area_struct *vma, + unsigned long start, unsigned long end); void __unmap_hugepage_range_final(struct mmu_gather *tlb, struct vm_area_struct *vma, unsigned long start, unsigned long end, @@ -428,6 +430,11 @@ static inline void __unmap_hugepage_range_final(struct mmu_gather *tlb, BUG(); } +static void __maybe_unused clear_hugetlb_page_range(struct vm_area_struct *vma, + unsigned long start, unsigned long end) +{ +} + static inline vm_fault_t hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long address, unsigned int flags) diff --git a/include/linux/mm.h b/include/linux/mm.h index 978c17df053e..517c8cc8ccb9 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3464,4 +3464,7 @@ madvise_set_anon_name(struct mm_struct *mm, unsigned long start, */ #define ZAP_FLAG_DROP_MARKER ((__force zap_flags_t) BIT(0)) +/* Set in unmap_vmas() to indicate an unmap call. Only used by hugetlb */ +#define ZAP_FLAG_UNMAP ((__force zap_flags_t) BIT(1)) + #endif /* _LINUX_MM_H */ diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 4a0289ef09fa..7ba46fa62f75 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -5072,7 +5072,6 @@ static void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct struct page *page; struct hstate *h = hstate_vma(vma); unsigned long sz = huge_page_size(h); - struct mmu_notifier_range range; unsigned long last_addr_mask; bool force_flush = false; @@ -5087,13 +5086,6 @@ static void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct tlb_change_page_size(tlb, sz); tlb_start_vma(tlb, vma); - /* - * If sharing possible, alert mmu notifiers of worst case. - */ - mmu_notifier_range_init(&range, MMU_NOTIFY_UNMAP, 0, vma, mm, start, - end); - adjust_range_if_pmd_sharing_possible(vma, &range.start, &range.end); - mmu_notifier_invalidate_range_start(&range); last_addr_mask = hugetlb_mask_last_page(h); address = start; for (; address < end; address += sz) { @@ -5178,7 +5170,6 @@ static void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct if (ref_page) break; } - mmu_notifier_invalidate_range_end(&range); tlb_end_vma(tlb, vma); /* @@ -5198,37 +5189,86 @@ static void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct tlb_flush_mmu_tlbonly(tlb); } -void __unmap_hugepage_range_final(struct mmu_gather *tlb, +static void __unmap_hugepage_range_locking(struct mmu_gather *tlb, struct vm_area_struct *vma, unsigned long start, unsigned long end, struct page *ref_page, zap_flags_t zap_flags) { + bool final = zap_flags & ZAP_FLAG_UNMAP; + hugetlb_vma_lock_write(vma); i_mmap_lock_write(vma->vm_file->f_mapping); __unmap_hugepage_range(tlb, vma, start, end, ref_page, zap_flags); - /* - * Unlock and free the vma lock before releasing i_mmap_rwsem. When - * the vma_lock is freed, this makes the vma ineligible for pmd - * sharing. And, i_mmap_rwsem is required to set up pmd sharing. - * This is important as page tables for this unmapped range will - * be asynchrously deleted. If the page tables are shared, there - * will be issues when accessed by someone else. - */ - __hugetlb_vma_unlock_write_free(vma); + if (final) { + /* + * Unlock and free the vma lock before releasing i_mmap_rwsem. + * When the vma_lock is freed, this makes the vma ineligible + * for pmd sharing. And, i_mmap_rwsem is required to set up + * pmd sharing. This is important as page tables for this + * unmapped range will be asynchrously deleted. If the page + * tables are shared, there will be issues when accessed by + * someone else. + */ + __hugetlb_vma_unlock_write_free(vma); + i_mmap_unlock_write(vma->vm_file->f_mapping); + } else { + i_mmap_unlock_write(vma->vm_file->f_mapping); + hugetlb_vma_unlock_write(vma); + } +} - i_mmap_unlock_write(vma->vm_file->f_mapping); +void __unmap_hugepage_range_final(struct mmu_gather *tlb, + struct vm_area_struct *vma, unsigned long start, + unsigned long end, struct page *ref_page, + zap_flags_t zap_flags) +{ + __unmap_hugepage_range_locking(tlb, vma, start, end, ref_page, + zap_flags); +} + +#ifdef CONFIG_ADVISE_SYSCALLS +/* + * Similar setup as in zap_page_range(). madvise(MADV_DONTNEED) can not call + * zap_page_range for hugetlb vmas as __unmap_hugepage_range_final will delete + * the associated vma_lock. + */ +void clear_hugetlb_page_range(struct vm_area_struct *vma, unsigned long start, + unsigned long end) +{ + struct mmu_notifier_range range; + struct mmu_gather tlb; + + mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, vma, vma->vm_mm, + start, end); + adjust_range_if_pmd_sharing_possible(vma, &range.start, &range.end); + tlb_gather_mmu(&tlb, vma->vm_mm); + update_hiwater_rss(vma->vm_mm); + mmu_notifier_invalidate_range_start(&range); + + __unmap_hugepage_range_locking(&tlb, vma, start, end, NULL, 0); + + mmu_notifier_invalidate_range_end(&range); + tlb_finish_mmu(&tlb); } +#endif void unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start, unsigned long end, struct page *ref_page, zap_flags_t zap_flags) { + struct mmu_notifier_range range; struct mmu_gather tlb; + mmu_notifier_range_init(&range, MMU_NOTIFY_UNMAP, 0, vma, vma->vm_mm, + start, end); + adjust_range_if_pmd_sharing_possible(vma, &range.start, &range.end); tlb_gather_mmu(&tlb, vma->vm_mm); + __unmap_hugepage_range(&tlb, vma, start, end, ref_page, zap_flags); + + mmu_notifier_invalidate_range_end(&range); tlb_finish_mmu(&tlb); } diff --git a/mm/memory.c b/mm/memory.c index c5599a9279b1..ecd2b4a6cbc3 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1671,7 +1671,7 @@ void unmap_vmas(struct mmu_gather *tlb, struct maple_tree *mt, { struct mmu_notifier_range range; struct zap_details details = { - .zap_flags = ZAP_FLAG_DROP_MARKER, + .zap_flags = ZAP_FLAG_DROP_MARKER | ZAP_FLAG_UNMAP, /* Careful - we need to zap private pages too! */ .even_cows = true, }; @@ -1704,15 +1704,21 @@ void zap_page_range(struct vm_area_struct *vma, unsigned long start, MA_STATE(mas, mt, vma->vm_end, vma->vm_end); lru_add_drain(); - mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, vma, vma->vm_mm, - start, start + size); tlb_gather_mmu(&tlb, vma->vm_mm); update_hiwater_rss(vma->vm_mm); - mmu_notifier_invalidate_range_start(&range); do { - unmap_single_vma(&tlb, vma, start, range.end, NULL); + mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, vma, + vma->vm_mm, + max(start, vma->vm_start), + min(start + size, vma->vm_end)); + if (is_vm_hugetlb_page(vma)) + adjust_range_if_pmd_sharing_possible(vma, + &range.start, + &range.end); + mmu_notifier_invalidate_range_start(&range); + unmap_single_vma(&tlb, vma, start, start + size, NULL); + mmu_notifier_invalidate_range_end(&range); } while ((vma = mas_find(&mas, end - 1)) != NULL); - mmu_notifier_invalidate_range_end(&range); tlb_finish_mmu(&tlb); } -- 2.37.3

3 years, 1 month

2
2
0 0

Waiting ....

by Mrs Therese Koga

Greetings Dear, I have sent you two emails and you did not respond, I even sent another message a few days ago with more details still no response from you. Please are you still using this email address? I am VERY SORRY if sincerely you did not receive those emails, I will resend it now as soon as you confirm you never received them. Regards, Mrs.Therese Koga

3 years, 1 month

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror October 2022