September 2022 - Linux-stable-mirror

[for-next][PATCH 05/15] ring-buffer: Add ring_buffer_wake_waiters()

by Steven Rostedt

From: "Steven Rostedt (Google)" <rostedt(a)goodmis.org> On closing of a file that represents a ring buffer or flushing the file, there may be waiters on the ring buffer that needs to be woken up and exit the ring_buffer_wait() function. Add ring_buffer_wake_waiters() to wake up the waiters on the ring buffer and allow them to exit the wait loop. Link: https://lkml.kernel.org/r/20220928133938.28dc2c27@gandalf.local.home Cc: stable(a)vger.kernel.org Cc: Ingo Molnar <mingo(a)kernel.org> Cc: Andrew Morton <akpm(a)linux-foundation.org> Fixes: 15693458c4bc0 ("tracing/ring-buffer: Move poll wake ups into ring buffer code") Signed-off-by: Steven Rostedt (Google) <rostedt(a)goodmis.org> --- include/linux/ring_buffer.h | 2 +- kernel/trace/ring_buffer.c | 39 +++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h index dac53fd3afea..2504df9a0453 100644 --- a/include/linux/ring_buffer.h +++ b/include/linux/ring_buffer.h @@ -101,7 +101,7 @@ __ring_buffer_alloc(unsigned long size, unsigned flags, struct lock_class_key *k int ring_buffer_wait(struct trace_buffer *buffer, int cpu, int full); __poll_t ring_buffer_poll_wait(struct trace_buffer *buffer, int cpu, struct file *filp, poll_table *poll_table); - +void ring_buffer_wake_waiters(struct trace_buffer *buffer, int cpu); #define RING_BUFFER_ALL_CPUS -1 diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 5a7d818ca3ea..3046deacf7b3 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -413,6 +413,7 @@ struct rb_irq_work { struct irq_work work; wait_queue_head_t waiters; wait_queue_head_t full_waiters; + long wait_index; bool waiters_pending; bool full_waiters_pending; bool wakeup_full; @@ -924,6 +925,37 @@ static void rb_wake_up_waiters(struct irq_work *work) } } +/** + * ring_buffer_wake_waiters - wake up any waiters on this ring buffer + * @buffer: The ring buffer to wake waiters on + * + * In the case of a file that represents a ring buffer is closing, + * it is prudent to wake up any waiters that are on this. + */ +void ring_buffer_wake_waiters(struct trace_buffer *buffer, int cpu) +{ + struct ring_buffer_per_cpu *cpu_buffer; + struct rb_irq_work *rbwork; + + if (cpu == RING_BUFFER_ALL_CPUS) { + + /* Wake up individual ones too. One level recursion */ + for_each_buffer_cpu(buffer, cpu) + ring_buffer_wake_waiters(buffer, cpu); + + rbwork = &buffer->irq_work; + } else { + cpu_buffer = buffer->buffers[cpu]; + rbwork = &cpu_buffer->irq_work; + } + + rbwork->wait_index++; + /* make sure the waiters see the new index */ + smp_wmb(); + + rb_wake_up_waiters(&rbwork->work); +} + /** * ring_buffer_wait - wait for input to the ring buffer * @buffer: buffer to wait on @@ -939,6 +971,7 @@ int ring_buffer_wait(struct trace_buffer *buffer, int cpu, int full) struct ring_buffer_per_cpu *cpu_buffer; DEFINE_WAIT(wait); struct rb_irq_work *work; + long wait_index; int ret = 0; /* @@ -957,6 +990,7 @@ int ring_buffer_wait(struct trace_buffer *buffer, int cpu, int full) work = &cpu_buffer->irq_work; } + wait_index = READ_ONCE(work->wait_index); while (true) { if (full) @@ -1021,6 +1055,11 @@ int ring_buffer_wait(struct trace_buffer *buffer, int cpu, int full) } schedule(); + + /* Make sure to see the new wait index */ + smp_rmb(); + if (wait_index != work->wait_index) + break; } if (full) -- 2.35.1

2 years, 2 months

1
0
0 0

[for-next][PATCH 04/15] ring-buffer: Check pending waiters when doing wake ups as well

by Steven Rostedt

From: "Steven Rostedt (Google)" <rostedt(a)goodmis.org> The wake up waiters only checks the "wakeup_full" variable and not the "full_waiters_pending". The full_waiters_pending is set when a waiter is added to the wait queue. The wakeup_full is only set when an event is triggered, and it clears the full_waiters_pending to avoid multiple calls to irq_work_queue(). The irq_work callback really needs to check both wakeup_full as well as full_waiters_pending such that this code can be used to wake up waiters when a file is closed that represents the ring buffer and the waiters need to be woken up. Link: https://lkml.kernel.org/r/20220927231824.209460321@goodmis.org Cc: stable(a)vger.kernel.org Cc: Ingo Molnar <mingo(a)kernel.org> Cc: Andrew Morton <akpm(a)linux-foundation.org> Fixes: 15693458c4bc0 ("tracing/ring-buffer: Move poll wake ups into ring buffer code") Signed-off-by: Steven Rostedt (Google) <rostedt(a)goodmis.org> --- kernel/trace/ring_buffer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 02db92c9eb1b..5a7d818ca3ea 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -917,8 +917,9 @@ static void rb_wake_up_waiters(struct irq_work *work) struct rb_irq_work *rbwork = container_of(work, struct rb_irq_work, work); wake_up_all(&rbwork->waiters); - if (rbwork->wakeup_full) { + if (rbwork->full_waiters_pending || rbwork->wakeup_full) { rbwork->wakeup_full = false; + rbwork->full_waiters_pending = false; wake_up_all(&rbwork->full_waiters); } } -- 2.35.1

2 years, 2 months

1
0
0 0

[for-next][PATCH 03/15] ring-buffer: Have the shortest_full queue be the shortest not longest

by Steven Rostedt

From: "Steven Rostedt (Google)" <rostedt(a)goodmis.org> The logic to know when the shortest waiters on the ring buffer should be woken up or not has uses a less than instead of a greater than compare, which causes the shortest_full to actually be the longest. Link: https://lkml.kernel.org/r/20220927231823.718039222@goodmis.org Cc: stable(a)vger.kernel.org Cc: Ingo Molnar <mingo(a)kernel.org> Cc: Andrew Morton <akpm(a)linux-foundation.org> Fixes: 2c2b0a78b3739 ("ring-buffer: Add percentage of ring buffer full to wake up reader") Signed-off-by: Steven Rostedt (Google) <rostedt(a)goodmis.org> --- kernel/trace/ring_buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 6b145d48dfd1..02db92c9eb1b 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -1011,7 +1011,7 @@ int ring_buffer_wait(struct trace_buffer *buffer, int cpu, int full) nr_pages = cpu_buffer->nr_pages; dirty = ring_buffer_nr_dirty_pages(buffer, cpu); if (!cpu_buffer->shortest_full || - cpu_buffer->shortest_full < full) + cpu_buffer->shortest_full > full) cpu_buffer->shortest_full = full; raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags); if (!pagebusy && -- 2.35.1

2 years, 2 months

1
0
0 0

[for-next][PATCH 02/15] ring-buffer: Allow splice to read previous partially read pages

by Steven Rostedt

From: "Steven Rostedt (Google)" <rostedt(a)goodmis.org> If a page is partially read, and then the splice system call is run against the ring buffer, it will always fail to read, no matter how much is in the ring buffer. That's because the code path for a partial read of the page does will fail if the "full" flag is set. The splice system call wants full pages, so if the read of the ring buffer is not yet full, it should return zero, and the splice will block. But if a previous read was done, where the beginning has been consumed, it should still be given to the splice caller if the rest of the page has been written to. This caused the splice command to never consume data in this scenario, and let the ring buffer just fill up and lose events. Link: https://lkml.kernel.org/r/20220927144317.46be6b80@gandalf.local.home Cc: stable(a)vger.kernel.org Fixes: 8789a9e7df6bf ("ring-buffer: read page interface") Signed-off-by: Steven Rostedt (Google) <rostedt(a)goodmis.org> --- kernel/trace/ring_buffer.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index d59b6a328b7f..6b145d48dfd1 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -5616,7 +5616,15 @@ int ring_buffer_read_page(struct trace_buffer *buffer, unsigned int pos = 0; unsigned int size; - if (full) + /* + * If a full page is expected, this can still be returned + * if there's been a previous partial read and the + * rest of the page can be read and the commit page is off + * the reader page. + */ + if (full && + (!read || (len < (commit - read)) || + cpu_buffer->reader_page == cpu_buffer->commit_page)) goto out_unlock; if (len > (commit - read)) -- 2.35.1

2 years, 2 months

1
0
0 0

[PATCH 5.19 000/207] 5.19.12-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.19.12 release. There are 207 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, 28 Sep 2022 10:07:26 +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.19.12-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.19.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.19.12-rc1 Christoph Hellwig <hch(a)lst.de> Revert "block: freeze the queue earlier in del_gendisk" Jan Kara <jack(a)suse.cz> ext4: use buckets for cr 1 block scan instead of rbtree Jan Kara <jack(a)suse.cz> ext4: use locality group preallocation for small closed files Jan Kara <jack(a)suse.cz> ext4: make directory inode spreading reflect flexbg size Jan Kara <jack(a)suse.cz> ext4: avoid unnecessary spreading of allocations among groups Jan Kara <jack(a)suse.cz> ext4: make mballoc try target group first even with mb_optimize_scan Theodore Ts'o <tytso(a)mit.edu> ext4: limit the number of retries after discarding preallocations blocks Luís Henriques <lhenriques(a)suse.de> ext4: fix bug in extents parsing when eh_entries == 0 and eh_depth > 0 Dan Williams <dan.j.williams(a)intel.com> devdax: Fix soft-reservation memory description Nick Desaulniers <ndesaulniers(a)google.com> Makefile.debug: re-enable debug info for .S files Nick Desaulniers <ndesaulniers(a)google.com> Makefile.debug: set -g unconditional on CONFIG_DEBUG_INFO_SPLIT Masahiro Yamada <masahiroy(a)kernel.org> certs: make system keyring depend on built-in x509 parser Alex Deucher <alexander.deucher(a)amd.com> drm/amdgpu: don't register a dirty callback for non-atomic Dan Carpenter <dan.carpenter(a)oracle.com> i2c: mux: harden i2c_mux_alloc() against integer overflows Asmaa Mnebhi <asmaa(a)nvidia.com> i2c: mlxbf: Fix frequency calculation Asmaa Mnebhi <asmaa(a)nvidia.com> i2c: mlxbf: prevent stack overflow in mlxbf_i2c_smbus_start_transaction() Asmaa Mnebhi <asmaa(a)nvidia.com> i2c: mlxbf: incorrect base address passed during io write Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> i2c: imx: If pm_runtime_get_sync() returned 1 device access is possible Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> workqueue: don't skip lockdep work dependency in cancel_work_sync() Li Jinlin <lijinlin3(a)huawei.com> fsdax: Fix infinite loop in dax_iomap_rw() Jane Chu <jane.chu(a)oracle.com> pmem: fix a name collision Sergio Paracuellos <sergio.paracuellos(a)gmail.com> gpio: mt7621: Make the irqchip immutable Nathan Huckleberry <nhuck(a)google.com> drm/rockchip: Fix return type of cdn_dp_connector_mode_valid Nathan Chancellor <nathan(a)kernel.org> drm/amd/display: Mark dml30's UseMinimumDCFCLK() as noinline for stack usage Nathan Chancellor <nathan(a)kernel.org> drm/amd/display: Reduce number of arguments of dml31's CalculateFlipSchedule() Nathan Chancellor <nathan(a)kernel.org> drm/amd/display: Reduce number of arguments of dml31's CalculateWatermarksAndDRAMSpeedChangeSupport() Yao Wang1 <Yao.Wang1(a)amd.com> drm/amd/display: Limit user regamma to a valid value Candice Li <candice.li(a)amd.com> drm/amdgpu: Skip reset error status for psp v13_0_0 Alex Deucher <alexander.deucher(a)amd.com> drm/amdgpu: add HDP remap functionality to nbio 7.7 Yang Wang <KevinYang.Wang(a)amd.com> drm/amdgpu: change the alignment size of TMR BO to 1M Hamza Mahfooz <hamza.mahfooz(a)amd.com> drm/amdgpu: use dirty framebuffer helper Guchun Chen <guchun.chen(a)amd.com> drm/amd/pm: disable BACO entry/exit completely on several sienna cichlid cards Linus Walleij <linus.walleij(a)linaro.org> gpio: ixp4xx: Make irqchip immutable Hans de Goede <hdegoede(a)redhat.com> drm/gma500: Fix (vblank) IRQs not working after suspend/resume Hans de Goede <hdegoede(a)redhat.com> drm/gma500: Fix WARN_ON(lock->magic != lock) error Hans de Goede <hdegoede(a)redhat.com> drm/gma500: Fix BUG: sleeping function called from invalid context errors Vitaly Kuznetsov <vkuznets(a)redhat.com> Drivers: hv: Never allocate anything besides framebuffer from framebuffer memory region Rafael Mendonca <rafaelmendsr(a)gmail.com> block: Do not call blk_put_queue() if gendisk allocation fails Christoph Hellwig <hch(a)lst.de> block: call blk_mq_exit_queue from disk_release for never added disks Christoph Hellwig <hch(a)lst.de> blk-mq: fix error handling in __blk_mq_alloc_disk José Roberto de Souza <jose.souza(a)intel.com> drm/i915/display: Fix handling of enable_psr parameter Stefan Haberland <sth(a)linux.ibm.com> s390/dasd: fix Oops in dasd_alias_get_start_dev due to missing pavgroup Pali Rohár <pali(a)kernel.org> phy: marvell: phy-mvebu-a3700-comphy: Remove broken reset support Ming Lei <ming.lei(a)redhat.com> cgroup: cgroup_get_from_id() must check the looked-up kn is a directory Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> serial: tegra-tcu: Use uart_xmit_advance(), fixes icount.tx accounting Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> serial: tegra: Use uart_xmit_advance(), fixes icount.tx accounting Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> serial: Create uart_xmit_advance() Lukas Wunner <lukas(a)wunner.de> serial: fsl_lpuart: Reset prior to registration Jens Axboe <axboe(a)kernel.dk> io_uring: ensure that cached task references are always put on exit Hangbin Liu <liuhangbin(a)gmail.com> selftests: forwarding: add shebang for sch_red.sh Jakub Kicinski <kuba(a)kernel.org> bnxt: prevent skb UAF after handing over to PTP worker Hangyu Hua <hbh25y(a)gmail.com> net: sched: fix possible refcount leak in tc_new_tfilter() Sean Anderson <seanga2(a)gmail.com> net: sunhme: Fix packet reception for len < RX_COPY_THRESHOLD Jonathan Toppins <jtoppins(a)redhat.com> bonding: fix NULL deref in bond_rr_gen_slave_id Michael Walle <michael(a)walle.cc> net: phy: micrel: fix shared interrupt on LAN8814 Wen Gu <guwen(a)linux.alibaba.com> net/smc: Stop the CLC flow if no link to map buffers on Larysa Zaremba <larysa.zaremba(a)intel.com> ice: Fix ice_xdp_xmit() when XDP TX queue number is not sufficient Nícolas F. R. A. Prado <nfraprado(a)collabora.com> drm/mediatek: dsi: Move mtk_dsi_stop() call back to mtk_dsi_poweroff() Namhyung Kim <namhyung(a)kernel.org> perf tools: Honor namespace when synthesizing build-ids Adrian Hunter <adrian.hunter(a)intel.com> perf kcore_copy: Do not check /proc/modules is unchanged Lieven Hey <lieven.hey(a)kdab.com> perf jit: Include program header in ELF files Namhyung Kim <namhyung(a)kernel.org> perf stat: Fix cpu map index in bperf cgroup code Namhyung Kim <namhyung(a)kernel.org> perf stat: Fix BPF program section name Marc Kleine-Budde <mkl(a)pengutronix.de> can: gs_usb: gs_can_open(): fix race dev->can.state condition Dongliang Mu <mudongliangabcd(a)gmail.com> gpio: tqmx86: fix uninitialized variable girq Geert Uytterhoeven <geert+renesas(a)glider.be> net: sh_eth: Fix PHY state warning splat during system resume Geert Uytterhoeven <geert+renesas(a)glider.be> net: ravb: Fix PHY state warning splat during system resume Florian Westphal <fw(a)strlen.de> netfilter: nf_ct_ftp: fix deadlock when nat rewrite is needed Florian Westphal <fw(a)strlen.de> netfilter: ebtables: fix memory leak when blob is malformed Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> netfilter: nf_tables: fix percpu memory leak at nf_tables_addchain() Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> netfilter: nf_tables: fix nft_counters_enabled underflow at nf_tables_addchain() Mateusz Palczewski <mateusz.palczewski(a)intel.com> ice: Fix interface being down after reset with link-down-on-close flag on Michal Swiatkowski <michal.swiatkowski(a)linux.intel.com> ice: config netdev tc before setting queues number Vladimir Oltean <vladimir.oltean(a)nxp.com> net/sched: taprio: make qdisc_leaf() see the per-netdev-queue pfifo child qdiscs Vladimir Oltean <vladimir.oltean(a)nxp.com> net/sched: taprio: avoid disabling offload when it was never enabled Ido Schimmel <idosch(a)nvidia.com> ipv6: Fix crash when IPv6 is administratively disabled Vladimir Oltean <vladimir.oltean(a)nxp.com> net: enetc: deny offload of tc-based TSN features on VF interfaces Vladimir Oltean <vladimir.oltean(a)nxp.com> net: enetc: move enetc_set_psfp() out of the common enetc_set_features() Jason A. Donenfeld <Jason(a)zx2c4.com> wireguard: netlink: avoid variable-sized memcpy on sockaddr Jason A. Donenfeld <Jason(a)zx2c4.com> wireguard: ratelimiter: disable timings test by default Íñigo Huguet <ihuguet(a)redhat.com> sfc/siena: fix null pointer dereference in efx_hard_start_xmit Íñigo Huguet <ihuguet(a)redhat.com> sfc/siena: fix TX channel offset when using legacy interrupts Alex Elder <elder(a)linaro.org> net: ipa: properly limit modem routing table use Liang He <windhl(a)126.com> of: mdio: Add of_node_put() when breaking out of for_each_xx Randy Dunlap <rdunlap(a)infradead.org> drm/hisilicon: Add depends on MMU Shailend Chand <shailend(a)google.com> gve: Fix GFP flags when allocing pages Vadim Fedorenko <vfedorenko(a)novek.ru> bnxt_en: fix flags to check for supported fw version Íñigo Huguet <ihuguet(a)redhat.com> sfc: fix null pointer dereference in efx_hard_start_xmit Íñigo Huguet <ihuguet(a)redhat.com> sfc: fix TX channel offset when using legacy interrupts Ido Schimmel <idosch(a)nvidia.com> netdevsim: Fix hwstats debugfs file permissions Michal Jaron <michalx.jaron(a)intel.com> i40e: Fix set max_tx_rate when it is lower than 1 Mbps Michal Jaron <michalx.jaron(a)intel.com> i40e: Fix VF set max MTU size Michal Jaron <michalx.jaron(a)intel.com> iavf: Fix set max MTU size with port VLAN and jumbo frames David Thompson <davthompson(a)nvidia.com> mlxbf_gige: clear MDIO gateway lock after read Norbert Zulinski <norbertx.zulinski(a)intel.com> iavf: Fix bad page state Christian Lamparter <chunkeey(a)gmail.com> um: fix default console kernel parameter Serge Semin <Sergey.Semin(a)baikalelectronics.ru> MIPS: Loongson32: Fix PHY-mode being left unspecified Randy Dunlap <rdunlap(a)infradead.org> MIPS: lantiq: export clk_get_io() for lantiq_wdt.ko Feng Tang <feng.tang(a)intel.com> mm/slab_common: fix possible double free of kmem_cache Heiko Schocher <hs(a)denx.de> drm/panel: simple: Fix innolux_g121i1_l01 bus_format Benjamin Poirier <bpoirier(a)nvidia.com> net: team: Unsync device addresses on ndo_stop Benjamin Poirier <bpoirier(a)nvidia.com> net: bonding: Unsync device addresses on ndo_stop Benjamin Poirier <bpoirier(a)nvidia.com> net: bonding: Share lacpdu_mcast_addr definition Sreekanth Reddy <sreekanth.reddy(a)broadcom.com> scsi: mpt3sas: Fix return value check of dma_get_required_mask() Rafael Mendonca <rafaelmendsr(a)gmail.com> scsi: qla2xxx: Fix memory leak in __qlt_24xx_handle_abts() Tim Harvey <tharvey(a)gateworks.com> arm64: dts: imx8mp-venice-gw74xx: fix port/phy validation Ioana Ciornei <ioana.ciornei(a)nxp.com> net: phy: aquantia: wait for the suspend/resume operations to finish Horatiu Vultur <horatiu.vultur(a)microchip.com> ARM: dts: lan966x: Fix the interrupt number for internal PHYs Tim Harvey <tharvey(a)gateworks.com> arm64: dts: imx8mp-venice-gw74xx: fix ksz9477 cpu port Tim Harvey <tharvey(a)gateworks.com> arm64: dts: imx8mp-venice-gw74xx: fix CAN STBY polarity Allen-KH Cheng <allen-kh.cheng(a)mediatek.com> drm/mediatek: Fix wrong dither settings Fabio Estevam <festevam(a)denx.de> arm64: dts: tqma8mqml: Include phy-imx8-pcie.h header Toke Høiland-Jørgensen <toke(a)redhat.com> wifi: iwlwifi: Mark IWLMEI as broken Ludovic Cintrat <ludovic.cintrat(a)gatewatcher.com> net: core: fix flow symmetric hash Lu Wei <luwei32(a)huawei.com> ipvlan: Fix out-of-bound bugs caused by unset skb->mac_header Brett Creeley <brett.creeley(a)intel.com> iavf: Fix cached head and tail value for iavf_get_tx_pending Ding Hui <dinghui(a)sangfor.com.cn> ice: Fix crash by keep old cfg when update TCs more than queues Dave Ertman <david.m.ertman(a)intel.com> ice: Don't double unplug aux on peer initiated reset Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nfnetlink_osf: fix possible bogus match in nf_osf_find() David Leadbeater <dgl(a)dgl.cx> netfilter: nf_conntrack_irc: Tighten matching on DCC message Igor Ryzhov <iryzhov(a)nfware.com> netfilter: nf_conntrack_sip: fix ct_sip_walk_headers Philippe Schenker <philippe.schenker(a)toradex.com> arm64: dts: imx8mm-verdin: extend pmic voltages Fabio Estevam <festevam(a)denx.de> arm64: dts: rockchip: Remove 'enable-active-low' from rk3566-quartz64-a Fabio Estevam <festevam(a)denx.de> arm64: dts: rockchip: Remove 'enable-active-low' from rk3399-puma Michael Riesch <michael.riesch(a)wolfvision.net> arm64: dts: rockchip: fix property for usb2 phy supply on rk3568-evb1-v10 Michael Riesch <michael.riesch(a)wolfvision.net> arm64: dts: rockchip: fix property for usb2 phy supply on rock-3a Liang He <windhl(a)126.com> dmaengine: ti: k3-udma-private: Fix refcount leak bug in of_xudma_dev_get() Peng Fan <peng.fan(a)nxp.com> arm64: dts: imx8ulp: add #reset-cells for pcc Marco Felsch <m.felsch(a)pengutronix.de> arm64: dts: imx8mn: remove GPU power domain reset zain wang <wzz(a)rock-chips.com> arm64: dts: rockchip: Set RK3399-Gru PCLK_EDP to 24 MHz Marek Vasut <marex(a)denx.de> arm64: dts: imx8mm: Reverse CPLD_Dn GPIO label mapping on MX8Menlo AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com> drm/mediatek: dsi: Add atomic {destroy,duplicate}_state, reset callbacks Jagan Teki <jagan(a)amarulasolutions.com> arm64: dts: rockchip: Fix typo in lisense text for PX30.Core Brian Norris <briannorris(a)chromium.org> arm64: dts: rockchip: Pull up wlan wake# on Gru-Bob Nicolas Frattaroli <frattaroli.nicolas(a)gmail.com> arm64: dts: rockchip: Lower sd speed on quartz64-b Cristian Marussi <cristian.marussi(a)arm.com> firmware: arm_scmi: Fix the asynchronous reset requests Cristian Marussi <cristian.marussi(a)arm.com> firmware: arm_scmi: Harden accesses to the reset domains Shigeru Yoshida <syoshida(a)redhat.com> batman-adv: Fix hang up with small MTU hard-interface Will Deacon <will(a)kernel.org> vmlinux.lds.h: CFI: Reduce alignment of jump-table to function alignment Sergey Shtylyov <s.shtylyov(a)omp.ru> arm64: topology: fix possible overflow in amu_fie_setup() Ilkka Koskinen <ilkka(a)os.amperecomputing.com> perf/arm-cmn: Add more bits to child node address offset field Sean Christopherson <seanjc(a)google.com> KVM: x86: Inject #UD on emulated XSETBV if XSAVES isn't enabled Dr. David Alan Gilbert <dgilbert(a)redhat.com> KVM: x86: Always enable legacy FP/SSE in allowed user XFEATURES Sean Christopherson <seanjc(a)google.com> KVM: x86: Reinstate kvm_vcpu_arch.guest_supported_xcr0 Maurizio Lombardi <mlombard(a)redhat.com> mm: slub: fix flush_cpu_slab()/__free_slab() invocations in task context. Chao Yu <chao.yu(a)oppo.com> mm/slub: fix to return errno if kmalloc() fails Haiyang Zhang <haiyangz(a)microsoft.com> net: mana: Add rmb after checking owner bits Marc Kleine-Budde <mkl(a)pengutronix.de> can: flexcan: flexcan_mailbox_read() fix return value for drop = true Peter Collingbourne <pcc(a)google.com> kasan: call kasan_malloc() from __kmalloc_*track_caller() Juergen Gross <jgross(a)suse.com> xen/xenbus: fix xenbus_setup_ring() Chris Wilson <chris(a)chris-wilson.co.uk> drm/i915/gem: Really move i915_gem_context.link under ref protection Janusz Krzysztofik <janusz.krzysztofik(a)linux.intel.com> drm/i915/gem: Flush contexts on driver release Randy Dunlap <rdunlap(a)infradead.org> riscv: fix RISCV_ISA_SVPBMT kconfig dependency warning Al Viro <viro(a)zeniv.linux.org.uk> riscv: fix a nasty sigreturn bug... Meng Li <Meng.Li(a)windriver.com> gpiolib: cdev: Set lineevent_state::irq after IRQ register successfully Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> gpio: mockup: Fix potential resource leakage when register a chip Bartosz Golaszewski <brgl(a)bgdev.pl> gpio: mockup: fix NULL pointer dereference when removing debugfs Felix Fietkau <nbd(a)nbd.name> wifi: mt76: fix reading current per-tid starting sequence number for aggregation Ard Biesheuvel <ardb(a)kernel.org> efi: libstub: check Shim mode using MokSBStateRT Ard Biesheuvel <ardb(a)kernel.org> efi: x86: Wipe setup_data on pure EFI boot Gil Fine <gil.fine(a)intel.com> thunderbolt: Add support for Intel Maple Ridge single port controller William Wu <william.wu(a)rock-chips.com> usb: dwc3: core: leave default DMA if the controller does not support 64-bit DMA Johan Hovold <johan(a)kernel.org> media: flexcop-usb: fix endpoint type check Adrian Hunter <adrian.hunter(a)intel.com> libperf evlist: Fix polling of system-wide events Naohiro Aota <naohiro.aota(a)wdc.com> btrfs: zoned: wait for extent buffer IOs before finishing a zone Filipe Manana <fdmanana(a)suse.com> btrfs: fix hang during unmount when stopping a space reclaim worker Filipe Manana <fdmanana(a)suse.com> btrfs: fix hang during unmount when stopping block group reclaim worker Yuezhang Mo <Yuezhang.Mo(a)sony.com> exfat: fix overflow for large capacity partition Yi Liu <yi.l.liu(a)intel.com> iommu/vt-d: Check correct capability for sagaw determination Daniel Houldsworth <dhould3(a)gmail.com> ALSA: hda/realtek: Add a quirk for HP OMEN 16 (8902) mute LED Callum Osmotherly <callum.osmotherly(a)gmail.com> ALSA: hda/realtek: Enable 4-speaker output Dell Precision 5530 laptop Luke D. Jones <luke(a)ljones.dev> ALSA: hda/realtek: Add quirk for ASUS GA503R laptop Luke D. Jones <luke(a)ljones.dev> ALSA: hda/realtek: Add pincfg for ASUS G533Z HP jack Luke D. Jones <luke(a)ljones.dev> ALSA: hda/realtek: Add pincfg for ASUS G513 HP jack Takashi Iwai <tiwai(a)suse.de> ALSA: hda/realtek: Re-arrange quirk table entries Callum Osmotherly <callum.osmotherly(a)gmail.com> ALSA: hda/realtek: Enable 4-speaker output Dell Precision 5570 laptop huangwenhui <huangwenhuia(a)uniontech.com> ALSA: hda/realtek: Add quirk for Huawei WRT-WX9 Kai Vehmanen <kai.vehmanen(a)linux.intel.com> ALSA: hda: add Intel 5 Series / 3400 PCI DID Mohan Kumar <mkumard(a)nvidia.com> ALSA: hda: Fix Nvidia dp infoframe Takashi Iwai <tiwai(a)suse.de> ALSA: hda: Fix hang at HD-audio codec unbinding due to refcount saturation Mohan Kumar <mkumard(a)nvidia.com> ALSA: hda/tegra: set depop delay for tegra Takashi Iwai <tiwai(a)suse.de> ALSA: core: Fix double-free at snd_card_new() Takashi Iwai <tiwai(a)suse.de> Revert "ALSA: usb-audio: Split endpoint setups for hw_params and prepare" jerry meng <jerry-meng(a)foxmail.com> USB: serial: option: add Quectel RM520N Carl Yin(殷张成) <carl.yin(a)quectel.com> USB: serial: option: add Quectel BG95 0x0203 composition Alan Stern <stern(a)rowland.harvard.edu> USB: core: Fix RST error in hub.c Phil Auld <pauld(a)redhat.com> drivers/base: Fix unsigned comparison to -1 in CPUMAP_FILE_MAX_BYTES Bart Van Assche <bvanassche(a)acm.org> scsi: core: Fix a use-after-free Christoph Hellwig <hch(a)lst.de> block: simplify disk shutdown Christoph Hellwig <hch(a)lst.de> block: stop setting the nomerges flags in blk_cleanup_queue Christoph Hellwig <hch(a)lst.de> block: remove QUEUE_FLAG_DEAD Antony Antony <antony.antony(a)secunet.com> xfrm: fix XFRMA_LASTUSED comment Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Revert "usb: gadget: udc-xilinx: replace memcpy with memcpy_toio" Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Revert "usb: add quirks for Lenovo OneLink+ Dock" Steve French <stfrench(a)microsoft.com> smb3: use filemap_write_and_wait_range instead of filemap_write_and_wait Piyush Mehta <piyush.mehta(a)amd.com> usb: gadget: udc-xilinx: replace memcpy with memcpy_toio Jean-Francois Le Fillatre <jflf_kernel(a)gmx.com> usb: add quirks for Lenovo OneLink+ Dock David Howells <dhowells(a)redhat.com> smb3: fix temporary data corruption in insert range Steve French <stfrench(a)microsoft.com> smb3: fix temporary data corruption in collapse range David Howells <dhowells(a)redhat.com> smb3: Move the flush out of smb2_copychunk_range() into its callers Jani Nikula <jani.nikula(a)intel.com> drm/i915/dsi: fix dual-link DSI backlight and CABC ports for display 11+ Jani Nikula <jani.nikula(a)intel.com> drm/i915/dsi: filter invalid backlight and CABC ports Ville Syrjälä <ville.syrjala(a)linux.intel.com> drm/i915/bios: Split VBT data into per-panel vs. global parts Ville Syrjälä <ville.syrjala(a)linux.intel.com> drm/i915/bios: Split VBT parsing to global vs. panel specific parts Ville Syrjälä <ville.syrjala(a)linux.intel.com> drm/i915/bios: Split parse_driver_features() into two parts Ville Syrjälä <ville.syrjala(a)linux.intel.com> drm/i915/pps: Split pps_init_delays() into distinct parts Ville Syrjälä <ville.syrjala(a)linux.intel.com> drm/i915: Extract intel_edp_fixup_vbt_bpp() ------------- Diffstat: Makefile | 4 +- arch/arm/boot/dts/lan966x.dtsi | 4 +- arch/arm64/boot/dts/freescale/imx8mm-mx8menlo.dts | 10 +- .../boot/dts/freescale/imx8mm-tqma8mqml-mba8mx.dts | 1 - .../arm64/boot/dts/freescale/imx8mm-tqma8mqml.dtsi | 1 + arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi | 10 +- arch/arm64/boot/dts/freescale/imx8mn.dtsi | 1 - .../boot/dts/freescale/imx8mp-venice-gw74xx.dts | 12 +- arch/arm64/boot/dts/freescale/imx8ulp.dtsi | 3 + .../boot/dts/rockchip/px30-engicam-px30-core.dtsi | 4 +- arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts | 5 + .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 9 + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 1 - arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 1 - arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 2 +- arch/arm64/kernel/topology.c | 2 +- arch/mips/lantiq/clk.c | 1 + arch/mips/loongson32/common/platform.c | 16 +- arch/riscv/Kconfig | 1 + arch/riscv/kernel/signal.c | 2 + arch/um/kernel/um_arch.c | 2 +- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/cpuid.c | 11 +- arch/x86/kvm/emulate.c | 3 + arch/x86/kvm/x86.c | 10 +- block/blk-core.c | 43 --- block/blk-mq-debugfs.c | 8 +- block/blk-mq.c | 43 ++- block/blk-sysfs.c | 5 - block/blk.h | 3 + block/bsg-lib.c | 4 +- block/genhd.c | 45 ++- certs/Kconfig | 2 +- drivers/block/ataflop.c | 1 - drivers/block/loop.c | 1 - drivers/block/mtip32xx/mtip32xx.c | 2 - drivers/block/rnbd/rnbd-clt.c | 2 +- drivers/block/sx8.c | 4 +- drivers/block/virtio_blk.c | 1 - drivers/block/z2ram.c | 1 - drivers/cdrom/gdrom.c | 1 - drivers/dax/hmem/device.c | 1 + drivers/dma/ti/k3-udma-private.c | 6 +- drivers/firmware/arm_scmi/reset.c | 10 +- drivers/firmware/efi/libstub/secureboot.c | 8 +- drivers/firmware/efi/libstub/x86-stub.c | 7 + drivers/gpio/gpio-ixp4xx.c | 17 +- drivers/gpio/gpio-mockup.c | 6 +- drivers/gpio/gpio-mt7621.c | 21 +- drivers/gpio/gpio-tqmx86.c | 4 +- drivers/gpio/gpiolib-cdev.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 13 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 3 +- drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c | 9 + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 3 +- .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 420 +++++---------------- .../drm/amd/display/modules/color/color_gamma.c | 4 + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 11 + drivers/gpu/drm/gma500/cdv_device.c | 4 +- drivers/gpu/drm/gma500/gem.c | 4 +- drivers/gpu/drm/gma500/gma_display.c | 11 +- drivers/gpu/drm/gma500/oaktrail_device.c | 5 +- drivers/gpu/drm/gma500/power.c | 8 +- drivers/gpu/drm/gma500/psb_drv.c | 2 +- drivers/gpu/drm/gma500/psb_drv.h | 5 +- drivers/gpu/drm/gma500/psb_irq.c | 15 +- drivers/gpu/drm/gma500/psb_irq.h | 2 +- drivers/gpu/drm/hisilicon/hibmc/Kconfig | 1 + drivers/gpu/drm/i915/display/g4x_dp.c | 22 +- drivers/gpu/drm/i915/display/icl_dsi.c | 18 +- drivers/gpu/drm/i915/display/intel_backlight.c | 23 +- drivers/gpu/drm/i915/display/intel_bios.c | 384 ++++++++++--------- drivers/gpu/drm/i915/display/intel_bios.h | 4 + drivers/gpu/drm/i915/display/intel_ddi.c | 22 +- drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 9 +- drivers/gpu/drm/i915/display/intel_display_types.h | 69 ++++ drivers/gpu/drm/i915/display/intel_dp.c | 40 +- drivers/gpu/drm/i915/display/intel_dp.h | 2 + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 6 +- drivers/gpu/drm/i915/display/intel_drrs.c | 3 - drivers/gpu/drm/i915/display/intel_dsi.c | 2 +- .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 9 +- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 56 +-- drivers/gpu/drm/i915/display/intel_lvds.c | 6 +- drivers/gpu/drm/i915/display/intel_panel.c | 13 +- drivers/gpu/drm/i915/display/intel_pps.c | 70 +++- drivers/gpu/drm/i915/display/intel_psr.c | 35 +- drivers/gpu/drm/i915/display/intel_sdvo.c | 3 + drivers/gpu/drm/i915/display/vlv_dsi.c | 21 +- drivers/gpu/drm/i915/gem/i915_gem_context.c | 8 +- drivers/gpu/drm/i915/i915_drv.h | 63 ---- drivers/gpu/drm/i915/i915_gem.c | 3 +- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 2 +- drivers/gpu/drm/mediatek/mtk_dsi.c | 24 +- drivers/gpu/drm/panel/panel-simple.c | 2 +- drivers/gpu/drm/rockchip/cdn-dp-core.c | 5 +- drivers/hv/vmbus_drv.c | 10 +- drivers/i2c/busses/i2c-imx.c | 2 +- drivers/i2c/busses/i2c-mlxbf.c | 68 ++-- drivers/i2c/i2c-mux.c | 5 +- drivers/iommu/intel/iommu.c | 2 +- drivers/media/usb/b2c2/flexcop-usb.c | 2 +- drivers/memstick/core/ms_block.c | 1 - drivers/memstick/core/mspro_block.c | 1 - drivers/mmc/core/block.c | 1 - drivers/mmc/core/queue.c | 1 - drivers/net/bonding/bond_3ad.c | 5 +- drivers/net/bonding/bond_main.c | 72 ++-- drivers/net/can/flexcan/flexcan-core.c | 10 +- drivers/net/can/usb/gs_usb.c | 4 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 10 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 4 +- drivers/net/ethernet/freescale/enetc/Makefile | 1 - drivers/net/ethernet/freescale/enetc/enetc.c | 53 +-- drivers/net/ethernet/freescale/enetc/enetc.h | 12 +- drivers/net/ethernet/freescale/enetc/enetc_pf.c | 32 +- drivers/net/ethernet/freescale/enetc/enetc_qos.c | 23 ++ drivers/net/ethernet/freescale/enetc/enetc_vf.c | 17 +- drivers/net/ethernet/google/gve/gve_rx_dqo.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 32 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 20 + drivers/net/ethernet/intel/iavf/iavf_txrx.c | 9 +- drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 7 +- drivers/net/ethernet/intel/ice/ice_lib.c | 42 ++- drivers/net/ethernet/intel/ice/ice_main.c | 25 +- drivers/net/ethernet/intel/ice/ice_txrx.c | 5 +- .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c | 6 + drivers/net/ethernet/microsoft/mana/gdma_main.c | 10 + drivers/net/ethernet/renesas/ravb_main.c | 2 + drivers/net/ethernet/renesas/sh_eth.c | 2 + drivers/net/ethernet/sfc/efx_channels.c | 2 +- drivers/net/ethernet/sfc/siena/efx_channels.c | 2 +- drivers/net/ethernet/sfc/siena/tx.c | 2 +- drivers/net/ethernet/sfc/tx.c | 2 +- drivers/net/ethernet/sun/sunhme.c | 4 +- drivers/net/ipa/ipa_qmi.c | 8 +- drivers/net/ipa/ipa_qmi_msg.c | 8 +- drivers/net/ipa/ipa_qmi_msg.h | 37 +- drivers/net/ipa/ipa_table.c | 2 - drivers/net/ipa/ipa_table.h | 3 + drivers/net/ipvlan/ipvlan_core.c | 6 +- drivers/net/mdio/of_mdio.c | 1 + drivers/net/netdevsim/hwstats.c | 6 +- drivers/net/phy/aquantia_main.c | 53 ++- drivers/net/phy/micrel.c | 18 +- drivers/net/team/team.c | 24 +- drivers/net/wireguard/netlink.c | 13 +- drivers/net/wireguard/selftest/ratelimiter.c | 25 +- drivers/net/wireless/intel/iwlwifi/Kconfig | 1 + drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 2 +- drivers/nvdimm/pmem.c | 6 +- drivers/nvme/host/apple.c | 2 +- drivers/nvme/host/core.c | 1 - drivers/nvme/host/fc.c | 12 +- drivers/nvme/host/pci.c | 2 +- drivers/nvme/host/rdma.c | 12 +- drivers/nvme/host/tcp.c | 12 +- drivers/nvme/target/loop.c | 12 +- drivers/perf/arm-cmn.c | 2 +- drivers/phy/marvell/phy-mvebu-a3700-comphy.c | 87 +---- drivers/s390/block/dasd.c | 2 +- drivers/s390/block/dasd_alias.c | 9 +- drivers/s390/block/dasd_genhd.c | 4 +- drivers/scsi/hosts.c | 16 +- drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +- drivers/scsi/qla2xxx/qla_target.c | 4 +- drivers/scsi/scsi_lib.c | 12 +- drivers/scsi/scsi_priv.h | 2 +- drivers/scsi/scsi_scan.c | 1 + drivers/scsi/scsi_sysfs.c | 3 +- drivers/scsi/sd.c | 4 +- drivers/scsi/sr.c | 4 +- drivers/thunderbolt/icm.c | 1 + drivers/thunderbolt/nhi.h | 1 + drivers/tty/serial/fsl_lpuart.c | 9 +- drivers/tty/serial/serial-tegra.c | 5 +- drivers/tty/serial/tegra-tcu.c | 2 +- drivers/ufs/core/ufshcd.c | 4 +- drivers/usb/core/hub.c | 2 +- drivers/usb/dwc3/core.c | 13 +- drivers/usb/serial/option.c | 6 + drivers/xen/xenbus/xenbus_client.c | 9 +- fs/btrfs/disk-io.c | 42 ++- fs/btrfs/zoned.c | 40 +- fs/cifs/cifsfs.c | 6 + fs/cifs/smb2ops.c | 69 ++-- fs/dax.c | 3 + fs/exfat/fatent.c | 3 +- fs/ext4/ext4.h | 10 +- fs/ext4/extents.c | 4 + fs/ext4/ialloc.c | 2 +- fs/ext4/mballoc.c | 318 +++++++--------- fs/ext4/mballoc.h | 1 - include/asm-generic/vmlinux.lds.h | 3 +- include/linux/blk-mq.h | 3 + include/linux/blkdev.h | 6 +- include/linux/cpumask.h | 5 +- include/linux/serial_core.h | 17 + include/net/bond_3ad.h | 2 - include/net/bonding.h | 3 + include/scsi/scsi_host.h | 2 + include/uapi/linux/xfrm.h | 2 +- io_uring/io_uring.c | 3 + kernel/cgroup/cgroup.c | 5 +- kernel/workqueue.c | 6 +- lib/Kconfig.debug | 4 +- mm/slab_common.c | 5 +- mm/slub.c | 18 +- net/batman-adv/hard-interface.c | 4 + net/bridge/netfilter/ebtables.c | 4 +- net/core/flow_dissector.c | 5 +- net/ipv6/af_inet6.c | 4 +- net/netfilter/nf_conntrack_ftp.c | 6 +- net/netfilter/nf_conntrack_irc.c | 34 +- net/netfilter/nf_conntrack_sip.c | 4 +- net/netfilter/nf_tables_api.c | 8 +- net/netfilter/nfnetlink_osf.c | 4 +- net/sched/cls_api.c | 1 + net/sched/sch_taprio.c | 18 +- net/smc/smc_core.c | 5 +- scripts/Makefile.debug | 21 +- sound/core/init.c | 10 +- sound/pci/hda/hda_bind.c | 4 +- sound/pci/hda/hda_intel.c | 2 + sound/pci/hda/patch_hdmi.c | 24 +- sound/pci/hda/patch_realtek.c | 33 +- sound/usb/endpoint.c | 23 +- sound/usb/endpoint.h | 6 +- sound/usb/pcm.c | 14 +- tools/lib/perf/evlist.c | 5 +- tools/perf/util/bpf_counter_cgroup.c | 4 +- tools/perf/util/bpf_skel/bperf_cgroup.bpf.c | 2 +- tools/perf/util/genelf.c | 14 + tools/perf/util/genelf.h | 4 + tools/perf/util/symbol-elf.c | 7 +- tools/perf/util/synthetic-events.c | 17 +- tools/testing/selftests/net/forwarding/sch_red.sh | 1 + 241 files changed, 2013 insertions(+), 1656 deletions(-)

2 years, 2 months

14
227
0 0

RE: [PATCH net] hv_netvsc: Fix race between VF offering and VF association message from host

by Haiyang Zhang

> -----Original Message----- > From: Gaurav Kohli <gauravkohli(a)linux.microsoft.com> > Sent: Wednesday, September 28, 2022 9:49 AM > To: KY Srinivasan <kys(a)microsoft.com>; Haiyang Zhang > <haiyangz(a)microsoft.com>; Stephen Hemminger > <sthemmin(a)microsoft.com>; wei.liu(a)kernel.org; Dexuan Cui > <decui(a)microsoft.com>; linux-hyperv(a)vger.kernel.org; > netdev(a)vger.kernel.org > Subject: [PATCH net] hv_netvsc: Fix race between VF offering and VF > association message from host > > During vm boot, there might be possibility that vf registration > call comes before the vf association from host to vm. > > And this might break netvsc vf path, To prevent the same block > vf registration until vf bind message comes from host. > > Cc: stable(a)vger.kernel.org > Fixes: 00d7ddba11436 ("hv_netvsc: pair VF based on serial number") > Signed-off-by: Gaurav Kohli <gauravkohli(a)linux.microsoft.com> Reviewed-by: Haiyang Zhang <haiyangz(a)microsoft.com> By the way, did you use "git send-email"? I didn't see the stable(a)vger.kernel.org cc-ed in your original email.

2 years, 2 months

1
0
0 0

[PATCH v2] nvme-pci: Set min align mask before calculating max_hw_sectors

by Rishabh Bhatnagar

In cases where swiotlb is enabled dma_max_mapping_size takes into account the min align mask for the device. Right now the mask is set after the max hw sectors are calculated which might result in a request size that overflows the swiotlb buffer. Set the min align mask for nvme driver before calling dma_max_mapping_size while calculating max hw sectors. Fixes: 7637de311bd2 ("nvme-pci: limit max_hw_sectors based on the DMA max mapping size") Cc: stable(a)vger.kernel.org Signed-off-by: Rishabh Bhatnagar <risbhat(a)amazon.com> --- Changes in V2: - Add Cc: <stable(a)vger.kernel.org> tag - Improve the commit text - Add patch version Changes in V1: - Add fixes tag drivers/nvme/host/pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 98864b853eef..30e71e41a0a2 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2834,6 +2834,8 @@ static void nvme_reset_work(struct work_struct *work) nvme_start_admin_queue(&dev->ctrl); } + dma_set_min_align_mask(dev->dev, NVME_CTRL_PAGE_SIZE - 1); + /* * Limit the max command size to prevent iod->sg allocations going * over a single page. @@ -2846,7 +2848,6 @@ static void nvme_reset_work(struct work_struct *work) * Don't limit the IOMMU merged segment size. */ dma_set_max_seg_size(dev->dev, 0xffffffff); - dma_set_min_align_mask(dev->dev, NVME_CTRL_PAGE_SIZE - 1); mutex_unlock(&dev->shutdown_lock); -- 2.37.1

2 years, 2 months

1
0
0 0

[PATCH] dmaengine: qcom-adm: fix wrong calling convention for prep_slave_sg

by Christian Marangi

The calling convention for pre_slave_sg is to return NULL on error and provide an error log to the system. Qcom-adm instead provide error pointer when an error occur. This indirectly cause kernel panic for example for the nandc driver that checks only if the pointer returned by device_prep_slave_sg is not NULL. Returning an error pointer makes nandc think the device_prep_slave_sg function correctly completed and makes the kernel panics later in the code. While nandc is the one that makes the kernel crash, it was pointed out that the real problem is qcom-adm not following calling convention for that function. To fix this, drop returning error pointer and return NULL with an error log. Fixes: 03de6b273805 ("dmaengine: qcom-adm: stop abusing slave_id config") Fixes: 5c9f8c2dbdbe ("dmaengine: qcom: Add ADM driver") Signed-off-by: Christian Marangi <ansuelsmth(a)gmail.com> Cc: stable(a)vger.kernel.org # v5.11+ --- drivers/dma/qcom/qcom_adm.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/dma/qcom/qcom_adm.c b/drivers/dma/qcom/qcom_adm.c index facdacf8aede..cd3f12cf4721 100644 --- a/drivers/dma/qcom/qcom_adm.c +++ b/drivers/dma/qcom/qcom_adm.c @@ -379,13 +379,13 @@ static struct dma_async_tx_descriptor *adm_prep_slave_sg(struct dma_chan *chan, if (blk_size < 0) { dev_err(adev->dev, "invalid burst value: %d\n", burst); - return ERR_PTR(-EINVAL); + return NULL; } crci = achan->crci & 0xf; if (!crci || achan->crci > 0x1f) { dev_err(adev->dev, "invalid crci value\n"); - return ERR_PTR(-EINVAL); + return NULL; } } @@ -403,8 +403,10 @@ static struct dma_async_tx_descriptor *adm_prep_slave_sg(struct dma_chan *chan, } async_desc = kzalloc(sizeof(*async_desc), GFP_NOWAIT); - if (!async_desc) - return ERR_PTR(-ENOMEM); + if (!async_desc) { + dev_err(adev->dev, "not enough memory for async_desc struct\n"); + return NULL; + } async_desc->mux = achan->mux ? ADM_CRCI_CTL_MUX_SEL : 0; async_desc->crci = crci; @@ -414,8 +416,10 @@ static struct dma_async_tx_descriptor *adm_prep_slave_sg(struct dma_chan *chan, sizeof(*cple) + 2 * ADM_DESC_ALIGN; async_desc->cpl = kzalloc(async_desc->dma_len, GFP_NOWAIT); - if (!async_desc->cpl) + if (!async_desc->cpl) { + dev_err(adev->dev, "not enough memory for cpl struct\n"); goto free; + } async_desc->adev = adev; @@ -437,8 +441,10 @@ static struct dma_async_tx_descriptor *adm_prep_slave_sg(struct dma_chan *chan, async_desc->dma_addr = dma_map_single(adev->dev, async_desc->cpl, async_desc->dma_len, DMA_TO_DEVICE); - if (dma_mapping_error(adev->dev, async_desc->dma_addr)) + if (dma_mapping_error(adev->dev, async_desc->dma_addr)) { + dev_err(adev->dev, "dma mapping error for cpl\n"); goto free; + } cple_addr = async_desc->dma_addr + ((void *)cple - async_desc->cpl); @@ -454,7 +460,7 @@ static struct dma_async_tx_descriptor *adm_prep_slave_sg(struct dma_chan *chan, free: kfree(async_desc); - return ERR_PTR(-ENOMEM); + return NULL; } /** -- 2.37.2

2 years, 2 months

2
1
0 0

[PATCH] dmaengine: qcom-adm: fix wrong sizeof config in slave_config

by Christian Marangi

Fix broken slave_config function that uncorrectly compare the peripheral_size with the size of the config pointer instead of the size of the config struct. This cause the crci value to be ignored and cause a kernel panic on any slave that use adm driver. To fix this, compare to the size of the struct and NOT the size of the pointer. Fixes: 03de6b273805 ("dmaengine: qcom-adm: stop abusing slave_id config") Signed-off-by: Christian Marangi <ansuelsmth(a)gmail.com> Cc: stable(a)vger.kernel.org # v5.17+ --- drivers/dma/qcom/qcom_adm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma/qcom/qcom_adm.c b/drivers/dma/qcom/qcom_adm.c index facdacf8aede..c77d9de853de 100644 --- a/drivers/dma/qcom/qcom_adm.c +++ b/drivers/dma/qcom/qcom_adm.c @@ -494,7 +494,7 @@ static int adm_slave_config(struct dma_chan *chan, struct dma_slave_config *cfg) spin_lock_irqsave(&achan->vc.lock, flag); memcpy(&achan->slave, cfg, sizeof(struct dma_slave_config)); - if (cfg->peripheral_size == sizeof(config)) + if (cfg->peripheral_size == sizeof(*config)) achan->crci = config->crci; spin_unlock_irqrestore(&achan->vc.lock, flag); -- 2.37.2

2 years, 2 months

4
3
0 0

[PATCH] ASoC: wcd-mbhc-v2: Revert "ASoC: wcd-mbhc-v2: use pm_runtime_resume_and_get()"

by Krzysztof Kozlowski

This reverts commit ddea4bbf287b6028eaa15a185d0693856956ecf2 ("ASoC: wcd-mbhc-v2: use pm_runtime_resume_and_get()"), because it introduced double runtime PM put if pm_runtime_get_sync() returns -EACCES: wcd934x-codec wcd934x-codec.3.auto: WCD934X Minor:0x1 Version:0x401 wcd934x-codec wcd934x-codec.3.auto: Runtime PM usage count underflow! The commit claimed no changes in functionality except dropping the reference on -EACCESS. This is exactly the change introducing bug because function calls unconditionally pm_runtime_put_autosuspend() at the end. Cc: Bard Liao <yung-chuan.liao(a)linux.intel.com> Cc: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Cc: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Cc: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Cc: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Cc: Cezary Rojewski <cezary.rojewski(a)intel.com> Cc: <stable(a)vger.kernel.org> Fixes: ddea4bbf287b ("ASoC: wcd-mbhc-v2: use pm_runtime_resume_and_get()") Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- sound/soc/codecs/wcd-mbhc-v2.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/wcd-mbhc-v2.c b/sound/soc/codecs/wcd-mbhc-v2.c index b16a18dbfe7a..1911750f7445 100644 --- a/sound/soc/codecs/wcd-mbhc-v2.c +++ b/sound/soc/codecs/wcd-mbhc-v2.c @@ -714,11 +714,12 @@ static int wcd_mbhc_initialise(struct wcd_mbhc *mbhc) struct snd_soc_component *component = mbhc->component; int ret; - ret = pm_runtime_resume_and_get(component->dev); + ret = pm_runtime_get_sync(component->dev); if (ret < 0 && ret != -EACCES) { dev_err_ratelimited(component->dev, - "pm_runtime_resume_and_get failed in %s, ret %d\n", + "pm_runtime_get_sync failed in %s, ret %d\n", __func__, ret); + pm_runtime_put_noidle(component->dev); return ret; } @@ -1096,11 +1097,12 @@ static void wcd_correct_swch_plug(struct work_struct *work) mbhc = container_of(work, struct wcd_mbhc, correct_plug_swch); component = mbhc->component; - ret = pm_runtime_resume_and_get(component->dev); + ret = pm_runtime_get_sync(component->dev); if (ret < 0 && ret != -EACCES) { dev_err_ratelimited(component->dev, - "pm_runtime_resume_and_get failed in %s, ret %d\n", + "pm_runtime_get_sync failed in %s, ret %d\n", __func__, ret); + pm_runtime_put_noidle(component->dev); return; } micbias_mv = wcd_mbhc_get_micbias(mbhc); -- 2.34.1

2 years, 2 months

2
4
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror September 2022