October 2023 - Linux-stable-mirror

[PATCH 5.15 000/183] 5.15.134-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.15.134 release. There are 183 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Fri, 06 Oct 2023 17:51:12 +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.15.134-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.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.15.134-rc1 Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: fix kdoc warnings after gc rework Jani Nikula <jani.nikula(a)intel.com> drm/meson: fix memory leak on ->hpd_notify callback Greg Ungerer <gerg(a)kernel.org> fs: binfmt_elf_efpic: fix personality for ELF-FDPIC Matthias Schiffer <mschiffer(a)universe-factory.net> ata: libata-sata: increase PMP SRST timeout to 10s Damien Le Moal <dlemoal(a)kernel.org> ata: libata-core: Do not register PM operations for SAS ports Damien Le Moal <dlemoal(a)kernel.org> ata: libata-core: Fix port and device removal Damien Le Moal <dlemoal(a)kernel.org> ata: libata-core: Fix ata_port_request_pm() locking Mika Westerberg <mika.westerberg(a)linux.intel.com> net: thunderbolt: Fix TCPv6 GSO checksum calculation Nick Desaulniers <ndesaulniers(a)google.com> bpf: Fix BTF_ID symbol generation collision in tools/ Jiri Olsa <jolsa(a)kernel.org> bpf: Fix BTF_ID symbol generation collision Josef Bacik <josef(a)toxicpanda.com> btrfs: properly report 0 avail for very full file systems Steven Rostedt (Google) <rostedt(a)goodmis.org> ring-buffer: Update "shortest_full" in polling Ben Wolsieffer <Ben.Wolsieffer(a)hefring.com> proc: nommu: /proc/<pid>/maps: release mmap read lock Trond Myklebust <trond.myklebust(a)hammerspace.com> Revert "SUNRPC dont update timeout value on connection reset" Jens Axboe <axboe(a)kernel.dk> io_uring/fs: remove sqe->rw_flags checking from LINKAT Joel Fernandes (Google) <joel(a)joelfernandes.org> sched/rt: Fix live lock between select_fallback_rq() and RT push Liam R. Howlett <Liam.Howlett(a)oracle.com> kernel/sched: Modify initial boot task idle setup Heiner Kallweit <hkallweit1(a)gmail.com> i2c: i801: unregister tco_pdev in i801_probe() error path Niklas Cassel <niklas.cassel(a)wdc.com> ata: libata-scsi: ignore reserved bits for REPORT SUPPORTED OPERATION CODES Kailang Yang <kailang(a)realtek.com> ALSA: hda: Disable power save for solving pop issue on Lenovo ThinkCentre M70q Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: disallow rule removal from chain binding Pan Bian <bianpan2016(a)163.com> nilfs2: fix potential use after free in nilfs_gccache_submit_read_data() Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> serial: 8250_port: Check IRQ data before use Daniel Starke <daniel.starke(a)siemens.com> Revert "tty: n_gsm: fix UAF in gsm_cleanup_mux" Ricky WU <ricky_wu(a)realtek.com> misc: rtsx: Fix some platforms can not boot and move the l1ss judgment to probe Pu Wen <puwen(a)hygon.cn> x86/srso: Add SRSO mitigation for Hygon processors Nicolin Chen <nicolinc(a)nvidia.com> iommu/arm-smmu-v3: Fix soft lockup triggered by arm_smmu_mm_invalidate_range Vishal Goel <vishal.goel(a)samsung.com> Smack:- Use overlay inode label in smack_inode_copy_up() Roberto Sassu <roberto.sassu(a)huawei.com> smack: Retrieve transmuting information in smack_inode_getsecurity() Roberto Sassu <roberto.sassu(a)huawei.com> smack: Record transmuting in smk_transmuted Irvin Cote <irvin.cote(a)insa-lyon.fr> nvme-pci: always return an ERR_PTR from nvme_pci_alloc_dev Gleb Chesnokov <gleb.chesnokov(a)scst.dev> scsi: qla2xxx: Fix NULL pointer dereference in target mode Ian Rogers <irogers(a)google.com> perf metric: Return early if no CPU PMU table exists Andrii Staikov <andrii.staikov(a)intel.com> i40e: fix potential NULL pointer dereferencing of pf->vf i40e_sync_vsi_filters() Mika Westerberg <mika.westerberg(a)linux.intel.com> watchdog: iTCO_wdt: Set NO_REBOOT if the watchdog is not already running Mika Westerberg <mika.westerberg(a)linux.intel.com> watchdog: iTCO_wdt: No need to stop the timer in probe Pratyush Yadav <ptyadav(a)amazon.de> nvme-pci: do not set the NUMA node of device if it has none Christoph Hellwig <hch(a)lst.de> nvme-pci: factor out a nvme_pci_alloc_dev helper Christoph Hellwig <hch(a)lst.de> nvme-pci: factor the iod mempool creation into a helper Chengming Zhou <zhouchengming(a)bytedance.com> cgroup: Fix suspicious rcu_dereference_check() usage warning Chengming Zhou <zhouchengming(a)bytedance.com> sched/cpuacct: Optimize away RCU read lock Arnaldo Carvalho de Melo <acme(a)redhat.com> perf build: Define YYNOMEM as YYNOABORT for bison < 3.81 Thomas Zimmermann <tzimmermann(a)suse.de> fbdev/sh7760fb: Depend on FB=y Johnathan Mantey <johnathanx.mantey(a)intel.com> ncsi: Propagate carrier gain/loss events to the NCSI controller Benjamin Gray <bgray(a)linux.ibm.com> powerpc/watchpoints: Annotate atomic context in more places Benjamin Gray <bgray(a)linux.ibm.com> powerpc/watchpoint: Disable pagefaults when getting user instruction Benjamin Gray <bgray(a)linux.ibm.com> powerpc/watchpoints: Disable preemption in thread_change_pc() Hans Verkuil <hverkuil-cisco(a)xs4all.nl> media: vb2: frame_vector.c: replace WARN_ONCE with a comment Chancel Liu <chancel.liu(a)nxp.com> ASoC: imx-rpmsg: Set ignore_pmdown_time for dai_link Stanislav Fomichev <sdf(a)google.com> bpf: Clarify error expectations from bpf_clone_redirect Shengjiu Wang <shengjiu.wang(a)nxp.com> ASoC: fsl: imx-pcm-rpmsg: Add SNDRV_PCM_INFO_BATCH flag Valentin Caron <valentin.caron(a)foss.st.com> spi: stm32: add a delay before SPI disable Han Xu <han.xu(a)nxp.com> spi: nxp-fspi: reset the FLSHxCR1 registers Niklas Cassel <niklas.cassel(a)wdc.com> ata: libata-eh: do not clear ATA_PFLAG_EH_PENDING in ata_eh_reset() Steve French <stfrench(a)microsoft.com> smb3: correct places where ENOTSUPP is used instead of preferred EOPNOTSUPP Michal Grzedzicki <mge(a)meta.com> scsi: pm80xx: Avoid leaking tags when processing OPC_INB_SET_CONTROLLER_CONFIG command Michal Grzedzicki <mge(a)meta.com> scsi: pm80xx: Use phy-specific SAS address when sending PHY_START command David Francis <David.Francis(a)amd.com> drm/amdgpu: Handle null atom context in VBIOS info ioctl Swapnil Patel <swapnil.patel(a)amd.com> drm/amd/display: Don't check registers, if using AUX BL control David Thompson <davthompson(a)nvidia.com> platform/mellanox: mlxbf-bootctl: add NET dependency into Kconfig Steven Rostedt (Google) <rostedt(a)goodmis.org> ring-buffer: Do not attempt to read past "commit" Ricardo B. Marliere <rbmarliere(a)gmail.com> selftests: fix dependency checker script Filipe Manana <fdmanana(a)suse.com> btrfs: improve error message after failure to add delayed dir index item Zheng Yejian <zhengyejian1(a)huawei.com> ring-buffer: Avoid softlockup in ring_buffer_resize() Zheng Yejian <zhengyejian1(a)huawei.com> selftests/ftrace: Correctly enable event in instance-event.tc Kiwoong Kim <kwmad.kim(a)samsung.com> scsi: ufs: core: Move __ufshcd_send_uic_cmd() outside host_lock Javed Hasan <jhasan(a)marvell.com> scsi: qedf: Add synchronization between I/O completions and abort Helge Deller <deller(a)gmx.de> parisc: irq: Make irq_stack_union static to avoid sparse warning Helge Deller <deller(a)gmx.de> parisc: drivers: Fix sparse warning Helge Deller <deller(a)gmx.de> parisc: iosapic.c: Fix sparse warnings Helge Deller <deller(a)gmx.de> parisc: sba: Fix compile warning wrt list of SBA devices Tobias Schramm <t.schramm(a)manjaro.org> spi: sun6i: fix race between DMA RX transfer completion and RX FIFO drain Tobias Schramm <t.schramm(a)manjaro.org> spi: sun6i: reduce DMA RX transfer width to single byte Sergey Senozhatsky <senozhatsky(a)chromium.org> dma-debug: don't call __dma_entry_alloc_check_leak() under free_entries_lock William A. Kennington III <william(a)wkennington.com> i2c: npcm7xx: Fix callback completion ordering Wenhua Lin <Wenhua.Lin(a)unisoc.com> gpio: pmic-eic-sprd: Add can_sleep flag for PMIC EIC chip Nathan Rossi <nathan.rossi(a)digi.com> soc: imx8m: Enable OCOTP clock for imx8mm before reading registers Max Filippov <jcmvbkbc(a)gmail.com> xtensa: boot/lib: fix function prototypes Randy Dunlap <rdunlap(a)infradead.org> xtensa: boot: don't add include-dirs Randy Dunlap <rdunlap(a)infradead.org> xtensa: iss/network: make functions static Max Filippov <jcmvbkbc(a)gmail.com> xtensa: add default definition for XCHAL_HAVE_DIV32 Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> firmware: imx-dsp: Fix an error handling path in imx_dsp_setup_channels() Dan Carpenter <dan.carpenter(a)linaro.org> power: supply: ucs1002: fix error code in ucs1002_get_property() Tony Lindgren <tony(a)atomide.com> bus: ti-sysc: Fix SYSC_QUIRK_SWSUP_SIDLE_ACT handling for uart wake-up Tony Lindgren <tony(a)atomide.com> ARM: dts: ti: omap: motorola-mapphone: Fix abe_clkctrl warning on boot Tony Lindgren <tony(a)atomide.com> ARM: dts: ti: omap: Fix bandgap thermal cells addressing for omap3/4 Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> ARM: dts: omap: correct indentation Thomas Gleixner <tglx(a)linutronix.de> treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_56.RULE (part 1) Timo Alho <talho(a)nvidia.com> clk: tegra: fix error return case for recalc_rate Adam Ford <aford173(a)gmail.com> bus: ti-sysc: Fix missing AM35xx SoC matching Julien Panis <jpanis(a)baylibre.com> bus: ti-sysc: Use fsleep() instead of usleep_range() in sysc_reset() Marek Vasut <marex(a)denx.de> drm/bridge: ti-sn65dsi83: Do not generate HFP/HBP/HSA and EOT packet Christoph Hellwig <hch(a)lst.de> MIPS: Alchemy: only build mmc support helpers if au1xmmc is enabled Qu Wenruo <wqu(a)suse.com> btrfs: reset destination buffer when read_extent_buffer() gets invalid range Nilesh Javali <njavali(a)marvell.com> scsi: qla2xxx: Use raw_smp_processor_id() instead of smp_processor_id() Shreyas Deodhar <sdeodhar(a)marvell.com> scsi: qla2xxx: Select qpair depending on which CPU post_cmd() gets called Werner Fischer <devlists(a)wefi.net> ata: ahci: Add Elkhart Lake AHCI controller Mario Limonciello <mario.limonciello(a)amd.com> ata: ahci: Rename board_ahci_mobile Paul Menzel <pmenzel(a)molgen.mpg.de> ata: ahci: Add support for AMD A85 FCH (Hudson D4) Paul Menzel <pmenzel(a)molgen.mpg.de> ata: libata: Rename link flag ATA_LFLAG_NO_DB_DELAY Xiao Liang <shaw.leon(a)gmail.com> netfilter: nft_exthdr: Fix non-linear header modification Florian Westphal <fw(a)strlen.de> netfilter: exthdr: add support for tcp option removal Namhyung Kim <namhyung(a)kernel.org> perf build: Update build rule for generated files Ian Rogers <rogers.email(a)gmail.com> perf jevents: Switch build to use jevents.py Werner Sembach <wse(a)tuxedocomputers.com> Input: i8042 - add quirk for TUXEDO Gemini 17 Gen1/Clevo PD70PN Huacai Chen <chenhuacai(a)kernel.org> Input: i8042 - rename i8042-x86ia64io.h to i8042-acpipnpio.h Darrick J. Wong <djwong(a)kernel.org> xfs: fix xfs_inodegc_stop racing with mod_delayed_work Darrick J. Wong <djwong(a)kernel.org> xfs: disable reaping in fscounters scrub Darrick J. Wong <djwong(a)kernel.org> xfs: check that per-cpu inodegc workers actually run on that cpu Darrick J. Wong <djwong(a)kernel.org> xfs: explicitly specify cpu when forcing inodegc delayed work to run immediately Dave Chinner <dchinner(a)redhat.com> xfs: introduce xfs_inodegc_push() Dave Chinner <dchinner(a)redhat.com> xfs: bound maximum wait time for inodegc work Liang He <windhl(a)126.com> i2c: mux: gpio: Add missing fwnode_handle_put() Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> i2c: mux: gpio: Replace custom acpi_get_local_address() Xiaoke Wang <xkernel.wang(a)foxmail.com> i2c: mux: demux-pinctrl: check the return value of devm_kstrdup() Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> gpio: tb10x: Fix an error handling path in tb10x_gpio_probe() Sasha Levin <sashal(a)kernel.org> Fix up backport of 136191703038 ("interconnect: Teach lockdep about icc_bw_lock order") Muhammad Husaini Zulkifli <muhammad.husaini.zulkifli(a)intel.com> igc: Expose tx-usecs coalesce setting to user Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> bnxt_en: Flush XDP for bnxt_poll_nitroa0()'s NAPI Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> net: ena: Flush XDP packets on error. Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> locking/seqlock: Do the lockdep annotation before locking in do_write_seqcount_begin_nested() Jozsef Kadlecsik <kadlec(a)netfilter.org> netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: disable toggling dormant table state more than once Artem Chernyshev <artem.chernyshev(a)red-soft.ru> net: rds: Fix possible NULL-pointer dereference Ziyang Xuan <william.xuanziyang(a)huawei.com> team: fix null-ptr-deref when team device type is changed Eric Dumazet <edumazet(a)google.com> net: bridge: use DEV_STATS_INC() Jie Wang <wangjie125(a)huawei.com> net: hns3: add 5ms delay before clear firmware reset irq source Jijie Shao <shaojijie(a)huawei.com> net: hns3: fix fail to delete tc flower rules during reset issue Jian Shen <shenjian15(a)huawei.com> net: hns3: only enable unicast promisc when mac table full Jie Wang <wangjie125(a)huawei.com> net: hns3: fix GRE checksum offload issue Josh Poimboeuf <jpoimboe(a)kernel.org> x86/srso: Fix SBPB enablement for spec_rstack_overflow=off Josh Poimboeuf <jpoimboe(a)kernel.org> x86/srso: Fix srso_show_state() side effect Stephen Boyd <swboyd(a)chromium.org> platform/x86: intel_scu_ipc: Fail IPC send if still busy Stephen Boyd <swboyd(a)chromium.org> platform/x86: intel_scu_ipc: Don't override scu in intel_scu_ipc_dev_simple_command() Stephen Boyd <swboyd(a)chromium.org> platform/x86: intel_scu_ipc: Check status upon timeout in ipc_wait_for_interrupt() Stephen Boyd <swboyd(a)chromium.org> platform/x86: intel_scu_ipc: Check status after timeout in busy_loop() Eric Dumazet <edumazet(a)google.com> dccp: fix dccp_v4_err()/dccp_v6_err() again Kajol Jain <kjain(a)linux.ibm.com> powerpc/perf/hv-24x7: Update domain value check Kyle Zeng <zengyhkyle(a)gmail.com> ipv4: fix null-deref in ipv4_link_failure Vinicius Costa Gomes <vinicius.gomes(a)intel.com> igc: Fix infinite initialization loop with early XDP redirect David Christensen <drc(a)linux.vnet.ibm.com> ionic: fix 16bit math issue when PAGE_SIZE >= 64KB Ivan Vecera <ivecera(a)redhat.com> i40e: Fix VF VLAN offloading when port VLAN is configured Mateusz Palczewski <mateusz.palczewski(a)intel.com> i40e: Add VF VLAN pruning Radoslaw Tyl <radoslawx.tyl(a)intel.com> iavf: do not process adminq tasks when __IAVF_IN_REMOVE_TASK is set Shengjiu Wang <shengjiu.wang(a)nxp.com> ASoC: imx-audmix: Fix return error with devm_clk_get() Sasha Neftin <sasha.neftin(a)intel.com> net/core: Fix ETH_P_1588 flow dissector Sabrina Dubroca <sd(a)queasysnail.net> selftests: tls: swap the TX and RX sockets in some tests Toke Høiland-Jørgensen <toke(a)redhat.com> bpf: Avoid deadlock when using queue and stack maps from NMI Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: disallow element removal on anonymous sets Jerome Brunet <jbrunet(a)baylibre.com> ASoC: meson: spdifin: start hw on dai probe Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: fix memleak when more than 255 elements expired Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_set_hash: try later when GC hits EAGAIN on iteration Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_set_pipapo: stop GC iteration if GC transaction allocation fails Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_set_pipapo: call nft_trans_gc_queue_sync() in catchall GC Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_set_rbtree: use read spinlock to avoid datapath contention Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_set_rbtree: skip sync GC for new elements in this transaction Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: defer gc run if previous batch is still pending Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: use correct lock to protect gc_list Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: GC transaction race with abort path Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: GC transaction race with netns dismantle Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: fix GC transaction races with netns and netlink event exit path Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: don't fail inserts if duplicate has expired Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: remove busy mark and gc batch API Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_set_hash: mark set element as dead when deleting from packet path Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: adapt set backend to use GC transaction API Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: GC transaction API to avoid race with control plane Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: don't skip expired elements during walk Steven Rostedt (Google) <rostedt(a)goodmis.org> tracing: Have event inject files inc the trace array ref count Jan Kara <jack(a)suse.cz> ext4: do not let fstrim block system suspend Jan Kara <jack(a)suse.cz> ext4: move setting of trimmed bit into ext4_try_to_trim_range() Kemeng Shi <shikemeng(a)huaweicloud.com> ext4: replace the traditional ternary conditional operator with with max()/min() Lukas Czerner <lczerner(a)redhat.com> ext4: change s_last_trim_minblks type to unsigned long Lukas Bulwahn <lukas.bulwahn(a)gmail.com> ext4: scope ret locally in ext4_try_to_trim_range() Szuying Chen <chensiying21(a)gmail.com> ata: libahci: clear pending interrupt status Hannes Reinecke <hare(a)suse.de> ata: ahci: Drop pointless VPRINTK() calls and convert the remaining ones Steven Rostedt (Google) <rostedt(a)goodmis.org> tracing: Increase trace array ref count on enable and filter files John Keeping <john(a)metanate.com> tracing: Make trace_marker{,_raw} stream-like Olga Kornievskaia <kolga(a)netapp.com> NFSv4.1: fix pnfs MDS=DS session trunking Olga Kornievskaia <kolga(a)netapp.com> NFSv4.1: use EXCHGID4_FLAG_USE_PNFS_DS for DS server Trond Myklebust <trond.myklebust(a)hammerspace.com> SUNRPC: Mark the cred for revalidation if the server rejects it Trond Myklebust <trond.myklebust(a)hammerspace.com> NFS/pNFS: Report EINVAL errors from connect() to the server Trond Myklebust <trond.myklebust(a)hammerspace.com> NFS: More fixes for nfs_direct_write_reschedule_io() Trond Myklebust <trond.myklebust(a)hammerspace.com> NFS: Use the correct commit info in nfs_join_page_group() ------------- Diffstat: Makefile | 4 +- arch/arm/boot/dts/am33xx.dtsi | 5 +- arch/arm/boot/dts/am3517.dtsi | 5 +- arch/arm/boot/dts/am4372.dtsi | 5 +- arch/arm/boot/dts/artpec6-devboard.dts | 9 +- arch/arm/boot/dts/dm814x.dtsi | 6 +- arch/arm/boot/dts/dm816x.dtsi | 6 +- arch/arm/boot/dts/dra62x.dtsi | 6 +- arch/arm/boot/dts/dra7-dspeve-thermal.dtsi | 5 +- arch/arm/boot/dts/dra7-iva-thermal.dtsi | 5 +- arch/arm/boot/dts/imx6q-gk802.dts | 9 +- arch/arm/boot/dts/motorola-mapphone-common.dtsi | 4 +- arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi | 6 +- arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi | 6 +- arch/arm/boot/dts/omap2.dtsi | 5 +- arch/arm/boot/dts/omap2420.dtsi | 5 +- arch/arm/boot/dts/omap2430.dtsi | 5 +- arch/arm/boot/dts/omap3-cm-t3517.dts | 12 +- arch/arm/boot/dts/omap3-cpu-thermal.dtsi | 8 +- arch/arm/boot/dts/omap3-gta04.dtsi | 6 +- arch/arm/boot/dts/omap3-ldp.dts | 2 +- arch/arm/boot/dts/omap3-n900.dts | 38 +- arch/arm/boot/dts/omap3-zoom3.dts | 44 +-- arch/arm/boot/dts/omap3.dtsi | 5 +- arch/arm/boot/dts/omap34xx.dtsi | 5 +- arch/arm/boot/dts/omap36xx.dtsi | 5 +- arch/arm/boot/dts/omap4-cpu-thermal.dtsi | 34 +- arch/arm/boot/dts/omap443x.dtsi | 6 +- arch/arm/boot/dts/omap4460.dtsi | 6 +- arch/arm/boot/dts/omap5-cm-t54.dts | 56 +-- arch/arm/boot/dts/omap5-core-thermal.dtsi | 5 +- arch/arm/boot/dts/omap5-gpu-thermal.dtsi | 5 +- arch/arm/boot/dts/orion5x-lacie-d2-network.dts | 5 +- .../dts/orion5x-lacie-ethernet-disk-mini-v2.dts | 9 +- .../boot/dts/orion5x-maxtor-shared-storage-2.dts | 5 +- arch/arm/boot/dts/orion5x-mv88f5181.dtsi | 9 +- arch/arm/boot/dts/orion5x-mv88f5182.dtsi | 9 +- arch/arm/boot/dts/orion5x-netgear-wnr854t.dts | 9 +- arch/arm/boot/dts/orion5x-rd88f5182-nas.dts | 9 +- arch/arm/boot/dts/orion5x.dtsi | 9 +- arch/arm/include/asm/hardware/cache-aurora-l2.h | 5 +- arch/arm/include/asm/hardware/cache-feroceon-l2.h | 6 +- arch/arm/include/asm/hardware/cache-tauros2.h | 5 +- arch/arm/mach-davinci/board-da830-evm.c | 6 +- arch/arm/mach-davinci/board-da850-evm.c | 6 +- arch/arm/mach-davinci/board-dm355-evm.c | 6 +- arch/arm/mach-davinci/board-dm355-leopard.c | 5 +- arch/arm/mach-davinci/board-dm644x-evm.c | 6 +- arch/arm/mach-davinci/board-dm646x-evm.c | 7 +- arch/arm/mach-davinci/board-mityomapl138.c | 5 +- arch/arm/mach-davinci/board-neuros-osd2.c | 5 +- arch/arm/mach-davinci/board-omapl138-hawk.c | 5 +- arch/arm/mach-davinci/common.c | 6 +- arch/arm/mach-davinci/cpuidle.h | 5 +- arch/arm/mach-davinci/da830.c | 6 +- arch/arm/mach-davinci/da850.c | 6 +- arch/arm/mach-davinci/dm355.c | 6 +- arch/arm/mach-davinci/dm644x.c | 6 +- arch/arm/mach-davinci/dm646x.c | 6 +- arch/arm/mach-davinci/include/mach/common.h | 6 +- arch/arm/mach-davinci/include/mach/cputype.h | 6 +- arch/arm/mach-davinci/include/mach/da8xx.h | 6 +- arch/arm/mach-davinci/include/mach/hardware.h | 6 +- arch/arm/mach-davinci/include/mach/serial.h | 6 +- arch/arm/mach-davinci/mux.c | 6 +- arch/arm/mach-davinci/mux.h | 6 +- arch/arm/mach-davinci/pm_domain.c | 5 +- arch/arm/mach-dove/bridge-regs.h | 9 +- arch/arm/mach-dove/cm-a510.c | 5 +- arch/arm/mach-dove/common.c | 5 +- arch/arm/mach-dove/common.h | 5 +- arch/arm/mach-dove/dove-db-setup.c | 5 +- arch/arm/mach-dove/dove.h | 9 +- arch/arm/mach-dove/irq.c | 5 +- arch/arm/mach-dove/irqs.h | 9 +- arch/arm/mach-dove/mpp.c | 5 +- arch/arm/mach-dove/pcie.c | 5 +- arch/arm/mach-dove/pm.h | 6 +- arch/arm/mach-lpc18xx/board-dt.c | 5 +- arch/arm/mach-lpc32xx/pm.c | 6 +- arch/arm/mach-lpc32xx/suspend.S | 6 +- arch/arm/mach-mv78xx0/bridge-regs.h | 6 +- arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | 5 +- arch/arm/mach-mv78xx0/common.c | 5 +- arch/arm/mach-mv78xx0/common.h | 5 +- arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 5 +- arch/arm/mach-mv78xx0/irq.c | 5 +- arch/arm/mach-mv78xx0/irqs.h | 9 +- arch/arm/mach-mv78xx0/mpp.c | 5 +- arch/arm/mach-mv78xx0/mpp.h | 6 +- arch/arm/mach-mv78xx0/mv78xx0.h | 5 +- arch/arm/mach-mv78xx0/pcie.c | 5 +- arch/arm/mach-mv78xx0/rd78x00-masa-setup.c | 5 +- arch/arm/mach-mvebu/armada-370-xp.h | 5 +- arch/arm/mach-mvebu/board-v7.c | 5 +- arch/arm/mach-mvebu/coherency.c | 5 +- arch/arm/mach-mvebu/coherency.h | 6 +- arch/arm/mach-mvebu/coherency_ll.S | 5 +- arch/arm/mach-mvebu/common.h | 5 +- arch/arm/mach-mvebu/cpu-reset.c | 5 +- arch/arm/mach-mvebu/dove.c | 5 +- arch/arm/mach-mvebu/headsmp-a9.S | 5 +- arch/arm/mach-mvebu/headsmp.S | 5 +- arch/arm/mach-mvebu/kirkwood.c | 5 +- arch/arm/mach-mvebu/kirkwood.h | 5 +- arch/arm/mach-mvebu/mvebu-soc-id.c | 5 +- arch/arm/mach-mvebu/mvebu-soc-id.h | 5 +- arch/arm/mach-mvebu/platsmp-a9.c | 5 +- arch/arm/mach-mvebu/platsmp.c | 5 +- arch/arm/mach-mvebu/pm-board.c | 5 +- arch/arm/mach-mvebu/pm.c | 5 +- arch/arm/mach-mvebu/pmsu.c | 5 +- arch/arm/mach-mvebu/pmsu.h | 5 +- arch/arm/mach-mvebu/pmsu_ll.S | 5 +- arch/arm/mach-mvebu/system-controller.c | 5 +- arch/arm/mach-omap1/include/mach/mtd-xip.h | 6 +- arch/arm/mach-omap1/pm_bus.c | 6 +- arch/arm/mach-omap2/prcm43xx.h | 5 +- arch/arm/mach-omap2/vc.c | 6 +- arch/arm/mach-orion5x/board-d2net.c | 5 +- arch/arm/mach-orion5x/board-dt.c | 5 +- arch/arm/mach-orion5x/board-rd88f5182.c | 5 +- arch/arm/mach-orion5x/bridge-regs.h | 9 +- arch/arm/mach-orion5x/common.c | 5 +- arch/arm/mach-orion5x/db88f5281-setup.c | 5 +- arch/arm/mach-orion5x/irq.c | 5 +- arch/arm/mach-orion5x/irqs.h | 5 +- arch/arm/mach-orion5x/kurobox_pro-setup.c | 5 +- arch/arm/mach-orion5x/ls_hgl-setup.c | 5 +- arch/arm/mach-orion5x/mpp.c | 5 +- arch/arm/mach-orion5x/net2big-setup.c | 6 +- arch/arm/mach-orion5x/orion5x.h | 5 +- arch/arm/mach-orion5x/pci.c | 5 +- arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 5 +- arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 5 +- arch/arm/mach-orion5x/rd88f5182-setup.c | 5 +- arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 5 +- arch/arm/mach-orion5x/ts78xx-setup.c | 5 +- arch/arm/mach-orion5x/wnr854t-setup.c | 9 +- arch/arm/mach-orion5x/wrt350n-v2-setup.c | 9 +- arch/arm/mach-pxa/eseries.c | 7 +- arch/arm/mach-pxa/standby.S | 6 +- arch/arm/mach-spear/generic.h | 5 +- arch/arm/mach-spear/include/mach/misc_regs.h | 5 +- arch/arm/mach-spear/include/mach/spear.h | 5 +- arch/arm/mach-spear/pl080.c | 5 +- arch/arm/mach-spear/pl080.h | 5 +- arch/arm/mach-spear/restart.c | 5 +- arch/arm/mach-spear/spear1310.c | 5 +- arch/arm/mach-spear/spear1340.c | 5 +- arch/arm/mach-spear/spear13xx.c | 5 +- arch/arm/mach-spear/spear300.c | 5 +- arch/arm/mach-spear/spear310.c | 5 +- arch/arm/mach-spear/spear320.c | 5 +- arch/arm/mach-spear/spear3xx.c | 5 +- arch/arm/mach-spear/spear6xx.c | 5 +- arch/arm/mach-spear/time.c | 5 +- arch/arm/mm/cache-feroceon-l2.c | 5 +- arch/arm/mm/cache-tauros2.c | 5 +- arch/mips/alchemy/devboards/db1000.c | 4 + arch/mips/alchemy/devboards/db1200.c | 6 + arch/mips/alchemy/devboards/db1300.c | 4 + arch/parisc/include/asm/ropes.h | 3 + arch/parisc/kernel/drivers.c | 2 +- arch/parisc/kernel/irq.c | 2 +- arch/powerpc/kernel/hw_breakpoint.c | 16 +- arch/powerpc/kernel/hw_breakpoint_constraints.c | 7 +- arch/powerpc/perf/hv-24x7.c | 2 +- arch/x86/kernel/cpu/bugs.c | 4 +- arch/x86/kernel/cpu/common.c | 2 +- arch/xtensa/boot/Makefile | 3 +- arch/xtensa/boot/lib/zmem.c | 5 +- arch/xtensa/include/asm/core.h | 4 + arch/xtensa/platforms/iss/network.c | 4 +- drivers/ata/ahci.c | 111 +++--- drivers/ata/ahci_brcm.c | 2 +- drivers/ata/ahci_xgene.c | 4 - drivers/ata/libahci.c | 49 +-- drivers/ata/libata-core.c | 47 ++- drivers/ata/libata-eh.c | 13 +- drivers/ata/libata-sata.c | 2 +- drivers/ata/libata-scsi.c | 2 +- drivers/ata/libata-transport.c | 9 +- drivers/ata/libata.h | 2 + drivers/bus/ti-sysc.c | 31 +- drivers/char/agp/parisc-agp.c | 2 - drivers/clk/tegra/clk-bpmp.c | 2 +- drivers/firmware/imx/imx-dsp.c | 1 + drivers/gpio/gpio-pmic-eic-sprd.c | 1 + drivers/gpio/gpio-tb10x.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 17 +- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 4 +- drivers/gpu/drm/bridge/ti-sn65dsi83.c | 4 +- drivers/gpu/drm/meson/meson_encoder_hdmi.c | 2 + drivers/i2c/busses/i2c-i801.c | 1 + drivers/i2c/busses/i2c-npcm7xx.c | 17 +- drivers/i2c/muxes/i2c-demux-pinctrl.c | 4 + drivers/i2c/muxes/i2c-mux-gpio.c | 47 +-- .../serio/{i8042-x86ia64io.h => i8042-acpipnpio.h} | 13 +- drivers/input/serio/i8042.h | 2 +- drivers/interconnect/core.c | 1 + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 27 +- drivers/media/common/videobuf2/frame_vector.c | 6 +- drivers/misc/cardreader/rts5227.c | 55 +-- drivers/misc/cardreader/rts5228.c | 57 +-- drivers/misc/cardreader/rts5249.c | 56 +-- drivers/misc/cardreader/rts5260.c | 43 +-- drivers/misc/cardreader/rts5261.c | 52 +-- drivers/misc/cardreader/rtsx_pcr.c | 51 ++- drivers/net/ethernet/amazon/ena/ena_netdev.c | 3 + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 9 + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 13 +- drivers/net/ethernet/intel/i40e/i40e.h | 1 + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 9 + drivers/net/ethernet/intel/i40e/i40e_main.c | 138 ++++++- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 16 +- drivers/net/ethernet/intel/iavf/iavf_main.c | 3 +- drivers/net/ethernet/intel/igc/igc_ethtool.c | 31 +- drivers/net/ethernet/intel/igc/igc_main.c | 2 +- drivers/net/ethernet/pensando/ionic/ionic_dev.h | 1 + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 10 +- drivers/net/team/team.c | 10 +- drivers/net/thunderbolt.c | 3 +- drivers/nvme/host/pci.c | 121 ++++--- drivers/parisc/iosapic.c | 4 +- drivers/parisc/iosapic_private.h | 4 +- drivers/platform/mellanox/Kconfig | 1 + drivers/platform/x86/intel_scu_ipc.c | 66 ++-- drivers/power/supply/ucs1002_power.c | 3 +- drivers/scsi/pm8001/pm8001_hwi.c | 2 +- drivers/scsi/pm8001/pm80xx_hwi.c | 4 +- drivers/scsi/qedf/qedf_io.c | 10 +- drivers/scsi/qedf/qedf_main.c | 7 +- drivers/scsi/qla2xxx/qla_def.h | 3 + drivers/scsi/qla2xxx/qla_init.c | 5 +- drivers/scsi/qla2xxx/qla_inline.h | 58 +++ drivers/scsi/qla2xxx/qla_isr.c | 12 +- drivers/scsi/qla2xxx/qla_nvme.c | 4 + drivers/scsi/qla2xxx/qla_os.c | 6 + drivers/scsi/qla2xxx/qla_target.c | 3 +- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 4 +- drivers/scsi/ufs/ufshcd.c | 6 +- drivers/soc/imx/soc-imx8m.c | 10 + drivers/spi/spi-nxp-fspi.c | 7 + drivers/spi/spi-stm32.c | 8 + drivers/spi/spi-sun6i.c | 31 +- drivers/tty/n_gsm.c | 4 +- drivers/tty/serial/8250/8250_port.c | 5 +- drivers/video/fbdev/Kconfig | 2 +- drivers/watchdog/iTCO_wdt.c | 26 +- fs/binfmt_elf_fdpic.c | 5 +- fs/btrfs/delayed-inode.c | 7 +- fs/btrfs/extent_io.c | 8 +- fs/btrfs/super.c | 2 +- fs/cifs/inode.c | 2 +- fs/cifs/smb2ops.c | 6 +- fs/ext4/ext4.h | 2 +- fs/ext4/mballoc.c | 67 ++-- fs/nfs/direct.c | 25 +- fs/nfs/flexfilelayout/flexfilelayout.c | 1 + fs/nfs/nfs4client.c | 9 +- fs/nfs/nfs4proc.c | 4 + fs/nfs/write.c | 23 +- fs/nilfs2/gcinode.c | 6 +- fs/proc/task_nommu.c | 27 +- fs/xfs/scrub/common.c | 25 -- fs/xfs/scrub/common.h | 2 - fs/xfs/scrub/fscounters.c | 13 +- fs/xfs/scrub/scrub.c | 2 - fs/xfs/scrub/scrub.h | 1 - fs/xfs/xfs_icache.c | 92 +++-- fs/xfs/xfs_icache.h | 1 + fs/xfs/xfs_mount.h | 5 +- fs/xfs/xfs_qm_syscalls.c | 9 +- fs/xfs/xfs_super.c | 12 +- fs/xfs/xfs_trace.h | 1 + include/linux/btf_ids.h | 2 +- include/linux/cgroup.h | 3 +- include/linux/if_team.h | 2 + include/linux/libata.h | 4 +- include/linux/nfs_fs_sb.h | 1 + include/linux/nfs_page.h | 4 +- include/linux/seqlock.h | 2 +- include/net/netfilter/nf_tables.h | 127 +++---- include/uapi/linux/bpf.h | 4 +- io_uring/io_uring.c | 2 +- kernel/bpf/queue_stack_maps.c | 21 +- kernel/dma/debug.c | 20 +- kernel/sched/core.c | 2 +- kernel/sched/cpuacct.c | 4 +- kernel/sched/cpupri.c | 1 + kernel/sched/idle.c | 1 + kernel/trace/ring_buffer.c | 10 + kernel/trace/trace.c | 45 ++- kernel/trace/trace.h | 2 + kernel/trace/trace_events.c | 6 +- kernel/trace/trace_events_inject.c | 3 +- net/bridge/br_forward.c | 4 +- net/bridge/br_input.c | 4 +- net/core/flow_dissector.c | 2 +- net/dccp/ipv4.c | 9 +- net/dccp/ipv6.c | 9 +- net/ipv4/route.c | 4 +- net/ncsi/ncsi-aen.c | 5 + net/netfilter/ipset/ip_set_core.c | 12 +- net/netfilter/nf_tables_api.c | 400 +++++++++++++++++---- net/netfilter/nft_exthdr.c | 110 +++++- net/netfilter/nft_set_hash.c | 87 +++-- net/netfilter/nft_set_pipapo.c | 71 ++-- net/netfilter/nft_set_rbtree.c | 161 +++++---- net/rds/rdma_transport.c | 12 +- net/sunrpc/clnt.c | 15 +- security/smack/smack.h | 1 + security/smack/smack_lsm.c | 65 +++- sound/pci/hda/hda_intel.c | 1 + sound/soc/fsl/imx-audmix.c | 2 +- sound/soc/fsl/imx-pcm-rpmsg.c | 1 + sound/soc/fsl/imx-rpmsg.c | 8 + sound/soc/meson/axg-spdifin.c | 49 +-- tools/build/Makefile.build | 10 + tools/include/linux/btf_ids.h | 2 +- tools/include/uapi/linux/bpf.h | 4 +- tools/perf/Makefile.config | 19 + tools/perf/Makefile.perf | 1 + tools/perf/pmu-events/Build | 19 +- tools/perf/pmu-events/empty-pmu-events.c | 158 ++++++++ tools/perf/util/Build | 6 + tools/perf/util/metricgroup.c | 3 + .../ftrace/test.d/instances/instance-event.tc | 2 +- tools/testing/selftests/kselftest_deps.sh | 77 +++- tools/testing/selftests/net/tls.c | 8 +- 332 files changed, 2602 insertions(+), 1896 deletions(-)

2 years, 1 month

14
212
0 0

[PATCH v2] drm/i915: Flush WC GGTT only on required platforms

by Nirmoy Das

gen8_ggtt_invalidate() is only needed for limited set of platforms where GGTT is mapped as WC otherwise this can cause unwanted side-effects on XE_HP platforms where GFX_FLSH_CNTL_GEN6 is not valid. v2: Add a func to detect wc ggtt detection (Ville) Fixes: d2eae8e98d59 ("drm/i915/dg2: Drop force_probe requirement") Cc: Rodrigo Vivi <rodrigo.vivi(a)intel.com> Cc: Tvrtko Ursulin <tvrtko.ursulin(a)linux.intel.com> Cc: Joonas Lahtinen <joonas.lahtinen(a)linux.intel.com> Cc: Jani Nikula <jani.nikula(a)linux.intel.com> Cc: Jonathan Cavitt <jonathan.cavitt(a)intel.com> Cc: John Harrison <john.c.harrison(a)intel.com> Cc: Andi Shyti <andi.shyti(a)linux.intel.com> Cc: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Cc: <stable(a)vger.kernel.org> # v6.2+ Suggested-by: Matt Roper <matthew.d.roper(a)intel.com> Signed-off-by: Nirmoy Das <nirmoy.das(a)intel.com> Acked-by: Andi Shyti <andi.shyti(a)linux.intel.com> --- drivers/gpu/drm/i915/gt/intel_ggtt.c | 35 +++++++++++++++++++--------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c index 4d7d88b92632..401667f83f96 100644 --- a/drivers/gpu/drm/i915/gt/intel_ggtt.c +++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c @@ -195,6 +195,21 @@ void gen6_ggtt_invalidate(struct i915_ggtt *ggtt) spin_unlock_irq(&uncore->lock); } +static bool needs_wc_ggtt_mapping(struct drm_i915_private *i915) +{ + /* + * On BXT+/ICL+ writes larger than 64 bit to the GTT pagetable range + * will be dropped. For WC mappings in general we have 64 byte burst + * writes when the WC buffer is flushed, so we can't use it, but have to + * resort to an uncached mapping. The WC issue is easily caught by the + * readback check when writing GTT PTE entries. + */ + if (!IS_GEN9_LP(i915) && GRAPHICS_VER(i915) < 11) + return true; + + return false; +} + static void gen8_ggtt_invalidate(struct i915_ggtt *ggtt) { struct intel_uncore *uncore = ggtt->vm.gt->uncore; @@ -202,8 +217,12 @@ static void gen8_ggtt_invalidate(struct i915_ggtt *ggtt) /* * Note that as an uncached mmio write, this will flush the * WCB of the writes into the GGTT before it triggers the invalidate. + * + * Only perform this when GGTT is mapped as WC, see ggtt_probe_common(). */ - intel_uncore_write_fw(uncore, GFX_FLSH_CNTL_GEN6, GFX_FLSH_CNTL_EN); + if (needs_wc_ggtt_mapping(ggtt->vm.i915)) + intel_uncore_write_fw(uncore, GFX_FLSH_CNTL_GEN6, + GFX_FLSH_CNTL_EN); } static void guc_ggtt_invalidate(struct i915_ggtt *ggtt) @@ -1126,17 +1145,11 @@ static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size) GEM_WARN_ON(pci_resource_len(pdev, GEN4_GTTMMADR_BAR) != gen6_gttmmadr_size(i915)); phys_addr = pci_resource_start(pdev, GEN4_GTTMMADR_BAR) + gen6_gttadr_offset(i915); - /* - * On BXT+/ICL+ writes larger than 64 bit to the GTT pagetable range - * will be dropped. For WC mappings in general we have 64 byte burst - * writes when the WC buffer is flushed, so we can't use it, but have to - * resort to an uncached mapping. The WC issue is easily caught by the - * readback check when writing GTT PTE entries. - */ - if (IS_GEN9_LP(i915) || GRAPHICS_VER(i915) >= 11) - ggtt->gsm = ioremap(phys_addr, size); - else + if (needs_wc_ggtt_mapping(i915)) ggtt->gsm = ioremap_wc(phys_addr, size); + else + ggtt->gsm = ioremap(phys_addr, size); + if (!ggtt->gsm) { drm_err(&i915->drm, "Failed to map the ggtt page table\n"); return -ENOMEM; -- 2.41.0

2 years, 1 month

3
3
0 0

FAILED: patch "[PATCH] x86/alternatives: Disable KASAN in apply_alternatives()" failed to apply to 6.1-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x d35652a5fc9944784f6f50a5c979518ff8dacf61 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023101547-captivate-regress-4cb0@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: d35652a5fc99 ("x86/alternatives: Disable KASAN in apply_alternatives()") 6becb5026b81 ("x86/alternative: Make debug-alternative selective") ac0ee0a9560c ("x86/alternatives: Teach text_poke_bp() to patch Jcc.d32 instructions") 5d1dd961e743 ("x86/alternatives: Add alt_instr.flags") 931ab63664f0 ("x86/ibt: Implement FineIBT") b341b20d648b ("x86: Add prefix symbols for function padding") 3b6c1747da48 ("x86/retpoline: Add SKL retthunk retpolines") 52354973573c ("x86/asm: Provide ALTERNATIVE_3") eaf44c816ed8 ("x86/modules: Add call patching") e81dc127ef69 ("x86/callthunks: Add call patching for call depth tracking") 80e4c1cd42ff ("x86/retbleed: Add X86_FEATURE_CALL_DEPTH") bea75b33895f ("x86/Kconfig: Introduce function padding") 8f7c0d8b23c3 ("x86/Kconfig: Add CONFIG_CALL_THUNKS") 8eb5d34e77c6 ("x86/asm: Differentiate between code and function alignment") d49a0626216b ("arch: Introduce CONFIG_FUNCTION_ALIGNMENT") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From d35652a5fc9944784f6f50a5c979518ff8dacf61 Mon Sep 17 00:00:00 2001 From: "Kirill A. Shutemov" <kirill.shutemov(a)linux.intel.com> Date: Thu, 12 Oct 2023 13:04:24 +0300 Subject: [PATCH] x86/alternatives: Disable KASAN in apply_alternatives() Fei has reported that KASAN triggers during apply_alternatives() on a 5-level paging machine: BUG: KASAN: out-of-bounds in rcu_is_watching() Read of size 4 at addr ff110003ee6419a0 by task swapper/0/0 ... __asan_load4() rcu_is_watching() trace_hardirqs_on() text_poke_early() apply_alternatives() ... On machines with 5-level paging, cpu_feature_enabled(X86_FEATURE_LA57) gets patched. It includes KASAN code, where KASAN_SHADOW_START depends on __VIRTUAL_MASK_SHIFT, which is defined with cpu_feature_enabled(). KASAN gets confused when apply_alternatives() patches the KASAN_SHADOW_START users. A test patch that makes KASAN_SHADOW_START static, by replacing __VIRTUAL_MASK_SHIFT with 56, works around the issue. Fix it for real by disabling KASAN while the kernel is patching alternatives. [ mingo: updated the changelog ] Fixes: 6657fca06e3f ("x86/mm: Allow to boot without LA57 if CONFIG_X86_5LEVEL=y") Reported-by: Fei Yang <fei.yang(a)intel.com> Signed-off-by: Kirill A. Shutemov <kirill.shutemov(a)linux.intel.com> Signed-off-by: Ingo Molnar <mingo(a)kernel.org> Acked-by: Peter Zijlstra (Intel) <peterz(a)infradead.org> Cc: Linus Torvalds <torvalds(a)linux-foundation.org> Cc: stable(a)vger.kernel.org Link: https://lore.kernel.org/r/20231012100424.1456-1-kirill.shutemov@linux.intel… diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index 517ee01503be..73be3931e4f0 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -403,6 +403,17 @@ void __init_or_module noinline apply_alternatives(struct alt_instr *start, u8 insn_buff[MAX_PATCH_LEN]; DPRINTK(ALT, "alt table %px, -> %px", start, end); + + /* + * In the case CONFIG_X86_5LEVEL=y, KASAN_SHADOW_START is defined using + * cpu_feature_enabled(X86_FEATURE_LA57) and is therefore patched here. + * During the process, KASAN becomes confused seeing partial LA57 + * conversion and triggers a false-positive out-of-bound report. + * + * Disable KASAN until the patching is complete. + */ + kasan_disable_current(); + /* * The scan order should be from start to end. A later scanned * alternative code can overwrite previously scanned alternative code. @@ -452,6 +463,8 @@ void __init_or_module noinline apply_alternatives(struct alt_instr *start, text_poke_early(instr, insn_buff, insn_buff_sz); } + + kasan_enable_current(); } static inline bool is_jcc32(struct insn *insn)

2 years, 1 month

3
2
0 0

FAILED: patch "[PATCH] x86/cpu: Fix AMD erratum #1485 on Zen4-based CPUs" failed to apply to 5.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x f454b18e07f518bcd0c05af17a2239138bff52de # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023101526-mumbling-theft-3113@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: f454b18e07f5 ("x86/cpu: Fix AMD erratum #1485 on Zen4-based CPUs") 77245f1c3c64 ("x86/CPU/AMD: Do not leak quotient data after a division by 0") 138bcddb86d8 ("Merge tag 'x86_bugs_srso' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From f454b18e07f518bcd0c05af17a2239138bff52de Mon Sep 17 00:00:00 2001 From: "Borislav Petkov (AMD)" <bp(a)alien8.de> Date: Sat, 7 Oct 2023 12:57:02 +0200 Subject: [PATCH] x86/cpu: Fix AMD erratum #1485 on Zen4-based CPUs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix erratum #1485 on Zen4 parts where running with STIBP disabled can cause an #UD exception. The performance impact of the fix is negligible. Reported-by: René Rebe <rene(a)exactcode.de> Signed-off-by: Borislav Petkov (AMD) <bp(a)alien8.de> Tested-by: René Rebe <rene(a)exactcode.de> Cc: <stable(a)kernel.org> Link: https://lore.kernel.org/r/D99589F4-BC5D-430B-87B2-72C20370CF57@exactcode.com diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 1d111350197f..b37abb55e948 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -637,12 +637,17 @@ /* AMD Last Branch Record MSRs */ #define MSR_AMD64_LBR_SELECT 0xc000010e -/* Fam 17h MSRs */ -#define MSR_F17H_IRPERF 0xc00000e9 +/* Zen4 */ +#define MSR_ZEN4_BP_CFG 0xc001102e +#define MSR_ZEN4_BP_CFG_SHARED_BTB_FIX_BIT 5 +/* Zen 2 */ #define MSR_ZEN2_SPECTRAL_CHICKEN 0xc00110e3 #define MSR_ZEN2_SPECTRAL_CHICKEN_BIT BIT_ULL(1) +/* Fam 17h MSRs */ +#define MSR_F17H_IRPERF 0xc00000e9 + /* Fam 16h MSRs */ #define MSR_F16H_L2I_PERF_CTL 0xc0010230 #define MSR_F16H_L2I_PERF_CTR 0xc0010231 diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 03ef962a6992..ece2b5b7b0fe 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -80,6 +80,10 @@ static const int amd_div0[] = AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x17, 0x00, 0x0, 0x2f, 0xf), AMD_MODEL_RANGE(0x17, 0x50, 0x0, 0x5f, 0xf)); +static const int amd_erratum_1485[] = + AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x19, 0x10, 0x0, 0x1f, 0xf), + AMD_MODEL_RANGE(0x19, 0x60, 0x0, 0xaf, 0xf)); + static bool cpu_has_amd_erratum(struct cpuinfo_x86 *cpu, const int *erratum) { int osvw_id = *erratum++; @@ -1149,6 +1153,10 @@ static void init_amd(struct cpuinfo_x86 *c) pr_notice_once("AMD Zen1 DIV0 bug detected. Disable SMT for full protection.\n"); setup_force_cpu_bug(X86_BUG_DIV0); } + + if (!cpu_has(c, X86_FEATURE_HYPERVISOR) && + cpu_has_amd_erratum(c, amd_erratum_1485)) + msr_set_bit(MSR_ZEN4_BP_CFG, MSR_ZEN4_BP_CFG_SHARED_BTB_FIX_BIT); } #ifdef CONFIG_X86_32

2 years, 1 month

3
2
0 0

Forgotten stable marking

by Linus Torvalds

Bah, I just noticed that the recent revert should have been marked for stable for 6.5, but I pushed it out and it's too late now. It may be that you end up auto-flagging reverts the same way you do for "Fixes:" tags, so maybe it would end up on your radar, but just to make sure, I thought I'd mention the commit here explicitly: fbe1bf1e5ff1 Revert "x86/smp: Put CPUs into INIT on shutdown if possible" just so that it doesn't get missed. Linus

2 years, 1 month

2
1
0 0

[RESEND PATCH v2] vhost: Allow null msg.size on VHOST_IOTLB_INVALIDATE

by Eric Auger

Commit e2ae38cf3d91 ("vhost: fix hung thread due to erroneous iotlb entries") Forbade vhost iotlb msg with null size to prevent entries with size = start = 0 and last = ULONG_MAX to end up in the iotlb. Then commit 95932ab2ea07 ("vhost: allow batching hint without size") only applied the check for VHOST_IOTLB_UPDATE and VHOST_IOTLB_INVALIDATE message types to fix a regression observed with batching hit. Still, the introduction of that check introduced a regression for some users attempting to invalidate the whole ULONG_MAX range by setting the size to 0. This is the case with qemu/smmuv3/vhost integration which does not work anymore. It Looks safe to partially revert the original commit and allow VHOST_IOTLB_INVALIDATE messages with null size. vhost_iotlb_del_range() will compute a correct end iova. Same for vhost_vdpa_iotlb_unmap(). Signed-off-by: Eric Auger <eric.auger(a)redhat.com> Fixes: e2ae38cf3d91 ("vhost: fix hung thread due to erroneous iotlb entries") Cc: stable(a)vger.kernel.org # v5.17+ Acked-by: Jason Wang <jasowang(a)redhat.com> --- drivers/vhost/vhost.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index c71d573f1c94..e0c181ad17e3 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -1458,9 +1458,7 @@ ssize_t vhost_chr_write_iter(struct vhost_dev *dev, goto done; } - if ((msg.type == VHOST_IOTLB_UPDATE || - msg.type == VHOST_IOTLB_INVALIDATE) && - msg.size == 0) { + if (msg.type == VHOST_IOTLB_UPDATE && msg.size == 0) { ret = -EINVAL; goto done; } -- 2.41.0

2 years, 1 month

1
1
0 0

[PATCH] drm/i915: Flush WC GGTT only on required platforms

by Nirmoy Das

gen8_ggtt_invalidate() is only needed for limitted set of platforms where GGTT is mapped as WC otherwise this can cause unwanted side-effects on XE_HP platforms where GFX_FLSH_CNTL_GEN6 is not valid. Fixes: d2eae8e98d59 ("drm/i915/dg2: Drop force_probe requirement") Cc: Rodrigo Vivi <rodrigo.vivi(a)intel.com> Cc: Tvrtko Ursulin <tvrtko.ursulin(a)linux.intel.com> Cc: Joonas Lahtinen <joonas.lahtinen(a)linux.intel.com> Cc: Jani Nikula <jani.nikula(a)linux.intel.com> Cc: Jonathan Cavitt <jonathan.cavitt(a)intel.com> Cc: John Harrison <john.c.harrison(a)intel.com> Cc: Andi Shyti <andi.shyti(a)linux.intel.com> Cc: <stable(a)vger.kernel.org> # v6.2+ Suggested-by: Matt Roper <matthew.d.roper(a)intel.com> Signed-off-by: Nirmoy Das <nirmoy.das(a)intel.com> --- drivers/gpu/drm/i915/gt/intel_ggtt.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c index 4d7d88b92632..c2858d434bce 100644 --- a/drivers/gpu/drm/i915/gt/intel_ggtt.c +++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c @@ -197,13 +197,17 @@ void gen6_ggtt_invalidate(struct i915_ggtt *ggtt) static void gen8_ggtt_invalidate(struct i915_ggtt *ggtt) { + struct drm_i915_private *i915 = ggtt->vm.i915; struct intel_uncore *uncore = ggtt->vm.gt->uncore; /* * Note that as an uncached mmio write, this will flush the * WCB of the writes into the GGTT before it triggers the invalidate. + * + * Only perform this when GGTT is mapped as WC, see ggtt_probe_common(). */ - intel_uncore_write_fw(uncore, GFX_FLSH_CNTL_GEN6, GFX_FLSH_CNTL_EN); + if (!IS_GEN9_LP(i915) && GRAPHICS_VER(i915) < 11) + intel_uncore_write_fw(uncore, GFX_FLSH_CNTL_GEN6, GFX_FLSH_CNTL_EN); } static void guc_ggtt_invalidate(struct i915_ggtt *ggtt) -- 2.41.0

2 years, 1 month

4
8
0 0

[PATCH] wifi: wilc1000: use vmm_table as array in wilc struct

by Alexis Lothoré

From: Ajay Singh <ajay.kathat(a)microchip.com> Enabling KASAN and running some iperf tests raises some memory issues with vmm_table: BUG: KASAN: slab-out-of-bounds in wilc_wlan_handle_txq+0x6ac/0xdb4 Write of size 4 at addr c3a61540 by task wlan0-tx/95 KASAN detects that we are writing data beyond range allocated to vmm_table. There is indeed a mismatch between the size passed to allocator in wilc_wlan_init, and the range of possible indexes used later: allocation size is missing a multiplication by sizeof(u32) While at it, instead of simply multiplying the allocation size, do not keep dedicated dynamic allocation for vmm_table: define it as an array with the relevant size in wilc struct, which is already dynamically allocated Fixes: 40b717bfcefa ("wifi: wilc1000: fix DMA on stack objects") Cc: stable(a)vger.kernel.org Signed-off-by: Ajay Singh <ajay.kathat(a)microchip.com> Signed-off-by: Alexis Lothoré <alexis.lothore(a)bootlin.com> --- drivers/net/wireless/microchip/wilc1000/netdev.h | 2 +- drivers/net/wireless/microchip/wilc1000/wlan.c | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.h b/drivers/net/wireless/microchip/wilc1000/netdev.h index bb1a315a7b7e..2137ef294953 100644 --- a/drivers/net/wireless/microchip/wilc1000/netdev.h +++ b/drivers/net/wireless/microchip/wilc1000/netdev.h @@ -245,7 +245,7 @@ struct wilc { u8 *rx_buffer; u32 rx_buffer_offset; u8 *tx_buffer; - u32 *vmm_table; + u32 vmm_table[WILC_VMM_TBL_SIZE]; struct txq_handle txq[NQUEUES]; int txq_entries; diff --git a/drivers/net/wireless/microchip/wilc1000/wlan.c b/drivers/net/wireless/microchip/wilc1000/wlan.c index 58bbf50081e4..d93493c40e49 100644 --- a/drivers/net/wireless/microchip/wilc1000/wlan.c +++ b/drivers/net/wireless/microchip/wilc1000/wlan.c @@ -1252,8 +1252,6 @@ void wilc_wlan_cleanup(struct net_device *dev) while ((rqe = wilc_wlan_rxq_remove(wilc))) kfree(rqe); - kfree(wilc->vmm_table); - wilc->vmm_table = NULL; kfree(wilc->rx_buffer); wilc->rx_buffer = NULL; kfree(wilc->tx_buffer); @@ -1491,14 +1489,6 @@ int wilc_wlan_init(struct net_device *dev) goto fail; } - if (!wilc->vmm_table) - wilc->vmm_table = kzalloc(WILC_VMM_TBL_SIZE, GFP_KERNEL); - - if (!wilc->vmm_table) { - ret = -ENOBUFS; - goto fail; - } - if (!wilc->tx_buffer) wilc->tx_buffer = kmalloc(WILC_TX_BUFF_SIZE, GFP_KERNEL); @@ -1523,8 +1513,6 @@ int wilc_wlan_init(struct net_device *dev) return 0; fail: - kfree(wilc->vmm_table); - wilc->vmm_table = NULL; kfree(wilc->rx_buffer); wilc->rx_buffer = NULL; kfree(wilc->tx_buffer); --- base-commit: f28d2198de8cbefa17286d5182337a1d6d518643 change-id: 20231012-wilc1000_tx_oops-58ce91ee3e93 Best regards, -- Alexis Lothoré, Bootlin Embedded Linux and Kernel engineering https://bootlin.com

2 years, 1 month

2
2
0 0

[PATCH] nvme: remove unprivileged passthrough support

by Kanchan Joshi

Passthrough has got a hole that can be exploited to cause kernel memory corruption. This is about making the device do larger DMA into short meta/data buffer owned by kernel [1]. As a stopgap measure, disable the support of unprivileged passthrough. This patch brings back coarse-granular CAP_SYS_ADMIN checks by reverting following patches: - 7d9d7d59d44 ("nvme: replace the fmode_t argument to the nvme ioctl handlers with a simple bool") - 313c08c72ee ("nvme: don't allow unprivileged passthrough on partitions") - 6f99ac04c46 ("nvme: consult the CSE log page for unprivileged passthrough") - ea43fceea41 ("nvme: allow unprivileged passthrough of Identify Controller") - e4fbcf32c86 ("nvme: identify-namespace without CAP_SYS_ADMIN") - 855b7717f44 ("nvme: fine-granular CAP_SYS_ADMIN for nvme io commands") [1] https://lore.kernel.org/linux-nvme/20231013051458.39987-1-joshi.k@samsung.c… CC: stable(a)vger.kernel.org # 6.2 Fixes <855b7717f44b1> ("nvme: fine-granular CAP_SYS_ADMIN for nvme io commands") Suggested-by: Christoph Hellwig <hch(a)lst.de> Signed-off-by: Kanchan Joshi <joshi.k(a)samsung.com> --- drivers/nvme/host/ioctl.c | 159 ++++++++------------------------------ include/linux/nvme.h | 2 - 2 files changed, 34 insertions(+), 127 deletions(-) diff --git a/drivers/nvme/host/ioctl.c b/drivers/nvme/host/ioctl.c index d8ff796fd5f2..788b36e7915a 100644 --- a/drivers/nvme/host/ioctl.c +++ b/drivers/nvme/host/ioctl.c @@ -10,80 +10,8 @@ enum { NVME_IOCTL_VEC = (1 << 0), - NVME_IOCTL_PARTITION = (1 << 1), }; -static bool nvme_cmd_allowed(struct nvme_ns *ns, struct nvme_command *c, - unsigned int flags, bool open_for_write) -{ - u32 effects; - - if (capable(CAP_SYS_ADMIN)) - return true; - - /* - * Do not allow unprivileged passthrough on partitions, as that allows an - * escape from the containment of the partition. - */ - if (flags & NVME_IOCTL_PARTITION) - return false; - - /* - * Do not allow unprivileged processes to send vendor specific or fabrics - * commands as we can't be sure about their effects. - */ - if (c->common.opcode >= nvme_cmd_vendor_start || - c->common.opcode == nvme_fabrics_command) - return false; - - /* - * Do not allow unprivileged passthrough of admin commands except - * for a subset of identify commands that contain information required - * to form proper I/O commands in userspace and do not expose any - * potentially sensitive information. - */ - if (!ns) { - if (c->common.opcode == nvme_admin_identify) { - switch (c->identify.cns) { - case NVME_ID_CNS_NS: - case NVME_ID_CNS_CS_NS: - case NVME_ID_CNS_NS_CS_INDEP: - case NVME_ID_CNS_CS_CTRL: - case NVME_ID_CNS_CTRL: - return true; - } - } - return false; - } - - /* - * Check if the controller provides a Commands Supported and Effects log - * and marks this command as supported. If not reject unprivileged - * passthrough. - */ - effects = nvme_command_effects(ns->ctrl, ns, c->common.opcode); - if (!(effects & NVME_CMD_EFFECTS_CSUPP)) - return false; - - /* - * Don't allow passthrough for command that have intrusive (or unknown) - * effects. - */ - if (effects & ~(NVME_CMD_EFFECTS_CSUPP | NVME_CMD_EFFECTS_LBCC | - NVME_CMD_EFFECTS_UUID_SEL | - NVME_CMD_EFFECTS_SCOPE_MASK)) - return false; - - /* - * Only allow I/O commands that transfer data to the controller or that - * change the logical block contents if the file descriptor is open for - * writing. - */ - if (nvme_is_write(c) || (effects & NVME_CMD_EFFECTS_LBCC)) - return open_for_write; - return true; -} - /* * Convert integer values from ioctl structures to user pointers, silently * ignoring the upper bits in the compat case to match behaviour of 32-bit @@ -335,8 +263,7 @@ static bool nvme_validate_passthru_nsid(struct nvme_ctrl *ctrl, } static int nvme_user_cmd(struct nvme_ctrl *ctrl, struct nvme_ns *ns, - struct nvme_passthru_cmd __user *ucmd, unsigned int flags, - bool open_for_write) + struct nvme_passthru_cmd __user *ucmd) { struct nvme_passthru_cmd cmd; struct nvme_command c; @@ -344,6 +271,8 @@ static int nvme_user_cmd(struct nvme_ctrl *ctrl, struct nvme_ns *ns, u64 result; int status; + if (!capable(CAP_SYS_ADMIN)) + return -EACCES; if (copy_from_user(&cmd, ucmd, sizeof(cmd))) return -EFAULT; if (cmd.flags) @@ -364,9 +293,6 @@ static int nvme_user_cmd(struct nvme_ctrl *ctrl, struct nvme_ns *ns, c.common.cdw14 = cpu_to_le32(cmd.cdw14); c.common.cdw15 = cpu_to_le32(cmd.cdw15); - if (!nvme_cmd_allowed(ns, &c, 0, open_for_write)) - return -EACCES; - if (cmd.timeout_ms) timeout = msecs_to_jiffies(cmd.timeout_ms); @@ -383,14 +309,16 @@ static int nvme_user_cmd(struct nvme_ctrl *ctrl, struct nvme_ns *ns, } static int nvme_user_cmd64(struct nvme_ctrl *ctrl, struct nvme_ns *ns, - struct nvme_passthru_cmd64 __user *ucmd, unsigned int flags, - bool open_for_write) + struct nvme_passthru_cmd64 __user *ucmd, + unsigned int flags) { struct nvme_passthru_cmd64 cmd; struct nvme_command c; unsigned timeout = 0; int status; + if (!capable(CAP_SYS_ADMIN)) + return -EACCES; if (copy_from_user(&cmd, ucmd, sizeof(cmd))) return -EFAULT; if (cmd.flags) @@ -411,9 +339,6 @@ static int nvme_user_cmd64(struct nvme_ctrl *ctrl, struct nvme_ns *ns, c.common.cdw14 = cpu_to_le32(cmd.cdw14); c.common.cdw15 = cpu_to_le32(cmd.cdw15); - if (!nvme_cmd_allowed(ns, &c, flags, open_for_write)) - return -EACCES; - if (cmd.timeout_ms) timeout = msecs_to_jiffies(cmd.timeout_ms); @@ -563,6 +488,9 @@ static int nvme_uring_cmd_io(struct nvme_ctrl *ctrl, struct nvme_ns *ns, void *meta = NULL; int ret; + if (!capable(CAP_SYS_ADMIN)) + return -EACCES; + c.common.opcode = READ_ONCE(cmd->opcode); c.common.flags = READ_ONCE(cmd->flags); if (c.common.flags) @@ -584,9 +512,6 @@ static int nvme_uring_cmd_io(struct nvme_ctrl *ctrl, struct nvme_ns *ns, c.common.cdw14 = cpu_to_le32(READ_ONCE(cmd->cdw14)); c.common.cdw15 = cpu_to_le32(READ_ONCE(cmd->cdw15)); - if (!nvme_cmd_allowed(ns, &c, 0, ioucmd->file->f_mode & FMODE_WRITE)) - return -EACCES; - d.metadata = READ_ONCE(cmd->metadata); d.addr = READ_ONCE(cmd->addr); d.data_len = READ_ONCE(cmd->data_len); @@ -643,13 +568,13 @@ static bool is_ctrl_ioctl(unsigned int cmd) } static int nvme_ctrl_ioctl(struct nvme_ctrl *ctrl, unsigned int cmd, - void __user *argp, bool open_for_write) + void __user *argp) { switch (cmd) { case NVME_IOCTL_ADMIN_CMD: - return nvme_user_cmd(ctrl, NULL, argp, 0, open_for_write); + return nvme_user_cmd(ctrl, NULL, argp); case NVME_IOCTL_ADMIN64_CMD: - return nvme_user_cmd64(ctrl, NULL, argp, 0, open_for_write); + return nvme_user_cmd64(ctrl, NULL, argp, 0); default: return sed_ioctl(ctrl->opal_dev, cmd, argp); } @@ -674,14 +599,16 @@ struct nvme_user_io32 { #endif /* COMPAT_FOR_U64_ALIGNMENT */ static int nvme_ns_ioctl(struct nvme_ns *ns, unsigned int cmd, - void __user *argp, unsigned int flags, bool open_for_write) + void __user *argp) { + unsigned int flags = 0; + switch (cmd) { case NVME_IOCTL_ID: force_successful_syscall_return(); return ns->head->ns_id; case NVME_IOCTL_IO_CMD: - return nvme_user_cmd(ns->ctrl, ns, argp, flags, open_for_write); + return nvme_user_cmd(ns->ctrl, ns, argp); /* * struct nvme_user_io can have different padding on some 32-bit ABIs. * Just accept the compat version as all fields that are used are the @@ -696,39 +623,32 @@ static int nvme_ns_ioctl(struct nvme_ns *ns, unsigned int cmd, flags |= NVME_IOCTL_VEC; fallthrough; case NVME_IOCTL_IO64_CMD: - return nvme_user_cmd64(ns->ctrl, ns, argp, flags, - open_for_write); + return nvme_user_cmd64(ns->ctrl, ns, argp, flags); default: return -ENOTTY; } } -int nvme_ioctl(struct block_device *bdev, blk_mode_t mode, +int nvme_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, unsigned long arg) { struct nvme_ns *ns = bdev->bd_disk->private_data; - bool open_for_write = mode & BLK_OPEN_WRITE; void __user *argp = (void __user *)arg; - unsigned int flags = 0; - - if (bdev_is_partition(bdev)) - flags |= NVME_IOCTL_PARTITION; if (is_ctrl_ioctl(cmd)) - return nvme_ctrl_ioctl(ns->ctrl, cmd, argp, open_for_write); - return nvme_ns_ioctl(ns, cmd, argp, flags, open_for_write); + return nvme_ctrl_ioctl(ns->ctrl, cmd, argp); + return nvme_ns_ioctl(ns, cmd, argp); } long nvme_ns_chr_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { struct nvme_ns *ns = container_of(file_inode(file)->i_cdev, struct nvme_ns, cdev); - bool open_for_write = file->f_mode & FMODE_WRITE; void __user *argp = (void __user *)arg; if (is_ctrl_ioctl(cmd)) - return nvme_ctrl_ioctl(ns->ctrl, cmd, argp, open_for_write); - return nvme_ns_ioctl(ns, cmd, argp, 0, open_for_write); + return nvme_ctrl_ioctl(ns->ctrl, cmd, argp); + return nvme_ns_ioctl(ns, cmd, argp); } static int nvme_uring_cmd_checks(unsigned int issue_flags) @@ -792,8 +712,7 @@ int nvme_ns_chr_uring_cmd_iopoll(struct io_uring_cmd *ioucmd, } #ifdef CONFIG_NVME_MULTIPATH static int nvme_ns_head_ctrl_ioctl(struct nvme_ns *ns, unsigned int cmd, - void __user *argp, struct nvme_ns_head *head, int srcu_idx, - bool open_for_write) + void __user *argp, struct nvme_ns_head *head, int srcu_idx) __releases(&head->srcu) { struct nvme_ctrl *ctrl = ns->ctrl; @@ -801,7 +720,7 @@ static int nvme_ns_head_ctrl_ioctl(struct nvme_ns *ns, unsigned int cmd, nvme_get_ctrl(ns->ctrl); srcu_read_unlock(&head->srcu, srcu_idx); - ret = nvme_ctrl_ioctl(ns->ctrl, cmd, argp, open_for_write); + ret = nvme_ctrl_ioctl(ns->ctrl, cmd, argp); nvme_put_ctrl(ctrl); return ret; @@ -811,14 +730,9 @@ int nvme_ns_head_ioctl(struct block_device *bdev, blk_mode_t mode, unsigned int cmd, unsigned long arg) { struct nvme_ns_head *head = bdev->bd_disk->private_data; - bool open_for_write = mode & BLK_OPEN_WRITE; void __user *argp = (void __user *)arg; struct nvme_ns *ns; int srcu_idx, ret = -EWOULDBLOCK; - unsigned int flags = 0; - - if (bdev_is_partition(bdev)) - flags |= NVME_IOCTL_PARTITION; srcu_idx = srcu_read_lock(&head->srcu); ns = nvme_find_path(head); @@ -831,10 +745,9 @@ int nvme_ns_head_ioctl(struct block_device *bdev, blk_mode_t mode, * deadlock when deleting namespaces using the passthrough interface. */ if (is_ctrl_ioctl(cmd)) - return nvme_ns_head_ctrl_ioctl(ns, cmd, argp, head, srcu_idx, - open_for_write); + return nvme_ns_head_ctrl_ioctl(ns, cmd, argp, head, srcu_idx); - ret = nvme_ns_ioctl(ns, cmd, argp, flags, open_for_write); + ret = nvme_ns_ioctl(ns, cmd, argp); out_unlock: srcu_read_unlock(&head->srcu, srcu_idx); return ret; @@ -843,7 +756,6 @@ int nvme_ns_head_ioctl(struct block_device *bdev, blk_mode_t mode, long nvme_ns_head_chr_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { - bool open_for_write = file->f_mode & FMODE_WRITE; struct cdev *cdev = file_inode(file)->i_cdev; struct nvme_ns_head *head = container_of(cdev, struct nvme_ns_head, cdev); @@ -857,10 +769,9 @@ long nvme_ns_head_chr_ioctl(struct file *file, unsigned int cmd, goto out_unlock; if (is_ctrl_ioctl(cmd)) - return nvme_ns_head_ctrl_ioctl(ns, cmd, argp, head, srcu_idx, - open_for_write); + return nvme_ns_head_ctrl_ioctl(ns, cmd, argp, head, srcu_idx); - ret = nvme_ns_ioctl(ns, cmd, argp, 0, open_for_write); + ret = nvme_ns_ioctl(ns, cmd, argp); out_unlock: srcu_read_unlock(&head->srcu, srcu_idx); return ret; @@ -909,8 +820,7 @@ int nvme_dev_uring_cmd(struct io_uring_cmd *ioucmd, unsigned int issue_flags) return ret; } -static int nvme_dev_user_cmd(struct nvme_ctrl *ctrl, void __user *argp, - bool open_for_write) +static int nvme_dev_user_cmd(struct nvme_ctrl *ctrl, void __user *argp) { struct nvme_ns *ns; int ret; @@ -934,7 +844,7 @@ static int nvme_dev_user_cmd(struct nvme_ctrl *ctrl, void __user *argp, kref_get(&ns->kref); up_read(&ctrl->namespaces_rwsem); - ret = nvme_user_cmd(ctrl, ns, argp, 0, open_for_write); + ret = nvme_user_cmd(ctrl, ns, argp); nvme_put_ns(ns); return ret; @@ -946,17 +856,16 @@ static int nvme_dev_user_cmd(struct nvme_ctrl *ctrl, void __user *argp, long nvme_dev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { - bool open_for_write = file->f_mode & FMODE_WRITE; struct nvme_ctrl *ctrl = file->private_data; void __user *argp = (void __user *)arg; switch (cmd) { case NVME_IOCTL_ADMIN_CMD: - return nvme_user_cmd(ctrl, NULL, argp, 0, open_for_write); + return nvme_user_cmd(ctrl, NULL, argp); case NVME_IOCTL_ADMIN64_CMD: - return nvme_user_cmd64(ctrl, NULL, argp, 0, open_for_write); + return nvme_user_cmd64(ctrl, NULL, argp, 0); case NVME_IOCTL_IO_CMD: - return nvme_dev_user_cmd(ctrl, argp, open_for_write); + return nvme_dev_user_cmd(ctrl, argp); case NVME_IOCTL_RESET: if (!capable(CAP_SYS_ADMIN)) return -EACCES; diff --git a/include/linux/nvme.h b/include/linux/nvme.h index 26dd3f859d9d..df3e2c619448 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -642,7 +642,6 @@ enum { NVME_CMD_EFFECTS_CCC = 1 << 4, NVME_CMD_EFFECTS_CSE_MASK = GENMASK(18, 16), NVME_CMD_EFFECTS_UUID_SEL = 1 << 19, - NVME_CMD_EFFECTS_SCOPE_MASK = GENMASK(31, 20), }; struct nvme_effects_log { @@ -834,7 +833,6 @@ enum nvme_opcode { nvme_cmd_zone_mgmt_send = 0x79, nvme_cmd_zone_mgmt_recv = 0x7a, nvme_cmd_zone_append = 0x7d, - nvme_cmd_vendor_start = 0x80, }; #define nvme_opcode_name(opcode) { opcode, #opcode } -- 2.25.1

2 years, 1 month

3
2
0 0

[PATCH v1] i2c: designware: Disable TX_EMPTY irq while waiting for block length byte

by Tam Nguyen

During SMBus block data read process, we have seen high interrupt rate because of TX_EMPTY irq status while waiting for block length byte (the first data byte after the address phase). The interrupt handler does not do anything because the internal state is kept as STATUS_WRITE_IN_PROGRESS. Hence, we should disable TX_EMPTY irq until I2C DW receives first data byte from I2C device, then re-enable it. It takes 0.789 ms for host to receive data length from slave. Without the patch, i2c_dw_isr is called 99 times by TX_EMPTY interrupt. And it is none after applying the patch. Cc: stable(a)vger.kernel.org Signed-off-by: Chuong Tran <chuong(a)os.amperecomputing.com> Signed-off-by: Tam Nguyen <tamnguyenchi(a)os.amperecomputing.com> --- drivers/i2c/busses/i2c-designware-master.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/i2c/busses/i2c-designware-master.c b/drivers/i2c/busses/i2c-designware-master.c index 55ea91a63382..2152b1f9b27c 100644 --- a/drivers/i2c/busses/i2c-designware-master.c +++ b/drivers/i2c/busses/i2c-designware-master.c @@ -462,6 +462,13 @@ i2c_dw_xfer_msg(struct dw_i2c_dev *dev) if (buf_len > 0 || flags & I2C_M_RECV_LEN) { /* more bytes to be written */ dev->status |= STATUS_WRITE_IN_PROGRESS; + /* + * In I2C_FUNC_SMBUS_BLOCK_DATA case, there is no data + * to send before receiving data length from slave. + * Disable TX_EMPTY while waiting for data length byte + */ + if (flags & I2C_M_RECV_LEN) + intr_mask &= ~DW_IC_INTR_TX_EMPTY; break; } else dev->status &= ~STATUS_WRITE_IN_PROGRESS; @@ -485,6 +492,7 @@ i2c_dw_recv_len(struct dw_i2c_dev *dev, u8 len) { struct i2c_msg *msgs = dev->msgs; u32 flags = msgs[dev->msg_read_idx].flags; + u32 intr_mask; /* * Adjust the buffer length and mask the flag @@ -495,6 +503,11 @@ i2c_dw_recv_len(struct dw_i2c_dev *dev, u8 len) msgs[dev->msg_read_idx].len = len; msgs[dev->msg_read_idx].flags &= ~I2C_M_RECV_LEN; + /* Re-enable TX_EMPTY interrupt. */ + regmap_read(dev->map, DW_IC_INTR_MASK, &intr_mask); + intr_mask |= DW_IC_INTR_TX_EMPTY; + regmap_write(dev->map, DW_IC_INTR_MASK, intr_mask); + return len; } -- 2.25.1

2 years, 2 months

6
7
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror October 2023