October 2023 - Linux-stable-mirror

[PATCH 5.10 000/226] 5.10.198-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.10.198 release. There are 226 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, 11 Oct 2023 13:00:55 +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.10.198-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.10.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.10.198-rc1 Florian Westphal <fw(a)strlen.de> netfilter: nftables: exthdr: fix 4-byte stack OOB write Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: fix kdoc warnings after gc rework John David Anglin <dave(a)parisc-linux.org> parisc: Restore __ldcw_align for PA-RISC 2.0 processors Shay Drory <shayd(a)nvidia.com> RDMA/mlx5: Fix NULL string error Bernard Metzler <bmt(a)zurich.ibm.com> RDMA/siw: Fix connection failure handling Konstantin Meskhidze <konstantin.meskhidze(a)huawei.com> RDMA/uverbs: Fix typo of sizeof argument Leon Romanovsky <leon(a)kernel.org> RDMA/cma: Fix truncation compilation warning in make_cma_ports Mark Zhang <markzhang(a)nvidia.com> RDMA/cma: Initialize ib_sa_multicast structure to 0 when join Duje Mihanović <duje.mihanovic(a)skole.hr> gpio: pxa: disable pinctrl calls for MMP_GPIO Bartosz Golaszewski <bartosz.golaszewski(a)linaro.org> gpio: aspeed: fix the GPIO number passed to pinctrl_gpio_set_config() Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> IB/mlx4: Fix the size of a buffer in add_port_entries() Dan Carpenter <dan.carpenter(a)linaro.org> of: dynamic: Fix potential memory leak in of_changeset_action() Leon Romanovsky <leon(a)kernel.org> RDMA/core: Require admin capabilities to set system parameters Fedor Pchelkin <pchelkin(a)ispras.ru> dm zoned: free dmz->ddev array in dmz_put_zoned_devices Ivan Babrou <ivan(a)cloudflare.com> cpupower: add Makefile dependencies for install targets Xin Long <lucien.xin(a)gmail.com> sctp: update hb timer immediately after users change hb_interval Xin Long <lucien.xin(a)gmail.com> sctp: update transport state when processing a dupcook packet Neal Cardwell <ncardwell(a)google.com> tcp: fix delayed ACKs for MSS boundary condition Neal Cardwell <ncardwell(a)google.com> tcp: fix quick-ack counting to count actual ACKs of new data Chengfeng Ye <dg573847474(a)gmail.com> tipc: fix a potential deadlock on &tx->lock Ben Wolsieffer <ben.wolsieffer(a)hefring.com> net: stmmac: dwmac-stm32: fix resume on STM32 MCU Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: nft_set_rbtree: fix spurious insertion failure Xin Long <lucien.xin(a)gmail.com> netfilter: handle the connecting collision properly in nf_conntrack_proto_sctp Dan Carpenter <dan.carpenter(a)linaro.org> net: ethernet: ti: am65-cpsw: Fix error code in am65_cpsw_nuss_init_tx_chns() Jeremy Cline <jeremy(a)jcline.org> net: nfc: llcp: Add lock when modifying device list Shigeru Yoshida <syoshida(a)redhat.com> net: usb: smsc75xx: Fix uninit-value access in __smsc75xx_read_reg Fabio Estevam <festevam(a)denx.de> net: dsa: mv88e6xxx: Avoid EEPROM timeout when EEPROM is absent David Howells <dhowells(a)redhat.com> ipv4, ipv6: Fix handling of transhdrlen in __ip{,6}_append_data() Eric Dumazet <edumazet(a)google.com> net: fix possible store tearing in neigh_periodic_work() Mauricio Faria de Oliveira <mfo(a)canonical.com> modpost: add missing else to the "of" check Trond Myklebust <trond.myklebust(a)hammerspace.com> NFSv4: Fix a nfs4_state_manager() race Arnd Bergmann <arnd(a)arndb.de> ima: rework CONFIG_IMA dependency block Junxiao Bi <junxiao.bi(a)oracle.com> scsi: target: core: Fix deadlock due to recursive locking Oleksandr Tymoshenko <ovt(a)google.com> ima: Finish deprecation of IMA_TRUSTED_KEYRING Kconfig Richard Fitzgerald <rf(a)opensource.cirrus.com> regmap: rbtree: Fix wrong register marked as in-cache when creating new node Felix Fietkau <nbd(a)nbd.name> wifi: mt76: mt76x02: fix MT76x0 external LNA gain handling Alexandra Diupina <adiupina(a)astralinux.ru> drivers/net: process the result of hdlc_open() and add call of hdlc_close() in uhdlc_close() Leon Hwang <hffilwlqm(a)gmail.com> bpf: Fix tr dereferencing Pin-yen Lin <treapking(a)chromium.org> wifi: mwifiex: Fix oob check condition in mwifiex_process_rx_packet Arnd Bergmann <arnd(a)arndb.de> wifi: iwlwifi: dbg_ini: fix structure packing Zhihao Cheng <chengzhihao1(a)huawei.com> ubi: Refuse attaching if mtd's erasesize is 0 Rob Herring <robh(a)kernel.org> arm64: Add Cortex-A520 CPU part definition Jordan Rife <jrife(a)google.com> net: prevent rewrite of msg_name in sock_sendmsg() Qu Wenruo <wqu(a)suse.com> btrfs: reject unknown mount options early Jordan Rife <jrife(a)google.com> net: replace calls to sock->ops->connect() with kernel_connect() Gustavo A. R. Silva <gustavoars(a)kernel.org> wifi: mwifiex: Fix tlv_buf_left calculation Gustavo A. R. Silva <gustavoars(a)kernel.org> qed/red_ll2: Fix undefined behavior bug in struct qed_ll2_info Dinghao Liu <dinghao.liu(a)zju.edu.cn> scsi: zfcp: Fix a double put in zfcp_port_enqueue() Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Revert "PCI: qcom: Disable write access to read only registers for IP v2.3.3" Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Revert "clk: imx: pll14xx: dynamically configure PLL for 393216000/361267200Hz" Ming Lei <ming.lei(a)redhat.com> block: fix use-after-free of q->q_usage_counter Ilya Dryomov <idryomov(a)gmail.com> rbd: take header_rwsem in rbd_dev_refresh() only when updating Ilya Dryomov <idryomov(a)gmail.com> rbd: decouple parent info read-in from updating rbd_dev Ilya Dryomov <idryomov(a)gmail.com> rbd: decouple header read-in from updating rbd_dev->header Ilya Dryomov <idryomov(a)gmail.com> rbd: move rbd_dev_refresh() definition Nathan Chancellor <nathan(a)kernel.org> drm/mediatek: Fix backport issue in mtk_drm_gem_prime_vmap() Zheng Yejian <zhengyejian1(a)huawei.com> ring-buffer: Fix bytes info in per_cpu buffer stats Vlastimil Babka <vbabka(a)suse.cz> ring-buffer: remove obsolete comment for free_buffer_page() Trond Myklebust <trond.myklebust(a)hammerspace.com> NFSv4: Fix a state manager thread deadlock regression Benjamin Coddington <bcodding(a)redhat.com> NFS: rename nfs_client_kset to nfs_kset Benjamin Coddington <bcodding(a)redhat.com> NFS: Cleanup unused rpc_clnt variable Johan Hovold <johan+linaro(a)kernel.org> spi: zynqmp-gqspi: fix clock imbalance on probe failure Dinghao Liu <dinghao.liu(a)zju.edu.cn> spi: spi-zynqmp-gqspi: Fix runtime PM imbalance in zynqmp_qspi_probe 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" 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" 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 Phil Sutter <phil(a)nwl.cc> netfilter: nft_exthdr: Fix for unsafe packet data read Phil Sutter <phil(a)nwl.cc> netfilter: nft_exthdr: Search chunks in SCTP packets only 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 Mario Limonciello <mario.limonciello(a)amd.com> ACPI: Check StorageD3Enable _DSD property in ACPI code 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 Chengming Zhou <zhouchengming(a)bytedance.com> sched/cpuacct: Fix charge percpu cpuusage Andrey Ryabinin <arbn(a)yandex-team.com> sched/cpuacct: Fix user/system in shown cpuacct.usage* 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: Disable preemption in thread_change_pc() Hans Verkuil <hverkuil-cisco(a)xs4all.nl> media: vb2: frame_vector.c: replace WARN_ONCE with a comment Stanislav Fomichev <sdf(a)google.com> bpf: Clarify error expectations from bpf_clone_redirect 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() 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 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 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 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 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 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 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: Unify pwm-omap-dmtimer node names Gireesh Hiremath <Gireesh.Hiremath(a)in.bosch.com> ARM: dts: am335x: Guardian: Update beeper label Geert Uytterhoeven <geert+renesas(a)glider.be> ARM: dts: motorola-mapphone: Drop second ti,wlcore compatible value Carl Philipp Klemm <philipp(a)uvos.xyz> ARM: dts: motorola-mapphone: Add 1.2GHz OPP Tony Lindgren <tony(a)atomide.com> ARM: dts: motorola-mapphone: Configure lower temperature passive cooling 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 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() 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 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 Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_exthdr: break evaluation if setting TCP option fails Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: add and use nft_thoff helper Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: add and use nft_sk helper Phil Sutter <phil(a)nwl.cc> netfilter: nft_exthdr: Support SCTP chunks Jan Engelhardt <jengelh(a)inai.de> netfilter: use actual socket sk for REJECT action Konrad Dybcio <konrad.dybcio(a)linaro.org> media: venus: hfi_venus: Write to VIDC_CTRL_INIT after unmasking interrupts Dikshita Agarwal <dikshita(a)codeaurora.org> media: venus: hfi: Add a 6xx boot logic Bryan O'Donoghue <bryan.odonoghue(a)linaro.org> media: venus: core: Add differentiator IS_V6(core) Dikshita Agarwal <dikshita(a)codeaurora.org> media: venus: hfi: Define additional 6xx registers Bryan O'Donoghue <bryan.odonoghue(a)linaro.org> media: venus: hfi,pm,firmware: Convert to block relative addressing Bryan O'Donoghue <bryan.odonoghue(a)linaro.org> media: venus: core: Add io base variables for each block Wolfram Sang <wsa+renesas(a)sang-engineering.com> mmc: renesas_sdhi: register irqs before registering controller Wolfram Sang <wsa+renesas(a)sang-engineering.com> mmc: tmio: support custom irq masks Wolfram Sang <wsa+renesas(a)sang-engineering.com> mmc: renesas_sdhi: populate SCC pointer at the proper place Wolfram Sang <wsa+renesas(a)sang-engineering.com> mmc: renesas_sdhi: probe into TMIO after SCC parameters have been setup Werner Sembach <wse(a)tuxedocomputers.com> Input: i8042 - add quirk for TUXEDO Gemini 17 Gen1/Clevo PD70PN Huacai Chen <chenhuacai(a)loongson.cn> Input: i8042 - rename i8042-x86ia64io.h to i8042-acpipnpio.h Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: double hook unregistration in netns path Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: unregister flowtable hooks on netns exit 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() Artem Chernyshev <artem.chernyshev(a)red-soft.ru> net: rds: Fix possible NULL-pointer dereference Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> bnxt_en: Flush XDP for bnxt_poll_nitroa0()'s NAPI Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> locking/seqlock: Do the lockdep annotation before locking in do_write_seqcount_begin_nested() Ahmed S. Darwish <a.darwish(a)linutronix.de> seqlock: Prefix internal seqcount_t-only macros with a "do_" Peter Zijlstra <peterz(a)infradead.org> seqlock: Rename __seqprop() users Arnd Bergmann <arnd(a)arndb.de> seqlock: avoid -Wshadow warnings Jozsef Kadlecsik <kadlec(a)netfilter.org> netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP 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 Jian Shen <shenjian15(a)huawei.com> net: hns3: only enable unicast promisc when mac table full 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 Ivan Vecera <ivecera(a)redhat.com> i40e: Fix VF VLAN offloading when port VLAN is configured Shengjiu Wang <shengjiu.wang(a)nxp.com> ASoC: imx-audmix: Fix return error with devm_clk_get() Sabrina Dubroca <sd(a)queasysnail.net> selftests: tls: swap the TX and RX sockets in some tests Kees Cook <keescook(a)chromium.org> selftests/tls: Add {} to avoid static checker warning 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_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 Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: integrate pipapo into commit protocol 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() Dmitry Monakhov <dmtrmonakhov(a)yandex-team.ru> ext4: mark group as trimmed only if it was fully scanned 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() Wang Jianchao <wangjianchao(a)kuaishou.com> ext4: add new helper interface ext4_try_to_trim_range() Wang Jianchao <wangjianchao(a)kuaishou.com> ext4: remove the 'group' parameter of ext4_trim_extent 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 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: Use the correct commit info in nfs_join_page_group() ------------- Diffstat: Makefile | 4 +- arch/arm/boot/dts/am335x-guardian.dts | 9 +- arch/arm/boot/dts/am3517-evm.dts | 2 +- arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi | 2 +- arch/arm/boot/dts/motorola-mapphone-common.dtsi | 33 +- arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi | 6 +- arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi | 6 +- arch/arm/boot/dts/omap3-cm-t3517.dts | 12 +- arch/arm/boot/dts/omap3-cpu-thermal.dtsi | 3 +- arch/arm/boot/dts/omap3-gta04.dtsi | 8 +- arch/arm/boot/dts/omap3-ldp.dts | 2 +- arch/arm/boot/dts/omap3-n900.dts | 40 +- arch/arm/boot/dts/omap3-zoom3.dts | 44 +-- arch/arm/boot/dts/omap4-cpu-thermal.dtsi | 29 +- arch/arm/boot/dts/omap443x.dtsi | 1 + arch/arm/boot/dts/omap4460.dtsi | 1 + arch/arm/boot/dts/omap5-cm-t54.dts | 64 +-- arch/arm64/include/asm/cputype.h | 2 + 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/ldcw.h | 36 +- arch/parisc/include/asm/ropes.h | 3 + arch/parisc/include/asm/spinlock_types.h | 5 - arch/parisc/kernel/drivers.c | 2 +- arch/parisc/kernel/irq.c | 2 +- arch/powerpc/kernel/hw_breakpoint.c | 7 +- arch/powerpc/perf/hv-24x7.c | 2 +- arch/x86/kernel/cpu/bugs.c | 4 +- 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 +- block/blk-core.c | 2 - block/blk-sysfs.c | 2 + drivers/acpi/device_pm.c | 29 ++ 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 | 41 +- 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/base/regmap/regcache-rbtree.c | 3 +- drivers/block/rbd.c | 412 ++++++++++--------- drivers/bus/ti-sysc.c | 31 +- drivers/char/agp/parisc-agp.c | 2 - drivers/clk/imx/clk-pll14xx.c | 2 + drivers/clk/tegra/clk-bpmp.c | 2 +- drivers/gpio/gpio-aspeed.c | 2 +- drivers/gpio/gpio-pmic-eic-sprd.c | 1 + drivers/gpio/gpio-pxa.c | 1 + drivers/gpio/gpio-tb10x.c | 6 +- drivers/gpu/drm/mediatek/mtk_drm_gem.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/infiniband/core/cma.c | 2 +- drivers/infiniband/core/cma_configfs.c | 2 +- drivers/infiniband/core/nldev.c | 1 + drivers/infiniband/core/uverbs_main.c | 2 +- drivers/infiniband/hw/mlx4/sysfs.c | 2 +- drivers/infiniband/hw/mlx5/main.c | 2 +- drivers/infiniband/sw/siw/siw_cm.c | 16 +- .../serio/{i8042-x86ia64io.h => i8042-acpipnpio.h} | 13 +- drivers/input/serio/i8042.h | 2 +- drivers/md/dm-zoned-target.c | 15 +- drivers/media/platform/qcom/venus/core.c | 12 + drivers/media/platform/qcom/venus/core.h | 11 + drivers/media/platform/qcom/venus/firmware.c | 28 +- drivers/media/platform/qcom/venus/hfi_venus.c | 94 +++-- drivers/media/platform/qcom/venus/hfi_venus_io.h | 114 ++++-- drivers/media/platform/qcom/venus/pm_helpers.c | 12 +- drivers/mmc/host/renesas_sdhi_core.c | 19 +- drivers/mmc/host/tmio_mmc.h | 1 + drivers/mmc/host/tmio_mmc_core.c | 8 +- drivers/mtd/ubi/build.c | 7 + drivers/net/dsa/mv88e6xxx/chip.c | 6 +- drivers/net/dsa/mv88e6xxx/global1.c | 31 -- drivers/net/dsa/mv88e6xxx/global1.h | 1 - drivers/net/dsa/mv88e6xxx/global2.c | 2 +- drivers/net/dsa/mv88e6xxx/global2.h | 1 + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 7 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 7 +- drivers/net/ethernet/qlogic/qed/qed_ll2.h | 2 +- drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 7 +- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 1 + drivers/net/team/team.c | 10 +- drivers/net/thunderbolt.c | 3 +- drivers/net/usb/smsc75xx.c | 4 +- drivers/net/wan/fsl_ucc_hdlc.c | 12 +- drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 6 +- .../net/wireless/marvell/mwifiex/11n_rxreorder.c | 4 +- drivers/net/wireless/marvell/mwifiex/sta_rx.c | 16 +- .../net/wireless/mediatek/mt76/mt76x02_eeprom.c | 7 - drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c | 13 +- drivers/nvme/host/pci.c | 149 +++---- drivers/of/dynamic.c | 6 +- drivers/parisc/iosapic.c | 4 +- drivers/parisc/iosapic_private.h | 4 +- drivers/pci/controller/dwc/pcie-qcom.c | 2 - drivers/platform/mellanox/Kconfig | 1 + drivers/platform/x86/intel_scu_ipc.c | 66 ++-- drivers/power/supply/ucs1002_power.c | 3 +- drivers/s390/scsi/zfcp_aux.c | 9 +- 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/spi/spi-nxp-fspi.c | 7 + drivers/spi/spi-zynqmp-gqspi.c | 24 +- drivers/target/target_core_device.c | 11 +- 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/extent_io.c | 8 +- fs/btrfs/super.c | 6 +- fs/ext4/ext4.h | 2 +- fs/ext4/mballoc.c | 138 ++++--- fs/nfs/direct.c | 8 +- fs/nfs/flexfilelayout/flexfilelayout.c | 1 + fs/nfs/nfs4proc.c | 4 +- fs/nfs/nfs4state.c | 47 ++- fs/nfs/sysfs.c | 16 +- fs/nfs/write.c | 23 +- fs/nilfs2/gcinode.c | 6 +- fs/proc/task_nommu.c | 27 +- include/linux/acpi.h | 5 + include/linux/bpf.h | 2 +- include/linux/btf_ids.h | 2 +- include/linux/cgroup.h | 3 +- include/linux/if_team.h | 2 + include/linux/libata.h | 4 +- include/linux/netfilter/nf_conntrack_sctp.h | 1 + include/linux/nfs_page.h | 4 +- include/linux/seqlock.h | 104 ++--- include/net/netfilter/ipv4/nf_reject.h | 4 +- include/net/netfilter/ipv6/nf_reject.h | 5 +- include/net/netfilter/nf_tables.h | 136 +++---- include/net/tcp.h | 6 +- include/uapi/linux/bpf.h | 4 +- include/uapi/linux/netfilter/nf_tables.h | 2 + kernel/bpf/queue_stack_maps.c | 21 +- kernel/dma/debug.c | 20 +- kernel/sched/cpuacct.c | 84 ++-- kernel/trace/ring_buffer.c | 42 +- kernel/trace/trace.c | 27 ++ kernel/trace/trace.h | 2 + kernel/trace/trace_events.c | 6 +- kernel/trace/trace_events_inject.c | 3 +- mm/frame_vector.c | 6 +- net/bridge/br_forward.c | 4 +- net/bridge/br_input.c | 4 +- net/core/neighbour.c | 4 +- net/dccp/ipv4.c | 9 +- net/dccp/ipv6.c | 9 +- net/ipv4/netfilter/ipt_REJECT.c | 3 +- net/ipv4/netfilter/nf_reject_ipv4.c | 6 +- net/ipv4/netfilter/nft_reject_ipv4.c | 3 +- net/ipv4/route.c | 4 +- net/ipv4/tcp_input.c | 13 + net/ipv4/tcp_output.c | 7 +- net/ipv6/netfilter/ip6t_REJECT.c | 2 +- net/ipv6/netfilter/nf_reject_ipv6.c | 5 +- net/ipv6/netfilter/nft_reject_ipv6.c | 3 +- net/l2tp/l2tp_ip6.c | 2 +- net/ncsi/ncsi-aen.c | 5 + net/netfilter/ipset/ip_set_core.c | 12 +- net/netfilter/ipvs/ip_vs_sync.c | 4 +- net/netfilter/nf_conntrack_proto_sctp.c | 43 +- net/netfilter/nf_tables_api.c | 436 ++++++++++++++++++--- net/netfilter/nf_tables_core.c | 2 +- net/netfilter/nf_tables_trace.c | 6 +- net/netfilter/nft_exthdr.c | 193 ++++++++- net/netfilter/nft_flow_offload.c | 2 +- net/netfilter/nft_payload.c | 10 +- net/netfilter/nft_reject_inet.c | 6 +- net/netfilter/nft_set_hash.c | 87 ++-- net/netfilter/nft_set_pipapo.c | 115 ++++-- net/netfilter/nft_set_rbtree.c | 199 ++++++---- net/netfilter/nft_synproxy.c | 4 +- net/netfilter/nft_tproxy.c | 4 +- net/nfc/llcp_core.c | 2 + net/rds/rdma_transport.c | 8 +- net/rds/tcp_connect.c | 2 +- net/sctp/associola.c | 3 +- net/sctp/socket.c | 1 + net/socket.c | 29 +- net/sunrpc/clnt.c | 4 +- net/tipc/crypto.c | 4 +- scripts/mod/file2alias.c | 2 +- security/integrity/ima/Kconfig | 21 +- 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/meson/axg-spdifin.c | 49 +-- tools/include/linux/btf_ids.h | 2 +- tools/include/uapi/linux/bpf.h | 4 +- tools/perf/util/Build | 6 + tools/power/cpupower/Makefile | 8 +- tools/power/cpupower/bench/Makefile | 2 +- .../ftrace/test.d/instances/instance-event.tc | 2 +- tools/testing/selftests/kselftest_deps.sh | 77 +++- tools/testing/selftests/net/tls.c | 11 +- 211 files changed, 2713 insertions(+), 1552 deletions(-)

1 year, 3 months

10
252
0 0

[tip: x86/apic] x86/apic/msi: Fix misconfigured non-maskable MSI quirk

by tip-bot2 for Koichiro Den

The following commit has been merged into the x86/apic branch of tip: Commit-ID: b56ebe7c896dc78b5865ec2c4b1dae3c93537517 Gitweb: https://git.kernel.org/tip/b56ebe7c896dc78b5865ec2c4b1dae3c93537517 Author: Koichiro Den <den(a)valinux.co.jp> AuthorDate: Thu, 26 Oct 2023 12:20:36 +09:00 Committer: Thomas Gleixner <tglx(a)linutronix.de> CommitterDate: Thu, 26 Oct 2023 13:53:06 +02:00 x86/apic/msi: Fix misconfigured non-maskable MSI quirk commit ef8dd01538ea ("genirq/msi: Make interrupt allocation less convoluted"), reworked the code so that the x86 specific quirk for affinity setting of non-maskable PCI/MSI interrupts is not longer activated if necessary. This could be solved by restoring the original logic in the core MSI code, but after a deeper analysis it turned out that the quirk flag is not required at all. The quirk is only required when the PCI/MSI device cannot mask the MSI interrupts, which in turn also prevents reservation mode from being enabled for the affected interrupt. This allows ot remove the NOMASK quirk bit completely as msi_set_affinity() can instead check whether reservation mode is enabled for the interrupt, which gives exactly the same answer. Even in the momentary non-existing case that the reservation mode would be not set for a maskable MSI interrupt this would not cause any harm as it just would cause msi_set_affinity() to go needlessly through the functionaly equivalent slow path, which works perfectly fine with maskable interrupts as well. Rework msi_set_affinity() to query the reservation mode and remove all NOMASK quirk logic from the core code. [ tglx: Massaged changelog ] Fixes: ef8dd01538ea ("genirq/msi: Make interrupt allocation less convoluted") Suggested-by: Thomas Gleixner <tglx(a)linutronix.de> Signed-off-by: Koichiro Den <den(a)valinux.co.jp> Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de> Cc: stable(a)vger.kernel.org Link: https://lore.kernel.org/r/20231026032036.2462428-1-den@valinux.co.jp --- arch/x86/kernel/apic/msi.c | 8 +++----- include/linux/irq.h | 26 ++++---------------------- include/linux/msi.h | 6 ------ kernel/irq/debugfs.c | 1 - kernel/irq/msi.c | 12 +----------- 5 files changed, 8 insertions(+), 45 deletions(-) diff --git a/arch/x86/kernel/apic/msi.c b/arch/x86/kernel/apic/msi.c index 6b6b711..d9651f1 100644 --- a/arch/x86/kernel/apic/msi.c +++ b/arch/x86/kernel/apic/msi.c @@ -55,14 +55,14 @@ msi_set_affinity(struct irq_data *irqd, const struct cpumask *mask, bool force) * caused by the non-atomic update of the address/data pair. * * Direct update is possible when: - * - The MSI is maskable (remapped MSI does not use this code path)). - * The quirk bit is not set in this case. + * - The MSI is maskable (remapped MSI does not use this code path). + * The reservation mode bit is set in this case. * - The new vector is the same as the old vector * - The old vector is MANAGED_IRQ_SHUTDOWN_VECTOR (interrupt starts up) * - The interrupt is not yet started up * - The new destination CPU is the same as the old destination CPU */ - if (!irqd_msi_nomask_quirk(irqd) || + if (!irqd_can_reserve(irqd) || cfg->vector == old_cfg.vector || old_cfg.vector == MANAGED_IRQ_SHUTDOWN_VECTOR || !irqd_is_started(irqd) || @@ -215,8 +215,6 @@ static bool x86_init_dev_msi_info(struct device *dev, struct irq_domain *domain, if (WARN_ON_ONCE(domain != real_parent)) return false; info->chip->irq_set_affinity = msi_set_affinity; - /* See msi_set_affinity() for the gory details */ - info->flags |= MSI_FLAG_NOMASK_QUIRK; break; case DOMAIN_BUS_DMAR: case DOMAIN_BUS_AMDVI: diff --git a/include/linux/irq.h b/include/linux/irq.h index d8a6fdc..90081af 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h @@ -215,8 +215,6 @@ struct irq_data { * IRQD_SINGLE_TARGET - IRQ allows only a single affinity target * IRQD_DEFAULT_TRIGGER_SET - Expected trigger already been set * IRQD_CAN_RESERVE - Can use reservation mode - * IRQD_MSI_NOMASK_QUIRK - Non-maskable MSI quirk for affinity change - * required * IRQD_HANDLE_ENFORCE_IRQCTX - Enforce that handle_irq_*() is only invoked * from actual interrupt context. * IRQD_AFFINITY_ON_ACTIVATE - Affinity is set on activation. Don't call @@ -247,11 +245,10 @@ enum { IRQD_SINGLE_TARGET = BIT(24), IRQD_DEFAULT_TRIGGER_SET = BIT(25), IRQD_CAN_RESERVE = BIT(26), - IRQD_MSI_NOMASK_QUIRK = BIT(27), - IRQD_HANDLE_ENFORCE_IRQCTX = BIT(28), - IRQD_AFFINITY_ON_ACTIVATE = BIT(29), - IRQD_IRQ_ENABLED_ON_SUSPEND = BIT(30), - IRQD_RESEND_WHEN_IN_PROGRESS = BIT(31), + IRQD_HANDLE_ENFORCE_IRQCTX = BIT(27), + IRQD_AFFINITY_ON_ACTIVATE = BIT(28), + IRQD_IRQ_ENABLED_ON_SUSPEND = BIT(29), + IRQD_RESEND_WHEN_IN_PROGRESS = BIT(30), }; #define __irqd_to_state(d) ACCESS_PRIVATE((d)->common, state_use_accessors) @@ -426,21 +423,6 @@ static inline bool irqd_can_reserve(struct irq_data *d) return __irqd_to_state(d) & IRQD_CAN_RESERVE; } -static inline void irqd_set_msi_nomask_quirk(struct irq_data *d) -{ - __irqd_to_state(d) |= IRQD_MSI_NOMASK_QUIRK; -} - -static inline void irqd_clr_msi_nomask_quirk(struct irq_data *d) -{ - __irqd_to_state(d) &= ~IRQD_MSI_NOMASK_QUIRK; -} - -static inline bool irqd_msi_nomask_quirk(struct irq_data *d) -{ - return __irqd_to_state(d) & IRQD_MSI_NOMASK_QUIRK; -} - static inline void irqd_set_affinity_on_activate(struct irq_data *d) { __irqd_to_state(d) |= IRQD_AFFINITY_ON_ACTIVATE; diff --git a/include/linux/msi.h b/include/linux/msi.h index a50ea79..ddace8c 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -547,12 +547,6 @@ enum { MSI_FLAG_ALLOC_SIMPLE_MSI_DESCS = (1 << 5), /* Free MSI descriptors */ MSI_FLAG_FREE_MSI_DESCS = (1 << 6), - /* - * Quirk to handle MSI implementations which do not provide - * masking. Currently known to affect x86, but has to be partially - * handled in the core MSI code. - */ - MSI_FLAG_NOMASK_QUIRK = (1 << 7), /* Mask for the generic functionality */ MSI_GENERIC_FLAGS_MASK = GENMASK(15, 0), diff --git a/kernel/irq/debugfs.c b/kernel/irq/debugfs.c index 5971a66..aae0402 100644 --- a/kernel/irq/debugfs.c +++ b/kernel/irq/debugfs.c @@ -121,7 +121,6 @@ static const struct irq_bit_descr irqdata_states[] = { BIT_MASK_DESCR(IRQD_AFFINITY_ON_ACTIVATE), BIT_MASK_DESCR(IRQD_MANAGED_SHUTDOWN), BIT_MASK_DESCR(IRQD_CAN_RESERVE), - BIT_MASK_DESCR(IRQD_MSI_NOMASK_QUIRK), BIT_MASK_DESCR(IRQD_FORWARDED_TO_VCPU), diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c index b4c31a5..79b4a58 100644 --- a/kernel/irq/msi.c +++ b/kernel/irq/msi.c @@ -1204,7 +1204,6 @@ static int msi_handle_pci_fail(struct irq_domain *domain, struct msi_desc *desc, #define VIRQ_CAN_RESERVE 0x01 #define VIRQ_ACTIVATE 0x02 -#define VIRQ_NOMASK_QUIRK 0x04 static int msi_init_virq(struct irq_domain *domain, int virq, unsigned int vflags) { @@ -1213,8 +1212,6 @@ static int msi_init_virq(struct irq_domain *domain, int virq, unsigned int vflag if (!(vflags & VIRQ_CAN_RESERVE)) { irqd_clr_can_reserve(irqd); - if (vflags & VIRQ_NOMASK_QUIRK) - irqd_set_msi_nomask_quirk(irqd); /* * If the interrupt is managed but no CPU is available to @@ -1275,15 +1272,8 @@ static int __msi_domain_alloc_irqs(struct device *dev, struct irq_domain *domain * Interrupt can use a reserved vector and will not occupy * a real device vector until the interrupt is requested. */ - if (msi_check_reservation_mode(domain, info, dev)) { + if (msi_check_reservation_mode(domain, info, dev)) vflags |= VIRQ_CAN_RESERVE; - /* - * MSI affinity setting requires a special quirk (X86) when - * reservation mode is active. - */ - if (info->flags & MSI_FLAG_NOMASK_QUIRK) - vflags |= VIRQ_NOMASK_QUIRK; - } xa_for_each_range(xa, idx, desc, ctrl->first, ctrl->last) { if (!msi_desc_match(desc, MSI_DESC_NOTASSOCIATED))

1 year, 3 months

1
0
0 0

[tip: x86/urgent] x86/i8259: Skip probing when ACPI/MADT advertises PCAT compatibility

by tip-bot2 for Thomas Gleixner

The following commit has been merged into the x86/urgent branch of tip: Commit-ID: 38d54ecfe293ed8bb26d05e6f0270a0aaa6656c6 Gitweb: https://git.kernel.org/tip/38d54ecfe293ed8bb26d05e6f0270a0aaa6656c6 Author: Thomas Gleixner <tglx(a)linutronix.de> AuthorDate: Wed, 25 Oct 2023 23:04:15 +02:00 Committer: Thomas Gleixner <tglx(a)linutronix.de> CommitterDate: Thu, 26 Oct 2023 11:31:45 +02:00 x86/i8259: Skip probing when ACPI/MADT advertises PCAT compatibility David and a few others reported that on certain newer systems some legacy interrupts fail to work correctly. Debugging revealed that the BIOS of these systems leaves the legacy PIC in uninitialized state which makes the PIC detection fail and the kernel switches to a dummy implementation. Unfortunately this fallback causes quite some code to fail as it depends on checks for the number of legacy PIC interrupts or the availability of the real PIC. In theory there is no reason to use the PIC on any modern system when IO/APIC is available, but the dependencies on the related checks cannot be resolved trivially and on short notice. This needs lots of analysis and rework. The PIC detection has been added to avoid quirky checks and force selection of the dummy implementation all over the place, especially in VM guest scenarios. So it's not an option to revert the relevant commit as that would break a lot of other scenarios. One solution would be to try to initialize the PIC on detection fail and retry the detection, but that puts the burden on everything which does not have a PIC. Fortunately the ACPI/MADT table header has a flag field, which advertises in bit 0 that the system is PCAT compatible, which means it has a legacy 8259 PIC. Evaluate that bit and if set avoid the detection routine and keep the real PIC installed, which then gets initialized (for nothing) and makes the rest of the code with all the dependencies work again. Fixes: e179f6914152 ("x86, irq, pic: Probe for legacy PIC and set legacy_pic appropriately") Reported-by: David Lazar <dlazar(a)gmail.com> Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de> Tested-by: David Lazar <dlazar(a)gmail.com> Reviewed-by: Hans de Goede <hdegoede(a)redhat.com> Reviewed-by: Mario Limonciello <mario.limonciello(a)amd.com> Cc: stable(a)vger.kernel.org Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218003 Link: https://lore.kernel.org/r/875y2u5s8g.ffs@tglx --- arch/x86/include/asm/i8259.h | 2 ++- arch/x86/kernel/acpi/boot.c | 3 +++- arch/x86/kernel/i8259.c | 38 +++++++++++++++++++++++++++-------- 3 files changed, 35 insertions(+), 8 deletions(-) diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h index 637fa1d..c715097 100644 --- a/arch/x86/include/asm/i8259.h +++ b/arch/x86/include/asm/i8259.h @@ -69,6 +69,8 @@ struct legacy_pic { void (*make_irq)(unsigned int irq); }; +void legacy_pic_pcat_compat(void); + extern struct legacy_pic *legacy_pic; extern struct legacy_pic null_legacy_pic; diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 2a0ea38..c55c0ef 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -148,6 +148,9 @@ static int __init acpi_parse_madt(struct acpi_table_header *table) pr_debug("Local APIC address 0x%08x\n", madt->address); } + if (madt->flags & ACPI_MADT_PCAT_COMPAT) + legacy_pic_pcat_compat(); + /* ACPI 6.3 and newer support the online capable bit. */ if (acpi_gbl_FADT.header.revision > 6 || (acpi_gbl_FADT.header.revision == 6 && diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c index 30a5520..c20d183 100644 --- a/arch/x86/kernel/i8259.c +++ b/arch/x86/kernel/i8259.c @@ -32,6 +32,7 @@ */ static void init_8259A(int auto_eoi); +static bool pcat_compat __ro_after_init; static int i8259A_auto_eoi; DEFINE_RAW_SPINLOCK(i8259A_lock); @@ -299,15 +300,32 @@ static void unmask_8259A(void) static int probe_8259A(void) { + unsigned char new_val, probe_val = ~(1 << PIC_CASCADE_IR); unsigned long flags; - unsigned char probe_val = ~(1 << PIC_CASCADE_IR); - unsigned char new_val; + + /* + * If MADT has the PCAT_COMPAT flag set, then do not bother probing + * for the PIC. Some BIOSes leave the PIC uninitialized and probing + * fails. + * + * Right now this causes problems as quite some code depends on + * nr_legacy_irqs() > 0 or has_legacy_pic() == true. This is silly + * when the system has an IO/APIC because then PIC is not required + * at all, except for really old machines where the timer interrupt + * must be routed through the PIC. So just pretend that the PIC is + * there and let legacy_pic->init() initialize it for nothing. + * + * Alternatively this could just try to initialize the PIC and + * repeat the probe, but for cases where there is no PIC that's + * just pointless. + */ + if (pcat_compat) + return nr_legacy_irqs(); + /* - * Check to see if we have a PIC. - * Mask all except the cascade and read - * back the value we just wrote. If we don't - * have a PIC, we will read 0xff as opposed to the - * value we wrote. + * Check to see if we have a PIC. Mask all except the cascade and + * read back the value we just wrote. If we don't have a PIC, we + * will read 0xff as opposed to the value we wrote. */ raw_spin_lock_irqsave(&i8259A_lock, flags); @@ -429,5 +447,9 @@ static int __init i8259A_init_ops(void) return 0; } - device_initcall(i8259A_init_ops); + +void __init legacy_pic_pcat_compat(void) +{ + pcat_compat = true; +}

1 year, 3 months

1
0
0 0

[tip: x86/urgent] x86/tsc: Defer marking TSC unstable to a worker

by tip-bot2 for Thomas Gleixner

The following commit has been merged into the x86/urgent branch of tip: Commit-ID: 4f0d5e708ef88b58c954581ca54161064beaaaf5 Gitweb: https://git.kernel.org/tip/4f0d5e708ef88b58c954581ca54161064beaaaf5 Author: Thomas Gleixner <tglx(a)linutronix.de> AuthorDate: Wed, 25 Oct 2023 23:31:35 +02:00 Committer: Thomas Gleixner <tglx(a)linutronix.de> CommitterDate: Thu, 26 Oct 2023 11:31:45 +02:00 x86/tsc: Defer marking TSC unstable to a worker Tetsuo reported the following lockdep splat when the TSC synchronization fails during CPU hotplug: tsc: Marking TSC unstable due to check_tsc_sync_source failed WARNING: inconsistent lock state inconsistent {IN-HARDIRQ-W} -> {HARDIRQ-ON-W} usage. ffffffff8cfa1c78 (watchdog_lock){?.-.}-{2:2}, at: clocksource_watchdog+0x23/0x5a0 {IN-HARDIRQ-W} state was registered at: _raw_spin_lock_irqsave+0x3f/0x60 clocksource_mark_unstable+0x1b/0x90 mark_tsc_unstable+0x41/0x50 check_tsc_sync_source+0x14f/0x180 sysvec_call_function_single+0x69/0x90 Possible unsafe locking scenario: lock(watchdog_lock); <Interrupt> lock(watchdog_lock); stack backtrace: _raw_spin_lock+0x30/0x40 clocksource_watchdog+0x23/0x5a0 run_timer_softirq+0x2a/0x50 sysvec_apic_timer_interrupt+0x6e/0x90 The reason is the recent conversion of the TSC synchronization function during CPU hotplug on the control CPU to a SMP function call. In case that the synchronization with the upcoming CPU fails, the TSC has to be marked unstable via clocksource_mark_unstable(). clocksource_mark_unstable() acquires 'watchdog_lock', but that lock is taken with interrupts enabled in the watchdog timer callback to minimize interrupt disabled time. That's obviously a possible deadlock scenario, Before that change the synchronization function was invoked in thread context so this could not happen. As it is not crucical whether the unstable marking happens slightly delayed, defer the call to a worker thread which avoids the lock context problem. Fixes: 9d349d47f0e3 ("x86/smpboot: Make TSC synchronization function call based") Reported-by: Tetsuo Handa <penguin-kernel(a)i-love.sakura.ne.jp> Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de> Tested-by: Tetsuo Handa <penguin-kernel(a)i-love.sakura.ne.jp> Cc: stable(a)vger.kernel.org Link: https://lore.kernel.org/r/87zg064ceg.ffs@tglx --- arch/x86/kernel/tsc_sync.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/tsc_sync.c b/arch/x86/kernel/tsc_sync.c index bbc440c..1123ef3 100644 --- a/arch/x86/kernel/tsc_sync.c +++ b/arch/x86/kernel/tsc_sync.c @@ -15,6 +15,7 @@ * ( The serial nature of the boot logic and the CPU hotplug lock * protects against more than 2 CPUs entering this code. ) */ +#include <linux/workqueue.h> #include <linux/topology.h> #include <linux/spinlock.h> #include <linux/kernel.h> @@ -342,6 +343,13 @@ static inline unsigned int loop_timeout(int cpu) return (cpumask_weight(topology_core_cpumask(cpu)) > 1) ? 2 : 20; } +static void tsc_sync_mark_tsc_unstable(struct work_struct *work) +{ + mark_tsc_unstable("check_tsc_sync_source failed"); +} + +static DECLARE_WORK(tsc_sync_work, tsc_sync_mark_tsc_unstable); + /* * The freshly booted CPU initiates this via an async SMP function call. */ @@ -395,7 +403,7 @@ retry: "turning off TSC clock.\n", max_warp); if (random_warps) pr_warn("TSC warped randomly between CPUs\n"); - mark_tsc_unstable("check_tsc_sync_source failed"); + schedule_work(&tsc_sync_work); } /*

1 year, 3 months

1
0
0 0

[PATCH] objtool/x86: add missing embedded_insn check

by John Sperbeck

When dbf460087755 ("objtool/x86: Fixup frame-pointer vs rethunk") was backported to some stable branches, the check for dest->embedded_insn in is_special_call() was missed. Add it back in. Signed-off-by: John Sperbeck <jsperbeck(a)google.com> --- I think 6.1.y, 5.15.y, and 5.10.y are the LTS branches missing the bit of code that this patch re-adds. tools/objtool/check.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/objtool/check.c b/tools/objtool/check.c index f8008ab31eef..cb363b507a32 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -2478,7 +2478,7 @@ static bool is_special_call(struct instruction *insn) if (!dest) return false; - if (dest->fentry) + if (dest->fentry || dest->embedded_insn) return true; } base-commit: 7d24402875c75ca6e43aa27ae3ce2042bde259a4 -- 2.42.0.758.gaed0368e0e-goog

1 year, 3 months

3
4
0 0

[PATCH v2] mmc: Capture correct oemid

by Avri Altman

The OEMID is an 8-bit binary number that identifies the Device OEM and/or the Device contents (when used as a distribution media either on ROM or FLASH Devices). It occupies bits [111:104] in the CID register: see the eMMC spec JESD84-B51 paragraph 7.2.3. So it is 8 bits, and has been so since ever - this bug is so ancients I couldn't even find its source. The furthest I could go is to commit 335eadf2ef6a (sd: initialize SD cards) but its already was wrong. Could be because in SD its indeed 16 bits (a 2-characters ASCII string). Another option as pointed out by Alex (offlist), it seems like this comes from the legacy MMC specs (v3.31 and before). It is important to fix it because we are using it as one of our quirk's token, as well as other tools, e.g. the LVFS (https://github.com/fwupd/fwupd/). Signed-off-by: Avri Altman <avri.altman(a)wdc.com> Cc: stable(a)vger.kernel.org --- Changelog: v1--v2: Add Alex's note of the possible origin of this bug. --- drivers/mmc/core/mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 89cd48fcec79..4a4bab9aa726 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -104,7 +104,7 @@ static int mmc_decode_cid(struct mmc_card *card) case 3: /* MMC v3.1 - v3.3 */ case 4: /* MMC v4 */ card->cid.manfid = UNSTUFF_BITS(resp, 120, 8); - card->cid.oemid = UNSTUFF_BITS(resp, 104, 16); + card->cid.oemid = UNSTUFF_BITS(resp, 104, 8); card->cid.prod_name[0] = UNSTUFF_BITS(resp, 96, 8); card->cid.prod_name[1] = UNSTUFF_BITS(resp, 88, 8); card->cid.prod_name[2] = UNSTUFF_BITS(resp, 80, 8); -- 2.42.0

1 year, 3 months

3
2
0 0

[PATCH] media: mtk-jpeg: Fix use after free bug due to error path handling in mtk_jpeg_dec_device_run

by Zheng Wang

In mtk_jpeg_probe, &jpeg->job_timeout_work is bound with mtk_jpeg_job_timeout_work. In mtk_jpeg_dec_device_run, if error happens in mtk_jpeg_set_dec_dst, it will finally start the worker while mark the job as finished by invoking v4l2_m2m_job_finish. There are two methods to trigger the bug. If we remove the module, it which will call mtk_jpeg_remove to make cleanup. The possible sequence is as follows, which will cause a use-after-free bug. CPU0 CPU1 mtk_jpeg_dec_... | start worker | |mtk_jpeg_job_timeout_work mtk_jpeg_remove | v4l2_m2m_release | kfree(m2m_dev); | | | v4l2_m2m_get_curr_priv | m2m_dev->curr_ctx //use If we close the file descriptor, which will call mtk_jpeg_release, it will have a similar sequence. Fix this bug by start timeout worker only if started jpegdec worker successfully so the v4l2_m2m_job_finish will only be called on either mtk_jpeg_job_timeout_work or mtk_jpeg_dec_device_run. This patch also reverts commit c677d7ae8314 ("media: mtk-jpeg: Fix use after free bug due to uncanceled work") for this patch also fixed the use-after-free bug mentioned before. Before mtk_jpeg_remove is invoked, mtk_jpeg_release must be invoked to close opened files. And it will call v4l2_m2m_cancel_job to wait for the timeout worker finished so the canceling in mtk_jpeg_remove is unnecessary. Fixes: b2f0d2724ba4 ("[media] vcodec: mediatek: Add Mediatek JPEG Decoder Driver") Signed-off-by: Zheng Wang <zyytlz.wz(a)163.com> Signed-off-by: Dmitry Osipenko <dmitry.osipenko(a)collabora.com> Cc: stable(a)vger.kernel.org --- .../media/platform/mediatek/jpeg/mtk_jpeg_core.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c index 7194f88edc0f..c3456c700c07 100644 --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c @@ -1021,13 +1021,13 @@ static void mtk_jpeg_dec_device_run(void *priv) if (ret < 0) goto dec_end; - schedule_delayed_work(&jpeg->job_timeout_work, - msecs_to_jiffies(MTK_JPEG_HW_TIMEOUT_MSEC)); - mtk_jpeg_set_dec_src(ctx, &src_buf->vb2_buf, &bs); if (mtk_jpeg_set_dec_dst(ctx, &jpeg_src_buf->dec_param, &dst_buf->vb2_buf, &fb)) goto dec_end; + schedule_delayed_work(&jpeg->job_timeout_work, + msecs_to_jiffies(MTK_JPEG_HW_TIMEOUT_MSEC)); + spin_lock_irqsave(&jpeg->hw_lock, flags); mtk_jpeg_dec_reset(jpeg->reg_base); mtk_jpeg_dec_set_config(jpeg->reg_base, @@ -1403,7 +1403,6 @@ static void mtk_jpeg_remove(struct platform_device *pdev) { struct mtk_jpeg_dev *jpeg = platform_get_drvdata(pdev); - cancel_delayed_work_sync(&jpeg->job_timeout_work); pm_runtime_disable(&pdev->dev); video_unregister_device(jpeg->vdev); v4l2_m2m_release(jpeg->m2m_dev); @@ -1750,9 +1749,6 @@ static void mtk_jpegdec_worker(struct work_struct *work) v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx); v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx); - schedule_delayed_work(&comp_jpeg[hw_id]->job_timeout_work, - msecs_to_jiffies(MTK_JPEG_HW_TIMEOUT_MSEC)); - mtk_jpeg_set_dec_src(ctx, &src_buf->vb2_buf, &bs); if (mtk_jpeg_set_dec_dst(ctx, &jpeg_src_buf->dec_param, @@ -1762,6 +1758,9 @@ static void mtk_jpegdec_worker(struct work_struct *work) goto setdst_end; } + schedule_delayed_work(&comp_jpeg[hw_id]->job_timeout_work, + msecs_to_jiffies(MTK_JPEG_HW_TIMEOUT_MSEC)); + spin_lock_irqsave(&comp_jpeg[hw_id]->hw_lock, flags); ctx->total_frame_num++; mtk_jpeg_dec_reset(comp_jpeg[hw_id]->reg_base); -- 2.25.1

1 year, 3 months

5
4
0 0

[merged mm-stable] mm-damon-lru_sort-avoid-divide-by-zero-in-hot-threshold-calculation.patch removed from -mm tree

by Andrew Morton

The quilt patch titled Subject: mm/damon/lru_sort: avoid divide-by-zero in hot threshold calculation has been removed from the -mm tree. Its filename was mm-damon-lru_sort-avoid-divide-by-zero-in-hot-threshold-calculation.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: SeongJae Park <sj(a)kernel.org> Subject: mm/damon/lru_sort: avoid divide-by-zero in hot threshold calculation Date: Thu, 19 Oct 2023 19:49:23 +0000 When calculating the hotness threshold for lru_prio scheme of DAMON_LRU_SORT, the module divides some values by the maximum nr_accesses. However, due to the type of the related variables, simple division-based calculation of the divisor can return zero. As a result, divide-by-zero is possible. Fix it by using damon_max_nr_accesses(), which handles the case. Link: https://lkml.kernel.org/r/20231019194924.100347-5-sj@kernel.org Fixes: 40e983cca927 ("mm/damon: introduce DAMON-based LRU-lists Sorting") Signed-off-by: SeongJae Park <sj(a)kernel.org> Reported-by: Jakub Acs <acsjakub(a)amazon.de> Cc: <stable(a)vger.kernel.org> [6.0+] Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- mm/damon/lru_sort.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) --- a/mm/damon/lru_sort.c~mm-damon-lru_sort-avoid-divide-by-zero-in-hot-threshold-calculation +++ a/mm/damon/lru_sort.c @@ -195,9 +195,7 @@ static int damon_lru_sort_apply_paramete if (err) return err; - /* aggr_interval / sample_interval is the maximum nr_accesses */ - hot_thres = damon_lru_sort_mon_attrs.aggr_interval / - damon_lru_sort_mon_attrs.sample_interval * + hot_thres = damon_max_nr_accesses(&damon_lru_sort_mon_attrs) * hot_thres_access_freq / 1000; scheme = damon_lru_sort_new_hot_scheme(hot_thres); if (!scheme) _ Patches currently in -mm which might be from sj(a)kernel.org are mm-damon-sysfs-remove-requested-targets-when-online-commit-inputs.patch

1 year, 3 months

1
0
0 0

[merged mm-stable] mm-damon-ops-common-avoid-divide-by-zero-during-region-hotness-calculation.patch removed from -mm tree

by Andrew Morton

The quilt patch titled Subject: mm/damon/ops-common: avoid divide-by-zero during region hotness calculation has been removed from the -mm tree. Its filename was mm-damon-ops-common-avoid-divide-by-zero-during-region-hotness-calculation.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: SeongJae Park <sj(a)kernel.org> Subject: mm/damon/ops-common: avoid divide-by-zero during region hotness calculation Date: Thu, 19 Oct 2023 19:49:22 +0000 When calculating the hotness of each region for the under-quota regions prioritization, DAMON divides some values by the maximum nr_accesses. However, due to the type of the related variables, simple division-based calculation of the divisor can return zero. As a result, divide-by-zero is possible. Fix it by using damon_max_nr_accesses(), which handles the case. Link: https://lkml.kernel.org/r/20231019194924.100347-4-sj@kernel.org Fixes: 198f0f4c58b9 ("mm/damon/vaddr,paddr: support pageout prioritization") Signed-off-by: SeongJae Park <sj(a)kernel.org> Reported-by: Jakub Acs <acsjakub(a)amazon.de> Cc: <stable(a)vger.kernel.org> [5.16+] Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- mm/damon/ops-common.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- a/mm/damon/ops-common.c~mm-damon-ops-common-avoid-divide-by-zero-during-region-hotness-calculation +++ a/mm/damon/ops-common.c @@ -73,7 +73,6 @@ void damon_pmdp_mkold(pmd_t *pmd, struct int damon_hot_score(struct damon_ctx *c, struct damon_region *r, struct damos *s) { - unsigned int max_nr_accesses; int freq_subscore; unsigned int age_in_sec; int age_in_log, age_subscore; @@ -81,8 +80,8 @@ int damon_hot_score(struct damon_ctx *c, unsigned int age_weight = s->quota.weight_age; int hotness; - max_nr_accesses = c->attrs.aggr_interval / c->attrs.sample_interval; - freq_subscore = r->nr_accesses * DAMON_MAX_SUBSCORE / max_nr_accesses; + freq_subscore = r->nr_accesses * DAMON_MAX_SUBSCORE / + damon_max_nr_accesses(&c->attrs); age_in_sec = (unsigned long)r->age * c->attrs.aggr_interval / 1000000; for (age_in_log = 0; age_in_log < DAMON_MAX_AGE_IN_LOG && age_in_sec; _ Patches currently in -mm which might be from sj(a)kernel.org are mm-damon-sysfs-remove-requested-targets-when-online-commit-inputs.patch

1 year, 3 months

1
0
0 0

[merged mm-stable] mm-damon-core-avoid-divide-by-zero-during-monitoring-results-update.patch removed from -mm tree

by Andrew Morton

The quilt patch titled Subject: mm/damon/core: avoid divide-by-zero during monitoring results update has been removed from the -mm tree. Its filename was mm-damon-core-avoid-divide-by-zero-during-monitoring-results-update.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: SeongJae Park <sj(a)kernel.org> Subject: mm/damon/core: avoid divide-by-zero during monitoring results update Date: Thu, 19 Oct 2023 19:49:21 +0000 When monitoring attributes are changed, DAMON updates access rate of the monitoring results accordingly. For that, it divides some values by the maximum nr_accesses. However, due to the type of the related variables, simple division-based calculation of the divisor can return zero. As a result, divide-by-zero is possible. Fix it by using damon_max_nr_accesses(), which handles the case. Link: https://lkml.kernel.org/r/20231019194924.100347-3-sj@kernel.org Fixes: 2f5bef5a590b ("mm/damon/core: update monitoring results for new monitoring attributes") Signed-off-by: SeongJae Park <sj(a)kernel.org> Reported-by: Jakub Acs <acsjakub(a)amazon.de> Cc: <stable(a)vger.kernel.org> [6.3+] Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- mm/damon/core.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) --- a/mm/damon/core.c~mm-damon-core-avoid-divide-by-zero-during-monitoring-results-update +++ a/mm/damon/core.c @@ -500,20 +500,14 @@ static unsigned int damon_age_for_new_at static unsigned int damon_accesses_bp_to_nr_accesses( unsigned int accesses_bp, struct damon_attrs *attrs) { - unsigned int max_nr_accesses = - attrs->aggr_interval / attrs->sample_interval; - - return accesses_bp * max_nr_accesses / 10000; + return accesses_bp * damon_max_nr_accesses(attrs) / 10000; } /* convert nr_accesses to access ratio in bp (per 10,000) */ static unsigned int damon_nr_accesses_to_accesses_bp( unsigned int nr_accesses, struct damon_attrs *attrs) { - unsigned int max_nr_accesses = - attrs->aggr_interval / attrs->sample_interval; - - return nr_accesses * 10000 / max_nr_accesses; + return nr_accesses * 10000 / damon_max_nr_accesses(attrs); } static unsigned int damon_nr_accesses_for_new_attrs(unsigned int nr_accesses, _ Patches currently in -mm which might be from sj(a)kernel.org are mm-damon-sysfs-remove-requested-targets-when-online-commit-inputs.patch

1 year, 3 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror October 2023