[merged] kunit-overflow-fix-ub-in-overflow_allocation_test.patch removed from -mm tree
by Andrew Morton
The quilt patch titled
Subject: kunit/overflow: fix UB in overflow_allocation_test
has been removed from the -mm tree. Its filename was
kunit-overflow-fix-ub-in-overflow_allocation_test.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Ivan Orlov <ivan.orlov0322(a)gmail.com>
Subject: kunit/overflow: fix UB in overflow_allocation_test
Date: Thu, 15 Aug 2024 01:04:31 +0100
The 'device_name' array doesn't exist out of the
'overflow_allocation_test' function scope. However, it is being used
as a driver name when calling 'kunit_driver_create' from
'kunit_device_register'. It produces the kernel panic with KASAN
enabled due to undefined behaviour.
Since this variable is used in one place only, remove it and pass the
device name into kunit_device_register directly as an ascii string.
Link: https://lkml.kernel.org/r/20240815000431.401869-1-ivan.orlov0322@gmail.com
Fixes: ca90800a91ba ("test_overflow: Add memory allocation overflow tests")
Signed-off-by: Ivan Orlov <ivan.orlov0322(a)gmail.com>
Tested-by: Erhard Furtner <erhard_f(a)mailbox.org>
Reviewed-by: David Gow <davidgow(a)google.com>
Cc: Kees Cook <kees(a)kernel.org>
Cc: <stable(a)vger.kernel.org>
Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
---
lib/overflow_kunit.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- a/lib/overflow_kunit.c~kunit-overflow-fix-ub-in-overflow_allocation_test
+++ a/lib/overflow_kunit.c
@@ -668,7 +668,6 @@ DEFINE_TEST_ALLOC(devm_kzalloc, devm_kf
static void overflow_allocation_test(struct kunit *test)
{
- const char device_name[] = "overflow-test";
struct device *dev;
int count = 0;
@@ -678,7 +677,7 @@ static void overflow_allocation_test(str
} while (0)
/* Create dummy device for devm_kmalloc()-family tests. */
- dev = kunit_device_register(test, device_name);
+ dev = kunit_device_register(test, "overflow-test");
KUNIT_ASSERT_FALSE_MSG(test, IS_ERR(dev),
"Cannot register test device\n");
_
Patches currently in -mm which might be from ivan.orlov0322(a)gmail.com are
1 year, 4 months
- 1
- 0
[PATCH net-next v2 7/9] idpf: fix netdev Tx queue stop/wake
by Tony Nguyen
From: Michal Kubiak <michal.kubiak(a)intel.com>
netif_txq_maybe_stop() returns -1, 0, or 1, while
idpf_tx_maybe_stop_common() says it returns 0 or -EBUSY. As a result,
there sometimes are Tx queue timeout warnings despite that the queue
is empty or there is at least enough space to restart it.
Make idpf_tx_maybe_stop_common() inline and returning true or false,
handling the return of netif_txq_maybe_stop() properly. Use a correct
goto in idpf_tx_maybe_stop_splitq() to avoid stopping the queue or
incrementing the stops counter twice.
Fixes: 6818c4d5b3c2 ("idpf: add splitq start_xmit")
Fixes: a5ab9ee0df0b ("idpf: add singleq start_xmit and napi poll")
Cc: stable(a)vger.kernel.org # 6.7+
Signed-off-by: Michal Kubiak <michal.kubiak(a)intel.com>
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel(a)intel.com>
Signed-off-by: Alexander Lobakin <aleksander.lobakin(a)intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen(a)intel.com>
---
.../ethernet/intel/idpf/idpf_singleq_txrx.c | 4 +++
drivers/net/ethernet/intel/idpf/idpf_txrx.c | 35 +++++--------------
drivers/net/ethernet/intel/idpf/idpf_txrx.h | 9 ++++-
3 files changed, 21 insertions(+), 27 deletions(-)
diff --git a/drivers/net/ethernet/intel/idpf/idpf_singleq_txrx.c b/drivers/net/ethernet/intel/idpf/idpf_singleq_txrx.c
index 947d3ff9677c..5ba360abbe66 100644
--- a/drivers/net/ethernet/intel/idpf/idpf_singleq_txrx.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_singleq_txrx.c
@@ -375,6 +375,10 @@ netdev_tx_t idpf_tx_singleq_frame(struct sk_buff *skb,
IDPF_TX_DESCS_FOR_CTX)) {
idpf_tx_buf_hw_update(tx_q, tx_q->next_to_use, false);
+ u64_stats_update_begin(&tx_q->stats_sync);
+ u64_stats_inc(&tx_q->q_stats.q_busy);
+ u64_stats_update_end(&tx_q->stats_sync);
+
return NETDEV_TX_BUSY;
}
diff --git a/drivers/net/ethernet/intel/idpf/idpf_txrx.c b/drivers/net/ethernet/intel/idpf/idpf_txrx.c
index c1df4341e9ab..60f875decd8a 100644
--- a/drivers/net/ethernet/intel/idpf/idpf_txrx.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_txrx.c
@@ -2128,29 +2128,6 @@ void idpf_tx_splitq_build_flow_desc(union idpf_tx_flex_desc *desc,
desc->flow.qw1.compl_tag = cpu_to_le16(params->compl_tag);
}
-/**
- * idpf_tx_maybe_stop_common - 1st level check for common Tx stop conditions
- * @tx_q: the queue to be checked
- * @size: number of descriptors we want to assure is available
- *
- * Returns 0 if stop is not needed
- */
-int idpf_tx_maybe_stop_common(struct idpf_tx_queue *tx_q, unsigned int size)
-{
- struct netdev_queue *nq;
-
- if (likely(IDPF_DESC_UNUSED(tx_q) >= size))
- return 0;
-
- u64_stats_update_begin(&tx_q->stats_sync);
- u64_stats_inc(&tx_q->q_stats.q_busy);
- u64_stats_update_end(&tx_q->stats_sync);
-
- nq = netdev_get_tx_queue(tx_q->netdev, tx_q->idx);
-
- return netif_txq_maybe_stop(nq, IDPF_DESC_UNUSED(tx_q), size, size);
-}
-
/**
* idpf_tx_maybe_stop_splitq - 1st level check for Tx splitq stop conditions
* @tx_q: the queue to be checked
@@ -2162,7 +2139,7 @@ static int idpf_tx_maybe_stop_splitq(struct idpf_tx_queue *tx_q,
unsigned int descs_needed)
{
if (idpf_tx_maybe_stop_common(tx_q, descs_needed))
- goto splitq_stop;
+ goto out;
/* If there are too many outstanding completions expected on the
* completion queue, stop the TX queue to give the device some time to
@@ -2181,10 +2158,12 @@ static int idpf_tx_maybe_stop_splitq(struct idpf_tx_queue *tx_q,
return 0;
splitq_stop:
+ netif_stop_subqueue(tx_q->netdev, tx_q->idx);
+
+out:
u64_stats_update_begin(&tx_q->stats_sync);
u64_stats_inc(&tx_q->q_stats.q_busy);
u64_stats_update_end(&tx_q->stats_sync);
- netif_stop_subqueue(tx_q->netdev, tx_q->idx);
return -EBUSY;
}
@@ -2207,7 +2186,11 @@ void idpf_tx_buf_hw_update(struct idpf_tx_queue *tx_q, u32 val,
nq = netdev_get_tx_queue(tx_q->netdev, tx_q->idx);
tx_q->next_to_use = val;
- idpf_tx_maybe_stop_common(tx_q, IDPF_TX_DESC_NEEDED);
+ if (idpf_tx_maybe_stop_common(tx_q, IDPF_TX_DESC_NEEDED)) {
+ u64_stats_update_begin(&tx_q->stats_sync);
+ u64_stats_inc(&tx_q->q_stats.q_busy);
+ u64_stats_update_end(&tx_q->stats_sync);
+ }
/* Force memory writes to complete before letting h/w
* know there are new descriptors to fetch. (Only
diff --git a/drivers/net/ethernet/intel/idpf/idpf_txrx.h b/drivers/net/ethernet/intel/idpf/idpf_txrx.h
index 2478f71adb95..df3574ac58c2 100644
--- a/drivers/net/ethernet/intel/idpf/idpf_txrx.h
+++ b/drivers/net/ethernet/intel/idpf/idpf_txrx.h
@@ -1020,7 +1020,6 @@ void idpf_tx_dma_map_error(struct idpf_tx_queue *txq, struct sk_buff *skb,
struct idpf_tx_buf *first, u16 ring_idx);
unsigned int idpf_tx_desc_count_required(struct idpf_tx_queue *txq,
struct sk_buff *skb);
-int idpf_tx_maybe_stop_common(struct idpf_tx_queue *tx_q, unsigned int size);
void idpf_tx_timeout(struct net_device *netdev, unsigned int txqueue);
netdev_tx_t idpf_tx_singleq_frame(struct sk_buff *skb,
struct idpf_tx_queue *tx_q);
@@ -1029,4 +1028,12 @@ bool idpf_rx_singleq_buf_hw_alloc_all(struct idpf_rx_queue *rxq,
u16 cleaned_count);
int idpf_tso(struct sk_buff *skb, struct idpf_tx_offload_params *off);
+static inline bool idpf_tx_maybe_stop_common(struct idpf_tx_queue *tx_q,
+ u32 needed)
+{
+ return !netif_subqueue_maybe_stop(tx_q->netdev, tx_q->idx,
+ IDPF_DESC_UNUSED(tx_q),
+ needed, needed);
+}
+
#endif /* !_IDPF_TXRX_H_ */
--
2.42.0
1 year, 4 months
- 1
- 0
[PATCH v8 2/6] RISC-V: Scalar unaligned access emulated on hotplug CPUs
by Jesse Taube
The check_unaligned_access_emulated() function should have been called
during CPU hotplug to ensure that if all CPUs had emulated unaligned
accesses, the new CPU also does.
This patch adds the call to check_unaligned_access_emulated() in
the hotplug path.
Fixes: 55e0bf49a0d0 ("RISC-V: Probe misaligned access speed in parallel")
Signed-off-by: Jesse Taube <jesse(a)rivosinc.com>
Reviewed-by: Evan Green <evan(a)rivosinc.com>
Cc: stable(a)vger.kernel.org
---
V5 -> V6:
- New patch
V6 -> V7:
- No changes
V7 -> V8:
- Rebase onto fixes
---
arch/riscv/kernel/unaligned_access_speed.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/riscv/kernel/unaligned_access_speed.c b/arch/riscv/kernel/unaligned_access_speed.c
index 160628a2116d..f3508cc54f91 100644
--- a/arch/riscv/kernel/unaligned_access_speed.c
+++ b/arch/riscv/kernel/unaligned_access_speed.c
@@ -191,6 +191,7 @@ static int riscv_online_cpu(unsigned int cpu)
if (per_cpu(misaligned_access_speed, cpu) != RISCV_HWPROBE_MISALIGNED_SCALAR_UNKNOWN)
goto exit;
+ check_unaligned_access_emulated(NULL);
buf = alloc_pages(GFP_KERNEL, MISALIGNED_BUFFER_ORDER);
if (!buf) {
pr_warn("Allocation failure, not measuring misaligned performance\n");
--
2.45.2
1 year, 4 months
- 1
- 0
[PATCH v8 1/6] RISC-V: Check scalar unaligned access on all CPUs
by Jesse Taube
Originally, the check_unaligned_access_emulated_all_cpus function
only checked the boot hart. This fixes the function to check all
harts.
Fixes: 71c54b3d169d ("riscv: report misaligned accesses emulation to hwprobe")
Signed-off-by: Jesse Taube <jesse(a)rivosinc.com>
Reviewed-by: Charlie Jenkins <charlie(a)rivosinc.com>
Reviewed-by: Evan Green <evan(a)rivosinc.com>
Cc: stable(a)vger.kernel.org
---
V1 -> V2:
- New patch
V2 -> V3:
- Split patch
V3 -> V4:
- Re-add check for a system where a heterogeneous
CPU is hotplugged into a previously homogenous
system.
V4 -> V5:
- Change work_struct *unused to work_struct *work __always_unused
V5 -> V6:
- Change check_unaligned_access_emulated to extern
V6 -> V7:
- No changes
V7 -> V8:
- Rebase onto fixes
---
arch/riscv/include/asm/cpufeature.h | 2 ++
arch/riscv/kernel/traps_misaligned.c | 14 +++++++-------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/arch/riscv/include/asm/cpufeature.h b/arch/riscv/include/asm/cpufeature.h
index 45f9c1171a48..dfa5cdddd367 100644
--- a/arch/riscv/include/asm/cpufeature.h
+++ b/arch/riscv/include/asm/cpufeature.h
@@ -8,6 +8,7 @@
#include <linux/bitmap.h>
#include <linux/jump_label.h>
+#include <linux/workqueue.h>
#include <asm/hwcap.h>
#include <asm/alternative-macros.h>
#include <asm/errno.h>
@@ -60,6 +61,7 @@ void riscv_user_isa_enable(void);
#if defined(CONFIG_RISCV_MISALIGNED)
bool check_unaligned_access_emulated_all_cpus(void);
+void check_unaligned_access_emulated(struct work_struct *work __always_unused);
void unaligned_emulation_finish(void);
bool unaligned_ctl_available(void);
DECLARE_PER_CPU(long, misaligned_access_speed);
diff --git a/arch/riscv/kernel/traps_misaligned.c b/arch/riscv/kernel/traps_misaligned.c
index 192cd5603e95..1ad981b2c7a3 100644
--- a/arch/riscv/kernel/traps_misaligned.c
+++ b/arch/riscv/kernel/traps_misaligned.c
@@ -526,11 +526,11 @@ int handle_misaligned_store(struct pt_regs *regs)
return 0;
}
-static bool check_unaligned_access_emulated(int cpu)
+void check_unaligned_access_emulated(struct work_struct *work __always_unused)
{
+ int cpu = smp_processor_id();
long *mas_ptr = per_cpu_ptr(&misaligned_access_speed, cpu);
unsigned long tmp_var, tmp_val;
- bool misaligned_emu_detected;
*mas_ptr = RISCV_HWPROBE_MISALIGNED_SCALAR_UNKNOWN;
@@ -538,19 +538,16 @@ static bool check_unaligned_access_emulated(int cpu)
" "REG_L" %[tmp], 1(%[ptr])\n"
: [tmp] "=r" (tmp_val) : [ptr] "r" (&tmp_var) : "memory");
- misaligned_emu_detected = (*mas_ptr == RISCV_HWPROBE_MISALIGNED_SCALAR_EMULATED);
/*
* If unaligned_ctl is already set, this means that we detected that all
* CPUS uses emulated misaligned access at boot time. If that changed
* when hotplugging the new cpu, this is something we don't handle.
*/
- if (unlikely(unaligned_ctl && !misaligned_emu_detected)) {
+ if (unlikely(unaligned_ctl && (*mas_ptr != RISCV_HWPROBE_MISALIGNED_SCALAR_EMULATED))) {
pr_crit("CPU misaligned accesses non homogeneous (expected all emulated)\n");
while (true)
cpu_relax();
}
-
- return misaligned_emu_detected;
}
bool check_unaligned_access_emulated_all_cpus(void)
@@ -562,8 +559,11 @@ bool check_unaligned_access_emulated_all_cpus(void)
* accesses emulated since tasks requesting such control can run on any
* CPU.
*/
+ schedule_on_each_cpu(check_unaligned_access_emulated);
+
for_each_online_cpu(cpu)
- if (!check_unaligned_access_emulated(cpu))
+ if (per_cpu(misaligned_access_speed, cpu)
+ != RISCV_HWPROBE_MISALIGNED_SCALAR_EMULATED)
return false;
unaligned_ctl = true;
--
2.45.2
1 year, 4 months
- 1
- 0
[REGRESSION][BISECTED][STABLE] hdparm errors since 28ab9769117c
by Christian Heusel
Hello Igor, hello Niklas,
on my NAS I am encountering the following issue since v6.6.44 (LTS),
when executing the hdparm command for my WD-WCC7K4NLX884 drives to get
the active or standby state:
$ hdparm -C /dev/sda
/dev/sda:
SG_IO: bad/missing sense data, sb[]: f0 00 01 00 50 40 ff 0a 00 00 78 00 00 1d 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
drive state is: unknown
While the expected output is the following:
$ hdparm -C /dev/sda
/dev/sda:
drive state is: active/idle
I did a bisection within the stable series and found the following
commit to be the first bad one:
28ab9769117c ("ata: libata-scsi: Honor the D_SENSE bit for CK_COND=1 and no error")
According to kernel.dance the same commit was also backported to the
v6.10.3 and v6.1.103 stable kernels and I could not find any commit or
pending patch with a "Fixes:" tag for the offending commit.
So far I have not been able to test with the mainline kernel as this is
a remote device which I couldn't rescue in case of a boot failure. Also
just for transparency it does have the out of tree ZFS module loaded,
but AFAIU this shouldn't be an issue here, as the commit seems clearly
related to the error. If needed I can test with an untainted mainline
kernel on Friday when I'm near the device.
I have attached the output of hdparm -I below and would be happy to
provide further debug information or test patches.
Cheers,
Christian
---
#regzbot introduced: 28ab9769117c
#regzbot title: ata: libata-scsi: Sense data errors breaking hdparm with WD drives
---
$ pacman -Q hdparm
hdparm 9.65-2
$ hdparm -I /dev/sda
/dev/sda:
ATA device, with non-removable media
Model Number: WDC WD40EFRX-68N32N0
Serial Number: WD-WCC7K4NLX884
Firmware Revision: 82.00A82
Transport: Serial, SATA 1.0a, SATA II Extensions, SATA Rev 2.5, SATA Rev 2.6, SATA Rev 3.0
Standards:
Used: unknown (minor revision code 0x006d)
Supported: 10 9 8 7 6 5
Likely used: 10
Configuration:
Logical max current
cylinders 16383 0
heads 16 0
sectors/track 63 0
--
LBA user addressable sectors: 268435455
LBA48 user addressable sectors: 7814037168
Logical Sector size: 512 bytes
Physical Sector size: 4096 bytes
Logical Sector-0 offset: 0 bytes
device size with M = 1024*1024: 3815447 MBytes
device size with M = 1000*1000: 4000787 MBytes (4000 GB)
cache/buffer size = unknown
Form Factor: 3.5 inch
Nominal Media Rotation Rate: 5400
Capabilities:
LBA, IORDY(can be disabled)
Queue depth: 32
Standby timer values: spec'd by Standard, with device specific minimum
R/W multiple sector transfer: Max = 16 Current = 16
DMA: mdma0 mdma1 mdma2 udma0 udma1 udma2 udma3 udma4 udma5 *udma6
Cycle time: min=120ns recommended=120ns
PIO: pio0 pio1 pio2 pio3 pio4
Cycle time: no flow control=120ns IORDY flow control=120ns
Commands/features:
Enabled Supported:
* SMART feature set
Security Mode feature set
* Power Management feature set
* Write cache
* Look-ahead
* Host Protected Area feature set
* WRITE_BUFFER command
* READ_BUFFER command
* NOP cmd
* DOWNLOAD_MICROCODE
Power-Up In Standby feature set
* SET_FEATURES required to spinup after power up
SET_MAX security extension
* 48-bit Address feature set
* Device Configuration Overlay feature set
* Mandatory FLUSH_CACHE
* FLUSH_CACHE_EXT
* SMART error logging
* SMART self-test
* General Purpose Logging feature set
* 64-bit World wide name
* IDLE_IMMEDIATE with UNLOAD
* WRITE_UNCORRECTABLE_EXT command
* {READ,WRITE}_DMA_EXT_GPL commands
* Segmented DOWNLOAD_MICROCODE
* Gen1 signaling speed (1.5Gb/s)
* Gen2 signaling speed (3.0Gb/s)
* Gen3 signaling speed (6.0Gb/s)
* Native Command Queueing (NCQ)
* Host-initiated interface power management
* Phy event counters
* Idle-Unload when NCQ is active
* NCQ priority information
* READ_LOG_DMA_EXT equivalent to READ_LOG_EXT
* DMA Setup Auto-Activate optimization
* Device-initiated interface power management
* Software settings preservation
* SMART Command Transport (SCT) feature set
* SCT Write Same (AC2)
* SCT Error Recovery Control (AC3)
* SCT Features Control (AC4)
* SCT Data Tables (AC5)
unknown 206[12] (vendor specific)
unknown 206[13] (vendor specific)
* DOWNLOAD MICROCODE DMA command
* WRITE BUFFER DMA command
* READ BUFFER DMA command
Security:
Master password revision code = 65534
supported
not enabled
not locked
frozen
not expired: security count
supported: enhanced erase
504min for SECURITY ERASE UNIT. 504min for ENHANCED SECURITY ERASE UNIT.
Logical Unit WWN Device Identifier: 50014ee2647735a1
NAA : 5
IEEE OUI : 0014ee
Unique ID : 2647735a1
Checksum: correct
1 year, 4 months
- 5
- 9
[PATCH 3/3] drm/vmwgfx: Disable coherent dumb buffers without 3d
by Zack Rusin
Coherent surfaces make only sense if the host renders to them using
accelerated apis. Without 3d the entire content of dumb buffers stays
in the guest making all of the extra work they're doing to synchronize
between guest and host useless.
Configurations without 3d also tend to run with very low graphics
memory limits. The pinned console fb, mob cursors and graphical login
manager tend to run out of 16MB graphics memory that those guests use.
Fix it by making sure the coherent dumb buffers are only used on
configs with 3d enabled.
Signed-off-by: Zack Rusin <zack.rusin(a)broadcom.com>
Fixes: d6667f0ddf46 ("drm/vmwgfx: Fix handling of dumb buffers")
Reported-by: Christian Heusel <christian(a)heusel.eu>
Closes: https://lore.kernel.org/all/0d0330f3-2ac0-4cd5-8075-7f1cbaf72a8e@heusel.eu
Cc: Broadcom internal kernel review list <bcm-kernel-feedback-list(a)broadcom.com>
Cc: dri-devel(a)lists.freedesktop.org
Cc: <stable(a)vger.kernel.org> # v6.9+
Cc: Maaz Mombasawala <maaz.mombasawala(a)broadcom.com>
Cc: Martin Krastev <martin.krastev(a)broadcom.com>
---
drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
index 8ae6a761c900..1625b30d9970 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
@@ -2283,9 +2283,11 @@ int vmw_dumb_create(struct drm_file *file_priv,
/*
* Without mob support we're just going to use raw memory buffer
* because we wouldn't be able to support full surface coherency
- * without mobs
+ * without mobs. There also no reason to support surface coherency
+ * without 3d (i.e. gpu usage on the host) because then all the
+ * contents is going to be rendered guest side.
*/
- if (!dev_priv->has_mob) {
+ if (!dev_priv->has_mob || !vmw_supports_3d(dev_priv)) {
int cpp = DIV_ROUND_UP(args->bpp, 8);
switch (cpp) {
--
2.43.0
1 year, 4 months
- 2
- 1
[PATCH 5.10 000/345] 5.10.224-rc3 review
by Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.224 release.
There are 345 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 Mon, 19 Aug 2024 07:46:32 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.224-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.224-rc3
Sean Young <sean(a)mess.org>
media: Revert "media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()"
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix phy-mode
Eric Dumazet <edumazet(a)google.com>
wifi: cfg80211: restrict NL80211_ATTR_TXQ_QUANTUM values
Jason Wang <jasowang(a)redhat.com>
vhost-vdpa: switch to use vmf_insert_pfn() in the fault handler
Cai Huoqing <caihuoqing(a)baidu.com>
vdpa: Make use of PFN_PHYS/PFN_UP/PFN_DOWN helper macro
WangYuli <wangyuli(a)uniontech.com>
nvme/pci: Add APST quirk for Lenovo N60z laptop
Kees Cook <kees(a)kernel.org>
exec: Fix ToCToU between perm check and set-uid/gid usage
Yunke Cao <yunkec(a)google.com>
media: uvcvideo: Use entity get_cur in uvc_ctrl_set
Amit Daniel Kachhap <amit.kachhap(a)arm.com>
arm64: cpufeature: Fix the visibility of compat hwcaps
Mahesh Salgaonkar <mahesh(a)linux.ibm.com>
powerpc: Avoid nmi_enter/nmi_exit in real mode interrupt.
Andi Shyti <andi.shyti(a)linux.intel.com>
drm/i915/gem: Fix Virtual Memory mapping boundaries calculation
Florian Westphal <fw(a)strlen.de>
netfilter: nf_tables: prefer nft_chain_validate
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: nf_tables: allow clone callbacks to sleep
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: nf_tables: use timestamp to check for set element timeout
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: nf_tables: set element extended ACK reporting support
Lukas Wunner <lukas(a)wunner.de>
PCI/DPC: Fix use-after-free on concurrent DPC and hot-removal
Jari Ruusu <jariruusu(a)protonmail.com>
Fix gcc 4.9 build issue in 5.10.y
Linus Torvalds <torvalds(a)linux-foundation.org>
Add gitignore file for samples/fanotify/ subdirectory
Gabriel Krisman Bertazi <krisman(a)collabora.com>
samples: Make fs-monitor depend on libc and headers
Gabriel Krisman Bertazi <krisman(a)collabora.com>
samples: Add fs error monitoring example
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: pm: fix backup support in signal endpoints
Geliang Tang <geliang.tang(a)suse.com>
mptcp: export local_address
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: mib: count MPJ with backup flag
Paolo Abeni <pabeni(a)redhat.com>
mptcp: fix NL PM announced address accounting
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: distinguish rcv vs sent backup flag in requests
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: sched: check both directions for backup
Thomas Zimmermann <tzimmermann(a)suse.de>
drm/mgag200: Set DDC timeout in milliseconds
Lucas Stach <l.stach(a)pengutronix.de>
drm/bridge: analogix_dp: properly handle zero sized AUX transactions
Andi Kleen <ak(a)linux.intel.com>
x86/mtrr: Check if fixed MTRRs exist before saving them
Waiman Long <longman(a)redhat.com>
padata: Fix possible divide-by-0 panic in padata_mt_helper()
Tze-nan Wu <Tze-nan.Wu(a)mediatek.com>
tracing: Fix overflow in get_free_elt()
Hans de Goede <hdegoede(a)redhat.com>
power: supply: axp288_charger: Round constant_charge_voltage writes down
Hans de Goede <hdegoede(a)redhat.com>
power: supply: axp288_charger: Fix constant_charge_voltage writes
Shay Drory <shayd(a)nvidia.com>
genirq/irqdesc: Honor caller provided affinity in alloc_desc()
Radhey Shyam Pandey <radhey.shyam.pandey(a)amd.com>
irqchip/xilinx: Fix shift out of bounds
George Kennedy <george.kennedy(a)oracle.com>
serial: core: check uartclk for zero to avoid divide by zero
Arseniy Krasnov <avkrasnov(a)salutedevices.com>
irqchip/meson-gpio: Convert meson_gpio_irq_controller::lock to 'raw_spinlock_t'
Qianggui Song <qianggui.song(a)amlogic.com>
irqchip/meson-gpio: support more than 8 channels gpio irq
Damien Le Moal <dlemoal(a)kernel.org>
scsi: mpt3sas: Avoid IOMMU page faults on REPORT ZONES
Sreekanth Reddy <sreekanth.reddy(a)broadcom.com>
scsi: mpt3sas: Remove scsi_dma_map() error messages
Justin Stitt <justinstitt(a)google.com>
ntp: Safeguard against time_constant overflow
Dan Williams <dan.j.williams(a)intel.com>
driver core: Fix uevent_show() vs driver detach race
Justin Stitt <justinstitt(a)google.com>
ntp: Clamp maxerror and esterror to operating range
Thomas Gleixner <tglx(a)linutronix.de>
tick/broadcast: Move per CPU pointer access into the atomic section
Vamshi Gajjela <vamshigajjela(a)google.com>
scsi: ufs: core: Fix hba->last_dme_cmd_tstamp timestamp updating logic
Prashanth K <quic_prashk(a)quicinc.com>
usb: gadget: u_serial: Set start_delayed during suspend
Chris Wulff <crwulff(a)gmail.com>
usb: gadget: core: Check for unset descriptor
Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com>
USB: serial: debug: do not echo input by default
Oliver Neukum <oneukum(a)suse.com>
usb: vhci-hcd: Do not drop references before new references are gained
Takashi Iwai <tiwai(a)suse.de>
ALSA: hda/hdmi: Yet more pin fix for HP EliteDesk 800 G4
Steven 'Steve' Kendall <skend(a)chromium.org>
ALSA: hda: Add HP MP9 G4 Retail System AMS to force connect list
Takashi Iwai <tiwai(a)suse.de>
ALSA: line6: Fix racy access to midibuf
Ma Ke <make24(a)iscas.ac.cn>
drm/client: fix null pointer dereference in drm_client_modeset_probe
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Re-add ScratchAmp quirk entries
Stefan Wahren <wahrenst(a)gmx.net>
spi: spi-fsl-lpspi: Fix scldiv calculation
Masami Hiramatsu (Google) <mhiramat(a)kernel.org>
kprobes: Fix to check symbol prefixes correctly
Menglong Dong <menglong8.dong(a)gmail.com>
bpf: kprobe: remove unused declaring of bpf_kprobe_override
Guenter Roeck <linux(a)roeck-us.net>
i2c: smbus: Send alert notifications to all devices if source not found
Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>
ASoC: codecs: wsa881x: Correct Soundwire ports mask
Guenter Roeck <linux(a)roeck-us.net>
i2c: smbus: Improve handling of stuck alerts
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Expand speculative SSBS workaround (again)
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-A725 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X1C definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Expand speculative SSBS workaround
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Unify speculative SSBS errata logic
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X925 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-A720 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X3 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Add workaround for Arm errata 3194386 and 3312417
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Neoverse-V3 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X4 definitions
Besar Wicaksono <bwicaksono(a)nvidia.com>
arm64: Add Neoverse-V2 part
James Morse <james.morse(a)arm.com>
arm64: cpufeature: Force HWCAP to be based on the sysreg visible to user-space
Kemeng Shi <shikemeng(a)huaweicloud.com>
ext4: fix wrong unit use in ext4_mb_find_by_goal
Zheng Zucheng <zhengzucheng(a)huawei.com>
sched/cputime: Fix mul_u64_u64_div_u64() precision for cputime
Benjamin Coddington <bcodding(a)redhat.com>
SUNRPC: Fix a race to wake a sync task
Peter Oberparleiter <oberpar(a)linux.ibm.com>
s390/sclp: Prevent release of buffer in I/O
Kemeng Shi <shikemeng(a)huaweicloud.com>
jbd2: avoid memleak in jbd2_journal_write_metadata_buffer
Michal Pecio <michal.pecio(a)gmail.com>
media: uvcvideo: Fix the bandwdith quirk on USB 3.x
Ricardo Ribalda <ribalda(a)chromium.org>
media: uvcvideo: Ignore empty TS packets
Ma Jun <Jun.Ma2(a)amd.com>
drm/amdgpu/pm: Fix the null pointer dereference in apply_state_adjust_rules
Ma Jun <Jun.Ma2(a)amd.com>
drm/amdgpu: Fix the null pointer dereference to ras_manager
Filipe Manana <fdmanana(a)suse.com>
btrfs: fix bitmap leak when loading free space cache on duplicate entry
Johannes Berg <johannes.berg(a)intel.com>
wifi: nl80211: don't give key data to userspace
Roman Smirnov <r.smirnov(a)omp.ru>
udf: prevent integer overflow in udf_bitmap_free_blocks()
FUJITA Tomonori <fujita.tomonori(a)gmail.com>
PCI: Add Edimax Vendor ID to pci_ids.h
Yonghong Song <yonghong.song(a)linux.dev>
selftests/bpf: Fix send_signal test with nested CONFIG_PARAVIRT
Thomas Weißschuh <linux(a)weissschuh.net>
ACPI: SBS: manage alarm sysfs attribute through psy core
Thomas Weißschuh <linux(a)weissschuh.net>
ACPI: battery: create alarm sysfs attribute atomically
Niklas Söderlund <niklas.soderlund+renesas(a)ragnatech.se>
clocksource/drivers/sh_cmt: Address race condition for clock events
Yu Kuai <yukuai3(a)huawei.com>
md/raid5: avoid BUG_ON() while continue reshape after reassembling
Li Nan <linan122(a)huawei.com>
md: do not delete safemode_timer in mddev_suspend
Paul E. McKenney <paulmck(a)kernel.org>
rcutorture: Fix rcu_torture_fwd_cb_cr() data race
Csókás, Bence <csokas.bence(a)prolan.hu>
net: fec: Stop PPS on driver remove
James Chapman <jchapman(a)katalix.com>
l2tp: fix lockdep splat
Joe Hattori <joe(a)pf.is.s.u-tokyo.ac.jp>
net: dsa: bcm_sf2: Fix a possible memory leak in bcm_sf2_mdio_register()
Dmitry Antipov <dmantipov(a)yandex.ru>
Bluetooth: l2cap: always unlock channel in l2cap_conless_channel()
Eric Dumazet <edumazet(a)google.com>
net: linkwatch: use system_unbound_wq
Daniele Palmas <dnlplm(a)gmail.com>
net: usb: qmi_wwan: fix memory leak for not ip packets
Kuniyuki Iwashima <kuniyu(a)amazon.com>
sctp: Fix null-ptr-deref in reuseport_add_sock().
Xin Long <lucien.xin(a)gmail.com>
sctp: move hlist_node and hashent out of sctp_ep_common
Peter Zijlstra <peterz(a)infradead.org>
x86/mm: Fix pti_clone_entry_text() for i386
Peter Zijlstra <peterz(a)infradead.org>
x86/mm: Fix pti_clone_pgtable() alignment assumption
Yipeng Zou <zouyipeng(a)huawei.com>
irqchip/mbigen: Fix mbigen node address layout
Marc Zyngier <maz(a)kernel.org>
genirq: Allow irq_chip registration functions to take a const irq_chip
Alexander Maltsev <keltar.gw(a)gmail.com>
netfilter: ipset: Add list flush to cancel_gc
Paolo Abeni <pabeni(a)redhat.com>
mptcp: fix duplicate data handling
Heiner Kallweit <hkallweit1(a)gmail.com>
r8169: don't increment tx_dropped in case of NETDEV_TX_BUSY
Ma Ke <make24(a)iscas.ac.cn>
net: usb: sr9700: fix uninitialized variable use in sr_mdio_read
Mavroudis Chatzilazaridis <mavchatz(a)protonmail.com>
ALSA: hda/realtek: Add quirk for Acer Aspire E5-574G
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Correct surround channels in UAC1 channel map
Al Viro <viro(a)zeniv.linux.org.uk>
protect the fetch of ->fd[fd] in do_dup2() from mispredictions
Tatsunosuke Tobita <tatsunosuke.tobita(a)wacom.com>
HID: wacom: Modify pen IDs
Patryk Duda <patrykd(a)google.com>
platform/chrome: cros_ec_proto: Lock device when updating MKBP version
Zhe Qiao <qiaozhe(a)iscas.ac.cn>
riscv/mm: Add handling for VM_FAULT_SIGSEGV in mm_fault_error()
Maciej Żenczykowski <maze(a)google.com>
ipv6: fix ndisc_is_useropt() handling for PIO
Shahar Shitrit <shshitrit(a)nvidia.com>
net/mlx5e: Add a check for the return value from mlx5_port_set_eth_ptys
Alexandra Winter <wintera(a)linux.ibm.com>
net/iucv: fix use after free in iucv_sock_close()
Eric Dumazet <edumazet(a)google.com>
sched: act_ct: take care of padding in struct zones_ht_key
Ian Forbes <ian.forbes(a)broadcom.com>
drm/vmwgfx: Fix overlay when using Screen Targets
Danilo Krummrich <dakr(a)kernel.org>
drm/nouveau: prime: fix refcount underflow
Aleksandr Mishin <amishin(a)t-argos.ru>
remoteproc: imx_rproc: Skip over memory region when node value is NULL
Dong Aisheng <aisheng.dong(a)nxp.com>
remoteproc: imx_rproc: Fix ignoring mapping vdev regions
Peng Fan <peng.fan(a)nxp.com>
remoteproc: imx_rproc: ignore mapping vdev regions
Shenwei Wang <shenwei.wang(a)nxp.com>
irqchip/imx-irqsteer: Handle runtime power management correctly
Lucas Stach <l.stach(a)pengutronix.de>
irqchip/imx-irqsteer: Add runtime PM support
Lucas Stach <l.stach(a)pengutronix.de>
irqchip/imx-irqsteer: Constify irq_chip struct
Marc Zyngier <maz(a)kernel.org>
genirq: Allow the PM device to originate from irq domain
Zijun Hu <quic_zijuhu(a)quicinc.com>
devres: Fix memory leakage caused by driver API devm_free_percpu()
Andy Shevchenko <andriy.shevchenko(a)linux.intel.com>
driver core: Cast to (void *) with __force for __percpu pointer
Jay Buddhabhatti <jay.buddhabhatti(a)amd.com>
drivers: soc: xilinx: check return status of get_api_version()
Michael Tretter <m.tretter(a)pengutronix.de>
soc: xilinx: move PM_INIT_FINALIZE to zynqmp_pm_domains driver
Zhang Yi <yi.zhang(a)huawei.com>
ext4: check the extent status again before inserting delalloc block
Zhang Yi <yi.zhang(a)huawei.com>
ext4: factor out a common helper to query extent map
Thomas Weißschuh <linux(a)weissschuh.net>
sysctl: always initialize i_uid/i_gid
Eric Sandeen <sandeen(a)redhat.com>
fuse: verify {g,u}id mount options correctly
Miklos Szeredi <mszeredi(a)redhat.com>
fuse: name fs_context consistently
Esben Haabendal <esben(a)geanix.com>
powerpc/configs: Update defconfig with now user-visible CONFIG_FSL_IFC
Seth Forshee (DigitalOcean) <sforshee(a)kernel.org>
fs: don't allow non-init s_user_ns for filesystems without FS_USERNS_MOUNT
Leon Romanovsky <leon(a)kernel.org>
nvme-pci: add missing condition check for existence of mapped data
Jens Axboe <axboe(a)kernel.dk>
nvme: split command copy into a helper
Gerd Bayer <gbayer(a)linux.ibm.com>
s390/pci: Allow allocation of more than 1 MSI interrupt
Gerd Bayer <gbayer(a)linux.ibm.com>
s390/pci: Refactor arch_setup_msi_irqs()
Thomas Gleixner <tglx(a)linutronix.de>
s390/pci: Rework MSI descriptor walk
Thomas Gleixner <tglx(a)linutronix.de>
s390/pci: Do not mask MSI[-X] entries on teardown
ethanwu <ethanwu(a)synology.com>
ceph: fix incorrect kmalloc size of pagevec mempool
Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>
ASoC: Intel: use soc_intel_is_byt_cr() only when IOSF_MBI is reachable
Al Viro <viro(a)zeniv.linux.org.uk>
lirc: rc_dev_get_from_fd(): fix file leak
Al Viro <viro(a)zeniv.linux.org.uk>
powerpc: fix a file leak in kvm_vcpu_ioctl_enable_cap()
Xiao Liang <shaw.leon(a)gmail.com>
apparmor: Fix null pointer deref when receiving skb during sock creation
Dan Carpenter <dan.carpenter(a)linaro.org>
mISDN: Fix a use after free in hfcmulti_tx()
Fred Li <dracodingfly(a)gmail.com>
bpf: Fix a segment issue when downgrading gso_size
Petr Machata <petrm(a)nvidia.com>
net: nexthop: Initialize all fields in dumped nexthops
Simon Horman <horms(a)kernel.org>
net: stmmac: Correct byte order of perfect_match
Shigeru Yoshida <syoshida(a)redhat.com>
tipc: Return non-zero value from tipc_udp_addr2str() on error
Florian Westphal <fw(a)strlen.de>
netfilter: nft_set_pipapo_avx2: disable softinterrupts
Johannes Berg <johannes.berg(a)intel.com>
net: bonding: correctly annotate RCU in bond_should_notify_peers()
Ido Schimmel <idosch(a)nvidia.com>
ipv4: Fix incorrect source address in Record Route option
Gregory CLEMENT <gregory.clement(a)bootlin.com>
MIPS: SMP-CPS: Fix address for GCR_ACCESS register for CM3 and later
Lance Richardson <rlance(a)google.com>
dma: fix call order in dmam_free_coherent
Andrii Nakryiko <andrii(a)kernel.org>
libbpf: Fix no-args func prototype BTF dumping syntax
Sheng Yong <shengyong(a)oppo.com>
f2fs: fix start segno of large section
Johannes Berg <johannes.berg(a)intel.com>
um: time-travel: fix time-travel-start option
Jeongjun Park <aha310510(a)gmail.com>
jfs: Fix array-index-out-of-bounds in diFree
Douglas Anderson <dianders(a)chromium.org>
kdb: Use the passed prompt in kdb_position_cursor()
Arnd Bergmann <arnd(a)arndb.de>
kdb: address -Wformat-security warnings
Pavel Begunkov <asml.silence(a)gmail.com>
kernel: rerun task_work while freezing in get_signal()
Pavel Begunkov <asml.silence(a)gmail.com>
io_uring/io-wq: limit retrying worker initialisation
Ryusuke Konishi <konishi.ryusuke(a)gmail.com>
nilfs2: handle inconsistent state in nilfs_btnode_create_block()
WangYuli <wangyuli(a)uniontech.com>
Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x13d3:0x3591
Hilda Wu <hildawu(a)realtek.com>
Bluetooth: btusb: Add RTL8852BE device 0489:e125 to device tables
Ilya Dryomov <idryomov(a)gmail.com>
rbd: don't assume RBD_LOCK_STATE_LOCKED for exclusive mappings
Ilya Dryomov <idryomov(a)gmail.com>
rbd: rename RBD_LOCK_STATE_RELEASING and releasing_wait
Dragan Simic <dsimic(a)manjaro.org>
drm/panfrost: Mark simple_ondemand governor as softdep
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
MIPS: Loongson64: env: Hook up Loongsson-2K
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
MIPS: ip30: ip30-console: Add missing include
Ilya Dryomov <idryomov(a)gmail.com>
rbd: don't assume rbd_is_lock_owner() for exclusive mappings
Michael Ellerman <mpe(a)ellerman.id.au>
selftests/sigaltstack: Fix ppc64 GCC build
Bart Van Assche <bvanassche(a)acm.org>
RDMA/iwcm: Fix a use-after-free related to destroying CM IDs
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
platform: mips: cpu_hwmon: Disable driver on unsupported hardware
Thomas Gleixner <tglx(a)linutronix.de>
watchdog/perf: properly initialize the turbo mode timestamp and rearm counter
Joy Chakraborty <joychakr(a)google.com>
rtc: isl1208: Fix return value of nvmem callbacks
Adrian Hunter <adrian.hunter(a)intel.com>
perf/x86/intel/pt: Fix a topa_entry base address calculation
Marco Cavenati <cavenati.marco(a)gmail.com>
perf/x86/intel/pt: Fix topa_entry base length
Nilesh Javali <njavali(a)marvell.com>
scsi: qla2xxx: validate nvme_local_port correctly
Shreyas Deodhar <sdeodhar(a)marvell.com>
scsi: qla2xxx: Complete command early within lock
Quinn Tran <qutran(a)marvell.com>
scsi: qla2xxx: Fix flash read failure
Shreyas Deodhar <sdeodhar(a)marvell.com>
scsi: qla2xxx: Fix for possible memory corruption
Manish Rangankar <mrangankar(a)marvell.com>
scsi: qla2xxx: During vport delete send async logout explicitly
Joy Chakraborty <joychakr(a)google.com>
rtc: cmos: Fix return value of nvmem callbacks
Zijun Hu <quic_zijuhu(a)quicinc.com>
devres: Fix devm_krealloc() wasting memory
Zijun Hu <quic_zijuhu(a)quicinc.com>
kobject_uevent: Fix OOB access within zap_modalias_env()
Nathan Chancellor <nathan(a)kernel.org>
kbuild: Fix '-S -c' in x86 stack protector scripts
Ross Lagerwall <ross.lagerwall(a)citrix.com>
decompress_bunzip2: fix rare decompression failure
Fedor Pchelkin <pchelkin(a)ispras.ru>
ubi: eba: properly rollback inside self_check_eba
Bastien Curutchet <bastien.curutchet(a)bootlin.com>
clk: davinci: da8xx-cfgchip: Initialize clk_init_data before use
Chao Yu <chao(a)kernel.org>
f2fs: fix to don't dirty inode for readonly filesystem
Saurav Kashyap <skashyap(a)marvell.com>
scsi: qla2xxx: Return ENOBUFS if sg_cnt is more than one for ELS cmds
tuhaowen <tuhaowen(a)uniontech.com>
dev/parport: fix the array out-of-bounds risk
Carlos Llamas <cmllamas(a)google.com>
binder: fix hang of unregistered readers
Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org>
PCI: rockchip: Use GPIOD_OUT_LOW flag while requesting ep_gpio
Wei Liu <wei.liu(a)kernel.org>
PCI: hv: Return zero, not garbage, when reading PCI_INTERRUPT_PIN
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
hwrng: amd - Convert PCIBIOS_* return codes to errnos
Alan Stern <stern(a)rowland.harvard.edu>
tools/memory-model: Fix bug in lock.cat
Sean Christopherson <seanjc(a)google.com>
KVM: VMX: Split out the non-virtualization part of vmx_interrupt_blocked()
Jan Kara <jack(a)suse.cz>
jbd2: make jbd2_journal_get_max_txn_bufs() internal
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
leds: ss4200: Convert PCIBIOS_* return codes to errnos
Rafael Beims <rafael.beims(a)toradex.com>
wifi: mwifiex: Fix interface type change
Baokun Li <libaokun1(a)huawei.com>
ext4: make sure the first directory block is not a hole
Baokun Li <libaokun1(a)huawei.com>
ext4: check dot and dotdot of dx_root before making dir indexed
Paolo Pisati <p.pisati(a)gmail.com>
m68k: amiga: Turn off Warp1260 interrupts during boot
Jan Kara <jack(a)suse.cz>
udf: Avoid using corrupted block bitmap buffer
Frederic Weisbecker <frederic(a)kernel.org>
task_work: Introduce task_work_cancel() again
Frederic Weisbecker <frederic(a)kernel.org>
task_work: s/task_work_cancel()/task_work_cancel_func()/
Fedor Pchelkin <pchelkin(a)ispras.ru>
apparmor: use kvfree_sensitive to free data->data
Pierre Gondois <pierre.gondois(a)arm.com>
sched/fair: Use all little CPUs for CPU-bound workloads
Sung Joon Kim <sungjoon.kim(a)amd.com>
drm/amd/display: Check for NULL pointer
Shreyas Deodhar <sdeodhar(a)marvell.com>
scsi: qla2xxx: Fix optrom version displayed in FDMI
Ma Ke <make24(a)iscas.ac.cn>
drm/gma500: fix null pointer dereference in psb_intel_lvds_get_modes
Ma Ke <make24(a)iscas.ac.cn>
drm/gma500: fix null pointer dereference in cdv_intel_lvds_get_modes
Jan Kara <jack(a)suse.cz>
ext2: Verify bitmap and itable block numbers before using them
Chao Yu <chao(a)kernel.org>
hfs: fix to initialize fields of hfs_inode_info after hfs_alloc_inode()
Dikshita Agarwal <quic_dikshita(a)quicinc.com>
media: venus: fix use after free in vdec_close
Joe Hattori <joe(a)pf.is.s.u-tokyo.ac.jp>
char: tpm: Fix possible memory leak in tpm_bios_measurements_open()
Tejun Heo <tj(a)kernel.org>
sched/fair: set_load_weight() must also call reweight_task() for SCHED_IDLE tasks
Nicolas Dichtel <nicolas.dichtel(a)6wind.com>
ipv6: take care of scope when choosing the src addr
Chengen Du <chengen.du(a)canonical.com>
af_packet: Handle outgoing VLAN packets without hardware offloading
Breno Leitao <leitao(a)debian.org>
net: netconsole: Disable target before netpoll cleanup
Yu Liao <liaoyu15(a)huawei.com>
tick/broadcast: Make takeover of broadcast hrtimer reliable
Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>
dt-bindings: thermal: correct thermal zone node name limit
Csókás, Bence <csokas.bence(a)prolan.hu>
rtc: interface: Add RTC offset to alarm after fix-up
Ryusuke Konishi <konishi.ryusuke(a)gmail.com>
nilfs2: avoid undefined behavior in nilfs_cnt32_ge macro
Alex Shi <alex.shi(a)linux.alibaba.com>
fs/nilfs2: remove some unused macros to tame gcc
David Hildenbrand <david(a)redhat.com>
fs/proc/task_mmu: indicate PM_FILE for PMD-mapped file THP
Peng Fan <peng.fan(a)nxp.com>
pinctrl: freescale: mxs: Fix refcount of child
Yang Yingliang <yangyingliang(a)huawei.com>
pinctrl: ti: ti-iodelay: fix possible memory leak when pinctrl_enable() fails
Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de>
pinctrl: ti: ti-iodelay: Drop if block with always false condition
Yang Yingliang <yangyingliang(a)huawei.com>
pinctrl: single: fix possible memory leak when pinctrl_enable() fails
Yang Yingliang <yangyingliang(a)huawei.com>
pinctrl: core: fix possible memory leak when pinctrl_enable() fails
Dmitry Yashin <dmt.yashin(a)gmail.com>
pinctrl: rockchip: update rk3308 iomux routes
Martin Willi <martin(a)strongswan.org>
net: dsa: b53: Limit chip-wide jumbo frame config to CPU ports
Martin Willi <martin(a)strongswan.org>
net: dsa: mv88e6xxx: Limit chip-wide frame size config to CPU ports
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: ctnetlink: use helper function to calculate expect ID
Jack Wang <jinpu.wang(a)ionos.com>
bnxt_re: Fix imm_data endianness
Chengchang Tang <tangchengchang(a)huawei.com>
RDMA/hns: Fix missing pagesize and alignment check in FRMR
Nick Bowler <nbowler(a)draconx.ca>
macintosh/therm_windtunnel: fix module unload.
Michael Ellerman <mpe(a)ellerman.id.au>
powerpc/xmon: Fix disassembly CPU feature checks
Dominique Martinet <dominique.martinet(a)atmark-techno.com>
MIPS: Octeron: remove source file executable bit
Dmitry Torokhov <dmitry.torokhov(a)gmail.com>
Input: elan_i2c - do not leave interrupt disabled on suspend failure
Leon Romanovsky <leon(a)kernel.org>
RDMA/device: Return error earlier if port in not valid
Arnd Bergmann <arnd(a)arndb.de>
mtd: make mtd_test.c a separate module
Chen Ni <nichen(a)iscas.ac.cn>
ASoC: max98088: Check for clk_prepare_enable() error
Honggang LI <honggangli(a)163.com>
RDMA/rxe: Don't set BTH_ACK_MASK for UC or UD QPs
Leon Romanovsky <leon(a)kernel.org>
RDMA/mlx4: Fix truncated output warning in alias_GUID.c
Leon Romanovsky <leon(a)kernel.org>
RDMA/mlx4: Fix truncated output warning in mad.c
Andrei Lalaev <andrei.lalaev(a)anton-paar.com>
Input: qt1050 - handle CHIP_ID reading error
James Clark <james.clark(a)arm.com>
coresight: Fix ref leak when of_coresight_parse_endpoint() fails
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
PCI: Fix resource double counting on remove & rescan
Benjamin Coddington <bcodding(a)redhat.com>
SUNRPC: Fixup gss_status tracepoint error output
Andreas Larsson <andreas(a)gaisler.com>
sparc64: Fix incorrect function signature and add prototype for prom_cif_init
Jan Kara <jack(a)suse.cz>
ext4: avoid writing unitialized memory to disk in EA inodes
NeilBrown <neilb(a)suse.de>
SUNRPC: avoid soft lockup when transmitting UDP to reachable server.
Chuck Lever <chuck.lever(a)oracle.com>
xprtrdma: Fix rpcrdma_reqs_reset()
Chuck Lever <chuck.lever(a)oracle.com>
xprtrdma: Rename frwr_release_mr()
Javier Carrasco <javier.carrasco.cruz(a)gmail.com>
mfd: omap-usb-tll: Use struct_size to allocate tll
Dikshita Agarwal <quic_dikshita(a)quicinc.com>
media: venus: flush all buffers in output plane streamoff
Luis Henriques (SUSE) <luis.henriques(a)linux.dev>
ext4: fix infinite loop when replaying fast_commit
Luca Ceresoli <luca.ceresoli(a)bootlin.com>
Revert "leds: led-core: Fix refcount leak in of_led_get()"
Chen Ni <nichen(a)iscas.ac.cn>
drm/qxl: Add check for drm_cvt_mode
Lucas Stach <l.stach(a)pengutronix.de>
drm/etnaviv: fix DMA direction handling for cached RW buffers
Namhyung Kim <namhyung(a)kernel.org>
perf report: Fix condition in sort__sym_cmp()
Hans de Goede <hdegoede(a)redhat.com>
leds: trigger: Unregister sysfs attributes before calling deactivate()
Laurent Pinchart <laurent.pinchart+renesas(a)ideasonboard.com>
media: renesas: vsp1: Store RPF partition configuration per RPF instance
Laurent Pinchart <laurent.pinchart+renesas(a)ideasonboard.com>
media: renesas: vsp1: Fix _irqsave and _irq mix
Daniel Schaefer <dhs(a)frame.work>
media: uvcvideo: Override default flags
Ricardo Ribalda <ribalda(a)chromium.org>
media: uvcvideo: Allow entity-defined get_info and get_cur
Aleksandr Burakov <a.burakov(a)rosalinux.ru>
saa7134: Unchecked i2c_transfer function result fixed
Ricardo Ribalda <ribalda(a)chromium.org>
media: imon: Fix race getting ictx->lock
Zheng Yejian <zhengyejian1(a)huawei.com>
media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()
Douglas Anderson <dianders(a)chromium.org>
drm/panel: boe-tv101wum-nl6: Check for errors on the NOP in prepare()
Douglas Anderson <dianders(a)chromium.org>
drm/panel: boe-tv101wum-nl6: If prepare fails, disable GPIO before regulators
Taehee Yoo <ap420073(a)gmail.com>
xdp: fix invalid wait context of page_pool_destroy()
Amit Cohen <amcohen(a)nvidia.com>
selftests: forwarding: devlink_lib: Wait for udev events after reloading
Alan Maguire <alan.maguire(a)oracle.com>
bpf: Eliminate remaining "make W=1" warnings in kernel/bpf/btf.o
Alexey Kodanev <aleksei.kodanev(a)bell-sw.com>
bna: adjust 'name' buf size of bna_tcb and bna_ccb structures
Alan Maguire <alan.maguire(a)oracle.com>
bpf: annotate BTF show functions with __printf
Geliang Tang <tanggeliang(a)kylinos.cn>
selftests/bpf: Close fd in error path in drop_on_reuseport
Johannes Berg <johannes.berg(a)intel.com>
wifi: virt_wifi: don't use strlen() in const context
Gaosheng Cui <cuigaosheng1(a)huawei.com>
gss_krb5: Fix the error handling path for crypto_sync_skcipher_setkey
En-Wei Wu <en-wei.wu(a)canonical.com>
wifi: virt_wifi: avoid reporting connection success with wrong SSID
Shai Malin <smalin(a)marvell.com>
qed: Improve the stack space of filter_config()
Adrian Hunter <adrian.hunter(a)intel.com>
perf: Prevent passing zero nr_pages to rb_alloc_aux()
Adrian Hunter <adrian.hunter(a)intel.com>
perf: Fix perf_aux_size() for greater-than 32-bit size
Adrian Hunter <adrian.hunter(a)intel.com>
perf/x86/intel/pt: Fix pt_topa_entry_for_page() address calculation
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: nf_tables: rise cap on SELinux secmark context
Ismael Luceno <iluceno(a)suse.de>
ipvs: Avoid unnecessary calls to skb_is_gso_sctp
Csókás, Bence <csokas.bence(a)prolan.hu>
net: fec: Fix FEC_ECR_EN1588 being cleared on link-down
Csókás Bence <csokas.bence(a)prolan.hu>
net: fec: Refactor: #define magic constants
Baochen Qiang <quic_bqiang(a)quicinc.com>
wifi: cfg80211: handle 2x996 RU allocation in cfg80211_calculate_bitrate_he()
Baochen Qiang <quic_bqiang(a)quicinc.com>
wifi: cfg80211: fix typo in cfg80211_calculate_bitrate_he()
Baochen Qiang <quic_bqiang(a)quicinc.com>
wifi: ath11k: fix wrong handling of CCMP256 and GCMP ciphers
Carl Huang <cjhuang(a)codeaurora.org>
ath11k: dp: stop rx pktlog before suspend
Ido Schimmel <idosch(a)nvidia.com>
mlxsw: spectrum_acl: Fix ACL scale regression and firmware errors
Amit Cohen <amcohen(a)nvidia.com>
mlxsw: spectrum_acl_bloom_filter: Make mlxsw_sp_acl_bf_key_encode() more flexible
Ido Schimmel <idosch(a)nvidia.com>
mlxsw: spectrum_acl_erp: Fix object nesting warning
Ido Schimmel <idosch(a)nvidia.com>
lib: objagg: Fix general protection fault
Geliang Tang <tanggeliang(a)kylinos.cn>
selftests/bpf: Check length of recv in test_sockmap
Guangguan Wang <guangguan.wang(a)linux.alibaba.com>
net/smc: set rmb's SG_MAX_SINGLE_ALLOC limitation only when CONFIG_ARCH_NO_SG_CHAIN is defined
Stefan Raspl <raspl(a)linux.ibm.com>
net/smc: Allow SMC-D 1MB DMB allocations
Hagar Hemdan <hagarhem(a)amazon.com>
net: esp: cleanup esp_output_tail_tcp() in case of unsupported ESPINTCP
Geliang Tang <tanggeliang(a)kylinos.cn>
selftests/bpf: Fix prog numbers in test_sockmap
Samasth Norway Ananda <samasth.norway.ananda(a)oracle.com>
wifi: brcmsmac: LCN PHY code is used for BCM4313 2G-only device
Marek Behún <kabel(a)kernel.org>
firmware: turris-mox-rwtm: Initialize completion before mailbox
Marek Behún <kabel(a)kernel.org>
firmware: turris-mox-rwtm: Fix checking return value of wait_for_completion_timeout()
Dmitry Torokhov <dmitry.torokhov(a)gmail.com>
ARM: spitz: fix GPIO assignment for backlight
Arnd Bergmann <arnd(a)arndb.de>
ARM: pxa: spitz: use gpio descriptors for audio
Thorsten Blum <thorsten.blum(a)toblux.com>
m68k: cmpxchg: Fix return value for default case in __arch_xchg()
Chen Ni <nichen(a)iscas.ac.cn>
x86/xen: Convert comma to semicolon
Eero Tamminen <oak(a)helsinkinet.fi>
m68k: atari: Fix TT bootup freeze / unexpected (SCU) interrupt messages
Jerome Brunet <jbrunet(a)baylibre.com>
arm64: dts: amlogic: gx: correct hdmi clocks
Rafał Miłecki <rafal(a)milecki.pl>
arm64: dts: mediatek: mt7622: fix "emmc" pinctrl mux
Chen-Yu Tsai <wenst(a)chromium.org>
arm64: dts: mediatek: mt8183-kukui: Drop bogus output-enable property
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix PCIe reset polarity
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix SPI0 chip selects
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix board reset
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix PHY reset
Marco Felsch <m.felsch(a)pengutronix.de>
ARM: dts: imx6qdl-kontron-samx6i: move phy reset into phy-node
Jonas Karlman <jonas(a)kwiboo.se>
arm64: dts: rockchip: Increase VOP clk rate on RK3328
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
soc: qcom: pdr: fix parsing of domains lists
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
soc: qcom: pdr: protect locator_addr with the main mutex
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: msm8996: specify UFS core_clk frequencies
Stephen Boyd <swboyd(a)chromium.org>
soc: qcom: rpmh-rsc: Ensure irqs aren't disabled by rpmh_rsc_send_data() callers
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: sdm845: add power-domain to UFS PHY
Guenter Roeck <linux(a)roeck-us.net>
hwmon: (max6697) Fix swapped temp{1,8} critical alarms
Guenter Roeck <linux(a)roeck-us.net>
hwmon: (max6697) Fix underflow when writing limit attributes
Uwe Kleine-König <u.kleine-koenig(a)baylibre.com>
pwm: stm32: Always do lazy disabling
Wayne Tung <chineweff(a)gmail.com>
hwmon: (adt7475) Fix default duty on fan is disabled
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/platform/iosf_mbi: Convert PCIBIOS_* return codes to errnos
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/pci/xen: Fix PCIBIOS_* return code handling
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/pci/intel_mid_pci: Fix PCIBIOS_* return code handling
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/of: Return consistent error type from x86_of_pci_irq_enable()
Chao Yu <chao(a)kernel.org>
hfsplus: fix to avoid false alarm of circular locking
Tzung-Bi Shih <tzungbi(a)kernel.org>
platform/chrome: cros_ec_debugfs: fix wrong EC message version
Arnd Bergmann <arnd(a)arndb.de>
EDAC, i10nm: make skx_common.o a separate module
Qiuxu Zhuo <qiuxu.zhuo(a)intel.com>
EDAC/skx_common: Add new ADXL components for 2-level memory
-------------
Diffstat:
Documentation/arm64/cpu-feature-registers.rst | 38 +++++-
Documentation/arm64/silicon-errata.rst | 36 +++++
.../devicetree/bindings/thermal/thermal-zones.yaml | 5 +-
Makefile | 4 +-
arch/arm/boot/dts/imx6q-kontron-samx6i.dtsi | 23 ----
arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 26 +++-
arch/arm/mach-pxa/spitz.c | 39 ++++--
arch/arm/mach-pxa/{include/mach => }/spitz.h | 2 +-
arch/arm/mach-pxa/spitz_pm.c | 2 +-
arch/arm64/Kconfig | 38 ++++++
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 4 +-
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 4 +-
.../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 4 +-
arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 4 +-
arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 2 -
arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 4 +-
arch/arm64/include/asm/cpucaps.h | 3 +-
arch/arm64/include/asm/cputype.h | 16 +++
arch/arm64/kernel/cpu_errata.c | 31 +++++
arch/arm64/kernel/cpufeature.c | 94 ++++++++++---
arch/arm64/kernel/proton-pack.c | 12 ++
arch/m68k/amiga/config.c | 9 ++
arch/m68k/atari/ataints.c | 6 +-
arch/m68k/include/asm/cmpxchg.h | 2 +-
arch/mips/include/asm/mach-loongson64/boot_param.h | 2 +
arch/mips/include/asm/mips-cm.h | 4 +
arch/mips/kernel/smp-cps.c | 5 +-
arch/mips/loongson64/env.c | 8 ++
arch/mips/pci/pcie-octeon.c | 0
arch/mips/sgi-ip30/ip30-console.c | 1 +
arch/powerpc/configs/85xx-hw.config | 2 +
arch/powerpc/include/asm/percpu.h | 10 ++
arch/powerpc/kernel/mce.c | 14 +-
arch/powerpc/kernel/setup_64.c | 2 +
arch/powerpc/kernel/traps.c | 8 +-
arch/powerpc/kvm/powerpc.c | 4 +-
arch/powerpc/xmon/ppc-dis.c | 33 ++---
arch/riscv/mm/fault.c | 17 +--
arch/s390/pci/pci_irq.c | 120 ++++++++++-------
arch/sparc/include/asm/oplib_64.h | 1 +
arch/sparc/prom/init_64.c | 3 -
arch/sparc/prom/p1275.c | 2 +-
arch/um/kernel/time.c | 4 +-
arch/x86/events/intel/pt.c | 4 +-
arch/x86/events/intel/pt.h | 4 +-
arch/x86/kernel/cpu/mtrr/mtrr.c | 2 +-
arch/x86/kernel/devicetree.c | 2 +-
arch/x86/kvm/vmx/vmx.c | 11 +-
arch/x86/kvm/vmx/vmx.h | 1 +
arch/x86/mm/pti.c | 8 +-
arch/x86/pci/intel_mid_pci.c | 4 +-
arch/x86/pci/xen.c | 4 +-
arch/x86/platform/intel/iosf_mbi.c | 4 +-
arch/x86/xen/p2m.c | 4 +-
drivers/acpi/battery.c | 16 ++-
drivers/acpi/sbs.c | 23 ++--
drivers/android/binder.c | 4 +-
drivers/base/core.c | 13 +-
drivers/base/devres.c | 13 +-
drivers/base/module.c | 4 +
drivers/block/rbd.c | 35 +++--
drivers/bluetooth/btusb.c | 4 +
drivers/char/hw_random/amd-rng.c | 4 +-
drivers/char/tpm/eventlog/common.c | 2 +
drivers/clk/davinci/da8xx-cfgchip.c | 4 +-
drivers/clocksource/sh_cmt.c | 13 +-
drivers/edac/Makefile | 10 +-
drivers/edac/skx_common.c | 88 ++++++++++--
drivers/edac/skx_common.h | 15 ++-
drivers/firmware/turris-mox-rwtm.c | 18 +--
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 7 +-
drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 3 +-
.../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 7 +-
.../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 14 +-
.../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 7 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 5 +-
drivers/gpu/drm/drm_client_modeset.c | 5 +
drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 +-
drivers/gpu/drm/gma500/cdv_intel_lvds.c | 3 +
drivers/gpu/drm/gma500/psb_intel_lvds.c | 3 +
drivers/gpu/drm/i915/gem/i915_gem_mman.c | 53 +++++++-
drivers/gpu/drm/mgag200/mgag200_i2c.c | 2 +-
drivers/gpu/drm/nouveau/nouveau_prime.c | 3 +-
drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 8 +-
drivers/gpu/drm/panfrost/panfrost_drv.c | 1 +
drivers/gpu/drm/qxl/qxl_display.c | 3 +
drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 2 +-
drivers/hid/wacom_wac.c | 3 +-
drivers/hwmon/adt7475.c | 2 +-
drivers/hwmon/max6697.c | 5 +-
drivers/hwtracing/coresight/coresight-platform.c | 4 +-
drivers/i2c/i2c-smbus.c | 64 ++++++++-
drivers/infiniband/core/device.c | 6 +-
drivers/infiniband/core/iwcm.c | 11 +-
drivers/infiniband/hw/bnxt_re/ib_verbs.c | 8 +-
drivers/infiniband/hw/bnxt_re/qplib_fp.h | 6 +-
drivers/infiniband/hw/hns/hns_roce_device.h | 4 +
drivers/infiniband/hw/hns/hns_roce_mr.c | 5 +
drivers/infiniband/hw/mlx4/alias_GUID.c | 2 +-
drivers/infiniband/hw/mlx4/mad.c | 2 +-
drivers/infiniband/sw/rxe/rxe_req.c | 7 +-
drivers/input/keyboard/qt1050.c | 7 +-
drivers/input/mouse/elan_i2c_core.c | 2 +
drivers/irqchip/irq-imx-irqsteer.c | 40 +++++-
drivers/irqchip/irq-mbigen.c | 20 ++-
drivers/irqchip/irq-meson-gpio.c | 35 ++---
drivers/irqchip/irq-xilinx-intc.c | 2 +-
drivers/isdn/hardware/mISDN/hfcmulti.c | 7 +-
drivers/leds/led-class.c | 1 -
drivers/leds/led-triggers.c | 2 +-
drivers/leds/leds-ss4200.c | 7 +-
drivers/macintosh/therm_windtunnel.c | 2 +-
drivers/md/md.c | 1 -
drivers/md/raid5.c | 20 ++-
drivers/media/pci/saa7134/saa7134-dvb.c | 8 +-
drivers/media/platform/qcom/venus/vdec.c | 3 +-
drivers/media/platform/vsp1/vsp1_histo.c | 20 ++-
drivers/media/platform/vsp1/vsp1_pipe.h | 2 +-
drivers/media/platform/vsp1/vsp1_rpf.c | 8 +-
drivers/media/rc/imon.c | 5 +-
drivers/media/rc/lirc_dev.c | 4 +-
drivers/media/usb/uvc/uvc_ctrl.c | 90 ++++++++-----
drivers/media/usb/uvc/uvc_video.c | 37 ++++-
drivers/media/usb/uvc/uvcvideo.h | 5 +
drivers/mfd/omap-usb-tll.c | 3 +-
drivers/mtd/tests/Makefile | 34 ++---
drivers/mtd/tests/mtd_test.c | 9 ++
drivers/mtd/ubi/eba.c | 3 +-
drivers/net/bonding/bond_main.c | 7 +-
drivers/net/dsa/b53/b53_common.c | 3 +
drivers/net/dsa/bcm_sf2.c | 4 +-
drivers/net/dsa/mv88e6xxx/chip.c | 3 +-
drivers/net/ethernet/brocade/bna/bna_types.h | 2 +-
drivers/net/ethernet/brocade/bna/bnad.c | 11 +-
drivers/net/ethernet/freescale/fec_main.c | 52 ++++---
drivers/net/ethernet/freescale/fec_ptp.c | 3 +
.../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 7 +-
.../ethernet/mellanox/mlxsw/spectrum_acl_atcam.c | 18 ++-
.../mellanox/mlxsw/spectrum_acl_bloom_filter.c | 38 ++++--
.../net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c | 13 --
.../ethernet/mellanox/mlxsw/spectrum_acl_tcam.h | 9 +-
drivers/net/ethernet/qlogic/qed/qed_l2.c | 23 +---
drivers/net/ethernet/qlogic/qede/qede_filter.c | 47 +++----
drivers/net/ethernet/realtek/r8169_main.c | 8 +-
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 +-
.../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 2 +-
drivers/net/ethernet/stmicro/stmmac/hwif.h | 2 +-
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 +-
drivers/net/netconsole.c | 2 +-
drivers/net/usb/qmi_wwan.c | 1 +
drivers/net/usb/sr9700.c | 11 +-
drivers/net/wireless/ath/ath11k/dp.h | 1 +
drivers/net/wireless/ath/ath11k/dp_rx.c | 51 ++++++-
drivers/net/wireless/ath/ath11k/dp_rx.h | 6 +
drivers/net/wireless/ath/ath11k/mac.c | 19 ++-
.../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 18 +--
drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 +
drivers/net/wireless/virt_wifi.c | 20 ++-
drivers/nvme/host/pci.c | 36 ++---
drivers/parport/procfs.c | 24 ++--
drivers/pci/controller/pci-hyperv.c | 4 +-
drivers/pci/controller/pcie-rockchip.c | 2 +-
drivers/pci/msi.c | 4 +-
drivers/pci/pci.c | 19 ++-
drivers/pci/setup-bus.c | 6 +-
drivers/pinctrl/core.c | 12 +-
drivers/pinctrl/freescale/pinctrl-mxs.c | 4 +-
drivers/pinctrl/pinctrl-rockchip.c | 17 +--
drivers/pinctrl/pinctrl-single.c | 7 +-
drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 14 +-
drivers/platform/chrome/cros_ec_debugfs.c | 1 +
drivers/platform/chrome/cros_ec_proto.c | 2 +
drivers/platform/mips/cpu_hwmon.c | 3 +
drivers/power/supply/axp288_charger.c | 24 ++--
drivers/pwm/pwm-stm32.c | 5 +-
drivers/remoteproc/imx_rproc.c | 5 +
drivers/rtc/interface.c | 9 +-
drivers/rtc/rtc-cmos.c | 10 +-
drivers/rtc/rtc-isl1208.c | 11 +-
drivers/s390/char/sclp_sd.c | 10 +-
drivers/scsi/mpt3sas/mpt3sas_base.c | 38 +++---
drivers/scsi/qla2xxx/qla_bsg.c | 2 +-
drivers/scsi/qla2xxx/qla_gs.c | 2 +-
drivers/scsi/qla2xxx/qla_init.c | 63 +++++++--
drivers/scsi/qla2xxx/qla_mid.c | 2 +-
drivers/scsi/qla2xxx/qla_nvme.c | 5 +-
drivers/scsi/qla2xxx/qla_os.c | 7 +-
drivers/scsi/qla2xxx/qla_sup.c | 108 ++++++++++-----
drivers/scsi/ufs/ufshcd.c | 11 +-
drivers/soc/qcom/pdr_interface.c | 8 +-
drivers/soc/qcom/rpmh-rsc.c | 7 +-
drivers/soc/qcom/rpmh.c | 1 -
drivers/soc/xilinx/zynqmp_pm_domains.c | 16 +++
drivers/soc/xilinx/zynqmp_power.c | 5 +-
drivers/spi/spi-fsl-lpspi.c | 6 +-
drivers/tty/serial/serial_core.c | 8 ++
drivers/usb/gadget/function/u_serial.c | 1 +
drivers/usb/gadget/udc/core.c | 10 +-
drivers/usb/serial/usb_debug.c | 7 +
drivers/usb/usbip/vhci_hcd.c | 9 +-
drivers/vhost/vdpa.c | 30 ++---
fs/btrfs/free-space-cache.c | 1 +
fs/ceph/super.c | 3 +-
fs/exec.c | 8 +-
fs/ext2/balloc.c | 11 +-
fs/ext4/extents_status.c | 2 +
fs/ext4/inode.c | 78 +++++++----
fs/ext4/mballoc.c | 3 +-
fs/ext4/namei.c | 73 +++++++---
fs/ext4/xattr.c | 6 +
fs/f2fs/inode.c | 3 +
fs/f2fs/segment.h | 3 +-
fs/file.c | 1 +
fs/fuse/control.c | 10 +-
fs/fuse/inode.c | 80 ++++++-----
fs/fuse/virtio_fs.c | 12 +-
fs/hfs/inode.c | 3 +
fs/hfsplus/bfind.c | 15 +--
fs/hfsplus/extents.c | 9 +-
fs/hfsplus/hfsplus_fs.h | 21 +++
fs/jbd2/commit.c | 2 +-
fs/jbd2/journal.c | 6 +
fs/jfs/jfs_imap.c | 5 +-
fs/nilfs2/btnode.c | 25 +++-
fs/nilfs2/btree.c | 4 +-
fs/nilfs2/segment.c | 7 +-
fs/proc/proc_sysctl.c | 6 +-
fs/proc/task_mmu.c | 2 +
fs/super.c | 11 ++
fs/udf/balloc.c | 51 +++----
fs/udf/super.c | 3 +-
include/linux/compiler_attributes.h | 1 +
include/linux/irq.h | 7 +-
include/linux/irqdomain.h | 10 ++
include/linux/jbd2.h | 5 -
include/linux/msi.h | 2 -
include/linux/objagg.h | 1 -
include/linux/pci_ids.h | 2 +
include/linux/qed/qed_eth_if.h | 21 ++-
include/linux/sched/signal.h | 6 +
include/linux/task_work.h | 3 +-
include/linux/trace_events.h | 1 -
include/net/netfilter/nf_tables.h | 25 +++-
include/net/sctp/sctp.h | 4 +-
include/net/sctp/structs.h | 8 +-
include/trace/events/rpcgss.h | 2 +-
include/uapi/linux/netfilter/nf_tables.h | 2 +-
include/uapi/linux/zorro_ids.h | 3 +
io_uring/io-wq.c | 10 +-
kernel/bpf/btf.c | 10 +-
kernel/debug/kdb/kdb_io.c | 6 +-
kernel/dma/mapping.c | 2 +-
kernel/events/core.c | 2 +
kernel/events/internal.h | 2 +-
kernel/irq/chip.c | 32 +++--
kernel/irq/irqdesc.c | 1 +
kernel/irq/manage.c | 2 +-
kernel/kprobes.c | 4 +-
kernel/padata.c | 7 +
kernel/rcu/rcutorture.c | 2 +-
kernel/sched/core.c | 23 ++--
kernel/sched/cputime.c | 6 +
kernel/sched/fair.c | 9 +-
kernel/sched/sched.h | 2 +-
kernel/signal.c | 8 ++
kernel/task_work.c | 34 ++++-
kernel/time/ntp.c | 9 +-
kernel/time/tick-broadcast.c | 24 ++++
kernel/trace/tracing_map.c | 6 +-
kernel/watchdog_hld.c | 11 +-
lib/decompress_bunzip2.c | 3 +-
lib/kobject_uevent.c | 17 ++-
lib/objagg.c | 18 +--
net/bluetooth/l2cap_core.c | 1 +
net/core/filter.c | 15 ++-
net/core/link_watch.c | 4 +-
net/core/xdp.c | 4 +-
net/ipv4/esp4.c | 3 +-
net/ipv4/nexthop.c | 7 +-
net/ipv4/route.c | 2 +-
net/ipv6/addrconf.c | 3 +-
net/ipv6/esp6.c | 3 +-
net/ipv6/ndisc.c | 34 ++---
net/iucv/af_iucv.c | 4 +-
net/l2tp/l2tp_core.c | 15 ++-
net/mptcp/mib.c | 2 +
net/mptcp/mib.h | 2 +
net/mptcp/options.c | 2 +-
net/mptcp/pm.c | 9 ++
net/mptcp/pm_netlink.c | 30 ++++-
net/mptcp/protocol.c | 10 +-
net/mptcp/protocol.h | 6 +-
net/mptcp/subflow.c | 24 +++-
net/netfilter/ipset/ip_set_list_set.c | 3 +
net/netfilter/ipvs/ip_vs_proto_sctp.c | 4 +-
net/netfilter/nf_conntrack_netlink.c | 3 +-
net/netfilter/nf_tables_api.c | 149 ++++-----------------
net/netfilter/nft_connlimit.c | 2 +-
net/netfilter/nft_counter.c | 4 +-
net/netfilter/nft_dynset.c | 2 +-
net/netfilter/nft_set_hash.c | 8 +-
net/netfilter/nft_set_pipapo.c | 18 ++-
net/netfilter/nft_set_pipapo_avx2.c | 12 +-
net/netfilter/nft_set_rbtree.c | 6 +-
net/packet/af_packet.c | 86 +++++++++++-
net/sched/act_ct.c | 4 +-
net/sctp/input.c | 48 +++----
net/sctp/proc.c | 10 +-
net/sctp/socket.c | 6 +-
net/smc/smc_core.c | 32 ++---
net/sunrpc/auth_gss/gss_krb5_keys.c | 2 +-
net/sunrpc/clnt.c | 3 +-
net/sunrpc/sched.c | 4 +-
net/sunrpc/xprtrdma/frwr_ops.c | 9 +-
net/sunrpc/xprtrdma/verbs.c | 20 ++-
net/sunrpc/xprtrdma/xprt_rdma.h | 2 +-
net/tipc/udp_media.c | 5 +-
net/wireless/nl80211.c | 16 +--
net/wireless/util.c | 8 +-
samples/Kconfig | 8 ++
samples/Makefile | 1 +
samples/fanotify/.gitignore | 1 +
samples/fanotify/Makefile | 5 +
samples/fanotify/fs-monitor.c | 142 ++++++++++++++++++++
scripts/gcc-x86_32-has-stack-protector.sh | 2 +-
scripts/gcc-x86_64-has-stack-protector.sh | 2 +-
security/apparmor/lsm.c | 7 +
security/apparmor/policy.c | 2 +-
security/apparmor/policy_unpack.c | 1 +
security/keys/keyctl.c | 2 +-
sound/pci/hda/patch_hdmi.c | 2 +
sound/pci/hda/patch_realtek.c | 1 +
sound/soc/codecs/max98088.c | 10 +-
sound/soc/codecs/wsa881x.c | 2 +-
sound/soc/intel/common/soc-intel-quirks.h | 2 +-
sound/soc/pxa/spitz.c | 58 ++++----
sound/usb/line6/driver.c | 5 +
sound/usb/quirks-table.h | 4 +
sound/usb/stream.c | 4 +-
tools/lib/bpf/btf_dump.c | 8 +-
tools/memory-model/lock.cat | 20 +--
tools/perf/util/sort.c | 2 +-
.../testing/selftests/bpf/prog_tests/send_signal.c | 3 +-
tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 2 +-
.../bpf/progs/btf_dump_test_case_multidim.c | 4 +-
.../bpf/progs/btf_dump_test_case_syntax.c | 4 +-
tools/testing/selftests/bpf/test_sockmap.c | 9 +-
.../drivers/net/mlxsw/spectrum-2/tc_flower.sh | 55 +++++++-
.../selftests/net/forwarding/devlink_lib.sh | 2 +
.../selftests/sigaltstack/current_stack_pointer.h | 2 +-
352 files changed, 2959 insertions(+), 1444 deletions(-)
1 year, 4 months
- 5
- 7
[PATCH] video/aperture: match the pci device when calling sysfb_disable()
by Alex Deucher
In aperture_remove_conflicting_pci_devices(), match the pci
device determine whether or not to call sysfb_disable(). This
fixes cases where the pimary device is not VGA compatible which
leads to the following problem:
1. A PCI device with a non-VGA class is the the boot display
2. That device is probed first and it is not a vga device so
sysfb_disable() is not called, but the device resources
are freed by aperture_detach_platform_device()
3. Non-primary GPU is vga device and it ends up calling sysfb_disable()
4. NULL pointer dereference via sysfb_disable() since the resources
have already been freed by aperture_detach_platform_device() when
it was called by the other device.
Fix this by calling sysfb_disable() on the device associated with it.
Fixes: 5ae3716cfdcd ("video/aperture: Only remove sysfb on the default vga pci device")
Cc: Javier Martinez Canillas <javierm(a)redhat.com>
Cc: Thomas Zimmermann <tzimmermann(a)suse.de>
Cc: Helge Deller <deller(a)gmx.de>
Cc: Sam Ravnborg <sam(a)ravnborg.org>
Cc: Daniel Vetter <daniel.vetter(a)ffwll.ch>
Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com>
Cc: stable(a)vger.kernel.org
---
drivers/video/aperture.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/video/aperture.c b/drivers/video/aperture.c
index 561be8feca96..56a5a0bc2b1a 100644
--- a/drivers/video/aperture.c
+++ b/drivers/video/aperture.c
@@ -6,6 +6,7 @@
#include <linux/mutex.h>
#include <linux/pci.h>
#include <linux/platform_device.h>
+#include <linux/screen_info.h>
#include <linux/slab.h>
#include <linux/sysfb.h>
#include <linux/types.h>
@@ -346,6 +347,7 @@ EXPORT_SYMBOL(__aperture_remove_legacy_vga_devices);
*/
int aperture_remove_conflicting_pci_devices(struct pci_dev *pdev, const char *name)
{
+ struct screen_info *si = &screen_info;
bool primary = false;
resource_size_t base, size;
int bar, ret = 0;
@@ -353,7 +355,7 @@ int aperture_remove_conflicting_pci_devices(struct pci_dev *pdev, const char *na
if (pdev == vga_default_device())
primary = true;
- if (primary)
+ if (pdev == screen_info_pci_dev(si))
sysfb_disable();
for (bar = 0; bar < PCI_STD_NUM_BARS; ++bar) {
--
2.45.2
1 year, 4 months
- 5
- 7
Re: [PATCH] ocfs2: fix null-ptr-deref when journal load failed.
by Julian Sun
CC stable
Julian Sun <sunjunchao2870(a)gmail.com> 于2024年8月19日周一 21:11写道：
>
> During the mounting process, if the jbd2_journal_load()
> call fails, it will internally invoke journal_reset()
> ->journal_fail_superblock(), which sets journal->j_sb_buffer
> to NULL. Subsequently, ocfs2_journal_shutdown() calls
> jbd2_journal_flush()->jbd2_cleanup_journal_tail()->
> __jbd2_update_log_tail()->jbd2_journal_update_sb_log_tail()
> ->lock_buffer(journal->j_sb_buffer), resulting in a
> null-pointer dereference error.
>
> To resolve this issue, a new state OCFS2_JOURNAL_INITED
> has been introduced to replace the previous functionality
> of OCFS2_JOURNAL_LOADED, the original OCFS2_JOURNAL_LOADED
> is only set when ocfs2_journal_load() is successful.
> The jbd2_journal_flush() function is allowed to be called
> only when this flag is set. The logic here is that if the
> journal has even not been successfully loaded, there is
> no need to flush the journal.
>
> Link: https://syzkaller.appspot.com/bug?extid=05b9b39d8bdfe1a0861f
> Reported-by: syzbot+05b9b39d8bdfe1a0861f(a)syzkaller.appspotmail.com
> Signed-off-by: Julian Sun <sunjunchao2870(a)gmail.com>
> ---
> fs/ocfs2/journal.c | 9 ++++++---
> fs/ocfs2/journal.h | 1 +
> 2 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
> index 530fba34f6d3..6f837296048f 100644
> --- a/fs/ocfs2/journal.c
> +++ b/fs/ocfs2/journal.c
> @@ -968,7 +968,7 @@ int ocfs2_journal_init(struct ocfs2_super *osb, int *dirty)
>
> ocfs2_set_journal_params(osb);
>
> - journal->j_state = OCFS2_JOURNAL_LOADED;
> + journal->j_state = OCFS2_JOURNAL_INITED;
>
> status = 0;
> done:
> @@ -1039,6 +1039,7 @@ void ocfs2_journal_shutdown(struct ocfs2_super *osb)
> int status = 0;
> struct inode *inode = NULL;
> int num_running_trans = 0;
> + enum ocfs2_journal_state state;
>
> BUG_ON(!osb);
>
> @@ -1047,8 +1048,9 @@ void ocfs2_journal_shutdown(struct ocfs2_super *osb)
> goto done;
>
> inode = journal->j_inode;
> + state = journal->j_state;
>
> - if (journal->j_state != OCFS2_JOURNAL_LOADED)
> + if (state != OCFS2_JOURNAL_INITED)
> goto done;
>
> /* need to inc inode use count - jbd2_journal_destroy will iput. */
> @@ -1076,7 +1078,7 @@ void ocfs2_journal_shutdown(struct ocfs2_super *osb)
>
> BUG_ON(atomic_read(&(osb->journal->j_num_trans)) != 0);
>
> - if (ocfs2_mount_local(osb)) {
> + if (ocfs2_mount_local(osb) && state == OCFS2_JOURNAL_LOADED) {
> jbd2_journal_lock_updates(journal->j_journal);
> status = jbd2_journal_flush(journal->j_journal, 0);
> jbd2_journal_unlock_updates(journal->j_journal);
> @@ -1174,6 +1176,7 @@ int ocfs2_journal_load(struct ocfs2_journal *journal, int local, int replayed)
> }
> } else
> osb->commit_task = NULL;
> + journal->j_state = OCFS2_JOURNAL_LOADED;
>
> done:
> return status;
> diff --git a/fs/ocfs2/journal.h b/fs/ocfs2/journal.h
> index e3c3a35dc5e0..a80f76a8fa0e 100644
> --- a/fs/ocfs2/journal.h
> +++ b/fs/ocfs2/journal.h
> @@ -15,6 +15,7 @@
>
> enum ocfs2_journal_state {
> OCFS2_JOURNAL_FREE = 0,
> + OCFS2_JOURNAL_INITED,
> OCFS2_JOURNAL_LOADED,
> OCFS2_JOURNAL_IN_SHUTDOWN,
> };
> --
> 2.39.2
>
--
Julian Sun <sunjunchao2870(a)gmail.com>
1 year, 4 months
- 1
- 0
[PATCH] arm-cci: Fix refcount leak in cci_probe
by Ma Ke
Add the missing of_node_put() to release the refcount incremented
by of_find_matching_node().
Cc: stable(a)vger.kernel.org
Fixes: f6b9e83ce05e ("arm-cci: Rearrange code for splitting PMU vs driver code")
Signed-off-by: Ma Ke <make24(a)iscas.ac.cn>
---
drivers/bus/arm-cci.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
index b8184a903583..6be7b05b5ff1 100644
--- a/drivers/bus/arm-cci.c
+++ b/drivers/bus/arm-cci.c
@@ -548,6 +548,7 @@ static int cci_probe(void)
}
if (ret || !cci_ctrl_base) {
WARN(1, "unable to ioremap CCI ctrl\n");
+ of_node_put(np);
return -ENXIO;
}
--
2.25.1
1 year, 4 months
- 2
- 1
[PATCH v3 1/2] drm/vmwgfx: Prevent unmapping active read buffers
by Zack Rusin
The kms paths keep a persistent map active to read and compare the cursor
buffer. These maps can race with each other in simple scenario where:
a) buffer "a" mapped for update
b) buffer "a" mapped for compare
c) do the compare
d) unmap "a" for compare
e) update the cursor
f) unmap "a" for update
At step "e" the buffer has been unmapped and the read contents is bogus.
Prevent unmapping of active read buffers by simply keeping a count of
how many paths have currently active maps and unmap only when the count
reaches 0.
v2: Update doc strings
Fixes: 485d98d472d5 ("drm/vmwgfx: Add support for CursorMob and CursorBypass 4")
Cc: Broadcom internal kernel review list <bcm-kernel-feedback-list(a)broadcom.com>
Cc: dri-devel(a)lists.freedesktop.org
Cc: <stable(a)vger.kernel.org> # v5.19+
Signed-off-by: Zack Rusin <zack.rusin(a)broadcom.com>
---
drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 13 +++++++++++--
drivers/gpu/drm/vmwgfx/vmwgfx_bo.h | 3 +++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_bo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_bo.c
index f42ebc4a7c22..a0e433fbcba6 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_bo.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_bo.c
@@ -360,6 +360,8 @@ void *vmw_bo_map_and_cache_size(struct vmw_bo *vbo, size_t size)
void *virtual;
int ret;
+ atomic_inc(&vbo->map_count);
+
virtual = ttm_kmap_obj_virtual(&vbo->map, ¬_used);
if (virtual)
return virtual;
@@ -383,11 +385,17 @@ void *vmw_bo_map_and_cache_size(struct vmw_bo *vbo, size_t size)
*/
void vmw_bo_unmap(struct vmw_bo *vbo)
{
+ int map_count;
+
if (vbo->map.bo == NULL)
return;
- ttm_bo_kunmap(&vbo->map);
- vbo->map.bo = NULL;
+ map_count = atomic_dec_return(&vbo->map_count);
+
+ if (!map_count) {
+ ttm_bo_kunmap(&vbo->map);
+ vbo->map.bo = NULL;
+ }
}
@@ -421,6 +429,7 @@ static int vmw_bo_init(struct vmw_private *dev_priv,
vmw_bo->tbo.priority = 3;
vmw_bo->res_tree = RB_ROOT;
xa_init(&vmw_bo->detached_resources);
+ atomic_set(&vmw_bo->map_count, 0);
params->size = ALIGN(params->size, PAGE_SIZE);
drm_gem_private_object_init(vdev, &vmw_bo->tbo.base, params->size);
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_bo.h b/drivers/gpu/drm/vmwgfx/vmwgfx_bo.h
index 62b4342d5f7c..43b5439ec9f7 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_bo.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_bo.h
@@ -71,6 +71,8 @@ struct vmw_bo_params {
* @map: Kmap object for semi-persistent mappings
* @res_tree: RB tree of resources using this buffer object as a backing MOB
* @res_prios: Eviction priority counts for attached resources
+ * @map_count: The number of currently active maps. Will differ from the
+ * cpu_writers because it includes kernel maps.
* @cpu_writers: Number of synccpu write grabs. Protected by reservation when
* increased. May be decreased without reservation.
* @dx_query_ctx: DX context if this buffer object is used as a DX query MOB
@@ -90,6 +92,7 @@ struct vmw_bo {
u32 res_prios[TTM_MAX_BO_PRIORITY];
struct xarray detached_resources;
+ atomic_t map_count;
atomic_t cpu_writers;
/* Not ref-counted. Protected by binding_mutex */
struct vmw_resource *dx_query_ctx;
--
2.43.0
1 year, 4 months
- 4
- 6
[PATCH] usb: typec: fsa4480: Relax CHIP_ID check
by Luca Weiss
Some FSA4480-compatible chips like the OCP96011 used on Fairphone 5
return 0x00 from the CHIP_ID register. Handle that gracefully and only
fail probe when the I2C read has failed.
With this the dev_dbg will print 0 but otherwise continue working.
[ 0.251581] fsa4480 1-0042: Found FSA4480 v0.0 (Vendor ID = 0)
Cc: stable(a)vger.kernel.org
Fixes: e885f5f1f2b4 ("usb: typec: fsa4480: Check if the chip is really there")
Signed-off-by: Luca Weiss <luca.weiss(a)fairphone.com>
---
drivers/usb/typec/mux/fsa4480.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/typec/mux/fsa4480.c b/drivers/usb/typec/mux/fsa4480.c
index cd235339834b..f71dba8bf07c 100644
--- a/drivers/usb/typec/mux/fsa4480.c
+++ b/drivers/usb/typec/mux/fsa4480.c
@@ -274,7 +274,7 @@ static int fsa4480_probe(struct i2c_client *client)
return dev_err_probe(dev, PTR_ERR(fsa->regmap), "failed to initialize regmap\n");
ret = regmap_read(fsa->regmap, FSA4480_DEVICE_ID, &val);
- if (ret || !val)
+ if (ret)
return dev_err_probe(dev, -ENODEV, "FSA4480 not found\n");
dev_dbg(dev, "Found FSA4480 v%lu.%lu (Vendor ID = %lu)\n",
---
base-commit: ccdbf91fdf5a71881ef32b41797382c4edd6f670
change-id: 20240818-fsa4480-chipid-fix-2c7cf5810135
Best regards,
--
Luca Weiss <luca.weiss(a)fairphone.com>
1 year, 4 months
- 3
- 3
FAILED: patch "[PATCH] media: uvcvideo: Fix integer overflow calculating timestamp" failed to apply to 4.19-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.19.y
git checkout FETCH_HEAD
git cherry-pick -x 8676a5e796fa18f55897ca36a94b2adf7f73ebd1
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024072903-hamster-magical-c334@gregkh' --subject-prefix 'PATCH 4.19.y' HEAD^..
Possible dependencies:
8676a5e796fa ("media: uvcvideo: Fix integer overflow calculating timestamp")
9e56380ae625 ("media: uvcvideo: Rename debug functions")
ed4c5fa4d804 ("media: uvcvideo: use dev_printk() for uvc_trace()")
59e92bf62771 ("media: uvcvideo: New macro uvc_trace_cont")
69df09547e7a ("media: uvcvideo: Use dev_ printk aliases")
2886477ff987 ("media: uvcvideo: Implement UVC_EXT_GPIO_UNIT")
351509c604dc ("media: uvcvideo: Move guid to entity")
dc9455ffae02 ("media: uvcvideo: Accept invalid bFormatIndex and bFrameIndex values")
b400b6f28af0 ("media: uvcvideo: Force UVC version to 1.0a for 1bcf:0b40")
8a652a17e3c0 ("media: uvcvideo: Ensure all probed info is returned to v4l2")
f875bcc375c7 ("media: uvcvideo: Fix dereference of out-of-bound list iterator")
d6834b4b58d1 ("media: uvcvideo: Set media controller entity functions")
1771e9fb67e2 ("media: Use fallthrough pseudo-keyword")
85872f861d4c ("media: venus: Mark last capture buffer")
0febf9236970 ("media: venus: helpers: Done buffers per queue type")
e6089feca460 ("media: m88ds3103: Add support for ds3103b demod")
ab1eda449c6e ("media: venus: vdec: handle 10bit bitstreams")
4ebf969375bc ("media: venus: introduce core selection")
7482a983dea3 ("media: venus: redesign clocks and pm domains control")
fd1ee315dcd4 ("media: venus: cache vb payload to be used by clock scaling")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 8676a5e796fa18f55897ca36a94b2adf7f73ebd1 Mon Sep 17 00:00:00 2001
From: Ricardo Ribalda <ribalda(a)chromium.org>
Date: Mon, 10 Jun 2024 19:17:49 +0000
Subject: [PATCH] media: uvcvideo: Fix integer overflow calculating timestamp
The function uvc_video_clock_update() supports a single SOF overflow. Or
in other words, the maximum difference between the first ant the last
timestamp can be 4096 ticks or 4.096 seconds.
This results in a maximum value for y2 of: 0x12FBECA00, that overflows
32bits.
y2 = (u32)ktime_to_ns(ktime_sub(last->host_time, first->host_time)) + y1;
Extend the size of y2 to u64 to support all its values.
Without this patch:
# yavta -s 1920x1080 -f YUYV -t 1/5 -c /dev/video0
Device /dev/v4l/by-id/usb-Shine-Optics_Integrated_Camera_0001-video-index0 opened.
Device `Integrated Camera: Integrated C' on `usb-0000:00:14.0-6' (driver 'uvcvideo') supports video, capture, without mplanes.
Video format set: YUYV (56595559) 1920x1080 (stride 3840) field none buffer size 4147200
Video format: YUYV (56595559) 1920x1080 (stride 3840) field none buffer size 4147200
Current frame rate: 1/5
Setting frame rate to: 1/5
Frame rate set: 1/5
8 buffers requested.
length: 4147200 offset: 0 timestamp type/source: mono/SoE
Buffer 0/0 mapped at address 0x7947ea94c000.
length: 4147200 offset: 4149248 timestamp type/source: mono/SoE
Buffer 1/0 mapped at address 0x7947ea557000.
length: 4147200 offset: 8298496 timestamp type/source: mono/SoE
Buffer 2/0 mapped at address 0x7947ea162000.
length: 4147200 offset: 12447744 timestamp type/source: mono/SoE
Buffer 3/0 mapped at address 0x7947e9d6d000.
length: 4147200 offset: 16596992 timestamp type/source: mono/SoE
Buffer 4/0 mapped at address 0x7947e9978000.
length: 4147200 offset: 20746240 timestamp type/source: mono/SoE
Buffer 5/0 mapped at address 0x7947e9583000.
length: 4147200 offset: 24895488 timestamp type/source: mono/SoE
Buffer 6/0 mapped at address 0x7947e918e000.
length: 4147200 offset: 29044736 timestamp type/source: mono/SoE
Buffer 7/0 mapped at address 0x7947e8d99000.
0 (0) [-] none 0 4147200 B 507.554210 508.874282 242.836 fps ts mono/SoE
1 (1) [-] none 2 4147200 B 508.886298 509.074289 0.751 fps ts mono/SoE
2 (2) [-] none 3 4147200 B 509.076362 509.274307 5.261 fps ts mono/SoE
3 (3) [-] none 4 4147200 B 509.276371 509.474336 5.000 fps ts mono/SoE
4 (4) [-] none 5 4147200 B 509.476394 509.674394 4.999 fps ts mono/SoE
5 (5) [-] none 6 4147200 B 509.676506 509.874345 4.997 fps ts mono/SoE
6 (6) [-] none 7 4147200 B 509.876430 510.074370 5.002 fps ts mono/SoE
7 (7) [-] none 8 4147200 B 510.076434 510.274365 5.000 fps ts mono/SoE
8 (0) [-] none 9 4147200 B 510.276421 510.474333 5.000 fps ts mono/SoE
9 (1) [-] none 10 4147200 B 510.476391 510.674429 5.001 fps ts mono/SoE
10 (2) [-] none 11 4147200 B 510.676434 510.874283 4.999 fps ts mono/SoE
11 (3) [-] none 12 4147200 B 510.886264 511.074349 4.766 fps ts mono/SoE
12 (4) [-] none 13 4147200 B 511.070577 511.274304 5.426 fps ts mono/SoE
13 (5) [-] none 14 4147200 B 511.286249 511.474301 4.637 fps ts mono/SoE
14 (6) [-] none 15 4147200 B 511.470542 511.674251 5.426 fps ts mono/SoE
15 (7) [-] none 16 4147200 B 511.672651 511.874337 4.948 fps ts mono/SoE
16 (0) [-] none 17 4147200 B 511.873988 512.074462 4.967 fps ts mono/SoE
17 (1) [-] none 18 4147200 B 512.075982 512.278296 4.951 fps ts mono/SoE
18 (2) [-] none 19 4147200 B 512.282631 512.482423 4.839 fps ts mono/SoE
19 (3) [-] none 20 4147200 B 518.986637 512.686333 0.149 fps ts mono/SoE
20 (4) [-] none 21 4147200 B 518.342709 512.886386 -1.553 fps ts mono/SoE
21 (5) [-] none 22 4147200 B 517.909812 513.090360 -2.310 fps ts mono/SoE
22 (6) [-] none 23 4147200 B 517.590775 513.294454 -3.134 fps ts mono/SoE
23 (7) [-] none 24 4147200 B 513.298465 513.494335 -0.233 fps ts mono/SoE
24 (0) [-] none 25 4147200 B 513.510273 513.698375 4.721 fps ts mono/SoE
25 (1) [-] none 26 4147200 B 513.698904 513.902327 5.301 fps ts mono/SoE
26 (2) [-] none 27 4147200 B 513.895971 514.102348 5.074 fps ts mono/SoE
27 (3) [-] none 28 4147200 B 514.099091 514.306337 4.923 fps ts mono/SoE
28 (4) [-] none 29 4147200 B 514.310348 514.510567 4.734 fps ts mono/SoE
29 (5) [-] none 30 4147200 B 514.509295 514.710367 5.026 fps ts mono/SoE
30 (6) [-] none 31 4147200 B 521.532513 514.914398 0.142 fps ts mono/SoE
31 (7) [-] none 32 4147200 B 520.885277 515.118385 -1.545 fps ts mono/SoE
32 (0) [-] none 33 4147200 B 520.411140 515.318336 -2.109 fps ts mono/SoE
33 (1) [-] none 34 4147200 B 515.325425 515.522278 -0.197 fps ts mono/SoE
34 (2) [-] none 35 4147200 B 515.538276 515.726423 4.698 fps ts mono/SoE
35 (3) [-] none 36 4147200 B 515.720767 515.930373 5.480 fps ts mono/SoE
Cc: stable(a)vger.kernel.org
Fixes: 66847ef013cc ("[media] uvcvideo: Add UVC timestamps support")
Signed-off-by: Ricardo Ribalda <ribalda(a)chromium.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com>
Link: https://lore.kernel.org/r/20240610-hwtimestamp-followup-v1-2-f9eaed7be7f0@c…
Signed-off-by: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com>
diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c
index aebcf9b25a16..4dfc1b86bdee 100644
--- a/drivers/media/usb/uvc/uvc_video.c
+++ b/drivers/media/usb/uvc/uvc_video.c
@@ -760,11 +760,11 @@ void uvc_video_clock_update(struct uvc_streaming *stream,
unsigned long flags;
u64 timestamp;
u32 delta_stc;
- u32 y1, y2;
+ u32 y1;
u32 x1, x2;
u32 mean;
u32 sof;
- u64 y;
+ u64 y, y2;
if (!uvc_hw_timestamps_param)
return;
@@ -816,7 +816,7 @@ void uvc_video_clock_update(struct uvc_streaming *stream,
sof = y;
uvc_dbg(stream->dev, CLOCK,
- "%s: PTS %u y %llu.%06llu SOF %u.%06llu (x1 %u x2 %u y1 %u y2 %u SOF offset %u)\n",
+ "%s: PTS %u y %llu.%06llu SOF %u.%06llu (x1 %u x2 %u y1 %u y2 %llu SOF offset %u)\n",
stream->dev->name, buf->pts,
y >> 16, div_u64((y & 0xffff) * 1000000, 65536),
sof >> 16, div_u64(((u64)sof & 0xffff) * 1000000LLU, 65536),
@@ -831,7 +831,7 @@ void uvc_video_clock_update(struct uvc_streaming *stream,
goto done;
y1 = NSEC_PER_SEC;
- y2 = (u32)ktime_to_ns(ktime_sub(last->host_time, first->host_time)) + y1;
+ y2 = ktime_to_ns(ktime_sub(last->host_time, first->host_time)) + y1;
/*
* Interpolated and host SOF timestamps can wrap around at slightly
@@ -852,7 +852,7 @@ void uvc_video_clock_update(struct uvc_streaming *stream,
timestamp = ktime_to_ns(first->host_time) + y - y1;
uvc_dbg(stream->dev, CLOCK,
- "%s: SOF %u.%06llu y %llu ts %llu buf ts %llu (x1 %u/%u/%u x2 %u/%u/%u y1 %u y2 %u)\n",
+ "%s: SOF %u.%06llu y %llu ts %llu buf ts %llu (x1 %u/%u/%u x2 %u/%u/%u y1 %u y2 %llu)\n",
stream->dev->name,
sof >> 16, div_u64(((u64)sof & 0xffff) * 1000000LLU, 65536),
y, timestamp, vbuf->vb2_buf.timestamp,
1 year, 4 months
- 2
- 1
FAILED: patch "[PATCH] media: uvcvideo: Fix integer overflow calculating timestamp" failed to apply to 5.4-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y
git checkout FETCH_HEAD
git cherry-pick -x 8676a5e796fa18f55897ca36a94b2adf7f73ebd1
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024072901-duct-manager-b71e@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^..
Possible dependencies:
8676a5e796fa ("media: uvcvideo: Fix integer overflow calculating timestamp")
9e56380ae625 ("media: uvcvideo: Rename debug functions")
ed4c5fa4d804 ("media: uvcvideo: use dev_printk() for uvc_trace()")
59e92bf62771 ("media: uvcvideo: New macro uvc_trace_cont")
69df09547e7a ("media: uvcvideo: Use dev_ printk aliases")
2886477ff987 ("media: uvcvideo: Implement UVC_EXT_GPIO_UNIT")
351509c604dc ("media: uvcvideo: Move guid to entity")
dc9455ffae02 ("media: uvcvideo: Accept invalid bFormatIndex and bFrameIndex values")
b400b6f28af0 ("media: uvcvideo: Force UVC version to 1.0a for 1bcf:0b40")
8a652a17e3c0 ("media: uvcvideo: Ensure all probed info is returned to v4l2")
f875bcc375c7 ("media: uvcvideo: Fix dereference of out-of-bound list iterator")
d6834b4b58d1 ("media: uvcvideo: Set media controller entity functions")
1771e9fb67e2 ("media: Use fallthrough pseudo-keyword")
85872f861d4c ("media: venus: Mark last capture buffer")
0febf9236970 ("media: venus: helpers: Done buffers per queue type")
e6089feca460 ("media: m88ds3103: Add support for ds3103b demod")
ab1eda449c6e ("media: venus: vdec: handle 10bit bitstreams")
4ebf969375bc ("media: venus: introduce core selection")
7482a983dea3 ("media: venus: redesign clocks and pm domains control")
fd1ee315dcd4 ("media: venus: cache vb payload to be used by clock scaling")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 8676a5e796fa18f55897ca36a94b2adf7f73ebd1 Mon Sep 17 00:00:00 2001
From: Ricardo Ribalda <ribalda(a)chromium.org>
Date: Mon, 10 Jun 2024 19:17:49 +0000
Subject: [PATCH] media: uvcvideo: Fix integer overflow calculating timestamp
The function uvc_video_clock_update() supports a single SOF overflow. Or
in other words, the maximum difference between the first ant the last
timestamp can be 4096 ticks or 4.096 seconds.
This results in a maximum value for y2 of: 0x12FBECA00, that overflows
32bits.
y2 = (u32)ktime_to_ns(ktime_sub(last->host_time, first->host_time)) + y1;
Extend the size of y2 to u64 to support all its values.
Without this patch:
# yavta -s 1920x1080 -f YUYV -t 1/5 -c /dev/video0
Device /dev/v4l/by-id/usb-Shine-Optics_Integrated_Camera_0001-video-index0 opened.
Device `Integrated Camera: Integrated C' on `usb-0000:00:14.0-6' (driver 'uvcvideo') supports video, capture, without mplanes.
Video format set: YUYV (56595559) 1920x1080 (stride 3840) field none buffer size 4147200
Video format: YUYV (56595559) 1920x1080 (stride 3840) field none buffer size 4147200
Current frame rate: 1/5
Setting frame rate to: 1/5
Frame rate set: 1/5
8 buffers requested.
length: 4147200 offset: 0 timestamp type/source: mono/SoE
Buffer 0/0 mapped at address 0x7947ea94c000.
length: 4147200 offset: 4149248 timestamp type/source: mono/SoE
Buffer 1/0 mapped at address 0x7947ea557000.
length: 4147200 offset: 8298496 timestamp type/source: mono/SoE
Buffer 2/0 mapped at address 0x7947ea162000.
length: 4147200 offset: 12447744 timestamp type/source: mono/SoE
Buffer 3/0 mapped at address 0x7947e9d6d000.
length: 4147200 offset: 16596992 timestamp type/source: mono/SoE
Buffer 4/0 mapped at address 0x7947e9978000.
length: 4147200 offset: 20746240 timestamp type/source: mono/SoE
Buffer 5/0 mapped at address 0x7947e9583000.
length: 4147200 offset: 24895488 timestamp type/source: mono/SoE
Buffer 6/0 mapped at address 0x7947e918e000.
length: 4147200 offset: 29044736 timestamp type/source: mono/SoE
Buffer 7/0 mapped at address 0x7947e8d99000.
0 (0) [-] none 0 4147200 B 507.554210 508.874282 242.836 fps ts mono/SoE
1 (1) [-] none 2 4147200 B 508.886298 509.074289 0.751 fps ts mono/SoE
2 (2) [-] none 3 4147200 B 509.076362 509.274307 5.261 fps ts mono/SoE
3 (3) [-] none 4 4147200 B 509.276371 509.474336 5.000 fps ts mono/SoE
4 (4) [-] none 5 4147200 B 509.476394 509.674394 4.999 fps ts mono/SoE
5 (5) [-] none 6 4147200 B 509.676506 509.874345 4.997 fps ts mono/SoE
6 (6) [-] none 7 4147200 B 509.876430 510.074370 5.002 fps ts mono/SoE
7 (7) [-] none 8 4147200 B 510.076434 510.274365 5.000 fps ts mono/SoE
8 (0) [-] none 9 4147200 B 510.276421 510.474333 5.000 fps ts mono/SoE
9 (1) [-] none 10 4147200 B 510.476391 510.674429 5.001 fps ts mono/SoE
10 (2) [-] none 11 4147200 B 510.676434 510.874283 4.999 fps ts mono/SoE
11 (3) [-] none 12 4147200 B 510.886264 511.074349 4.766 fps ts mono/SoE
12 (4) [-] none 13 4147200 B 511.070577 511.274304 5.426 fps ts mono/SoE
13 (5) [-] none 14 4147200 B 511.286249 511.474301 4.637 fps ts mono/SoE
14 (6) [-] none 15 4147200 B 511.470542 511.674251 5.426 fps ts mono/SoE
15 (7) [-] none 16 4147200 B 511.672651 511.874337 4.948 fps ts mono/SoE
16 (0) [-] none 17 4147200 B 511.873988 512.074462 4.967 fps ts mono/SoE
17 (1) [-] none 18 4147200 B 512.075982 512.278296 4.951 fps ts mono/SoE
18 (2) [-] none 19 4147200 B 512.282631 512.482423 4.839 fps ts mono/SoE
19 (3) [-] none 20 4147200 B 518.986637 512.686333 0.149 fps ts mono/SoE
20 (4) [-] none 21 4147200 B 518.342709 512.886386 -1.553 fps ts mono/SoE
21 (5) [-] none 22 4147200 B 517.909812 513.090360 -2.310 fps ts mono/SoE
22 (6) [-] none 23 4147200 B 517.590775 513.294454 -3.134 fps ts mono/SoE
23 (7) [-] none 24 4147200 B 513.298465 513.494335 -0.233 fps ts mono/SoE
24 (0) [-] none 25 4147200 B 513.510273 513.698375 4.721 fps ts mono/SoE
25 (1) [-] none 26 4147200 B 513.698904 513.902327 5.301 fps ts mono/SoE
26 (2) [-] none 27 4147200 B 513.895971 514.102348 5.074 fps ts mono/SoE
27 (3) [-] none 28 4147200 B 514.099091 514.306337 4.923 fps ts mono/SoE
28 (4) [-] none 29 4147200 B 514.310348 514.510567 4.734 fps ts mono/SoE
29 (5) [-] none 30 4147200 B 514.509295 514.710367 5.026 fps ts mono/SoE
30 (6) [-] none 31 4147200 B 521.532513 514.914398 0.142 fps ts mono/SoE
31 (7) [-] none 32 4147200 B 520.885277 515.118385 -1.545 fps ts mono/SoE
32 (0) [-] none 33 4147200 B 520.411140 515.318336 -2.109 fps ts mono/SoE
33 (1) [-] none 34 4147200 B 515.325425 515.522278 -0.197 fps ts mono/SoE
34 (2) [-] none 35 4147200 B 515.538276 515.726423 4.698 fps ts mono/SoE
35 (3) [-] none 36 4147200 B 515.720767 515.930373 5.480 fps ts mono/SoE
Cc: stable(a)vger.kernel.org
Fixes: 66847ef013cc ("[media] uvcvideo: Add UVC timestamps support")
Signed-off-by: Ricardo Ribalda <ribalda(a)chromium.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com>
Link: https://lore.kernel.org/r/20240610-hwtimestamp-followup-v1-2-f9eaed7be7f0@c…
Signed-off-by: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com>
diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c
index aebcf9b25a16..4dfc1b86bdee 100644
--- a/drivers/media/usb/uvc/uvc_video.c
+++ b/drivers/media/usb/uvc/uvc_video.c
@@ -760,11 +760,11 @@ void uvc_video_clock_update(struct uvc_streaming *stream,
unsigned long flags;
u64 timestamp;
u32 delta_stc;
- u32 y1, y2;
+ u32 y1;
u32 x1, x2;
u32 mean;
u32 sof;
- u64 y;
+ u64 y, y2;
if (!uvc_hw_timestamps_param)
return;
@@ -816,7 +816,7 @@ void uvc_video_clock_update(struct uvc_streaming *stream,
sof = y;
uvc_dbg(stream->dev, CLOCK,
- "%s: PTS %u y %llu.%06llu SOF %u.%06llu (x1 %u x2 %u y1 %u y2 %u SOF offset %u)\n",
+ "%s: PTS %u y %llu.%06llu SOF %u.%06llu (x1 %u x2 %u y1 %u y2 %llu SOF offset %u)\n",
stream->dev->name, buf->pts,
y >> 16, div_u64((y & 0xffff) * 1000000, 65536),
sof >> 16, div_u64(((u64)sof & 0xffff) * 1000000LLU, 65536),
@@ -831,7 +831,7 @@ void uvc_video_clock_update(struct uvc_streaming *stream,
goto done;
y1 = NSEC_PER_SEC;
- y2 = (u32)ktime_to_ns(ktime_sub(last->host_time, first->host_time)) + y1;
+ y2 = ktime_to_ns(ktime_sub(last->host_time, first->host_time)) + y1;
/*
* Interpolated and host SOF timestamps can wrap around at slightly
@@ -852,7 +852,7 @@ void uvc_video_clock_update(struct uvc_streaming *stream,
timestamp = ktime_to_ns(first->host_time) + y - y1;
uvc_dbg(stream->dev, CLOCK,
- "%s: SOF %u.%06llu y %llu ts %llu buf ts %llu (x1 %u/%u/%u x2 %u/%u/%u y1 %u y2 %u)\n",
+ "%s: SOF %u.%06llu y %llu ts %llu buf ts %llu (x1 %u/%u/%u x2 %u/%u/%u y1 %u y2 %llu)\n",
stream->dev->name,
sof >> 16, div_u64(((u64)sof & 0xffff) * 1000000LLU, 65536),
y, timestamp, vbuf->vb2_buf.timestamp,
1 year, 4 months
- 2
- 1
[PATCH 3/5] drm/xe/display: Make display suspend/resume work on discrete
by Maarten Lankhorst
We should unpin before evicting all memory, and repin after GT resume.
This way, we preserve the contents of the framebuffers, and won't hang
on resume due to migration engine not being restored yet.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst(a)linux.intel.com>
Fixes: dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
Cc: <stable(a)vger.kernel.org> # v6.8+
---
drivers/gpu/drm/xe/display/xe_display.c | 23 +++++++++++++++++++++++
drivers/gpu/drm/xe/xe_pm.c | 11 ++++++-----
2 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index 7a1d39e1bbd7d..76a834b72d384 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -286,6 +286,27 @@ static bool suspend_to_idle(void)
return false;
}
+static void xe_display_flush_cleanup_work(struct xe_device *xe)
+{
+ struct intel_crtc *crtc;
+
+ for_each_intel_crtc(&xe->drm, crtc) {
+ struct drm_crtc_commit *commit;
+
+ spin_lock(&crtc->base.commit_lock);
+ commit = list_first_entry_or_null(&crtc->base.commit_list,
+ struct drm_crtc_commit, commit_entry);
+ if (commit)
+ drm_crtc_commit_get(commit);
+ spin_unlock(&crtc->base.commit_lock);
+
+ if (commit) {
+ wait_for_completion(&commit->cleanup_done);
+ drm_crtc_commit_put(commit);
+ }
+ }
+}
+
void xe_display_pm_suspend(struct xe_device *xe, bool runtime)
{
bool s2idle = suspend_to_idle();
@@ -306,6 +327,8 @@ void xe_display_pm_suspend(struct xe_device *xe, bool runtime)
if (!runtime)
intel_display_driver_suspend(xe);
+ xe_display_flush_cleanup_work(xe);
+
intel_dp_mst_suspend(xe);
intel_hpd_cancel_work(xe);
diff --git a/drivers/gpu/drm/xe/xe_pm.c b/drivers/gpu/drm/xe/xe_pm.c
index 9f3c14fd9f337..fcfb49af8c891 100644
--- a/drivers/gpu/drm/xe/xe_pm.c
+++ b/drivers/gpu/drm/xe/xe_pm.c
@@ -93,13 +93,13 @@ int xe_pm_suspend(struct xe_device *xe)
for_each_gt(gt, xe, id)
xe_gt_suspend_prepare(gt);
+ xe_display_pm_suspend(xe, false);
+
/* FIXME: Super racey... */
err = xe_bo_evict_all(xe);
if (err)
goto err;
- xe_display_pm_suspend(xe, false);
-
for_each_gt(gt, xe, id) {
err = xe_gt_suspend(gt);
if (err) {
@@ -154,11 +154,11 @@ int xe_pm_resume(struct xe_device *xe)
xe_irq_resume(xe);
- xe_display_pm_resume(xe, false);
-
for_each_gt(gt, xe, id)
xe_gt_resume(gt);
+ xe_display_pm_resume(xe, false);
+
err = xe_bo_restore_user(xe);
if (err)
goto err;
@@ -367,10 +367,11 @@ int xe_pm_runtime_suspend(struct xe_device *xe)
mutex_unlock(&xe->mem_access.vram_userfault.lock);
if (xe->d3cold.allowed) {
+ xe_display_pm_suspend(xe, true);
+
err = xe_bo_evict_all(xe);
if (err)
goto out;
- xe_display_pm_suspend(xe, true);
}
for_each_gt(gt, xe, id) {
--
2.45.2
1 year, 4 months
- 1
- 0
[PATCH 1/5] drm/xe: Read out rawclk_freq for display
by Maarten Lankhorst
Failing to read out rawclk makes it impossible to read out backlight,
which results in backlight not working when the backlight is off during
boot, or when reloading the module.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst(a)linux.intel.com>
Fixes: 44e694958b95 ("drm/xe/display: Implement display support")
Cc: <stable(a)vger.kernel.org> # v6.8+
---
drivers/gpu/drm/xe/display/xe_display.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index ca4468c820788..65d7a5040270e 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -157,6 +157,9 @@ int xe_display_init_noirq(struct xe_device *xe)
intel_display_device_info_runtime_init(xe);
+ RUNTIME_INFO(xe)->rawclk_freq = intel_read_rawclk(xe);
+ drm_dbg(&xe->drm, "rawclk rate: %d kHz\n", RUNTIME_INFO(xe)->rawclk_freq);
+
err = intel_display_driver_probe_noirq(xe);
if (err) {
intel_opregion_cleanup(xe);
--
2.45.2
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] dm suspend: return -ERESTARTSYS instead of -EINTR" failed to apply to 5.10-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 1e1fd567d32fcf7544c6e09e0e5bc6c650da6e23
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081926-dumpling-ecard-9941@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
1e1fd567d32f ("dm suspend: return -ERESTARTSYS instead of -EINTR")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 1e1fd567d32fcf7544c6e09e0e5bc6c650da6e23 Mon Sep 17 00:00:00 2001
From: Mikulas Patocka <mpatocka(a)redhat.com>
Date: Tue, 13 Aug 2024 12:38:51 +0200
Subject: [PATCH] dm suspend: return -ERESTARTSYS instead of -EINTR
This commit changes device mapper, so that it returns -ERESTARTSYS
instead of -EINTR when it is interrupted by a signal (so that the ioctl
can be restarted).
The manpage signal(7) says that the ioctl function should be restarted if
the signal was handled with SA_RESTART.
Signed-off-by: Mikulas Patocka <mpatocka(a)redhat.com>
Cc: stable(a)vger.kernel.org
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 97fab2087df8..87bb90303435 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -2737,7 +2737,7 @@ static int dm_wait_for_bios_completion(struct mapped_device *md, unsigned int ta
break;
if (signal_pending_state(task_state, current)) {
- r = -EINTR;
+ r = -ERESTARTSYS;
break;
}
@@ -2762,7 +2762,7 @@ static int dm_wait_for_completion(struct mapped_device *md, unsigned int task_st
break;
if (signal_pending_state(task_state, current)) {
- r = -EINTR;
+ r = -ERESTARTSYS;
break;
}
1 year, 4 months
- 2
- 1
FAILED: patch "[PATCH] pidfd: prevent creation of pidfds for kthreads" failed to apply to 5.4-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y
git checkout FETCH_HEAD
git cherry-pick -x 3b5bbe798b2451820e74243b738268f51901e7d0
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081916-hastily-apostle-7025@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^..
Possible dependencies:
3b5bbe798b24 ("pidfd: prevent creation of pidfds for kthreads")
83b290c9e3b5 ("pidfd: clone: allow CLONE_THREAD | CLONE_PIDFD together")
64bef697d33b ("pidfd: implement PIDFD_THREAD flag for pidfd_open()")
21e25205d7f9 ("pidfd: don't do_notify_pidfd() if !thread_group_empty()")
cdefbf2324ce ("pidfd: cleanup the usage of __pidfd_prepare's flags")
932562a6045e ("rseq: Split out rseq.h from sched.h")
cba6167f0adb ("restart_block: Trim includes")
f038cc1379c0 ("locking/seqlock: Split out seqlock_types.h")
53d31ba842d9 ("posix-cpu-timers: Split out posix-timers_types.h")
f995443f01b4 ("locking/seqlock: Simplify SEQCOUNT_LOCKNAME()")
58390c8ce1bd ("Merge tag 'iommu-updates-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 3b5bbe798b2451820e74243b738268f51901e7d0 Mon Sep 17 00:00:00 2001
From: Christian Brauner <brauner(a)kernel.org>
Date: Wed, 31 Jul 2024 12:01:12 +0200
Subject: [PATCH] pidfd: prevent creation of pidfds for kthreads
It's currently possible to create pidfds for kthreads but it is unclear
what that is supposed to mean. Until we have use-cases for it and we
figured out what behavior we want block the creation of pidfds for
kthreads.
Link: https://lore.kernel.org/r/20240731-gleis-mehreinnahmen-6bbadd128383@brauner
Fixes: 32fcb426ec00 ("pid: add pidfd_open()")
Cc: stable(a)vger.kernel.org
Signed-off-by: Christian Brauner <brauner(a)kernel.org>
diff --git a/kernel/fork.c b/kernel/fork.c
index cc760491f201..18bdc87209d0 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -2053,11 +2053,24 @@ static int __pidfd_prepare(struct pid *pid, unsigned int flags, struct file **re
*/
int pidfd_prepare(struct pid *pid, unsigned int flags, struct file **ret)
{
- bool thread = flags & PIDFD_THREAD;
-
- if (!pid || !pid_has_task(pid, thread ? PIDTYPE_PID : PIDTYPE_TGID))
+ if (!pid)
return -EINVAL;
+ scoped_guard(rcu) {
+ struct task_struct *tsk;
+
+ if (flags & PIDFD_THREAD)
+ tsk = pid_task(pid, PIDTYPE_PID);
+ else
+ tsk = pid_task(pid, PIDTYPE_TGID);
+ if (!tsk)
+ return -EINVAL;
+
+ /* Don't create pidfds for kernel threads for now. */
+ if (tsk->flags & PF_KTHREAD)
+ return -EINVAL;
+ }
+
return __pidfd_prepare(pid, flags, ret);
}
@@ -2403,6 +2416,12 @@ __latent_entropy struct task_struct *copy_process(
if (clone_flags & CLONE_PIDFD) {
int flags = (clone_flags & CLONE_THREAD) ? PIDFD_THREAD : 0;
+ /* Don't create pidfds for kernel threads for now. */
+ if (args->kthread) {
+ retval = -EINVAL;
+ goto bad_fork_free_pid;
+ }
+
/* Note that no task has been attached to @pid yet. */
retval = __pidfd_prepare(pid, flags, &pidfile);
if (retval < 0)
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] pidfd: prevent creation of pidfds for kthreads" failed to apply to 5.10-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 3b5bbe798b2451820e74243b738268f51901e7d0
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081915-sample-happening-317a@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
3b5bbe798b24 ("pidfd: prevent creation of pidfds for kthreads")
83b290c9e3b5 ("pidfd: clone: allow CLONE_THREAD | CLONE_PIDFD together")
64bef697d33b ("pidfd: implement PIDFD_THREAD flag for pidfd_open()")
21e25205d7f9 ("pidfd: don't do_notify_pidfd() if !thread_group_empty()")
cdefbf2324ce ("pidfd: cleanup the usage of __pidfd_prepare's flags")
932562a6045e ("rseq: Split out rseq.h from sched.h")
cba6167f0adb ("restart_block: Trim includes")
f038cc1379c0 ("locking/seqlock: Split out seqlock_types.h")
53d31ba842d9 ("posix-cpu-timers: Split out posix-timers_types.h")
f995443f01b4 ("locking/seqlock: Simplify SEQCOUNT_LOCKNAME()")
58390c8ce1bd ("Merge tag 'iommu-updates-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 3b5bbe798b2451820e74243b738268f51901e7d0 Mon Sep 17 00:00:00 2001
From: Christian Brauner <brauner(a)kernel.org>
Date: Wed, 31 Jul 2024 12:01:12 +0200
Subject: [PATCH] pidfd: prevent creation of pidfds for kthreads
It's currently possible to create pidfds for kthreads but it is unclear
what that is supposed to mean. Until we have use-cases for it and we
figured out what behavior we want block the creation of pidfds for
kthreads.
Link: https://lore.kernel.org/r/20240731-gleis-mehreinnahmen-6bbadd128383@brauner
Fixes: 32fcb426ec00 ("pid: add pidfd_open()")
Cc: stable(a)vger.kernel.org
Signed-off-by: Christian Brauner <brauner(a)kernel.org>
diff --git a/kernel/fork.c b/kernel/fork.c
index cc760491f201..18bdc87209d0 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -2053,11 +2053,24 @@ static int __pidfd_prepare(struct pid *pid, unsigned int flags, struct file **re
*/
int pidfd_prepare(struct pid *pid, unsigned int flags, struct file **ret)
{
- bool thread = flags & PIDFD_THREAD;
-
- if (!pid || !pid_has_task(pid, thread ? PIDTYPE_PID : PIDTYPE_TGID))
+ if (!pid)
return -EINVAL;
+ scoped_guard(rcu) {
+ struct task_struct *tsk;
+
+ if (flags & PIDFD_THREAD)
+ tsk = pid_task(pid, PIDTYPE_PID);
+ else
+ tsk = pid_task(pid, PIDTYPE_TGID);
+ if (!tsk)
+ return -EINVAL;
+
+ /* Don't create pidfds for kernel threads for now. */
+ if (tsk->flags & PF_KTHREAD)
+ return -EINVAL;
+ }
+
return __pidfd_prepare(pid, flags, ret);
}
@@ -2403,6 +2416,12 @@ __latent_entropy struct task_struct *copy_process(
if (clone_flags & CLONE_PIDFD) {
int flags = (clone_flags & CLONE_THREAD) ? PIDFD_THREAD : 0;
+ /* Don't create pidfds for kernel threads for now. */
+ if (args->kthread) {
+ retval = -EINVAL;
+ goto bad_fork_free_pid;
+ }
+
/* Note that no task has been attached to @pid yet. */
retval = __pidfd_prepare(pid, flags, &pidfile);
if (retval < 0)
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] pidfd: prevent creation of pidfds for kthreads" failed to apply to 5.15-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x 3b5bbe798b2451820e74243b738268f51901e7d0
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081910-grid-bobsled-6cb3@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
3b5bbe798b24 ("pidfd: prevent creation of pidfds for kthreads")
83b290c9e3b5 ("pidfd: clone: allow CLONE_THREAD | CLONE_PIDFD together")
64bef697d33b ("pidfd: implement PIDFD_THREAD flag for pidfd_open()")
21e25205d7f9 ("pidfd: don't do_notify_pidfd() if !thread_group_empty()")
cdefbf2324ce ("pidfd: cleanup the usage of __pidfd_prepare's flags")
932562a6045e ("rseq: Split out rseq.h from sched.h")
cba6167f0adb ("restart_block: Trim includes")
f038cc1379c0 ("locking/seqlock: Split out seqlock_types.h")
53d31ba842d9 ("posix-cpu-timers: Split out posix-timers_types.h")
f995443f01b4 ("locking/seqlock: Simplify SEQCOUNT_LOCKNAME()")
58390c8ce1bd ("Merge tag 'iommu-updates-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 3b5bbe798b2451820e74243b738268f51901e7d0 Mon Sep 17 00:00:00 2001
From: Christian Brauner <brauner(a)kernel.org>
Date: Wed, 31 Jul 2024 12:01:12 +0200
Subject: [PATCH] pidfd: prevent creation of pidfds for kthreads
It's currently possible to create pidfds for kthreads but it is unclear
what that is supposed to mean. Until we have use-cases for it and we
figured out what behavior we want block the creation of pidfds for
kthreads.
Link: https://lore.kernel.org/r/20240731-gleis-mehreinnahmen-6bbadd128383@brauner
Fixes: 32fcb426ec00 ("pid: add pidfd_open()")
Cc: stable(a)vger.kernel.org
Signed-off-by: Christian Brauner <brauner(a)kernel.org>
diff --git a/kernel/fork.c b/kernel/fork.c
index cc760491f201..18bdc87209d0 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -2053,11 +2053,24 @@ static int __pidfd_prepare(struct pid *pid, unsigned int flags, struct file **re
*/
int pidfd_prepare(struct pid *pid, unsigned int flags, struct file **ret)
{
- bool thread = flags & PIDFD_THREAD;
-
- if (!pid || !pid_has_task(pid, thread ? PIDTYPE_PID : PIDTYPE_TGID))
+ if (!pid)
return -EINVAL;
+ scoped_guard(rcu) {
+ struct task_struct *tsk;
+
+ if (flags & PIDFD_THREAD)
+ tsk = pid_task(pid, PIDTYPE_PID);
+ else
+ tsk = pid_task(pid, PIDTYPE_TGID);
+ if (!tsk)
+ return -EINVAL;
+
+ /* Don't create pidfds for kernel threads for now. */
+ if (tsk->flags & PF_KTHREAD)
+ return -EINVAL;
+ }
+
return __pidfd_prepare(pid, flags, ret);
}
@@ -2403,6 +2416,12 @@ __latent_entropy struct task_struct *copy_process(
if (clone_flags & CLONE_PIDFD) {
int flags = (clone_flags & CLONE_THREAD) ? PIDFD_THREAD : 0;
+ /* Don't create pidfds for kernel threads for now. */
+ if (args->kthread) {
+ retval = -EINVAL;
+ goto bad_fork_free_pid;
+ }
+
/* Note that no task has been attached to @pid yet. */
retval = __pidfd_prepare(pid, flags, &pidfile);
if (retval < 0)
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] pidfd: prevent creation of pidfds for kthreads" failed to apply to 6.1-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 3b5bbe798b2451820e74243b738268f51901e7d0
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081909-comment-hypocrisy-a802@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
3b5bbe798b24 ("pidfd: prevent creation of pidfds for kthreads")
83b290c9e3b5 ("pidfd: clone: allow CLONE_THREAD | CLONE_PIDFD together")
64bef697d33b ("pidfd: implement PIDFD_THREAD flag for pidfd_open()")
21e25205d7f9 ("pidfd: don't do_notify_pidfd() if !thread_group_empty()")
cdefbf2324ce ("pidfd: cleanup the usage of __pidfd_prepare's flags")
932562a6045e ("rseq: Split out rseq.h from sched.h")
cba6167f0adb ("restart_block: Trim includes")
f038cc1379c0 ("locking/seqlock: Split out seqlock_types.h")
53d31ba842d9 ("posix-cpu-timers: Split out posix-timers_types.h")
f995443f01b4 ("locking/seqlock: Simplify SEQCOUNT_LOCKNAME()")
58390c8ce1bd ("Merge tag 'iommu-updates-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 3b5bbe798b2451820e74243b738268f51901e7d0 Mon Sep 17 00:00:00 2001
From: Christian Brauner <brauner(a)kernel.org>
Date: Wed, 31 Jul 2024 12:01:12 +0200
Subject: [PATCH] pidfd: prevent creation of pidfds for kthreads
It's currently possible to create pidfds for kthreads but it is unclear
what that is supposed to mean. Until we have use-cases for it and we
figured out what behavior we want block the creation of pidfds for
kthreads.
Link: https://lore.kernel.org/r/20240731-gleis-mehreinnahmen-6bbadd128383@brauner
Fixes: 32fcb426ec00 ("pid: add pidfd_open()")
Cc: stable(a)vger.kernel.org
Signed-off-by: Christian Brauner <brauner(a)kernel.org>
diff --git a/kernel/fork.c b/kernel/fork.c
index cc760491f201..18bdc87209d0 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -2053,11 +2053,24 @@ static int __pidfd_prepare(struct pid *pid, unsigned int flags, struct file **re
*/
int pidfd_prepare(struct pid *pid, unsigned int flags, struct file **ret)
{
- bool thread = flags & PIDFD_THREAD;
-
- if (!pid || !pid_has_task(pid, thread ? PIDTYPE_PID : PIDTYPE_TGID))
+ if (!pid)
return -EINVAL;
+ scoped_guard(rcu) {
+ struct task_struct *tsk;
+
+ if (flags & PIDFD_THREAD)
+ tsk = pid_task(pid, PIDTYPE_PID);
+ else
+ tsk = pid_task(pid, PIDTYPE_TGID);
+ if (!tsk)
+ return -EINVAL;
+
+ /* Don't create pidfds for kernel threads for now. */
+ if (tsk->flags & PF_KTHREAD)
+ return -EINVAL;
+ }
+
return __pidfd_prepare(pid, flags, ret);
}
@@ -2403,6 +2416,12 @@ __latent_entropy struct task_struct *copy_process(
if (clone_flags & CLONE_PIDFD) {
int flags = (clone_flags & CLONE_THREAD) ? PIDFD_THREAD : 0;
+ /* Don't create pidfds for kernel threads for now. */
+ if (args->kthread) {
+ retval = -EINVAL;
+ goto bad_fork_free_pid;
+ }
+
/* Note that no task has been attached to @pid yet. */
retval = __pidfd_prepare(pid, flags, &pidfile);
if (retval < 0)
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] pidfd: prevent creation of pidfds for kthreads" failed to apply to 6.6-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 3b5bbe798b2451820e74243b738268f51901e7d0
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081908-dork-steadfast-6a68@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
3b5bbe798b24 ("pidfd: prevent creation of pidfds for kthreads")
83b290c9e3b5 ("pidfd: clone: allow CLONE_THREAD | CLONE_PIDFD together")
64bef697d33b ("pidfd: implement PIDFD_THREAD flag for pidfd_open()")
21e25205d7f9 ("pidfd: don't do_notify_pidfd() if !thread_group_empty()")
cdefbf2324ce ("pidfd: cleanup the usage of __pidfd_prepare's flags")
932562a6045e ("rseq: Split out rseq.h from sched.h")
cba6167f0adb ("restart_block: Trim includes")
f038cc1379c0 ("locking/seqlock: Split out seqlock_types.h")
53d31ba842d9 ("posix-cpu-timers: Split out posix-timers_types.h")
f995443f01b4 ("locking/seqlock: Simplify SEQCOUNT_LOCKNAME()")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 3b5bbe798b2451820e74243b738268f51901e7d0 Mon Sep 17 00:00:00 2001
From: Christian Brauner <brauner(a)kernel.org>
Date: Wed, 31 Jul 2024 12:01:12 +0200
Subject: [PATCH] pidfd: prevent creation of pidfds for kthreads
It's currently possible to create pidfds for kthreads but it is unclear
what that is supposed to mean. Until we have use-cases for it and we
figured out what behavior we want block the creation of pidfds for
kthreads.
Link: https://lore.kernel.org/r/20240731-gleis-mehreinnahmen-6bbadd128383@brauner
Fixes: 32fcb426ec00 ("pid: add pidfd_open()")
Cc: stable(a)vger.kernel.org
Signed-off-by: Christian Brauner <brauner(a)kernel.org>
diff --git a/kernel/fork.c b/kernel/fork.c
index cc760491f201..18bdc87209d0 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -2053,11 +2053,24 @@ static int __pidfd_prepare(struct pid *pid, unsigned int flags, struct file **re
*/
int pidfd_prepare(struct pid *pid, unsigned int flags, struct file **ret)
{
- bool thread = flags & PIDFD_THREAD;
-
- if (!pid || !pid_has_task(pid, thread ? PIDTYPE_PID : PIDTYPE_TGID))
+ if (!pid)
return -EINVAL;
+ scoped_guard(rcu) {
+ struct task_struct *tsk;
+
+ if (flags & PIDFD_THREAD)
+ tsk = pid_task(pid, PIDTYPE_PID);
+ else
+ tsk = pid_task(pid, PIDTYPE_TGID);
+ if (!tsk)
+ return -EINVAL;
+
+ /* Don't create pidfds for kernel threads for now. */
+ if (tsk->flags & PF_KTHREAD)
+ return -EINVAL;
+ }
+
return __pidfd_prepare(pid, flags, ret);
}
@@ -2403,6 +2416,12 @@ __latent_entropy struct task_struct *copy_process(
if (clone_flags & CLONE_PIDFD) {
int flags = (clone_flags & CLONE_THREAD) ? PIDFD_THREAD : 0;
+ /* Don't create pidfds for kernel threads for now. */
+ if (args->kthread) {
+ retval = -EINVAL;
+ goto bad_fork_free_pid;
+ }
+
/* Note that no task has been attached to @pid yet. */
retval = __pidfd_prepare(pid, flags, &pidfile);
if (retval < 0)
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] drm/amd/display: Fix MST BW calculation Regression" failed to apply to 4.19-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.19.y
git checkout FETCH_HEAD
git cherry-pick -x 338567d17627064dba63cf063459605e782f71d2
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081956-vice-dribble-c1ce@gregkh' --subject-prefix 'PATCH 4.19.y' HEAD^..
Possible dependencies:
338567d17627 ("drm/amd/display: Fix MST BW calculation Regression")
00c391102abc ("drm/amd/display: Add misc DC changes for DCN401")
da87132f641e ("drm/amd/display: Add some DCN401 reg name to macro definitions")
ef319dff5475 ("drm/amd/display: add support for chroma offset")
a41aa6a7d0a6 ("drm/amd/display: Add comments to improve the code readability")
5324e2b205a2 ("drm/amd/display: Add driver support for future FAMS versions")
f3736c0d979a ("drm/amd/display: Add code comments clock and encode code")
8b2cb32cf0c6 ("drm/amd/display: FEC overhead should be checked once for mst slot nums")
4df96ba66760 ("drm/amd/display: Add timing pixel encoding for mst mode validation")
2dbe9c2b2685 ("drm/amd/display: add DCN 351 version for microcode load")
1c5c36530a57 ("drm/amd/display: Set DCN351 BB and IP the same as DCN35")
5034b935f62a ("drm/amd/display: Modify DHCUB waterwark structures and functions")
9d43241953f7 ("drm/amd/display: Refactor DML2 interfaces")
8cffa89bd5e2 ("drm/amd/display: Expand DML2 callbacks")
2d5bb791e24f ("drm/amd/display: Implement update_planes_and_stream_v3 sequence")
88867807564e ("drm/amd/display: Refactor DPP into a component directory")
eed4edda910f ("drm/amd/display: Support long vblank feature")
caef6c453cf2 ("drm/amd/display: Add DML2 folder to include path")
2d7f3d1a5866 ("drm/amd/display: Implement wait_for_odm_update_pending_complete")
4f5b8d78ca43 ("drm/amd/display: Init DPPCLK from SMU on dcn32")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 338567d17627064dba63cf063459605e782f71d2 Mon Sep 17 00:00:00 2001
From: Fangzhi Zuo <Jerry.Zuo(a)amd.com>
Date: Mon, 29 Jul 2024 10:23:03 -0400
Subject: [PATCH] drm/amd/display: Fix MST BW calculation Regression
[Why & How]
Revert commit 8b2cb32cf0c6
("drm/amd/display: FEC overhead should be checked once for mst slot nums")
Because causes bw calculation regression
Cc: mario.limonciello(a)amd.com
Cc: alexander.deucher(a)amd.com
Reported-by: jirislaby(a)kernel.org
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3495
Closes: https://bugzilla.suse.com/show_bug.cgi?id=1228093
Reviewed-by: Wayne Lin <wayne.lin(a)amd.com>
Signed-off-by: Fangzhi Zuo <Jerry.Zuo(a)amd.com>
Signed-off-by: Tom Chung <chiahsuan.chung(a)amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler(a)amd.com>
Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com>
(cherry picked from commit 12dbb3ed212fc7655fce421542a5add637f8af7a)
Cc: stable(a)vger.kernel.org
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index 915eb2c08ece..2e9f6da1acdc 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -804,12 +804,25 @@ struct dsc_mst_fairness_params {
};
#if defined(CONFIG_DRM_AMD_DC_FP)
-static int kbps_to_peak_pbn(int kbps)
+static uint16_t get_fec_overhead_multiplier(struct dc_link *dc_link)
+{
+ u8 link_coding_cap;
+ uint16_t fec_overhead_multiplier_x1000 = PBN_FEC_OVERHEAD_MULTIPLIER_8B_10B;
+
+ link_coding_cap = dc_link_dp_mst_decide_link_encoding_format(dc_link);
+ if (link_coding_cap == DP_128b_132b_ENCODING)
+ fec_overhead_multiplier_x1000 = PBN_FEC_OVERHEAD_MULTIPLIER_128B_132B;
+
+ return fec_overhead_multiplier_x1000;
+}
+
+static int kbps_to_peak_pbn(int kbps, uint16_t fec_overhead_multiplier_x1000)
{
u64 peak_kbps = kbps;
peak_kbps *= 1006;
- peak_kbps = div_u64(peak_kbps, 1000);
+ peak_kbps *= fec_overhead_multiplier_x1000;
+ peak_kbps = div_u64(peak_kbps, 1000 * 1000);
return (int) DIV64_U64_ROUND_UP(peak_kbps * 64, (54 * 8 * 1000));
}
@@ -910,11 +923,12 @@ static int increase_dsc_bpp(struct drm_atomic_state *state,
int link_timeslots_used;
int fair_pbn_alloc;
int ret = 0;
+ uint16_t fec_overhead_multiplier_x1000 = get_fec_overhead_multiplier(dc_link);
for (i = 0; i < count; i++) {
if (vars[i + k].dsc_enabled) {
initial_slack[i] =
- kbps_to_peak_pbn(params[i].bw_range.max_kbps) - vars[i + k].pbn;
+ kbps_to_peak_pbn(params[i].bw_range.max_kbps, fec_overhead_multiplier_x1000) - vars[i + k].pbn;
bpp_increased[i] = false;
remaining_to_increase += 1;
} else {
@@ -1010,6 +1024,7 @@ static int try_disable_dsc(struct drm_atomic_state *state,
int next_index;
int remaining_to_try = 0;
int ret;
+ uint16_t fec_overhead_multiplier_x1000 = get_fec_overhead_multiplier(dc_link);
for (i = 0; i < count; i++) {
if (vars[i + k].dsc_enabled
@@ -1039,7 +1054,7 @@ static int try_disable_dsc(struct drm_atomic_state *state,
if (next_index == -1)
break;
- vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.stream_kbps);
+ vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
ret = drm_dp_atomic_find_time_slots(state,
params[next_index].port->mgr,
params[next_index].port,
@@ -1052,8 +1067,7 @@ static int try_disable_dsc(struct drm_atomic_state *state,
vars[next_index].dsc_enabled = false;
vars[next_index].bpp_x16 = 0;
} else {
- vars[next_index].pbn = kbps_to_peak_pbn(
- params[next_index].bw_range.max_kbps);
+ vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
ret = drm_dp_atomic_find_time_slots(state,
params[next_index].port->mgr,
params[next_index].port,
@@ -1082,6 +1096,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
int count = 0;
int i, k, ret;
bool debugfs_overwrite = false;
+ uint16_t fec_overhead_multiplier_x1000 = get_fec_overhead_multiplier(dc_link);
memset(params, 0, sizeof(params));
@@ -1146,7 +1161,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
/* Try no compression */
for (i = 0; i < count; i++) {
vars[i + k].aconnector = params[i].aconnector;
- vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps);
+ vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
vars[i + k].dsc_enabled = false;
vars[i + k].bpp_x16 = 0;
ret = drm_dp_atomic_find_time_slots(state, params[i].port->mgr, params[i].port,
@@ -1165,7 +1180,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
/* Try max compression */
for (i = 0; i < count; i++) {
if (params[i].compression_possible && params[i].clock_force_enable != DSC_CLK_FORCE_DISABLE) {
- vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.min_kbps);
+ vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.min_kbps, fec_overhead_multiplier_x1000);
vars[i + k].dsc_enabled = true;
vars[i + k].bpp_x16 = params[i].bw_range.min_target_bpp_x16;
ret = drm_dp_atomic_find_time_slots(state, params[i].port->mgr,
@@ -1173,7 +1188,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
if (ret < 0)
return ret;
} else {
- vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps);
+ vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
vars[i + k].dsc_enabled = false;
vars[i + k].bpp_x16 = 0;
ret = drm_dp_atomic_find_time_slots(state, params[i].port->mgr,
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
index fa84d34b7373..600d6e221011 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
@@ -46,6 +46,9 @@
#define SYNAPTICS_CASCADED_HUB_ID 0x5A
#define IS_SYNAPTICS_CASCADED_PANAMERA(devName, data) ((IS_SYNAPTICS_PANAMERA(devName) && ((int)data[2] == SYNAPTICS_CASCADED_HUB_ID)) ? 1 : 0)
+#define PBN_FEC_OVERHEAD_MULTIPLIER_8B_10B 1031
+#define PBN_FEC_OVERHEAD_MULTIPLIER_128B_132B 1000
+
enum mst_msg_ready_type {
NONE_MSG_RDY_EVENT = 0,
DOWN_REP_MSG_RDY_EVENT = 1,
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] drm/amd/display: Fix MST BW calculation Regression" failed to apply to 5.4-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y
git checkout FETCH_HEAD
git cherry-pick -x 338567d17627064dba63cf063459605e782f71d2
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081956-latter-uproar-9ce6@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^..
Possible dependencies:
338567d17627 ("drm/amd/display: Fix MST BW calculation Regression")
00c391102abc ("drm/amd/display: Add misc DC changes for DCN401")
da87132f641e ("drm/amd/display: Add some DCN401 reg name to macro definitions")
ef319dff5475 ("drm/amd/display: add support for chroma offset")
a41aa6a7d0a6 ("drm/amd/display: Add comments to improve the code readability")
5324e2b205a2 ("drm/amd/display: Add driver support for future FAMS versions")
f3736c0d979a ("drm/amd/display: Add code comments clock and encode code")
8b2cb32cf0c6 ("drm/amd/display: FEC overhead should be checked once for mst slot nums")
4df96ba66760 ("drm/amd/display: Add timing pixel encoding for mst mode validation")
2dbe9c2b2685 ("drm/amd/display: add DCN 351 version for microcode load")
1c5c36530a57 ("drm/amd/display: Set DCN351 BB and IP the same as DCN35")
5034b935f62a ("drm/amd/display: Modify DHCUB waterwark structures and functions")
9d43241953f7 ("drm/amd/display: Refactor DML2 interfaces")
8cffa89bd5e2 ("drm/amd/display: Expand DML2 callbacks")
2d5bb791e24f ("drm/amd/display: Implement update_planes_and_stream_v3 sequence")
88867807564e ("drm/amd/display: Refactor DPP into a component directory")
eed4edda910f ("drm/amd/display: Support long vblank feature")
caef6c453cf2 ("drm/amd/display: Add DML2 folder to include path")
2d7f3d1a5866 ("drm/amd/display: Implement wait_for_odm_update_pending_complete")
4f5b8d78ca43 ("drm/amd/display: Init DPPCLK from SMU on dcn32")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 338567d17627064dba63cf063459605e782f71d2 Mon Sep 17 00:00:00 2001
From: Fangzhi Zuo <Jerry.Zuo(a)amd.com>
Date: Mon, 29 Jul 2024 10:23:03 -0400
Subject: [PATCH] drm/amd/display: Fix MST BW calculation Regression
[Why & How]
Revert commit 8b2cb32cf0c6
("drm/amd/display: FEC overhead should be checked once for mst slot nums")
Because causes bw calculation regression
Cc: mario.limonciello(a)amd.com
Cc: alexander.deucher(a)amd.com
Reported-by: jirislaby(a)kernel.org
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3495
Closes: https://bugzilla.suse.com/show_bug.cgi?id=1228093
Reviewed-by: Wayne Lin <wayne.lin(a)amd.com>
Signed-off-by: Fangzhi Zuo <Jerry.Zuo(a)amd.com>
Signed-off-by: Tom Chung <chiahsuan.chung(a)amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler(a)amd.com>
Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com>
(cherry picked from commit 12dbb3ed212fc7655fce421542a5add637f8af7a)
Cc: stable(a)vger.kernel.org
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index 915eb2c08ece..2e9f6da1acdc 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -804,12 +804,25 @@ struct dsc_mst_fairness_params {
};
#if defined(CONFIG_DRM_AMD_DC_FP)
-static int kbps_to_peak_pbn(int kbps)
+static uint16_t get_fec_overhead_multiplier(struct dc_link *dc_link)
+{
+ u8 link_coding_cap;
+ uint16_t fec_overhead_multiplier_x1000 = PBN_FEC_OVERHEAD_MULTIPLIER_8B_10B;
+
+ link_coding_cap = dc_link_dp_mst_decide_link_encoding_format(dc_link);
+ if (link_coding_cap == DP_128b_132b_ENCODING)
+ fec_overhead_multiplier_x1000 = PBN_FEC_OVERHEAD_MULTIPLIER_128B_132B;
+
+ return fec_overhead_multiplier_x1000;
+}
+
+static int kbps_to_peak_pbn(int kbps, uint16_t fec_overhead_multiplier_x1000)
{
u64 peak_kbps = kbps;
peak_kbps *= 1006;
- peak_kbps = div_u64(peak_kbps, 1000);
+ peak_kbps *= fec_overhead_multiplier_x1000;
+ peak_kbps = div_u64(peak_kbps, 1000 * 1000);
return (int) DIV64_U64_ROUND_UP(peak_kbps * 64, (54 * 8 * 1000));
}
@@ -910,11 +923,12 @@ static int increase_dsc_bpp(struct drm_atomic_state *state,
int link_timeslots_used;
int fair_pbn_alloc;
int ret = 0;
+ uint16_t fec_overhead_multiplier_x1000 = get_fec_overhead_multiplier(dc_link);
for (i = 0; i < count; i++) {
if (vars[i + k].dsc_enabled) {
initial_slack[i] =
- kbps_to_peak_pbn(params[i].bw_range.max_kbps) - vars[i + k].pbn;
+ kbps_to_peak_pbn(params[i].bw_range.max_kbps, fec_overhead_multiplier_x1000) - vars[i + k].pbn;
bpp_increased[i] = false;
remaining_to_increase += 1;
} else {
@@ -1010,6 +1024,7 @@ static int try_disable_dsc(struct drm_atomic_state *state,
int next_index;
int remaining_to_try = 0;
int ret;
+ uint16_t fec_overhead_multiplier_x1000 = get_fec_overhead_multiplier(dc_link);
for (i = 0; i < count; i++) {
if (vars[i + k].dsc_enabled
@@ -1039,7 +1054,7 @@ static int try_disable_dsc(struct drm_atomic_state *state,
if (next_index == -1)
break;
- vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.stream_kbps);
+ vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
ret = drm_dp_atomic_find_time_slots(state,
params[next_index].port->mgr,
params[next_index].port,
@@ -1052,8 +1067,7 @@ static int try_disable_dsc(struct drm_atomic_state *state,
vars[next_index].dsc_enabled = false;
vars[next_index].bpp_x16 = 0;
} else {
- vars[next_index].pbn = kbps_to_peak_pbn(
- params[next_index].bw_range.max_kbps);
+ vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
ret = drm_dp_atomic_find_time_slots(state,
params[next_index].port->mgr,
params[next_index].port,
@@ -1082,6 +1096,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
int count = 0;
int i, k, ret;
bool debugfs_overwrite = false;
+ uint16_t fec_overhead_multiplier_x1000 = get_fec_overhead_multiplier(dc_link);
memset(params, 0, sizeof(params));
@@ -1146,7 +1161,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
/* Try no compression */
for (i = 0; i < count; i++) {
vars[i + k].aconnector = params[i].aconnector;
- vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps);
+ vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
vars[i + k].dsc_enabled = false;
vars[i + k].bpp_x16 = 0;
ret = drm_dp_atomic_find_time_slots(state, params[i].port->mgr, params[i].port,
@@ -1165,7 +1180,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
/* Try max compression */
for (i = 0; i < count; i++) {
if (params[i].compression_possible && params[i].clock_force_enable != DSC_CLK_FORCE_DISABLE) {
- vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.min_kbps);
+ vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.min_kbps, fec_overhead_multiplier_x1000);
vars[i + k].dsc_enabled = true;
vars[i + k].bpp_x16 = params[i].bw_range.min_target_bpp_x16;
ret = drm_dp_atomic_find_time_slots(state, params[i].port->mgr,
@@ -1173,7 +1188,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
if (ret < 0)
return ret;
} else {
- vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps);
+ vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
vars[i + k].dsc_enabled = false;
vars[i + k].bpp_x16 = 0;
ret = drm_dp_atomic_find_time_slots(state, params[i].port->mgr,
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
index fa84d34b7373..600d6e221011 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
@@ -46,6 +46,9 @@
#define SYNAPTICS_CASCADED_HUB_ID 0x5A
#define IS_SYNAPTICS_CASCADED_PANAMERA(devName, data) ((IS_SYNAPTICS_PANAMERA(devName) && ((int)data[2] == SYNAPTICS_CASCADED_HUB_ID)) ? 1 : 0)
+#define PBN_FEC_OVERHEAD_MULTIPLIER_8B_10B 1031
+#define PBN_FEC_OVERHEAD_MULTIPLIER_128B_132B 1000
+
enum mst_msg_ready_type {
NONE_MSG_RDY_EVENT = 0,
DOWN_REP_MSG_RDY_EVENT = 1,
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] drm/amd/display: Fix MST BW calculation Regression" failed to apply to 5.10-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 338567d17627064dba63cf063459605e782f71d2
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081955-gallows-cheesy-4b51@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
338567d17627 ("drm/amd/display: Fix MST BW calculation Regression")
00c391102abc ("drm/amd/display: Add misc DC changes for DCN401")
da87132f641e ("drm/amd/display: Add some DCN401 reg name to macro definitions")
ef319dff5475 ("drm/amd/display: add support for chroma offset")
a41aa6a7d0a6 ("drm/amd/display: Add comments to improve the code readability")
5324e2b205a2 ("drm/amd/display: Add driver support for future FAMS versions")
f3736c0d979a ("drm/amd/display: Add code comments clock and encode code")
8b2cb32cf0c6 ("drm/amd/display: FEC overhead should be checked once for mst slot nums")
4df96ba66760 ("drm/amd/display: Add timing pixel encoding for mst mode validation")
2dbe9c2b2685 ("drm/amd/display: add DCN 351 version for microcode load")
1c5c36530a57 ("drm/amd/display: Set DCN351 BB and IP the same as DCN35")
5034b935f62a ("drm/amd/display: Modify DHCUB waterwark structures and functions")
9d43241953f7 ("drm/amd/display: Refactor DML2 interfaces")
8cffa89bd5e2 ("drm/amd/display: Expand DML2 callbacks")
2d5bb791e24f ("drm/amd/display: Implement update_planes_and_stream_v3 sequence")
88867807564e ("drm/amd/display: Refactor DPP into a component directory")
eed4edda910f ("drm/amd/display: Support long vblank feature")
caef6c453cf2 ("drm/amd/display: Add DML2 folder to include path")
2d7f3d1a5866 ("drm/amd/display: Implement wait_for_odm_update_pending_complete")
4f5b8d78ca43 ("drm/amd/display: Init DPPCLK from SMU on dcn32")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 338567d17627064dba63cf063459605e782f71d2 Mon Sep 17 00:00:00 2001
From: Fangzhi Zuo <Jerry.Zuo(a)amd.com>
Date: Mon, 29 Jul 2024 10:23:03 -0400
Subject: [PATCH] drm/amd/display: Fix MST BW calculation Regression
[Why & How]
Revert commit 8b2cb32cf0c6
("drm/amd/display: FEC overhead should be checked once for mst slot nums")
Because causes bw calculation regression
Cc: mario.limonciello(a)amd.com
Cc: alexander.deucher(a)amd.com
Reported-by: jirislaby(a)kernel.org
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3495
Closes: https://bugzilla.suse.com/show_bug.cgi?id=1228093
Reviewed-by: Wayne Lin <wayne.lin(a)amd.com>
Signed-off-by: Fangzhi Zuo <Jerry.Zuo(a)amd.com>
Signed-off-by: Tom Chung <chiahsuan.chung(a)amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler(a)amd.com>
Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com>
(cherry picked from commit 12dbb3ed212fc7655fce421542a5add637f8af7a)
Cc: stable(a)vger.kernel.org
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index 915eb2c08ece..2e9f6da1acdc 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -804,12 +804,25 @@ struct dsc_mst_fairness_params {
};
#if defined(CONFIG_DRM_AMD_DC_FP)
-static int kbps_to_peak_pbn(int kbps)
+static uint16_t get_fec_overhead_multiplier(struct dc_link *dc_link)
+{
+ u8 link_coding_cap;
+ uint16_t fec_overhead_multiplier_x1000 = PBN_FEC_OVERHEAD_MULTIPLIER_8B_10B;
+
+ link_coding_cap = dc_link_dp_mst_decide_link_encoding_format(dc_link);
+ if (link_coding_cap == DP_128b_132b_ENCODING)
+ fec_overhead_multiplier_x1000 = PBN_FEC_OVERHEAD_MULTIPLIER_128B_132B;
+
+ return fec_overhead_multiplier_x1000;
+}
+
+static int kbps_to_peak_pbn(int kbps, uint16_t fec_overhead_multiplier_x1000)
{
u64 peak_kbps = kbps;
peak_kbps *= 1006;
- peak_kbps = div_u64(peak_kbps, 1000);
+ peak_kbps *= fec_overhead_multiplier_x1000;
+ peak_kbps = div_u64(peak_kbps, 1000 * 1000);
return (int) DIV64_U64_ROUND_UP(peak_kbps * 64, (54 * 8 * 1000));
}
@@ -910,11 +923,12 @@ static int increase_dsc_bpp(struct drm_atomic_state *state,
int link_timeslots_used;
int fair_pbn_alloc;
int ret = 0;
+ uint16_t fec_overhead_multiplier_x1000 = get_fec_overhead_multiplier(dc_link);
for (i = 0; i < count; i++) {
if (vars[i + k].dsc_enabled) {
initial_slack[i] =
- kbps_to_peak_pbn(params[i].bw_range.max_kbps) - vars[i + k].pbn;
+ kbps_to_peak_pbn(params[i].bw_range.max_kbps, fec_overhead_multiplier_x1000) - vars[i + k].pbn;
bpp_increased[i] = false;
remaining_to_increase += 1;
} else {
@@ -1010,6 +1024,7 @@ static int try_disable_dsc(struct drm_atomic_state *state,
int next_index;
int remaining_to_try = 0;
int ret;
+ uint16_t fec_overhead_multiplier_x1000 = get_fec_overhead_multiplier(dc_link);
for (i = 0; i < count; i++) {
if (vars[i + k].dsc_enabled
@@ -1039,7 +1054,7 @@ static int try_disable_dsc(struct drm_atomic_state *state,
if (next_index == -1)
break;
- vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.stream_kbps);
+ vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
ret = drm_dp_atomic_find_time_slots(state,
params[next_index].port->mgr,
params[next_index].port,
@@ -1052,8 +1067,7 @@ static int try_disable_dsc(struct drm_atomic_state *state,
vars[next_index].dsc_enabled = false;
vars[next_index].bpp_x16 = 0;
} else {
- vars[next_index].pbn = kbps_to_peak_pbn(
- params[next_index].bw_range.max_kbps);
+ vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
ret = drm_dp_atomic_find_time_slots(state,
params[next_index].port->mgr,
params[next_index].port,
@@ -1082,6 +1096,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
int count = 0;
int i, k, ret;
bool debugfs_overwrite = false;
+ uint16_t fec_overhead_multiplier_x1000 = get_fec_overhead_multiplier(dc_link);
memset(params, 0, sizeof(params));
@@ -1146,7 +1161,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
/* Try no compression */
for (i = 0; i < count; i++) {
vars[i + k].aconnector = params[i].aconnector;
- vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps);
+ vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
vars[i + k].dsc_enabled = false;
vars[i + k].bpp_x16 = 0;
ret = drm_dp_atomic_find_time_slots(state, params[i].port->mgr, params[i].port,
@@ -1165,7 +1180,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
/* Try max compression */
for (i = 0; i < count; i++) {
if (params[i].compression_possible && params[i].clock_force_enable != DSC_CLK_FORCE_DISABLE) {
- vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.min_kbps);
+ vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.min_kbps, fec_overhead_multiplier_x1000);
vars[i + k].dsc_enabled = true;
vars[i + k].bpp_x16 = params[i].bw_range.min_target_bpp_x16;
ret = drm_dp_atomic_find_time_slots(state, params[i].port->mgr,
@@ -1173,7 +1188,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
if (ret < 0)
return ret;
} else {
- vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps);
+ vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
vars[i + k].dsc_enabled = false;
vars[i + k].bpp_x16 = 0;
ret = drm_dp_atomic_find_time_slots(state, params[i].port->mgr,
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
index fa84d34b7373..600d6e221011 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
@@ -46,6 +46,9 @@
#define SYNAPTICS_CASCADED_HUB_ID 0x5A
#define IS_SYNAPTICS_CASCADED_PANAMERA(devName, data) ((IS_SYNAPTICS_PANAMERA(devName) && ((int)data[2] == SYNAPTICS_CASCADED_HUB_ID)) ? 1 : 0)
+#define PBN_FEC_OVERHEAD_MULTIPLIER_8B_10B 1031
+#define PBN_FEC_OVERHEAD_MULTIPLIER_128B_132B 1000
+
enum mst_msg_ready_type {
NONE_MSG_RDY_EVENT = 0,
DOWN_REP_MSG_RDY_EVENT = 1,
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] drm/amd/display: Fix MST BW calculation Regression" failed to apply to 6.1-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 338567d17627064dba63cf063459605e782f71d2
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081953-undaunted-dining-ae84@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
338567d17627 ("drm/amd/display: Fix MST BW calculation Regression")
00c391102abc ("drm/amd/display: Add misc DC changes for DCN401")
da87132f641e ("drm/amd/display: Add some DCN401 reg name to macro definitions")
ef319dff5475 ("drm/amd/display: add support for chroma offset")
a41aa6a7d0a6 ("drm/amd/display: Add comments to improve the code readability")
5324e2b205a2 ("drm/amd/display: Add driver support for future FAMS versions")
f3736c0d979a ("drm/amd/display: Add code comments clock and encode code")
8b2cb32cf0c6 ("drm/amd/display: FEC overhead should be checked once for mst slot nums")
4df96ba66760 ("drm/amd/display: Add timing pixel encoding for mst mode validation")
2dbe9c2b2685 ("drm/amd/display: add DCN 351 version for microcode load")
1c5c36530a57 ("drm/amd/display: Set DCN351 BB and IP the same as DCN35")
5034b935f62a ("drm/amd/display: Modify DHCUB waterwark structures and functions")
9d43241953f7 ("drm/amd/display: Refactor DML2 interfaces")
8cffa89bd5e2 ("drm/amd/display: Expand DML2 callbacks")
2d5bb791e24f ("drm/amd/display: Implement update_planes_and_stream_v3 sequence")
88867807564e ("drm/amd/display: Refactor DPP into a component directory")
eed4edda910f ("drm/amd/display: Support long vblank feature")
caef6c453cf2 ("drm/amd/display: Add DML2 folder to include path")
2d7f3d1a5866 ("drm/amd/display: Implement wait_for_odm_update_pending_complete")
4f5b8d78ca43 ("drm/amd/display: Init DPPCLK from SMU on dcn32")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 338567d17627064dba63cf063459605e782f71d2 Mon Sep 17 00:00:00 2001
From: Fangzhi Zuo <Jerry.Zuo(a)amd.com>
Date: Mon, 29 Jul 2024 10:23:03 -0400
Subject: [PATCH] drm/amd/display: Fix MST BW calculation Regression
[Why & How]
Revert commit 8b2cb32cf0c6
("drm/amd/display: FEC overhead should be checked once for mst slot nums")
Because causes bw calculation regression
Cc: mario.limonciello(a)amd.com
Cc: alexander.deucher(a)amd.com
Reported-by: jirislaby(a)kernel.org
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3495
Closes: https://bugzilla.suse.com/show_bug.cgi?id=1228093
Reviewed-by: Wayne Lin <wayne.lin(a)amd.com>
Signed-off-by: Fangzhi Zuo <Jerry.Zuo(a)amd.com>
Signed-off-by: Tom Chung <chiahsuan.chung(a)amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler(a)amd.com>
Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com>
(cherry picked from commit 12dbb3ed212fc7655fce421542a5add637f8af7a)
Cc: stable(a)vger.kernel.org
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index 915eb2c08ece..2e9f6da1acdc 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -804,12 +804,25 @@ struct dsc_mst_fairness_params {
};
#if defined(CONFIG_DRM_AMD_DC_FP)
-static int kbps_to_peak_pbn(int kbps)
+static uint16_t get_fec_overhead_multiplier(struct dc_link *dc_link)
+{
+ u8 link_coding_cap;
+ uint16_t fec_overhead_multiplier_x1000 = PBN_FEC_OVERHEAD_MULTIPLIER_8B_10B;
+
+ link_coding_cap = dc_link_dp_mst_decide_link_encoding_format(dc_link);
+ if (link_coding_cap == DP_128b_132b_ENCODING)
+ fec_overhead_multiplier_x1000 = PBN_FEC_OVERHEAD_MULTIPLIER_128B_132B;
+
+ return fec_overhead_multiplier_x1000;
+}
+
+static int kbps_to_peak_pbn(int kbps, uint16_t fec_overhead_multiplier_x1000)
{
u64 peak_kbps = kbps;
peak_kbps *= 1006;
- peak_kbps = div_u64(peak_kbps, 1000);
+ peak_kbps *= fec_overhead_multiplier_x1000;
+ peak_kbps = div_u64(peak_kbps, 1000 * 1000);
return (int) DIV64_U64_ROUND_UP(peak_kbps * 64, (54 * 8 * 1000));
}
@@ -910,11 +923,12 @@ static int increase_dsc_bpp(struct drm_atomic_state *state,
int link_timeslots_used;
int fair_pbn_alloc;
int ret = 0;
+ uint16_t fec_overhead_multiplier_x1000 = get_fec_overhead_multiplier(dc_link);
for (i = 0; i < count; i++) {
if (vars[i + k].dsc_enabled) {
initial_slack[i] =
- kbps_to_peak_pbn(params[i].bw_range.max_kbps) - vars[i + k].pbn;
+ kbps_to_peak_pbn(params[i].bw_range.max_kbps, fec_overhead_multiplier_x1000) - vars[i + k].pbn;
bpp_increased[i] = false;
remaining_to_increase += 1;
} else {
@@ -1010,6 +1024,7 @@ static int try_disable_dsc(struct drm_atomic_state *state,
int next_index;
int remaining_to_try = 0;
int ret;
+ uint16_t fec_overhead_multiplier_x1000 = get_fec_overhead_multiplier(dc_link);
for (i = 0; i < count; i++) {
if (vars[i + k].dsc_enabled
@@ -1039,7 +1054,7 @@ static int try_disable_dsc(struct drm_atomic_state *state,
if (next_index == -1)
break;
- vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.stream_kbps);
+ vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
ret = drm_dp_atomic_find_time_slots(state,
params[next_index].port->mgr,
params[next_index].port,
@@ -1052,8 +1067,7 @@ static int try_disable_dsc(struct drm_atomic_state *state,
vars[next_index].dsc_enabled = false;
vars[next_index].bpp_x16 = 0;
} else {
- vars[next_index].pbn = kbps_to_peak_pbn(
- params[next_index].bw_range.max_kbps);
+ vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
ret = drm_dp_atomic_find_time_slots(state,
params[next_index].port->mgr,
params[next_index].port,
@@ -1082,6 +1096,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
int count = 0;
int i, k, ret;
bool debugfs_overwrite = false;
+ uint16_t fec_overhead_multiplier_x1000 = get_fec_overhead_multiplier(dc_link);
memset(params, 0, sizeof(params));
@@ -1146,7 +1161,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
/* Try no compression */
for (i = 0; i < count; i++) {
vars[i + k].aconnector = params[i].aconnector;
- vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps);
+ vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
vars[i + k].dsc_enabled = false;
vars[i + k].bpp_x16 = 0;
ret = drm_dp_atomic_find_time_slots(state, params[i].port->mgr, params[i].port,
@@ -1165,7 +1180,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
/* Try max compression */
for (i = 0; i < count; i++) {
if (params[i].compression_possible && params[i].clock_force_enable != DSC_CLK_FORCE_DISABLE) {
- vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.min_kbps);
+ vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.min_kbps, fec_overhead_multiplier_x1000);
vars[i + k].dsc_enabled = true;
vars[i + k].bpp_x16 = params[i].bw_range.min_target_bpp_x16;
ret = drm_dp_atomic_find_time_slots(state, params[i].port->mgr,
@@ -1173,7 +1188,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
if (ret < 0)
return ret;
} else {
- vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps);
+ vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
vars[i + k].dsc_enabled = false;
vars[i + k].bpp_x16 = 0;
ret = drm_dp_atomic_find_time_slots(state, params[i].port->mgr,
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
index fa84d34b7373..600d6e221011 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
@@ -46,6 +46,9 @@
#define SYNAPTICS_CASCADED_HUB_ID 0x5A
#define IS_SYNAPTICS_CASCADED_PANAMERA(devName, data) ((IS_SYNAPTICS_PANAMERA(devName) && ((int)data[2] == SYNAPTICS_CASCADED_HUB_ID)) ? 1 : 0)
+#define PBN_FEC_OVERHEAD_MULTIPLIER_8B_10B 1031
+#define PBN_FEC_OVERHEAD_MULTIPLIER_128B_132B 1000
+
enum mst_msg_ready_type {
NONE_MSG_RDY_EVENT = 0,
DOWN_REP_MSG_RDY_EVENT = 1,
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] drm/amd/display: Fix MST BW calculation Regression" failed to apply to 5.15-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x 338567d17627064dba63cf063459605e782f71d2
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081954-rhyme-equinox-00fe@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
338567d17627 ("drm/amd/display: Fix MST BW calculation Regression")
00c391102abc ("drm/amd/display: Add misc DC changes for DCN401")
da87132f641e ("drm/amd/display: Add some DCN401 reg name to macro definitions")
ef319dff5475 ("drm/amd/display: add support for chroma offset")
a41aa6a7d0a6 ("drm/amd/display: Add comments to improve the code readability")
5324e2b205a2 ("drm/amd/display: Add driver support for future FAMS versions")
f3736c0d979a ("drm/amd/display: Add code comments clock and encode code")
8b2cb32cf0c6 ("drm/amd/display: FEC overhead should be checked once for mst slot nums")
4df96ba66760 ("drm/amd/display: Add timing pixel encoding for mst mode validation")
2dbe9c2b2685 ("drm/amd/display: add DCN 351 version for microcode load")
1c5c36530a57 ("drm/amd/display: Set DCN351 BB and IP the same as DCN35")
5034b935f62a ("drm/amd/display: Modify DHCUB waterwark structures and functions")
9d43241953f7 ("drm/amd/display: Refactor DML2 interfaces")
8cffa89bd5e2 ("drm/amd/display: Expand DML2 callbacks")
2d5bb791e24f ("drm/amd/display: Implement update_planes_and_stream_v3 sequence")
88867807564e ("drm/amd/display: Refactor DPP into a component directory")
eed4edda910f ("drm/amd/display: Support long vblank feature")
caef6c453cf2 ("drm/amd/display: Add DML2 folder to include path")
2d7f3d1a5866 ("drm/amd/display: Implement wait_for_odm_update_pending_complete")
4f5b8d78ca43 ("drm/amd/display: Init DPPCLK from SMU on dcn32")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 338567d17627064dba63cf063459605e782f71d2 Mon Sep 17 00:00:00 2001
From: Fangzhi Zuo <Jerry.Zuo(a)amd.com>
Date: Mon, 29 Jul 2024 10:23:03 -0400
Subject: [PATCH] drm/amd/display: Fix MST BW calculation Regression
[Why & How]
Revert commit 8b2cb32cf0c6
("drm/amd/display: FEC overhead should be checked once for mst slot nums")
Because causes bw calculation regression
Cc: mario.limonciello(a)amd.com
Cc: alexander.deucher(a)amd.com
Reported-by: jirislaby(a)kernel.org
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3495
Closes: https://bugzilla.suse.com/show_bug.cgi?id=1228093
Reviewed-by: Wayne Lin <wayne.lin(a)amd.com>
Signed-off-by: Fangzhi Zuo <Jerry.Zuo(a)amd.com>
Signed-off-by: Tom Chung <chiahsuan.chung(a)amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler(a)amd.com>
Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com>
(cherry picked from commit 12dbb3ed212fc7655fce421542a5add637f8af7a)
Cc: stable(a)vger.kernel.org
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index 915eb2c08ece..2e9f6da1acdc 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -804,12 +804,25 @@ struct dsc_mst_fairness_params {
};
#if defined(CONFIG_DRM_AMD_DC_FP)
-static int kbps_to_peak_pbn(int kbps)
+static uint16_t get_fec_overhead_multiplier(struct dc_link *dc_link)
+{
+ u8 link_coding_cap;
+ uint16_t fec_overhead_multiplier_x1000 = PBN_FEC_OVERHEAD_MULTIPLIER_8B_10B;
+
+ link_coding_cap = dc_link_dp_mst_decide_link_encoding_format(dc_link);
+ if (link_coding_cap == DP_128b_132b_ENCODING)
+ fec_overhead_multiplier_x1000 = PBN_FEC_OVERHEAD_MULTIPLIER_128B_132B;
+
+ return fec_overhead_multiplier_x1000;
+}
+
+static int kbps_to_peak_pbn(int kbps, uint16_t fec_overhead_multiplier_x1000)
{
u64 peak_kbps = kbps;
peak_kbps *= 1006;
- peak_kbps = div_u64(peak_kbps, 1000);
+ peak_kbps *= fec_overhead_multiplier_x1000;
+ peak_kbps = div_u64(peak_kbps, 1000 * 1000);
return (int) DIV64_U64_ROUND_UP(peak_kbps * 64, (54 * 8 * 1000));
}
@@ -910,11 +923,12 @@ static int increase_dsc_bpp(struct drm_atomic_state *state,
int link_timeslots_used;
int fair_pbn_alloc;
int ret = 0;
+ uint16_t fec_overhead_multiplier_x1000 = get_fec_overhead_multiplier(dc_link);
for (i = 0; i < count; i++) {
if (vars[i + k].dsc_enabled) {
initial_slack[i] =
- kbps_to_peak_pbn(params[i].bw_range.max_kbps) - vars[i + k].pbn;
+ kbps_to_peak_pbn(params[i].bw_range.max_kbps, fec_overhead_multiplier_x1000) - vars[i + k].pbn;
bpp_increased[i] = false;
remaining_to_increase += 1;
} else {
@@ -1010,6 +1024,7 @@ static int try_disable_dsc(struct drm_atomic_state *state,
int next_index;
int remaining_to_try = 0;
int ret;
+ uint16_t fec_overhead_multiplier_x1000 = get_fec_overhead_multiplier(dc_link);
for (i = 0; i < count; i++) {
if (vars[i + k].dsc_enabled
@@ -1039,7 +1054,7 @@ static int try_disable_dsc(struct drm_atomic_state *state,
if (next_index == -1)
break;
- vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.stream_kbps);
+ vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
ret = drm_dp_atomic_find_time_slots(state,
params[next_index].port->mgr,
params[next_index].port,
@@ -1052,8 +1067,7 @@ static int try_disable_dsc(struct drm_atomic_state *state,
vars[next_index].dsc_enabled = false;
vars[next_index].bpp_x16 = 0;
} else {
- vars[next_index].pbn = kbps_to_peak_pbn(
- params[next_index].bw_range.max_kbps);
+ vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
ret = drm_dp_atomic_find_time_slots(state,
params[next_index].port->mgr,
params[next_index].port,
@@ -1082,6 +1096,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
int count = 0;
int i, k, ret;
bool debugfs_overwrite = false;
+ uint16_t fec_overhead_multiplier_x1000 = get_fec_overhead_multiplier(dc_link);
memset(params, 0, sizeof(params));
@@ -1146,7 +1161,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
/* Try no compression */
for (i = 0; i < count; i++) {
vars[i + k].aconnector = params[i].aconnector;
- vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps);
+ vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
vars[i + k].dsc_enabled = false;
vars[i + k].bpp_x16 = 0;
ret = drm_dp_atomic_find_time_slots(state, params[i].port->mgr, params[i].port,
@@ -1165,7 +1180,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
/* Try max compression */
for (i = 0; i < count; i++) {
if (params[i].compression_possible && params[i].clock_force_enable != DSC_CLK_FORCE_DISABLE) {
- vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.min_kbps);
+ vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.min_kbps, fec_overhead_multiplier_x1000);
vars[i + k].dsc_enabled = true;
vars[i + k].bpp_x16 = params[i].bw_range.min_target_bpp_x16;
ret = drm_dp_atomic_find_time_slots(state, params[i].port->mgr,
@@ -1173,7 +1188,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
if (ret < 0)
return ret;
} else {
- vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps);
+ vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
vars[i + k].dsc_enabled = false;
vars[i + k].bpp_x16 = 0;
ret = drm_dp_atomic_find_time_slots(state, params[i].port->mgr,
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
index fa84d34b7373..600d6e221011 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
@@ -46,6 +46,9 @@
#define SYNAPTICS_CASCADED_HUB_ID 0x5A
#define IS_SYNAPTICS_CASCADED_PANAMERA(devName, data) ((IS_SYNAPTICS_PANAMERA(devName) && ((int)data[2] == SYNAPTICS_CASCADED_HUB_ID)) ? 1 : 0)
+#define PBN_FEC_OVERHEAD_MULTIPLIER_8B_10B 1031
+#define PBN_FEC_OVERHEAD_MULTIPLIER_128B_132B 1000
+
enum mst_msg_ready_type {
NONE_MSG_RDY_EVENT = 0,
DOWN_REP_MSG_RDY_EVENT = 1,
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] drm/amd/display: Fix MST BW calculation Regression" failed to apply to 6.6-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 338567d17627064dba63cf063459605e782f71d2
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081953-gravel-flame-4e6b@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
338567d17627 ("drm/amd/display: Fix MST BW calculation Regression")
00c391102abc ("drm/amd/display: Add misc DC changes for DCN401")
da87132f641e ("drm/amd/display: Add some DCN401 reg name to macro definitions")
ef319dff5475 ("drm/amd/display: add support for chroma offset")
a41aa6a7d0a6 ("drm/amd/display: Add comments to improve the code readability")
5324e2b205a2 ("drm/amd/display: Add driver support for future FAMS versions")
f3736c0d979a ("drm/amd/display: Add code comments clock and encode code")
8b2cb32cf0c6 ("drm/amd/display: FEC overhead should be checked once for mst slot nums")
4df96ba66760 ("drm/amd/display: Add timing pixel encoding for mst mode validation")
2dbe9c2b2685 ("drm/amd/display: add DCN 351 version for microcode load")
1c5c36530a57 ("drm/amd/display: Set DCN351 BB and IP the same as DCN35")
5034b935f62a ("drm/amd/display: Modify DHCUB waterwark structures and functions")
9d43241953f7 ("drm/amd/display: Refactor DML2 interfaces")
8cffa89bd5e2 ("drm/amd/display: Expand DML2 callbacks")
2d5bb791e24f ("drm/amd/display: Implement update_planes_and_stream_v3 sequence")
88867807564e ("drm/amd/display: Refactor DPP into a component directory")
eed4edda910f ("drm/amd/display: Support long vblank feature")
caef6c453cf2 ("drm/amd/display: Add DML2 folder to include path")
2d7f3d1a5866 ("drm/amd/display: Implement wait_for_odm_update_pending_complete")
4f5b8d78ca43 ("drm/amd/display: Init DPPCLK from SMU on dcn32")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 338567d17627064dba63cf063459605e782f71d2 Mon Sep 17 00:00:00 2001
From: Fangzhi Zuo <Jerry.Zuo(a)amd.com>
Date: Mon, 29 Jul 2024 10:23:03 -0400
Subject: [PATCH] drm/amd/display: Fix MST BW calculation Regression
[Why & How]
Revert commit 8b2cb32cf0c6
("drm/amd/display: FEC overhead should be checked once for mst slot nums")
Because causes bw calculation regression
Cc: mario.limonciello(a)amd.com
Cc: alexander.deucher(a)amd.com
Reported-by: jirislaby(a)kernel.org
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3495
Closes: https://bugzilla.suse.com/show_bug.cgi?id=1228093
Reviewed-by: Wayne Lin <wayne.lin(a)amd.com>
Signed-off-by: Fangzhi Zuo <Jerry.Zuo(a)amd.com>
Signed-off-by: Tom Chung <chiahsuan.chung(a)amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler(a)amd.com>
Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com>
(cherry picked from commit 12dbb3ed212fc7655fce421542a5add637f8af7a)
Cc: stable(a)vger.kernel.org
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index 915eb2c08ece..2e9f6da1acdc 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -804,12 +804,25 @@ struct dsc_mst_fairness_params {
};
#if defined(CONFIG_DRM_AMD_DC_FP)
-static int kbps_to_peak_pbn(int kbps)
+static uint16_t get_fec_overhead_multiplier(struct dc_link *dc_link)
+{
+ u8 link_coding_cap;
+ uint16_t fec_overhead_multiplier_x1000 = PBN_FEC_OVERHEAD_MULTIPLIER_8B_10B;
+
+ link_coding_cap = dc_link_dp_mst_decide_link_encoding_format(dc_link);
+ if (link_coding_cap == DP_128b_132b_ENCODING)
+ fec_overhead_multiplier_x1000 = PBN_FEC_OVERHEAD_MULTIPLIER_128B_132B;
+
+ return fec_overhead_multiplier_x1000;
+}
+
+static int kbps_to_peak_pbn(int kbps, uint16_t fec_overhead_multiplier_x1000)
{
u64 peak_kbps = kbps;
peak_kbps *= 1006;
- peak_kbps = div_u64(peak_kbps, 1000);
+ peak_kbps *= fec_overhead_multiplier_x1000;
+ peak_kbps = div_u64(peak_kbps, 1000 * 1000);
return (int) DIV64_U64_ROUND_UP(peak_kbps * 64, (54 * 8 * 1000));
}
@@ -910,11 +923,12 @@ static int increase_dsc_bpp(struct drm_atomic_state *state,
int link_timeslots_used;
int fair_pbn_alloc;
int ret = 0;
+ uint16_t fec_overhead_multiplier_x1000 = get_fec_overhead_multiplier(dc_link);
for (i = 0; i < count; i++) {
if (vars[i + k].dsc_enabled) {
initial_slack[i] =
- kbps_to_peak_pbn(params[i].bw_range.max_kbps) - vars[i + k].pbn;
+ kbps_to_peak_pbn(params[i].bw_range.max_kbps, fec_overhead_multiplier_x1000) - vars[i + k].pbn;
bpp_increased[i] = false;
remaining_to_increase += 1;
} else {
@@ -1010,6 +1024,7 @@ static int try_disable_dsc(struct drm_atomic_state *state,
int next_index;
int remaining_to_try = 0;
int ret;
+ uint16_t fec_overhead_multiplier_x1000 = get_fec_overhead_multiplier(dc_link);
for (i = 0; i < count; i++) {
if (vars[i + k].dsc_enabled
@@ -1039,7 +1054,7 @@ static int try_disable_dsc(struct drm_atomic_state *state,
if (next_index == -1)
break;
- vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.stream_kbps);
+ vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
ret = drm_dp_atomic_find_time_slots(state,
params[next_index].port->mgr,
params[next_index].port,
@@ -1052,8 +1067,7 @@ static int try_disable_dsc(struct drm_atomic_state *state,
vars[next_index].dsc_enabled = false;
vars[next_index].bpp_x16 = 0;
} else {
- vars[next_index].pbn = kbps_to_peak_pbn(
- params[next_index].bw_range.max_kbps);
+ vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
ret = drm_dp_atomic_find_time_slots(state,
params[next_index].port->mgr,
params[next_index].port,
@@ -1082,6 +1096,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
int count = 0;
int i, k, ret;
bool debugfs_overwrite = false;
+ uint16_t fec_overhead_multiplier_x1000 = get_fec_overhead_multiplier(dc_link);
memset(params, 0, sizeof(params));
@@ -1146,7 +1161,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
/* Try no compression */
for (i = 0; i < count; i++) {
vars[i + k].aconnector = params[i].aconnector;
- vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps);
+ vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
vars[i + k].dsc_enabled = false;
vars[i + k].bpp_x16 = 0;
ret = drm_dp_atomic_find_time_slots(state, params[i].port->mgr, params[i].port,
@@ -1165,7 +1180,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
/* Try max compression */
for (i = 0; i < count; i++) {
if (params[i].compression_possible && params[i].clock_force_enable != DSC_CLK_FORCE_DISABLE) {
- vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.min_kbps);
+ vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.min_kbps, fec_overhead_multiplier_x1000);
vars[i + k].dsc_enabled = true;
vars[i + k].bpp_x16 = params[i].bw_range.min_target_bpp_x16;
ret = drm_dp_atomic_find_time_slots(state, params[i].port->mgr,
@@ -1173,7 +1188,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
if (ret < 0)
return ret;
} else {
- vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps);
+ vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
vars[i + k].dsc_enabled = false;
vars[i + k].bpp_x16 = 0;
ret = drm_dp_atomic_find_time_slots(state, params[i].port->mgr,
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
index fa84d34b7373..600d6e221011 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
@@ -46,6 +46,9 @@
#define SYNAPTICS_CASCADED_HUB_ID 0x5A
#define IS_SYNAPTICS_CASCADED_PANAMERA(devName, data) ((IS_SYNAPTICS_PANAMERA(devName) && ((int)data[2] == SYNAPTICS_CASCADED_HUB_ID)) ? 1 : 0)
+#define PBN_FEC_OVERHEAD_MULTIPLIER_8B_10B 1031
+#define PBN_FEC_OVERHEAD_MULTIPLIER_128B_132B 1000
+
enum mst_msg_ready_type {
NONE_MSG_RDY_EVENT = 0,
DOWN_REP_MSG_RDY_EVENT = 1,
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] drm/amd/display: Fix MST BW calculation Regression" failed to apply to 6.10-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.10-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.10.y
git checkout FETCH_HEAD
git cherry-pick -x 338567d17627064dba63cf063459605e782f71d2
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081952-knapsack-enjoyment-313c@gregkh' --subject-prefix 'PATCH 6.10.y' HEAD^..
Possible dependencies:
338567d17627 ("drm/amd/display: Fix MST BW calculation Regression")
00c391102abc ("drm/amd/display: Add misc DC changes for DCN401")
da87132f641e ("drm/amd/display: Add some DCN401 reg name to macro definitions")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 338567d17627064dba63cf063459605e782f71d2 Mon Sep 17 00:00:00 2001
From: Fangzhi Zuo <Jerry.Zuo(a)amd.com>
Date: Mon, 29 Jul 2024 10:23:03 -0400
Subject: [PATCH] drm/amd/display: Fix MST BW calculation Regression
[Why & How]
Revert commit 8b2cb32cf0c6
("drm/amd/display: FEC overhead should be checked once for mst slot nums")
Because causes bw calculation regression
Cc: mario.limonciello(a)amd.com
Cc: alexander.deucher(a)amd.com
Reported-by: jirislaby(a)kernel.org
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3495
Closes: https://bugzilla.suse.com/show_bug.cgi?id=1228093
Reviewed-by: Wayne Lin <wayne.lin(a)amd.com>
Signed-off-by: Fangzhi Zuo <Jerry.Zuo(a)amd.com>
Signed-off-by: Tom Chung <chiahsuan.chung(a)amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler(a)amd.com>
Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com>
(cherry picked from commit 12dbb3ed212fc7655fce421542a5add637f8af7a)
Cc: stable(a)vger.kernel.org
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index 915eb2c08ece..2e9f6da1acdc 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -804,12 +804,25 @@ struct dsc_mst_fairness_params {
};
#if defined(CONFIG_DRM_AMD_DC_FP)
-static int kbps_to_peak_pbn(int kbps)
+static uint16_t get_fec_overhead_multiplier(struct dc_link *dc_link)
+{
+ u8 link_coding_cap;
+ uint16_t fec_overhead_multiplier_x1000 = PBN_FEC_OVERHEAD_MULTIPLIER_8B_10B;
+
+ link_coding_cap = dc_link_dp_mst_decide_link_encoding_format(dc_link);
+ if (link_coding_cap == DP_128b_132b_ENCODING)
+ fec_overhead_multiplier_x1000 = PBN_FEC_OVERHEAD_MULTIPLIER_128B_132B;
+
+ return fec_overhead_multiplier_x1000;
+}
+
+static int kbps_to_peak_pbn(int kbps, uint16_t fec_overhead_multiplier_x1000)
{
u64 peak_kbps = kbps;
peak_kbps *= 1006;
- peak_kbps = div_u64(peak_kbps, 1000);
+ peak_kbps *= fec_overhead_multiplier_x1000;
+ peak_kbps = div_u64(peak_kbps, 1000 * 1000);
return (int) DIV64_U64_ROUND_UP(peak_kbps * 64, (54 * 8 * 1000));
}
@@ -910,11 +923,12 @@ static int increase_dsc_bpp(struct drm_atomic_state *state,
int link_timeslots_used;
int fair_pbn_alloc;
int ret = 0;
+ uint16_t fec_overhead_multiplier_x1000 = get_fec_overhead_multiplier(dc_link);
for (i = 0; i < count; i++) {
if (vars[i + k].dsc_enabled) {
initial_slack[i] =
- kbps_to_peak_pbn(params[i].bw_range.max_kbps) - vars[i + k].pbn;
+ kbps_to_peak_pbn(params[i].bw_range.max_kbps, fec_overhead_multiplier_x1000) - vars[i + k].pbn;
bpp_increased[i] = false;
remaining_to_increase += 1;
} else {
@@ -1010,6 +1024,7 @@ static int try_disable_dsc(struct drm_atomic_state *state,
int next_index;
int remaining_to_try = 0;
int ret;
+ uint16_t fec_overhead_multiplier_x1000 = get_fec_overhead_multiplier(dc_link);
for (i = 0; i < count; i++) {
if (vars[i + k].dsc_enabled
@@ -1039,7 +1054,7 @@ static int try_disable_dsc(struct drm_atomic_state *state,
if (next_index == -1)
break;
- vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.stream_kbps);
+ vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
ret = drm_dp_atomic_find_time_slots(state,
params[next_index].port->mgr,
params[next_index].port,
@@ -1052,8 +1067,7 @@ static int try_disable_dsc(struct drm_atomic_state *state,
vars[next_index].dsc_enabled = false;
vars[next_index].bpp_x16 = 0;
} else {
- vars[next_index].pbn = kbps_to_peak_pbn(
- params[next_index].bw_range.max_kbps);
+ vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
ret = drm_dp_atomic_find_time_slots(state,
params[next_index].port->mgr,
params[next_index].port,
@@ -1082,6 +1096,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
int count = 0;
int i, k, ret;
bool debugfs_overwrite = false;
+ uint16_t fec_overhead_multiplier_x1000 = get_fec_overhead_multiplier(dc_link);
memset(params, 0, sizeof(params));
@@ -1146,7 +1161,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
/* Try no compression */
for (i = 0; i < count; i++) {
vars[i + k].aconnector = params[i].aconnector;
- vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps);
+ vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
vars[i + k].dsc_enabled = false;
vars[i + k].bpp_x16 = 0;
ret = drm_dp_atomic_find_time_slots(state, params[i].port->mgr, params[i].port,
@@ -1165,7 +1180,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
/* Try max compression */
for (i = 0; i < count; i++) {
if (params[i].compression_possible && params[i].clock_force_enable != DSC_CLK_FORCE_DISABLE) {
- vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.min_kbps);
+ vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.min_kbps, fec_overhead_multiplier_x1000);
vars[i + k].dsc_enabled = true;
vars[i + k].bpp_x16 = params[i].bw_range.min_target_bpp_x16;
ret = drm_dp_atomic_find_time_slots(state, params[i].port->mgr,
@@ -1173,7 +1188,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
if (ret < 0)
return ret;
} else {
- vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps);
+ vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
vars[i + k].dsc_enabled = false;
vars[i + k].bpp_x16 = 0;
ret = drm_dp_atomic_find_time_slots(state, params[i].port->mgr,
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
index fa84d34b7373..600d6e221011 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
@@ -46,6 +46,9 @@
#define SYNAPTICS_CASCADED_HUB_ID 0x5A
#define IS_SYNAPTICS_CASCADED_PANAMERA(devName, data) ((IS_SYNAPTICS_PANAMERA(devName) && ((int)data[2] == SYNAPTICS_CASCADED_HUB_ID)) ? 1 : 0)
+#define PBN_FEC_OVERHEAD_MULTIPLIER_8B_10B 1031
+#define PBN_FEC_OVERHEAD_MULTIPLIER_128B_132B 1000
+
enum mst_msg_ready_type {
NONE_MSG_RDY_EVENT = 0,
DOWN_REP_MSG_RDY_EVENT = 1,
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] drm/amdgpu/mes: fix mes ring buffer overflow" failed to apply to 6.10-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.10-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.10.y
git checkout FETCH_HEAD
git cherry-pick -x 11752c013f562a1124088a35bd314aa0e9f0e88f
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081941-flavorful-extrovert-01b9@gregkh' --subject-prefix 'PATCH 6.10.y' HEAD^..
Possible dependencies:
11752c013f56 ("drm/amdgpu/mes: fix mes ring buffer overflow")
fffe347e1478 ("drm/amdgpu: cleanup MES12 command submission")
de3246254156 ("drm/amdgpu: cleanup MES11 command submission")
ade887c63394 ("drm/amdgpu/mes12: Use a separate fence per transaction")
94b51a3d01ed ("drm/amdgpu/mes12: increase mes submission timeout")
b1d852920b31 ("drm/amdgpu/mes12: print MES opcodes rather than numbers")
785f0f9fe742 ("drm/amdgpu: Add mes v12_0 ip block support (v4)")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 11752c013f562a1124088a35bd314aa0e9f0e88f Mon Sep 17 00:00:00 2001
From: Jack Xiao <Jack.Xiao(a)amd.com>
Date: Thu, 18 Jul 2024 16:38:50 +0800
Subject: [PATCH] drm/amdgpu/mes: fix mes ring buffer overflow
wait memory room until enough before writing mes packets
to avoid ring buffer overflow.
v2: squash in sched_hw_submission fix
Fixes: de3246254156 ("drm/amdgpu: cleanup MES11 command submission")
Fixes: fffe347e1478 ("drm/amdgpu: cleanup MES12 command submission")
Signed-off-by: Jack Xiao <Jack.Xiao(a)amd.com>
Acked-by: Alex Deucher <alexander.deucher(a)amd.com>
Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com>
(cherry picked from commit 34e087e8920e635c62e2ed6a758b0cd27f836d13)
Cc: stable(a)vger.kernel.org
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
index ad49cecb20b8..e6344a6b0a9f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
@@ -212,6 +212,8 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring,
*/
if (ring->funcs->type == AMDGPU_RING_TYPE_KIQ)
sched_hw_submission = max(sched_hw_submission, 256);
+ if (ring->funcs->type == AMDGPU_RING_TYPE_MES)
+ sched_hw_submission = 8;
else if (ring == &adev->sdma.instance[0].page)
sched_hw_submission = 256;
diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
index f9343642ae7e..1a5ad5be33bf 100644
--- a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
@@ -168,7 +168,7 @@ static int mes_v11_0_submit_pkt_and_poll_completion(struct amdgpu_mes *mes,
const char *op_str, *misc_op_str;
unsigned long flags;
u64 status_gpu_addr;
- u32 status_offset;
+ u32 seq, status_offset;
u64 *status_ptr;
signed long r;
int ret;
@@ -196,6 +196,13 @@ static int mes_v11_0_submit_pkt_and_poll_completion(struct amdgpu_mes *mes,
if (r)
goto error_unlock_free;
+ seq = ++ring->fence_drv.sync_seq;
+ r = amdgpu_fence_wait_polling(ring,
+ seq - ring->fence_drv.num_fences_mask,
+ timeout);
+ if (r < 1)
+ goto error_undo;
+
api_status = (struct MES_API_STATUS *)((char *)pkt + api_status_off);
api_status->api_completion_fence_addr = status_gpu_addr;
api_status->api_completion_fence_value = 1;
@@ -208,8 +215,7 @@ static int mes_v11_0_submit_pkt_and_poll_completion(struct amdgpu_mes *mes,
mes_status_pkt.header.dwsize = API_FRAME_SIZE_IN_DWORDS;
mes_status_pkt.api_status.api_completion_fence_addr =
ring->fence_drv.gpu_addr;
- mes_status_pkt.api_status.api_completion_fence_value =
- ++ring->fence_drv.sync_seq;
+ mes_status_pkt.api_status.api_completion_fence_value = seq;
amdgpu_ring_write_multiple(ring, &mes_status_pkt,
sizeof(mes_status_pkt) / 4);
@@ -229,7 +235,7 @@ static int mes_v11_0_submit_pkt_and_poll_completion(struct amdgpu_mes *mes,
dev_dbg(adev->dev, "MES msg=%d was emitted\n",
x_pkt->header.opcode);
- r = amdgpu_fence_wait_polling(ring, ring->fence_drv.sync_seq, timeout);
+ r = amdgpu_fence_wait_polling(ring, seq, timeout);
if (r < 1 || !*status_ptr) {
if (misc_op_str)
@@ -252,6 +258,10 @@ static int mes_v11_0_submit_pkt_and_poll_completion(struct amdgpu_mes *mes,
amdgpu_device_wb_free(adev, status_offset);
return 0;
+error_undo:
+ dev_err(adev->dev, "MES ring buffer is full.\n");
+ amdgpu_ring_undo(ring);
+
error_unlock_free:
spin_unlock_irqrestore(&mes->ring_lock, flags);
diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c b/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
index 0713bc3eb263..249e5a66205c 100644
--- a/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
@@ -154,7 +154,7 @@ static int mes_v12_0_submit_pkt_and_poll_completion(struct amdgpu_mes *mes,
const char *op_str, *misc_op_str;
unsigned long flags;
u64 status_gpu_addr;
- u32 status_offset;
+ u32 seq, status_offset;
u64 *status_ptr;
signed long r;
int ret;
@@ -182,6 +182,13 @@ static int mes_v12_0_submit_pkt_and_poll_completion(struct amdgpu_mes *mes,
if (r)
goto error_unlock_free;
+ seq = ++ring->fence_drv.sync_seq;
+ r = amdgpu_fence_wait_polling(ring,
+ seq - ring->fence_drv.num_fences_mask,
+ timeout);
+ if (r < 1)
+ goto error_undo;
+
api_status = (struct MES_API_STATUS *)((char *)pkt + api_status_off);
api_status->api_completion_fence_addr = status_gpu_addr;
api_status->api_completion_fence_value = 1;
@@ -194,8 +201,7 @@ static int mes_v12_0_submit_pkt_and_poll_completion(struct amdgpu_mes *mes,
mes_status_pkt.header.dwsize = API_FRAME_SIZE_IN_DWORDS;
mes_status_pkt.api_status.api_completion_fence_addr =
ring->fence_drv.gpu_addr;
- mes_status_pkt.api_status.api_completion_fence_value =
- ++ring->fence_drv.sync_seq;
+ mes_status_pkt.api_status.api_completion_fence_value = seq;
amdgpu_ring_write_multiple(ring, &mes_status_pkt,
sizeof(mes_status_pkt) / 4);
@@ -215,7 +221,7 @@ static int mes_v12_0_submit_pkt_and_poll_completion(struct amdgpu_mes *mes,
dev_dbg(adev->dev, "MES msg=%d was emitted\n",
x_pkt->header.opcode);
- r = amdgpu_fence_wait_polling(ring, ring->fence_drv.sync_seq, timeout);
+ r = amdgpu_fence_wait_polling(ring, seq, timeout);
if (r < 1 || !*status_ptr) {
if (misc_op_str)
@@ -238,6 +244,10 @@ static int mes_v12_0_submit_pkt_and_poll_completion(struct amdgpu_mes *mes,
amdgpu_device_wb_free(adev, status_offset);
return 0;
+error_undo:
+ dev_err(adev->dev, "MES ring buffer is full.\n");
+ amdgpu_ring_undo(ring);
+
error_unlock_free:
spin_unlock_irqrestore(&mes->ring_lock, flags);
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] drm/amd/amdgpu: command submission parser for JPEG" failed to apply to 4.19-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.19.y
git checkout FETCH_HEAD
git cherry-pick -x 470516c2925493594a690bc4d05b1f4471d9f996
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081924-outsmart-cannon-1871@gregkh' --subject-prefix 'PATCH 4.19.y' HEAD^..
Possible dependencies:
470516c29254 ("drm/amd/amdgpu: command submission parser for JPEG")
e6c6bd6253e7 ("drm/amdgpu/jpeg4: properly set atomics vmid field")
dfad65c65728 ("drm/amdgpu: Add JPEG5 support")
8f98a715da8e ("drm/amdgpu/jpeg: add jpeg support for VCN4_0_5")
35d54e21e002 ("drm/amdgpu: Initialize jpeg v4_0_3 ras function")
570df4bca618 ("drm/amdgpu: Add reset_ras_error_count for jpeg v4_0_3")
41e491d8b606 ("drm/amdgpu: Add query_ras_error_count for jpeg v4_0_3")
e684e654eba9 ("drm/amdgpu/jpeg: add jpeg support for VCN4_0_3")
bf35dbc13585 ("drm/amdgpu/jpeg: enable jpeg v4_0 for sriov")
86e8255f941e ("drm/amdgpu: add JPEG 4.0 RAS poison consumption handling")
533174580133 ("drm/amdgpu: add RAS error query for JPEG 4.0")
f4b92fcd740d ("drm/amdgpu: cleanup CS pass2 v6")
d4e8ad908b20 ("drm/amdgpu: reorder CS code")
88c98d54b220 ("drm/amdgpu: cleanup CS init/fini and pass1")
dd80d9c8eeca ("drm/amdgpu: revert "partial revert "remove ctx->lock" v2"")
9b94c609cc17 ("drm/amdgpu: remove SRIOV and MCBP dependencies from the CS")
63127922e155 ("drm/amdgpu/vcn: Add MMSCH v4_0 support for sriov")
aa44beb5f015 ("drm/amdgpu/vcn: Add sriov VCN v4_0 unified queue support")
dc5f3829a752 ("drm/amdgpu: sriov remove vcn_4_0 and jpeg_4_0")
5df79aeb6e08 ("drm/amdgpu: Protect the amdgpu_bo_list list with a mutex v2")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 470516c2925493594a690bc4d05b1f4471d9f996 Mon Sep 17 00:00:00 2001
From: "David (Ming Qiang) Wu" <David.Wu3(a)amd.com>
Date: Thu, 8 Aug 2024 12:19:50 -0400
Subject: [PATCH] drm/amd/amdgpu: command submission parser for JPEG
Add JPEG IB command parser to ensure registers
in the command are within the JPEG IP block.
Reviewed-by: Alex Deucher <alexander.deucher(a)amd.com>
Signed-off-by: David (Ming Qiang) Wu <David.Wu3(a)amd.com>
Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com>
(cherry picked from commit a7f670d5d8e77b092404ca8a35bb0f8f89ed3117)
Cc: stable(a)vger.kernel.org
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 9aa952f258cf..6dfdff58bffd 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -1057,6 +1057,9 @@ static int amdgpu_cs_patch_ibs(struct amdgpu_cs_parser *p,
r = amdgpu_ring_parse_cs(ring, p, job, ib);
if (r)
return r;
+
+ if (ib->sa_bo)
+ ib->gpu_addr = amdgpu_sa_bo_gpu_addr(ib->sa_bo);
} else {
ib->ptr = (uint32_t *)kptr;
r = amdgpu_ring_patch_cs_in_place(ring, p, job, ib);
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
index f4662920c653..6ae5a784e187 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
@@ -23,6 +23,7 @@
#include "amdgpu.h"
#include "amdgpu_jpeg.h"
+#include "amdgpu_cs.h"
#include "soc15.h"
#include "soc15d.h"
#include "jpeg_v4_0_3.h"
@@ -782,7 +783,11 @@ void jpeg_v4_0_3_dec_ring_emit_ib(struct amdgpu_ring *ring,
amdgpu_ring_write(ring, PACKETJ(regUVD_LMI_JRBC_IB_VMID_INTERNAL_OFFSET,
0, 0, PACKETJ_TYPE0));
- amdgpu_ring_write(ring, (vmid | (vmid << 4) | (vmid << 8)));
+
+ if (ring->funcs->parse_cs)
+ amdgpu_ring_write(ring, 0);
+ else
+ amdgpu_ring_write(ring, (vmid | (vmid << 4) | (vmid << 8)));
amdgpu_ring_write(ring, PACKETJ(regUVD_LMI_JPEG_VMID_INTERNAL_OFFSET,
0, 0, PACKETJ_TYPE0));
@@ -1084,6 +1089,7 @@ static const struct amdgpu_ring_funcs jpeg_v4_0_3_dec_ring_vm_funcs = {
.get_rptr = jpeg_v4_0_3_dec_ring_get_rptr,
.get_wptr = jpeg_v4_0_3_dec_ring_get_wptr,
.set_wptr = jpeg_v4_0_3_dec_ring_set_wptr,
+ .parse_cs = jpeg_v4_0_3_dec_ring_parse_cs,
.emit_frame_size =
SOC15_FLUSH_GPU_TLB_NUM_WREG * 6 +
SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT * 8 +
@@ -1248,3 +1254,56 @@ static void jpeg_v4_0_3_set_ras_funcs(struct amdgpu_device *adev)
{
adev->jpeg.ras = &jpeg_v4_0_3_ras;
}
+
+/**
+ * jpeg_v4_0_3_dec_ring_parse_cs - command submission parser
+ *
+ * @parser: Command submission parser context
+ * @job: the job to parse
+ * @ib: the IB to parse
+ *
+ * Parse the command stream, return -EINVAL for invalid packet,
+ * 0 otherwise
+ */
+int jpeg_v4_0_3_dec_ring_parse_cs(struct amdgpu_cs_parser *parser,
+ struct amdgpu_job *job,
+ struct amdgpu_ib *ib)
+{
+ uint32_t i, reg, res, cond, type;
+ struct amdgpu_device *adev = parser->adev;
+
+ for (i = 0; i < ib->length_dw ; i += 2) {
+ reg = CP_PACKETJ_GET_REG(ib->ptr[i]);
+ res = CP_PACKETJ_GET_RES(ib->ptr[i]);
+ cond = CP_PACKETJ_GET_COND(ib->ptr[i]);
+ type = CP_PACKETJ_GET_TYPE(ib->ptr[i]);
+
+ if (res) /* only support 0 at the moment */
+ return -EINVAL;
+
+ switch (type) {
+ case PACKETJ_TYPE0:
+ if (cond != PACKETJ_CONDITION_CHECK0 || reg < JPEG_REG_RANGE_START || reg > JPEG_REG_RANGE_END) {
+ dev_err(adev->dev, "Invalid packet [0x%08x]!\n", ib->ptr[i]);
+ return -EINVAL;
+ }
+ break;
+ case PACKETJ_TYPE3:
+ if (cond != PACKETJ_CONDITION_CHECK3 || reg < JPEG_REG_RANGE_START || reg > JPEG_REG_RANGE_END) {
+ dev_err(adev->dev, "Invalid packet [0x%08x]!\n", ib->ptr[i]);
+ return -EINVAL;
+ }
+ break;
+ case PACKETJ_TYPE6:
+ if (ib->ptr[i] == CP_PACKETJ_NOP)
+ continue;
+ dev_err(adev->dev, "Invalid packet [0x%08x]!\n", ib->ptr[i]);
+ return -EINVAL;
+ default:
+ dev_err(adev->dev, "Unknown packet type %d !\n", type);
+ return -EINVAL;
+ }
+ }
+
+ return 0;
+}
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h
index 747a3e5f6856..71c54b294e15 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h
@@ -46,6 +46,9 @@
#define JRBC_DEC_EXTERNAL_REG_WRITE_ADDR 0x18000
+#define JPEG_REG_RANGE_START 0x4000
+#define JPEG_REG_RANGE_END 0x41c2
+
extern const struct amdgpu_ip_block_version jpeg_v4_0_3_ip_block;
void jpeg_v4_0_3_dec_ring_emit_ib(struct amdgpu_ring *ring,
@@ -62,5 +65,7 @@ void jpeg_v4_0_3_dec_ring_insert_end(struct amdgpu_ring *ring);
void jpeg_v4_0_3_dec_ring_emit_wreg(struct amdgpu_ring *ring, uint32_t reg, uint32_t val);
void jpeg_v4_0_3_dec_ring_emit_reg_wait(struct amdgpu_ring *ring, uint32_t reg,
uint32_t val, uint32_t mask);
-
+int jpeg_v4_0_3_dec_ring_parse_cs(struct amdgpu_cs_parser *parser,
+ struct amdgpu_job *job,
+ struct amdgpu_ib *ib);
#endif /* __JPEG_V4_0_3_H__ */
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
index d694a276498a..f4daff90c770 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
@@ -646,6 +646,7 @@ static const struct amdgpu_ring_funcs jpeg_v5_0_0_dec_ring_vm_funcs = {
.get_rptr = jpeg_v5_0_0_dec_ring_get_rptr,
.get_wptr = jpeg_v5_0_0_dec_ring_get_wptr,
.set_wptr = jpeg_v5_0_0_dec_ring_set_wptr,
+ .parse_cs = jpeg_v4_0_3_dec_ring_parse_cs,
.emit_frame_size =
SOC15_FLUSH_GPU_TLB_NUM_WREG * 6 +
SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT * 8 +
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15d.h b/drivers/gpu/drm/amd/amdgpu/soc15d.h
index 2357ff39323f..e74e1983da53 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15d.h
+++ b/drivers/gpu/drm/amd/amdgpu/soc15d.h
@@ -76,6 +76,12 @@
((cond & 0xF) << 24) | \
((type & 0xF) << 28))
+#define CP_PACKETJ_NOP 0x60000000
+#define CP_PACKETJ_GET_REG(x) ((x) & 0x3FFFF)
+#define CP_PACKETJ_GET_RES(x) (((x) >> 18) & 0x3F)
+#define CP_PACKETJ_GET_COND(x) (((x) >> 24) & 0xF)
+#define CP_PACKETJ_GET_TYPE(x) (((x) >> 28) & 0xF)
+
/* Packet 3 types */
#define PACKET3_NOP 0x10
#define PACKET3_SET_BASE 0x11
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] drm/amd/amdgpu: command submission parser for JPEG" failed to apply to 5.4-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y
git checkout FETCH_HEAD
git cherry-pick -x 470516c2925493594a690bc4d05b1f4471d9f996
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081923-overhear-yard-8281@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^..
Possible dependencies:
470516c29254 ("drm/amd/amdgpu: command submission parser for JPEG")
e6c6bd6253e7 ("drm/amdgpu/jpeg4: properly set atomics vmid field")
dfad65c65728 ("drm/amdgpu: Add JPEG5 support")
8f98a715da8e ("drm/amdgpu/jpeg: add jpeg support for VCN4_0_5")
35d54e21e002 ("drm/amdgpu: Initialize jpeg v4_0_3 ras function")
570df4bca618 ("drm/amdgpu: Add reset_ras_error_count for jpeg v4_0_3")
41e491d8b606 ("drm/amdgpu: Add query_ras_error_count for jpeg v4_0_3")
e684e654eba9 ("drm/amdgpu/jpeg: add jpeg support for VCN4_0_3")
bf35dbc13585 ("drm/amdgpu/jpeg: enable jpeg v4_0 for sriov")
86e8255f941e ("drm/amdgpu: add JPEG 4.0 RAS poison consumption handling")
533174580133 ("drm/amdgpu: add RAS error query for JPEG 4.0")
f4b92fcd740d ("drm/amdgpu: cleanup CS pass2 v6")
d4e8ad908b20 ("drm/amdgpu: reorder CS code")
88c98d54b220 ("drm/amdgpu: cleanup CS init/fini and pass1")
dd80d9c8eeca ("drm/amdgpu: revert "partial revert "remove ctx->lock" v2"")
9b94c609cc17 ("drm/amdgpu: remove SRIOV and MCBP dependencies from the CS")
63127922e155 ("drm/amdgpu/vcn: Add MMSCH v4_0 support for sriov")
aa44beb5f015 ("drm/amdgpu/vcn: Add sriov VCN v4_0 unified queue support")
dc5f3829a752 ("drm/amdgpu: sriov remove vcn_4_0 and jpeg_4_0")
5df79aeb6e08 ("drm/amdgpu: Protect the amdgpu_bo_list list with a mutex v2")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 470516c2925493594a690bc4d05b1f4471d9f996 Mon Sep 17 00:00:00 2001
From: "David (Ming Qiang) Wu" <David.Wu3(a)amd.com>
Date: Thu, 8 Aug 2024 12:19:50 -0400
Subject: [PATCH] drm/amd/amdgpu: command submission parser for JPEG
Add JPEG IB command parser to ensure registers
in the command are within the JPEG IP block.
Reviewed-by: Alex Deucher <alexander.deucher(a)amd.com>
Signed-off-by: David (Ming Qiang) Wu <David.Wu3(a)amd.com>
Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com>
(cherry picked from commit a7f670d5d8e77b092404ca8a35bb0f8f89ed3117)
Cc: stable(a)vger.kernel.org
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 9aa952f258cf..6dfdff58bffd 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -1057,6 +1057,9 @@ static int amdgpu_cs_patch_ibs(struct amdgpu_cs_parser *p,
r = amdgpu_ring_parse_cs(ring, p, job, ib);
if (r)
return r;
+
+ if (ib->sa_bo)
+ ib->gpu_addr = amdgpu_sa_bo_gpu_addr(ib->sa_bo);
} else {
ib->ptr = (uint32_t *)kptr;
r = amdgpu_ring_patch_cs_in_place(ring, p, job, ib);
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
index f4662920c653..6ae5a784e187 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
@@ -23,6 +23,7 @@
#include "amdgpu.h"
#include "amdgpu_jpeg.h"
+#include "amdgpu_cs.h"
#include "soc15.h"
#include "soc15d.h"
#include "jpeg_v4_0_3.h"
@@ -782,7 +783,11 @@ void jpeg_v4_0_3_dec_ring_emit_ib(struct amdgpu_ring *ring,
amdgpu_ring_write(ring, PACKETJ(regUVD_LMI_JRBC_IB_VMID_INTERNAL_OFFSET,
0, 0, PACKETJ_TYPE0));
- amdgpu_ring_write(ring, (vmid | (vmid << 4) | (vmid << 8)));
+
+ if (ring->funcs->parse_cs)
+ amdgpu_ring_write(ring, 0);
+ else
+ amdgpu_ring_write(ring, (vmid | (vmid << 4) | (vmid << 8)));
amdgpu_ring_write(ring, PACKETJ(regUVD_LMI_JPEG_VMID_INTERNAL_OFFSET,
0, 0, PACKETJ_TYPE0));
@@ -1084,6 +1089,7 @@ static const struct amdgpu_ring_funcs jpeg_v4_0_3_dec_ring_vm_funcs = {
.get_rptr = jpeg_v4_0_3_dec_ring_get_rptr,
.get_wptr = jpeg_v4_0_3_dec_ring_get_wptr,
.set_wptr = jpeg_v4_0_3_dec_ring_set_wptr,
+ .parse_cs = jpeg_v4_0_3_dec_ring_parse_cs,
.emit_frame_size =
SOC15_FLUSH_GPU_TLB_NUM_WREG * 6 +
SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT * 8 +
@@ -1248,3 +1254,56 @@ static void jpeg_v4_0_3_set_ras_funcs(struct amdgpu_device *adev)
{
adev->jpeg.ras = &jpeg_v4_0_3_ras;
}
+
+/**
+ * jpeg_v4_0_3_dec_ring_parse_cs - command submission parser
+ *
+ * @parser: Command submission parser context
+ * @job: the job to parse
+ * @ib: the IB to parse
+ *
+ * Parse the command stream, return -EINVAL for invalid packet,
+ * 0 otherwise
+ */
+int jpeg_v4_0_3_dec_ring_parse_cs(struct amdgpu_cs_parser *parser,
+ struct amdgpu_job *job,
+ struct amdgpu_ib *ib)
+{
+ uint32_t i, reg, res, cond, type;
+ struct amdgpu_device *adev = parser->adev;
+
+ for (i = 0; i < ib->length_dw ; i += 2) {
+ reg = CP_PACKETJ_GET_REG(ib->ptr[i]);
+ res = CP_PACKETJ_GET_RES(ib->ptr[i]);
+ cond = CP_PACKETJ_GET_COND(ib->ptr[i]);
+ type = CP_PACKETJ_GET_TYPE(ib->ptr[i]);
+
+ if (res) /* only support 0 at the moment */
+ return -EINVAL;
+
+ switch (type) {
+ case PACKETJ_TYPE0:
+ if (cond != PACKETJ_CONDITION_CHECK0 || reg < JPEG_REG_RANGE_START || reg > JPEG_REG_RANGE_END) {
+ dev_err(adev->dev, "Invalid packet [0x%08x]!\n", ib->ptr[i]);
+ return -EINVAL;
+ }
+ break;
+ case PACKETJ_TYPE3:
+ if (cond != PACKETJ_CONDITION_CHECK3 || reg < JPEG_REG_RANGE_START || reg > JPEG_REG_RANGE_END) {
+ dev_err(adev->dev, "Invalid packet [0x%08x]!\n", ib->ptr[i]);
+ return -EINVAL;
+ }
+ break;
+ case PACKETJ_TYPE6:
+ if (ib->ptr[i] == CP_PACKETJ_NOP)
+ continue;
+ dev_err(adev->dev, "Invalid packet [0x%08x]!\n", ib->ptr[i]);
+ return -EINVAL;
+ default:
+ dev_err(adev->dev, "Unknown packet type %d !\n", type);
+ return -EINVAL;
+ }
+ }
+
+ return 0;
+}
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h
index 747a3e5f6856..71c54b294e15 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h
@@ -46,6 +46,9 @@
#define JRBC_DEC_EXTERNAL_REG_WRITE_ADDR 0x18000
+#define JPEG_REG_RANGE_START 0x4000
+#define JPEG_REG_RANGE_END 0x41c2
+
extern const struct amdgpu_ip_block_version jpeg_v4_0_3_ip_block;
void jpeg_v4_0_3_dec_ring_emit_ib(struct amdgpu_ring *ring,
@@ -62,5 +65,7 @@ void jpeg_v4_0_3_dec_ring_insert_end(struct amdgpu_ring *ring);
void jpeg_v4_0_3_dec_ring_emit_wreg(struct amdgpu_ring *ring, uint32_t reg, uint32_t val);
void jpeg_v4_0_3_dec_ring_emit_reg_wait(struct amdgpu_ring *ring, uint32_t reg,
uint32_t val, uint32_t mask);
-
+int jpeg_v4_0_3_dec_ring_parse_cs(struct amdgpu_cs_parser *parser,
+ struct amdgpu_job *job,
+ struct amdgpu_ib *ib);
#endif /* __JPEG_V4_0_3_H__ */
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
index d694a276498a..f4daff90c770 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
@@ -646,6 +646,7 @@ static const struct amdgpu_ring_funcs jpeg_v5_0_0_dec_ring_vm_funcs = {
.get_rptr = jpeg_v5_0_0_dec_ring_get_rptr,
.get_wptr = jpeg_v5_0_0_dec_ring_get_wptr,
.set_wptr = jpeg_v5_0_0_dec_ring_set_wptr,
+ .parse_cs = jpeg_v4_0_3_dec_ring_parse_cs,
.emit_frame_size =
SOC15_FLUSH_GPU_TLB_NUM_WREG * 6 +
SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT * 8 +
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15d.h b/drivers/gpu/drm/amd/amdgpu/soc15d.h
index 2357ff39323f..e74e1983da53 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15d.h
+++ b/drivers/gpu/drm/amd/amdgpu/soc15d.h
@@ -76,6 +76,12 @@
((cond & 0xF) << 24) | \
((type & 0xF) << 28))
+#define CP_PACKETJ_NOP 0x60000000
+#define CP_PACKETJ_GET_REG(x) ((x) & 0x3FFFF)
+#define CP_PACKETJ_GET_RES(x) (((x) >> 18) & 0x3F)
+#define CP_PACKETJ_GET_COND(x) (((x) >> 24) & 0xF)
+#define CP_PACKETJ_GET_TYPE(x) (((x) >> 28) & 0xF)
+
/* Packet 3 types */
#define PACKET3_NOP 0x10
#define PACKET3_SET_BASE 0x11
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] drm/amd/amdgpu: command submission parser for JPEG" failed to apply to 5.10-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 470516c2925493594a690bc4d05b1f4471d9f996
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081922-praising-crumb-e6e3@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
470516c29254 ("drm/amd/amdgpu: command submission parser for JPEG")
e6c6bd6253e7 ("drm/amdgpu/jpeg4: properly set atomics vmid field")
dfad65c65728 ("drm/amdgpu: Add JPEG5 support")
8f98a715da8e ("drm/amdgpu/jpeg: add jpeg support for VCN4_0_5")
35d54e21e002 ("drm/amdgpu: Initialize jpeg v4_0_3 ras function")
570df4bca618 ("drm/amdgpu: Add reset_ras_error_count for jpeg v4_0_3")
41e491d8b606 ("drm/amdgpu: Add query_ras_error_count for jpeg v4_0_3")
e684e654eba9 ("drm/amdgpu/jpeg: add jpeg support for VCN4_0_3")
bf35dbc13585 ("drm/amdgpu/jpeg: enable jpeg v4_0 for sriov")
86e8255f941e ("drm/amdgpu: add JPEG 4.0 RAS poison consumption handling")
533174580133 ("drm/amdgpu: add RAS error query for JPEG 4.0")
f4b92fcd740d ("drm/amdgpu: cleanup CS pass2 v6")
d4e8ad908b20 ("drm/amdgpu: reorder CS code")
88c98d54b220 ("drm/amdgpu: cleanup CS init/fini and pass1")
dd80d9c8eeca ("drm/amdgpu: revert "partial revert "remove ctx->lock" v2"")
9b94c609cc17 ("drm/amdgpu: remove SRIOV and MCBP dependencies from the CS")
63127922e155 ("drm/amdgpu/vcn: Add MMSCH v4_0 support for sriov")
aa44beb5f015 ("drm/amdgpu/vcn: Add sriov VCN v4_0 unified queue support")
dc5f3829a752 ("drm/amdgpu: sriov remove vcn_4_0 and jpeg_4_0")
5df79aeb6e08 ("drm/amdgpu: Protect the amdgpu_bo_list list with a mutex v2")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 470516c2925493594a690bc4d05b1f4471d9f996 Mon Sep 17 00:00:00 2001
From: "David (Ming Qiang) Wu" <David.Wu3(a)amd.com>
Date: Thu, 8 Aug 2024 12:19:50 -0400
Subject: [PATCH] drm/amd/amdgpu: command submission parser for JPEG
Add JPEG IB command parser to ensure registers
in the command are within the JPEG IP block.
Reviewed-by: Alex Deucher <alexander.deucher(a)amd.com>
Signed-off-by: David (Ming Qiang) Wu <David.Wu3(a)amd.com>
Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com>
(cherry picked from commit a7f670d5d8e77b092404ca8a35bb0f8f89ed3117)
Cc: stable(a)vger.kernel.org
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 9aa952f258cf..6dfdff58bffd 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -1057,6 +1057,9 @@ static int amdgpu_cs_patch_ibs(struct amdgpu_cs_parser *p,
r = amdgpu_ring_parse_cs(ring, p, job, ib);
if (r)
return r;
+
+ if (ib->sa_bo)
+ ib->gpu_addr = amdgpu_sa_bo_gpu_addr(ib->sa_bo);
} else {
ib->ptr = (uint32_t *)kptr;
r = amdgpu_ring_patch_cs_in_place(ring, p, job, ib);
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
index f4662920c653..6ae5a784e187 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
@@ -23,6 +23,7 @@
#include "amdgpu.h"
#include "amdgpu_jpeg.h"
+#include "amdgpu_cs.h"
#include "soc15.h"
#include "soc15d.h"
#include "jpeg_v4_0_3.h"
@@ -782,7 +783,11 @@ void jpeg_v4_0_3_dec_ring_emit_ib(struct amdgpu_ring *ring,
amdgpu_ring_write(ring, PACKETJ(regUVD_LMI_JRBC_IB_VMID_INTERNAL_OFFSET,
0, 0, PACKETJ_TYPE0));
- amdgpu_ring_write(ring, (vmid | (vmid << 4) | (vmid << 8)));
+
+ if (ring->funcs->parse_cs)
+ amdgpu_ring_write(ring, 0);
+ else
+ amdgpu_ring_write(ring, (vmid | (vmid << 4) | (vmid << 8)));
amdgpu_ring_write(ring, PACKETJ(regUVD_LMI_JPEG_VMID_INTERNAL_OFFSET,
0, 0, PACKETJ_TYPE0));
@@ -1084,6 +1089,7 @@ static const struct amdgpu_ring_funcs jpeg_v4_0_3_dec_ring_vm_funcs = {
.get_rptr = jpeg_v4_0_3_dec_ring_get_rptr,
.get_wptr = jpeg_v4_0_3_dec_ring_get_wptr,
.set_wptr = jpeg_v4_0_3_dec_ring_set_wptr,
+ .parse_cs = jpeg_v4_0_3_dec_ring_parse_cs,
.emit_frame_size =
SOC15_FLUSH_GPU_TLB_NUM_WREG * 6 +
SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT * 8 +
@@ -1248,3 +1254,56 @@ static void jpeg_v4_0_3_set_ras_funcs(struct amdgpu_device *adev)
{
adev->jpeg.ras = &jpeg_v4_0_3_ras;
}
+
+/**
+ * jpeg_v4_0_3_dec_ring_parse_cs - command submission parser
+ *
+ * @parser: Command submission parser context
+ * @job: the job to parse
+ * @ib: the IB to parse
+ *
+ * Parse the command stream, return -EINVAL for invalid packet,
+ * 0 otherwise
+ */
+int jpeg_v4_0_3_dec_ring_parse_cs(struct amdgpu_cs_parser *parser,
+ struct amdgpu_job *job,
+ struct amdgpu_ib *ib)
+{
+ uint32_t i, reg, res, cond, type;
+ struct amdgpu_device *adev = parser->adev;
+
+ for (i = 0; i < ib->length_dw ; i += 2) {
+ reg = CP_PACKETJ_GET_REG(ib->ptr[i]);
+ res = CP_PACKETJ_GET_RES(ib->ptr[i]);
+ cond = CP_PACKETJ_GET_COND(ib->ptr[i]);
+ type = CP_PACKETJ_GET_TYPE(ib->ptr[i]);
+
+ if (res) /* only support 0 at the moment */
+ return -EINVAL;
+
+ switch (type) {
+ case PACKETJ_TYPE0:
+ if (cond != PACKETJ_CONDITION_CHECK0 || reg < JPEG_REG_RANGE_START || reg > JPEG_REG_RANGE_END) {
+ dev_err(adev->dev, "Invalid packet [0x%08x]!\n", ib->ptr[i]);
+ return -EINVAL;
+ }
+ break;
+ case PACKETJ_TYPE3:
+ if (cond != PACKETJ_CONDITION_CHECK3 || reg < JPEG_REG_RANGE_START || reg > JPEG_REG_RANGE_END) {
+ dev_err(adev->dev, "Invalid packet [0x%08x]!\n", ib->ptr[i]);
+ return -EINVAL;
+ }
+ break;
+ case PACKETJ_TYPE6:
+ if (ib->ptr[i] == CP_PACKETJ_NOP)
+ continue;
+ dev_err(adev->dev, "Invalid packet [0x%08x]!\n", ib->ptr[i]);
+ return -EINVAL;
+ default:
+ dev_err(adev->dev, "Unknown packet type %d !\n", type);
+ return -EINVAL;
+ }
+ }
+
+ return 0;
+}
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h
index 747a3e5f6856..71c54b294e15 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h
@@ -46,6 +46,9 @@
#define JRBC_DEC_EXTERNAL_REG_WRITE_ADDR 0x18000
+#define JPEG_REG_RANGE_START 0x4000
+#define JPEG_REG_RANGE_END 0x41c2
+
extern const struct amdgpu_ip_block_version jpeg_v4_0_3_ip_block;
void jpeg_v4_0_3_dec_ring_emit_ib(struct amdgpu_ring *ring,
@@ -62,5 +65,7 @@ void jpeg_v4_0_3_dec_ring_insert_end(struct amdgpu_ring *ring);
void jpeg_v4_0_3_dec_ring_emit_wreg(struct amdgpu_ring *ring, uint32_t reg, uint32_t val);
void jpeg_v4_0_3_dec_ring_emit_reg_wait(struct amdgpu_ring *ring, uint32_t reg,
uint32_t val, uint32_t mask);
-
+int jpeg_v4_0_3_dec_ring_parse_cs(struct amdgpu_cs_parser *parser,
+ struct amdgpu_job *job,
+ struct amdgpu_ib *ib);
#endif /* __JPEG_V4_0_3_H__ */
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
index d694a276498a..f4daff90c770 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
@@ -646,6 +646,7 @@ static const struct amdgpu_ring_funcs jpeg_v5_0_0_dec_ring_vm_funcs = {
.get_rptr = jpeg_v5_0_0_dec_ring_get_rptr,
.get_wptr = jpeg_v5_0_0_dec_ring_get_wptr,
.set_wptr = jpeg_v5_0_0_dec_ring_set_wptr,
+ .parse_cs = jpeg_v4_0_3_dec_ring_parse_cs,
.emit_frame_size =
SOC15_FLUSH_GPU_TLB_NUM_WREG * 6 +
SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT * 8 +
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15d.h b/drivers/gpu/drm/amd/amdgpu/soc15d.h
index 2357ff39323f..e74e1983da53 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15d.h
+++ b/drivers/gpu/drm/amd/amdgpu/soc15d.h
@@ -76,6 +76,12 @@
((cond & 0xF) << 24) | \
((type & 0xF) << 28))
+#define CP_PACKETJ_NOP 0x60000000
+#define CP_PACKETJ_GET_REG(x) ((x) & 0x3FFFF)
+#define CP_PACKETJ_GET_RES(x) (((x) >> 18) & 0x3F)
+#define CP_PACKETJ_GET_COND(x) (((x) >> 24) & 0xF)
+#define CP_PACKETJ_GET_TYPE(x) (((x) >> 28) & 0xF)
+
/* Packet 3 types */
#define PACKET3_NOP 0x10
#define PACKET3_SET_BASE 0x11
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] drm/amd/amdgpu: command submission parser for JPEG" failed to apply to 5.15-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x 470516c2925493594a690bc4d05b1f4471d9f996
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081922-hammock-cloning-41b2@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
470516c29254 ("drm/amd/amdgpu: command submission parser for JPEG")
e6c6bd6253e7 ("drm/amdgpu/jpeg4: properly set atomics vmid field")
dfad65c65728 ("drm/amdgpu: Add JPEG5 support")
8f98a715da8e ("drm/amdgpu/jpeg: add jpeg support for VCN4_0_5")
35d54e21e002 ("drm/amdgpu: Initialize jpeg v4_0_3 ras function")
570df4bca618 ("drm/amdgpu: Add reset_ras_error_count for jpeg v4_0_3")
41e491d8b606 ("drm/amdgpu: Add query_ras_error_count for jpeg v4_0_3")
e684e654eba9 ("drm/amdgpu/jpeg: add jpeg support for VCN4_0_3")
bf35dbc13585 ("drm/amdgpu/jpeg: enable jpeg v4_0 for sriov")
86e8255f941e ("drm/amdgpu: add JPEG 4.0 RAS poison consumption handling")
533174580133 ("drm/amdgpu: add RAS error query for JPEG 4.0")
f4b92fcd740d ("drm/amdgpu: cleanup CS pass2 v6")
d4e8ad908b20 ("drm/amdgpu: reorder CS code")
88c98d54b220 ("drm/amdgpu: cleanup CS init/fini and pass1")
dd80d9c8eeca ("drm/amdgpu: revert "partial revert "remove ctx->lock" v2"")
9b94c609cc17 ("drm/amdgpu: remove SRIOV and MCBP dependencies from the CS")
63127922e155 ("drm/amdgpu/vcn: Add MMSCH v4_0 support for sriov")
aa44beb5f015 ("drm/amdgpu/vcn: Add sriov VCN v4_0 unified queue support")
dc5f3829a752 ("drm/amdgpu: sriov remove vcn_4_0 and jpeg_4_0")
5df79aeb6e08 ("drm/amdgpu: Protect the amdgpu_bo_list list with a mutex v2")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 470516c2925493594a690bc4d05b1f4471d9f996 Mon Sep 17 00:00:00 2001
From: "David (Ming Qiang) Wu" <David.Wu3(a)amd.com>
Date: Thu, 8 Aug 2024 12:19:50 -0400
Subject: [PATCH] drm/amd/amdgpu: command submission parser for JPEG
Add JPEG IB command parser to ensure registers
in the command are within the JPEG IP block.
Reviewed-by: Alex Deucher <alexander.deucher(a)amd.com>
Signed-off-by: David (Ming Qiang) Wu <David.Wu3(a)amd.com>
Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com>
(cherry picked from commit a7f670d5d8e77b092404ca8a35bb0f8f89ed3117)
Cc: stable(a)vger.kernel.org
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 9aa952f258cf..6dfdff58bffd 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -1057,6 +1057,9 @@ static int amdgpu_cs_patch_ibs(struct amdgpu_cs_parser *p,
r = amdgpu_ring_parse_cs(ring, p, job, ib);
if (r)
return r;
+
+ if (ib->sa_bo)
+ ib->gpu_addr = amdgpu_sa_bo_gpu_addr(ib->sa_bo);
} else {
ib->ptr = (uint32_t *)kptr;
r = amdgpu_ring_patch_cs_in_place(ring, p, job, ib);
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
index f4662920c653..6ae5a784e187 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
@@ -23,6 +23,7 @@
#include "amdgpu.h"
#include "amdgpu_jpeg.h"
+#include "amdgpu_cs.h"
#include "soc15.h"
#include "soc15d.h"
#include "jpeg_v4_0_3.h"
@@ -782,7 +783,11 @@ void jpeg_v4_0_3_dec_ring_emit_ib(struct amdgpu_ring *ring,
amdgpu_ring_write(ring, PACKETJ(regUVD_LMI_JRBC_IB_VMID_INTERNAL_OFFSET,
0, 0, PACKETJ_TYPE0));
- amdgpu_ring_write(ring, (vmid | (vmid << 4) | (vmid << 8)));
+
+ if (ring->funcs->parse_cs)
+ amdgpu_ring_write(ring, 0);
+ else
+ amdgpu_ring_write(ring, (vmid | (vmid << 4) | (vmid << 8)));
amdgpu_ring_write(ring, PACKETJ(regUVD_LMI_JPEG_VMID_INTERNAL_OFFSET,
0, 0, PACKETJ_TYPE0));
@@ -1084,6 +1089,7 @@ static const struct amdgpu_ring_funcs jpeg_v4_0_3_dec_ring_vm_funcs = {
.get_rptr = jpeg_v4_0_3_dec_ring_get_rptr,
.get_wptr = jpeg_v4_0_3_dec_ring_get_wptr,
.set_wptr = jpeg_v4_0_3_dec_ring_set_wptr,
+ .parse_cs = jpeg_v4_0_3_dec_ring_parse_cs,
.emit_frame_size =
SOC15_FLUSH_GPU_TLB_NUM_WREG * 6 +
SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT * 8 +
@@ -1248,3 +1254,56 @@ static void jpeg_v4_0_3_set_ras_funcs(struct amdgpu_device *adev)
{
adev->jpeg.ras = &jpeg_v4_0_3_ras;
}
+
+/**
+ * jpeg_v4_0_3_dec_ring_parse_cs - command submission parser
+ *
+ * @parser: Command submission parser context
+ * @job: the job to parse
+ * @ib: the IB to parse
+ *
+ * Parse the command stream, return -EINVAL for invalid packet,
+ * 0 otherwise
+ */
+int jpeg_v4_0_3_dec_ring_parse_cs(struct amdgpu_cs_parser *parser,
+ struct amdgpu_job *job,
+ struct amdgpu_ib *ib)
+{
+ uint32_t i, reg, res, cond, type;
+ struct amdgpu_device *adev = parser->adev;
+
+ for (i = 0; i < ib->length_dw ; i += 2) {
+ reg = CP_PACKETJ_GET_REG(ib->ptr[i]);
+ res = CP_PACKETJ_GET_RES(ib->ptr[i]);
+ cond = CP_PACKETJ_GET_COND(ib->ptr[i]);
+ type = CP_PACKETJ_GET_TYPE(ib->ptr[i]);
+
+ if (res) /* only support 0 at the moment */
+ return -EINVAL;
+
+ switch (type) {
+ case PACKETJ_TYPE0:
+ if (cond != PACKETJ_CONDITION_CHECK0 || reg < JPEG_REG_RANGE_START || reg > JPEG_REG_RANGE_END) {
+ dev_err(adev->dev, "Invalid packet [0x%08x]!\n", ib->ptr[i]);
+ return -EINVAL;
+ }
+ break;
+ case PACKETJ_TYPE3:
+ if (cond != PACKETJ_CONDITION_CHECK3 || reg < JPEG_REG_RANGE_START || reg > JPEG_REG_RANGE_END) {
+ dev_err(adev->dev, "Invalid packet [0x%08x]!\n", ib->ptr[i]);
+ return -EINVAL;
+ }
+ break;
+ case PACKETJ_TYPE6:
+ if (ib->ptr[i] == CP_PACKETJ_NOP)
+ continue;
+ dev_err(adev->dev, "Invalid packet [0x%08x]!\n", ib->ptr[i]);
+ return -EINVAL;
+ default:
+ dev_err(adev->dev, "Unknown packet type %d !\n", type);
+ return -EINVAL;
+ }
+ }
+
+ return 0;
+}
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h
index 747a3e5f6856..71c54b294e15 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h
@@ -46,6 +46,9 @@
#define JRBC_DEC_EXTERNAL_REG_WRITE_ADDR 0x18000
+#define JPEG_REG_RANGE_START 0x4000
+#define JPEG_REG_RANGE_END 0x41c2
+
extern const struct amdgpu_ip_block_version jpeg_v4_0_3_ip_block;
void jpeg_v4_0_3_dec_ring_emit_ib(struct amdgpu_ring *ring,
@@ -62,5 +65,7 @@ void jpeg_v4_0_3_dec_ring_insert_end(struct amdgpu_ring *ring);
void jpeg_v4_0_3_dec_ring_emit_wreg(struct amdgpu_ring *ring, uint32_t reg, uint32_t val);
void jpeg_v4_0_3_dec_ring_emit_reg_wait(struct amdgpu_ring *ring, uint32_t reg,
uint32_t val, uint32_t mask);
-
+int jpeg_v4_0_3_dec_ring_parse_cs(struct amdgpu_cs_parser *parser,
+ struct amdgpu_job *job,
+ struct amdgpu_ib *ib);
#endif /* __JPEG_V4_0_3_H__ */
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
index d694a276498a..f4daff90c770 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
@@ -646,6 +646,7 @@ static const struct amdgpu_ring_funcs jpeg_v5_0_0_dec_ring_vm_funcs = {
.get_rptr = jpeg_v5_0_0_dec_ring_get_rptr,
.get_wptr = jpeg_v5_0_0_dec_ring_get_wptr,
.set_wptr = jpeg_v5_0_0_dec_ring_set_wptr,
+ .parse_cs = jpeg_v4_0_3_dec_ring_parse_cs,
.emit_frame_size =
SOC15_FLUSH_GPU_TLB_NUM_WREG * 6 +
SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT * 8 +
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15d.h b/drivers/gpu/drm/amd/amdgpu/soc15d.h
index 2357ff39323f..e74e1983da53 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15d.h
+++ b/drivers/gpu/drm/amd/amdgpu/soc15d.h
@@ -76,6 +76,12 @@
((cond & 0xF) << 24) | \
((type & 0xF) << 28))
+#define CP_PACKETJ_NOP 0x60000000
+#define CP_PACKETJ_GET_REG(x) ((x) & 0x3FFFF)
+#define CP_PACKETJ_GET_RES(x) (((x) >> 18) & 0x3F)
+#define CP_PACKETJ_GET_COND(x) (((x) >> 24) & 0xF)
+#define CP_PACKETJ_GET_TYPE(x) (((x) >> 28) & 0xF)
+
/* Packet 3 types */
#define PACKET3_NOP 0x10
#define PACKET3_SET_BASE 0x11
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] drm/amd/amdgpu: command submission parser for JPEG" failed to apply to 6.1-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 470516c2925493594a690bc4d05b1f4471d9f996
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081921-corroding-scrabble-432d@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
470516c29254 ("drm/amd/amdgpu: command submission parser for JPEG")
e6c6bd6253e7 ("drm/amdgpu/jpeg4: properly set atomics vmid field")
dfad65c65728 ("drm/amdgpu: Add JPEG5 support")
8f98a715da8e ("drm/amdgpu/jpeg: add jpeg support for VCN4_0_5")
35d54e21e002 ("drm/amdgpu: Initialize jpeg v4_0_3 ras function")
570df4bca618 ("drm/amdgpu: Add reset_ras_error_count for jpeg v4_0_3")
41e491d8b606 ("drm/amdgpu: Add query_ras_error_count for jpeg v4_0_3")
e684e654eba9 ("drm/amdgpu/jpeg: add jpeg support for VCN4_0_3")
bf35dbc13585 ("drm/amdgpu/jpeg: enable jpeg v4_0 for sriov")
86e8255f941e ("drm/amdgpu: add JPEG 4.0 RAS poison consumption handling")
533174580133 ("drm/amdgpu: add RAS error query for JPEG 4.0")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 470516c2925493594a690bc4d05b1f4471d9f996 Mon Sep 17 00:00:00 2001
From: "David (Ming Qiang) Wu" <David.Wu3(a)amd.com>
Date: Thu, 8 Aug 2024 12:19:50 -0400
Subject: [PATCH] drm/amd/amdgpu: command submission parser for JPEG
Add JPEG IB command parser to ensure registers
in the command are within the JPEG IP block.
Reviewed-by: Alex Deucher <alexander.deucher(a)amd.com>
Signed-off-by: David (Ming Qiang) Wu <David.Wu3(a)amd.com>
Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com>
(cherry picked from commit a7f670d5d8e77b092404ca8a35bb0f8f89ed3117)
Cc: stable(a)vger.kernel.org
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 9aa952f258cf..6dfdff58bffd 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -1057,6 +1057,9 @@ static int amdgpu_cs_patch_ibs(struct amdgpu_cs_parser *p,
r = amdgpu_ring_parse_cs(ring, p, job, ib);
if (r)
return r;
+
+ if (ib->sa_bo)
+ ib->gpu_addr = amdgpu_sa_bo_gpu_addr(ib->sa_bo);
} else {
ib->ptr = (uint32_t *)kptr;
r = amdgpu_ring_patch_cs_in_place(ring, p, job, ib);
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
index f4662920c653..6ae5a784e187 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
@@ -23,6 +23,7 @@
#include "amdgpu.h"
#include "amdgpu_jpeg.h"
+#include "amdgpu_cs.h"
#include "soc15.h"
#include "soc15d.h"
#include "jpeg_v4_0_3.h"
@@ -782,7 +783,11 @@ void jpeg_v4_0_3_dec_ring_emit_ib(struct amdgpu_ring *ring,
amdgpu_ring_write(ring, PACKETJ(regUVD_LMI_JRBC_IB_VMID_INTERNAL_OFFSET,
0, 0, PACKETJ_TYPE0));
- amdgpu_ring_write(ring, (vmid | (vmid << 4) | (vmid << 8)));
+
+ if (ring->funcs->parse_cs)
+ amdgpu_ring_write(ring, 0);
+ else
+ amdgpu_ring_write(ring, (vmid | (vmid << 4) | (vmid << 8)));
amdgpu_ring_write(ring, PACKETJ(regUVD_LMI_JPEG_VMID_INTERNAL_OFFSET,
0, 0, PACKETJ_TYPE0));
@@ -1084,6 +1089,7 @@ static const struct amdgpu_ring_funcs jpeg_v4_0_3_dec_ring_vm_funcs = {
.get_rptr = jpeg_v4_0_3_dec_ring_get_rptr,
.get_wptr = jpeg_v4_0_3_dec_ring_get_wptr,
.set_wptr = jpeg_v4_0_3_dec_ring_set_wptr,
+ .parse_cs = jpeg_v4_0_3_dec_ring_parse_cs,
.emit_frame_size =
SOC15_FLUSH_GPU_TLB_NUM_WREG * 6 +
SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT * 8 +
@@ -1248,3 +1254,56 @@ static void jpeg_v4_0_3_set_ras_funcs(struct amdgpu_device *adev)
{
adev->jpeg.ras = &jpeg_v4_0_3_ras;
}
+
+/**
+ * jpeg_v4_0_3_dec_ring_parse_cs - command submission parser
+ *
+ * @parser: Command submission parser context
+ * @job: the job to parse
+ * @ib: the IB to parse
+ *
+ * Parse the command stream, return -EINVAL for invalid packet,
+ * 0 otherwise
+ */
+int jpeg_v4_0_3_dec_ring_parse_cs(struct amdgpu_cs_parser *parser,
+ struct amdgpu_job *job,
+ struct amdgpu_ib *ib)
+{
+ uint32_t i, reg, res, cond, type;
+ struct amdgpu_device *adev = parser->adev;
+
+ for (i = 0; i < ib->length_dw ; i += 2) {
+ reg = CP_PACKETJ_GET_REG(ib->ptr[i]);
+ res = CP_PACKETJ_GET_RES(ib->ptr[i]);
+ cond = CP_PACKETJ_GET_COND(ib->ptr[i]);
+ type = CP_PACKETJ_GET_TYPE(ib->ptr[i]);
+
+ if (res) /* only support 0 at the moment */
+ return -EINVAL;
+
+ switch (type) {
+ case PACKETJ_TYPE0:
+ if (cond != PACKETJ_CONDITION_CHECK0 || reg < JPEG_REG_RANGE_START || reg > JPEG_REG_RANGE_END) {
+ dev_err(adev->dev, "Invalid packet [0x%08x]!\n", ib->ptr[i]);
+ return -EINVAL;
+ }
+ break;
+ case PACKETJ_TYPE3:
+ if (cond != PACKETJ_CONDITION_CHECK3 || reg < JPEG_REG_RANGE_START || reg > JPEG_REG_RANGE_END) {
+ dev_err(adev->dev, "Invalid packet [0x%08x]!\n", ib->ptr[i]);
+ return -EINVAL;
+ }
+ break;
+ case PACKETJ_TYPE6:
+ if (ib->ptr[i] == CP_PACKETJ_NOP)
+ continue;
+ dev_err(adev->dev, "Invalid packet [0x%08x]!\n", ib->ptr[i]);
+ return -EINVAL;
+ default:
+ dev_err(adev->dev, "Unknown packet type %d !\n", type);
+ return -EINVAL;
+ }
+ }
+
+ return 0;
+}
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h
index 747a3e5f6856..71c54b294e15 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h
@@ -46,6 +46,9 @@
#define JRBC_DEC_EXTERNAL_REG_WRITE_ADDR 0x18000
+#define JPEG_REG_RANGE_START 0x4000
+#define JPEG_REG_RANGE_END 0x41c2
+
extern const struct amdgpu_ip_block_version jpeg_v4_0_3_ip_block;
void jpeg_v4_0_3_dec_ring_emit_ib(struct amdgpu_ring *ring,
@@ -62,5 +65,7 @@ void jpeg_v4_0_3_dec_ring_insert_end(struct amdgpu_ring *ring);
void jpeg_v4_0_3_dec_ring_emit_wreg(struct amdgpu_ring *ring, uint32_t reg, uint32_t val);
void jpeg_v4_0_3_dec_ring_emit_reg_wait(struct amdgpu_ring *ring, uint32_t reg,
uint32_t val, uint32_t mask);
-
+int jpeg_v4_0_3_dec_ring_parse_cs(struct amdgpu_cs_parser *parser,
+ struct amdgpu_job *job,
+ struct amdgpu_ib *ib);
#endif /* __JPEG_V4_0_3_H__ */
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
index d694a276498a..f4daff90c770 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
@@ -646,6 +646,7 @@ static const struct amdgpu_ring_funcs jpeg_v5_0_0_dec_ring_vm_funcs = {
.get_rptr = jpeg_v5_0_0_dec_ring_get_rptr,
.get_wptr = jpeg_v5_0_0_dec_ring_get_wptr,
.set_wptr = jpeg_v5_0_0_dec_ring_set_wptr,
+ .parse_cs = jpeg_v4_0_3_dec_ring_parse_cs,
.emit_frame_size =
SOC15_FLUSH_GPU_TLB_NUM_WREG * 6 +
SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT * 8 +
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15d.h b/drivers/gpu/drm/amd/amdgpu/soc15d.h
index 2357ff39323f..e74e1983da53 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15d.h
+++ b/drivers/gpu/drm/amd/amdgpu/soc15d.h
@@ -76,6 +76,12 @@
((cond & 0xF) << 24) | \
((type & 0xF) << 28))
+#define CP_PACKETJ_NOP 0x60000000
+#define CP_PACKETJ_GET_REG(x) ((x) & 0x3FFFF)
+#define CP_PACKETJ_GET_RES(x) (((x) >> 18) & 0x3F)
+#define CP_PACKETJ_GET_COND(x) (((x) >> 24) & 0xF)
+#define CP_PACKETJ_GET_TYPE(x) (((x) >> 28) & 0xF)
+
/* Packet 3 types */
#define PACKET3_NOP 0x10
#define PACKET3_SET_BASE 0x11
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] drm/amd/amdgpu: command submission parser for JPEG" failed to apply to 6.6-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 470516c2925493594a690bc4d05b1f4471d9f996
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081921-overvalue-angles-9d06@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
470516c29254 ("drm/amd/amdgpu: command submission parser for JPEG")
e6c6bd6253e7 ("drm/amdgpu/jpeg4: properly set atomics vmid field")
dfad65c65728 ("drm/amdgpu: Add JPEG5 support")
8f98a715da8e ("drm/amdgpu/jpeg: add jpeg support for VCN4_0_5")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 470516c2925493594a690bc4d05b1f4471d9f996 Mon Sep 17 00:00:00 2001
From: "David (Ming Qiang) Wu" <David.Wu3(a)amd.com>
Date: Thu, 8 Aug 2024 12:19:50 -0400
Subject: [PATCH] drm/amd/amdgpu: command submission parser for JPEG
Add JPEG IB command parser to ensure registers
in the command are within the JPEG IP block.
Reviewed-by: Alex Deucher <alexander.deucher(a)amd.com>
Signed-off-by: David (Ming Qiang) Wu <David.Wu3(a)amd.com>
Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com>
(cherry picked from commit a7f670d5d8e77b092404ca8a35bb0f8f89ed3117)
Cc: stable(a)vger.kernel.org
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 9aa952f258cf..6dfdff58bffd 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -1057,6 +1057,9 @@ static int amdgpu_cs_patch_ibs(struct amdgpu_cs_parser *p,
r = amdgpu_ring_parse_cs(ring, p, job, ib);
if (r)
return r;
+
+ if (ib->sa_bo)
+ ib->gpu_addr = amdgpu_sa_bo_gpu_addr(ib->sa_bo);
} else {
ib->ptr = (uint32_t *)kptr;
r = amdgpu_ring_patch_cs_in_place(ring, p, job, ib);
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
index f4662920c653..6ae5a784e187 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
@@ -23,6 +23,7 @@
#include "amdgpu.h"
#include "amdgpu_jpeg.h"
+#include "amdgpu_cs.h"
#include "soc15.h"
#include "soc15d.h"
#include "jpeg_v4_0_3.h"
@@ -782,7 +783,11 @@ void jpeg_v4_0_3_dec_ring_emit_ib(struct amdgpu_ring *ring,
amdgpu_ring_write(ring, PACKETJ(regUVD_LMI_JRBC_IB_VMID_INTERNAL_OFFSET,
0, 0, PACKETJ_TYPE0));
- amdgpu_ring_write(ring, (vmid | (vmid << 4) | (vmid << 8)));
+
+ if (ring->funcs->parse_cs)
+ amdgpu_ring_write(ring, 0);
+ else
+ amdgpu_ring_write(ring, (vmid | (vmid << 4) | (vmid << 8)));
amdgpu_ring_write(ring, PACKETJ(regUVD_LMI_JPEG_VMID_INTERNAL_OFFSET,
0, 0, PACKETJ_TYPE0));
@@ -1084,6 +1089,7 @@ static const struct amdgpu_ring_funcs jpeg_v4_0_3_dec_ring_vm_funcs = {
.get_rptr = jpeg_v4_0_3_dec_ring_get_rptr,
.get_wptr = jpeg_v4_0_3_dec_ring_get_wptr,
.set_wptr = jpeg_v4_0_3_dec_ring_set_wptr,
+ .parse_cs = jpeg_v4_0_3_dec_ring_parse_cs,
.emit_frame_size =
SOC15_FLUSH_GPU_TLB_NUM_WREG * 6 +
SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT * 8 +
@@ -1248,3 +1254,56 @@ static void jpeg_v4_0_3_set_ras_funcs(struct amdgpu_device *adev)
{
adev->jpeg.ras = &jpeg_v4_0_3_ras;
}
+
+/**
+ * jpeg_v4_0_3_dec_ring_parse_cs - command submission parser
+ *
+ * @parser: Command submission parser context
+ * @job: the job to parse
+ * @ib: the IB to parse
+ *
+ * Parse the command stream, return -EINVAL for invalid packet,
+ * 0 otherwise
+ */
+int jpeg_v4_0_3_dec_ring_parse_cs(struct amdgpu_cs_parser *parser,
+ struct amdgpu_job *job,
+ struct amdgpu_ib *ib)
+{
+ uint32_t i, reg, res, cond, type;
+ struct amdgpu_device *adev = parser->adev;
+
+ for (i = 0; i < ib->length_dw ; i += 2) {
+ reg = CP_PACKETJ_GET_REG(ib->ptr[i]);
+ res = CP_PACKETJ_GET_RES(ib->ptr[i]);
+ cond = CP_PACKETJ_GET_COND(ib->ptr[i]);
+ type = CP_PACKETJ_GET_TYPE(ib->ptr[i]);
+
+ if (res) /* only support 0 at the moment */
+ return -EINVAL;
+
+ switch (type) {
+ case PACKETJ_TYPE0:
+ if (cond != PACKETJ_CONDITION_CHECK0 || reg < JPEG_REG_RANGE_START || reg > JPEG_REG_RANGE_END) {
+ dev_err(adev->dev, "Invalid packet [0x%08x]!\n", ib->ptr[i]);
+ return -EINVAL;
+ }
+ break;
+ case PACKETJ_TYPE3:
+ if (cond != PACKETJ_CONDITION_CHECK3 || reg < JPEG_REG_RANGE_START || reg > JPEG_REG_RANGE_END) {
+ dev_err(adev->dev, "Invalid packet [0x%08x]!\n", ib->ptr[i]);
+ return -EINVAL;
+ }
+ break;
+ case PACKETJ_TYPE6:
+ if (ib->ptr[i] == CP_PACKETJ_NOP)
+ continue;
+ dev_err(adev->dev, "Invalid packet [0x%08x]!\n", ib->ptr[i]);
+ return -EINVAL;
+ default:
+ dev_err(adev->dev, "Unknown packet type %d !\n", type);
+ return -EINVAL;
+ }
+ }
+
+ return 0;
+}
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h
index 747a3e5f6856..71c54b294e15 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h
@@ -46,6 +46,9 @@
#define JRBC_DEC_EXTERNAL_REG_WRITE_ADDR 0x18000
+#define JPEG_REG_RANGE_START 0x4000
+#define JPEG_REG_RANGE_END 0x41c2
+
extern const struct amdgpu_ip_block_version jpeg_v4_0_3_ip_block;
void jpeg_v4_0_3_dec_ring_emit_ib(struct amdgpu_ring *ring,
@@ -62,5 +65,7 @@ void jpeg_v4_0_3_dec_ring_insert_end(struct amdgpu_ring *ring);
void jpeg_v4_0_3_dec_ring_emit_wreg(struct amdgpu_ring *ring, uint32_t reg, uint32_t val);
void jpeg_v4_0_3_dec_ring_emit_reg_wait(struct amdgpu_ring *ring, uint32_t reg,
uint32_t val, uint32_t mask);
-
+int jpeg_v4_0_3_dec_ring_parse_cs(struct amdgpu_cs_parser *parser,
+ struct amdgpu_job *job,
+ struct amdgpu_ib *ib);
#endif /* __JPEG_V4_0_3_H__ */
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
index d694a276498a..f4daff90c770 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
@@ -646,6 +646,7 @@ static const struct amdgpu_ring_funcs jpeg_v5_0_0_dec_ring_vm_funcs = {
.get_rptr = jpeg_v5_0_0_dec_ring_get_rptr,
.get_wptr = jpeg_v5_0_0_dec_ring_get_wptr,
.set_wptr = jpeg_v5_0_0_dec_ring_set_wptr,
+ .parse_cs = jpeg_v4_0_3_dec_ring_parse_cs,
.emit_frame_size =
SOC15_FLUSH_GPU_TLB_NUM_WREG * 6 +
SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT * 8 +
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15d.h b/drivers/gpu/drm/amd/amdgpu/soc15d.h
index 2357ff39323f..e74e1983da53 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15d.h
+++ b/drivers/gpu/drm/amd/amdgpu/soc15d.h
@@ -76,6 +76,12 @@
((cond & 0xF) << 24) | \
((type & 0xF) << 28))
+#define CP_PACKETJ_NOP 0x60000000
+#define CP_PACKETJ_GET_REG(x) ((x) & 0x3FFFF)
+#define CP_PACKETJ_GET_RES(x) (((x) >> 18) & 0x3F)
+#define CP_PACKETJ_GET_COND(x) (((x) >> 24) & 0xF)
+#define CP_PACKETJ_GET_TYPE(x) (((x) >> 28) & 0xF)
+
/* Packet 3 types */
#define PACKET3_NOP 0x10
#define PACKET3_SET_BASE 0x11
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] drm/amd/display: fix cursor offset on rotation 180" failed to apply to 6.1-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 737222cebecbdbcdde2b69475c52bcb9ecfeb830
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081937-granular-passably-9226@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
737222cebecb ("drm/amd/display: fix cursor offset on rotation 180")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 737222cebecbdbcdde2b69475c52bcb9ecfeb830 Mon Sep 17 00:00:00 2001
From: Melissa Wen <mwen(a)igalia.com>
Date: Tue, 31 Jan 2023 15:05:46 -0100
Subject: [PATCH] drm/amd/display: fix cursor offset on rotation 180
[why & how]
Cursor gets clipped off in the middle of the screen with hw
rotation 180. Fix a miscalculation of cursor offset when it's
placed near the edges in the pipe split case.
Cursor bugs with hw rotation were reported on AMD issue
tracker:
https://gitlab.freedesktop.org/drm/amd/-/issues/2247
The issues on rotation 270 was fixed by:
https://lore.kernel.org/amd-gfx/20221118125935.4013669-22-Brian.Chang@amd.c…
that partially addressed the rotation 180 too. So, this patch is the
final bits for rotation 180.
Reported-by: Xaver Hugl <xaver.hugl(a)gmail.com>
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/2247
Reviewed-by: Harry Wentland <harry.wentland(a)amd.com>
Fixes: 9d84c7ef8a87 ("drm/amd/display: Correct cursor position on horizontal mirror")
Signed-off-by: Melissa Wen <mwen(a)igalia.com>
Signed-off-by: Hamza Mahfooz <hamza.mahfooz(a)amd.com>
Signed-off-by: Tom Chung <chiahsuan.chung(a)amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler(a)amd.com>
Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com>
(cherry picked from commit 1fd2cf090096af8a25bf85564341cfc21cec659d)
Cc: stable(a)vger.kernel.org
diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c
index ff03b1d98aa7..1b9ac8812f5b 100644
--- a/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c
@@ -3589,7 +3589,7 @@ void dcn10_set_cursor_position(struct pipe_ctx *pipe_ctx)
(int)hubp->curs_attr.width || pos_cpy.x
<= (int)hubp->curs_attr.width +
pipe_ctx->plane_state->src_rect.x) {
- pos_cpy.x = temp_x + viewport_width;
+ pos_cpy.x = 2 * viewport_width - temp_x;
}
}
} else {
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] drm/amd/display: fix cursor offset on rotation 180" failed to apply to 6.6-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 737222cebecbdbcdde2b69475c52bcb9ecfeb830
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081932-diabetes-etching-e527@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
737222cebecb ("drm/amd/display: fix cursor offset on rotation 180")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 737222cebecbdbcdde2b69475c52bcb9ecfeb830 Mon Sep 17 00:00:00 2001
From: Melissa Wen <mwen(a)igalia.com>
Date: Tue, 31 Jan 2023 15:05:46 -0100
Subject: [PATCH] drm/amd/display: fix cursor offset on rotation 180
[why & how]
Cursor gets clipped off in the middle of the screen with hw
rotation 180. Fix a miscalculation of cursor offset when it's
placed near the edges in the pipe split case.
Cursor bugs with hw rotation were reported on AMD issue
tracker:
https://gitlab.freedesktop.org/drm/amd/-/issues/2247
The issues on rotation 270 was fixed by:
https://lore.kernel.org/amd-gfx/20221118125935.4013669-22-Brian.Chang@amd.c…
that partially addressed the rotation 180 too. So, this patch is the
final bits for rotation 180.
Reported-by: Xaver Hugl <xaver.hugl(a)gmail.com>
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/2247
Reviewed-by: Harry Wentland <harry.wentland(a)amd.com>
Fixes: 9d84c7ef8a87 ("drm/amd/display: Correct cursor position on horizontal mirror")
Signed-off-by: Melissa Wen <mwen(a)igalia.com>
Signed-off-by: Hamza Mahfooz <hamza.mahfooz(a)amd.com>
Signed-off-by: Tom Chung <chiahsuan.chung(a)amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler(a)amd.com>
Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com>
(cherry picked from commit 1fd2cf090096af8a25bf85564341cfc21cec659d)
Cc: stable(a)vger.kernel.org
diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c
index ff03b1d98aa7..1b9ac8812f5b 100644
--- a/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c
@@ -3589,7 +3589,7 @@ void dcn10_set_cursor_position(struct pipe_ctx *pipe_ctx)
(int)hubp->curs_attr.width || pos_cpy.x
<= (int)hubp->curs_attr.width +
pipe_ctx->plane_state->src_rect.x) {
- pos_cpy.x = temp_x + viewport_width;
+ pos_cpy.x = 2 * viewport_width - temp_x;
}
}
} else {
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] drm/amd/display: Enable otg synchronization logic for DCN321" failed to apply to 6.1-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 0dbb81d44108a2a1004e5b485ef3fca5bc078424
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081910-upload-display-e82d@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
0dbb81d44108 ("drm/amd/display: Enable otg synchronization logic for DCN321")
8b8eed05a1c6 ("drm/amd/display: Refactor resource into component directory")
e53524cdcc02 ("drm/amd/display: Refactor HWSS into component folder")
6e2c4941ce0c ("drm/amd/display: Move dml code under CONFIG_DRM_AMD_DC_FP guard")
45e7649fd191 ("drm/amd/display: Add DCN35 CORE")
1cb87e048975 ("drm/amd/display: Add DCN35 blocks to Makefile")
0fa45b6aeae4 ("drm/amd/display: Add DCN35 Resource")
ec129fa356be ("drm/amd/display: Add DCN35 init")
6f8b7565cca4 ("drm/amd/display: Add DCN35 HWSEQ")
927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable")
927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable")
927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable")
927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable")
927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable")
927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable")
927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable")
927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable")
927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable")
927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable")
927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 0dbb81d44108a2a1004e5b485ef3fca5bc078424 Mon Sep 17 00:00:00 2001
From: Loan Chen <lo-an.chen(a)amd.com>
Date: Fri, 2 Aug 2024 13:57:40 +0800
Subject: [PATCH] drm/amd/display: Enable otg synchronization logic for DCN321
[Why]
Tiled display cannot synchronize properly after S3.
The fix for commit 5f0c74915815 ("drm/amd/display: Fix for otg
synchronization logic") is not enable in DCN321, which causes
the otg is excluded from synchronization.
[How]
Enable otg synchronization logic in dcn321.
Fixes: 5f0c74915815 ("drm/amd/display: Fix for otg synchronization logic")
Cc: Mario Limonciello <mario.limonciello(a)amd.com>
Cc: Alex Deucher <alexander.deucher(a)amd.com>
Reviewed-by: Alvin Lee <alvin.lee2(a)amd.com>
Signed-off-by: Loan Chen <lo-an.chen(a)amd.com>
Signed-off-by: Tom Chung <chiahsuan.chung(a)amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler(a)amd.com>
Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com>
(cherry picked from commit d6ed53712f583423db61fbb802606759e023bf7b)
Cc: stable(a)vger.kernel.org
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c
index 9a3cc0514a36..8e0588b1cf30 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c
@@ -1778,6 +1778,9 @@ static bool dcn321_resource_construct(
dc->caps.color.mpc.ogam_rom_caps.hlg = 0;
dc->caps.color.mpc.ocsc = 1;
+ /* Use pipe context based otg sync logic */
+ dc->config.use_pipe_ctx_sync_logic = true;
+
dc->config.dc_mode_clk_limit_support = true;
dc->config.enable_windowed_mpo_odm = true;
/* read VBIOS LTTPR caps */
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] drm/amd/display: Enable otg synchronization logic for DCN321" failed to apply to 6.6-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 0dbb81d44108a2a1004e5b485ef3fca5bc078424
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081907-uptight-blah-bb36@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
0dbb81d44108 ("drm/amd/display: Enable otg synchronization logic for DCN321")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 0dbb81d44108a2a1004e5b485ef3fca5bc078424 Mon Sep 17 00:00:00 2001
From: Loan Chen <lo-an.chen(a)amd.com>
Date: Fri, 2 Aug 2024 13:57:40 +0800
Subject: [PATCH] drm/amd/display: Enable otg synchronization logic for DCN321
[Why]
Tiled display cannot synchronize properly after S3.
The fix for commit 5f0c74915815 ("drm/amd/display: Fix for otg
synchronization logic") is not enable in DCN321, which causes
the otg is excluded from synchronization.
[How]
Enable otg synchronization logic in dcn321.
Fixes: 5f0c74915815 ("drm/amd/display: Fix for otg synchronization logic")
Cc: Mario Limonciello <mario.limonciello(a)amd.com>
Cc: Alex Deucher <alexander.deucher(a)amd.com>
Reviewed-by: Alvin Lee <alvin.lee2(a)amd.com>
Signed-off-by: Loan Chen <lo-an.chen(a)amd.com>
Signed-off-by: Tom Chung <chiahsuan.chung(a)amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler(a)amd.com>
Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com>
(cherry picked from commit d6ed53712f583423db61fbb802606759e023bf7b)
Cc: stable(a)vger.kernel.org
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c
index 9a3cc0514a36..8e0588b1cf30 100644
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c
@@ -1778,6 +1778,9 @@ static bool dcn321_resource_construct(
dc->caps.color.mpc.ogam_rom_caps.hlg = 0;
dc->caps.color.mpc.ocsc = 1;
+ /* Use pipe context based otg sync logic */
+ dc->config.use_pipe_ctx_sync_logic = true;
+
dc->config.dc_mode_clk_limit_support = true;
dc->config.enable_windowed_mpo_odm = true;
/* read VBIOS LTTPR caps */
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] drm/amd/display: Adjust cursor position" failed to apply to 6.1-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 56fb276d0244d430496f249335a44ae114dd5f54
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081912-custodian-handgrip-81cc@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
56fb276d0244 ("drm/amd/display: Adjust cursor position")
e53524cdcc02 ("drm/amd/display: Refactor HWSS into component folder")
6e2c4941ce0c ("drm/amd/display: Move dml code under CONFIG_DRM_AMD_DC_FP guard")
1cb87e048975 ("drm/amd/display: Add DCN35 blocks to Makefile")
0fa45b6aeae4 ("drm/amd/display: Add DCN35 Resource")
ec129fa356be ("drm/amd/display: Add DCN35 init")
6f8b7565cca4 ("drm/amd/display: Add DCN35 HWSEQ")
927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable")
927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable")
927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable")
927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable")
927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable")
927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable")
927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable")
927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable")
927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable")
927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable")
927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable")
927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable")
927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 56fb276d0244d430496f249335a44ae114dd5f54 Mon Sep 17 00:00:00 2001
From: Rodrigo Siqueira <Rodrigo.Siqueira(a)amd.com>
Date: Thu, 1 Aug 2024 16:16:35 -0600
Subject: [PATCH] drm/amd/display: Adjust cursor position
[why & how]
When the commit 9d84c7ef8a87 ("drm/amd/display: Correct cursor position
on horizontal mirror") was introduced, it used the wrong calculation for
the position copy for X. This commit uses the correct calculation for that
based on the original patch.
Fixes: 9d84c7ef8a87 ("drm/amd/display: Correct cursor position on horizontal mirror")
Cc: Mario Limonciello <mario.limonciello(a)amd.com>
Cc: Alex Deucher <alexander.deucher(a)amd.com>
Acked-by: Wayne Lin <wayne.lin(a)amd.com>
Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira(a)amd.com>
Signed-off-by: Tom Chung <chiahsuan.chung(a)amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler(a)amd.com>
Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com>
(cherry picked from commit 8f9b23abbae5ffcd64856facd26a86b67195bc2f)
Cc: stable(a)vger.kernel.org
diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c
index 1b9ac8812f5b..14a902ff3b8a 100644
--- a/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c
@@ -3682,7 +3682,7 @@ void dcn10_set_cursor_position(struct pipe_ctx *pipe_ctx)
(int)hubp->curs_attr.width || pos_cpy.x
<= (int)hubp->curs_attr.width +
pipe_ctx->plane_state->src_rect.x) {
- pos_cpy.x = 2 * viewport_width - temp_x;
+ pos_cpy.x = temp_x + viewport_width;
}
}
} else {
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] drm/amd/display: Adjust cursor position" failed to apply to 6.6-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 56fb276d0244d430496f249335a44ae114dd5f54
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081911-spending-purchase-3a01@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
56fb276d0244 ("drm/amd/display: Adjust cursor position")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 56fb276d0244d430496f249335a44ae114dd5f54 Mon Sep 17 00:00:00 2001
From: Rodrigo Siqueira <Rodrigo.Siqueira(a)amd.com>
Date: Thu, 1 Aug 2024 16:16:35 -0600
Subject: [PATCH] drm/amd/display: Adjust cursor position
[why & how]
When the commit 9d84c7ef8a87 ("drm/amd/display: Correct cursor position
on horizontal mirror") was introduced, it used the wrong calculation for
the position copy for X. This commit uses the correct calculation for that
based on the original patch.
Fixes: 9d84c7ef8a87 ("drm/amd/display: Correct cursor position on horizontal mirror")
Cc: Mario Limonciello <mario.limonciello(a)amd.com>
Cc: Alex Deucher <alexander.deucher(a)amd.com>
Acked-by: Wayne Lin <wayne.lin(a)amd.com>
Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira(a)amd.com>
Signed-off-by: Tom Chung <chiahsuan.chung(a)amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler(a)amd.com>
Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com>
(cherry picked from commit 8f9b23abbae5ffcd64856facd26a86b67195bc2f)
Cc: stable(a)vger.kernel.org
diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c
index 1b9ac8812f5b..14a902ff3b8a 100644
--- a/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c
@@ -3682,7 +3682,7 @@ void dcn10_set_cursor_position(struct pipe_ctx *pipe_ctx)
(int)hubp->curs_attr.width || pos_cpy.x
<= (int)hubp->curs_attr.width +
pipe_ctx->plane_state->src_rect.x) {
- pos_cpy.x = 2 * viewport_width - temp_x;
+ pos_cpy.x = temp_x + viewport_width;
}
}
} else {
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] mm: fix endless reclaim on machines with unaccepted memory" failed to apply to 6.6-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 807174a93d24c456503692dc3f5af322ee0b640a
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081913-outbid-skincare-1e41@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
807174a93d24 ("mm: fix endless reclaim on machines with unaccepted memory")
57c0419c5f0e ("mm, pcp: decrease PCP high if free pages < high watermark")
51a755c56dc0 ("mm: tune PCP high automatically")
90b41691b988 ("mm: add framework for PCP high auto-tuning")
c0a242394cb9 ("mm, page_alloc: scale the number of pages that are batch allocated")
52166607ecc9 ("mm: restrict the pcp batch scale factor to avoid too long latency")
362d37a106dd ("mm, pcp: reduce lock contention for draining high-order pages")
94a3bfe4073c ("cacheinfo: calculate size of per-CPU data cache slice")
ca71fe1ad922 ("mm, pcp: avoid to drain PCP when process exit")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 807174a93d24c456503692dc3f5af322ee0b640a Mon Sep 17 00:00:00 2001
From: "Kirill A. Shutemov" <kirill.shutemov(a)linux.intel.com>
Date: Fri, 9 Aug 2024 14:48:47 +0300
Subject: [PATCH] mm: fix endless reclaim on machines with unaccepted memory
Unaccepted memory is considered unusable free memory, which is not counted
as free on the zone watermark check. This causes get_page_from_freelist()
to accept more memory to hit the high watermark, but it creates problems
in the reclaim path.
The reclaim path encounters a failed zone watermark check and attempts to
reclaim memory. This is usually successful, but if there is little or no
reclaimable memory, it can result in endless reclaim with little to no
progress. This can occur early in the boot process, just after start of
the init process when the only reclaimable memory is the page cache of the
init executable and its libraries.
Make unaccepted memory free from watermark check point of view. This way
unaccepted memory will never be the trigger of memory reclaim. Accept
more memory in the get_page_from_freelist() if needed.
Link: https://lkml.kernel.org/r/20240809114854.3745464-2-kirill.shutemov@linux.in…
Fixes: dcdfdd40fa82 ("mm: Add support for unaccepted memory")
Signed-off-by: Kirill A. Shutemov <kirill.shutemov(a)linux.intel.com>
Reported-by: Jianxiong Gao <jxgao(a)google.com>
Acked-by: David Hildenbrand <david(a)redhat.com>
Tested-by: Jianxiong Gao <jxgao(a)google.com>
Cc: Borislav Petkov <bp(a)alien8.de>
Cc: Johannes Weiner <hannes(a)cmpxchg.org>
Cc: Kirill A. Shutemov <kirill.shutemov(a)linux.intel.com>
Cc: Matthew Wilcox <willy(a)infradead.org>
Cc: Mel Gorman <mgorman(a)suse.de>
Cc: Mike Rapoport (Microsoft) <rppt(a)kernel.org>
Cc: Tom Lendacky <thomas.lendacky(a)amd.com>
Cc: Vlastimil Babka <vbabka(a)suse.cz>
Cc: <stable(a)vger.kernel.org> [6.5+]
Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 875d76e8684a..8747087acee3 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -287,7 +287,7 @@ EXPORT_SYMBOL(nr_online_nodes);
static bool page_contains_unaccepted(struct page *page, unsigned int order);
static void accept_page(struct page *page, unsigned int order);
-static bool try_to_accept_memory(struct zone *zone, unsigned int order);
+static bool cond_accept_memory(struct zone *zone, unsigned int order);
static inline bool has_unaccepted_memory(void);
static bool __free_unaccepted(struct page *page);
@@ -3072,9 +3072,6 @@ static inline long __zone_watermark_unusable_free(struct zone *z,
if (!(alloc_flags & ALLOC_CMA))
unusable_free += zone_page_state(z, NR_FREE_CMA_PAGES);
#endif
-#ifdef CONFIG_UNACCEPTED_MEMORY
- unusable_free += zone_page_state(z, NR_UNACCEPTED);
-#endif
return unusable_free;
}
@@ -3368,6 +3365,8 @@ get_page_from_freelist(gfp_t gfp_mask, unsigned int order, int alloc_flags,
}
}
+ cond_accept_memory(zone, order);
+
/*
* Detect whether the number of free pages is below high
* watermark. If so, we will decrease pcp->high and free
@@ -3393,10 +3392,8 @@ get_page_from_freelist(gfp_t gfp_mask, unsigned int order, int alloc_flags,
gfp_mask)) {
int ret;
- if (has_unaccepted_memory()) {
- if (try_to_accept_memory(zone, order))
- goto try_this_zone;
- }
+ if (cond_accept_memory(zone, order))
+ goto try_this_zone;
#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT
/*
@@ -3450,10 +3447,8 @@ get_page_from_freelist(gfp_t gfp_mask, unsigned int order, int alloc_flags,
return page;
} else {
- if (has_unaccepted_memory()) {
- if (try_to_accept_memory(zone, order))
- goto try_this_zone;
- }
+ if (cond_accept_memory(zone, order))
+ goto try_this_zone;
#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT
/* Try again if zone has deferred pages */
@@ -6950,9 +6945,6 @@ static bool try_to_accept_memory_one(struct zone *zone)
struct page *page;
bool last;
- if (list_empty(&zone->unaccepted_pages))
- return false;
-
spin_lock_irqsave(&zone->lock, flags);
page = list_first_entry_or_null(&zone->unaccepted_pages,
struct page, lru);
@@ -6978,23 +6970,29 @@ static bool try_to_accept_memory_one(struct zone *zone)
return true;
}
-static bool try_to_accept_memory(struct zone *zone, unsigned int order)
+static bool cond_accept_memory(struct zone *zone, unsigned int order)
{
long to_accept;
- int ret = false;
+ bool ret = false;
+
+ if (!has_unaccepted_memory())
+ return false;
+
+ if (list_empty(&zone->unaccepted_pages))
+ return false;
/* How much to accept to get to high watermark? */
to_accept = high_wmark_pages(zone) -
(zone_page_state(zone, NR_FREE_PAGES) -
- __zone_watermark_unusable_free(zone, order, 0));
+ __zone_watermark_unusable_free(zone, order, 0) -
+ zone_page_state(zone, NR_UNACCEPTED));
- /* Accept at least one page */
- do {
+ while (to_accept > 0) {
if (!try_to_accept_memory_one(zone))
break;
ret = true;
to_accept -= MAX_ORDER_NR_PAGES;
- } while (to_accept > 0);
+ }
return ret;
}
@@ -7037,7 +7035,7 @@ static void accept_page(struct page *page, unsigned int order)
{
}
-static bool try_to_accept_memory(struct zone *zone, unsigned int order)
+static bool cond_accept_memory(struct zone *zone, unsigned int order)
{
return false;
}
1 year, 4 months
- 2
- 1
FAILED: patch "[PATCH] selinux: add the processing of the failure of" failed to apply to 4.19-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.19.y
git checkout FETCH_HEAD
git cherry-pick -x 6dd1e4c045afa6a4ba5d46f044c83bd357c593c2
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081935-borax-concerned-4bcc@gregkh' --subject-prefix 'PATCH 4.19.y' HEAD^..
Possible dependencies:
6dd1e4c045af ("selinux: add the processing of the failure of avc_add_xperms_decision()")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 6dd1e4c045afa6a4ba5d46f044c83bd357c593c2 Mon Sep 17 00:00:00 2001
From: Zhen Lei <thunder.leizhen(a)huawei.com>
Date: Wed, 7 Aug 2024 17:00:56 +0800
Subject: [PATCH] selinux: add the processing of the failure of
avc_add_xperms_decision()
When avc_add_xperms_decision() fails, the information recorded by the new
avc node is incomplete. In this case, the new avc node should be released
instead of replacing the old avc node.
Cc: stable(a)vger.kernel.org
Fixes: fa1aa143ac4a ("selinux: extended permissions for ioctls")
Suggested-by: Stephen Smalley <stephen.smalley.work(a)gmail.com>
Signed-off-by: Zhen Lei <thunder.leizhen(a)huawei.com>
Acked-by: Stephen Smalley <stephen.smalley.work(a)gmail.com>
Signed-off-by: Paul Moore <paul(a)paul-moore.com>
diff --git a/security/selinux/avc.c b/security/selinux/avc.c
index 7087cd2b802d..b49c44869dc4 100644
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -907,7 +907,11 @@ static int avc_update_node(u32 event, u32 perms, u8 driver, u8 xperm, u32 ssid,
node->ae.avd.auditdeny &= ~perms;
break;
case AVC_CALLBACK_ADD_XPERMS:
- avc_add_xperms_decision(node, xpd);
+ rc = avc_add_xperms_decision(node, xpd);
+ if (rc) {
+ avc_node_kill(node);
+ goto out_unlock;
+ }
break;
}
avc_node_replace(node, orig);
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] selinux: add the processing of the failure of" failed to apply to 5.10-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 6dd1e4c045afa6a4ba5d46f044c83bd357c593c2
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081933-audience-hedging-fac5@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
6dd1e4c045af ("selinux: add the processing of the failure of avc_add_xperms_decision()")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 6dd1e4c045afa6a4ba5d46f044c83bd357c593c2 Mon Sep 17 00:00:00 2001
From: Zhen Lei <thunder.leizhen(a)huawei.com>
Date: Wed, 7 Aug 2024 17:00:56 +0800
Subject: [PATCH] selinux: add the processing of the failure of
avc_add_xperms_decision()
When avc_add_xperms_decision() fails, the information recorded by the new
avc node is incomplete. In this case, the new avc node should be released
instead of replacing the old avc node.
Cc: stable(a)vger.kernel.org
Fixes: fa1aa143ac4a ("selinux: extended permissions for ioctls")
Suggested-by: Stephen Smalley <stephen.smalley.work(a)gmail.com>
Signed-off-by: Zhen Lei <thunder.leizhen(a)huawei.com>
Acked-by: Stephen Smalley <stephen.smalley.work(a)gmail.com>
Signed-off-by: Paul Moore <paul(a)paul-moore.com>
diff --git a/security/selinux/avc.c b/security/selinux/avc.c
index 7087cd2b802d..b49c44869dc4 100644
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -907,7 +907,11 @@ static int avc_update_node(u32 event, u32 perms, u8 driver, u8 xperm, u32 ssid,
node->ae.avd.auditdeny &= ~perms;
break;
case AVC_CALLBACK_ADD_XPERMS:
- avc_add_xperms_decision(node, xpd);
+ rc = avc_add_xperms_decision(node, xpd);
+ if (rc) {
+ avc_node_kill(node);
+ goto out_unlock;
+ }
break;
}
avc_node_replace(node, orig);
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] selinux: add the processing of the failure of" failed to apply to 5.4-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y
git checkout FETCH_HEAD
git cherry-pick -x 6dd1e4c045afa6a4ba5d46f044c83bd357c593c2
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081934-daffodil-dingy-d012@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^..
Possible dependencies:
6dd1e4c045af ("selinux: add the processing of the failure of avc_add_xperms_decision()")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 6dd1e4c045afa6a4ba5d46f044c83bd357c593c2 Mon Sep 17 00:00:00 2001
From: Zhen Lei <thunder.leizhen(a)huawei.com>
Date: Wed, 7 Aug 2024 17:00:56 +0800
Subject: [PATCH] selinux: add the processing of the failure of
avc_add_xperms_decision()
When avc_add_xperms_decision() fails, the information recorded by the new
avc node is incomplete. In this case, the new avc node should be released
instead of replacing the old avc node.
Cc: stable(a)vger.kernel.org
Fixes: fa1aa143ac4a ("selinux: extended permissions for ioctls")
Suggested-by: Stephen Smalley <stephen.smalley.work(a)gmail.com>
Signed-off-by: Zhen Lei <thunder.leizhen(a)huawei.com>
Acked-by: Stephen Smalley <stephen.smalley.work(a)gmail.com>
Signed-off-by: Paul Moore <paul(a)paul-moore.com>
diff --git a/security/selinux/avc.c b/security/selinux/avc.c
index 7087cd2b802d..b49c44869dc4 100644
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -907,7 +907,11 @@ static int avc_update_node(u32 event, u32 perms, u8 driver, u8 xperm, u32 ssid,
node->ae.avd.auditdeny &= ~perms;
break;
case AVC_CALLBACK_ADD_XPERMS:
- avc_add_xperms_decision(node, xpd);
+ rc = avc_add_xperms_decision(node, xpd);
+ if (rc) {
+ avc_node_kill(node);
+ goto out_unlock;
+ }
break;
}
avc_node_replace(node, orig);
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] selinux: add the processing of the failure of" failed to apply to 5.15-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x 6dd1e4c045afa6a4ba5d46f044c83bd357c593c2
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081933-sulphuric-enamel-7da6@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
6dd1e4c045af ("selinux: add the processing of the failure of avc_add_xperms_decision()")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 6dd1e4c045afa6a4ba5d46f044c83bd357c593c2 Mon Sep 17 00:00:00 2001
From: Zhen Lei <thunder.leizhen(a)huawei.com>
Date: Wed, 7 Aug 2024 17:00:56 +0800
Subject: [PATCH] selinux: add the processing of the failure of
avc_add_xperms_decision()
When avc_add_xperms_decision() fails, the information recorded by the new
avc node is incomplete. In this case, the new avc node should be released
instead of replacing the old avc node.
Cc: stable(a)vger.kernel.org
Fixes: fa1aa143ac4a ("selinux: extended permissions for ioctls")
Suggested-by: Stephen Smalley <stephen.smalley.work(a)gmail.com>
Signed-off-by: Zhen Lei <thunder.leizhen(a)huawei.com>
Acked-by: Stephen Smalley <stephen.smalley.work(a)gmail.com>
Signed-off-by: Paul Moore <paul(a)paul-moore.com>
diff --git a/security/selinux/avc.c b/security/selinux/avc.c
index 7087cd2b802d..b49c44869dc4 100644
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -907,7 +907,11 @@ static int avc_update_node(u32 event, u32 perms, u8 driver, u8 xperm, u32 ssid,
node->ae.avd.auditdeny &= ~perms;
break;
case AVC_CALLBACK_ADD_XPERMS:
- avc_add_xperms_decision(node, xpd);
+ rc = avc_add_xperms_decision(node, xpd);
+ if (rc) {
+ avc_node_kill(node);
+ goto out_unlock;
+ }
break;
}
avc_node_replace(node, orig);
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] selinux: add the processing of the failure of" failed to apply to 6.1-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 6dd1e4c045afa6a4ba5d46f044c83bd357c593c2
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081932-idealism-parabola-3435@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
6dd1e4c045af ("selinux: add the processing of the failure of avc_add_xperms_decision()")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 6dd1e4c045afa6a4ba5d46f044c83bd357c593c2 Mon Sep 17 00:00:00 2001
From: Zhen Lei <thunder.leizhen(a)huawei.com>
Date: Wed, 7 Aug 2024 17:00:56 +0800
Subject: [PATCH] selinux: add the processing of the failure of
avc_add_xperms_decision()
When avc_add_xperms_decision() fails, the information recorded by the new
avc node is incomplete. In this case, the new avc node should be released
instead of replacing the old avc node.
Cc: stable(a)vger.kernel.org
Fixes: fa1aa143ac4a ("selinux: extended permissions for ioctls")
Suggested-by: Stephen Smalley <stephen.smalley.work(a)gmail.com>
Signed-off-by: Zhen Lei <thunder.leizhen(a)huawei.com>
Acked-by: Stephen Smalley <stephen.smalley.work(a)gmail.com>
Signed-off-by: Paul Moore <paul(a)paul-moore.com>
diff --git a/security/selinux/avc.c b/security/selinux/avc.c
index 7087cd2b802d..b49c44869dc4 100644
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -907,7 +907,11 @@ static int avc_update_node(u32 event, u32 perms, u8 driver, u8 xperm, u32 ssid,
node->ae.avd.auditdeny &= ~perms;
break;
case AVC_CALLBACK_ADD_XPERMS:
- avc_add_xperms_decision(node, xpd);
+ rc = avc_add_xperms_decision(node, xpd);
+ if (rc) {
+ avc_node_kill(node);
+ goto out_unlock;
+ }
break;
}
avc_node_replace(node, orig);
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] btrfs: zoned: properly take lock to read/update block group's" failed to apply to 5.15-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x e30729d4bd4001881be4d1ad4332a5d4985398f8
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081951-enrich-hesitate-0db0@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
e30729d4bd40 ("btrfs: zoned: properly take lock to read/update block group's zoned variables")
8cd44dd1d17a ("btrfs: zoned: fix zone_unusable accounting on making block group read-write again")
b9fd2affe4aa ("btrfs: zoned: fix initial free space detection")
6a8ebc773ef6 ("btrfs: zoned: no longer count fresh BG region as zone unusable")
fa2068d7e922 ("btrfs: zoned: count fresh BG region as zone unusable")
3349b57fd47b ("btrfs: convert block group bit field to use bit helpers")
9d4b0a129a0d ("btrfs: simplify arguments of btrfs_update_space_info and rename")
6ca64ac27631 ("btrfs: zoned: fix mounting with conventional zones")
ced8ecf026fd ("btrfs: fix space cache corruption and potential double allocations")
b09315139136 ("btrfs: zoned: activate metadata block group on flush_space")
6a921de58992 ("btrfs: zoned: introduce space_info->active_total_bytes")
393f646e34c1 ("btrfs: zoned: finish least available block group on data bg allocation")
bb9950d3df71 ("btrfs: let can_allocate_chunk return error")
f6fca3917b4d ("btrfs: store chunk size in space-info struct")
b8bea09a456f ("btrfs: add trace event for submitted RAID56 bio")
c67c68eb57f1 ("btrfs: use integrated bitmaps for btrfs_raid_bio::dbitmap and finish_pbitmap")
143823cf4d5a ("btrfs: fix typos in comments")
b3a3b0255797 ("btrfs: zoned: drop optimization of zone finish")
343d8a30851c ("btrfs: zoned: prevent allocation from previous data relocation BG")
d70cbdda75da ("btrfs: zoned: consolidate zone finish functions")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From e30729d4bd4001881be4d1ad4332a5d4985398f8 Mon Sep 17 00:00:00 2001
From: Naohiro Aota <naohiro.aota(a)wdc.com>
Date: Thu, 1 Aug 2024 16:47:52 +0900
Subject: [PATCH] btrfs: zoned: properly take lock to read/update block group's
zoned variables
__btrfs_add_free_space_zoned() references and modifies bg's alloc_offset,
ro, and zone_unusable, but without taking the lock. It is mostly safe
because they monotonically increase (at least for now) and this function is
mostly called by a transaction commit, which is serialized by itself.
Still, taking the lock is a safer and correct option and I'm going to add a
change to reset zone_unusable while a block group is still alive. So, add
locking around the operations.
Fixes: 169e0da91a21 ("btrfs: zoned: track unusable bytes for zones")
CC: stable(a)vger.kernel.org # 5.15+
Reviewed-by: Johannes Thumshirn <johannes.thumshirn(a)wdc.com>
Signed-off-by: Naohiro Aota <naohiro.aota(a)wdc.com>
Reviewed-by: David Sterba <dsterba(a)suse.com>
Signed-off-by: David Sterba <dsterba(a)suse.com>
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index f5996a43db24..eaa1dbd31352 100644
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -2697,15 +2697,16 @@ static int __btrfs_add_free_space_zoned(struct btrfs_block_group *block_group,
u64 offset = bytenr - block_group->start;
u64 to_free, to_unusable;
int bg_reclaim_threshold = 0;
- bool initial = ((size == block_group->length) && (block_group->alloc_offset == 0));
+ bool initial;
u64 reclaimable_unusable;
- WARN_ON(!initial && offset + size > block_group->zone_capacity);
+ spin_lock(&block_group->lock);
+ initial = ((size == block_group->length) && (block_group->alloc_offset == 0));
+ WARN_ON(!initial && offset + size > block_group->zone_capacity);
if (!initial)
bg_reclaim_threshold = READ_ONCE(sinfo->bg_reclaim_threshold);
- spin_lock(&ctl->tree_lock);
if (!used)
to_free = size;
else if (initial)
@@ -2718,7 +2719,9 @@ static int __btrfs_add_free_space_zoned(struct btrfs_block_group *block_group,
to_free = offset + size - block_group->alloc_offset;
to_unusable = size - to_free;
+ spin_lock(&ctl->tree_lock);
ctl->free_space += to_free;
+ spin_unlock(&ctl->tree_lock);
/*
* If the block group is read-only, we should account freed space into
* bytes_readonly.
@@ -2727,11 +2730,8 @@ static int __btrfs_add_free_space_zoned(struct btrfs_block_group *block_group,
block_group->zone_unusable += to_unusable;
WARN_ON(block_group->zone_unusable > block_group->length);
}
- spin_unlock(&ctl->tree_lock);
if (!used) {
- spin_lock(&block_group->lock);
block_group->alloc_offset -= size;
- spin_unlock(&block_group->lock);
}
reclaimable_unusable = block_group->zone_unusable -
@@ -2745,6 +2745,8 @@ static int __btrfs_add_free_space_zoned(struct btrfs_block_group *block_group,
btrfs_mark_bg_to_reclaim(block_group);
}
+ spin_unlock(&block_group->lock);
+
return 0;
}
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] btrfs: check delayed refs when we're checking if a ref exists" failed to apply to 5.4-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y
git checkout FETCH_HEAD
git cherry-pick -x 42fac187b5c746227c92d024f1caf33bc1d337e4
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081933-lyricism-manly-3272@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^..
Possible dependencies:
42fac187b5c7 ("btrfs: check delayed refs when we're checking if a ref exists")
e094f48040cd ("btrfs: change root->root_key.objectid to btrfs_root_id()")
44cc2e38e67b ("btrfs: stop referencing btrfs_delayed_data_ref directly")
cf4f04325b2b ("btrfs: move ->parent and ->ref_root into btrfs_delayed_ref_node")
12390e42b69d ("btrfs: rename ->len to ->num_bytes in btrfs_ref")
1bff6d4f8737 ("btrfs: simplify delayed ref tracepoints")
0ea4703cc27e ("btrfs: move ref specific initialization into init_delayed_ref_common")
0509cc56619d ("btrfs: initialize btrfs_delayed_ref_head with btrfs_ref")
da3c54854197 ("btrfs: pass btrfs_ref to init_delayed_ref_common")
f2e69a77aa51 ("btrfs: move ref_root into btrfs_ref")
4d09b4e942bc ("btrfs: do not use a function to initialize btrfs_ref")
d3fbb00f5e21 ("btrfs: embed data_ref and tree_ref in btrfs_delayed_ref_node")
0eea355fc0f4 ("btrfs: add a helper to get the delayed ref node from the data/tree ref")
6de3595473b0 ("btrfs: compression: add error handling for missed page cache")
01b69bf9906b ("btrfs: convert put_file_data() to folios")
073bda7a5417 ("btrfs: zoned: add ASSERT and WARN for EXTENT_BUFFER_ZONED_ZEROOUT handling")
141fb8cd206a ("btrfs: qgroup: correctly model root qgroup rsv in convert")
ef5a05c55704 ("btrfs: remove SLAB_MEM_SPREAD flag use")
06c9564980f1 ("btrfs: use KMEM_CACHE() to create btrfs_free_space cache")
b2c7d55e4c4c ("btrfs: use KMEM_CACHE() to create delayed ref caches")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 42fac187b5c746227c92d024f1caf33bc1d337e4 Mon Sep 17 00:00:00 2001
From: Josef Bacik <josef(a)toxicpanda.com>
Date: Thu, 11 Apr 2024 16:41:20 -0400
Subject: [PATCH] btrfs: check delayed refs when we're checking if a ref exists
In the patch 78c52d9eb6b7 ("btrfs: check for refs on snapshot delete
resume") I added some code to handle file systems that had been
corrupted by a bug that incorrectly skipped updating the drop progress
key while dropping a snapshot. This code would check to see if we had
already deleted our reference for a child block, and skip the deletion
if we had already.
Unfortunately there is a bug, as the check would only check the on-disk
references. I made an incorrect assumption that blocks in an already
deleted snapshot that was having the deletion resume on mount wouldn't
be modified.
If we have 2 pending deleted snapshots that share blocks, we can easily
modify the rules for a block. Take the following example
subvolume a exists, and subvolume b is a snapshot of subvolume a. They
share references to block 1. Block 1 will have 2 full references, one
for subvolume a and one for subvolume b, and it belongs to subvolume a
(btrfs_header_owner(block 1) == subvolume a).
When deleting subvolume a, we will drop our full reference for block 1,
and because we are the owner we will drop our full reference for all of
block 1's children, convert block 1 to FULL BACKREF, and add a shared
reference to all of block 1's children.
Then we will start the snapshot deletion of subvolume b. We look up the
extent info for block 1, which checks delayed refs and tells us that
FULL BACKREF is set, so sets parent to the bytenr of block 1. However
because this is a resumed snapshot deletion, we call into
check_ref_exists(). Because check_ref_exists() only looks at the disk,
it doesn't find the shared backref for the child of block 1, and thus
returns 0 and we skip deleting the reference for the child of block 1
and continue. This orphans the child of block 1.
The fix is to lookup the delayed refs, similar to what we do in
btrfs_lookup_extent_info(). However we only care about whether the
reference exists or not. If we fail to find our reference on disk, go
look up the bytenr in the delayed refs, and if it exists look for an
existing ref in the delayed ref head. If that exists then we know we
can delete the reference safely and carry on. If it doesn't exist we
know we have to skip over this block.
This bug has existed since I introduced this fix, however requires
having multiple deleted snapshots pending when we unmount. We noticed
this in production because our shutdown path stops the container on the
system, which deletes a bunch of subvolumes, and then reboots the box.
This gives us plenty of opportunities to hit this issue. Looking at the
history we've seen this occasionally in production, but we had a big
spike recently thanks to faster machines getting jobs with multiple
subvolumes in the job.
Chris Mason wrote a reproducer which does the following
mount /dev/nvme4n1 /btrfs
btrfs subvol create /btrfs/s1
simoop -E -f 4k -n 200000 -z /btrfs/s1
while(true) ; do
btrfs subvol snap /btrfs/s1 /btrfs/s2
simoop -f 4k -n 200000 -r 10 -z /btrfs/s2
btrfs subvol snap /btrfs/s2 /btrfs/s3
btrfs balance start -dusage=80 /btrfs
btrfs subvol del /btrfs/s2 /btrfs/s3
umount /btrfs
btrfsck /dev/nvme4n1 || exit 1
mount /dev/nvme4n1 /btrfs
done
On the second loop this would fail consistently, with my patch it has
been running for hours and hasn't failed.
I also used dm-log-writes to capture the state of the failure so I could
debug the problem. Using the existing failure case to test my patch
validated that it fixes the problem.
Fixes: 78c52d9eb6b7 ("btrfs: check for refs on snapshot delete resume")
CC: stable(a)vger.kernel.org # 5.4+
Reviewed-by: Filipe Manana <fdmanana(a)suse.com>
Signed-off-by: Josef Bacik <josef(a)toxicpanda.com>
Signed-off-by: David Sterba <dsterba(a)suse.com>
diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
index 2ac9296edccb..06a9e0542d70 100644
--- a/fs/btrfs/delayed-ref.c
+++ b/fs/btrfs/delayed-ref.c
@@ -1134,6 +1134,73 @@ btrfs_find_delayed_ref_head(struct btrfs_delayed_ref_root *delayed_refs, u64 byt
return find_ref_head(delayed_refs, bytenr, false);
}
+static int find_comp(struct btrfs_delayed_ref_node *entry, u64 root, u64 parent)
+{
+ int type = parent ? BTRFS_SHARED_BLOCK_REF_KEY : BTRFS_TREE_BLOCK_REF_KEY;
+
+ if (type < entry->type)
+ return -1;
+ if (type > entry->type)
+ return 1;
+
+ if (type == BTRFS_TREE_BLOCK_REF_KEY) {
+ if (root < entry->ref_root)
+ return -1;
+ if (root > entry->ref_root)
+ return 1;
+ } else {
+ if (parent < entry->parent)
+ return -1;
+ if (parent > entry->parent)
+ return 1;
+ }
+ return 0;
+}
+
+/*
+ * Check to see if a given root/parent reference is attached to the head. This
+ * only checks for BTRFS_ADD_DELAYED_REF references that match, as that
+ * indicates the reference exists for the given root or parent. This is for
+ * tree blocks only.
+ *
+ * @head: the head of the bytenr we're searching.
+ * @root: the root objectid of the reference if it is a normal reference.
+ * @parent: the parent if this is a shared backref.
+ */
+bool btrfs_find_delayed_tree_ref(struct btrfs_delayed_ref_head *head,
+ u64 root, u64 parent)
+{
+ struct rb_node *node;
+ bool found = false;
+
+ lockdep_assert_held(&head->mutex);
+
+ spin_lock(&head->lock);
+ node = head->ref_tree.rb_root.rb_node;
+ while (node) {
+ struct btrfs_delayed_ref_node *entry;
+ int ret;
+
+ entry = rb_entry(node, struct btrfs_delayed_ref_node, ref_node);
+ ret = find_comp(entry, root, parent);
+ if (ret < 0) {
+ node = node->rb_left;
+ } else if (ret > 0) {
+ node = node->rb_right;
+ } else {
+ /*
+ * We only want to count ADD actions, as drops mean the
+ * ref doesn't exist.
+ */
+ if (entry->action == BTRFS_ADD_DELAYED_REF)
+ found = true;
+ break;
+ }
+ }
+ spin_unlock(&head->lock);
+ return found;
+}
+
void __cold btrfs_delayed_ref_exit(void)
{
kmem_cache_destroy(btrfs_delayed_ref_head_cachep);
diff --git a/fs/btrfs/delayed-ref.h b/fs/btrfs/delayed-ref.h
index ef15e998be03..05f634eb472d 100644
--- a/fs/btrfs/delayed-ref.h
+++ b/fs/btrfs/delayed-ref.h
@@ -389,6 +389,8 @@ void btrfs_dec_delayed_refs_rsv_bg_updates(struct btrfs_fs_info *fs_info);
int btrfs_delayed_refs_rsv_refill(struct btrfs_fs_info *fs_info,
enum btrfs_reserve_flush_enum flush);
bool btrfs_check_space_for_delayed_refs(struct btrfs_fs_info *fs_info);
+bool btrfs_find_delayed_tree_ref(struct btrfs_delayed_ref_head *head,
+ u64 root, u64 parent);
static inline u64 btrfs_delayed_ref_owner(struct btrfs_delayed_ref_node *node)
{
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index ff9f0d41987e..feec49e6f9c8 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -5472,23 +5472,62 @@ static int check_ref_exists(struct btrfs_trans_handle *trans,
struct btrfs_root *root, u64 bytenr, u64 parent,
int level)
{
+ struct btrfs_delayed_ref_root *delayed_refs;
+ struct btrfs_delayed_ref_head *head;
struct btrfs_path *path;
struct btrfs_extent_inline_ref *iref;
int ret;
+ bool exists = false;
path = btrfs_alloc_path();
if (!path)
return -ENOMEM;
-
+again:
ret = lookup_extent_backref(trans, path, &iref, bytenr,
root->fs_info->nodesize, parent,
btrfs_root_id(root), level, 0);
+ if (ret != -ENOENT) {
+ /*
+ * If we get 0 then we found our reference, return 1, else
+ * return the error if it's not -ENOENT;
+ */
+ btrfs_free_path(path);
+ return (ret < 0 ) ? ret : 1;
+ }
+
+ /*
+ * We could have a delayed ref with this reference, so look it up while
+ * we're holding the path open to make sure we don't race with the
+ * delayed ref running.
+ */
+ delayed_refs = &trans->transaction->delayed_refs;
+ spin_lock(&delayed_refs->lock);
+ head = btrfs_find_delayed_ref_head(delayed_refs, bytenr);
+ if (!head)
+ goto out;
+ if (!mutex_trylock(&head->mutex)) {
+ /*
+ * We're contended, means that the delayed ref is running, get a
+ * reference and wait for the ref head to be complete and then
+ * try again.
+ */
+ refcount_inc(&head->refs);
+ spin_unlock(&delayed_refs->lock);
+
+ btrfs_release_path(path);
+
+ mutex_lock(&head->mutex);
+ mutex_unlock(&head->mutex);
+ btrfs_put_delayed_ref_head(head);
+ goto again;
+ }
+
+ exists = btrfs_find_delayed_tree_ref(head, root->root_key.objectid, parent);
+ mutex_unlock(&head->mutex);
+out:
+ spin_unlock(&delayed_refs->lock);
btrfs_free_path(path);
- if (ret == -ENOENT)
- return 0;
- if (ret < 0)
- return ret;
- return 1;
+ return exists ? 1 : 0;
}
/*
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] btrfs: check delayed refs when we're checking if a ref exists" failed to apply to 5.10-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 42fac187b5c746227c92d024f1caf33bc1d337e4
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081931-slot-improving-a44a@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
42fac187b5c7 ("btrfs: check delayed refs when we're checking if a ref exists")
e094f48040cd ("btrfs: change root->root_key.objectid to btrfs_root_id()")
44cc2e38e67b ("btrfs: stop referencing btrfs_delayed_data_ref directly")
cf4f04325b2b ("btrfs: move ->parent and ->ref_root into btrfs_delayed_ref_node")
12390e42b69d ("btrfs: rename ->len to ->num_bytes in btrfs_ref")
1bff6d4f8737 ("btrfs: simplify delayed ref tracepoints")
0ea4703cc27e ("btrfs: move ref specific initialization into init_delayed_ref_common")
0509cc56619d ("btrfs: initialize btrfs_delayed_ref_head with btrfs_ref")
da3c54854197 ("btrfs: pass btrfs_ref to init_delayed_ref_common")
f2e69a77aa51 ("btrfs: move ref_root into btrfs_ref")
4d09b4e942bc ("btrfs: do not use a function to initialize btrfs_ref")
d3fbb00f5e21 ("btrfs: embed data_ref and tree_ref in btrfs_delayed_ref_node")
0eea355fc0f4 ("btrfs: add a helper to get the delayed ref node from the data/tree ref")
6de3595473b0 ("btrfs: compression: add error handling for missed page cache")
01b69bf9906b ("btrfs: convert put_file_data() to folios")
073bda7a5417 ("btrfs: zoned: add ASSERT and WARN for EXTENT_BUFFER_ZONED_ZEROOUT handling")
141fb8cd206a ("btrfs: qgroup: correctly model root qgroup rsv in convert")
ef5a05c55704 ("btrfs: remove SLAB_MEM_SPREAD flag use")
06c9564980f1 ("btrfs: use KMEM_CACHE() to create btrfs_free_space cache")
b2c7d55e4c4c ("btrfs: use KMEM_CACHE() to create delayed ref caches")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 42fac187b5c746227c92d024f1caf33bc1d337e4 Mon Sep 17 00:00:00 2001
From: Josef Bacik <josef(a)toxicpanda.com>
Date: Thu, 11 Apr 2024 16:41:20 -0400
Subject: [PATCH] btrfs: check delayed refs when we're checking if a ref exists
In the patch 78c52d9eb6b7 ("btrfs: check for refs on snapshot delete
resume") I added some code to handle file systems that had been
corrupted by a bug that incorrectly skipped updating the drop progress
key while dropping a snapshot. This code would check to see if we had
already deleted our reference for a child block, and skip the deletion
if we had already.
Unfortunately there is a bug, as the check would only check the on-disk
references. I made an incorrect assumption that blocks in an already
deleted snapshot that was having the deletion resume on mount wouldn't
be modified.
If we have 2 pending deleted snapshots that share blocks, we can easily
modify the rules for a block. Take the following example
subvolume a exists, and subvolume b is a snapshot of subvolume a. They
share references to block 1. Block 1 will have 2 full references, one
for subvolume a and one for subvolume b, and it belongs to subvolume a
(btrfs_header_owner(block 1) == subvolume a).
When deleting subvolume a, we will drop our full reference for block 1,
and because we are the owner we will drop our full reference for all of
block 1's children, convert block 1 to FULL BACKREF, and add a shared
reference to all of block 1's children.
Then we will start the snapshot deletion of subvolume b. We look up the
extent info for block 1, which checks delayed refs and tells us that
FULL BACKREF is set, so sets parent to the bytenr of block 1. However
because this is a resumed snapshot deletion, we call into
check_ref_exists(). Because check_ref_exists() only looks at the disk,
it doesn't find the shared backref for the child of block 1, and thus
returns 0 and we skip deleting the reference for the child of block 1
and continue. This orphans the child of block 1.
The fix is to lookup the delayed refs, similar to what we do in
btrfs_lookup_extent_info(). However we only care about whether the
reference exists or not. If we fail to find our reference on disk, go
look up the bytenr in the delayed refs, and if it exists look for an
existing ref in the delayed ref head. If that exists then we know we
can delete the reference safely and carry on. If it doesn't exist we
know we have to skip over this block.
This bug has existed since I introduced this fix, however requires
having multiple deleted snapshots pending when we unmount. We noticed
this in production because our shutdown path stops the container on the
system, which deletes a bunch of subvolumes, and then reboots the box.
This gives us plenty of opportunities to hit this issue. Looking at the
history we've seen this occasionally in production, but we had a big
spike recently thanks to faster machines getting jobs with multiple
subvolumes in the job.
Chris Mason wrote a reproducer which does the following
mount /dev/nvme4n1 /btrfs
btrfs subvol create /btrfs/s1
simoop -E -f 4k -n 200000 -z /btrfs/s1
while(true) ; do
btrfs subvol snap /btrfs/s1 /btrfs/s2
simoop -f 4k -n 200000 -r 10 -z /btrfs/s2
btrfs subvol snap /btrfs/s2 /btrfs/s3
btrfs balance start -dusage=80 /btrfs
btrfs subvol del /btrfs/s2 /btrfs/s3
umount /btrfs
btrfsck /dev/nvme4n1 || exit 1
mount /dev/nvme4n1 /btrfs
done
On the second loop this would fail consistently, with my patch it has
been running for hours and hasn't failed.
I also used dm-log-writes to capture the state of the failure so I could
debug the problem. Using the existing failure case to test my patch
validated that it fixes the problem.
Fixes: 78c52d9eb6b7 ("btrfs: check for refs on snapshot delete resume")
CC: stable(a)vger.kernel.org # 5.4+
Reviewed-by: Filipe Manana <fdmanana(a)suse.com>
Signed-off-by: Josef Bacik <josef(a)toxicpanda.com>
Signed-off-by: David Sterba <dsterba(a)suse.com>
diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
index 2ac9296edccb..06a9e0542d70 100644
--- a/fs/btrfs/delayed-ref.c
+++ b/fs/btrfs/delayed-ref.c
@@ -1134,6 +1134,73 @@ btrfs_find_delayed_ref_head(struct btrfs_delayed_ref_root *delayed_refs, u64 byt
return find_ref_head(delayed_refs, bytenr, false);
}
+static int find_comp(struct btrfs_delayed_ref_node *entry, u64 root, u64 parent)
+{
+ int type = parent ? BTRFS_SHARED_BLOCK_REF_KEY : BTRFS_TREE_BLOCK_REF_KEY;
+
+ if (type < entry->type)
+ return -1;
+ if (type > entry->type)
+ return 1;
+
+ if (type == BTRFS_TREE_BLOCK_REF_KEY) {
+ if (root < entry->ref_root)
+ return -1;
+ if (root > entry->ref_root)
+ return 1;
+ } else {
+ if (parent < entry->parent)
+ return -1;
+ if (parent > entry->parent)
+ return 1;
+ }
+ return 0;
+}
+
+/*
+ * Check to see if a given root/parent reference is attached to the head. This
+ * only checks for BTRFS_ADD_DELAYED_REF references that match, as that
+ * indicates the reference exists for the given root or parent. This is for
+ * tree blocks only.
+ *
+ * @head: the head of the bytenr we're searching.
+ * @root: the root objectid of the reference if it is a normal reference.
+ * @parent: the parent if this is a shared backref.
+ */
+bool btrfs_find_delayed_tree_ref(struct btrfs_delayed_ref_head *head,
+ u64 root, u64 parent)
+{
+ struct rb_node *node;
+ bool found = false;
+
+ lockdep_assert_held(&head->mutex);
+
+ spin_lock(&head->lock);
+ node = head->ref_tree.rb_root.rb_node;
+ while (node) {
+ struct btrfs_delayed_ref_node *entry;
+ int ret;
+
+ entry = rb_entry(node, struct btrfs_delayed_ref_node, ref_node);
+ ret = find_comp(entry, root, parent);
+ if (ret < 0) {
+ node = node->rb_left;
+ } else if (ret > 0) {
+ node = node->rb_right;
+ } else {
+ /*
+ * We only want to count ADD actions, as drops mean the
+ * ref doesn't exist.
+ */
+ if (entry->action == BTRFS_ADD_DELAYED_REF)
+ found = true;
+ break;
+ }
+ }
+ spin_unlock(&head->lock);
+ return found;
+}
+
void __cold btrfs_delayed_ref_exit(void)
{
kmem_cache_destroy(btrfs_delayed_ref_head_cachep);
diff --git a/fs/btrfs/delayed-ref.h b/fs/btrfs/delayed-ref.h
index ef15e998be03..05f634eb472d 100644
--- a/fs/btrfs/delayed-ref.h
+++ b/fs/btrfs/delayed-ref.h
@@ -389,6 +389,8 @@ void btrfs_dec_delayed_refs_rsv_bg_updates(struct btrfs_fs_info *fs_info);
int btrfs_delayed_refs_rsv_refill(struct btrfs_fs_info *fs_info,
enum btrfs_reserve_flush_enum flush);
bool btrfs_check_space_for_delayed_refs(struct btrfs_fs_info *fs_info);
+bool btrfs_find_delayed_tree_ref(struct btrfs_delayed_ref_head *head,
+ u64 root, u64 parent);
static inline u64 btrfs_delayed_ref_owner(struct btrfs_delayed_ref_node *node)
{
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index ff9f0d41987e..feec49e6f9c8 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -5472,23 +5472,62 @@ static int check_ref_exists(struct btrfs_trans_handle *trans,
struct btrfs_root *root, u64 bytenr, u64 parent,
int level)
{
+ struct btrfs_delayed_ref_root *delayed_refs;
+ struct btrfs_delayed_ref_head *head;
struct btrfs_path *path;
struct btrfs_extent_inline_ref *iref;
int ret;
+ bool exists = false;
path = btrfs_alloc_path();
if (!path)
return -ENOMEM;
-
+again:
ret = lookup_extent_backref(trans, path, &iref, bytenr,
root->fs_info->nodesize, parent,
btrfs_root_id(root), level, 0);
+ if (ret != -ENOENT) {
+ /*
+ * If we get 0 then we found our reference, return 1, else
+ * return the error if it's not -ENOENT;
+ */
+ btrfs_free_path(path);
+ return (ret < 0 ) ? ret : 1;
+ }
+
+ /*
+ * We could have a delayed ref with this reference, so look it up while
+ * we're holding the path open to make sure we don't race with the
+ * delayed ref running.
+ */
+ delayed_refs = &trans->transaction->delayed_refs;
+ spin_lock(&delayed_refs->lock);
+ head = btrfs_find_delayed_ref_head(delayed_refs, bytenr);
+ if (!head)
+ goto out;
+ if (!mutex_trylock(&head->mutex)) {
+ /*
+ * We're contended, means that the delayed ref is running, get a
+ * reference and wait for the ref head to be complete and then
+ * try again.
+ */
+ refcount_inc(&head->refs);
+ spin_unlock(&delayed_refs->lock);
+
+ btrfs_release_path(path);
+
+ mutex_lock(&head->mutex);
+ mutex_unlock(&head->mutex);
+ btrfs_put_delayed_ref_head(head);
+ goto again;
+ }
+
+ exists = btrfs_find_delayed_tree_ref(head, root->root_key.objectid, parent);
+ mutex_unlock(&head->mutex);
+out:
+ spin_unlock(&delayed_refs->lock);
btrfs_free_path(path);
- if (ret == -ENOENT)
- return 0;
- if (ret < 0)
- return ret;
- return 1;
+ return exists ? 1 : 0;
}
/*
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] btrfs: check delayed refs when we're checking if a ref exists" failed to apply to 5.15-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x 42fac187b5c746227c92d024f1caf33bc1d337e4
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081929-drastic-shale-7639@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
42fac187b5c7 ("btrfs: check delayed refs when we're checking if a ref exists")
e094f48040cd ("btrfs: change root->root_key.objectid to btrfs_root_id()")
44cc2e38e67b ("btrfs: stop referencing btrfs_delayed_data_ref directly")
cf4f04325b2b ("btrfs: move ->parent and ->ref_root into btrfs_delayed_ref_node")
12390e42b69d ("btrfs: rename ->len to ->num_bytes in btrfs_ref")
1bff6d4f8737 ("btrfs: simplify delayed ref tracepoints")
0ea4703cc27e ("btrfs: move ref specific initialization into init_delayed_ref_common")
0509cc56619d ("btrfs: initialize btrfs_delayed_ref_head with btrfs_ref")
da3c54854197 ("btrfs: pass btrfs_ref to init_delayed_ref_common")
f2e69a77aa51 ("btrfs: move ref_root into btrfs_ref")
4d09b4e942bc ("btrfs: do not use a function to initialize btrfs_ref")
d3fbb00f5e21 ("btrfs: embed data_ref and tree_ref in btrfs_delayed_ref_node")
0eea355fc0f4 ("btrfs: add a helper to get the delayed ref node from the data/tree ref")
6de3595473b0 ("btrfs: compression: add error handling for missed page cache")
01b69bf9906b ("btrfs: convert put_file_data() to folios")
073bda7a5417 ("btrfs: zoned: add ASSERT and WARN for EXTENT_BUFFER_ZONED_ZEROOUT handling")
141fb8cd206a ("btrfs: qgroup: correctly model root qgroup rsv in convert")
ef5a05c55704 ("btrfs: remove SLAB_MEM_SPREAD flag use")
06c9564980f1 ("btrfs: use KMEM_CACHE() to create btrfs_free_space cache")
b2c7d55e4c4c ("btrfs: use KMEM_CACHE() to create delayed ref caches")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 42fac187b5c746227c92d024f1caf33bc1d337e4 Mon Sep 17 00:00:00 2001
From: Josef Bacik <josef(a)toxicpanda.com>
Date: Thu, 11 Apr 2024 16:41:20 -0400
Subject: [PATCH] btrfs: check delayed refs when we're checking if a ref exists
In the patch 78c52d9eb6b7 ("btrfs: check for refs on snapshot delete
resume") I added some code to handle file systems that had been
corrupted by a bug that incorrectly skipped updating the drop progress
key while dropping a snapshot. This code would check to see if we had
already deleted our reference for a child block, and skip the deletion
if we had already.
Unfortunately there is a bug, as the check would only check the on-disk
references. I made an incorrect assumption that blocks in an already
deleted snapshot that was having the deletion resume on mount wouldn't
be modified.
If we have 2 pending deleted snapshots that share blocks, we can easily
modify the rules for a block. Take the following example
subvolume a exists, and subvolume b is a snapshot of subvolume a. They
share references to block 1. Block 1 will have 2 full references, one
for subvolume a and one for subvolume b, and it belongs to subvolume a
(btrfs_header_owner(block 1) == subvolume a).
When deleting subvolume a, we will drop our full reference for block 1,
and because we are the owner we will drop our full reference for all of
block 1's children, convert block 1 to FULL BACKREF, and add a shared
reference to all of block 1's children.
Then we will start the snapshot deletion of subvolume b. We look up the
extent info for block 1, which checks delayed refs and tells us that
FULL BACKREF is set, so sets parent to the bytenr of block 1. However
because this is a resumed snapshot deletion, we call into
check_ref_exists(). Because check_ref_exists() only looks at the disk,
it doesn't find the shared backref for the child of block 1, and thus
returns 0 and we skip deleting the reference for the child of block 1
and continue. This orphans the child of block 1.
The fix is to lookup the delayed refs, similar to what we do in
btrfs_lookup_extent_info(). However we only care about whether the
reference exists or not. If we fail to find our reference on disk, go
look up the bytenr in the delayed refs, and if it exists look for an
existing ref in the delayed ref head. If that exists then we know we
can delete the reference safely and carry on. If it doesn't exist we
know we have to skip over this block.
This bug has existed since I introduced this fix, however requires
having multiple deleted snapshots pending when we unmount. We noticed
this in production because our shutdown path stops the container on the
system, which deletes a bunch of subvolumes, and then reboots the box.
This gives us plenty of opportunities to hit this issue. Looking at the
history we've seen this occasionally in production, but we had a big
spike recently thanks to faster machines getting jobs with multiple
subvolumes in the job.
Chris Mason wrote a reproducer which does the following
mount /dev/nvme4n1 /btrfs
btrfs subvol create /btrfs/s1
simoop -E -f 4k -n 200000 -z /btrfs/s1
while(true) ; do
btrfs subvol snap /btrfs/s1 /btrfs/s2
simoop -f 4k -n 200000 -r 10 -z /btrfs/s2
btrfs subvol snap /btrfs/s2 /btrfs/s3
btrfs balance start -dusage=80 /btrfs
btrfs subvol del /btrfs/s2 /btrfs/s3
umount /btrfs
btrfsck /dev/nvme4n1 || exit 1
mount /dev/nvme4n1 /btrfs
done
On the second loop this would fail consistently, with my patch it has
been running for hours and hasn't failed.
I also used dm-log-writes to capture the state of the failure so I could
debug the problem. Using the existing failure case to test my patch
validated that it fixes the problem.
Fixes: 78c52d9eb6b7 ("btrfs: check for refs on snapshot delete resume")
CC: stable(a)vger.kernel.org # 5.4+
Reviewed-by: Filipe Manana <fdmanana(a)suse.com>
Signed-off-by: Josef Bacik <josef(a)toxicpanda.com>
Signed-off-by: David Sterba <dsterba(a)suse.com>
diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
index 2ac9296edccb..06a9e0542d70 100644
--- a/fs/btrfs/delayed-ref.c
+++ b/fs/btrfs/delayed-ref.c
@@ -1134,6 +1134,73 @@ btrfs_find_delayed_ref_head(struct btrfs_delayed_ref_root *delayed_refs, u64 byt
return find_ref_head(delayed_refs, bytenr, false);
}
+static int find_comp(struct btrfs_delayed_ref_node *entry, u64 root, u64 parent)
+{
+ int type = parent ? BTRFS_SHARED_BLOCK_REF_KEY : BTRFS_TREE_BLOCK_REF_KEY;
+
+ if (type < entry->type)
+ return -1;
+ if (type > entry->type)
+ return 1;
+
+ if (type == BTRFS_TREE_BLOCK_REF_KEY) {
+ if (root < entry->ref_root)
+ return -1;
+ if (root > entry->ref_root)
+ return 1;
+ } else {
+ if (parent < entry->parent)
+ return -1;
+ if (parent > entry->parent)
+ return 1;
+ }
+ return 0;
+}
+
+/*
+ * Check to see if a given root/parent reference is attached to the head. This
+ * only checks for BTRFS_ADD_DELAYED_REF references that match, as that
+ * indicates the reference exists for the given root or parent. This is for
+ * tree blocks only.
+ *
+ * @head: the head of the bytenr we're searching.
+ * @root: the root objectid of the reference if it is a normal reference.
+ * @parent: the parent if this is a shared backref.
+ */
+bool btrfs_find_delayed_tree_ref(struct btrfs_delayed_ref_head *head,
+ u64 root, u64 parent)
+{
+ struct rb_node *node;
+ bool found = false;
+
+ lockdep_assert_held(&head->mutex);
+
+ spin_lock(&head->lock);
+ node = head->ref_tree.rb_root.rb_node;
+ while (node) {
+ struct btrfs_delayed_ref_node *entry;
+ int ret;
+
+ entry = rb_entry(node, struct btrfs_delayed_ref_node, ref_node);
+ ret = find_comp(entry, root, parent);
+ if (ret < 0) {
+ node = node->rb_left;
+ } else if (ret > 0) {
+ node = node->rb_right;
+ } else {
+ /*
+ * We only want to count ADD actions, as drops mean the
+ * ref doesn't exist.
+ */
+ if (entry->action == BTRFS_ADD_DELAYED_REF)
+ found = true;
+ break;
+ }
+ }
+ spin_unlock(&head->lock);
+ return found;
+}
+
void __cold btrfs_delayed_ref_exit(void)
{
kmem_cache_destroy(btrfs_delayed_ref_head_cachep);
diff --git a/fs/btrfs/delayed-ref.h b/fs/btrfs/delayed-ref.h
index ef15e998be03..05f634eb472d 100644
--- a/fs/btrfs/delayed-ref.h
+++ b/fs/btrfs/delayed-ref.h
@@ -389,6 +389,8 @@ void btrfs_dec_delayed_refs_rsv_bg_updates(struct btrfs_fs_info *fs_info);
int btrfs_delayed_refs_rsv_refill(struct btrfs_fs_info *fs_info,
enum btrfs_reserve_flush_enum flush);
bool btrfs_check_space_for_delayed_refs(struct btrfs_fs_info *fs_info);
+bool btrfs_find_delayed_tree_ref(struct btrfs_delayed_ref_head *head,
+ u64 root, u64 parent);
static inline u64 btrfs_delayed_ref_owner(struct btrfs_delayed_ref_node *node)
{
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index ff9f0d41987e..feec49e6f9c8 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -5472,23 +5472,62 @@ static int check_ref_exists(struct btrfs_trans_handle *trans,
struct btrfs_root *root, u64 bytenr, u64 parent,
int level)
{
+ struct btrfs_delayed_ref_root *delayed_refs;
+ struct btrfs_delayed_ref_head *head;
struct btrfs_path *path;
struct btrfs_extent_inline_ref *iref;
int ret;
+ bool exists = false;
path = btrfs_alloc_path();
if (!path)
return -ENOMEM;
-
+again:
ret = lookup_extent_backref(trans, path, &iref, bytenr,
root->fs_info->nodesize, parent,
btrfs_root_id(root), level, 0);
+ if (ret != -ENOENT) {
+ /*
+ * If we get 0 then we found our reference, return 1, else
+ * return the error if it's not -ENOENT;
+ */
+ btrfs_free_path(path);
+ return (ret < 0 ) ? ret : 1;
+ }
+
+ /*
+ * We could have a delayed ref with this reference, so look it up while
+ * we're holding the path open to make sure we don't race with the
+ * delayed ref running.
+ */
+ delayed_refs = &trans->transaction->delayed_refs;
+ spin_lock(&delayed_refs->lock);
+ head = btrfs_find_delayed_ref_head(delayed_refs, bytenr);
+ if (!head)
+ goto out;
+ if (!mutex_trylock(&head->mutex)) {
+ /*
+ * We're contended, means that the delayed ref is running, get a
+ * reference and wait for the ref head to be complete and then
+ * try again.
+ */
+ refcount_inc(&head->refs);
+ spin_unlock(&delayed_refs->lock);
+
+ btrfs_release_path(path);
+
+ mutex_lock(&head->mutex);
+ mutex_unlock(&head->mutex);
+ btrfs_put_delayed_ref_head(head);
+ goto again;
+ }
+
+ exists = btrfs_find_delayed_tree_ref(head, root->root_key.objectid, parent);
+ mutex_unlock(&head->mutex);
+out:
+ spin_unlock(&delayed_refs->lock);
btrfs_free_path(path);
- if (ret == -ENOENT)
- return 0;
- if (ret < 0)
- return ret;
- return 1;
+ return exists ? 1 : 0;
}
/*
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] btrfs: check delayed refs when we're checking if a ref exists" failed to apply to 6.1-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 42fac187b5c746227c92d024f1caf33bc1d337e4
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081927-overstay-bullseye-eee1@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
42fac187b5c7 ("btrfs: check delayed refs when we're checking if a ref exists")
e094f48040cd ("btrfs: change root->root_key.objectid to btrfs_root_id()")
44cc2e38e67b ("btrfs: stop referencing btrfs_delayed_data_ref directly")
cf4f04325b2b ("btrfs: move ->parent and ->ref_root into btrfs_delayed_ref_node")
12390e42b69d ("btrfs: rename ->len to ->num_bytes in btrfs_ref")
1bff6d4f8737 ("btrfs: simplify delayed ref tracepoints")
0ea4703cc27e ("btrfs: move ref specific initialization into init_delayed_ref_common")
0509cc56619d ("btrfs: initialize btrfs_delayed_ref_head with btrfs_ref")
da3c54854197 ("btrfs: pass btrfs_ref to init_delayed_ref_common")
f2e69a77aa51 ("btrfs: move ref_root into btrfs_ref")
4d09b4e942bc ("btrfs: do not use a function to initialize btrfs_ref")
d3fbb00f5e21 ("btrfs: embed data_ref and tree_ref in btrfs_delayed_ref_node")
0eea355fc0f4 ("btrfs: add a helper to get the delayed ref node from the data/tree ref")
6de3595473b0 ("btrfs: compression: add error handling for missed page cache")
01b69bf9906b ("btrfs: convert put_file_data() to folios")
073bda7a5417 ("btrfs: zoned: add ASSERT and WARN for EXTENT_BUFFER_ZONED_ZEROOUT handling")
141fb8cd206a ("btrfs: qgroup: correctly model root qgroup rsv in convert")
ef5a05c55704 ("btrfs: remove SLAB_MEM_SPREAD flag use")
06c9564980f1 ("btrfs: use KMEM_CACHE() to create btrfs_free_space cache")
b2c7d55e4c4c ("btrfs: use KMEM_CACHE() to create delayed ref caches")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 42fac187b5c746227c92d024f1caf33bc1d337e4 Mon Sep 17 00:00:00 2001
From: Josef Bacik <josef(a)toxicpanda.com>
Date: Thu, 11 Apr 2024 16:41:20 -0400
Subject: [PATCH] btrfs: check delayed refs when we're checking if a ref exists
In the patch 78c52d9eb6b7 ("btrfs: check for refs on snapshot delete
resume") I added some code to handle file systems that had been
corrupted by a bug that incorrectly skipped updating the drop progress
key while dropping a snapshot. This code would check to see if we had
already deleted our reference for a child block, and skip the deletion
if we had already.
Unfortunately there is a bug, as the check would only check the on-disk
references. I made an incorrect assumption that blocks in an already
deleted snapshot that was having the deletion resume on mount wouldn't
be modified.
If we have 2 pending deleted snapshots that share blocks, we can easily
modify the rules for a block. Take the following example
subvolume a exists, and subvolume b is a snapshot of subvolume a. They
share references to block 1. Block 1 will have 2 full references, one
for subvolume a and one for subvolume b, and it belongs to subvolume a
(btrfs_header_owner(block 1) == subvolume a).
When deleting subvolume a, we will drop our full reference for block 1,
and because we are the owner we will drop our full reference for all of
block 1's children, convert block 1 to FULL BACKREF, and add a shared
reference to all of block 1's children.
Then we will start the snapshot deletion of subvolume b. We look up the
extent info for block 1, which checks delayed refs and tells us that
FULL BACKREF is set, so sets parent to the bytenr of block 1. However
because this is a resumed snapshot deletion, we call into
check_ref_exists(). Because check_ref_exists() only looks at the disk,
it doesn't find the shared backref for the child of block 1, and thus
returns 0 and we skip deleting the reference for the child of block 1
and continue. This orphans the child of block 1.
The fix is to lookup the delayed refs, similar to what we do in
btrfs_lookup_extent_info(). However we only care about whether the
reference exists or not. If we fail to find our reference on disk, go
look up the bytenr in the delayed refs, and if it exists look for an
existing ref in the delayed ref head. If that exists then we know we
can delete the reference safely and carry on. If it doesn't exist we
know we have to skip over this block.
This bug has existed since I introduced this fix, however requires
having multiple deleted snapshots pending when we unmount. We noticed
this in production because our shutdown path stops the container on the
system, which deletes a bunch of subvolumes, and then reboots the box.
This gives us plenty of opportunities to hit this issue. Looking at the
history we've seen this occasionally in production, but we had a big
spike recently thanks to faster machines getting jobs with multiple
subvolumes in the job.
Chris Mason wrote a reproducer which does the following
mount /dev/nvme4n1 /btrfs
btrfs subvol create /btrfs/s1
simoop -E -f 4k -n 200000 -z /btrfs/s1
while(true) ; do
btrfs subvol snap /btrfs/s1 /btrfs/s2
simoop -f 4k -n 200000 -r 10 -z /btrfs/s2
btrfs subvol snap /btrfs/s2 /btrfs/s3
btrfs balance start -dusage=80 /btrfs
btrfs subvol del /btrfs/s2 /btrfs/s3
umount /btrfs
btrfsck /dev/nvme4n1 || exit 1
mount /dev/nvme4n1 /btrfs
done
On the second loop this would fail consistently, with my patch it has
been running for hours and hasn't failed.
I also used dm-log-writes to capture the state of the failure so I could
debug the problem. Using the existing failure case to test my patch
validated that it fixes the problem.
Fixes: 78c52d9eb6b7 ("btrfs: check for refs on snapshot delete resume")
CC: stable(a)vger.kernel.org # 5.4+
Reviewed-by: Filipe Manana <fdmanana(a)suse.com>
Signed-off-by: Josef Bacik <josef(a)toxicpanda.com>
Signed-off-by: David Sterba <dsterba(a)suse.com>
diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
index 2ac9296edccb..06a9e0542d70 100644
--- a/fs/btrfs/delayed-ref.c
+++ b/fs/btrfs/delayed-ref.c
@@ -1134,6 +1134,73 @@ btrfs_find_delayed_ref_head(struct btrfs_delayed_ref_root *delayed_refs, u64 byt
return find_ref_head(delayed_refs, bytenr, false);
}
+static int find_comp(struct btrfs_delayed_ref_node *entry, u64 root, u64 parent)
+{
+ int type = parent ? BTRFS_SHARED_BLOCK_REF_KEY : BTRFS_TREE_BLOCK_REF_KEY;
+
+ if (type < entry->type)
+ return -1;
+ if (type > entry->type)
+ return 1;
+
+ if (type == BTRFS_TREE_BLOCK_REF_KEY) {
+ if (root < entry->ref_root)
+ return -1;
+ if (root > entry->ref_root)
+ return 1;
+ } else {
+ if (parent < entry->parent)
+ return -1;
+ if (parent > entry->parent)
+ return 1;
+ }
+ return 0;
+}
+
+/*
+ * Check to see if a given root/parent reference is attached to the head. This
+ * only checks for BTRFS_ADD_DELAYED_REF references that match, as that
+ * indicates the reference exists for the given root or parent. This is for
+ * tree blocks only.
+ *
+ * @head: the head of the bytenr we're searching.
+ * @root: the root objectid of the reference if it is a normal reference.
+ * @parent: the parent if this is a shared backref.
+ */
+bool btrfs_find_delayed_tree_ref(struct btrfs_delayed_ref_head *head,
+ u64 root, u64 parent)
+{
+ struct rb_node *node;
+ bool found = false;
+
+ lockdep_assert_held(&head->mutex);
+
+ spin_lock(&head->lock);
+ node = head->ref_tree.rb_root.rb_node;
+ while (node) {
+ struct btrfs_delayed_ref_node *entry;
+ int ret;
+
+ entry = rb_entry(node, struct btrfs_delayed_ref_node, ref_node);
+ ret = find_comp(entry, root, parent);
+ if (ret < 0) {
+ node = node->rb_left;
+ } else if (ret > 0) {
+ node = node->rb_right;
+ } else {
+ /*
+ * We only want to count ADD actions, as drops mean the
+ * ref doesn't exist.
+ */
+ if (entry->action == BTRFS_ADD_DELAYED_REF)
+ found = true;
+ break;
+ }
+ }
+ spin_unlock(&head->lock);
+ return found;
+}
+
void __cold btrfs_delayed_ref_exit(void)
{
kmem_cache_destroy(btrfs_delayed_ref_head_cachep);
diff --git a/fs/btrfs/delayed-ref.h b/fs/btrfs/delayed-ref.h
index ef15e998be03..05f634eb472d 100644
--- a/fs/btrfs/delayed-ref.h
+++ b/fs/btrfs/delayed-ref.h
@@ -389,6 +389,8 @@ void btrfs_dec_delayed_refs_rsv_bg_updates(struct btrfs_fs_info *fs_info);
int btrfs_delayed_refs_rsv_refill(struct btrfs_fs_info *fs_info,
enum btrfs_reserve_flush_enum flush);
bool btrfs_check_space_for_delayed_refs(struct btrfs_fs_info *fs_info);
+bool btrfs_find_delayed_tree_ref(struct btrfs_delayed_ref_head *head,
+ u64 root, u64 parent);
static inline u64 btrfs_delayed_ref_owner(struct btrfs_delayed_ref_node *node)
{
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index ff9f0d41987e..feec49e6f9c8 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -5472,23 +5472,62 @@ static int check_ref_exists(struct btrfs_trans_handle *trans,
struct btrfs_root *root, u64 bytenr, u64 parent,
int level)
{
+ struct btrfs_delayed_ref_root *delayed_refs;
+ struct btrfs_delayed_ref_head *head;
struct btrfs_path *path;
struct btrfs_extent_inline_ref *iref;
int ret;
+ bool exists = false;
path = btrfs_alloc_path();
if (!path)
return -ENOMEM;
-
+again:
ret = lookup_extent_backref(trans, path, &iref, bytenr,
root->fs_info->nodesize, parent,
btrfs_root_id(root), level, 0);
+ if (ret != -ENOENT) {
+ /*
+ * If we get 0 then we found our reference, return 1, else
+ * return the error if it's not -ENOENT;
+ */
+ btrfs_free_path(path);
+ return (ret < 0 ) ? ret : 1;
+ }
+
+ /*
+ * We could have a delayed ref with this reference, so look it up while
+ * we're holding the path open to make sure we don't race with the
+ * delayed ref running.
+ */
+ delayed_refs = &trans->transaction->delayed_refs;
+ spin_lock(&delayed_refs->lock);
+ head = btrfs_find_delayed_ref_head(delayed_refs, bytenr);
+ if (!head)
+ goto out;
+ if (!mutex_trylock(&head->mutex)) {
+ /*
+ * We're contended, means that the delayed ref is running, get a
+ * reference and wait for the ref head to be complete and then
+ * try again.
+ */
+ refcount_inc(&head->refs);
+ spin_unlock(&delayed_refs->lock);
+
+ btrfs_release_path(path);
+
+ mutex_lock(&head->mutex);
+ mutex_unlock(&head->mutex);
+ btrfs_put_delayed_ref_head(head);
+ goto again;
+ }
+
+ exists = btrfs_find_delayed_tree_ref(head, root->root_key.objectid, parent);
+ mutex_unlock(&head->mutex);
+out:
+ spin_unlock(&delayed_refs->lock);
btrfs_free_path(path);
- if (ret == -ENOENT)
- return 0;
- if (ret < 0)
- return ret;
- return 1;
+ return exists ? 1 : 0;
}
/*
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] btrfs: check delayed refs when we're checking if a ref exists" failed to apply to 6.6-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 42fac187b5c746227c92d024f1caf33bc1d337e4
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081925-knoll-dropkick-f11a@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
42fac187b5c7 ("btrfs: check delayed refs when we're checking if a ref exists")
e094f48040cd ("btrfs: change root->root_key.objectid to btrfs_root_id()")
44cc2e38e67b ("btrfs: stop referencing btrfs_delayed_data_ref directly")
cf4f04325b2b ("btrfs: move ->parent and ->ref_root into btrfs_delayed_ref_node")
12390e42b69d ("btrfs: rename ->len to ->num_bytes in btrfs_ref")
1bff6d4f8737 ("btrfs: simplify delayed ref tracepoints")
0ea4703cc27e ("btrfs: move ref specific initialization into init_delayed_ref_common")
0509cc56619d ("btrfs: initialize btrfs_delayed_ref_head with btrfs_ref")
da3c54854197 ("btrfs: pass btrfs_ref to init_delayed_ref_common")
f2e69a77aa51 ("btrfs: move ref_root into btrfs_ref")
4d09b4e942bc ("btrfs: do not use a function to initialize btrfs_ref")
d3fbb00f5e21 ("btrfs: embed data_ref and tree_ref in btrfs_delayed_ref_node")
0eea355fc0f4 ("btrfs: add a helper to get the delayed ref node from the data/tree ref")
6de3595473b0 ("btrfs: compression: add error handling for missed page cache")
01b69bf9906b ("btrfs: convert put_file_data() to folios")
073bda7a5417 ("btrfs: zoned: add ASSERT and WARN for EXTENT_BUFFER_ZONED_ZEROOUT handling")
141fb8cd206a ("btrfs: qgroup: correctly model root qgroup rsv in convert")
ef5a05c55704 ("btrfs: remove SLAB_MEM_SPREAD flag use")
06c9564980f1 ("btrfs: use KMEM_CACHE() to create btrfs_free_space cache")
b2c7d55e4c4c ("btrfs: use KMEM_CACHE() to create delayed ref caches")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 42fac187b5c746227c92d024f1caf33bc1d337e4 Mon Sep 17 00:00:00 2001
From: Josef Bacik <josef(a)toxicpanda.com>
Date: Thu, 11 Apr 2024 16:41:20 -0400
Subject: [PATCH] btrfs: check delayed refs when we're checking if a ref exists
In the patch 78c52d9eb6b7 ("btrfs: check for refs on snapshot delete
resume") I added some code to handle file systems that had been
corrupted by a bug that incorrectly skipped updating the drop progress
key while dropping a snapshot. This code would check to see if we had
already deleted our reference for a child block, and skip the deletion
if we had already.
Unfortunately there is a bug, as the check would only check the on-disk
references. I made an incorrect assumption that blocks in an already
deleted snapshot that was having the deletion resume on mount wouldn't
be modified.
If we have 2 pending deleted snapshots that share blocks, we can easily
modify the rules for a block. Take the following example
subvolume a exists, and subvolume b is a snapshot of subvolume a. They
share references to block 1. Block 1 will have 2 full references, one
for subvolume a and one for subvolume b, and it belongs to subvolume a
(btrfs_header_owner(block 1) == subvolume a).
When deleting subvolume a, we will drop our full reference for block 1,
and because we are the owner we will drop our full reference for all of
block 1's children, convert block 1 to FULL BACKREF, and add a shared
reference to all of block 1's children.
Then we will start the snapshot deletion of subvolume b. We look up the
extent info for block 1, which checks delayed refs and tells us that
FULL BACKREF is set, so sets parent to the bytenr of block 1. However
because this is a resumed snapshot deletion, we call into
check_ref_exists(). Because check_ref_exists() only looks at the disk,
it doesn't find the shared backref for the child of block 1, and thus
returns 0 and we skip deleting the reference for the child of block 1
and continue. This orphans the child of block 1.
The fix is to lookup the delayed refs, similar to what we do in
btrfs_lookup_extent_info(). However we only care about whether the
reference exists or not. If we fail to find our reference on disk, go
look up the bytenr in the delayed refs, and if it exists look for an
existing ref in the delayed ref head. If that exists then we know we
can delete the reference safely and carry on. If it doesn't exist we
know we have to skip over this block.
This bug has existed since I introduced this fix, however requires
having multiple deleted snapshots pending when we unmount. We noticed
this in production because our shutdown path stops the container on the
system, which deletes a bunch of subvolumes, and then reboots the box.
This gives us plenty of opportunities to hit this issue. Looking at the
history we've seen this occasionally in production, but we had a big
spike recently thanks to faster machines getting jobs with multiple
subvolumes in the job.
Chris Mason wrote a reproducer which does the following
mount /dev/nvme4n1 /btrfs
btrfs subvol create /btrfs/s1
simoop -E -f 4k -n 200000 -z /btrfs/s1
while(true) ; do
btrfs subvol snap /btrfs/s1 /btrfs/s2
simoop -f 4k -n 200000 -r 10 -z /btrfs/s2
btrfs subvol snap /btrfs/s2 /btrfs/s3
btrfs balance start -dusage=80 /btrfs
btrfs subvol del /btrfs/s2 /btrfs/s3
umount /btrfs
btrfsck /dev/nvme4n1 || exit 1
mount /dev/nvme4n1 /btrfs
done
On the second loop this would fail consistently, with my patch it has
been running for hours and hasn't failed.
I also used dm-log-writes to capture the state of the failure so I could
debug the problem. Using the existing failure case to test my patch
validated that it fixes the problem.
Fixes: 78c52d9eb6b7 ("btrfs: check for refs on snapshot delete resume")
CC: stable(a)vger.kernel.org # 5.4+
Reviewed-by: Filipe Manana <fdmanana(a)suse.com>
Signed-off-by: Josef Bacik <josef(a)toxicpanda.com>
Signed-off-by: David Sterba <dsterba(a)suse.com>
diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
index 2ac9296edccb..06a9e0542d70 100644
--- a/fs/btrfs/delayed-ref.c
+++ b/fs/btrfs/delayed-ref.c
@@ -1134,6 +1134,73 @@ btrfs_find_delayed_ref_head(struct btrfs_delayed_ref_root *delayed_refs, u64 byt
return find_ref_head(delayed_refs, bytenr, false);
}
+static int find_comp(struct btrfs_delayed_ref_node *entry, u64 root, u64 parent)
+{
+ int type = parent ? BTRFS_SHARED_BLOCK_REF_KEY : BTRFS_TREE_BLOCK_REF_KEY;
+
+ if (type < entry->type)
+ return -1;
+ if (type > entry->type)
+ return 1;
+
+ if (type == BTRFS_TREE_BLOCK_REF_KEY) {
+ if (root < entry->ref_root)
+ return -1;
+ if (root > entry->ref_root)
+ return 1;
+ } else {
+ if (parent < entry->parent)
+ return -1;
+ if (parent > entry->parent)
+ return 1;
+ }
+ return 0;
+}
+
+/*
+ * Check to see if a given root/parent reference is attached to the head. This
+ * only checks for BTRFS_ADD_DELAYED_REF references that match, as that
+ * indicates the reference exists for the given root or parent. This is for
+ * tree blocks only.
+ *
+ * @head: the head of the bytenr we're searching.
+ * @root: the root objectid of the reference if it is a normal reference.
+ * @parent: the parent if this is a shared backref.
+ */
+bool btrfs_find_delayed_tree_ref(struct btrfs_delayed_ref_head *head,
+ u64 root, u64 parent)
+{
+ struct rb_node *node;
+ bool found = false;
+
+ lockdep_assert_held(&head->mutex);
+
+ spin_lock(&head->lock);
+ node = head->ref_tree.rb_root.rb_node;
+ while (node) {
+ struct btrfs_delayed_ref_node *entry;
+ int ret;
+
+ entry = rb_entry(node, struct btrfs_delayed_ref_node, ref_node);
+ ret = find_comp(entry, root, parent);
+ if (ret < 0) {
+ node = node->rb_left;
+ } else if (ret > 0) {
+ node = node->rb_right;
+ } else {
+ /*
+ * We only want to count ADD actions, as drops mean the
+ * ref doesn't exist.
+ */
+ if (entry->action == BTRFS_ADD_DELAYED_REF)
+ found = true;
+ break;
+ }
+ }
+ spin_unlock(&head->lock);
+ return found;
+}
+
void __cold btrfs_delayed_ref_exit(void)
{
kmem_cache_destroy(btrfs_delayed_ref_head_cachep);
diff --git a/fs/btrfs/delayed-ref.h b/fs/btrfs/delayed-ref.h
index ef15e998be03..05f634eb472d 100644
--- a/fs/btrfs/delayed-ref.h
+++ b/fs/btrfs/delayed-ref.h
@@ -389,6 +389,8 @@ void btrfs_dec_delayed_refs_rsv_bg_updates(struct btrfs_fs_info *fs_info);
int btrfs_delayed_refs_rsv_refill(struct btrfs_fs_info *fs_info,
enum btrfs_reserve_flush_enum flush);
bool btrfs_check_space_for_delayed_refs(struct btrfs_fs_info *fs_info);
+bool btrfs_find_delayed_tree_ref(struct btrfs_delayed_ref_head *head,
+ u64 root, u64 parent);
static inline u64 btrfs_delayed_ref_owner(struct btrfs_delayed_ref_node *node)
{
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index ff9f0d41987e..feec49e6f9c8 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -5472,23 +5472,62 @@ static int check_ref_exists(struct btrfs_trans_handle *trans,
struct btrfs_root *root, u64 bytenr, u64 parent,
int level)
{
+ struct btrfs_delayed_ref_root *delayed_refs;
+ struct btrfs_delayed_ref_head *head;
struct btrfs_path *path;
struct btrfs_extent_inline_ref *iref;
int ret;
+ bool exists = false;
path = btrfs_alloc_path();
if (!path)
return -ENOMEM;
-
+again:
ret = lookup_extent_backref(trans, path, &iref, bytenr,
root->fs_info->nodesize, parent,
btrfs_root_id(root), level, 0);
+ if (ret != -ENOENT) {
+ /*
+ * If we get 0 then we found our reference, return 1, else
+ * return the error if it's not -ENOENT;
+ */
+ btrfs_free_path(path);
+ return (ret < 0 ) ? ret : 1;
+ }
+
+ /*
+ * We could have a delayed ref with this reference, so look it up while
+ * we're holding the path open to make sure we don't race with the
+ * delayed ref running.
+ */
+ delayed_refs = &trans->transaction->delayed_refs;
+ spin_lock(&delayed_refs->lock);
+ head = btrfs_find_delayed_ref_head(delayed_refs, bytenr);
+ if (!head)
+ goto out;
+ if (!mutex_trylock(&head->mutex)) {
+ /*
+ * We're contended, means that the delayed ref is running, get a
+ * reference and wait for the ref head to be complete and then
+ * try again.
+ */
+ refcount_inc(&head->refs);
+ spin_unlock(&delayed_refs->lock);
+
+ btrfs_release_path(path);
+
+ mutex_lock(&head->mutex);
+ mutex_unlock(&head->mutex);
+ btrfs_put_delayed_ref_head(head);
+ goto again;
+ }
+
+ exists = btrfs_find_delayed_tree_ref(head, root->root_key.objectid, parent);
+ mutex_unlock(&head->mutex);
+out:
+ spin_unlock(&delayed_refs->lock);
btrfs_free_path(path);
- if (ret == -ENOENT)
- return 0;
- if (ret < 0)
- return ret;
- return 1;
+ return exists ? 1 : 0;
}
/*
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] btrfs: send: allow cloning non-aligned extent if it ends at" failed to apply to 5.10-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 46a6e10a1ab16cc71d4a3cab73e79aabadd6b8ea
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081915-scrubber-excretion-0f83@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
46a6e10a1ab1 ("btrfs: send: allow cloning non-aligned extent if it ends at i_size")
4e00422ee626 ("btrfs: replace sb::s_blocksize by fs_info::sectorsize")
3ea4dc5bf00c ("btrfs: send: send compressed extents with encoded writes")
6fe81a3a3ac8 ("btrfs: balance btree dirty pages and delayed items after clone and dedupe")
152555b39ceb ("btrfs: send: avoid trashing the page cache")
521b6803f22e ("btrfs: send: keep the current inode open while processing it")
1c6cbbbeeeca ("btrfs: remove inode_dio_wait() calls when starting reflink operations")
6b1f86f8e9c7 ("Merge tag 'folio-5.18b' of git://git.infradead.org/users/willy/pagecache")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 46a6e10a1ab16cc71d4a3cab73e79aabadd6b8ea Mon Sep 17 00:00:00 2001
From: Filipe Manana <fdmanana(a)suse.com>
Date: Mon, 12 Aug 2024 14:18:06 +0100
Subject: [PATCH] btrfs: send: allow cloning non-aligned extent if it ends at
i_size
If we a find that an extent is shared but its end offset is not sector
size aligned, then we don't clone it and issue write operations instead.
This is because the reflink (remap_file_range) operation does not allow
to clone unaligned ranges, except if the end offset of the range matches
the i_size of the source and destination files (and the start offset is
sector size aligned).
While this is not incorrect because send can only guarantee that a file
has the same data in the source and destination snapshots, it's not
optimal and generates confusion and surprising behaviour for users.
For example, running this test:
$ cat test.sh
#!/bin/bash
DEV=/dev/sdi
MNT=/mnt/sdi
mkfs.btrfs -f $DEV
mount $DEV $MNT
# Use a file size not aligned to any possible sector size.
file_size=$((1 * 1024 * 1024 + 5)) # 1MB + 5 bytes
dd if=/dev/random of=$MNT/foo bs=$file_size count=1
cp --reflink=always $MNT/foo $MNT/bar
btrfs subvolume snapshot -r $MNT/ $MNT/snap
rm -f /tmp/send-test
btrfs send -f /tmp/send-test $MNT/snap
umount $MNT
mkfs.btrfs -f $DEV
mount $DEV $MNT
btrfs receive -vv -f /tmp/send-test $MNT
xfs_io -r -c "fiemap -v" $MNT/snap/bar
umount $MNT
Gives the following result:
(...)
mkfile o258-7-0
rename o258-7-0 -> bar
write bar - offset=0 length=49152
write bar - offset=49152 length=49152
write bar - offset=98304 length=49152
write bar - offset=147456 length=49152
write bar - offset=196608 length=49152
write bar - offset=245760 length=49152
write bar - offset=294912 length=49152
write bar - offset=344064 length=49152
write bar - offset=393216 length=49152
write bar - offset=442368 length=49152
write bar - offset=491520 length=49152
write bar - offset=540672 length=49152
write bar - offset=589824 length=49152
write bar - offset=638976 length=49152
write bar - offset=688128 length=49152
write bar - offset=737280 length=49152
write bar - offset=786432 length=49152
write bar - offset=835584 length=49152
write bar - offset=884736 length=49152
write bar - offset=933888 length=49152
write bar - offset=983040 length=49152
write bar - offset=1032192 length=16389
chown bar - uid=0, gid=0
chmod bar - mode=0644
utimes bar
utimes
BTRFS_IOC_SET_RECEIVED_SUBVOL uuid=06d640da-9ca1-604c-b87c-3375175a8eb3, stransid=7
/mnt/sdi/snap/bar:
EXT: FILE-OFFSET BLOCK-RANGE TOTAL FLAGS
0: [0..2055]: 26624..28679 2056 0x1
There's no clone operation to clone extents from the file foo into file
bar and fiemap confirms there's no shared flag (0x2000).
So update send_write_or_clone() so that it proceeds with cloning if the
source and destination ranges end at the i_size of the respective files.
After this changes the result of the test is:
(...)
mkfile o258-7-0
rename o258-7-0 -> bar
clone bar - source=foo source offset=0 offset=0 length=1048581
chown bar - uid=0, gid=0
chmod bar - mode=0644
utimes bar
utimes
BTRFS_IOC_SET_RECEIVED_SUBVOL uuid=582420f3-ea7d-564e-bbe5-ce440d622190, stransid=7
/mnt/sdi/snap/bar:
EXT: FILE-OFFSET BLOCK-RANGE TOTAL FLAGS
0: [0..2055]: 26624..28679 2056 0x2001
A test case for fstests will also follow up soon.
Link: https://github.com/kdave/btrfs-progs/issues/572#issuecomment-2282841416
CC: stable(a)vger.kernel.org # 5.10+
Reviewed-by: Qu Wenruo <wqu(a)suse.com>
Signed-off-by: Filipe Manana <fdmanana(a)suse.com>
Reviewed-by: David Sterba <dsterba(a)suse.com>
Signed-off-by: David Sterba <dsterba(a)suse.com>
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index 4ca711a773ef..7fc692fc76e1 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -6157,25 +6157,51 @@ static int send_write_or_clone(struct send_ctx *sctx,
u64 offset = key->offset;
u64 end;
u64 bs = sctx->send_root->fs_info->sectorsize;
+ struct btrfs_file_extent_item *ei;
+ u64 disk_byte;
+ u64 data_offset;
+ u64 num_bytes;
+ struct btrfs_inode_info info = { 0 };
end = min_t(u64, btrfs_file_extent_end(path), sctx->cur_inode_size);
if (offset >= end)
return 0;
- if (clone_root && IS_ALIGNED(end, bs)) {
- struct btrfs_file_extent_item *ei;
- u64 disk_byte;
- u64 data_offset;
+ num_bytes = end - offset;
- ei = btrfs_item_ptr(path->nodes[0], path->slots[0],
- struct btrfs_file_extent_item);
- disk_byte = btrfs_file_extent_disk_bytenr(path->nodes[0], ei);
- data_offset = btrfs_file_extent_offset(path->nodes[0], ei);
- ret = clone_range(sctx, path, clone_root, disk_byte,
- data_offset, offset, end - offset);
- } else {
- ret = send_extent_data(sctx, path, offset, end - offset);
- }
+ if (!clone_root)
+ goto write_data;
+
+ if (IS_ALIGNED(end, bs))
+ goto clone_data;
+
+ /*
+ * If the extent end is not aligned, we can clone if the extent ends at
+ * the i_size of the inode and the clone range ends at the i_size of the
+ * source inode, otherwise the clone operation fails with -EINVAL.
+ */
+ if (end != sctx->cur_inode_size)
+ goto write_data;
+
+ ret = get_inode_info(clone_root->root, clone_root->ino, &info);
+ if (ret < 0)
+ return ret;
+
+ if (clone_root->offset + num_bytes == info.size)
+ goto clone_data;
+
+write_data:
+ ret = send_extent_data(sctx, path, offset, num_bytes);
+ sctx->cur_inode_next_write_offset = end;
+ return ret;
+
+clone_data:
+ ei = btrfs_item_ptr(path->nodes[0], path->slots[0],
+ struct btrfs_file_extent_item);
+ disk_byte = btrfs_file_extent_disk_bytenr(path->nodes[0], ei);
+ data_offset = btrfs_file_extent_offset(path->nodes[0], ei);
+ ret = clone_range(sctx, path, clone_root, disk_byte, data_offset, offset,
+ num_bytes);
sctx->cur_inode_next_write_offset = end;
return ret;
}
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] btrfs: send: allow cloning non-aligned extent if it ends at" failed to apply to 5.15-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x 46a6e10a1ab16cc71d4a3cab73e79aabadd6b8ea
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081913-cupped-curing-f315@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
46a6e10a1ab1 ("btrfs: send: allow cloning non-aligned extent if it ends at i_size")
4e00422ee626 ("btrfs: replace sb::s_blocksize by fs_info::sectorsize")
3ea4dc5bf00c ("btrfs: send: send compressed extents with encoded writes")
6fe81a3a3ac8 ("btrfs: balance btree dirty pages and delayed items after clone and dedupe")
152555b39ceb ("btrfs: send: avoid trashing the page cache")
521b6803f22e ("btrfs: send: keep the current inode open while processing it")
1c6cbbbeeeca ("btrfs: remove inode_dio_wait() calls when starting reflink operations")
6b1f86f8e9c7 ("Merge tag 'folio-5.18b' of git://git.infradead.org/users/willy/pagecache")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 46a6e10a1ab16cc71d4a3cab73e79aabadd6b8ea Mon Sep 17 00:00:00 2001
From: Filipe Manana <fdmanana(a)suse.com>
Date: Mon, 12 Aug 2024 14:18:06 +0100
Subject: [PATCH] btrfs: send: allow cloning non-aligned extent if it ends at
i_size
If we a find that an extent is shared but its end offset is not sector
size aligned, then we don't clone it and issue write operations instead.
This is because the reflink (remap_file_range) operation does not allow
to clone unaligned ranges, except if the end offset of the range matches
the i_size of the source and destination files (and the start offset is
sector size aligned).
While this is not incorrect because send can only guarantee that a file
has the same data in the source and destination snapshots, it's not
optimal and generates confusion and surprising behaviour for users.
For example, running this test:
$ cat test.sh
#!/bin/bash
DEV=/dev/sdi
MNT=/mnt/sdi
mkfs.btrfs -f $DEV
mount $DEV $MNT
# Use a file size not aligned to any possible sector size.
file_size=$((1 * 1024 * 1024 + 5)) # 1MB + 5 bytes
dd if=/dev/random of=$MNT/foo bs=$file_size count=1
cp --reflink=always $MNT/foo $MNT/bar
btrfs subvolume snapshot -r $MNT/ $MNT/snap
rm -f /tmp/send-test
btrfs send -f /tmp/send-test $MNT/snap
umount $MNT
mkfs.btrfs -f $DEV
mount $DEV $MNT
btrfs receive -vv -f /tmp/send-test $MNT
xfs_io -r -c "fiemap -v" $MNT/snap/bar
umount $MNT
Gives the following result:
(...)
mkfile o258-7-0
rename o258-7-0 -> bar
write bar - offset=0 length=49152
write bar - offset=49152 length=49152
write bar - offset=98304 length=49152
write bar - offset=147456 length=49152
write bar - offset=196608 length=49152
write bar - offset=245760 length=49152
write bar - offset=294912 length=49152
write bar - offset=344064 length=49152
write bar - offset=393216 length=49152
write bar - offset=442368 length=49152
write bar - offset=491520 length=49152
write bar - offset=540672 length=49152
write bar - offset=589824 length=49152
write bar - offset=638976 length=49152
write bar - offset=688128 length=49152
write bar - offset=737280 length=49152
write bar - offset=786432 length=49152
write bar - offset=835584 length=49152
write bar - offset=884736 length=49152
write bar - offset=933888 length=49152
write bar - offset=983040 length=49152
write bar - offset=1032192 length=16389
chown bar - uid=0, gid=0
chmod bar - mode=0644
utimes bar
utimes
BTRFS_IOC_SET_RECEIVED_SUBVOL uuid=06d640da-9ca1-604c-b87c-3375175a8eb3, stransid=7
/mnt/sdi/snap/bar:
EXT: FILE-OFFSET BLOCK-RANGE TOTAL FLAGS
0: [0..2055]: 26624..28679 2056 0x1
There's no clone operation to clone extents from the file foo into file
bar and fiemap confirms there's no shared flag (0x2000).
So update send_write_or_clone() so that it proceeds with cloning if the
source and destination ranges end at the i_size of the respective files.
After this changes the result of the test is:
(...)
mkfile o258-7-0
rename o258-7-0 -> bar
clone bar - source=foo source offset=0 offset=0 length=1048581
chown bar - uid=0, gid=0
chmod bar - mode=0644
utimes bar
utimes
BTRFS_IOC_SET_RECEIVED_SUBVOL uuid=582420f3-ea7d-564e-bbe5-ce440d622190, stransid=7
/mnt/sdi/snap/bar:
EXT: FILE-OFFSET BLOCK-RANGE TOTAL FLAGS
0: [0..2055]: 26624..28679 2056 0x2001
A test case for fstests will also follow up soon.
Link: https://github.com/kdave/btrfs-progs/issues/572#issuecomment-2282841416
CC: stable(a)vger.kernel.org # 5.10+
Reviewed-by: Qu Wenruo <wqu(a)suse.com>
Signed-off-by: Filipe Manana <fdmanana(a)suse.com>
Reviewed-by: David Sterba <dsterba(a)suse.com>
Signed-off-by: David Sterba <dsterba(a)suse.com>
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index 4ca711a773ef..7fc692fc76e1 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -6157,25 +6157,51 @@ static int send_write_or_clone(struct send_ctx *sctx,
u64 offset = key->offset;
u64 end;
u64 bs = sctx->send_root->fs_info->sectorsize;
+ struct btrfs_file_extent_item *ei;
+ u64 disk_byte;
+ u64 data_offset;
+ u64 num_bytes;
+ struct btrfs_inode_info info = { 0 };
end = min_t(u64, btrfs_file_extent_end(path), sctx->cur_inode_size);
if (offset >= end)
return 0;
- if (clone_root && IS_ALIGNED(end, bs)) {
- struct btrfs_file_extent_item *ei;
- u64 disk_byte;
- u64 data_offset;
+ num_bytes = end - offset;
- ei = btrfs_item_ptr(path->nodes[0], path->slots[0],
- struct btrfs_file_extent_item);
- disk_byte = btrfs_file_extent_disk_bytenr(path->nodes[0], ei);
- data_offset = btrfs_file_extent_offset(path->nodes[0], ei);
- ret = clone_range(sctx, path, clone_root, disk_byte,
- data_offset, offset, end - offset);
- } else {
- ret = send_extent_data(sctx, path, offset, end - offset);
- }
+ if (!clone_root)
+ goto write_data;
+
+ if (IS_ALIGNED(end, bs))
+ goto clone_data;
+
+ /*
+ * If the extent end is not aligned, we can clone if the extent ends at
+ * the i_size of the inode and the clone range ends at the i_size of the
+ * source inode, otherwise the clone operation fails with -EINVAL.
+ */
+ if (end != sctx->cur_inode_size)
+ goto write_data;
+
+ ret = get_inode_info(clone_root->root, clone_root->ino, &info);
+ if (ret < 0)
+ return ret;
+
+ if (clone_root->offset + num_bytes == info.size)
+ goto clone_data;
+
+write_data:
+ ret = send_extent_data(sctx, path, offset, num_bytes);
+ sctx->cur_inode_next_write_offset = end;
+ return ret;
+
+clone_data:
+ ei = btrfs_item_ptr(path->nodes[0], path->slots[0],
+ struct btrfs_file_extent_item);
+ disk_byte = btrfs_file_extent_disk_bytenr(path->nodes[0], ei);
+ data_offset = btrfs_file_extent_offset(path->nodes[0], ei);
+ ret = clone_range(sctx, path, clone_root, disk_byte, data_offset, offset,
+ num_bytes);
sctx->cur_inode_next_write_offset = end;
return ret;
}
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] btrfs: send: allow cloning non-aligned extent if it ends at" failed to apply to 6.1-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 46a6e10a1ab16cc71d4a3cab73e79aabadd6b8ea
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081911-shrivel-overstay-1394@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
46a6e10a1ab1 ("btrfs: send: allow cloning non-aligned extent if it ends at i_size")
4e00422ee626 ("btrfs: replace sb::s_blocksize by fs_info::sectorsize")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 46a6e10a1ab16cc71d4a3cab73e79aabadd6b8ea Mon Sep 17 00:00:00 2001
From: Filipe Manana <fdmanana(a)suse.com>
Date: Mon, 12 Aug 2024 14:18:06 +0100
Subject: [PATCH] btrfs: send: allow cloning non-aligned extent if it ends at
i_size
If we a find that an extent is shared but its end offset is not sector
size aligned, then we don't clone it and issue write operations instead.
This is because the reflink (remap_file_range) operation does not allow
to clone unaligned ranges, except if the end offset of the range matches
the i_size of the source and destination files (and the start offset is
sector size aligned).
While this is not incorrect because send can only guarantee that a file
has the same data in the source and destination snapshots, it's not
optimal and generates confusion and surprising behaviour for users.
For example, running this test:
$ cat test.sh
#!/bin/bash
DEV=/dev/sdi
MNT=/mnt/sdi
mkfs.btrfs -f $DEV
mount $DEV $MNT
# Use a file size not aligned to any possible sector size.
file_size=$((1 * 1024 * 1024 + 5)) # 1MB + 5 bytes
dd if=/dev/random of=$MNT/foo bs=$file_size count=1
cp --reflink=always $MNT/foo $MNT/bar
btrfs subvolume snapshot -r $MNT/ $MNT/snap
rm -f /tmp/send-test
btrfs send -f /tmp/send-test $MNT/snap
umount $MNT
mkfs.btrfs -f $DEV
mount $DEV $MNT
btrfs receive -vv -f /tmp/send-test $MNT
xfs_io -r -c "fiemap -v" $MNT/snap/bar
umount $MNT
Gives the following result:
(...)
mkfile o258-7-0
rename o258-7-0 -> bar
write bar - offset=0 length=49152
write bar - offset=49152 length=49152
write bar - offset=98304 length=49152
write bar - offset=147456 length=49152
write bar - offset=196608 length=49152
write bar - offset=245760 length=49152
write bar - offset=294912 length=49152
write bar - offset=344064 length=49152
write bar - offset=393216 length=49152
write bar - offset=442368 length=49152
write bar - offset=491520 length=49152
write bar - offset=540672 length=49152
write bar - offset=589824 length=49152
write bar - offset=638976 length=49152
write bar - offset=688128 length=49152
write bar - offset=737280 length=49152
write bar - offset=786432 length=49152
write bar - offset=835584 length=49152
write bar - offset=884736 length=49152
write bar - offset=933888 length=49152
write bar - offset=983040 length=49152
write bar - offset=1032192 length=16389
chown bar - uid=0, gid=0
chmod bar - mode=0644
utimes bar
utimes
BTRFS_IOC_SET_RECEIVED_SUBVOL uuid=06d640da-9ca1-604c-b87c-3375175a8eb3, stransid=7
/mnt/sdi/snap/bar:
EXT: FILE-OFFSET BLOCK-RANGE TOTAL FLAGS
0: [0..2055]: 26624..28679 2056 0x1
There's no clone operation to clone extents from the file foo into file
bar and fiemap confirms there's no shared flag (0x2000).
So update send_write_or_clone() so that it proceeds with cloning if the
source and destination ranges end at the i_size of the respective files.
After this changes the result of the test is:
(...)
mkfile o258-7-0
rename o258-7-0 -> bar
clone bar - source=foo source offset=0 offset=0 length=1048581
chown bar - uid=0, gid=0
chmod bar - mode=0644
utimes bar
utimes
BTRFS_IOC_SET_RECEIVED_SUBVOL uuid=582420f3-ea7d-564e-bbe5-ce440d622190, stransid=7
/mnt/sdi/snap/bar:
EXT: FILE-OFFSET BLOCK-RANGE TOTAL FLAGS
0: [0..2055]: 26624..28679 2056 0x2001
A test case for fstests will also follow up soon.
Link: https://github.com/kdave/btrfs-progs/issues/572#issuecomment-2282841416
CC: stable(a)vger.kernel.org # 5.10+
Reviewed-by: Qu Wenruo <wqu(a)suse.com>
Signed-off-by: Filipe Manana <fdmanana(a)suse.com>
Reviewed-by: David Sterba <dsterba(a)suse.com>
Signed-off-by: David Sterba <dsterba(a)suse.com>
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index 4ca711a773ef..7fc692fc76e1 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -6157,25 +6157,51 @@ static int send_write_or_clone(struct send_ctx *sctx,
u64 offset = key->offset;
u64 end;
u64 bs = sctx->send_root->fs_info->sectorsize;
+ struct btrfs_file_extent_item *ei;
+ u64 disk_byte;
+ u64 data_offset;
+ u64 num_bytes;
+ struct btrfs_inode_info info = { 0 };
end = min_t(u64, btrfs_file_extent_end(path), sctx->cur_inode_size);
if (offset >= end)
return 0;
- if (clone_root && IS_ALIGNED(end, bs)) {
- struct btrfs_file_extent_item *ei;
- u64 disk_byte;
- u64 data_offset;
+ num_bytes = end - offset;
- ei = btrfs_item_ptr(path->nodes[0], path->slots[0],
- struct btrfs_file_extent_item);
- disk_byte = btrfs_file_extent_disk_bytenr(path->nodes[0], ei);
- data_offset = btrfs_file_extent_offset(path->nodes[0], ei);
- ret = clone_range(sctx, path, clone_root, disk_byte,
- data_offset, offset, end - offset);
- } else {
- ret = send_extent_data(sctx, path, offset, end - offset);
- }
+ if (!clone_root)
+ goto write_data;
+
+ if (IS_ALIGNED(end, bs))
+ goto clone_data;
+
+ /*
+ * If the extent end is not aligned, we can clone if the extent ends at
+ * the i_size of the inode and the clone range ends at the i_size of the
+ * source inode, otherwise the clone operation fails with -EINVAL.
+ */
+ if (end != sctx->cur_inode_size)
+ goto write_data;
+
+ ret = get_inode_info(clone_root->root, clone_root->ino, &info);
+ if (ret < 0)
+ return ret;
+
+ if (clone_root->offset + num_bytes == info.size)
+ goto clone_data;
+
+write_data:
+ ret = send_extent_data(sctx, path, offset, num_bytes);
+ sctx->cur_inode_next_write_offset = end;
+ return ret;
+
+clone_data:
+ ei = btrfs_item_ptr(path->nodes[0], path->slots[0],
+ struct btrfs_file_extent_item);
+ disk_byte = btrfs_file_extent_disk_bytenr(path->nodes[0], ei);
+ data_offset = btrfs_file_extent_offset(path->nodes[0], ei);
+ ret = clone_range(sctx, path, clone_root, disk_byte, data_offset, offset,
+ num_bytes);
sctx->cur_inode_next_write_offset = end;
return ret;
}
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] btrfs: send: allow cloning non-aligned extent if it ends at" failed to apply to 6.6-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 46a6e10a1ab16cc71d4a3cab73e79aabadd6b8ea
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081909-blunt-glass-4ea5@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
46a6e10a1ab1 ("btrfs: send: allow cloning non-aligned extent if it ends at i_size")
4e00422ee626 ("btrfs: replace sb::s_blocksize by fs_info::sectorsize")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 46a6e10a1ab16cc71d4a3cab73e79aabadd6b8ea Mon Sep 17 00:00:00 2001
From: Filipe Manana <fdmanana(a)suse.com>
Date: Mon, 12 Aug 2024 14:18:06 +0100
Subject: [PATCH] btrfs: send: allow cloning non-aligned extent if it ends at
i_size
If we a find that an extent is shared but its end offset is not sector
size aligned, then we don't clone it and issue write operations instead.
This is because the reflink (remap_file_range) operation does not allow
to clone unaligned ranges, except if the end offset of the range matches
the i_size of the source and destination files (and the start offset is
sector size aligned).
While this is not incorrect because send can only guarantee that a file
has the same data in the source and destination snapshots, it's not
optimal and generates confusion and surprising behaviour for users.
For example, running this test:
$ cat test.sh
#!/bin/bash
DEV=/dev/sdi
MNT=/mnt/sdi
mkfs.btrfs -f $DEV
mount $DEV $MNT
# Use a file size not aligned to any possible sector size.
file_size=$((1 * 1024 * 1024 + 5)) # 1MB + 5 bytes
dd if=/dev/random of=$MNT/foo bs=$file_size count=1
cp --reflink=always $MNT/foo $MNT/bar
btrfs subvolume snapshot -r $MNT/ $MNT/snap
rm -f /tmp/send-test
btrfs send -f /tmp/send-test $MNT/snap
umount $MNT
mkfs.btrfs -f $DEV
mount $DEV $MNT
btrfs receive -vv -f /tmp/send-test $MNT
xfs_io -r -c "fiemap -v" $MNT/snap/bar
umount $MNT
Gives the following result:
(...)
mkfile o258-7-0
rename o258-7-0 -> bar
write bar - offset=0 length=49152
write bar - offset=49152 length=49152
write bar - offset=98304 length=49152
write bar - offset=147456 length=49152
write bar - offset=196608 length=49152
write bar - offset=245760 length=49152
write bar - offset=294912 length=49152
write bar - offset=344064 length=49152
write bar - offset=393216 length=49152
write bar - offset=442368 length=49152
write bar - offset=491520 length=49152
write bar - offset=540672 length=49152
write bar - offset=589824 length=49152
write bar - offset=638976 length=49152
write bar - offset=688128 length=49152
write bar - offset=737280 length=49152
write bar - offset=786432 length=49152
write bar - offset=835584 length=49152
write bar - offset=884736 length=49152
write bar - offset=933888 length=49152
write bar - offset=983040 length=49152
write bar - offset=1032192 length=16389
chown bar - uid=0, gid=0
chmod bar - mode=0644
utimes bar
utimes
BTRFS_IOC_SET_RECEIVED_SUBVOL uuid=06d640da-9ca1-604c-b87c-3375175a8eb3, stransid=7
/mnt/sdi/snap/bar:
EXT: FILE-OFFSET BLOCK-RANGE TOTAL FLAGS
0: [0..2055]: 26624..28679 2056 0x1
There's no clone operation to clone extents from the file foo into file
bar and fiemap confirms there's no shared flag (0x2000).
So update send_write_or_clone() so that it proceeds with cloning if the
source and destination ranges end at the i_size of the respective files.
After this changes the result of the test is:
(...)
mkfile o258-7-0
rename o258-7-0 -> bar
clone bar - source=foo source offset=0 offset=0 length=1048581
chown bar - uid=0, gid=0
chmod bar - mode=0644
utimes bar
utimes
BTRFS_IOC_SET_RECEIVED_SUBVOL uuid=582420f3-ea7d-564e-bbe5-ce440d622190, stransid=7
/mnt/sdi/snap/bar:
EXT: FILE-OFFSET BLOCK-RANGE TOTAL FLAGS
0: [0..2055]: 26624..28679 2056 0x2001
A test case for fstests will also follow up soon.
Link: https://github.com/kdave/btrfs-progs/issues/572#issuecomment-2282841416
CC: stable(a)vger.kernel.org # 5.10+
Reviewed-by: Qu Wenruo <wqu(a)suse.com>
Signed-off-by: Filipe Manana <fdmanana(a)suse.com>
Reviewed-by: David Sterba <dsterba(a)suse.com>
Signed-off-by: David Sterba <dsterba(a)suse.com>
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index 4ca711a773ef..7fc692fc76e1 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -6157,25 +6157,51 @@ static int send_write_or_clone(struct send_ctx *sctx,
u64 offset = key->offset;
u64 end;
u64 bs = sctx->send_root->fs_info->sectorsize;
+ struct btrfs_file_extent_item *ei;
+ u64 disk_byte;
+ u64 data_offset;
+ u64 num_bytes;
+ struct btrfs_inode_info info = { 0 };
end = min_t(u64, btrfs_file_extent_end(path), sctx->cur_inode_size);
if (offset >= end)
return 0;
- if (clone_root && IS_ALIGNED(end, bs)) {
- struct btrfs_file_extent_item *ei;
- u64 disk_byte;
- u64 data_offset;
+ num_bytes = end - offset;
- ei = btrfs_item_ptr(path->nodes[0], path->slots[0],
- struct btrfs_file_extent_item);
- disk_byte = btrfs_file_extent_disk_bytenr(path->nodes[0], ei);
- data_offset = btrfs_file_extent_offset(path->nodes[0], ei);
- ret = clone_range(sctx, path, clone_root, disk_byte,
- data_offset, offset, end - offset);
- } else {
- ret = send_extent_data(sctx, path, offset, end - offset);
- }
+ if (!clone_root)
+ goto write_data;
+
+ if (IS_ALIGNED(end, bs))
+ goto clone_data;
+
+ /*
+ * If the extent end is not aligned, we can clone if the extent ends at
+ * the i_size of the inode and the clone range ends at the i_size of the
+ * source inode, otherwise the clone operation fails with -EINVAL.
+ */
+ if (end != sctx->cur_inode_size)
+ goto write_data;
+
+ ret = get_inode_info(clone_root->root, clone_root->ino, &info);
+ if (ret < 0)
+ return ret;
+
+ if (clone_root->offset + num_bytes == info.size)
+ goto clone_data;
+
+write_data:
+ ret = send_extent_data(sctx, path, offset, num_bytes);
+ sctx->cur_inode_next_write_offset = end;
+ return ret;
+
+clone_data:
+ ei = btrfs_item_ptr(path->nodes[0], path->slots[0],
+ struct btrfs_file_extent_item);
+ disk_byte = btrfs_file_extent_disk_bytenr(path->nodes[0], ei);
+ data_offset = btrfs_file_extent_offset(path->nodes[0], ei);
+ ret = clone_range(sctx, path, clone_root, disk_byte, data_offset, offset,
+ num_bytes);
sctx->cur_inode_next_write_offset = end;
return ret;
}
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] btrfs: tree-checker: reject BTRFS_FT_UNKNOWN dir type" failed to apply to 5.4-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y
git checkout FETCH_HEAD
git cherry-pick -x 31723c9542dba1681cc3720571fdf12ffe0eddd9
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081954-purplish-scarecrow-7568@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^..
Possible dependencies:
31723c9542db ("btrfs: tree-checker: reject BTRFS_FT_UNKNOWN dir type")
94a48aef49f2 ("btrfs: extend btrfs_dir_item type to store encryption status")
e43eec81c516 ("btrfs: use struct qstr instead of name and namelen pairs")
07e81dc94474 ("btrfs: move accessor helpers into accessors.h")
ad1ac5012c2b ("btrfs: move btrfs_map_token to accessors")
55e5cfd36da5 ("btrfs: remove fs_info::pending_changes and related code")
7966a6b5959b ("btrfs: move fs_info::flags enum to fs.h")
fc97a410bd78 ("btrfs: move mount option definitions to fs.h")
0d3a9cf8c306 ("btrfs: convert incompat and compat flag test helpers to macros")
ec8eb376e271 ("btrfs: move BTRFS_FS_STATE* definitions and helpers to fs.h")
9b569ea0be6f ("btrfs: move the printk helpers out of ctree.h")
e118578a8df7 ("btrfs: move assert helpers out of ctree.h")
c7f13d428ea1 ("btrfs: move fs wide helpers out of ctree.h")
63a7cb130718 ("btrfs: auto enable discard=async when possible")
7a66eda351ba ("btrfs: move the btrfs_verity_descriptor_item defs up in ctree.h")
956504a331a6 ("btrfs: move trans_handle_cachep out of ctree.h")
f1e5c6185ca1 ("btrfs: move flush related definitions to space-info.h")
ed4c491a3db2 ("btrfs: move BTRFS_MAX_MIRRORS into scrub.c")
4300c58f8090 ("btrfs: move btrfs on-disk definitions out of ctree.h")
d60d956eb41f ("btrfs: remove unused set/clear_pending_info helpers")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 31723c9542dba1681cc3720571fdf12ffe0eddd9 Mon Sep 17 00:00:00 2001
From: Qu Wenruo <wqu(a)suse.com>
Date: Mon, 12 Aug 2024 08:52:44 +0930
Subject: [PATCH] btrfs: tree-checker: reject BTRFS_FT_UNKNOWN dir type
[REPORT]
There is a bug report that kernel is rejecting a mismatching inode mode
and its dir item:
[ 1881.553937] BTRFS critical (device dm-0): inode mode mismatch with
dir: inode mode=040700 btrfs type=2 dir type=0
[CAUSE]
It looks like the inode mode is correct, while the dir item type
0 is BTRFS_FT_UNKNOWN, which should not be generated by btrfs at all.
This may be caused by a memory bit flip.
[ENHANCEMENT]
Although tree-checker is not able to do any cross-leaf verification, for
this particular case we can at least reject any dir type with
BTRFS_FT_UNKNOWN.
So here we enhance the dir type check from [0, BTRFS_FT_MAX), to
(0, BTRFS_FT_MAX).
Although the existing corruption can not be fixed just by such enhanced
checking, it should prevent the same 0x2->0x0 bitflip for dir type to
reach disk in the future.
Reported-by: Kota <nospam(a)kota.moe>
Link: https://lore.kernel.org/linux-btrfs/CACsxjPYnQF9ZF-0OhH16dAx50=BXXOcP74MxBc…
CC: stable(a)vger.kernel.org # 5.4+
Signed-off-by: Qu Wenruo <wqu(a)suse.com>
Signed-off-by: David Sterba <dsterba(a)suse.com>
diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c
index a825fa598e3c..6f1e2f2215d9 100644
--- a/fs/btrfs/tree-checker.c
+++ b/fs/btrfs/tree-checker.c
@@ -569,9 +569,10 @@ static int check_dir_item(struct extent_buffer *leaf,
/* dir type check */
dir_type = btrfs_dir_ftype(leaf, di);
- if (unlikely(dir_type >= BTRFS_FT_MAX)) {
+ if (unlikely(dir_type <= BTRFS_FT_UNKNOWN ||
+ dir_type >= BTRFS_FT_MAX)) {
dir_item_err(leaf, slot,
- "invalid dir item type, have %u expect [0, %u)",
+ "invalid dir item type, have %u expect (0, %u)",
dir_type, BTRFS_FT_MAX);
return -EUCLEAN;
}
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] btrfs: tree-checker: reject BTRFS_FT_UNKNOWN dir type" failed to apply to 5.10-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 31723c9542dba1681cc3720571fdf12ffe0eddd9
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081953-calm-granola-8c1b@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
31723c9542db ("btrfs: tree-checker: reject BTRFS_FT_UNKNOWN dir type")
94a48aef49f2 ("btrfs: extend btrfs_dir_item type to store encryption status")
e43eec81c516 ("btrfs: use struct qstr instead of name and namelen pairs")
07e81dc94474 ("btrfs: move accessor helpers into accessors.h")
ad1ac5012c2b ("btrfs: move btrfs_map_token to accessors")
55e5cfd36da5 ("btrfs: remove fs_info::pending_changes and related code")
7966a6b5959b ("btrfs: move fs_info::flags enum to fs.h")
fc97a410bd78 ("btrfs: move mount option definitions to fs.h")
0d3a9cf8c306 ("btrfs: convert incompat and compat flag test helpers to macros")
ec8eb376e271 ("btrfs: move BTRFS_FS_STATE* definitions and helpers to fs.h")
9b569ea0be6f ("btrfs: move the printk helpers out of ctree.h")
e118578a8df7 ("btrfs: move assert helpers out of ctree.h")
c7f13d428ea1 ("btrfs: move fs wide helpers out of ctree.h")
63a7cb130718 ("btrfs: auto enable discard=async when possible")
7a66eda351ba ("btrfs: move the btrfs_verity_descriptor_item defs up in ctree.h")
956504a331a6 ("btrfs: move trans_handle_cachep out of ctree.h")
f1e5c6185ca1 ("btrfs: move flush related definitions to space-info.h")
ed4c491a3db2 ("btrfs: move BTRFS_MAX_MIRRORS into scrub.c")
4300c58f8090 ("btrfs: move btrfs on-disk definitions out of ctree.h")
d60d956eb41f ("btrfs: remove unused set/clear_pending_info helpers")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 31723c9542dba1681cc3720571fdf12ffe0eddd9 Mon Sep 17 00:00:00 2001
From: Qu Wenruo <wqu(a)suse.com>
Date: Mon, 12 Aug 2024 08:52:44 +0930
Subject: [PATCH] btrfs: tree-checker: reject BTRFS_FT_UNKNOWN dir type
[REPORT]
There is a bug report that kernel is rejecting a mismatching inode mode
and its dir item:
[ 1881.553937] BTRFS critical (device dm-0): inode mode mismatch with
dir: inode mode=040700 btrfs type=2 dir type=0
[CAUSE]
It looks like the inode mode is correct, while the dir item type
0 is BTRFS_FT_UNKNOWN, which should not be generated by btrfs at all.
This may be caused by a memory bit flip.
[ENHANCEMENT]
Although tree-checker is not able to do any cross-leaf verification, for
this particular case we can at least reject any dir type with
BTRFS_FT_UNKNOWN.
So here we enhance the dir type check from [0, BTRFS_FT_MAX), to
(0, BTRFS_FT_MAX).
Although the existing corruption can not be fixed just by such enhanced
checking, it should prevent the same 0x2->0x0 bitflip for dir type to
reach disk in the future.
Reported-by: Kota <nospam(a)kota.moe>
Link: https://lore.kernel.org/linux-btrfs/CACsxjPYnQF9ZF-0OhH16dAx50=BXXOcP74MxBc…
CC: stable(a)vger.kernel.org # 5.4+
Signed-off-by: Qu Wenruo <wqu(a)suse.com>
Signed-off-by: David Sterba <dsterba(a)suse.com>
diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c
index a825fa598e3c..6f1e2f2215d9 100644
--- a/fs/btrfs/tree-checker.c
+++ b/fs/btrfs/tree-checker.c
@@ -569,9 +569,10 @@ static int check_dir_item(struct extent_buffer *leaf,
/* dir type check */
dir_type = btrfs_dir_ftype(leaf, di);
- if (unlikely(dir_type >= BTRFS_FT_MAX)) {
+ if (unlikely(dir_type <= BTRFS_FT_UNKNOWN ||
+ dir_type >= BTRFS_FT_MAX)) {
dir_item_err(leaf, slot,
- "invalid dir item type, have %u expect [0, %u)",
+ "invalid dir item type, have %u expect (0, %u)",
dir_type, BTRFS_FT_MAX);
return -EUCLEAN;
}
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] btrfs: tree-checker: reject BTRFS_FT_UNKNOWN dir type" failed to apply to 5.15-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x 31723c9542dba1681cc3720571fdf12ffe0eddd9
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081952-clatter-tribute-f81c@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
31723c9542db ("btrfs: tree-checker: reject BTRFS_FT_UNKNOWN dir type")
94a48aef49f2 ("btrfs: extend btrfs_dir_item type to store encryption status")
e43eec81c516 ("btrfs: use struct qstr instead of name and namelen pairs")
07e81dc94474 ("btrfs: move accessor helpers into accessors.h")
ad1ac5012c2b ("btrfs: move btrfs_map_token to accessors")
55e5cfd36da5 ("btrfs: remove fs_info::pending_changes and related code")
7966a6b5959b ("btrfs: move fs_info::flags enum to fs.h")
fc97a410bd78 ("btrfs: move mount option definitions to fs.h")
0d3a9cf8c306 ("btrfs: convert incompat and compat flag test helpers to macros")
ec8eb376e271 ("btrfs: move BTRFS_FS_STATE* definitions and helpers to fs.h")
9b569ea0be6f ("btrfs: move the printk helpers out of ctree.h")
e118578a8df7 ("btrfs: move assert helpers out of ctree.h")
c7f13d428ea1 ("btrfs: move fs wide helpers out of ctree.h")
63a7cb130718 ("btrfs: auto enable discard=async when possible")
7a66eda351ba ("btrfs: move the btrfs_verity_descriptor_item defs up in ctree.h")
956504a331a6 ("btrfs: move trans_handle_cachep out of ctree.h")
f1e5c6185ca1 ("btrfs: move flush related definitions to space-info.h")
ed4c491a3db2 ("btrfs: move BTRFS_MAX_MIRRORS into scrub.c")
4300c58f8090 ("btrfs: move btrfs on-disk definitions out of ctree.h")
d60d956eb41f ("btrfs: remove unused set/clear_pending_info helpers")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 31723c9542dba1681cc3720571fdf12ffe0eddd9 Mon Sep 17 00:00:00 2001
From: Qu Wenruo <wqu(a)suse.com>
Date: Mon, 12 Aug 2024 08:52:44 +0930
Subject: [PATCH] btrfs: tree-checker: reject BTRFS_FT_UNKNOWN dir type
[REPORT]
There is a bug report that kernel is rejecting a mismatching inode mode
and its dir item:
[ 1881.553937] BTRFS critical (device dm-0): inode mode mismatch with
dir: inode mode=040700 btrfs type=2 dir type=0
[CAUSE]
It looks like the inode mode is correct, while the dir item type
0 is BTRFS_FT_UNKNOWN, which should not be generated by btrfs at all.
This may be caused by a memory bit flip.
[ENHANCEMENT]
Although tree-checker is not able to do any cross-leaf verification, for
this particular case we can at least reject any dir type with
BTRFS_FT_UNKNOWN.
So here we enhance the dir type check from [0, BTRFS_FT_MAX), to
(0, BTRFS_FT_MAX).
Although the existing corruption can not be fixed just by such enhanced
checking, it should prevent the same 0x2->0x0 bitflip for dir type to
reach disk in the future.
Reported-by: Kota <nospam(a)kota.moe>
Link: https://lore.kernel.org/linux-btrfs/CACsxjPYnQF9ZF-0OhH16dAx50=BXXOcP74MxBc…
CC: stable(a)vger.kernel.org # 5.4+
Signed-off-by: Qu Wenruo <wqu(a)suse.com>
Signed-off-by: David Sterba <dsterba(a)suse.com>
diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c
index a825fa598e3c..6f1e2f2215d9 100644
--- a/fs/btrfs/tree-checker.c
+++ b/fs/btrfs/tree-checker.c
@@ -569,9 +569,10 @@ static int check_dir_item(struct extent_buffer *leaf,
/* dir type check */
dir_type = btrfs_dir_ftype(leaf, di);
- if (unlikely(dir_type >= BTRFS_FT_MAX)) {
+ if (unlikely(dir_type <= BTRFS_FT_UNKNOWN ||
+ dir_type >= BTRFS_FT_MAX)) {
dir_item_err(leaf, slot,
- "invalid dir item type, have %u expect [0, %u)",
+ "invalid dir item type, have %u expect (0, %u)",
dir_type, BTRFS_FT_MAX);
return -EUCLEAN;
}
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] btrfs: tree-checker: reject BTRFS_FT_UNKNOWN dir type" failed to apply to 6.1-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 31723c9542dba1681cc3720571fdf12ffe0eddd9
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081951-anyhow-fool-5756@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
31723c9542db ("btrfs: tree-checker: reject BTRFS_FT_UNKNOWN dir type")
94a48aef49f2 ("btrfs: extend btrfs_dir_item type to store encryption status")
e43eec81c516 ("btrfs: use struct qstr instead of name and namelen pairs")
07e81dc94474 ("btrfs: move accessor helpers into accessors.h")
ad1ac5012c2b ("btrfs: move btrfs_map_token to accessors")
55e5cfd36da5 ("btrfs: remove fs_info::pending_changes and related code")
7966a6b5959b ("btrfs: move fs_info::flags enum to fs.h")
fc97a410bd78 ("btrfs: move mount option definitions to fs.h")
0d3a9cf8c306 ("btrfs: convert incompat and compat flag test helpers to macros")
ec8eb376e271 ("btrfs: move BTRFS_FS_STATE* definitions and helpers to fs.h")
9b569ea0be6f ("btrfs: move the printk helpers out of ctree.h")
e118578a8df7 ("btrfs: move assert helpers out of ctree.h")
c7f13d428ea1 ("btrfs: move fs wide helpers out of ctree.h")
63a7cb130718 ("btrfs: auto enable discard=async when possible")
7a66eda351ba ("btrfs: move the btrfs_verity_descriptor_item defs up in ctree.h")
956504a331a6 ("btrfs: move trans_handle_cachep out of ctree.h")
f1e5c6185ca1 ("btrfs: move flush related definitions to space-info.h")
ed4c491a3db2 ("btrfs: move BTRFS_MAX_MIRRORS into scrub.c")
4300c58f8090 ("btrfs: move btrfs on-disk definitions out of ctree.h")
d60d956eb41f ("btrfs: remove unused set/clear_pending_info helpers")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 31723c9542dba1681cc3720571fdf12ffe0eddd9 Mon Sep 17 00:00:00 2001
From: Qu Wenruo <wqu(a)suse.com>
Date: Mon, 12 Aug 2024 08:52:44 +0930
Subject: [PATCH] btrfs: tree-checker: reject BTRFS_FT_UNKNOWN dir type
[REPORT]
There is a bug report that kernel is rejecting a mismatching inode mode
and its dir item:
[ 1881.553937] BTRFS critical (device dm-0): inode mode mismatch with
dir: inode mode=040700 btrfs type=2 dir type=0
[CAUSE]
It looks like the inode mode is correct, while the dir item type
0 is BTRFS_FT_UNKNOWN, which should not be generated by btrfs at all.
This may be caused by a memory bit flip.
[ENHANCEMENT]
Although tree-checker is not able to do any cross-leaf verification, for
this particular case we can at least reject any dir type with
BTRFS_FT_UNKNOWN.
So here we enhance the dir type check from [0, BTRFS_FT_MAX), to
(0, BTRFS_FT_MAX).
Although the existing corruption can not be fixed just by such enhanced
checking, it should prevent the same 0x2->0x0 bitflip for dir type to
reach disk in the future.
Reported-by: Kota <nospam(a)kota.moe>
Link: https://lore.kernel.org/linux-btrfs/CACsxjPYnQF9ZF-0OhH16dAx50=BXXOcP74MxBc…
CC: stable(a)vger.kernel.org # 5.4+
Signed-off-by: Qu Wenruo <wqu(a)suse.com>
Signed-off-by: David Sterba <dsterba(a)suse.com>
diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c
index a825fa598e3c..6f1e2f2215d9 100644
--- a/fs/btrfs/tree-checker.c
+++ b/fs/btrfs/tree-checker.c
@@ -569,9 +569,10 @@ static int check_dir_item(struct extent_buffer *leaf,
/* dir type check */
dir_type = btrfs_dir_ftype(leaf, di);
- if (unlikely(dir_type >= BTRFS_FT_MAX)) {
+ if (unlikely(dir_type <= BTRFS_FT_UNKNOWN ||
+ dir_type >= BTRFS_FT_MAX)) {
dir_item_err(leaf, slot,
- "invalid dir item type, have %u expect [0, %u)",
+ "invalid dir item type, have %u expect (0, %u)",
dir_type, BTRFS_FT_MAX);
return -EUCLEAN;
}
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] selftests: memfd_secret: don't build memfd_secret test on" failed to apply to 5.15-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x 7c5e8d212d7d81991a580e7de3904ea213d9a852
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081942-rippling-relieving-c8d1@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
7c5e8d212d7d ("selftests: memfd_secret: don't build memfd_secret test on unsupported arches")
a3c5cc5129ef ("selftests/mm: log run_vmtests.sh results in TAP format")
2ffc27b15b11 ("tools/testing/selftests/mm/run_vmtests.sh: lower the ptrace permissions")
05f1edac8009 ("selftests/mm: run all tests from run_vmtests.sh")
000303329752 ("selftests/mm: make migration test robust to failure")
f6dd4e223d87 ("selftests/mm: skip soft-dirty tests on arm64")
ba91e7e5d15a ("selftests/mm: add tests for HWPOISON hugetlbfs read")
2bc481362245 ("selftests/mm: add -a to run_vmtests.sh")
63773d2b593d ("Merge mm-hotfixes-stable into mm-stable to pick up depended-upon changes.")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 7c5e8d212d7d81991a580e7de3904ea213d9a852 Mon Sep 17 00:00:00 2001
From: Muhammad Usama Anjum <usama.anjum(a)collabora.com>
Date: Fri, 9 Aug 2024 12:56:42 +0500
Subject: [PATCH] selftests: memfd_secret: don't build memfd_secret test on
unsupported arches
[1] mentions that memfd_secret is only supported on arm64, riscv, x86 and
x86_64 for now. It doesn't support other architectures. I found the
build error on arm and decided to send the fix as it was creating noise on
KernelCI:
memfd_secret.c: In function 'memfd_secret':
memfd_secret.c:42:24: error: '__NR_memfd_secret' undeclared (first use in this function);
did you mean 'memfd_secret'?
42 | return syscall(__NR_memfd_secret, flags);
| ^~~~~~~~~~~~~~~~~
| memfd_secret
Hence I'm adding condition that memfd_secret should only be compiled on
supported architectures.
Also check in run_vmtests script if memfd_secret binary is present before
executing it.
Link: https://lkml.kernel.org/r/20240812061522.1933054-1-usama.anjum@collabora.com
Link: https://lore.kernel.org/all/20210518072034.31572-7-rppt@kernel.org/ [1]
Link: https://lkml.kernel.org/r/20240809075642.403247-1-usama.anjum@collabora.com
Fixes: 76fe17ef588a ("secretmem: test: add basic selftest for memfd_secret(2)")
Signed-off-by: Muhammad Usama Anjum <usama.anjum(a)collabora.com>
Reviewed-by: Shuah Khan <skhan(a)linuxfoundation.org>
Acked-by: Mike Rapoport (Microsoft) <rppt(a)kernel.org>
Cc: Albert Ou <aou(a)eecs.berkeley.edu>
Cc: James Bottomley <James.Bottomley(a)HansenPartnership.com>
Cc: Mike Rapoport (Microsoft) <rppt(a)kernel.org>
Cc: Palmer Dabbelt <palmer(a)dabbelt.com>
Cc: Paul Walmsley <paul.walmsley(a)sifive.com>
Cc: <stable(a)vger.kernel.org>
Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
diff --git a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/Makefile
index 7b8a5def54a1..cfad627e8d94 100644
--- a/tools/testing/selftests/mm/Makefile
+++ b/tools/testing/selftests/mm/Makefile
@@ -53,7 +53,9 @@ TEST_GEN_FILES += madv_populate
TEST_GEN_FILES += map_fixed_noreplace
TEST_GEN_FILES += map_hugetlb
TEST_GEN_FILES += map_populate
+ifneq (,$(filter $(ARCH),arm64 riscv riscv64 x86 x86_64))
TEST_GEN_FILES += memfd_secret
+endif
TEST_GEN_FILES += migration
TEST_GEN_FILES += mkdirty
TEST_GEN_FILES += mlock-random-test
diff --git a/tools/testing/selftests/mm/run_vmtests.sh b/tools/testing/selftests/mm/run_vmtests.sh
index 03ac4f2e1cce..36045edb10de 100755
--- a/tools/testing/selftests/mm/run_vmtests.sh
+++ b/tools/testing/selftests/mm/run_vmtests.sh
@@ -374,8 +374,11 @@ CATEGORY="hmm" run_test bash ./test_hmm.sh smoke
# MADV_POPULATE_READ and MADV_POPULATE_WRITE tests
CATEGORY="madv_populate" run_test ./madv_populate
+if [ -x ./memfd_secret ]
+then
(echo 0 | sudo tee /proc/sys/kernel/yama/ptrace_scope 2>&1) | tap_prefix
CATEGORY="memfd_secret" run_test ./memfd_secret
+fi
# KSM KSM_MERGE_TIME_HUGE_PAGES test with size of 100
CATEGORY="ksm" run_test ./ksm_tests -H -s 100
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] selftests: memfd_secret: don't build memfd_secret test on" failed to apply to 6.1-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 7c5e8d212d7d81991a580e7de3904ea213d9a852
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081941-agility-fable-8749@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
7c5e8d212d7d ("selftests: memfd_secret: don't build memfd_secret test on unsupported arches")
a3c5cc5129ef ("selftests/mm: log run_vmtests.sh results in TAP format")
2ffc27b15b11 ("tools/testing/selftests/mm/run_vmtests.sh: lower the ptrace permissions")
05f1edac8009 ("selftests/mm: run all tests from run_vmtests.sh")
000303329752 ("selftests/mm: make migration test robust to failure")
f6dd4e223d87 ("selftests/mm: skip soft-dirty tests on arm64")
ba91e7e5d15a ("selftests/mm: add tests for HWPOISON hugetlbfs read")
2bc481362245 ("selftests/mm: add -a to run_vmtests.sh")
63773d2b593d ("Merge mm-hotfixes-stable into mm-stable to pick up depended-upon changes.")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 7c5e8d212d7d81991a580e7de3904ea213d9a852 Mon Sep 17 00:00:00 2001
From: Muhammad Usama Anjum <usama.anjum(a)collabora.com>
Date: Fri, 9 Aug 2024 12:56:42 +0500
Subject: [PATCH] selftests: memfd_secret: don't build memfd_secret test on
unsupported arches
[1] mentions that memfd_secret is only supported on arm64, riscv, x86 and
x86_64 for now. It doesn't support other architectures. I found the
build error on arm and decided to send the fix as it was creating noise on
KernelCI:
memfd_secret.c: In function 'memfd_secret':
memfd_secret.c:42:24: error: '__NR_memfd_secret' undeclared (first use in this function);
did you mean 'memfd_secret'?
42 | return syscall(__NR_memfd_secret, flags);
| ^~~~~~~~~~~~~~~~~
| memfd_secret
Hence I'm adding condition that memfd_secret should only be compiled on
supported architectures.
Also check in run_vmtests script if memfd_secret binary is present before
executing it.
Link: https://lkml.kernel.org/r/20240812061522.1933054-1-usama.anjum@collabora.com
Link: https://lore.kernel.org/all/20210518072034.31572-7-rppt@kernel.org/ [1]
Link: https://lkml.kernel.org/r/20240809075642.403247-1-usama.anjum@collabora.com
Fixes: 76fe17ef588a ("secretmem: test: add basic selftest for memfd_secret(2)")
Signed-off-by: Muhammad Usama Anjum <usama.anjum(a)collabora.com>
Reviewed-by: Shuah Khan <skhan(a)linuxfoundation.org>
Acked-by: Mike Rapoport (Microsoft) <rppt(a)kernel.org>
Cc: Albert Ou <aou(a)eecs.berkeley.edu>
Cc: James Bottomley <James.Bottomley(a)HansenPartnership.com>
Cc: Mike Rapoport (Microsoft) <rppt(a)kernel.org>
Cc: Palmer Dabbelt <palmer(a)dabbelt.com>
Cc: Paul Walmsley <paul.walmsley(a)sifive.com>
Cc: <stable(a)vger.kernel.org>
Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
diff --git a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/Makefile
index 7b8a5def54a1..cfad627e8d94 100644
--- a/tools/testing/selftests/mm/Makefile
+++ b/tools/testing/selftests/mm/Makefile
@@ -53,7 +53,9 @@ TEST_GEN_FILES += madv_populate
TEST_GEN_FILES += map_fixed_noreplace
TEST_GEN_FILES += map_hugetlb
TEST_GEN_FILES += map_populate
+ifneq (,$(filter $(ARCH),arm64 riscv riscv64 x86 x86_64))
TEST_GEN_FILES += memfd_secret
+endif
TEST_GEN_FILES += migration
TEST_GEN_FILES += mkdirty
TEST_GEN_FILES += mlock-random-test
diff --git a/tools/testing/selftests/mm/run_vmtests.sh b/tools/testing/selftests/mm/run_vmtests.sh
index 03ac4f2e1cce..36045edb10de 100755
--- a/tools/testing/selftests/mm/run_vmtests.sh
+++ b/tools/testing/selftests/mm/run_vmtests.sh
@@ -374,8 +374,11 @@ CATEGORY="hmm" run_test bash ./test_hmm.sh smoke
# MADV_POPULATE_READ and MADV_POPULATE_WRITE tests
CATEGORY="madv_populate" run_test ./madv_populate
+if [ -x ./memfd_secret ]
+then
(echo 0 | sudo tee /proc/sys/kernel/yama/ptrace_scope 2>&1) | tap_prefix
CATEGORY="memfd_secret" run_test ./memfd_secret
+fi
# KSM KSM_MERGE_TIME_HUGE_PAGES test with size of 100
CATEGORY="ksm" run_test ./ksm_tests -H -s 100
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] selftests: memfd_secret: don't build memfd_secret test on" failed to apply to 6.6-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 7c5e8d212d7d81991a580e7de3904ea213d9a852
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081940-stopped-knickers-3a22@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
7c5e8d212d7d ("selftests: memfd_secret: don't build memfd_secret test on unsupported arches")
a3c5cc5129ef ("selftests/mm: log run_vmtests.sh results in TAP format")
2ffc27b15b11 ("tools/testing/selftests/mm/run_vmtests.sh: lower the ptrace permissions")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 7c5e8d212d7d81991a580e7de3904ea213d9a852 Mon Sep 17 00:00:00 2001
From: Muhammad Usama Anjum <usama.anjum(a)collabora.com>
Date: Fri, 9 Aug 2024 12:56:42 +0500
Subject: [PATCH] selftests: memfd_secret: don't build memfd_secret test on
unsupported arches
[1] mentions that memfd_secret is only supported on arm64, riscv, x86 and
x86_64 for now. It doesn't support other architectures. I found the
build error on arm and decided to send the fix as it was creating noise on
KernelCI:
memfd_secret.c: In function 'memfd_secret':
memfd_secret.c:42:24: error: '__NR_memfd_secret' undeclared (first use in this function);
did you mean 'memfd_secret'?
42 | return syscall(__NR_memfd_secret, flags);
| ^~~~~~~~~~~~~~~~~
| memfd_secret
Hence I'm adding condition that memfd_secret should only be compiled on
supported architectures.
Also check in run_vmtests script if memfd_secret binary is present before
executing it.
Link: https://lkml.kernel.org/r/20240812061522.1933054-1-usama.anjum@collabora.com
Link: https://lore.kernel.org/all/20210518072034.31572-7-rppt@kernel.org/ [1]
Link: https://lkml.kernel.org/r/20240809075642.403247-1-usama.anjum@collabora.com
Fixes: 76fe17ef588a ("secretmem: test: add basic selftest for memfd_secret(2)")
Signed-off-by: Muhammad Usama Anjum <usama.anjum(a)collabora.com>
Reviewed-by: Shuah Khan <skhan(a)linuxfoundation.org>
Acked-by: Mike Rapoport (Microsoft) <rppt(a)kernel.org>
Cc: Albert Ou <aou(a)eecs.berkeley.edu>
Cc: James Bottomley <James.Bottomley(a)HansenPartnership.com>
Cc: Mike Rapoport (Microsoft) <rppt(a)kernel.org>
Cc: Palmer Dabbelt <palmer(a)dabbelt.com>
Cc: Paul Walmsley <paul.walmsley(a)sifive.com>
Cc: <stable(a)vger.kernel.org>
Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
diff --git a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/Makefile
index 7b8a5def54a1..cfad627e8d94 100644
--- a/tools/testing/selftests/mm/Makefile
+++ b/tools/testing/selftests/mm/Makefile
@@ -53,7 +53,9 @@ TEST_GEN_FILES += madv_populate
TEST_GEN_FILES += map_fixed_noreplace
TEST_GEN_FILES += map_hugetlb
TEST_GEN_FILES += map_populate
+ifneq (,$(filter $(ARCH),arm64 riscv riscv64 x86 x86_64))
TEST_GEN_FILES += memfd_secret
+endif
TEST_GEN_FILES += migration
TEST_GEN_FILES += mkdirty
TEST_GEN_FILES += mlock-random-test
diff --git a/tools/testing/selftests/mm/run_vmtests.sh b/tools/testing/selftests/mm/run_vmtests.sh
index 03ac4f2e1cce..36045edb10de 100755
--- a/tools/testing/selftests/mm/run_vmtests.sh
+++ b/tools/testing/selftests/mm/run_vmtests.sh
@@ -374,8 +374,11 @@ CATEGORY="hmm" run_test bash ./test_hmm.sh smoke
# MADV_POPULATE_READ and MADV_POPULATE_WRITE tests
CATEGORY="madv_populate" run_test ./madv_populate
+if [ -x ./memfd_secret ]
+then
(echo 0 | sudo tee /proc/sys/kernel/yama/ptrace_scope 2>&1) | tap_prefix
CATEGORY="memfd_secret" run_test ./memfd_secret
+fi
# KSM KSM_MERGE_TIME_HUGE_PAGES test with size of 100
CATEGORY="ksm" run_test ./ksm_tests -H -s 100
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] mm/memory-failure: use raw_spinlock_t in struct" failed to apply to 5.15-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x d75abd0d0bc29e6ebfebbf76d11b4067b35844af
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081925-stardust-create-e577@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
d75abd0d0bc2 ("mm/memory-failure: use raw_spinlock_t in struct memory_failure_cpu")
96f96763de26 ("mm: memory-failure: convert to pr_fmt()")
98931dd95fd4 ("Merge tag 'mm-stable-2022-05-25' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From d75abd0d0bc29e6ebfebbf76d11b4067b35844af Mon Sep 17 00:00:00 2001
From: Waiman Long <longman(a)redhat.com>
Date: Tue, 6 Aug 2024 12:41:07 -0400
Subject: [PATCH] mm/memory-failure: use raw_spinlock_t in struct
memory_failure_cpu
The memory_failure_cpu structure is a per-cpu structure. Access to its
content requires the use of get_cpu_var() to lock in the current CPU and
disable preemption. The use of a regular spinlock_t for locking purpose
is fine for a non-RT kernel.
Since the integration of RT spinlock support into the v5.15 kernel, a
spinlock_t in a RT kernel becomes a sleeping lock and taking a sleeping
lock in a preemption disabled context is illegal resulting in the
following kind of warning.
[12135.732244] BUG: sleeping function called from invalid context at kernel/locking/spinlock_rt.c:48
[12135.732248] in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 270076, name: kworker/0:0
[12135.732252] preempt_count: 1, expected: 0
[12135.732255] RCU nest depth: 2, expected: 2
:
[12135.732420] Hardware name: Dell Inc. PowerEdge R640/0HG0J8, BIOS 2.10.2 02/24/2021
[12135.732423] Workqueue: kacpi_notify acpi_os_execute_deferred
[12135.732433] Call Trace:
[12135.732436] <TASK>
[12135.732450] dump_stack_lvl+0x57/0x81
[12135.732461] __might_resched.cold+0xf4/0x12f
[12135.732479] rt_spin_lock+0x4c/0x100
[12135.732491] memory_failure_queue+0x40/0xe0
[12135.732503] ghes_do_memory_failure+0x53/0x390
[12135.732516] ghes_do_proc.constprop.0+0x229/0x3e0
[12135.732575] ghes_proc+0xf9/0x1a0
[12135.732591] ghes_notify_hed+0x6a/0x150
[12135.732602] notifier_call_chain+0x43/0xb0
[12135.732626] blocking_notifier_call_chain+0x43/0x60
[12135.732637] acpi_ev_notify_dispatch+0x47/0x70
[12135.732648] acpi_os_execute_deferred+0x13/0x20
[12135.732654] process_one_work+0x41f/0x500
[12135.732695] worker_thread+0x192/0x360
[12135.732715] kthread+0x111/0x140
[12135.732733] ret_from_fork+0x29/0x50
[12135.732779] </TASK>
Fix it by using a raw_spinlock_t for locking instead.
Also move the pr_err() out of the lock critical section and after
put_cpu_ptr() to avoid indeterminate latency and the possibility of sleep
with this call.
[longman(a)redhat.com: don't hold percpu ref across pr_err(), per Miaohe]
Link: https://lkml.kernel.org/r/20240807181130.1122660-1-longman@redhat.com
Link: https://lkml.kernel.org/r/20240806164107.1044956-1-longman@redhat.com
Fixes: 0f383b6dc96e ("locking/spinlock: Provide RT variant")
Signed-off-by: Waiman Long <longman(a)redhat.com>
Acked-by: Miaohe Lin <linmiaohe(a)huawei.com>
Cc: "Huang, Ying" <ying.huang(a)intel.com>
Cc: Juri Lelli <juri.lelli(a)redhat.com>
Cc: Len Brown <len.brown(a)intel.com>
Cc: Naoya Horiguchi <nao.horiguchi(a)gmail.com>
Cc: <stable(a)vger.kernel.org>
Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 581d3e5c9117..7066fc84f351 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -2417,7 +2417,7 @@ struct memory_failure_entry {
struct memory_failure_cpu {
DECLARE_KFIFO(fifo, struct memory_failure_entry,
MEMORY_FAILURE_FIFO_SIZE);
- spinlock_t lock;
+ raw_spinlock_t lock;
struct work_struct work;
};
@@ -2443,20 +2443,22 @@ void memory_failure_queue(unsigned long pfn, int flags)
{
struct memory_failure_cpu *mf_cpu;
unsigned long proc_flags;
+ bool buffer_overflow;
struct memory_failure_entry entry = {
.pfn = pfn,
.flags = flags,
};
mf_cpu = &get_cpu_var(memory_failure_cpu);
- spin_lock_irqsave(&mf_cpu->lock, proc_flags);
- if (kfifo_put(&mf_cpu->fifo, entry))
+ raw_spin_lock_irqsave(&mf_cpu->lock, proc_flags);
+ buffer_overflow = !kfifo_put(&mf_cpu->fifo, entry);
+ if (!buffer_overflow)
schedule_work_on(smp_processor_id(), &mf_cpu->work);
- else
+ raw_spin_unlock_irqrestore(&mf_cpu->lock, proc_flags);
+ put_cpu_var(memory_failure_cpu);
+ if (buffer_overflow)
pr_err("buffer overflow when queuing memory failure at %#lx\n",
pfn);
- spin_unlock_irqrestore(&mf_cpu->lock, proc_flags);
- put_cpu_var(memory_failure_cpu);
}
EXPORT_SYMBOL_GPL(memory_failure_queue);
@@ -2469,9 +2471,9 @@ static void memory_failure_work_func(struct work_struct *work)
mf_cpu = container_of(work, struct memory_failure_cpu, work);
for (;;) {
- spin_lock_irqsave(&mf_cpu->lock, proc_flags);
+ raw_spin_lock_irqsave(&mf_cpu->lock, proc_flags);
gotten = kfifo_get(&mf_cpu->fifo, &entry);
- spin_unlock_irqrestore(&mf_cpu->lock, proc_flags);
+ raw_spin_unlock_irqrestore(&mf_cpu->lock, proc_flags);
if (!gotten)
break;
if (entry.flags & MF_SOFT_OFFLINE)
@@ -2501,7 +2503,7 @@ static int __init memory_failure_init(void)
for_each_possible_cpu(cpu) {
mf_cpu = &per_cpu(memory_failure_cpu, cpu);
- spin_lock_init(&mf_cpu->lock);
+ raw_spin_lock_init(&mf_cpu->lock);
INIT_KFIFO(mf_cpu->fifo);
INIT_WORK(&mf_cpu->work, memory_failure_work_func);
}
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] net: mana: Fix doorbell out of order violation and avoid" failed to apply to 5.15-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x 58a63729c957621f1990c3494c702711188ca347
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081950-tweed-tattle-7f2c@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
58a63729c957 ("net: mana: Fix doorbell out of order violation and avoid unnecessary doorbell rings")
18010ff776fa ("net: mana: Fix race on per-CQ variable napi work_done")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 58a63729c957621f1990c3494c702711188ca347 Mon Sep 17 00:00:00 2001
From: Long Li <longli(a)microsoft.com>
Date: Fri, 9 Aug 2024 08:58:58 -0700
Subject: [PATCH] net: mana: Fix doorbell out of order violation and avoid
unnecessary doorbell rings
After napi_complete_done() is called when NAPI is polling in the current
process context, another NAPI may be scheduled and start running in
softirq on another CPU and may ring the doorbell before the current CPU
does. When combined with unnecessary rings when there is no need to arm
the CQ, it triggers error paths in the hardware.
This patch fixes this by calling napi_complete_done() after doorbell
rings. It limits the number of unnecessary rings when there is
no need to arm. MANA hardware specifies that there must be one doorbell
ring every 8 CQ wraparounds. This driver guarantees one doorbell ring as
soon as the number of consumed CQEs exceeds 4 CQ wraparounds. In practical
workloads, the 4 CQ wraparounds proves to be big enough that it rarely
exceeds this limit before all the napi weight is consumed.
To implement this, add a per-CQ counter cq->work_done_since_doorbell,
and make sure the CQ is armed as soon as passing 4 wraparounds of the CQ.
Cc: stable(a)vger.kernel.org
Fixes: e1b5683ff62e ("net: mana: Move NAPI from EQ to CQ")
Reviewed-by: Haiyang Zhang <haiyangz(a)microsoft.com>
Signed-off-by: Long Li <longli(a)microsoft.com>
Link: https://patch.msgid.link/1723219138-29887-1-git-send-email-longli@linuxonhy…
Signed-off-by: Paolo Abeni <pabeni(a)redhat.com>
diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c
index ae717d06e66f..39f56973746d 100644
--- a/drivers/net/ethernet/microsoft/mana/mana_en.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
@@ -1792,7 +1792,6 @@ static void mana_poll_rx_cq(struct mana_cq *cq)
static int mana_cq_handler(void *context, struct gdma_queue *gdma_queue)
{
struct mana_cq *cq = context;
- u8 arm_bit;
int w;
WARN_ON_ONCE(cq->gdma_cq != gdma_queue);
@@ -1803,16 +1802,23 @@ static int mana_cq_handler(void *context, struct gdma_queue *gdma_queue)
mana_poll_tx_cq(cq);
w = cq->work_done;
+ cq->work_done_since_doorbell += w;
- if (w < cq->budget &&
- napi_complete_done(&cq->napi, w)) {
- arm_bit = SET_ARM_BIT;
- } else {
- arm_bit = 0;
+ if (w < cq->budget) {
+ mana_gd_ring_cq(gdma_queue, SET_ARM_BIT);
+ cq->work_done_since_doorbell = 0;
+ napi_complete_done(&cq->napi, w);
+ } else if (cq->work_done_since_doorbell >
+ cq->gdma_cq->queue_size / COMP_ENTRY_SIZE * 4) {
+ /* MANA hardware requires at least one doorbell ring every 8
+ * wraparounds of CQ even if there is no need to arm the CQ.
+ * This driver rings the doorbell as soon as we have exceeded
+ * 4 wraparounds.
+ */
+ mana_gd_ring_cq(gdma_queue, 0);
+ cq->work_done_since_doorbell = 0;
}
- mana_gd_ring_cq(gdma_queue, arm_bit);
-
return w;
}
diff --git a/include/net/mana/mana.h b/include/net/mana/mana.h
index 6439fd8b437b..7caa334f4888 100644
--- a/include/net/mana/mana.h
+++ b/include/net/mana/mana.h
@@ -275,6 +275,7 @@ struct mana_cq {
/* NAPI data */
struct napi_struct napi;
int work_done;
+ int work_done_since_doorbell;
int budget;
};
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] net: mana: Fix doorbell out of order violation and avoid" failed to apply to 6.1-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 58a63729c957621f1990c3494c702711188ca347
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081949-strategy-gatherer-758e@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
58a63729c957 ("net: mana: Fix doorbell out of order violation and avoid unnecessary doorbell rings")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 58a63729c957621f1990c3494c702711188ca347 Mon Sep 17 00:00:00 2001
From: Long Li <longli(a)microsoft.com>
Date: Fri, 9 Aug 2024 08:58:58 -0700
Subject: [PATCH] net: mana: Fix doorbell out of order violation and avoid
unnecessary doorbell rings
After napi_complete_done() is called when NAPI is polling in the current
process context, another NAPI may be scheduled and start running in
softirq on another CPU and may ring the doorbell before the current CPU
does. When combined with unnecessary rings when there is no need to arm
the CQ, it triggers error paths in the hardware.
This patch fixes this by calling napi_complete_done() after doorbell
rings. It limits the number of unnecessary rings when there is
no need to arm. MANA hardware specifies that there must be one doorbell
ring every 8 CQ wraparounds. This driver guarantees one doorbell ring as
soon as the number of consumed CQEs exceeds 4 CQ wraparounds. In practical
workloads, the 4 CQ wraparounds proves to be big enough that it rarely
exceeds this limit before all the napi weight is consumed.
To implement this, add a per-CQ counter cq->work_done_since_doorbell,
and make sure the CQ is armed as soon as passing 4 wraparounds of the CQ.
Cc: stable(a)vger.kernel.org
Fixes: e1b5683ff62e ("net: mana: Move NAPI from EQ to CQ")
Reviewed-by: Haiyang Zhang <haiyangz(a)microsoft.com>
Signed-off-by: Long Li <longli(a)microsoft.com>
Link: https://patch.msgid.link/1723219138-29887-1-git-send-email-longli@linuxonhy…
Signed-off-by: Paolo Abeni <pabeni(a)redhat.com>
diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c
index ae717d06e66f..39f56973746d 100644
--- a/drivers/net/ethernet/microsoft/mana/mana_en.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
@@ -1792,7 +1792,6 @@ static void mana_poll_rx_cq(struct mana_cq *cq)
static int mana_cq_handler(void *context, struct gdma_queue *gdma_queue)
{
struct mana_cq *cq = context;
- u8 arm_bit;
int w;
WARN_ON_ONCE(cq->gdma_cq != gdma_queue);
@@ -1803,16 +1802,23 @@ static int mana_cq_handler(void *context, struct gdma_queue *gdma_queue)
mana_poll_tx_cq(cq);
w = cq->work_done;
+ cq->work_done_since_doorbell += w;
- if (w < cq->budget &&
- napi_complete_done(&cq->napi, w)) {
- arm_bit = SET_ARM_BIT;
- } else {
- arm_bit = 0;
+ if (w < cq->budget) {
+ mana_gd_ring_cq(gdma_queue, SET_ARM_BIT);
+ cq->work_done_since_doorbell = 0;
+ napi_complete_done(&cq->napi, w);
+ } else if (cq->work_done_since_doorbell >
+ cq->gdma_cq->queue_size / COMP_ENTRY_SIZE * 4) {
+ /* MANA hardware requires at least one doorbell ring every 8
+ * wraparounds of CQ even if there is no need to arm the CQ.
+ * This driver rings the doorbell as soon as we have exceeded
+ * 4 wraparounds.
+ */
+ mana_gd_ring_cq(gdma_queue, 0);
+ cq->work_done_since_doorbell = 0;
}
- mana_gd_ring_cq(gdma_queue, arm_bit);
-
return w;
}
diff --git a/include/net/mana/mana.h b/include/net/mana/mana.h
index 6439fd8b437b..7caa334f4888 100644
--- a/include/net/mana/mana.h
+++ b/include/net/mana/mana.h
@@ -275,6 +275,7 @@ struct mana_cq {
/* NAPI data */
struct napi_struct napi;
int work_done;
+ int work_done_since_doorbell;
int budget;
};
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] wifi: ath12k: use 128 bytes aligned iova in transmit path for" failed to apply to 4.19-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.19.y
git checkout FETCH_HEAD
git cherry-pick -x 38055789d15155109b41602ad719d770af507030
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081927-arrogance-stowing-7314@gregkh' --subject-prefix 'PATCH 4.19.y' HEAD^..
Possible dependencies:
38055789d151 ("wifi: ath12k: use 128 bytes aligned iova in transmit path for WCN7850")
26dd8ccdba4d ("wifi: ath12k: dynamic VLAN support")
97b7cbb7a3cb ("wifi: ath12k: support SMPS configuration for 6 GHz")
f0e61dc7ecf9 ("wifi: ath12k: refactor SMPS configuration")
112dbc6af807 ("wifi: ath12k: add 6 GHz params in peer assoc command")
576771c9fa21 ("wifi: ath12k: ACPI TAS support")
8d5f4da8d70b ("wifi: ath12k: support suspend/resume")
2652f6b472ff ("wifi: ath12k: avoid stopping mac80211 queues in ath12k_core_restart()")
c7b2da3c0a57 ("wifi: ath12k: rearrange IRQ enable/disable in reset path")
303c017821d8 ("wifi: ath12k: fix kernel crash during resume")
f8bde02a26b9 ("wifi: ath12k: initial debugfs support")
54ca3308a23c ("wifi: ath12k: enable 802.11 power save mode in station mode")
2d3a7384b9c8 ("wifi: ath12k: disable QMI PHY capability learn in split-phy QCN9274")
af9bc78d14fb ("wifi: ath12k: Read board id to support split-PHY QCN9274")
f7019c2fcdf6 ("wifi: ath12k: split hal_ops to support RX TLVs word mask compaction")
12f491cd6d81 ("wifi: ath12k: add firmware-2.bin support")
53a65445c144 ("wifi: ath12k: add QMI PHY capability learn support")
76fece36f17a ("wifi: ath12k: refactor QMI MLO host capability helper function")
ce20a10fdff4 ("wifi: ath12k: refactor ath12k_bss_assoc()")
e7ab40b73309 ("wifi: ath12k: Make QMI message rules const")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 38055789d15155109b41602ad719d770af507030 Mon Sep 17 00:00:00 2001
From: Baochen Qiang <quic_bqiang(a)quicinc.com>
Date: Thu, 1 Aug 2024 18:04:07 +0300
Subject: [PATCH] wifi: ath12k: use 128 bytes aligned iova in transmit path for
WCN7850
In transmit path, it is likely that the iova is not aligned to PCIe TLP
max payload size, which is 128 for WCN7850. Normally in such cases hardware
is expected to split the packet into several parts in a manner such that
they, other than the first one, have aligned iova. However due to hardware
limitations, WCN7850 does not behave like that properly with some specific
unaligned iova in transmit path. This easily results in target hang in a
KPI transmit test: packet send/receive failure, WMI command send timeout
etc. Also fatal error seen in PCIe level:
...
Capabilities: ...
...
DevSta: ... FatalErr+ ...
...
...
Work around this by manually moving/reallocating payload buffer such that
we can map it to a 128 bytes aligned iova. The moving requires sufficient
head room or tail room in skb: for the former we can do ourselves a favor
by asking some extra bytes when registering with mac80211, while for the
latter we can do nothing.
Moving/reallocating buffer consumes additional CPU cycles, but the good news
is that an aligned iova increases PCIe efficiency. In my tests on some X86
platforms the KPI results are almost consistent.
Since this is seen only with WCN7850, add a new hardware parameter to
differentiate from others.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
Signed-off-by: Baochen Qiang <quic_bqiang(a)quicinc.com>
Cc: <stable(a)vger.kernel.org>
Tested-by: Mark Pearson <mpearson-lenovo(a)squebb.ca>
Signed-off-by: Kalle Valo <quic_kvalo(a)quicinc.com>
Link: https://patch.msgid.link/20240715023814.20242-1-quic_bqiang@quicinc.com
diff --git a/drivers/net/wireless/ath/ath12k/dp_tx.c b/drivers/net/wireless/ath/ath12k/dp_tx.c
index d08c04343e90..44406e0b4a34 100644
--- a/drivers/net/wireless/ath/ath12k/dp_tx.c
+++ b/drivers/net/wireless/ath/ath12k/dp_tx.c
@@ -162,6 +162,60 @@ static int ath12k_dp_prepare_htt_metadata(struct sk_buff *skb)
return 0;
}
+static void ath12k_dp_tx_move_payload(struct sk_buff *skb,
+ unsigned long delta,
+ bool head)
+{
+ unsigned long len = skb->len;
+
+ if (head) {
+ skb_push(skb, delta);
+ memmove(skb->data, skb->data + delta, len);
+ skb_trim(skb, len);
+ } else {
+ skb_put(skb, delta);
+ memmove(skb->data + delta, skb->data, len);
+ skb_pull(skb, delta);
+ }
+}
+
+static int ath12k_dp_tx_align_payload(struct ath12k_base *ab,
+ struct sk_buff **pskb)
+{
+ u32 iova_mask = ab->hw_params->iova_mask;
+ unsigned long offset, delta1, delta2;
+ struct sk_buff *skb2, *skb = *pskb;
+ unsigned int headroom = skb_headroom(skb);
+ int tailroom = skb_tailroom(skb);
+ int ret = 0;
+
+ offset = (unsigned long)skb->data & iova_mask;
+ delta1 = offset;
+ delta2 = iova_mask - offset + 1;
+
+ if (headroom >= delta1) {
+ ath12k_dp_tx_move_payload(skb, delta1, true);
+ } else if (tailroom >= delta2) {
+ ath12k_dp_tx_move_payload(skb, delta2, false);
+ } else {
+ skb2 = skb_realloc_headroom(skb, iova_mask);
+ if (!skb2) {
+ ret = -ENOMEM;
+ goto out;
+ }
+
+ dev_kfree_skb_any(skb);
+
+ offset = (unsigned long)skb2->data & iova_mask;
+ if (offset)
+ ath12k_dp_tx_move_payload(skb2, offset, true);
+ *pskb = skb2;
+ }
+
+out:
+ return ret;
+}
+
int ath12k_dp_tx(struct ath12k *ar, struct ath12k_vif *arvif,
struct sk_buff *skb)
{
@@ -184,6 +238,7 @@ int ath12k_dp_tx(struct ath12k *ar, struct ath12k_vif *arvif,
bool tcl_ring_retry;
bool msdu_ext_desc = false;
bool add_htt_metadata = false;
+ u32 iova_mask = ab->hw_params->iova_mask;
if (test_bit(ATH12K_FLAG_CRASH_FLUSH, &ar->ab->dev_flags))
return -ESHUTDOWN;
@@ -279,6 +334,23 @@ int ath12k_dp_tx(struct ath12k *ar, struct ath12k_vif *arvif,
goto fail_remove_tx_buf;
}
+ if (iova_mask &&
+ (unsigned long)skb->data & iova_mask) {
+ ret = ath12k_dp_tx_align_payload(ab, &skb);
+ if (ret) {
+ ath12k_warn(ab, "failed to align TX buffer %d\n", ret);
+ /* don't bail out, give original buffer
+ * a chance even unaligned.
+ */
+ goto map;
+ }
+
+ /* hdr is pointing to a wrong place after alignment,
+ * so refresh it for later use.
+ */
+ hdr = (void *)skb->data;
+ }
+map:
ti.paddr = dma_map_single(ab->dev, skb->data, skb->len, DMA_TO_DEVICE);
if (dma_mapping_error(ab->dev, ti.paddr)) {
atomic_inc(&ab->soc_stats.tx_err.misc_fail);
diff --git a/drivers/net/wireless/ath/ath12k/hw.c b/drivers/net/wireless/ath/ath12k/hw.c
index 2e11ea763574..7b0b6a7f4701 100644
--- a/drivers/net/wireless/ath/ath12k/hw.c
+++ b/drivers/net/wireless/ath/ath12k/hw.c
@@ -924,6 +924,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.acpi_guid = NULL,
.supports_dynamic_smps_6ghz = true,
+
+ .iova_mask = 0,
},
{
.name = "wcn7850 hw2.0",
@@ -1000,6 +1002,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.acpi_guid = &wcn7850_uuid,
.supports_dynamic_smps_6ghz = false,
+
+ .iova_mask = ATH12K_PCIE_MAX_PAYLOAD_SIZE - 1,
},
{
.name = "qcn9274 hw2.0",
@@ -1072,6 +1076,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.acpi_guid = NULL,
.supports_dynamic_smps_6ghz = true,
+
+ .iova_mask = 0,
},
};
diff --git a/drivers/net/wireless/ath/ath12k/hw.h b/drivers/net/wireless/ath/ath12k/hw.h
index e792eb6b249b..b1d302c48326 100644
--- a/drivers/net/wireless/ath/ath12k/hw.h
+++ b/drivers/net/wireless/ath/ath12k/hw.h
@@ -96,6 +96,8 @@
#define ATH12K_M3_FILE "m3.bin"
#define ATH12K_REGDB_FILE_NAME "regdb.bin"
+#define ATH12K_PCIE_MAX_PAYLOAD_SIZE 128
+
enum ath12k_hw_rate_cck {
ATH12K_HW_RATE_CCK_LP_11M = 0,
ATH12K_HW_RATE_CCK_LP_5_5M,
@@ -215,6 +217,8 @@ struct ath12k_hw_params {
const guid_t *acpi_guid;
bool supports_dynamic_smps_6ghz;
+
+ u32 iova_mask;
};
struct ath12k_hw_ops {
diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index 8106297f0bc1..ce41c8153080 100644
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -9193,6 +9193,7 @@ static int ath12k_mac_hw_register(struct ath12k_hw *ah)
hw->vif_data_size = sizeof(struct ath12k_vif);
hw->sta_data_size = sizeof(struct ath12k_sta);
+ hw->extra_tx_headroom = ab->hw_params->iova_mask;
wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);
wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_STA_TX_PWR);
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] wifi: ath12k: use 128 bytes aligned iova in transmit path for" failed to apply to 5.4-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y
git checkout FETCH_HEAD
git cherry-pick -x 38055789d15155109b41602ad719d770af507030
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081926-armchair-dude-0c3d@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^..
Possible dependencies:
38055789d151 ("wifi: ath12k: use 128 bytes aligned iova in transmit path for WCN7850")
26dd8ccdba4d ("wifi: ath12k: dynamic VLAN support")
97b7cbb7a3cb ("wifi: ath12k: support SMPS configuration for 6 GHz")
f0e61dc7ecf9 ("wifi: ath12k: refactor SMPS configuration")
112dbc6af807 ("wifi: ath12k: add 6 GHz params in peer assoc command")
576771c9fa21 ("wifi: ath12k: ACPI TAS support")
8d5f4da8d70b ("wifi: ath12k: support suspend/resume")
2652f6b472ff ("wifi: ath12k: avoid stopping mac80211 queues in ath12k_core_restart()")
c7b2da3c0a57 ("wifi: ath12k: rearrange IRQ enable/disable in reset path")
303c017821d8 ("wifi: ath12k: fix kernel crash during resume")
f8bde02a26b9 ("wifi: ath12k: initial debugfs support")
54ca3308a23c ("wifi: ath12k: enable 802.11 power save mode in station mode")
2d3a7384b9c8 ("wifi: ath12k: disable QMI PHY capability learn in split-phy QCN9274")
af9bc78d14fb ("wifi: ath12k: Read board id to support split-PHY QCN9274")
f7019c2fcdf6 ("wifi: ath12k: split hal_ops to support RX TLVs word mask compaction")
12f491cd6d81 ("wifi: ath12k: add firmware-2.bin support")
53a65445c144 ("wifi: ath12k: add QMI PHY capability learn support")
76fece36f17a ("wifi: ath12k: refactor QMI MLO host capability helper function")
ce20a10fdff4 ("wifi: ath12k: refactor ath12k_bss_assoc()")
e7ab40b73309 ("wifi: ath12k: Make QMI message rules const")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 38055789d15155109b41602ad719d770af507030 Mon Sep 17 00:00:00 2001
From: Baochen Qiang <quic_bqiang(a)quicinc.com>
Date: Thu, 1 Aug 2024 18:04:07 +0300
Subject: [PATCH] wifi: ath12k: use 128 bytes aligned iova in transmit path for
WCN7850
In transmit path, it is likely that the iova is not aligned to PCIe TLP
max payload size, which is 128 for WCN7850. Normally in such cases hardware
is expected to split the packet into several parts in a manner such that
they, other than the first one, have aligned iova. However due to hardware
limitations, WCN7850 does not behave like that properly with some specific
unaligned iova in transmit path. This easily results in target hang in a
KPI transmit test: packet send/receive failure, WMI command send timeout
etc. Also fatal error seen in PCIe level:
...
Capabilities: ...
...
DevSta: ... FatalErr+ ...
...
...
Work around this by manually moving/reallocating payload buffer such that
we can map it to a 128 bytes aligned iova. The moving requires sufficient
head room or tail room in skb: for the former we can do ourselves a favor
by asking some extra bytes when registering with mac80211, while for the
latter we can do nothing.
Moving/reallocating buffer consumes additional CPU cycles, but the good news
is that an aligned iova increases PCIe efficiency. In my tests on some X86
platforms the KPI results are almost consistent.
Since this is seen only with WCN7850, add a new hardware parameter to
differentiate from others.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
Signed-off-by: Baochen Qiang <quic_bqiang(a)quicinc.com>
Cc: <stable(a)vger.kernel.org>
Tested-by: Mark Pearson <mpearson-lenovo(a)squebb.ca>
Signed-off-by: Kalle Valo <quic_kvalo(a)quicinc.com>
Link: https://patch.msgid.link/20240715023814.20242-1-quic_bqiang@quicinc.com
diff --git a/drivers/net/wireless/ath/ath12k/dp_tx.c b/drivers/net/wireless/ath/ath12k/dp_tx.c
index d08c04343e90..44406e0b4a34 100644
--- a/drivers/net/wireless/ath/ath12k/dp_tx.c
+++ b/drivers/net/wireless/ath/ath12k/dp_tx.c
@@ -162,6 +162,60 @@ static int ath12k_dp_prepare_htt_metadata(struct sk_buff *skb)
return 0;
}
+static void ath12k_dp_tx_move_payload(struct sk_buff *skb,
+ unsigned long delta,
+ bool head)
+{
+ unsigned long len = skb->len;
+
+ if (head) {
+ skb_push(skb, delta);
+ memmove(skb->data, skb->data + delta, len);
+ skb_trim(skb, len);
+ } else {
+ skb_put(skb, delta);
+ memmove(skb->data + delta, skb->data, len);
+ skb_pull(skb, delta);
+ }
+}
+
+static int ath12k_dp_tx_align_payload(struct ath12k_base *ab,
+ struct sk_buff **pskb)
+{
+ u32 iova_mask = ab->hw_params->iova_mask;
+ unsigned long offset, delta1, delta2;
+ struct sk_buff *skb2, *skb = *pskb;
+ unsigned int headroom = skb_headroom(skb);
+ int tailroom = skb_tailroom(skb);
+ int ret = 0;
+
+ offset = (unsigned long)skb->data & iova_mask;
+ delta1 = offset;
+ delta2 = iova_mask - offset + 1;
+
+ if (headroom >= delta1) {
+ ath12k_dp_tx_move_payload(skb, delta1, true);
+ } else if (tailroom >= delta2) {
+ ath12k_dp_tx_move_payload(skb, delta2, false);
+ } else {
+ skb2 = skb_realloc_headroom(skb, iova_mask);
+ if (!skb2) {
+ ret = -ENOMEM;
+ goto out;
+ }
+
+ dev_kfree_skb_any(skb);
+
+ offset = (unsigned long)skb2->data & iova_mask;
+ if (offset)
+ ath12k_dp_tx_move_payload(skb2, offset, true);
+ *pskb = skb2;
+ }
+
+out:
+ return ret;
+}
+
int ath12k_dp_tx(struct ath12k *ar, struct ath12k_vif *arvif,
struct sk_buff *skb)
{
@@ -184,6 +238,7 @@ int ath12k_dp_tx(struct ath12k *ar, struct ath12k_vif *arvif,
bool tcl_ring_retry;
bool msdu_ext_desc = false;
bool add_htt_metadata = false;
+ u32 iova_mask = ab->hw_params->iova_mask;
if (test_bit(ATH12K_FLAG_CRASH_FLUSH, &ar->ab->dev_flags))
return -ESHUTDOWN;
@@ -279,6 +334,23 @@ int ath12k_dp_tx(struct ath12k *ar, struct ath12k_vif *arvif,
goto fail_remove_tx_buf;
}
+ if (iova_mask &&
+ (unsigned long)skb->data & iova_mask) {
+ ret = ath12k_dp_tx_align_payload(ab, &skb);
+ if (ret) {
+ ath12k_warn(ab, "failed to align TX buffer %d\n", ret);
+ /* don't bail out, give original buffer
+ * a chance even unaligned.
+ */
+ goto map;
+ }
+
+ /* hdr is pointing to a wrong place after alignment,
+ * so refresh it for later use.
+ */
+ hdr = (void *)skb->data;
+ }
+map:
ti.paddr = dma_map_single(ab->dev, skb->data, skb->len, DMA_TO_DEVICE);
if (dma_mapping_error(ab->dev, ti.paddr)) {
atomic_inc(&ab->soc_stats.tx_err.misc_fail);
diff --git a/drivers/net/wireless/ath/ath12k/hw.c b/drivers/net/wireless/ath/ath12k/hw.c
index 2e11ea763574..7b0b6a7f4701 100644
--- a/drivers/net/wireless/ath/ath12k/hw.c
+++ b/drivers/net/wireless/ath/ath12k/hw.c
@@ -924,6 +924,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.acpi_guid = NULL,
.supports_dynamic_smps_6ghz = true,
+
+ .iova_mask = 0,
},
{
.name = "wcn7850 hw2.0",
@@ -1000,6 +1002,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.acpi_guid = &wcn7850_uuid,
.supports_dynamic_smps_6ghz = false,
+
+ .iova_mask = ATH12K_PCIE_MAX_PAYLOAD_SIZE - 1,
},
{
.name = "qcn9274 hw2.0",
@@ -1072,6 +1076,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.acpi_guid = NULL,
.supports_dynamic_smps_6ghz = true,
+
+ .iova_mask = 0,
},
};
diff --git a/drivers/net/wireless/ath/ath12k/hw.h b/drivers/net/wireless/ath/ath12k/hw.h
index e792eb6b249b..b1d302c48326 100644
--- a/drivers/net/wireless/ath/ath12k/hw.h
+++ b/drivers/net/wireless/ath/ath12k/hw.h
@@ -96,6 +96,8 @@
#define ATH12K_M3_FILE "m3.bin"
#define ATH12K_REGDB_FILE_NAME "regdb.bin"
+#define ATH12K_PCIE_MAX_PAYLOAD_SIZE 128
+
enum ath12k_hw_rate_cck {
ATH12K_HW_RATE_CCK_LP_11M = 0,
ATH12K_HW_RATE_CCK_LP_5_5M,
@@ -215,6 +217,8 @@ struct ath12k_hw_params {
const guid_t *acpi_guid;
bool supports_dynamic_smps_6ghz;
+
+ u32 iova_mask;
};
struct ath12k_hw_ops {
diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index 8106297f0bc1..ce41c8153080 100644
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -9193,6 +9193,7 @@ static int ath12k_mac_hw_register(struct ath12k_hw *ah)
hw->vif_data_size = sizeof(struct ath12k_vif);
hw->sta_data_size = sizeof(struct ath12k_sta);
+ hw->extra_tx_headroom = ab->hw_params->iova_mask;
wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);
wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_STA_TX_PWR);
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] wifi: ath12k: use 128 bytes aligned iova in transmit path for" failed to apply to 5.10-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 38055789d15155109b41602ad719d770af507030
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081925-stress-wireless-63d4@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
38055789d151 ("wifi: ath12k: use 128 bytes aligned iova in transmit path for WCN7850")
26dd8ccdba4d ("wifi: ath12k: dynamic VLAN support")
97b7cbb7a3cb ("wifi: ath12k: support SMPS configuration for 6 GHz")
f0e61dc7ecf9 ("wifi: ath12k: refactor SMPS configuration")
112dbc6af807 ("wifi: ath12k: add 6 GHz params in peer assoc command")
576771c9fa21 ("wifi: ath12k: ACPI TAS support")
8d5f4da8d70b ("wifi: ath12k: support suspend/resume")
2652f6b472ff ("wifi: ath12k: avoid stopping mac80211 queues in ath12k_core_restart()")
c7b2da3c0a57 ("wifi: ath12k: rearrange IRQ enable/disable in reset path")
303c017821d8 ("wifi: ath12k: fix kernel crash during resume")
f8bde02a26b9 ("wifi: ath12k: initial debugfs support")
54ca3308a23c ("wifi: ath12k: enable 802.11 power save mode in station mode")
2d3a7384b9c8 ("wifi: ath12k: disable QMI PHY capability learn in split-phy QCN9274")
af9bc78d14fb ("wifi: ath12k: Read board id to support split-PHY QCN9274")
f7019c2fcdf6 ("wifi: ath12k: split hal_ops to support RX TLVs word mask compaction")
12f491cd6d81 ("wifi: ath12k: add firmware-2.bin support")
53a65445c144 ("wifi: ath12k: add QMI PHY capability learn support")
76fece36f17a ("wifi: ath12k: refactor QMI MLO host capability helper function")
ce20a10fdff4 ("wifi: ath12k: refactor ath12k_bss_assoc()")
e7ab40b73309 ("wifi: ath12k: Make QMI message rules const")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 38055789d15155109b41602ad719d770af507030 Mon Sep 17 00:00:00 2001
From: Baochen Qiang <quic_bqiang(a)quicinc.com>
Date: Thu, 1 Aug 2024 18:04:07 +0300
Subject: [PATCH] wifi: ath12k: use 128 bytes aligned iova in transmit path for
WCN7850
In transmit path, it is likely that the iova is not aligned to PCIe TLP
max payload size, which is 128 for WCN7850. Normally in such cases hardware
is expected to split the packet into several parts in a manner such that
they, other than the first one, have aligned iova. However due to hardware
limitations, WCN7850 does not behave like that properly with some specific
unaligned iova in transmit path. This easily results in target hang in a
KPI transmit test: packet send/receive failure, WMI command send timeout
etc. Also fatal error seen in PCIe level:
...
Capabilities: ...
...
DevSta: ... FatalErr+ ...
...
...
Work around this by manually moving/reallocating payload buffer such that
we can map it to a 128 bytes aligned iova. The moving requires sufficient
head room or tail room in skb: for the former we can do ourselves a favor
by asking some extra bytes when registering with mac80211, while for the
latter we can do nothing.
Moving/reallocating buffer consumes additional CPU cycles, but the good news
is that an aligned iova increases PCIe efficiency. In my tests on some X86
platforms the KPI results are almost consistent.
Since this is seen only with WCN7850, add a new hardware parameter to
differentiate from others.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
Signed-off-by: Baochen Qiang <quic_bqiang(a)quicinc.com>
Cc: <stable(a)vger.kernel.org>
Tested-by: Mark Pearson <mpearson-lenovo(a)squebb.ca>
Signed-off-by: Kalle Valo <quic_kvalo(a)quicinc.com>
Link: https://patch.msgid.link/20240715023814.20242-1-quic_bqiang@quicinc.com
diff --git a/drivers/net/wireless/ath/ath12k/dp_tx.c b/drivers/net/wireless/ath/ath12k/dp_tx.c
index d08c04343e90..44406e0b4a34 100644
--- a/drivers/net/wireless/ath/ath12k/dp_tx.c
+++ b/drivers/net/wireless/ath/ath12k/dp_tx.c
@@ -162,6 +162,60 @@ static int ath12k_dp_prepare_htt_metadata(struct sk_buff *skb)
return 0;
}
+static void ath12k_dp_tx_move_payload(struct sk_buff *skb,
+ unsigned long delta,
+ bool head)
+{
+ unsigned long len = skb->len;
+
+ if (head) {
+ skb_push(skb, delta);
+ memmove(skb->data, skb->data + delta, len);
+ skb_trim(skb, len);
+ } else {
+ skb_put(skb, delta);
+ memmove(skb->data + delta, skb->data, len);
+ skb_pull(skb, delta);
+ }
+}
+
+static int ath12k_dp_tx_align_payload(struct ath12k_base *ab,
+ struct sk_buff **pskb)
+{
+ u32 iova_mask = ab->hw_params->iova_mask;
+ unsigned long offset, delta1, delta2;
+ struct sk_buff *skb2, *skb = *pskb;
+ unsigned int headroom = skb_headroom(skb);
+ int tailroom = skb_tailroom(skb);
+ int ret = 0;
+
+ offset = (unsigned long)skb->data & iova_mask;
+ delta1 = offset;
+ delta2 = iova_mask - offset + 1;
+
+ if (headroom >= delta1) {
+ ath12k_dp_tx_move_payload(skb, delta1, true);
+ } else if (tailroom >= delta2) {
+ ath12k_dp_tx_move_payload(skb, delta2, false);
+ } else {
+ skb2 = skb_realloc_headroom(skb, iova_mask);
+ if (!skb2) {
+ ret = -ENOMEM;
+ goto out;
+ }
+
+ dev_kfree_skb_any(skb);
+
+ offset = (unsigned long)skb2->data & iova_mask;
+ if (offset)
+ ath12k_dp_tx_move_payload(skb2, offset, true);
+ *pskb = skb2;
+ }
+
+out:
+ return ret;
+}
+
int ath12k_dp_tx(struct ath12k *ar, struct ath12k_vif *arvif,
struct sk_buff *skb)
{
@@ -184,6 +238,7 @@ int ath12k_dp_tx(struct ath12k *ar, struct ath12k_vif *arvif,
bool tcl_ring_retry;
bool msdu_ext_desc = false;
bool add_htt_metadata = false;
+ u32 iova_mask = ab->hw_params->iova_mask;
if (test_bit(ATH12K_FLAG_CRASH_FLUSH, &ar->ab->dev_flags))
return -ESHUTDOWN;
@@ -279,6 +334,23 @@ int ath12k_dp_tx(struct ath12k *ar, struct ath12k_vif *arvif,
goto fail_remove_tx_buf;
}
+ if (iova_mask &&
+ (unsigned long)skb->data & iova_mask) {
+ ret = ath12k_dp_tx_align_payload(ab, &skb);
+ if (ret) {
+ ath12k_warn(ab, "failed to align TX buffer %d\n", ret);
+ /* don't bail out, give original buffer
+ * a chance even unaligned.
+ */
+ goto map;
+ }
+
+ /* hdr is pointing to a wrong place after alignment,
+ * so refresh it for later use.
+ */
+ hdr = (void *)skb->data;
+ }
+map:
ti.paddr = dma_map_single(ab->dev, skb->data, skb->len, DMA_TO_DEVICE);
if (dma_mapping_error(ab->dev, ti.paddr)) {
atomic_inc(&ab->soc_stats.tx_err.misc_fail);
diff --git a/drivers/net/wireless/ath/ath12k/hw.c b/drivers/net/wireless/ath/ath12k/hw.c
index 2e11ea763574..7b0b6a7f4701 100644
--- a/drivers/net/wireless/ath/ath12k/hw.c
+++ b/drivers/net/wireless/ath/ath12k/hw.c
@@ -924,6 +924,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.acpi_guid = NULL,
.supports_dynamic_smps_6ghz = true,
+
+ .iova_mask = 0,
},
{
.name = "wcn7850 hw2.0",
@@ -1000,6 +1002,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.acpi_guid = &wcn7850_uuid,
.supports_dynamic_smps_6ghz = false,
+
+ .iova_mask = ATH12K_PCIE_MAX_PAYLOAD_SIZE - 1,
},
{
.name = "qcn9274 hw2.0",
@@ -1072,6 +1076,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.acpi_guid = NULL,
.supports_dynamic_smps_6ghz = true,
+
+ .iova_mask = 0,
},
};
diff --git a/drivers/net/wireless/ath/ath12k/hw.h b/drivers/net/wireless/ath/ath12k/hw.h
index e792eb6b249b..b1d302c48326 100644
--- a/drivers/net/wireless/ath/ath12k/hw.h
+++ b/drivers/net/wireless/ath/ath12k/hw.h
@@ -96,6 +96,8 @@
#define ATH12K_M3_FILE "m3.bin"
#define ATH12K_REGDB_FILE_NAME "regdb.bin"
+#define ATH12K_PCIE_MAX_PAYLOAD_SIZE 128
+
enum ath12k_hw_rate_cck {
ATH12K_HW_RATE_CCK_LP_11M = 0,
ATH12K_HW_RATE_CCK_LP_5_5M,
@@ -215,6 +217,8 @@ struct ath12k_hw_params {
const guid_t *acpi_guid;
bool supports_dynamic_smps_6ghz;
+
+ u32 iova_mask;
};
struct ath12k_hw_ops {
diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index 8106297f0bc1..ce41c8153080 100644
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -9193,6 +9193,7 @@ static int ath12k_mac_hw_register(struct ath12k_hw *ah)
hw->vif_data_size = sizeof(struct ath12k_vif);
hw->sta_data_size = sizeof(struct ath12k_sta);
+ hw->extra_tx_headroom = ab->hw_params->iova_mask;
wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);
wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_STA_TX_PWR);
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] wifi: ath12k: use 128 bytes aligned iova in transmit path for" failed to apply to 5.15-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x 38055789d15155109b41602ad719d770af507030
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081924-unopposed-anemia-269e@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
38055789d151 ("wifi: ath12k: use 128 bytes aligned iova in transmit path for WCN7850")
26dd8ccdba4d ("wifi: ath12k: dynamic VLAN support")
97b7cbb7a3cb ("wifi: ath12k: support SMPS configuration for 6 GHz")
f0e61dc7ecf9 ("wifi: ath12k: refactor SMPS configuration")
112dbc6af807 ("wifi: ath12k: add 6 GHz params in peer assoc command")
576771c9fa21 ("wifi: ath12k: ACPI TAS support")
8d5f4da8d70b ("wifi: ath12k: support suspend/resume")
2652f6b472ff ("wifi: ath12k: avoid stopping mac80211 queues in ath12k_core_restart()")
c7b2da3c0a57 ("wifi: ath12k: rearrange IRQ enable/disable in reset path")
303c017821d8 ("wifi: ath12k: fix kernel crash during resume")
f8bde02a26b9 ("wifi: ath12k: initial debugfs support")
54ca3308a23c ("wifi: ath12k: enable 802.11 power save mode in station mode")
2d3a7384b9c8 ("wifi: ath12k: disable QMI PHY capability learn in split-phy QCN9274")
af9bc78d14fb ("wifi: ath12k: Read board id to support split-PHY QCN9274")
f7019c2fcdf6 ("wifi: ath12k: split hal_ops to support RX TLVs word mask compaction")
12f491cd6d81 ("wifi: ath12k: add firmware-2.bin support")
53a65445c144 ("wifi: ath12k: add QMI PHY capability learn support")
76fece36f17a ("wifi: ath12k: refactor QMI MLO host capability helper function")
ce20a10fdff4 ("wifi: ath12k: refactor ath12k_bss_assoc()")
e7ab40b73309 ("wifi: ath12k: Make QMI message rules const")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 38055789d15155109b41602ad719d770af507030 Mon Sep 17 00:00:00 2001
From: Baochen Qiang <quic_bqiang(a)quicinc.com>
Date: Thu, 1 Aug 2024 18:04:07 +0300
Subject: [PATCH] wifi: ath12k: use 128 bytes aligned iova in transmit path for
WCN7850
In transmit path, it is likely that the iova is not aligned to PCIe TLP
max payload size, which is 128 for WCN7850. Normally in such cases hardware
is expected to split the packet into several parts in a manner such that
they, other than the first one, have aligned iova. However due to hardware
limitations, WCN7850 does not behave like that properly with some specific
unaligned iova in transmit path. This easily results in target hang in a
KPI transmit test: packet send/receive failure, WMI command send timeout
etc. Also fatal error seen in PCIe level:
...
Capabilities: ...
...
DevSta: ... FatalErr+ ...
...
...
Work around this by manually moving/reallocating payload buffer such that
we can map it to a 128 bytes aligned iova. The moving requires sufficient
head room or tail room in skb: for the former we can do ourselves a favor
by asking some extra bytes when registering with mac80211, while for the
latter we can do nothing.
Moving/reallocating buffer consumes additional CPU cycles, but the good news
is that an aligned iova increases PCIe efficiency. In my tests on some X86
platforms the KPI results are almost consistent.
Since this is seen only with WCN7850, add a new hardware parameter to
differentiate from others.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
Signed-off-by: Baochen Qiang <quic_bqiang(a)quicinc.com>
Cc: <stable(a)vger.kernel.org>
Tested-by: Mark Pearson <mpearson-lenovo(a)squebb.ca>
Signed-off-by: Kalle Valo <quic_kvalo(a)quicinc.com>
Link: https://patch.msgid.link/20240715023814.20242-1-quic_bqiang@quicinc.com
diff --git a/drivers/net/wireless/ath/ath12k/dp_tx.c b/drivers/net/wireless/ath/ath12k/dp_tx.c
index d08c04343e90..44406e0b4a34 100644
--- a/drivers/net/wireless/ath/ath12k/dp_tx.c
+++ b/drivers/net/wireless/ath/ath12k/dp_tx.c
@@ -162,6 +162,60 @@ static int ath12k_dp_prepare_htt_metadata(struct sk_buff *skb)
return 0;
}
+static void ath12k_dp_tx_move_payload(struct sk_buff *skb,
+ unsigned long delta,
+ bool head)
+{
+ unsigned long len = skb->len;
+
+ if (head) {
+ skb_push(skb, delta);
+ memmove(skb->data, skb->data + delta, len);
+ skb_trim(skb, len);
+ } else {
+ skb_put(skb, delta);
+ memmove(skb->data + delta, skb->data, len);
+ skb_pull(skb, delta);
+ }
+}
+
+static int ath12k_dp_tx_align_payload(struct ath12k_base *ab,
+ struct sk_buff **pskb)
+{
+ u32 iova_mask = ab->hw_params->iova_mask;
+ unsigned long offset, delta1, delta2;
+ struct sk_buff *skb2, *skb = *pskb;
+ unsigned int headroom = skb_headroom(skb);
+ int tailroom = skb_tailroom(skb);
+ int ret = 0;
+
+ offset = (unsigned long)skb->data & iova_mask;
+ delta1 = offset;
+ delta2 = iova_mask - offset + 1;
+
+ if (headroom >= delta1) {
+ ath12k_dp_tx_move_payload(skb, delta1, true);
+ } else if (tailroom >= delta2) {
+ ath12k_dp_tx_move_payload(skb, delta2, false);
+ } else {
+ skb2 = skb_realloc_headroom(skb, iova_mask);
+ if (!skb2) {
+ ret = -ENOMEM;
+ goto out;
+ }
+
+ dev_kfree_skb_any(skb);
+
+ offset = (unsigned long)skb2->data & iova_mask;
+ if (offset)
+ ath12k_dp_tx_move_payload(skb2, offset, true);
+ *pskb = skb2;
+ }
+
+out:
+ return ret;
+}
+
int ath12k_dp_tx(struct ath12k *ar, struct ath12k_vif *arvif,
struct sk_buff *skb)
{
@@ -184,6 +238,7 @@ int ath12k_dp_tx(struct ath12k *ar, struct ath12k_vif *arvif,
bool tcl_ring_retry;
bool msdu_ext_desc = false;
bool add_htt_metadata = false;
+ u32 iova_mask = ab->hw_params->iova_mask;
if (test_bit(ATH12K_FLAG_CRASH_FLUSH, &ar->ab->dev_flags))
return -ESHUTDOWN;
@@ -279,6 +334,23 @@ int ath12k_dp_tx(struct ath12k *ar, struct ath12k_vif *arvif,
goto fail_remove_tx_buf;
}
+ if (iova_mask &&
+ (unsigned long)skb->data & iova_mask) {
+ ret = ath12k_dp_tx_align_payload(ab, &skb);
+ if (ret) {
+ ath12k_warn(ab, "failed to align TX buffer %d\n", ret);
+ /* don't bail out, give original buffer
+ * a chance even unaligned.
+ */
+ goto map;
+ }
+
+ /* hdr is pointing to a wrong place after alignment,
+ * so refresh it for later use.
+ */
+ hdr = (void *)skb->data;
+ }
+map:
ti.paddr = dma_map_single(ab->dev, skb->data, skb->len, DMA_TO_DEVICE);
if (dma_mapping_error(ab->dev, ti.paddr)) {
atomic_inc(&ab->soc_stats.tx_err.misc_fail);
diff --git a/drivers/net/wireless/ath/ath12k/hw.c b/drivers/net/wireless/ath/ath12k/hw.c
index 2e11ea763574..7b0b6a7f4701 100644
--- a/drivers/net/wireless/ath/ath12k/hw.c
+++ b/drivers/net/wireless/ath/ath12k/hw.c
@@ -924,6 +924,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.acpi_guid = NULL,
.supports_dynamic_smps_6ghz = true,
+
+ .iova_mask = 0,
},
{
.name = "wcn7850 hw2.0",
@@ -1000,6 +1002,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.acpi_guid = &wcn7850_uuid,
.supports_dynamic_smps_6ghz = false,
+
+ .iova_mask = ATH12K_PCIE_MAX_PAYLOAD_SIZE - 1,
},
{
.name = "qcn9274 hw2.0",
@@ -1072,6 +1076,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.acpi_guid = NULL,
.supports_dynamic_smps_6ghz = true,
+
+ .iova_mask = 0,
},
};
diff --git a/drivers/net/wireless/ath/ath12k/hw.h b/drivers/net/wireless/ath/ath12k/hw.h
index e792eb6b249b..b1d302c48326 100644
--- a/drivers/net/wireless/ath/ath12k/hw.h
+++ b/drivers/net/wireless/ath/ath12k/hw.h
@@ -96,6 +96,8 @@
#define ATH12K_M3_FILE "m3.bin"
#define ATH12K_REGDB_FILE_NAME "regdb.bin"
+#define ATH12K_PCIE_MAX_PAYLOAD_SIZE 128
+
enum ath12k_hw_rate_cck {
ATH12K_HW_RATE_CCK_LP_11M = 0,
ATH12K_HW_RATE_CCK_LP_5_5M,
@@ -215,6 +217,8 @@ struct ath12k_hw_params {
const guid_t *acpi_guid;
bool supports_dynamic_smps_6ghz;
+
+ u32 iova_mask;
};
struct ath12k_hw_ops {
diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index 8106297f0bc1..ce41c8153080 100644
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -9193,6 +9193,7 @@ static int ath12k_mac_hw_register(struct ath12k_hw *ah)
hw->vif_data_size = sizeof(struct ath12k_vif);
hw->sta_data_size = sizeof(struct ath12k_sta);
+ hw->extra_tx_headroom = ab->hw_params->iova_mask;
wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);
wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_STA_TX_PWR);
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] wifi: ath12k: use 128 bytes aligned iova in transmit path for" failed to apply to 6.1-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 38055789d15155109b41602ad719d770af507030
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081923-landmine-blabber-da89@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
38055789d151 ("wifi: ath12k: use 128 bytes aligned iova in transmit path for WCN7850")
26dd8ccdba4d ("wifi: ath12k: dynamic VLAN support")
97b7cbb7a3cb ("wifi: ath12k: support SMPS configuration for 6 GHz")
f0e61dc7ecf9 ("wifi: ath12k: refactor SMPS configuration")
112dbc6af807 ("wifi: ath12k: add 6 GHz params in peer assoc command")
576771c9fa21 ("wifi: ath12k: ACPI TAS support")
8d5f4da8d70b ("wifi: ath12k: support suspend/resume")
2652f6b472ff ("wifi: ath12k: avoid stopping mac80211 queues in ath12k_core_restart()")
c7b2da3c0a57 ("wifi: ath12k: rearrange IRQ enable/disable in reset path")
303c017821d8 ("wifi: ath12k: fix kernel crash during resume")
f8bde02a26b9 ("wifi: ath12k: initial debugfs support")
54ca3308a23c ("wifi: ath12k: enable 802.11 power save mode in station mode")
2d3a7384b9c8 ("wifi: ath12k: disable QMI PHY capability learn in split-phy QCN9274")
af9bc78d14fb ("wifi: ath12k: Read board id to support split-PHY QCN9274")
f7019c2fcdf6 ("wifi: ath12k: split hal_ops to support RX TLVs word mask compaction")
12f491cd6d81 ("wifi: ath12k: add firmware-2.bin support")
53a65445c144 ("wifi: ath12k: add QMI PHY capability learn support")
76fece36f17a ("wifi: ath12k: refactor QMI MLO host capability helper function")
ce20a10fdff4 ("wifi: ath12k: refactor ath12k_bss_assoc()")
e7ab40b73309 ("wifi: ath12k: Make QMI message rules const")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 38055789d15155109b41602ad719d770af507030 Mon Sep 17 00:00:00 2001
From: Baochen Qiang <quic_bqiang(a)quicinc.com>
Date: Thu, 1 Aug 2024 18:04:07 +0300
Subject: [PATCH] wifi: ath12k: use 128 bytes aligned iova in transmit path for
WCN7850
In transmit path, it is likely that the iova is not aligned to PCIe TLP
max payload size, which is 128 for WCN7850. Normally in such cases hardware
is expected to split the packet into several parts in a manner such that
they, other than the first one, have aligned iova. However due to hardware
limitations, WCN7850 does not behave like that properly with some specific
unaligned iova in transmit path. This easily results in target hang in a
KPI transmit test: packet send/receive failure, WMI command send timeout
etc. Also fatal error seen in PCIe level:
...
Capabilities: ...
...
DevSta: ... FatalErr+ ...
...
...
Work around this by manually moving/reallocating payload buffer such that
we can map it to a 128 bytes aligned iova. The moving requires sufficient
head room or tail room in skb: for the former we can do ourselves a favor
by asking some extra bytes when registering with mac80211, while for the
latter we can do nothing.
Moving/reallocating buffer consumes additional CPU cycles, but the good news
is that an aligned iova increases PCIe efficiency. In my tests on some X86
platforms the KPI results are almost consistent.
Since this is seen only with WCN7850, add a new hardware parameter to
differentiate from others.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
Signed-off-by: Baochen Qiang <quic_bqiang(a)quicinc.com>
Cc: <stable(a)vger.kernel.org>
Tested-by: Mark Pearson <mpearson-lenovo(a)squebb.ca>
Signed-off-by: Kalle Valo <quic_kvalo(a)quicinc.com>
Link: https://patch.msgid.link/20240715023814.20242-1-quic_bqiang@quicinc.com
diff --git a/drivers/net/wireless/ath/ath12k/dp_tx.c b/drivers/net/wireless/ath/ath12k/dp_tx.c
index d08c04343e90..44406e0b4a34 100644
--- a/drivers/net/wireless/ath/ath12k/dp_tx.c
+++ b/drivers/net/wireless/ath/ath12k/dp_tx.c
@@ -162,6 +162,60 @@ static int ath12k_dp_prepare_htt_metadata(struct sk_buff *skb)
return 0;
}
+static void ath12k_dp_tx_move_payload(struct sk_buff *skb,
+ unsigned long delta,
+ bool head)
+{
+ unsigned long len = skb->len;
+
+ if (head) {
+ skb_push(skb, delta);
+ memmove(skb->data, skb->data + delta, len);
+ skb_trim(skb, len);
+ } else {
+ skb_put(skb, delta);
+ memmove(skb->data + delta, skb->data, len);
+ skb_pull(skb, delta);
+ }
+}
+
+static int ath12k_dp_tx_align_payload(struct ath12k_base *ab,
+ struct sk_buff **pskb)
+{
+ u32 iova_mask = ab->hw_params->iova_mask;
+ unsigned long offset, delta1, delta2;
+ struct sk_buff *skb2, *skb = *pskb;
+ unsigned int headroom = skb_headroom(skb);
+ int tailroom = skb_tailroom(skb);
+ int ret = 0;
+
+ offset = (unsigned long)skb->data & iova_mask;
+ delta1 = offset;
+ delta2 = iova_mask - offset + 1;
+
+ if (headroom >= delta1) {
+ ath12k_dp_tx_move_payload(skb, delta1, true);
+ } else if (tailroom >= delta2) {
+ ath12k_dp_tx_move_payload(skb, delta2, false);
+ } else {
+ skb2 = skb_realloc_headroom(skb, iova_mask);
+ if (!skb2) {
+ ret = -ENOMEM;
+ goto out;
+ }
+
+ dev_kfree_skb_any(skb);
+
+ offset = (unsigned long)skb2->data & iova_mask;
+ if (offset)
+ ath12k_dp_tx_move_payload(skb2, offset, true);
+ *pskb = skb2;
+ }
+
+out:
+ return ret;
+}
+
int ath12k_dp_tx(struct ath12k *ar, struct ath12k_vif *arvif,
struct sk_buff *skb)
{
@@ -184,6 +238,7 @@ int ath12k_dp_tx(struct ath12k *ar, struct ath12k_vif *arvif,
bool tcl_ring_retry;
bool msdu_ext_desc = false;
bool add_htt_metadata = false;
+ u32 iova_mask = ab->hw_params->iova_mask;
if (test_bit(ATH12K_FLAG_CRASH_FLUSH, &ar->ab->dev_flags))
return -ESHUTDOWN;
@@ -279,6 +334,23 @@ int ath12k_dp_tx(struct ath12k *ar, struct ath12k_vif *arvif,
goto fail_remove_tx_buf;
}
+ if (iova_mask &&
+ (unsigned long)skb->data & iova_mask) {
+ ret = ath12k_dp_tx_align_payload(ab, &skb);
+ if (ret) {
+ ath12k_warn(ab, "failed to align TX buffer %d\n", ret);
+ /* don't bail out, give original buffer
+ * a chance even unaligned.
+ */
+ goto map;
+ }
+
+ /* hdr is pointing to a wrong place after alignment,
+ * so refresh it for later use.
+ */
+ hdr = (void *)skb->data;
+ }
+map:
ti.paddr = dma_map_single(ab->dev, skb->data, skb->len, DMA_TO_DEVICE);
if (dma_mapping_error(ab->dev, ti.paddr)) {
atomic_inc(&ab->soc_stats.tx_err.misc_fail);
diff --git a/drivers/net/wireless/ath/ath12k/hw.c b/drivers/net/wireless/ath/ath12k/hw.c
index 2e11ea763574..7b0b6a7f4701 100644
--- a/drivers/net/wireless/ath/ath12k/hw.c
+++ b/drivers/net/wireless/ath/ath12k/hw.c
@@ -924,6 +924,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.acpi_guid = NULL,
.supports_dynamic_smps_6ghz = true,
+
+ .iova_mask = 0,
},
{
.name = "wcn7850 hw2.0",
@@ -1000,6 +1002,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.acpi_guid = &wcn7850_uuid,
.supports_dynamic_smps_6ghz = false,
+
+ .iova_mask = ATH12K_PCIE_MAX_PAYLOAD_SIZE - 1,
},
{
.name = "qcn9274 hw2.0",
@@ -1072,6 +1076,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.acpi_guid = NULL,
.supports_dynamic_smps_6ghz = true,
+
+ .iova_mask = 0,
},
};
diff --git a/drivers/net/wireless/ath/ath12k/hw.h b/drivers/net/wireless/ath/ath12k/hw.h
index e792eb6b249b..b1d302c48326 100644
--- a/drivers/net/wireless/ath/ath12k/hw.h
+++ b/drivers/net/wireless/ath/ath12k/hw.h
@@ -96,6 +96,8 @@
#define ATH12K_M3_FILE "m3.bin"
#define ATH12K_REGDB_FILE_NAME "regdb.bin"
+#define ATH12K_PCIE_MAX_PAYLOAD_SIZE 128
+
enum ath12k_hw_rate_cck {
ATH12K_HW_RATE_CCK_LP_11M = 0,
ATH12K_HW_RATE_CCK_LP_5_5M,
@@ -215,6 +217,8 @@ struct ath12k_hw_params {
const guid_t *acpi_guid;
bool supports_dynamic_smps_6ghz;
+
+ u32 iova_mask;
};
struct ath12k_hw_ops {
diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index 8106297f0bc1..ce41c8153080 100644
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -9193,6 +9193,7 @@ static int ath12k_mac_hw_register(struct ath12k_hw *ah)
hw->vif_data_size = sizeof(struct ath12k_vif);
hw->sta_data_size = sizeof(struct ath12k_sta);
+ hw->extra_tx_headroom = ab->hw_params->iova_mask;
wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);
wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_STA_TX_PWR);
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] wifi: ath12k: use 128 bytes aligned iova in transmit path for" failed to apply to 6.6-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 38055789d15155109b41602ad719d770af507030
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081921-graded-starlet-91b8@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
38055789d151 ("wifi: ath12k: use 128 bytes aligned iova in transmit path for WCN7850")
26dd8ccdba4d ("wifi: ath12k: dynamic VLAN support")
97b7cbb7a3cb ("wifi: ath12k: support SMPS configuration for 6 GHz")
f0e61dc7ecf9 ("wifi: ath12k: refactor SMPS configuration")
112dbc6af807 ("wifi: ath12k: add 6 GHz params in peer assoc command")
576771c9fa21 ("wifi: ath12k: ACPI TAS support")
8d5f4da8d70b ("wifi: ath12k: support suspend/resume")
2652f6b472ff ("wifi: ath12k: avoid stopping mac80211 queues in ath12k_core_restart()")
c7b2da3c0a57 ("wifi: ath12k: rearrange IRQ enable/disable in reset path")
303c017821d8 ("wifi: ath12k: fix kernel crash during resume")
f8bde02a26b9 ("wifi: ath12k: initial debugfs support")
54ca3308a23c ("wifi: ath12k: enable 802.11 power save mode in station mode")
2d3a7384b9c8 ("wifi: ath12k: disable QMI PHY capability learn in split-phy QCN9274")
af9bc78d14fb ("wifi: ath12k: Read board id to support split-PHY QCN9274")
f7019c2fcdf6 ("wifi: ath12k: split hal_ops to support RX TLVs word mask compaction")
12f491cd6d81 ("wifi: ath12k: add firmware-2.bin support")
53a65445c144 ("wifi: ath12k: add QMI PHY capability learn support")
76fece36f17a ("wifi: ath12k: refactor QMI MLO host capability helper function")
ce20a10fdff4 ("wifi: ath12k: refactor ath12k_bss_assoc()")
e7ab40b73309 ("wifi: ath12k: Make QMI message rules const")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 38055789d15155109b41602ad719d770af507030 Mon Sep 17 00:00:00 2001
From: Baochen Qiang <quic_bqiang(a)quicinc.com>
Date: Thu, 1 Aug 2024 18:04:07 +0300
Subject: [PATCH] wifi: ath12k: use 128 bytes aligned iova in transmit path for
WCN7850
In transmit path, it is likely that the iova is not aligned to PCIe TLP
max payload size, which is 128 for WCN7850. Normally in such cases hardware
is expected to split the packet into several parts in a manner such that
they, other than the first one, have aligned iova. However due to hardware
limitations, WCN7850 does not behave like that properly with some specific
unaligned iova in transmit path. This easily results in target hang in a
KPI transmit test: packet send/receive failure, WMI command send timeout
etc. Also fatal error seen in PCIe level:
...
Capabilities: ...
...
DevSta: ... FatalErr+ ...
...
...
Work around this by manually moving/reallocating payload buffer such that
we can map it to a 128 bytes aligned iova. The moving requires sufficient
head room or tail room in skb: for the former we can do ourselves a favor
by asking some extra bytes when registering with mac80211, while for the
latter we can do nothing.
Moving/reallocating buffer consumes additional CPU cycles, but the good news
is that an aligned iova increases PCIe efficiency. In my tests on some X86
platforms the KPI results are almost consistent.
Since this is seen only with WCN7850, add a new hardware parameter to
differentiate from others.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
Signed-off-by: Baochen Qiang <quic_bqiang(a)quicinc.com>
Cc: <stable(a)vger.kernel.org>
Tested-by: Mark Pearson <mpearson-lenovo(a)squebb.ca>
Signed-off-by: Kalle Valo <quic_kvalo(a)quicinc.com>
Link: https://patch.msgid.link/20240715023814.20242-1-quic_bqiang@quicinc.com
diff --git a/drivers/net/wireless/ath/ath12k/dp_tx.c b/drivers/net/wireless/ath/ath12k/dp_tx.c
index d08c04343e90..44406e0b4a34 100644
--- a/drivers/net/wireless/ath/ath12k/dp_tx.c
+++ b/drivers/net/wireless/ath/ath12k/dp_tx.c
@@ -162,6 +162,60 @@ static int ath12k_dp_prepare_htt_metadata(struct sk_buff *skb)
return 0;
}
+static void ath12k_dp_tx_move_payload(struct sk_buff *skb,
+ unsigned long delta,
+ bool head)
+{
+ unsigned long len = skb->len;
+
+ if (head) {
+ skb_push(skb, delta);
+ memmove(skb->data, skb->data + delta, len);
+ skb_trim(skb, len);
+ } else {
+ skb_put(skb, delta);
+ memmove(skb->data + delta, skb->data, len);
+ skb_pull(skb, delta);
+ }
+}
+
+static int ath12k_dp_tx_align_payload(struct ath12k_base *ab,
+ struct sk_buff **pskb)
+{
+ u32 iova_mask = ab->hw_params->iova_mask;
+ unsigned long offset, delta1, delta2;
+ struct sk_buff *skb2, *skb = *pskb;
+ unsigned int headroom = skb_headroom(skb);
+ int tailroom = skb_tailroom(skb);
+ int ret = 0;
+
+ offset = (unsigned long)skb->data & iova_mask;
+ delta1 = offset;
+ delta2 = iova_mask - offset + 1;
+
+ if (headroom >= delta1) {
+ ath12k_dp_tx_move_payload(skb, delta1, true);
+ } else if (tailroom >= delta2) {
+ ath12k_dp_tx_move_payload(skb, delta2, false);
+ } else {
+ skb2 = skb_realloc_headroom(skb, iova_mask);
+ if (!skb2) {
+ ret = -ENOMEM;
+ goto out;
+ }
+
+ dev_kfree_skb_any(skb);
+
+ offset = (unsigned long)skb2->data & iova_mask;
+ if (offset)
+ ath12k_dp_tx_move_payload(skb2, offset, true);
+ *pskb = skb2;
+ }
+
+out:
+ return ret;
+}
+
int ath12k_dp_tx(struct ath12k *ar, struct ath12k_vif *arvif,
struct sk_buff *skb)
{
@@ -184,6 +238,7 @@ int ath12k_dp_tx(struct ath12k *ar, struct ath12k_vif *arvif,
bool tcl_ring_retry;
bool msdu_ext_desc = false;
bool add_htt_metadata = false;
+ u32 iova_mask = ab->hw_params->iova_mask;
if (test_bit(ATH12K_FLAG_CRASH_FLUSH, &ar->ab->dev_flags))
return -ESHUTDOWN;
@@ -279,6 +334,23 @@ int ath12k_dp_tx(struct ath12k *ar, struct ath12k_vif *arvif,
goto fail_remove_tx_buf;
}
+ if (iova_mask &&
+ (unsigned long)skb->data & iova_mask) {
+ ret = ath12k_dp_tx_align_payload(ab, &skb);
+ if (ret) {
+ ath12k_warn(ab, "failed to align TX buffer %d\n", ret);
+ /* don't bail out, give original buffer
+ * a chance even unaligned.
+ */
+ goto map;
+ }
+
+ /* hdr is pointing to a wrong place after alignment,
+ * so refresh it for later use.
+ */
+ hdr = (void *)skb->data;
+ }
+map:
ti.paddr = dma_map_single(ab->dev, skb->data, skb->len, DMA_TO_DEVICE);
if (dma_mapping_error(ab->dev, ti.paddr)) {
atomic_inc(&ab->soc_stats.tx_err.misc_fail);
diff --git a/drivers/net/wireless/ath/ath12k/hw.c b/drivers/net/wireless/ath/ath12k/hw.c
index 2e11ea763574..7b0b6a7f4701 100644
--- a/drivers/net/wireless/ath/ath12k/hw.c
+++ b/drivers/net/wireless/ath/ath12k/hw.c
@@ -924,6 +924,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.acpi_guid = NULL,
.supports_dynamic_smps_6ghz = true,
+
+ .iova_mask = 0,
},
{
.name = "wcn7850 hw2.0",
@@ -1000,6 +1002,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.acpi_guid = &wcn7850_uuid,
.supports_dynamic_smps_6ghz = false,
+
+ .iova_mask = ATH12K_PCIE_MAX_PAYLOAD_SIZE - 1,
},
{
.name = "qcn9274 hw2.0",
@@ -1072,6 +1076,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.acpi_guid = NULL,
.supports_dynamic_smps_6ghz = true,
+
+ .iova_mask = 0,
},
};
diff --git a/drivers/net/wireless/ath/ath12k/hw.h b/drivers/net/wireless/ath/ath12k/hw.h
index e792eb6b249b..b1d302c48326 100644
--- a/drivers/net/wireless/ath/ath12k/hw.h
+++ b/drivers/net/wireless/ath/ath12k/hw.h
@@ -96,6 +96,8 @@
#define ATH12K_M3_FILE "m3.bin"
#define ATH12K_REGDB_FILE_NAME "regdb.bin"
+#define ATH12K_PCIE_MAX_PAYLOAD_SIZE 128
+
enum ath12k_hw_rate_cck {
ATH12K_HW_RATE_CCK_LP_11M = 0,
ATH12K_HW_RATE_CCK_LP_5_5M,
@@ -215,6 +217,8 @@ struct ath12k_hw_params {
const guid_t *acpi_guid;
bool supports_dynamic_smps_6ghz;
+
+ u32 iova_mask;
};
struct ath12k_hw_ops {
diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index 8106297f0bc1..ce41c8153080 100644
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -9193,6 +9193,7 @@ static int ath12k_mac_hw_register(struct ath12k_hw *ah)
hw->vif_data_size = sizeof(struct ath12k_vif);
hw->sta_data_size = sizeof(struct ath12k_sta);
+ hw->extra_tx_headroom = ab->hw_params->iova_mask;
wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);
wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_STA_TX_PWR);
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] wifi: ath12k: use 128 bytes aligned iova in transmit path for" failed to apply to 6.10-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.10-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.10.y
git checkout FETCH_HEAD
git cherry-pick -x 38055789d15155109b41602ad719d770af507030
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081920-gating-yummy-71e0@gregkh' --subject-prefix 'PATCH 6.10.y' HEAD^..
Possible dependencies:
38055789d151 ("wifi: ath12k: use 128 bytes aligned iova in transmit path for WCN7850")
26dd8ccdba4d ("wifi: ath12k: dynamic VLAN support")
97b7cbb7a3cb ("wifi: ath12k: support SMPS configuration for 6 GHz")
f0e61dc7ecf9 ("wifi: ath12k: refactor SMPS configuration")
112dbc6af807 ("wifi: ath12k: add 6 GHz params in peer assoc command")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 38055789d15155109b41602ad719d770af507030 Mon Sep 17 00:00:00 2001
From: Baochen Qiang <quic_bqiang(a)quicinc.com>
Date: Thu, 1 Aug 2024 18:04:07 +0300
Subject: [PATCH] wifi: ath12k: use 128 bytes aligned iova in transmit path for
WCN7850
In transmit path, it is likely that the iova is not aligned to PCIe TLP
max payload size, which is 128 for WCN7850. Normally in such cases hardware
is expected to split the packet into several parts in a manner such that
they, other than the first one, have aligned iova. However due to hardware
limitations, WCN7850 does not behave like that properly with some specific
unaligned iova in transmit path. This easily results in target hang in a
KPI transmit test: packet send/receive failure, WMI command send timeout
etc. Also fatal error seen in PCIe level:
...
Capabilities: ...
...
DevSta: ... FatalErr+ ...
...
...
Work around this by manually moving/reallocating payload buffer such that
we can map it to a 128 bytes aligned iova. The moving requires sufficient
head room or tail room in skb: for the former we can do ourselves a favor
by asking some extra bytes when registering with mac80211, while for the
latter we can do nothing.
Moving/reallocating buffer consumes additional CPU cycles, but the good news
is that an aligned iova increases PCIe efficiency. In my tests on some X86
platforms the KPI results are almost consistent.
Since this is seen only with WCN7850, add a new hardware parameter to
differentiate from others.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
Signed-off-by: Baochen Qiang <quic_bqiang(a)quicinc.com>
Cc: <stable(a)vger.kernel.org>
Tested-by: Mark Pearson <mpearson-lenovo(a)squebb.ca>
Signed-off-by: Kalle Valo <quic_kvalo(a)quicinc.com>
Link: https://patch.msgid.link/20240715023814.20242-1-quic_bqiang@quicinc.com
diff --git a/drivers/net/wireless/ath/ath12k/dp_tx.c b/drivers/net/wireless/ath/ath12k/dp_tx.c
index d08c04343e90..44406e0b4a34 100644
--- a/drivers/net/wireless/ath/ath12k/dp_tx.c
+++ b/drivers/net/wireless/ath/ath12k/dp_tx.c
@@ -162,6 +162,60 @@ static int ath12k_dp_prepare_htt_metadata(struct sk_buff *skb)
return 0;
}
+static void ath12k_dp_tx_move_payload(struct sk_buff *skb,
+ unsigned long delta,
+ bool head)
+{
+ unsigned long len = skb->len;
+
+ if (head) {
+ skb_push(skb, delta);
+ memmove(skb->data, skb->data + delta, len);
+ skb_trim(skb, len);
+ } else {
+ skb_put(skb, delta);
+ memmove(skb->data + delta, skb->data, len);
+ skb_pull(skb, delta);
+ }
+}
+
+static int ath12k_dp_tx_align_payload(struct ath12k_base *ab,
+ struct sk_buff **pskb)
+{
+ u32 iova_mask = ab->hw_params->iova_mask;
+ unsigned long offset, delta1, delta2;
+ struct sk_buff *skb2, *skb = *pskb;
+ unsigned int headroom = skb_headroom(skb);
+ int tailroom = skb_tailroom(skb);
+ int ret = 0;
+
+ offset = (unsigned long)skb->data & iova_mask;
+ delta1 = offset;
+ delta2 = iova_mask - offset + 1;
+
+ if (headroom >= delta1) {
+ ath12k_dp_tx_move_payload(skb, delta1, true);
+ } else if (tailroom >= delta2) {
+ ath12k_dp_tx_move_payload(skb, delta2, false);
+ } else {
+ skb2 = skb_realloc_headroom(skb, iova_mask);
+ if (!skb2) {
+ ret = -ENOMEM;
+ goto out;
+ }
+
+ dev_kfree_skb_any(skb);
+
+ offset = (unsigned long)skb2->data & iova_mask;
+ if (offset)
+ ath12k_dp_tx_move_payload(skb2, offset, true);
+ *pskb = skb2;
+ }
+
+out:
+ return ret;
+}
+
int ath12k_dp_tx(struct ath12k *ar, struct ath12k_vif *arvif,
struct sk_buff *skb)
{
@@ -184,6 +238,7 @@ int ath12k_dp_tx(struct ath12k *ar, struct ath12k_vif *arvif,
bool tcl_ring_retry;
bool msdu_ext_desc = false;
bool add_htt_metadata = false;
+ u32 iova_mask = ab->hw_params->iova_mask;
if (test_bit(ATH12K_FLAG_CRASH_FLUSH, &ar->ab->dev_flags))
return -ESHUTDOWN;
@@ -279,6 +334,23 @@ int ath12k_dp_tx(struct ath12k *ar, struct ath12k_vif *arvif,
goto fail_remove_tx_buf;
}
+ if (iova_mask &&
+ (unsigned long)skb->data & iova_mask) {
+ ret = ath12k_dp_tx_align_payload(ab, &skb);
+ if (ret) {
+ ath12k_warn(ab, "failed to align TX buffer %d\n", ret);
+ /* don't bail out, give original buffer
+ * a chance even unaligned.
+ */
+ goto map;
+ }
+
+ /* hdr is pointing to a wrong place after alignment,
+ * so refresh it for later use.
+ */
+ hdr = (void *)skb->data;
+ }
+map:
ti.paddr = dma_map_single(ab->dev, skb->data, skb->len, DMA_TO_DEVICE);
if (dma_mapping_error(ab->dev, ti.paddr)) {
atomic_inc(&ab->soc_stats.tx_err.misc_fail);
diff --git a/drivers/net/wireless/ath/ath12k/hw.c b/drivers/net/wireless/ath/ath12k/hw.c
index 2e11ea763574..7b0b6a7f4701 100644
--- a/drivers/net/wireless/ath/ath12k/hw.c
+++ b/drivers/net/wireless/ath/ath12k/hw.c
@@ -924,6 +924,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.acpi_guid = NULL,
.supports_dynamic_smps_6ghz = true,
+
+ .iova_mask = 0,
},
{
.name = "wcn7850 hw2.0",
@@ -1000,6 +1002,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.acpi_guid = &wcn7850_uuid,
.supports_dynamic_smps_6ghz = false,
+
+ .iova_mask = ATH12K_PCIE_MAX_PAYLOAD_SIZE - 1,
},
{
.name = "qcn9274 hw2.0",
@@ -1072,6 +1076,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.acpi_guid = NULL,
.supports_dynamic_smps_6ghz = true,
+
+ .iova_mask = 0,
},
};
diff --git a/drivers/net/wireless/ath/ath12k/hw.h b/drivers/net/wireless/ath/ath12k/hw.h
index e792eb6b249b..b1d302c48326 100644
--- a/drivers/net/wireless/ath/ath12k/hw.h
+++ b/drivers/net/wireless/ath/ath12k/hw.h
@@ -96,6 +96,8 @@
#define ATH12K_M3_FILE "m3.bin"
#define ATH12K_REGDB_FILE_NAME "regdb.bin"
+#define ATH12K_PCIE_MAX_PAYLOAD_SIZE 128
+
enum ath12k_hw_rate_cck {
ATH12K_HW_RATE_CCK_LP_11M = 0,
ATH12K_HW_RATE_CCK_LP_5_5M,
@@ -215,6 +217,8 @@ struct ath12k_hw_params {
const guid_t *acpi_guid;
bool supports_dynamic_smps_6ghz;
+
+ u32 iova_mask;
};
struct ath12k_hw_ops {
diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index 8106297f0bc1..ce41c8153080 100644
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -9193,6 +9193,7 @@ static int ath12k_mac_hw_register(struct ath12k_hw *ah)
hw->vif_data_size = sizeof(struct ath12k_vif);
hw->sta_data_size = sizeof(struct ath12k_sta);
+ hw->extra_tx_headroom = ab->hw_params->iova_mask;
wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);
wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_STA_TX_PWR);
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] i2c: qcom-geni: Add missing geni_icc_disable in" failed to apply to 5.10-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 4e91fa1ef3ce6290b4c598e54b5eb6cf134fbec8
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081926-thrower-salaried-4605@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
4e91fa1ef3ce ("i2c: qcom-geni: Add missing geni_icc_disable in geni_i2c_runtime_resume")
14d02fbadb5d ("i2c: qcom-geni: add desc struct to prepare support for I2C Master Hub variant")
d8703554f4de ("i2c: qcom-geni: Add support for GPI DMA")
357ee8841d0b ("i2c: qcom-geni: Store DMA mapping data in geni_i2c_dev struct")
9cb4c67d7717 ("Revert "i2c: i2c-qcom-geni: Fix DMA transfer race"")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 4e91fa1ef3ce6290b4c598e54b5eb6cf134fbec8 Mon Sep 17 00:00:00 2001
From: Andi Shyti <andi.shyti(a)kernel.org>
Date: Mon, 12 Aug 2024 21:40:28 +0200
Subject: [PATCH] i2c: qcom-geni: Add missing geni_icc_disable in
geni_i2c_runtime_resume
Add the missing geni_icc_disable() call before returning in the
geni_i2c_runtime_resume() function.
Commit 9ba48db9f77c ("i2c: qcom-geni: Add missing
geni_icc_disable in geni_i2c_runtime_resume") by Gaosheng missed
disabling the interconnect in one case.
Fixes: bf225ed357c6 ("i2c: i2c-qcom-geni: Add interconnect support")
Cc: Gaosheng Cui <cuigaosheng1(a)huawei.com>
Cc: stable(a)vger.kernel.org # v5.9+
Signed-off-by: Andi Shyti <andi.shyti(a)kernel.org>
diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c
index 365e37bba0f3..06e836e3e877 100644
--- a/drivers/i2c/busses/i2c-qcom-geni.c
+++ b/drivers/i2c/busses/i2c-qcom-geni.c
@@ -986,8 +986,10 @@ static int __maybe_unused geni_i2c_runtime_resume(struct device *dev)
return ret;
ret = clk_prepare_enable(gi2c->core_clk);
- if (ret)
+ if (ret) {
+ geni_icc_disable(&gi2c->se);
return ret;
+ }
ret = geni_se_resources_on(&gi2c->se);
if (ret) {
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] i2c: qcom-geni: Add missing geni_icc_disable in" failed to apply to 5.15-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x 4e91fa1ef3ce6290b4c598e54b5eb6cf134fbec8
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081925-editor-flinch-ca97@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
4e91fa1ef3ce ("i2c: qcom-geni: Add missing geni_icc_disable in geni_i2c_runtime_resume")
14d02fbadb5d ("i2c: qcom-geni: add desc struct to prepare support for I2C Master Hub variant")
d8703554f4de ("i2c: qcom-geni: Add support for GPI DMA")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 4e91fa1ef3ce6290b4c598e54b5eb6cf134fbec8 Mon Sep 17 00:00:00 2001
From: Andi Shyti <andi.shyti(a)kernel.org>
Date: Mon, 12 Aug 2024 21:40:28 +0200
Subject: [PATCH] i2c: qcom-geni: Add missing geni_icc_disable in
geni_i2c_runtime_resume
Add the missing geni_icc_disable() call before returning in the
geni_i2c_runtime_resume() function.
Commit 9ba48db9f77c ("i2c: qcom-geni: Add missing
geni_icc_disable in geni_i2c_runtime_resume") by Gaosheng missed
disabling the interconnect in one case.
Fixes: bf225ed357c6 ("i2c: i2c-qcom-geni: Add interconnect support")
Cc: Gaosheng Cui <cuigaosheng1(a)huawei.com>
Cc: stable(a)vger.kernel.org # v5.9+
Signed-off-by: Andi Shyti <andi.shyti(a)kernel.org>
diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c
index 365e37bba0f3..06e836e3e877 100644
--- a/drivers/i2c/busses/i2c-qcom-geni.c
+++ b/drivers/i2c/busses/i2c-qcom-geni.c
@@ -986,8 +986,10 @@ static int __maybe_unused geni_i2c_runtime_resume(struct device *dev)
return ret;
ret = clk_prepare_enable(gi2c->core_clk);
- if (ret)
+ if (ret) {
+ geni_icc_disable(&gi2c->se);
return ret;
+ }
ret = geni_se_resources_on(&gi2c->se);
if (ret) {
1 year, 4 months
- 1
- 0
[PATCH] irqchip/gic-v2m: Fix refcount leak in gicv2m_of_init
by Ma Ke
Add the missing of_node_put() to release the refcount incremented
by of_find_matching_node().
Cc: stable(a)vger.kernel.org
Fixes: 4266ab1a8ff5 ("irqchip/gic-v2m: Refactor to prepare for ACPI support")
Signed-off-by: Ma Ke <make24(a)iscas.ac.cn>
---
drivers/irqchip/irq-gic-v2m.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/irqchip/irq-gic-v2m.c b/drivers/irqchip/irq-gic-v2m.c
index 51af63c046ed..65a55ee7bb30 100644
--- a/drivers/irqchip/irq-gic-v2m.c
+++ b/drivers/irqchip/irq-gic-v2m.c
@@ -396,6 +396,7 @@ static int __init gicv2m_of_init(struct fwnode_handle *parent_handle,
ret = of_address_to_resource(child, 0, &res);
if (ret) {
pr_err("Failed to allocate v2m resource.\n");
+ of_node_put(child);
break;
}
--
2.25.1
1 year, 4 months
- 2
- 1
FAILED: patch "[PATCH] dm suspend: return -ERESTARTSYS instead of -EINTR" failed to apply to 5.4-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y
git checkout FETCH_HEAD
git cherry-pick -x 1e1fd567d32fcf7544c6e09e0e5bc6c650da6e23
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081927-lapping-sedation-f06f@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^..
Possible dependencies:
1e1fd567d32f ("dm suspend: return -ERESTARTSYS instead of -EINTR")
85067747cf98 ("dm: do not use waitqueue for request-based DM")
087615bf3acd ("dm mpath: pass IO start time to path selector")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 1e1fd567d32fcf7544c6e09e0e5bc6c650da6e23 Mon Sep 17 00:00:00 2001
From: Mikulas Patocka <mpatocka(a)redhat.com>
Date: Tue, 13 Aug 2024 12:38:51 +0200
Subject: [PATCH] dm suspend: return -ERESTARTSYS instead of -EINTR
This commit changes device mapper, so that it returns -ERESTARTSYS
instead of -EINTR when it is interrupted by a signal (so that the ioctl
can be restarted).
The manpage signal(7) says that the ioctl function should be restarted if
the signal was handled with SA_RESTART.
Signed-off-by: Mikulas Patocka <mpatocka(a)redhat.com>
Cc: stable(a)vger.kernel.org
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 97fab2087df8..87bb90303435 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -2737,7 +2737,7 @@ static int dm_wait_for_bios_completion(struct mapped_device *md, unsigned int ta
break;
if (signal_pending_state(task_state, current)) {
- r = -EINTR;
+ r = -ERESTARTSYS;
break;
}
@@ -2762,7 +2762,7 @@ static int dm_wait_for_completion(struct mapped_device *md, unsigned int task_st
break;
if (signal_pending_state(task_state, current)) {
- r = -EINTR;
+ r = -ERESTARTSYS;
break;
}
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] dm suspend: return -ERESTARTSYS instead of -EINTR" failed to apply to 5.15-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x 1e1fd567d32fcf7544c6e09e0e5bc6c650da6e23
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081925-voting-handwrite-258d@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
1e1fd567d32f ("dm suspend: return -ERESTARTSYS instead of -EINTR")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 1e1fd567d32fcf7544c6e09e0e5bc6c650da6e23 Mon Sep 17 00:00:00 2001
From: Mikulas Patocka <mpatocka(a)redhat.com>
Date: Tue, 13 Aug 2024 12:38:51 +0200
Subject: [PATCH] dm suspend: return -ERESTARTSYS instead of -EINTR
This commit changes device mapper, so that it returns -ERESTARTSYS
instead of -EINTR when it is interrupted by a signal (so that the ioctl
can be restarted).
The manpage signal(7) says that the ioctl function should be restarted if
the signal was handled with SA_RESTART.
Signed-off-by: Mikulas Patocka <mpatocka(a)redhat.com>
Cc: stable(a)vger.kernel.org
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 97fab2087df8..87bb90303435 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -2737,7 +2737,7 @@ static int dm_wait_for_bios_completion(struct mapped_device *md, unsigned int ta
break;
if (signal_pending_state(task_state, current)) {
- r = -EINTR;
+ r = -ERESTARTSYS;
break;
}
@@ -2762,7 +2762,7 @@ static int dm_wait_for_completion(struct mapped_device *md, unsigned int task_st
break;
if (signal_pending_state(task_state, current)) {
- r = -EINTR;
+ r = -ERESTARTSYS;
break;
}
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] dm suspend: return -ERESTARTSYS instead of -EINTR" failed to apply to 6.1-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 1e1fd567d32fcf7544c6e09e0e5bc6c650da6e23
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081925-comic-charcoal-8b91@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
1e1fd567d32f ("dm suspend: return -ERESTARTSYS instead of -EINTR")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 1e1fd567d32fcf7544c6e09e0e5bc6c650da6e23 Mon Sep 17 00:00:00 2001
From: Mikulas Patocka <mpatocka(a)redhat.com>
Date: Tue, 13 Aug 2024 12:38:51 +0200
Subject: [PATCH] dm suspend: return -ERESTARTSYS instead of -EINTR
This commit changes device mapper, so that it returns -ERESTARTSYS
instead of -EINTR when it is interrupted by a signal (so that the ioctl
can be restarted).
The manpage signal(7) says that the ioctl function should be restarted if
the signal was handled with SA_RESTART.
Signed-off-by: Mikulas Patocka <mpatocka(a)redhat.com>
Cc: stable(a)vger.kernel.org
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 97fab2087df8..87bb90303435 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -2737,7 +2737,7 @@ static int dm_wait_for_bios_completion(struct mapped_device *md, unsigned int ta
break;
if (signal_pending_state(task_state, current)) {
- r = -EINTR;
+ r = -ERESTARTSYS;
break;
}
@@ -2762,7 +2762,7 @@ static int dm_wait_for_completion(struct mapped_device *md, unsigned int task_st
break;
if (signal_pending_state(task_state, current)) {
- r = -EINTR;
+ r = -ERESTARTSYS;
break;
}
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] dm suspend: return -ERESTARTSYS instead of -EINTR" failed to apply to 6.10-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.10-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.10.y
git checkout FETCH_HEAD
git cherry-pick -x 1e1fd567d32fcf7544c6e09e0e5bc6c650da6e23
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081923-move-improving-38ad@gregkh' --subject-prefix 'PATCH 6.10.y' HEAD^..
Possible dependencies:
1e1fd567d32f ("dm suspend: return -ERESTARTSYS instead of -EINTR")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 1e1fd567d32fcf7544c6e09e0e5bc6c650da6e23 Mon Sep 17 00:00:00 2001
From: Mikulas Patocka <mpatocka(a)redhat.com>
Date: Tue, 13 Aug 2024 12:38:51 +0200
Subject: [PATCH] dm suspend: return -ERESTARTSYS instead of -EINTR
This commit changes device mapper, so that it returns -ERESTARTSYS
instead of -EINTR when it is interrupted by a signal (so that the ioctl
can be restarted).
The manpage signal(7) says that the ioctl function should be restarted if
the signal was handled with SA_RESTART.
Signed-off-by: Mikulas Patocka <mpatocka(a)redhat.com>
Cc: stable(a)vger.kernel.org
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 97fab2087df8..87bb90303435 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -2737,7 +2737,7 @@ static int dm_wait_for_bios_completion(struct mapped_device *md, unsigned int ta
break;
if (signal_pending_state(task_state, current)) {
- r = -EINTR;
+ r = -ERESTARTSYS;
break;
}
@@ -2762,7 +2762,7 @@ static int dm_wait_for_completion(struct mapped_device *md, unsigned int task_st
break;
if (signal_pending_state(task_state, current)) {
- r = -EINTR;
+ r = -ERESTARTSYS;
break;
}
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] dm suspend: return -ERESTARTSYS instead of -EINTR" failed to apply to 6.6-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 1e1fd567d32fcf7544c6e09e0e5bc6c650da6e23
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081924-fidelity-leverage-7546@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
1e1fd567d32f ("dm suspend: return -ERESTARTSYS instead of -EINTR")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 1e1fd567d32fcf7544c6e09e0e5bc6c650da6e23 Mon Sep 17 00:00:00 2001
From: Mikulas Patocka <mpatocka(a)redhat.com>
Date: Tue, 13 Aug 2024 12:38:51 +0200
Subject: [PATCH] dm suspend: return -ERESTARTSYS instead of -EINTR
This commit changes device mapper, so that it returns -ERESTARTSYS
instead of -EINTR when it is interrupted by a signal (so that the ioctl
can be restarted).
The manpage signal(7) says that the ioctl function should be restarted if
the signal was handled with SA_RESTART.
Signed-off-by: Mikulas Patocka <mpatocka(a)redhat.com>
Cc: stable(a)vger.kernel.org
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 97fab2087df8..87bb90303435 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -2737,7 +2737,7 @@ static int dm_wait_for_bios_completion(struct mapped_device *md, unsigned int ta
break;
if (signal_pending_state(task_state, current)) {
- r = -EINTR;
+ r = -ERESTARTSYS;
break;
}
@@ -2762,7 +2762,7 @@ static int dm_wait_for_completion(struct mapped_device *md, unsigned int task_st
break;
if (signal_pending_state(task_state, current)) {
- r = -EINTR;
+ r = -ERESTARTSYS;
break;
}
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] smb/client: avoid possible NULL dereference in" failed to apply to 6.10-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.10-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.10.y
git checkout FETCH_HEAD
git cherry-pick -x 74c2ab6d653b4c2354df65a7f7f2df1925a40a51
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081927-sustained-humbly-8aaf@gregkh' --subject-prefix 'PATCH 6.10.y' HEAD^..
Possible dependencies:
74c2ab6d653b ("smb/client: avoid possible NULL dereference in cifs_free_subrequest()")
519be989717c ("cifs: Add a tracepoint to track credits involved in R/W requests")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 74c2ab6d653b4c2354df65a7f7f2df1925a40a51 Mon Sep 17 00:00:00 2001
From: Su Hui <suhui(a)nfschina.com>
Date: Thu, 8 Aug 2024 20:23:32 +0800
Subject: [PATCH] smb/client: avoid possible NULL dereference in
cifs_free_subrequest()
Clang static checker (scan-build) warning:
cifsglob.h:line 890, column 3
Access to field 'ops' results in a dereference of a null pointer.
Commit 519be989717c ("cifs: Add a tracepoint to track credits involved in
R/W requests") adds a check for 'rdata->server', and let clang throw this
warning about NULL dereference.
When 'rdata->credits.value != 0 && rdata->server == NULL' happens,
add_credits_and_wake_if() will call rdata->server->ops->add_credits().
This will cause NULL dereference problem. Add a check for 'rdata->server'
to avoid NULL dereference.
Cc: stable(a)vger.kernel.org
Fixes: 69c3c023af25 ("cifs: Implement netfslib hooks")
Reviewed-by: David Howells <dhowells(a)redhat.com>
Signed-off-by: Su Hui <suhui(a)nfschina.com>
Signed-off-by: Steve French <stfrench(a)microsoft.com>
diff --git a/fs/smb/client/file.c b/fs/smb/client/file.c
index b2405dd4d4d4..45459af5044d 100644
--- a/fs/smb/client/file.c
+++ b/fs/smb/client/file.c
@@ -315,7 +315,7 @@ static void cifs_free_subrequest(struct netfs_io_subrequest *subreq)
#endif
}
- if (rdata->credits.value != 0)
+ if (rdata->credits.value != 0) {
trace_smb3_rw_credits(rdata->rreq->debug_id,
rdata->subreq.debug_index,
rdata->credits.value,
@@ -323,8 +323,12 @@ static void cifs_free_subrequest(struct netfs_io_subrequest *subreq)
rdata->server ? rdata->server->in_flight : 0,
-rdata->credits.value,
cifs_trace_rw_credits_free_subreq);
+ if (rdata->server)
+ add_credits_and_wake_if(rdata->server, &rdata->credits, 0);
+ else
+ rdata->credits.value = 0;
+ }
- add_credits_and_wake_if(rdata->server, &rdata->credits, 0);
if (rdata->have_xid)
free_xid(rdata->xid);
}
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] smb3: fix lock breakage for cached writes" failed to apply to 4.19-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.19.y
git checkout FETCH_HEAD
git cherry-pick -x 836bb3268db405cf9021496ac4dbc26d3e4758fe
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081915-antitoxic-kennel-6f2e@gregkh' --subject-prefix 'PATCH 4.19.y' HEAD^..
Possible dependencies:
836bb3268db4 ("smb3: fix lock breakage for cached writes")
3ee1a1fc3981 ("cifs: Cut over to using netfslib")
69c3c023af25 ("cifs: Implement netfslib hooks")
edea94a69730 ("cifs: Add mempools for cifs_io_request and cifs_io_subrequest structs")
1a5b4edd97ce ("cifs: Move cifs_loose_read_iter() and cifs_file_write_iter() to file.c")
ab58fbdeebc7 ("cifs: Use more fields from netfs_io_subrequest")
a975a2f22cdc ("cifs: Replace cifs_writedata with a wrapper around netfs_io_subrequest")
753b67eb630d ("cifs: Replace cifs_readdata with a wrapper around netfs_io_subrequest")
0f7c0f3f5150 ("cifs: Use alternative invalidation to using launder_folio")
2e9d7e4b984a ("mm: Remove the PG_fscache alias for PG_private_2")
2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
f3dc1bdb6b0b ("cifs: Fix writeback data corruption")
d1bba17e20d5 ("Merge tag '6.8-rc1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 836bb3268db405cf9021496ac4dbc26d3e4758fe Mon Sep 17 00:00:00 2001
From: Steve French <stfrench(a)microsoft.com>
Date: Thu, 15 Aug 2024 14:03:43 -0500
Subject: [PATCH] smb3: fix lock breakage for cached writes
Mandatory locking is enforced for cached writes, which violates
default posix semantics, and also it is enforced inconsistently.
This apparently breaks recent versions of libreoffice, but can
also be demonstrated by opening a file twice from the same
client, locking it from handle one and writing to it from
handle two (which fails, returning EACCES).
Since there was already a mount option "forcemandatorylock"
(which defaults to off), with this change only when the user
intentionally specifies "forcemandatorylock" on mount will we
break posix semantics on write to a locked range (ie we will
only fail the write in this case, if the user mounts with
"forcemandatorylock").
Fixes: 85160e03a79e ("CIFS: Implement caching mechanism for mandatory brlocks")
Cc: stable(a)vger.kernel.org
Cc: Pavel Shilovsky <piastryyy(a)gmail.com>
Reported-by: abartlet(a)samba.org
Reported-by: Kevin Ottens <kevin.ottens(a)enioka.com>
Reviewed-by: David Howells <dhowells(a)redhat.com>
Signed-off-by: Steve French <stfrench(a)microsoft.com>
diff --git a/fs/smb/client/file.c b/fs/smb/client/file.c
index 45459af5044d..06a0667f8ff2 100644
--- a/fs/smb/client/file.c
+++ b/fs/smb/client/file.c
@@ -2753,6 +2753,7 @@ cifs_writev(struct kiocb *iocb, struct iov_iter *from)
struct inode *inode = file->f_mapping->host;
struct cifsInodeInfo *cinode = CIFS_I(inode);
struct TCP_Server_Info *server = tlink_tcon(cfile->tlink)->ses->server;
+ struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
ssize_t rc;
rc = netfs_start_io_write(inode);
@@ -2769,12 +2770,16 @@ cifs_writev(struct kiocb *iocb, struct iov_iter *from)
if (rc <= 0)
goto out;
- if (!cifs_find_lock_conflict(cfile, iocb->ki_pos, iov_iter_count(from),
+ if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOPOSIXBRL) &&
+ (cifs_find_lock_conflict(cfile, iocb->ki_pos, iov_iter_count(from),
server->vals->exclusive_lock_type, 0,
- NULL, CIFS_WRITE_OP))
- rc = netfs_buffered_write_iter_locked(iocb, from, NULL);
- else
+ NULL, CIFS_WRITE_OP))) {
rc = -EACCES;
+ goto out;
+ }
+
+ rc = netfs_buffered_write_iter_locked(iocb, from, NULL);
+
out:
up_read(&cinode->lock_sem);
netfs_end_io_write(inode);
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] smb3: fix lock breakage for cached writes" failed to apply to 5.4-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y
git checkout FETCH_HEAD
git cherry-pick -x 836bb3268db405cf9021496ac4dbc26d3e4758fe
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081914-divided-overhaul-0e25@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^..
Possible dependencies:
836bb3268db4 ("smb3: fix lock breakage for cached writes")
3ee1a1fc3981 ("cifs: Cut over to using netfslib")
69c3c023af25 ("cifs: Implement netfslib hooks")
edea94a69730 ("cifs: Add mempools for cifs_io_request and cifs_io_subrequest structs")
1a5b4edd97ce ("cifs: Move cifs_loose_read_iter() and cifs_file_write_iter() to file.c")
ab58fbdeebc7 ("cifs: Use more fields from netfs_io_subrequest")
a975a2f22cdc ("cifs: Replace cifs_writedata with a wrapper around netfs_io_subrequest")
753b67eb630d ("cifs: Replace cifs_readdata with a wrapper around netfs_io_subrequest")
0f7c0f3f5150 ("cifs: Use alternative invalidation to using launder_folio")
2e9d7e4b984a ("mm: Remove the PG_fscache alias for PG_private_2")
2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
f3dc1bdb6b0b ("cifs: Fix writeback data corruption")
d1bba17e20d5 ("Merge tag '6.8-rc1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 836bb3268db405cf9021496ac4dbc26d3e4758fe Mon Sep 17 00:00:00 2001
From: Steve French <stfrench(a)microsoft.com>
Date: Thu, 15 Aug 2024 14:03:43 -0500
Subject: [PATCH] smb3: fix lock breakage for cached writes
Mandatory locking is enforced for cached writes, which violates
default posix semantics, and also it is enforced inconsistently.
This apparently breaks recent versions of libreoffice, but can
also be demonstrated by opening a file twice from the same
client, locking it from handle one and writing to it from
handle two (which fails, returning EACCES).
Since there was already a mount option "forcemandatorylock"
(which defaults to off), with this change only when the user
intentionally specifies "forcemandatorylock" on mount will we
break posix semantics on write to a locked range (ie we will
only fail the write in this case, if the user mounts with
"forcemandatorylock").
Fixes: 85160e03a79e ("CIFS: Implement caching mechanism for mandatory brlocks")
Cc: stable(a)vger.kernel.org
Cc: Pavel Shilovsky <piastryyy(a)gmail.com>
Reported-by: abartlet(a)samba.org
Reported-by: Kevin Ottens <kevin.ottens(a)enioka.com>
Reviewed-by: David Howells <dhowells(a)redhat.com>
Signed-off-by: Steve French <stfrench(a)microsoft.com>
diff --git a/fs/smb/client/file.c b/fs/smb/client/file.c
index 45459af5044d..06a0667f8ff2 100644
--- a/fs/smb/client/file.c
+++ b/fs/smb/client/file.c
@@ -2753,6 +2753,7 @@ cifs_writev(struct kiocb *iocb, struct iov_iter *from)
struct inode *inode = file->f_mapping->host;
struct cifsInodeInfo *cinode = CIFS_I(inode);
struct TCP_Server_Info *server = tlink_tcon(cfile->tlink)->ses->server;
+ struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
ssize_t rc;
rc = netfs_start_io_write(inode);
@@ -2769,12 +2770,16 @@ cifs_writev(struct kiocb *iocb, struct iov_iter *from)
if (rc <= 0)
goto out;
- if (!cifs_find_lock_conflict(cfile, iocb->ki_pos, iov_iter_count(from),
+ if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOPOSIXBRL) &&
+ (cifs_find_lock_conflict(cfile, iocb->ki_pos, iov_iter_count(from),
server->vals->exclusive_lock_type, 0,
- NULL, CIFS_WRITE_OP))
- rc = netfs_buffered_write_iter_locked(iocb, from, NULL);
- else
+ NULL, CIFS_WRITE_OP))) {
rc = -EACCES;
+ goto out;
+ }
+
+ rc = netfs_buffered_write_iter_locked(iocb, from, NULL);
+
out:
up_read(&cinode->lock_sem);
netfs_end_io_write(inode);
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] smb3: fix lock breakage for cached writes" failed to apply to 5.10-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 836bb3268db405cf9021496ac4dbc26d3e4758fe
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081913-dominoes-octagon-edcc@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
836bb3268db4 ("smb3: fix lock breakage for cached writes")
3ee1a1fc3981 ("cifs: Cut over to using netfslib")
69c3c023af25 ("cifs: Implement netfslib hooks")
edea94a69730 ("cifs: Add mempools for cifs_io_request and cifs_io_subrequest structs")
1a5b4edd97ce ("cifs: Move cifs_loose_read_iter() and cifs_file_write_iter() to file.c")
ab58fbdeebc7 ("cifs: Use more fields from netfs_io_subrequest")
a975a2f22cdc ("cifs: Replace cifs_writedata with a wrapper around netfs_io_subrequest")
753b67eb630d ("cifs: Replace cifs_readdata with a wrapper around netfs_io_subrequest")
0f7c0f3f5150 ("cifs: Use alternative invalidation to using launder_folio")
2e9d7e4b984a ("mm: Remove the PG_fscache alias for PG_private_2")
2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
f3dc1bdb6b0b ("cifs: Fix writeback data corruption")
d1bba17e20d5 ("Merge tag '6.8-rc1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 836bb3268db405cf9021496ac4dbc26d3e4758fe Mon Sep 17 00:00:00 2001
From: Steve French <stfrench(a)microsoft.com>
Date: Thu, 15 Aug 2024 14:03:43 -0500
Subject: [PATCH] smb3: fix lock breakage for cached writes
Mandatory locking is enforced for cached writes, which violates
default posix semantics, and also it is enforced inconsistently.
This apparently breaks recent versions of libreoffice, but can
also be demonstrated by opening a file twice from the same
client, locking it from handle one and writing to it from
handle two (which fails, returning EACCES).
Since there was already a mount option "forcemandatorylock"
(which defaults to off), with this change only when the user
intentionally specifies "forcemandatorylock" on mount will we
break posix semantics on write to a locked range (ie we will
only fail the write in this case, if the user mounts with
"forcemandatorylock").
Fixes: 85160e03a79e ("CIFS: Implement caching mechanism for mandatory brlocks")
Cc: stable(a)vger.kernel.org
Cc: Pavel Shilovsky <piastryyy(a)gmail.com>
Reported-by: abartlet(a)samba.org
Reported-by: Kevin Ottens <kevin.ottens(a)enioka.com>
Reviewed-by: David Howells <dhowells(a)redhat.com>
Signed-off-by: Steve French <stfrench(a)microsoft.com>
diff --git a/fs/smb/client/file.c b/fs/smb/client/file.c
index 45459af5044d..06a0667f8ff2 100644
--- a/fs/smb/client/file.c
+++ b/fs/smb/client/file.c
@@ -2753,6 +2753,7 @@ cifs_writev(struct kiocb *iocb, struct iov_iter *from)
struct inode *inode = file->f_mapping->host;
struct cifsInodeInfo *cinode = CIFS_I(inode);
struct TCP_Server_Info *server = tlink_tcon(cfile->tlink)->ses->server;
+ struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
ssize_t rc;
rc = netfs_start_io_write(inode);
@@ -2769,12 +2770,16 @@ cifs_writev(struct kiocb *iocb, struct iov_iter *from)
if (rc <= 0)
goto out;
- if (!cifs_find_lock_conflict(cfile, iocb->ki_pos, iov_iter_count(from),
+ if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOPOSIXBRL) &&
+ (cifs_find_lock_conflict(cfile, iocb->ki_pos, iov_iter_count(from),
server->vals->exclusive_lock_type, 0,
- NULL, CIFS_WRITE_OP))
- rc = netfs_buffered_write_iter_locked(iocb, from, NULL);
- else
+ NULL, CIFS_WRITE_OP))) {
rc = -EACCES;
+ goto out;
+ }
+
+ rc = netfs_buffered_write_iter_locked(iocb, from, NULL);
+
out:
up_read(&cinode->lock_sem);
netfs_end_io_write(inode);
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] smb3: fix lock breakage for cached writes" failed to apply to 5.15-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x 836bb3268db405cf9021496ac4dbc26d3e4758fe
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081912-hesitate-manor-84c0@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
836bb3268db4 ("smb3: fix lock breakage for cached writes")
3ee1a1fc3981 ("cifs: Cut over to using netfslib")
69c3c023af25 ("cifs: Implement netfslib hooks")
edea94a69730 ("cifs: Add mempools for cifs_io_request and cifs_io_subrequest structs")
1a5b4edd97ce ("cifs: Move cifs_loose_read_iter() and cifs_file_write_iter() to file.c")
ab58fbdeebc7 ("cifs: Use more fields from netfs_io_subrequest")
a975a2f22cdc ("cifs: Replace cifs_writedata with a wrapper around netfs_io_subrequest")
753b67eb630d ("cifs: Replace cifs_readdata with a wrapper around netfs_io_subrequest")
0f7c0f3f5150 ("cifs: Use alternative invalidation to using launder_folio")
2e9d7e4b984a ("mm: Remove the PG_fscache alias for PG_private_2")
2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
f3dc1bdb6b0b ("cifs: Fix writeback data corruption")
d1bba17e20d5 ("Merge tag '6.8-rc1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 836bb3268db405cf9021496ac4dbc26d3e4758fe Mon Sep 17 00:00:00 2001
From: Steve French <stfrench(a)microsoft.com>
Date: Thu, 15 Aug 2024 14:03:43 -0500
Subject: [PATCH] smb3: fix lock breakage for cached writes
Mandatory locking is enforced for cached writes, which violates
default posix semantics, and also it is enforced inconsistently.
This apparently breaks recent versions of libreoffice, but can
also be demonstrated by opening a file twice from the same
client, locking it from handle one and writing to it from
handle two (which fails, returning EACCES).
Since there was already a mount option "forcemandatorylock"
(which defaults to off), with this change only when the user
intentionally specifies "forcemandatorylock" on mount will we
break posix semantics on write to a locked range (ie we will
only fail the write in this case, if the user mounts with
"forcemandatorylock").
Fixes: 85160e03a79e ("CIFS: Implement caching mechanism for mandatory brlocks")
Cc: stable(a)vger.kernel.org
Cc: Pavel Shilovsky <piastryyy(a)gmail.com>
Reported-by: abartlet(a)samba.org
Reported-by: Kevin Ottens <kevin.ottens(a)enioka.com>
Reviewed-by: David Howells <dhowells(a)redhat.com>
Signed-off-by: Steve French <stfrench(a)microsoft.com>
diff --git a/fs/smb/client/file.c b/fs/smb/client/file.c
index 45459af5044d..06a0667f8ff2 100644
--- a/fs/smb/client/file.c
+++ b/fs/smb/client/file.c
@@ -2753,6 +2753,7 @@ cifs_writev(struct kiocb *iocb, struct iov_iter *from)
struct inode *inode = file->f_mapping->host;
struct cifsInodeInfo *cinode = CIFS_I(inode);
struct TCP_Server_Info *server = tlink_tcon(cfile->tlink)->ses->server;
+ struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
ssize_t rc;
rc = netfs_start_io_write(inode);
@@ -2769,12 +2770,16 @@ cifs_writev(struct kiocb *iocb, struct iov_iter *from)
if (rc <= 0)
goto out;
- if (!cifs_find_lock_conflict(cfile, iocb->ki_pos, iov_iter_count(from),
+ if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOPOSIXBRL) &&
+ (cifs_find_lock_conflict(cfile, iocb->ki_pos, iov_iter_count(from),
server->vals->exclusive_lock_type, 0,
- NULL, CIFS_WRITE_OP))
- rc = netfs_buffered_write_iter_locked(iocb, from, NULL);
- else
+ NULL, CIFS_WRITE_OP))) {
rc = -EACCES;
+ goto out;
+ }
+
+ rc = netfs_buffered_write_iter_locked(iocb, from, NULL);
+
out:
up_read(&cinode->lock_sem);
netfs_end_io_write(inode);
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] smb3: fix lock breakage for cached writes" failed to apply to 6.1-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 836bb3268db405cf9021496ac4dbc26d3e4758fe
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081911-flame-used-1927@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
836bb3268db4 ("smb3: fix lock breakage for cached writes")
3ee1a1fc3981 ("cifs: Cut over to using netfslib")
69c3c023af25 ("cifs: Implement netfslib hooks")
edea94a69730 ("cifs: Add mempools for cifs_io_request and cifs_io_subrequest structs")
1a5b4edd97ce ("cifs: Move cifs_loose_read_iter() and cifs_file_write_iter() to file.c")
ab58fbdeebc7 ("cifs: Use more fields from netfs_io_subrequest")
a975a2f22cdc ("cifs: Replace cifs_writedata with a wrapper around netfs_io_subrequest")
753b67eb630d ("cifs: Replace cifs_readdata with a wrapper around netfs_io_subrequest")
0f7c0f3f5150 ("cifs: Use alternative invalidation to using launder_folio")
2e9d7e4b984a ("mm: Remove the PG_fscache alias for PG_private_2")
2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
f3dc1bdb6b0b ("cifs: Fix writeback data corruption")
d1bba17e20d5 ("Merge tag '6.8-rc1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 836bb3268db405cf9021496ac4dbc26d3e4758fe Mon Sep 17 00:00:00 2001
From: Steve French <stfrench(a)microsoft.com>
Date: Thu, 15 Aug 2024 14:03:43 -0500
Subject: [PATCH] smb3: fix lock breakage for cached writes
Mandatory locking is enforced for cached writes, which violates
default posix semantics, and also it is enforced inconsistently.
This apparently breaks recent versions of libreoffice, but can
also be demonstrated by opening a file twice from the same
client, locking it from handle one and writing to it from
handle two (which fails, returning EACCES).
Since there was already a mount option "forcemandatorylock"
(which defaults to off), with this change only when the user
intentionally specifies "forcemandatorylock" on mount will we
break posix semantics on write to a locked range (ie we will
only fail the write in this case, if the user mounts with
"forcemandatorylock").
Fixes: 85160e03a79e ("CIFS: Implement caching mechanism for mandatory brlocks")
Cc: stable(a)vger.kernel.org
Cc: Pavel Shilovsky <piastryyy(a)gmail.com>
Reported-by: abartlet(a)samba.org
Reported-by: Kevin Ottens <kevin.ottens(a)enioka.com>
Reviewed-by: David Howells <dhowells(a)redhat.com>
Signed-off-by: Steve French <stfrench(a)microsoft.com>
diff --git a/fs/smb/client/file.c b/fs/smb/client/file.c
index 45459af5044d..06a0667f8ff2 100644
--- a/fs/smb/client/file.c
+++ b/fs/smb/client/file.c
@@ -2753,6 +2753,7 @@ cifs_writev(struct kiocb *iocb, struct iov_iter *from)
struct inode *inode = file->f_mapping->host;
struct cifsInodeInfo *cinode = CIFS_I(inode);
struct TCP_Server_Info *server = tlink_tcon(cfile->tlink)->ses->server;
+ struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
ssize_t rc;
rc = netfs_start_io_write(inode);
@@ -2769,12 +2770,16 @@ cifs_writev(struct kiocb *iocb, struct iov_iter *from)
if (rc <= 0)
goto out;
- if (!cifs_find_lock_conflict(cfile, iocb->ki_pos, iov_iter_count(from),
+ if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOPOSIXBRL) &&
+ (cifs_find_lock_conflict(cfile, iocb->ki_pos, iov_iter_count(from),
server->vals->exclusive_lock_type, 0,
- NULL, CIFS_WRITE_OP))
- rc = netfs_buffered_write_iter_locked(iocb, from, NULL);
- else
+ NULL, CIFS_WRITE_OP))) {
rc = -EACCES;
+ goto out;
+ }
+
+ rc = netfs_buffered_write_iter_locked(iocb, from, NULL);
+
out:
up_read(&cinode->lock_sem);
netfs_end_io_write(inode);
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] smb3: fix lock breakage for cached writes" failed to apply to 6.6-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 836bb3268db405cf9021496ac4dbc26d3e4758fe
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081910-dawn-handoff-e37b@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
836bb3268db4 ("smb3: fix lock breakage for cached writes")
3ee1a1fc3981 ("cifs: Cut over to using netfslib")
69c3c023af25 ("cifs: Implement netfslib hooks")
edea94a69730 ("cifs: Add mempools for cifs_io_request and cifs_io_subrequest structs")
1a5b4edd97ce ("cifs: Move cifs_loose_read_iter() and cifs_file_write_iter() to file.c")
ab58fbdeebc7 ("cifs: Use more fields from netfs_io_subrequest")
a975a2f22cdc ("cifs: Replace cifs_writedata with a wrapper around netfs_io_subrequest")
753b67eb630d ("cifs: Replace cifs_readdata with a wrapper around netfs_io_subrequest")
0f7c0f3f5150 ("cifs: Use alternative invalidation to using launder_folio")
2e9d7e4b984a ("mm: Remove the PG_fscache alias for PG_private_2")
2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
f3dc1bdb6b0b ("cifs: Fix writeback data corruption")
d1bba17e20d5 ("Merge tag '6.8-rc1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 836bb3268db405cf9021496ac4dbc26d3e4758fe Mon Sep 17 00:00:00 2001
From: Steve French <stfrench(a)microsoft.com>
Date: Thu, 15 Aug 2024 14:03:43 -0500
Subject: [PATCH] smb3: fix lock breakage for cached writes
Mandatory locking is enforced for cached writes, which violates
default posix semantics, and also it is enforced inconsistently.
This apparently breaks recent versions of libreoffice, but can
also be demonstrated by opening a file twice from the same
client, locking it from handle one and writing to it from
handle two (which fails, returning EACCES).
Since there was already a mount option "forcemandatorylock"
(which defaults to off), with this change only when the user
intentionally specifies "forcemandatorylock" on mount will we
break posix semantics on write to a locked range (ie we will
only fail the write in this case, if the user mounts with
"forcemandatorylock").
Fixes: 85160e03a79e ("CIFS: Implement caching mechanism for mandatory brlocks")
Cc: stable(a)vger.kernel.org
Cc: Pavel Shilovsky <piastryyy(a)gmail.com>
Reported-by: abartlet(a)samba.org
Reported-by: Kevin Ottens <kevin.ottens(a)enioka.com>
Reviewed-by: David Howells <dhowells(a)redhat.com>
Signed-off-by: Steve French <stfrench(a)microsoft.com>
diff --git a/fs/smb/client/file.c b/fs/smb/client/file.c
index 45459af5044d..06a0667f8ff2 100644
--- a/fs/smb/client/file.c
+++ b/fs/smb/client/file.c
@@ -2753,6 +2753,7 @@ cifs_writev(struct kiocb *iocb, struct iov_iter *from)
struct inode *inode = file->f_mapping->host;
struct cifsInodeInfo *cinode = CIFS_I(inode);
struct TCP_Server_Info *server = tlink_tcon(cfile->tlink)->ses->server;
+ struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
ssize_t rc;
rc = netfs_start_io_write(inode);
@@ -2769,12 +2770,16 @@ cifs_writev(struct kiocb *iocb, struct iov_iter *from)
if (rc <= 0)
goto out;
- if (!cifs_find_lock_conflict(cfile, iocb->ki_pos, iov_iter_count(from),
+ if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOPOSIXBRL) &&
+ (cifs_find_lock_conflict(cfile, iocb->ki_pos, iov_iter_count(from),
server->vals->exclusive_lock_type, 0,
- NULL, CIFS_WRITE_OP))
- rc = netfs_buffered_write_iter_locked(iocb, from, NULL);
- else
+ NULL, CIFS_WRITE_OP))) {
rc = -EACCES;
+ goto out;
+ }
+
+ rc = netfs_buffered_write_iter_locked(iocb, from, NULL);
+
out:
up_read(&cinode->lock_sem);
netfs_end_io_write(inode);
1 year, 4 months
- 1
- 0
[PATCH] drm/sti: avoid potential dereference of error pointers
by Ma Ke
The return value of drm_atomic_get_crtc_state() needs to be
checked. To avoid use of error pointer 'crtc_state' in case
of the failure.
Cc: stable(a)vger.kernel.org
Fixes: dec92020671c ("drm: Use the state pointer directly in planes atomic_check")
Signed-off-by: Ma Ke <make24(a)iscas.ac.cn>
---
drivers/gpu/drm/sti/sti_cursor.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/sti/sti_cursor.c b/drivers/gpu/drm/sti/sti_cursor.c
index db0a1eb53532..e460f5ba2d87 100644
--- a/drivers/gpu/drm/sti/sti_cursor.c
+++ b/drivers/gpu/drm/sti/sti_cursor.c
@@ -200,6 +200,8 @@ static int sti_cursor_atomic_check(struct drm_plane *drm_plane,
return 0;
crtc_state = drm_atomic_get_crtc_state(state, crtc);
+ if (IS_ERR(crtc_state))
+ return PTR_ERR(crtc_state);
mode = &crtc_state->mode;
dst_x = new_plane_state->crtc_x;
dst_y = new_plane_state->crtc_y;
--
2.25.1
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] thermal: gov_bang_bang: Use governor_data to reduce overhead" failed to apply to 6.10-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.10-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.10.y
git checkout FETCH_HEAD
git cherry-pick -x 6e6f58a170ea98e44075b761f2da42a5aec47dfb
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081916-anguished-snooze-7b66@gregkh' --subject-prefix 'PATCH 6.10.y' HEAD^..
Possible dependencies:
6e6f58a170ea ("thermal: gov_bang_bang: Use governor_data to reduce overhead")
5f64b4a1ab1b ("thermal: gov_bang_bang: Add .manage() callback")
84248e35d9b6 ("thermal: gov_bang_bang: Split bang_bang_control()")
b9b6ee6fe258 ("thermal: gov_bang_bang: Call __thermal_cdev_update() directly")
2c637af8a74d ("thermal: gov_bang_bang: Drop unnecessary cooling device target state checks")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 6e6f58a170ea98e44075b761f2da42a5aec47dfb Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rafael.j.wysocki(a)intel.com>
Date: Tue, 13 Aug 2024 16:29:11 +0200
Subject: [PATCH] thermal: gov_bang_bang: Use governor_data to reduce overhead
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
After running once, the for_each_trip_desc() loop in
bang_bang_manage() is pure needless overhead because it is not going to
make any changes unless a new cooling device has been bound to one of
the trips in the thermal zone or the system is resuming from sleep.
For this reason, make bang_bang_manage() set governor_data for the
thermal zone and check it upfront to decide whether or not it needs to
do anything.
However, governor_data needs to be reset in some cases to let
bang_bang_manage() know that it should walk the trips again, so add an
.update_tz() callback to the governor and make the core additionally
invoke it during system resume.
To avoid affecting the other users of that callback unnecessarily, add
a special notification reason for system resume, THERMAL_TZ_RESUME, and
also pass it to __thermal_zone_device_update() called during system
resume for consistency.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki(a)intel.com>
Acked-by: Peter Kästle <peter(a)piie.net>
Reviewed-by: Zhang Rui <rui.zhang(a)intel.com>
Cc: 6.10+ <stable(a)vger.kernel.org> # 6.10+
Link: https://patch.msgid.link/2285575.iZASKD2KPV@rjwysocki.net
diff --git a/drivers/thermal/gov_bang_bang.c b/drivers/thermal/gov_bang_bang.c
index bc55e0698bfa..daed67d19efb 100644
--- a/drivers/thermal/gov_bang_bang.c
+++ b/drivers/thermal/gov_bang_bang.c
@@ -86,6 +86,10 @@ static void bang_bang_manage(struct thermal_zone_device *tz)
const struct thermal_trip_desc *td;
struct thermal_instance *instance;
+ /* If the code below has run already, nothing needs to be done. */
+ if (tz->governor_data)
+ return;
+
for_each_trip_desc(tz, td) {
const struct thermal_trip *trip = &td->trip;
@@ -107,11 +111,25 @@ static void bang_bang_manage(struct thermal_zone_device *tz)
bang_bang_set_instance_target(instance, 0);
}
}
+
+ tz->governor_data = (void *)true;
+}
+
+static void bang_bang_update_tz(struct thermal_zone_device *tz,
+ enum thermal_notify_event reason)
+{
+ /*
+ * Let bang_bang_manage() know that it needs to walk trips after binding
+ * a new cdev and after system resume.
+ */
+ if (reason == THERMAL_TZ_BIND_CDEV || reason == THERMAL_TZ_RESUME)
+ tz->governor_data = NULL;
}
static struct thermal_governor thermal_gov_bang_bang = {
.name = "bang_bang",
.trip_crossed = bang_bang_control,
.manage = bang_bang_manage,
+ .update_tz = bang_bang_update_tz,
};
THERMAL_GOVERNOR_DECLARE(thermal_gov_bang_bang);
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 95c399f94744..e6669aeda1ff 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -1728,7 +1728,8 @@ static void thermal_zone_device_resume(struct work_struct *work)
thermal_debug_tz_resume(tz);
thermal_zone_device_init(tz);
- __thermal_zone_device_update(tz, THERMAL_EVENT_UNSPECIFIED);
+ thermal_governor_update_tz(tz, THERMAL_TZ_RESUME);
+ __thermal_zone_device_update(tz, THERMAL_TZ_RESUME);
complete(&tz->resume);
tz->resuming = false;
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 25fbf960b474..b86ddca46b9e 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -55,6 +55,7 @@ enum thermal_notify_event {
THERMAL_TZ_BIND_CDEV, /* Cooling dev is bind to the thermal zone */
THERMAL_TZ_UNBIND_CDEV, /* Cooling dev is unbind from the thermal zone */
THERMAL_INSTANCE_WEIGHT_CHANGED, /* Thermal instance weight changed */
+ THERMAL_TZ_RESUME, /* Thermal zone is resuming after system sleep */
};
/**
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] thermal: gov_bang_bang: Add .manage() callback" failed to apply to 6.10-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.10-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.10.y
git checkout FETCH_HEAD
git cherry-pick -x 5f64b4a1ab1b0412446d42e1fc2964c2cdb60b27
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081911-parlor-reformer-542a@gregkh' --subject-prefix 'PATCH 6.10.y' HEAD^..
Possible dependencies:
5f64b4a1ab1b ("thermal: gov_bang_bang: Add .manage() callback")
84248e35d9b6 ("thermal: gov_bang_bang: Split bang_bang_control()")
b9b6ee6fe258 ("thermal: gov_bang_bang: Call __thermal_cdev_update() directly")
2c637af8a74d ("thermal: gov_bang_bang: Drop unnecessary cooling device target state checks")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 5f64b4a1ab1b0412446d42e1fc2964c2cdb60b27 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rafael.j.wysocki(a)intel.com>
Date: Tue, 13 Aug 2024 16:27:33 +0200
Subject: [PATCH] thermal: gov_bang_bang: Add .manage() callback
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
After recent changes, the Bang-bang governor may not adjust the
initial configuration of cooling devices to the actual situation.
Namely, if a cooling device bound to a certain trip point starts in
the "on" state and the thermal zone temperature is below the threshold
of that trip point, the trip point may never be crossed on the way up
in which case the state of the cooling device will never be adjusted
because the thermal core will never invoke the governor's
.trip_crossed() callback. [Note that there is no issue if the zone
temperature is at the trip threshold or above it to start with because
.trip_crossed() will be invoked then to indicate the start of thermal
mitigation for the given trip.]
To address this, add a .manage() callback to the Bang-bang governor
and use it to ensure that all of the thermal instances managed by the
governor have been initialized properly and the states of all of the
cooling devices involved have been adjusted to the current zone
temperature as appropriate.
Fixes: 530c932bdf75 ("thermal: gov_bang_bang: Use .trip_crossed() instead of .throttle()")
Link: https://lore.kernel.org/linux-pm/1bfbbae5-42b0-4c7d-9544-e98855715294@piie.…
Cc: 6.10+ <stable(a)vger.kernel.org> # 6.10+
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki(a)intel.com>
Acked-by: Peter Kästle <peter(a)piie.net>
Reviewed-by: Zhang Rui <rui.zhang(a)intel.com>
Link: https://patch.msgid.link/8419356.T7Z3S40VBb@rjwysocki.net
diff --git a/drivers/thermal/gov_bang_bang.c b/drivers/thermal/gov_bang_bang.c
index 87cff3ea77a9..bc55e0698bfa 100644
--- a/drivers/thermal/gov_bang_bang.c
+++ b/drivers/thermal/gov_bang_bang.c
@@ -26,6 +26,7 @@ static void bang_bang_set_instance_target(struct thermal_instance *instance,
* when the trip is crossed on the way down.
*/
instance->target = target;
+ instance->initialized = true;
dev_dbg(&instance->cdev->device, "target=%ld\n", instance->target);
@@ -80,8 +81,37 @@ static void bang_bang_control(struct thermal_zone_device *tz,
}
}
+static void bang_bang_manage(struct thermal_zone_device *tz)
+{
+ const struct thermal_trip_desc *td;
+ struct thermal_instance *instance;
+
+ for_each_trip_desc(tz, td) {
+ const struct thermal_trip *trip = &td->trip;
+
+ if (tz->temperature >= td->threshold ||
+ trip->temperature == THERMAL_TEMP_INVALID ||
+ trip->type == THERMAL_TRIP_CRITICAL ||
+ trip->type == THERMAL_TRIP_HOT)
+ continue;
+
+ /*
+ * If the initial cooling device state is "on", but the zone
+ * temperature is not above the trip point, the core will not
+ * call bang_bang_control() until the zone temperature reaches
+ * the trip point temperature which may be never. In those
+ * cases, set the initial state of the cooling device to 0.
+ */
+ list_for_each_entry(instance, &tz->thermal_instances, tz_node) {
+ if (!instance->initialized && instance->trip == trip)
+ bang_bang_set_instance_target(instance, 0);
+ }
+ }
+}
+
static struct thermal_governor thermal_gov_bang_bang = {
.name = "bang_bang",
.trip_crossed = bang_bang_control,
+ .manage = bang_bang_manage,
};
THERMAL_GOVERNOR_DECLARE(thermal_gov_bang_bang);
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] thermal: gov_bang_bang: Split bang_bang_control()" failed to apply to 6.10-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.10-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.10.y
git checkout FETCH_HEAD
git cherry-pick -x 84248e35d9b60e03df7276627e4e91fbaf80f73d
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081904-sprite-urologist-d8e9@gregkh' --subject-prefix 'PATCH 6.10.y' HEAD^..
Possible dependencies:
84248e35d9b6 ("thermal: gov_bang_bang: Split bang_bang_control()")
b9b6ee6fe258 ("thermal: gov_bang_bang: Call __thermal_cdev_update() directly")
2c637af8a74d ("thermal: gov_bang_bang: Drop unnecessary cooling device target state checks")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 84248e35d9b60e03df7276627e4e91fbaf80f73d Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rafael.j.wysocki(a)intel.com>
Date: Tue, 13 Aug 2024 16:26:42 +0200
Subject: [PATCH] thermal: gov_bang_bang: Split bang_bang_control()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Move the setting of the thermal instance target state from
bang_bang_control() into a separate function that will be also called
in a different place going forward.
No intentional functional impact.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki(a)intel.com>
Acked-by: Peter Kästle <peter(a)piie.net>
Reviewed-by: Zhang Rui <rui.zhang(a)intel.com>
Cc: 6.10+ <stable(a)vger.kernel.org> # 6.10+
Link: https://patch.msgid.link/3313587.aeNJFYEL58@rjwysocki.net
diff --git a/drivers/thermal/gov_bang_bang.c b/drivers/thermal/gov_bang_bang.c
index b9474c6af72b..87cff3ea77a9 100644
--- a/drivers/thermal/gov_bang_bang.c
+++ b/drivers/thermal/gov_bang_bang.c
@@ -13,6 +13,27 @@
#include "thermal_core.h"
+static void bang_bang_set_instance_target(struct thermal_instance *instance,
+ unsigned int target)
+{
+ if (instance->target != 0 && instance->target != 1 &&
+ instance->target != THERMAL_NO_TARGET)
+ pr_debug("Unexpected state %ld of thermal instance %s in bang-bang\n",
+ instance->target, instance->name);
+
+ /*
+ * Enable the fan when the trip is crossed on the way up and disable it
+ * when the trip is crossed on the way down.
+ */
+ instance->target = target;
+
+ dev_dbg(&instance->cdev->device, "target=%ld\n", instance->target);
+
+ mutex_lock(&instance->cdev->lock);
+ __thermal_cdev_update(instance->cdev);
+ mutex_unlock(&instance->cdev->lock);
+}
+
/**
* bang_bang_control - controls devices associated with the given zone
* @tz: thermal_zone_device
@@ -54,25 +75,8 @@ static void bang_bang_control(struct thermal_zone_device *tz,
tz->temperature, trip->hysteresis);
list_for_each_entry(instance, &tz->thermal_instances, tz_node) {
- if (instance->trip != trip)
- continue;
-
- if (instance->target != 0 && instance->target != 1 &&
- instance->target != THERMAL_NO_TARGET)
- pr_debug("Unexpected state %ld of thermal instance %s in bang-bang\n",
- instance->target, instance->name);
-
- /*
- * Enable the fan when the trip is crossed on the way up and
- * disable it when the trip is crossed on the way down.
- */
- instance->target = crossed_up;
-
- dev_dbg(&instance->cdev->device, "target=%ld\n", instance->target);
-
- mutex_lock(&instance->cdev->lock);
- __thermal_cdev_update(instance->cdev);
- mutex_unlock(&instance->cdev->lock);
+ if (instance->trip == trip)
+ bang_bang_set_instance_target(instance, crossed_up);
}
}
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] ALSA: timer: Relax start tick time check for slave timer" failed to apply to 5.4-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y
git checkout FETCH_HEAD
git cherry-pick -x ccbfcac05866ebe6eb3bc6d07b51d4ed4fcde436
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081930-untoasted-corporal-214e@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^..
Possible dependencies:
ccbfcac05866 ("ALSA: timer: Relax start tick time check for slave timer elements")
4a63bd179fa8 ("ALSA: timer: Set lower bound of start tick time")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From ccbfcac05866ebe6eb3bc6d07b51d4ed4fcde436 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai(a)suse.de>
Date: Sat, 10 Aug 2024 10:48:32 +0200
Subject: [PATCH] ALSA: timer: Relax start tick time check for slave timer
elements
The recent addition of a sanity check for a too low start tick time
seems breaking some applications that uses aloop with a certain slave
timer setup. They may have the initial resolution 0, hence it's
treated as if it were a too low value.
Relax and skip the check for the slave timer instance for addressing
the regression.
Fixes: 4a63bd179fa8 ("ALSA: timer: Set lower bound of start tick time")
Cc: <stable(a)vger.kernel.org>
Link: https://github.com/raspberrypi/linux/issues/6294
Link: https://patch.msgid.link/20240810084833.10939-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai(a)suse.de>
diff --git a/sound/core/timer.c b/sound/core/timer.c
index d104adc75a8b..71a07c1662f5 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -547,7 +547,7 @@ static int snd_timer_start1(struct snd_timer_instance *timeri,
/* check the actual time for the start tick;
* bail out as error if it's way too low (< 100us)
*/
- if (start) {
+ if (start && !(timer->hw.flags & SNDRV_TIMER_HW_SLAVE)) {
if ((u64)snd_timer_hw_resolution(timer) * ticks < 100000)
return -EINVAL;
}
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] ALSA: timer: Relax start tick time check for slave timer" failed to apply to 4.19-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.19.y
git checkout FETCH_HEAD
git cherry-pick -x ccbfcac05866ebe6eb3bc6d07b51d4ed4fcde436
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081931-improvise-purgatory-bbe3@gregkh' --subject-prefix 'PATCH 4.19.y' HEAD^..
Possible dependencies:
ccbfcac05866 ("ALSA: timer: Relax start tick time check for slave timer elements")
4a63bd179fa8 ("ALSA: timer: Set lower bound of start tick time")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From ccbfcac05866ebe6eb3bc6d07b51d4ed4fcde436 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai(a)suse.de>
Date: Sat, 10 Aug 2024 10:48:32 +0200
Subject: [PATCH] ALSA: timer: Relax start tick time check for slave timer
elements
The recent addition of a sanity check for a too low start tick time
seems breaking some applications that uses aloop with a certain slave
timer setup. They may have the initial resolution 0, hence it's
treated as if it were a too low value.
Relax and skip the check for the slave timer instance for addressing
the regression.
Fixes: 4a63bd179fa8 ("ALSA: timer: Set lower bound of start tick time")
Cc: <stable(a)vger.kernel.org>
Link: https://github.com/raspberrypi/linux/issues/6294
Link: https://patch.msgid.link/20240810084833.10939-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai(a)suse.de>
diff --git a/sound/core/timer.c b/sound/core/timer.c
index d104adc75a8b..71a07c1662f5 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -547,7 +547,7 @@ static int snd_timer_start1(struct snd_timer_instance *timeri,
/* check the actual time for the start tick;
* bail out as error if it's way too low (< 100us)
*/
- if (start) {
+ if (start && !(timer->hw.flags & SNDRV_TIMER_HW_SLAVE)) {
if ((u64)snd_timer_hw_resolution(timer) * ticks < 100000)
return -EINVAL;
}
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] ALSA: timer: Relax start tick time check for slave timer" failed to apply to 5.10-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x ccbfcac05866ebe6eb3bc6d07b51d4ed4fcde436
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081930-commuting-makeover-de1c@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
ccbfcac05866 ("ALSA: timer: Relax start tick time check for slave timer elements")
4a63bd179fa8 ("ALSA: timer: Set lower bound of start tick time")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From ccbfcac05866ebe6eb3bc6d07b51d4ed4fcde436 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai(a)suse.de>
Date: Sat, 10 Aug 2024 10:48:32 +0200
Subject: [PATCH] ALSA: timer: Relax start tick time check for slave timer
elements
The recent addition of a sanity check for a too low start tick time
seems breaking some applications that uses aloop with a certain slave
timer setup. They may have the initial resolution 0, hence it's
treated as if it were a too low value.
Relax and skip the check for the slave timer instance for addressing
the regression.
Fixes: 4a63bd179fa8 ("ALSA: timer: Set lower bound of start tick time")
Cc: <stable(a)vger.kernel.org>
Link: https://github.com/raspberrypi/linux/issues/6294
Link: https://patch.msgid.link/20240810084833.10939-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai(a)suse.de>
diff --git a/sound/core/timer.c b/sound/core/timer.c
index d104adc75a8b..71a07c1662f5 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -547,7 +547,7 @@ static int snd_timer_start1(struct snd_timer_instance *timeri,
/* check the actual time for the start tick;
* bail out as error if it's way too low (< 100us)
*/
- if (start) {
+ if (start && !(timer->hw.flags & SNDRV_TIMER_HW_SLAVE)) {
if ((u64)snd_timer_hw_resolution(timer) * ticks < 100000)
return -EINVAL;
}
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] ALSA: timer: Relax start tick time check for slave timer" failed to apply to 5.15-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x ccbfcac05866ebe6eb3bc6d07b51d4ed4fcde436
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081929-kangaroo-abstract-f5d8@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
ccbfcac05866 ("ALSA: timer: Relax start tick time check for slave timer elements")
4a63bd179fa8 ("ALSA: timer: Set lower bound of start tick time")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From ccbfcac05866ebe6eb3bc6d07b51d4ed4fcde436 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai(a)suse.de>
Date: Sat, 10 Aug 2024 10:48:32 +0200
Subject: [PATCH] ALSA: timer: Relax start tick time check for slave timer
elements
The recent addition of a sanity check for a too low start tick time
seems breaking some applications that uses aloop with a certain slave
timer setup. They may have the initial resolution 0, hence it's
treated as if it were a too low value.
Relax and skip the check for the slave timer instance for addressing
the regression.
Fixes: 4a63bd179fa8 ("ALSA: timer: Set lower bound of start tick time")
Cc: <stable(a)vger.kernel.org>
Link: https://github.com/raspberrypi/linux/issues/6294
Link: https://patch.msgid.link/20240810084833.10939-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai(a)suse.de>
diff --git a/sound/core/timer.c b/sound/core/timer.c
index d104adc75a8b..71a07c1662f5 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -547,7 +547,7 @@ static int snd_timer_start1(struct snd_timer_instance *timeri,
/* check the actual time for the start tick;
* bail out as error if it's way too low (< 100us)
*/
- if (start) {
+ if (start && !(timer->hw.flags & SNDRV_TIMER_HW_SLAVE)) {
if ((u64)snd_timer_hw_resolution(timer) * ticks < 100000)
return -EINVAL;
}
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] ALSA: timer: Relax start tick time check for slave timer" failed to apply to 6.6-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x ccbfcac05866ebe6eb3bc6d07b51d4ed4fcde436
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081927-ungodly-gumminess-adf9@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
ccbfcac05866 ("ALSA: timer: Relax start tick time check for slave timer elements")
4a63bd179fa8 ("ALSA: timer: Set lower bound of start tick time")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From ccbfcac05866ebe6eb3bc6d07b51d4ed4fcde436 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai(a)suse.de>
Date: Sat, 10 Aug 2024 10:48:32 +0200
Subject: [PATCH] ALSA: timer: Relax start tick time check for slave timer
elements
The recent addition of a sanity check for a too low start tick time
seems breaking some applications that uses aloop with a certain slave
timer setup. They may have the initial resolution 0, hence it's
treated as if it were a too low value.
Relax and skip the check for the slave timer instance for addressing
the regression.
Fixes: 4a63bd179fa8 ("ALSA: timer: Set lower bound of start tick time")
Cc: <stable(a)vger.kernel.org>
Link: https://github.com/raspberrypi/linux/issues/6294
Link: https://patch.msgid.link/20240810084833.10939-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai(a)suse.de>
diff --git a/sound/core/timer.c b/sound/core/timer.c
index d104adc75a8b..71a07c1662f5 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -547,7 +547,7 @@ static int snd_timer_start1(struct snd_timer_instance *timeri,
/* check the actual time for the start tick;
* bail out as error if it's way too low (< 100us)
*/
- if (start) {
+ if (start && !(timer->hw.flags & SNDRV_TIMER_HW_SLAVE)) {
if ((u64)snd_timer_hw_resolution(timer) * ticks < 100000)
return -EINVAL;
}
1 year, 4 months
- 1
- 0
FAILED: patch "[PATCH] ALSA: timer: Relax start tick time check for slave timer" failed to apply to 6.1-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x ccbfcac05866ebe6eb3bc6d07b51d4ed4fcde436
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081928-deduct-humongous-41ae@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
ccbfcac05866 ("ALSA: timer: Relax start tick time check for slave timer elements")
4a63bd179fa8 ("ALSA: timer: Set lower bound of start tick time")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From ccbfcac05866ebe6eb3bc6d07b51d4ed4fcde436 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai(a)suse.de>
Date: Sat, 10 Aug 2024 10:48:32 +0200
Subject: [PATCH] ALSA: timer: Relax start tick time check for slave timer
elements
The recent addition of a sanity check for a too low start tick time
seems breaking some applications that uses aloop with a certain slave
timer setup. They may have the initial resolution 0, hence it's
treated as if it were a too low value.
Relax and skip the check for the slave timer instance for addressing
the regression.
Fixes: 4a63bd179fa8 ("ALSA: timer: Set lower bound of start tick time")
Cc: <stable(a)vger.kernel.org>
Link: https://github.com/raspberrypi/linux/issues/6294
Link: https://patch.msgid.link/20240810084833.10939-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai(a)suse.de>
diff --git a/sound/core/timer.c b/sound/core/timer.c
index d104adc75a8b..71a07c1662f5 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -547,7 +547,7 @@ static int snd_timer_start1(struct snd_timer_instance *timeri,
/* check the actual time for the start tick;
* bail out as error if it's way too low (< 100us)
*/
- if (start) {
+ if (start && !(timer->hw.flags & SNDRV_TIMER_HW_SLAVE)) {
if ((u64)snd_timer_hw_resolution(timer) * ticks < 100000)
return -EINVAL;
}
1 year, 4 months
- 1
- 0
[PATCH RESEND] wifi: mt76: mt7996: fix NULL pointer dereference in mt7996_mcu_sta_bfer_he
by Ma Ke
Fix the NULL pointer dereference in mt7996_mcu_sta_bfer_he
routine adding an sta interface to the mt7996 driver.
Found by code review.
Cc: stable(a)vger.kernel.org
Fixes: 98686cd21624 ("wifi: mt76: mt7996: add driver for MediaTek Wi-Fi 7 (802.11be) devices")
Signed-off-by: Ma Ke <make24(a)iscas.ac.cn>
---
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
index 2e4fa9f48dfb..cba28d8d5562 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
@@ -1544,6 +1544,9 @@ mt7996_mcu_sta_bfer_he(struct ieee80211_sta *sta, struct ieee80211_vif *vif,
u8 nss_mcs = mt7996_mcu_get_sta_nss(mcs_map);
u8 snd_dim, sts;
+ if (!vc)
+ return;
+
bf->tx_mode = MT_PHY_TYPE_HE_SU;
mt7996_mcu_sta_sounding_rate(bf);
--
2.25.1
1 year, 4 months
- 1
- 0
[PATCH] drm/radeon/evergreen_cs: fix int overflow errors in cs track offsets
by Nikita Zhandarovich
Several cs track offsets (such as 'track->db_s_read_offset')
either are initialized with or plainly take big enough values that,
once shifted 8 bits left, may be hit with integer overflow if the
resulting values end up going over u32 limit.
Some debug prints take this into account (see according dev_warn() in
evergreen_cs_track_validate_stencil()), even if the actual
calculated value assigned to local 'offset' variable is missing
similar proper expansion.
Mitigate the problem by casting the type of right operands to the
wider type of corresponding left ones in all such cases.
Found by Linux Verification Center (linuxtesting.org) with static
analysis tool SVACE.
Fixes: 285484e2d55e ("drm/radeon: add support for evergreen/ni tiling informations v11")
Cc: stable(a)vger.kernel.org
Signed-off-by: Nikita Zhandarovich <n.zhandarovich(a)fintech.ru>
---
P.S. While I am not certain that track->cb_color_bo_offset[id]
actually ends up taking values high enough to cause an overflow,
nonetheless I thought it prudent to cast it to ulong as well.
drivers/gpu/drm/radeon/evergreen_cs.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c
index 1fe6e0d883c7..d734d221e2da 100644
--- a/drivers/gpu/drm/radeon/evergreen_cs.c
+++ b/drivers/gpu/drm/radeon/evergreen_cs.c
@@ -433,7 +433,7 @@ static int evergreen_cs_track_validate_cb(struct radeon_cs_parser *p, unsigned i
return r;
}
- offset = track->cb_color_bo_offset[id] << 8;
+ offset = (unsigned long)track->cb_color_bo_offset[id] << 8;
if (offset & (surf.base_align - 1)) {
dev_warn(p->dev, "%s:%d cb[%d] bo base %ld not aligned with %ld\n",
__func__, __LINE__, id, offset, surf.base_align);
@@ -455,7 +455,7 @@ static int evergreen_cs_track_validate_cb(struct radeon_cs_parser *p, unsigned i
min = surf.nby - 8;
}
bsize = radeon_bo_size(track->cb_color_bo[id]);
- tmp = track->cb_color_bo_offset[id] << 8;
+ tmp = (unsigned long)track->cb_color_bo_offset[id] << 8;
for (nby = surf.nby; nby > min; nby--) {
size = nby * surf.nbx * surf.bpe * surf.nsamples;
if ((tmp + size * mslice) <= bsize) {
@@ -476,10 +476,10 @@ static int evergreen_cs_track_validate_cb(struct radeon_cs_parser *p, unsigned i
}
}
dev_warn(p->dev, "%s:%d cb[%d] bo too small (layer size %d, "
- "offset %d, max layer %d, bo size %ld, slice %d)\n",
+ "offset %ld, max layer %d, bo size %ld, slice %d)\n",
__func__, __LINE__, id, surf.layer_size,
- track->cb_color_bo_offset[id] << 8, mslice,
- radeon_bo_size(track->cb_color_bo[id]), slice);
+ (unsigned long)track->cb_color_bo_offset[id] << 8,
+ mslice, radeon_bo_size(track->cb_color_bo[id]), slice);
dev_warn(p->dev, "%s:%d problematic surf: (%d %d) (%d %d %d %d %d %d %d)\n",
__func__, __LINE__, surf.nbx, surf.nby,
surf.mode, surf.bpe, surf.nsamples,
@@ -608,7 +608,7 @@ static int evergreen_cs_track_validate_stencil(struct radeon_cs_parser *p)
return r;
}
- offset = track->db_s_read_offset << 8;
+ offset = (unsigned long)track->db_s_read_offset << 8;
if (offset & (surf.base_align - 1)) {
dev_warn(p->dev, "%s:%d stencil read bo base %ld not aligned with %ld\n",
__func__, __LINE__, offset, surf.base_align);
@@ -627,7 +627,7 @@ static int evergreen_cs_track_validate_stencil(struct radeon_cs_parser *p)
return -EINVAL;
}
- offset = track->db_s_write_offset << 8;
+ offset = (unsigned long)track->db_s_write_offset << 8;
if (offset & (surf.base_align - 1)) {
dev_warn(p->dev, "%s:%d stencil write bo base %ld not aligned with %ld\n",
__func__, __LINE__, offset, surf.base_align);
@@ -706,7 +706,7 @@ static int evergreen_cs_track_validate_depth(struct radeon_cs_parser *p)
return r;
}
- offset = track->db_z_read_offset << 8;
+ offset = (unsigned long)track->db_z_read_offset << 8;
if (offset & (surf.base_align - 1)) {
dev_warn(p->dev, "%s:%d stencil read bo base %ld not aligned with %ld\n",
__func__, __LINE__, offset, surf.base_align);
@@ -722,7 +722,7 @@ static int evergreen_cs_track_validate_depth(struct radeon_cs_parser *p)
return -EINVAL;
}
- offset = track->db_z_write_offset << 8;
+ offset = (unsigned long)track->db_z_write_offset << 8;
if (offset & (surf.base_align - 1)) {
dev_warn(p->dev, "%s:%d stencil write bo base %ld not aligned with %ld\n",
__func__, __LINE__, offset, surf.base_align);
1 year, 4 months
- 3
- 13
[PATCH] tty: vt: conmakehash: cope with abs_srctree no longer in env
by max.oss.09＠gmail.com
From: Max Krummenacher <max.krummenacher(a)toradex.com>
conmakehash uses getenv("abs_srctree") from the environment to strip
the absolute path from the generated sources.
However since commit e2bad142bb3d ("kbuild: unexport abs_srctree and
abs_objtree") this environment variable no longer gets set.
Instead use basename() to indicate the used file in a comment of the
generated source file.
Fixes: 3bd85c6c97b2 ("tty: vt: conmakehash: Don't mention the full path of the input in output")
Signed-off-by: Max Krummenacher <max.krummenacher(a)toradex.com>
---
drivers/tty/vt/conmakehash.c | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/drivers/tty/vt/conmakehash.c b/drivers/tty/vt/conmakehash.c
index dc2177fec715..82d9db68b2ce 100644
--- a/drivers/tty/vt/conmakehash.c
+++ b/drivers/tty/vt/conmakehash.c
@@ -11,6 +11,8 @@
* Copyright (C) 1995-1997 H. Peter Anvin
*/
+#include <libgen.h>
+#include <linux/limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <sysexits.h>
@@ -76,8 +78,8 @@ static void addpair(int fp, int un)
int main(int argc, char *argv[])
{
FILE *ctbl;
- const char *tblname, *rel_tblname;
- const char *abs_srctree;
+ const char *tblname;
+ char base_tblname[PATH_MAX];
char buffer[65536];
int fontlen;
int i, nuni, nent;
@@ -102,16 +104,6 @@ int main(int argc, char *argv[])
}
}
- abs_srctree = getenv("abs_srctree");
- if (abs_srctree && !strncmp(abs_srctree, tblname, strlen(abs_srctree)))
- {
- rel_tblname = tblname + strlen(abs_srctree);
- while (*rel_tblname == '/')
- ++rel_tblname;
- }
- else
- rel_tblname = tblname;
-
/* For now we assume the default font is always 256 characters. */
fontlen = 256;
@@ -253,6 +245,8 @@ int main(int argc, char *argv[])
for ( i = 0 ; i < fontlen ; i++ )
nuni += unicount[i];
+ strncpy(base_tblname, tblname, PATH_MAX);
+ base_tblname[PATH_MAX - 1] = 0;
printf("\
/*\n\
* Do not edit this file; it was automatically generated by\n\
@@ -264,7 +258,7 @@ int main(int argc, char *argv[])
#include <linux/types.h>\n\
\n\
u8 dfont_unicount[%d] = \n\
-{\n\t", rel_tblname, fontlen);
+{\n\t", basename(base_tblname), fontlen);
for ( i = 0 ; i < fontlen ; i++ )
{
--
2.42.0
1 year, 4 months
- 5
- 5
[PATCH v4] scsi: sd: retry command SYNC CACHE if format in progress
by Yihang Li
If formatting a suspended disk (such as formatting with different DIF
type), the disk will be resuming first, and then the format command will
submit to the disk through SG_IO ioctl.
When the disk is processing the format command, the system does not submit
other commands to the disk. Therefore, the system attempts to suspend the
disk again and sends the SYNC CACHE command. However, the SYNC CACHE
command will fail because the disk is in the formatting process, which
will cause the runtime_status of the disk to error and it is difficult
for user to recover it. Error info like:
[ 669.925325] sd 6:0:6:0: [sdg] Synchronizing SCSI cache
[ 670.202371] sd 6:0:6:0: [sdg] Synchronize Cache(10) failed: Result: hostbyte=0x00 driverbyte=DRIVER_OK
[ 670.216300] sd 6:0:6:0: [sdg] Sense Key : 0x2 [current]
[ 670.221860] sd 6:0:6:0: [sdg] ASC=0x4 ASCQ=0x4
To solve the issue, retry the command until format command is finished.
Cc: stable(a)vger.kernel.org
Signed-off-by: Yihang Li <liyihang9(a)huawei.com>
Reviewed-by: Bart Van Assche <bvanassche(a)acm.org>
---
Changes since v3:
- Add Cc tag for kernel stable.
Changes since v2:
- Add Reviewed-by for Bart.
Changes since v1:
- Updated and added error information to the patch description.
---
drivers/scsi/sd.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index adeaa8ab9951..5cd88a8eea73 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1823,6 +1823,11 @@ static int sd_sync_cache(struct scsi_disk *sdkp)
(sshdr.asc == 0x74 && sshdr.ascq == 0x71)) /* drive is password locked */
/* this is no error here */
return 0;
+
+ /* retry if format in progress */
+ if (sshdr.asc == 0x4 && sshdr.ascq == 0x4)
+ return -EBUSY;
+
/*
* This drive doesn't support sync and there's not much
* we can do because this is called during shutdown
--
2.33.0
1 year, 4 months
- 2
- 4
[v2] usb: dwc3: Avoid waking up gadget during startxfer
by Prashanth K
When operating in High-Speed, it is observed that DSTS[USBLNKST] doesn't
update link state immediately after receiving the wakeup interrupt. Since
wakeup event handler calls the resume callbacks, there is a chance that
function drivers can perform an ep queue, which in turn tries to perform
remote wakeup from send_gadget_ep_cmd(STARTXFER). This happens because
DSTS[[21:18] wasn't updated to U0 yet, it's observed that the latency of
DSTS can be in order of milli-seconds. Hence avoid calling gadget_wakeup
during startxfer to prevent unnecessarily issuing remote wakeup to host.
Fixes: c36d8e947a56 ("usb: dwc3: gadget: put link to U0 before Start Transfer")
Cc: <stable(a)vger.kernel.org>
Suggested-by: Thinh Nguyen <Thinh.Nguyen(a)synopsys.com>
Signed-off-by: Prashanth K <quic_prashk(a)quicinc.com>
---
v2: Refactored the patch as suggested in v1 discussion.
drivers/usb/dwc3/gadget.c | 24 ------------------------
1 file changed, 24 deletions(-)
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 89fc690fdf34..3f634209c5b8 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -327,30 +327,6 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned int cmd,
dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg);
}
- if (DWC3_DEPCMD_CMD(cmd) == DWC3_DEPCMD_STARTTRANSFER) {
- int link_state;
-
- /*
- * Initiate remote wakeup if the link state is in U3 when
- * operating in SS/SSP or L1/L2 when operating in HS/FS. If the
- * link state is in U1/U2, no remote wakeup is needed. The Start
- * Transfer command will initiate the link recovery.
- */
- link_state = dwc3_gadget_get_link_state(dwc);
- switch (link_state) {
- case DWC3_LINK_STATE_U2:
- if (dwc->gadget->speed >= USB_SPEED_SUPER)
- break;
-
- fallthrough;
- case DWC3_LINK_STATE_U3:
- ret = __dwc3_gadget_wakeup(dwc, false);
- dev_WARN_ONCE(dwc->dev, ret, "wakeup failed --> %d\n",
- ret);
- break;
- }
- }
-
/*
* For some commands such as Update Transfer command, DEPCMDPARn
* registers are reserved. Since the driver often sends Update Transfer
--
2.25.1
1 year, 4 months
- 2
- 2
Linux 6.10.6
by Greg Kroah-Hartman
I'm announcing the release of the 6.10.6 kernel.
All users of the 6.10 kernel series must upgrade.
The updated 6.10.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.10.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2
arch/loongarch/include/uapi/asm/unistd.h | 1
drivers/ata/libata-scsi.c | 15
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 14
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 232 ++++--------
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 6
drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 90 +++-
drivers/gpu/drm/amd/display/dc/dc_stream.h | 8
drivers/gpu/drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 2
drivers/media/usb/dvb-usb/dvb-usb-init.c | 35 -
drivers/nvme/host/pci.c | 7
drivers/platform/x86/Kconfig | 1
drivers/platform/x86/amd/pmf/spc.c | 32 -
drivers/platform/x86/ideapad-laptop.c | 148 ++++++-
drivers/platform/x86/ideapad-laptop.h | 9
drivers/platform/x86/lenovo-ymc.c | 60 ---
fs/binfmt_flat.c | 4
fs/exec.c | 8
fs/f2fs/extent_cache.c | 48 --
fs/f2fs/f2fs.h | 2
fs/f2fs/gc.c | 10
fs/f2fs/inode.c | 10
fs/jfs/jfs_dmap.c | 2
fs/jfs/jfs_dtree.c | 2
fs/ntfs3/frecord.c | 75 +++
net/core/filter.c | 8
net/ipv4/fou_core.c | 2
sound/soc/codecs/cs35l56-shared.c | 1
sound/usb/mixer.c | 7
29 files changed, 486 insertions(+), 355 deletions(-)
Chao Yu (2):
f2fs: fix to do sanity check on F2FS_INLINE_DATA flag in inode during GC
f2fs: fix to cover read extent cache access with lock
Edward Adam Davis (1):
jfs: fix null ptr deref in dtInsertEntry
Fangzhi Zuo (1):
drm/amd/display: Prevent IPX From Link Detect and Set Mode
Gergo Koteles (3):
platform/x86: ideapad-laptop: introduce a generic notification chain
platform/x86: ideapad-laptop: move ymc_trigger_ec from lenovo-ymc
platform/x86: ideapad-laptop: add a mutex to synchronize VPC commands
Greg Kroah-Hartman (2):
Revert "drm/amd/display: Refactor function dm_dp_mst_is_port_support_mode()"
Linux 6.10.6
Harry Wentland (1):
drm/amd/display: Separate setting and programming of cursor
Huacai Chen (1):
LoongArch: Define __ARCH_WANT_NEW_STAT in unistd.h
Kees Cook (2):
exec: Fix ToCToU between perm check and set-uid/gid usage
binfmt_flat: Fix corruption when not offsetting data start
Konstantin Komarov (1):
fs/ntfs3: Do copy_to_user out of run_lock
Niklas Cassel (1):
Revert "ata: libata-scsi: Honor the D_SENSE bit for CK_COND=1 and no error"
Pei Li (1):
jfs: Fix shift-out-of-bounds in dbDiscardAG
Sean Young (1):
media: Revert "media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()"
Shyam Sundar S K (1):
platform/x86/amd/pmf: Fix to Update HPD Data When ALS is Disabled
Simon Trimmer (1):
ASoC: cs35l56: Patch CS35L56_IRQ1_MASK_18 to the default value
Srinivasan Shanmugam (1):
drm/amdgpu/display: Fix null pointer dereference in dc_stream_program_cursor_position
Takashi Iwai (1):
ALSA: usb: Fix UBSAN warning in parse_audio_unit()
WangYuli (1):
nvme/pci: Add APST quirk for Lenovo N60z laptop
Wayne Lin (2):
drm/amd/display: Defer handling mst up request in resume
drm/amd/display: Solve mst monitors blank out problem after resume
Willem de Bruijn (1):
fou: remove warn in gue_gro_receive on unsupported protocol
yunshui (1):
bpf, net: Use DEV_STAT_INC()
1 year, 4 months
- 1
- 1
Linux 6.6.47
by Greg Kroah-Hartman
I'm announcing the release of the 6.6.47 kernel.
All users of the 6.6 kernel series must upgrade.
The updated 6.6.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.6.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/bpf/map_lpm_trie.rst | 2
Documentation/mm/page_table_check.rst | 9
Makefile | 2
arch/arm64/kvm/hyp/pgtable.c | 12 -
arch/loongarch/include/uapi/asm/unistd.h | 1
arch/x86/include/asm/pgtable.h | 18 -
drivers/ata/libata-scsi.c | 15 +
drivers/isdn/mISDN/socket.c | 10
drivers/media/usb/dvb-usb/dvb-usb-init.c | 35 ---
drivers/net/ppp/pppoe.c | 23 --
drivers/nvme/host/pci.c | 7
fs/binfmt_flat.c | 4
fs/buffer.c | 2
fs/cramfs/inode.c | 2
fs/erofs/decompressor.c | 8
fs/exec.c | 8
fs/ext4/inode.c | 24 +-
fs/ext4/xattr.c | 155 ++++++--------
fs/f2fs/extent_cache.c | 48 +---
fs/f2fs/f2fs.h | 2
fs/f2fs/gc.c | 10
fs/f2fs/inode.c | 10
fs/fhandle.c | 6
fs/jfs/jfs_dmap.c | 2
fs/jfs/jfs_dtree.c | 2
fs/jfs/jfs_logmgr.c | 33 +--
fs/jfs/jfs_logmgr.h | 2
fs/jfs/jfs_mount.c | 3
fs/lockd/svc.c | 3
fs/nfs/callback.c | 3
fs/nfsd/cache.h | 2
fs/nfsd/export.c | 32 ++
fs/nfsd/export.h | 4
fs/nfsd/netns.h | 25 +-
fs/nfsd/nfs4proc.c | 6
fs/nfsd/nfs4state.c | 3
fs/nfsd/nfscache.c | 40 ---
fs/nfsd/nfsctl.c | 16 -
fs/nfsd/nfsd.h | 1
fs/nfsd/nfsfh.c | 3
fs/nfsd/nfssvc.c | 14 -
fs/nfsd/stats.c | 54 ++--
fs/nfsd/stats.h | 90 +++-----
fs/nfsd/vfs.c | 6
fs/ntfs3/frecord.c | 75 ++++++
fs/quota/quota_tree.c | 128 ++++++++---
fs/quota/quota_v2.c | 15 -
fs/reiserfs/stree.c | 2
fs/romfs/super.c | 2
fs/squashfs/block.c | 2
fs/squashfs/file.c | 3
fs/squashfs/file_direct.c | 6
fs/super.c | 15 -
include/linux/cgroup-defs.h | 7
include/linux/fs.h | 3
include/linux/sockptr.h | 25 ++
include/linux/sunrpc/svc.h | 5
include/uapi/linux/bpf.h | 19 +
kernel/bpf/lpm_trie.c | 33 +--
kernel/cgroup/cgroup-internal.h | 3
kernel/cgroup/cgroup.c | 23 +-
kernel/irq/cpuhotplug.c | 27 ++
kernel/irq/manage.c | 12 -
mm/debug_vm_pgtable.c | 31 --
mm/gup.c | 251 +++++++++++------------
mm/huge_memory.c | 6
mm/hugetlb.c | 2
mm/internal.h | 4
mm/page_table_check.c | 30 ++
net/bluetooth/rfcomm/sock.c | 14 -
net/core/filter.c | 8
net/ipv4/fou_core.c | 2
net/ipv4/tcp_metrics.c | 7
net/mac80211/iface.c | 27 ++
net/nfc/llcp_sock.c | 12 -
net/rds/recv.c | 13 +
net/sched/sch_generic.c | 5
net/sctp/inqueue.c | 14 -
net/sunrpc/stats.c | 2
net/sunrpc/svc.c | 39 ++-
net/wireless/nl80211.c | 6
samples/bpf/map_perf_test_user.c | 2
samples/bpf/xdp_router_ipv4_user.c | 2
sound/soc/soc-topology.c | 32 --
sound/usb/mixer.c | 7
tools/include/uapi/linux/bpf.h | 19 +
tools/testing/selftests/bpf/progs/map_ptr_kern.c | 2
tools/testing/selftests/bpf/test_lpm_map.c | 18 -
tools/testing/selftests/net/tls.c | 14 +
89 files changed, 1003 insertions(+), 728 deletions(-)
Alexei Starovoitov (1):
bpf: Avoid kfree_rcu() under lock in bpf_lpm_trie.
Allison Henderson (1):
net:rds: Fix possible deadlock in rds_message_put
Amadeusz Sławiński (2):
ASoC: topology: Clean up route loading
ASoC: topology: Fix route memory corruption
Chao Yu (2):
f2fs: fix to do sanity check on F2FS_INLINE_DATA flag in inode during GC
f2fs: fix to cover read extent cache access with lock
Chuck Lever (2):
NFSD: Rewrite synopsis of nfsd_percpu_counters_init()
NFSD: Fix frame size warning in svc_export_parse()
Dave Kleikamp (1):
Revert "jfs: fix shift-out-of-bounds in dbJoin"
David Stevens (1):
genirq/cpuhotplug: Skip suspended interrupts when restoring affinity
Dmitry Antipov (1):
net: sctp: fix skb leak in sctp_inq_free()
Dongli Zhang (1):
genirq/cpuhotplug: Retry with cpu_online_mask when migration fails
Edward Adam Davis (2):
reiserfs: fix uninit-value in comp_keys
jfs: fix null ptr deref in dtInsertEntry
Eric Dumazet (5):
tcp_metrics: optimize tcp_metrics_flush_all()
mISDN: fix MISDN_TIME_STAMP handling
net: add copy_safe_from_sockptr() helper
nfc: llcp: fix nfc_llcp_setsockopt() unsafe copies
wifi: cfg80211: restrict NL80211_ATTR_TXQ_QUANTUM values
Gao Xiang (1):
erofs: avoid debugging output for (de)compressed data
Gavrilov Ilia (1):
pppoe: Fix memory leak in pppoe_sendmsg()
Greg Kroah-Hartman (1):
Linux 6.6.47
Gustavo A. R. Silva (1):
fs: Annotate struct file_handle with __counted_by() and use struct_size()
Huacai Chen (1):
LoongArch: Define __ARCH_WANT_NEW_STAT in unistd.h
Jakub Kicinski (1):
net: don't dump stack on queue timeout
Jan Kara (5):
fs: Convert to bdev_open_by_dev()
jfs: Convert to bdev_open_by_dev()
quota: Detect loops in quota tree
ext4: fold quota accounting into ext4_xattr_inode_lookup_create()
ext4: do not create EA inode under buffer lock
Javier Carrasco (2):
Input: bcm5974 - check endpoint type before starting traffic
Revert "Input: bcm5974 - check endpoint type before starting traffic"
Johannes Berg (2):
wifi: mac80211: take wiphy lock for MAC addr change
wifi: mac80211: fix change_address deadlock during unregister
John Fastabend (1):
net: tls, add test to capture error on large splice
Josef Bacik (10):
sunrpc: don't change ->sv_stats if it doesn't exist
nfsd: stop setting ->pg_stats for unused stats
sunrpc: pass in the sv_stats struct through svc_create_pooled
sunrpc: remove ->pg_stats from svc_program
sunrpc: use the struct net as the svc proc private
nfsd: rename NFSD_NET_* to NFSD_STATS_*
nfsd: expose /proc/net/sunrpc/nfsd in net namespaces
nfsd: make all of the nfsd stats per-network namespace
nfsd: remove nfsd_stats, make th_cnt a global counter
nfsd: make svc_stat per-network namespace instead of global
Kees Cook (3):
exec: Fix ToCToU between perm check and set-uid/gid usage
bpf: Replace bpf_lpm_trie_key 0-length array with flexible array
binfmt_flat: Fix corruption when not offsetting data start
Konstantin Komarov (1):
fs/ntfs3: Do copy_to_user out of run_lock
Lizhi Xu (2):
jfs: fix log->bdev_handle null ptr deref in lbmStartIO
squashfs: squashfs_read_data need to check if the length is 0
Luiz Augusto von Dentz (1):
Bluetooth: RFCOMM: Fix not validating setsockopt user input
Manas Ghandat (1):
jfs: fix shift-out-of-bounds in dbJoin
Matthew Wilcox (Oracle) (1):
ext4: convert ext4_da_do_write_end() to take a folio
Niklas Cassel (1):
Revert "ata: libata-scsi: Honor the D_SENSE bit for CK_COND=1 and no error"
Pei Li (1):
jfs: Fix shift-out-of-bounds in dbDiscardAG
Peter Xu (2):
mm/page_table_check: support userfault wr-protect entries
mm/debug_vm_pgtable: drop RANDOM_ORVALUE trick
Phillip Lougher (1):
Squashfs: fix variable overflow triggered by sysbot
Sean Young (1):
media: Revert "media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()"
Takashi Iwai (1):
ALSA: usb: Fix UBSAN warning in parse_audio_unit()
Waiman Long (1):
cgroup: Move rcu_head up near the top of cgroup_root
WangYuli (1):
nvme/pci: Add APST quirk for Lenovo N60z laptop
Will Deacon (2):
KVM: arm64: Don't defer TLB invalidation when zapping table entries
KVM: arm64: Don't pass a TLBI level hint when zapping table entries
Willem de Bruijn (1):
fou: remove warn in gue_gro_receive on unsupported protocol
Wojciech Gładysz (1):
ext4: sanity check for NULL pointer after ext4_force_shutdown
Yafang Shao (1):
cgroup: Make operations on the cgroup root_list RCU safe
Yang Shi (1):
mm: gup: stop abusing try_grab_folio
yunshui (1):
bpf, net: Use DEV_STAT_INC()
1 year, 4 months
- 1
- 1
Linux 6.1.106
by Greg Kroah-Hartman
I'm announcing the release of the 6.1.106 kernel.
All users of the 6.1 kernel series must upgrade.
The updated 6.1.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.1.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2
arch/arm64/kvm/hyp/pgtable.c | 10 -
arch/loongarch/include/uapi/asm/unistd.h | 1
drivers/ata/libata-scsi.c | 15 +
drivers/gpu/drm/i915/gem/i915_gem_mman.c | 192 ++++++++++++++++------
drivers/gpu/drm/i915/gem/i915_gem_mman.h | 2
drivers/media/usb/dvb-usb/dvb-usb-init.c | 35 ----
drivers/nvme/host/pci.c | 7
fs/binfmt_flat.c | 4
fs/exec.c | 8
fs/lockd/svc.c | 3
fs/nfs/callback.c | 3
fs/nfsd/export.c | 32 ++-
fs/nfsd/export.h | 4
fs/nfsd/netns.h | 25 ++
fs/nfsd/nfs4proc.c | 6
fs/nfsd/nfscache.c | 201 ++++++++++++++----------
fs/nfsd/nfsctl.c | 24 +-
fs/nfsd/nfsd.h | 1
fs/nfsd/nfsfh.c | 3
fs/nfsd/nfssvc.c | 24 +-
fs/nfsd/stats.c | 52 ++----
fs/nfsd/stats.h | 85 +++-------
fs/nfsd/trace.h | 22 ++
fs/nfsd/vfs.c | 6
include/linux/cgroup-defs.h | 7
include/linux/sunrpc/svc.h | 5
kernel/cgroup/cgroup-internal.h | 3
kernel/cgroup/cgroup.c | 23 +-
net/mptcp/options.c | 3
net/mptcp/pm_netlink.c | 49 +++--
net/mptcp/pm_userspace.c | 2
net/mptcp/protocol.h | 2
net/sunrpc/stats.c | 2
net/sunrpc/svc.c | 36 ++--
net/wireless/nl80211.c | 6
sound/soc/soc-topology.c | 32 ---
tools/testing/selftests/net/mptcp/mptcp_join.sh | 14 +
38 files changed, 572 insertions(+), 379 deletions(-)
Amadeusz Sławiński (2):
ASoC: topology: Clean up route loading
ASoC: topology: Fix route memory corruption
Andi Shyti (2):
drm/i915/gem: Fix Virtual Memory mapping boundaries calculation
drm/i915/gem: Adjust vma offset for framebuffer mmap offset
Chuck Lever (6):
NFSD: Refactor nfsd_reply_cache_free_locked()
NFSD: Rename nfsd_reply_cache_alloc()
NFSD: Replace nfsd_prune_bucket()
NFSD: Refactor the duplicate reply cache shrinker
NFSD: Rewrite synopsis of nfsd_percpu_counters_init()
NFSD: Fix frame size warning in svc_export_parse()
Dan Carpenter (1):
drm/i915: Fix a NULL vs IS_ERR() bug
Eric Dumazet (1):
wifi: cfg80211: restrict NL80211_ATTR_TXQ_QUANTUM values
Geliang Tang (1):
mptcp: pass addr to mptcp_pm_alloc_anno_list
Greg Kroah-Hartman (1):
Linux 6.1.106
Huacai Chen (1):
LoongArch: Define __ARCH_WANT_NEW_STAT in unistd.h
Jeff Layton (2):
nfsd: move reply cache initialization into nfsd startup
nfsd: move init of percpu reply_cache_stats counters back to nfsd_init_net
Josef Bacik (10):
sunrpc: don't change ->sv_stats if it doesn't exist
nfsd: stop setting ->pg_stats for unused stats
sunrpc: pass in the sv_stats struct through svc_create_pooled
sunrpc: remove ->pg_stats from svc_program
sunrpc: use the struct net as the svc proc private
nfsd: rename NFSD_NET_* to NFSD_STATS_*
nfsd: expose /proc/net/sunrpc/nfsd in net namespaces
nfsd: make all of the nfsd stats per-network namespace
nfsd: remove nfsd_stats, make th_cnt a global counter
nfsd: make svc_stat per-network namespace instead of global
Kees Cook (2):
exec: Fix ToCToU between perm check and set-uid/gid usage
binfmt_flat: Fix corruption when not offsetting data start
Matthieu Baerts (NGI0) (5):
mptcp: pm: reduce indentation blocks
mptcp: pm: don't try to create sf if alloc failed
mptcp: pm: do not ignore 'subflow' if 'signal' flag is also set
selftests: mptcp: join: test both signal & subflow
mptcp: fully established after ADD_ADDR echo on MPJ
Niklas Cassel (1):
Revert "ata: libata-scsi: Honor the D_SENSE bit for CK_COND=1 and no error"
Nirmoy Das (1):
drm/i915: Add a function to mmap framebuffer obj
Sean Young (1):
media: Revert "media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()"
Waiman Long (1):
cgroup: Move rcu_head up near the top of cgroup_root
WangYuli (1):
nvme/pci: Add APST quirk for Lenovo N60z laptop
Will Deacon (1):
KVM: arm64: Don't pass a TLBI level hint when zapping table entries
Yafang Shao (1):
cgroup: Make operations on the cgroup root_list RCU safe
1 year, 4 months
- 1
- 1
Linux 5.15.165
by Greg Kroah-Hartman
I'm announcing the release of the 5.15.165 kernel.
All users of the 5.15 kernel series must upgrade.
The updated 5.15.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.15.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/admin-guide/kernel-parameters.txt | 10
Documentation/arm64/cpu-feature-registers.rst | 38 +-
Documentation/arm64/silicon-errata.rst | 36 +
Documentation/devicetree/bindings/thermal/thermal-zones.yaml | 5
Makefile | 2
arch/arm/boot/dts/imx6q-kontron-samx6i.dtsi | 23 -
arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 26 +
arch/arm/mach-pxa/include/mach/spitz.h | 185 ---------
arch/arm/mach-pxa/spitz.c | 39 +-
arch/arm/mach-pxa/spitz.h | 185 +++++++++
arch/arm/mach-pxa/spitz_pm.c | 2
arch/arm64/Kconfig | 38 ++
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 4
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 4
arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 4
arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 4
arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 25 -
arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 2
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 6
arch/arm64/boot/dts/qcom/msm8996.dtsi | 8
arch/arm64/boot/dts/qcom/msm8998.dtsi | 36 -
arch/arm64/boot/dts/qcom/sdm845.dtsi | 2
arch/arm64/boot/dts/qcom/sm8250.dtsi | 22 -
arch/arm64/boot/dts/qcom/sm8350.dtsi | 3
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 4
arch/arm64/include/asm/barrier.h | 4
arch/arm64/include/asm/cputype.h | 16
arch/arm64/kernel/cpu_errata.c | 31 +
arch/arm64/kernel/cpufeature.c | 90 +++-
arch/arm64/kernel/proton-pack.c | 12
arch/arm64/tools/cpucaps | 1
arch/m68k/amiga/config.c | 9
arch/m68k/atari/ataints.c | 6
arch/m68k/include/asm/cmpxchg.h | 2
arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi | 98 +++--
arch/mips/include/asm/mach-loongson64/boot_param.h | 2
arch/mips/include/asm/mips-cm.h | 4
arch/mips/kernel/smp-cps.c | 5
arch/mips/loongson64/env.c | 8
arch/mips/loongson64/reset.c | 38 --
arch/mips/loongson64/smp.c | 23 +
arch/mips/sgi-ip30/ip30-console.c | 1
arch/powerpc/configs/85xx-hw.config | 2
arch/powerpc/include/asm/interrupt.h | 14
arch/powerpc/include/asm/percpu.h | 10
arch/powerpc/kernel/setup_64.c | 2
arch/powerpc/kvm/powerpc.c | 4
arch/powerpc/xmon/ppc-dis.c | 33 -
arch/riscv/mm/fault.c | 17
arch/sparc/include/asm/oplib_64.h | 1
arch/sparc/prom/init_64.c | 3
arch/sparc/prom/p1275.c | 2
arch/um/kernel/time.c | 4
arch/um/os-Linux/signal.c | 118 +++++-
arch/x86/events/intel/pt.c | 4
arch/x86/events/intel/pt.h | 4
arch/x86/events/intel/uncore_snbep.c | 6
arch/x86/kernel/cpu/mtrr/mtrr.c | 2
arch/x86/kernel/devicetree.c | 2
arch/x86/kvm/vmx/vmx.c | 11
arch/x86/kvm/vmx/vmx.h | 1
arch/x86/mm/pti.c | 8
arch/x86/pci/intel_mid_pci.c | 4
arch/x86/pci/xen.c | 4
arch/x86/platform/intel/iosf_mbi.c | 4
arch/x86/xen/p2m.c | 4
block/bio-integrity.c | 21 -
drivers/acpi/battery.c | 16
drivers/acpi/sbs.c | 23 -
drivers/android/binder.c | 4
drivers/ata/libata-scsi.c | 10
drivers/base/core.c | 13
drivers/base/devres.c | 11
drivers/base/module.c | 4
drivers/block/rbd.c | 35 -
drivers/bluetooth/btusb.c | 4
drivers/char/hw_random/amd-rng.c | 4
drivers/char/tpm/eventlog/common.c | 2
drivers/clk/davinci/da8xx-cfgchip.c | 4
drivers/clk/qcom/clk-branch.h | 26 +
drivers/clk/qcom/gcc-sc7280.c | 3
drivers/clocksource/sh_cmt.c | 13
drivers/dma/ti/k3-udma.c | 4
drivers/edac/Makefile | 10
drivers/edac/skx_common.c | 21 +
drivers/edac/skx_common.h | 4
drivers/firmware/turris-mox-rwtm.c | 23 -
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 7
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 12
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9
drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 3
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 57 +--
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 14
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 7
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 4
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 5
drivers/gpu/drm/drm_client_modeset.c | 5
drivers/gpu/drm/drm_dp_mst_topology.c | 4
drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6
drivers/gpu/drm/gma500/cdv_intel_lvds.c | 3
drivers/gpu/drm/gma500/psb_intel_lvds.c | 3
drivers/gpu/drm/i915/display/intel_dp.c | 2
drivers/gpu/drm/i915/gem/i915_gem_mman.c | 53 ++
drivers/gpu/drm/i915/gt/intel_execlists_submission.c | 6
drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 17
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 6
drivers/gpu/drm/mediatek/mtk_drm_plane.c | 4
drivers/gpu/drm/meson/meson_drv.c | 37 -
drivers/gpu/drm/mgag200/mgag200_i2c.c | 2
drivers/gpu/drm/nouveau/nouveau_prime.c | 3
drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 8
drivers/gpu/drm/panfrost/panfrost_drv.c | 1
drivers/gpu/drm/qxl/qxl_display.c | 3
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 17
drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 2
drivers/hid/wacom_wac.c | 3
drivers/hwmon/adt7475.c | 2
drivers/hwmon/max6697.c | 5
drivers/hwtracing/coresight/coresight-platform.c | 4
drivers/i2c/i2c-smbus.c | 64 +++
drivers/infiniband/core/cache.c | 14
drivers/infiniband/core/device.c | 6
drivers/infiniband/core/iwcm.c | 11
drivers/infiniband/hw/bnxt_re/ib_verbs.c | 8
drivers/infiniband/hw/bnxt_re/qplib_fp.h | 6
drivers/infiniband/hw/hns/hns_roce_device.h | 4
drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 6
drivers/infiniband/hw/hns/hns_roce_mr.c | 5
drivers/infiniband/hw/hns/hns_roce_srq.c | 2
drivers/infiniband/hw/mlx4/alias_GUID.c | 2
drivers/infiniband/hw/mlx4/mad.c | 2
drivers/infiniband/hw/mlx5/mlx5_ib.h | 13
drivers/infiniband/hw/mlx5/odp.c | 6
drivers/infiniband/sw/rxe/rxe_req.c | 7
drivers/input/keyboard/qt1050.c | 7
drivers/input/mouse/elan_i2c_core.c | 2
drivers/iommu/sprd-iommu.c | 2
drivers/irqchip/irq-imx-irqsteer.c | 40 +-
drivers/irqchip/irq-mbigen.c | 20 -
drivers/irqchip/irq-meson-gpio.c | 35 +
drivers/irqchip/irq-xilinx-intc.c | 2
drivers/isdn/hardware/mISDN/hfcmulti.c | 7
drivers/leds/led-class.c | 1
drivers/leds/led-triggers.c | 75 ++-
drivers/leds/leds-ss4200.c | 7
drivers/leds/trigger/ledtrig-timer.c | 5
drivers/macintosh/therm_windtunnel.c | 2
drivers/md/md.c | 1
drivers/md/raid5.c | 20 -
drivers/media/i2c/imx412.c | 9
drivers/media/pci/saa7134/saa7134-dvb.c | 8
drivers/media/platform/qcom/venus/vdec.c | 3
drivers/media/platform/vsp1/vsp1_histo.c | 20 -
drivers/media/platform/vsp1/vsp1_pipe.h | 2
drivers/media/platform/vsp1/vsp1_rpf.c | 8
drivers/media/rc/imon.c | 5
drivers/media/rc/lirc_dev.c | 4
drivers/media/usb/uvc/uvc_ctrl.c | 9
drivers/media/usb/uvc/uvc_video.c | 47 ++
drivers/memory/Kconfig | 2
drivers/mfd/Makefile | 6
drivers/mfd/omap-usb-tll.c | 3
drivers/mfd/rsmu_core.c | 2
drivers/mtd/nand/raw/Kconfig | 3
drivers/mtd/tests/Makefile | 34 -
drivers/mtd/tests/mtd_test.c | 9
drivers/mtd/ubi/eba.c | 3
drivers/net/bonding/bond_main.c | 7
drivers/net/dsa/b53/b53_common.c | 3
drivers/net/dsa/bcm_sf2.c | 4
drivers/net/dsa/mv88e6xxx/chip.c | 3
drivers/net/ethernet/brocade/bna/bna_types.h | 2
drivers/net/ethernet/brocade/bna/bnad.c | 11
drivers/net/ethernet/freescale/fec_main.c | 52 +-
drivers/net/ethernet/freescale/fec_ptp.c | 3
drivers/net/ethernet/google/gve/gve_tx_dqo.c | 22 +
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 6
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 7
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c | 18
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_bloom_filter.c | 38 +-
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c | 13
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.h | 9
drivers/net/ethernet/realtek/r8169_main.c | 8
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 2
drivers/net/ethernet/stmicro/stmmac/hwif.h | 2
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6
drivers/net/netconsole.c | 2
drivers/net/usb/qmi_wwan.c | 1
drivers/net/usb/sr9700.c | 11
drivers/net/wireless/ath/ath11k/dp_rx.c | 3
drivers/net/wireless/ath/ath11k/dp_rx.h | 3
drivers/net/wireless/ath/ath11k/mac.c | 15
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 18
drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2
drivers/net/wireless/virt_wifi.c | 20 -
drivers/nvme/host/pci.c | 91 ++--
drivers/parport/procfs.c | 24 -
drivers/pci/controller/dwc/pcie-designware-host.c | 7
drivers/pci/controller/dwc/pcie-dw-rockchip.c | 2
drivers/pci/controller/pci-hyperv.c | 4
drivers/pci/controller/pcie-rockchip.c | 2
drivers/pci/endpoint/functions/pci-epf-vntb.c | 12
drivers/pci/pci.c | 19 -
drivers/pci/setup-bus.c | 6
drivers/phy/cadence/phy-cadence-torrent.c | 3
drivers/pinctrl/core.c | 12
drivers/pinctrl/freescale/pinctrl-mxs.c | 4
drivers/pinctrl/pinctrl-rockchip.c | 17
drivers/pinctrl/pinctrl-single.c | 7
drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 14
drivers/platform/chrome/cros_ec_debugfs.c | 1
drivers/platform/chrome/cros_ec_proto.c | 2
drivers/platform/mips/cpu_hwmon.c | 3
drivers/power/supply/axp288_charger.c | 22 -
drivers/power/supply/bq24190_charger.c | 2
drivers/pwm/pwm-stm32.c | 5
drivers/remoteproc/imx_rproc.c | 10
drivers/remoteproc/stm32_rproc.c | 2
drivers/rtc/interface.c | 9
drivers/rtc/rtc-cmos.c | 10
drivers/rtc/rtc-isl1208.c | 11
drivers/s390/char/sclp_sd.c | 10
drivers/scsi/mpi3mr/mpi3mr_os.c | 11
drivers/scsi/mpt3sas/mpt3sas_base.c | 20 -
drivers/scsi/qla2xxx/qla_bsg.c | 98 +++--
drivers/scsi/qla2xxx/qla_def.h | 3
drivers/scsi/qla2xxx/qla_gs.c | 35 +
drivers/scsi/qla2xxx/qla_init.c | 87 +++-
drivers/scsi/qla2xxx/qla_inline.h | 8
drivers/scsi/qla2xxx/qla_mid.c | 2
drivers/scsi/qla2xxx/qla_nvme.c | 5
drivers/scsi/qla2xxx/qla_os.c | 7
drivers/scsi/qla2xxx/qla_sup.c | 108 +++--
drivers/scsi/ufs/ufshcd.c | 11
drivers/soc/qcom/pdr_interface.c | 8
drivers/soc/qcom/rpmh-rsc.c | 7
drivers/soc/qcom/rpmh.c | 1
drivers/soc/xilinx/zynqmp_pm_domains.c | 16
drivers/soc/xilinx/zynqmp_power.c | 5
drivers/spi/spi-fsl-lpspi.c | 6
drivers/spi/spidev.c | 95 ++---
drivers/tty/serial/serial_core.c | 8
drivers/usb/gadget/function/u_audio.c | 42 +-
drivers/usb/gadget/function/u_serial.c | 1
drivers/usb/gadget/udc/core.c | 10
drivers/usb/serial/usb_debug.c | 7
drivers/usb/usbip/vhci_hcd.c | 9
drivers/vhost/vdpa.c | 8
drivers/vhost/vsock.c | 4
fs/binfmt_flat.c | 4
fs/btrfs/ctree.h | 1
fs/btrfs/file.c | 60 ++-
fs/btrfs/free-space-cache.c | 1
fs/ceph/super.c | 3
fs/exec.c | 8
fs/ext2/balloc.c | 11
fs/ext4/extents.c | 5
fs/ext4/extents_status.c | 16
fs/ext4/extents_status.h | 6
fs/ext4/fast_commit.c | 65 ++-
fs/ext4/inline.c | 6
fs/ext4/inode.c | 115 +++---
fs/ext4/mballoc.c | 3
fs/ext4/namei.c | 88 +++-
fs/ext4/xattr.c | 6
fs/f2fs/inline.c | 6
fs/f2fs/inode.c | 3
fs/file.c | 1
fs/fuse/inode.c | 24 +
fs/hfs/inode.c | 3
fs/hfsplus/bfind.c | 15
fs/hfsplus/extents.c | 9
fs/hfsplus/hfsplus_fs.h | 21 +
fs/jbd2/commit.c | 2
fs/jbd2/journal.c | 6
fs/jfs/jfs_imap.c | 5
fs/nfs/nfs4client.c | 6
fs/nfs/nfs4proc.c | 2
fs/nilfs2/btnode.c | 25 +
fs/nilfs2/btree.c | 4
fs/nilfs2/segment.c | 2
fs/ntfs3/attrib.c | 14
fs/ntfs3/bitmap.c | 2
fs/ntfs3/dir.c | 3
fs/ntfs3/file.c | 5
fs/ntfs3/frecord.c | 2
fs/ntfs3/fslog.c | 5
fs/ntfs3/fsntfs.c | 2
fs/ntfs3/index.c | 4
fs/ntfs3/inode.c | 2
fs/ntfs3/ntfs.h | 13
fs/ntfs3/ntfs_fs.h | 2
fs/proc/proc_sysctl.c | 6
fs/proc/task_mmu.c | 2
fs/super.c | 11
fs/udf/balloc.c | 51 +-
fs/udf/super.c | 3
fs/xfs/xfs_log_recover.c | 20 -
include/asm-generic/vmlinux.lds.h | 2
include/linux/clocksource.h | 14
include/linux/hugetlb.h | 1
include/linux/irq.h | 7
include/linux/irqdomain.h | 10
include/linux/jbd2.h | 5
include/linux/leds.h | 32 -
include/linux/objagg.h | 1
include/linux/pci_ids.h | 2
include/linux/perf_event.h | 1
include/linux/profile.h | 1
include/linux/sched/signal.h | 6
include/linux/task_work.h | 3
include/linux/trace_events.h | 1
include/linux/virtio_net.h | 11
include/net/netfilter/nf_tables.h | 20 -
include/net/sctp/sctp.h | 4
include/net/sctp/structs.h | 8
include/net/tcp.h | 1
include/trace/events/mptcp.h | 2
include/trace/events/rpcgss.h | 2
include/uapi/linux/netfilter/nf_tables.h | 2
include/uapi/linux/zorro_ids.h | 3
io_uring/io-wq.c | 10
io_uring/io_uring.c | 5
kernel/bpf/btf.c | 10
kernel/debug/kdb/kdb_io.c | 6
kernel/dma/mapping.c | 2
kernel/events/core.c | 79 ++--
kernel/events/internal.h | 2
kernel/events/ring_buffer.c | 4
kernel/irq/chip.c | 32 +
kernel/irq/irqdesc.c | 1
kernel/irq/irqdomain.c | 7
kernel/irq/manage.c | 2
kernel/kcov.c | 15
kernel/kprobes.c | 4
kernel/locking/rwsem.c | 6
kernel/padata.c | 7
kernel/profile.c | 16
kernel/rcu/rcutorture.c | 2
kernel/sched/core.c | 50 +-
kernel/sched/cputime.c | 6
kernel/sched/fair.c | 19 -
kernel/sched/sched.h | 2
kernel/signal.c | 8
kernel/task_work.c | 34 +
kernel/time/clocksource-wdtest.c | 13
kernel/time/clocksource.c | 10
kernel/time/ntp.c | 9
kernel/time/tick-broadcast.c | 24 +
kernel/time/timekeeping.c | 2
kernel/trace/tracing_map.c | 6
kernel/watchdog_hld.c | 11
lib/decompress_bunzip2.c | 3
lib/kobject_uevent.c | 17
lib/objagg.c | 18
mm/hugetlb.c | 2
mm/mempolicy.c | 18
mm/mmap_lock.c | 175 +--------
net/bluetooth/l2cap_core.c | 1
net/bridge/br_multicast.c | 4
net/core/filter.c | 15
net/core/link_watch.c | 4
net/core/rtnetlink.c | 69 +--
net/core/xdp.c | 4
net/ipv4/esp4.c | 3
net/ipv4/netfilter/iptable_nat.c | 18
net/ipv4/nexthop.c | 7
net/ipv4/route.c | 2
net/ipv4/tcp.c | 13
net/ipv4/tcp_input.c | 34 +
net/ipv4/tcp_ipv4.c | 19 -
net/ipv4/tcp_output.c | 2
net/ipv4/tcp_timer.c | 10
net/ipv6/addrconf.c | 3
net/ipv6/esp6.c | 3
net/ipv6/ndisc.c | 34 -
net/ipv6/netfilter/ip6table_nat.c | 14
net/ipv6/tcp_ipv6.c | 19 -
net/iucv/af_iucv.c | 4
net/l2tp/l2tp_core.c | 15
net/mac80211/cfg.c | 21 -
net/mptcp/mib.c | 2
net/mptcp/mib.h | 2
net/mptcp/options.c | 5
net/mptcp/pm.c | 9
net/mptcp/pm_netlink.c | 48 +-
net/mptcp/protocol.c | 18
net/mptcp/protocol.h | 4
net/mptcp/subflow.c | 24 +
net/netfilter/ipset/ip_set_list_set.c | 3
net/netfilter/ipvs/ip_vs_proto_sctp.c | 4
net/netfilter/nf_conntrack_netlink.c | 3
net/netfilter/nf_tables_api.c | 188 +---------
net/netfilter/nft_connlimit.c | 4
net/netfilter/nft_counter.c | 4
net/netfilter/nft_dynset.c | 2
net/netfilter/nft_last.c | 4
net/netfilter/nft_limit.c | 14
net/netfilter/nft_quota.c | 4
net/netfilter/nft_set_hash.c | 8
net/netfilter/nft_set_pipapo.c | 40 +-
net/netfilter/nft_set_pipapo.h | 27 +
net/netfilter/nft_set_pipapo_avx2.c | 81 ++--
net/netfilter/nft_set_rbtree.c | 6
net/packet/af_packet.c | 86 ++++
net/sched/act_ct.c | 4
net/sctp/input.c | 46 +-
net/sctp/proc.c | 10
net/sctp/socket.c | 6
net/smc/smc_core.c | 5
net/sunrpc/auth_gss/gss_krb5_keys.c | 2
net/sunrpc/clnt.c | 3
net/sunrpc/sched.c | 4
net/sunrpc/xprtrdma/frwr_ops.c | 3
net/sunrpc/xprtrdma/verbs.c | 16
net/tipc/udp_media.c | 5
net/tls/tls_sw.c | 16
net/wireless/nl80211.c | 16
net/wireless/util.c | 8
scripts/gcc-x86_32-has-stack-protector.sh | 2
scripts/gcc-x86_64-has-stack-protector.sh | 2
security/apparmor/lsm.c | 7
security/apparmor/policy.c | 2
security/apparmor/policy_unpack.c | 1
security/keys/keyctl.c | 2
security/landlock/cred.c | 11
sound/firewire/amdtp-stream.c | 38 +-
sound/firewire/amdtp-stream.h | 1
sound/pci/hda/patch_conexant.c | 54 --
sound/pci/hda/patch_hdmi.c | 2
sound/pci/hda/patch_realtek.c | 1
sound/soc/codecs/max98088.c | 10
sound/soc/codecs/wcd938x-sdw.c | 4
sound/soc/codecs/wsa881x.c | 2
sound/soc/intel/common/soc-intel-quirks.h | 2
sound/soc/meson/axg-fifo.c | 26 -
sound/soc/pxa/spitz.c | 58 +--
sound/usb/line6/driver.c | 5
sound/usb/mixer.c | 7
sound/usb/quirks-table.h | 4
sound/usb/quirks.c | 4
sound/usb/stream.c | 4
tools/lib/bpf/btf_dump.c | 8
tools/lib/bpf/linker.c | 11
tools/memory-model/lock.cat | 20 -
tools/perf/arch/x86/util/intel-pt.c | 15
tools/perf/util/sort.c | 2
tools/testing/selftests/bpf/prog_tests/send_signal.c | 3
tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 2
tools/testing/selftests/bpf/progs/btf_dump_test_case_multidim.c | 4
tools/testing/selftests/bpf/progs/btf_dump_test_case_syntax.c | 4
tools/testing/selftests/bpf/test_sockmap.c | 9
tools/testing/selftests/drivers/net/mlxsw/spectrum-2/tc_flower.sh | 55 ++
tools/testing/selftests/landlock/base_test.c | 74 +++
tools/testing/selftests/landlock/config | 5
tools/testing/selftests/net/forwarding/devlink_lib.sh | 2
tools/testing/selftests/net/mptcp/mptcp_join.sh | 41 ++
tools/testing/selftests/rcutorture/bin/torture.sh | 6
tools/testing/selftests/sigaltstack/current_stack_pointer.h | 2
461 files changed, 4183 insertions(+), 2519 deletions(-)
Adrian Hunter (7):
perf/x86/intel/pt: Fix pt_topa_entry_for_page() address calculation
perf: Fix perf_aux_size() for greater-than 32-bit size
perf: Prevent passing zero nr_pages to rb_alloc_aux()
perf: Fix default aux_watermark calculation
perf intel-pt: Fix aux_watermark calculation for 64-bit size
perf intel-pt: Fix exclude_guest setting
perf/x86/intel/pt: Fix a topa_entry base address calculation
Al Viro (3):
powerpc: fix a file leak in kvm_vcpu_ioctl_enable_cap()
lirc: rc_dev_get_from_fd(): fix file leak
protect the fetch of ->fd[fd] in do_dup2() from mispredictions
Alan Maguire (2):
bpf: annotate BTF show functions with __printf
bpf: Eliminate remaining "make W=1" warnings in kernel/bpf/btf.o
Alan Stern (1):
tools/memory-model: Fix bug in lock.cat
Aleksandr Burakov (1):
saa7134: Unchecked i2c_transfer function result fixed
Aleksandr Mishin (2):
remoteproc: imx_rproc: Skip over memory region when node value is NULL
remoteproc: imx_rproc: Fix refcount mistake in imx_rproc_addr_init
Alex Deucher (1):
drm/amdgpu/sdma5.2: Update wptr registers as well as doorbell
Alex Hung (1):
drm/amd/display: Add null checker before passing variables
Alexander Maltsev (1):
netfilter: ipset: Add list flush to cancel_gc
Alexandra Winter (1):
net/iucv: fix use after free in iucv_sock_close()
Alexey Kodanev (1):
bna: adjust 'name' buf size of bna_tcb and bna_ccb structures
Amit Cohen (2):
mlxsw: spectrum_acl_bloom_filter: Make mlxsw_sp_acl_bf_key_encode() more flexible
selftests: forwarding: devlink_lib: Wait for udev events after reloading
Amit Daniel Kachhap (1):
arm64: cpufeature: Fix the visibility of compat hwcaps
Andi Kleen (1):
x86/mtrr: Check if fixed MTRRs exist before saving them
Andi Shyti (1):
drm/i915/gem: Fix Virtual Memory mapping boundaries calculation
Andreas Larsson (1):
sparc64: Fix incorrect function signature and add prototype for prom_cif_init
Andrei Lalaev (1):
Input: qt1050 - handle CHIP_ID reading error
Andrey Konovalov (1):
kcov: properly check for softirq context
Andrii Nakryiko (1):
libbpf: Fix no-args func prototype BTF dumping syntax
Andy Shevchenko (2):
spi: spidev: Replace ACPI specific code by device_get_match_data()
spi: spidev: Replace OF specific code by device property API
Arnd Bergmann (5):
EDAC, i10nm: make skx_common.o a separate module
ARM: pxa: spitz: use gpio descriptors for audio
mfd: rsmu: Split core code into separate module
mtd: make mtd_test.c a separate module
kdb: address -Wformat-security warnings
Arseniy Krasnov (1):
irqchip/meson-gpio: Convert meson_gpio_irq_controller::lock to 'raw_spinlock_t'
Artem Chernyshev (1):
iommu: sprd: Avoid NULL deref in sprd_iommu_hw_en
Bailey Forrest (1):
gve: Fix an edge case for TSO skb validity check
Baochen Qiang (3):
wifi: ath11k: fix wrong handling of CCMP256 and GCMP ciphers
wifi: cfg80211: fix typo in cfg80211_calculate_bitrate_he()
wifi: cfg80211: handle 2x996 RU allocation in cfg80211_calculate_bitrate_he()
Baokun Li (3):
ext4: check dot and dotdot of dx_root before making dir indexed
ext4: make sure the first directory block is not a hole
ext4: make ext4_es_insert_extent() return void
Bart Van Assche (1):
RDMA/iwcm: Fix a use-after-free related to destroying CM IDs
Bastien Curutchet (1):
clk: davinci: da8xx-cfgchip: Initialize clk_init_data before use
Benjamin Coddington (2):
SUNRPC: Fixup gss_status tracepoint error output
SUNRPC: Fix a race to wake a sync task
Besar Wicaksono (1):
arm64: Add Neoverse-V2 part
Binbin Zhou (1):
MIPS: Loongson64: DTS: Add RTC support to Loongson-2K1000
Breno Leitao (1):
net: netconsole: Disable target before netpoll cleanup
Bryan O'Donoghue (1):
media: i2c: Fix imx412 exposure control
Carlos Llamas (1):
binder: fix hang of unregistered readers
Chao Yu (4):
f2fs: fix return value of f2fs_convert_inline_inode()
f2fs: fix to don't dirty inode for readonly filesystem
hfsplus: fix to avoid false alarm of circular locking
hfs: fix to initialize fields of hfs_inode_info after hfs_alloc_inode()
Chen Ni (3):
x86/xen: Convert comma to semicolon
drm/qxl: Add check for drm_cvt_mode
ASoC: max98088: Check for clk_prepare_enable() error
Chen-Yu Tsai (2):
arm64: dts: mediatek: mt8183-kukui: Drop bogus output-enable property
arm64: dts: mediatek: mt8183-kukui-jacuzzi: Add ports node for anx7625
Chengchang Tang (3):
RDMA/hns: Fix missing pagesize and alignment check in FRMR
RDMA/hns: Fix undifined behavior caused by invalid max_sge
RDMA/hns: Fix insufficient extend DB for VFs.
Chengen Du (1):
af_packet: Handle outgoing VLAN packets without hardware offloading
Chiara Meiohas (1):
RDMA/mlx5: Set mkeys for dmabuf at PAGE_SIZE
Chris Wulff (2):
usb: gadget: core: Check for unset descriptor
usb: gadget: u_audio: Check return codes from usb_ep_enable and config_ep_by_speed.
Christoph Hellwig (2):
block: initialize integrity buffer to zero before writing it to media
xfs: fix log recovery buffer allocation for the legacy h_size fixup
Christophe Leroy (1):
vmlinux.lds.h: catch .bss..L* sections into BSS")
Chuck Lever (1):
xprtrdma: Fix rpcrdma_reqs_reset()
Conor Dooley (1):
spi: spidev: add correct compatible for Rohm BH2228FV
Csókás Bence (1):
net: fec: Refactor: #define magic constants
Csókás, Bence (3):
net: fec: Fix FEC_ECR_EN1588 being cleared on link-down
rtc: interface: Add RTC offset to alarm after fix-up
net: fec: Stop PPS on driver remove
Damien Le Moal (2):
scsi: mpt3sas: Avoid IOMMU page faults on REPORT ZONES
scsi: mpi3mr: Avoid IOMMU page faults on REPORT ZONES
Dan Carpenter (3):
PCI: endpoint: Clean up error handling in vpci_scan_bus()
mISDN: Fix a use after free in hfcmulti_tx()
net: mvpp2: Don't re-use loop iterator
Dan Williams (1):
driver core: Fix uevent_show() vs driver detach race
Daniel Schaefer (1):
media: uvcvideo: Override default flags
Daniele Palmas (1):
net: usb: qmi_wwan: fix memory leak for not ip packets
Danilo Krummrich (1):
drm/nouveau: prime: fix refcount underflow
David Hildenbrand (1):
fs/proc/task_mmu: indicate PM_FILE for PMD-mapped file THP
Denis Arefev (1):
net: missing check virtio
Dikshita Agarwal (2):
media: venus: flush all buffers in output plane streamoff
media: venus: fix use after free in vdec_close
Dmitry Antipov (1):
Bluetooth: l2cap: always unlock channel in l2cap_conless_channel()
Dmitry Baryshkov (8):
arm64: dts: qcom: sdm845: add power-domain to UFS PHY
arm64: dts: qcom: sm8250: switch UFS QMP PHY to new style of bindings
arm64: dts: qcom: sm8250: add power-domain to UFS PHY
arm64: dts: qcom: msm8996: specify UFS core_clk frequencies
soc: qcom: pdr: protect locator_addr with the main mutex
soc: qcom: pdr: fix parsing of domains lists
arm64: dts: qcom: msm8998: switch USB QMP PHY to new style of bindings
arm64: dts: qcom: msm8996: correct #clock-cells for QMP PHY nodes
Dmitry Torokhov (2):
ARM: spitz: fix GPIO assignment for backlight
Input: elan_i2c - do not leave interrupt disabled on suspend failure
Dmitry Yashin (1):
pinctrl: rockchip: update rk3308 iomux routes
Dominique Martinet (1):
MIPS: Octeron: remove source file executable bit
Donglin Peng (1):
libbpf: Checking the btf_type kind when fixing variable offsets
Douglas Anderson (3):
drm/panel: boe-tv101wum-nl6: If prepare fails, disable GPIO before regulators
drm/panel: boe-tv101wum-nl6: Check for errors on the NOP in prepare()
kdb: Use the passed prompt in kdb_position_cursor()
Dragan Simic (1):
drm/panfrost: Mark simple_ondemand governor as softdep
Edmund Raile (2):
Revert "ALSA: firewire-lib: obsolete workqueue for period update"
Revert "ALSA: firewire-lib: operate for period elapse event in process context"
Eero Tamminen (1):
m68k: atari: Fix TT bootup freeze / unexpected (SCU) interrupt messages
En-Wei Wu (1):
wifi: virt_wifi: avoid reporting connection success with wrong SSID
Eric Dumazet (8):
tcp: annotate lockless accesses to sk->sk_err_soft
tcp: annotate lockless access to sk->sk_err
tcp: add tcp_done_with_error() helper
tcp: fix race in tcp_write_err()
tcp: fix races in tcp_v[46]_err()
sched: act_ct: take care of padding in struct zones_ht_key
net: linkwatch: use system_unbound_wq
wifi: cfg80211: restrict NL80211_ATTR_TXQ_QUANTUM values
Eric Sandeen (1):
fuse: verify {g,u}id mount options correctly
Esben Haabendal (2):
memory: fsl_ifc: Make FSL_IFC config visible and selectable
powerpc/configs: Update defconfig with now user-visible CONFIG_FSL_IFC
FUJITA Tomonori (1):
PCI: Add Edimax Vendor ID to pci_ids.h
Fedor Pchelkin (2):
apparmor: use kvfree_sensitive to free data->data
ubi: eba: properly rollback inside self_check_eba
Feng Tang (1):
clocksource: Scale the watchdog read retries automatically
Filipe Manana (3):
btrfs: fix bitmap leak when loading free space cache on duplicate entry
btrfs: fix corruption after buffer fault in during direct IO append write
btrfs: fix double inode unlock for direct IO sync writes
Florent Fourcot (1):
rtnetlink: enable alt_ifname for setlink/newlink
Florian Westphal (5):
netfilter: nft_set_pipapo: constify lookup fn args where possible
netfilter: nf_set_pipapo: fix initial map fill
netfilter: nft_set_pipapo_avx2: disable softinterrupts
netfilter: nf_tables: allow clone callbacks to sleep
netfilter: nf_tables: prefer nft_chain_validate
Fred Li (1):
bpf: Fix a segment issue when downgrading gso_size
Frederic Weisbecker (4):
task_work: s/task_work_cancel()/task_work_cancel_func()/
task_work: Introduce task_work_cancel() again
perf: Fix event leak upon exit
perf: Fix event leak upon exec and file release
Friedrich Vock (1):
drm/amdgpu: Check if NBIO funcs are NULL in amdgpu_device_baco_exit
Gaosheng Cui (1):
gss_krb5: Fix the error handling path for crypto_sync_skcipher_setkey
Geert Uytterhoeven (1):
spi: spidev: Add missing spi_device_id for bh2228fv
Geliang Tang (4):
selftests/bpf: Fix prog numbers in test_sockmap
selftests/bpf: Check length of recv in test_sockmap
selftests/bpf: Close fd in error path in drop_on_reuseport
mptcp: export local_address
George Kennedy (1):
serial: core: check uartclk for zero to avoid divide by zero
Greg Kroah-Hartman (1):
Linux 5.15.165
Gregory CLEMENT (1):
MIPS: SMP-CPS: Fix address for GCR_ACCESS register for CM3 and later
Guangguan Wang (1):
net/smc: set rmb's SG_MAX_SINGLE_ALLOC limitation only when CONFIG_ARCH_NO_SG_CHAIN is defined
Guenter Roeck (4):
hwmon: (max6697) Fix underflow when writing limit attributes
hwmon: (max6697) Fix swapped temp{1,8} critical alarms
i2c: smbus: Improve handling of stuck alerts
i2c: smbus: Send alert notifications to all devices if source not found
Gwenael Treuveur (1):
remoteproc: stm32_rproc: Fix mailbox interrupts queuing
Hagar Hemdan (1):
net: esp: cleanup esp_output_tail_tcp() in case of unsupported ESPINTCP
Hans de Goede (4):
leds: trigger: Unregister sysfs attributes before calling deactivate()
leds: trigger: Call synchronize_rcu() before calling trig->activate()
power: supply: axp288_charger: Fix constant_charge_voltage writes
power: supply: axp288_charger: Round constant_charge_voltage writes down
Heiner Kallweit (3):
leds: trigger: Remove unused function led_trigger_rename_static()
leds: trigger: Store brightness set by led_trigger_event()
r8169: don't increment tx_dropped in case of NETDEV_TX_BUSY
Herve Codina (1):
irqdomain: Fixed unbalanced fwnode get and put
Hilda Wu (1):
Bluetooth: btusb: Add RTL8852BE device 0489:e125 to device tables
Honggang LI (1):
RDMA/rxe: Don't set BTH_ACK_MASK for UC or UD QPs
Hou Tao (1):
bpf, events: Use prog to emit ksymbol event for main program
Hsiao Chien Sung (2):
drm/mediatek: Add missing plane settings when async update
drm/mediatek: Add DRM_MODE_ROTATE_0 to rotation property
Huacai Chen (1):
fs/ntfs3: Update log->page_{mask,bits} if log->page_size changed
Ian Forbes (1):
drm/vmwgfx: Fix overlay when using Screen Targets
Ido Schimmel (4):
lib: objagg: Fix general protection fault
mlxsw: spectrum_acl_erp: Fix object nesting warning
mlxsw: spectrum_acl: Fix ACL scale regression and firmware errors
ipv4: Fix incorrect source address in Record Route option
Igor Pylypiv (1):
ata: libata-scsi: Honor the D_SENSE bit for CK_COND=1 and no error
Ilpo Järvinen (7):
x86/of: Return consistent error type from x86_of_pci_irq_enable()
x86/pci/intel_mid_pci: Fix PCIBIOS_* return code handling
x86/pci/xen: Fix PCIBIOS_* return code handling
x86/platform/iosf_mbi: Convert PCIBIOS_* return codes to errnos
PCI: Fix resource double counting on remove & rescan
leds: ss4200: Convert PCIBIOS_* return codes to errnos
hwrng: amd - Convert PCIBIOS_* return codes to errnos
Ilya Dryomov (3):
rbd: don't assume rbd_is_lock_owner() for exclusive mappings
rbd: rename RBD_LOCK_STATE_RELEASING and releasing_wait
rbd: don't assume RBD_LOCK_STATE_LOCKED for exclusive mappings
Imre Deak (1):
drm/i915/dp: Reset intel_dp->link_trained before retraining the link
Ismael Luceno (1):
ipvs: Avoid unnecessary calls to skb_is_gso_sctp
Jack Wang (1):
bnxt_re: Fix imm_data endianness
Jakub Kicinski (1):
tls: fix race between tx work scheduling and socket close
James Chapman (1):
l2tp: fix lockdep splat
James Clark (1):
coresight: Fix ref leak when of_coresight_parse_endpoint() fails
James Morse (1):
arm64: cpufeature: Force HWCAP to be based on the sysreg visible to user-space
Jan Kara (4):
ext4: avoid writing unitialized memory to disk in EA inodes
ext2: Verify bitmap and itable block numbers before using them
udf: Avoid using corrupted block bitmap buffer
jbd2: make jbd2_journal_get_max_txn_bufs() internal
Jann Horn (1):
landlock: Don't lose track of restrictions on cred_transfer
Jason Wang (1):
vhost-vdpa: switch to use vmf_insert_pfn() in the fault handler
Javier Carrasco (1):
mfd: omap-usb-tll: Use struct_size to allocate tll
Javier Martinez Canillas (1):
spi: spidev: Make probe to fail early if a spidev compatible is used
Jay Buddhabhatti (1):
drivers: soc: xilinx: check return status of get_api_version()
Jens Axboe (2):
nvme: split command copy into a helper
nvme: separate command prep and issue
Jeongjun Park (1):
jfs: Fix array-index-out-of-bounds in diFree
Jerome Brunet (2):
arm64: dts: amlogic: gx: correct hdmi clocks
ASoC: meson: axg-fifo: fix irq scheduling issue with PREEMPT_RT
Jiaxun Yang (10):
platform: mips: cpu_hwmon: Disable driver on unsupported hardware
MIPS: ip30: ip30-console: Add missing include
MIPS: dts: loongson: Fix GMAC phy node
MIPS: Loongson64: env: Hook up Loongsson-2K
MIPS: Loongson64: Remove memory node for builtin-dtb
MIPS: Loongson64: reset: Prioritise firmware service
MIPS: Loongson64: Test register availability before use
MIPS: Loongson64: DTS: Fix PCIe port nodes for ls7a
MIPS: dts: loongson: Fix liointc IRQ polarity
MIPS: dts: loongson: Fix ls2k1000-rtc interrupt
Jinyoung Choi (1):
block: cleanup bio_integrity_prep
Jisheng Zhang (1):
PCI: dwc: Restore MSI Receiver mask during resume
Joe Hattori (2):
char: tpm: Fix possible memory leak in tpm_bios_measurements_open()
net: dsa: bcm_sf2: Fix a possible memory leak in bcm_sf2_mdio_register()
Johan Hovold (1):
arm64: dts: qcom: msm8998: drop USB PHY clock index
Johannes Berg (7):
wifi: virt_wifi: don't use strlen() in const context
um: time-travel: fix time-travel-start option
um: time-travel: fix signal blocking race/hang
net: bonding: correctly annotate RCU in bond_should_notify_peers()
leds: trigger: use RCU to protect the led_cdevs list
wifi: nl80211: don't give key data to userspace
wifi: mac80211: check basic rates validity
John Stultz (1):
locking/rwsem: Add __always_inline annotation to __down_write_common() and inlined callers
Jonas Karlman (1):
arm64: dts: rockchip: Increase VOP clk rate on RK3328
Joy Chakraborty (2):
rtc: cmos: Fix return value of nvmem callbacks
rtc: isl1208: Fix return value of nvmem callbacks
Justin Stitt (3):
power: supply: bq24190_charger: replace deprecated strncpy with strscpy
ntp: Clamp maxerror and esterror to operating range
ntp: Safeguard against time_constant overflow
Kan Liang (1):
perf/x86/intel/uncore: Fix the bits of the CHA extended umask for SPR
Kees Cook (2):
exec: Fix ToCToU between perm check and set-uid/gid usage
binfmt_flat: Fix corruption when not offsetting data start
Kemeng Shi (2):
jbd2: avoid memleak in jbd2_journal_write_metadata_buffer
ext4: fix wrong unit use in ext4_mb_find_by_goal
Konrad Dybcio (1):
clk: qcom: branch: Add helper functions for setting retain bits
Konstantin Komarov (8):
fs/ntfs3: Use ALIGN kernel macro
fs/ntfs3: Merge synonym COMPRESSION_UNIT and NTFS_LZNT_CUNIT
fs/ntfs3: Fix transform resident to nonresident for compressed files
fs/ntfs3: Missed NI_FLAG_UPDATE_PARENT setting
fs/ntfs3: Fix getting file type
fs/ntfs3: Replace inode_trylock with inode_lock
fs/ntfs3: Fix field-spanning write in INDEX_HDR
fs/ntfs3: Missed error return
Krishna Kurapati (2):
arm64: dts: qcom: msm8998: Disable SS instance in Parkmode for USB
arm64: dts: qcom: ipq8074: Disable SS instance in Parkmode for USB
Krzysztof Kozlowski (4):
dt-bindings: thermal: correct thermal zone node name limit
spi: spidev: order compatibles alphabetically
ASoC: codecs: wcd938x-sdw: Correct Soundwire ports mask
ASoC: codecs: wsa881x: Correct Soundwire ports mask
Kuniyuki Iwashima (4):
rtnetlink: Don't ignore IFLA_TARGET_NETNSID when ifname is specified in rtnl_dellink().
netfilter: iptables: Fix null-ptr-deref in iptable_nat_table_init().
netfilter: iptables: Fix potential null-ptr-deref in ip6table_nat_table_init().
sctp: Fix null-ptr-deref in reuseport_add_sock().
Lance Richardson (1):
dma: fix call order in dmam_free_coherent
Laurent Pinchart (2):
media: renesas: vsp1: Fix _irqsave and _irq mix
media: renesas: vsp1: Store RPF partition configuration per RPF instance
Leon Romanovsky (5):
RDMA/cache: Release GID table even if leak is detected
RDMA/mlx4: Fix truncated output warning in mad.c
RDMA/mlx4: Fix truncated output warning in alias_GUID.c
RDMA/device: Return error earlier if port in not valid
nvme-pci: add missing condition check for existence of mapped data
Li Nan (1):
md: do not delete safemode_timer in mddev_suspend
Lijo Lazar (1):
drm/amd/pm: Fix aldebaran pcie speed reporting
Luca Ceresoli (1):
Revert "leds: led-core: Fix refcount leak in of_led_get()"
Lucas Stach (4):
drm/etnaviv: fix DMA direction handling for cached RW buffers
irqchip/imx-irqsteer: Constify irq_chip struct
irqchip/imx-irqsteer: Add runtime PM support
drm/bridge: analogix_dp: properly handle zero sized AUX transactions
Luis Henriques (SUSE) (2):
ext4: fix infinite loop when replaying fast_commit
ext4: don't track ranges in fast_commit if inode has inlined data
Lukas Wunner (1):
PCI/DPC: Fix use-after-free on concurrent DPC and hot-removal
Ma Jun (3):
drm/amdgpu/pm: Fix the null pointer dereference for smu7
drm/amdgpu: Fix the null pointer dereference to ras_manager
drm/amdgpu/pm: Fix the null pointer dereference in apply_state_adjust_rules
Ma Ke (5):
drm/gma500: fix null pointer dereference in cdv_intel_lvds_get_modes
drm/gma500: fix null pointer dereference in psb_intel_lvds_get_modes
phy: cadence-torrent: Check return value on register read
net: usb: sr9700: fix uninitialized variable use in sr_mdio_read
drm/client: fix null pointer dereference in drm_client_modeset_probe
Maciej Żenczykowski (1):
ipv6: fix ndisc_is_useropt() handling for PIO
Mahesh Salgaonkar (1):
powerpc: Avoid nmi_enter/nmi_exit in real mode interrupt.
Manish Rangankar (1):
scsi: qla2xxx: During vport delete send async logout explicitly
Manivannan Sadhasivam (1):
PCI: rockchip: Use GPIOD_OUT_LOW flag while requesting ep_gpio
Marc Zyngier (2):
genirq: Allow the PM device to originate from irq domain
genirq: Allow irq_chip registration functions to take a const irq_chip
Marco Cavenati (1):
perf/x86/intel/pt: Fix topa_entry base length
Marco Felsch (1):
ARM: dts: imx6qdl-kontron-samx6i: move phy reset into phy-node
Marek Behún (3):
firmware: turris-mox-rwtm: Do not complete if there are no waiters
firmware: turris-mox-rwtm: Fix checking return value of wait_for_completion_timeout()
firmware: turris-mox-rwtm: Initialize completion before mailbox
Marek Marczykowski-Górecki (1):
USB: serial: debug: do not echo input by default
Mark Rutland (12):
arm64: barrier: Restore spec_bar() macro
arm64: cputype: Add Cortex-X4 definitions
arm64: cputype: Add Neoverse-V3 definitions
arm64: errata: Add workaround for Arm errata 3194386 and 3312417
arm64: cputype: Add Cortex-X3 definitions
arm64: cputype: Add Cortex-A720 definitions
arm64: cputype: Add Cortex-X925 definitions
arm64: errata: Unify speculative SSBS errata logic
arm64: errata: Expand speculative SSBS workaround
arm64: cputype: Add Cortex-X1C definitions
arm64: cputype: Add Cortex-A725 definitions
arm64: errata: Expand speculative SSBS workaround (again)
Martin Willi (2):
net: dsa: mv88e6xxx: Limit chip-wide frame size config to CPU ports
net: dsa: b53: Limit chip-wide jumbo frame config to CPU ports
Masami Hiramatsu (Google) (1):
kprobes: Fix to check symbol prefixes correctly
Matthieu Baerts (NGI0) (8):
mptcp: sched: check both directions for backup
mptcp: distinguish rcv vs sent backup flag in requests
mptcp: mib: count MPJ with backup flag
mptcp: pm: only set request_bkup flag when sending MP_PRIO
mptcp: pm: fix backup support in signal endpoints
selftests: mptcp: join: validate backup in MPJ
selftests: mptcp: join: check backup support in signal endp
mptcp: fully established after ADD_ADDR echo on MPJ
Mavroudis Chatzilazaridis (1):
ALSA: hda/realtek: Add quirk for Acer Aspire E5-574G
Menglong Dong (1):
bpf: kprobe: remove unused declaring of bpf_kprobe_override
Miaohe Lin (1):
mm/hugetlb: fix possible recursive locking detected warning
Michael Ellerman (2):
powerpc/xmon: Fix disassembly CPU feature checks
selftests/sigaltstack: Fix ppc64 GCC build
Michael S. Tsirkin (1):
vhost/vsock: always initialize seqpacket_allow
Michael Tretter (1):
soc: xilinx: move PM_INIT_FINALIZE to zynqmp_pm_domains driver
Michael Walle (5):
ARM: dts: imx6qdl-kontron-samx6i: fix PHY reset
ARM: dts: imx6qdl-kontron-samx6i: fix board reset
ARM: dts: imx6qdl-kontron-samx6i: fix SPI0 chip selects
ARM: dts: imx6qdl-kontron-samx6i: fix PCIe reset polarity
ARM: dts: imx6qdl-kontron-samx6i: fix phy-mode
Michal Pecio (1):
media: uvcvideo: Fix the bandwdith quirk on USB 3.x
Mickaël Salaün (1):
selftests/landlock: Add cred_transfer test
Namhyung Kim (1):
perf report: Fix condition in sort__sym_cmp()
Nathan Chancellor (1):
kbuild: Fix '-S -c' in x86 stack protector scripts
NeilBrown (1):
SUNRPC: avoid soft lockup when transmitting UDP to reachable server.
Nick Bowler (1):
macintosh/therm_windtunnel: fix module unload.
Nicolas Dichtel (1):
ipv6: take care of scope when choosing the src addr
Niklas Cassel (2):
PCI: dw-rockchip: Fix initial PERST# GPIO value
Revert "ata: libata-scsi: Honor the D_SENSE bit for CK_COND=1 and no error"
Niklas Söderlund (1):
clocksource/drivers/sh_cmt: Address race condition for clock events
Nikolay Aleksandrov (1):
net: bridge: mcast: wait for previous gc cycles when removing port
Nilesh Javali (1):
scsi: qla2xxx: validate nvme_local_port correctly
Nitesh Shetty (1):
block: refactor to use helper
Nitin Gote (1):
drm/i915/gt: Do not consider preemption during execlists_dequeue for gen8
Olga Kornievskaia (1):
NFSv4.1 another fix for EXCHGID4_FLAG_USE_PNFS_DS for DS server
Oliver Neukum (1):
usb: vhci-hcd: Do not drop references before new references are gained
Pablo Neira Ayuso (5):
netfilter: nf_tables: rise cap on SELinux secmark context
netfilter: ctnetlink: use helper function to calculate expect ID
netfilter: nf_tables: set element extended ACK reporting support
netfilter: nf_tables: use timestamp to check for set element timeout
netfilter: nf_tables: bail out if stateful expression provides no .clone
Paolo Abeni (3):
mptcp: fix duplicate data handling
mptcp: fix NL PM announced address accounting
mptcp: fix bad RCVPRUNED mib accounting
Paolo Pisati (1):
m68k: amiga: Turn off Warp1260 interrupts during boot
Patryk Duda (1):
platform/chrome: cros_ec_proto: Lock device when updating MKBP version
Paul E. McKenney (3):
rcutorture: Fix rcu_torture_fwd_cb_cr() data race
torture: Enable clocksource watchdog with "tsc=watchdog"
clocksource: Fix brown-bag boolean thinko in cs_watchdog_read()
Pavel Begunkov (3):
io_uring: tighten task exit cancellations
io_uring/io-wq: limit retrying worker initialisation
kernel: rerun task_work while freezing in get_signal()
Peng Fan (1):
pinctrl: freescale: mxs: Fix refcount of child
Peter Oberparleiter (1):
s390/sclp: Prevent release of buffer in I/O
Peter Zijlstra (2):
x86/mm: Fix pti_clone_pgtable() alignment assumption
x86/mm: Fix pti_clone_entry_text() for i386
Petr Machata (1):
net: nexthop: Initialize all fields in dumped nexthops
Pierre Gondois (1):
sched/fair: Use all little CPUs for CPU-bound workloads
Pierre-Louis Bossart (1):
ASoC: Intel: use soc_intel_is_byt_cr() only when IOSF_MBI is reachable
Prashanth K (1):
usb: gadget: u_serial: Set start_delayed during suspend
Qianggui Song (1):
irqchip/meson-gpio: support more than 8 channels gpio irq
Quinn Tran (3):
scsi: qla2xxx: Unable to act on RSCN for port online
scsi: qla2xxx: Use QP lock to search for bsg
scsi: qla2xxx: Fix flash read failure
Radhey Shyam Pandey (1):
irqchip/xilinx: Fix shift out of bounds
Rafael Beims (1):
wifi: mwifiex: Fix interface type change
Rafał Miłecki (1):
arm64: dts: mediatek: mt7622: fix "emmc" pinctrl mux
Ricardo Ribalda (3):
media: imon: Fix race getting ictx->lock
media: uvcvideo: Fix integer overflow calculating timestamp
media: uvcvideo: Ignore empty TS packets
Ritesh Harjani (1):
ext4: return early for non-eligible fast_commit track events
Roman Smirnov (1):
udf: prevent integer overflow in udf_bitmap_free_blocks()
Ross Lagerwall (1):
decompress_bunzip2: fix rare decompression failure
Ryusuke Konishi (2):
nilfs2: avoid undefined behavior in nilfs_cnt32_ge macro
nilfs2: handle inconsistent state in nilfs_btnode_create_block()
Samasth Norway Ananda (1):
wifi: brcmsmac: LCN PHY code is used for BCM4313 2G-only device
Saurav Kashyap (1):
scsi: qla2xxx: Return ENOBUFS if sg_cnt is more than one for ELS cmds
Sean Christopherson (1):
KVM: VMX: Split out the non-virtualization part of vmx_interrupt_blocked()
Sean Young (1):
media: Revert "media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()"
Seth Forshee (DigitalOcean) (1):
fs: don't allow non-init s_user_ns for filesystems without FS_USERNS_MOUNT
Shahar Shitrit (1):
net/mlx5e: Add a check for the return value from mlx5_port_set_eth_ptys
Shawn Guo (1):
arm64: dts: qcom: msm8996: Move '#clock-cells' to QMP PHY child node
Shay Drory (1):
genirq/irqdesc: Honor caller provided affinity in alloc_desc()
Shenwei Wang (2):
irqchip/imx-irqsteer: Handle runtime power management correctly
net: stmmac: Enable mac_managed_pm phylink config
Shigeru Yoshida (1):
tipc: Return non-zero value from tipc_udp_addr2str() on error
Shreyas Deodhar (3):
scsi: qla2xxx: Fix optrom version displayed in FDMI
scsi: qla2xxx: Fix for possible memory corruption
scsi: qla2xxx: Complete command early within lock
Simon Horman (1):
net: stmmac: Correct byte order of perfect_match
Stefan Wahren (1):
spi: spi-fsl-lpspi: Fix scldiv calculation
Stephen Boyd (1):
soc: qcom: rpmh-rsc: Ensure irqs aren't disabled by rpmh_rsc_send_data() callers
Steven 'Steve' Kendall (1):
ALSA: hda: Add HP MP9 G4 Retail System AMS to force connect list
Sung Joon Kim (1):
drm/amd/display: Check for NULL pointer
Taehee Yoo (1):
xdp: fix invalid wait context of page_pool_destroy()
Takashi Iwai (5):
ALSA: usb-audio: Move HD Webcam quirk to the right place
ALSA: usb-audio: Correct surround channels in UAC1 channel map
ALSA: usb-audio: Re-add ScratchAmp quirk entries
ALSA: line6: Fix racy access to midibuf
ALSA: hda/hdmi: Yet more pin fix for HP EliteDesk 800 G4
Taniya Das (1):
clk: qcom: gcc-sc7280: Update force mem core bit for UFS ICE clock
Tatsunosuke Tobita (1):
HID: wacom: Modify pen IDs
Tejun Heo (1):
sched/fair: set_load_weight() must also call reweight_task() for SCHED_IDLE tasks
Tetsuo Handa (2):
mm: mmap_lock: replace get_memcg_path_buf() with on-stack buffer
profiling: remove profile=sleep support
Thomas Gleixner (3):
watchdog/perf: properly initialize the turbo mode timestamp and rearm counter
tick/broadcast: Move per CPU pointer access into the atomic section
timekeeping: Fix bogus clock_was_set() invocation in do_adjtimex()
Thomas Weißschuh (4):
sysctl: always initialize i_uid/i_gid
leds: triggers: Flush pending brightness before activating trigger
ACPI: battery: create alarm sysfs attribute atomically
ACPI: SBS: manage alarm sysfs attribute through psy core
Thomas Zimmermann (1):
drm/mgag200: Set DDC timeout in milliseconds
Thorsten Blum (1):
m68k: cmpxchg: Fix return value for default case in __arch_xchg()
Tvrtko Ursulin (1):
mm/numa_balancing: teach mpol_to_str about the balancing mode
Tze-nan Wu (1):
tracing: Fix overflow in get_free_elt()
Tzung-Bi Shih (1):
platform/chrome: cros_ec_debugfs: fix wrong EC message version
Uwe Kleine-König (2):
pwm: stm32: Always do lazy disabling
pinctrl: ti: ti-iodelay: Drop if block with always false condition
Vamshi Gajjela (1):
scsi: ufs: core: Fix hba->last_dme_cmd_tstamp timestamp updating logic
Vignesh Raghavendra (1):
dmaengine: ti: k3-udma: Fix BCHAN count with UHC and HC channels
Vincent Tremblay (1):
spidev: Add Silicon Labs EM3581 device compatible
Waiman Long (2):
clocksource: Reduce the default clocksource_watchdog() retries to 2
padata: Fix possible divide-by-0 panic in padata_mt_helper()
WangYuli (2):
Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x13d3:0x3591
nvme/pci: Add APST quirk for Lenovo N60z laptop
Wayne Lin (1):
drm/dp_mst: Fix all mstb marked as not probed after suspend/resume
Wayne Tung (1):
hwmon: (adt7475) Fix default duty on fan is disabled
Wei Liu (1):
PCI: hv: Return zero, not garbage, when reading PCI_INTERRUPT_PIN
Xiao Liang (1):
apparmor: Fix null pointer deref when receiving skb during sock creation
Xiaxi Shen (1):
ext4: fix uninitialized variable in ext4_inlinedir_to_tree
Xin Long (1):
sctp: move hlist_node and hashent out of sctp_ep_common
Yang Yingliang (5):
pinctrl: core: fix possible memory leak when pinctrl_enable() fails
pinctrl: single: fix possible memory leak when pinctrl_enable() fails
pinctrl: ti: ti-iodelay: fix possible memory leak when pinctrl_enable() fails
sched/smt: Introduce sched_smt_present_inc/dec() helper
sched/smt: Fix unbalance sched_smt_present dec/inc
Yao Zi (1):
drm/meson: fix canvas release in bind function
Yipeng Zou (1):
irqchip/mbigen: Fix mbigen node address layout
Yonghong Song (1):
selftests/bpf: Fix send_signal test with nested CONFIG_PARAVIRT
Yu Kuai (1):
md/raid5: avoid BUG_ON() while continue reshape after reassembling
Yu Liao (1):
tick/broadcast: Make takeover of broadcast hrtimer reliable
Zack Rusin (1):
drm/vmwgfx: Fix a deadlock in dma buf fence polling
Zhang Yi (4):
ext4: refactor ext4_da_map_blocks()
ext4: convert to exclusive lock while inserting delalloc extents
ext4: factor out a common helper to query extent map
ext4: check the extent status again before inserting delalloc block
Zhe Qiao (1):
riscv/mm: Add handling for VM_FAULT_SIGSEGV in mm_fault_error()
Zheng Yejian (1):
media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()
Zheng Zucheng (1):
sched/cputime: Fix mul_u64_u64_div_u64() precision for cputime
Zijun Hu (3):
kobject_uevent: Fix OOB access within zap_modalias_env()
devres: Fix devm_krealloc() wasting memory
devres: Fix memory leakage caused by driver API devm_free_percpu()
ethanwu (1):
ceph: fix incorrect kmalloc size of pagevec mempool
songxiebing (1):
ALSA: hda: conexant: Fix headset auto detect fail in the polling mode
tuhaowen (1):
dev/parport: fix the array out-of-bounds risk
wangdicheng (2):
ALSA: usb-audio: Fix microphone sound on HD webcam.
ALSA: usb-audio: Add a quirk for Sonix HD USB Camera
1 year, 4 months
- 1
- 1
Linux 5.10.224
by Greg Kroah-Hartman
I'm announcing the release of the 5.10.224 kernel.
All users of the 5.10 kernel series must upgrade.
The updated 5.10.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.10.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/arm64/cpu-feature-registers.rst | 38 ++
Documentation/arm64/silicon-errata.rst | 36 +
Documentation/devicetree/bindings/thermal/thermal-zones.yaml | 5
Makefile | 2
arch/arm/boot/dts/imx6q-kontron-samx6i.dtsi | 23 -
arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 26 +
arch/arm/mach-pxa/include/mach/spitz.h | 185 ----------
arch/arm/mach-pxa/spitz.c | 39 +-
arch/arm/mach-pxa/spitz.h | 185 ++++++++++
arch/arm/mach-pxa/spitz_pm.c | 2
arch/arm64/Kconfig | 38 ++
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 4
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 4
arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 4
arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 4
arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 2
arch/arm64/boot/dts/qcom/msm8996.dtsi | 2
arch/arm64/boot/dts/qcom/sdm845.dtsi | 2
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 4
arch/arm64/include/asm/cpucaps.h | 3
arch/arm64/include/asm/cputype.h | 16
arch/arm64/kernel/cpu_errata.c | 31 +
arch/arm64/kernel/cpufeature.c | 90 ++++
arch/arm64/kernel/proton-pack.c | 12
arch/m68k/amiga/config.c | 9
arch/m68k/atari/ataints.c | 6
arch/m68k/include/asm/cmpxchg.h | 2
arch/mips/include/asm/mach-loongson64/boot_param.h | 2
arch/mips/include/asm/mips-cm.h | 4
arch/mips/kernel/smp-cps.c | 5
arch/mips/loongson64/env.c | 8
arch/mips/sgi-ip30/ip30-console.c | 1
arch/powerpc/configs/85xx-hw.config | 2
arch/powerpc/include/asm/percpu.h | 10
arch/powerpc/kernel/mce.c | 14
arch/powerpc/kernel/setup_64.c | 2
arch/powerpc/kernel/traps.c | 8
arch/powerpc/kvm/powerpc.c | 4
arch/powerpc/xmon/ppc-dis.c | 33 -
arch/riscv/mm/fault.c | 17
arch/sparc/include/asm/oplib_64.h | 1
arch/sparc/prom/init_64.c | 3
arch/sparc/prom/p1275.c | 2
arch/um/kernel/time.c | 4
arch/x86/events/intel/pt.c | 4
arch/x86/events/intel/pt.h | 4
arch/x86/kernel/cpu/mtrr/mtrr.c | 2
arch/x86/kernel/devicetree.c | 2
arch/x86/kvm/vmx/vmx.c | 11
arch/x86/kvm/vmx/vmx.h | 1
arch/x86/mm/pti.c | 8
arch/x86/pci/intel_mid_pci.c | 4
arch/x86/pci/xen.c | 4
arch/x86/platform/intel/iosf_mbi.c | 4
arch/x86/xen/p2m.c | 4
drivers/acpi/battery.c | 16
drivers/acpi/sbs.c | 23 -
drivers/android/binder.c | 4
drivers/base/core.c | 13
drivers/base/devres.c | 13
drivers/base/module.c | 4
drivers/block/rbd.c | 35 -
drivers/bluetooth/btusb.c | 4
drivers/char/hw_random/amd-rng.c | 4
drivers/char/tpm/eventlog/common.c | 2
drivers/clk/davinci/da8xx-cfgchip.c | 4
drivers/clocksource/sh_cmt.c | 13
drivers/edac/Makefile | 10
drivers/edac/skx_common.c | 88 ++++
drivers/edac/skx_common.h | 15
drivers/firmware/turris-mox-rwtm.c | 18
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 7
drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 3
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 7
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 14
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 7
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 5
drivers/gpu/drm/drm_client_modeset.c | 5
drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6
drivers/gpu/drm/gma500/cdv_intel_lvds.c | 3
drivers/gpu/drm/gma500/psb_intel_lvds.c | 3
drivers/gpu/drm/i915/gem/i915_gem_mman.c | 53 ++
drivers/gpu/drm/mgag200/mgag200_i2c.c | 2
drivers/gpu/drm/nouveau/nouveau_prime.c | 3
drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 8
drivers/gpu/drm/panfrost/panfrost_drv.c | 1
drivers/gpu/drm/qxl/qxl_display.c | 3
drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 2
drivers/hid/wacom_wac.c | 3
drivers/hwmon/adt7475.c | 2
drivers/hwmon/max6697.c | 5
drivers/hwtracing/coresight/coresight-platform.c | 4
drivers/i2c/i2c-smbus.c | 64 +++
drivers/infiniband/core/device.c | 6
drivers/infiniband/core/iwcm.c | 11
drivers/infiniband/hw/bnxt_re/ib_verbs.c | 8
drivers/infiniband/hw/bnxt_re/qplib_fp.h | 6
drivers/infiniband/hw/hns/hns_roce_device.h | 4
drivers/infiniband/hw/hns/hns_roce_mr.c | 5
drivers/infiniband/hw/mlx4/alias_GUID.c | 2
drivers/infiniband/hw/mlx4/mad.c | 2
drivers/infiniband/sw/rxe/rxe_req.c | 7
drivers/input/keyboard/qt1050.c | 7
drivers/input/mouse/elan_i2c_core.c | 2
drivers/irqchip/irq-imx-irqsteer.c | 40 +-
drivers/irqchip/irq-mbigen.c | 20 -
drivers/irqchip/irq-meson-gpio.c | 35 +
drivers/irqchip/irq-xilinx-intc.c | 2
drivers/isdn/hardware/mISDN/hfcmulti.c | 7
drivers/leds/led-class.c | 1
drivers/leds/led-triggers.c | 2
drivers/leds/leds-ss4200.c | 7
drivers/macintosh/therm_windtunnel.c | 2
drivers/md/md.c | 1
drivers/md/raid5.c | 20 -
drivers/media/pci/saa7134/saa7134-dvb.c | 8
drivers/media/platform/qcom/venus/vdec.c | 3
drivers/media/platform/vsp1/vsp1_histo.c | 20 -
drivers/media/platform/vsp1/vsp1_pipe.h | 2
drivers/media/platform/vsp1/vsp1_rpf.c | 8
drivers/media/rc/imon.c | 5
drivers/media/rc/lirc_dev.c | 4
drivers/media/usb/uvc/uvc_ctrl.c | 90 +++-
drivers/media/usb/uvc/uvc_video.c | 37 +-
drivers/media/usb/uvc/uvcvideo.h | 5
drivers/mfd/omap-usb-tll.c | 3
drivers/mtd/tests/Makefile | 34 -
drivers/mtd/tests/mtd_test.c | 9
drivers/mtd/ubi/eba.c | 3
drivers/net/bonding/bond_main.c | 7
drivers/net/dsa/b53/b53_common.c | 3
drivers/net/dsa/bcm_sf2.c | 4
drivers/net/dsa/mv88e6xxx/chip.c | 3
drivers/net/ethernet/brocade/bna/bna_types.h | 2
drivers/net/ethernet/brocade/bna/bnad.c | 11
drivers/net/ethernet/freescale/fec_main.c | 52 +-
drivers/net/ethernet/freescale/fec_ptp.c | 3
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 7
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c | 18
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_bloom_filter.c | 38 +-
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c | 13
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.h | 9
drivers/net/ethernet/qlogic/qed/qed_l2.c | 23 -
drivers/net/ethernet/qlogic/qede/qede_filter.c | 47 +-
drivers/net/ethernet/realtek/r8169_main.c | 8
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 2
drivers/net/ethernet/stmicro/stmmac/hwif.h | 2
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4
drivers/net/netconsole.c | 2
drivers/net/usb/qmi_wwan.c | 1
drivers/net/usb/sr9700.c | 11
drivers/net/wireless/ath/ath11k/dp.h | 1
drivers/net/wireless/ath/ath11k/dp_rx.c | 51 ++
drivers/net/wireless/ath/ath11k/dp_rx.h | 6
drivers/net/wireless/ath/ath11k/mac.c | 19 -
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 18
drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2
drivers/net/wireless/virt_wifi.c | 20 -
drivers/nvme/host/pci.c | 36 +
drivers/parport/procfs.c | 24 -
drivers/pci/controller/pci-hyperv.c | 4
drivers/pci/controller/pcie-rockchip.c | 2
drivers/pci/pci.c | 19 -
drivers/pci/setup-bus.c | 6
drivers/pinctrl/core.c | 12
drivers/pinctrl/freescale/pinctrl-mxs.c | 4
drivers/pinctrl/pinctrl-rockchip.c | 17
drivers/pinctrl/pinctrl-single.c | 7
drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 14
drivers/platform/chrome/cros_ec_debugfs.c | 1
drivers/platform/chrome/cros_ec_proto.c | 2
drivers/platform/mips/cpu_hwmon.c | 3
drivers/power/supply/axp288_charger.c | 22 -
drivers/pwm/pwm-stm32.c | 5
drivers/remoteproc/imx_rproc.c | 5
drivers/rtc/interface.c | 9
drivers/rtc/rtc-cmos.c | 10
drivers/rtc/rtc-isl1208.c | 11
drivers/s390/char/sclp_sd.c | 10
drivers/scsi/mpt3sas/mpt3sas_base.c | 38 +-
drivers/scsi/qla2xxx/qla_bsg.c | 2
drivers/scsi/qla2xxx/qla_gs.c | 2
drivers/scsi/qla2xxx/qla_init.c | 63 ++-
drivers/scsi/qla2xxx/qla_mid.c | 2
drivers/scsi/qla2xxx/qla_nvme.c | 5
drivers/scsi/qla2xxx/qla_os.c | 7
drivers/scsi/qla2xxx/qla_sup.c | 108 ++++-
drivers/scsi/ufs/ufshcd.c | 11
drivers/soc/qcom/pdr_interface.c | 8
drivers/soc/qcom/rpmh-rsc.c | 7
drivers/soc/qcom/rpmh.c | 1
drivers/soc/xilinx/zynqmp_pm_domains.c | 16
drivers/soc/xilinx/zynqmp_power.c | 5
drivers/spi/spi-fsl-lpspi.c | 6
drivers/tty/serial/serial_core.c | 8
drivers/usb/gadget/function/u_serial.c | 1
drivers/usb/gadget/udc/core.c | 10
drivers/usb/serial/usb_debug.c | 7
drivers/usb/usbip/vhci_hcd.c | 9
drivers/vhost/vdpa.c | 30 -
fs/btrfs/free-space-cache.c | 1
fs/ceph/super.c | 3
fs/exec.c | 8
fs/ext2/balloc.c | 11
fs/ext4/extents_status.c | 2
fs/ext4/inode.c | 76 ++--
fs/ext4/mballoc.c | 3
fs/ext4/namei.c | 73 +++
fs/ext4/xattr.c | 6
fs/f2fs/inode.c | 3
fs/f2fs/segment.h | 3
fs/file.c | 1
fs/fuse/control.c | 10
fs/fuse/inode.c | 80 ++--
fs/fuse/virtio_fs.c | 12
fs/hfs/inode.c | 3
fs/hfsplus/bfind.c | 15
fs/hfsplus/extents.c | 9
fs/hfsplus/hfsplus_fs.h | 21 +
fs/jbd2/commit.c | 2
fs/jbd2/journal.c | 6
fs/jfs/jfs_imap.c | 5
fs/nilfs2/btnode.c | 25 +
fs/nilfs2/btree.c | 4
fs/nilfs2/segment.c | 7
fs/proc/proc_sysctl.c | 6
fs/proc/task_mmu.c | 2
fs/super.c | 11
fs/udf/balloc.c | 51 +-
fs/udf/super.c | 3
include/linux/compiler_attributes.h | 1
include/linux/irq.h | 7
include/linux/irqdomain.h | 10
include/linux/jbd2.h | 5
include/linux/objagg.h | 1
include/linux/pci_ids.h | 2
include/linux/qed/qed_eth_if.h | 21 -
include/linux/sched/signal.h | 6
include/linux/task_work.h | 3
include/linux/trace_events.h | 1
include/net/netfilter/nf_tables.h | 25 +
include/net/sctp/sctp.h | 4
include/net/sctp/structs.h | 8
include/trace/events/rpcgss.h | 2
include/uapi/linux/netfilter/nf_tables.h | 2
include/uapi/linux/zorro_ids.h | 3
io_uring/io-wq.c | 10
kernel/bpf/btf.c | 10
kernel/debug/kdb/kdb_io.c | 6
kernel/dma/mapping.c | 2
kernel/events/core.c | 2
kernel/events/internal.h | 2
kernel/irq/chip.c | 32 +
kernel/irq/irqdesc.c | 1
kernel/irq/manage.c | 2
kernel/kprobes.c | 4
kernel/padata.c | 7
kernel/rcu/rcutorture.c | 2
kernel/sched/core.c | 23 -
kernel/sched/cputime.c | 6
kernel/sched/fair.c | 9
kernel/sched/sched.h | 2
kernel/signal.c | 8
kernel/task_work.c | 34 +
kernel/time/ntp.c | 9
kernel/time/tick-broadcast.c | 24 +
kernel/trace/tracing_map.c | 6
kernel/watchdog_hld.c | 11
lib/decompress_bunzip2.c | 3
lib/kobject_uevent.c | 17
lib/objagg.c | 18
net/bluetooth/l2cap_core.c | 1
net/core/filter.c | 15
net/core/link_watch.c | 4
net/core/xdp.c | 4
net/ipv4/esp4.c | 3
net/ipv4/nexthop.c | 7
net/ipv4/route.c | 2
net/ipv6/addrconf.c | 3
net/ipv6/esp6.c | 3
net/ipv6/ndisc.c | 34 -
net/iucv/af_iucv.c | 4
net/l2tp/l2tp_core.c | 15
net/mptcp/mib.c | 2
net/mptcp/mib.h | 2
net/mptcp/options.c | 2
net/mptcp/pm.c | 9
net/mptcp/pm_netlink.c | 30 +
net/mptcp/protocol.c | 10
net/mptcp/protocol.h | 6
net/mptcp/subflow.c | 24 +
net/netfilter/ipset/ip_set_list_set.c | 3
net/netfilter/ipvs/ip_vs_proto_sctp.c | 4
net/netfilter/nf_conntrack_netlink.c | 3
net/netfilter/nf_tables_api.c | 149 +-------
net/netfilter/nft_connlimit.c | 2
net/netfilter/nft_counter.c | 4
net/netfilter/nft_dynset.c | 2
net/netfilter/nft_set_hash.c | 8
net/netfilter/nft_set_pipapo.c | 18
net/netfilter/nft_set_pipapo_avx2.c | 12
net/netfilter/nft_set_rbtree.c | 6
net/packet/af_packet.c | 86 ++++
net/sched/act_ct.c | 4
net/sctp/input.c | 46 +-
net/sctp/proc.c | 10
net/sctp/socket.c | 6
net/smc/smc_core.c | 32 -
net/sunrpc/auth_gss/gss_krb5_keys.c | 2
net/sunrpc/clnt.c | 3
net/sunrpc/sched.c | 4
net/sunrpc/xprtrdma/frwr_ops.c | 9
net/sunrpc/xprtrdma/verbs.c | 20 -
net/sunrpc/xprtrdma/xprt_rdma.h | 2
net/tipc/udp_media.c | 5
net/wireless/nl80211.c | 16
net/wireless/util.c | 8
samples/Kconfig | 8
samples/Makefile | 1
samples/fanotify/.gitignore | 1
samples/fanotify/Makefile | 5
samples/fanotify/fs-monitor.c | 142 +++++++
scripts/gcc-x86_32-has-stack-protector.sh | 2
scripts/gcc-x86_64-has-stack-protector.sh | 2
security/apparmor/lsm.c | 7
security/apparmor/policy.c | 2
security/apparmor/policy_unpack.c | 1
security/keys/keyctl.c | 2
sound/pci/hda/patch_hdmi.c | 2
sound/pci/hda/patch_realtek.c | 1
sound/soc/codecs/max98088.c | 10
sound/soc/codecs/wsa881x.c | 2
sound/soc/intel/common/soc-intel-quirks.h | 2
sound/soc/pxa/spitz.c | 58 +--
sound/usb/line6/driver.c | 5
sound/usb/quirks-table.h | 4
sound/usb/stream.c | 4
tools/lib/bpf/btf_dump.c | 8
tools/memory-model/lock.cat | 20 -
tools/perf/util/sort.c | 2
tools/testing/selftests/bpf/prog_tests/send_signal.c | 3
tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 2
tools/testing/selftests/bpf/progs/btf_dump_test_case_multidim.c | 4
tools/testing/selftests/bpf/progs/btf_dump_test_case_syntax.c | 4
tools/testing/selftests/bpf/test_sockmap.c | 9
tools/testing/selftests/drivers/net/mlxsw/spectrum-2/tc_flower.sh | 55 ++
tools/testing/selftests/net/forwarding/devlink_lib.sh | 2
tools/testing/selftests/sigaltstack/current_stack_pointer.h | 2
349 files changed, 3062 insertions(+), 1571 deletions(-)
Adrian Hunter (4):
perf/x86/intel/pt: Fix pt_topa_entry_for_page() address calculation
perf: Fix perf_aux_size() for greater-than 32-bit size
perf: Prevent passing zero nr_pages to rb_alloc_aux()
perf/x86/intel/pt: Fix a topa_entry base address calculation
Al Viro (3):
powerpc: fix a file leak in kvm_vcpu_ioctl_enable_cap()
lirc: rc_dev_get_from_fd(): fix file leak
protect the fetch of ->fd[fd] in do_dup2() from mispredictions
Alan Maguire (2):
bpf: annotate BTF show functions with __printf
bpf: Eliminate remaining "make W=1" warnings in kernel/bpf/btf.o
Alan Stern (1):
tools/memory-model: Fix bug in lock.cat
Aleksandr Burakov (1):
saa7134: Unchecked i2c_transfer function result fixed
Aleksandr Mishin (1):
remoteproc: imx_rproc: Skip over memory region when node value is NULL
Alex Shi (1):
fs/nilfs2: remove some unused macros to tame gcc
Alexander Maltsev (1):
netfilter: ipset: Add list flush to cancel_gc
Alexandra Winter (1):
net/iucv: fix use after free in iucv_sock_close()
Alexey Kodanev (1):
bna: adjust 'name' buf size of bna_tcb and bna_ccb structures
Amit Cohen (2):
mlxsw: spectrum_acl_bloom_filter: Make mlxsw_sp_acl_bf_key_encode() more flexible
selftests: forwarding: devlink_lib: Wait for udev events after reloading
Amit Daniel Kachhap (1):
arm64: cpufeature: Fix the visibility of compat hwcaps
Andi Kleen (1):
x86/mtrr: Check if fixed MTRRs exist before saving them
Andi Shyti (1):
drm/i915/gem: Fix Virtual Memory mapping boundaries calculation
Andreas Larsson (1):
sparc64: Fix incorrect function signature and add prototype for prom_cif_init
Andrei Lalaev (1):
Input: qt1050 - handle CHIP_ID reading error
Andrii Nakryiko (1):
libbpf: Fix no-args func prototype BTF dumping syntax
Andy Shevchenko (1):
driver core: Cast to (void *) with __force for __percpu pointer
Arnd Bergmann (4):
EDAC, i10nm: make skx_common.o a separate module
ARM: pxa: spitz: use gpio descriptors for audio
mtd: make mtd_test.c a separate module
kdb: address -Wformat-security warnings
Arseniy Krasnov (1):
irqchip/meson-gpio: Convert meson_gpio_irq_controller::lock to 'raw_spinlock_t'
Baochen Qiang (3):
wifi: ath11k: fix wrong handling of CCMP256 and GCMP ciphers
wifi: cfg80211: fix typo in cfg80211_calculate_bitrate_he()
wifi: cfg80211: handle 2x996 RU allocation in cfg80211_calculate_bitrate_he()
Baokun Li (2):
ext4: check dot and dotdot of dx_root before making dir indexed
ext4: make sure the first directory block is not a hole
Bart Van Assche (1):
RDMA/iwcm: Fix a use-after-free related to destroying CM IDs
Bastien Curutchet (1):
clk: davinci: da8xx-cfgchip: Initialize clk_init_data before use
Benjamin Coddington (2):
SUNRPC: Fixup gss_status tracepoint error output
SUNRPC: Fix a race to wake a sync task
Besar Wicaksono (1):
arm64: Add Neoverse-V2 part
Breno Leitao (1):
net: netconsole: Disable target before netpoll cleanup
Cai Huoqing (1):
vdpa: Make use of PFN_PHYS/PFN_UP/PFN_DOWN helper macro
Carl Huang (1):
ath11k: dp: stop rx pktlog before suspend
Carlos Llamas (1):
binder: fix hang of unregistered readers
Chao Yu (3):
hfsplus: fix to avoid false alarm of circular locking
hfs: fix to initialize fields of hfs_inode_info after hfs_alloc_inode()
f2fs: fix to don't dirty inode for readonly filesystem
Chen Ni (3):
x86/xen: Convert comma to semicolon
drm/qxl: Add check for drm_cvt_mode
ASoC: max98088: Check for clk_prepare_enable() error
Chen-Yu Tsai (1):
arm64: dts: mediatek: mt8183-kukui: Drop bogus output-enable property
Chengchang Tang (1):
RDMA/hns: Fix missing pagesize and alignment check in FRMR
Chengen Du (1):
af_packet: Handle outgoing VLAN packets without hardware offloading
Chris Wulff (1):
usb: gadget: core: Check for unset descriptor
Chuck Lever (2):
xprtrdma: Rename frwr_release_mr()
xprtrdma: Fix rpcrdma_reqs_reset()
Csókás Bence (1):
net: fec: Refactor: #define magic constants
Csókás, Bence (3):
net: fec: Fix FEC_ECR_EN1588 being cleared on link-down
rtc: interface: Add RTC offset to alarm after fix-up
net: fec: Stop PPS on driver remove
Damien Le Moal (1):
scsi: mpt3sas: Avoid IOMMU page faults on REPORT ZONES
Dan Carpenter (1):
mISDN: Fix a use after free in hfcmulti_tx()
Dan Williams (1):
driver core: Fix uevent_show() vs driver detach race
Daniel Schaefer (1):
media: uvcvideo: Override default flags
Daniele Palmas (1):
net: usb: qmi_wwan: fix memory leak for not ip packets
Danilo Krummrich (1):
drm/nouveau: prime: fix refcount underflow
David Hildenbrand (1):
fs/proc/task_mmu: indicate PM_FILE for PMD-mapped file THP
Dikshita Agarwal (2):
media: venus: flush all buffers in output plane streamoff
media: venus: fix use after free in vdec_close
Dmitry Antipov (1):
Bluetooth: l2cap: always unlock channel in l2cap_conless_channel()
Dmitry Baryshkov (4):
arm64: dts: qcom: sdm845: add power-domain to UFS PHY
arm64: dts: qcom: msm8996: specify UFS core_clk frequencies
soc: qcom: pdr: protect locator_addr with the main mutex
soc: qcom: pdr: fix parsing of domains lists
Dmitry Torokhov (2):
ARM: spitz: fix GPIO assignment for backlight
Input: elan_i2c - do not leave interrupt disabled on suspend failure
Dmitry Yashin (1):
pinctrl: rockchip: update rk3308 iomux routes
Dominique Martinet (1):
MIPS: Octeron: remove source file executable bit
Dong Aisheng (1):
remoteproc: imx_rproc: Fix ignoring mapping vdev regions
Douglas Anderson (3):
drm/panel: boe-tv101wum-nl6: If prepare fails, disable GPIO before regulators
drm/panel: boe-tv101wum-nl6: Check for errors on the NOP in prepare()
kdb: Use the passed prompt in kdb_position_cursor()
Dragan Simic (1):
drm/panfrost: Mark simple_ondemand governor as softdep
Eero Tamminen (1):
m68k: atari: Fix TT bootup freeze / unexpected (SCU) interrupt messages
En-Wei Wu (1):
wifi: virt_wifi: avoid reporting connection success with wrong SSID
Eric Dumazet (3):
sched: act_ct: take care of padding in struct zones_ht_key
net: linkwatch: use system_unbound_wq
wifi: cfg80211: restrict NL80211_ATTR_TXQ_QUANTUM values
Eric Sandeen (1):
fuse: verify {g,u}id mount options correctly
Esben Haabendal (1):
powerpc/configs: Update defconfig with now user-visible CONFIG_FSL_IFC
FUJITA Tomonori (1):
PCI: Add Edimax Vendor ID to pci_ids.h
Fedor Pchelkin (2):
apparmor: use kvfree_sensitive to free data->data
ubi: eba: properly rollback inside self_check_eba
Filipe Manana (1):
btrfs: fix bitmap leak when loading free space cache on duplicate entry
Florian Westphal (2):
netfilter: nft_set_pipapo_avx2: disable softinterrupts
netfilter: nf_tables: prefer nft_chain_validate
Fred Li (1):
bpf: Fix a segment issue when downgrading gso_size
Frederic Weisbecker (2):
task_work: s/task_work_cancel()/task_work_cancel_func()/
task_work: Introduce task_work_cancel() again
Gabriel Krisman Bertazi (2):
samples: Add fs error monitoring example
samples: Make fs-monitor depend on libc and headers
Gaosheng Cui (1):
gss_krb5: Fix the error handling path for crypto_sync_skcipher_setkey
Geliang Tang (4):
selftests/bpf: Fix prog numbers in test_sockmap
selftests/bpf: Check length of recv in test_sockmap
selftests/bpf: Close fd in error path in drop_on_reuseport
mptcp: export local_address
George Kennedy (1):
serial: core: check uartclk for zero to avoid divide by zero
Greg Kroah-Hartman (1):
Linux 5.10.224
Gregory CLEMENT (1):
MIPS: SMP-CPS: Fix address for GCR_ACCESS register for CM3 and later
Guangguan Wang (1):
net/smc: set rmb's SG_MAX_SINGLE_ALLOC limitation only when CONFIG_ARCH_NO_SG_CHAIN is defined
Guenter Roeck (4):
hwmon: (max6697) Fix underflow when writing limit attributes
hwmon: (max6697) Fix swapped temp{1,8} critical alarms
i2c: smbus: Improve handling of stuck alerts
i2c: smbus: Send alert notifications to all devices if source not found
Hagar Hemdan (1):
net: esp: cleanup esp_output_tail_tcp() in case of unsupported ESPINTCP
Hans de Goede (3):
leds: trigger: Unregister sysfs attributes before calling deactivate()
power: supply: axp288_charger: Fix constant_charge_voltage writes
power: supply: axp288_charger: Round constant_charge_voltage writes down
Heiner Kallweit (1):
r8169: don't increment tx_dropped in case of NETDEV_TX_BUSY
Hilda Wu (1):
Bluetooth: btusb: Add RTL8852BE device 0489:e125 to device tables
Honggang LI (1):
RDMA/rxe: Don't set BTH_ACK_MASK for UC or UD QPs
Ian Forbes (1):
drm/vmwgfx: Fix overlay when using Screen Targets
Ido Schimmel (4):
lib: objagg: Fix general protection fault
mlxsw: spectrum_acl_erp: Fix object nesting warning
mlxsw: spectrum_acl: Fix ACL scale regression and firmware errors
ipv4: Fix incorrect source address in Record Route option
Ilpo Järvinen (7):
x86/of: Return consistent error type from x86_of_pci_irq_enable()
x86/pci/intel_mid_pci: Fix PCIBIOS_* return code handling
x86/pci/xen: Fix PCIBIOS_* return code handling
x86/platform/iosf_mbi: Convert PCIBIOS_* return codes to errnos
PCI: Fix resource double counting on remove & rescan
leds: ss4200: Convert PCIBIOS_* return codes to errnos
hwrng: amd - Convert PCIBIOS_* return codes to errnos
Ilya Dryomov (3):
rbd: don't assume rbd_is_lock_owner() for exclusive mappings
rbd: rename RBD_LOCK_STATE_RELEASING and releasing_wait
rbd: don't assume RBD_LOCK_STATE_LOCKED for exclusive mappings
Ismael Luceno (1):
ipvs: Avoid unnecessary calls to skb_is_gso_sctp
Jack Wang (1):
bnxt_re: Fix imm_data endianness
James Chapman (1):
l2tp: fix lockdep splat
James Clark (1):
coresight: Fix ref leak when of_coresight_parse_endpoint() fails
James Morse (1):
arm64: cpufeature: Force HWCAP to be based on the sysreg visible to user-space
Jan Kara (4):
ext4: avoid writing unitialized memory to disk in EA inodes
ext2: Verify bitmap and itable block numbers before using them
udf: Avoid using corrupted block bitmap buffer
jbd2: make jbd2_journal_get_max_txn_bufs() internal
Jari Ruusu (1):
Fix gcc 4.9 build issue in 5.10.y
Jason Wang (1):
vhost-vdpa: switch to use vmf_insert_pfn() in the fault handler
Javier Carrasco (1):
mfd: omap-usb-tll: Use struct_size to allocate tll
Jay Buddhabhatti (1):
drivers: soc: xilinx: check return status of get_api_version()
Jens Axboe (1):
nvme: split command copy into a helper
Jeongjun Park (1):
jfs: Fix array-index-out-of-bounds in diFree
Jerome Brunet (1):
arm64: dts: amlogic: gx: correct hdmi clocks
Jiaxun Yang (3):
platform: mips: cpu_hwmon: Disable driver on unsupported hardware
MIPS: ip30: ip30-console: Add missing include
MIPS: Loongson64: env: Hook up Loongsson-2K
Joe Hattori (2):
char: tpm: Fix possible memory leak in tpm_bios_measurements_open()
net: dsa: bcm_sf2: Fix a possible memory leak in bcm_sf2_mdio_register()
Johannes Berg (4):
wifi: virt_wifi: don't use strlen() in const context
um: time-travel: fix time-travel-start option
net: bonding: correctly annotate RCU in bond_should_notify_peers()
wifi: nl80211: don't give key data to userspace
Jonas Karlman (1):
arm64: dts: rockchip: Increase VOP clk rate on RK3328
Joy Chakraborty (2):
rtc: cmos: Fix return value of nvmem callbacks
rtc: isl1208: Fix return value of nvmem callbacks
Justin Stitt (2):
ntp: Clamp maxerror and esterror to operating range
ntp: Safeguard against time_constant overflow
Kees Cook (1):
exec: Fix ToCToU between perm check and set-uid/gid usage
Kemeng Shi (2):
jbd2: avoid memleak in jbd2_journal_write_metadata_buffer
ext4: fix wrong unit use in ext4_mb_find_by_goal
Krzysztof Kozlowski (2):
dt-bindings: thermal: correct thermal zone node name limit
ASoC: codecs: wsa881x: Correct Soundwire ports mask
Kuniyuki Iwashima (1):
sctp: Fix null-ptr-deref in reuseport_add_sock().
Lance Richardson (1):
dma: fix call order in dmam_free_coherent
Laurent Pinchart (2):
media: renesas: vsp1: Fix _irqsave and _irq mix
media: renesas: vsp1: Store RPF partition configuration per RPF instance
Leon Romanovsky (4):
RDMA/mlx4: Fix truncated output warning in mad.c
RDMA/mlx4: Fix truncated output warning in alias_GUID.c
RDMA/device: Return error earlier if port in not valid
nvme-pci: add missing condition check for existence of mapped data
Li Nan (1):
md: do not delete safemode_timer in mddev_suspend
Linus Torvalds (1):
Add gitignore file for samples/fanotify/ subdirectory
Luca Ceresoli (1):
Revert "leds: led-core: Fix refcount leak in of_led_get()"
Lucas Stach (4):
drm/etnaviv: fix DMA direction handling for cached RW buffers
irqchip/imx-irqsteer: Constify irq_chip struct
irqchip/imx-irqsteer: Add runtime PM support
drm/bridge: analogix_dp: properly handle zero sized AUX transactions
Luis Henriques (SUSE) (1):
ext4: fix infinite loop when replaying fast_commit
Lukas Wunner (1):
PCI/DPC: Fix use-after-free on concurrent DPC and hot-removal
Ma Jun (2):
drm/amdgpu: Fix the null pointer dereference to ras_manager
drm/amdgpu/pm: Fix the null pointer dereference in apply_state_adjust_rules
Ma Ke (4):
drm/gma500: fix null pointer dereference in cdv_intel_lvds_get_modes
drm/gma500: fix null pointer dereference in psb_intel_lvds_get_modes
net: usb: sr9700: fix uninitialized variable use in sr_mdio_read
drm/client: fix null pointer dereference in drm_client_modeset_probe
Maciej Żenczykowski (1):
ipv6: fix ndisc_is_useropt() handling for PIO
Mahesh Salgaonkar (1):
powerpc: Avoid nmi_enter/nmi_exit in real mode interrupt.
Manish Rangankar (1):
scsi: qla2xxx: During vport delete send async logout explicitly
Manivannan Sadhasivam (1):
PCI: rockchip: Use GPIOD_OUT_LOW flag while requesting ep_gpio
Marc Zyngier (2):
genirq: Allow the PM device to originate from irq domain
genirq: Allow irq_chip registration functions to take a const irq_chip
Marco Cavenati (1):
perf/x86/intel/pt: Fix topa_entry base length
Marco Felsch (1):
ARM: dts: imx6qdl-kontron-samx6i: move phy reset into phy-node
Marek Behún (2):
firmware: turris-mox-rwtm: Fix checking return value of wait_for_completion_timeout()
firmware: turris-mox-rwtm: Initialize completion before mailbox
Marek Marczykowski-Górecki (1):
USB: serial: debug: do not echo input by default
Mark Rutland (11):
arm64: cputype: Add Cortex-X4 definitions
arm64: cputype: Add Neoverse-V3 definitions
arm64: errata: Add workaround for Arm errata 3194386 and 3312417
arm64: cputype: Add Cortex-X3 definitions
arm64: cputype: Add Cortex-A720 definitions
arm64: cputype: Add Cortex-X925 definitions
arm64: errata: Unify speculative SSBS errata logic
arm64: errata: Expand speculative SSBS workaround
arm64: cputype: Add Cortex-X1C definitions
arm64: cputype: Add Cortex-A725 definitions
arm64: errata: Expand speculative SSBS workaround (again)
Martin Willi (2):
net: dsa: mv88e6xxx: Limit chip-wide frame size config to CPU ports
net: dsa: b53: Limit chip-wide jumbo frame config to CPU ports
Masami Hiramatsu (Google) (1):
kprobes: Fix to check symbol prefixes correctly
Matthieu Baerts (NGI0) (4):
mptcp: sched: check both directions for backup
mptcp: distinguish rcv vs sent backup flag in requests
mptcp: mib: count MPJ with backup flag
mptcp: pm: fix backup support in signal endpoints
Mavroudis Chatzilazaridis (1):
ALSA: hda/realtek: Add quirk for Acer Aspire E5-574G
Menglong Dong (1):
bpf: kprobe: remove unused declaring of bpf_kprobe_override
Michael Ellerman (2):
powerpc/xmon: Fix disassembly CPU feature checks
selftests/sigaltstack: Fix ppc64 GCC build
Michael Tretter (1):
soc: xilinx: move PM_INIT_FINALIZE to zynqmp_pm_domains driver
Michael Walle (5):
ARM: dts: imx6qdl-kontron-samx6i: fix PHY reset
ARM: dts: imx6qdl-kontron-samx6i: fix board reset
ARM: dts: imx6qdl-kontron-samx6i: fix SPI0 chip selects
ARM: dts: imx6qdl-kontron-samx6i: fix PCIe reset polarity
ARM: dts: imx6qdl-kontron-samx6i: fix phy-mode
Michal Pecio (1):
media: uvcvideo: Fix the bandwdith quirk on USB 3.x
Miklos Szeredi (1):
fuse: name fs_context consistently
Namhyung Kim (1):
perf report: Fix condition in sort__sym_cmp()
Nathan Chancellor (1):
kbuild: Fix '-S -c' in x86 stack protector scripts
NeilBrown (1):
SUNRPC: avoid soft lockup when transmitting UDP to reachable server.
Nick Bowler (1):
macintosh/therm_windtunnel: fix module unload.
Nicolas Dichtel (1):
ipv6: take care of scope when choosing the src addr
Niklas Söderlund (1):
clocksource/drivers/sh_cmt: Address race condition for clock events
Nilesh Javali (1):
scsi: qla2xxx: validate nvme_local_port correctly
Oliver Neukum (1):
usb: vhci-hcd: Do not drop references before new references are gained
Pablo Neira Ayuso (5):
netfilter: nf_tables: rise cap on SELinux secmark context
netfilter: ctnetlink: use helper function to calculate expect ID
netfilter: nf_tables: set element extended ACK reporting support
netfilter: nf_tables: use timestamp to check for set element timeout
netfilter: nf_tables: allow clone callbacks to sleep
Paolo Abeni (2):
mptcp: fix duplicate data handling
mptcp: fix NL PM announced address accounting
Paolo Pisati (1):
m68k: amiga: Turn off Warp1260 interrupts during boot
Patryk Duda (1):
platform/chrome: cros_ec_proto: Lock device when updating MKBP version
Paul E. McKenney (1):
rcutorture: Fix rcu_torture_fwd_cb_cr() data race
Pavel Begunkov (2):
io_uring/io-wq: limit retrying worker initialisation
kernel: rerun task_work while freezing in get_signal()
Peng Fan (2):
pinctrl: freescale: mxs: Fix refcount of child
remoteproc: imx_rproc: ignore mapping vdev regions
Peter Oberparleiter (1):
s390/sclp: Prevent release of buffer in I/O
Peter Zijlstra (2):
x86/mm: Fix pti_clone_pgtable() alignment assumption
x86/mm: Fix pti_clone_entry_text() for i386
Petr Machata (1):
net: nexthop: Initialize all fields in dumped nexthops
Pierre Gondois (1):
sched/fair: Use all little CPUs for CPU-bound workloads
Pierre-Louis Bossart (1):
ASoC: Intel: use soc_intel_is_byt_cr() only when IOSF_MBI is reachable
Prashanth K (1):
usb: gadget: u_serial: Set start_delayed during suspend
Qianggui Song (1):
irqchip/meson-gpio: support more than 8 channels gpio irq
Qiuxu Zhuo (1):
EDAC/skx_common: Add new ADXL components for 2-level memory
Quinn Tran (1):
scsi: qla2xxx: Fix flash read failure
Radhey Shyam Pandey (1):
irqchip/xilinx: Fix shift out of bounds
Rafael Beims (1):
wifi: mwifiex: Fix interface type change
Rafał Miłecki (1):
arm64: dts: mediatek: mt7622: fix "emmc" pinctrl mux
Ricardo Ribalda (3):
media: imon: Fix race getting ictx->lock
media: uvcvideo: Allow entity-defined get_info and get_cur
media: uvcvideo: Ignore empty TS packets
Roman Smirnov (1):
udf: prevent integer overflow in udf_bitmap_free_blocks()
Ross Lagerwall (1):
decompress_bunzip2: fix rare decompression failure
Ryusuke Konishi (2):
nilfs2: avoid undefined behavior in nilfs_cnt32_ge macro
nilfs2: handle inconsistent state in nilfs_btnode_create_block()
Samasth Norway Ananda (1):
wifi: brcmsmac: LCN PHY code is used for BCM4313 2G-only device
Saurav Kashyap (1):
scsi: qla2xxx: Return ENOBUFS if sg_cnt is more than one for ELS cmds
Sean Christopherson (1):
KVM: VMX: Split out the non-virtualization part of vmx_interrupt_blocked()
Sean Young (1):
media: Revert "media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()"
Seth Forshee (DigitalOcean) (1):
fs: don't allow non-init s_user_ns for filesystems without FS_USERNS_MOUNT
Shahar Shitrit (1):
net/mlx5e: Add a check for the return value from mlx5_port_set_eth_ptys
Shai Malin (1):
qed: Improve the stack space of filter_config()
Shay Drory (1):
genirq/irqdesc: Honor caller provided affinity in alloc_desc()
Sheng Yong (1):
f2fs: fix start segno of large section
Shenwei Wang (1):
irqchip/imx-irqsteer: Handle runtime power management correctly
Shigeru Yoshida (1):
tipc: Return non-zero value from tipc_udp_addr2str() on error
Shreyas Deodhar (3):
scsi: qla2xxx: Fix optrom version displayed in FDMI
scsi: qla2xxx: Fix for possible memory corruption
scsi: qla2xxx: Complete command early within lock
Simon Horman (1):
net: stmmac: Correct byte order of perfect_match
Sreekanth Reddy (1):
scsi: mpt3sas: Remove scsi_dma_map() error messages
Stefan Raspl (1):
net/smc: Allow SMC-D 1MB DMB allocations
Stefan Wahren (1):
spi: spi-fsl-lpspi: Fix scldiv calculation
Stephen Boyd (1):
soc: qcom: rpmh-rsc: Ensure irqs aren't disabled by rpmh_rsc_send_data() callers
Steven 'Steve' Kendall (1):
ALSA: hda: Add HP MP9 G4 Retail System AMS to force connect list
Sung Joon Kim (1):
drm/amd/display: Check for NULL pointer
Taehee Yoo (1):
xdp: fix invalid wait context of page_pool_destroy()
Takashi Iwai (4):
ALSA: usb-audio: Correct surround channels in UAC1 channel map
ALSA: usb-audio: Re-add ScratchAmp quirk entries
ALSA: line6: Fix racy access to midibuf
ALSA: hda/hdmi: Yet more pin fix for HP EliteDesk 800 G4
Tatsunosuke Tobita (1):
HID: wacom: Modify pen IDs
Tejun Heo (1):
sched/fair: set_load_weight() must also call reweight_task() for SCHED_IDLE tasks
Thomas Gleixner (2):
watchdog/perf: properly initialize the turbo mode timestamp and rearm counter
tick/broadcast: Move per CPU pointer access into the atomic section
Thomas Weißschuh (3):
sysctl: always initialize i_uid/i_gid
ACPI: battery: create alarm sysfs attribute atomically
ACPI: SBS: manage alarm sysfs attribute through psy core
Thomas Zimmermann (1):
drm/mgag200: Set DDC timeout in milliseconds
Thorsten Blum (1):
m68k: cmpxchg: Fix return value for default case in __arch_xchg()
Tze-nan Wu (1):
tracing: Fix overflow in get_free_elt()
Tzung-Bi Shih (1):
platform/chrome: cros_ec_debugfs: fix wrong EC message version
Uwe Kleine-König (2):
pwm: stm32: Always do lazy disabling
pinctrl: ti: ti-iodelay: Drop if block with always false condition
Vamshi Gajjela (1):
scsi: ufs: core: Fix hba->last_dme_cmd_tstamp timestamp updating logic
Waiman Long (1):
padata: Fix possible divide-by-0 panic in padata_mt_helper()
WangYuli (2):
Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x13d3:0x3591
nvme/pci: Add APST quirk for Lenovo N60z laptop
Wayne Tung (1):
hwmon: (adt7475) Fix default duty on fan is disabled
Wei Liu (1):
PCI: hv: Return zero, not garbage, when reading PCI_INTERRUPT_PIN
Xiao Liang (1):
apparmor: Fix null pointer deref when receiving skb during sock creation
Xin Long (1):
sctp: move hlist_node and hashent out of sctp_ep_common
Yang Yingliang (3):
pinctrl: core: fix possible memory leak when pinctrl_enable() fails
pinctrl: single: fix possible memory leak when pinctrl_enable() fails
pinctrl: ti: ti-iodelay: fix possible memory leak when pinctrl_enable() fails
Yipeng Zou (1):
irqchip/mbigen: Fix mbigen node address layout
Yonghong Song (1):
selftests/bpf: Fix send_signal test with nested CONFIG_PARAVIRT
Yu Kuai (1):
md/raid5: avoid BUG_ON() while continue reshape after reassembling
Yu Liao (1):
tick/broadcast: Make takeover of broadcast hrtimer reliable
Yunke Cao (1):
media: uvcvideo: Use entity get_cur in uvc_ctrl_set
Zhang Yi (2):
ext4: factor out a common helper to query extent map
ext4: check the extent status again before inserting delalloc block
Zhe Qiao (1):
riscv/mm: Add handling for VM_FAULT_SIGSEGV in mm_fault_error()
Zheng Yejian (1):
media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()
Zheng Zucheng (1):
sched/cputime: Fix mul_u64_u64_div_u64() precision for cputime
Zijun Hu (3):
kobject_uevent: Fix OOB access within zap_modalias_env()
devres: Fix devm_krealloc() wasting memory
devres: Fix memory leakage caused by driver API devm_free_percpu()
ethanwu (1):
ceph: fix incorrect kmalloc size of pagevec mempool
tuhaowen (1):
dev/parport: fix the array out-of-bounds risk
1 year, 4 months
- 1
- 1
Linux 5.4.282
by Greg Kroah-Hartman
I'm announcing the release of the 5.4.282 kernel.
All users of the 5.4 kernel series must upgrade.
The updated 5.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.4.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/arm64/cpu-feature-registers.rst | 38 ++
Documentation/arm64/silicon-errata.rst | 36 ++
Makefile | 2
arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 21 -
arch/arm64/Kconfig | 38 ++
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 4
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 4
arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 4
arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 4
arch/arm64/boot/dts/qcom/msm8996.dtsi | 2
arch/arm64/boot/dts/qcom/sdm845.dtsi | 2
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 4
arch/arm64/include/asm/cpucaps.h | 3
arch/arm64/include/asm/cputype.h | 16
arch/arm64/kernel/cpu_errata.c | 44 ++
arch/arm64/kernel/cpufeature.c | 90 ++++-
arch/m68k/amiga/config.c | 9
arch/m68k/atari/ataints.c | 6
arch/m68k/include/asm/cmpxchg.h | 2
arch/mips/include/asm/mips-cm.h | 4
arch/mips/kernel/smp-cps.c | 5
arch/powerpc/kvm/powerpc.c | 4
arch/powerpc/xmon/ppc-dis.c | 33 -
arch/sparc/include/asm/oplib_64.h | 1
arch/sparc/prom/init_64.c | 3
arch/sparc/prom/p1275.c | 2
arch/um/kernel/time.c | 4
arch/x86/events/intel/pt.c | 4
arch/x86/events/intel/pt.h | 4
arch/x86/kernel/cpu/mtrr/mtrr.c | 2
arch/x86/kernel/devicetree.c | 2
arch/x86/mm/pti.c | 6
arch/x86/pci/intel_mid_pci.c | 4
arch/x86/pci/xen.c | 4
arch/x86/platform/intel/iosf_mbi.c | 4
arch/x86/xen/p2m.c | 4
drivers/acpi/battery.c | 16
drivers/acpi/sbs.c | 23 -
drivers/android/binder.c | 4
drivers/base/core.c | 13
drivers/base/devres.c | 8
drivers/base/module.c | 4
drivers/block/rbd.c | 35 -
drivers/bluetooth/btusb.c | 4
drivers/char/hw_random/amd-rng.c | 4
drivers/char/tpm/eventlog/common.c | 2
drivers/clk/davinci/da8xx-cfgchip.c | 4
drivers/clocksource/sh_cmt.c | 13
drivers/edac/Makefile | 10
drivers/edac/skx_base.c | 51 ++
drivers/edac/skx_common.c | 146 +++++---
drivers/edac/skx_common.h | 19 -
drivers/firmware/turris-mox-rwtm.c | 18 -
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 7
drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 3
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 5
drivers/gpu/drm/drm_client_modeset.c | 5
drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6
drivers/gpu/drm/gma500/cdv_intel_lvds.c | 3
drivers/gpu/drm/gma500/psb_intel_lvds.c | 3
drivers/gpu/drm/i915/gem/i915_gem_mman.c | 47 ++
drivers/gpu/drm/mgag200/mgag200_i2c.c | 2
drivers/gpu/drm/nouveau/nouveau_prime.c | 3
drivers/gpu/drm/panfrost/panfrost_drv.c | 1
drivers/gpu/drm/qxl/qxl_display.c | 3
drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 2
drivers/hid/wacom_wac.c | 3
drivers/hwmon/adt7475.c | 2
drivers/hwmon/max6697.c | 5
drivers/i2c/i2c-smbus.c | 69 +++
drivers/infiniband/core/device.c | 6
drivers/infiniband/core/iwcm.c | 11
drivers/infiniband/hw/bnxt_re/ib_verbs.c | 8
drivers/infiniband/hw/bnxt_re/qplib_fp.h | 6
drivers/infiniband/hw/mlx4/alias_GUID.c | 2
drivers/infiniband/hw/mlx4/mad.c | 2
drivers/infiniband/sw/rxe/rxe_req.c | 7
drivers/input/keyboard/qt1050.c | 7
drivers/input/mouse/elan_i2c_core.c | 2
drivers/irqchip/irq-imx-irqsteer.c | 40 +-
drivers/irqchip/irq-mbigen.c | 20 -
drivers/isdn/hardware/mISDN/hfcmulti.c | 7
drivers/leds/led-triggers.c | 2
drivers/leds/leds-ss4200.c | 7
drivers/macintosh/therm_windtunnel.c | 2
drivers/md/raid5.c | 20 -
drivers/media/pci/saa7134/saa7134-dvb.c | 8
drivers/media/platform/qcom/venus/vdec.c | 1
drivers/media/platform/vsp1/vsp1_histo.c | 20 -
drivers/media/platform/vsp1/vsp1_pipe.h | 2
drivers/media/platform/vsp1/vsp1_rpf.c | 8
drivers/media/rc/imon.c | 5
drivers/media/usb/uvc/uvc_ctrl.c | 90 +++--
drivers/media/usb/uvc/uvc_video.c | 37 +-
drivers/media/usb/uvc/uvcvideo.h | 5
drivers/mfd/omap-usb-tll.c | 3
drivers/mtd/tests/Makefile | 34 -
drivers/mtd/tests/mtd_test.c | 9
drivers/mtd/ubi/eba.c | 3
drivers/net/bonding/bond_main.c | 7
drivers/net/ethernet/brocade/bna/bna_types.h | 2
drivers/net/ethernet/brocade/bna/bnad.c | 11
drivers/net/ethernet/freescale/fec_main.c | 52 ++
drivers/net/ethernet/freescale/fec_ptp.c | 3
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 7
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c | 13
drivers/net/ethernet/qlogic/qed/qed_l2.c | 23 -
drivers/net/ethernet/qlogic/qede/qede_filter.c | 47 +-
drivers/net/netconsole.c | 2
drivers/net/usb/qmi_wwan.c | 1
drivers/net/usb/sr9700.c | 11
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 18 -
drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2
drivers/net/wireless/virt_wifi.c | 20 -
drivers/nvme/host/pci.c | 10
drivers/parport/daisy.c | 6
drivers/parport/ieee1284.c | 4
drivers/parport/ieee1284_ops.c | 3
drivers/parport/parport_amiga.c | 2
drivers/parport/parport_atari.c | 2
drivers/parport/parport_cs.c | 6
drivers/parport/parport_gsc.c | 15
drivers/parport/parport_ip32.c | 25 -
drivers/parport/parport_mfc3.c | 2
drivers/parport/parport_pc.c | 178 ++++------
drivers/parport/parport_sunbpp.c | 2
drivers/parport/probe.c | 7
drivers/parport/procfs.c | 28 -
drivers/parport/share.c | 24 -
drivers/pci/controller/pci-hyperv.c | 4
drivers/pci/controller/pcie-rockchip.c | 12
drivers/pci/setup-bus.c | 6
drivers/pinctrl/core.c | 12
drivers/pinctrl/freescale/pinctrl-mxs.c | 4
drivers/pinctrl/pinctrl-single.c | 7
drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 14
drivers/platform/chrome/cros_ec_debugfs.c | 1
drivers/platform/mips/cpu_hwmon.c | 3
drivers/power/supply/axp288_charger.c | 22 -
drivers/pwm/pwm-stm32.c | 5
drivers/remoteproc/imx_rproc.c | 5
drivers/rtc/interface.c | 9
drivers/rtc/rtc-cmos.c | 10
drivers/rtc/rtc-isl1208.c | 11
drivers/s390/char/sclp_sd.c | 10
drivers/scsi/mpt3sas/mpt3sas_base.c | 38 +-
drivers/scsi/qla2xxx/qla_bsg.c | 2
drivers/scsi/qla2xxx/qla_mid.c | 2
drivers/scsi/qla2xxx/qla_nvme.c | 5
drivers/scsi/qla2xxx/qla_os.c | 7
drivers/scsi/ufs/ufshcd.c | 11
drivers/spi/spi-fsl-lpspi.c | 11
drivers/tty/serial/serial_core.c | 8
drivers/usb/core/urb.c | 31 +
drivers/usb/gadget/udc/core.c | 10
drivers/usb/serial/usb_debug.c | 7
drivers/usb/usbip/vhci_hcd.c | 9
fs/btrfs/free-space-cache.c | 1
fs/exec.c | 8
fs/ext4/mballoc.c | 3
fs/ext4/namei.c | 73 +++-
fs/ext4/xattr.c | 6
fs/f2fs/inode.c | 3
fs/file.c | 1
fs/hfs/inode.c | 3
fs/hfsplus/bfind.c | 15
fs/hfsplus/extents.c | 9
fs/hfsplus/hfsplus_fs.h | 21 +
fs/jbd2/journal.c | 1
fs/jfs/jfs_imap.c | 5
fs/nilfs2/btnode.c | 25 +
fs/nilfs2/btree.c | 4
fs/nilfs2/segment.c | 7
fs/udf/balloc.c | 51 +-
fs/udf/super.c | 3
include/linux/compiler_attributes.h | 1
include/linux/irq.h | 7
include/linux/irqdomain.h | 10
include/linux/objagg.h | 1
include/linux/pci_ids.h | 2
include/linux/platform_data/x86/soc.h | 65 +++
include/linux/qed/qed_eth_if.h | 21 -
include/linux/trace_events.h | 1
include/linux/usb.h | 1
include/net/netfilter/nf_tables.h | 21 +
include/net/sctp/sctp.h | 4
include/net/sctp/structs.h | 8
include/trace/events/rpcgss.h | 2
include/uapi/linux/netfilter/nf_tables.h | 2
include/uapi/linux/zorro_ids.h | 3
kernel/debug/kdb/kdb_io.c | 6
kernel/dma/mapping.c | 2
kernel/events/core.c | 2
kernel/events/internal.h | 2
kernel/irq/chip.c | 32 +
kernel/irq/irqdesc.c | 1
kernel/time/ntp.c | 9
kernel/time/tick-broadcast.c | 24 +
kernel/trace/tracing_map.c | 6
kernel/watchdog_hld.c | 11
lib/decompress_bunzip2.c | 3
lib/kobject_uevent.c | 17
lib/objagg.c | 18 -
mm/page-writeback.c | 30 +
net/bluetooth/l2cap_core.c | 1
net/core/filter.c | 15
net/core/link_watch.c | 4
net/ipv4/nexthop.c | 7
net/ipv4/route.c | 2
net/ipv6/addrconf.c | 3
net/ipv6/ndisc.c | 34 +
net/iucv/af_iucv.c | 4
net/netfilter/ipset/ip_set_list_set.c | 3
net/netfilter/ipvs/ip_vs_proto_sctp.c | 4
net/netfilter/nf_conntrack_netlink.c | 3
net/netfilter/nf_tables_api.c | 128 +------
net/netfilter/nft_set_hash.c | 8
net/netfilter/nft_set_rbtree.c | 6
net/packet/af_packet.c | 86 ++++
net/sctp/input.c | 46 +-
net/sctp/proc.c | 10
net/sctp/socket.c | 6
net/smc/smc_core.c | 32 -
net/sunrpc/auth_gss/gss_krb5_keys.c | 2
net/sunrpc/clnt.c | 3
net/sunrpc/sched.c | 4
net/tipc/udp_media.c | 5
net/wireless/nl80211.c | 10
net/wireless/util.c | 8
scripts/gcc-x86_32-has-stack-protector.sh | 2
scripts/gcc-x86_64-has-stack-protector.sh | 2
security/apparmor/lsm.c | 7
sound/pci/hda/patch_hdmi.c | 2
sound/soc/codecs/max98088.c | 10
sound/soc/intel/common/soc-intel-quirks.h | 55 ---
sound/usb/helper.c | 16
sound/usb/helper.h | 1
sound/usb/line6/driver.c | 5
sound/usb/mixer_scarlett_gen2.c | 2
sound/usb/quirks.c | 12
sound/usb/stream.c | 4
tools/lib/bpf/btf_dump.c | 8
tools/memory-model/lock.cat | 20 -
tools/perf/util/sort.c | 2
tools/testing/selftests/bpf/prog_tests/send_signal.c | 3
tools/testing/selftests/bpf/progs/btf_dump_test_case_multidim.c | 4
tools/testing/selftests/bpf/progs/btf_dump_test_case_syntax.c | 4
tools/testing/selftests/bpf/test_sockmap.c | 3
tools/testing/selftests/net/forwarding/devlink_lib.sh | 2
tools/testing/selftests/sigaltstack/current_stack_pointer.h | 2
250 files changed, 2102 insertions(+), 1194 deletions(-)
Adrian Hunter (4):
perf/x86/intel/pt: Fix pt_topa_entry_for_page() address calculation
perf: Fix perf_aux_size() for greater-than 32-bit size
perf: Prevent passing zero nr_pages to rb_alloc_aux()
perf/x86/intel/pt: Fix a topa_entry base address calculation
Al Viro (2):
powerpc: fix a file leak in kvm_vcpu_ioctl_enable_cap()
protect the fetch of ->fd[fd] in do_dup2() from mispredictions
Alan Stern (1):
tools/memory-model: Fix bug in lock.cat
Aleksandr Burakov (1):
saa7134: Unchecked i2c_transfer function result fixed
Aleksandr Mishin (1):
remoteproc: imx_rproc: Skip over memory region when node value is NULL
Alex Shi (1):
fs/nilfs2: remove some unused macros to tame gcc
Alexander Maltsev (1):
netfilter: ipset: Add list flush to cancel_gc
Alexandra Winter (1):
net/iucv: fix use after free in iucv_sock_close()
Alexey Kodanev (1):
bna: adjust 'name' buf size of bna_tcb and bna_ccb structures
Amit Cohen (1):
selftests: forwarding: devlink_lib: Wait for udev events after reloading
Amit Daniel Kachhap (1):
arm64: cpufeature: Fix the visibility of compat hwcaps
Andi Kleen (1):
x86/mtrr: Check if fixed MTRRs exist before saving them
Andi Shyti (1):
drm/i915/gem: Fix Virtual Memory mapping boundaries calculation
Andreas Larsson (1):
sparc64: Fix incorrect function signature and add prototype for prom_cif_init
Andrei Lalaev (1):
Input: qt1050 - handle CHIP_ID reading error
Andrii Nakryiko (1):
libbpf: Fix no-args func prototype BTF dumping syntax
Andy Shevchenko (1):
driver core: Cast to (void *) with __force for __percpu pointer
Arnd Bergmann (3):
EDAC, i10nm: make skx_common.o a separate module
mtd: make mtd_test.c a separate module
kdb: address -Wformat-security warnings
Baochen Qiang (2):
wifi: cfg80211: fix typo in cfg80211_calculate_bitrate_he()
wifi: cfg80211: handle 2x996 RU allocation in cfg80211_calculate_bitrate_he()
Baokun Li (2):
ext4: check dot and dotdot of dx_root before making dir indexed
ext4: make sure the first directory block is not a hole
Bart Van Assche (1):
RDMA/iwcm: Fix a use-after-free related to destroying CM IDs
Bastien Curutchet (1):
clk: davinci: da8xx-cfgchip: Initialize clk_init_data before use
Benjamin Coddington (2):
SUNRPC: Fixup gss_status tracepoint error output
SUNRPC: Fix a race to wake a sync task
Besar Wicaksono (1):
arm64: Add Neoverse-V2 part
Breno Leitao (1):
net: netconsole: Disable target before netpoll cleanup
Carlos Llamas (1):
binder: fix hang of unregistered readers
Chao Yu (3):
hfsplus: fix to avoid false alarm of circular locking
hfs: fix to initialize fields of hfs_inode_info after hfs_alloc_inode()
f2fs: fix to don't dirty inode for readonly filesystem
Chen Ni (3):
x86/xen: Convert comma to semicolon
drm/qxl: Add check for drm_cvt_mode
ASoC: max98088: Check for clk_prepare_enable() error
Chen-Yu Tsai (1):
PCI: rockchip: Make 'ep-gpios' DT property optional
Chengen Du (1):
af_packet: Handle outgoing VLAN packets without hardware offloading
Chris Wulff (1):
usb: gadget: core: Check for unset descriptor
Corey Minyard (1):
i2c: smbus: Don't filter out duplicate alerts
Csókás Bence (1):
net: fec: Refactor: #define magic constants
Csókás, Bence (3):
net: fec: Fix FEC_ECR_EN1588 being cleared on link-down
rtc: interface: Add RTC offset to alarm after fix-up
net: fec: Stop PPS on driver remove
Damien Le Moal (1):
scsi: mpt3sas: Avoid IOMMU page faults on REPORT ZONES
Dan Carpenter (1):
mISDN: Fix a use after free in hfcmulti_tx()
Dan Williams (1):
driver core: Fix uevent_show() vs driver detach race
Daniel Schaefer (1):
media: uvcvideo: Override default flags
Daniele Palmas (1):
net: usb: qmi_wwan: fix memory leak for not ip packets
Danilo Krummrich (1):
drm/nouveau: prime: fix refcount underflow
Dikshita Agarwal (1):
media: venus: fix use after free in vdec_close
Dmitry Antipov (1):
Bluetooth: l2cap: always unlock channel in l2cap_conless_channel()
Dmitry Baryshkov (2):
arm64: dts: qcom: sdm845: add power-domain to UFS PHY
arm64: dts: qcom: msm8996: specify UFS core_clk frequencies
Dmitry Torokhov (1):
Input: elan_i2c - do not leave interrupt disabled on suspend failure
Dominique Martinet (1):
MIPS: Octeron: remove source file executable bit
Dong Aisheng (1):
remoteproc: imx_rproc: Fix ignoring mapping vdev regions
Douglas Anderson (1):
kdb: Use the passed prompt in kdb_position_cursor()
Dragan Simic (1):
drm/panfrost: Mark simple_ondemand governor as softdep
Eero Tamminen (1):
m68k: atari: Fix TT bootup freeze / unexpected (SCU) interrupt messages
En-Wei Wu (1):
wifi: virt_wifi: avoid reporting connection success with wrong SSID
Eric Dumazet (1):
net: linkwatch: use system_unbound_wq
FUJITA Tomonori (1):
PCI: Add Edimax Vendor ID to pci_ids.h
Fedor Pchelkin (1):
ubi: eba: properly rollback inside self_check_eba
Filipe Manana (1):
btrfs: fix bitmap leak when loading free space cache on duplicate entry
Florian Westphal (1):
netfilter: nf_tables: prefer nft_chain_validate
Fred Li (1):
bpf: Fix a segment issue when downgrading gso_size
Gaosheng Cui (1):
gss_krb5: Fix the error handling path for crypto_sync_skcipher_setkey
Geliang Tang (1):
selftests/bpf: Check length of recv in test_sockmap
George Kennedy (1):
serial: core: check uartclk for zero to avoid divide by zero
Greg Kroah-Hartman (2):
USB: move snd_usb_pipe_sanity_check into the USB core
Linux 5.4.282
Gregory CLEMENT (1):
MIPS: SMP-CPS: Fix address for GCR_ACCESS register for CM3 and later
Guangguan Wang (1):
net/smc: set rmb's SG_MAX_SINGLE_ALLOC limitation only when CONFIG_ARCH_NO_SG_CHAIN is defined
Guenter Roeck (4):
hwmon: (max6697) Fix underflow when writing limit attributes
hwmon: (max6697) Fix swapped temp{1,8} critical alarms
i2c: smbus: Improve handling of stuck alerts
i2c: smbus: Send alert notifications to all devices if source not found
Hans de Goede (4):
leds: trigger: Unregister sysfs attributes before calling deactivate()
ASoC: Intel: Move soc_intel_is_foo() helpers to a generic header
power: supply: axp288_charger: Fix constant_charge_voltage writes
power: supply: axp288_charger: Round constant_charge_voltage writes down
Hilda Wu (1):
Bluetooth: btusb: Add RTL8852BE device 0489:e125 to device tables
Honggang LI (1):
RDMA/rxe: Don't set BTH_ACK_MASK for UC or UD QPs
Ian Forbes (1):
drm/vmwgfx: Fix overlay when using Screen Targets
Ido Schimmel (3):
lib: objagg: Fix general protection fault
mlxsw: spectrum_acl_erp: Fix object nesting warning
ipv4: Fix incorrect source address in Record Route option
Ilpo Järvinen (7):
x86/of: Return consistent error type from x86_of_pci_irq_enable()
x86/pci/intel_mid_pci: Fix PCIBIOS_* return code handling
x86/pci/xen: Fix PCIBIOS_* return code handling
x86/platform/iosf_mbi: Convert PCIBIOS_* return codes to errnos
PCI: Fix resource double counting on remove & rescan
leds: ss4200: Convert PCIBIOS_* return codes to errnos
hwrng: amd - Convert PCIBIOS_* return codes to errnos
Ilya Dryomov (3):
rbd: don't assume rbd_is_lock_owner() for exclusive mappings
rbd: rename RBD_LOCK_STATE_RELEASING and releasing_wait
rbd: don't assume RBD_LOCK_STATE_LOCKED for exclusive mappings
Ismael Luceno (1):
ipvs: Avoid unnecessary calls to skb_is_gso_sctp
Jack Wang (1):
bnxt_re: Fix imm_data endianness
James Morse (1):
arm64: cpufeature: Force HWCAP to be based on the sysreg visible to user-space
Jan Kara (3):
ext4: avoid writing unitialized memory to disk in EA inodes
udf: Avoid using corrupted block bitmap buffer
mm: avoid overflows in dirty throttling logic
Jari Ruusu (1):
Fix gcc 4.9 build issue in 5.4.y
Javier Carrasco (1):
mfd: omap-usb-tll: Use struct_size to allocate tll
Jeongjun Park (1):
jfs: Fix array-index-out-of-bounds in diFree
Jerome Brunet (1):
arm64: dts: amlogic: gx: correct hdmi clocks
Jiaxun Yang (1):
platform: mips: cpu_hwmon: Disable driver on unsupported hardware
Joe Hattori (1):
char: tpm: Fix possible memory leak in tpm_bios_measurements_open()
Joe Perches (2):
parport: Convert printk(KERN_<LEVEL> to pr_<level>(
parport: Standardize use of printmode
Johannes Berg (4):
wifi: virt_wifi: don't use strlen() in const context
um: time-travel: fix time-travel-start option
net: bonding: correctly annotate RCU in bond_should_notify_peers()
wifi: nl80211: don't give key data to userspace
Jonas Karlman (1):
arm64: dts: rockchip: Increase VOP clk rate on RK3328
Joy Chakraborty (2):
rtc: cmos: Fix return value of nvmem callbacks
rtc: isl1208: Fix return value of nvmem callbacks
Justin Stitt (2):
ntp: Clamp maxerror and esterror to operating range
ntp: Safeguard against time_constant overflow
Kees Cook (1):
exec: Fix ToCToU between perm check and set-uid/gid usage
Kemeng Shi (2):
jbd2: avoid memleak in jbd2_journal_write_metadata_buffer
ext4: fix wrong unit use in ext4_mb_find_by_goal
Kuniyuki Iwashima (1):
sctp: Fix null-ptr-deref in reuseport_add_sock().
Lance Richardson (1):
dma: fix call order in dmam_free_coherent
Laurent Pinchart (2):
media: renesas: vsp1: Fix _irqsave and _irq mix
media: renesas: vsp1: Store RPF partition configuration per RPF instance
Leon Romanovsky (4):
RDMA/mlx4: Fix truncated output warning in mad.c
RDMA/mlx4: Fix truncated output warning in alias_GUID.c
RDMA/device: Return error earlier if port in not valid
nvme-pci: add missing condition check for existence of mapped data
Lucas Stach (4):
drm/etnaviv: fix DMA direction handling for cached RW buffers
irqchip/imx-irqsteer: Constify irq_chip struct
irqchip/imx-irqsteer: Add runtime PM support
drm/bridge: analogix_dp: properly handle zero sized AUX transactions
Ma Jun (1):
drm/amdgpu: Fix the null pointer dereference to ras_manager
Ma Ke (4):
drm/gma500: fix null pointer dereference in cdv_intel_lvds_get_modes
drm/gma500: fix null pointer dereference in psb_intel_lvds_get_modes
net: usb: sr9700: fix uninitialized variable use in sr_mdio_read
drm/client: fix null pointer dereference in drm_client_modeset_probe
Maciej Żenczykowski (1):
ipv6: fix ndisc_is_useropt() handling for PIO
Manish Rangankar (1):
scsi: qla2xxx: During vport delete send async logout explicitly
Manivannan Sadhasivam (1):
PCI: rockchip: Use GPIOD_OUT_LOW flag while requesting ep_gpio
Marc Zyngier (2):
genirq: Allow the PM device to originate from irq domain
genirq: Allow irq_chip registration functions to take a const irq_chip
Marco Cavenati (1):
perf/x86/intel/pt: Fix topa_entry base length
Marco Felsch (1):
ARM: dts: imx6qdl-kontron-samx6i: move phy reset into phy-node
Marek Behún (2):
firmware: turris-mox-rwtm: Fix checking return value of wait_for_completion_timeout()
firmware: turris-mox-rwtm: Initialize completion before mailbox
Marek Marczykowski-Górecki (1):
USB: serial: debug: do not echo input by default
Mark Rutland (11):
arm64: cputype: Add Cortex-X4 definitions
arm64: cputype: Add Neoverse-V3 definitions
arm64: errata: Add workaround for Arm errata 3194386 and 3312417
arm64: cputype: Add Cortex-X3 definitions
arm64: cputype: Add Cortex-A720 definitions
arm64: cputype: Add Cortex-X925 definitions
arm64: errata: Unify speculative SSBS errata logic
arm64: errata: Expand speculative SSBS workaround
arm64: cputype: Add Cortex-X1C definitions
arm64: cputype: Add Cortex-A725 definitions
arm64: errata: Expand speculative SSBS workaround (again)
Menglong Dong (1):
bpf: kprobe: remove unused declaring of bpf_kprobe_override
Michael Ellerman (2):
powerpc/xmon: Fix disassembly CPU feature checks
selftests/sigaltstack: Fix ppc64 GCC build
Michael Walle (4):
ARM: dts: imx6qdl-kontron-samx6i: fix PHY reset
ARM: dts: imx6qdl-kontron-samx6i: fix board reset
ARM: dts: imx6qdl-kontron-samx6i: fix PCIe reset polarity
ARM: dts: imx6qdl-kontron-samx6i: fix phy-mode
Michal Pecio (1):
media: uvcvideo: Fix the bandwdith quirk on USB 3.x
Namhyung Kim (1):
perf report: Fix condition in sort__sym_cmp()
Nathan Chancellor (1):
kbuild: Fix '-S -c' in x86 stack protector scripts
NeilBrown (1):
SUNRPC: avoid soft lockup when transmitting UDP to reachable server.
Nick Bowler (1):
macintosh/therm_windtunnel: fix module unload.
Nicolas Dichtel (1):
ipv6: take care of scope when choosing the src addr
Niklas Söderlund (1):
clocksource/drivers/sh_cmt: Address race condition for clock events
Nilesh Javali (1):
scsi: qla2xxx: validate nvme_local_port correctly
Oleksandr Suvorov (1):
spi: fsl-lpspi: remove unneeded array
Oliver Neukum (1):
usb: vhci-hcd: Do not drop references before new references are gained
Pablo Neira Ayuso (4):
netfilter: nf_tables: rise cap on SELinux secmark context
netfilter: ctnetlink: use helper function to calculate expect ID
netfilter: nf_tables: set element extended ACK reporting support
netfilter: nf_tables: use timestamp to check for set element timeout
Paolo Pisati (1):
m68k: amiga: Turn off Warp1260 interrupts during boot
Peng Fan (2):
pinctrl: freescale: mxs: Fix refcount of child
remoteproc: imx_rproc: ignore mapping vdev regions
Peter Oberparleiter (1):
s390/sclp: Prevent release of buffer in I/O
Peter Zijlstra (1):
x86/mm: Fix pti_clone_pgtable() alignment assumption
Petr Machata (1):
net: nexthop: Initialize all fields in dumped nexthops
Pierre-Louis Bossart (1):
ASoC: Intel: use soc_intel_is_byt_cr() only when IOSF_MBI is reachable
Qiuxu Zhuo (1):
EDAC/skx_common: Add new ADXL components for 2-level memory
Rafael Beims (1):
wifi: mwifiex: Fix interface type change
Rafał Miłecki (1):
arm64: dts: mediatek: mt7622: fix "emmc" pinctrl mux
Ricardo Ribalda (3):
media: imon: Fix race getting ictx->lock
media: uvcvideo: Allow entity-defined get_info and get_cur
media: uvcvideo: Ignore empty TS packets
Roman Smirnov (1):
udf: prevent integer overflow in udf_bitmap_free_blocks()
Ross Lagerwall (1):
decompress_bunzip2: fix rare decompression failure
Ryusuke Konishi (2):
nilfs2: avoid undefined behavior in nilfs_cnt32_ge macro
nilfs2: handle inconsistent state in nilfs_btnode_create_block()
Samasth Norway Ananda (1):
wifi: brcmsmac: LCN PHY code is used for BCM4313 2G-only device
Saurav Kashyap (1):
scsi: qla2xxx: Return ENOBUFS if sg_cnt is more than one for ELS cmds
Sean Young (1):
media: Revert "media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()"
Shahar Shitrit (1):
net/mlx5e: Add a check for the return value from mlx5_port_set_eth_ptys
Shai Malin (1):
qed: Improve the stack space of filter_config()
Shay Drory (1):
genirq/irqdesc: Honor caller provided affinity in alloc_desc()
Shenwei Wang (1):
irqchip/imx-irqsteer: Handle runtime power management correctly
Shigeru Yoshida (1):
tipc: Return non-zero value from tipc_udp_addr2str() on error
Shreyas Deodhar (2):
scsi: qla2xxx: Fix for possible memory corruption
scsi: qla2xxx: Complete command early within lock
Sreekanth Reddy (1):
scsi: mpt3sas: Remove scsi_dma_map() error messages
Stefan Raspl (1):
net/smc: Allow SMC-D 1MB DMB allocations
Stefan Wahren (1):
spi: spi-fsl-lpspi: Fix scldiv calculation
Steven 'Steve' Kendall (1):
ALSA: hda: Add HP MP9 G4 Retail System AMS to force connect list
Sung Joon Kim (1):
drm/amd/display: Check for NULL pointer
Takashi Iwai (3):
ALSA: usb-audio: Correct surround channels in UAC1 channel map
ALSA: line6: Fix racy access to midibuf
ALSA: hda/hdmi: Yet more pin fix for HP EliteDesk 800 G4
Tatsunosuke Tobita (1):
HID: wacom: Modify pen IDs
Thomas Gleixner (3):
watchdog/perf: properly initialize the turbo mode timestamp and rearm counter
ASoC: Intel: Convert to new X86 CPU match macros
tick/broadcast: Move per CPU pointer access into the atomic section
Thomas Weißschuh (2):
ACPI: battery: create alarm sysfs attribute atomically
ACPI: SBS: manage alarm sysfs attribute through psy core
Thomas Zimmermann (1):
drm/mgag200: Set DDC timeout in milliseconds
Thorsten Blum (1):
m68k: cmpxchg: Fix return value for default case in __arch_xchg()
Tony Luck (2):
EDAC, skx_common: Refactor so that we initialize "dev" in result of adxl decode.
EDAC, skx: Retrieve and print retry_rd_err_log registers
Tze-nan Wu (1):
tracing: Fix overflow in get_free_elt()
Tzung-Bi Shih (1):
platform/chrome: cros_ec_debugfs: fix wrong EC message version
Uwe Kleine-König (2):
pwm: stm32: Always do lazy disabling
pinctrl: ti: ti-iodelay: Drop if block with always false condition
Vamshi Gajjela (1):
scsi: ufs: core: Fix hba->last_dme_cmd_tstamp timestamp updating logic
WangYuli (2):
Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x13d3:0x3591
nvme/pci: Add APST quirk for Lenovo N60z laptop
Wayne Tung (1):
hwmon: (adt7475) Fix default duty on fan is disabled
Wei Liu (1):
PCI: hv: Return zero, not garbage, when reading PCI_INTERRUPT_PIN
Xiao Liang (1):
apparmor: Fix null pointer deref when receiving skb during sock creation
Xin Long (1):
sctp: move hlist_node and hashent out of sctp_ep_common
Yang Yingliang (3):
pinctrl: core: fix possible memory leak when pinctrl_enable() fails
pinctrl: single: fix possible memory leak when pinctrl_enable() fails
pinctrl: ti: ti-iodelay: fix possible memory leak when pinctrl_enable() fails
Yipeng Zou (1):
irqchip/mbigen: Fix mbigen node address layout
Yonghong Song (1):
selftests/bpf: Fix send_signal test with nested CONFIG_PARAVIRT
Yu Kuai (1):
md/raid5: avoid BUG_ON() while continue reshape after reassembling
Yu Liao (1):
tick/broadcast: Make takeover of broadcast hrtimer reliable
Yunke Cao (1):
media: uvcvideo: Use entity get_cur in uvc_ctrl_set
Zheng Yejian (1):
media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()
Zijun Hu (2):
kobject_uevent: Fix OOB access within zap_modalias_env()
devres: Fix memory leakage caused by driver API devm_free_percpu()
tuhaowen (1):
dev/parport: fix the array out-of-bounds risk
1 year, 4 months
- 1
- 1
Re: [PATCH net v2] net: dsa: microchip: fix PTP config failure when using multiple ports
by Arun.Ramadoss＠microchip.com
On Sat, 2024-08-17 at 10:41 +0100, Martin Whitaker wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you
> know the content is safe
>
> When performing the port_hwtstamp_set operation,
> ptp_schedule_worker()
> will be called if hardware timestamoing is enabled on any of the
> ports.
> When using multiple ports for PTP, port_hwtstamp_set is executed for
> each port. When called for the first time ptp_schedule_worker()
> returns
> 0. On subsequent calls it returns 1, indicating the worker is already
> scheduled. Currently the ksz driver treats 1 as an error and fails to
> complete the port_hwtstamp_set operation, thus leaving the
> timestamping
> configuration for those ports unchanged.
>
> This patch fixes this by ignoring the ptp_schedule_worker() return
> value.
>
> Link:
> https://lore.kernel.org/netdev/7aae307a-35ca-4209-a850-7b2749d40f90@martin-…
> Fixes: bb01ad30570b0 ("net: dsa: microchip: ptp: manipulating
> absolute time using ptp hw clock")
> Signed-off-by: Martin Whitaker <foss(a)martin-whitaker.me.uk>
Acked-by: Arun Ramadoss <arun.ramadoss(a)microchip.com>
1 year, 4 months
- 1
- 0
[PATCH 1/2] wifi: mt76: mt7925: fix a potential array-index-out-of-bounds issue for clc
by Mingyen Hsieh
From: Ming Yen Hsieh <mingyen.hsieh(a)mediatek.com>
Due to the lack of checks on the clc array, if the firmware supports
more clc configuration, it will cause illegal memory access.
Cc: stable(a)vger.kernel.org
Fixes: c948b5da6bbe ("wifi: mt76: mt7925: add Mediatek Wi-Fi7 driver for mt7925 chips")
Signed-off-by: Ming Yen Hsieh <mingyen.hsieh(a)mediatek.com>
---
drivers/net/wireless/mediatek/mt76/mt7925/mcu.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
index 9dc22fbe25d3..c6c380571fd8 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
@@ -638,6 +638,9 @@ static int mt7925_load_clc(struct mt792x_dev *dev, const char *fw_name)
for (offset = 0; offset < len; offset += le32_to_cpu(clc->len)) {
clc = (const struct mt7925_clc *)(clc_base + offset);
+ if (clc->idx > ARRAY_SIZE(phy->clc))
+ break;
+
/* do not init buf again if chip reset triggered */
if (phy->clc[clc->idx])
continue;
--
2.18.0
1 year, 4 months
- 1
- 0
[PATCH 5.15.y V2] block: use "unsigned long" for blk_validate_block_size().
by David Hunter
From: Tetsuo Handa <penguin-kernel(a)i-love.sakura.ne.jp>
[ Upstream commit 37ae5a0f5287a52cf51242e76ccf198d02ffe495]
Since lo_simple_ioctl(LOOP_SET_BLOCK_SIZE) and ioctl(NBD_SET_BLKSIZE) pass
user-controlled "unsigned long arg" to blk_validate_block_size(),
"unsigned long" should be used for validation.
Signed-off-by: Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp>
Reviewed-by: Christoph Hellwig <hch(a)lst.de>
Link: https://lore.kernel.org/r/9ecbf057-4375-c2db-ab53-e4cc0dff953d@i-love.sakur…
Signed-off-by: Jens Axboe <axboe(a)kernel.dk>
(cherry picked from commit 37ae5a0f5287a52cf51242e76ccf198d02ffe495)
Signed-off-by: David Hunter <david.hunter.linux(a)gmail.com>
---
V1 --> V2
- put upstream commit after subject
- put the original Author
- Added a few people I needed to CC
---
include/linux/blkdev.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 905844172cfd..c6d57814988d 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -235,7 +235,7 @@ struct request {
void *end_io_data;
};
-static inline int blk_validate_block_size(unsigned int bsize)
+static inline int blk_validate_block_size(unsigned long bsize)
{
if (bsize < 512 || bsize > PAGE_SIZE || !is_power_of_2(bsize))
return -EINVAL;
--
2.43.0
1 year, 4 months
- 1
- 0
[git:media_tree/master] media: uapi/linux/cec.h: cec_msg_set_reply_to: zero flags
by Mauro Carvalho Chehab
This is an automatic generated email to let you know that the following patch were queued:
Subject: media: uapi/linux/cec.h: cec_msg_set_reply_to: zero flags
Author: Hans Verkuil <hverkuil-cisco(a)xs4all.nl>
Date: Wed Aug 7 09:22:10 2024 +0200
The cec_msg_set_reply_to() helper function never zeroed the
struct cec_msg flags field, this can cause unexpected behavior
if flags was uninitialized to begin with.
Signed-off-by: Hans Verkuil <hverkuil-cisco(a)xs4all.nl>
Fixes: 0dbacebede1e ("[media] cec: move the CEC framework out of staging and to media")
Cc: <stable(a)vger.kernel.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei(a)kernel.org>
include/uapi/linux/cec.h | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/include/uapi/linux/cec.h b/include/uapi/linux/cec.h
index 894fffc66f2c..b2af1dddd4d7 100644
--- a/include/uapi/linux/cec.h
+++ b/include/uapi/linux/cec.h
@@ -132,6 +132,8 @@ static inline void cec_msg_init(struct cec_msg *msg,
* Set the msg destination to the orig initiator and the msg initiator to the
* orig destination. Note that msg and orig may be the same pointer, in which
* case the change is done in place.
+ *
+ * It also zeroes the reply, timeout and flags fields.
*/
static inline void cec_msg_set_reply_to(struct cec_msg *msg,
struct cec_msg *orig)
@@ -139,7 +141,9 @@ static inline void cec_msg_set_reply_to(struct cec_msg *msg,
/* The destination becomes the initiator and vice versa */
msg->msg[0] = (cec_msg_destination(orig) << 4) |
cec_msg_initiator(orig);
- msg->reply = msg->timeout = 0;
+ msg->reply = 0;
+ msg->timeout = 0;
+ msg->flags = 0;
}
/**
1 year, 4 months
- 1
- 0
[PATCH 4.19 000/196] 4.19.320-rc1 review
by Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.320 release.
There are 196 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 Sat, 17 Aug 2024 13:18:17 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.320-r…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.19.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 4.19.320-rc1
WangYuli <wangyuli(a)uniontech.com>
nvme/pci: Add APST quirk for Lenovo N60z laptop
Kees Cook <kees(a)kernel.org>
exec: Fix ToCToU between perm check and set-uid/gid usage
Andi Shyti <andi.shyti(a)linux.intel.com>
drm/i915/gem: Fix Virtual Memory mapping boundaries calculation
Yunke Cao <yunkec(a)google.com>
media: uvcvideo: Use entity get_cur in uvc_ctrl_set
Amit Daniel Kachhap <amit.kachhap(a)arm.com>
arm64: cpufeature: Fix the visibility of compat hwcaps
Florian Westphal <fw(a)strlen.de>
netfilter: nf_tables: prefer nft_chain_validate
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: nf_tables: use timestamp to check for set element timeout
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: nf_tables: set element extended ACK reporting support
Nathan Chancellor <nathan(a)kernel.org>
kbuild: Fix '-S -c' in x86 stack protector scripts
Thomas Zimmermann <tzimmermann(a)suse.de>
drm/mgag200: Set DDC timeout in milliseconds
Lucas Stach <l.stach(a)pengutronix.de>
drm/bridge: analogix_dp: properly handle zero sized AUX transactions
Andi Kleen <ak(a)linux.intel.com>
x86/mtrr: Check if fixed MTRRs exist before saving them
Tze-nan Wu <Tze-nan.Wu(a)mediatek.com>
tracing: Fix overflow in get_free_elt()
Hans de Goede <hdegoede(a)redhat.com>
power: supply: axp288_charger: Round constant_charge_voltage writes down
Hans de Goede <hdegoede(a)redhat.com>
power: supply: axp288_charger: Fix constant_charge_voltage writes
George Kennedy <george.kennedy(a)oracle.com>
serial: core: check uartclk for zero to avoid divide by zero
Justin Stitt <justinstitt(a)google.com>
ntp: Safeguard against time_constant overflow
Dan Williams <dan.j.williams(a)intel.com>
driver core: Fix uevent_show() vs driver detach race
Justin Stitt <justinstitt(a)google.com>
ntp: Clamp maxerror and esterror to operating range
Thomas Gleixner <tglx(a)linutronix.de>
tick/broadcast: Move per CPU pointer access into the atomic section
Vamshi Gajjela <vamshigajjela(a)google.com>
scsi: ufs: core: Fix hba->last_dme_cmd_tstamp timestamp updating logic
Chris Wulff <crwulff(a)gmail.com>
usb: gadget: core: Check for unset descriptor
Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com>
USB: serial: debug: do not echo input by default
Oliver Neukum <oneukum(a)suse.com>
usb: vhci-hcd: Do not drop references before new references are gained
Takashi Iwai <tiwai(a)suse.de>
ALSA: line6: Fix racy access to midibuf
Stefan Wahren <wahrenst(a)gmx.net>
spi: spi-fsl-lpspi: Fix scldiv calculation
Oleksandr Suvorov <oleksandr.suvorov(a)toradex.com>
spi: fsl-lpspi: remove unneeded array
Clark Wang <xiaoning.wang(a)nxp.com>
spi: lpspi: add the error info of transfer speed setting
Clark Wang <xiaoning.wang(a)nxp.com>
spi: lpspi: Add i.MX8 boards support for lpspi
Clark Wang <xiaoning.wang(a)nxp.com>
spi: lpspi: Let watermark change with send data length
Clark Wang <xiaoning.wang(a)nxp.com>
spi: lpspi: Add slave mode support
Clark Wang <xiaoning.wang(a)nxp.com>
spi: lpspi: Replace all "master" with "controller"
Menglong Dong <menglong8.dong(a)gmail.com>
bpf: kprobe: remove unused declaring of bpf_kprobe_override
Guenter Roeck <linux(a)roeck-us.net>
i2c: smbus: Send alert notifications to all devices if source not found
Guenter Roeck <linux(a)roeck-us.net>
i2c: smbus: Improve handling of stuck alerts
Corey Minyard <cminyard(a)mvista.com>
i2c: smbus: Don't filter out duplicate alerts
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Expand speculative SSBS workaround (again)
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-A725 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X1C definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Expand speculative SSBS workaround
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Unify speculative SSBS errata logic
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X925 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-A720 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X3 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Add workaround for Arm errata 3194386 and 3312417
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Neoverse-V3 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X4 definitions
Besar Wicaksono <bwicaksono(a)nvidia.com>
arm64: Add Neoverse-V2 part
James Morse <james.morse(a)arm.com>
arm64: cpufeature: Force HWCAP to be based on the sysreg visible to user-space
Will Deacon <will.deacon(a)arm.com>
arm64: Add support for SB barrier and patch in over DSB; ISB sequences
Kemeng Shi <shikemeng(a)huaweicloud.com>
ext4: fix wrong unit use in ext4_mb_find_by_goal
Benjamin Coddington <bcodding(a)redhat.com>
SUNRPC: Fix a race to wake a sync task
Peter Oberparleiter <oberpar(a)linux.ibm.com>
s390/sclp: Prevent release of buffer in I/O
Kemeng Shi <shikemeng(a)huaweicloud.com>
jbd2: avoid memleak in jbd2_journal_write_metadata_buffer
Michal Pecio <michal.pecio(a)gmail.com>
media: uvcvideo: Fix the bandwdith quirk on USB 3.x
Ricardo Ribalda <ribalda(a)chromium.org>
media: uvcvideo: Ignore empty TS packets
Filipe Manana <fdmanana(a)suse.com>
btrfs: fix bitmap leak when loading free space cache on duplicate entry
Johannes Berg <johannes.berg(a)intel.com>
wifi: nl80211: don't give key data to userspace
Roman Smirnov <r.smirnov(a)omp.ru>
udf: prevent integer overflow in udf_bitmap_free_blocks()
FUJITA Tomonori <fujita.tomonori(a)gmail.com>
PCI: Add Edimax Vendor ID to pci_ids.h
Niklas Söderlund <niklas.soderlund+renesas(a)ragnatech.se>
clocksource/drivers/sh_cmt: Address race condition for clock events
Yu Kuai <yukuai3(a)huawei.com>
md/raid5: avoid BUG_ON() while continue reshape after reassembling
Csókás, Bence <csokas.bence(a)prolan.hu>
net: fec: Stop PPS on driver remove
Dmitry Antipov <dmantipov(a)yandex.ru>
Bluetooth: l2cap: always unlock channel in l2cap_conless_channel()
Eric Dumazet <edumazet(a)google.com>
net: linkwatch: use system_unbound_wq
Daniele Palmas <dnlplm(a)gmail.com>
net: usb: qmi_wwan: fix memory leak for not ip packets
Peter Zijlstra <peterz(a)infradead.org>
x86/mm: Fix pti_clone_pgtable() alignment assumption
Yipeng Zou <zouyipeng(a)huawei.com>
irqchip/mbigen: Fix mbigen node address layout
Ma Ke <make24(a)iscas.ac.cn>
net: usb: sr9700: fix uninitialized variable use in sr_mdio_read
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Correct surround channels in UAC1 channel map
Al Viro <viro(a)zeniv.linux.org.uk>
protect the fetch of ->fd[fd] in do_dup2() from mispredictions
Maciej Żenczykowski <maze(a)google.com>
ipv6: fix ndisc_is_useropt() handling for PIO
Alexandra Winter <wintera(a)linux.ibm.com>
net/iucv: fix use after free in iucv_sock_close()
Ian Forbes <ian.forbes(a)broadcom.com>
drm/vmwgfx: Fix overlay when using Screen Targets
Aleksandr Mishin <amishin(a)t-argos.ru>
remoteproc: imx_rproc: Skip over memory region when node value is NULL
Dong Aisheng <aisheng.dong(a)nxp.com>
remoteproc: imx_rproc: Fix ignoring mapping vdev regions
Peng Fan <peng.fan(a)nxp.com>
remoteproc: imx_rproc: ignore mapping vdev regions
Adrian Hunter <adrian.hunter(a)intel.com>
perf/x86/intel/pt: Fix a topa_entry base address calculation
Alexander Shishkin <alexander.shishkin(a)linux.intel.com>
perf/x86/intel/pt: Split ToPA metadata and page layout
Alexander Shishkin <alexander.shishkin(a)linux.intel.com>
perf/x86/intel/pt: Use pointer arithmetics instead in ToPA entry calculation
Alexander Shishkin <alexander.shishkin(a)linux.intel.com>
perf/x86/intel/pt: Use helpers to obtain ToPA entry size
Chao Peng <chao.p.peng(a)linux.intel.com>
perf/x86/intel/pt: Export pt_cap_get()
Zijun Hu <quic_zijuhu(a)quicinc.com>
devres: Fix memory leakage caused by driver API devm_free_percpu()
Andy Shevchenko <andriy.shevchenko(a)linux.intel.com>
driver core: Cast to (void *) with __force for __percpu pointer
tuhaowen <tuhaowen(a)uniontech.com>
dev/parport: fix the array out-of-bounds risk
Joe Perches <joe(a)perches.com>
parport: Standardize use of printmode
Joe Perches <joe(a)perches.com>
parport: Convert printk(KERN_<LEVEL> to pr_<level>(
Gustavo A. R. Silva <gustavo(a)embeddedor.com>
parport: parport_pc: Mark expected switch fall-through
Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org>
PCI: rockchip: Use GPIOD_OUT_LOW flag while requesting ep_gpio
Chen-Yu Tsai <wens(a)csie.org>
PCI: rockchip: Make 'ep-gpios' DT property optional
Jan Kara <jack(a)suse.cz>
mm: avoid overflows in dirty throttling logic
Dan Carpenter <dan.carpenter(a)linaro.org>
mISDN: Fix a use after free in hfcmulti_tx()
Shigeru Yoshida <syoshida(a)redhat.com>
tipc: Return non-zero value from tipc_udp_addr2str() on error
Johannes Berg <johannes.berg(a)intel.com>
net: bonding: correctly annotate RCU in bond_should_notify_peers()
Ido Schimmel <idosch(a)nvidia.com>
ipv4: Fix incorrect source address in Record Route option
Maciej Żenczykowski <maze(a)google.com>
net: ip_rt_get_source() - use new style struct initializer instead of memset
Gregory CLEMENT <gregory.clement(a)bootlin.com>
MIPS: SMP-CPS: Fix address for GCR_ACCESS register for CM3 and later
Lance Richardson <rlance(a)google.com>
dma: fix call order in dmam_free_coherent
Jeongjun Park <aha310510(a)gmail.com>
jfs: Fix array-index-out-of-bounds in diFree
Douglas Anderson <dianders(a)chromium.org>
kdb: Use the passed prompt in kdb_position_cursor()
Arnd Bergmann <arnd(a)arndb.de>
kdb: address -Wformat-security warnings
Wenlin Kang <wenlin.kang(a)windriver.com>
kdb: Fix bound check compiler warning
Ryusuke Konishi <konishi.ryusuke(a)gmail.com>
nilfs2: handle inconsistent state in nilfs_btnode_create_block()
Michael Ellerman <mpe(a)ellerman.id.au>
selftests/sigaltstack: Fix ppc64 GCC build
Bart Van Assche <bvanassche(a)acm.org>
RDMA/iwcm: Fix a use-after-free related to destroying CM IDs
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
platform: mips: cpu_hwmon: Disable driver on unsupported hardware
Thomas Gleixner <tglx(a)linutronix.de>
watchdog/perf: properly initialize the turbo mode timestamp and rearm counter
Marco Cavenati <cavenati.marco(a)gmail.com>
perf/x86/intel/pt: Fix topa_entry base length
Nilesh Javali <njavali(a)marvell.com>
scsi: qla2xxx: validate nvme_local_port correctly
Manish Rangankar <mrangankar(a)marvell.com>
scsi: qla2xxx: During vport delete send async logout explicitly
Joy Chakraborty <joychakr(a)google.com>
rtc: cmos: Fix return value of nvmem callbacks
Zijun Hu <quic_zijuhu(a)quicinc.com>
kobject_uevent: Fix OOB access within zap_modalias_env()
Ross Lagerwall <ross.lagerwall(a)citrix.com>
decompress_bunzip2: fix rare decompression failure
Fedor Pchelkin <pchelkin(a)ispras.ru>
ubi: eba: properly rollback inside self_check_eba
Bastien Curutchet <bastien.curutchet(a)bootlin.com>
clk: davinci: da8xx-cfgchip: Initialize clk_init_data before use
Chao Yu <chao(a)kernel.org>
f2fs: fix to don't dirty inode for readonly filesystem
Saurav Kashyap <skashyap(a)marvell.com>
scsi: qla2xxx: Return ENOBUFS if sg_cnt is more than one for ELS cmds
Carlos Llamas <cmllamas(a)google.com>
binder: fix hang of unregistered readers
Wei Liu <wei.liu(a)kernel.org>
PCI: hv: Return zero, not garbage, when reading PCI_INTERRUPT_PIN
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
hwrng: amd - Convert PCIBIOS_* return codes to errnos
Alan Stern <stern(a)rowland.harvard.edu>
tools/memory-model: Fix bug in lock.cat
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
leds: ss4200: Convert PCIBIOS_* return codes to errnos
Rafael Beims <rafael.beims(a)toradex.com>
wifi: mwifiex: Fix interface type change
Baokun Li <libaokun1(a)huawei.com>
ext4: make sure the first directory block is not a hole
Baokun Li <libaokun1(a)huawei.com>
ext4: check dot and dotdot of dx_root before making dir indexed
Paolo Pisati <p.pisati(a)gmail.com>
m68k: amiga: Turn off Warp1260 interrupts during boot
Ma Ke <make24(a)iscas.ac.cn>
drm/gma500: fix null pointer dereference in psb_intel_lvds_get_modes
Ma Ke <make24(a)iscas.ac.cn>
drm/gma500: fix null pointer dereference in cdv_intel_lvds_get_modes
Chao Yu <chao(a)kernel.org>
hfs: fix to initialize fields of hfs_inode_info after hfs_alloc_inode()
Dikshita Agarwal <quic_dikshita(a)quicinc.com>
media: venus: fix use after free in vdec_close
Joe Hattori <joe(a)pf.is.s.u-tokyo.ac.jp>
char: tpm: Fix possible memory leak in tpm_bios_measurements_open()
Nicolas Dichtel <nicolas.dichtel(a)6wind.com>
ipv6: take care of scope when choosing the src addr
Chengen Du <chengen.du(a)canonical.com>
af_packet: Handle outgoing VLAN packets without hardware offloading
Breno Leitao <leitao(a)debian.org>
net: netconsole: Disable target before netpoll cleanup
Yu Liao <liaoyu15(a)huawei.com>
tick/broadcast: Make takeover of broadcast hrtimer reliable
Ryusuke Konishi <konishi.ryusuke(a)gmail.com>
nilfs2: avoid undefined behavior in nilfs_cnt32_ge macro
Alex Shi <alex.shi(a)linux.alibaba.com>
fs/nilfs2: remove some unused macros to tame gcc
Peng Fan <peng.fan(a)nxp.com>
pinctrl: freescale: mxs: Fix refcount of child
Yang Yingliang <yangyingliang(a)huawei.com>
pinctrl: ti: ti-iodelay: fix possible memory leak when pinctrl_enable() fails
Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de>
pinctrl: ti: ti-iodelay: Drop if block with always false condition
Yang Yingliang <yangyingliang(a)huawei.com>
pinctrl: single: fix possible memory leak when pinctrl_enable() fails
Yang Yingliang <yangyingliang(a)huawei.com>
pinctrl: core: fix possible memory leak when pinctrl_enable() fails
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: ctnetlink: use helper function to calculate expect ID
Anirudh Venkataramanan <anirudh.venkataramanan(a)intel.com>
ice: Rework flex descriptor programming
Jack Wang <jinpu.wang(a)ionos.com>
bnxt_re: Fix imm_data endianness
Nick Bowler <nbowler(a)draconx.ca>
macintosh/therm_windtunnel: fix module unload.
Michael Ellerman <mpe(a)ellerman.id.au>
powerpc/xmon: Fix disassembly CPU feature checks
Dominique Martinet <dominique.martinet(a)atmark-techno.com>
MIPS: Octeron: remove source file executable bit
Dmitry Torokhov <dmitry.torokhov(a)gmail.com>
Input: elan_i2c - do not leave interrupt disabled on suspend failure
Arnd Bergmann <arnd(a)arndb.de>
mtd: make mtd_test.c a separate module
Honggang LI <honggangli(a)163.com>
RDMA/rxe: Don't set BTH_ACK_MASK for UC or UD QPs
Leon Romanovsky <leonro(a)nvidia.com>
RDMA/mlx4: Fix truncated output warning in alias_GUID.c
Leon Romanovsky <leonro(a)nvidia.com>
RDMA/mlx4: Fix truncated output warning in mad.c
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
PCI: Fix resource double counting on remove & rescan
Jon Derrick <jonathan.derrick(a)intel.com>
PCI: Equalize hotplug memory and io for occupied and empty slots
Andreas Larsson <andreas(a)gaisler.com>
sparc64: Fix incorrect function signature and add prototype for prom_cif_init
Jan Kara <jack(a)suse.cz>
ext4: avoid writing unitialized memory to disk in EA inodes
Javier Carrasco <javier.carrasco.cruz(a)gmail.com>
mfd: omap-usb-tll: Use struct_size to allocate tll
Lucas Stach <l.stach(a)pengutronix.de>
drm/etnaviv: fix DMA direction handling for cached RW buffers
Namhyung Kim <namhyung(a)kernel.org>
perf report: Fix condition in sort__sym_cmp()
Hans de Goede <hdegoede(a)redhat.com>
leds: trigger: Unregister sysfs attributes before calling deactivate()
Laurent Pinchart <laurent.pinchart+renesas(a)ideasonboard.com>
media: renesas: vsp1: Store RPF partition configuration per RPF instance
Laurent Pinchart <laurent.pinchart+renesas(a)ideasonboard.com>
media: renesas: vsp1: Fix _irqsave and _irq mix
Daniel Schaefer <dhs(a)frame.work>
media: uvcvideo: Override default flags
Ricardo Ribalda <ribalda(a)chromium.org>
media: uvcvideo: Allow entity-defined get_info and get_cur
Aleksandr Burakov <a.burakov(a)rosalinux.ru>
saa7134: Unchecked i2c_transfer function result fixed
Ricardo Ribalda <ribalda(a)chromium.org>
media: imon: Fix race getting ictx->lock
Amit Cohen <amcohen(a)nvidia.com>
selftests: forwarding: devlink_lib: Wait for udev events after reloading
Alexey Kodanev <aleksei.kodanev(a)bell-sw.com>
bna: adjust 'name' buf size of bna_tcb and bna_ccb structures
Adrian Hunter <adrian.hunter(a)intel.com>
perf: Prevent passing zero nr_pages to rb_alloc_aux()
Adrian Hunter <adrian.hunter(a)intel.com>
perf: Fix perf_aux_size() for greater-than 32-bit size
Ismael Luceno <iluceno(a)suse.de>
ipvs: Avoid unnecessary calls to skb_is_gso_sctp
Csókás, Bence <csokas.bence(a)prolan.hu>
net: fec: Fix FEC_ECR_EN1588 being cleared on link-down
Csókás Bence <csokas.bence(a)prolan.hu>
net: fec: Refactor: #define magic constants
Baochen Qiang <quic_bqiang(a)quicinc.com>
wifi: cfg80211: handle 2x996 RU allocation in cfg80211_calculate_bitrate_he()
Baochen Qiang <quic_bqiang(a)quicinc.com>
wifi: cfg80211: fix typo in cfg80211_calculate_bitrate_he()
Geliang Tang <tanggeliang(a)kylinos.cn>
selftests/bpf: Check length of recv in test_sockmap
Guangguan Wang <guangguan.wang(a)linux.alibaba.com>
net/smc: set rmb's SG_MAX_SINGLE_ALLOC limitation only when CONFIG_ARCH_NO_SG_CHAIN is defined
Stefan Raspl <raspl(a)linux.ibm.com>
net/smc: Allow SMC-D 1MB DMB allocations
Samasth Norway Ananda <samasth.norway.ananda(a)oracle.com>
wifi: brcmsmac: LCN PHY code is used for BCM4313 2G-only device
Thorsten Blum <thorsten.blum(a)toblux.com>
m68k: cmpxchg: Fix return value for default case in __arch_xchg()
Chen Ni <nichen(a)iscas.ac.cn>
x86/xen: Convert comma to semicolon
Eero Tamminen <oak(a)helsinkinet.fi>
m68k: atari: Fix TT bootup freeze / unexpected (SCU) interrupt messages
Jonas Karlman <jonas(a)kwiboo.se>
arm64: dts: rockchip: Increase VOP clk rate on RK3328
Guenter Roeck <linux(a)roeck-us.net>
hwmon: (max6697) Fix swapped temp{1,8} critical alarms
Guenter Roeck <linux(a)roeck-us.net>
hwmon: (max6697) Auto-convert to use SENSOR_DEVICE_ATTR_{RO, RW, WO}
Guenter Roeck <linux(a)roeck-us.net>
hwmon: Introduce SENSOR_DEVICE_ATTR_{RO, RW, WO} and variants
Guenter Roeck <linux(a)roeck-us.net>
hwmon: (max6697) Fix underflow when writing limit attributes
Uwe Kleine-König <u.kleine-koenig(a)baylibre.com>
pwm: stm32: Always do lazy disabling
Wayne Tung <chineweff(a)gmail.com>
hwmon: (adt7475) Fix default duty on fan is disabled
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/platform/iosf_mbi: Convert PCIBIOS_* return codes to errnos
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/pci/xen: Fix PCIBIOS_* return code handling
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/pci/intel_mid_pci: Fix PCIBIOS_* return code handling
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/of: Return consistent error type from x86_of_pci_irq_enable()
Chao Yu <chao(a)kernel.org>
hfsplus: fix to avoid false alarm of circular locking
Tzung-Bi Shih <tzungbi(a)kernel.org>
platform/chrome: cros_ec_debugfs: fix wrong EC message version
-------------
Diffstat:
Documentation/arm64/silicon-errata.txt | 18 ++
Documentation/hwmon/hwmon-kernel-api.txt | 24 +-
Makefile | 4 +-
arch/arm64/Kconfig | 38 +++
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 4 +-
arch/arm64/include/asm/assembler.h | 13 +
arch/arm64/include/asm/barrier.h | 4 +
arch/arm64/include/asm/cpucaps.h | 4 +-
arch/arm64/include/asm/cputype.h | 16 ++
arch/arm64/include/asm/sysreg.h | 6 +
arch/arm64/include/asm/uaccess.h | 3 +-
arch/arm64/include/uapi/asm/hwcap.h | 1 +
arch/arm64/kernel/cpu_errata.c | 43 ++++
arch/arm64/kernel/cpufeature.c | 107 ++++++--
arch/arm64/kernel/cpuinfo.c | 1 +
arch/m68k/amiga/config.c | 9 +
arch/m68k/atari/ataints.c | 6 +-
arch/m68k/include/asm/cmpxchg.h | 2 +-
arch/mips/include/asm/mips-cm.h | 4 +
arch/mips/kernel/smp-cps.c | 5 +-
arch/mips/pci/pcie-octeon.c | 0
arch/powerpc/xmon/ppc-dis.c | 33 +--
arch/sparc/include/asm/oplib_64.h | 1 +
arch/sparc/prom/init_64.c | 3 -
arch/sparc/prom/p1275.c | 2 +-
arch/x86/events/intel/pt.c | 157 +++++++-----
arch/x86/events/intel/pt.h | 25 +-
arch/x86/include/asm/intel_pt.h | 23 ++
arch/x86/kernel/cpu/mtrr/mtrr.c | 2 +-
arch/x86/kernel/devicetree.c | 2 +-
arch/x86/mm/pti.c | 6 +-
arch/x86/pci/intel_mid_pci.c | 4 +-
arch/x86/pci/xen.c | 4 +-
arch/x86/platform/intel/iosf_mbi.c | 4 +-
arch/x86/xen/p2m.c | 4 +-
drivers/android/binder.c | 4 +-
drivers/base/core.c | 13 +-
drivers/base/devres.c | 8 +-
drivers/base/module.c | 4 +
drivers/char/hw_random/amd-rng.c | 4 +-
drivers/char/tpm/eventlog/common.c | 2 +
drivers/clk/davinci/da8xx-cfgchip.c | 4 +-
drivers/clocksource/sh_cmt.c | 13 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 5 +-
drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 +-
drivers/gpu/drm/gma500/cdv_intel_lvds.c | 3 +
drivers/gpu/drm/gma500/psb_intel_lvds.c | 3 +
drivers/gpu/drm/i915/i915_gem.c | 47 +++-
drivers/gpu/drm/mgag200/mgag200_i2c.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 2 +-
drivers/hwmon/adt7475.c | 2 +-
drivers/hwmon/max6697.c | 125 ++++------
drivers/i2c/i2c-smbus.c | 69 ++++-
drivers/infiniband/core/iwcm.c | 11 +-
drivers/infiniband/hw/bnxt_re/ib_verbs.c | 8 +-
drivers/infiniband/hw/bnxt_re/qplib_fp.h | 6 +-
drivers/infiniband/hw/mlx4/alias_GUID.c | 2 +-
drivers/infiniband/hw/mlx4/mad.c | 2 +-
drivers/infiniband/sw/rxe/rxe_req.c | 7 +-
drivers/input/mouse/elan_i2c_core.c | 2 +
drivers/irqchip/irq-mbigen.c | 20 +-
drivers/isdn/hardware/mISDN/hfcmulti.c | 7 +-
drivers/leds/led-triggers.c | 2 +-
drivers/leds/leds-ss4200.c | 7 +-
drivers/macintosh/therm_windtunnel.c | 2 +-
drivers/md/raid5.c | 20 +-
drivers/media/pci/saa7134/saa7134-dvb.c | 8 +-
drivers/media/platform/qcom/venus/vdec.c | 1 +
drivers/media/platform/vsp1/vsp1_histo.c | 20 +-
drivers/media/platform/vsp1/vsp1_pipe.h | 2 +-
drivers/media/platform/vsp1/vsp1_rpf.c | 8 +-
drivers/media/rc/imon.c | 5 +-
drivers/media/usb/uvc/uvc_ctrl.c | 90 ++++---
drivers/media/usb/uvc/uvc_video.c | 37 ++-
drivers/media/usb/uvc/uvcvideo.h | 5 +
drivers/mfd/omap-usb-tll.c | 3 +-
drivers/mtd/tests/Makefile | 34 +--
drivers/mtd/tests/mtd_test.c | 9 +
drivers/mtd/ubi/eba.c | 3 +-
drivers/net/bonding/bond_main.c | 7 +-
drivers/net/ethernet/brocade/bna/bna_types.h | 2 +-
drivers/net/ethernet/brocade/bna/bnad.c | 11 +-
drivers/net/ethernet/freescale/fec_main.c | 52 ++--
drivers/net/ethernet/freescale/fec_ptp.c | 3 +
drivers/net/ethernet/intel/ice/ice_common.c | 102 ++++++--
drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 24 +-
drivers/net/netconsole.c | 2 +-
drivers/net/usb/qmi_wwan.c | 1 +
drivers/net/usb/sr9700.c | 11 +-
.../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 18 +-
drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 +
drivers/nvme/host/pci.c | 7 +
drivers/parport/daisy.c | 6 +-
drivers/parport/ieee1284.c | 4 +-
drivers/parport/ieee1284_ops.c | 3 +-
drivers/parport/parport_amiga.c | 2 +-
drivers/parport/parport_atari.c | 2 +-
drivers/parport/parport_cs.c | 6 +-
drivers/parport/parport_gsc.c | 15 +-
drivers/parport/parport_ip32.c | 25 +-
drivers/parport/parport_mfc3.c | 2 +-
drivers/parport/parport_pc.c | 180 ++++++-------
drivers/parport/parport_sunbpp.c | 2 +-
drivers/parport/probe.c | 7 +-
drivers/parport/procfs.c | 28 ++-
drivers/parport/share.c | 24 +-
drivers/pci/controller/pci-hyperv.c | 4 +-
drivers/pci/controller/pcie-rockchip.c | 12 +-
drivers/pci/setup-bus.c | 32 +--
drivers/pinctrl/core.c | 12 +-
drivers/pinctrl/freescale/pinctrl-mxs.c | 4 +-
drivers/pinctrl/pinctrl-single.c | 7 +-
drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 14 +-
drivers/platform/chrome/cros_ec_debugfs.c | 1 +
drivers/platform/mips/cpu_hwmon.c | 3 +
drivers/power/supply/axp288_charger.c | 24 +-
drivers/pwm/pwm-stm32.c | 5 +-
drivers/remoteproc/imx_rproc.c | 5 +
drivers/rtc/rtc-cmos.c | 10 +-
drivers/s390/char/sclp_sd.c | 10 +-
drivers/scsi/qla2xxx/qla_bsg.c | 2 +-
drivers/scsi/qla2xxx/qla_mid.c | 2 +-
drivers/scsi/qla2xxx/qla_nvme.c | 5 +-
drivers/scsi/ufs/ufshcd.c | 11 +-
drivers/spi/spi-fsl-lpspi.c | 277 ++++++++++++++-------
drivers/tty/serial/serial_core.c | 8 +
drivers/usb/gadget/udc/core.c | 10 +-
drivers/usb/serial/usb_debug.c | 7 +
drivers/usb/usbip/vhci_hcd.c | 9 +-
fs/btrfs/free-space-cache.c | 1 +
fs/exec.c | 8 +-
fs/ext4/mballoc.c | 3 +-
fs/ext4/namei.c | 73 ++++--
fs/ext4/xattr.c | 6 +
fs/f2fs/inode.c | 3 +
fs/file.c | 1 +
fs/hfs/inode.c | 3 +
fs/hfsplus/bfind.c | 15 +-
fs/hfsplus/extents.c | 9 +-
fs/hfsplus/hfsplus_fs.h | 21 ++
fs/jbd2/journal.c | 1 +
fs/jfs/jfs_imap.c | 5 +-
fs/nilfs2/btnode.c | 25 +-
fs/nilfs2/btree.c | 4 +-
fs/nilfs2/segment.c | 7 +-
fs/udf/balloc.c | 36 +--
include/linux/hwmon-sysfs.h | 39 +++
include/linux/pci_ids.h | 2 +
include/linux/trace_events.h | 1 -
include/net/netfilter/nf_tables.h | 21 +-
include/uapi/linux/zorro_ids.h | 3 +
kernel/debug/kdb/kdb_io.c | 8 +-
kernel/dma/mapping.c | 2 +-
kernel/events/core.c | 2 +
kernel/events/internal.h | 2 +-
kernel/time/ntp.c | 9 +-
kernel/time/tick-broadcast.c | 24 ++
kernel/trace/tracing_map.c | 6 +-
kernel/watchdog_hld.c | 11 +-
lib/decompress_bunzip2.c | 3 +-
lib/kobject_uevent.c | 17 +-
mm/page-writeback.c | 30 ++-
net/bluetooth/l2cap_core.c | 1 +
net/core/link_watch.c | 4 +-
net/ipv4/route.c | 21 +-
net/ipv6/addrconf.c | 3 +-
net/ipv6/ndisc.c | 34 +--
net/iucv/af_iucv.c | 4 +-
net/netfilter/ipvs/ip_vs_proto_sctp.c | 4 +-
net/netfilter/nf_conntrack_netlink.c | 3 +-
net/netfilter/nf_tables_api.c | 128 ++--------
net/netfilter/nft_set_hash.c | 8 +-
net/netfilter/nft_set_rbtree.c | 6 +-
net/packet/af_packet.c | 86 ++++++-
net/smc/smc_core.c | 32 +--
net/sunrpc/sched.c | 4 +-
net/tipc/udp_media.c | 5 +-
net/wireless/nl80211.c | 10 +-
net/wireless/util.c | 8 +-
scripts/gcc-x86_32-has-stack-protector.sh | 2 +-
scripts/gcc-x86_64-has-stack-protector.sh | 2 +-
sound/usb/line6/driver.c | 5 +
sound/usb/stream.c | 4 +-
tools/memory-model/lock.cat | 20 +-
tools/perf/util/sort.c | 2 +-
tools/testing/selftests/bpf/test_sockmap.c | 3 +-
.../selftests/net/forwarding/devlink_lib.sh | 2 +
.../selftests/sigaltstack/current_stack_pointer.h | 2 +-
188 files changed, 1966 insertions(+), 1079 deletions(-)
1 year, 4 months
- 5
- 200
[PATCH 5.4 000/255] 5.4.282-rc2 review
by Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.282 release.
There are 255 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Sun, 18 Aug 2024 09:52:32 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.282-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.4.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 5.4.282-rc2
Sean Young <sean(a)mess.org>
media: Revert "media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()"
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix phy-mode
WangYuli <wangyuli(a)uniontech.com>
nvme/pci: Add APST quirk for Lenovo N60z laptop
Kees Cook <kees(a)kernel.org>
exec: Fix ToCToU between perm check and set-uid/gid usage
Yunke Cao <yunkec(a)google.com>
media: uvcvideo: Use entity get_cur in uvc_ctrl_set
Amit Daniel Kachhap <amit.kachhap(a)arm.com>
arm64: cpufeature: Fix the visibility of compat hwcaps
Andi Shyti <andi.shyti(a)linux.intel.com>
drm/i915/gem: Fix Virtual Memory mapping boundaries calculation
Florian Westphal <fw(a)strlen.de>
netfilter: nf_tables: prefer nft_chain_validate
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: nf_tables: use timestamp to check for set element timeout
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: nf_tables: set element extended ACK reporting support
Nathan Chancellor <nathan(a)kernel.org>
kbuild: Fix '-S -c' in x86 stack protector scripts
Jari Ruusu <jariruusu(a)protonmail.com>
Fix gcc 4.9 build issue in 5.4.y
Thomas Zimmermann <tzimmermann(a)suse.de>
drm/mgag200: Set DDC timeout in milliseconds
Lucas Stach <l.stach(a)pengutronix.de>
drm/bridge: analogix_dp: properly handle zero sized AUX transactions
Andi Kleen <ak(a)linux.intel.com>
x86/mtrr: Check if fixed MTRRs exist before saving them
Tze-nan Wu <Tze-nan.Wu(a)mediatek.com>
tracing: Fix overflow in get_free_elt()
Hans de Goede <hdegoede(a)redhat.com>
power: supply: axp288_charger: Round constant_charge_voltage writes down
Hans de Goede <hdegoede(a)redhat.com>
power: supply: axp288_charger: Fix constant_charge_voltage writes
Shay Drory <shayd(a)nvidia.com>
genirq/irqdesc: Honor caller provided affinity in alloc_desc()
George Kennedy <george.kennedy(a)oracle.com>
serial: core: check uartclk for zero to avoid divide by zero
Damien Le Moal <dlemoal(a)kernel.org>
scsi: mpt3sas: Avoid IOMMU page faults on REPORT ZONES
Sreekanth Reddy <sreekanth.reddy(a)broadcom.com>
scsi: mpt3sas: Remove scsi_dma_map() error messages
Justin Stitt <justinstitt(a)google.com>
ntp: Safeguard against time_constant overflow
Dan Williams <dan.j.williams(a)intel.com>
driver core: Fix uevent_show() vs driver detach race
Justin Stitt <justinstitt(a)google.com>
ntp: Clamp maxerror and esterror to operating range
Thomas Gleixner <tglx(a)linutronix.de>
tick/broadcast: Move per CPU pointer access into the atomic section
Vamshi Gajjela <vamshigajjela(a)google.com>
scsi: ufs: core: Fix hba->last_dme_cmd_tstamp timestamp updating logic
Chris Wulff <crwulff(a)gmail.com>
usb: gadget: core: Check for unset descriptor
Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com>
USB: serial: debug: do not echo input by default
Oliver Neukum <oneukum(a)suse.com>
usb: vhci-hcd: Do not drop references before new references are gained
Takashi Iwai <tiwai(a)suse.de>
ALSA: hda/hdmi: Yet more pin fix for HP EliteDesk 800 G4
Steven 'Steve' Kendall <skend(a)chromium.org>
ALSA: hda: Add HP MP9 G4 Retail System AMS to force connect list
Takashi Iwai <tiwai(a)suse.de>
ALSA: line6: Fix racy access to midibuf
Ma Ke <make24(a)iscas.ac.cn>
drm/client: fix null pointer dereference in drm_client_modeset_probe
Stefan Wahren <wahrenst(a)gmx.net>
spi: spi-fsl-lpspi: Fix scldiv calculation
Oleksandr Suvorov <oleksandr.suvorov(a)toradex.com>
spi: fsl-lpspi: remove unneeded array
Menglong Dong <menglong8.dong(a)gmail.com>
bpf: kprobe: remove unused declaring of bpf_kprobe_override
Guenter Roeck <linux(a)roeck-us.net>
i2c: smbus: Send alert notifications to all devices if source not found
Guenter Roeck <linux(a)roeck-us.net>
i2c: smbus: Improve handling of stuck alerts
Corey Minyard <cminyard(a)mvista.com>
i2c: smbus: Don't filter out duplicate alerts
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Expand speculative SSBS workaround (again)
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-A725 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X1C definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Expand speculative SSBS workaround
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Unify speculative SSBS errata logic
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X925 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-A720 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X3 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Add workaround for Arm errata 3194386 and 3312417
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Neoverse-V3 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X4 definitions
Besar Wicaksono <bwicaksono(a)nvidia.com>
arm64: Add Neoverse-V2 part
James Morse <james.morse(a)arm.com>
arm64: cpufeature: Force HWCAP to be based on the sysreg visible to user-space
Kemeng Shi <shikemeng(a)huaweicloud.com>
ext4: fix wrong unit use in ext4_mb_find_by_goal
Benjamin Coddington <bcodding(a)redhat.com>
SUNRPC: Fix a race to wake a sync task
Peter Oberparleiter <oberpar(a)linux.ibm.com>
s390/sclp: Prevent release of buffer in I/O
Kemeng Shi <shikemeng(a)huaweicloud.com>
jbd2: avoid memleak in jbd2_journal_write_metadata_buffer
Michal Pecio <michal.pecio(a)gmail.com>
media: uvcvideo: Fix the bandwdith quirk on USB 3.x
Ricardo Ribalda <ribalda(a)chromium.org>
media: uvcvideo: Ignore empty TS packets
Ma Jun <Jun.Ma2(a)amd.com>
drm/amdgpu: Fix the null pointer dereference to ras_manager
Filipe Manana <fdmanana(a)suse.com>
btrfs: fix bitmap leak when loading free space cache on duplicate entry
Johannes Berg <johannes.berg(a)intel.com>
wifi: nl80211: don't give key data to userspace
Roman Smirnov <r.smirnov(a)omp.ru>
udf: prevent integer overflow in udf_bitmap_free_blocks()
FUJITA Tomonori <fujita.tomonori(a)gmail.com>
PCI: Add Edimax Vendor ID to pci_ids.h
Yonghong Song <yonghong.song(a)linux.dev>
selftests/bpf: Fix send_signal test with nested CONFIG_PARAVIRT
Thomas Weißschuh <linux(a)weissschuh.net>
ACPI: SBS: manage alarm sysfs attribute through psy core
Thomas Weißschuh <linux(a)weissschuh.net>
ACPI: battery: create alarm sysfs attribute atomically
Niklas Söderlund <niklas.soderlund+renesas(a)ragnatech.se>
clocksource/drivers/sh_cmt: Address race condition for clock events
Yu Kuai <yukuai3(a)huawei.com>
md/raid5: avoid BUG_ON() while continue reshape after reassembling
Csókás, Bence <csokas.bence(a)prolan.hu>
net: fec: Stop PPS on driver remove
Dmitry Antipov <dmantipov(a)yandex.ru>
Bluetooth: l2cap: always unlock channel in l2cap_conless_channel()
Eric Dumazet <edumazet(a)google.com>
net: linkwatch: use system_unbound_wq
Daniele Palmas <dnlplm(a)gmail.com>
net: usb: qmi_wwan: fix memory leak for not ip packets
Kuniyuki Iwashima <kuniyu(a)amazon.com>
sctp: Fix null-ptr-deref in reuseport_add_sock().
Xin Long <lucien.xin(a)gmail.com>
sctp: move hlist_node and hashent out of sctp_ep_common
Peter Zijlstra <peterz(a)infradead.org>
x86/mm: Fix pti_clone_pgtable() alignment assumption
Yipeng Zou <zouyipeng(a)huawei.com>
irqchip/mbigen: Fix mbigen node address layout
Marc Zyngier <maz(a)kernel.org>
genirq: Allow irq_chip registration functions to take a const irq_chip
Alexander Maltsev <keltar.gw(a)gmail.com>
netfilter: ipset: Add list flush to cancel_gc
Ma Ke <make24(a)iscas.ac.cn>
net: usb: sr9700: fix uninitialized variable use in sr_mdio_read
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Correct surround channels in UAC1 channel map
Al Viro <viro(a)zeniv.linux.org.uk>
protect the fetch of ->fd[fd] in do_dup2() from mispredictions
Tatsunosuke Tobita <tatsunosuke.tobita(a)wacom.com>
HID: wacom: Modify pen IDs
Maciej Żenczykowski <maze(a)google.com>
ipv6: fix ndisc_is_useropt() handling for PIO
Shahar Shitrit <shshitrit(a)nvidia.com>
net/mlx5e: Add a check for the return value from mlx5_port_set_eth_ptys
Alexandra Winter <wintera(a)linux.ibm.com>
net/iucv: fix use after free in iucv_sock_close()
Ian Forbes <ian.forbes(a)broadcom.com>
drm/vmwgfx: Fix overlay when using Screen Targets
Danilo Krummrich <dakr(a)kernel.org>
drm/nouveau: prime: fix refcount underflow
Aleksandr Mishin <amishin(a)t-argos.ru>
remoteproc: imx_rproc: Skip over memory region when node value is NULL
Dong Aisheng <aisheng.dong(a)nxp.com>
remoteproc: imx_rproc: Fix ignoring mapping vdev regions
Peng Fan <peng.fan(a)nxp.com>
remoteproc: imx_rproc: ignore mapping vdev regions
Shenwei Wang <shenwei.wang(a)nxp.com>
irqchip/imx-irqsteer: Handle runtime power management correctly
Lucas Stach <l.stach(a)pengutronix.de>
irqchip/imx-irqsteer: Add runtime PM support
Lucas Stach <l.stach(a)pengutronix.de>
irqchip/imx-irqsteer: Constify irq_chip struct
Marc Zyngier <maz(a)kernel.org>
genirq: Allow the PM device to originate from irq domain
Zijun Hu <quic_zijuhu(a)quicinc.com>
devres: Fix memory leakage caused by driver API devm_free_percpu()
Andy Shevchenko <andriy.shevchenko(a)linux.intel.com>
driver core: Cast to (void *) with __force for __percpu pointer
tuhaowen <tuhaowen(a)uniontech.com>
dev/parport: fix the array out-of-bounds risk
Joe Perches <joe(a)perches.com>
parport: Standardize use of printmode
Joe Perches <joe(a)perches.com>
parport: Convert printk(KERN_<LEVEL> to pr_<level>(
Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org>
PCI: rockchip: Use GPIOD_OUT_LOW flag while requesting ep_gpio
Chen-Yu Tsai <wens(a)csie.org>
PCI: rockchip: Make 'ep-gpios' DT property optional
Jan Kara <jack(a)suse.cz>
mm: avoid overflows in dirty throttling logic
Leon Romanovsky <leonro(a)nvidia.com>
nvme-pci: add missing condition check for existence of mapped data
Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>
ASoC: Intel: use soc_intel_is_byt_cr() only when IOSF_MBI is reachable
Hans de Goede <hdegoede(a)redhat.com>
ASoC: Intel: Move soc_intel_is_foo() helpers to a generic header
Thomas Gleixner <tglx(a)linutronix.de>
ASoC: Intel: Convert to new X86 CPU match macros
Al Viro <viro(a)zeniv.linux.org.uk>
powerpc: fix a file leak in kvm_vcpu_ioctl_enable_cap()
Xiao Liang <shaw.leon(a)gmail.com>
apparmor: Fix null pointer deref when receiving skb during sock creation
Dan Carpenter <dan.carpenter(a)linaro.org>
mISDN: Fix a use after free in hfcmulti_tx()
Fred Li <dracodingfly(a)gmail.com>
bpf: Fix a segment issue when downgrading gso_size
Petr Machata <petrm(a)nvidia.com>
net: nexthop: Initialize all fields in dumped nexthops
Shigeru Yoshida <syoshida(a)redhat.com>
tipc: Return non-zero value from tipc_udp_addr2str() on error
Johannes Berg <johannes.berg(a)intel.com>
net: bonding: correctly annotate RCU in bond_should_notify_peers()
Ido Schimmel <idosch(a)nvidia.com>
ipv4: Fix incorrect source address in Record Route option
Gregory CLEMENT <gregory.clement(a)bootlin.com>
MIPS: SMP-CPS: Fix address for GCR_ACCESS register for CM3 and later
Lance Richardson <rlance(a)google.com>
dma: fix call order in dmam_free_coherent
Andrii Nakryiko <andrii(a)kernel.org>
libbpf: Fix no-args func prototype BTF dumping syntax
Johannes Berg <johannes.berg(a)intel.com>
um: time-travel: fix time-travel-start option
Jeongjun Park <aha310510(a)gmail.com>
jfs: Fix array-index-out-of-bounds in diFree
Douglas Anderson <dianders(a)chromium.org>
kdb: Use the passed prompt in kdb_position_cursor()
Arnd Bergmann <arnd(a)arndb.de>
kdb: address -Wformat-security warnings
Ryusuke Konishi <konishi.ryusuke(a)gmail.com>
nilfs2: handle inconsistent state in nilfs_btnode_create_block()
WangYuli <wangyuli(a)uniontech.com>
Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x13d3:0x3591
Hilda Wu <hildawu(a)realtek.com>
Bluetooth: btusb: Add RTL8852BE device 0489:e125 to device tables
Ilya Dryomov <idryomov(a)gmail.com>
rbd: don't assume RBD_LOCK_STATE_LOCKED for exclusive mappings
Ilya Dryomov <idryomov(a)gmail.com>
rbd: rename RBD_LOCK_STATE_RELEASING and releasing_wait
Dragan Simic <dsimic(a)manjaro.org>
drm/panfrost: Mark simple_ondemand governor as softdep
Ilya Dryomov <idryomov(a)gmail.com>
rbd: don't assume rbd_is_lock_owner() for exclusive mappings
Michael Ellerman <mpe(a)ellerman.id.au>
selftests/sigaltstack: Fix ppc64 GCC build
Bart Van Assche <bvanassche(a)acm.org>
RDMA/iwcm: Fix a use-after-free related to destroying CM IDs
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
platform: mips: cpu_hwmon: Disable driver on unsupported hardware
Thomas Gleixner <tglx(a)linutronix.de>
watchdog/perf: properly initialize the turbo mode timestamp and rearm counter
Joy Chakraborty <joychakr(a)google.com>
rtc: isl1208: Fix return value of nvmem callbacks
Adrian Hunter <adrian.hunter(a)intel.com>
perf/x86/intel/pt: Fix a topa_entry base address calculation
Marco Cavenati <cavenati.marco(a)gmail.com>
perf/x86/intel/pt: Fix topa_entry base length
Nilesh Javali <njavali(a)marvell.com>
scsi: qla2xxx: validate nvme_local_port correctly
Shreyas Deodhar <sdeodhar(a)marvell.com>
scsi: qla2xxx: Complete command early within lock
Shreyas Deodhar <sdeodhar(a)marvell.com>
scsi: qla2xxx: Fix for possible memory corruption
Manish Rangankar <mrangankar(a)marvell.com>
scsi: qla2xxx: During vport delete send async logout explicitly
Joy Chakraborty <joychakr(a)google.com>
rtc: cmos: Fix return value of nvmem callbacks
Zijun Hu <quic_zijuhu(a)quicinc.com>
kobject_uevent: Fix OOB access within zap_modalias_env()
Ross Lagerwall <ross.lagerwall(a)citrix.com>
decompress_bunzip2: fix rare decompression failure
Fedor Pchelkin <pchelkin(a)ispras.ru>
ubi: eba: properly rollback inside self_check_eba
Bastien Curutchet <bastien.curutchet(a)bootlin.com>
clk: davinci: da8xx-cfgchip: Initialize clk_init_data before use
Chao Yu <chao(a)kernel.org>
f2fs: fix to don't dirty inode for readonly filesystem
Saurav Kashyap <skashyap(a)marvell.com>
scsi: qla2xxx: Return ENOBUFS if sg_cnt is more than one for ELS cmds
Carlos Llamas <cmllamas(a)google.com>
binder: fix hang of unregistered readers
Wei Liu <wei.liu(a)kernel.org>
PCI: hv: Return zero, not garbage, when reading PCI_INTERRUPT_PIN
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
hwrng: amd - Convert PCIBIOS_* return codes to errnos
Alan Stern <stern(a)rowland.harvard.edu>
tools/memory-model: Fix bug in lock.cat
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
leds: ss4200: Convert PCIBIOS_* return codes to errnos
Rafael Beims <rafael.beims(a)toradex.com>
wifi: mwifiex: Fix interface type change
Baokun Li <libaokun1(a)huawei.com>
ext4: make sure the first directory block is not a hole
Baokun Li <libaokun1(a)huawei.com>
ext4: check dot and dotdot of dx_root before making dir indexed
Paolo Pisati <p.pisati(a)gmail.com>
m68k: amiga: Turn off Warp1260 interrupts during boot
Jan Kara <jack(a)suse.cz>
udf: Avoid using corrupted block bitmap buffer
Sung Joon Kim <sungjoon.kim(a)amd.com>
drm/amd/display: Check for NULL pointer
Ma Ke <make24(a)iscas.ac.cn>
drm/gma500: fix null pointer dereference in psb_intel_lvds_get_modes
Ma Ke <make24(a)iscas.ac.cn>
drm/gma500: fix null pointer dereference in cdv_intel_lvds_get_modes
Chao Yu <chao(a)kernel.org>
hfs: fix to initialize fields of hfs_inode_info after hfs_alloc_inode()
Dikshita Agarwal <quic_dikshita(a)quicinc.com>
media: venus: fix use after free in vdec_close
Joe Hattori <joe(a)pf.is.s.u-tokyo.ac.jp>
char: tpm: Fix possible memory leak in tpm_bios_measurements_open()
Nicolas Dichtel <nicolas.dichtel(a)6wind.com>
ipv6: take care of scope when choosing the src addr
Chengen Du <chengen.du(a)canonical.com>
af_packet: Handle outgoing VLAN packets without hardware offloading
Breno Leitao <leitao(a)debian.org>
net: netconsole: Disable target before netpoll cleanup
Yu Liao <liaoyu15(a)huawei.com>
tick/broadcast: Make takeover of broadcast hrtimer reliable
Csókás, Bence <csokas.bence(a)prolan.hu>
rtc: interface: Add RTC offset to alarm after fix-up
Ryusuke Konishi <konishi.ryusuke(a)gmail.com>
nilfs2: avoid undefined behavior in nilfs_cnt32_ge macro
Alex Shi <alex.shi(a)linux.alibaba.com>
fs/nilfs2: remove some unused macros to tame gcc
Peng Fan <peng.fan(a)nxp.com>
pinctrl: freescale: mxs: Fix refcount of child
Yang Yingliang <yangyingliang(a)huawei.com>
pinctrl: ti: ti-iodelay: fix possible memory leak when pinctrl_enable() fails
Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de>
pinctrl: ti: ti-iodelay: Drop if block with always false condition
Yang Yingliang <yangyingliang(a)huawei.com>
pinctrl: single: fix possible memory leak when pinctrl_enable() fails
Yang Yingliang <yangyingliang(a)huawei.com>
pinctrl: core: fix possible memory leak when pinctrl_enable() fails
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: ctnetlink: use helper function to calculate expect ID
Jack Wang <jinpu.wang(a)ionos.com>
bnxt_re: Fix imm_data endianness
Nick Bowler <nbowler(a)draconx.ca>
macintosh/therm_windtunnel: fix module unload.
Michael Ellerman <mpe(a)ellerman.id.au>
powerpc/xmon: Fix disassembly CPU feature checks
Dominique Martinet <dominique.martinet(a)atmark-techno.com>
MIPS: Octeron: remove source file executable bit
Dmitry Torokhov <dmitry.torokhov(a)gmail.com>
Input: elan_i2c - do not leave interrupt disabled on suspend failure
Leon Romanovsky <leonro(a)nvidia.com>
RDMA/device: Return error earlier if port in not valid
Arnd Bergmann <arnd(a)arndb.de>
mtd: make mtd_test.c a separate module
Chen Ni <nichen(a)iscas.ac.cn>
ASoC: max98088: Check for clk_prepare_enable() error
Honggang LI <honggangli(a)163.com>
RDMA/rxe: Don't set BTH_ACK_MASK for UC or UD QPs
Leon Romanovsky <leonro(a)nvidia.com>
RDMA/mlx4: Fix truncated output warning in alias_GUID.c
Leon Romanovsky <leonro(a)nvidia.com>
RDMA/mlx4: Fix truncated output warning in mad.c
Andrei Lalaev <andrei.lalaev(a)anton-paar.com>
Input: qt1050 - handle CHIP_ID reading error
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
PCI: Fix resource double counting on remove & rescan
Benjamin Coddington <bcodding(a)redhat.com>
SUNRPC: Fixup gss_status tracepoint error output
Andreas Larsson <andreas(a)gaisler.com>
sparc64: Fix incorrect function signature and add prototype for prom_cif_init
Jan Kara <jack(a)suse.cz>
ext4: avoid writing unitialized memory to disk in EA inodes
NeilBrown <neilb(a)suse.de>
SUNRPC: avoid soft lockup when transmitting UDP to reachable server.
Javier Carrasco <javier.carrasco.cruz(a)gmail.com>
mfd: omap-usb-tll: Use struct_size to allocate tll
Chen Ni <nichen(a)iscas.ac.cn>
drm/qxl: Add check for drm_cvt_mode
Lucas Stach <l.stach(a)pengutronix.de>
drm/etnaviv: fix DMA direction handling for cached RW buffers
Namhyung Kim <namhyung(a)kernel.org>
perf report: Fix condition in sort__sym_cmp()
Hans de Goede <hdegoede(a)redhat.com>
leds: trigger: Unregister sysfs attributes before calling deactivate()
Laurent Pinchart <laurent.pinchart+renesas(a)ideasonboard.com>
media: renesas: vsp1: Store RPF partition configuration per RPF instance
Laurent Pinchart <laurent.pinchart+renesas(a)ideasonboard.com>
media: renesas: vsp1: Fix _irqsave and _irq mix
Daniel Schaefer <dhs(a)frame.work>
media: uvcvideo: Override default flags
Ricardo Ribalda <ribalda(a)chromium.org>
media: uvcvideo: Allow entity-defined get_info and get_cur
Aleksandr Burakov <a.burakov(a)rosalinux.ru>
saa7134: Unchecked i2c_transfer function result fixed
Ricardo Ribalda <ribalda(a)chromium.org>
media: imon: Fix race getting ictx->lock
Zheng Yejian <zhengyejian1(a)huawei.com>
media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
USB: move snd_usb_pipe_sanity_check into the USB core
Amit Cohen <amcohen(a)nvidia.com>
selftests: forwarding: devlink_lib: Wait for udev events after reloading
Alexey Kodanev <aleksei.kodanev(a)bell-sw.com>
bna: adjust 'name' buf size of bna_tcb and bna_ccb structures
Johannes Berg <johannes.berg(a)intel.com>
wifi: virt_wifi: don't use strlen() in const context
Gaosheng Cui <cuigaosheng1(a)huawei.com>
gss_krb5: Fix the error handling path for crypto_sync_skcipher_setkey
En-Wei Wu <en-wei.wu(a)canonical.com>
wifi: virt_wifi: avoid reporting connection success with wrong SSID
Shai Malin <smalin(a)marvell.com>
qed: Improve the stack space of filter_config()
Adrian Hunter <adrian.hunter(a)intel.com>
perf: Prevent passing zero nr_pages to rb_alloc_aux()
Adrian Hunter <adrian.hunter(a)intel.com>
perf: Fix perf_aux_size() for greater-than 32-bit size
Adrian Hunter <adrian.hunter(a)intel.com>
perf/x86/intel/pt: Fix pt_topa_entry_for_page() address calculation
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: nf_tables: rise cap on SELinux secmark context
Ismael Luceno <iluceno(a)suse.de>
ipvs: Avoid unnecessary calls to skb_is_gso_sctp
Csókás, Bence <csokas.bence(a)prolan.hu>
net: fec: Fix FEC_ECR_EN1588 being cleared on link-down
Csókás Bence <csokas.bence(a)prolan.hu>
net: fec: Refactor: #define magic constants
Baochen Qiang <quic_bqiang(a)quicinc.com>
wifi: cfg80211: handle 2x996 RU allocation in cfg80211_calculate_bitrate_he()
Baochen Qiang <quic_bqiang(a)quicinc.com>
wifi: cfg80211: fix typo in cfg80211_calculate_bitrate_he()
Ido Schimmel <idosch(a)nvidia.com>
mlxsw: spectrum_acl_erp: Fix object nesting warning
Ido Schimmel <idosch(a)nvidia.com>
lib: objagg: Fix general protection fault
Geliang Tang <tanggeliang(a)kylinos.cn>
selftests/bpf: Check length of recv in test_sockmap
Guangguan Wang <guangguan.wang(a)linux.alibaba.com>
net/smc: set rmb's SG_MAX_SINGLE_ALLOC limitation only when CONFIG_ARCH_NO_SG_CHAIN is defined
Stefan Raspl <raspl(a)linux.ibm.com>
net/smc: Allow SMC-D 1MB DMB allocations
Samasth Norway Ananda <samasth.norway.ananda(a)oracle.com>
wifi: brcmsmac: LCN PHY code is used for BCM4313 2G-only device
Marek Behún <kabel(a)kernel.org>
firmware: turris-mox-rwtm: Initialize completion before mailbox
Marek Behún <kabel(a)kernel.org>
firmware: turris-mox-rwtm: Fix checking return value of wait_for_completion_timeout()
Thorsten Blum <thorsten.blum(a)toblux.com>
m68k: cmpxchg: Fix return value for default case in __arch_xchg()
Chen Ni <nichen(a)iscas.ac.cn>
x86/xen: Convert comma to semicolon
Eero Tamminen <oak(a)helsinkinet.fi>
m68k: atari: Fix TT bootup freeze / unexpected (SCU) interrupt messages
Jerome Brunet <jbrunet(a)baylibre.com>
arm64: dts: amlogic: gx: correct hdmi clocks
Rafał Miłecki <rafal(a)milecki.pl>
arm64: dts: mediatek: mt7622: fix "emmc" pinctrl mux
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix PCIe reset polarity
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix board reset
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix PHY reset
Marco Felsch <m.felsch(a)pengutronix.de>
ARM: dts: imx6qdl-kontron-samx6i: move phy reset into phy-node
Jonas Karlman <jonas(a)kwiboo.se>
arm64: dts: rockchip: Increase VOP clk rate on RK3328
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: msm8996: specify UFS core_clk frequencies
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: sdm845: add power-domain to UFS PHY
Guenter Roeck <linux(a)roeck-us.net>
hwmon: (max6697) Fix swapped temp{1,8} critical alarms
Guenter Roeck <linux(a)roeck-us.net>
hwmon: (max6697) Fix underflow when writing limit attributes
Uwe Kleine-König <u.kleine-koenig(a)baylibre.com>
pwm: stm32: Always do lazy disabling
Wayne Tung <chineweff(a)gmail.com>
hwmon: (adt7475) Fix default duty on fan is disabled
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/platform/iosf_mbi: Convert PCIBIOS_* return codes to errnos
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/pci/xen: Fix PCIBIOS_* return code handling
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/pci/intel_mid_pci: Fix PCIBIOS_* return code handling
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/of: Return consistent error type from x86_of_pci_irq_enable()
Chao Yu <chao(a)kernel.org>
hfsplus: fix to avoid false alarm of circular locking
Tzung-Bi Shih <tzungbi(a)kernel.org>
platform/chrome: cros_ec_debugfs: fix wrong EC message version
Arnd Bergmann <arnd(a)arndb.de>
EDAC, i10nm: make skx_common.o a separate module
Qiuxu Zhuo <qiuxu.zhuo(a)intel.com>
EDAC/skx_common: Add new ADXL components for 2-level memory
Tony Luck <tony.luck(a)intel.com>
EDAC, skx: Retrieve and print retry_rd_err_log registers
Tony Luck <tony.luck(a)intel.com>
EDAC, skx_common: Refactor so that we initialize "dev" in result of adxl decode.
-------------
Diffstat:
Documentation/arm64/cpu-feature-registers.rst | 38 ++++-
Documentation/arm64/silicon-errata.rst | 36 +++++
Makefile | 4 +-
arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 21 ++-
arch/arm64/Kconfig | 38 +++++
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 4 +-
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 4 +-
.../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 4 +-
arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 4 +-
arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 4 +-
arch/arm64/include/asm/cpucaps.h | 3 +-
arch/arm64/include/asm/cputype.h | 16 ++
arch/arm64/kernel/cpu_errata.c | 44 +++++
arch/arm64/kernel/cpufeature.c | 94 ++++++++---
arch/m68k/amiga/config.c | 9 ++
arch/m68k/atari/ataints.c | 6 +-
arch/m68k/include/asm/cmpxchg.h | 2 +-
arch/mips/include/asm/mips-cm.h | 4 +
arch/mips/kernel/smp-cps.c | 5 +-
arch/mips/pci/pcie-octeon.c | 0
arch/powerpc/kvm/powerpc.c | 4 +-
arch/powerpc/xmon/ppc-dis.c | 33 ++--
arch/sparc/include/asm/oplib_64.h | 1 +
arch/sparc/prom/init_64.c | 3 -
arch/sparc/prom/p1275.c | 2 +-
arch/um/kernel/time.c | 4 +-
arch/x86/events/intel/pt.c | 4 +-
arch/x86/events/intel/pt.h | 4 +-
arch/x86/kernel/cpu/mtrr/mtrr.c | 2 +-
arch/x86/kernel/devicetree.c | 2 +-
arch/x86/mm/pti.c | 6 +-
arch/x86/pci/intel_mid_pci.c | 4 +-
arch/x86/pci/xen.c | 4 +-
arch/x86/platform/intel/iosf_mbi.c | 4 +-
arch/x86/xen/p2m.c | 4 +-
drivers/acpi/battery.c | 16 +-
drivers/acpi/sbs.c | 23 +--
drivers/android/binder.c | 4 +-
drivers/base/core.c | 13 +-
drivers/base/devres.c | 8 +-
drivers/base/module.c | 4 +
drivers/block/rbd.c | 35 ++--
drivers/bluetooth/btusb.c | 4 +
drivers/char/hw_random/amd-rng.c | 4 +-
drivers/char/tpm/eventlog/common.c | 2 +
drivers/clk/davinci/da8xx-cfgchip.c | 4 +-
drivers/clocksource/sh_cmt.c | 13 +-
drivers/edac/Makefile | 10 +-
drivers/edac/skx_base.c | 51 +++++-
drivers/edac/skx_common.c | 146 ++++++++++++-----
drivers/edac/skx_common.h | 19 ++-
drivers/firmware/turris-mox-rwtm.c | 18 +--
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 7 +-
drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 3 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 5 +-
drivers/gpu/drm/drm_client_modeset.c | 5 +
drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 +-
drivers/gpu/drm/gma500/cdv_intel_lvds.c | 3 +
drivers/gpu/drm/gma500/psb_intel_lvds.c | 3 +
drivers/gpu/drm/i915/gem/i915_gem_mman.c | 47 +++++-
drivers/gpu/drm/mgag200/mgag200_i2c.c | 2 +-
drivers/gpu/drm/nouveau/nouveau_prime.c | 3 +-
drivers/gpu/drm/panfrost/panfrost_drv.c | 1 +
drivers/gpu/drm/qxl/qxl_display.c | 3 +
drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 2 +-
drivers/hid/wacom_wac.c | 3 +-
drivers/hwmon/adt7475.c | 2 +-
drivers/hwmon/max6697.c | 5 +-
drivers/i2c/i2c-smbus.c | 69 ++++++--
drivers/infiniband/core/device.c | 6 +-
drivers/infiniband/core/iwcm.c | 11 +-
drivers/infiniband/hw/bnxt_re/ib_verbs.c | 8 +-
drivers/infiniband/hw/bnxt_re/qplib_fp.h | 6 +-
drivers/infiniband/hw/mlx4/alias_GUID.c | 2 +-
drivers/infiniband/hw/mlx4/mad.c | 2 +-
drivers/infiniband/sw/rxe/rxe_req.c | 7 +-
drivers/input/keyboard/qt1050.c | 7 +-
drivers/input/mouse/elan_i2c_core.c | 2 +
drivers/irqchip/irq-imx-irqsteer.c | 40 ++++-
drivers/irqchip/irq-mbigen.c | 20 ++-
drivers/isdn/hardware/mISDN/hfcmulti.c | 7 +-
drivers/leds/led-triggers.c | 2 +-
drivers/leds/leds-ss4200.c | 7 +-
drivers/macintosh/therm_windtunnel.c | 2 +-
drivers/md/raid5.c | 20 ++-
drivers/media/pci/saa7134/saa7134-dvb.c | 8 +-
drivers/media/platform/qcom/venus/vdec.c | 1 +
drivers/media/platform/vsp1/vsp1_histo.c | 20 +--
drivers/media/platform/vsp1/vsp1_pipe.h | 2 +-
drivers/media/platform/vsp1/vsp1_rpf.c | 8 +-
drivers/media/rc/imon.c | 5 +-
drivers/media/usb/uvc/uvc_ctrl.c | 90 +++++++----
drivers/media/usb/uvc/uvc_video.c | 37 ++++-
drivers/media/usb/uvc/uvcvideo.h | 5 +
drivers/mfd/omap-usb-tll.c | 3 +-
drivers/mtd/tests/Makefile | 34 ++--
drivers/mtd/tests/mtd_test.c | 9 ++
drivers/mtd/ubi/eba.c | 3 +-
drivers/net/bonding/bond_main.c | 7 +-
drivers/net/ethernet/brocade/bna/bna_types.h | 2 +-
drivers/net/ethernet/brocade/bna/bnad.c | 11 +-
drivers/net/ethernet/freescale/fec_main.c | 52 ++++--
drivers/net/ethernet/freescale/fec_ptp.c | 3 +
.../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 7 +-
.../net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c | 13 --
drivers/net/ethernet/qlogic/qed/qed_l2.c | 23 +--
drivers/net/ethernet/qlogic/qede/qede_filter.c | 47 +++---
drivers/net/netconsole.c | 2 +-
drivers/net/usb/qmi_wwan.c | 1 +
drivers/net/usb/sr9700.c | 11 +-
.../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 18 +--
drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 +
drivers/net/wireless/virt_wifi.c | 20 ++-
drivers/nvme/host/pci.c | 10 +-
drivers/parport/daisy.c | 6 +-
drivers/parport/ieee1284.c | 4 +-
drivers/parport/ieee1284_ops.c | 3 +-
drivers/parport/parport_amiga.c | 2 +-
drivers/parport/parport_atari.c | 2 +-
drivers/parport/parport_cs.c | 6 +-
drivers/parport/parport_gsc.c | 15 +-
drivers/parport/parport_ip32.c | 25 ++-
drivers/parport/parport_mfc3.c | 2 +-
drivers/parport/parport_pc.c | 178 +++++++++------------
drivers/parport/parport_sunbpp.c | 2 +-
drivers/parport/probe.c | 7 +-
drivers/parport/procfs.c | 28 ++--
drivers/parport/share.c | 24 +--
drivers/pci/controller/pci-hyperv.c | 4 +-
drivers/pci/controller/pcie-rockchip.c | 12 +-
drivers/pci/setup-bus.c | 6 +-
drivers/pinctrl/core.c | 12 +-
drivers/pinctrl/freescale/pinctrl-mxs.c | 4 +-
drivers/pinctrl/pinctrl-single.c | 7 +-
drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 14 +-
drivers/platform/chrome/cros_ec_debugfs.c | 1 +
drivers/platform/mips/cpu_hwmon.c | 3 +
drivers/power/supply/axp288_charger.c | 24 +--
drivers/pwm/pwm-stm32.c | 5 +-
drivers/remoteproc/imx_rproc.c | 5 +
drivers/rtc/interface.c | 9 +-
drivers/rtc/rtc-cmos.c | 10 +-
drivers/rtc/rtc-isl1208.c | 11 +-
drivers/s390/char/sclp_sd.c | 10 +-
drivers/scsi/mpt3sas/mpt3sas_base.c | 38 +++--
drivers/scsi/qla2xxx/qla_bsg.c | 2 +-
drivers/scsi/qla2xxx/qla_mid.c | 2 +-
drivers/scsi/qla2xxx/qla_nvme.c | 5 +-
drivers/scsi/qla2xxx/qla_os.c | 7 +-
drivers/scsi/ufs/ufshcd.c | 11 +-
drivers/spi/spi-fsl-lpspi.c | 11 +-
drivers/tty/serial/serial_core.c | 8 +
drivers/usb/core/urb.c | 33 ++--
drivers/usb/gadget/udc/core.c | 10 +-
drivers/usb/serial/usb_debug.c | 7 +
drivers/usb/usbip/vhci_hcd.c | 9 +-
fs/btrfs/free-space-cache.c | 1 +
fs/exec.c | 8 +-
fs/ext4/mballoc.c | 3 +-
fs/ext4/namei.c | 73 +++++++--
fs/ext4/xattr.c | 6 +
fs/f2fs/inode.c | 3 +
fs/file.c | 1 +
fs/hfs/inode.c | 3 +
fs/hfsplus/bfind.c | 15 +-
fs/hfsplus/extents.c | 9 +-
fs/hfsplus/hfsplus_fs.h | 21 +++
fs/jbd2/journal.c | 1 +
fs/jfs/jfs_imap.c | 5 +-
fs/nilfs2/btnode.c | 25 ++-
fs/nilfs2/btree.c | 4 +-
fs/nilfs2/segment.c | 7 +-
fs/udf/balloc.c | 51 +++---
fs/udf/super.c | 3 +-
include/linux/compiler_attributes.h | 1 +
include/linux/irq.h | 7 +-
include/linux/irqdomain.h | 10 ++
include/linux/objagg.h | 1 -
include/linux/pci_ids.h | 2 +
include/linux/platform_data/x86/soc.h | 65 ++++++++
include/linux/qed/qed_eth_if.h | 21 +--
include/linux/trace_events.h | 1 -
include/linux/usb.h | 1 +
include/net/netfilter/nf_tables.h | 21 ++-
include/net/sctp/sctp.h | 4 +-
include/net/sctp/structs.h | 8 +-
include/trace/events/rpcgss.h | 2 +-
include/uapi/linux/netfilter/nf_tables.h | 2 +-
include/uapi/linux/zorro_ids.h | 3 +
kernel/debug/kdb/kdb_io.c | 6 +-
kernel/dma/mapping.c | 2 +-
kernel/events/core.c | 2 +
kernel/events/internal.h | 2 +-
kernel/irq/chip.c | 32 ++--
kernel/irq/irqdesc.c | 1 +
kernel/time/ntp.c | 9 +-
kernel/time/tick-broadcast.c | 24 +++
kernel/trace/tracing_map.c | 6 +-
kernel/watchdog_hld.c | 11 +-
lib/decompress_bunzip2.c | 3 +-
lib/kobject_uevent.c | 17 +-
lib/objagg.c | 18 +--
mm/page-writeback.c | 30 +++-
net/bluetooth/l2cap_core.c | 1 +
net/core/filter.c | 15 +-
net/core/link_watch.c | 4 +-
net/ipv4/nexthop.c | 7 +-
net/ipv4/route.c | 2 +-
net/ipv6/addrconf.c | 3 +-
net/ipv6/ndisc.c | 34 ++--
net/iucv/af_iucv.c | 4 +-
net/netfilter/ipset/ip_set_list_set.c | 3 +
net/netfilter/ipvs/ip_vs_proto_sctp.c | 4 +-
net/netfilter/nf_conntrack_netlink.c | 3 +-
net/netfilter/nf_tables_api.c | 128 +++------------
net/netfilter/nft_set_hash.c | 8 +-
net/netfilter/nft_set_rbtree.c | 6 +-
net/packet/af_packet.c | 86 +++++++++-
net/sctp/input.c | 48 +++---
net/sctp/proc.c | 10 +-
net/sctp/socket.c | 6 +-
net/smc/smc_core.c | 32 ++--
net/sunrpc/auth_gss/gss_krb5_keys.c | 2 +-
net/sunrpc/clnt.c | 3 +-
net/sunrpc/sched.c | 4 +-
net/tipc/udp_media.c | 5 +-
net/wireless/nl80211.c | 10 +-
net/wireless/util.c | 8 +-
scripts/gcc-x86_32-has-stack-protector.sh | 2 +-
scripts/gcc-x86_64-has-stack-protector.sh | 2 +-
security/apparmor/lsm.c | 7 +
sound/pci/hda/patch_hdmi.c | 2 +
sound/soc/codecs/max98088.c | 10 +-
sound/soc/intel/common/soc-intel-quirks.h | 55 +------
sound/usb/helper.c | 16 +-
sound/usb/helper.h | 1 -
sound/usb/line6/driver.c | 5 +
sound/usb/mixer_scarlett_gen2.c | 2 +-
sound/usb/quirks.c | 12 +-
sound/usb/stream.c | 4 +-
tools/lib/bpf/btf_dump.c | 8 +-
tools/memory-model/lock.cat | 20 +--
tools/perf/util/sort.c | 2 +-
.../testing/selftests/bpf/prog_tests/send_signal.c | 3 +-
.../bpf/progs/btf_dump_test_case_multidim.c | 4 +-
.../bpf/progs/btf_dump_test_case_syntax.c | 4 +-
tools/testing/selftests/bpf/test_sockmap.c | 3 +-
.../selftests/net/forwarding/devlink_lib.sh | 2 +
.../selftests/sigaltstack/current_stack_pointer.h | 2 +-
251 files changed, 2108 insertions(+), 1200 deletions(-)
1 year, 4 months
- 5
- 4
[PATCH v3] dmaengine: moxart: handle irq_of_parse_and_map() errors
by Ma Ke
Zero and negative number is not a valid IRQ for in-kernel code and the
irq_of_parse_and_map() function returns zero on error. So this check for
valid IRQs should only accept values > 0.
Cc: stable(a)vger.kernel.org
Fixes: 2d9e31b9412c ("dmaengine: moxart: remove NO_IRQ")
Signed-off-by: Ma Ke <make24(a)iscas.ac.cn>
---
Changes in v3:
- added missed changelog v2.
Changes in v2:
- added Cc stable line;
- added Fixes line.
---
drivers/dma/moxart-dma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/dma/moxart-dma.c b/drivers/dma/moxart-dma.c
index 66dc6d31b603..16dd3c5aba4d 100644
--- a/drivers/dma/moxart-dma.c
+++ b/drivers/dma/moxart-dma.c
@@ -568,7 +568,7 @@ static int moxart_probe(struct platform_device *pdev)
return -ENOMEM;
irq = irq_of_parse_and_map(node, 0);
- if (!irq) {
+ if (irq <= 0) {
dev_err(dev, "no IRQ resource\n");
return -EINVAL;
}
--
2.25.1
1 year, 4 months
- 3
- 2
Re: [PATCH 6.10 00/25] 6.10.6-rc3 review
by Ronald Warsow
Hi Greg
no regressions here on x86_64 (RKL, Intel 11th Gen. CPU)
Thanks
Tested-by: Ronald Warsow <rwarsow(a)gmx.de>
1 year, 4 months
- 1
- 0
[PATCH 6.10 00/25] 6.10.6-rc2 review
by Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.10.6 release.
There are 25 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Sun, 18 Aug 2024 08:52:13 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.10.6-rc2…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.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 6.10.6-rc2
Aurabindo Pillai <aurabindo.pillai(a)amd.com>
drm/amd/display: Add misc DC changes for DCN401
Niklas Cassel <cassel(a)kernel.org>
Revert "ata: libata-scsi: Honor the D_SENSE bit for CK_COND=1 and no error"
Sean Young <sean(a)mess.org>
media: Revert "media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()"
Srinivasan Shanmugam <srinivasan.shanmugam(a)amd.com>
drm/amdgpu/display: Fix null pointer dereference in dc_stream_program_cursor_position
Wayne Lin <Wayne.Lin(a)amd.com>
drm/amd/display: Solve mst monitors blank out problem after resume
Kees Cook <kees(a)kernel.org>
binfmt_flat: Fix corruption when not offsetting data start
Gergo Koteles <soyer(a)irl.hu>
platform/x86: ideapad-laptop: add a mutex to synchronize VPC commands
Gergo Koteles <soyer(a)irl.hu>
platform/x86: ideapad-laptop: move ymc_trigger_ec from lenovo-ymc
Gergo Koteles <soyer(a)irl.hu>
platform/x86: ideapad-laptop: introduce a generic notification chain
Shyam Sundar S K <Shyam-sundar.S-k(a)amd.com>
platform/x86/amd/pmf: Fix to Update HPD Data When ALS is Disabled
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb: Fix UBSAN warning in parse_audio_unit()
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Do copy_to_user out of run_lock
Pei Li <peili.dev(a)gmail.com>
jfs: Fix shift-out-of-bounds in dbDiscardAG
Edward Adam Davis <eadavis(a)qq.com>
jfs: fix null ptr deref in dtInsertEntry
Willem de Bruijn <willemb(a)google.com>
fou: remove warn in gue_gro_receive on unsupported protocol
Chao Yu <chao(a)kernel.org>
f2fs: fix to cover read extent cache access with lock
Chao Yu <chao(a)kernel.org>
f2fs: fix to do sanity check on F2FS_INLINE_DATA flag in inode during GC
yunshui <jiangyunshui(a)kylinos.cn>
bpf, net: Use DEV_STAT_INC()
Simon Trimmer <simont(a)opensource.cirrus.com>
ASoC: cs35l56: Patch CS35L56_IRQ1_MASK_18 to the default value
WangYuli <wangyuli(a)uniontech.com>
nvme/pci: Add APST quirk for Lenovo N60z laptop
Huacai Chen <chenhuacai(a)kernel.org>
LoongArch: Define __ARCH_WANT_NEW_STAT in unistd.h
Fangzhi Zuo <jerry.zuo(a)amd.com>
drm/amd/display: Prevent IPX From Link Detect and Set Mode
Harry Wentland <harry.wentland(a)amd.com>
drm/amd/display: Separate setting and programming of cursor
Wayne Lin <wayne.lin(a)amd.com>
drm/amd/display: Defer handling mst up request in resume
Kees Cook <kees(a)kernel.org>
exec: Fix ToCToU between perm check and set-uid/gid usage
-------------
Diffstat:
Makefile | 4 +-
arch/loongarch/include/uapi/asm/unistd.h | 1 +
drivers/ata/libata-scsi.c | 15 ++-
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 14 +-
.../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 6 +
.../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 6 +-
drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 94 ++++++++-----
drivers/gpu/drm/amd/display/dc/dc_stream.h | 8 ++
.../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 2 +-
drivers/media/usb/dvb-usb/dvb-usb-init.c | 35 +----
drivers/nvme/host/pci.c | 7 +
drivers/platform/x86/Kconfig | 1 +
drivers/platform/x86/amd/pmf/spc.c | 32 ++---
drivers/platform/x86/ideapad-laptop.c | 148 ++++++++++++++++++---
drivers/platform/x86/ideapad-laptop.h | 9 ++
drivers/platform/x86/lenovo-ymc.c | 60 +--------
fs/binfmt_flat.c | 4 +-
fs/exec.c | 8 +-
fs/f2fs/extent_cache.c | 50 +++----
fs/f2fs/f2fs.h | 2 +-
fs/f2fs/gc.c | 10 ++
fs/f2fs/inode.c | 10 +-
fs/jfs/jfs_dmap.c | 2 +
fs/jfs/jfs_dtree.c | 2 +
fs/ntfs3/frecord.c | 75 ++++++++++-
net/core/filter.c | 8 +-
net/ipv4/fou_core.c | 2 +-
sound/soc/codecs/cs35l56-shared.c | 1 +
sound/usb/mixer.c | 7 +
29 files changed, 411 insertions(+), 212 deletions(-)
1 year, 4 months
- 10
- 10
[PATCH RESEND] drm/nouveau: fix a possible null pointer dereference
by Ma Ke
In ch7006_encoder_get_modes(), the return value of drm_mode_duplicate() is
used directly in drm_mode_probed_add(), which will lead to a NULL pointer
dereference on failure of drm_mode_duplicate(). Add a check to avoid npd.
Cc: stable(a)vger.kernel.org
Fixes: 6ee738610f41 ("drm/nouveau: Add DRM driver for NVIDIA GPUs")
Signed-off-by: Ma Ke <make24(a)iscas.ac.cn>
---
drivers/gpu/drm/i2c/ch7006_drv.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i2c/ch7006_drv.c b/drivers/gpu/drm/i2c/ch7006_drv.c
index 131512a5f3bd..cd68c32a4ba2 100644
--- a/drivers/gpu/drm/i2c/ch7006_drv.c
+++ b/drivers/gpu/drm/i2c/ch7006_drv.c
@@ -229,6 +229,7 @@ static int ch7006_encoder_get_modes(struct drm_encoder *encoder,
{
struct ch7006_priv *priv = to_ch7006_priv(encoder);
const struct ch7006_mode *mode;
+ struct drm_display_mode *encoder_mode = NULL;
int n = 0;
for (mode = ch7006_modes; mode->mode.clock; mode++) {
@@ -236,8 +237,11 @@ static int ch7006_encoder_get_modes(struct drm_encoder *encoder,
~mode->valid_norms & 1<<priv->norm)
continue;
- drm_mode_probed_add(connector,
- drm_mode_duplicate(encoder->dev, &mode->mode));
+ encoder_mode = drm_mode_duplicate(encoder->dev, &mode->mode);
+ if (!encoder_mode)
+ return 0;
+
+ drm_mode_probed_add(connector, encoder_mode);
n++;
}
--
2.25.1
1 year, 4 months
- 1
- 0
[PATCH 6.10] drm/amd/display: Refactor function dm_dp_mst_is_port_support_mode()
by Kevin Holm
From: Wayne Lin <wayne.lin(a)amd.com>
[ Upstream commit fa57924c76d995e87ca3533ec60d1d5e55769a27 ]
[Why]
dm_dp_mst_is_port_support_mode() is a bit not following the original design rule and cause
light up issue with multiple 4k monitors after mst dsc hub.
[How]
Refactor function dm_dp_mst_is_port_support_mode() a bit to solve the light up issue.
Reviewed-by: Jerry Zuo <jerry.zuo(a)amd.com>
Acked-by: Zaeem Mohamed <zaeem.mohamed(a)amd.com>
Signed-off-by: Wayne Lin <wayne.lin(a)amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler(a)amd.com>
Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com>
[kevin(a)holm.dev: Resolved merge conflict in .../amdgpu_dm_mst_types.c]
Fixes: 4df96ba6676034 ("drm/amd/display: Add timing pixel encoding for mst mode validation")
Link: https://lore.kernel.org/stable/d74a7768e957e6ce88c27a5bece0c64dff132e24@hol…
Signed-off-by: Kevin Holm <kevin(a)holm.dev>
---
I resolved the merge conflict so that, after this patch is applied to the
linux-6.10.y branch of the stable git repository, the resulting function
dm_dp_mst_is_port_support_mode (and also the new function
dp_get_link_current_set_bw) is identical to the original commit.
I've confirmed that it fixes the regression I reported for my use case.
---
.../display/amdgpu_dm/amdgpu_dm_mst_types.c | 232 +++++++++++-------
1 file changed, 147 insertions(+), 85 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index a5e1a93ddaea..e90f9d697511 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -1595,109 +1595,171 @@ static bool is_dsc_common_config_possible(struct dc_stream_state *stream,
return bw_range->max_target_bpp_x16 && bw_range->min_target_bpp_x16;
}
+#if defined(CONFIG_DRM_AMD_DC_FP)
+static bool dp_get_link_current_set_bw(struct drm_dp_aux *aux, uint32_t *cur_link_bw)
+{
+ uint32_t total_data_bw_efficiency_x10000 = 0;
+ uint32_t link_rate_per_lane_kbps = 0;
+ enum dc_link_rate link_rate;
+ union lane_count_set lane_count;
+ u8 dp_link_encoding;
+ u8 link_bw_set = 0;
+
+ *cur_link_bw = 0;
+
+ if (drm_dp_dpcd_read(aux, DP_MAIN_LINK_CHANNEL_CODING_SET, &dp_link_encoding, 1) != 1 ||
+ drm_dp_dpcd_read(aux, DP_LANE_COUNT_SET, &lane_count.raw, 1) != 1 ||
+ drm_dp_dpcd_read(aux, DP_LINK_BW_SET, &link_bw_set, 1) != 1)
+ return false;
+
+ switch (dp_link_encoding) {
+ case DP_8b_10b_ENCODING:
+ link_rate = link_bw_set;
+ link_rate_per_lane_kbps = link_rate * LINK_RATE_REF_FREQ_IN_KHZ * BITS_PER_DP_BYTE;
+ total_data_bw_efficiency_x10000 = DATA_EFFICIENCY_8b_10b_x10000;
+ total_data_bw_efficiency_x10000 /= 100;
+ total_data_bw_efficiency_x10000 *= DATA_EFFICIENCY_8b_10b_FEC_EFFICIENCY_x100;
+ break;
+ case DP_128b_132b_ENCODING:
+ switch (link_bw_set) {
+ case DP_LINK_BW_10:
+ link_rate = LINK_RATE_UHBR10;
+ break;
+ case DP_LINK_BW_13_5:
+ link_rate = LINK_RATE_UHBR13_5;
+ break;
+ case DP_LINK_BW_20:
+ link_rate = LINK_RATE_UHBR20;
+ break;
+ default:
+ return false;
+ }
+
+ link_rate_per_lane_kbps = link_rate * 10000;
+ total_data_bw_efficiency_x10000 = DATA_EFFICIENCY_128b_132b_x10000;
+ break;
+ default:
+ return false;
+ }
+
+ *cur_link_bw = link_rate_per_lane_kbps * lane_count.bits.LANE_COUNT_SET / 10000 * total_data_bw_efficiency_x10000;
+ return true;
+}
+#endif
+
enum dc_status dm_dp_mst_is_port_support_mode(
struct amdgpu_dm_connector *aconnector,
struct dc_stream_state *stream)
{
- int pbn, branch_max_throughput_mps = 0;
+#if defined(CONFIG_DRM_AMD_DC_FP)
+ int branch_max_throughput_mps = 0;
struct dc_link_settings cur_link_settings;
- unsigned int end_to_end_bw_in_kbps = 0;
- unsigned int upper_link_bw_in_kbps = 0, down_link_bw_in_kbps = 0;
+ uint32_t end_to_end_bw_in_kbps = 0;
+ uint32_t root_link_bw_in_kbps = 0;
+ uint32_t virtual_channel_bw_in_kbps = 0;
struct dc_dsc_bw_range bw_range = {0};
struct dc_dsc_config_options dsc_options = {0};
+ uint32_t stream_kbps;
- /*
- * Consider the case with the depth of the mst topology tree is equal or less than 2
- * A. When dsc bitstream can be transmitted along the entire path
- * 1. dsc is possible between source and branch/leaf device (common dsc params is possible), AND
- * 2. dsc passthrough supported at MST branch, or
- * 3. dsc decoding supported at leaf MST device
- * Use maximum dsc compression as bw constraint
- * B. When dsc bitstream cannot be transmitted along the entire path
- * Use native bw as bw constraint
+ /* DSC unnecessary case
+ * Check if timing could be supported within end-to-end BW
*/
- if (is_dsc_common_config_possible(stream, &bw_range) &&
- (aconnector->mst_output_port->passthrough_aux ||
- aconnector->dsc_aux == &aconnector->mst_output_port->aux)) {
- cur_link_settings = stream->link->verified_link_cap;
- upper_link_bw_in_kbps = dc_link_bandwidth_kbps(aconnector->dc_link, &cur_link_settings);
- down_link_bw_in_kbps = kbps_from_pbn(aconnector->mst_output_port->full_pbn);
-
- /* pick the end to end bw bottleneck */
- end_to_end_bw_in_kbps = min(upper_link_bw_in_kbps, down_link_bw_in_kbps);
-
- if (end_to_end_bw_in_kbps < bw_range.min_kbps) {
- DRM_DEBUG_DRIVER("maximum dsc compression cannot fit into end-to-end bandwidth\n");
+ stream_kbps =
+ dc_bandwidth_in_kbps_from_timing(&stream->timing,
+ dc_link_get_highest_encoding_format(stream->link));
+ cur_link_settings = stream->link->verified_link_cap;
+ root_link_bw_in_kbps = dc_link_bandwidth_kbps(aconnector->dc_link, &cur_link_settings);
+ virtual_channel_bw_in_kbps = kbps_from_pbn(aconnector->mst_output_port->full_pbn);
+
+ /* pick the end to end bw bottleneck */
+ end_to_end_bw_in_kbps = min(root_link_bw_in_kbps, virtual_channel_bw_in_kbps);
+
+ if (stream_kbps <= end_to_end_bw_in_kbps) {
+ DRM_DEBUG_DRIVER("No DSC needed. End-to-end bw sufficient.");
+ return DC_OK;
+ }
+
+ /*DSC necessary case*/
+ if (!aconnector->dsc_aux)
+ return DC_FAIL_BANDWIDTH_VALIDATE;
+
+ if (is_dsc_common_config_possible(stream, &bw_range)) {
+
+ /*capable of dsc passthough. dsc bitstream along the entire path*/
+ if (aconnector->mst_output_port->passthrough_aux) {
+ if (bw_range.min_kbps > end_to_end_bw_in_kbps) {
+ DRM_DEBUG_DRIVER("DSC passthrough. Max dsc compression can't fit into end-to-end bw\n");
return DC_FAIL_BANDWIDTH_VALIDATE;
- }
+ }
+ } else {
+ /*dsc bitstream decoded at the dp last link*/
+ struct drm_dp_mst_port *immediate_upstream_port = NULL;
+ uint32_t end_link_bw = 0;
+
+ /*Get last DP link BW capability*/
+ if (dp_get_link_current_set_bw(&aconnector->mst_output_port->aux, &end_link_bw)) {
+ if (stream_kbps > end_link_bw) {
+ DRM_DEBUG_DRIVER("DSC decode at last link. Mode required bw can't fit into available bw\n");
+ return DC_FAIL_BANDWIDTH_VALIDATE;
+ }
+ }
- if (end_to_end_bw_in_kbps < bw_range.stream_kbps) {
- dc_dsc_get_default_config_option(stream->link->dc, &dsc_options);
- dsc_options.max_target_bpp_limit_override_x16 = aconnector->base.display_info.max_dsc_bpp * 16;
- if (dc_dsc_compute_config(stream->sink->ctx->dc->res_pool->dscs[0],
- &stream->sink->dsc_caps.dsc_dec_caps,
- &dsc_options,
- end_to_end_bw_in_kbps,
- &stream->timing,
- dc_link_get_highest_encoding_format(stream->link),
- &stream->timing.dsc_cfg)) {
- stream->timing.flags.DSC = 1;
- DRM_DEBUG_DRIVER("end-to-end bandwidth require dsc and dsc config found\n");
- } else {
- DRM_DEBUG_DRIVER("end-to-end bandwidth require dsc but dsc config not found\n");
- return DC_FAIL_BANDWIDTH_VALIDATE;
+ /*Get virtual channel bandwidth between source and the link before the last link*/
+ if (aconnector->mst_output_port->parent->port_parent)
+ immediate_upstream_port = aconnector->mst_output_port->parent->port_parent;
+
+ if (immediate_upstream_port) {
+ virtual_channel_bw_in_kbps = kbps_from_pbn(immediate_upstream_port->full_pbn);
+ virtual_channel_bw_in_kbps = min(root_link_bw_in_kbps, virtual_channel_bw_in_kbps);
+ if (bw_range.min_kbps > virtual_channel_bw_in_kbps) {
+ DRM_DEBUG_DRIVER("DSC decode at last link. Max dsc compression can't fit into MST available bw\n");
+ return DC_FAIL_BANDWIDTH_VALIDATE;
+ }
}
}
- } else {
- /* Check if mode could be supported within max slot
- * number of current mst link and full_pbn of mst links.
- */
- int pbn_div, slot_num, max_slot_num;
- enum dc_link_encoding_format link_encoding;
- uint32_t stream_kbps =
- dc_bandwidth_in_kbps_from_timing(&stream->timing,
- dc_link_get_highest_encoding_format(stream->link));
-
- pbn = kbps_to_peak_pbn(stream_kbps);
- pbn_div = dm_mst_get_pbn_divider(stream->link);
- slot_num = DIV_ROUND_UP(pbn, pbn_div);
-
- link_encoding = dc_link_get_highest_encoding_format(stream->link);
- if (link_encoding == DC_LINK_ENCODING_DP_8b_10b)
- max_slot_num = 63;
- else if (link_encoding == DC_LINK_ENCODING_DP_128b_132b)
- max_slot_num = 64;
- else {
- DRM_DEBUG_DRIVER("Invalid link encoding format\n");
- return DC_FAIL_BANDWIDTH_VALIDATE;
- }
- if (slot_num > max_slot_num ||
- pbn > aconnector->mst_output_port->full_pbn) {
- DRM_DEBUG_DRIVER("Mode can not be supported within mst links!");
+ /*Confirm if we can obtain dsc config*/
+ dc_dsc_get_default_config_option(stream->link->dc, &dsc_options);
+ dsc_options.max_target_bpp_limit_override_x16 = aconnector->base.display_info.max_dsc_bpp * 16;
+ if (dc_dsc_compute_config(stream->sink->ctx->dc->res_pool->dscs[0],
+ &stream->sink->dsc_caps.dsc_dec_caps,
+ &dsc_options,
+ end_to_end_bw_in_kbps,
+ &stream->timing,
+ dc_link_get_highest_encoding_format(stream->link),
+ &stream->timing.dsc_cfg)) {
+ stream->timing.flags.DSC = 1;
+ DRM_DEBUG_DRIVER("Require dsc and dsc config found\n");
+ } else {
+ DRM_DEBUG_DRIVER("Require dsc but can't find appropriate dsc config\n");
return DC_FAIL_BANDWIDTH_VALIDATE;
}
- }
- /* check is mst dsc output bandwidth branch_overall_throughput_0_mps */
- switch (stream->timing.pixel_encoding) {
- case PIXEL_ENCODING_RGB:
- case PIXEL_ENCODING_YCBCR444:
- branch_max_throughput_mps =
- aconnector->dc_sink->dsc_caps.dsc_dec_caps.branch_overall_throughput_0_mps;
- break;
- case PIXEL_ENCODING_YCBCR422:
- case PIXEL_ENCODING_YCBCR420:
- branch_max_throughput_mps =
- aconnector->dc_sink->dsc_caps.dsc_dec_caps.branch_overall_throughput_1_mps;
- break;
- default:
- break;
- }
+ /* check is mst dsc output bandwidth branch_overall_throughput_0_mps */
+ switch (stream->timing.pixel_encoding) {
+ case PIXEL_ENCODING_RGB:
+ case PIXEL_ENCODING_YCBCR444:
+ branch_max_throughput_mps =
+ aconnector->dc_sink->dsc_caps.dsc_dec_caps.branch_overall_throughput_0_mps;
+ break;
+ case PIXEL_ENCODING_YCBCR422:
+ case PIXEL_ENCODING_YCBCR420:
+ branch_max_throughput_mps =
+ aconnector->dc_sink->dsc_caps.dsc_dec_caps.branch_overall_throughput_1_mps;
+ break;
+ default:
+ break;
+ }
- if (branch_max_throughput_mps != 0 &&
- ((stream->timing.pix_clk_100hz / 10) > branch_max_throughput_mps * 1000))
+ if (branch_max_throughput_mps != 0 &&
+ ((stream->timing.pix_clk_100hz / 10) > branch_max_throughput_mps * 1000)) {
+ DRM_DEBUG_DRIVER("DSC is required but max throughput mps fails");
return DC_FAIL_BANDWIDTH_VALIDATE;
-
+ }
+ } else {
+ DRM_DEBUG_DRIVER("DSC is required but can't find common dsc config.");
+ return DC_FAIL_BANDWIDTH_VALIDATE;
+ }
+#endif
return DC_OK;
}
--
2.45.2
1 year, 4 months
- 5
- 6
[PATCH 6.1 000/149] 6.1.105-rc2 review
by Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.1.105 release.
There are 149 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 Thu, 15 Aug 2024 06:19:25 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.1.105-rc…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.1.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 6.1.105-rc2
Filipe Manana <fdmanana(a)suse.com>
btrfs: fix double inode unlock for direct IO sync writes
Yang Yingliang <yangyingliang(a)huawei.com>
i2c: qcom-geni: fix missing clk_disable_unprepare() and geni_se_resources_off()
Florian Westphal <fw(a)strlen.de>
netfilter: nf_tables: prefer nft_chain_validate
Florian Westphal <fw(a)strlen.de>
netfilter: nf_tables: allow clone callbacks to sleep
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: nf_tables: bail out if stateful expression provides no .clone
Wayne Lin <wayne.lin(a)amd.com>
drm/amd/display: Defer handling mst up request in resume
Christoph Hellwig <hch(a)lst.de>
xfs: fix log recovery buffer allocation for the legacy h_size fixup
Bart Van Assche <bvanassche(a)acm.org>
block/mq-deadline: Fix the tag reservation code
Bart Van Assche <bvanassche(a)acm.org>
block: Call .limit_depth() after .hctx has been set
Miaohe Lin <linmiaohe(a)huawei.com>
mm/hugetlb: fix potential race in __update_and_free_hugetlb_folio()
Arnaldo Carvalho de Melo <acme(a)redhat.com>
tools headers arm64: Sync arm64's cputype.h with the kernel sources
Nicolas Dichtel <nicolas.dichtel(a)6wind.com>
ipv6: fix source address selection with route leak
Filipe Manana <fdmanana(a)suse.com>
btrfs: fix corruption after buffer fault in during direct IO append write
Yang Shi <yang(a)os.amperecomputing.com>
mm: huge_memory: use !CONFIG_64BIT to relax huge page alignment on 32 bit machines
Ivan Lipski <ivlipski(a)amd.com>
Revert "drm/amd/display: Add NULL check for 'afb' before dereferencing in amdgpu_dm_plane_handle_cursor_update"
Jens Axboe <axboe(a)kernel.dk>
block: use the right type for stub rq_integrity_vec()
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: pm: deny endp with signal + subflow + port
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
selftests: mptcp: join: check backup support in signal endp
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
selftests: mptcp: join: validate backup in MPJ
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: pm: fix backup support in signal endpoints
Geliang Tang <geliang.tang(a)suse.com>
mptcp: export local_address
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: mib: count MPJ with backup flag
Thomas Zimmermann <tzimmermann(a)suse.de>
drm/mgag200: Bind I2C lifetime to DRM device
Thomas Zimmermann <tzimmermann(a)suse.de>
drm/mgag200: Set DDC timeout in milliseconds
Dragan Simic <dsimic(a)manjaro.org>
drm/lima: Mark simple_ondemand governor as softdep
Wayne Lin <Wayne.Lin(a)amd.com>
drm/dp_mst: Skip CSN if topology probing is not done yet
Lucas Stach <l.stach(a)pengutronix.de>
drm/bridge: analogix_dp: properly handle zero sized AUX transactions
Yang Yingliang <yangyingliang(a)huawei.com>
sched/smt: Fix unbalance sched_smt_present dec/inc
Yang Yingliang <yangyingliang(a)huawei.com>
sched/smt: Introduce sched_smt_present_inc/dec() helper
Andi Kleen <ak(a)linux.intel.com>
x86/mtrr: Check if fixed MTRRs exist before saving them
Qu Wenruo <wqu(a)suse.com>
btrfs: avoid using fixed char array size for tree names
Steve French <stfrench(a)microsoft.com>
smb3: fix setting SecurityFlags when encryption is required
Waiman Long <longman(a)redhat.com>
padata: Fix possible divide-by-0 panic in padata_mt_helper()
Tze-nan Wu <Tze-nan.Wu(a)mediatek.com>
tracing: Fix overflow in get_free_elt()
Hans de Goede <hdegoede(a)redhat.com>
power: supply: axp288_charger: Round constant_charge_voltage writes down
Hans de Goede <hdegoede(a)redhat.com>
power: supply: axp288_charger: Fix constant_charge_voltage writes
Shay Drory <shayd(a)nvidia.com>
genirq/irqdesc: Honor caller provided affinity in alloc_desc()
Radhey Shyam Pandey <radhey.shyam.pandey(a)amd.com>
irqchip/xilinx: Fix shift out of bounds
Andrey Konovalov <andreyknvl(a)gmail.com>
kcov: properly check for softirq context
Takashi Iwai <tiwai(a)suse.de>
ASoC: amd: yc: Add quirk entry for OMEN by HP Gaming Laptop 16-n0xxx
George Kennedy <george.kennedy(a)oracle.com>
serial: core: check uartclk for zero to avoid divide by zero
Thomas Gleixner <tglx(a)linutronix.de>
timekeeping: Fix bogus clock_was_set() invocation in do_adjtimex()
Justin Stitt <justinstitt(a)google.com>
ntp: Safeguard against time_constant overflow
Dan Williams <dan.j.williams(a)intel.com>
driver core: Fix uevent_show() vs driver detach race
Paul E. McKenney <paulmck(a)kernel.org>
clocksource: Fix brown-bag boolean thinko in cs_watchdog_read()
Feng Tang <feng.tang(a)intel.com>
clocksource: Scale the watchdog read retries automatically
Paul E. McKenney <paulmck(a)kernel.org>
torture: Enable clocksource watchdog with "tsc=watchdog"
Justin Stitt <justinstitt(a)google.com>
ntp: Clamp maxerror and esterror to operating range
Jason Wang <jasowang(a)redhat.com>
vhost-vdpa: switch to use vmf_insert_pfn() in the fault handler
Thomas Gleixner <tglx(a)linutronix.de>
tick/broadcast: Move per CPU pointer access into the atomic section
Vamshi Gajjela <vamshigajjela(a)google.com>
scsi: ufs: core: Fix hba->last_dme_cmd_tstamp timestamp updating logic
Damien Le Moal <dlemoal(a)kernel.org>
scsi: mpi3mr: Avoid IOMMU page faults on REPORT ZONES
Chris Wulff <crwulff(a)gmail.com>
usb: gadget: u_audio: Check return codes from usb_ep_enable and config_ep_by_speed.
Prashanth K <quic_prashk(a)quicinc.com>
usb: gadget: u_serial: Set start_delayed during suspend
Chris Wulff <crwulff(a)gmail.com>
usb: gadget: core: Check for unset descriptor
Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com>
USB: serial: debug: do not echo input by default
Oliver Neukum <oneukum(a)suse.com>
usb: vhci-hcd: Do not drop references before new references are gained
Takashi Iwai <tiwai(a)suse.de>
ALSA: hda/hdmi: Yet more pin fix for HP EliteDesk 800 G4
Dustin L. Howett <dustin(a)howett.net>
ALSA: hda/realtek: Add Framework Laptop 13 (Intel Core Ultra) to quirks
Steven 'Steve' Kendall <skend(a)chromium.org>
ALSA: hda: Add HP MP9 G4 Retail System AMS to force connect list
Takashi Iwai <tiwai(a)suse.de>
ALSA: line6: Fix racy access to midibuf
Ma Ke <make24(a)iscas.ac.cn>
drm/client: fix null pointer dereference in drm_client_modeset_probe
Fangzhi Zuo <Jerry.Zuo(a)amd.com>
drm/amd/display: Skip Recompute DSC Params if no Stream on Link
Jerome Brunet <jbrunet(a)baylibre.com>
ASoC: meson: axg-fifo: fix irq scheduling issue with PREEMPT_RT
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Re-add ScratchAmp quirk entries
Stefan Wahren <wahrenst(a)gmx.net>
spi: spi-fsl-lpspi: Fix scldiv calculation
Gaosheng Cui <cuigaosheng1(a)huawei.com>
i2c: qcom-geni: Add missing geni_icc_disable in geni_i2c_runtime_resume
Gaosheng Cui <cuigaosheng1(a)huawei.com>
i2c: qcom-geni: Add missing clk_disable_unprepare in geni_i2c_runtime_resume
Neil Armstrong <neil.armstrong(a)linaro.org>
i2c: qcom-geni: add desc struct to prepare support for I2C Master Hub variant
Masami Hiramatsu (Google) <mhiramat(a)kernel.org>
kprobes: Fix to check symbol prefixes correctly
Menglong Dong <menglong8.dong(a)gmail.com>
bpf: kprobe: remove unused declaring of bpf_kprobe_override
Guenter Roeck <linux(a)roeck-us.net>
i2c: smbus: Send alert notifications to all devices if source not found
Curtis Malainey <cujomalainey(a)chromium.org>
ASoC: SOF: Remove libraries from topology lookups
Geert Uytterhoeven <geert+renesas(a)glider.be>
spi: spidev: Add missing spi_device_id for bh2228fv
Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>
ASoC: codecs: wsa883x: Correct Soundwire ports mask
Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org>
ASoC: codecs: wsa883x: parse port-mapping information
Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>
ASoC: codecs: wsa881x: Correct Soundwire ports mask
Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>
ASoC: codecs: wcd938x-sdw: Correct Soundwire ports mask
Guenter Roeck <linux(a)roeck-us.net>
i2c: smbus: Improve handling of stuck alerts
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Expand speculative SSBS workaround (again)
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-A725 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X1C definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Expand speculative SSBS workaround
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Unify speculative SSBS errata logic
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X925 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-A720 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X3 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Add workaround for Arm errata 3194386 and 3312417
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Neoverse-V3 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X4 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: barrier: Restore spec_bar() macro
Besar Wicaksono <bwicaksono(a)nvidia.com>
arm64: Add Neoverse-V2 part
Kemeng Shi <shikemeng(a)huaweicloud.com>
ext4: fix wrong unit use in ext4_mb_find_by_goal
Zheng Zucheng <zhengzucheng(a)huawei.com>
sched/cputime: Fix mul_u64_u64_div_u64() precision for cputime
Huacai Chen <chenhuacai(a)kernel.org>
irqchip/loongarch-cpu: Fix return value of lpic_gsi_to_irq()
Arseniy Krasnov <avkrasnov(a)salutedevices.com>
irqchip/meson-gpio: Convert meson_gpio_irq_controller::lock to 'raw_spinlock_t'
Damien Le Moal <dlemoal(a)kernel.org>
scsi: mpt3sas: Avoid IOMMU page faults on REPORT ZONES
Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp>
profiling: remove profile=sleep support
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Revert "bpftool: Mount bpffs when pinmaps path not under the bpffs"
Daniele Palmas <dnlplm(a)gmail.com>
bus: mhi: host: pci_generic: add support for Telit FE990 modem
Benjamin Coddington <bcodding(a)redhat.com>
SUNRPC: Fix a race to wake a sync task
Peter Oberparleiter <oberpar(a)linux.ibm.com>
s390/sclp: Prevent release of buffer in I/O
Kemeng Shi <shikemeng(a)huaweicloud.com>
jbd2: avoid memleak in jbd2_journal_write_metadata_buffer
Xiaxi Shen <shenxiaxi26(a)gmail.com>
ext4: fix uninitialized variable in ext4_inlinedir_to_tree
Chi Zhiling <chizhiling(a)kylinos.cn>
media: xc2028: avoid use-after-free in load_firmware_cb()
Michal Pecio <michal.pecio(a)gmail.com>
media: uvcvideo: Fix the bandwdith quirk on USB 3.x
Ricardo Ribalda <ribalda(a)chromium.org>
media: uvcvideo: Ignore empty TS packets
Alex Hung <alex.hung(a)amd.com>
drm/amd/display: Add null checker before passing variables
Srinivasan Shanmugam <srinivasan.shanmugam(a)amd.com>
drm/amd/display: Add NULL check for 'afb' before dereferencing in amdgpu_dm_plane_handle_cursor_update
Ming Qian <ming.qian(a)nxp.com>
media: amphion: Remove lock in s_ctrl callback
Bob Zhou <bob.zhou(a)amd.com>
drm/amd/pm: Fix the null pointer dereference for vega10_hwmgr
Victor Skvortsov <victor.skvortsov(a)amd.com>
drm/amdgpu: Add lock around VF RLCG interface
Ma Jun <Jun.Ma2(a)amd.com>
drm/amdgpu/pm: Fix the null pointer dereference in apply_state_adjust_rules
Ma Jun <Jun.Ma2(a)amd.com>
drm/amdgpu: Fix the null pointer dereference to ras_manager
Ma Jun <Jun.Ma2(a)amd.com>
drm/amdgpu/pm: Fix the null pointer dereference for smu7
Ma Jun <Jun.Ma2(a)amd.com>
drm/amdgpu/pm: Fix the param type of set_power_profile_mode
Filipe Manana <fdmanana(a)suse.com>
btrfs: fix bitmap leak when loading free space cache on duplicate entry
Marc Kleine-Budde <mkl(a)pengutronix.de>
can: mcp251xfd: tef: update workaround for erratum DS80000789E 6 of mcp2518fd
Marc Kleine-Budde <mkl(a)pengutronix.de>
can: mcp251xfd: tef: prepare to workaround broken TEF FIFO tail index erratum
Johannes Berg <johannes.berg(a)intel.com>
wifi: nl80211: don't give key data to userspace
Roman Smirnov <r.smirnov(a)omp.ru>
udf: prevent integer overflow in udf_bitmap_free_blocks()
FUJITA Tomonori <fujita.tomonori(a)gmail.com>
PCI: Add Edimax Vendor ID to pci_ids.h
Kuniyuki Iwashima <kuniyu(a)amazon.com>
af_unix: Don't retry after unix_state_lock_nested() in unix_stream_connect().
Yonghong Song <yonghong.song(a)linux.dev>
selftests/bpf: Fix send_signal test with nested CONFIG_PARAVIRT
Dragos Tatulea <dtatulea(a)nvidia.com>
net/mlx5e: SHAMPO, Fix invalid WQ linked list unlink
Johannes Berg <johannes.berg(a)intel.com>
wifi: nl80211: disallow setting special AP channel widths
Thomas Weißschuh <linux(a)weissschuh.net>
ACPI: SBS: manage alarm sysfs attribute through psy core
Thomas Weißschuh <linux(a)weissschuh.net>
ACPI: battery: create alarm sysfs attribute atomically
Niklas Söderlund <niklas.soderlund+renesas(a)ragnatech.se>
clocksource/drivers/sh_cmt: Address race condition for clock events
Frederic Weisbecker <frederic(a)kernel.org>
rcu: Fix rcu_barrier() VS post CPUHP_TEARDOWN_CPU invocation
Mikulas Patocka <mpatocka(a)redhat.com>
block: change rq_integrity_vec to respect the iterator
Yu Kuai <yukuai3(a)huawei.com>
md/raid5: avoid BUG_ON() while continue reshape after reassembling
Li Nan <linan122(a)huawei.com>
md: do not delete safemode_timer in mddev_suspend
Paul E. McKenney <paulmck(a)kernel.org>
rcutorture: Fix rcu_torture_fwd_cb_cr() data race
Csókás, Bence <csokas.bence(a)prolan.hu>
net: fec: Stop PPS on driver remove
James Chapman <jchapman(a)katalix.com>
l2tp: fix lockdep splat
Joe Hattori <joe(a)pf.is.s.u-tokyo.ac.jp>
net: dsa: bcm_sf2: Fix a possible memory leak in bcm_sf2_mdio_register()
Anton Khirnov <anton(a)khirnov.net>
Bluetooth: hci_sync: avoid dup filtering when passive scanning with adv monitor
Dmitry Antipov <dmantipov(a)yandex.ru>
Bluetooth: l2cap: always unlock channel in l2cap_conless_channel()
Eric Dumazet <edumazet(a)google.com>
net: linkwatch: use system_unbound_wq
Nikolay Aleksandrov <razor(a)blackwall.org>
net: bridge: mcast: wait for previous gc cycles when removing port
Daniele Palmas <dnlplm(a)gmail.com>
net: usb: qmi_wwan: fix memory leak for not ip packets
Kuniyuki Iwashima <kuniyu(a)amazon.com>
sctp: Fix null-ptr-deref in reuseport_add_sock().
Peter Zijlstra <peterz(a)infradead.org>
x86/mm: Fix pti_clone_entry_text() for i386
Peter Zijlstra <peterz(a)infradead.org>
x86/mm: Fix pti_clone_pgtable() alignment assumption
Peter Zijlstra <peterz(a)infradead.org>
jump_label: Fix the fix, brown paper bags galore
Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy(a)linux.intel.com>
platform/x86/intel/ifs: Initialize union ifs_status to zero
Jithu Joseph <jithu.joseph(a)intel.com>
platform/x86/intel/ifs: Gen2 Scan test support
Yipeng Zou <zouyipeng(a)huawei.com>
irqchip/mbigen: Fix mbigen node address layout
-------------
Diffstat:
Documentation/admin-guide/cifs/usage.rst | 2 +-
Documentation/admin-guide/kernel-parameters.txt | 10 +-
Documentation/arm64/silicon-errata.rst | 36 +++++
Makefile | 4 +-
arch/arm64/Kconfig | 38 +++++
arch/arm64/include/asm/barrier.h | 4 +
arch/arm64/include/asm/cputype.h | 16 ++
arch/arm64/kernel/cpu_errata.c | 31 ++++
arch/arm64/kernel/cpufeature.c | 12 ++
arch/arm64/kernel/proton-pack.c | 12 ++
arch/arm64/tools/cpucaps | 1 +
arch/x86/kernel/cpu/mtrr/mtrr.c | 2 +-
arch/x86/mm/pti.c | 8 +-
block/blk-mq.c | 6 +-
block/mq-deadline.c | 20 ++-
drivers/acpi/battery.c | 16 +-
drivers/acpi/sbs.c | 23 +--
drivers/base/core.c | 13 +-
drivers/base/module.c | 4 +
drivers/bus/mhi/host/pci_generic.c | 3 +
drivers/clocksource/sh_cmt.c | 13 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 +
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 7 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 6 +
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 2 +
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 +-
.../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 3 +
drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 8 +-
drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c | 8 +-
.../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 55 +++----
.../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 14 +-
.../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 36 ++++-
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 16 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 5 +-
drivers/gpu/drm/display/drm_dp_mst_topology.c | 11 ++
drivers/gpu/drm/drm_client_modeset.c | 5 +
drivers/gpu/drm/lima/lima_drv.c | 1 +
drivers/gpu/drm/mgag200/mgag200_i2c.c | 8 +-
drivers/i2c/busses/i2c-qcom-geni.c | 63 +++++++-
drivers/i2c/i2c-smbus.c | 64 +++++++-
drivers/irqchip/irq-loongarch-cpu.c | 6 +-
drivers/irqchip/irq-mbigen.c | 20 ++-
drivers/irqchip/irq-meson-gpio.c | 14 +-
drivers/irqchip/irq-xilinx-intc.c | 2 +-
drivers/md/md.c | 1 -
drivers/md/raid5.c | 20 ++-
drivers/media/platform/amphion/vdec.c | 2 -
drivers/media/platform/amphion/venc.c | 2 -
drivers/media/tuners/xc2028.c | 9 +-
drivers/media/usb/uvc/uvc_video.c | 37 ++++-
drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c | 2 +
drivers/net/can/spi/mcp251xfd/mcp251xfd-tef.c | 125 ++++++++-------
drivers/net/can/spi/mcp251xfd/mcp251xfd.h | 13 +-
drivers/net/dsa/bcm_sf2.c | 4 +-
drivers/net/ethernet/freescale/fec_ptp.c | 3 +
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 3 +
drivers/net/usb/qmi_wwan.c | 1 +
drivers/nvme/host/pci.c | 6 +-
drivers/platform/x86/intel/ifs/ifs.h | 28 +++-
drivers/platform/x86/intel/ifs/runtest.c | 31 +++-
drivers/power/supply/axp288_charger.c | 24 +--
drivers/s390/char/sclp_sd.c | 10 +-
drivers/scsi/mpi3mr/mpi3mr_os.c | 11 ++
drivers/scsi/mpt3sas/mpt3sas_base.c | 20 ++-
drivers/spi/spi-fsl-lpspi.c | 6 +-
drivers/spi/spidev.c | 1 +
drivers/tty/serial/serial_core.c | 8 +
drivers/ufs/core/ufshcd.c | 11 +-
drivers/usb/gadget/function/u_audio.c | 42 ++++-
drivers/usb/gadget/function/u_serial.c | 1 +
drivers/usb/gadget/udc/core.c | 10 +-
drivers/usb/serial/usb_debug.c | 7 +
drivers/usb/usbip/vhci_hcd.c | 9 +-
drivers/vhost/vdpa.c | 8 +-
fs/btrfs/ctree.h | 1 +
fs/btrfs/file.c | 60 +++++--
fs/btrfs/free-space-cache.c | 1 +
fs/btrfs/print-tree.c | 2 +-
fs/ext4/inline.c | 6 +-
fs/ext4/mballoc.c | 3 +-
fs/jbd2/journal.c | 1 +
fs/smb/client/cifs_debug.c | 2 +-
fs/smb/client/cifsglob.h | 8 +-
fs/smb/client/smb2pdu.c | 3 +
fs/udf/balloc.c | 36 ++---
fs/xfs/xfs_log_recover.c | 20 ++-
include/linux/blk-integrity.h | 16 +-
include/linux/clocksource.h | 14 +-
include/linux/pci_ids.h | 2 +
include/linux/profile.h | 1 -
include/linux/trace_events.h | 1 -
include/net/ip6_route.h | 22 ++-
include/net/netfilter/nf_tables.h | 4 +-
include/trace/events/intel_ifs.h | 16 +-
kernel/irq/irqdesc.c | 1 +
kernel/jump_label.c | 4 +-
kernel/kcov.c | 15 +-
kernel/kprobes.c | 4 +-
kernel/padata.c | 7 +
kernel/profile.c | 11 +-
kernel/rcu/rcutorture.c | 2 +-
kernel/rcu/tree.c | 10 +-
kernel/sched/core.c | 27 +++-
kernel/sched/cputime.c | 6 +
kernel/sched/stats.c | 10 --
kernel/time/clocksource-wdtest.c | 13 +-
kernel/time/clocksource.c | 10 +-
kernel/time/ntp.c | 9 +-
kernel/time/tick-broadcast.c | 3 +-
kernel/time/timekeeping.c | 2 +-
kernel/trace/tracing_map.c | 6 +-
mm/huge_memory.c | 2 +-
mm/hugetlb.c | 14 +-
net/bluetooth/hci_sync.c | 14 ++
net/bluetooth/l2cap_core.c | 1 +
net/bridge/br_multicast.c | 4 +-
net/core/link_watch.c | 4 +-
net/ipv6/ip6_output.c | 1 +
net/ipv6/route.c | 2 +-
net/l2tp/l2tp_core.c | 15 +-
net/mptcp/mib.c | 2 +
net/mptcp/mib.h | 2 +
net/mptcp/pm.c | 12 ++
net/mptcp/pm_netlink.c | 39 +++--
net/mptcp/pm_userspace.c | 18 +++
net/mptcp/protocol.h | 4 +
net/mptcp/subflow.c | 9 ++
net/netfilter/nf_tables_api.c | 172 +++------------------
net/netfilter/nft_connlimit.c | 4 +-
net/netfilter/nft_counter.c | 4 +-
net/netfilter/nft_dynset.c | 2 +-
net/netfilter/nft_last.c | 4 +-
net/netfilter/nft_limit.c | 14 +-
net/netfilter/nft_quota.c | 4 +-
net/sctp/input.c | 19 ++-
net/sunrpc/sched.c | 4 +-
net/unix/af_unix.c | 34 ++--
net/wireless/nl80211.c | 37 ++++-
sound/pci/hda/patch_hdmi.c | 2 +
sound/pci/hda/patch_realtek.c | 1 +
sound/soc/amd/yc/acp6x-mach.c | 7 +
sound/soc/codecs/wcd938x-sdw.c | 4 +-
sound/soc/codecs/wsa881x.c | 2 +-
sound/soc/codecs/wsa883x.c | 10 +-
sound/soc/meson/axg-fifo.c | 26 ++--
sound/soc/sof/mediatek/mt8195/mt8195.c | 2 +-
sound/usb/line6/driver.c | 5 +
sound/usb/quirks-table.h | 4 +
tools/arch/arm64/include/asm/cputype.h | 6 +
tools/bpf/bpftool/prog.c | 4 -
.../testing/selftests/bpf/prog_tests/send_signal.c | 3 +-
tools/testing/selftests/net/mptcp/mptcp_join.sh | 75 +++++++--
tools/testing/selftests/rcutorture/bin/torture.sh | 6 +-
153 files changed, 1349 insertions(+), 702 deletions(-)
1 year, 4 months
- 11
- 11
[PATCH 6.6 000/189] 6.6.46-rc1 review
by Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.6.46 release.
There are 189 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, 14 Aug 2024 16:00: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/v6.x/stable-review/patch-6.6.46-rc1…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.6.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 6.6.46-rc1
Filipe Manana <fdmanana(a)suse.com>
btrfs: fix double inode unlock for direct IO sync writes
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
Revert "selftests: mptcp: simult flows: mark 'unbalanced' tests as flaky"
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
selftests: mptcp: join: test both signal & subflow
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
selftests: mptcp: join: ability to invert ADD_ADDR check
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: pm: do not ignore 'subflow' if 'signal' flag is also set
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: pm: don't try to create sf if alloc failed
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: pm: reduce indentation blocks
Wayne Lin <wayne.lin(a)amd.com>
drm/amd/display: Defer handling mst up request in resume
Christoph Hellwig <hch(a)lst.de>
xfs: fix log recovery buffer allocation for the legacy h_size fixup
Dave Airlie <airlied(a)redhat.com>
nouveau: set placement to original placement on uvmm validate.
Miaohe Lin <linmiaohe(a)huawei.com>
mm/hugetlb: fix potential race in __update_and_free_hugetlb_folio()
Arnaldo Carvalho de Melo <acme(a)redhat.com>
tools headers arm64: Sync arm64's cputype.h with the kernel sources
Nicolas Dichtel <nicolas.dichtel(a)6wind.com>
ipv6: fix source address selection with route leak
Florian Westphal <fw(a)strlen.de>
netfilter: nf_tables: prefer nft_chain_validate
Filipe Manana <fdmanana(a)suse.com>
btrfs: fix corruption after buffer fault in during direct IO append write
Yang Shi <yang(a)os.amperecomputing.com>
mm: huge_memory: use !CONFIG_64BIT to relax huge page alignment on 32 bit machines
Yang Shi <yang(a)os.amperecomputing.com>
mm: huge_memory: don't force huge page alignment on 32 bit
Ivan Lipski <ivlipski(a)amd.com>
Revert "drm/amd/display: Add NULL check for 'afb' before dereferencing in amdgpu_dm_plane_handle_cursor_update"
Jens Axboe <axboe(a)kernel.dk>
block: use the right type for stub rq_integrity_vec()
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: pm: deny endp with signal + subflow + port
Paolo Abeni <pabeni(a)redhat.com>
selftests: mptcp: fix error path
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: pm: fix backup support in signal endpoints
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: fully established after ADD_ADDR echo on MPJ
Bill Wendling <morbo(a)google.com>
drm/radeon: Remove __counted_by from StateArray.states[]
Thomas Zimmermann <tzimmermann(a)suse.de>
drm/mgag200: Bind I2C lifetime to DRM device
Thomas Zimmermann <tzimmermann(a)suse.de>
drm/mgag200: Set DDC timeout in milliseconds
Dragan Simic <dsimic(a)manjaro.org>
drm/lima: Mark simple_ondemand governor as softdep
Wayne Lin <Wayne.Lin(a)amd.com>
drm/dp_mst: Skip CSN if topology probing is not done yet
Lucas Stach <l.stach(a)pengutronix.de>
drm/bridge: analogix_dp: properly handle zero sized AUX transactions
Yang Yingliang <yangyingliang(a)huawei.com>
sched/core: Fix unbalance set_rq_online/offline() in sched_cpu_deactivate()
Yang Yingliang <yangyingliang(a)huawei.com>
sched/core: Introduce sched_set_rq_on/offline() helper
Yang Yingliang <yangyingliang(a)huawei.com>
sched/smt: Fix unbalance sched_smt_present dec/inc
Yang Yingliang <yangyingliang(a)huawei.com>
sched/smt: Introduce sched_smt_present_inc/dec() helper
Andi Kleen <ak(a)linux.intel.com>
x86/mtrr: Check if fixed MTRRs exist before saving them
Chen Yu <yu.c.chen(a)intel.com>
x86/paravirt: Fix incorrect virt spinlock setting on bare metal
Qu Wenruo <wqu(a)suse.com>
btrfs: avoid using fixed char array size for tree names
Nico Pache <npache(a)redhat.com>
selftests: mm: add s390 to ARCH check
Mathias Krause <minipli(a)grsecurity.net>
eventfs: Use SRCU for freeing eventfs_inodes
Mathias Krause <minipli(a)grsecurity.net>
eventfs: Don't return NULL in eventfs_create_dir()
Steve French <stfrench(a)microsoft.com>
smb3: fix setting SecurityFlags when encryption is required
Waiman Long <longman(a)redhat.com>
padata: Fix possible divide-by-0 panic in padata_mt_helper()
Tze-nan Wu <Tze-nan.Wu(a)mediatek.com>
tracing: Fix overflow in get_free_elt()
Hans de Goede <hdegoede(a)redhat.com>
power: supply: axp288_charger: Round constant_charge_voltage writes down
Hans de Goede <hdegoede(a)redhat.com>
power: supply: axp288_charger: Fix constant_charge_voltage writes
Neil Armstrong <neil.armstrong(a)linaro.org>
power: supply: qcom_battmgr: return EAGAIN when firmware service is not up
Miao Wang <shankerwangmiao(a)gmail.com>
LoongArch: Enable general EFI poweroff method
Shay Drory <shayd(a)nvidia.com>
genirq/irqdesc: Honor caller provided affinity in alloc_desc()
Radhey Shyam Pandey <radhey.shyam.pandey(a)amd.com>
irqchip/xilinx: Fix shift out of bounds
Andrey Konovalov <andreyknvl(a)gmail.com>
kcov: properly check for softirq context
Takashi Iwai <tiwai(a)suse.de>
ASoC: amd: yc: Add quirk entry for OMEN by HP Gaming Laptop 16-n0xxx
Mikulas Patocka <mpatocka(a)redhat.com>
parisc: fix a possible DMA corruption
Mikulas Patocka <mpatocka(a)redhat.com>
parisc: fix unaligned accesses in BPF
Shakeel Butt <shakeel.butt(a)linux.dev>
memcg: protect concurrent access to mem_cgroup_idr
George Kennedy <george.kennedy(a)oracle.com>
serial: core: check uartclk for zero to avoid divide by zero
Thomas Gleixner <tglx(a)linutronix.de>
timekeeping: Fix bogus clock_was_set() invocation in do_adjtimex()
Justin Stitt <justinstitt(a)google.com>
ntp: Safeguard against time_constant overflow
Steven Rostedt <rostedt(a)goodmis.org>
tracefs: Use generic inode RCU for synchronizing freeing
Mathias Krause <minipli(a)grsecurity.net>
tracefs: Fix inode allocation
Dan Williams <dan.j.williams(a)intel.com>
driver core: Fix uevent_show() vs driver detach race
Paul E. McKenney <paulmck(a)kernel.org>
clocksource: Fix brown-bag boolean thinko in cs_watchdog_read()
Feng Tang <feng.tang(a)intel.com>
clocksource: Scale the watchdog read retries automatically
Justin Stitt <justinstitt(a)google.com>
ntp: Clamp maxerror and esterror to operating range
Jason Wang <jasowang(a)redhat.com>
vhost-vdpa: switch to use vmf_insert_pfn() in the fault handler
Thomas Gleixner <tglx(a)linutronix.de>
tick/broadcast: Move per CPU pointer access into the atomic section
Vamshi Gajjela <vamshigajjela(a)google.com>
scsi: ufs: core: Fix hba->last_dme_cmd_tstamp timestamp updating logic
Manivannan Sadhasivam <mani(a)kernel.org>
scsi: ufs: core: Do not set link to OFF state while waking up from hibernation
Damien Le Moal <dlemoal(a)kernel.org>
scsi: mpi3mr: Avoid IOMMU page faults on REPORT ZONES
Chris Wulff <crwulff(a)gmail.com>
usb: gadget: u_audio: Check return codes from usb_ep_enable and config_ep_by_speed.
Prashanth K <quic_prashk(a)quicinc.com>
usb: gadget: u_serial: Set start_delayed during suspend
Takashi Iwai <tiwai(a)suse.de>
usb: gadget: midi2: Fix the response for FB info with block 0xff
Chris Wulff <crwulff(a)gmail.com>
usb: gadget: core: Check for unset descriptor
Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com>
USB: serial: debug: do not echo input by default
Oliver Neukum <oneukum(a)suse.com>
usb: vhci-hcd: Do not drop references before new references are gained
Takashi Iwai <tiwai(a)suse.de>
ALSA: hda/hdmi: Yet more pin fix for HP EliteDesk 800 G4
Dustin L. Howett <dustin(a)howett.net>
ALSA: hda/realtek: Add Framework Laptop 13 (Intel Core Ultra) to quirks
Steven 'Steve' Kendall <skend(a)chromium.org>
ALSA: hda: Add HP MP9 G4 Retail System AMS to force connect list
Takashi Iwai <tiwai(a)suse.de>
ALSA: line6: Fix racy access to midibuf
Ma Ke <make24(a)iscas.ac.cn>
drm/client: fix null pointer dereference in drm_client_modeset_probe
Andi Shyti <andi.shyti(a)linux.intel.com>
drm/i915/gem: Adjust vma offset for framebuffer mmap offset
Joshua Ashton <joshua(a)froggi.es>
drm/amdgpu: Forward soft recovery errors to userspace
Fangzhi Zuo <Jerry.Zuo(a)amd.com>
drm/amd/display: Skip Recompute DSC Params if no Stream on Link
Andi Shyti <andi.shyti(a)linux.intel.com>
drm/i915/gem: Fix Virtual Memory mapping boundaries calculation
Linus Torvalds <torvalds(a)linux-foundation.org>
module: make waiting for a concurrent module loader interruptible
Linus Torvalds <torvalds(a)linux-foundation.org>
module: warn about excessively long module waits
Gleb Korobeynikov <gkorobeynikov(a)astralinux.ru>
cifs: cifs_inval_name_dfs_link_error: correct the check for fullpath
Jerome Brunet <jbrunet(a)baylibre.com>
ASoC: meson: axg-fifo: fix irq scheduling issue with PREEMPT_RT
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Re-add ScratchAmp quirk entries
Stefan Wahren <wahrenst(a)gmx.net>
spi: spi-fsl-lpspi: Fix scldiv calculation
Gaosheng Cui <cuigaosheng1(a)huawei.com>
i2c: qcom-geni: Add missing geni_icc_disable in geni_i2c_runtime_resume
Gaosheng Cui <cuigaosheng1(a)huawei.com>
i2c: qcom-geni: Add missing clk_disable_unprepare in geni_i2c_runtime_resume
Masami Hiramatsu (Google) <mhiramat(a)kernel.org>
kprobes: Fix to check symbol prefixes correctly
Menglong Dong <menglong8.dong(a)gmail.com>
bpf: kprobe: remove unused declaring of bpf_kprobe_override
Guenter Roeck <linux(a)roeck-us.net>
i2c: smbus: Send alert notifications to all devices if source not found
Curtis Malainey <cujomalainey(a)chromium.org>
ASoC: SOF: Remove libraries from topology lookups
Geert Uytterhoeven <geert+renesas(a)glider.be>
spi: spidev: Add missing spi_device_id for bh2228fv
Jerome Audu <jau(a)free.fr>
ASoC: sti: add missing probe entry for player and reader
Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>
ASoC: codecs: wsa884x: Correct Soundwire ports mask
Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org>
ASoC: codecs: wsa884x: parse port-mapping information
Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>
ASoC: codecs: wsa883x: Correct Soundwire ports mask
Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org>
ASoC: codecs: wsa883x: parse port-mapping information
Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>
ASoC: codecs: wsa881x: Correct Soundwire ports mask
Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>
ASoC: codecs: wcd938x-sdw: Correct Soundwire ports mask
Guenter Roeck <linux(a)roeck-us.net>
i2c: smbus: Improve handling of stuck alerts
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Expand speculative SSBS workaround (again)
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-A725 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X1C definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Expand speculative SSBS workaround
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Unify speculative SSBS errata logic
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X925 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-A720 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X3 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Add workaround for Arm errata 3194386 and 3312417
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Neoverse-V3 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X4 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: barrier: Restore spec_bar() macro
Besar Wicaksono <bwicaksono(a)nvidia.com>
arm64: Add Neoverse-V2 part
Willem de Bruijn <willemb(a)google.com>
net: drop bad gso csum_start and offset in virtio_net_hdr
Zheng Zucheng <zhengzucheng(a)huawei.com>
sched/cputime: Fix mul_u64_u64_div_u64() precision for cputime
Huacai Chen <chenhuacai(a)kernel.org>
irqchip/loongarch-cpu: Fix return value of lpic_gsi_to_irq()
Arseniy Krasnov <avkrasnov(a)salutedevices.com>
irqchip/meson-gpio: Convert meson_gpio_irq_controller::lock to 'raw_spinlock_t'
Damien Le Moal <dlemoal(a)kernel.org>
scsi: mpt3sas: Avoid IOMMU page faults on REPORT ZONES
Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp>
profiling: remove profile=sleep support
Benjamin Coddington <bcodding(a)redhat.com>
SUNRPC: Fix a race to wake a sync task
Peter Oberparleiter <oberpar(a)linux.ibm.com>
s390/sclp: Prevent release of buffer in I/O
Kemeng Shi <shikemeng(a)huaweicloud.com>
jbd2: avoid memleak in jbd2_journal_write_metadata_buffer
Xiaxi Shen <shenxiaxi26(a)gmail.com>
ext4: fix uninitialized variable in ext4_inlinedir_to_tree
Chi Zhiling <chizhiling(a)kylinos.cn>
media: xc2028: avoid use-after-free in load_firmware_cb()
Michal Pecio <michal.pecio(a)gmail.com>
media: uvcvideo: Fix the bandwdith quirk on USB 3.x
Ricardo Ribalda <ribalda(a)chromium.org>
media: uvcvideo: Ignore empty TS packets
Alex Hung <alex.hung(a)amd.com>
drm/amd/display: Add null checker before passing variables
Srinivasan Shanmugam <srinivasan.shanmugam(a)amd.com>
drm/amd/display: Add NULL check for 'afb' before dereferencing in amdgpu_dm_plane_handle_cursor_update
Ming Qian <ming.qian(a)nxp.com>
media: amphion: Remove lock in s_ctrl callback
Bob Zhou <bob.zhou(a)amd.com>
drm/amd/pm: Fix the null pointer dereference for vega10_hwmgr
Victor Skvortsov <victor.skvortsov(a)amd.com>
drm/amdgpu: Add lock around VF RLCG interface
Jesse Zhang <jesse.zhang(a)amd.com>
drm/admgpu: fix dereferencing null pointer context
Ma Jun <Jun.Ma2(a)amd.com>
drm/amdgpu/pm: Fix the null pointer dereference in apply_state_adjust_rules
Ma Jun <Jun.Ma2(a)amd.com>
drm/amdgpu: Fix the null pointer dereference to ras_manager
Ma Jun <Jun.Ma2(a)amd.com>
drm/amdgpu/pm: Fix the null pointer dereference for smu7
Ma Jun <Jun.Ma2(a)amd.com>
drm/amdgpu/pm: Fix the param type of set_power_profile_mode
Tim Huang <Tim.Huang(a)amd.com>
drm/amdgpu: fix potential resource leak warning
Michael Strauss <michael.strauss(a)amd.com>
drm/amd/display: Add delay to improve LTTPR UHBR interop
Luke Wang <ziniu.wang_1(a)nxp.com>
Bluetooth: btnxpuart: Shutdown timer and prevent rearming when driver unloading
Filipe Manana <fdmanana(a)suse.com>
btrfs: fix bitmap leak when loading free space cache on duplicate entry
Qu Wenruo <wqu(a)suse.com>
btrfs: do not clear page dirty inside extent_write_locked_range()
Bartosz Golaszewski <bartosz.golaszewski(a)linaro.org>
net: stmmac: qcom-ethqos: enable SGMII loopback during DMA reset on sa8775p-ride-r3
Marc Kleine-Budde <mkl(a)pengutronix.de>
can: mcp251xfd: tef: update workaround for erratum DS80000789E 6 of mcp2518fd
Marc Kleine-Budde <mkl(a)pengutronix.de>
can: mcp251xfd: tef: prepare to workaround broken TEF FIFO tail index erratum
Johannes Berg <johannes.berg(a)intel.com>
wifi: nl80211: don't give key data to userspace
Roman Smirnov <r.smirnov(a)omp.ru>
udf: prevent integer overflow in udf_bitmap_free_blocks()
FUJITA Tomonori <fujita.tomonori(a)gmail.com>
PCI: Add Edimax Vendor ID to pci_ids.h
Kuniyuki Iwashima <kuniyu(a)amazon.com>
af_unix: Don't retry after unix_state_lock_nested() in unix_stream_connect().
Yonghong Song <yonghong.song(a)linux.dev>
selftests/bpf: Fix send_signal test with nested CONFIG_PARAVIRT
Dragos Tatulea <dtatulea(a)nvidia.com>
net/mlx5e: SHAMPO, Fix invalid WQ linked list unlink
Baochen Qiang <quic_bqiang(a)quicinc.com>
wifi: ath12k: fix memory leak in ath12k_dp_rx_peer_frag_setup()
Johannes Berg <johannes.berg(a)intel.com>
wifi: nl80211: disallow setting special AP channel widths
Viresh Kumar <viresh.kumar(a)linaro.org>
xen: privcmd: Switch from mutex to spinlock for irqfds
Thomas Weißschuh <linux(a)weissschuh.net>
ACPI: SBS: manage alarm sysfs attribute through psy core
Thomas Weißschuh <linux(a)weissschuh.net>
ACPI: battery: create alarm sysfs attribute atomically
Niklas Söderlund <niklas.soderlund+renesas(a)ragnatech.se>
clocksource/drivers/sh_cmt: Address race condition for clock events
Frederic Weisbecker <frederic(a)kernel.org>
rcu: Fix rcu_barrier() VS post CPUHP_TEARDOWN_CPU invocation
Mikulas Patocka <mpatocka(a)redhat.com>
block: change rq_integrity_vec to respect the iterator
Yu Kuai <yukuai3(a)huawei.com>
md/raid5: avoid BUG_ON() while continue reshape after reassembling
Li Nan <linan122(a)huawei.com>
md: do not delete safemode_timer in mddev_suspend
Paul E. McKenney <paulmck(a)kernel.org>
rcutorture: Fix rcu_torture_fwd_cb_cr() data race
Wilken Gottwalt <wilken.gottwalt(a)posteo.net>
hwmon: corsair-psu: add USB id of HX1200i Series 2023 psu
Hagar Hemdan <hagarhem(a)amazon.com>
gpio: prevent potential speculation leaks in gpio_device_get_desc()
Csókás, Bence <csokas.bence(a)prolan.hu>
net: fec: Stop PPS on driver remove
Florian Fainelli <florian.fainelli(a)broadcom.com>
net: bcmgenet: Properly overlay PHY and MAC Wake-on-LAN capabilities
James Chapman <jchapman(a)katalix.com>
l2tp: fix lockdep splat
Joe Hattori <joe(a)pf.is.s.u-tokyo.ac.jp>
net: dsa: bcm_sf2: Fix a possible memory leak in bcm_sf2_mdio_register()
Zhengchao Shao <shaozhengchao(a)huawei.com>
net/smc: add the max value of fallback reason count
Anton Khirnov <anton(a)khirnov.net>
Bluetooth: hci_sync: avoid dup filtering when passive scanning with adv monitor
Dmitry Antipov <dmantipov(a)yandex.ru>
Bluetooth: l2cap: always unlock channel in l2cap_conless_channel()
Grzegorz Nitka <grzegorz.nitka(a)intel.com>
ice: Fix reset handler
Eric Dumazet <edumazet(a)google.com>
net: linkwatch: use system_unbound_wq
Nikolay Aleksandrov <razor(a)blackwall.org>
net: bridge: mcast: wait for previous gc cycles when removing port
Daniele Palmas <dnlplm(a)gmail.com>
net: usb: qmi_wwan: fix memory leak for not ip packets
Kuniyuki Iwashima <kuniyu(a)amazon.com>
sctp: Fix null-ptr-deref in reuseport_add_sock().
Johan Hovold <johan+linaro(a)kernel.org>
wifi: ath12k: fix soft lockup on suspend
Kang Yang <quic_kangyang(a)quicinc.com>
wifi: ath12k: add CE and ext IRQ flag to indicate irq_handler
Karthikeyan Periyasamy <quic_periyasa(a)quicinc.com>
wifi: ath12k: rename the sc naming convention to ab
Paulo Alcantara <pc(a)manguebit.com>
smb: client: handle lack of FSCTL_GET_REPARSE_POINT support
Peter Zijlstra <peterz(a)infradead.org>
x86/mm: Fix pti_clone_entry_text() for i386
Peter Zijlstra <peterz(a)infradead.org>
x86/mm: Fix pti_clone_pgtable() alignment assumption
Peter Zijlstra <peterz(a)infradead.org>
jump_label: Fix the fix, brown paper bags galore
Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy(a)linux.intel.com>
platform/x86/intel/ifs: Initialize union ifs_status to zero
Jithu Joseph <jithu.joseph(a)intel.com>
platform/x86/intel/ifs: Gen2 Scan test support
Jithu Joseph <jithu.joseph(a)intel.com>
platform/x86/intel/ifs: Store IFS generation number
Yipeng Zou <zouyipeng(a)huawei.com>
irqchip/mbigen: Fix mbigen node address layout
-------------
Diffstat:
Documentation/admin-guide/cifs/usage.rst | 2 +-
Documentation/admin-guide/kernel-parameters.txt | 10 +-
Documentation/arch/arm64/silicon-errata.rst | 36 +++++
Documentation/hwmon/corsair-psu.rst | 6 +-
Makefile | 4 +-
arch/arm64/Kconfig | 38 +++++
arch/arm64/include/asm/barrier.h | 4 +
arch/arm64/include/asm/cputype.h | 16 +++
arch/arm64/kernel/cpu_errata.c | 31 +++++
arch/arm64/kernel/cpufeature.c | 12 ++
arch/arm64/kernel/proton-pack.c | 12 ++
arch/arm64/tools/cpucaps | 1 +
arch/loongarch/kernel/efi.c | 6 +
arch/parisc/Kconfig | 1 +
arch/parisc/include/asm/cache.h | 11 +-
arch/parisc/net/bpf_jit_core.c | 2 +-
arch/x86/include/asm/msr-index.h | 1 +
arch/x86/include/asm/qspinlock.h | 12 +-
arch/x86/kernel/cpu/mtrr/mtrr.c | 2 +-
arch/x86/kernel/paravirt.c | 7 +-
arch/x86/mm/pti.c | 8 +-
drivers/acpi/battery.c | 16 ++-
drivers/acpi/sbs.c | 23 +--
drivers/base/core.c | 13 +-
drivers/base/module.c | 4 +
drivers/bluetooth/btnxpuart.c | 2 +-
drivers/clocksource/sh_cmt.c | 13 +-
drivers/gpio/gpiolib.c | 3 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 +
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 3 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 7 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 6 +
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 2 +
drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 5 +
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 +-
.../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 3 +
.../hwss/link_hwss_hpo_fixed_vs_pe_retimer_dp.c | 5 +
drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 8 +-
drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c | 8 +-
.../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 55 ++++----
.../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 14 +-
.../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 36 ++++-
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 16 +--
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 5 +-
drivers/gpu/drm/display/drm_dp_mst_topology.c | 11 ++
drivers/gpu/drm/drm_client_modeset.c | 5 +
drivers/gpu/drm/i915/gem/i915_gem_mman.c | 55 +++++++-
drivers/gpu/drm/lima/lima_drv.c | 1 +
drivers/gpu/drm/mgag200/mgag200_i2c.c | 8 +-
drivers/gpu/drm/nouveau/nouveau_uvmm.c | 6 +-
drivers/gpu/drm/radeon/pptable.h | 2 +-
drivers/hwmon/corsair-psu.c | 7 +-
drivers/i2c/busses/i2c-qcom-geni.c | 5 +-
drivers/i2c/i2c-smbus.c | 64 ++++++++-
drivers/irqchip/irq-loongarch-cpu.c | 6 +-
drivers/irqchip/irq-mbigen.c | 20 ++-
drivers/irqchip/irq-meson-gpio.c | 14 +-
drivers/irqchip/irq-xilinx-intc.c | 2 +-
drivers/md/md.c | 1 -
drivers/md/raid5.c | 20 ++-
drivers/media/platform/amphion/vdec.c | 2 -
drivers/media/platform/amphion/venc.c | 2 -
drivers/media/tuners/xc2028.c | 9 +-
drivers/media/usb/uvc/uvc_video.c | 37 ++++-
drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c | 2 +
drivers/net/can/spi/mcp251xfd/mcp251xfd-tef.c | 125 +++++++++--------
drivers/net/can/spi/mcp251xfd/mcp251xfd.h | 13 +-
drivers/net/dsa/bcm_sf2.c | 4 +-
drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 14 +-
drivers/net/ethernet/freescale/fec_ptp.c | 3 +
drivers/net/ethernet/intel/ice/ice_main.c | 2 +
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 3 +
.../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 23 +++
drivers/net/usb/qmi_wwan.c | 1 +
drivers/net/wireless/ath/ath12k/core.h | 2 +
drivers/net/wireless/ath/ath12k/dp_rx.c | 1 +
drivers/net/wireless/ath/ath12k/hif.h | 18 +--
drivers/net/wireless/ath/ath12k/pci.c | 21 ++-
drivers/nvme/host/pci.c | 6 +-
drivers/platform/x86/intel/ifs/core.c | 3 +
drivers/platform/x86/intel/ifs/ifs.h | 30 +++-
drivers/platform/x86/intel/ifs/runtest.c | 31 +++--
drivers/power/supply/axp288_charger.c | 24 ++--
drivers/power/supply/qcom_battmgr.c | 8 +-
drivers/s390/char/sclp_sd.c | 10 +-
drivers/scsi/mpi3mr/mpi3mr_os.c | 11 ++
drivers/scsi/mpt3sas/mpt3sas_base.c | 20 ++-
drivers/spi/spi-fsl-lpspi.c | 6 +-
drivers/spi/spidev.c | 1 +
drivers/tty/serial/serial_core.c | 8 ++
drivers/ufs/core/ufshcd.c | 14 +-
drivers/usb/gadget/function/f_midi2.c | 21 ++-
drivers/usb/gadget/function/u_audio.c | 42 ++++--
drivers/usb/gadget/function/u_serial.c | 1 +
drivers/usb/gadget/udc/core.c | 10 +-
drivers/usb/serial/usb_debug.c | 7 +
drivers/usb/usbip/vhci_hcd.c | 9 +-
drivers/vhost/vdpa.c | 8 +-
drivers/xen/privcmd.c | 25 ++--
fs/btrfs/ctree.h | 1 +
fs/btrfs/extent_io.c | 4 +-
fs/btrfs/file.c | 60 ++++++--
fs/btrfs/free-space-cache.c | 1 +
fs/btrfs/print-tree.c | 2 +-
fs/ext4/inline.c | 6 +-
fs/jbd2/journal.c | 1 +
fs/smb/client/cifs_debug.c | 2 +-
fs/smb/client/cifsglob.h | 8 +-
fs/smb/client/inode.c | 17 ++-
fs/smb/client/misc.c | 9 +-
fs/smb/client/reparse.c | 4 +
fs/smb/client/reparse.h | 19 ++-
fs/smb/client/smb2inode.c | 2 +
fs/smb/client/smb2pdu.c | 3 +
fs/tracefs/event_inode.c | 4 +-
fs/tracefs/inode.c | 12 +-
fs/tracefs/internal.h | 5 +-
fs/udf/balloc.c | 36 ++---
fs/xfs/xfs_log_recover.c | 20 ++-
include/linux/blk-integrity.h | 16 +--
include/linux/clocksource.h | 14 +-
include/linux/fs.h | 2 +-
include/linux/pci_ids.h | 2 +
include/linux/profile.h | 1 -
include/linux/trace_events.h | 1 -
include/linux/virtio_net.h | 16 +--
include/net/ip6_route.h | 22 ++-
include/trace/events/intel_ifs.h | 16 +--
kernel/irq/irqdesc.c | 1 +
kernel/jump_label.c | 4 +-
kernel/kcov.c | 15 +-
kernel/kprobes.c | 4 +-
kernel/module/main.c | 41 ++++--
kernel/padata.c | 7 +
kernel/profile.c | 11 +-
kernel/rcu/rcutorture.c | 2 +-
kernel/rcu/tree.c | 10 +-
kernel/sched/core.c | 68 ++++++---
kernel/sched/cputime.c | 6 +
kernel/sched/stats.c | 10 --
kernel/time/clocksource-wdtest.c | 13 +-
kernel/time/clocksource.c | 10 +-
kernel/time/ntp.c | 9 +-
kernel/time/tick-broadcast.c | 3 +-
kernel/time/timekeeping.c | 2 +-
kernel/trace/tracing_map.c | 6 +-
mm/huge_memory.c | 4 +
mm/hugetlb.c | 14 +-
mm/memcontrol.c | 22 ++-
net/bluetooth/hci_sync.c | 14 ++
net/bluetooth/l2cap_core.c | 1 +
net/bridge/br_multicast.c | 4 +-
net/core/link_watch.c | 4 +-
net/ipv4/tcp_offload.c | 3 +
net/ipv4/udp_offload.c | 4 +
net/ipv6/ip6_output.c | 1 +
net/ipv6/route.c | 2 +-
net/l2tp/l2tp_core.c | 15 +-
net/mptcp/options.c | 3 +-
net/mptcp/pm.c | 12 ++
net/mptcp/pm_netlink.c | 65 ++++++---
net/mptcp/pm_userspace.c | 18 +++
net/mptcp/protocol.h | 3 +
net/mptcp/subflow.c | 3 +
net/netfilter/nf_tables_api.c | 154 ++-------------------
net/sctp/input.c | 19 +--
net/smc/smc_stats.h | 2 +-
net/sunrpc/sched.c | 4 +-
net/unix/af_unix.c | 34 ++---
net/wireless/nl80211.c | 37 +++--
sound/pci/hda/patch_hdmi.c | 2 +
sound/pci/hda/patch_realtek.c | 1 +
sound/soc/amd/yc/acp6x-mach.c | 7 +
sound/soc/codecs/wcd938x-sdw.c | 4 +-
sound/soc/codecs/wsa881x.c | 2 +-
sound/soc/codecs/wsa883x.c | 10 +-
sound/soc/codecs/wsa884x.c | 10 +-
sound/soc/meson/axg-fifo.c | 26 ++--
sound/soc/sof/mediatek/mt8195/mt8195.c | 2 +-
sound/soc/sti/sti_uniperif.c | 2 +-
sound/soc/sti/uniperif.h | 1 +
sound/soc/sti/uniperif_player.c | 1 +
sound/soc/sti/uniperif_reader.c | 1 +
sound/usb/line6/driver.c | 5 +
sound/usb/quirks-table.h | 4 +
tools/arch/arm64/include/asm/cputype.h | 6 +
.../testing/selftests/bpf/prog_tests/send_signal.c | 3 +-
tools/testing/selftests/mm/Makefile | 2 +-
tools/testing/selftests/net/mptcp/mptcp_join.sh | 57 ++++++--
tools/testing/selftests/net/mptcp/simult_flows.sh | 6 +-
tools/testing/selftests/rcutorture/bin/torture.sh | 2 +-
192 files changed, 1600 insertions(+), 810 deletions(-)
1 year, 4 months
- 10
- 198
[PATCH] iio: imu: inv_mpu6050: fix interrupt status read for old buggy chips
by inv.git-commit＠tdk.com
From: Jean-Baptiste Maneyrol <jean-baptiste.maneyrol(a)tdk.com>
Interrupt status read seems to be broken on some old MPU-6050 like
chips. Fix by reverting to previous driver behavior bypassing interrupt
status read. This is working because these chips are not supporting
WoM and data ready is the only interrupt source.
Fixes: 5537f653d9be ("iio: imu: inv_mpu6050: add new interrupt handler for WoM events")
Cc: stable(a)vger.kernel.org
Signed-off-by: Jean-Baptiste Maneyrol <jean-baptiste.maneyrol(a)tdk.com>
---
drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
index 84273660ca2e..3bfeabab0ec4 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
@@ -248,12 +248,20 @@ static irqreturn_t inv_mpu6050_interrupt_handle(int irq, void *p)
int result;
switch (st->chip_type) {
+ case INV_MPU6000:
case INV_MPU6050:
+ case INV_MPU9150:
+ /*
+ * WoM is not supported and interrupt status read seems to be broken for
+ * some chips. Since data ready is the only interrupt, bypass interrupt
+ * status read and always assert data ready bit.
+ */
+ wom_bits = 0;
+ int_status = INV_MPU6050_BIT_RAW_DATA_RDY_INT;
+ goto data_ready_interrupt;
case INV_MPU6500:
case INV_MPU6515:
case INV_MPU6880:
- case INV_MPU6000:
- case INV_MPU9150:
case INV_MPU9250:
case INV_MPU9255:
wom_bits = INV_MPU6500_BIT_WOM_INT;
@@ -279,6 +287,7 @@ static irqreturn_t inv_mpu6050_interrupt_handle(int irq, void *p)
}
}
+data_ready_interrupt:
/* handle raw data interrupt */
if (int_status & INV_MPU6050_BIT_RAW_DATA_RDY_INT) {
indio_dev->pollfunc->timestamp = st->it_timestamp;
--
2.34.1
1 year, 4 months
- 3
- 2
[PATCH 5.15 000/483] 5.15.165-rc2 review
by Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.165 release.
There are 483 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Sun, 18 Aug 2024 10:14:00 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.165-r…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 5.15.165-rc2
Niklas Cassel <cassel(a)kernel.org>
Revert "ata: libata-scsi: Honor the D_SENSE bit for CK_COND=1 and no error"
Sean Young <sean(a)mess.org>
media: Revert "media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()"
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix phy-mode
Eric Dumazet <edumazet(a)google.com>
wifi: cfg80211: restrict NL80211_ATTR_TXQ_QUANTUM values
Kees Cook <kees(a)kernel.org>
binfmt_flat: Fix corruption when not offsetting data start
Chris Wulff <crwulff(a)gmail.com>
usb: gadget: u_audio: Check return codes from usb_ep_enable and config_ep_by_speed.
WangYuli <wangyuli(a)uniontech.com>
nvme/pci: Add APST quirk for Lenovo N60z laptop
Kees Cook <kees(a)kernel.org>
exec: Fix ToCToU between perm check and set-uid/gid usage
Amit Daniel Kachhap <amit.kachhap(a)arm.com>
arm64: cpufeature: Fix the visibility of compat hwcaps
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: msm8996: correct #clock-cells for QMP PHY nodes
Mahesh Salgaonkar <mahesh(a)linux.ibm.com>
powerpc: Avoid nmi_enter/nmi_exit in real mode interrupt.
Andi Shyti <andi.shyti(a)linux.intel.com>
drm/i915/gem: Fix Virtual Memory mapping boundaries calculation
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: fully established after ADD_ADDR echo on MPJ
Johannes Berg <johannes.berg(a)intel.com>
wifi: mac80211: check basic rates validity
Jisheng Zhang <jszhang(a)kernel.org>
PCI: dwc: Restore MSI Receiver mask during resume
Shenwei Wang <shenwei.wang(a)nxp.com>
net: stmmac: Enable mac_managed_pm phylink config
Florian Westphal <fw(a)strlen.de>
netfilter: nf_tables: prefer nft_chain_validate
Florian Westphal <fw(a)strlen.de>
netfilter: nf_tables: allow clone callbacks to sleep
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: nf_tables: bail out if stateful expression provides no .clone
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: nf_tables: use timestamp to check for set element timeout
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: nf_tables: set element extended ACK reporting support
Jakub Kicinski <kuba(a)kernel.org>
tls: fix race between tx work scheduling and socket close
Lukas Wunner <lukas(a)wunner.de>
PCI/DPC: Fix use-after-free on concurrent DPC and hot-removal
Filipe Manana <fdmanana(a)suse.com>
btrfs: fix double inode unlock for direct IO sync writes
Christoph Hellwig <hch(a)lst.de>
xfs: fix log recovery buffer allocation for the legacy h_size fixup
Filipe Manana <fdmanana(a)suse.com>
btrfs: fix corruption after buffer fault in during direct IO append write
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
selftests: mptcp: join: check backup support in signal endp
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
selftests: mptcp: join: validate backup in MPJ
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: pm: fix backup support in signal endpoints
Geliang Tang <geliang.tang(a)suse.com>
mptcp: export local_address
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: pm: only set request_bkup flag when sending MP_PRIO
Paolo Abeni <pabeni(a)redhat.com>
mptcp: fix bad RCVPRUNED mib accounting
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: mib: count MPJ with backup flag
Paolo Abeni <pabeni(a)redhat.com>
mptcp: fix NL PM announced address accounting
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: distinguish rcv vs sent backup flag in requests
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: sched: check both directions for backup
Thomas Zimmermann <tzimmermann(a)suse.de>
drm/mgag200: Set DDC timeout in milliseconds
Lucas Stach <l.stach(a)pengutronix.de>
drm/bridge: analogix_dp: properly handle zero sized AUX transactions
Yang Yingliang <yangyingliang(a)huawei.com>
sched/smt: Fix unbalance sched_smt_present dec/inc
Yang Yingliang <yangyingliang(a)huawei.com>
sched/smt: Introduce sched_smt_present_inc/dec() helper
Andi Kleen <ak(a)linux.intel.com>
x86/mtrr: Check if fixed MTRRs exist before saving them
Waiman Long <longman(a)redhat.com>
padata: Fix possible divide-by-0 panic in padata_mt_helper()
Tze-nan Wu <Tze-nan.Wu(a)mediatek.com>
tracing: Fix overflow in get_free_elt()
Hans de Goede <hdegoede(a)redhat.com>
power: supply: axp288_charger: Round constant_charge_voltage writes down
Hans de Goede <hdegoede(a)redhat.com>
power: supply: axp288_charger: Fix constant_charge_voltage writes
Shay Drory <shayd(a)nvidia.com>
genirq/irqdesc: Honor caller provided affinity in alloc_desc()
Radhey Shyam Pandey <radhey.shyam.pandey(a)amd.com>
irqchip/xilinx: Fix shift out of bounds
Andrey Konovalov <andreyknvl(a)gmail.com>
kcov: properly check for softirq context
George Kennedy <george.kennedy(a)oracle.com>
serial: core: check uartclk for zero to avoid divide by zero
Thomas Gleixner <tglx(a)linutronix.de>
timekeeping: Fix bogus clock_was_set() invocation in do_adjtimex()
Justin Stitt <justinstitt(a)google.com>
ntp: Safeguard against time_constant overflow
Dan Williams <dan.j.williams(a)intel.com>
driver core: Fix uevent_show() vs driver detach race
Arseniy Krasnov <avkrasnov(a)salutedevices.com>
irqchip/meson-gpio: Convert meson_gpio_irq_controller::lock to 'raw_spinlock_t'
Qianggui Song <qianggui.song(a)amlogic.com>
irqchip/meson-gpio: support more than 8 channels gpio irq
Paul E. McKenney <paulmck(a)kernel.org>
clocksource: Fix brown-bag boolean thinko in cs_watchdog_read()
Feng Tang <feng.tang(a)intel.com>
clocksource: Scale the watchdog read retries automatically
Paul E. McKenney <paulmck(a)kernel.org>
torture: Enable clocksource watchdog with "tsc=watchdog"
Waiman Long <longman(a)redhat.com>
clocksource: Reduce the default clocksource_watchdog() retries to 2
Justin Stitt <justinstitt(a)google.com>
ntp: Clamp maxerror and esterror to operating range
Jason Wang <jasowang(a)redhat.com>
vhost-vdpa: switch to use vmf_insert_pfn() in the fault handler
Thomas Gleixner <tglx(a)linutronix.de>
tick/broadcast: Move per CPU pointer access into the atomic section
Vamshi Gajjela <vamshigajjela(a)google.com>
scsi: ufs: core: Fix hba->last_dme_cmd_tstamp timestamp updating logic
Damien Le Moal <dlemoal(a)kernel.org>
scsi: mpi3mr: Avoid IOMMU page faults on REPORT ZONES
Prashanth K <quic_prashk(a)quicinc.com>
usb: gadget: u_serial: Set start_delayed during suspend
Chris Wulff <crwulff(a)gmail.com>
usb: gadget: core: Check for unset descriptor
Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com>
USB: serial: debug: do not echo input by default
Oliver Neukum <oneukum(a)suse.com>
usb: vhci-hcd: Do not drop references before new references are gained
Takashi Iwai <tiwai(a)suse.de>
ALSA: hda/hdmi: Yet more pin fix for HP EliteDesk 800 G4
Steven 'Steve' Kendall <skend(a)chromium.org>
ALSA: hda: Add HP MP9 G4 Retail System AMS to force connect list
Takashi Iwai <tiwai(a)suse.de>
ALSA: line6: Fix racy access to midibuf
Ma Ke <make24(a)iscas.ac.cn>
drm/client: fix null pointer dereference in drm_client_modeset_probe
Jerome Brunet <jbrunet(a)baylibre.com>
ASoC: meson: axg-fifo: fix irq scheduling issue with PREEMPT_RT
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Re-add ScratchAmp quirk entries
Stefan Wahren <wahrenst(a)gmx.net>
spi: spi-fsl-lpspi: Fix scldiv calculation
Masami Hiramatsu (Google) <mhiramat(a)kernel.org>
kprobes: Fix to check symbol prefixes correctly
Menglong Dong <menglong8.dong(a)gmail.com>
bpf: kprobe: remove unused declaring of bpf_kprobe_override
Guenter Roeck <linux(a)roeck-us.net>
i2c: smbus: Send alert notifications to all devices if source not found
Geert Uytterhoeven <geert+renesas(a)glider.be>
spi: spidev: Add missing spi_device_id for bh2228fv
Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>
ASoC: codecs: wsa881x: Correct Soundwire ports mask
Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>
ASoC: codecs: wcd938x-sdw: Correct Soundwire ports mask
Guenter Roeck <linux(a)roeck-us.net>
i2c: smbus: Improve handling of stuck alerts
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Expand speculative SSBS workaround (again)
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-A725 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X1C definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Expand speculative SSBS workaround
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Unify speculative SSBS errata logic
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X925 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-A720 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X3 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Add workaround for Arm errata 3194386 and 3312417
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Neoverse-V3 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X4 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: barrier: Restore spec_bar() macro
Besar Wicaksono <bwicaksono(a)nvidia.com>
arm64: Add Neoverse-V2 part
James Morse <james.morse(a)arm.com>
arm64: cpufeature: Force HWCAP to be based on the sysreg visible to user-space
Kemeng Shi <shikemeng(a)huaweicloud.com>
ext4: fix wrong unit use in ext4_mb_find_by_goal
Zheng Zucheng <zhengzucheng(a)huawei.com>
sched/cputime: Fix mul_u64_u64_div_u64() precision for cputime
Damien Le Moal <dlemoal(a)kernel.org>
scsi: mpt3sas: Avoid IOMMU page faults on REPORT ZONES
Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp>
profiling: remove profile=sleep support
Benjamin Coddington <bcodding(a)redhat.com>
SUNRPC: Fix a race to wake a sync task
Peter Oberparleiter <oberpar(a)linux.ibm.com>
s390/sclp: Prevent release of buffer in I/O
Kemeng Shi <shikemeng(a)huaweicloud.com>
jbd2: avoid memleak in jbd2_journal_write_metadata_buffer
Xiaxi Shen <shenxiaxi26(a)gmail.com>
ext4: fix uninitialized variable in ext4_inlinedir_to_tree
Michal Pecio <michal.pecio(a)gmail.com>
media: uvcvideo: Fix the bandwdith quirk on USB 3.x
Ricardo Ribalda <ribalda(a)chromium.org>
media: uvcvideo: Ignore empty TS packets
Alex Hung <alex.hung(a)amd.com>
drm/amd/display: Add null checker before passing variables
Ma Jun <Jun.Ma2(a)amd.com>
drm/amdgpu/pm: Fix the null pointer dereference in apply_state_adjust_rules
Ma Jun <Jun.Ma2(a)amd.com>
drm/amdgpu: Fix the null pointer dereference to ras_manager
Ma Jun <Jun.Ma2(a)amd.com>
drm/amdgpu/pm: Fix the null pointer dereference for smu7
Filipe Manana <fdmanana(a)suse.com>
btrfs: fix bitmap leak when loading free space cache on duplicate entry
Johannes Berg <johannes.berg(a)intel.com>
wifi: nl80211: don't give key data to userspace
Roman Smirnov <r.smirnov(a)omp.ru>
udf: prevent integer overflow in udf_bitmap_free_blocks()
FUJITA Tomonori <fujita.tomonori(a)gmail.com>
PCI: Add Edimax Vendor ID to pci_ids.h
Yonghong Song <yonghong.song(a)linux.dev>
selftests/bpf: Fix send_signal test with nested CONFIG_PARAVIRT
Thomas Weißschuh <linux(a)weissschuh.net>
ACPI: SBS: manage alarm sysfs attribute through psy core
Thomas Weißschuh <linux(a)weissschuh.net>
ACPI: battery: create alarm sysfs attribute atomically
Niklas Söderlund <niklas.soderlund+renesas(a)ragnatech.se>
clocksource/drivers/sh_cmt: Address race condition for clock events
Yu Kuai <yukuai3(a)huawei.com>
md/raid5: avoid BUG_ON() while continue reshape after reassembling
Li Nan <linan122(a)huawei.com>
md: do not delete safemode_timer in mddev_suspend
Paul E. McKenney <paulmck(a)kernel.org>
rcutorture: Fix rcu_torture_fwd_cb_cr() data race
Csókás, Bence <csokas.bence(a)prolan.hu>
net: fec: Stop PPS on driver remove
James Chapman <jchapman(a)katalix.com>
l2tp: fix lockdep splat
Joe Hattori <joe(a)pf.is.s.u-tokyo.ac.jp>
net: dsa: bcm_sf2: Fix a possible memory leak in bcm_sf2_mdio_register()
Dmitry Antipov <dmantipov(a)yandex.ru>
Bluetooth: l2cap: always unlock channel in l2cap_conless_channel()
Eric Dumazet <edumazet(a)google.com>
net: linkwatch: use system_unbound_wq
Nikolay Aleksandrov <razor(a)blackwall.org>
net: bridge: mcast: wait for previous gc cycles when removing port
Daniele Palmas <dnlplm(a)gmail.com>
net: usb: qmi_wwan: fix memory leak for not ip packets
Kuniyuki Iwashima <kuniyu(a)amazon.com>
sctp: Fix null-ptr-deref in reuseport_add_sock().
Xin Long <lucien.xin(a)gmail.com>
sctp: move hlist_node and hashent out of sctp_ep_common
Peter Zijlstra <peterz(a)infradead.org>
x86/mm: Fix pti_clone_entry_text() for i386
Peter Zijlstra <peterz(a)infradead.org>
x86/mm: Fix pti_clone_pgtable() alignment assumption
Yipeng Zou <zouyipeng(a)huawei.com>
irqchip/mbigen: Fix mbigen node address layout
Marc Zyngier <maz(a)kernel.org>
genirq: Allow irq_chip registration functions to take a const irq_chip
Alexander Maltsev <keltar.gw(a)gmail.com>
netfilter: ipset: Add list flush to cancel_gc
Paolo Abeni <pabeni(a)redhat.com>
mptcp: fix duplicate data handling
Heiner Kallweit <hkallweit1(a)gmail.com>
r8169: don't increment tx_dropped in case of NETDEV_TX_BUSY
Ma Ke <make24(a)iscas.ac.cn>
net: usb: sr9700: fix uninitialized variable use in sr_mdio_read
Zack Rusin <zack.rusin(a)broadcom.com>
drm/vmwgfx: Fix a deadlock in dma buf fence polling
Edmund Raile <edmund.raile(a)protonmail.com>
Revert "ALSA: firewire-lib: operate for period elapse event in process context"
Edmund Raile <edmund.raile(a)protonmail.com>
Revert "ALSA: firewire-lib: obsolete workqueue for period update"
Mavroudis Chatzilazaridis <mavchatz(a)protonmail.com>
ALSA: hda/realtek: Add quirk for Acer Aspire E5-574G
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Correct surround channels in UAC1 channel map
Al Viro <viro(a)zeniv.linux.org.uk>
protect the fetch of ->fd[fd] in do_dup2() from mispredictions
Tatsunosuke Tobita <tatsunosuke.tobita(a)wacom.com>
HID: wacom: Modify pen IDs
Patryk Duda <patrykd(a)google.com>
platform/chrome: cros_ec_proto: Lock device when updating MKBP version
Justin Stitt <justinstitt(a)google.com>
power: supply: bq24190_charger: replace deprecated strncpy with strscpy
Zhe Qiao <qiaozhe(a)iscas.ac.cn>
riscv/mm: Add handling for VM_FAULT_SIGSEGV in mm_fault_error()
Maciej Żenczykowski <maze(a)google.com>
ipv6: fix ndisc_is_useropt() handling for PIO
Shahar Shitrit <shshitrit(a)nvidia.com>
net/mlx5e: Add a check for the return value from mlx5_port_set_eth_ptys
Kuniyuki Iwashima <kuniyu(a)amazon.com>
netfilter: iptables: Fix potential null-ptr-deref in ip6table_nat_table_init().
Kuniyuki Iwashima <kuniyu(a)amazon.com>
netfilter: iptables: Fix null-ptr-deref in iptable_nat_table_init().
Dan Carpenter <dan.carpenter(a)linaro.org>
net: mvpp2: Don't re-use loop iterator
Alexandra Winter <wintera(a)linux.ibm.com>
net/iucv: fix use after free in iucv_sock_close()
Kuniyuki Iwashima <kuniyu(a)amazon.com>
rtnetlink: Don't ignore IFLA_TARGET_NETNSID when ifname is specified in rtnl_dellink().
Florent Fourcot <florent.fourcot(a)wifirst.fr>
rtnetlink: enable alt_ifname for setlink/newlink
songxiebing <songxiebing(a)kylinos.cn>
ALSA: hda: conexant: Fix headset auto detect fail in the polling mode
Eric Dumazet <edumazet(a)google.com>
sched: act_ct: take care of padding in struct zones_ht_key
Ian Forbes <ian.forbes(a)broadcom.com>
drm/vmwgfx: Fix overlay when using Screen Targets
Danilo Krummrich <dakr(a)kernel.org>
drm/nouveau: prime: fix refcount underflow
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
MIPS: dts: loongson: Fix ls2k1000-rtc interrupt
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
MIPS: dts: loongson: Fix liointc IRQ polarity
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
MIPS: Loongson64: DTS: Fix PCIe port nodes for ls7a
Binbin Zhou <zhoubinbin(a)loongson.cn>
MIPS: Loongson64: DTS: Add RTC support to Loongson-2K1000
Aleksandr Mishin <amishin(a)t-argos.ru>
remoteproc: imx_rproc: Fix refcount mistake in imx_rproc_addr_init
Wayne Lin <Wayne.Lin(a)amd.com>
drm/dp_mst: Fix all mstb marked as not probed after suspend/resume
Shenwei Wang <shenwei.wang(a)nxp.com>
irqchip/imx-irqsteer: Handle runtime power management correctly
Lucas Stach <l.stach(a)pengutronix.de>
irqchip/imx-irqsteer: Add runtime PM support
Lucas Stach <l.stach(a)pengutronix.de>
irqchip/imx-irqsteer: Constify irq_chip struct
Marc Zyngier <maz(a)kernel.org>
genirq: Allow the PM device to originate from irq domain
Herve Codina <herve.codina(a)bootlin.com>
irqdomain: Fixed unbalanced fwnode get and put
Thomas Weißschuh <linux(a)weissschuh.net>
leds: triggers: Flush pending brightness before activating trigger
Hans de Goede <hdegoede(a)redhat.com>
leds: trigger: Call synchronize_rcu() before calling trig->activate()
Heiner Kallweit <hkallweit1(a)gmail.com>
leds: trigger: Store brightness set by led_trigger_event()
Heiner Kallweit <hkallweit1(a)gmail.com>
leds: trigger: Remove unused function led_trigger_rename_static()
Johannes Berg <johannes.berg(a)intel.com>
leds: trigger: use RCU to protect the led_cdevs list
Jay Buddhabhatti <jay.buddhabhatti(a)amd.com>
drivers: soc: xilinx: check return status of get_api_version()
Michael Tretter <m.tretter(a)pengutronix.de>
soc: xilinx: move PM_INIT_FINALIZE to zynqmp_pm_domains driver
Zhang Yi <yi.zhang(a)huawei.com>
ext4: check the extent status again before inserting delalloc block
Zhang Yi <yi.zhang(a)huawei.com>
ext4: factor out a common helper to query extent map
Zhang Yi <yi.zhang(a)huawei.com>
ext4: convert to exclusive lock while inserting delalloc extents
Zhang Yi <yi.zhang(a)huawei.com>
ext4: refactor ext4_da_map_blocks()
Baokun Li <libaokun1(a)huawei.com>
ext4: make ext4_es_insert_extent() return void
Thomas Weißschuh <linux(a)weissschuh.net>
sysctl: always initialize i_uid/i_gid
Krishna Kurapati <quic_kriskura(a)quicinc.com>
arm64: dts: qcom: ipq8074: Disable SS instance in Parkmode for USB
Krishna Kurapati <quic_kriskura(a)quicinc.com>
arm64: dts: qcom: msm8998: Disable SS instance in Parkmode for USB
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: msm8998: switch USB QMP PHY to new style of bindings
Johan Hovold <johan+linaro(a)kernel.org>
arm64: dts: qcom: msm8998: drop USB PHY clock index
Shawn Guo <shawn.guo(a)linaro.org>
arm64: dts: qcom: msm8996: Move '#clock-cells' to QMP PHY child node
Esben Haabendal <esben(a)geanix.com>
powerpc/configs: Update defconfig with now user-visible CONFIG_FSL_IFC
Seth Forshee (DigitalOcean) <sforshee(a)kernel.org>
fs: don't allow non-init s_user_ns for filesystems without FS_USERNS_MOUNT
Leon Romanovsky <leon(a)kernel.org>
nvme-pci: add missing condition check for existence of mapped data
Jens Axboe <axboe(a)kernel.dk>
nvme: separate command prep and issue
Jens Axboe <axboe(a)kernel.dk>
nvme: split command copy into a helper
Artem Chernyshev <artem.chernyshev(a)red-soft.ru>
iommu: sprd: Avoid NULL deref in sprd_iommu_hw_en
Gerd Bayer <gbayer(a)linux.ibm.com>
s390/pci: Allow allocation of more than 1 MSI interrupt
Gerd Bayer <gbayer(a)linux.ibm.com>
s390/pci: Refactor arch_setup_msi_irqs()
Thomas Gleixner <tglx(a)linutronix.de>
s390/pci: Rework MSI descriptor walk
ethanwu <ethanwu(a)synology.com>
ceph: fix incorrect kmalloc size of pagevec mempool
Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>
ASoC: Intel: use soc_intel_is_byt_cr() only when IOSF_MBI is reachable
Conor Dooley <conor.dooley(a)microchip.com>
spi: spidev: add correct compatible for Rohm BH2228FV
Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>
spi: spidev: order compatibles alphabetically
Vincent Tremblay <vincent(a)vtremblay.dev>
spidev: Add Silicon Labs EM3581 device compatible
Andy Shevchenko <andriy.shevchenko(a)linux.intel.com>
spi: spidev: Replace OF specific code by device property API
Andy Shevchenko <andriy.shevchenko(a)linux.intel.com>
spi: spidev: Replace ACPI specific code by device_get_match_data()
Javier Martinez Canillas <javierm(a)redhat.com>
spi: spidev: Make probe to fail early if a spidev compatible is used
Al Viro <viro(a)zeniv.linux.org.uk>
lirc: rc_dev_get_from_fd(): fix file leak
Al Viro <viro(a)zeniv.linux.org.uk>
powerpc: fix a file leak in kvm_vcpu_ioctl_enable_cap()
Xiao Liang <shaw.leon(a)gmail.com>
apparmor: Fix null pointer deref when receiving skb during sock creation
Dan Carpenter <dan.carpenter(a)linaro.org>
mISDN: Fix a use after free in hfcmulti_tx()
Fred Li <dracodingfly(a)gmail.com>
bpf: Fix a segment issue when downgrading gso_size
Petr Machata <petrm(a)nvidia.com>
net: nexthop: Initialize all fields in dumped nexthops
Simon Horman <horms(a)kernel.org>
net: stmmac: Correct byte order of perfect_match
Shigeru Yoshida <syoshida(a)redhat.com>
tipc: Return non-zero value from tipc_udp_addr2str() on error
Florian Westphal <fw(a)strlen.de>
netfilter: nft_set_pipapo_avx2: disable softinterrupts
Johannes Berg <johannes.berg(a)intel.com>
net: bonding: correctly annotate RCU in bond_should_notify_peers()
Ido Schimmel <idosch(a)nvidia.com>
ipv4: Fix incorrect source address in Record Route option
Gregory CLEMENT <gregory.clement(a)bootlin.com>
MIPS: SMP-CPS: Fix address for GCR_ACCESS register for CM3 and later
Hou Tao <houtao1(a)huawei.com>
bpf, events: Use prog to emit ksymbol event for main program
Lance Richardson <rlance(a)google.com>
dma: fix call order in dmam_free_coherent
Andrii Nakryiko <andrii(a)kernel.org>
libbpf: Fix no-args func prototype BTF dumping syntax
Johannes Berg <johannes.berg(a)intel.com>
um: time-travel: fix signal blocking race/hang
Johannes Berg <johannes.berg(a)intel.com>
um: time-travel: fix time-travel-start option
Ma Ke <make24(a)iscas.ac.cn>
phy: cadence-torrent: Check return value on register read
Vignesh Raghavendra <vigneshr(a)ti.com>
dmaengine: ti: k3-udma: Fix BCHAN count with UHC and HC channels
Jeongjun Park <aha310510(a)gmail.com>
jfs: Fix array-index-out-of-bounds in diFree
Douglas Anderson <dianders(a)chromium.org>
kdb: Use the passed prompt in kdb_position_cursor()
Arnd Bergmann <arnd(a)arndb.de>
kdb: address -Wformat-security warnings
Pavel Begunkov <asml.silence(a)gmail.com>
kernel: rerun task_work while freezing in get_signal()
Pavel Begunkov <asml.silence(a)gmail.com>
io_uring/io-wq: limit retrying worker initialisation
Ryusuke Konishi <konishi.ryusuke(a)gmail.com>
nilfs2: handle inconsistent state in nilfs_btnode_create_block()
WangYuli <wangyuli(a)uniontech.com>
Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x13d3:0x3591
Hilda Wu <hildawu(a)realtek.com>
Bluetooth: btusb: Add RTL8852BE device 0489:e125 to device tables
Ilya Dryomov <idryomov(a)gmail.com>
rbd: don't assume RBD_LOCK_STATE_LOCKED for exclusive mappings
Ilya Dryomov <idryomov(a)gmail.com>
rbd: rename RBD_LOCK_STATE_RELEASING and releasing_wait
Dragan Simic <dsimic(a)manjaro.org>
drm/panfrost: Mark simple_ondemand governor as softdep
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
MIPS: Loongson64: Test register availability before use
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
MIPS: Loongson64: reset: Prioritise firmware service
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
MIPS: Loongson64: Remove memory node for builtin-dtb
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
MIPS: Loongson64: env: Hook up Loongsson-2K
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
MIPS: dts: loongson: Fix GMAC phy node
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
MIPS: ip30: ip30-console: Add missing include
Aleksandr Mishin <amishin(a)t-argos.ru>
remoteproc: imx_rproc: Skip over memory region when node value is NULL
Gwenael Treuveur <gwenael.treuveur(a)foss.st.com>
remoteproc: stm32_rproc: Fix mailbox interrupts queuing
Ilya Dryomov <idryomov(a)gmail.com>
rbd: don't assume rbd_is_lock_owner() for exclusive mappings
Michael Ellerman <mpe(a)ellerman.id.au>
selftests/sigaltstack: Fix ppc64 GCC build
Bart Van Assche <bvanassche(a)acm.org>
RDMA/iwcm: Fix a use-after-free related to destroying CM IDs
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
platform: mips: cpu_hwmon: Disable driver on unsupported hardware
Thomas Gleixner <tglx(a)linutronix.de>
watchdog/perf: properly initialize the turbo mode timestamp and rearm counter
Joy Chakraborty <joychakr(a)google.com>
rtc: isl1208: Fix return value of nvmem callbacks
Imre Deak <imre.deak(a)intel.com>
drm/i915/dp: Reset intel_dp->link_trained before retraining the link
Alex Deucher <alexander.deucher(a)amd.com>
drm/amdgpu/sdma5.2: Update wptr registers as well as doorbell
Nitin Gote <nitin.r.gote(a)intel.com>
drm/i915/gt: Do not consider preemption during execlists_dequeue for gen8
Adrian Hunter <adrian.hunter(a)intel.com>
perf/x86/intel/pt: Fix a topa_entry base address calculation
Marco Cavenati <cavenati.marco(a)gmail.com>
perf/x86/intel/pt: Fix topa_entry base length
Kan Liang <kan.liang(a)linux.intel.com>
perf/x86/intel/uncore: Fix the bits of the CHA extended umask for SPR
Frederic Weisbecker <frederic(a)kernel.org>
perf: Fix event leak upon exec and file release
Frederic Weisbecker <frederic(a)kernel.org>
perf: Fix event leak upon exit
Nilesh Javali <njavali(a)marvell.com>
scsi: qla2xxx: validate nvme_local_port correctly
Shreyas Deodhar <sdeodhar(a)marvell.com>
scsi: qla2xxx: Complete command early within lock
Quinn Tran <qutran(a)marvell.com>
scsi: qla2xxx: Fix flash read failure
Quinn Tran <qutran(a)marvell.com>
scsi: qla2xxx: Use QP lock to search for bsg
Shreyas Deodhar <sdeodhar(a)marvell.com>
scsi: qla2xxx: Fix for possible memory corruption
Quinn Tran <qutran(a)marvell.com>
scsi: qla2xxx: Unable to act on RSCN for port online
Manish Rangankar <mrangankar(a)marvell.com>
scsi: qla2xxx: During vport delete send async logout explicitly
Joy Chakraborty <joychakr(a)google.com>
rtc: cmos: Fix return value of nvmem callbacks
Tvrtko Ursulin <tvrtko.ursulin(a)igalia.com>
mm/numa_balancing: teach mpol_to_str about the balancing mode
Zijun Hu <quic_zijuhu(a)quicinc.com>
devres: Fix memory leakage caused by driver API devm_free_percpu()
Zijun Hu <quic_zijuhu(a)quicinc.com>
devres: Fix devm_krealloc() wasting memory
Bailey Forrest <bcf(a)google.com>
gve: Fix an edge case for TSO skb validity check
Zijun Hu <quic_zijuhu(a)quicinc.com>
kobject_uevent: Fix OOB access within zap_modalias_env()
Nathan Chancellor <nathan(a)kernel.org>
kbuild: Fix '-S -c' in x86 stack protector scripts
Ross Lagerwall <ross.lagerwall(a)citrix.com>
decompress_bunzip2: fix rare decompression failure
Fedor Pchelkin <pchelkin(a)ispras.ru>
ubi: eba: properly rollback inside self_check_eba
Bastien Curutchet <bastien.curutchet(a)bootlin.com>
clk: davinci: da8xx-cfgchip: Initialize clk_init_data before use
Saurav Kashyap <skashyap(a)marvell.com>
scsi: qla2xxx: Return ENOBUFS if sg_cnt is more than one for ELS cmds
Huacai Chen <chenhuacai(a)kernel.org>
fs/ntfs3: Update log->page_{mask,bits} if log->page_size changed
tuhaowen <tuhaowen(a)uniontech.com>
dev/parport: fix the array out-of-bounds risk
Carlos Llamas <cmllamas(a)google.com>
binder: fix hang of unregistered readers
Manivannan Sadhasivam <mani(a)kernel.org>
PCI: rockchip: Use GPIOD_OUT_LOW flag while requesting ep_gpio
Niklas Cassel <cassel(a)kernel.org>
PCI: dw-rockchip: Fix initial PERST# GPIO value
Wei Liu <wei.liu(a)kernel.org>
PCI: hv: Return zero, not garbage, when reading PCI_INTERRUPT_PIN
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
hwrng: amd - Convert PCIBIOS_* return codes to errnos
Alan Stern <stern(a)rowland.harvard.edu>
tools/memory-model: Fix bug in lock.cat
wangdicheng <wangdicheng(a)kylinos.cn>
ALSA: usb-audio: Add a quirk for Sonix HD USB Camera
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Move HD Webcam quirk to the right place
wangdicheng <wangdicheng(a)kylinos.cn>
ALSA: usb-audio: Fix microphone sound on HD webcam.
Sean Christopherson <seanjc(a)google.com>
KVM: VMX: Split out the non-virtualization part of vmx_interrupt_blocked()
Ricardo Ribalda <ribalda(a)chromium.org>
media: uvcvideo: Fix integer overflow calculating timestamp
Jan Kara <jack(a)suse.cz>
jbd2: make jbd2_journal_get_max_txn_bufs() internal
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
leds: ss4200: Convert PCIBIOS_* return codes to errnos
Rafael Beims <rafael.beims(a)toradex.com>
wifi: mwifiex: Fix interface type change
Mickaël Salaün <mic(a)digikod.net>
selftests/landlock: Add cred_transfer test
Pavel Begunkov <asml.silence(a)gmail.com>
io_uring: tighten task exit cancellations
Baokun Li <libaokun1(a)huawei.com>
ext4: make sure the first directory block is not a hole
Baokun Li <libaokun1(a)huawei.com>
ext4: check dot and dotdot of dx_root before making dir indexed
Paolo Pisati <p.pisati(a)gmail.com>
m68k: amiga: Turn off Warp1260 interrupts during boot
Jan Kara <jack(a)suse.cz>
udf: Avoid using corrupted block bitmap buffer
Frederic Weisbecker <frederic(a)kernel.org>
task_work: Introduce task_work_cancel() again
Frederic Weisbecker <frederic(a)kernel.org>
task_work: s/task_work_cancel()/task_work_cancel_func()/
Fedor Pchelkin <pchelkin(a)ispras.ru>
apparmor: use kvfree_sensitive to free data->data
Pierre Gondois <pierre.gondois(a)arm.com>
sched/fair: Use all little CPUs for CPU-bound workloads
Sung Joon Kim <sungjoon.kim(a)amd.com>
drm/amd/display: Check for NULL pointer
Shreyas Deodhar <sdeodhar(a)marvell.com>
scsi: qla2xxx: Fix optrom version displayed in FDMI
Ma Ke <make24(a)iscas.ac.cn>
drm/gma500: fix null pointer dereference in psb_intel_lvds_get_modes
Ma Ke <make24(a)iscas.ac.cn>
drm/gma500: fix null pointer dereference in cdv_intel_lvds_get_modes
Jan Kara <jack(a)suse.cz>
ext2: Verify bitmap and itable block numbers before using them
Chao Yu <chao(a)kernel.org>
hfs: fix to initialize fields of hfs_inode_info after hfs_alloc_inode()
Igor Pylypiv <ipylypiv(a)google.com>
ata: libata-scsi: Honor the D_SENSE bit for CK_COND=1 and no error
Dikshita Agarwal <quic_dikshita(a)quicinc.com>
media: venus: fix use after free in vdec_close
Joe Hattori <joe(a)pf.is.s.u-tokyo.ac.jp>
char: tpm: Fix possible memory leak in tpm_bios_measurements_open()
Eric Sandeen <sandeen(a)redhat.com>
fuse: verify {g,u}id mount options correctly
Tejun Heo <tj(a)kernel.org>
sched/fair: set_load_weight() must also call reweight_task() for SCHED_IDLE tasks
Nicolas Dichtel <nicolas.dichtel(a)6wind.com>
ipv6: take care of scope when choosing the src addr
Chengen Du <chengen.du(a)canonical.com>
af_packet: Handle outgoing VLAN packets without hardware offloading
Breno Leitao <leitao(a)debian.org>
net: netconsole: Disable target before netpoll cleanup
Yu Liao <liaoyu15(a)huawei.com>
tick/broadcast: Make takeover of broadcast hrtimer reliable
Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>
dt-bindings: thermal: correct thermal zone node name limit
Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp>
mm: mmap_lock: replace get_memcg_path_buf() with on-stack buffer
Miaohe Lin <linmiaohe(a)huawei.com>
mm/hugetlb: fix possible recursive locking detected warning
Jann Horn <jannh(a)google.com>
landlock: Don't lose track of restrictions on cred_transfer
Carlos López <clopez(a)suse.de>
s390/dasd: fix error checks in dasd_copy_pair_store()
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Missed error return
Csókás, Bence <csokas.bence(a)prolan.hu>
rtc: interface: Add RTC offset to alarm after fix-up
Ryusuke Konishi <konishi.ryusuke(a)gmail.com>
nilfs2: avoid undefined behavior in nilfs_cnt32_ge macro
David Hildenbrand <david(a)redhat.com>
fs/proc/task_mmu: indicate PM_FILE for PMD-mapped file THP
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Fix field-spanning write in INDEX_HDR
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Replace inode_trylock with inode_lock
Peng Fan <peng.fan(a)nxp.com>
pinctrl: freescale: mxs: Fix refcount of child
Yang Yingliang <yangyingliang(a)huawei.com>
pinctrl: ti: ti-iodelay: fix possible memory leak when pinctrl_enable() fails
Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de>
pinctrl: ti: ti-iodelay: Drop if block with always false condition
Yang Yingliang <yangyingliang(a)huawei.com>
pinctrl: single: fix possible memory leak when pinctrl_enable() fails
Yang Yingliang <yangyingliang(a)huawei.com>
pinctrl: core: fix possible memory leak when pinctrl_enable() fails
Dmitry Yashin <dmt.yashin(a)gmail.com>
pinctrl: rockchip: update rk3308 iomux routes
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Fix getting file type
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Missed NI_FLAG_UPDATE_PARENT setting
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Fix transform resident to nonresident for compressed files
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Merge synonym COMPRESSION_UNIT and NTFS_LZNT_CUNIT
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Use ALIGN kernel macro
Martin Willi <martin(a)strongswan.org>
net: dsa: b53: Limit chip-wide jumbo frame config to CPU ports
Martin Willi <martin(a)strongswan.org>
net: dsa: mv88e6xxx: Limit chip-wide frame size config to CPU ports
Florian Westphal <fw(a)strlen.de>
netfilter: nf_set_pipapo: fix initial map fill
Florian Westphal <fw(a)strlen.de>
netfilter: nft_set_pipapo: constify lookup fn args where possible
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: ctnetlink: use helper function to calculate expect ID
Jack Wang <jinpu.wang(a)ionos.com>
bnxt_re: Fix imm_data endianness
Chengchang Tang <tangchengchang(a)huawei.com>
RDMA/hns: Fix insufficient extend DB for VFs.
Chengchang Tang <tangchengchang(a)huawei.com>
RDMA/hns: Fix undifined behavior caused by invalid max_sge
Chengchang Tang <tangchengchang(a)huawei.com>
RDMA/hns: Fix missing pagesize and alignment check in FRMR
Nick Bowler <nbowler(a)draconx.ca>
macintosh/therm_windtunnel: fix module unload.
Michael Ellerman <mpe(a)ellerman.id.au>
powerpc/xmon: Fix disassembly CPU feature checks
Dominique Martinet <dominique.martinet(a)atmark-techno.com>
MIPS: Octeron: remove source file executable bit
Denis Arefev <arefev(a)swemel.ru>
net: missing check virtio
Michael S. Tsirkin <mst(a)redhat.com>
vhost/vsock: always initialize seqpacket_allow
Dan Carpenter <dan.carpenter(a)linaro.org>
PCI: endpoint: Clean up error handling in vpci_scan_bus()
Dmitry Torokhov <dmitry.torokhov(a)gmail.com>
Input: elan_i2c - do not leave interrupt disabled on suspend failure
Leon Romanovsky <leon(a)kernel.org>
RDMA/device: Return error earlier if port in not valid
Arnd Bergmann <arnd(a)arndb.de>
mtd: make mtd_test.c a separate module
Chen Ni <nichen(a)iscas.ac.cn>
ASoC: max98088: Check for clk_prepare_enable() error
Honggang LI <honggangli(a)163.com>
RDMA/rxe: Don't set BTH_ACK_MASK for UC or UD QPs
Leon Romanovsky <leon(a)kernel.org>
RDMA/mlx4: Fix truncated output warning in alias_GUID.c
Leon Romanovsky <leon(a)kernel.org>
RDMA/mlx4: Fix truncated output warning in mad.c
Andrei Lalaev <andrei.lalaev(a)anton-paar.com>
Input: qt1050 - handle CHIP_ID reading error
Leon Romanovsky <leon(a)kernel.org>
RDMA/cache: Release GID table even if leak is detected
Chiara Meiohas <cmeiohas(a)nvidia.com>
RDMA/mlx5: Set mkeys for dmabuf at PAGE_SIZE
James Clark <james.clark(a)arm.com>
coresight: Fix ref leak when of_coresight_parse_endpoint() fails
Taniya Das <quic_tdas(a)quicinc.com>
clk: qcom: gcc-sc7280: Update force mem core bit for UFS ICE clock
Konrad Dybcio <konrad.dybcio(a)linaro.org>
clk: qcom: branch: Add helper functions for setting retain bits
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
PCI: Fix resource double counting on remove & rescan
Benjamin Coddington <bcodding(a)redhat.com>
SUNRPC: Fixup gss_status tracepoint error output
Andreas Larsson <andreas(a)gaisler.com>
sparc64: Fix incorrect function signature and add prototype for prom_cif_init
Jan Kara <jack(a)suse.cz>
ext4: avoid writing unitialized memory to disk in EA inodes
Luis Henriques (SUSE) <luis.henriques(a)linux.dev>
ext4: don't track ranges in fast_commit if inode has inlined data
Ritesh Harjani <riteshh(a)linux.ibm.com>
ext4: return early for non-eligible fast_commit track events
Olga Kornievskaia <kolga(a)netapp.com>
NFSv4.1 another fix for EXCHGID4_FLAG_USE_PNFS_DS for DS server
NeilBrown <neilb(a)suse.de>
SUNRPC: avoid soft lockup when transmitting UDP to reachable server.
Chuck Lever <chuck.lever(a)oracle.com>
xprtrdma: Fix rpcrdma_reqs_reset()
Javier Carrasco <javier.carrasco.cruz(a)gmail.com>
mfd: omap-usb-tll: Use struct_size to allocate tll
Arnd Bergmann <arnd(a)arndb.de>
mfd: rsmu: Split core code into separate module
Adrian Hunter <adrian.hunter(a)intel.com>
perf intel-pt: Fix exclude_guest setting
Adrian Hunter <adrian.hunter(a)intel.com>
perf intel-pt: Fix aux_watermark calculation for 64-bit size
Dikshita Agarwal <quic_dikshita(a)quicinc.com>
media: venus: flush all buffers in output plane streamoff
Luis Henriques (SUSE) <luis.henriques(a)linux.dev>
ext4: fix infinite loop when replaying fast_commit
Luca Ceresoli <luca.ceresoli(a)bootlin.com>
Revert "leds: led-core: Fix refcount leak in of_led_get()"
Chen Ni <nichen(a)iscas.ac.cn>
drm/qxl: Add check for drm_cvt_mode
Lucas Stach <l.stach(a)pengutronix.de>
drm/etnaviv: fix DMA direction handling for cached RW buffers
Namhyung Kim <namhyung(a)kernel.org>
perf report: Fix condition in sort__sym_cmp()
Hans de Goede <hdegoede(a)redhat.com>
leds: trigger: Unregister sysfs attributes before calling deactivate()
Hsiao Chien Sung <shawn.sung(a)mediatek.com>
drm/mediatek: Add DRM_MODE_ROTATE_0 to rotation property
Hsiao Chien Sung <shawn.sung(a)mediatek.com>
drm/mediatek: Add missing plane settings when async update
Laurent Pinchart <laurent.pinchart+renesas(a)ideasonboard.com>
media: renesas: vsp1: Store RPF partition configuration per RPF instance
Laurent Pinchart <laurent.pinchart+renesas(a)ideasonboard.com>
media: renesas: vsp1: Fix _irqsave and _irq mix
Daniel Schaefer <dhs(a)frame.work>
media: uvcvideo: Override default flags
Aleksandr Burakov <a.burakov(a)rosalinux.ru>
saa7134: Unchecked i2c_transfer function result fixed
Claudio Imbrenda <imbrenda(a)linux.ibm.com>
KVM: s390: fix race in gmap_make_secure()
Claudio Imbrenda <imbrenda(a)linux.ibm.com>
KVM: s390: pv: add export before import
Claudio Imbrenda <imbrenda(a)linux.ibm.com>
KVM: s390: pv: properly handle page flags for protected guests
Claudio Imbrenda <imbrenda(a)linux.ibm.com>
KVM: s390: pv: avoid stalls when making pages secure
Bryan O'Donoghue <bryan.odonoghue(a)linaro.org>
media: i2c: Fix imx412 exposure control
Ricardo Ribalda <ribalda(a)chromium.org>
media: imon: Fix race getting ictx->lock
Zheng Yejian <zhengyejian1(a)huawei.com>
media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()
Douglas Anderson <dianders(a)chromium.org>
drm/panel: boe-tv101wum-nl6: Check for errors on the NOP in prepare()
Douglas Anderson <dianders(a)chromium.org>
drm/panel: boe-tv101wum-nl6: If prepare fails, disable GPIO before regulators
Friedrich Vock <friedrich.vock(a)gmx.de>
drm/amdgpu: Check if NBIO funcs are NULL in amdgpu_device_baco_exit
Lijo Lazar <lijo.lazar(a)amd.com>
drm/amd/pm: Fix aldebaran pcie speed reporting
Taehee Yoo <ap420073(a)gmail.com>
xdp: fix invalid wait context of page_pool_destroy()
Amit Cohen <amcohen(a)nvidia.com>
selftests: forwarding: devlink_lib: Wait for udev events after reloading
Alan Maguire <alan.maguire(a)oracle.com>
bpf: Eliminate remaining "make W=1" warnings in kernel/bpf/btf.o
Alexey Kodanev <aleksei.kodanev(a)bell-sw.com>
bna: adjust 'name' buf size of bna_tcb and bna_ccb structures
Alan Maguire <alan.maguire(a)oracle.com>
bpf: annotate BTF show functions with __printf
Geliang Tang <tanggeliang(a)kylinos.cn>
selftests/bpf: Close fd in error path in drop_on_reuseport
John Stultz <jstultz(a)google.com>
locking/rwsem: Add __always_inline annotation to __down_write_common() and inlined callers
Johannes Berg <johannes.berg(a)intel.com>
wifi: virt_wifi: don't use strlen() in const context
Gaosheng Cui <cuigaosheng1(a)huawei.com>
gss_krb5: Fix the error handling path for crypto_sync_skcipher_setkey
En-Wei Wu <en-wei.wu(a)canonical.com>
wifi: virt_wifi: avoid reporting connection success with wrong SSID
Adrian Hunter <adrian.hunter(a)intel.com>
perf: Fix default aux_watermark calculation
Adrian Hunter <adrian.hunter(a)intel.com>
perf: Prevent passing zero nr_pages to rb_alloc_aux()
Adrian Hunter <adrian.hunter(a)intel.com>
perf: Fix perf_aux_size() for greater-than 32-bit size
Adrian Hunter <adrian.hunter(a)intel.com>
perf/x86/intel/pt: Fix pt_topa_entry_for_page() address calculation
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: nf_tables: rise cap on SELinux secmark context
Ismael Luceno <iluceno(a)suse.de>
ipvs: Avoid unnecessary calls to skb_is_gso_sctp
Donglin Peng <dolinux.peng(a)gmail.com>
libbpf: Checking the btf_type kind when fixing variable offsets
Csókás, Bence <csokas.bence(a)prolan.hu>
net: fec: Fix FEC_ECR_EN1588 being cleared on link-down
Csókás Bence <csokas.bence(a)prolan.hu>
net: fec: Refactor: #define magic constants
Baochen Qiang <quic_bqiang(a)quicinc.com>
wifi: cfg80211: handle 2x996 RU allocation in cfg80211_calculate_bitrate_he()
Baochen Qiang <quic_bqiang(a)quicinc.com>
wifi: cfg80211: fix typo in cfg80211_calculate_bitrate_he()
Baochen Qiang <quic_bqiang(a)quicinc.com>
wifi: ath11k: fix wrong handling of CCMP256 and GCMP ciphers
Ido Schimmel <idosch(a)nvidia.com>
mlxsw: spectrum_acl: Fix ACL scale regression and firmware errors
Amit Cohen <amcohen(a)nvidia.com>
mlxsw: spectrum_acl_bloom_filter: Make mlxsw_sp_acl_bf_key_encode() more flexible
Ido Schimmel <idosch(a)nvidia.com>
mlxsw: spectrum_acl_erp: Fix object nesting warning
Ido Schimmel <idosch(a)nvidia.com>
lib: objagg: Fix general protection fault
Geliang Tang <tanggeliang(a)kylinos.cn>
selftests/bpf: Check length of recv in test_sockmap
Guangguan Wang <guangguan.wang(a)linux.alibaba.com>
net/smc: set rmb's SG_MAX_SINGLE_ALLOC limitation only when CONFIG_ARCH_NO_SG_CHAIN is defined
Eric Dumazet <edumazet(a)google.com>
tcp: fix races in tcp_v[46]_err()
Eric Dumazet <edumazet(a)google.com>
tcp: fix race in tcp_write_err()
Eric Dumazet <edumazet(a)google.com>
tcp: add tcp_done_with_error() helper
Eric Dumazet <edumazet(a)google.com>
tcp: annotate lockless access to sk->sk_err
Eric Dumazet <edumazet(a)google.com>
tcp: annotate lockless accesses to sk->sk_err_soft
Hagar Hemdan <hagarhem(a)amazon.com>
net: esp: cleanup esp_output_tail_tcp() in case of unsupported ESPINTCP
Geliang Tang <tanggeliang(a)kylinos.cn>
selftests/bpf: Fix prog numbers in test_sockmap
Samasth Norway Ananda <samasth.norway.ananda(a)oracle.com>
wifi: brcmsmac: LCN PHY code is used for BCM4313 2G-only device
Marek Behún <kabel(a)kernel.org>
firmware: turris-mox-rwtm: Initialize completion before mailbox
Marek Behún <kabel(a)kernel.org>
firmware: turris-mox-rwtm: Fix checking return value of wait_for_completion_timeout()
Marek Behún <kabel(a)kernel.org>
firmware: turris-mox-rwtm: Do not complete if there are no waiters
Christophe Leroy <christophe.leroy(a)csgroup.eu>
vmlinux.lds.h: catch .bss..L* sections into BSS")
Dmitry Torokhov <dmitry.torokhov(a)gmail.com>
ARM: spitz: fix GPIO assignment for backlight
Arnd Bergmann <arnd(a)arndb.de>
ARM: pxa: spitz: use gpio descriptors for audio
Thorsten Blum <thorsten.blum(a)toblux.com>
m68k: cmpxchg: Fix return value for default case in __arch_xchg()
Chen Ni <nichen(a)iscas.ac.cn>
x86/xen: Convert comma to semicolon
Eero Tamminen <oak(a)helsinkinet.fi>
m68k: atari: Fix TT bootup freeze / unexpected (SCU) interrupt messages
Jerome Brunet <jbrunet(a)baylibre.com>
arm64: dts: amlogic: gx: correct hdmi clocks
Chen-Yu Tsai <wenst(a)chromium.org>
arm64: dts: mediatek: mt8183-kukui-jacuzzi: Add ports node for anx7625
Rafał Miłecki <rafal(a)milecki.pl>
arm64: dts: mediatek: mt7622: fix "emmc" pinctrl mux
Chen-Yu Tsai <wenst(a)chromium.org>
arm64: dts: mediatek: mt8183-kukui: Drop bogus output-enable property
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix PCIe reset polarity
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix SPI0 chip selects
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix board reset
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix PHY reset
Marco Felsch <m.felsch(a)pengutronix.de>
ARM: dts: imx6qdl-kontron-samx6i: move phy reset into phy-node
Jonas Karlman <jonas(a)kwiboo.se>
arm64: dts: rockchip: Increase VOP clk rate on RK3328
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
soc: qcom: pdr: fix parsing of domains lists
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
soc: qcom: pdr: protect locator_addr with the main mutex
Esben Haabendal <esben(a)geanix.com>
memory: fsl_ifc: Make FSL_IFC config visible and selectable
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: msm8996: specify UFS core_clk frequencies
Stephen Boyd <swboyd(a)chromium.org>
soc: qcom: rpmh-rsc: Ensure irqs aren't disabled by rpmh_rsc_send_data() callers
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: sm8250: add power-domain to UFS PHY
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: sm8250: switch UFS QMP PHY to new style of bindings
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: sdm845: add power-domain to UFS PHY
Guenter Roeck <linux(a)roeck-us.net>
hwmon: (max6697) Fix swapped temp{1,8} critical alarms
Guenter Roeck <linux(a)roeck-us.net>
hwmon: (max6697) Fix underflow when writing limit attributes
Yao Zi <ziyao(a)disroot.org>
drm/meson: fix canvas release in bind function
Uwe Kleine-König <u.kleine-koenig(a)baylibre.com>
pwm: stm32: Always do lazy disabling
Wayne Tung <chineweff(a)gmail.com>
hwmon: (adt7475) Fix default duty on fan is disabled
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/platform/iosf_mbi: Convert PCIBIOS_* return codes to errnos
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/pci/xen: Fix PCIBIOS_* return code handling
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/pci/intel_mid_pci: Fix PCIBIOS_* return code handling
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/of: Return consistent error type from x86_of_pci_irq_enable()
Chao Yu <chao(a)kernel.org>
hfsplus: fix to avoid false alarm of circular locking
Christoph Hellwig <hch(a)lst.de>
block: initialize integrity buffer to zero before writing it to media
Jinyoung Choi <j-young.choi(a)samsung.com>
block: cleanup bio_integrity_prep
Nitesh Shetty <nj.shetty(a)samsung.com>
block: refactor to use helper
Tzung-Bi Shih <tzungbi(a)kernel.org>
platform/chrome: cros_ec_debugfs: fix wrong EC message version
Arnd Bergmann <arnd(a)arndb.de>
EDAC, i10nm: make skx_common.o a separate module
Chao Yu <chao(a)kernel.org>
f2fs: fix to don't dirty inode for readonly filesystem
Chao Yu <chao(a)kernel.org>
f2fs: fix return value of f2fs_convert_inline_inode()
-------------
Diffstat:
Documentation/admin-guide/kernel-parameters.txt | 10 +-
Documentation/arm64/cpu-feature-registers.rst | 38 ++++-
Documentation/arm64/silicon-errata.rst | 36 ++++
.../devicetree/bindings/thermal/thermal-zones.yaml | 5 +-
Makefile | 4 +-
arch/arm/boot/dts/imx6q-kontron-samx6i.dtsi | 23 ---
arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 26 ++-
arch/arm/mach-pxa/spitz.c | 39 ++++-
arch/arm/mach-pxa/{include/mach => }/spitz.h | 2 +-
arch/arm/mach-pxa/spitz_pm.c | 2 +-
arch/arm64/Kconfig | 38 +++++
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 4 +-
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 4 +-
.../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 4 +-
arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 4 +-
.../boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 25 +--
arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 2 -
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 6 +-
arch/arm64/boot/dts/qcom/msm8996.dtsi | 8 +-
arch/arm64/boot/dts/qcom/msm8998.dtsi | 36 ++--
arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +
arch/arm64/boot/dts/qcom/sm8250.dtsi | 22 +--
arch/arm64/boot/dts/qcom/sm8350.dtsi | 3 -
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 4 +-
arch/arm64/include/asm/barrier.h | 4 +
arch/arm64/include/asm/cputype.h | 16 ++
arch/arm64/kernel/cpu_errata.c | 31 ++++
arch/arm64/kernel/cpufeature.c | 94 +++++++++--
arch/arm64/kernel/proton-pack.c | 12 ++
arch/arm64/tools/cpucaps | 1 +
arch/m68k/amiga/config.c | 9 +
arch/m68k/atari/ataints.c | 6 +-
arch/m68k/include/asm/cmpxchg.h | 2 +-
arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi | 98 +++++++----
arch/mips/include/asm/mach-loongson64/boot_param.h | 2 +
arch/mips/include/asm/mips-cm.h | 4 +
arch/mips/kernel/smp-cps.c | 5 +-
arch/mips/loongson64/env.c | 8 +
arch/mips/loongson64/reset.c | 38 ++---
arch/mips/loongson64/smp.c | 23 ++-
arch/mips/pci/pcie-octeon.c | 0
arch/mips/sgi-ip30/ip30-console.c | 1 +
arch/powerpc/configs/85xx-hw.config | 2 +
arch/powerpc/include/asm/interrupt.h | 14 +-
arch/powerpc/include/asm/percpu.h | 10 ++
arch/powerpc/kernel/setup_64.c | 2 +
arch/powerpc/kvm/powerpc.c | 4 +-
arch/powerpc/xmon/ppc-dis.c | 33 ++--
arch/riscv/mm/fault.c | 17 +-
arch/s390/include/asm/pgtable.h | 9 +-
arch/s390/include/asm/uv.h | 10 +-
arch/s390/kernel/uv.c | 119 ++++++++++---
arch/s390/kvm/intercept.c | 5 +
arch/s390/mm/gmap.c | 4 +-
arch/s390/pci/pci_irq.c | 116 ++++++++-----
arch/sparc/include/asm/oplib_64.h | 1 +
arch/sparc/prom/init_64.c | 3 -
arch/sparc/prom/p1275.c | 2 +-
arch/um/kernel/time.c | 4 +-
arch/um/os-Linux/signal.c | 118 ++++++++++---
arch/x86/events/intel/pt.c | 4 +-
arch/x86/events/intel/pt.h | 4 +-
arch/x86/events/intel/uncore_snbep.c | 6 +-
arch/x86/kernel/cpu/mtrr/mtrr.c | 2 +-
arch/x86/kernel/devicetree.c | 2 +-
arch/x86/kvm/vmx/vmx.c | 11 +-
arch/x86/kvm/vmx/vmx.h | 1 +
arch/x86/mm/pti.c | 8 +-
arch/x86/pci/intel_mid_pci.c | 4 +-
arch/x86/pci/xen.c | 4 +-
arch/x86/platform/intel/iosf_mbi.c | 4 +-
arch/x86/xen/p2m.c | 4 +-
block/bio-integrity.c | 21 ++-
drivers/acpi/battery.c | 16 +-
drivers/acpi/sbs.c | 23 +--
drivers/android/binder.c | 4 +-
drivers/ata/libata-scsi.c | 10 +-
drivers/base/core.c | 13 +-
drivers/base/devres.c | 11 +-
drivers/base/module.c | 4 +
drivers/block/rbd.c | 35 ++--
drivers/bluetooth/btusb.c | 4 +
drivers/char/hw_random/amd-rng.c | 4 +-
drivers/char/tpm/eventlog/common.c | 2 +
drivers/clk/davinci/da8xx-cfgchip.c | 4 +-
drivers/clk/qcom/clk-branch.h | 26 +++
drivers/clk/qcom/gcc-sc7280.c | 3 +
drivers/clocksource/sh_cmt.c | 13 +-
drivers/dma/ti/k3-udma.c | 4 +-
drivers/edac/Makefile | 10 +-
drivers/edac/skx_common.c | 21 ++-
drivers/edac/skx_common.h | 4 +-
drivers/firmware/turris-mox-rwtm.c | 23 ++-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 7 +-
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 12 ++
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9 +-
drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 3 +-
.../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 55 +++---
.../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 14 +-
.../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 7 +-
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 4 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 5 +-
drivers/gpu/drm/drm_client_modeset.c | 5 +
drivers/gpu/drm/drm_dp_mst_topology.c | 4 +-
drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 +-
drivers/gpu/drm/gma500/cdv_intel_lvds.c | 3 +
drivers/gpu/drm/gma500/psb_intel_lvds.c | 3 +
drivers/gpu/drm/i915/display/intel_dp.c | 2 +
drivers/gpu/drm/i915/gem/i915_gem_mman.c | 53 +++++-
.../gpu/drm/i915/gt/intel_execlists_submission.c | 6 +-
drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 17 +-
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 6 +-
drivers/gpu/drm/mediatek/mtk_drm_plane.c | 4 +-
drivers/gpu/drm/meson/meson_drv.c | 37 ++--
drivers/gpu/drm/mgag200/mgag200_i2c.c | 2 +-
drivers/gpu/drm/nouveau/nouveau_prime.c | 3 +-
drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 8 +-
drivers/gpu/drm/panfrost/panfrost_drv.c | 1 +
drivers/gpu/drm/qxl/qxl_display.c | 3 +
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 17 +-
drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 2 +-
drivers/hid/wacom_wac.c | 3 +-
drivers/hwmon/adt7475.c | 2 +-
drivers/hwmon/max6697.c | 5 +-
drivers/hwtracing/coresight/coresight-platform.c | 4 +-
drivers/i2c/i2c-smbus.c | 64 ++++++-
drivers/infiniband/core/cache.c | 14 +-
drivers/infiniband/core/device.c | 6 +-
drivers/infiniband/core/iwcm.c | 11 +-
drivers/infiniband/hw/bnxt_re/ib_verbs.c | 8 +-
drivers/infiniband/hw/bnxt_re/qplib_fp.h | 6 +-
drivers/infiniband/hw/hns/hns_roce_device.h | 4 +
drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 6 +-
drivers/infiniband/hw/hns/hns_roce_mr.c | 5 +
drivers/infiniband/hw/hns/hns_roce_srq.c | 2 +-
drivers/infiniband/hw/mlx4/alias_GUID.c | 2 +-
drivers/infiniband/hw/mlx4/mad.c | 2 +-
drivers/infiniband/hw/mlx5/mlx5_ib.h | 13 ++
drivers/infiniband/hw/mlx5/odp.c | 6 +-
drivers/infiniband/sw/rxe/rxe_req.c | 7 +-
drivers/input/keyboard/qt1050.c | 7 +-
drivers/input/mouse/elan_i2c_core.c | 2 +
drivers/iommu/sprd-iommu.c | 2 +-
drivers/irqchip/irq-imx-irqsteer.c | 40 ++++-
drivers/irqchip/irq-mbigen.c | 20 ++-
drivers/irqchip/irq-meson-gpio.c | 35 ++--
drivers/irqchip/irq-xilinx-intc.c | 2 +-
drivers/isdn/hardware/mISDN/hfcmulti.c | 7 +-
drivers/leds/led-class.c | 1 -
drivers/leds/led-triggers.c | 75 ++++----
drivers/leds/leds-ss4200.c | 7 +-
drivers/leds/trigger/ledtrig-timer.c | 5 -
drivers/macintosh/therm_windtunnel.c | 2 +-
drivers/md/md.c | 1 -
drivers/md/raid5.c | 20 ++-
drivers/media/i2c/imx412.c | 9 +-
drivers/media/pci/saa7134/saa7134-dvb.c | 8 +-
drivers/media/platform/qcom/venus/vdec.c | 3 +-
drivers/media/platform/vsp1/vsp1_histo.c | 20 +--
drivers/media/platform/vsp1/vsp1_pipe.h | 2 +-
drivers/media/platform/vsp1/vsp1_rpf.c | 8 +-
drivers/media/rc/imon.c | 5 +-
drivers/media/rc/lirc_dev.c | 4 +-
drivers/media/usb/uvc/uvc_ctrl.c | 9 +-
drivers/media/usb/uvc/uvc_video.c | 47 +++++-
drivers/memory/Kconfig | 2 +-
drivers/mfd/Makefile | 6 +-
drivers/mfd/omap-usb-tll.c | 3 +-
drivers/mfd/rsmu_core.c | 2 +
drivers/mtd/nand/raw/Kconfig | 3 +-
drivers/mtd/tests/Makefile | 34 ++--
drivers/mtd/tests/mtd_test.c | 9 +
drivers/mtd/ubi/eba.c | 3 +-
drivers/net/bonding/bond_main.c | 7 +-
drivers/net/dsa/b53/b53_common.c | 3 +
drivers/net/dsa/bcm_sf2.c | 4 +-
drivers/net/dsa/mv88e6xxx/chip.c | 3 +-
drivers/net/ethernet/brocade/bna/bna_types.h | 2 +-
drivers/net/ethernet/brocade/bna/bnad.c | 11 +-
drivers/net/ethernet/freescale/fec_main.c | 52 ++++--
drivers/net/ethernet/freescale/fec_ptp.c | 3 +
drivers/net/ethernet/google/gve/gve_tx_dqo.c | 22 ++-
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 6 +-
.../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 7 +-
.../ethernet/mellanox/mlxsw/spectrum_acl_atcam.c | 18 +-
.../mellanox/mlxsw/spectrum_acl_bloom_filter.c | 38 +++--
.../net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c | 13 --
.../ethernet/mellanox/mlxsw/spectrum_acl_tcam.h | 9 +-
drivers/net/ethernet/realtek/r8169_main.c | 8 +-
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 +-
.../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 2 +-
drivers/net/ethernet/stmicro/stmmac/hwif.h | 2 +-
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +-
drivers/net/netconsole.c | 2 +-
drivers/net/usb/qmi_wwan.c | 1 +
drivers/net/usb/sr9700.c | 11 +-
drivers/net/wireless/ath/ath11k/dp_rx.c | 3 +-
drivers/net/wireless/ath/ath11k/dp_rx.h | 3 +
drivers/net/wireless/ath/ath11k/mac.c | 15 +-
.../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 18 +-
drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 +
drivers/net/wireless/virt_wifi.c | 20 ++-
drivers/nvme/host/pci.c | 99 ++++++-----
drivers/parport/procfs.c | 24 +--
drivers/pci/controller/dwc/pcie-designware-host.c | 7 +-
drivers/pci/controller/dwc/pcie-dw-rockchip.c | 2 +-
drivers/pci/controller/pci-hyperv.c | 4 +-
drivers/pci/controller/pcie-rockchip.c | 2 +-
drivers/pci/endpoint/functions/pci-epf-vntb.c | 12 +-
drivers/pci/pci.c | 19 ++-
drivers/pci/setup-bus.c | 6 +-
drivers/phy/cadence/phy-cadence-torrent.c | 3 +
drivers/pinctrl/core.c | 12 +-
drivers/pinctrl/freescale/pinctrl-mxs.c | 4 +-
drivers/pinctrl/pinctrl-rockchip.c | 17 +-
drivers/pinctrl/pinctrl-single.c | 7 +-
drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 14 +-
drivers/platform/chrome/cros_ec_debugfs.c | 1 +
drivers/platform/chrome/cros_ec_proto.c | 2 +
drivers/platform/mips/cpu_hwmon.c | 3 +
drivers/power/supply/axp288_charger.c | 24 +--
drivers/power/supply/bq24190_charger.c | 2 +-
drivers/pwm/pwm-stm32.c | 5 +-
drivers/remoteproc/imx_rproc.c | 10 +-
drivers/remoteproc/stm32_rproc.c | 2 +-
drivers/rtc/interface.c | 9 +-
drivers/rtc/rtc-cmos.c | 10 +-
drivers/rtc/rtc-isl1208.c | 11 +-
drivers/s390/block/dasd_devmap.c | 10 +-
drivers/s390/char/sclp_sd.c | 10 +-
drivers/scsi/mpi3mr/mpi3mr_os.c | 11 ++
drivers/scsi/mpt3sas/mpt3sas_base.c | 20 ++-
drivers/scsi/qla2xxx/qla_bsg.c | 98 ++++++-----
drivers/scsi/qla2xxx/qla_def.h | 3 +
drivers/scsi/qla2xxx/qla_gs.c | 35 +++-
drivers/scsi/qla2xxx/qla_init.c | 87 ++++++++--
drivers/scsi/qla2xxx/qla_inline.h | 8 +
drivers/scsi/qla2xxx/qla_mid.c | 2 +-
drivers/scsi/qla2xxx/qla_nvme.c | 5 +-
drivers/scsi/qla2xxx/qla_os.c | 7 +-
drivers/scsi/qla2xxx/qla_sup.c | 108 ++++++++----
drivers/scsi/ufs/ufshcd.c | 11 +-
drivers/soc/qcom/pdr_interface.c | 8 +-
drivers/soc/qcom/rpmh-rsc.c | 7 +-
drivers/soc/qcom/rpmh.c | 1 -
drivers/soc/xilinx/zynqmp_pm_domains.c | 16 ++
drivers/soc/xilinx/zynqmp_power.c | 5 +-
drivers/spi/spi-fsl-lpspi.c | 6 +-
drivers/spi/spidev.c | 95 +++++------
drivers/tty/serial/serial_core.c | 8 +
drivers/usb/gadget/function/u_audio.c | 42 ++++-
drivers/usb/gadget/function/u_serial.c | 1 +
drivers/usb/gadget/udc/core.c | 10 +-
drivers/usb/serial/usb_debug.c | 7 +
drivers/usb/usbip/vhci_hcd.c | 9 +-
drivers/vhost/vdpa.c | 8 +-
drivers/vhost/vsock.c | 4 +-
fs/binfmt_flat.c | 4 +-
fs/btrfs/ctree.h | 1 +
fs/btrfs/file.c | 60 +++++--
fs/btrfs/free-space-cache.c | 1 +
fs/ceph/super.c | 3 +-
fs/exec.c | 8 +-
fs/ext2/balloc.c | 11 +-
fs/ext4/extents.c | 5 +-
fs/ext4/extents_status.c | 16 +-
fs/ext4/extents_status.h | 6 +-
fs/ext4/fast_commit.c | 65 +++++--
fs/ext4/inline.c | 6 +-
fs/ext4/inode.c | 115 +++++++------
fs/ext4/mballoc.c | 3 +-
fs/ext4/namei.c | 88 +++++++---
fs/ext4/xattr.c | 6 +
fs/f2fs/inline.c | 6 +-
fs/f2fs/inode.c | 3 +
fs/file.c | 1 +
fs/fuse/inode.c | 24 ++-
fs/hfs/inode.c | 3 +
fs/hfsplus/bfind.c | 15 +-
fs/hfsplus/extents.c | 9 +-
fs/hfsplus/hfsplus_fs.h | 21 +++
fs/jbd2/commit.c | 2 +-
fs/jbd2/journal.c | 6 +
fs/jfs/jfs_imap.c | 5 +-
fs/nfs/nfs4client.c | 6 +-
fs/nfs/nfs4proc.c | 2 +-
fs/nilfs2/btnode.c | 25 ++-
fs/nilfs2/btree.c | 4 +-
fs/nilfs2/segment.c | 2 +-
fs/ntfs3/attrib.c | 14 +-
fs/ntfs3/bitmap.c | 2 +-
fs/ntfs3/dir.c | 3 +-
fs/ntfs3/file.c | 5 +-
fs/ntfs3/frecord.c | 2 +-
fs/ntfs3/fslog.c | 5 +-
fs/ntfs3/fsntfs.c | 2 +-
fs/ntfs3/index.c | 4 +-
fs/ntfs3/inode.c | 2 +-
fs/ntfs3/ntfs.h | 13 +-
fs/ntfs3/ntfs_fs.h | 2 +
fs/proc/proc_sysctl.c | 6 +-
fs/proc/task_mmu.c | 2 +
fs/super.c | 11 ++
fs/udf/balloc.c | 51 +++---
fs/udf/super.c | 3 +-
fs/xfs/xfs_log_recover.c | 20 ++-
include/asm-generic/vmlinux.lds.h | 2 +-
include/linux/clocksource.h | 14 +-
include/linux/hugetlb.h | 1 +
include/linux/irq.h | 7 +-
include/linux/irqdomain.h | 10 ++
include/linux/jbd2.h | 5 -
include/linux/leds.h | 32 ++--
include/linux/objagg.h | 1 -
include/linux/pci_ids.h | 2 +
include/linux/perf_event.h | 1 +
include/linux/profile.h | 1 -
include/linux/sched/signal.h | 6 +
include/linux/task_work.h | 3 +-
include/linux/trace_events.h | 1 -
include/linux/virtio_net.h | 11 ++
include/net/netfilter/nf_tables.h | 20 ++-
include/net/sctp/sctp.h | 4 +-
include/net/sctp/structs.h | 8 +-
include/net/tcp.h | 1 +
include/trace/events/mptcp.h | 2 +-
include/trace/events/rpcgss.h | 2 +-
include/uapi/linux/netfilter/nf_tables.h | 2 +-
include/uapi/linux/zorro_ids.h | 3 +
io_uring/io-wq.c | 10 +-
io_uring/io_uring.c | 5 +-
kernel/bpf/btf.c | 10 +-
kernel/debug/kdb/kdb_io.c | 6 +-
kernel/dma/mapping.c | 2 +-
kernel/events/core.c | 77 ++++++---
kernel/events/internal.h | 2 +-
kernel/events/ring_buffer.c | 4 +-
kernel/irq/chip.c | 32 ++--
kernel/irq/irqdesc.c | 1 +
kernel/irq/irqdomain.c | 7 +-
kernel/irq/manage.c | 2 +-
kernel/kcov.c | 15 +-
kernel/kprobes.c | 4 +-
kernel/locking/rwsem.c | 6 +-
kernel/padata.c | 7 +
kernel/profile.c | 16 +-
kernel/rcu/rcutorture.c | 2 +-
kernel/sched/core.c | 50 +++---
kernel/sched/cputime.c | 6 +
kernel/sched/fair.c | 19 +--
kernel/sched/sched.h | 2 +-
kernel/signal.c | 8 +
kernel/task_work.c | 34 +++-
kernel/time/clocksource-wdtest.c | 13 +-
kernel/time/clocksource.c | 10 +-
kernel/time/ntp.c | 9 +-
kernel/time/tick-broadcast.c | 24 +++
kernel/time/timekeeping.c | 2 +-
kernel/trace/tracing_map.c | 6 +-
kernel/watchdog_hld.c | 11 +-
lib/decompress_bunzip2.c | 3 +-
lib/kobject_uevent.c | 17 +-
lib/objagg.c | 18 +-
mm/hugetlb.c | 2 +-
mm/mempolicy.c | 18 +-
mm/mmap_lock.c | 175 +++----------------
net/bluetooth/l2cap_core.c | 1 +
net/bridge/br_multicast.c | 4 +-
net/core/filter.c | 15 +-
net/core/link_watch.c | 4 +-
net/core/rtnetlink.c | 65 +++----
net/core/xdp.c | 4 +-
net/ipv4/esp4.c | 3 +-
net/ipv4/netfilter/iptable_nat.c | 18 +-
net/ipv4/nexthop.c | 7 +-
net/ipv4/route.c | 2 +-
net/ipv4/tcp.c | 13 +-
net/ipv4/tcp_input.c | 34 ++--
net/ipv4/tcp_ipv4.c | 19 +--
net/ipv4/tcp_output.c | 2 +-
net/ipv4/tcp_timer.c | 10 +-
net/ipv6/addrconf.c | 3 +-
net/ipv6/esp6.c | 3 +-
net/ipv6/ndisc.c | 34 ++--
net/ipv6/netfilter/ip6table_nat.c | 14 +-
net/ipv6/tcp_ipv6.c | 19 +--
net/iucv/af_iucv.c | 4 +-
net/l2tp/l2tp_core.c | 15 +-
net/mac80211/cfg.c | 21 +--
net/mptcp/mib.c | 2 +
net/mptcp/mib.h | 2 +
net/mptcp/options.c | 5 +-
net/mptcp/pm.c | 9 +
net/mptcp/pm_netlink.c | 48 ++++--
net/mptcp/protocol.c | 18 +-
net/mptcp/protocol.h | 4 +
net/mptcp/subflow.c | 24 ++-
net/netfilter/ipset/ip_set_list_set.c | 3 +
net/netfilter/ipvs/ip_vs_proto_sctp.c | 4 +-
net/netfilter/nf_conntrack_netlink.c | 3 +-
net/netfilter/nf_tables_api.c | 188 ++++-----------------
net/netfilter/nft_connlimit.c | 4 +-
net/netfilter/nft_counter.c | 4 +-
net/netfilter/nft_dynset.c | 2 +-
net/netfilter/nft_last.c | 4 +-
net/netfilter/nft_limit.c | 14 +-
net/netfilter/nft_quota.c | 4 +-
net/netfilter/nft_set_hash.c | 8 +-
net/netfilter/nft_set_pipapo.c | 40 +++--
net/netfilter/nft_set_pipapo.h | 27 ++-
net/netfilter/nft_set_pipapo_avx2.c | 81 +++++----
net/netfilter/nft_set_rbtree.c | 6 +-
net/packet/af_packet.c | 86 +++++++++-
net/sched/act_ct.c | 4 +-
net/sctp/input.c | 48 +++---
net/sctp/proc.c | 10 +-
net/sctp/socket.c | 6 +-
net/smc/smc_core.c | 5 +-
net/sunrpc/auth_gss/gss_krb5_keys.c | 2 +-
net/sunrpc/clnt.c | 3 +-
net/sunrpc/sched.c | 4 +-
net/sunrpc/xprtrdma/frwr_ops.c | 3 +-
net/sunrpc/xprtrdma/verbs.c | 16 +-
net/tipc/udp_media.c | 5 +-
net/tls/tls_sw.c | 16 +-
net/wireless/nl80211.c | 16 +-
net/wireless/util.c | 8 +-
scripts/gcc-x86_32-has-stack-protector.sh | 2 +-
scripts/gcc-x86_64-has-stack-protector.sh | 2 +-
security/apparmor/lsm.c | 7 +
security/apparmor/policy.c | 2 +-
security/apparmor/policy_unpack.c | 1 +
security/keys/keyctl.c | 2 +-
security/landlock/cred.c | 11 +-
sound/firewire/amdtp-stream.c | 38 +++--
sound/firewire/amdtp-stream.h | 1 +
sound/pci/hda/patch_conexant.c | 54 +-----
sound/pci/hda/patch_hdmi.c | 2 +
sound/pci/hda/patch_realtek.c | 1 +
sound/soc/codecs/max98088.c | 10 +-
sound/soc/codecs/wcd938x-sdw.c | 4 +-
sound/soc/codecs/wsa881x.c | 2 +-
sound/soc/intel/common/soc-intel-quirks.h | 2 +-
sound/soc/meson/axg-fifo.c | 26 ++-
sound/soc/pxa/spitz.c | 58 +++----
sound/usb/line6/driver.c | 5 +
sound/usb/mixer.c | 7 +
sound/usb/quirks-table.h | 4 +
sound/usb/quirks.c | 4 +
sound/usb/stream.c | 4 +-
tools/lib/bpf/btf_dump.c | 8 +-
tools/lib/bpf/linker.c | 11 +-
tools/memory-model/lock.cat | 20 +--
tools/perf/arch/x86/util/intel-pt.c | 15 +-
tools/perf/util/sort.c | 2 +-
.../testing/selftests/bpf/prog_tests/send_signal.c | 3 +-
tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 2 +-
.../bpf/progs/btf_dump_test_case_multidim.c | 4 +-
.../bpf/progs/btf_dump_test_case_syntax.c | 4 +-
tools/testing/selftests/bpf/test_sockmap.c | 9 +-
.../drivers/net/mlxsw/spectrum-2/tc_flower.sh | 55 +++++-
tools/testing/selftests/landlock/base_test.c | 74 ++++++++
tools/testing/selftests/landlock/config | 5 +-
.../selftests/net/forwarding/devlink_lib.sh | 2 +
tools/testing/selftests/net/mptcp/mptcp_join.sh | 41 ++++-
tools/testing/selftests/rcutorture/bin/torture.sh | 6 +-
.../selftests/sigaltstack/current_stack_pointer.h | 2 +-
468 files changed, 4200 insertions(+), 2417 deletions(-)
1 year, 4 months
- 6
- 6
[PATCH 5.10 000/350] 5.10.224-rc2 review
by Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.224 release.
There are 350 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Sun, 18 Aug 2024 10:14:04 +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.224-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.224-rc2
Sean Young <sean(a)mess.org>
media: Revert "media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()"
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix phy-mode
Eric Dumazet <edumazet(a)google.com>
wifi: cfg80211: restrict NL80211_ATTR_TXQ_QUANTUM values
Jason Wang <jasowang(a)redhat.com>
vhost-vdpa: switch to use vmf_insert_pfn() in the fault handler
Cai Huoqing <caihuoqing(a)baidu.com>
vdpa: Make use of PFN_PHYS/PFN_UP/PFN_DOWN helper macro
WangYuli <wangyuli(a)uniontech.com>
nvme/pci: Add APST quirk for Lenovo N60z laptop
Kees Cook <kees(a)kernel.org>
exec: Fix ToCToU between perm check and set-uid/gid usage
Yunke Cao <yunkec(a)google.com>
media: uvcvideo: Use entity get_cur in uvc_ctrl_set
Amit Daniel Kachhap <amit.kachhap(a)arm.com>
arm64: cpufeature: Fix the visibility of compat hwcaps
Mahesh Salgaonkar <mahesh(a)linux.ibm.com>
powerpc: Avoid nmi_enter/nmi_exit in real mode interrupt.
Andi Shyti <andi.shyti(a)linux.intel.com>
drm/i915/gem: Fix Virtual Memory mapping boundaries calculation
Florian Westphal <fw(a)strlen.de>
netfilter: nf_tables: prefer nft_chain_validate
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: nf_tables: allow clone callbacks to sleep
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: nf_tables: use timestamp to check for set element timeout
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: nf_tables: set element extended ACK reporting support
Lukas Wunner <lukas(a)wunner.de>
PCI/DPC: Fix use-after-free on concurrent DPC and hot-removal
Jari Ruusu <jariruusu(a)protonmail.com>
Fix gcc 4.9 build issue in 5.10.y
Linus Torvalds <torvalds(a)linux-foundation.org>
Add gitignore file for samples/fanotify/ subdirectory
Gabriel Krisman Bertazi <krisman(a)collabora.com>
samples: Make fs-monitor depend on libc and headers
Gabriel Krisman Bertazi <krisman(a)collabora.com>
samples: Add fs error monitoring example
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: pm: fix backup support in signal endpoints
Geliang Tang <geliang.tang(a)suse.com>
mptcp: export local_address
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: mib: count MPJ with backup flag
Paolo Abeni <pabeni(a)redhat.com>
mptcp: fix NL PM announced address accounting
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: distinguish rcv vs sent backup flag in requests
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: sched: check both directions for backup
Thomas Zimmermann <tzimmermann(a)suse.de>
drm/mgag200: Set DDC timeout in milliseconds
Lucas Stach <l.stach(a)pengutronix.de>
drm/bridge: analogix_dp: properly handle zero sized AUX transactions
Andi Kleen <ak(a)linux.intel.com>
x86/mtrr: Check if fixed MTRRs exist before saving them
Waiman Long <longman(a)redhat.com>
padata: Fix possible divide-by-0 panic in padata_mt_helper()
Tze-nan Wu <Tze-nan.Wu(a)mediatek.com>
tracing: Fix overflow in get_free_elt()
Hans de Goede <hdegoede(a)redhat.com>
power: supply: axp288_charger: Round constant_charge_voltage writes down
Hans de Goede <hdegoede(a)redhat.com>
power: supply: axp288_charger: Fix constant_charge_voltage writes
Shay Drory <shayd(a)nvidia.com>
genirq/irqdesc: Honor caller provided affinity in alloc_desc()
Radhey Shyam Pandey <radhey.shyam.pandey(a)amd.com>
irqchip/xilinx: Fix shift out of bounds
George Kennedy <george.kennedy(a)oracle.com>
serial: core: check uartclk for zero to avoid divide by zero
Arseniy Krasnov <avkrasnov(a)salutedevices.com>
irqchip/meson-gpio: Convert meson_gpio_irq_controller::lock to 'raw_spinlock_t'
Qianggui Song <qianggui.song(a)amlogic.com>
irqchip/meson-gpio: support more than 8 channels gpio irq
Damien Le Moal <dlemoal(a)kernel.org>
scsi: mpt3sas: Avoid IOMMU page faults on REPORT ZONES
Sreekanth Reddy <sreekanth.reddy(a)broadcom.com>
scsi: mpt3sas: Remove scsi_dma_map() error messages
Justin Stitt <justinstitt(a)google.com>
ntp: Safeguard against time_constant overflow
Dan Williams <dan.j.williams(a)intel.com>
driver core: Fix uevent_show() vs driver detach race
Justin Stitt <justinstitt(a)google.com>
ntp: Clamp maxerror and esterror to operating range
Thomas Gleixner <tglx(a)linutronix.de>
tick/broadcast: Move per CPU pointer access into the atomic section
Vamshi Gajjela <vamshigajjela(a)google.com>
scsi: ufs: core: Fix hba->last_dme_cmd_tstamp timestamp updating logic
Prashanth K <quic_prashk(a)quicinc.com>
usb: gadget: u_serial: Set start_delayed during suspend
Chris Wulff <crwulff(a)gmail.com>
usb: gadget: core: Check for unset descriptor
Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com>
USB: serial: debug: do not echo input by default
Oliver Neukum <oneukum(a)suse.com>
usb: vhci-hcd: Do not drop references before new references are gained
Takashi Iwai <tiwai(a)suse.de>
ALSA: hda/hdmi: Yet more pin fix for HP EliteDesk 800 G4
Steven 'Steve' Kendall <skend(a)chromium.org>
ALSA: hda: Add HP MP9 G4 Retail System AMS to force connect list
Takashi Iwai <tiwai(a)suse.de>
ALSA: line6: Fix racy access to midibuf
Ma Ke <make24(a)iscas.ac.cn>
drm/client: fix null pointer dereference in drm_client_modeset_probe
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Re-add ScratchAmp quirk entries
Stefan Wahren <wahrenst(a)gmx.net>
spi: spi-fsl-lpspi: Fix scldiv calculation
Masami Hiramatsu (Google) <mhiramat(a)kernel.org>
kprobes: Fix to check symbol prefixes correctly
Menglong Dong <menglong8.dong(a)gmail.com>
bpf: kprobe: remove unused declaring of bpf_kprobe_override
Guenter Roeck <linux(a)roeck-us.net>
i2c: smbus: Send alert notifications to all devices if source not found
Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>
ASoC: codecs: wsa881x: Correct Soundwire ports mask
Guenter Roeck <linux(a)roeck-us.net>
i2c: smbus: Improve handling of stuck alerts
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Expand speculative SSBS workaround (again)
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-A725 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X1C definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Expand speculative SSBS workaround
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Unify speculative SSBS errata logic
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X925 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-A720 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X3 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Add workaround for Arm errata 3194386 and 3312417
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Neoverse-V3 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X4 definitions
Besar Wicaksono <bwicaksono(a)nvidia.com>
arm64: Add Neoverse-V2 part
James Morse <james.morse(a)arm.com>
arm64: cpufeature: Force HWCAP to be based on the sysreg visible to user-space
Kemeng Shi <shikemeng(a)huaweicloud.com>
ext4: fix wrong unit use in ext4_mb_find_by_goal
Zheng Zucheng <zhengzucheng(a)huawei.com>
sched/cputime: Fix mul_u64_u64_div_u64() precision for cputime
Benjamin Coddington <bcodding(a)redhat.com>
SUNRPC: Fix a race to wake a sync task
Peter Oberparleiter <oberpar(a)linux.ibm.com>
s390/sclp: Prevent release of buffer in I/O
Kemeng Shi <shikemeng(a)huaweicloud.com>
jbd2: avoid memleak in jbd2_journal_write_metadata_buffer
Michal Pecio <michal.pecio(a)gmail.com>
media: uvcvideo: Fix the bandwdith quirk on USB 3.x
Ricardo Ribalda <ribalda(a)chromium.org>
media: uvcvideo: Ignore empty TS packets
Ma Jun <Jun.Ma2(a)amd.com>
drm/amdgpu/pm: Fix the null pointer dereference in apply_state_adjust_rules
Ma Jun <Jun.Ma2(a)amd.com>
drm/amdgpu: Fix the null pointer dereference to ras_manager
Filipe Manana <fdmanana(a)suse.com>
btrfs: fix bitmap leak when loading free space cache on duplicate entry
Johannes Berg <johannes.berg(a)intel.com>
wifi: nl80211: don't give key data to userspace
Roman Smirnov <r.smirnov(a)omp.ru>
udf: prevent integer overflow in udf_bitmap_free_blocks()
FUJITA Tomonori <fujita.tomonori(a)gmail.com>
PCI: Add Edimax Vendor ID to pci_ids.h
Yonghong Song <yonghong.song(a)linux.dev>
selftests/bpf: Fix send_signal test with nested CONFIG_PARAVIRT
Thomas Weißschuh <linux(a)weissschuh.net>
ACPI: SBS: manage alarm sysfs attribute through psy core
Thomas Weißschuh <linux(a)weissschuh.net>
ACPI: battery: create alarm sysfs attribute atomically
Niklas Söderlund <niklas.soderlund+renesas(a)ragnatech.se>
clocksource/drivers/sh_cmt: Address race condition for clock events
Yu Kuai <yukuai3(a)huawei.com>
md/raid5: avoid BUG_ON() while continue reshape after reassembling
Li Nan <linan122(a)huawei.com>
md: do not delete safemode_timer in mddev_suspend
Paul E. McKenney <paulmck(a)kernel.org>
rcutorture: Fix rcu_torture_fwd_cb_cr() data race
Csókás, Bence <csokas.bence(a)prolan.hu>
net: fec: Stop PPS on driver remove
James Chapman <jchapman(a)katalix.com>
l2tp: fix lockdep splat
Joe Hattori <joe(a)pf.is.s.u-tokyo.ac.jp>
net: dsa: bcm_sf2: Fix a possible memory leak in bcm_sf2_mdio_register()
Dmitry Antipov <dmantipov(a)yandex.ru>
Bluetooth: l2cap: always unlock channel in l2cap_conless_channel()
Eric Dumazet <edumazet(a)google.com>
net: linkwatch: use system_unbound_wq
Daniele Palmas <dnlplm(a)gmail.com>
net: usb: qmi_wwan: fix memory leak for not ip packets
Kuniyuki Iwashima <kuniyu(a)amazon.com>
sctp: Fix null-ptr-deref in reuseport_add_sock().
Xin Long <lucien.xin(a)gmail.com>
sctp: move hlist_node and hashent out of sctp_ep_common
Peter Zijlstra <peterz(a)infradead.org>
x86/mm: Fix pti_clone_entry_text() for i386
Peter Zijlstra <peterz(a)infradead.org>
x86/mm: Fix pti_clone_pgtable() alignment assumption
Yipeng Zou <zouyipeng(a)huawei.com>
irqchip/mbigen: Fix mbigen node address layout
Marc Zyngier <maz(a)kernel.org>
genirq: Allow irq_chip registration functions to take a const irq_chip
Alexander Maltsev <keltar.gw(a)gmail.com>
netfilter: ipset: Add list flush to cancel_gc
Paolo Abeni <pabeni(a)redhat.com>
mptcp: fix duplicate data handling
Heiner Kallweit <hkallweit1(a)gmail.com>
r8169: don't increment tx_dropped in case of NETDEV_TX_BUSY
Ma Ke <make24(a)iscas.ac.cn>
net: usb: sr9700: fix uninitialized variable use in sr_mdio_read
Mavroudis Chatzilazaridis <mavchatz(a)protonmail.com>
ALSA: hda/realtek: Add quirk for Acer Aspire E5-574G
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Correct surround channels in UAC1 channel map
Al Viro <viro(a)zeniv.linux.org.uk>
protect the fetch of ->fd[fd] in do_dup2() from mispredictions
Tatsunosuke Tobita <tatsunosuke.tobita(a)wacom.com>
HID: wacom: Modify pen IDs
Patryk Duda <patrykd(a)google.com>
platform/chrome: cros_ec_proto: Lock device when updating MKBP version
Zhe Qiao <qiaozhe(a)iscas.ac.cn>
riscv/mm: Add handling for VM_FAULT_SIGSEGV in mm_fault_error()
Maciej Żenczykowski <maze(a)google.com>
ipv6: fix ndisc_is_useropt() handling for PIO
Shahar Shitrit <shshitrit(a)nvidia.com>
net/mlx5e: Add a check for the return value from mlx5_port_set_eth_ptys
Alexandra Winter <wintera(a)linux.ibm.com>
net/iucv: fix use after free in iucv_sock_close()
Eric Dumazet <edumazet(a)google.com>
sched: act_ct: take care of padding in struct zones_ht_key
Ian Forbes <ian.forbes(a)broadcom.com>
drm/vmwgfx: Fix overlay when using Screen Targets
Danilo Krummrich <dakr(a)kernel.org>
drm/nouveau: prime: fix refcount underflow
Aleksandr Mishin <amishin(a)t-argos.ru>
remoteproc: imx_rproc: Skip over memory region when node value is NULL
Dong Aisheng <aisheng.dong(a)nxp.com>
remoteproc: imx_rproc: Fix ignoring mapping vdev regions
Peng Fan <peng.fan(a)nxp.com>
remoteproc: imx_rproc: ignore mapping vdev regions
Shenwei Wang <shenwei.wang(a)nxp.com>
irqchip/imx-irqsteer: Handle runtime power management correctly
Lucas Stach <l.stach(a)pengutronix.de>
irqchip/imx-irqsteer: Add runtime PM support
Lucas Stach <l.stach(a)pengutronix.de>
irqchip/imx-irqsteer: Constify irq_chip struct
Marc Zyngier <maz(a)kernel.org>
genirq: Allow the PM device to originate from irq domain
Zijun Hu <quic_zijuhu(a)quicinc.com>
devres: Fix memory leakage caused by driver API devm_free_percpu()
Andy Shevchenko <andriy.shevchenko(a)linux.intel.com>
driver core: Cast to (void *) with __force for __percpu pointer
Jay Buddhabhatti <jay.buddhabhatti(a)amd.com>
drivers: soc: xilinx: check return status of get_api_version()
Michael Tretter <m.tretter(a)pengutronix.de>
soc: xilinx: move PM_INIT_FINALIZE to zynqmp_pm_domains driver
Zhang Yi <yi.zhang(a)huawei.com>
ext4: check the extent status again before inserting delalloc block
Zhang Yi <yi.zhang(a)huawei.com>
ext4: factor out a common helper to query extent map
Thomas Weißschuh <linux(a)weissschuh.net>
sysctl: always initialize i_uid/i_gid
Eric Sandeen <sandeen(a)redhat.com>
fuse: verify {g,u}id mount options correctly
Miklos Szeredi <mszeredi(a)redhat.com>
fuse: name fs_context consistently
Esben Haabendal <esben(a)geanix.com>
powerpc/configs: Update defconfig with now user-visible CONFIG_FSL_IFC
Seth Forshee (DigitalOcean) <sforshee(a)kernel.org>
fs: don't allow non-init s_user_ns for filesystems without FS_USERNS_MOUNT
Leon Romanovsky <leon(a)kernel.org>
nvme-pci: add missing condition check for existence of mapped data
Jens Axboe <axboe(a)kernel.dk>
nvme: split command copy into a helper
Gerd Bayer <gbayer(a)linux.ibm.com>
s390/pci: Allow allocation of more than 1 MSI interrupt
Gerd Bayer <gbayer(a)linux.ibm.com>
s390/pci: Refactor arch_setup_msi_irqs()
Thomas Gleixner <tglx(a)linutronix.de>
s390/pci: Rework MSI descriptor walk
Thomas Gleixner <tglx(a)linutronix.de>
s390/pci: Do not mask MSI[-X] entries on teardown
ethanwu <ethanwu(a)synology.com>
ceph: fix incorrect kmalloc size of pagevec mempool
Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>
ASoC: Intel: use soc_intel_is_byt_cr() only when IOSF_MBI is reachable
Al Viro <viro(a)zeniv.linux.org.uk>
lirc: rc_dev_get_from_fd(): fix file leak
Al Viro <viro(a)zeniv.linux.org.uk>
powerpc: fix a file leak in kvm_vcpu_ioctl_enable_cap()
Xiao Liang <shaw.leon(a)gmail.com>
apparmor: Fix null pointer deref when receiving skb during sock creation
Dan Carpenter <dan.carpenter(a)linaro.org>
mISDN: Fix a use after free in hfcmulti_tx()
Fred Li <dracodingfly(a)gmail.com>
bpf: Fix a segment issue when downgrading gso_size
Petr Machata <petrm(a)nvidia.com>
net: nexthop: Initialize all fields in dumped nexthops
Simon Horman <horms(a)kernel.org>
net: stmmac: Correct byte order of perfect_match
Shigeru Yoshida <syoshida(a)redhat.com>
tipc: Return non-zero value from tipc_udp_addr2str() on error
Florian Westphal <fw(a)strlen.de>
netfilter: nft_set_pipapo_avx2: disable softinterrupts
Johannes Berg <johannes.berg(a)intel.com>
net: bonding: correctly annotate RCU in bond_should_notify_peers()
Ido Schimmel <idosch(a)nvidia.com>
ipv4: Fix incorrect source address in Record Route option
Gregory CLEMENT <gregory.clement(a)bootlin.com>
MIPS: SMP-CPS: Fix address for GCR_ACCESS register for CM3 and later
Lance Richardson <rlance(a)google.com>
dma: fix call order in dmam_free_coherent
Andrii Nakryiko <andrii(a)kernel.org>
libbpf: Fix no-args func prototype BTF dumping syntax
Sheng Yong <shengyong(a)oppo.com>
f2fs: fix start segno of large section
Johannes Berg <johannes.berg(a)intel.com>
um: time-travel: fix time-travel-start option
Jeongjun Park <aha310510(a)gmail.com>
jfs: Fix array-index-out-of-bounds in diFree
Douglas Anderson <dianders(a)chromium.org>
kdb: Use the passed prompt in kdb_position_cursor()
Arnd Bergmann <arnd(a)arndb.de>
kdb: address -Wformat-security warnings
Pavel Begunkov <asml.silence(a)gmail.com>
kernel: rerun task_work while freezing in get_signal()
Pavel Begunkov <asml.silence(a)gmail.com>
io_uring/io-wq: limit retrying worker initialisation
Ryusuke Konishi <konishi.ryusuke(a)gmail.com>
nilfs2: handle inconsistent state in nilfs_btnode_create_block()
WangYuli <wangyuli(a)uniontech.com>
Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x13d3:0x3591
Hilda Wu <hildawu(a)realtek.com>
Bluetooth: btusb: Add RTL8852BE device 0489:e125 to device tables
Ilya Dryomov <idryomov(a)gmail.com>
rbd: don't assume RBD_LOCK_STATE_LOCKED for exclusive mappings
Ilya Dryomov <idryomov(a)gmail.com>
rbd: rename RBD_LOCK_STATE_RELEASING and releasing_wait
Dragan Simic <dsimic(a)manjaro.org>
drm/panfrost: Mark simple_ondemand governor as softdep
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
MIPS: Loongson64: env: Hook up Loongsson-2K
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
MIPS: ip30: ip30-console: Add missing include
Ilya Dryomov <idryomov(a)gmail.com>
rbd: don't assume rbd_is_lock_owner() for exclusive mappings
Michael Ellerman <mpe(a)ellerman.id.au>
selftests/sigaltstack: Fix ppc64 GCC build
Bart Van Assche <bvanassche(a)acm.org>
RDMA/iwcm: Fix a use-after-free related to destroying CM IDs
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
platform: mips: cpu_hwmon: Disable driver on unsupported hardware
Thomas Gleixner <tglx(a)linutronix.de>
watchdog/perf: properly initialize the turbo mode timestamp and rearm counter
Joy Chakraborty <joychakr(a)google.com>
rtc: isl1208: Fix return value of nvmem callbacks
Adrian Hunter <adrian.hunter(a)intel.com>
perf/x86/intel/pt: Fix a topa_entry base address calculation
Marco Cavenati <cavenati.marco(a)gmail.com>
perf/x86/intel/pt: Fix topa_entry base length
Nilesh Javali <njavali(a)marvell.com>
scsi: qla2xxx: validate nvme_local_port correctly
Shreyas Deodhar <sdeodhar(a)marvell.com>
scsi: qla2xxx: Complete command early within lock
Quinn Tran <qutran(a)marvell.com>
scsi: qla2xxx: Fix flash read failure
Shreyas Deodhar <sdeodhar(a)marvell.com>
scsi: qla2xxx: Fix for possible memory corruption
Manish Rangankar <mrangankar(a)marvell.com>
scsi: qla2xxx: During vport delete send async logout explicitly
Joy Chakraborty <joychakr(a)google.com>
rtc: cmos: Fix return value of nvmem callbacks
Zijun Hu <quic_zijuhu(a)quicinc.com>
devres: Fix devm_krealloc() wasting memory
Zijun Hu <quic_zijuhu(a)quicinc.com>
kobject_uevent: Fix OOB access within zap_modalias_env()
Nathan Chancellor <nathan(a)kernel.org>
kbuild: Fix '-S -c' in x86 stack protector scripts
Ross Lagerwall <ross.lagerwall(a)citrix.com>
decompress_bunzip2: fix rare decompression failure
Fedor Pchelkin <pchelkin(a)ispras.ru>
ubi: eba: properly rollback inside self_check_eba
Bastien Curutchet <bastien.curutchet(a)bootlin.com>
clk: davinci: da8xx-cfgchip: Initialize clk_init_data before use
Chao Yu <chao(a)kernel.org>
f2fs: fix to don't dirty inode for readonly filesystem
Saurav Kashyap <skashyap(a)marvell.com>
scsi: qla2xxx: Return ENOBUFS if sg_cnt is more than one for ELS cmds
tuhaowen <tuhaowen(a)uniontech.com>
dev/parport: fix the array out-of-bounds risk
Carlos Llamas <cmllamas(a)google.com>
binder: fix hang of unregistered readers
Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org>
PCI: rockchip: Use GPIOD_OUT_LOW flag while requesting ep_gpio
Wei Liu <wei.liu(a)kernel.org>
PCI: hv: Return zero, not garbage, when reading PCI_INTERRUPT_PIN
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
hwrng: amd - Convert PCIBIOS_* return codes to errnos
Alan Stern <stern(a)rowland.harvard.edu>
tools/memory-model: Fix bug in lock.cat
Sean Christopherson <seanjc(a)google.com>
KVM: VMX: Split out the non-virtualization part of vmx_interrupt_blocked()
Jan Kara <jack(a)suse.cz>
jbd2: make jbd2_journal_get_max_txn_bufs() internal
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
leds: ss4200: Convert PCIBIOS_* return codes to errnos
Rafael Beims <rafael.beims(a)toradex.com>
wifi: mwifiex: Fix interface type change
Baokun Li <libaokun1(a)huawei.com>
ext4: make sure the first directory block is not a hole
Baokun Li <libaokun1(a)huawei.com>
ext4: check dot and dotdot of dx_root before making dir indexed
Paolo Pisati <p.pisati(a)gmail.com>
m68k: amiga: Turn off Warp1260 interrupts during boot
Jan Kara <jack(a)suse.cz>
udf: Avoid using corrupted block bitmap buffer
Frederic Weisbecker <frederic(a)kernel.org>
task_work: Introduce task_work_cancel() again
Frederic Weisbecker <frederic(a)kernel.org>
task_work: s/task_work_cancel()/task_work_cancel_func()/
Fedor Pchelkin <pchelkin(a)ispras.ru>
apparmor: use kvfree_sensitive to free data->data
Pierre Gondois <pierre.gondois(a)arm.com>
sched/fair: Use all little CPUs for CPU-bound workloads
Sung Joon Kim <sungjoon.kim(a)amd.com>
drm/amd/display: Check for NULL pointer
Shreyas Deodhar <sdeodhar(a)marvell.com>
scsi: qla2xxx: Fix optrom version displayed in FDMI
Ma Ke <make24(a)iscas.ac.cn>
drm/gma500: fix null pointer dereference in psb_intel_lvds_get_modes
Ma Ke <make24(a)iscas.ac.cn>
drm/gma500: fix null pointer dereference in cdv_intel_lvds_get_modes
Jan Kara <jack(a)suse.cz>
ext2: Verify bitmap and itable block numbers before using them
Chao Yu <chao(a)kernel.org>
hfs: fix to initialize fields of hfs_inode_info after hfs_alloc_inode()
Dikshita Agarwal <quic_dikshita(a)quicinc.com>
media: venus: fix use after free in vdec_close
Joe Hattori <joe(a)pf.is.s.u-tokyo.ac.jp>
char: tpm: Fix possible memory leak in tpm_bios_measurements_open()
Tejun Heo <tj(a)kernel.org>
sched/fair: set_load_weight() must also call reweight_task() for SCHED_IDLE tasks
Nicolas Dichtel <nicolas.dichtel(a)6wind.com>
ipv6: take care of scope when choosing the src addr
Chengen Du <chengen.du(a)canonical.com>
af_packet: Handle outgoing VLAN packets without hardware offloading
Breno Leitao <leitao(a)debian.org>
net: netconsole: Disable target before netpoll cleanup
Yu Liao <liaoyu15(a)huawei.com>
tick/broadcast: Make takeover of broadcast hrtimer reliable
Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>
dt-bindings: thermal: correct thermal zone node name limit
Csókás, Bence <csokas.bence(a)prolan.hu>
rtc: interface: Add RTC offset to alarm after fix-up
Ryusuke Konishi <konishi.ryusuke(a)gmail.com>
nilfs2: avoid undefined behavior in nilfs_cnt32_ge macro
Alex Shi <alex.shi(a)linux.alibaba.com>
fs/nilfs2: remove some unused macros to tame gcc
David Hildenbrand <david(a)redhat.com>
fs/proc/task_mmu: indicate PM_FILE for PMD-mapped file THP
Peng Fan <peng.fan(a)nxp.com>
pinctrl: freescale: mxs: Fix refcount of child
Yang Yingliang <yangyingliang(a)huawei.com>
pinctrl: ti: ti-iodelay: fix possible memory leak when pinctrl_enable() fails
Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de>
pinctrl: ti: ti-iodelay: Drop if block with always false condition
Yang Yingliang <yangyingliang(a)huawei.com>
pinctrl: single: fix possible memory leak when pinctrl_enable() fails
Yang Yingliang <yangyingliang(a)huawei.com>
pinctrl: core: fix possible memory leak when pinctrl_enable() fails
Dmitry Yashin <dmt.yashin(a)gmail.com>
pinctrl: rockchip: update rk3308 iomux routes
Martin Willi <martin(a)strongswan.org>
net: dsa: b53: Limit chip-wide jumbo frame config to CPU ports
Martin Willi <martin(a)strongswan.org>
net: dsa: mv88e6xxx: Limit chip-wide frame size config to CPU ports
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: ctnetlink: use helper function to calculate expect ID
Jack Wang <jinpu.wang(a)ionos.com>
bnxt_re: Fix imm_data endianness
Chengchang Tang <tangchengchang(a)huawei.com>
RDMA/hns: Fix missing pagesize and alignment check in FRMR
Nick Bowler <nbowler(a)draconx.ca>
macintosh/therm_windtunnel: fix module unload.
Michael Ellerman <mpe(a)ellerman.id.au>
powerpc/xmon: Fix disassembly CPU feature checks
Dominique Martinet <dominique.martinet(a)atmark-techno.com>
MIPS: Octeron: remove source file executable bit
Dmitry Torokhov <dmitry.torokhov(a)gmail.com>
Input: elan_i2c - do not leave interrupt disabled on suspend failure
Leon Romanovsky <leon(a)kernel.org>
RDMA/device: Return error earlier if port in not valid
Arnd Bergmann <arnd(a)arndb.de>
mtd: make mtd_test.c a separate module
Chen Ni <nichen(a)iscas.ac.cn>
ASoC: max98088: Check for clk_prepare_enable() error
Honggang LI <honggangli(a)163.com>
RDMA/rxe: Don't set BTH_ACK_MASK for UC or UD QPs
Leon Romanovsky <leon(a)kernel.org>
RDMA/mlx4: Fix truncated output warning in alias_GUID.c
Leon Romanovsky <leon(a)kernel.org>
RDMA/mlx4: Fix truncated output warning in mad.c
Andrei Lalaev <andrei.lalaev(a)anton-paar.com>
Input: qt1050 - handle CHIP_ID reading error
James Clark <james.clark(a)arm.com>
coresight: Fix ref leak when of_coresight_parse_endpoint() fails
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
PCI: Fix resource double counting on remove & rescan
Benjamin Coddington <bcodding(a)redhat.com>
SUNRPC: Fixup gss_status tracepoint error output
Andreas Larsson <andreas(a)gaisler.com>
sparc64: Fix incorrect function signature and add prototype for prom_cif_init
Jan Kara <jack(a)suse.cz>
ext4: avoid writing unitialized memory to disk in EA inodes
NeilBrown <neilb(a)suse.de>
SUNRPC: avoid soft lockup when transmitting UDP to reachable server.
Chuck Lever <chuck.lever(a)oracle.com>
xprtrdma: Fix rpcrdma_reqs_reset()
Chuck Lever <chuck.lever(a)oracle.com>
xprtrdma: Rename frwr_release_mr()
Javier Carrasco <javier.carrasco.cruz(a)gmail.com>
mfd: omap-usb-tll: Use struct_size to allocate tll
Dikshita Agarwal <quic_dikshita(a)quicinc.com>
media: venus: flush all buffers in output plane streamoff
Luis Henriques (SUSE) <luis.henriques(a)linux.dev>
ext4: fix infinite loop when replaying fast_commit
Luca Ceresoli <luca.ceresoli(a)bootlin.com>
Revert "leds: led-core: Fix refcount leak in of_led_get()"
Chen Ni <nichen(a)iscas.ac.cn>
drm/qxl: Add check for drm_cvt_mode
Lucas Stach <l.stach(a)pengutronix.de>
drm/etnaviv: fix DMA direction handling for cached RW buffers
Namhyung Kim <namhyung(a)kernel.org>
perf report: Fix condition in sort__sym_cmp()
Hans de Goede <hdegoede(a)redhat.com>
leds: trigger: Unregister sysfs attributes before calling deactivate()
Laurent Pinchart <laurent.pinchart+renesas(a)ideasonboard.com>
media: renesas: vsp1: Store RPF partition configuration per RPF instance
Laurent Pinchart <laurent.pinchart+renesas(a)ideasonboard.com>
media: renesas: vsp1: Fix _irqsave and _irq mix
Daniel Schaefer <dhs(a)frame.work>
media: uvcvideo: Override default flags
Ricardo Ribalda <ribalda(a)chromium.org>
media: uvcvideo: Allow entity-defined get_info and get_cur
Aleksandr Burakov <a.burakov(a)rosalinux.ru>
saa7134: Unchecked i2c_transfer function result fixed
Claudio Imbrenda <imbrenda(a)linux.ibm.com>
KVM: s390: fix race in gmap_make_secure()
Claudio Imbrenda <imbrenda(a)linux.ibm.com>
KVM: s390: pv: add export before import
Claudio Imbrenda <imbrenda(a)linux.ibm.com>
KVM: s390: pv: properly handle page flags for protected guests
Claudio Imbrenda <imbrenda(a)linux.ibm.com>
KVM: s390: pv: avoid stalls when making pages secure
Ricardo Ribalda <ribalda(a)chromium.org>
media: imon: Fix race getting ictx->lock
Zheng Yejian <zhengyejian1(a)huawei.com>
media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()
Douglas Anderson <dianders(a)chromium.org>
drm/panel: boe-tv101wum-nl6: Check for errors on the NOP in prepare()
Douglas Anderson <dianders(a)chromium.org>
drm/panel: boe-tv101wum-nl6: If prepare fails, disable GPIO before regulators
Taehee Yoo <ap420073(a)gmail.com>
xdp: fix invalid wait context of page_pool_destroy()
Amit Cohen <amcohen(a)nvidia.com>
selftests: forwarding: devlink_lib: Wait for udev events after reloading
Alan Maguire <alan.maguire(a)oracle.com>
bpf: Eliminate remaining "make W=1" warnings in kernel/bpf/btf.o
Alexey Kodanev <aleksei.kodanev(a)bell-sw.com>
bna: adjust 'name' buf size of bna_tcb and bna_ccb structures
Alan Maguire <alan.maguire(a)oracle.com>
bpf: annotate BTF show functions with __printf
Geliang Tang <tanggeliang(a)kylinos.cn>
selftests/bpf: Close fd in error path in drop_on_reuseport
Johannes Berg <johannes.berg(a)intel.com>
wifi: virt_wifi: don't use strlen() in const context
Gaosheng Cui <cuigaosheng1(a)huawei.com>
gss_krb5: Fix the error handling path for crypto_sync_skcipher_setkey
En-Wei Wu <en-wei.wu(a)canonical.com>
wifi: virt_wifi: avoid reporting connection success with wrong SSID
Shai Malin <smalin(a)marvell.com>
qed: Improve the stack space of filter_config()
Adrian Hunter <adrian.hunter(a)intel.com>
perf: Prevent passing zero nr_pages to rb_alloc_aux()
Adrian Hunter <adrian.hunter(a)intel.com>
perf: Fix perf_aux_size() for greater-than 32-bit size
Adrian Hunter <adrian.hunter(a)intel.com>
perf/x86/intel/pt: Fix pt_topa_entry_for_page() address calculation
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: nf_tables: rise cap on SELinux secmark context
Ismael Luceno <iluceno(a)suse.de>
ipvs: Avoid unnecessary calls to skb_is_gso_sctp
Csókás, Bence <csokas.bence(a)prolan.hu>
net: fec: Fix FEC_ECR_EN1588 being cleared on link-down
Csókás Bence <csokas.bence(a)prolan.hu>
net: fec: Refactor: #define magic constants
Baochen Qiang <quic_bqiang(a)quicinc.com>
wifi: cfg80211: handle 2x996 RU allocation in cfg80211_calculate_bitrate_he()
Baochen Qiang <quic_bqiang(a)quicinc.com>
wifi: cfg80211: fix typo in cfg80211_calculate_bitrate_he()
Baochen Qiang <quic_bqiang(a)quicinc.com>
wifi: ath11k: fix wrong handling of CCMP256 and GCMP ciphers
Carl Huang <cjhuang(a)codeaurora.org>
ath11k: dp: stop rx pktlog before suspend
Ido Schimmel <idosch(a)nvidia.com>
mlxsw: spectrum_acl: Fix ACL scale regression and firmware errors
Amit Cohen <amcohen(a)nvidia.com>
mlxsw: spectrum_acl_bloom_filter: Make mlxsw_sp_acl_bf_key_encode() more flexible
Ido Schimmel <idosch(a)nvidia.com>
mlxsw: spectrum_acl_erp: Fix object nesting warning
Ido Schimmel <idosch(a)nvidia.com>
lib: objagg: Fix general protection fault
Geliang Tang <tanggeliang(a)kylinos.cn>
selftests/bpf: Check length of recv in test_sockmap
Guangguan Wang <guangguan.wang(a)linux.alibaba.com>
net/smc: set rmb's SG_MAX_SINGLE_ALLOC limitation only when CONFIG_ARCH_NO_SG_CHAIN is defined
Stefan Raspl <raspl(a)linux.ibm.com>
net/smc: Allow SMC-D 1MB DMB allocations
Hagar Hemdan <hagarhem(a)amazon.com>
net: esp: cleanup esp_output_tail_tcp() in case of unsupported ESPINTCP
Geliang Tang <tanggeliang(a)kylinos.cn>
selftests/bpf: Fix prog numbers in test_sockmap
Samasth Norway Ananda <samasth.norway.ananda(a)oracle.com>
wifi: brcmsmac: LCN PHY code is used for BCM4313 2G-only device
Marek Behún <kabel(a)kernel.org>
firmware: turris-mox-rwtm: Initialize completion before mailbox
Marek Behún <kabel(a)kernel.org>
firmware: turris-mox-rwtm: Fix checking return value of wait_for_completion_timeout()
Dmitry Torokhov <dmitry.torokhov(a)gmail.com>
ARM: spitz: fix GPIO assignment for backlight
Arnd Bergmann <arnd(a)arndb.de>
ARM: pxa: spitz: use gpio descriptors for audio
Thorsten Blum <thorsten.blum(a)toblux.com>
m68k: cmpxchg: Fix return value for default case in __arch_xchg()
Chen Ni <nichen(a)iscas.ac.cn>
x86/xen: Convert comma to semicolon
Eero Tamminen <oak(a)helsinkinet.fi>
m68k: atari: Fix TT bootup freeze / unexpected (SCU) interrupt messages
Jerome Brunet <jbrunet(a)baylibre.com>
arm64: dts: amlogic: gx: correct hdmi clocks
Rafał Miłecki <rafal(a)milecki.pl>
arm64: dts: mediatek: mt7622: fix "emmc" pinctrl mux
Chen-Yu Tsai <wenst(a)chromium.org>
arm64: dts: mediatek: mt8183-kukui: Drop bogus output-enable property
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix PCIe reset polarity
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix SPI0 chip selects
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix board reset
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix PHY reset
Marco Felsch <m.felsch(a)pengutronix.de>
ARM: dts: imx6qdl-kontron-samx6i: move phy reset into phy-node
Jonas Karlman <jonas(a)kwiboo.se>
arm64: dts: rockchip: Increase VOP clk rate on RK3328
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
soc: qcom: pdr: fix parsing of domains lists
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
soc: qcom: pdr: protect locator_addr with the main mutex
Esben Haabendal <esben(a)geanix.com>
memory: fsl_ifc: Make FSL_IFC config visible and selectable
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: msm8996: specify UFS core_clk frequencies
Stephen Boyd <swboyd(a)chromium.org>
soc: qcom: rpmh-rsc: Ensure irqs aren't disabled by rpmh_rsc_send_data() callers
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: sdm845: add power-domain to UFS PHY
Guenter Roeck <linux(a)roeck-us.net>
hwmon: (max6697) Fix swapped temp{1,8} critical alarms
Guenter Roeck <linux(a)roeck-us.net>
hwmon: (max6697) Fix underflow when writing limit attributes
Uwe Kleine-König <u.kleine-koenig(a)baylibre.com>
pwm: stm32: Always do lazy disabling
Wayne Tung <chineweff(a)gmail.com>
hwmon: (adt7475) Fix default duty on fan is disabled
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/platform/iosf_mbi: Convert PCIBIOS_* return codes to errnos
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/pci/xen: Fix PCIBIOS_* return code handling
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/pci/intel_mid_pci: Fix PCIBIOS_* return code handling
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/of: Return consistent error type from x86_of_pci_irq_enable()
Chao Yu <chao(a)kernel.org>
hfsplus: fix to avoid false alarm of circular locking
Tzung-Bi Shih <tzungbi(a)kernel.org>
platform/chrome: cros_ec_debugfs: fix wrong EC message version
Arnd Bergmann <arnd(a)arndb.de>
EDAC, i10nm: make skx_common.o a separate module
Qiuxu Zhuo <qiuxu.zhuo(a)intel.com>
EDAC/skx_common: Add new ADXL components for 2-level memory
-------------
Diffstat:
Documentation/arm64/cpu-feature-registers.rst | 38 +++++-
Documentation/arm64/silicon-errata.rst | 36 +++++
.../devicetree/bindings/thermal/thermal-zones.yaml | 5 +-
Makefile | 4 +-
arch/arm/boot/dts/imx6q-kontron-samx6i.dtsi | 23 ----
arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 26 +++-
arch/arm/mach-pxa/spitz.c | 39 ++++--
arch/arm/mach-pxa/{include/mach => }/spitz.h | 2 +-
arch/arm/mach-pxa/spitz_pm.c | 2 +-
arch/arm64/Kconfig | 38 ++++++
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 4 +-
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 4 +-
.../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 4 +-
arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 4 +-
arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 2 -
arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 4 +-
arch/arm64/include/asm/cpucaps.h | 3 +-
arch/arm64/include/asm/cputype.h | 16 +++
arch/arm64/kernel/cpu_errata.c | 31 +++++
arch/arm64/kernel/cpufeature.c | 94 ++++++++++---
arch/arm64/kernel/proton-pack.c | 12 ++
arch/m68k/amiga/config.c | 9 ++
arch/m68k/atari/ataints.c | 6 +-
arch/m68k/include/asm/cmpxchg.h | 2 +-
arch/mips/include/asm/mach-loongson64/boot_param.h | 2 +
arch/mips/include/asm/mips-cm.h | 4 +
arch/mips/kernel/smp-cps.c | 5 +-
arch/mips/loongson64/env.c | 8 ++
arch/mips/pci/pcie-octeon.c | 0
arch/mips/sgi-ip30/ip30-console.c | 1 +
arch/powerpc/configs/85xx-hw.config | 2 +
arch/powerpc/include/asm/percpu.h | 10 ++
arch/powerpc/kernel/mce.c | 14 +-
arch/powerpc/kernel/setup_64.c | 2 +
arch/powerpc/kernel/traps.c | 8 +-
arch/powerpc/kvm/powerpc.c | 4 +-
arch/powerpc/xmon/ppc-dis.c | 33 ++---
arch/riscv/mm/fault.c | 17 +--
arch/s390/include/asm/pgtable.h | 9 +-
arch/s390/include/asm/uv.h | 10 +-
arch/s390/kernel/uv.c | 119 ++++++++++++----
arch/s390/kvm/intercept.c | 5 +
arch/s390/mm/gmap.c | 4 +-
arch/s390/pci/pci_irq.c | 120 ++++++++++-------
arch/sparc/include/asm/oplib_64.h | 1 +
arch/sparc/prom/init_64.c | 3 -
arch/sparc/prom/p1275.c | 2 +-
arch/um/kernel/time.c | 4 +-
arch/x86/events/intel/pt.c | 4 +-
arch/x86/events/intel/pt.h | 4 +-
arch/x86/kernel/cpu/mtrr/mtrr.c | 2 +-
arch/x86/kernel/devicetree.c | 2 +-
arch/x86/kvm/vmx/vmx.c | 11 +-
arch/x86/kvm/vmx/vmx.h | 1 +
arch/x86/mm/pti.c | 8 +-
arch/x86/pci/intel_mid_pci.c | 4 +-
arch/x86/pci/xen.c | 4 +-
arch/x86/platform/intel/iosf_mbi.c | 4 +-
arch/x86/xen/p2m.c | 4 +-
drivers/acpi/battery.c | 16 ++-
drivers/acpi/sbs.c | 23 ++--
drivers/android/binder.c | 4 +-
drivers/base/core.c | 13 +-
drivers/base/devres.c | 13 +-
drivers/base/module.c | 4 +
drivers/block/rbd.c | 35 +++--
drivers/bluetooth/btusb.c | 4 +
drivers/char/hw_random/amd-rng.c | 4 +-
drivers/char/tpm/eventlog/common.c | 2 +
drivers/clk/davinci/da8xx-cfgchip.c | 4 +-
drivers/clocksource/sh_cmt.c | 13 +-
drivers/edac/Makefile | 10 +-
drivers/edac/skx_common.c | 88 ++++++++++--
drivers/edac/skx_common.h | 15 ++-
drivers/firmware/turris-mox-rwtm.c | 18 +--
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 7 +-
drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 3 +-
.../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 7 +-
.../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 14 +-
.../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 7 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 5 +-
drivers/gpu/drm/drm_client_modeset.c | 5 +
drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 +-
drivers/gpu/drm/gma500/cdv_intel_lvds.c | 3 +
drivers/gpu/drm/gma500/psb_intel_lvds.c | 3 +
drivers/gpu/drm/i915/gem/i915_gem_mman.c | 53 +++++++-
drivers/gpu/drm/mgag200/mgag200_i2c.c | 2 +-
drivers/gpu/drm/nouveau/nouveau_prime.c | 3 +-
drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 8 +-
drivers/gpu/drm/panfrost/panfrost_drv.c | 1 +
drivers/gpu/drm/qxl/qxl_display.c | 3 +
drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 2 +-
drivers/hid/wacom_wac.c | 3 +-
drivers/hwmon/adt7475.c | 2 +-
drivers/hwmon/max6697.c | 5 +-
drivers/hwtracing/coresight/coresight-platform.c | 4 +-
drivers/i2c/i2c-smbus.c | 64 ++++++++-
drivers/infiniband/core/device.c | 6 +-
drivers/infiniband/core/iwcm.c | 11 +-
drivers/infiniband/hw/bnxt_re/ib_verbs.c | 8 +-
drivers/infiniband/hw/bnxt_re/qplib_fp.h | 6 +-
drivers/infiniband/hw/hns/hns_roce_device.h | 4 +
drivers/infiniband/hw/hns/hns_roce_mr.c | 5 +
drivers/infiniband/hw/mlx4/alias_GUID.c | 2 +-
drivers/infiniband/hw/mlx4/mad.c | 2 +-
drivers/infiniband/sw/rxe/rxe_req.c | 7 +-
drivers/input/keyboard/qt1050.c | 7 +-
drivers/input/mouse/elan_i2c_core.c | 2 +
drivers/irqchip/irq-imx-irqsteer.c | 40 +++++-
drivers/irqchip/irq-mbigen.c | 20 ++-
drivers/irqchip/irq-meson-gpio.c | 35 ++---
drivers/irqchip/irq-xilinx-intc.c | 2 +-
drivers/isdn/hardware/mISDN/hfcmulti.c | 7 +-
drivers/leds/led-class.c | 1 -
drivers/leds/led-triggers.c | 2 +-
drivers/leds/leds-ss4200.c | 7 +-
drivers/macintosh/therm_windtunnel.c | 2 +-
drivers/md/md.c | 1 -
drivers/md/raid5.c | 20 ++-
drivers/media/pci/saa7134/saa7134-dvb.c | 8 +-
drivers/media/platform/qcom/venus/vdec.c | 3 +-
drivers/media/platform/vsp1/vsp1_histo.c | 20 ++-
drivers/media/platform/vsp1/vsp1_pipe.h | 2 +-
drivers/media/platform/vsp1/vsp1_rpf.c | 8 +-
drivers/media/rc/imon.c | 5 +-
drivers/media/rc/lirc_dev.c | 4 +-
drivers/media/usb/uvc/uvc_ctrl.c | 90 ++++++++-----
drivers/media/usb/uvc/uvc_video.c | 37 ++++-
drivers/media/usb/uvc/uvcvideo.h | 5 +
drivers/memory/Kconfig | 2 +-
drivers/mfd/omap-usb-tll.c | 3 +-
drivers/mtd/nand/raw/Kconfig | 3 +-
drivers/mtd/tests/Makefile | 34 ++---
drivers/mtd/tests/mtd_test.c | 9 ++
drivers/mtd/ubi/eba.c | 3 +-
drivers/net/bonding/bond_main.c | 7 +-
drivers/net/dsa/b53/b53_common.c | 3 +
drivers/net/dsa/bcm_sf2.c | 4 +-
drivers/net/dsa/mv88e6xxx/chip.c | 3 +-
drivers/net/ethernet/brocade/bna/bna_types.h | 2 +-
drivers/net/ethernet/brocade/bna/bnad.c | 11 +-
drivers/net/ethernet/freescale/fec_main.c | 52 ++++---
drivers/net/ethernet/freescale/fec_ptp.c | 3 +
.../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 7 +-
.../ethernet/mellanox/mlxsw/spectrum_acl_atcam.c | 18 ++-
.../mellanox/mlxsw/spectrum_acl_bloom_filter.c | 38 ++++--
.../net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c | 13 --
.../ethernet/mellanox/mlxsw/spectrum_acl_tcam.h | 9 +-
drivers/net/ethernet/qlogic/qed/qed_l2.c | 23 +---
drivers/net/ethernet/qlogic/qede/qede_filter.c | 47 +++----
drivers/net/ethernet/realtek/r8169_main.c | 8 +-
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 +-
.../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 2 +-
drivers/net/ethernet/stmicro/stmmac/hwif.h | 2 +-
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 +-
drivers/net/netconsole.c | 2 +-
drivers/net/usb/qmi_wwan.c | 1 +
drivers/net/usb/sr9700.c | 11 +-
drivers/net/wireless/ath/ath11k/dp.h | 1 +
drivers/net/wireless/ath/ath11k/dp_rx.c | 51 ++++++-
drivers/net/wireless/ath/ath11k/dp_rx.h | 6 +
drivers/net/wireless/ath/ath11k/mac.c | 19 ++-
.../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 18 +--
drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 +
drivers/net/wireless/virt_wifi.c | 20 ++-
drivers/nvme/host/pci.c | 36 ++---
drivers/parport/procfs.c | 24 ++--
drivers/pci/controller/pci-hyperv.c | 4 +-
drivers/pci/controller/pcie-rockchip.c | 2 +-
drivers/pci/msi.c | 4 +-
drivers/pci/pci.c | 19 ++-
drivers/pci/setup-bus.c | 6 +-
drivers/pinctrl/core.c | 12 +-
drivers/pinctrl/freescale/pinctrl-mxs.c | 4 +-
drivers/pinctrl/pinctrl-rockchip.c | 17 +--
drivers/pinctrl/pinctrl-single.c | 7 +-
drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 14 +-
drivers/platform/chrome/cros_ec_debugfs.c | 1 +
drivers/platform/chrome/cros_ec_proto.c | 2 +
drivers/platform/mips/cpu_hwmon.c | 3 +
drivers/power/supply/axp288_charger.c | 24 ++--
drivers/pwm/pwm-stm32.c | 5 +-
drivers/remoteproc/imx_rproc.c | 5 +
drivers/rtc/interface.c | 9 +-
drivers/rtc/rtc-cmos.c | 10 +-
drivers/rtc/rtc-isl1208.c | 11 +-
drivers/s390/char/sclp_sd.c | 10 +-
drivers/scsi/mpt3sas/mpt3sas_base.c | 38 +++---
drivers/scsi/qla2xxx/qla_bsg.c | 2 +-
drivers/scsi/qla2xxx/qla_gs.c | 2 +-
drivers/scsi/qla2xxx/qla_init.c | 63 +++++++--
drivers/scsi/qla2xxx/qla_mid.c | 2 +-
drivers/scsi/qla2xxx/qla_nvme.c | 5 +-
drivers/scsi/qla2xxx/qla_os.c | 7 +-
drivers/scsi/qla2xxx/qla_sup.c | 108 ++++++++++-----
drivers/scsi/ufs/ufshcd.c | 11 +-
drivers/soc/qcom/pdr_interface.c | 8 +-
drivers/soc/qcom/rpmh-rsc.c | 7 +-
drivers/soc/qcom/rpmh.c | 1 -
drivers/soc/xilinx/zynqmp_pm_domains.c | 16 +++
drivers/soc/xilinx/zynqmp_power.c | 5 +-
drivers/spi/spi-fsl-lpspi.c | 6 +-
drivers/tty/serial/serial_core.c | 8 ++
drivers/usb/gadget/function/u_serial.c | 1 +
drivers/usb/gadget/udc/core.c | 10 +-
drivers/usb/serial/usb_debug.c | 7 +
drivers/usb/usbip/vhci_hcd.c | 9 +-
drivers/vhost/vdpa.c | 30 ++---
fs/btrfs/free-space-cache.c | 1 +
fs/ceph/super.c | 3 +-
fs/exec.c | 8 +-
fs/ext2/balloc.c | 11 +-
fs/ext4/extents_status.c | 2 +
fs/ext4/inode.c | 78 +++++++----
fs/ext4/mballoc.c | 3 +-
fs/ext4/namei.c | 73 +++++++---
fs/ext4/xattr.c | 6 +
fs/f2fs/inode.c | 3 +
fs/f2fs/segment.h | 3 +-
fs/file.c | 1 +
fs/fuse/control.c | 10 +-
fs/fuse/inode.c | 80 ++++++-----
fs/fuse/virtio_fs.c | 12 +-
fs/hfs/inode.c | 3 +
fs/hfsplus/bfind.c | 15 +--
fs/hfsplus/extents.c | 9 +-
fs/hfsplus/hfsplus_fs.h | 21 +++
fs/jbd2/commit.c | 2 +-
fs/jbd2/journal.c | 6 +
fs/jfs/jfs_imap.c | 5 +-
fs/nilfs2/btnode.c | 25 +++-
fs/nilfs2/btree.c | 4 +-
fs/nilfs2/segment.c | 7 +-
fs/proc/proc_sysctl.c | 6 +-
fs/proc/task_mmu.c | 2 +
fs/super.c | 11 ++
fs/udf/balloc.c | 51 +++----
fs/udf/super.c | 3 +-
include/linux/compiler_attributes.h | 1 +
include/linux/irq.h | 7 +-
include/linux/irqdomain.h | 10 ++
include/linux/jbd2.h | 5 -
include/linux/msi.h | 2 -
include/linux/objagg.h | 1 -
include/linux/pci_ids.h | 2 +
include/linux/qed/qed_eth_if.h | 21 ++-
include/linux/sched/signal.h | 6 +
include/linux/task_work.h | 3 +-
include/linux/trace_events.h | 1 -
include/net/netfilter/nf_tables.h | 25 +++-
include/net/sctp/sctp.h | 4 +-
include/net/sctp/structs.h | 8 +-
include/trace/events/rpcgss.h | 2 +-
include/uapi/linux/netfilter/nf_tables.h | 2 +-
include/uapi/linux/zorro_ids.h | 3 +
io_uring/io-wq.c | 10 +-
kernel/bpf/btf.c | 10 +-
kernel/debug/kdb/kdb_io.c | 6 +-
kernel/dma/mapping.c | 2 +-
kernel/events/core.c | 2 +
kernel/events/internal.h | 2 +-
kernel/irq/chip.c | 32 +++--
kernel/irq/irqdesc.c | 1 +
kernel/irq/manage.c | 2 +-
kernel/kprobes.c | 4 +-
kernel/padata.c | 7 +
kernel/rcu/rcutorture.c | 2 +-
kernel/sched/core.c | 23 ++--
kernel/sched/cputime.c | 6 +
kernel/sched/fair.c | 9 +-
kernel/sched/sched.h | 2 +-
kernel/signal.c | 8 ++
kernel/task_work.c | 34 ++++-
kernel/time/ntp.c | 9 +-
kernel/time/tick-broadcast.c | 24 ++++
kernel/trace/tracing_map.c | 6 +-
kernel/watchdog_hld.c | 11 +-
lib/decompress_bunzip2.c | 3 +-
lib/kobject_uevent.c | 17 ++-
lib/objagg.c | 18 +--
net/bluetooth/l2cap_core.c | 1 +
net/core/filter.c | 15 ++-
net/core/link_watch.c | 4 +-
net/core/xdp.c | 4 +-
net/ipv4/esp4.c | 3 +-
net/ipv4/nexthop.c | 7 +-
net/ipv4/route.c | 2 +-
net/ipv6/addrconf.c | 3 +-
net/ipv6/esp6.c | 3 +-
net/ipv6/ndisc.c | 34 ++---
net/iucv/af_iucv.c | 4 +-
net/l2tp/l2tp_core.c | 15 ++-
net/mptcp/mib.c | 2 +
net/mptcp/mib.h | 2 +
net/mptcp/options.c | 2 +-
net/mptcp/pm.c | 9 ++
net/mptcp/pm_netlink.c | 30 ++++-
net/mptcp/protocol.c | 10 +-
net/mptcp/protocol.h | 6 +-
net/mptcp/subflow.c | 24 +++-
net/netfilter/ipset/ip_set_list_set.c | 3 +
net/netfilter/ipvs/ip_vs_proto_sctp.c | 4 +-
net/netfilter/nf_conntrack_netlink.c | 3 +-
net/netfilter/nf_tables_api.c | 149 ++++-----------------
net/netfilter/nft_connlimit.c | 2 +-
net/netfilter/nft_counter.c | 4 +-
net/netfilter/nft_dynset.c | 2 +-
net/netfilter/nft_set_hash.c | 8 +-
net/netfilter/nft_set_pipapo.c | 18 ++-
net/netfilter/nft_set_pipapo_avx2.c | 12 +-
net/netfilter/nft_set_rbtree.c | 6 +-
net/packet/af_packet.c | 86 +++++++++++-
net/sched/act_ct.c | 4 +-
net/sctp/input.c | 48 +++----
net/sctp/proc.c | 10 +-
net/sctp/socket.c | 6 +-
net/smc/smc_core.c | 32 ++---
net/sunrpc/auth_gss/gss_krb5_keys.c | 2 +-
net/sunrpc/clnt.c | 3 +-
net/sunrpc/sched.c | 4 +-
net/sunrpc/xprtrdma/frwr_ops.c | 9 +-
net/sunrpc/xprtrdma/verbs.c | 20 ++-
net/sunrpc/xprtrdma/xprt_rdma.h | 2 +-
net/tipc/udp_media.c | 5 +-
net/wireless/nl80211.c | 16 +--
net/wireless/util.c | 8 +-
samples/Kconfig | 8 ++
samples/Makefile | 1 +
samples/fanotify/.gitignore | 1 +
samples/fanotify/Makefile | 5 +
samples/fanotify/fs-monitor.c | 142 ++++++++++++++++++++
scripts/gcc-x86_32-has-stack-protector.sh | 2 +-
scripts/gcc-x86_64-has-stack-protector.sh | 2 +-
security/apparmor/lsm.c | 7 +
security/apparmor/policy.c | 2 +-
security/apparmor/policy_unpack.c | 1 +
security/keys/keyctl.c | 2 +-
sound/pci/hda/patch_hdmi.c | 2 +
sound/pci/hda/patch_realtek.c | 1 +
sound/soc/codecs/max98088.c | 10 +-
sound/soc/codecs/wsa881x.c | 2 +-
sound/soc/intel/common/soc-intel-quirks.h | 2 +-
sound/soc/pxa/spitz.c | 58 ++++----
sound/usb/line6/driver.c | 5 +
sound/usb/quirks-table.h | 4 +
sound/usb/stream.c | 4 +-
tools/lib/bpf/btf_dump.c | 8 +-
tools/memory-model/lock.cat | 20 +--
tools/perf/util/sort.c | 2 +-
.../testing/selftests/bpf/prog_tests/send_signal.c | 3 +-
tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 2 +-
.../bpf/progs/btf_dump_test_case_multidim.c | 4 +-
.../bpf/progs/btf_dump_test_case_syntax.c | 4 +-
tools/testing/selftests/bpf/test_sockmap.c | 9 +-
.../drivers/net/mlxsw/spectrum-2/tc_flower.sh | 55 +++++++-
.../selftests/net/forwarding/devlink_lib.sh | 2 +
.../selftests/sigaltstack/current_stack_pointer.h | 2 +-
359 files changed, 3076 insertions(+), 1479 deletions(-)
1 year, 4 months
- 6
- 6
Re: [PATCH 5.10 000/350] 5.10.224-rc2 review
by Greg Kroah-Hartman
On Fri, Aug 16, 2024 at 08:12:36PM +0000, Jon Hunter wrote:
>
> ________________________________
> From: Jon Hunter <jonathanh(a)nvidia.com>
> Sent: Friday, August 16, 2024 2:43 PM
> To: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
> Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>; patches(a)lists.linux.dev <patches(a)lists.linux.dev>; linux-kernel(a)vger.kernel.org <linux-kernel(a)vger.kernel.org>; torvalds(a)linux-foundation.org <torvalds(a)linux-foundation.org>; akpm(a)linux-foundation.org <akpm(a)linux-foundation.org>; linux(a)roeck-us.net <linux(a)roeck-us.net>; shuah(a)kernel.org <shuah(a)kernel.org>; patches(a)kernelci.org <patches(a)kernelci.org>; lkft-triage(a)lists.linaro.org <lkft-triage(a)lists.linaro.org>; pavel(a)denx.de <pavel(a)denx.de>; Jon Hunter <jonathanh(a)nvidia.com>; f.fainelli(a)gmail.com <f.fainelli(a)gmail.com>; sudipm.mukherjee(a)gmail.com <sudipm.mukherjee(a)gmail.com>; srw(a)sladewatkins.net <srw(a)sladewatkins.net>; rwarsow(a)gmx.de <rwarsow(a)gmx.de>; conor(a)kernel.org <conor(a)kernel.org>; allen.lkml(a)gmail.com <allen.lkml(a)gmail.com>; broonie(a)kernel.org <broonie(a)kernel.org>; linux-tegra(a)vger.kernel.org <linux-tegra(a)vger.kernel.org>; stable(a)vger.kernel.org <stable(a)vger.kernel.org>
> Subject: Re: [PATCH 5.10 000/350] 5.10.224-rc2 review
>
> On Fri, 16 Aug 2024 12:22:05 +0200, Greg Kroah-Hartman wrote:
> > This is the start of the stable review cycle for the 5.10.224 release.
> > There are 350 patches in this series, all will be posted as a response
> > to this one. If anyone has any issues with these being applied, please
> > let me know.
> >
> > Responses should be made by Sun, 18 Aug 2024 10:14:04 +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.224-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
>
> Failures detected for Tegra ...
>
> Test results for stable-v5.10:
> 10 builds: 10 pass, 0 fail
> 31 boots: 26 pass, 5 fail
> 45 tests: 44 pass, 1 fail
>
> Linux version: 5.10.224-rc2-g470450f8c61c
> Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
> tegra194-p2972-0000, tegra194-p3509-0000+p3668-0000,
> tegra20-ventana, tegra210-p2371-2180,
> tegra210-p3450-0000, tegra30-cardhu-a04
>
> Boot failures: tegra186-p2771-0000, tegra210-p2371-2180,
> tegra210-p3450-0000
>
> Test failures: tegra194-p2972-0000: boot.py
>
> ---
>
> Apologies for the mail formatting. I am travelling and only have outlook for mobile :-(
>
> Bisect points to the following commit ...
>
> # first bad commit: [4bade5a6b1cfe81c9777aa3c8823009ff28a6e7f] memory: fsl_ifc: Make FSL_IFC config visible and selectable
>
> Reverting this does fix the issue. Seems odd but this appears to disable CONFIG_MEMORY for v5.10 with ARM64 defconfig. So something we need to fix.
Ah, that's a mess. I'll go drop this one for now, glad it's not showing
up on 5.15.y where this commit also is. It's not really important for
5.10.y so there's no harm in removing it.
thanks,
greg k-h
1 year, 4 months
- 1
- 0
[PATCH 00/11] NCR5380: Bug fixes and other improvements
by Finn Thain
This series begins with some work on the mac_scsi driver to improve
compatibility with SCSI2SD v5 devices. Better error handling is needed
there because the PDMA hardware does not tolerate the write latency spikes
which SD cards can produce.
A bug is fixed in the 5380 core driver so that scatter/gather can be
enabled in mac_scsi.
Several patches at the end of this series improve robustness and correctness
in the core driver.
This series has been tested on a variety of mac_scsi hosts. A variety of
SCSI targets was also tested, including Quantum HDD, Fujitsu HDD, Iomega FDD,
Ricoh CD-RW, Matsushita CD-ROM, SCSI2SD and BlueSCSI.
Finn Thain (11):
scsi: mac_scsi: Revise printk(KERN_DEBUG ...) messages
scsi: mac_scsi: Refactor polling loop
scsi: mac_scsi: Disallow bus errors during PDMA send
scsi: NCR5380: Check for phase match during PDMA fixup
scsi: mac_scsi: Enable scatter/gather by default
scsi: NCR5380: Initialize buffer for MSG IN and STATUS transfers
scsi: NCR5380: Handle BSY signal loss during information transfer
phases
scsi: NCR5380: Drop redundant member from struct NCR5380_cmd
scsi: NCR5380: Remove redundant result calculation from
NCR5380_transfer_pio()
scsi: NCR5380: Remove obsolete comment
scsi: NCR5380: Clean up indentation
drivers/scsi/NCR5380.c | 233 +++++++++++++++++++--------------------
drivers/scsi/NCR5380.h | 20 ++--
drivers/scsi/mac_scsi.c | 170 ++++++++++++++--------------
drivers/scsi/sun3_scsi.c | 2 +-
4 files changed, 215 insertions(+), 210 deletions(-)
--
2.39.5
1 year, 4 months
- 2
- 5
[PATCH v2] scsi: fix the return value of scsi_logical_block_count
by Chaotian Jing
scsi_logical_block_count() should return the block count of scsi device,
but the original code has a wrong implement.
Cc: stable(a)vger.kernel.org
Fixes: 6a20e21ae1e2 ("scsi: core: Add helper to return number of logical
blocks in a request")
Signed-off-by: Chaotian Jing <chaotian.jing(a)mediatek.com>
Reviewed-by: Bart Van Assche <bvanassche(a)acm.org>
---
include/scsi/scsi_cmnd.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index 45c40d200154..8ecfb94049db 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -234,7 +234,7 @@ static inline sector_t scsi_get_lba(struct scsi_cmnd *scmd)
static inline unsigned int scsi_logical_block_count(struct scsi_cmnd *scmd)
{
- unsigned int shift = ilog2(scmd->device->sector_size) - SECTOR_SHIFT;
+ unsigned int shift = ilog2(scmd->device->sector_size);
return blk_rq_bytes(scsi_cmd_to_rq(scmd)) >> shift;
}
--
2.46.0
1 year, 4 months
- 2
- 1
[PATCH v2 1/2] usb: dwc3: omap: add missing depopulate in probe error path
by Krzysztof Kozlowski
Depopulate device in probe error paths to fix leak of children
resources.
Fixes: ee249b455494 ("usb: dwc3: omap: remove IRQ_NOAUTOEN used with shared irq")
Cc: stable(a)vger.kernel.org
Acked-by: Thinh Nguyen <Thinh.Nguyen(a)synopsys.com>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>
---
Changes in v2:
1. Add Ack
---
drivers/usb/dwc3/dwc3-omap.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c
index d5c77db4daa9..2a11fc0ee84f 100644
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@ -522,11 +522,13 @@ static int dwc3_omap_probe(struct platform_device *pdev)
if (ret) {
dev_err(dev, "failed to request IRQ #%d --> %d\n",
omap->irq, ret);
- goto err1;
+ goto err2;
}
dwc3_omap_enable_irqs(omap);
return 0;
+err2:
+ of_platform_depopulate(dev);
err1:
pm_runtime_put_sync(dev);
pm_runtime_disable(dev);
--
2.43.0
1 year, 4 months
- 2
- 2
+ kexec_file-fix-elfcorehdr-digest-exclusion-when-config_crash_hotplug=y.patch added to mm-hotfixes-unstable branch
by Andrew Morton
The patch titled
Subject: kexec_file: fix elfcorehdr digest exclusion when CONFIG_CRASH_HOTPLUG=y
has been added to the -mm mm-hotfixes-unstable branch. Its filename is
kexec_file-fix-elfcorehdr-digest-exclusion-when-config_crash_hotplug=y.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patche…
This patch will later appear in the mm-hotfixes-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Petr Tesarik <ptesarik(a)suse.com>
Subject: kexec_file: fix elfcorehdr digest exclusion when CONFIG_CRASH_HOTPLUG=y
Date: Mon, 5 Aug 2024 17:07:50 +0200
Fix the condition to exclude the elfcorehdr segment from the SHA digest
calculation.
The j iterator is an index into the output sha_regions[] array, not into
the input image->segment[] array. Once it reaches
image->elfcorehdr_index, all subsequent segments are excluded. Besides,
if the purgatory segment precedes the elfcorehdr segment, the elfcorehdr
may be wrongly included in the calculation.
Link: https://lkml.kernel.org/r/20240805150750.170739-1-petr.tesarik@suse.com
Fixes: f7cc804a9fd4 ("kexec: exclude elfcorehdr from the segment digest")
Signed-off-by: Petr Tesarik <ptesarik(a)suse.com>
Acked-by: Baoquan He <bhe(a)redhat.com>
Cc: Eric Biederman <ebiederm(a)xmission.com>
Cc: Hari Bathini <hbathini(a)linux.ibm.com>
Cc: Sourabh Jain <sourabhjain(a)linux.ibm.com>
Cc: Eric DeVolder <eric_devolder(a)yahoo.com>
Cc: <stable(a)vger.kernel.org>
Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
---
kernel/kexec_file.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/kernel/kexec_file.c~kexec_file-fix-elfcorehdr-digest-exclusion-when-config_crash_hotplug=y
+++ a/kernel/kexec_file.c
@@ -752,7 +752,7 @@ static int kexec_calculate_store_digests
#ifdef CONFIG_CRASH_HOTPLUG
/* Exclude elfcorehdr segment to allow future changes via hotplug */
- if (j == image->elfcorehdr_index)
+ if (i == image->elfcorehdr_index)
continue;
#endif
_
Patches currently in -mm which might be from ptesarik(a)suse.com are
kexec_file-fix-elfcorehdr-digest-exclusion-when-config_crash_hotplug=y.patch
1 year, 4 months
- 1
- 0
[PATCH 6.1 00/38] 6.1.106-rc1 review
by Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.1.106 release.
There are 38 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Sat, 17 Aug 2024 13:18:17 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.1.106-rc…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.1.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 6.1.106-rc1
Will Deacon <will(a)kernel.org>
KVM: arm64: Don't pass a TLBI level hint when zapping table entries
Eric Dumazet <edumazet(a)google.com>
wifi: cfg80211: restrict NL80211_ATTR_TXQ_QUANTUM values
Waiman Long <longman(a)redhat.com>
cgroup: Move rcu_head up near the top of cgroup_root
Kees Cook <kees(a)kernel.org>
binfmt_flat: Fix corruption when not offsetting data start
Andi Shyti <andi.shyti(a)linux.intel.com>
drm/i915/gem: Adjust vma offset for framebuffer mmap offset
Dan Carpenter <dan.carpenter(a)linaro.org>
drm/i915: Fix a NULL vs IS_ERR() bug
Nirmoy Das <nirmoy.das(a)intel.com>
drm/i915: Add a function to mmap framebuffer obj
Yafang Shao <laoar.shao(a)gmail.com>
cgroup: Make operations on the cgroup root_list RCU safe
Andi Shyti <andi.shyti(a)linux.intel.com>
drm/i915/gem: Fix Virtual Memory mapping boundaries calculation
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: fully established after ADD_ADDR echo on MPJ
WangYuli <wangyuli(a)uniontech.com>
nvme/pci: Add APST quirk for Lenovo N60z laptop
Josef Bacik <josef(a)toxicpanda.com>
nfsd: make svc_stat per-network namespace instead of global
Josef Bacik <josef(a)toxicpanda.com>
nfsd: remove nfsd_stats, make th_cnt a global counter
Josef Bacik <josef(a)toxicpanda.com>
nfsd: make all of the nfsd stats per-network namespace
Josef Bacik <josef(a)toxicpanda.com>
nfsd: expose /proc/net/sunrpc/nfsd in net namespaces
Josef Bacik <josef(a)toxicpanda.com>
nfsd: rename NFSD_NET_* to NFSD_STATS_*
Josef Bacik <josef(a)toxicpanda.com>
sunrpc: use the struct net as the svc proc private
Josef Bacik <josef(a)toxicpanda.com>
sunrpc: remove ->pg_stats from svc_program
Josef Bacik <josef(a)toxicpanda.com>
sunrpc: pass in the sv_stats struct through svc_create_pooled
Josef Bacik <josef(a)toxicpanda.com>
nfsd: stop setting ->pg_stats for unused stats
Josef Bacik <josef(a)toxicpanda.com>
sunrpc: don't change ->sv_stats if it doesn't exist
Chuck Lever <chuck.lever(a)oracle.com>
NFSD: Fix frame size warning in svc_export_parse()
Chuck Lever <chuck.lever(a)oracle.com>
NFSD: Rewrite synopsis of nfsd_percpu_counters_init()
Chuck Lever <chuck.lever(a)oracle.com>
NFSD: Refactor the duplicate reply cache shrinker
Chuck Lever <chuck.lever(a)oracle.com>
NFSD: Replace nfsd_prune_bucket()
Chuck Lever <chuck.lever(a)oracle.com>
NFSD: Rename nfsd_reply_cache_alloc()
Chuck Lever <chuck.lever(a)oracle.com>
NFSD: Refactor nfsd_reply_cache_free_locked()
Jeff Layton <jlayton(a)kernel.org>
nfsd: move init of percpu reply_cache_stats counters back to nfsd_init_net
Jeff Layton <jlayton(a)kernel.org>
nfsd: move reply cache initialization into nfsd startup
Huacai Chen <chenhuacai(a)kernel.org>
LoongArch: Define __ARCH_WANT_NEW_STAT in unistd.h
Kees Cook <kees(a)kernel.org>
exec: Fix ToCToU between perm check and set-uid/gid usage
Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com>
ASoC: topology: Fix route memory corruption
Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com>
ASoC: topology: Clean up route loading
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
selftests: mptcp: join: test both signal & subflow
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: pm: do not ignore 'subflow' if 'signal' flag is also set
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: pm: don't try to create sf if alloc failed
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: pm: reduce indentation blocks
Geliang Tang <geliang.tang(a)suse.com>
mptcp: pass addr to mptcp_pm_alloc_anno_list
-------------
Diffstat:
Makefile | 4 +-
arch/arm64/kvm/hyp/pgtable.c | 10 +-
arch/loongarch/include/uapi/asm/unistd.h | 1 +
drivers/gpu/drm/i915/gem/i915_gem_mman.c | 192 ++++++++++++++++------
drivers/gpu/drm/i915/gem/i915_gem_mman.h | 2 +-
drivers/nvme/host/pci.c | 7 +
fs/binfmt_flat.c | 4 +-
fs/exec.c | 8 +-
fs/lockd/svc.c | 3 -
fs/nfs/callback.c | 3 -
fs/nfsd/export.c | 32 ++--
fs/nfsd/export.h | 4 +-
fs/nfsd/netns.h | 25 ++-
fs/nfsd/nfs4proc.c | 6 +-
fs/nfsd/nfscache.c | 201 ++++++++++++++----------
fs/nfsd/nfsctl.c | 24 ++-
fs/nfsd/nfsd.h | 1 +
fs/nfsd/nfsfh.c | 3 +-
fs/nfsd/nfssvc.c | 24 +--
fs/nfsd/stats.c | 52 +++---
fs/nfsd/stats.h | 83 ++++------
fs/nfsd/trace.h | 22 +++
fs/nfsd/vfs.c | 6 +-
include/linux/cgroup-defs.h | 7 +-
include/linux/sunrpc/svc.h | 5 +-
kernel/cgroup/cgroup-internal.h | 3 +-
kernel/cgroup/cgroup.c | 23 ++-
net/mptcp/options.c | 3 +-
net/mptcp/pm_netlink.c | 49 +++---
net/mptcp/pm_userspace.c | 2 +-
net/mptcp/protocol.h | 2 +-
net/sunrpc/stats.c | 2 +-
net/sunrpc/svc.c | 36 +++--
net/wireless/nl80211.c | 6 +-
sound/soc/soc-topology.c | 32 +---
tools/testing/selftests/net/mptcp/mptcp_join.sh | 14 ++
36 files changed, 555 insertions(+), 346 deletions(-)
1 year, 4 months
- 8
- 45
[PATCH 6.6 00/67] 6.6.47-rc1 review
by Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.6.47 release.
There are 67 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 Sat, 17 Aug 2024 13:18:17 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.6.47-rc1…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.6.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 6.6.47-rc1
Will Deacon <will(a)kernel.org>
KVM: arm64: Don't pass a TLBI level hint when zapping table entries
Will Deacon <will(a)kernel.org>
KVM: arm64: Don't defer TLB invalidation when zapping table entries
Waiman Long <longman(a)redhat.com>
cgroup: Move rcu_head up near the top of cgroup_root
Peter Xu <peterx(a)redhat.com>
mm/debug_vm_pgtable: drop RANDOM_ORVALUE trick
Javier Carrasco <javier.carrasco.cruz(a)gmail.com>
Revert "Input: bcm5974 - check endpoint type before starting traffic"
Dave Kleikamp <dave.kleikamp(a)oracle.com>
Revert "jfs: fix shift-out-of-bounds in dbJoin"
Kees Cook <kees(a)kernel.org>
binfmt_flat: Fix corruption when not offsetting data start
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb: Fix UBSAN warning in parse_audio_unit()
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Do copy_to_user out of run_lock
Pei Li <peili.dev(a)gmail.com>
jfs: Fix shift-out-of-bounds in dbDiscardAG
Edward Adam Davis <eadavis(a)qq.com>
jfs: fix null ptr deref in dtInsertEntry
Willem de Bruijn <willemb(a)google.com>
fou: remove warn in gue_gro_receive on unsupported protocol
Chao Yu <chao(a)kernel.org>
f2fs: fix to cover read extent cache access with lock
Chao Yu <chao(a)kernel.org>
f2fs: fix to do sanity check on F2FS_INLINE_DATA flag in inode during GC
yunshui <jiangyunshui(a)kylinos.cn>
bpf, net: Use DEV_STAT_INC()
Wojciech Gładysz <wojciech.gladysz(a)infogain.com>
ext4: sanity check for NULL pointer after ext4_force_shutdown
Matthew Wilcox (Oracle) <willy(a)infradead.org>
ext4: convert ext4_da_do_write_end() to take a folio
Eric Dumazet <edumazet(a)google.com>
wifi: cfg80211: restrict NL80211_ATTR_TXQ_QUANTUM values
Peter Xu <peterx(a)redhat.com>
mm/page_table_check: support userfault wr-protect entries
Jan Kara <jack(a)suse.cz>
ext4: do not create EA inode under buffer lock
Jan Kara <jack(a)suse.cz>
ext4: fold quota accounting into ext4_xattr_inode_lookup_create()
Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com>
Bluetooth: RFCOMM: Fix not validating setsockopt user input
Eric Dumazet <edumazet(a)google.com>
nfc: llcp: fix nfc_llcp_setsockopt() unsafe copies
Eric Dumazet <edumazet(a)google.com>
net: add copy_safe_from_sockptr() helper
Eric Dumazet <edumazet(a)google.com>
mISDN: fix MISDN_TIME_STAMP handling
Gustavo A. R. Silva <gustavoars(a)kernel.org>
fs: Annotate struct file_handle with __counted_by() and use struct_size()
Alexei Starovoitov <ast(a)kernel.org>
bpf: Avoid kfree_rcu() under lock in bpf_lpm_trie.
Kees Cook <keescook(a)chromium.org>
bpf: Replace bpf_lpm_trie_key 0-length array with flexible array
Gavrilov Ilia <Ilia.Gavrilov(a)infotecs.ru>
pppoe: Fix memory leak in pppoe_sendmsg()
Dmitry Antipov <dmantipov(a)yandex.ru>
net: sctp: fix skb leak in sctp_inq_free()
Allison Henderson <allison.henderson(a)oracle.com>
net:rds: Fix possible deadlock in rds_message_put
Jan Kara <jack(a)suse.cz>
quota: Detect loops in quota tree
Javier Carrasco <javier.carrasco.cruz(a)gmail.com>
Input: bcm5974 - check endpoint type before starting traffic
John Fastabend <john.fastabend(a)gmail.com>
net: tls, add test to capture error on large splice
Gao Xiang <xiang(a)kernel.org>
erofs: avoid debugging output for (de)compressed data
Edward Adam Davis <eadavis(a)qq.com>
reiserfs: fix uninit-value in comp_keys
Phillip Lougher <phillip(a)squashfs.org.uk>
Squashfs: fix variable overflow triggered by sysbot
Lizhi Xu <lizhi.xu(a)windriver.com>
squashfs: squashfs_read_data need to check if the length is 0
Manas Ghandat <ghandatmanas(a)gmail.com>
jfs: fix shift-out-of-bounds in dbJoin
Jakub Kicinski <kuba(a)kernel.org>
net: don't dump stack on queue timeout
Lizhi Xu <lizhi.xu(a)windriver.com>
jfs: fix log->bdev_handle null ptr deref in lbmStartIO
Jan Kara <jack(a)suse.cz>
jfs: Convert to bdev_open_by_dev()
Jan Kara <jack(a)suse.cz>
fs: Convert to bdev_open_by_dev()
Johannes Berg <johannes.berg(a)intel.com>
wifi: mac80211: fix change_address deadlock during unregister
Johannes Berg <johannes.berg(a)intel.com>
wifi: mac80211: take wiphy lock for MAC addr change
Eric Dumazet <edumazet(a)google.com>
tcp_metrics: optimize tcp_metrics_flush_all()
Yafang Shao <laoar.shao(a)gmail.com>
cgroup: Make operations on the cgroup root_list RCU safe
Dongli Zhang <dongli.zhang(a)oracle.com>
genirq/cpuhotplug: Retry with cpu_online_mask when migration fails
David Stevens <stevensd(a)chromium.org>
genirq/cpuhotplug: Skip suspended interrupts when restoring affinity
WangYuli <wangyuli(a)uniontech.com>
nvme/pci: Add APST quirk for Lenovo N60z laptop
Yang Shi <yang(a)os.amperecomputing.com>
mm: gup: stop abusing try_grab_folio
Josef Bacik <josef(a)toxicpanda.com>
nfsd: make svc_stat per-network namespace instead of global
Josef Bacik <josef(a)toxicpanda.com>
nfsd: remove nfsd_stats, make th_cnt a global counter
Josef Bacik <josef(a)toxicpanda.com>
nfsd: make all of the nfsd stats per-network namespace
Josef Bacik <josef(a)toxicpanda.com>
nfsd: expose /proc/net/sunrpc/nfsd in net namespaces
Josef Bacik <josef(a)toxicpanda.com>
nfsd: rename NFSD_NET_* to NFSD_STATS_*
Josef Bacik <josef(a)toxicpanda.com>
sunrpc: use the struct net as the svc proc private
Josef Bacik <josef(a)toxicpanda.com>
sunrpc: remove ->pg_stats from svc_program
Josef Bacik <josef(a)toxicpanda.com>
sunrpc: pass in the sv_stats struct through svc_create_pooled
Josef Bacik <josef(a)toxicpanda.com>
nfsd: stop setting ->pg_stats for unused stats
Josef Bacik <josef(a)toxicpanda.com>
sunrpc: don't change ->sv_stats if it doesn't exist
Chuck Lever <chuck.lever(a)oracle.com>
NFSD: Fix frame size warning in svc_export_parse()
Chuck Lever <chuck.lever(a)oracle.com>
NFSD: Rewrite synopsis of nfsd_percpu_counters_init()
Huacai Chen <chenhuacai(a)kernel.org>
LoongArch: Define __ARCH_WANT_NEW_STAT in unistd.h
Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com>
ASoC: topology: Fix route memory corruption
Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com>
ASoC: topology: Clean up route loading
Kees Cook <kees(a)kernel.org>
exec: Fix ToCToU between perm check and set-uid/gid usage
-------------
Diffstat:
Documentation/bpf/map_lpm_trie.rst | 2 +-
Documentation/mm/page_table_check.rst | 9 +-
Makefile | 4 +-
arch/arm64/kvm/hyp/pgtable.c | 12 +-
arch/loongarch/include/uapi/asm/unistd.h | 1 +
arch/x86/include/asm/pgtable.h | 18 +-
drivers/isdn/mISDN/socket.c | 10 +-
drivers/net/ppp/pppoe.c | 23 +--
drivers/nvme/host/pci.c | 7 +
fs/binfmt_flat.c | 4 +-
fs/buffer.c | 2 +
fs/cramfs/inode.c | 2 +-
fs/erofs/decompressor.c | 8 +-
fs/exec.c | 8 +-
fs/ext4/inode.c | 24 ++-
fs/ext4/xattr.c | 155 +++++++-------
fs/f2fs/extent_cache.c | 50 ++---
fs/f2fs/f2fs.h | 2 +-
fs/f2fs/gc.c | 10 +
fs/f2fs/inode.c | 10 +-
fs/fhandle.c | 6 +-
fs/jfs/jfs_dmap.c | 2 +
fs/jfs/jfs_dtree.c | 2 +
fs/jfs/jfs_logmgr.c | 33 +--
fs/jfs/jfs_logmgr.h | 2 +-
fs/jfs/jfs_mount.c | 3 +-
fs/lockd/svc.c | 3 -
fs/nfs/callback.c | 3 -
fs/nfsd/cache.h | 2 -
fs/nfsd/export.c | 32 ++-
fs/nfsd/export.h | 4 +-
fs/nfsd/netns.h | 25 ++-
fs/nfsd/nfs4proc.c | 6 +-
fs/nfsd/nfs4state.c | 3 +-
fs/nfsd/nfscache.c | 40 +---
fs/nfsd/nfsctl.c | 16 +-
fs/nfsd/nfsd.h | 1 +
fs/nfsd/nfsfh.c | 3 +-
fs/nfsd/nfssvc.c | 14 +-
fs/nfsd/stats.c | 54 ++---
fs/nfsd/stats.h | 88 +++-----
fs/nfsd/vfs.c | 6 +-
fs/ntfs3/frecord.c | 75 ++++++-
fs/quota/quota_tree.c | 128 +++++++++---
fs/quota/quota_v2.c | 15 +-
fs/reiserfs/stree.c | 2 +-
fs/romfs/super.c | 2 +-
fs/squashfs/block.c | 2 +-
fs/squashfs/file.c | 3 +-
fs/squashfs/file_direct.c | 6 +-
fs/super.c | 15 +-
include/linux/cgroup-defs.h | 7 +-
include/linux/fs.h | 3 +-
include/linux/sockptr.h | 25 +++
include/linux/sunrpc/svc.h | 5 +-
include/uapi/linux/bpf.h | 19 +-
kernel/bpf/lpm_trie.c | 33 +--
kernel/cgroup/cgroup-internal.h | 3 +-
kernel/cgroup/cgroup.c | 23 ++-
kernel/irq/cpuhotplug.c | 27 ++-
kernel/irq/manage.c | 12 +-
mm/debug_vm_pgtable.c | 31 +--
mm/gup.c | 251 ++++++++++++-----------
mm/huge_memory.c | 6 +-
mm/hugetlb.c | 2 +-
mm/internal.h | 4 +-
mm/page_table_check.c | 30 +++
net/bluetooth/rfcomm/sock.c | 14 +-
net/core/filter.c | 8 +-
net/ipv4/fou_core.c | 2 +-
net/ipv4/tcp_metrics.c | 7 +-
net/mac80211/iface.c | 27 ++-
net/nfc/llcp_sock.c | 12 +-
net/rds/recv.c | 13 +-
net/sched/sch_generic.c | 5 +-
net/sctp/inqueue.c | 14 +-
net/sunrpc/stats.c | 2 +-
net/sunrpc/svc.c | 39 ++--
net/wireless/nl80211.c | 6 +-
samples/bpf/map_perf_test_user.c | 2 +-
samples/bpf/xdp_router_ipv4_user.c | 2 +-
sound/soc/soc-topology.c | 32 +--
sound/usb/mixer.c | 7 +
tools/include/uapi/linux/bpf.h | 19 +-
tools/testing/selftests/bpf/progs/map_ptr_kern.c | 2 +-
tools/testing/selftests/bpf/test_lpm_map.c | 18 +-
tools/testing/selftests/net/tls.c | 14 ++
87 files changed, 987 insertions(+), 696 deletions(-)
1 year, 4 months
- 10
- 78
[PATCH v2 09/13] csky, hexagon: fix broken sys_sync_file_range
by Arnd Bergmann
From: Arnd Bergmann <arnd(a)arndb.de>
Both of these architectures require u64 function arguments to be
passed in even/odd pairs of registers or stack slots, which in case of
sync_file_range would result in a seven-argument system call that is
not currently possible. The system call is therefore incompatible with
all existing binaries.
While it would be possible to implement support for seven arguments
like on mips, it seems better to use a six-argument version, either
with the normal argument order but misaligned as on most architectures
or with the reordered sync_file_range2() calling conventions as on
arm and powerpc.
Cc: stable(a)vger.kernel.org
Acked-by: Guo Ren <guoren(a)kernel.org>
Signed-off-by: Arnd Bergmann <arnd(a)arndb.de>
---
arch/csky/include/uapi/asm/unistd.h | 1 +
arch/hexagon/include/uapi/asm/unistd.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/arch/csky/include/uapi/asm/unistd.h b/arch/csky/include/uapi/asm/unistd.h
index 7ff6a2466af1..e0594b6370a6 100644
--- a/arch/csky/include/uapi/asm/unistd.h
+++ b/arch/csky/include/uapi/asm/unistd.h
@@ -6,6 +6,7 @@
#define __ARCH_WANT_SYS_CLONE3
#define __ARCH_WANT_SET_GET_RLIMIT
#define __ARCH_WANT_TIME32_SYSCALLS
+#define __ARCH_WANT_SYNC_FILE_RANGE2
#include <asm-generic/unistd.h>
#define __NR_set_thread_area (__NR_arch_specific_syscall + 0)
diff --git a/arch/hexagon/include/uapi/asm/unistd.h b/arch/hexagon/include/uapi/asm/unistd.h
index 432c4db1b623..21ae22306b5d 100644
--- a/arch/hexagon/include/uapi/asm/unistd.h
+++ b/arch/hexagon/include/uapi/asm/unistd.h
@@ -36,5 +36,6 @@
#define __ARCH_WANT_SYS_VFORK
#define __ARCH_WANT_SYS_FORK
#define __ARCH_WANT_TIME32_SYSCALLS
+#define __ARCH_WANT_SYNC_FILE_RANGE2
#include <asm-generic/unistd.h>
--
2.39.2
1 year, 4 months
- 2
- 1
[PATCH v5 5.10/5.15] ata: libata-scsi: check cdb length for VARIABLE_LENGTH_CMD commands
by Artem Sadovnikov
No upstream commit exists for this commit.
Fuzzing of 5.10 stable branch reports a slab-out-of-bounds error in
ata_scsi_pass_thru.
The error is fixed in 5.18 by commit ce70fd9a551a ("scsi: core: Remove the
cmd field from struct scsi_request") upstream.
Backporting this commit would require significant changes to the code so
it is better to use a simple fix for that particular error.
The problem is that the length of the received SCSI command is not
validated if scsi_op == VARIABLE_LENGTH_CMD. It can lead to out-of-bounds
reading if the user sends a request with SCSI command of length less than
32.
Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
Acked-by: Damien Le Moal <dlemoal(a)kernel.org>
Co-developed-by: Mikhail Ivanov <iwanov-23(a)bk.ru>
Signed-off-by: Mikhail Ivanov <iwanov-23(a)bk.ru>
Co-developed-by: Mikhail Ukhin <mish.uxin2012(a)yandex.ru>
Signed-off-by: Mikhail Ukhin <mish.uxin2012(a)yandex.ru>
Signed-off-by: Artem Sadovnikov <ancowi69(a)gmail.com>
---
Link: https://lore.kernel.org/lkml/20240711151546.341491-1-ancowi69@gmail.com/T/#u
unfortunately, stable(a)vger.kernel.org wasn't initially mentioned.
drivers/ata/libata-scsi.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 36f32fa052df..4397986db053 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -3949,6 +3949,9 @@ static unsigned int ata_scsi_var_len_cdb_xlat(struct ata_queued_cmd *qc)
const u8 *cdb = scmd->cmnd;
const u16 sa = get_unaligned_be16(&cdb[8]);
+ if (scmd->cmd_len != 32)
+ return 1;
+
/*
* if service action represents a ata pass-thru(32) command,
* then pass it to ata_scsi_pass_thru handler.
--
2.34.1
1 year, 4 months
- 1
- 0
[PATCH] btrfs: only enable extent map shrinker for DEBUG builds
by Qu Wenruo
Although there are several patches improving the extent map shrinker,
there are still reports of too frequent shrinker behavior, taking too
much CPU for the kswapd process.
So let's only enable extent shrinker for now, until we got more
comprehensive understanding and a better solution.
Link: https://lore.kernel.org/linux-btrfs/3df4acd616a07ef4d2dc6bad668701504b412ff…
Link: https://lore.kernel.org/linux-btrfs/c30fd6b3-ca7a-4759-8a53-d42878bf84f7@gm…
Fixes: 956a17d9d050 ("btrfs: add a shrinker for extent maps")
CC: stable(a)vger.kernel.org # 6.10+
Signed-off-by: Qu Wenruo <wqu(a)suse.com>
---
I also checked how XFS (the only other fs implemented the
free_cached_objects callback) implemented the callback.
They did two things:
- Make sure there is only one queued reclaim
Currently we only do the reclaim for kswapd, but for multi-node
systems, we can still have multiple kswapd processes.
But I do not think that's the root cause.
- With an extra delay of 60% of xfs_syncd_centiseccs
The default value for xfs_syncd_centiseccs is 3000 centiseconds (30s),
with a minimal 100 centiseconds (1s).
This results the reclaim work only to be executed at most every 18
seconds by default (or 0.6s for the minimal interval).
I believe this is the root cause, we have no extra delay and that
makes btrfs to shrink extent maps too frequently.
---
fs/btrfs/super.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 11044e9e2cb1..98fa0f382480 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -2402,7 +2402,13 @@ static long btrfs_nr_cached_objects(struct super_block *sb, struct shrink_contro
trace_btrfs_extent_map_shrinker_count(fs_info, nr);
- return nr;
+ /*
+ * Only report the real number for DEBUG builds, as there are reports of
+ * serious performance degradation caused by too frequent shrinks.
+ */
+ if (IS_ENABLED(CONFIG_BTRFS_DEBUG))
+ return nr;
+ return 0;
}
static long btrfs_free_cached_objects(struct super_block *sb, struct shrink_control *sc)
--
2.46.0
1 year, 4 months
- 2
- 1
[PATCH v3 1/2] dmaengine: dw-edma: Fix unmasking STOP and ABORT interrupts for HDMA
by Mrinmay Sarkar
The current logic is enabling both STOP_INT_MASK and ABORT_INT_MASK
bit. This is apparently masking those particular interrupts rather than
unmasking the same. If the interrupts are masked, they would never get
triggered.
So fix the issue by unmasking the STOP and ABORT interrupts properly.
Fixes: e74c39573d35 ("dmaengine: dw-edma: Add support for native HDMA")
cc: stable(a)vger.kernel.org
Signed-off-by: Mrinmay Sarkar <quic_msarkar(a)quicinc.com>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org>
---
drivers/dma/dw-edma/dw-hdma-v0-core.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/dma/dw-edma/dw-hdma-v0-core.c b/drivers/dma/dw-edma/dw-hdma-v0-core.c
index 10e8f07..a0aabdd 100644
--- a/drivers/dma/dw-edma/dw-hdma-v0-core.c
+++ b/drivers/dma/dw-edma/dw-hdma-v0-core.c
@@ -247,10 +247,11 @@ static void dw_hdma_v0_core_start(struct dw_edma_chunk *chunk, bool first)
if (first) {
/* Enable engine */
SET_CH_32(dw, chan->dir, chan->id, ch_en, BIT(0));
- /* Interrupt enable&unmask - done, abort */
- tmp = GET_CH_32(dw, chan->dir, chan->id, int_setup) |
- HDMA_V0_STOP_INT_MASK | HDMA_V0_ABORT_INT_MASK |
- HDMA_V0_LOCAL_STOP_INT_EN | HDMA_V0_LOCAL_ABORT_INT_EN;
+ /* Interrupt unmask - stop, abort */
+ tmp = GET_CH_32(dw, chan->dir, chan->id, int_setup) &
+ ~HDMA_V0_STOP_INT_MASK & ~HDMA_V0_ABORT_INT_MASK;
+ /* Interrupt enable - stop, abort */
+ tmp |= HDMA_V0_LOCAL_STOP_INT_EN | HDMA_V0_LOCAL_ABORT_INT_EN;
if (!(dw->chip->flags & DW_EDMA_CHIP_LOCAL))
tmp |= HDMA_V0_REMOTE_STOP_INT_EN | HDMA_V0_REMOTE_ABORT_INT_EN;
SET_CH_32(dw, chan->dir, chan->id, int_setup, tmp);
--
2.7.4
1 year, 4 months
- 2
- 1
[PATCH 2/3] drm/vmwgfx: Fix prime with external buffers
by Zack Rusin
Make sure that for external buffers mapping goes through the dma_buf
interface instead of trying to access pages directly.
External buffers might not provide direct access to readable/writable
pages so to make sure the bo's created from external dma_bufs can be
read dma_buf interface has to be used.
Fixes crashes in IGT's kms_prime with vgem. Regular desktop usage won't
trigger this due to the fact that virtual machines will not have
multiple GPUs but it enables better test coverage in IGT.
Signed-off-by: Zack Rusin <zack.rusin(a)broadcom.com>
Fixes: b32233acceff ("drm/vmwgfx: Fix prime import/export")
Cc: <stable(a)vger.kernel.org> # v6.6+
Cc: Broadcom internal kernel review list <bcm-kernel-feedback-list(a)broadcom.com>
Cc: dri-devel(a)lists.freedesktop.org
Cc: <stable(a)vger.kernel.org> # v6.9+
---
drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 114 ++++++++++++++++++++++++++-
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 4 +-
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 12 +--
3 files changed, 118 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_blit.c b/drivers/gpu/drm/vmwgfx/vmwgfx_blit.c
index 717d624e9a05..890a66a2361f 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_blit.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_blit.c
@@ -27,6 +27,8 @@
**************************************************************************/
#include "vmwgfx_drv.h"
+
+#include "vmwgfx_bo.h"
#include <linux/highmem.h>
/*
@@ -420,13 +422,105 @@ static int vmw_bo_cpu_blit_line(struct vmw_bo_blit_line_data *d,
return 0;
}
+static void *map_external(struct vmw_bo *bo, struct iosys_map *map)
+{
+ struct vmw_private *vmw =
+ container_of(bo->tbo.bdev, struct vmw_private, bdev);
+ void *ptr = NULL;
+ int ret;
+
+ if (bo->tbo.base.import_attach) {
+ ret = dma_buf_vmap(bo->tbo.base.dma_buf, map);
+ if (ret) {
+ drm_dbg_driver(&vmw->drm,
+ "Wasn't able to map external bo!\n");
+ goto out;
+ }
+ ptr = map->vaddr;
+ } else {
+ ptr = vmw_bo_map_and_cache(bo);
+ }
+
+out:
+ return ptr;
+}
+
+static void unmap_external(struct vmw_bo *bo, struct iosys_map *map)
+{
+ if (bo->tbo.base.import_attach)
+ dma_buf_vunmap(bo->tbo.base.dma_buf, map);
+ else
+ vmw_bo_unmap(bo);
+}
+
+static int vmw_external_bo_copy(struct vmw_bo *dst, u32 dst_offset,
+ u32 dst_stride, struct vmw_bo *src,
+ u32 src_offset, u32 src_stride,
+ u32 width_in_bytes, u32 height,
+ struct vmw_diff_cpy *diff)
+{
+ struct vmw_private *vmw =
+ container_of(dst->tbo.bdev, struct vmw_private, bdev);
+ size_t dst_size = dst->tbo.resource->size;
+ size_t src_size = src->tbo.resource->size;
+ struct iosys_map dst_map = {0};
+ struct iosys_map src_map = {0};
+ int ret, i;
+ int x_in_bytes;
+ u8 *vsrc;
+ u8 *vdst;
+
+ vsrc = map_external(src, &src_map);
+ if (!vsrc) {
+ drm_dbg_driver(&vmw->drm, "Wasn't able to map src\n");
+ ret = -ENOMEM;
+ goto out;
+ }
+
+ vdst = map_external(dst, &dst_map);
+ if (!vdst) {
+ drm_dbg_driver(&vmw->drm, "Wasn't able to map dst\n");
+ ret = -ENOMEM;
+ goto out;
+ }
+
+ vsrc += src_offset;
+ vdst += dst_offset;
+ if (src_stride == dst_stride) {
+ dst_size -= dst_offset;
+ src_size -= src_offset;
+ memcpy(vdst, vsrc,
+ min(dst_stride * height, min(dst_size, src_size)));
+ } else {
+ WARN_ON(dst_stride < width_in_bytes);
+ for (i = 0; i < height; ++i) {
+ memcpy(vdst, vsrc, width_in_bytes);
+ vsrc += src_stride;
+ vdst += dst_stride;
+ }
+ }
+
+ x_in_bytes = (dst_offset % dst_stride);
+ diff->rect.x1 = x_in_bytes / diff->cpp;
+ diff->rect.y1 = ((dst_offset - x_in_bytes) / dst_stride);
+ diff->rect.x2 = diff->rect.x1 + width_in_bytes / diff->cpp;
+ diff->rect.y2 = diff->rect.y1 + height;
+
+ ret = 0;
+out:
+ unmap_external(src, &src_map);
+ unmap_external(dst, &dst_map);
+
+ return ret;
+}
+
/**
* vmw_bo_cpu_blit - in-kernel cpu blit.
*
- * @dst: Destination buffer object.
+ * @vmw_dst: Destination buffer object.
* @dst_offset: Destination offset of blit start in bytes.
* @dst_stride: Destination stride in bytes.
- * @src: Source buffer object.
+ * @vmw_src: Source buffer object.
* @src_offset: Source offset of blit start in bytes.
* @src_stride: Source stride in bytes.
* @w: Width of blit.
@@ -444,13 +538,15 @@ static int vmw_bo_cpu_blit_line(struct vmw_bo_blit_line_data *d,
* Neither of the buffer objects may be placed in PCI memory
* (Fixed memory in TTM terminology) when using this function.
*/
-int vmw_bo_cpu_blit(struct ttm_buffer_object *dst,
+int vmw_bo_cpu_blit(struct vmw_bo *vmw_dst,
u32 dst_offset, u32 dst_stride,
- struct ttm_buffer_object *src,
+ struct vmw_bo *vmw_src,
u32 src_offset, u32 src_stride,
u32 w, u32 h,
struct vmw_diff_cpy *diff)
{
+ struct ttm_buffer_object *src = &vmw_src->tbo;
+ struct ttm_buffer_object *dst = &vmw_dst->tbo;
struct ttm_operation_ctx ctx = {
.interruptible = false,
.no_wait_gpu = false
@@ -460,6 +556,11 @@ int vmw_bo_cpu_blit(struct ttm_buffer_object *dst,
int ret = 0;
struct page **dst_pages = NULL;
struct page **src_pages = NULL;
+ bool src_external = (src->ttm->page_flags & TTM_TT_FLAG_EXTERNAL) != 0;
+ bool dst_external = (dst->ttm->page_flags & TTM_TT_FLAG_EXTERNAL) != 0;
+
+ if (WARN_ON(dst == src))
+ return -EINVAL;
/* Buffer objects need to be either pinned or reserved: */
if (!(dst->pin_count))
@@ -479,6 +580,11 @@ int vmw_bo_cpu_blit(struct ttm_buffer_object *dst,
return ret;
}
+ if (src_external || dst_external)
+ return vmw_external_bo_copy(vmw_dst, dst_offset, dst_stride,
+ vmw_src, src_offset, src_stride,
+ w, h, diff);
+
if (!src->ttm->pages && src->ttm->sg) {
src_pages = kvmalloc_array(src->ttm->num_pages,
sizeof(struct page *), GFP_KERNEL);
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
index 32f50e595809..3f4719b3c268 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
@@ -1353,9 +1353,9 @@ void vmw_diff_memcpy(struct vmw_diff_cpy *diff, u8 *dest, const u8 *src,
void vmw_memcpy(struct vmw_diff_cpy *diff, u8 *dest, const u8 *src, size_t n);
-int vmw_bo_cpu_blit(struct ttm_buffer_object *dst,
+int vmw_bo_cpu_blit(struct vmw_bo *dst,
u32 dst_offset, u32 dst_stride,
- struct ttm_buffer_object *src,
+ struct vmw_bo *src,
u32 src_offset, u32 src_stride,
u32 w, u32 h,
struct vmw_diff_cpy *diff);
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
index 5106413c14b7..3cc664384b66 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
@@ -502,7 +502,7 @@ static void vmw_stdu_bo_cpu_commit(struct vmw_kms_dirty *dirty)
container_of(dirty->unit, typeof(*stdu), base);
s32 width, height;
s32 src_pitch, dst_pitch;
- struct ttm_buffer_object *src_bo, *dst_bo;
+ struct vmw_bo *src_bo, *dst_bo;
u32 src_offset, dst_offset;
struct vmw_diff_cpy diff = VMW_CPU_BLIT_DIFF_INITIALIZER(stdu->cpp);
@@ -517,11 +517,11 @@ static void vmw_stdu_bo_cpu_commit(struct vmw_kms_dirty *dirty)
/* Assume we are blitting from Guest (bo) to Host (display_srf) */
src_pitch = stdu->display_srf->metadata.base_size.width * stdu->cpp;
- src_bo = &stdu->display_srf->res.guest_memory_bo->tbo;
+ src_bo = stdu->display_srf->res.guest_memory_bo;
src_offset = ddirty->top * src_pitch + ddirty->left * stdu->cpp;
dst_pitch = ddirty->pitch;
- dst_bo = &ddirty->buf->tbo;
+ dst_bo = ddirty->buf;
dst_offset = ddirty->fb_top * dst_pitch + ddirty->fb_left * stdu->cpp;
(void) vmw_bo_cpu_blit(dst_bo, dst_offset, dst_pitch,
@@ -1143,7 +1143,7 @@ vmw_stdu_bo_populate_update_cpu(struct vmw_du_update_plane *update, void *cmd,
struct vmw_diff_cpy diff = VMW_CPU_BLIT_DIFF_INITIALIZER(0);
struct vmw_stdu_update_gb_image *cmd_img = cmd;
struct vmw_stdu_update *cmd_update;
- struct ttm_buffer_object *src_bo, *dst_bo;
+ struct vmw_bo *src_bo, *dst_bo;
u32 src_offset, dst_offset;
s32 src_pitch, dst_pitch;
s32 width, height;
@@ -1157,11 +1157,11 @@ vmw_stdu_bo_populate_update_cpu(struct vmw_du_update_plane *update, void *cmd,
diff.cpp = stdu->cpp;
- dst_bo = &stdu->display_srf->res.guest_memory_bo->tbo;
+ dst_bo = stdu->display_srf->res.guest_memory_bo;
dst_pitch = stdu->display_srf->metadata.base_size.width * stdu->cpp;
dst_offset = bb->y1 * dst_pitch + bb->x1 * stdu->cpp;
- src_bo = &vfbbo->buffer->tbo;
+ src_bo = vfbbo->buffer;
src_pitch = update->vfb->base.pitches[0];
src_offset = bo_update->fb_top * src_pitch + bo_update->fb_left *
stdu->cpp;
--
2.43.0
1 year, 4 months
- 1
- 0
[PATCH 1/3] drm/vmwgfx: Prevent unmapping active read buffers
by Zack Rusin
The kms paths keep a persistent map active to read and compare the cursor
buffer. These maps can race with each other in simple scenario where:
a) buffer "a" mapped for update
b) buffer "a" mapped for compare
c) do the compare
d) unmap "a" for compare
e) update the cursor
f) unmap "a" for update
At step "e" the buffer has been unmapped and the read contents is bogus.
Prevent unmapping of active read buffers by simply keeping a count of
how many paths have currently active maps and unmap only when the count
reaches 0.
Fixes: 485d98d472d5 ("drm/vmwgfx: Add support for CursorMob and CursorBypass 4")
Cc: Broadcom internal kernel review list <bcm-kernel-feedback-list(a)broadcom.com>
Cc: dri-devel(a)lists.freedesktop.org
Cc: <stable(a)vger.kernel.org> # v5.19+
Signed-off-by: Zack Rusin <zack.rusin(a)broadcom.com>
---
drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 13 +++++++++++--
drivers/gpu/drm/vmwgfx/vmwgfx_bo.h | 3 +++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_bo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_bo.c
index f42ebc4a7c22..a0e433fbcba6 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_bo.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_bo.c
@@ -360,6 +360,8 @@ void *vmw_bo_map_and_cache_size(struct vmw_bo *vbo, size_t size)
void *virtual;
int ret;
+ atomic_inc(&vbo->map_count);
+
virtual = ttm_kmap_obj_virtual(&vbo->map, ¬_used);
if (virtual)
return virtual;
@@ -383,11 +385,17 @@ void *vmw_bo_map_and_cache_size(struct vmw_bo *vbo, size_t size)
*/
void vmw_bo_unmap(struct vmw_bo *vbo)
{
+ int map_count;
+
if (vbo->map.bo == NULL)
return;
- ttm_bo_kunmap(&vbo->map);
- vbo->map.bo = NULL;
+ map_count = atomic_dec_return(&vbo->map_count);
+
+ if (!map_count) {
+ ttm_bo_kunmap(&vbo->map);
+ vbo->map.bo = NULL;
+ }
}
@@ -421,6 +429,7 @@ static int vmw_bo_init(struct vmw_private *dev_priv,
vmw_bo->tbo.priority = 3;
vmw_bo->res_tree = RB_ROOT;
xa_init(&vmw_bo->detached_resources);
+ atomic_set(&vmw_bo->map_count, 0);
params->size = ALIGN(params->size, PAGE_SIZE);
drm_gem_private_object_init(vdev, &vmw_bo->tbo.base, params->size);
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_bo.h b/drivers/gpu/drm/vmwgfx/vmwgfx_bo.h
index 62b4342d5f7c..43b5439ec9f7 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_bo.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_bo.h
@@ -71,6 +71,8 @@ struct vmw_bo_params {
* @map: Kmap object for semi-persistent mappings
* @res_tree: RB tree of resources using this buffer object as a backing MOB
* @res_prios: Eviction priority counts for attached resources
+ * @map_count: The number of currently active maps. Will differ from the
+ * cpu_writers because it includes kernel maps.
* @cpu_writers: Number of synccpu write grabs. Protected by reservation when
* increased. May be decreased without reservation.
* @dx_query_ctx: DX context if this buffer object is used as a DX query MOB
@@ -90,6 +92,7 @@ struct vmw_bo {
u32 res_prios[TTM_MAX_BO_PRIORITY];
struct xarray detached_resources;
+ atomic_t map_count;
atomic_t cpu_writers;
/* Not ref-counted. Protected by binding_mutex */
struct vmw_resource *dx_query_ctx;
--
2.43.0
1 year, 4 months
- 1
- 0
[PATCH] cxgb4: add forgotten u64 ivlan cast before shift
by Nikolay Kuratov
It is done everywhere in cxgb4 code, e.g. in is_filter_exact_match()
There is no reason it should not be done here
Found by Linux Verification Center (linuxtesting.org) with SVACE
Signed-off-by: Nikolay Kuratov <kniv(a)yandex-team.ru>
Cc: stable(a)vger.kernel.org
Fixes: 12b276fbf6e0 ("cxgb4: add support to create hash filters")
---
drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c
index 786ceae34488..e417ff0ea06c 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c
@@ -1244,7 +1244,7 @@ static u64 hash_filter_ntuple(struct ch_filter_specification *fs,
* in the Compressed Filter Tuple.
*/
if (tp->vlan_shift >= 0 && fs->mask.ivlan)
- ntuple |= (FT_VLAN_VLD_F | fs->val.ivlan) << tp->vlan_shift;
+ ntuple |= (u64)(FT_VLAN_VLD_F | fs->val.ivlan) << tp->vlan_shift;
if (tp->port_shift >= 0 && fs->mask.iport)
ntuple |= (u64)fs->val.iport << tp->port_shift;
--
2.34.1
1 year, 4 months
- 2
- 1
HI DEAR !
by Boris Soroka
Greetings,
Did you receive my last email message I sent to this Email
address: ( stable(a)vger.kernel.org ) concerning relocating my
investment to your country due to the on going war in my country
Russia.
Best Regards,
Mr.Boris Soroka.
1 year, 4 months
- 1
- 0
[for-linus][PATCH 2/2] rtla/osnoise: Prevent NULL dereference in error handling
by Steven Rostedt
From: Dan Carpenter <dan.carpenter(a)linaro.org>
If the "tool->data" allocation fails then there is no need to call
osnoise_free_top() and, in fact, doing so will lead to a NULL dereference.
Cc: stable(a)vger.kernel.org
Cc: John Kacur <jkacur(a)redhat.com>
Cc: "Luis Claudio R. Goncalves" <lgoncalv(a)redhat.com>
Cc: Clark Williams <williams(a)redhat.com>
Fixes: 1eceb2fc2ca5 ("rtla/osnoise: Add osnoise top mode")
Link: https://lore.kernel.org/f964ed1f-64d2-4fde-ad3e-708331f8f358@stanley.mounta…
Signed-off-by: Dan Carpenter <dan.carpenter(a)linaro.org>
Signed-off-by: Steven Rostedt (Google) <rostedt(a)goodmis.org>
---
tools/tracing/rtla/src/osnoise_top.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/tools/tracing/rtla/src/osnoise_top.c b/tools/tracing/rtla/src/osnoise_top.c
index f594a44df840..2f756628613d 100644
--- a/tools/tracing/rtla/src/osnoise_top.c
+++ b/tools/tracing/rtla/src/osnoise_top.c
@@ -651,8 +651,10 @@ struct osnoise_tool *osnoise_init_top(struct osnoise_top_params *params)
return NULL;
tool->data = osnoise_alloc_top(nr_cpus);
- if (!tool->data)
- goto out_err;
+ if (!tool->data) {
+ osnoise_destroy_tool(tool);
+ return NULL;
+ }
tool->params = params;
@@ -660,11 +662,6 @@ struct osnoise_tool *osnoise_init_top(struct osnoise_top_params *params)
osnoise_top_handler, NULL);
return tool;
-
-out_err:
- osnoise_free_top(tool->data);
- osnoise_destroy_tool(tool);
- return NULL;
}
static int stop_tracing;
--
2.43.0
1 year, 4 months
- 1
- 0
[for-linus][PATCH 1/2] tracing: Return from tracing_buffers_read() if the file has been closed
by Steven Rostedt
From: Steven Rostedt <rostedt(a)goodmis.org>
When running the following:
# cd /sys/kernel/tracing/
# echo 1 > events/sched/sched_waking/enable
# echo 1 > events/sched/sched_switch/enable
# echo 0 > tracing_on
# dd if=per_cpu/cpu0/trace_pipe_raw of=/tmp/raw0.dat
The dd task would get stuck in an infinite loop in the kernel. What would
happen is the following:
When ring_buffer_read_page() returns -1 (no data) then a check is made to
see if the buffer is empty (as happens when the page is not full), it will
call wait_on_pipe() to wait until the ring buffer has data. When it is it
will try again to read data (unless O_NONBLOCK is set).
The issue happens when there's a reader and the file descriptor is closed.
The wait_on_pipe() will return when that is the case. But this loop will
continue to try again and wait_on_pipe() will again return immediately and
the loop will continue and never stop.
Simply check if the file was closed before looping and exit out if it is.
Cc: stable(a)vger.kernel.org
Cc: Masami Hiramatsu <mhiramat(a)kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com>
Link: https://lore.kernel.org/20240808235730.78bf63e5@rorschach.local.home
Fixes: 2aa043a55b9a7 ("tracing/ring-buffer: Fix wait_on_pipe() race")
Signed-off-by: Steven Rostedt (Google) <rostedt(a)goodmis.org>
---
kernel/trace/trace.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 10cd38bce2f1..ebe7ce2f5f4a 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -7956,7 +7956,7 @@ tracing_buffers_read(struct file *filp, char __user *ubuf,
trace_access_unlock(iter->cpu_file);
if (ret < 0) {
- if (trace_empty(iter)) {
+ if (trace_empty(iter) && !iter->closed) {
if ((filp->f_flags & O_NONBLOCK))
return -EAGAIN;
--
2.43.0
1 year, 4 months
- 1
- 0
Re: [PATCH 6.10 00/25] 6.10.6-rc2 review
by Ronald Warsow
Hi Greg
no regressions here on x86_64 (RKL, Intel 11th Gen. CPU)
Thanks
Tested-by: Ronald Warsow <rwarsow(a)gmx.de>
1 year, 4 months
- 1
- 0
[PATCH 6.10 00/22] 6.10.6-rc1 review
by Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.10.6 release.
There are 22 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 Sat, 17 Aug 2024 13:18:17 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.10.6-rc1…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.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 6.10.6-rc1
Srinivasan Shanmugam <srinivasan.shanmugam(a)amd.com>
drm/amdgpu/display: Fix null pointer dereference in dc_stream_program_cursor_position
Wayne Lin <Wayne.Lin(a)amd.com>
drm/amd/display: Solve mst monitors blank out problem after resume
Kees Cook <kees(a)kernel.org>
binfmt_flat: Fix corruption when not offsetting data start
Gergo Koteles <soyer(a)irl.hu>
platform/x86: ideapad-laptop: add a mutex to synchronize VPC commands
Gergo Koteles <soyer(a)irl.hu>
platform/x86: ideapad-laptop: move ymc_trigger_ec from lenovo-ymc
Gergo Koteles <soyer(a)irl.hu>
platform/x86: ideapad-laptop: introduce a generic notification chain
Shyam Sundar S K <Shyam-sundar.S-k(a)amd.com>
platform/x86/amd/pmf: Fix to Update HPD Data When ALS is Disabled
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb: Fix UBSAN warning in parse_audio_unit()
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Do copy_to_user out of run_lock
Pei Li <peili.dev(a)gmail.com>
jfs: Fix shift-out-of-bounds in dbDiscardAG
Edward Adam Davis <eadavis(a)qq.com>
jfs: fix null ptr deref in dtInsertEntry
Willem de Bruijn <willemb(a)google.com>
fou: remove warn in gue_gro_receive on unsupported protocol
Chao Yu <chao(a)kernel.org>
f2fs: fix to cover read extent cache access with lock
Chao Yu <chao(a)kernel.org>
f2fs: fix to do sanity check on F2FS_INLINE_DATA flag in inode during GC
yunshui <jiangyunshui(a)kylinos.cn>
bpf, net: Use DEV_STAT_INC()
Simon Trimmer <simont(a)opensource.cirrus.com>
ASoC: cs35l56: Patch CS35L56_IRQ1_MASK_18 to the default value
WangYuli <wangyuli(a)uniontech.com>
nvme/pci: Add APST quirk for Lenovo N60z laptop
Huacai Chen <chenhuacai(a)kernel.org>
LoongArch: Define __ARCH_WANT_NEW_STAT in unistd.h
Fangzhi Zuo <jerry.zuo(a)amd.com>
drm/amd/display: Prevent IPX From Link Detect and Set Mode
Harry Wentland <harry.wentland(a)amd.com>
drm/amd/display: Separate setting and programming of cursor
Wayne Lin <wayne.lin(a)amd.com>
drm/amd/display: Defer handling mst up request in resume
Kees Cook <kees(a)kernel.org>
exec: Fix ToCToU between perm check and set-uid/gid usage
-------------
Diffstat:
Makefile | 4 +-
arch/loongarch/include/uapi/asm/unistd.h | 1 +
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 14 +-
.../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 6 +-
drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 94 ++++++++-----
drivers/gpu/drm/amd/display/dc/dc_stream.h | 8 ++
.../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 2 +-
drivers/nvme/host/pci.c | 7 +
drivers/platform/x86/Kconfig | 1 +
drivers/platform/x86/amd/pmf/spc.c | 32 ++---
drivers/platform/x86/ideapad-laptop.c | 148 ++++++++++++++++++---
drivers/platform/x86/ideapad-laptop.h | 9 ++
drivers/platform/x86/lenovo-ymc.c | 60 +--------
fs/binfmt_flat.c | 4 +-
fs/exec.c | 8 +-
fs/f2fs/extent_cache.c | 50 +++----
fs/f2fs/f2fs.h | 2 +-
fs/f2fs/gc.c | 10 ++
fs/f2fs/inode.c | 10 +-
fs/jfs/jfs_dmap.c | 2 +
fs/jfs/jfs_dtree.c | 2 +
fs/ntfs3/frecord.c | 75 ++++++++++-
net/core/filter.c | 8 +-
net/ipv4/fou_core.c | 2 +-
sound/soc/codecs/cs35l56-shared.c | 1 +
sound/usb/mixer.c | 7 +
26 files changed, 388 insertions(+), 179 deletions(-)
1 year, 4 months
- 10
- 32
[PATCH 5.4 000/259] 5.4.282-rc1 review
by Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.282 release.
There are 259 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 Sat, 17 Aug 2024 13:18:17 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.282-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.4.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 5.4.282-rc1
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix phy-mode
WangYuli <wangyuli(a)uniontech.com>
nvme/pci: Add APST quirk for Lenovo N60z laptop
Kees Cook <kees(a)kernel.org>
exec: Fix ToCToU between perm check and set-uid/gid usage
Yunke Cao <yunkec(a)google.com>
media: uvcvideo: Use entity get_cur in uvc_ctrl_set
Amit Daniel Kachhap <amit.kachhap(a)arm.com>
arm64: cpufeature: Fix the visibility of compat hwcaps
Andi Shyti <andi.shyti(a)linux.intel.com>
drm/i915/gem: Fix Virtual Memory mapping boundaries calculation
Florian Westphal <fw(a)strlen.de>
netfilter: nf_tables: prefer nft_chain_validate
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: nf_tables: use timestamp to check for set element timeout
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: nf_tables: set element extended ACK reporting support
Nathan Chancellor <nathan(a)kernel.org>
kbuild: Fix '-S -c' in x86 stack protector scripts
Jari Ruusu <jariruusu(a)protonmail.com>
Fix gcc 4.9 build issue in 5.4.y
Thomas Zimmermann <tzimmermann(a)suse.de>
drm/mgag200: Set DDC timeout in milliseconds
Lucas Stach <l.stach(a)pengutronix.de>
drm/bridge: analogix_dp: properly handle zero sized AUX transactions
Andi Kleen <ak(a)linux.intel.com>
x86/mtrr: Check if fixed MTRRs exist before saving them
Tze-nan Wu <Tze-nan.Wu(a)mediatek.com>
tracing: Fix overflow in get_free_elt()
Hans de Goede <hdegoede(a)redhat.com>
power: supply: axp288_charger: Round constant_charge_voltage writes down
Hans de Goede <hdegoede(a)redhat.com>
power: supply: axp288_charger: Fix constant_charge_voltage writes
Shay Drory <shayd(a)nvidia.com>
genirq/irqdesc: Honor caller provided affinity in alloc_desc()
George Kennedy <george.kennedy(a)oracle.com>
serial: core: check uartclk for zero to avoid divide by zero
Damien Le Moal <dlemoal(a)kernel.org>
scsi: mpt3sas: Avoid IOMMU page faults on REPORT ZONES
Sreekanth Reddy <sreekanth.reddy(a)broadcom.com>
scsi: mpt3sas: Remove scsi_dma_map() error messages
Justin Stitt <justinstitt(a)google.com>
ntp: Safeguard against time_constant overflow
Dan Williams <dan.j.williams(a)intel.com>
driver core: Fix uevent_show() vs driver detach race
Justin Stitt <justinstitt(a)google.com>
ntp: Clamp maxerror and esterror to operating range
Thomas Gleixner <tglx(a)linutronix.de>
tick/broadcast: Move per CPU pointer access into the atomic section
Vamshi Gajjela <vamshigajjela(a)google.com>
scsi: ufs: core: Fix hba->last_dme_cmd_tstamp timestamp updating logic
Chris Wulff <crwulff(a)gmail.com>
usb: gadget: core: Check for unset descriptor
Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com>
USB: serial: debug: do not echo input by default
Oliver Neukum <oneukum(a)suse.com>
usb: vhci-hcd: Do not drop references before new references are gained
Takashi Iwai <tiwai(a)suse.de>
ALSA: hda/hdmi: Yet more pin fix for HP EliteDesk 800 G4
Steven 'Steve' Kendall <skend(a)chromium.org>
ALSA: hda: Add HP MP9 G4 Retail System AMS to force connect list
Takashi Iwai <tiwai(a)suse.de>
ALSA: line6: Fix racy access to midibuf
Ma Ke <make24(a)iscas.ac.cn>
drm/client: fix null pointer dereference in drm_client_modeset_probe
Stefan Wahren <wahrenst(a)gmx.net>
spi: spi-fsl-lpspi: Fix scldiv calculation
Oleksandr Suvorov <oleksandr.suvorov(a)toradex.com>
spi: fsl-lpspi: remove unneeded array
Menglong Dong <menglong8.dong(a)gmail.com>
bpf: kprobe: remove unused declaring of bpf_kprobe_override
Guenter Roeck <linux(a)roeck-us.net>
i2c: smbus: Send alert notifications to all devices if source not found
Guenter Roeck <linux(a)roeck-us.net>
i2c: smbus: Improve handling of stuck alerts
Corey Minyard <cminyard(a)mvista.com>
i2c: smbus: Don't filter out duplicate alerts
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Expand speculative SSBS workaround (again)
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-A725 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X1C definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Expand speculative SSBS workaround
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Unify speculative SSBS errata logic
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X925 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-A720 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X3 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Add workaround for Arm errata 3194386 and 3312417
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Neoverse-V3 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X4 definitions
Besar Wicaksono <bwicaksono(a)nvidia.com>
arm64: Add Neoverse-V2 part
James Morse <james.morse(a)arm.com>
arm64: cpufeature: Force HWCAP to be based on the sysreg visible to user-space
Kemeng Shi <shikemeng(a)huaweicloud.com>
ext4: fix wrong unit use in ext4_mb_find_by_goal
Benjamin Coddington <bcodding(a)redhat.com>
SUNRPC: Fix a race to wake a sync task
Peter Oberparleiter <oberpar(a)linux.ibm.com>
s390/sclp: Prevent release of buffer in I/O
Kemeng Shi <shikemeng(a)huaweicloud.com>
jbd2: avoid memleak in jbd2_journal_write_metadata_buffer
Michal Pecio <michal.pecio(a)gmail.com>
media: uvcvideo: Fix the bandwdith quirk on USB 3.x
Ricardo Ribalda <ribalda(a)chromium.org>
media: uvcvideo: Ignore empty TS packets
Ma Jun <Jun.Ma2(a)amd.com>
drm/amdgpu: Fix the null pointer dereference to ras_manager
Filipe Manana <fdmanana(a)suse.com>
btrfs: fix bitmap leak when loading free space cache on duplicate entry
Johannes Berg <johannes.berg(a)intel.com>
wifi: nl80211: don't give key data to userspace
Roman Smirnov <r.smirnov(a)omp.ru>
udf: prevent integer overflow in udf_bitmap_free_blocks()
FUJITA Tomonori <fujita.tomonori(a)gmail.com>
PCI: Add Edimax Vendor ID to pci_ids.h
Yonghong Song <yonghong.song(a)linux.dev>
selftests/bpf: Fix send_signal test with nested CONFIG_PARAVIRT
Thomas Weißschuh <linux(a)weissschuh.net>
ACPI: SBS: manage alarm sysfs attribute through psy core
Thomas Weißschuh <linux(a)weissschuh.net>
ACPI: battery: create alarm sysfs attribute atomically
Niklas Söderlund <niklas.soderlund+renesas(a)ragnatech.se>
clocksource/drivers/sh_cmt: Address race condition for clock events
Yu Kuai <yukuai3(a)huawei.com>
md/raid5: avoid BUG_ON() while continue reshape after reassembling
Csókás, Bence <csokas.bence(a)prolan.hu>
net: fec: Stop PPS on driver remove
Dmitry Antipov <dmantipov(a)yandex.ru>
Bluetooth: l2cap: always unlock channel in l2cap_conless_channel()
Eric Dumazet <edumazet(a)google.com>
net: linkwatch: use system_unbound_wq
Daniele Palmas <dnlplm(a)gmail.com>
net: usb: qmi_wwan: fix memory leak for not ip packets
Kuniyuki Iwashima <kuniyu(a)amazon.com>
sctp: Fix null-ptr-deref in reuseport_add_sock().
Xin Long <lucien.xin(a)gmail.com>
sctp: move hlist_node and hashent out of sctp_ep_common
Peter Zijlstra <peterz(a)infradead.org>
x86/mm: Fix pti_clone_pgtable() alignment assumption
Yipeng Zou <zouyipeng(a)huawei.com>
irqchip/mbigen: Fix mbigen node address layout
Marc Zyngier <maz(a)kernel.org>
genirq: Allow irq_chip registration functions to take a const irq_chip
Alexander Maltsev <keltar.gw(a)gmail.com>
netfilter: ipset: Add list flush to cancel_gc
Ma Ke <make24(a)iscas.ac.cn>
net: usb: sr9700: fix uninitialized variable use in sr_mdio_read
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Correct surround channels in UAC1 channel map
Al Viro <viro(a)zeniv.linux.org.uk>
protect the fetch of ->fd[fd] in do_dup2() from mispredictions
Tatsunosuke Tobita <tatsunosuke.tobita(a)wacom.com>
HID: wacom: Modify pen IDs
Maciej Żenczykowski <maze(a)google.com>
ipv6: fix ndisc_is_useropt() handling for PIO
Shahar Shitrit <shshitrit(a)nvidia.com>
net/mlx5e: Add a check for the return value from mlx5_port_set_eth_ptys
Alexandra Winter <wintera(a)linux.ibm.com>
net/iucv: fix use after free in iucv_sock_close()
Ian Forbes <ian.forbes(a)broadcom.com>
drm/vmwgfx: Fix overlay when using Screen Targets
Danilo Krummrich <dakr(a)kernel.org>
drm/nouveau: prime: fix refcount underflow
Aleksandr Mishin <amishin(a)t-argos.ru>
remoteproc: imx_rproc: Skip over memory region when node value is NULL
Dong Aisheng <aisheng.dong(a)nxp.com>
remoteproc: imx_rproc: Fix ignoring mapping vdev regions
Peng Fan <peng.fan(a)nxp.com>
remoteproc: imx_rproc: ignore mapping vdev regions
Shenwei Wang <shenwei.wang(a)nxp.com>
irqchip/imx-irqsteer: Handle runtime power management correctly
Lucas Stach <l.stach(a)pengutronix.de>
irqchip/imx-irqsteer: Add runtime PM support
Lucas Stach <l.stach(a)pengutronix.de>
irqchip/imx-irqsteer: Constify irq_chip struct
Marc Zyngier <maz(a)kernel.org>
genirq: Allow the PM device to originate from irq domain
Zijun Hu <quic_zijuhu(a)quicinc.com>
devres: Fix memory leakage caused by driver API devm_free_percpu()
Andy Shevchenko <andriy.shevchenko(a)linux.intel.com>
driver core: Cast to (void *) with __force for __percpu pointer
tuhaowen <tuhaowen(a)uniontech.com>
dev/parport: fix the array out-of-bounds risk
Joe Perches <joe(a)perches.com>
parport: Standardize use of printmode
Joe Perches <joe(a)perches.com>
parport: Convert printk(KERN_<LEVEL> to pr_<level>(
Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org>
PCI: rockchip: Use GPIOD_OUT_LOW flag while requesting ep_gpio
Chen-Yu Tsai <wens(a)csie.org>
PCI: rockchip: Make 'ep-gpios' DT property optional
Jan Kara <jack(a)suse.cz>
mm: avoid overflows in dirty throttling logic
Leon Romanovsky <leonro(a)nvidia.com>
nvme-pci: add missing condition check for existence of mapped data
Gerd Bayer <gbayer(a)linux.ibm.com>
s390/pci: Allow allocation of more than 1 MSI interrupt
Gerd Bayer <gbayer(a)linux.ibm.com>
s390/pci: Refactor arch_setup_msi_irqs()
Thomas Gleixner <tglx(a)linutronix.de>
s390/pci: Rework MSI descriptor walk
Thomas Gleixner <tglx(a)linutronix.de>
s390/pci: Do not mask MSI[-X] entries on teardown
Alexander Gordeev <agordeev(a)linux.ibm.com>
s390/pci: fix CPU address in MSI for directed IRQ
Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>
ASoC: Intel: use soc_intel_is_byt_cr() only when IOSF_MBI is reachable
Hans de Goede <hdegoede(a)redhat.com>
ASoC: Intel: Move soc_intel_is_foo() helpers to a generic header
Thomas Gleixner <tglx(a)linutronix.de>
ASoC: Intel: Convert to new X86 CPU match macros
Al Viro <viro(a)zeniv.linux.org.uk>
powerpc: fix a file leak in kvm_vcpu_ioctl_enable_cap()
Xiao Liang <shaw.leon(a)gmail.com>
apparmor: Fix null pointer deref when receiving skb during sock creation
Dan Carpenter <dan.carpenter(a)linaro.org>
mISDN: Fix a use after free in hfcmulti_tx()
Fred Li <dracodingfly(a)gmail.com>
bpf: Fix a segment issue when downgrading gso_size
Petr Machata <petrm(a)nvidia.com>
net: nexthop: Initialize all fields in dumped nexthops
Shigeru Yoshida <syoshida(a)redhat.com>
tipc: Return non-zero value from tipc_udp_addr2str() on error
Johannes Berg <johannes.berg(a)intel.com>
net: bonding: correctly annotate RCU in bond_should_notify_peers()
Ido Schimmel <idosch(a)nvidia.com>
ipv4: Fix incorrect source address in Record Route option
Gregory CLEMENT <gregory.clement(a)bootlin.com>
MIPS: SMP-CPS: Fix address for GCR_ACCESS register for CM3 and later
Lance Richardson <rlance(a)google.com>
dma: fix call order in dmam_free_coherent
Andrii Nakryiko <andrii(a)kernel.org>
libbpf: Fix no-args func prototype BTF dumping syntax
Johannes Berg <johannes.berg(a)intel.com>
um: time-travel: fix time-travel-start option
Jeongjun Park <aha310510(a)gmail.com>
jfs: Fix array-index-out-of-bounds in diFree
Douglas Anderson <dianders(a)chromium.org>
kdb: Use the passed prompt in kdb_position_cursor()
Arnd Bergmann <arnd(a)arndb.de>
kdb: address -Wformat-security warnings
Ryusuke Konishi <konishi.ryusuke(a)gmail.com>
nilfs2: handle inconsistent state in nilfs_btnode_create_block()
WangYuli <wangyuli(a)uniontech.com>
Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x13d3:0x3591
Hilda Wu <hildawu(a)realtek.com>
Bluetooth: btusb: Add RTL8852BE device 0489:e125 to device tables
Ilya Dryomov <idryomov(a)gmail.com>
rbd: don't assume RBD_LOCK_STATE_LOCKED for exclusive mappings
Ilya Dryomov <idryomov(a)gmail.com>
rbd: rename RBD_LOCK_STATE_RELEASING and releasing_wait
Dragan Simic <dsimic(a)manjaro.org>
drm/panfrost: Mark simple_ondemand governor as softdep
Ilya Dryomov <idryomov(a)gmail.com>
rbd: don't assume rbd_is_lock_owner() for exclusive mappings
Michael Ellerman <mpe(a)ellerman.id.au>
selftests/sigaltstack: Fix ppc64 GCC build
Bart Van Assche <bvanassche(a)acm.org>
RDMA/iwcm: Fix a use-after-free related to destroying CM IDs
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
platform: mips: cpu_hwmon: Disable driver on unsupported hardware
Thomas Gleixner <tglx(a)linutronix.de>
watchdog/perf: properly initialize the turbo mode timestamp and rearm counter
Joy Chakraborty <joychakr(a)google.com>
rtc: isl1208: Fix return value of nvmem callbacks
Adrian Hunter <adrian.hunter(a)intel.com>
perf/x86/intel/pt: Fix a topa_entry base address calculation
Marco Cavenati <cavenati.marco(a)gmail.com>
perf/x86/intel/pt: Fix topa_entry base length
Nilesh Javali <njavali(a)marvell.com>
scsi: qla2xxx: validate nvme_local_port correctly
Shreyas Deodhar <sdeodhar(a)marvell.com>
scsi: qla2xxx: Complete command early within lock
Shreyas Deodhar <sdeodhar(a)marvell.com>
scsi: qla2xxx: Fix for possible memory corruption
Manish Rangankar <mrangankar(a)marvell.com>
scsi: qla2xxx: During vport delete send async logout explicitly
Joy Chakraborty <joychakr(a)google.com>
rtc: cmos: Fix return value of nvmem callbacks
Zijun Hu <quic_zijuhu(a)quicinc.com>
kobject_uevent: Fix OOB access within zap_modalias_env()
Ross Lagerwall <ross.lagerwall(a)citrix.com>
decompress_bunzip2: fix rare decompression failure
Fedor Pchelkin <pchelkin(a)ispras.ru>
ubi: eba: properly rollback inside self_check_eba
Bastien Curutchet <bastien.curutchet(a)bootlin.com>
clk: davinci: da8xx-cfgchip: Initialize clk_init_data before use
Chao Yu <chao(a)kernel.org>
f2fs: fix to don't dirty inode for readonly filesystem
Saurav Kashyap <skashyap(a)marvell.com>
scsi: qla2xxx: Return ENOBUFS if sg_cnt is more than one for ELS cmds
Carlos Llamas <cmllamas(a)google.com>
binder: fix hang of unregistered readers
Wei Liu <wei.liu(a)kernel.org>
PCI: hv: Return zero, not garbage, when reading PCI_INTERRUPT_PIN
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
hwrng: amd - Convert PCIBIOS_* return codes to errnos
Alan Stern <stern(a)rowland.harvard.edu>
tools/memory-model: Fix bug in lock.cat
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
leds: ss4200: Convert PCIBIOS_* return codes to errnos
Rafael Beims <rafael.beims(a)toradex.com>
wifi: mwifiex: Fix interface type change
Baokun Li <libaokun1(a)huawei.com>
ext4: make sure the first directory block is not a hole
Baokun Li <libaokun1(a)huawei.com>
ext4: check dot and dotdot of dx_root before making dir indexed
Paolo Pisati <p.pisati(a)gmail.com>
m68k: amiga: Turn off Warp1260 interrupts during boot
Jan Kara <jack(a)suse.cz>
udf: Avoid using corrupted block bitmap buffer
Sung Joon Kim <sungjoon.kim(a)amd.com>
drm/amd/display: Check for NULL pointer
Ma Ke <make24(a)iscas.ac.cn>
drm/gma500: fix null pointer dereference in psb_intel_lvds_get_modes
Ma Ke <make24(a)iscas.ac.cn>
drm/gma500: fix null pointer dereference in cdv_intel_lvds_get_modes
Chao Yu <chao(a)kernel.org>
hfs: fix to initialize fields of hfs_inode_info after hfs_alloc_inode()
Dikshita Agarwal <quic_dikshita(a)quicinc.com>
media: venus: fix use after free in vdec_close
Joe Hattori <joe(a)pf.is.s.u-tokyo.ac.jp>
char: tpm: Fix possible memory leak in tpm_bios_measurements_open()
Nicolas Dichtel <nicolas.dichtel(a)6wind.com>
ipv6: take care of scope when choosing the src addr
Chengen Du <chengen.du(a)canonical.com>
af_packet: Handle outgoing VLAN packets without hardware offloading
Breno Leitao <leitao(a)debian.org>
net: netconsole: Disable target before netpoll cleanup
Yu Liao <liaoyu15(a)huawei.com>
tick/broadcast: Make takeover of broadcast hrtimer reliable
Csókás, Bence <csokas.bence(a)prolan.hu>
rtc: interface: Add RTC offset to alarm after fix-up
Ryusuke Konishi <konishi.ryusuke(a)gmail.com>
nilfs2: avoid undefined behavior in nilfs_cnt32_ge macro
Alex Shi <alex.shi(a)linux.alibaba.com>
fs/nilfs2: remove some unused macros to tame gcc
Peng Fan <peng.fan(a)nxp.com>
pinctrl: freescale: mxs: Fix refcount of child
Yang Yingliang <yangyingliang(a)huawei.com>
pinctrl: ti: ti-iodelay: fix possible memory leak when pinctrl_enable() fails
Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de>
pinctrl: ti: ti-iodelay: Drop if block with always false condition
Yang Yingliang <yangyingliang(a)huawei.com>
pinctrl: single: fix possible memory leak when pinctrl_enable() fails
Yang Yingliang <yangyingliang(a)huawei.com>
pinctrl: core: fix possible memory leak when pinctrl_enable() fails
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: ctnetlink: use helper function to calculate expect ID
Jack Wang <jinpu.wang(a)ionos.com>
bnxt_re: Fix imm_data endianness
Nick Bowler <nbowler(a)draconx.ca>
macintosh/therm_windtunnel: fix module unload.
Michael Ellerman <mpe(a)ellerman.id.au>
powerpc/xmon: Fix disassembly CPU feature checks
Dominique Martinet <dominique.martinet(a)atmark-techno.com>
MIPS: Octeron: remove source file executable bit
Dmitry Torokhov <dmitry.torokhov(a)gmail.com>
Input: elan_i2c - do not leave interrupt disabled on suspend failure
Leon Romanovsky <leonro(a)nvidia.com>
RDMA/device: Return error earlier if port in not valid
Arnd Bergmann <arnd(a)arndb.de>
mtd: make mtd_test.c a separate module
Chen Ni <nichen(a)iscas.ac.cn>
ASoC: max98088: Check for clk_prepare_enable() error
Honggang LI <honggangli(a)163.com>
RDMA/rxe: Don't set BTH_ACK_MASK for UC or UD QPs
Leon Romanovsky <leonro(a)nvidia.com>
RDMA/mlx4: Fix truncated output warning in alias_GUID.c
Leon Romanovsky <leonro(a)nvidia.com>
RDMA/mlx4: Fix truncated output warning in mad.c
Andrei Lalaev <andrei.lalaev(a)anton-paar.com>
Input: qt1050 - handle CHIP_ID reading error
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
PCI: Fix resource double counting on remove & rescan
Benjamin Coddington <bcodding(a)redhat.com>
SUNRPC: Fixup gss_status tracepoint error output
Andreas Larsson <andreas(a)gaisler.com>
sparc64: Fix incorrect function signature and add prototype for prom_cif_init
Jan Kara <jack(a)suse.cz>
ext4: avoid writing unitialized memory to disk in EA inodes
NeilBrown <neilb(a)suse.de>
SUNRPC: avoid soft lockup when transmitting UDP to reachable server.
Javier Carrasco <javier.carrasco.cruz(a)gmail.com>
mfd: omap-usb-tll: Use struct_size to allocate tll
Chen Ni <nichen(a)iscas.ac.cn>
drm/qxl: Add check for drm_cvt_mode
Lucas Stach <l.stach(a)pengutronix.de>
drm/etnaviv: fix DMA direction handling for cached RW buffers
Namhyung Kim <namhyung(a)kernel.org>
perf report: Fix condition in sort__sym_cmp()
Hans de Goede <hdegoede(a)redhat.com>
leds: trigger: Unregister sysfs attributes before calling deactivate()
Laurent Pinchart <laurent.pinchart+renesas(a)ideasonboard.com>
media: renesas: vsp1: Store RPF partition configuration per RPF instance
Laurent Pinchart <laurent.pinchart+renesas(a)ideasonboard.com>
media: renesas: vsp1: Fix _irqsave and _irq mix
Daniel Schaefer <dhs(a)frame.work>
media: uvcvideo: Override default flags
Ricardo Ribalda <ribalda(a)chromium.org>
media: uvcvideo: Allow entity-defined get_info and get_cur
Aleksandr Burakov <a.burakov(a)rosalinux.ru>
saa7134: Unchecked i2c_transfer function result fixed
Ricardo Ribalda <ribalda(a)chromium.org>
media: imon: Fix race getting ictx->lock
Zheng Yejian <zhengyejian1(a)huawei.com>
media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
USB: move snd_usb_pipe_sanity_check into the USB core
Amit Cohen <amcohen(a)nvidia.com>
selftests: forwarding: devlink_lib: Wait for udev events after reloading
Alexey Kodanev <aleksei.kodanev(a)bell-sw.com>
bna: adjust 'name' buf size of bna_tcb and bna_ccb structures
Johannes Berg <johannes.berg(a)intel.com>
wifi: virt_wifi: don't use strlen() in const context
Gaosheng Cui <cuigaosheng1(a)huawei.com>
gss_krb5: Fix the error handling path for crypto_sync_skcipher_setkey
En-Wei Wu <en-wei.wu(a)canonical.com>
wifi: virt_wifi: avoid reporting connection success with wrong SSID
Shai Malin <smalin(a)marvell.com>
qed: Improve the stack space of filter_config()
Adrian Hunter <adrian.hunter(a)intel.com>
perf: Prevent passing zero nr_pages to rb_alloc_aux()
Adrian Hunter <adrian.hunter(a)intel.com>
perf: Fix perf_aux_size() for greater-than 32-bit size
Adrian Hunter <adrian.hunter(a)intel.com>
perf/x86/intel/pt: Fix pt_topa_entry_for_page() address calculation
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: nf_tables: rise cap on SELinux secmark context
Ismael Luceno <iluceno(a)suse.de>
ipvs: Avoid unnecessary calls to skb_is_gso_sctp
Csókás, Bence <csokas.bence(a)prolan.hu>
net: fec: Fix FEC_ECR_EN1588 being cleared on link-down
Csókás Bence <csokas.bence(a)prolan.hu>
net: fec: Refactor: #define magic constants
Baochen Qiang <quic_bqiang(a)quicinc.com>
wifi: cfg80211: handle 2x996 RU allocation in cfg80211_calculate_bitrate_he()
Baochen Qiang <quic_bqiang(a)quicinc.com>
wifi: cfg80211: fix typo in cfg80211_calculate_bitrate_he()
Ido Schimmel <idosch(a)nvidia.com>
mlxsw: spectrum_acl_erp: Fix object nesting warning
Ido Schimmel <idosch(a)nvidia.com>
lib: objagg: Fix general protection fault
Geliang Tang <tanggeliang(a)kylinos.cn>
selftests/bpf: Check length of recv in test_sockmap
Guangguan Wang <guangguan.wang(a)linux.alibaba.com>
net/smc: set rmb's SG_MAX_SINGLE_ALLOC limitation only when CONFIG_ARCH_NO_SG_CHAIN is defined
Stefan Raspl <raspl(a)linux.ibm.com>
net/smc: Allow SMC-D 1MB DMB allocations
Samasth Norway Ananda <samasth.norway.ananda(a)oracle.com>
wifi: brcmsmac: LCN PHY code is used for BCM4313 2G-only device
Marek Behún <kabel(a)kernel.org>
firmware: turris-mox-rwtm: Initialize completion before mailbox
Marek Behún <kabel(a)kernel.org>
firmware: turris-mox-rwtm: Fix checking return value of wait_for_completion_timeout()
Thorsten Blum <thorsten.blum(a)toblux.com>
m68k: cmpxchg: Fix return value for default case in __arch_xchg()
Chen Ni <nichen(a)iscas.ac.cn>
x86/xen: Convert comma to semicolon
Eero Tamminen <oak(a)helsinkinet.fi>
m68k: atari: Fix TT bootup freeze / unexpected (SCU) interrupt messages
Jerome Brunet <jbrunet(a)baylibre.com>
arm64: dts: amlogic: gx: correct hdmi clocks
Rafał Miłecki <rafal(a)milecki.pl>
arm64: dts: mediatek: mt7622: fix "emmc" pinctrl mux
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix PCIe reset polarity
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix board reset
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix PHY reset
Marco Felsch <m.felsch(a)pengutronix.de>
ARM: dts: imx6qdl-kontron-samx6i: move phy reset into phy-node
Jonas Karlman <jonas(a)kwiboo.se>
arm64: dts: rockchip: Increase VOP clk rate on RK3328
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: msm8996: specify UFS core_clk frequencies
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: sdm845: add power-domain to UFS PHY
Guenter Roeck <linux(a)roeck-us.net>
hwmon: (max6697) Fix swapped temp{1,8} critical alarms
Guenter Roeck <linux(a)roeck-us.net>
hwmon: (max6697) Fix underflow when writing limit attributes
Uwe Kleine-König <u.kleine-koenig(a)baylibre.com>
pwm: stm32: Always do lazy disabling
Wayne Tung <chineweff(a)gmail.com>
hwmon: (adt7475) Fix default duty on fan is disabled
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/platform/iosf_mbi: Convert PCIBIOS_* return codes to errnos
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/pci/xen: Fix PCIBIOS_* return code handling
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/pci/intel_mid_pci: Fix PCIBIOS_* return code handling
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/of: Return consistent error type from x86_of_pci_irq_enable()
Chao Yu <chao(a)kernel.org>
hfsplus: fix to avoid false alarm of circular locking
Tzung-Bi Shih <tzungbi(a)kernel.org>
platform/chrome: cros_ec_debugfs: fix wrong EC message version
Arnd Bergmann <arnd(a)arndb.de>
EDAC, i10nm: make skx_common.o a separate module
Qiuxu Zhuo <qiuxu.zhuo(a)intel.com>
EDAC/skx_common: Add new ADXL components for 2-level memory
Tony Luck <tony.luck(a)intel.com>
EDAC, skx: Retrieve and print retry_rd_err_log registers
Tony Luck <tony.luck(a)intel.com>
EDAC, skx_common: Refactor so that we initialize "dev" in result of adxl decode.
-------------
Diffstat:
Documentation/arm64/cpu-feature-registers.rst | 38 ++++-
Documentation/arm64/silicon-errata.rst | 36 +++++
Makefile | 4 +-
arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 21 ++-
arch/arm64/Kconfig | 38 +++++
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 4 +-
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 4 +-
.../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 4 +-
arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 4 +-
arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 4 +-
arch/arm64/include/asm/cpucaps.h | 3 +-
arch/arm64/include/asm/cputype.h | 16 ++
arch/arm64/kernel/cpu_errata.c | 44 +++++
arch/arm64/kernel/cpufeature.c | 94 ++++++++---
arch/m68k/amiga/config.c | 9 ++
arch/m68k/atari/ataints.c | 6 +-
arch/m68k/include/asm/cmpxchg.h | 2 +-
arch/mips/include/asm/mips-cm.h | 4 +
arch/mips/kernel/smp-cps.c | 5 +-
arch/mips/pci/pcie-octeon.c | 0
arch/powerpc/kvm/powerpc.c | 4 +-
arch/powerpc/xmon/ppc-dis.c | 33 ++--
arch/s390/pci/pci_irq.c | 132 +++++++++------
arch/sparc/include/asm/oplib_64.h | 1 +
arch/sparc/prom/init_64.c | 3 -
arch/sparc/prom/p1275.c | 2 +-
arch/um/kernel/time.c | 4 +-
arch/x86/events/intel/pt.c | 4 +-
arch/x86/events/intel/pt.h | 4 +-
arch/x86/kernel/cpu/mtrr/mtrr.c | 2 +-
arch/x86/kernel/devicetree.c | 2 +-
arch/x86/mm/pti.c | 6 +-
arch/x86/pci/intel_mid_pci.c | 4 +-
arch/x86/pci/xen.c | 4 +-
arch/x86/platform/intel/iosf_mbi.c | 4 +-
arch/x86/xen/p2m.c | 4 +-
drivers/acpi/battery.c | 16 +-
drivers/acpi/sbs.c | 23 +--
drivers/android/binder.c | 4 +-
drivers/base/core.c | 13 +-
drivers/base/devres.c | 8 +-
drivers/base/module.c | 4 +
drivers/block/rbd.c | 35 ++--
drivers/bluetooth/btusb.c | 4 +
drivers/char/hw_random/amd-rng.c | 4 +-
drivers/char/tpm/eventlog/common.c | 2 +
drivers/clk/davinci/da8xx-cfgchip.c | 4 +-
drivers/clocksource/sh_cmt.c | 13 +-
drivers/edac/Makefile | 10 +-
drivers/edac/skx_base.c | 51 +++++-
drivers/edac/skx_common.c | 146 ++++++++++++-----
drivers/edac/skx_common.h | 19 ++-
drivers/firmware/turris-mox-rwtm.c | 18 +--
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 7 +-
drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 3 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 5 +-
drivers/gpu/drm/drm_client_modeset.c | 5 +
drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 +-
drivers/gpu/drm/gma500/cdv_intel_lvds.c | 3 +
drivers/gpu/drm/gma500/psb_intel_lvds.c | 3 +
drivers/gpu/drm/i915/gem/i915_gem_mman.c | 47 +++++-
drivers/gpu/drm/mgag200/mgag200_i2c.c | 2 +-
drivers/gpu/drm/nouveau/nouveau_prime.c | 3 +-
drivers/gpu/drm/panfrost/panfrost_drv.c | 1 +
drivers/gpu/drm/qxl/qxl_display.c | 3 +
drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 2 +-
drivers/hid/wacom_wac.c | 3 +-
drivers/hwmon/adt7475.c | 2 +-
drivers/hwmon/max6697.c | 5 +-
drivers/i2c/i2c-smbus.c | 69 ++++++--
drivers/infiniband/core/device.c | 6 +-
drivers/infiniband/core/iwcm.c | 11 +-
drivers/infiniband/hw/bnxt_re/ib_verbs.c | 8 +-
drivers/infiniband/hw/bnxt_re/qplib_fp.h | 6 +-
drivers/infiniband/hw/mlx4/alias_GUID.c | 2 +-
drivers/infiniband/hw/mlx4/mad.c | 2 +-
drivers/infiniband/sw/rxe/rxe_req.c | 7 +-
drivers/input/keyboard/qt1050.c | 7 +-
drivers/input/mouse/elan_i2c_core.c | 2 +
drivers/irqchip/irq-imx-irqsteer.c | 40 ++++-
drivers/irqchip/irq-mbigen.c | 20 ++-
drivers/isdn/hardware/mISDN/hfcmulti.c | 7 +-
drivers/leds/led-triggers.c | 2 +-
drivers/leds/leds-ss4200.c | 7 +-
drivers/macintosh/therm_windtunnel.c | 2 +-
drivers/md/raid5.c | 20 ++-
drivers/media/pci/saa7134/saa7134-dvb.c | 8 +-
drivers/media/platform/qcom/venus/vdec.c | 1 +
drivers/media/platform/vsp1/vsp1_histo.c | 20 +--
drivers/media/platform/vsp1/vsp1_pipe.h | 2 +-
drivers/media/platform/vsp1/vsp1_rpf.c | 8 +-
drivers/media/rc/imon.c | 5 +-
drivers/media/usb/dvb-usb/dvb-usb-init.c | 35 +++-
drivers/media/usb/uvc/uvc_ctrl.c | 90 +++++++----
drivers/media/usb/uvc/uvc_video.c | 37 ++++-
drivers/media/usb/uvc/uvcvideo.h | 5 +
drivers/mfd/omap-usb-tll.c | 3 +-
drivers/mtd/tests/Makefile | 34 ++--
drivers/mtd/tests/mtd_test.c | 9 ++
drivers/mtd/ubi/eba.c | 3 +-
drivers/net/bonding/bond_main.c | 7 +-
drivers/net/ethernet/brocade/bna/bna_types.h | 2 +-
drivers/net/ethernet/brocade/bna/bnad.c | 11 +-
drivers/net/ethernet/freescale/fec_main.c | 52 ++++--
drivers/net/ethernet/freescale/fec_ptp.c | 3 +
.../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 7 +-
.../net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c | 13 --
drivers/net/ethernet/qlogic/qed/qed_l2.c | 23 +--
drivers/net/ethernet/qlogic/qede/qede_filter.c | 47 +++---
drivers/net/netconsole.c | 2 +-
drivers/net/usb/qmi_wwan.c | 1 +
drivers/net/usb/sr9700.c | 11 +-
.../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 18 +--
drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 +
drivers/net/wireless/virt_wifi.c | 20 ++-
drivers/nvme/host/pci.c | 10 +-
drivers/parport/daisy.c | 6 +-
drivers/parport/ieee1284.c | 4 +-
drivers/parport/ieee1284_ops.c | 3 +-
drivers/parport/parport_amiga.c | 2 +-
drivers/parport/parport_atari.c | 2 +-
drivers/parport/parport_cs.c | 6 +-
drivers/parport/parport_gsc.c | 15 +-
drivers/parport/parport_ip32.c | 25 ++-
drivers/parport/parport_mfc3.c | 2 +-
drivers/parport/parport_pc.c | 178 +++++++++------------
drivers/parport/parport_sunbpp.c | 2 +-
drivers/parport/probe.c | 7 +-
drivers/parport/procfs.c | 28 ++--
drivers/parport/share.c | 24 +--
drivers/pci/controller/pci-hyperv.c | 4 +-
drivers/pci/controller/pcie-rockchip.c | 12 +-
drivers/pci/msi.c | 4 +-
drivers/pci/setup-bus.c | 6 +-
drivers/pinctrl/core.c | 12 +-
drivers/pinctrl/freescale/pinctrl-mxs.c | 4 +-
drivers/pinctrl/pinctrl-single.c | 7 +-
drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 14 +-
drivers/platform/chrome/cros_ec_debugfs.c | 1 +
drivers/platform/mips/cpu_hwmon.c | 3 +
drivers/power/supply/axp288_charger.c | 24 +--
drivers/pwm/pwm-stm32.c | 5 +-
drivers/remoteproc/imx_rproc.c | 5 +
drivers/rtc/interface.c | 9 +-
drivers/rtc/rtc-cmos.c | 10 +-
drivers/rtc/rtc-isl1208.c | 11 +-
drivers/s390/char/sclp_sd.c | 10 +-
drivers/scsi/mpt3sas/mpt3sas_base.c | 38 +++--
drivers/scsi/qla2xxx/qla_bsg.c | 2 +-
drivers/scsi/qla2xxx/qla_mid.c | 2 +-
drivers/scsi/qla2xxx/qla_nvme.c | 5 +-
drivers/scsi/qla2xxx/qla_os.c | 7 +-
drivers/scsi/ufs/ufshcd.c | 11 +-
drivers/spi/spi-fsl-lpspi.c | 11 +-
drivers/tty/serial/serial_core.c | 8 +
drivers/usb/core/urb.c | 33 ++--
drivers/usb/gadget/udc/core.c | 10 +-
drivers/usb/serial/usb_debug.c | 7 +
drivers/usb/usbip/vhci_hcd.c | 9 +-
fs/btrfs/free-space-cache.c | 1 +
fs/exec.c | 8 +-
fs/ext4/mballoc.c | 3 +-
fs/ext4/namei.c | 73 +++++++--
fs/ext4/xattr.c | 6 +
fs/f2fs/inode.c | 3 +
fs/file.c | 1 +
fs/hfs/inode.c | 3 +
fs/hfsplus/bfind.c | 15 +-
fs/hfsplus/extents.c | 9 +-
fs/hfsplus/hfsplus_fs.h | 21 +++
fs/jbd2/journal.c | 1 +
fs/jfs/jfs_imap.c | 5 +-
fs/nilfs2/btnode.c | 25 ++-
fs/nilfs2/btree.c | 4 +-
fs/nilfs2/segment.c | 7 +-
fs/udf/balloc.c | 51 +++---
fs/udf/super.c | 3 +-
include/linux/compiler_attributes.h | 1 +
include/linux/irq.h | 7 +-
include/linux/irqdomain.h | 10 ++
include/linux/msi.h | 2 -
include/linux/objagg.h | 1 -
include/linux/pci_ids.h | 2 +
include/linux/platform_data/x86/soc.h | 65 ++++++++
include/linux/qed/qed_eth_if.h | 21 +--
include/linux/trace_events.h | 1 -
include/linux/usb.h | 1 +
include/net/netfilter/nf_tables.h | 21 ++-
include/net/sctp/sctp.h | 4 +-
include/net/sctp/structs.h | 8 +-
include/trace/events/rpcgss.h | 2 +-
include/uapi/linux/netfilter/nf_tables.h | 2 +-
include/uapi/linux/zorro_ids.h | 3 +
kernel/debug/kdb/kdb_io.c | 6 +-
kernel/dma/mapping.c | 2 +-
kernel/events/core.c | 2 +
kernel/events/internal.h | 2 +-
kernel/irq/chip.c | 32 ++--
kernel/irq/irqdesc.c | 1 +
kernel/time/ntp.c | 9 +-
kernel/time/tick-broadcast.c | 24 +++
kernel/trace/tracing_map.c | 6 +-
kernel/watchdog_hld.c | 11 +-
lib/decompress_bunzip2.c | 3 +-
lib/kobject_uevent.c | 17 +-
lib/objagg.c | 18 +--
mm/page-writeback.c | 30 +++-
net/bluetooth/l2cap_core.c | 1 +
net/core/filter.c | 15 +-
net/core/link_watch.c | 4 +-
net/ipv4/nexthop.c | 7 +-
net/ipv4/route.c | 2 +-
net/ipv6/addrconf.c | 3 +-
net/ipv6/ndisc.c | 34 ++--
net/iucv/af_iucv.c | 4 +-
net/netfilter/ipset/ip_set_list_set.c | 3 +
net/netfilter/ipvs/ip_vs_proto_sctp.c | 4 +-
net/netfilter/nf_conntrack_netlink.c | 3 +-
net/netfilter/nf_tables_api.c | 128 +++------------
net/netfilter/nft_set_hash.c | 8 +-
net/netfilter/nft_set_rbtree.c | 6 +-
net/packet/af_packet.c | 86 +++++++++-
net/sctp/input.c | 48 +++---
net/sctp/proc.c | 10 +-
net/sctp/socket.c | 6 +-
net/smc/smc_core.c | 32 ++--
net/sunrpc/auth_gss/gss_krb5_keys.c | 2 +-
net/sunrpc/clnt.c | 3 +-
net/sunrpc/sched.c | 4 +-
net/tipc/udp_media.c | 5 +-
net/wireless/nl80211.c | 10 +-
net/wireless/util.c | 8 +-
scripts/gcc-x86_32-has-stack-protector.sh | 2 +-
scripts/gcc-x86_64-has-stack-protector.sh | 2 +-
security/apparmor/lsm.c | 7 +
sound/pci/hda/patch_hdmi.c | 2 +
sound/soc/codecs/max98088.c | 10 +-
sound/soc/intel/common/soc-intel-quirks.h | 55 +------
sound/usb/helper.c | 16 +-
sound/usb/helper.h | 1 -
sound/usb/line6/driver.c | 5 +
sound/usb/mixer_scarlett_gen2.c | 2 +-
sound/usb/quirks.c | 12 +-
sound/usb/stream.c | 4 +-
tools/lib/bpf/btf_dump.c | 8 +-
tools/memory-model/lock.cat | 20 +--
tools/perf/util/sort.c | 2 +-
.../testing/selftests/bpf/prog_tests/send_signal.c | 3 +-
.../bpf/progs/btf_dump_test_case_multidim.c | 4 +-
.../bpf/progs/btf_dump_test_case_syntax.c | 4 +-
tools/testing/selftests/bpf/test_sockmap.c | 3 +-
.../selftests/net/forwarding/devlink_lib.sh | 2 +
.../selftests/sigaltstack/current_stack_pointer.h | 2 +-
255 files changed, 2224 insertions(+), 1257 deletions(-)
1 year, 4 months
- 4
- 263
[PATCH 5.15 000/484] 5.15.165-rc1 review
by Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.165 release.
There are 484 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 Sat, 17 Aug 2024 13:18:17 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.165-r…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 5.15.165-rc1
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix phy-mode
Eric Dumazet <edumazet(a)google.com>
wifi: cfg80211: restrict NL80211_ATTR_TXQ_QUANTUM values
Kees Cook <kees(a)kernel.org>
binfmt_flat: Fix corruption when not offsetting data start
Chris Wulff <crwulff(a)gmail.com>
usb: gadget: u_audio: Check return codes from usb_ep_enable and config_ep_by_speed.
WangYuli <wangyuli(a)uniontech.com>
nvme/pci: Add APST quirk for Lenovo N60z laptop
Kees Cook <kees(a)kernel.org>
exec: Fix ToCToU between perm check and set-uid/gid usage
Amit Daniel Kachhap <amit.kachhap(a)arm.com>
arm64: cpufeature: Fix the visibility of compat hwcaps
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: msm8996: correct #clock-cells for QMP PHY nodes
Mahesh Salgaonkar <mahesh(a)linux.ibm.com>
powerpc: Avoid nmi_enter/nmi_exit in real mode interrupt.
Andi Shyti <andi.shyti(a)linux.intel.com>
drm/i915/gem: Fix Virtual Memory mapping boundaries calculation
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: fully established after ADD_ADDR echo on MPJ
Johannes Berg <johannes.berg(a)intel.com>
wifi: mac80211: check basic rates validity
Jisheng Zhang <jszhang(a)kernel.org>
PCI: dwc: Restore MSI Receiver mask during resume
Shenwei Wang <shenwei.wang(a)nxp.com>
net: stmmac: Enable mac_managed_pm phylink config
Florian Westphal <fw(a)strlen.de>
netfilter: nf_tables: prefer nft_chain_validate
Florian Westphal <fw(a)strlen.de>
netfilter: nf_tables: allow clone callbacks to sleep
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: nf_tables: bail out if stateful expression provides no .clone
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: nf_tables: use timestamp to check for set element timeout
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: nf_tables: set element extended ACK reporting support
Jakub Kicinski <kuba(a)kernel.org>
tls: fix race between tx work scheduling and socket close
Lukas Wunner <lukas(a)wunner.de>
PCI/DPC: Fix use-after-free on concurrent DPC and hot-removal
Filipe Manana <fdmanana(a)suse.com>
btrfs: fix double inode unlock for direct IO sync writes
Christoph Hellwig <hch(a)lst.de>
xfs: fix log recovery buffer allocation for the legacy h_size fixup
Filipe Manana <fdmanana(a)suse.com>
btrfs: fix corruption after buffer fault in during direct IO append write
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
selftests: mptcp: join: check backup support in signal endp
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
selftests: mptcp: join: validate backup in MPJ
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: pm: fix backup support in signal endpoints
Geliang Tang <geliang.tang(a)suse.com>
mptcp: export local_address
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: pm: only set request_bkup flag when sending MP_PRIO
Paolo Abeni <pabeni(a)redhat.com>
mptcp: fix bad RCVPRUNED mib accounting
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: mib: count MPJ with backup flag
Paolo Abeni <pabeni(a)redhat.com>
mptcp: fix NL PM announced address accounting
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: distinguish rcv vs sent backup flag in requests
Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
mptcp: sched: check both directions for backup
Thomas Zimmermann <tzimmermann(a)suse.de>
drm/mgag200: Set DDC timeout in milliseconds
Lucas Stach <l.stach(a)pengutronix.de>
drm/bridge: analogix_dp: properly handle zero sized AUX transactions
Yang Yingliang <yangyingliang(a)huawei.com>
sched/smt: Fix unbalance sched_smt_present dec/inc
Yang Yingliang <yangyingliang(a)huawei.com>
sched/smt: Introduce sched_smt_present_inc/dec() helper
Andi Kleen <ak(a)linux.intel.com>
x86/mtrr: Check if fixed MTRRs exist before saving them
Waiman Long <longman(a)redhat.com>
padata: Fix possible divide-by-0 panic in padata_mt_helper()
Tze-nan Wu <Tze-nan.Wu(a)mediatek.com>
tracing: Fix overflow in get_free_elt()
Hans de Goede <hdegoede(a)redhat.com>
power: supply: axp288_charger: Round constant_charge_voltage writes down
Hans de Goede <hdegoede(a)redhat.com>
power: supply: axp288_charger: Fix constant_charge_voltage writes
Shay Drory <shayd(a)nvidia.com>
genirq/irqdesc: Honor caller provided affinity in alloc_desc()
Radhey Shyam Pandey <radhey.shyam.pandey(a)amd.com>
irqchip/xilinx: Fix shift out of bounds
Andrey Konovalov <andreyknvl(a)gmail.com>
kcov: properly check for softirq context
George Kennedy <george.kennedy(a)oracle.com>
serial: core: check uartclk for zero to avoid divide by zero
Thomas Gleixner <tglx(a)linutronix.de>
timekeeping: Fix bogus clock_was_set() invocation in do_adjtimex()
Justin Stitt <justinstitt(a)google.com>
ntp: Safeguard against time_constant overflow
Dan Williams <dan.j.williams(a)intel.com>
driver core: Fix uevent_show() vs driver detach race
Arseniy Krasnov <avkrasnov(a)salutedevices.com>
irqchip/meson-gpio: Convert meson_gpio_irq_controller::lock to 'raw_spinlock_t'
Qianggui Song <qianggui.song(a)amlogic.com>
irqchip/meson-gpio: support more than 8 channels gpio irq
Paul E. McKenney <paulmck(a)kernel.org>
clocksource: Fix brown-bag boolean thinko in cs_watchdog_read()
Feng Tang <feng.tang(a)intel.com>
clocksource: Scale the watchdog read retries automatically
Paul E. McKenney <paulmck(a)kernel.org>
torture: Enable clocksource watchdog with "tsc=watchdog"
Waiman Long <longman(a)redhat.com>
clocksource: Reduce the default clocksource_watchdog() retries to 2
Justin Stitt <justinstitt(a)google.com>
ntp: Clamp maxerror and esterror to operating range
Jason Wang <jasowang(a)redhat.com>
vhost-vdpa: switch to use vmf_insert_pfn() in the fault handler
Thomas Gleixner <tglx(a)linutronix.de>
tick/broadcast: Move per CPU pointer access into the atomic section
Vamshi Gajjela <vamshigajjela(a)google.com>
scsi: ufs: core: Fix hba->last_dme_cmd_tstamp timestamp updating logic
Damien Le Moal <dlemoal(a)kernel.org>
scsi: mpi3mr: Avoid IOMMU page faults on REPORT ZONES
Prashanth K <quic_prashk(a)quicinc.com>
usb: gadget: u_serial: Set start_delayed during suspend
Chris Wulff <crwulff(a)gmail.com>
usb: gadget: core: Check for unset descriptor
Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com>
USB: serial: debug: do not echo input by default
Oliver Neukum <oneukum(a)suse.com>
usb: vhci-hcd: Do not drop references before new references are gained
Takashi Iwai <tiwai(a)suse.de>
ALSA: hda/hdmi: Yet more pin fix for HP EliteDesk 800 G4
Steven 'Steve' Kendall <skend(a)chromium.org>
ALSA: hda: Add HP MP9 G4 Retail System AMS to force connect list
Takashi Iwai <tiwai(a)suse.de>
ALSA: line6: Fix racy access to midibuf
Ma Ke <make24(a)iscas.ac.cn>
drm/client: fix null pointer dereference in drm_client_modeset_probe
Jerome Brunet <jbrunet(a)baylibre.com>
ASoC: meson: axg-fifo: fix irq scheduling issue with PREEMPT_RT
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Re-add ScratchAmp quirk entries
Stefan Wahren <wahrenst(a)gmx.net>
spi: spi-fsl-lpspi: Fix scldiv calculation
Masami Hiramatsu (Google) <mhiramat(a)kernel.org>
kprobes: Fix to check symbol prefixes correctly
Menglong Dong <menglong8.dong(a)gmail.com>
bpf: kprobe: remove unused declaring of bpf_kprobe_override
Guenter Roeck <linux(a)roeck-us.net>
i2c: smbus: Send alert notifications to all devices if source not found
Geert Uytterhoeven <geert+renesas(a)glider.be>
spi: spidev: Add missing spi_device_id for bh2228fv
Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>
ASoC: codecs: wsa881x: Correct Soundwire ports mask
Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>
ASoC: codecs: wcd938x-sdw: Correct Soundwire ports mask
Guenter Roeck <linux(a)roeck-us.net>
i2c: smbus: Improve handling of stuck alerts
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Expand speculative SSBS workaround (again)
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-A725 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X1C definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Expand speculative SSBS workaround
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Unify speculative SSBS errata logic
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X925 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-A720 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X3 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: errata: Add workaround for Arm errata 3194386 and 3312417
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Neoverse-V3 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: cputype: Add Cortex-X4 definitions
Mark Rutland <mark.rutland(a)arm.com>
arm64: barrier: Restore spec_bar() macro
Besar Wicaksono <bwicaksono(a)nvidia.com>
arm64: Add Neoverse-V2 part
James Morse <james.morse(a)arm.com>
arm64: cpufeature: Force HWCAP to be based on the sysreg visible to user-space
Kemeng Shi <shikemeng(a)huaweicloud.com>
ext4: fix wrong unit use in ext4_mb_find_by_goal
Zheng Zucheng <zhengzucheng(a)huawei.com>
sched/cputime: Fix mul_u64_u64_div_u64() precision for cputime
Damien Le Moal <dlemoal(a)kernel.org>
scsi: mpt3sas: Avoid IOMMU page faults on REPORT ZONES
Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp>
profiling: remove profile=sleep support
Benjamin Coddington <bcodding(a)redhat.com>
SUNRPC: Fix a race to wake a sync task
Peter Oberparleiter <oberpar(a)linux.ibm.com>
s390/sclp: Prevent release of buffer in I/O
Kemeng Shi <shikemeng(a)huaweicloud.com>
jbd2: avoid memleak in jbd2_journal_write_metadata_buffer
Xiaxi Shen <shenxiaxi26(a)gmail.com>
ext4: fix uninitialized variable in ext4_inlinedir_to_tree
Michal Pecio <michal.pecio(a)gmail.com>
media: uvcvideo: Fix the bandwdith quirk on USB 3.x
Ricardo Ribalda <ribalda(a)chromium.org>
media: uvcvideo: Ignore empty TS packets
Alex Hung <alex.hung(a)amd.com>
drm/amd/display: Add null checker before passing variables
Ma Jun <Jun.Ma2(a)amd.com>
drm/amdgpu/pm: Fix the null pointer dereference in apply_state_adjust_rules
Ma Jun <Jun.Ma2(a)amd.com>
drm/amdgpu: Fix the null pointer dereference to ras_manager
Ma Jun <Jun.Ma2(a)amd.com>
drm/amdgpu/pm: Fix the null pointer dereference for smu7
Filipe Manana <fdmanana(a)suse.com>
btrfs: fix bitmap leak when loading free space cache on duplicate entry
Johannes Berg <johannes.berg(a)intel.com>
wifi: nl80211: don't give key data to userspace
Roman Smirnov <r.smirnov(a)omp.ru>
udf: prevent integer overflow in udf_bitmap_free_blocks()
FUJITA Tomonori <fujita.tomonori(a)gmail.com>
PCI: Add Edimax Vendor ID to pci_ids.h
Yonghong Song <yonghong.song(a)linux.dev>
selftests/bpf: Fix send_signal test with nested CONFIG_PARAVIRT
Thomas Weißschuh <linux(a)weissschuh.net>
ACPI: SBS: manage alarm sysfs attribute through psy core
Thomas Weißschuh <linux(a)weissschuh.net>
ACPI: battery: create alarm sysfs attribute atomically
Niklas Söderlund <niklas.soderlund+renesas(a)ragnatech.se>
clocksource/drivers/sh_cmt: Address race condition for clock events
Yu Kuai <yukuai3(a)huawei.com>
md/raid5: avoid BUG_ON() while continue reshape after reassembling
Li Nan <linan122(a)huawei.com>
md: do not delete safemode_timer in mddev_suspend
Paul E. McKenney <paulmck(a)kernel.org>
rcutorture: Fix rcu_torture_fwd_cb_cr() data race
Csókás, Bence <csokas.bence(a)prolan.hu>
net: fec: Stop PPS on driver remove
James Chapman <jchapman(a)katalix.com>
l2tp: fix lockdep splat
Joe Hattori <joe(a)pf.is.s.u-tokyo.ac.jp>
net: dsa: bcm_sf2: Fix a possible memory leak in bcm_sf2_mdio_register()
Dmitry Antipov <dmantipov(a)yandex.ru>
Bluetooth: l2cap: always unlock channel in l2cap_conless_channel()
Eric Dumazet <edumazet(a)google.com>
net: linkwatch: use system_unbound_wq
Nikolay Aleksandrov <razor(a)blackwall.org>
net: bridge: mcast: wait for previous gc cycles when removing port
Daniele Palmas <dnlplm(a)gmail.com>
net: usb: qmi_wwan: fix memory leak for not ip packets
Kuniyuki Iwashima <kuniyu(a)amazon.com>
sctp: Fix null-ptr-deref in reuseport_add_sock().
Xin Long <lucien.xin(a)gmail.com>
sctp: move hlist_node and hashent out of sctp_ep_common
Peter Zijlstra <peterz(a)infradead.org>
x86/mm: Fix pti_clone_entry_text() for i386
Peter Zijlstra <peterz(a)infradead.org>
x86/mm: Fix pti_clone_pgtable() alignment assumption
Yipeng Zou <zouyipeng(a)huawei.com>
irqchip/mbigen: Fix mbigen node address layout
Marc Zyngier <maz(a)kernel.org>
genirq: Allow irq_chip registration functions to take a const irq_chip
Alexander Maltsev <keltar.gw(a)gmail.com>
netfilter: ipset: Add list flush to cancel_gc
Paolo Abeni <pabeni(a)redhat.com>
mptcp: fix duplicate data handling
Heiner Kallweit <hkallweit1(a)gmail.com>
r8169: don't increment tx_dropped in case of NETDEV_TX_BUSY
Ma Ke <make24(a)iscas.ac.cn>
net: usb: sr9700: fix uninitialized variable use in sr_mdio_read
Zack Rusin <zack.rusin(a)broadcom.com>
drm/vmwgfx: Fix a deadlock in dma buf fence polling
Edmund Raile <edmund.raile(a)protonmail.com>
Revert "ALSA: firewire-lib: operate for period elapse event in process context"
Edmund Raile <edmund.raile(a)protonmail.com>
Revert "ALSA: firewire-lib: obsolete workqueue for period update"
Mavroudis Chatzilazaridis <mavchatz(a)protonmail.com>
ALSA: hda/realtek: Add quirk for Acer Aspire E5-574G
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Correct surround channels in UAC1 channel map
Al Viro <viro(a)zeniv.linux.org.uk>
protect the fetch of ->fd[fd] in do_dup2() from mispredictions
Tatsunosuke Tobita <tatsunosuke.tobita(a)wacom.com>
HID: wacom: Modify pen IDs
Patryk Duda <patrykd(a)google.com>
platform/chrome: cros_ec_proto: Lock device when updating MKBP version
Justin Stitt <justinstitt(a)google.com>
power: supply: bq24190_charger: replace deprecated strncpy with strscpy
Zhe Qiao <qiaozhe(a)iscas.ac.cn>
riscv/mm: Add handling for VM_FAULT_SIGSEGV in mm_fault_error()
Maciej Żenczykowski <maze(a)google.com>
ipv6: fix ndisc_is_useropt() handling for PIO
Shahar Shitrit <shshitrit(a)nvidia.com>
net/mlx5e: Add a check for the return value from mlx5_port_set_eth_ptys
Kuniyuki Iwashima <kuniyu(a)amazon.com>
netfilter: iptables: Fix potential null-ptr-deref in ip6table_nat_table_init().
Kuniyuki Iwashima <kuniyu(a)amazon.com>
netfilter: iptables: Fix null-ptr-deref in iptable_nat_table_init().
Dan Carpenter <dan.carpenter(a)linaro.org>
net: mvpp2: Don't re-use loop iterator
Alexandra Winter <wintera(a)linux.ibm.com>
net/iucv: fix use after free in iucv_sock_close()
Kuniyuki Iwashima <kuniyu(a)amazon.com>
rtnetlink: Don't ignore IFLA_TARGET_NETNSID when ifname is specified in rtnl_dellink().
Florent Fourcot <florent.fourcot(a)wifirst.fr>
rtnetlink: enable alt_ifname for setlink/newlink
songxiebing <songxiebing(a)kylinos.cn>
ALSA: hda: conexant: Fix headset auto detect fail in the polling mode
Eric Dumazet <edumazet(a)google.com>
sched: act_ct: take care of padding in struct zones_ht_key
Ian Forbes <ian.forbes(a)broadcom.com>
drm/vmwgfx: Fix overlay when using Screen Targets
Danilo Krummrich <dakr(a)kernel.org>
drm/nouveau: prime: fix refcount underflow
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
MIPS: dts: loongson: Fix ls2k1000-rtc interrupt
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
MIPS: dts: loongson: Fix liointc IRQ polarity
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
MIPS: Loongson64: DTS: Fix PCIe port nodes for ls7a
Binbin Zhou <zhoubinbin(a)loongson.cn>
MIPS: Loongson64: DTS: Add RTC support to Loongson-2K1000
Aleksandr Mishin <amishin(a)t-argos.ru>
remoteproc: imx_rproc: Fix refcount mistake in imx_rproc_addr_init
Wayne Lin <Wayne.Lin(a)amd.com>
drm/dp_mst: Fix all mstb marked as not probed after suspend/resume
Shenwei Wang <shenwei.wang(a)nxp.com>
irqchip/imx-irqsteer: Handle runtime power management correctly
Lucas Stach <l.stach(a)pengutronix.de>
irqchip/imx-irqsteer: Add runtime PM support
Lucas Stach <l.stach(a)pengutronix.de>
irqchip/imx-irqsteer: Constify irq_chip struct
Marc Zyngier <maz(a)kernel.org>
genirq: Allow the PM device to originate from irq domain
Herve Codina <herve.codina(a)bootlin.com>
irqdomain: Fixed unbalanced fwnode get and put
Thomas Weißschuh <linux(a)weissschuh.net>
leds: triggers: Flush pending brightness before activating trigger
Hans de Goede <hdegoede(a)redhat.com>
leds: trigger: Call synchronize_rcu() before calling trig->activate()
Heiner Kallweit <hkallweit1(a)gmail.com>
leds: trigger: Store brightness set by led_trigger_event()
Heiner Kallweit <hkallweit1(a)gmail.com>
leds: trigger: Remove unused function led_trigger_rename_static()
Johannes Berg <johannes.berg(a)intel.com>
leds: trigger: use RCU to protect the led_cdevs list
Jay Buddhabhatti <jay.buddhabhatti(a)amd.com>
drivers: soc: xilinx: check return status of get_api_version()
Michael Tretter <m.tretter(a)pengutronix.de>
soc: xilinx: move PM_INIT_FINALIZE to zynqmp_pm_domains driver
Zhang Yi <yi.zhang(a)huawei.com>
ext4: check the extent status again before inserting delalloc block
Zhang Yi <yi.zhang(a)huawei.com>
ext4: factor out a common helper to query extent map
Zhang Yi <yi.zhang(a)huawei.com>
ext4: convert to exclusive lock while inserting delalloc extents
Zhang Yi <yi.zhang(a)huawei.com>
ext4: refactor ext4_da_map_blocks()
Baokun Li <libaokun1(a)huawei.com>
ext4: make ext4_es_insert_extent() return void
Thomas Weißschuh <linux(a)weissschuh.net>
sysctl: always initialize i_uid/i_gid
Krishna Kurapati <quic_kriskura(a)quicinc.com>
arm64: dts: qcom: ipq8074: Disable SS instance in Parkmode for USB
Krishna Kurapati <quic_kriskura(a)quicinc.com>
arm64: dts: qcom: msm8998: Disable SS instance in Parkmode for USB
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: msm8998: switch USB QMP PHY to new style of bindings
Johan Hovold <johan+linaro(a)kernel.org>
arm64: dts: qcom: msm8998: drop USB PHY clock index
Shawn Guo <shawn.guo(a)linaro.org>
arm64: dts: qcom: msm8996: Move '#clock-cells' to QMP PHY child node
Esben Haabendal <esben(a)geanix.com>
powerpc/configs: Update defconfig with now user-visible CONFIG_FSL_IFC
Seth Forshee (DigitalOcean) <sforshee(a)kernel.org>
fs: don't allow non-init s_user_ns for filesystems without FS_USERNS_MOUNT
Leon Romanovsky <leon(a)kernel.org>
nvme-pci: add missing condition check for existence of mapped data
Jens Axboe <axboe(a)kernel.dk>
nvme: separate command prep and issue
Jens Axboe <axboe(a)kernel.dk>
nvme: split command copy into a helper
Artem Chernyshev <artem.chernyshev(a)red-soft.ru>
iommu: sprd: Avoid NULL deref in sprd_iommu_hw_en
Gerd Bayer <gbayer(a)linux.ibm.com>
s390/pci: Allow allocation of more than 1 MSI interrupt
Gerd Bayer <gbayer(a)linux.ibm.com>
s390/pci: Refactor arch_setup_msi_irqs()
Thomas Gleixner <tglx(a)linutronix.de>
s390/pci: Rework MSI descriptor walk
ethanwu <ethanwu(a)synology.com>
ceph: fix incorrect kmalloc size of pagevec mempool
Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>
ASoC: Intel: use soc_intel_is_byt_cr() only when IOSF_MBI is reachable
Conor Dooley <conor.dooley(a)microchip.com>
spi: spidev: add correct compatible for Rohm BH2228FV
Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>
spi: spidev: order compatibles alphabetically
Vincent Tremblay <vincent(a)vtremblay.dev>
spidev: Add Silicon Labs EM3581 device compatible
Andy Shevchenko <andriy.shevchenko(a)linux.intel.com>
spi: spidev: Replace OF specific code by device property API
Andy Shevchenko <andriy.shevchenko(a)linux.intel.com>
spi: spidev: Replace ACPI specific code by device_get_match_data()
Javier Martinez Canillas <javierm(a)redhat.com>
spi: spidev: Make probe to fail early if a spidev compatible is used
Al Viro <viro(a)zeniv.linux.org.uk>
lirc: rc_dev_get_from_fd(): fix file leak
Al Viro <viro(a)zeniv.linux.org.uk>
powerpc: fix a file leak in kvm_vcpu_ioctl_enable_cap()
Xiao Liang <shaw.leon(a)gmail.com>
apparmor: Fix null pointer deref when receiving skb during sock creation
Dan Carpenter <dan.carpenter(a)linaro.org>
mISDN: Fix a use after free in hfcmulti_tx()
Fred Li <dracodingfly(a)gmail.com>
bpf: Fix a segment issue when downgrading gso_size
Petr Machata <petrm(a)nvidia.com>
net: nexthop: Initialize all fields in dumped nexthops
Simon Horman <horms(a)kernel.org>
net: stmmac: Correct byte order of perfect_match
Shigeru Yoshida <syoshida(a)redhat.com>
tipc: Return non-zero value from tipc_udp_addr2str() on error
Florian Westphal <fw(a)strlen.de>
netfilter: nft_set_pipapo_avx2: disable softinterrupts
Johannes Berg <johannes.berg(a)intel.com>
net: bonding: correctly annotate RCU in bond_should_notify_peers()
Ido Schimmel <idosch(a)nvidia.com>
ipv4: Fix incorrect source address in Record Route option
Gregory CLEMENT <gregory.clement(a)bootlin.com>
MIPS: SMP-CPS: Fix address for GCR_ACCESS register for CM3 and later
Hou Tao <houtao1(a)huawei.com>
bpf, events: Use prog to emit ksymbol event for main program
Lance Richardson <rlance(a)google.com>
dma: fix call order in dmam_free_coherent
Andrii Nakryiko <andrii(a)kernel.org>
libbpf: Fix no-args func prototype BTF dumping syntax
Johannes Berg <johannes.berg(a)intel.com>
um: time-travel: fix signal blocking race/hang
Johannes Berg <johannes.berg(a)intel.com>
um: time-travel: fix time-travel-start option
Ma Ke <make24(a)iscas.ac.cn>
phy: cadence-torrent: Check return value on register read
Vignesh Raghavendra <vigneshr(a)ti.com>
dmaengine: ti: k3-udma: Fix BCHAN count with UHC and HC channels
Jeongjun Park <aha310510(a)gmail.com>
jfs: Fix array-index-out-of-bounds in diFree
Douglas Anderson <dianders(a)chromium.org>
kdb: Use the passed prompt in kdb_position_cursor()
Arnd Bergmann <arnd(a)arndb.de>
kdb: address -Wformat-security warnings
Pavel Begunkov <asml.silence(a)gmail.com>
kernel: rerun task_work while freezing in get_signal()
Pavel Begunkov <asml.silence(a)gmail.com>
io_uring/io-wq: limit retrying worker initialisation
Ryusuke Konishi <konishi.ryusuke(a)gmail.com>
nilfs2: handle inconsistent state in nilfs_btnode_create_block()
WangYuli <wangyuli(a)uniontech.com>
Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x13d3:0x3591
Hilda Wu <hildawu(a)realtek.com>
Bluetooth: btusb: Add RTL8852BE device 0489:e125 to device tables
Ilya Dryomov <idryomov(a)gmail.com>
rbd: don't assume RBD_LOCK_STATE_LOCKED for exclusive mappings
Ilya Dryomov <idryomov(a)gmail.com>
rbd: rename RBD_LOCK_STATE_RELEASING and releasing_wait
Dragan Simic <dsimic(a)manjaro.org>
drm/panfrost: Mark simple_ondemand governor as softdep
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
MIPS: Loongson64: Test register availability before use
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
MIPS: Loongson64: reset: Prioritise firmware service
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
MIPS: Loongson64: Remove memory node for builtin-dtb
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
MIPS: Loongson64: env: Hook up Loongsson-2K
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
MIPS: dts: loongson: Fix GMAC phy node
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
MIPS: ip30: ip30-console: Add missing include
Aleksandr Mishin <amishin(a)t-argos.ru>
remoteproc: imx_rproc: Skip over memory region when node value is NULL
Gwenael Treuveur <gwenael.treuveur(a)foss.st.com>
remoteproc: stm32_rproc: Fix mailbox interrupts queuing
Ilya Dryomov <idryomov(a)gmail.com>
rbd: don't assume rbd_is_lock_owner() for exclusive mappings
Michael Ellerman <mpe(a)ellerman.id.au>
selftests/sigaltstack: Fix ppc64 GCC build
Bart Van Assche <bvanassche(a)acm.org>
RDMA/iwcm: Fix a use-after-free related to destroying CM IDs
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
platform: mips: cpu_hwmon: Disable driver on unsupported hardware
Thomas Gleixner <tglx(a)linutronix.de>
watchdog/perf: properly initialize the turbo mode timestamp and rearm counter
Joy Chakraborty <joychakr(a)google.com>
rtc: isl1208: Fix return value of nvmem callbacks
Imre Deak <imre.deak(a)intel.com>
drm/i915/dp: Reset intel_dp->link_trained before retraining the link
Alex Deucher <alexander.deucher(a)amd.com>
drm/amdgpu/sdma5.2: Update wptr registers as well as doorbell
Nitin Gote <nitin.r.gote(a)intel.com>
drm/i915/gt: Do not consider preemption during execlists_dequeue for gen8
Adrian Hunter <adrian.hunter(a)intel.com>
perf/x86/intel/pt: Fix a topa_entry base address calculation
Marco Cavenati <cavenati.marco(a)gmail.com>
perf/x86/intel/pt: Fix topa_entry base length
Kan Liang <kan.liang(a)linux.intel.com>
perf/x86/intel/uncore: Fix the bits of the CHA extended umask for SPR
Frederic Weisbecker <frederic(a)kernel.org>
perf: Fix event leak upon exec and file release
Frederic Weisbecker <frederic(a)kernel.org>
perf: Fix event leak upon exit
Nilesh Javali <njavali(a)marvell.com>
scsi: qla2xxx: validate nvme_local_port correctly
Shreyas Deodhar <sdeodhar(a)marvell.com>
scsi: qla2xxx: Complete command early within lock
Quinn Tran <qutran(a)marvell.com>
scsi: qla2xxx: Fix flash read failure
Quinn Tran <qutran(a)marvell.com>
scsi: qla2xxx: Use QP lock to search for bsg
Shreyas Deodhar <sdeodhar(a)marvell.com>
scsi: qla2xxx: Fix for possible memory corruption
Quinn Tran <qutran(a)marvell.com>
scsi: qla2xxx: Unable to act on RSCN for port online
Manish Rangankar <mrangankar(a)marvell.com>
scsi: qla2xxx: During vport delete send async logout explicitly
Joy Chakraborty <joychakr(a)google.com>
rtc: cmos: Fix return value of nvmem callbacks
Tvrtko Ursulin <tvrtko.ursulin(a)igalia.com>
mm/numa_balancing: teach mpol_to_str about the balancing mode
Zijun Hu <quic_zijuhu(a)quicinc.com>
devres: Fix memory leakage caused by driver API devm_free_percpu()
Zijun Hu <quic_zijuhu(a)quicinc.com>
devres: Fix devm_krealloc() wasting memory
Bailey Forrest <bcf(a)google.com>
gve: Fix an edge case for TSO skb validity check
Zijun Hu <quic_zijuhu(a)quicinc.com>
kobject_uevent: Fix OOB access within zap_modalias_env()
Nathan Chancellor <nathan(a)kernel.org>
kbuild: Fix '-S -c' in x86 stack protector scripts
Ross Lagerwall <ross.lagerwall(a)citrix.com>
decompress_bunzip2: fix rare decompression failure
Fedor Pchelkin <pchelkin(a)ispras.ru>
ubi: eba: properly rollback inside self_check_eba
Bastien Curutchet <bastien.curutchet(a)bootlin.com>
clk: davinci: da8xx-cfgchip: Initialize clk_init_data before use
Saurav Kashyap <skashyap(a)marvell.com>
scsi: qla2xxx: Return ENOBUFS if sg_cnt is more than one for ELS cmds
Huacai Chen <chenhuacai(a)kernel.org>
fs/ntfs3: Update log->page_{mask,bits} if log->page_size changed
tuhaowen <tuhaowen(a)uniontech.com>
dev/parport: fix the array out-of-bounds risk
Carlos Llamas <cmllamas(a)google.com>
binder: fix hang of unregistered readers
Manivannan Sadhasivam <mani(a)kernel.org>
PCI: rockchip: Use GPIOD_OUT_LOW flag while requesting ep_gpio
Niklas Cassel <cassel(a)kernel.org>
PCI: dw-rockchip: Fix initial PERST# GPIO value
Wei Liu <wei.liu(a)kernel.org>
PCI: hv: Return zero, not garbage, when reading PCI_INTERRUPT_PIN
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
hwrng: amd - Convert PCIBIOS_* return codes to errnos
Alan Stern <stern(a)rowland.harvard.edu>
tools/memory-model: Fix bug in lock.cat
wangdicheng <wangdicheng(a)kylinos.cn>
ALSA: usb-audio: Add a quirk for Sonix HD USB Camera
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Move HD Webcam quirk to the right place
wangdicheng <wangdicheng(a)kylinos.cn>
ALSA: usb-audio: Fix microphone sound on HD webcam.
Sean Christopherson <seanjc(a)google.com>
KVM: VMX: Split out the non-virtualization part of vmx_interrupt_blocked()
Ricardo Ribalda <ribalda(a)chromium.org>
media: uvcvideo: Fix integer overflow calculating timestamp
Jan Kara <jack(a)suse.cz>
jbd2: make jbd2_journal_get_max_txn_bufs() internal
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
leds: ss4200: Convert PCIBIOS_* return codes to errnos
Rafael Beims <rafael.beims(a)toradex.com>
wifi: mwifiex: Fix interface type change
Mickaël Salaün <mic(a)digikod.net>
selftests/landlock: Add cred_transfer test
Pavel Begunkov <asml.silence(a)gmail.com>
io_uring: tighten task exit cancellations
Baokun Li <libaokun1(a)huawei.com>
ext4: make sure the first directory block is not a hole
Baokun Li <libaokun1(a)huawei.com>
ext4: check dot and dotdot of dx_root before making dir indexed
Paolo Pisati <p.pisati(a)gmail.com>
m68k: amiga: Turn off Warp1260 interrupts during boot
Jan Kara <jack(a)suse.cz>
udf: Avoid using corrupted block bitmap buffer
Frederic Weisbecker <frederic(a)kernel.org>
task_work: Introduce task_work_cancel() again
Frederic Weisbecker <frederic(a)kernel.org>
task_work: s/task_work_cancel()/task_work_cancel_func()/
Fedor Pchelkin <pchelkin(a)ispras.ru>
apparmor: use kvfree_sensitive to free data->data
Pierre Gondois <pierre.gondois(a)arm.com>
sched/fair: Use all little CPUs for CPU-bound workloads
Sung Joon Kim <sungjoon.kim(a)amd.com>
drm/amd/display: Check for NULL pointer
Shreyas Deodhar <sdeodhar(a)marvell.com>
scsi: qla2xxx: Fix optrom version displayed in FDMI
Ma Ke <make24(a)iscas.ac.cn>
drm/gma500: fix null pointer dereference in psb_intel_lvds_get_modes
Ma Ke <make24(a)iscas.ac.cn>
drm/gma500: fix null pointer dereference in cdv_intel_lvds_get_modes
Jan Kara <jack(a)suse.cz>
ext2: Verify bitmap and itable block numbers before using them
Chao Yu <chao(a)kernel.org>
hfs: fix to initialize fields of hfs_inode_info after hfs_alloc_inode()
Igor Pylypiv <ipylypiv(a)google.com>
ata: libata-scsi: Honor the D_SENSE bit for CK_COND=1 and no error
Dikshita Agarwal <quic_dikshita(a)quicinc.com>
media: venus: fix use after free in vdec_close
Joe Hattori <joe(a)pf.is.s.u-tokyo.ac.jp>
char: tpm: Fix possible memory leak in tpm_bios_measurements_open()
Eric Sandeen <sandeen(a)redhat.com>
fuse: verify {g,u}id mount options correctly
Tejun Heo <tj(a)kernel.org>
sched/fair: set_load_weight() must also call reweight_task() for SCHED_IDLE tasks
Nicolas Dichtel <nicolas.dichtel(a)6wind.com>
ipv6: take care of scope when choosing the src addr
Chengen Du <chengen.du(a)canonical.com>
af_packet: Handle outgoing VLAN packets without hardware offloading
Breno Leitao <leitao(a)debian.org>
net: netconsole: Disable target before netpoll cleanup
Yu Liao <liaoyu15(a)huawei.com>
tick/broadcast: Make takeover of broadcast hrtimer reliable
Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>
dt-bindings: thermal: correct thermal zone node name limit
Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp>
mm: mmap_lock: replace get_memcg_path_buf() with on-stack buffer
Miaohe Lin <linmiaohe(a)huawei.com>
mm/hugetlb: fix possible recursive locking detected warning
Jann Horn <jannh(a)google.com>
landlock: Don't lose track of restrictions on cred_transfer
Carlos López <clopez(a)suse.de>
s390/dasd: fix error checks in dasd_copy_pair_store()
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Missed error return
Csókás, Bence <csokas.bence(a)prolan.hu>
rtc: interface: Add RTC offset to alarm after fix-up
Ryusuke Konishi <konishi.ryusuke(a)gmail.com>
nilfs2: avoid undefined behavior in nilfs_cnt32_ge macro
David Hildenbrand <david(a)redhat.com>
fs/proc/task_mmu: indicate PM_FILE for PMD-mapped file THP
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Fix field-spanning write in INDEX_HDR
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Replace inode_trylock with inode_lock
Peng Fan <peng.fan(a)nxp.com>
pinctrl: freescale: mxs: Fix refcount of child
Yang Yingliang <yangyingliang(a)huawei.com>
pinctrl: ti: ti-iodelay: fix possible memory leak when pinctrl_enable() fails
Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de>
pinctrl: ti: ti-iodelay: Drop if block with always false condition
Yang Yingliang <yangyingliang(a)huawei.com>
pinctrl: single: fix possible memory leak when pinctrl_enable() fails
Yang Yingliang <yangyingliang(a)huawei.com>
pinctrl: core: fix possible memory leak when pinctrl_enable() fails
Dmitry Yashin <dmt.yashin(a)gmail.com>
pinctrl: rockchip: update rk3308 iomux routes
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Fix getting file type
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Missed NI_FLAG_UPDATE_PARENT setting
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Fix transform resident to nonresident for compressed files
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Merge synonym COMPRESSION_UNIT and NTFS_LZNT_CUNIT
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Use ALIGN kernel macro
Martin Willi <martin(a)strongswan.org>
net: dsa: b53: Limit chip-wide jumbo frame config to CPU ports
Martin Willi <martin(a)strongswan.org>
net: dsa: mv88e6xxx: Limit chip-wide frame size config to CPU ports
Florian Westphal <fw(a)strlen.de>
netfilter: nf_set_pipapo: fix initial map fill
Florian Westphal <fw(a)strlen.de>
netfilter: nft_set_pipapo: constify lookup fn args where possible
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: ctnetlink: use helper function to calculate expect ID
Jack Wang <jinpu.wang(a)ionos.com>
bnxt_re: Fix imm_data endianness
Chengchang Tang <tangchengchang(a)huawei.com>
RDMA/hns: Fix insufficient extend DB for VFs.
Chengchang Tang <tangchengchang(a)huawei.com>
RDMA/hns: Fix undifined behavior caused by invalid max_sge
Chengchang Tang <tangchengchang(a)huawei.com>
RDMA/hns: Fix missing pagesize and alignment check in FRMR
Nick Bowler <nbowler(a)draconx.ca>
macintosh/therm_windtunnel: fix module unload.
Michael Ellerman <mpe(a)ellerman.id.au>
powerpc/xmon: Fix disassembly CPU feature checks
Dominique Martinet <dominique.martinet(a)atmark-techno.com>
MIPS: Octeron: remove source file executable bit
Denis Arefev <arefev(a)swemel.ru>
net: missing check virtio
Michael S. Tsirkin <mst(a)redhat.com>
vhost/vsock: always initialize seqpacket_allow
Dan Carpenter <dan.carpenter(a)linaro.org>
PCI: endpoint: Clean up error handling in vpci_scan_bus()
Dmitry Torokhov <dmitry.torokhov(a)gmail.com>
Input: elan_i2c - do not leave interrupt disabled on suspend failure
Leon Romanovsky <leon(a)kernel.org>
RDMA/device: Return error earlier if port in not valid
Arnd Bergmann <arnd(a)arndb.de>
mtd: make mtd_test.c a separate module
Chen Ni <nichen(a)iscas.ac.cn>
ASoC: max98088: Check for clk_prepare_enable() error
Honggang LI <honggangli(a)163.com>
RDMA/rxe: Don't set BTH_ACK_MASK for UC or UD QPs
Leon Romanovsky <leon(a)kernel.org>
RDMA/mlx4: Fix truncated output warning in alias_GUID.c
Leon Romanovsky <leon(a)kernel.org>
RDMA/mlx4: Fix truncated output warning in mad.c
Andrei Lalaev <andrei.lalaev(a)anton-paar.com>
Input: qt1050 - handle CHIP_ID reading error
Leon Romanovsky <leon(a)kernel.org>
RDMA/cache: Release GID table even if leak is detected
Chiara Meiohas <cmeiohas(a)nvidia.com>
RDMA/mlx5: Set mkeys for dmabuf at PAGE_SIZE
James Clark <james.clark(a)arm.com>
coresight: Fix ref leak when of_coresight_parse_endpoint() fails
Taniya Das <quic_tdas(a)quicinc.com>
clk: qcom: gcc-sc7280: Update force mem core bit for UFS ICE clock
Konrad Dybcio <konrad.dybcio(a)linaro.org>
clk: qcom: branch: Add helper functions for setting retain bits
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
PCI: Fix resource double counting on remove & rescan
Benjamin Coddington <bcodding(a)redhat.com>
SUNRPC: Fixup gss_status tracepoint error output
Andreas Larsson <andreas(a)gaisler.com>
sparc64: Fix incorrect function signature and add prototype for prom_cif_init
Jan Kara <jack(a)suse.cz>
ext4: avoid writing unitialized memory to disk in EA inodes
Luis Henriques (SUSE) <luis.henriques(a)linux.dev>
ext4: don't track ranges in fast_commit if inode has inlined data
Ritesh Harjani <riteshh(a)linux.ibm.com>
ext4: return early for non-eligible fast_commit track events
Olga Kornievskaia <kolga(a)netapp.com>
NFSv4.1 another fix for EXCHGID4_FLAG_USE_PNFS_DS for DS server
NeilBrown <neilb(a)suse.de>
SUNRPC: avoid soft lockup when transmitting UDP to reachable server.
Chuck Lever <chuck.lever(a)oracle.com>
xprtrdma: Fix rpcrdma_reqs_reset()
Javier Carrasco <javier.carrasco.cruz(a)gmail.com>
mfd: omap-usb-tll: Use struct_size to allocate tll
Arnd Bergmann <arnd(a)arndb.de>
mfd: rsmu: Split core code into separate module
Adrian Hunter <adrian.hunter(a)intel.com>
perf intel-pt: Fix exclude_guest setting
Adrian Hunter <adrian.hunter(a)intel.com>
perf intel-pt: Fix aux_watermark calculation for 64-bit size
Dikshita Agarwal <quic_dikshita(a)quicinc.com>
media: venus: flush all buffers in output plane streamoff
Luis Henriques (SUSE) <luis.henriques(a)linux.dev>
ext4: fix infinite loop when replaying fast_commit
Luca Ceresoli <luca.ceresoli(a)bootlin.com>
Revert "leds: led-core: Fix refcount leak in of_led_get()"
Chen Ni <nichen(a)iscas.ac.cn>
drm/qxl: Add check for drm_cvt_mode
Lucas Stach <l.stach(a)pengutronix.de>
drm/etnaviv: fix DMA direction handling for cached RW buffers
Namhyung Kim <namhyung(a)kernel.org>
perf report: Fix condition in sort__sym_cmp()
Hans de Goede <hdegoede(a)redhat.com>
leds: trigger: Unregister sysfs attributes before calling deactivate()
Hsiao Chien Sung <shawn.sung(a)mediatek.com>
drm/mediatek: Add DRM_MODE_ROTATE_0 to rotation property
Hsiao Chien Sung <shawn.sung(a)mediatek.com>
drm/mediatek: Add missing plane settings when async update
Laurent Pinchart <laurent.pinchart+renesas(a)ideasonboard.com>
media: renesas: vsp1: Store RPF partition configuration per RPF instance
Laurent Pinchart <laurent.pinchart+renesas(a)ideasonboard.com>
media: renesas: vsp1: Fix _irqsave and _irq mix
Daniel Schaefer <dhs(a)frame.work>
media: uvcvideo: Override default flags
Aleksandr Burakov <a.burakov(a)rosalinux.ru>
saa7134: Unchecked i2c_transfer function result fixed
David Hildenbrand <david(a)redhat.com>
s390/uv: Don't call folio_wait_writeback() without a folio reference
Matthew Wilcox (Oracle) <willy(a)infradead.org>
s390/mm: Convert gmap_make_secure to use a folio
Matthew Wilcox (Oracle) <willy(a)infradead.org>
s390/mm: Convert make_page_secure to use a folio
Claudio Imbrenda <imbrenda(a)linux.ibm.com>
KVM: s390: fix race in gmap_make_secure()
Claudio Imbrenda <imbrenda(a)linux.ibm.com>
KVM: s390: pv: add export before import
Claudio Imbrenda <imbrenda(a)linux.ibm.com>
KVM: s390: pv: properly handle page flags for protected guests
Claudio Imbrenda <imbrenda(a)linux.ibm.com>
KVM: s390: pv: avoid stalls when making pages secure
Bryan O'Donoghue <bryan.odonoghue(a)linaro.org>
media: i2c: Fix imx412 exposure control
Ricardo Ribalda <ribalda(a)chromium.org>
media: imon: Fix race getting ictx->lock
Zheng Yejian <zhengyejian1(a)huawei.com>
media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()
Douglas Anderson <dianders(a)chromium.org>
drm/panel: boe-tv101wum-nl6: Check for errors on the NOP in prepare()
Douglas Anderson <dianders(a)chromium.org>
drm/panel: boe-tv101wum-nl6: If prepare fails, disable GPIO before regulators
Friedrich Vock <friedrich.vock(a)gmx.de>
drm/amdgpu: Check if NBIO funcs are NULL in amdgpu_device_baco_exit
Lijo Lazar <lijo.lazar(a)amd.com>
drm/amd/pm: Fix aldebaran pcie speed reporting
Taehee Yoo <ap420073(a)gmail.com>
xdp: fix invalid wait context of page_pool_destroy()
Amit Cohen <amcohen(a)nvidia.com>
selftests: forwarding: devlink_lib: Wait for udev events after reloading
Alan Maguire <alan.maguire(a)oracle.com>
bpf: Eliminate remaining "make W=1" warnings in kernel/bpf/btf.o
Alexey Kodanev <aleksei.kodanev(a)bell-sw.com>
bna: adjust 'name' buf size of bna_tcb and bna_ccb structures
Alan Maguire <alan.maguire(a)oracle.com>
bpf: annotate BTF show functions with __printf
Geliang Tang <tanggeliang(a)kylinos.cn>
selftests/bpf: Close fd in error path in drop_on_reuseport
John Stultz <jstultz(a)google.com>
locking/rwsem: Add __always_inline annotation to __down_write_common() and inlined callers
Johannes Berg <johannes.berg(a)intel.com>
wifi: virt_wifi: don't use strlen() in const context
Gaosheng Cui <cuigaosheng1(a)huawei.com>
gss_krb5: Fix the error handling path for crypto_sync_skcipher_setkey
En-Wei Wu <en-wei.wu(a)canonical.com>
wifi: virt_wifi: avoid reporting connection success with wrong SSID
Adrian Hunter <adrian.hunter(a)intel.com>
perf: Fix default aux_watermark calculation
Adrian Hunter <adrian.hunter(a)intel.com>
perf: Prevent passing zero nr_pages to rb_alloc_aux()
Adrian Hunter <adrian.hunter(a)intel.com>
perf: Fix perf_aux_size() for greater-than 32-bit size
Adrian Hunter <adrian.hunter(a)intel.com>
perf/x86/intel/pt: Fix pt_topa_entry_for_page() address calculation
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: nf_tables: rise cap on SELinux secmark context
Ismael Luceno <iluceno(a)suse.de>
ipvs: Avoid unnecessary calls to skb_is_gso_sctp
Donglin Peng <dolinux.peng(a)gmail.com>
libbpf: Checking the btf_type kind when fixing variable offsets
Csókás, Bence <csokas.bence(a)prolan.hu>
net: fec: Fix FEC_ECR_EN1588 being cleared on link-down
Csókás Bence <csokas.bence(a)prolan.hu>
net: fec: Refactor: #define magic constants
Baochen Qiang <quic_bqiang(a)quicinc.com>
wifi: cfg80211: handle 2x996 RU allocation in cfg80211_calculate_bitrate_he()
Baochen Qiang <quic_bqiang(a)quicinc.com>
wifi: cfg80211: fix typo in cfg80211_calculate_bitrate_he()
Baochen Qiang <quic_bqiang(a)quicinc.com>
wifi: ath11k: fix wrong handling of CCMP256 and GCMP ciphers
Ido Schimmel <idosch(a)nvidia.com>
mlxsw: spectrum_acl: Fix ACL scale regression and firmware errors
Amit Cohen <amcohen(a)nvidia.com>
mlxsw: spectrum_acl_bloom_filter: Make mlxsw_sp_acl_bf_key_encode() more flexible
Ido Schimmel <idosch(a)nvidia.com>
mlxsw: spectrum_acl_erp: Fix object nesting warning
Ido Schimmel <idosch(a)nvidia.com>
lib: objagg: Fix general protection fault
Geliang Tang <tanggeliang(a)kylinos.cn>
selftests/bpf: Check length of recv in test_sockmap
Guangguan Wang <guangguan.wang(a)linux.alibaba.com>
net/smc: set rmb's SG_MAX_SINGLE_ALLOC limitation only when CONFIG_ARCH_NO_SG_CHAIN is defined
Eric Dumazet <edumazet(a)google.com>
tcp: fix races in tcp_v[46]_err()
Eric Dumazet <edumazet(a)google.com>
tcp: fix race in tcp_write_err()
Eric Dumazet <edumazet(a)google.com>
tcp: add tcp_done_with_error() helper
Eric Dumazet <edumazet(a)google.com>
tcp: annotate lockless access to sk->sk_err
Eric Dumazet <edumazet(a)google.com>
tcp: annotate lockless accesses to sk->sk_err_soft
Hagar Hemdan <hagarhem(a)amazon.com>
net: esp: cleanup esp_output_tail_tcp() in case of unsupported ESPINTCP
Geliang Tang <tanggeliang(a)kylinos.cn>
selftests/bpf: Fix prog numbers in test_sockmap
Samasth Norway Ananda <samasth.norway.ananda(a)oracle.com>
wifi: brcmsmac: LCN PHY code is used for BCM4313 2G-only device
Marek Behún <kabel(a)kernel.org>
firmware: turris-mox-rwtm: Initialize completion before mailbox
Marek Behún <kabel(a)kernel.org>
firmware: turris-mox-rwtm: Fix checking return value of wait_for_completion_timeout()
Marek Behún <kabel(a)kernel.org>
firmware: turris-mox-rwtm: Do not complete if there are no waiters
Christophe Leroy <christophe.leroy(a)csgroup.eu>
vmlinux.lds.h: catch .bss..L* sections into BSS")
Dmitry Torokhov <dmitry.torokhov(a)gmail.com>
ARM: spitz: fix GPIO assignment for backlight
Arnd Bergmann <arnd(a)arndb.de>
ARM: pxa: spitz: use gpio descriptors for audio
Thorsten Blum <thorsten.blum(a)toblux.com>
m68k: cmpxchg: Fix return value for default case in __arch_xchg()
Chen Ni <nichen(a)iscas.ac.cn>
x86/xen: Convert comma to semicolon
Eero Tamminen <oak(a)helsinkinet.fi>
m68k: atari: Fix TT bootup freeze / unexpected (SCU) interrupt messages
Jerome Brunet <jbrunet(a)baylibre.com>
arm64: dts: amlogic: gx: correct hdmi clocks
Chen-Yu Tsai <wenst(a)chromium.org>
arm64: dts: mediatek: mt8183-kukui-jacuzzi: Add ports node for anx7625
Rafał Miłecki <rafal(a)milecki.pl>
arm64: dts: mediatek: mt7622: fix "emmc" pinctrl mux
Chen-Yu Tsai <wenst(a)chromium.org>
arm64: dts: mediatek: mt8183-kukui: Drop bogus output-enable property
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix PCIe reset polarity
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix SPI0 chip selects
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix board reset
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix PHY reset
Marco Felsch <m.felsch(a)pengutronix.de>
ARM: dts: imx6qdl-kontron-samx6i: move phy reset into phy-node
Jonas Karlman <jonas(a)kwiboo.se>
arm64: dts: rockchip: Increase VOP clk rate on RK3328
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
soc: qcom: pdr: fix parsing of domains lists
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
soc: qcom: pdr: protect locator_addr with the main mutex
Esben Haabendal <esben(a)geanix.com>
memory: fsl_ifc: Make FSL_IFC config visible and selectable
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: msm8996: specify UFS core_clk frequencies
Stephen Boyd <swboyd(a)chromium.org>
soc: qcom: rpmh-rsc: Ensure irqs aren't disabled by rpmh_rsc_send_data() callers
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: sm8250: add power-domain to UFS PHY
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: sm8250: switch UFS QMP PHY to new style of bindings
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: sdm845: add power-domain to UFS PHY
Guenter Roeck <linux(a)roeck-us.net>
hwmon: (max6697) Fix swapped temp{1,8} critical alarms
Guenter Roeck <linux(a)roeck-us.net>
hwmon: (max6697) Fix underflow when writing limit attributes
Yao Zi <ziyao(a)disroot.org>
drm/meson: fix canvas release in bind function
Uwe Kleine-König <u.kleine-koenig(a)baylibre.com>
pwm: stm32: Always do lazy disabling
Wayne Tung <chineweff(a)gmail.com>
hwmon: (adt7475) Fix default duty on fan is disabled
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/platform/iosf_mbi: Convert PCIBIOS_* return codes to errnos
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/pci/xen: Fix PCIBIOS_* return code handling
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/pci/intel_mid_pci: Fix PCIBIOS_* return code handling
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/of: Return consistent error type from x86_of_pci_irq_enable()
Chao Yu <chao(a)kernel.org>
hfsplus: fix to avoid false alarm of circular locking
Christoph Hellwig <hch(a)lst.de>
block: initialize integrity buffer to zero before writing it to media
Jinyoung Choi <j-young.choi(a)samsung.com>
block: cleanup bio_integrity_prep
Nitesh Shetty <nj.shetty(a)samsung.com>
block: refactor to use helper
Tzung-Bi Shih <tzungbi(a)kernel.org>
platform/chrome: cros_ec_debugfs: fix wrong EC message version
Arnd Bergmann <arnd(a)arndb.de>
EDAC, i10nm: make skx_common.o a separate module
Chao Yu <chao(a)kernel.org>
f2fs: fix to don't dirty inode for readonly filesystem
Chao Yu <chao(a)kernel.org>
f2fs: fix return value of f2fs_convert_inline_inode()
-------------
Diffstat:
Documentation/admin-guide/kernel-parameters.txt | 10 +-
Documentation/arm64/cpu-feature-registers.rst | 38 ++++-
Documentation/arm64/silicon-errata.rst | 36 ++++
.../devicetree/bindings/thermal/thermal-zones.yaml | 5 +-
Makefile | 4 +-
arch/arm/boot/dts/imx6q-kontron-samx6i.dtsi | 23 ---
arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 26 ++-
arch/arm/mach-pxa/spitz.c | 39 ++++-
arch/arm/mach-pxa/{include/mach => }/spitz.h | 2 +-
arch/arm/mach-pxa/spitz_pm.c | 2 +-
arch/arm64/Kconfig | 38 +++++
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 4 +-
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 4 +-
.../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 4 +-
arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 4 +-
.../boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 25 +--
arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 2 -
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 6 +-
arch/arm64/boot/dts/qcom/msm8996.dtsi | 8 +-
arch/arm64/boot/dts/qcom/msm8998.dtsi | 36 ++--
arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +
arch/arm64/boot/dts/qcom/sm8250.dtsi | 22 +--
arch/arm64/boot/dts/qcom/sm8350.dtsi | 3 -
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 4 +-
arch/arm64/include/asm/barrier.h | 4 +
arch/arm64/include/asm/cputype.h | 16 ++
arch/arm64/kernel/cpu_errata.c | 31 ++++
arch/arm64/kernel/cpufeature.c | 94 +++++++++--
arch/arm64/kernel/proton-pack.c | 12 ++
arch/arm64/tools/cpucaps | 1 +
arch/m68k/amiga/config.c | 9 +
arch/m68k/atari/ataints.c | 6 +-
arch/m68k/include/asm/cmpxchg.h | 2 +-
arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi | 98 +++++++----
arch/mips/include/asm/mach-loongson64/boot_param.h | 2 +
arch/mips/include/asm/mips-cm.h | 4 +
arch/mips/kernel/smp-cps.c | 5 +-
arch/mips/loongson64/env.c | 8 +
arch/mips/loongson64/reset.c | 38 ++---
arch/mips/loongson64/smp.c | 23 ++-
arch/mips/pci/pcie-octeon.c | 0
arch/mips/sgi-ip30/ip30-console.c | 1 +
arch/powerpc/configs/85xx-hw.config | 2 +
arch/powerpc/include/asm/interrupt.h | 14 +-
arch/powerpc/include/asm/percpu.h | 10 ++
arch/powerpc/kernel/setup_64.c | 2 +
arch/powerpc/kvm/powerpc.c | 4 +-
arch/powerpc/xmon/ppc-dis.c | 33 ++--
arch/riscv/mm/fault.c | 17 +-
arch/s390/include/asm/pgtable.h | 9 +-
arch/s390/include/asm/uv.h | 10 +-
arch/s390/kernel/uv.c | 163 +++++++++++++-----
arch/s390/kvm/intercept.c | 5 +
arch/s390/mm/gmap.c | 4 +-
arch/s390/pci/pci_irq.c | 116 ++++++++-----
arch/sparc/include/asm/oplib_64.h | 1 +
arch/sparc/prom/init_64.c | 3 -
arch/sparc/prom/p1275.c | 2 +-
arch/um/kernel/time.c | 4 +-
arch/um/os-Linux/signal.c | 118 ++++++++++---
arch/x86/events/intel/pt.c | 4 +-
arch/x86/events/intel/pt.h | 4 +-
arch/x86/events/intel/uncore_snbep.c | 6 +-
arch/x86/kernel/cpu/mtrr/mtrr.c | 2 +-
arch/x86/kernel/devicetree.c | 2 +-
arch/x86/kvm/vmx/vmx.c | 11 +-
arch/x86/kvm/vmx/vmx.h | 1 +
arch/x86/mm/pti.c | 8 +-
arch/x86/pci/intel_mid_pci.c | 4 +-
arch/x86/pci/xen.c | 4 +-
arch/x86/platform/intel/iosf_mbi.c | 4 +-
arch/x86/xen/p2m.c | 4 +-
block/bio-integrity.c | 21 ++-
drivers/acpi/battery.c | 16 +-
drivers/acpi/sbs.c | 23 +--
drivers/android/binder.c | 4 +-
drivers/ata/libata-scsi.c | 7 +-
drivers/base/core.c | 13 +-
drivers/base/devres.c | 11 +-
drivers/base/module.c | 4 +
drivers/block/rbd.c | 35 ++--
drivers/bluetooth/btusb.c | 4 +
drivers/char/hw_random/amd-rng.c | 4 +-
drivers/char/tpm/eventlog/common.c | 2 +
drivers/clk/davinci/da8xx-cfgchip.c | 4 +-
drivers/clk/qcom/clk-branch.h | 26 +++
drivers/clk/qcom/gcc-sc7280.c | 3 +
drivers/clocksource/sh_cmt.c | 13 +-
drivers/dma/ti/k3-udma.c | 4 +-
drivers/edac/Makefile | 10 +-
drivers/edac/skx_common.c | 21 ++-
drivers/edac/skx_common.h | 4 +-
drivers/firmware/turris-mox-rwtm.c | 23 ++-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 7 +-
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 12 ++
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9 +-
drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 3 +-
.../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 55 +++---
.../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 14 +-
.../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 7 +-
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 4 +-
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 5 +-
drivers/gpu/drm/drm_client_modeset.c | 5 +
drivers/gpu/drm/drm_dp_mst_topology.c | 4 +-
drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 +-
drivers/gpu/drm/gma500/cdv_intel_lvds.c | 3 +
drivers/gpu/drm/gma500/psb_intel_lvds.c | 3 +
drivers/gpu/drm/i915/display/intel_dp.c | 2 +
drivers/gpu/drm/i915/gem/i915_gem_mman.c | 53 +++++-
.../gpu/drm/i915/gt/intel_execlists_submission.c | 6 +-
drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 17 +-
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 6 +-
drivers/gpu/drm/mediatek/mtk_drm_plane.c | 4 +-
drivers/gpu/drm/meson/meson_drv.c | 37 ++--
drivers/gpu/drm/mgag200/mgag200_i2c.c | 2 +-
drivers/gpu/drm/nouveau/nouveau_prime.c | 3 +-
drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 8 +-
drivers/gpu/drm/panfrost/panfrost_drv.c | 1 +
drivers/gpu/drm/qxl/qxl_display.c | 3 +
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 17 +-
drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 2 +-
drivers/hid/wacom_wac.c | 3 +-
drivers/hwmon/adt7475.c | 2 +-
drivers/hwmon/max6697.c | 5 +-
drivers/hwtracing/coresight/coresight-platform.c | 4 +-
drivers/i2c/i2c-smbus.c | 64 ++++++-
drivers/infiniband/core/cache.c | 14 +-
drivers/infiniband/core/device.c | 6 +-
drivers/infiniband/core/iwcm.c | 11 +-
drivers/infiniband/hw/bnxt_re/ib_verbs.c | 8 +-
drivers/infiniband/hw/bnxt_re/qplib_fp.h | 6 +-
drivers/infiniband/hw/hns/hns_roce_device.h | 4 +
drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 6 +-
drivers/infiniband/hw/hns/hns_roce_mr.c | 5 +
drivers/infiniband/hw/hns/hns_roce_srq.c | 2 +-
drivers/infiniband/hw/mlx4/alias_GUID.c | 2 +-
drivers/infiniband/hw/mlx4/mad.c | 2 +-
drivers/infiniband/hw/mlx5/mlx5_ib.h | 13 ++
drivers/infiniband/hw/mlx5/odp.c | 6 +-
drivers/infiniband/sw/rxe/rxe_req.c | 7 +-
drivers/input/keyboard/qt1050.c | 7 +-
drivers/input/mouse/elan_i2c_core.c | 2 +
drivers/iommu/sprd-iommu.c | 2 +-
drivers/irqchip/irq-imx-irqsteer.c | 40 ++++-
drivers/irqchip/irq-mbigen.c | 20 ++-
drivers/irqchip/irq-meson-gpio.c | 35 ++--
drivers/irqchip/irq-xilinx-intc.c | 2 +-
drivers/isdn/hardware/mISDN/hfcmulti.c | 7 +-
drivers/leds/led-class.c | 1 -
drivers/leds/led-triggers.c | 75 ++++----
drivers/leds/leds-ss4200.c | 7 +-
drivers/leds/trigger/ledtrig-timer.c | 5 -
drivers/macintosh/therm_windtunnel.c | 2 +-
drivers/md/md.c | 1 -
drivers/md/raid5.c | 20 ++-
drivers/media/i2c/imx412.c | 9 +-
drivers/media/pci/saa7134/saa7134-dvb.c | 8 +-
drivers/media/platform/qcom/venus/vdec.c | 3 +-
drivers/media/platform/vsp1/vsp1_histo.c | 20 +--
drivers/media/platform/vsp1/vsp1_pipe.h | 2 +-
drivers/media/platform/vsp1/vsp1_rpf.c | 8 +-
drivers/media/rc/imon.c | 5 +-
drivers/media/rc/lirc_dev.c | 4 +-
drivers/media/usb/dvb-usb/dvb-usb-init.c | 35 +++-
drivers/media/usb/uvc/uvc_ctrl.c | 9 +-
drivers/media/usb/uvc/uvc_video.c | 47 +++++-
drivers/memory/Kconfig | 2 +-
drivers/mfd/Makefile | 6 +-
drivers/mfd/omap-usb-tll.c | 3 +-
drivers/mfd/rsmu_core.c | 2 +
drivers/mtd/nand/raw/Kconfig | 3 +-
drivers/mtd/tests/Makefile | 34 ++--
drivers/mtd/tests/mtd_test.c | 9 +
drivers/mtd/ubi/eba.c | 3 +-
drivers/net/bonding/bond_main.c | 7 +-
drivers/net/dsa/b53/b53_common.c | 3 +
drivers/net/dsa/bcm_sf2.c | 4 +-
drivers/net/dsa/mv88e6xxx/chip.c | 3 +-
drivers/net/ethernet/brocade/bna/bna_types.h | 2 +-
drivers/net/ethernet/brocade/bna/bnad.c | 11 +-
drivers/net/ethernet/freescale/fec_main.c | 52 ++++--
drivers/net/ethernet/freescale/fec_ptp.c | 3 +
drivers/net/ethernet/google/gve/gve_tx_dqo.c | 22 ++-
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 6 +-
.../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 7 +-
.../ethernet/mellanox/mlxsw/spectrum_acl_atcam.c | 18 +-
.../mellanox/mlxsw/spectrum_acl_bloom_filter.c | 38 +++--
.../net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c | 13 --
.../ethernet/mellanox/mlxsw/spectrum_acl_tcam.h | 9 +-
drivers/net/ethernet/realtek/r8169_main.c | 8 +-
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 +-
.../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 2 +-
drivers/net/ethernet/stmicro/stmmac/hwif.h | 2 +-
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +-
drivers/net/netconsole.c | 2 +-
drivers/net/usb/qmi_wwan.c | 1 +
drivers/net/usb/sr9700.c | 11 +-
drivers/net/wireless/ath/ath11k/dp_rx.c | 3 +-
drivers/net/wireless/ath/ath11k/dp_rx.h | 3 +
drivers/net/wireless/ath/ath11k/mac.c | 15 +-
.../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 18 +-
drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 +
drivers/net/wireless/virt_wifi.c | 20 ++-
drivers/nvme/host/pci.c | 99 ++++++-----
drivers/parport/procfs.c | 24 +--
drivers/pci/controller/dwc/pcie-designware-host.c | 7 +-
drivers/pci/controller/dwc/pcie-dw-rockchip.c | 2 +-
drivers/pci/controller/pci-hyperv.c | 4 +-
drivers/pci/controller/pcie-rockchip.c | 2 +-
drivers/pci/endpoint/functions/pci-epf-vntb.c | 12 +-
drivers/pci/pci.c | 19 ++-
drivers/pci/setup-bus.c | 6 +-
drivers/phy/cadence/phy-cadence-torrent.c | 3 +
drivers/pinctrl/core.c | 12 +-
drivers/pinctrl/freescale/pinctrl-mxs.c | 4 +-
drivers/pinctrl/pinctrl-rockchip.c | 17 +-
drivers/pinctrl/pinctrl-single.c | 7 +-
drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 14 +-
drivers/platform/chrome/cros_ec_debugfs.c | 1 +
drivers/platform/chrome/cros_ec_proto.c | 2 +
drivers/platform/mips/cpu_hwmon.c | 3 +
drivers/power/supply/axp288_charger.c | 24 +--
drivers/power/supply/bq24190_charger.c | 2 +-
drivers/pwm/pwm-stm32.c | 5 +-
drivers/remoteproc/imx_rproc.c | 10 +-
drivers/remoteproc/stm32_rproc.c | 2 +-
drivers/rtc/interface.c | 9 +-
drivers/rtc/rtc-cmos.c | 10 +-
drivers/rtc/rtc-isl1208.c | 11 +-
drivers/s390/block/dasd_devmap.c | 10 +-
drivers/s390/char/sclp_sd.c | 10 +-
drivers/scsi/mpi3mr/mpi3mr_os.c | 11 ++
drivers/scsi/mpt3sas/mpt3sas_base.c | 20 ++-
drivers/scsi/qla2xxx/qla_bsg.c | 98 ++++++-----
drivers/scsi/qla2xxx/qla_def.h | 3 +
drivers/scsi/qla2xxx/qla_gs.c | 35 +++-
drivers/scsi/qla2xxx/qla_init.c | 87 ++++++++--
drivers/scsi/qla2xxx/qla_inline.h | 8 +
drivers/scsi/qla2xxx/qla_mid.c | 2 +-
drivers/scsi/qla2xxx/qla_nvme.c | 5 +-
drivers/scsi/qla2xxx/qla_os.c | 7 +-
drivers/scsi/qla2xxx/qla_sup.c | 108 ++++++++----
drivers/scsi/ufs/ufshcd.c | 11 +-
drivers/soc/qcom/pdr_interface.c | 8 +-
drivers/soc/qcom/rpmh-rsc.c | 7 +-
drivers/soc/qcom/rpmh.c | 1 -
drivers/soc/xilinx/zynqmp_pm_domains.c | 16 ++
drivers/soc/xilinx/zynqmp_power.c | 5 +-
drivers/spi/spi-fsl-lpspi.c | 6 +-
drivers/spi/spidev.c | 95 +++++------
drivers/tty/serial/serial_core.c | 8 +
drivers/usb/gadget/function/u_audio.c | 42 ++++-
drivers/usb/gadget/function/u_serial.c | 1 +
drivers/usb/gadget/udc/core.c | 10 +-
drivers/usb/serial/usb_debug.c | 7 +
drivers/usb/usbip/vhci_hcd.c | 9 +-
drivers/vhost/vdpa.c | 8 +-
drivers/vhost/vsock.c | 4 +-
fs/binfmt_flat.c | 4 +-
fs/btrfs/ctree.h | 1 +
fs/btrfs/file.c | 60 +++++--
fs/btrfs/free-space-cache.c | 1 +
fs/ceph/super.c | 3 +-
fs/exec.c | 8 +-
fs/ext2/balloc.c | 11 +-
fs/ext4/extents.c | 5 +-
fs/ext4/extents_status.c | 16 +-
fs/ext4/extents_status.h | 6 +-
fs/ext4/fast_commit.c | 65 +++++--
fs/ext4/inline.c | 6 +-
fs/ext4/inode.c | 115 +++++++------
fs/ext4/mballoc.c | 3 +-
fs/ext4/namei.c | 88 +++++++---
fs/ext4/xattr.c | 6 +
fs/f2fs/inline.c | 6 +-
fs/f2fs/inode.c | 3 +
fs/file.c | 1 +
fs/fuse/inode.c | 24 ++-
fs/hfs/inode.c | 3 +
fs/hfsplus/bfind.c | 15 +-
fs/hfsplus/extents.c | 9 +-
fs/hfsplus/hfsplus_fs.h | 21 +++
fs/jbd2/commit.c | 2 +-
fs/jbd2/journal.c | 6 +
fs/jfs/jfs_imap.c | 5 +-
fs/nfs/nfs4client.c | 6 +-
fs/nfs/nfs4proc.c | 2 +-
fs/nilfs2/btnode.c | 25 ++-
fs/nilfs2/btree.c | 4 +-
fs/nilfs2/segment.c | 2 +-
fs/ntfs3/attrib.c | 14 +-
fs/ntfs3/bitmap.c | 2 +-
fs/ntfs3/dir.c | 3 +-
fs/ntfs3/file.c | 5 +-
fs/ntfs3/frecord.c | 2 +-
fs/ntfs3/fslog.c | 5 +-
fs/ntfs3/fsntfs.c | 2 +-
fs/ntfs3/index.c | 4 +-
fs/ntfs3/inode.c | 2 +-
fs/ntfs3/ntfs.h | 13 +-
fs/ntfs3/ntfs_fs.h | 2 +
fs/proc/proc_sysctl.c | 6 +-
fs/proc/task_mmu.c | 2 +
fs/super.c | 11 ++
fs/udf/balloc.c | 51 +++---
fs/udf/super.c | 3 +-
fs/xfs/xfs_log_recover.c | 20 ++-
include/asm-generic/vmlinux.lds.h | 2 +-
include/linux/clocksource.h | 14 +-
include/linux/hugetlb.h | 1 +
include/linux/irq.h | 7 +-
include/linux/irqdomain.h | 10 ++
include/linux/jbd2.h | 5 -
include/linux/leds.h | 32 ++--
include/linux/objagg.h | 1 -
include/linux/pci_ids.h | 2 +
include/linux/perf_event.h | 1 +
include/linux/profile.h | 1 -
include/linux/sched/signal.h | 6 +
include/linux/task_work.h | 3 +-
include/linux/trace_events.h | 1 -
include/linux/virtio_net.h | 11 ++
include/net/netfilter/nf_tables.h | 20 ++-
include/net/sctp/sctp.h | 4 +-
include/net/sctp/structs.h | 8 +-
include/net/tcp.h | 1 +
include/trace/events/mptcp.h | 2 +-
include/trace/events/rpcgss.h | 2 +-
include/uapi/linux/netfilter/nf_tables.h | 2 +-
include/uapi/linux/zorro_ids.h | 3 +
io_uring/io-wq.c | 10 +-
io_uring/io_uring.c | 5 +-
kernel/bpf/btf.c | 10 +-
kernel/debug/kdb/kdb_io.c | 6 +-
kernel/dma/mapping.c | 2 +-
kernel/events/core.c | 77 ++++++---
kernel/events/internal.h | 2 +-
kernel/events/ring_buffer.c | 4 +-
kernel/irq/chip.c | 32 ++--
kernel/irq/irqdesc.c | 1 +
kernel/irq/irqdomain.c | 7 +-
kernel/irq/manage.c | 2 +-
kernel/kcov.c | 15 +-
kernel/kprobes.c | 4 +-
kernel/locking/rwsem.c | 6 +-
kernel/padata.c | 7 +
kernel/profile.c | 16 +-
kernel/rcu/rcutorture.c | 2 +-
kernel/sched/core.c | 50 +++---
kernel/sched/cputime.c | 6 +
kernel/sched/fair.c | 19 +--
kernel/sched/sched.h | 2 +-
kernel/signal.c | 8 +
kernel/task_work.c | 34 +++-
kernel/time/clocksource-wdtest.c | 13 +-
kernel/time/clocksource.c | 10 +-
kernel/time/ntp.c | 9 +-
kernel/time/tick-broadcast.c | 24 +++
kernel/time/timekeeping.c | 2 +-
kernel/trace/tracing_map.c | 6 +-
kernel/watchdog_hld.c | 11 +-
lib/decompress_bunzip2.c | 3 +-
lib/kobject_uevent.c | 17 +-
lib/objagg.c | 18 +-
mm/hugetlb.c | 2 +-
mm/mempolicy.c | 18 +-
mm/mmap_lock.c | 175 +++----------------
net/bluetooth/l2cap_core.c | 1 +
net/bridge/br_multicast.c | 4 +-
net/core/filter.c | 15 +-
net/core/link_watch.c | 4 +-
net/core/rtnetlink.c | 65 +++----
net/core/xdp.c | 4 +-
net/ipv4/esp4.c | 3 +-
net/ipv4/netfilter/iptable_nat.c | 18 +-
net/ipv4/nexthop.c | 7 +-
net/ipv4/route.c | 2 +-
net/ipv4/tcp.c | 13 +-
net/ipv4/tcp_input.c | 34 ++--
net/ipv4/tcp_ipv4.c | 19 +--
net/ipv4/tcp_output.c | 2 +-
net/ipv4/tcp_timer.c | 10 +-
net/ipv6/addrconf.c | 3 +-
net/ipv6/esp6.c | 3 +-
net/ipv6/ndisc.c | 34 ++--
net/ipv6/netfilter/ip6table_nat.c | 14 +-
net/ipv6/tcp_ipv6.c | 19 +--
net/iucv/af_iucv.c | 4 +-
net/l2tp/l2tp_core.c | 15 +-
net/mac80211/cfg.c | 21 +--
net/mptcp/mib.c | 2 +
net/mptcp/mib.h | 2 +
net/mptcp/options.c | 5 +-
net/mptcp/pm.c | 9 +
net/mptcp/pm_netlink.c | 48 ++++--
net/mptcp/protocol.c | 18 +-
net/mptcp/protocol.h | 4 +
net/mptcp/subflow.c | 24 ++-
net/netfilter/ipset/ip_set_list_set.c | 3 +
net/netfilter/ipvs/ip_vs_proto_sctp.c | 4 +-
net/netfilter/nf_conntrack_netlink.c | 3 +-
net/netfilter/nf_tables_api.c | 188 ++++-----------------
net/netfilter/nft_connlimit.c | 4 +-
net/netfilter/nft_counter.c | 4 +-
net/netfilter/nft_dynset.c | 2 +-
net/netfilter/nft_last.c | 4 +-
net/netfilter/nft_limit.c | 14 +-
net/netfilter/nft_quota.c | 4 +-
net/netfilter/nft_set_hash.c | 8 +-
net/netfilter/nft_set_pipapo.c | 40 +++--
net/netfilter/nft_set_pipapo.h | 27 ++-
net/netfilter/nft_set_pipapo_avx2.c | 81 +++++----
net/netfilter/nft_set_rbtree.c | 6 +-
net/packet/af_packet.c | 86 +++++++++-
net/sched/act_ct.c | 4 +-
net/sctp/input.c | 48 +++---
net/sctp/proc.c | 10 +-
net/sctp/socket.c | 6 +-
net/smc/smc_core.c | 5 +-
net/sunrpc/auth_gss/gss_krb5_keys.c | 2 +-
net/sunrpc/clnt.c | 3 +-
net/sunrpc/sched.c | 4 +-
net/sunrpc/xprtrdma/frwr_ops.c | 3 +-
net/sunrpc/xprtrdma/verbs.c | 16 +-
net/tipc/udp_media.c | 5 +-
net/tls/tls_sw.c | 16 +-
net/wireless/nl80211.c | 16 +-
net/wireless/util.c | 8 +-
scripts/gcc-x86_32-has-stack-protector.sh | 2 +-
scripts/gcc-x86_64-has-stack-protector.sh | 2 +-
security/apparmor/lsm.c | 7 +
security/apparmor/policy.c | 2 +-
security/apparmor/policy_unpack.c | 1 +
security/keys/keyctl.c | 2 +-
security/landlock/cred.c | 11 +-
sound/firewire/amdtp-stream.c | 38 +++--
sound/firewire/amdtp-stream.h | 1 +
sound/pci/hda/patch_conexant.c | 54 +-----
sound/pci/hda/patch_hdmi.c | 2 +
sound/pci/hda/patch_realtek.c | 1 +
sound/soc/codecs/max98088.c | 10 +-
sound/soc/codecs/wcd938x-sdw.c | 4 +-
sound/soc/codecs/wsa881x.c | 2 +-
sound/soc/intel/common/soc-intel-quirks.h | 2 +-
sound/soc/meson/axg-fifo.c | 26 ++-
sound/soc/pxa/spitz.c | 58 +++----
sound/usb/line6/driver.c | 5 +
sound/usb/mixer.c | 7 +
sound/usb/quirks-table.h | 4 +
sound/usb/quirks.c | 4 +
sound/usb/stream.c | 4 +-
tools/lib/bpf/btf_dump.c | 8 +-
tools/lib/bpf/linker.c | 11 +-
tools/memory-model/lock.cat | 20 +--
tools/perf/arch/x86/util/intel-pt.c | 15 +-
tools/perf/util/sort.c | 2 +-
.../testing/selftests/bpf/prog_tests/send_signal.c | 3 +-
tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 2 +-
.../bpf/progs/btf_dump_test_case_multidim.c | 4 +-
.../bpf/progs/btf_dump_test_case_syntax.c | 4 +-
tools/testing/selftests/bpf/test_sockmap.c | 9 +-
.../drivers/net/mlxsw/spectrum-2/tc_flower.sh | 55 +++++-
tools/testing/selftests/landlock/base_test.c | 74 ++++++++
tools/testing/selftests/landlock/config | 5 +-
.../selftests/net/forwarding/devlink_lib.sh | 2 +
tools/testing/selftests/net/mptcp/mptcp_join.sh | 41 ++++-
tools/testing/selftests/rcutorture/bin/torture.sh | 6 +-
.../selftests/sigaltstack/current_stack_pointer.h | 2 +-
469 files changed, 4252 insertions(+), 2441 deletions(-)
1 year, 4 months
- 7
- 494
[PATCH] mwifiex: duplicate static structs used in driver instances
by Sascha Hauer
mwifiex_band_2ghz and mwifiex_band_5ghz are statically allocated, but
used and modified in driver instances. Duplicate them before using
them in driver instances so that different driver instances do not
influence each other.
This was observed on a board which has one PCIe and one SDIO mwifiex
adapter. It blew up in mwifiex_setup_ht_caps(). This was called with
the statically allocated struct which is modified in this function.
Cc: stable(a)vger.kernel.org
Fixes: d6bffe8bb520 ("mwifiex: support for creation of AP interface")
Signed-off-by: Sascha Hauer <s.hauer(a)pengutronix.de>
---
drivers/net/wireless/marvell/mwifiex/cfg80211.c | 32 ++++++++++++++++++++-----
1 file changed, 26 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
index b909a7665e9cc..d2e4153192032 100644
--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
@@ -4361,11 +4361,27 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)
if (ISSUPP_ADHOC_ENABLED(adapter->fw_cap_info))
wiphy->interface_modes |= BIT(NL80211_IFTYPE_ADHOC);
- wiphy->bands[NL80211_BAND_2GHZ] = &mwifiex_band_2ghz;
- if (adapter->config_bands & BAND_A)
- wiphy->bands[NL80211_BAND_5GHZ] = &mwifiex_band_5ghz;
- else
+ wiphy->bands[NL80211_BAND_2GHZ] = devm_kmemdup(adapter->dev,
+ &mwifiex_band_2ghz,
+ sizeof(mwifiex_band_2ghz),
+ GFP_KERNEL);
+ if (!wiphy->bands[NL80211_BAND_2GHZ]) {
+ ret = -ENOMEM;
+ goto err;
+ }
+
+ if (adapter->config_bands & BAND_A) {
+ wiphy->bands[NL80211_BAND_5GHZ] = devm_kmemdup(adapter->dev,
+ &mwifiex_band_5ghz,
+ sizeof(mwifiex_band_5ghz),
+ GFP_KERNEL);
+ if (!wiphy->bands[NL80211_BAND_5GHZ]) {
+ ret = -ENOMEM;
+ goto err;
+ }
+ } else {
wiphy->bands[NL80211_BAND_5GHZ] = NULL;
+ }
if (adapter->drcs_enabled && ISSUPP_DRCS_ENABLED(adapter->fw_cap_info))
wiphy->iface_combinations = &mwifiex_iface_comb_ap_sta_drcs;
@@ -4459,8 +4475,7 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)
if (ret < 0) {
mwifiex_dbg(adapter, ERROR,
"%s: wiphy_register failed: %d\n", __func__, ret);
- wiphy_free(wiphy);
- return ret;
+ goto err;
}
if (!adapter->regd) {
@@ -4502,4 +4517,9 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)
adapter->wiphy = wiphy;
return ret;
+
+err:
+ wiphy_free(wiphy);
+
+ return ret;
}
---
base-commit: 0c3836482481200ead7b416ca80c68a29cfdaabd
change-id: 20240809-mwifiex-duplicate-static-structs-f6355e8da797
Best regards,
--
Sascha Hauer <s.hauer(a)pengutronix.de>
1 year, 4 months
- 5
- 8
[tip: x86/urgent] x86/kaslr: Expose and use the end of the physical memory address space
by tip-bot2 for Thomas Gleixner
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: dfb3911c3692e45b027f13c7dca3230921533953
Gitweb: https://git.kernel.org/tip/dfb3911c3692e45b027f13c7dca3230921533953
Author: Thomas Gleixner <tglx(a)linutronix.de>
AuthorDate: Wed, 14 Aug 2024 00:29:36 +02:00
Committer: Thomas Gleixner <tglx(a)linutronix.de>
CommitterDate: Fri, 16 Aug 2024 11:33:33 +02:00
x86/kaslr: Expose and use the end of the physical memory address space
iounmap() on x86 occasionally fails to unmap because the provided valid
ioremap address is not below high_memory. It turned out that this
happens due to KASLR.
KASLR uses the full address space between PAGE_OFFSET and vaddr_end to
randomize the starting points of the direct map, vmalloc and vmemmap
regions. It thereby limits the size of the direct map by using the
installed memory size plus an extra configurable margin for hot-plug
memory. This limitation is done to gain more randomization space
because otherwise only the holes between the direct map, vmalloc,
vmemmap and vaddr_end would be usable for randomizing.
The limited direct map size is not exposed to the rest of the kernel, so
the memory hot-plug and resource management related code paths still
operate under the assumption that the available address space can be
determined with MAX_PHYSMEM_BITS.
request_free_mem_region() allocates from (1 << MAX_PHYSMEM_BITS) - 1
downwards. That means the first allocation happens past the end of the
direct map and if unlucky this address is in the vmalloc space, which
causes high_memory to become greater than VMALLOC_START and consequently
causes iounmap() to fail for valid ioremap addresses.
MAX_PHYSMEM_BITS cannot be changed for that because the randomization
does not align with address bit boundaries and there are other places
which actually require to know the maximum number of address bits. All
remaining usage sites of MAX_PHYSMEM_BITS have been analyzed and found
to be correct.
Cure this by exposing the end of the direct map via PHYSMEM_END and use
that for the memory hot-plug and resource management related places
instead of relying on MAX_PHYSMEM_BITS. In the KASLR case PHYSMEM_END
maps to a variable which is initialized by the KASLR initialization and
otherwise it is based on MAX_PHYSMEM_BITS as before.
To prevent future hickups add a check into add_pages() to catch callers
trying to add memory above PHYSMEM_END.
Fixes: 0483e1fa6e09 ("x86/mm: Implement ASLR for kernel memory regions")
Reported-by: Max Ramanouski <max8rr8(a)gmail.com>
Reported-by: Alistair Popple <apopple(a)nvidia.com>
Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de>
Tested-By: Max Ramanouski <max8rr8(a)gmail.com>
Tested-by: Alistair Popple <apopple(a)nvidia.com>
Reviewed-by: Dan Williams <dan.j.williams(a)intel.com>
Reviewed-by: Alistair Popple <apopple(a)nvidia.com>
Reviewed-by: Kees Cook <kees(a)kernel.org>
Cc: stable(a)vger.kernel.org
Link: https://lore.kernel.org/all/87ed6soy3z.ffs@tglx
---
arch/x86/include/asm/page_64.h | 1 +-
arch/x86/include/asm/pgtable_64_types.h | 4 ++++-
arch/x86/mm/init_64.c | 4 ++++-
arch/x86/mm/kaslr.c | 26 +++++++++++++++++++++---
include/linux/mm.h | 4 ++++-
kernel/resource.c | 6 ++----
mm/memory_hotplug.c | 2 +-
mm/sparse.c | 2 +-
8 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
index af4302d..f3d257c 100644
--- a/arch/x86/include/asm/page_64.h
+++ b/arch/x86/include/asm/page_64.h
@@ -17,6 +17,7 @@ extern unsigned long phys_base;
extern unsigned long page_offset_base;
extern unsigned long vmalloc_base;
extern unsigned long vmemmap_base;
+extern unsigned long physmem_end;
static __always_inline unsigned long __phys_addr_nodebug(unsigned long x)
{
diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
index 9053dfe..a98e534 100644
--- a/arch/x86/include/asm/pgtable_64_types.h
+++ b/arch/x86/include/asm/pgtable_64_types.h
@@ -140,6 +140,10 @@ extern unsigned int ptrs_per_p4d;
# define VMEMMAP_START __VMEMMAP_BASE_L4
#endif /* CONFIG_DYNAMIC_MEMORY_LAYOUT */
+#ifdef CONFIG_RANDOMIZE_MEMORY
+# define PHYSMEM_END physmem_end
+#endif
+
/*
* End of the region for which vmalloc page tables are pre-allocated.
* For non-KMSAN builds, this is the same as VMALLOC_END.
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index d8dbeac..ff25364 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -958,8 +958,12 @@ static void update_end_of_memory_vars(u64 start, u64 size)
int add_pages(int nid, unsigned long start_pfn, unsigned long nr_pages,
struct mhp_params *params)
{
+ unsigned long end = ((start_pfn + nr_pages) << PAGE_SHIFT) - 1;
int ret;
+ if (WARN_ON_ONCE(end > PHYSMEM_END))
+ return -ERANGE;
+
ret = __add_pages(nid, start_pfn, nr_pages, params);
WARN_ON_ONCE(ret);
diff --git a/arch/x86/mm/kaslr.c b/arch/x86/mm/kaslr.c
index 37db264..0f2a3a4 100644
--- a/arch/x86/mm/kaslr.c
+++ b/arch/x86/mm/kaslr.c
@@ -47,13 +47,24 @@ static const unsigned long vaddr_end = CPU_ENTRY_AREA_BASE;
*/
static __initdata struct kaslr_memory_region {
unsigned long *base;
+ unsigned long *end;
unsigned long size_tb;
} kaslr_regions[] = {
- { &page_offset_base, 0 },
- { &vmalloc_base, 0 },
- { &vmemmap_base, 0 },
+ {
+ .base = &page_offset_base,
+ .end = &physmem_end,
+ },
+ {
+ .base = &vmalloc_base,
+ },
+ {
+ .base = &vmemmap_base,
+ },
};
+/* The end of the possible address space for physical memory */
+unsigned long physmem_end __ro_after_init;
+
/* Get size in bytes used by the memory region */
static inline unsigned long get_padding(struct kaslr_memory_region *region)
{
@@ -82,6 +93,8 @@ void __init kernel_randomize_memory(void)
BUILD_BUG_ON(vaddr_end != CPU_ENTRY_AREA_BASE);
BUILD_BUG_ON(vaddr_end > __START_KERNEL_map);
+ /* Preset the end of the possible address space for physical memory */
+ physmem_end = ((1ULL << MAX_PHYSMEM_BITS) - 1);
if (!kaslr_memory_enabled())
return;
@@ -134,6 +147,13 @@ void __init kernel_randomize_memory(void)
*/
vaddr += get_padding(&kaslr_regions[i]);
vaddr = round_up(vaddr + 1, PUD_SIZE);
+
+ /*
+ * KASLR trims the maximum possible size of the
+ * direct-map. Update the physmem_end boundary.
+ */
+ if (kaslr_regions[i].end)
+ *kaslr_regions[i].end = __pa(vaddr) - 1;
remain_entropy -= entropy;
}
}
diff --git a/include/linux/mm.h b/include/linux/mm.h
index c4b238a..b386415 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -97,6 +97,10 @@ extern const int mmap_rnd_compat_bits_max;
extern int mmap_rnd_compat_bits __read_mostly;
#endif
+#ifndef PHYSMEM_END
+# define PHYSMEM_END ((1ULL << MAX_PHYSMEM_BITS) - 1)
+#endif
+
#include <asm/page.h>
#include <asm/processor.h>
diff --git a/kernel/resource.c b/kernel/resource.c
index 14777af..a83040f 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -1826,8 +1826,7 @@ static resource_size_t gfr_start(struct resource *base, resource_size_t size,
if (flags & GFR_DESCENDING) {
resource_size_t end;
- end = min_t(resource_size_t, base->end,
- (1ULL << MAX_PHYSMEM_BITS) - 1);
+ end = min_t(resource_size_t, base->end, PHYSMEM_END);
return end - size + 1;
}
@@ -1844,8 +1843,7 @@ static bool gfr_continue(struct resource *base, resource_size_t addr,
* @size did not wrap 0.
*/
return addr > addr - size &&
- addr <= min_t(resource_size_t, base->end,
- (1ULL << MAX_PHYSMEM_BITS) - 1);
+ addr <= min_t(resource_size_t, base->end, PHYSMEM_END);
}
static resource_size_t gfr_next(resource_size_t addr, resource_size_t size,
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 66267c2..951878a 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1681,7 +1681,7 @@ struct range __weak arch_get_mappable_range(void)
struct range mhp_get_pluggable_range(bool need_mapping)
{
- const u64 max_phys = (1ULL << MAX_PHYSMEM_BITS) - 1;
+ const u64 max_phys = PHYSMEM_END;
struct range mhp_range;
if (need_mapping) {
diff --git a/mm/sparse.c b/mm/sparse.c
index e4b8300..0c3bff8 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -129,7 +129,7 @@ static inline int sparse_early_nid(struct mem_section *section)
static void __meminit mminit_validate_memmodel_limits(unsigned long *start_pfn,
unsigned long *end_pfn)
{
- unsigned long max_sparsemem_pfn = 1UL << (MAX_PHYSMEM_BITS-PAGE_SHIFT);
+ unsigned long max_sparsemem_pfn = (PHYSMEM_END + 1) >> PAGE_SHIFT;
/*
* Sanity checks - do not allow an architecture to pass
1 year, 4 months
- 1
- 0
[PATCH 6.2.y] jfs: define xtree root and page independently
by Sergio González Collado
From: Dave Kleikamp <dave.kleikamp(a)oracle.com>
[ Upstream commit a779ed754e52d582b8c0e17959df063108bd0656 ]
In order to make array bounds checking sane, provide a separate
definition of the in-inode xtree root and the external xtree page.
Signed-off-by: Dave Kleikamp <dave.kleikamp(a)oracle.com>
Tested-by: Manas Ghandat <ghandatmanas(a)gmail.com>
(cherry picked from commit a779ed754e52d582b8c0e17959df063108bd0656)
Signed-off-by: Sergio González Collado <sergio.collado(a)gmail.com>
---
fs/jfs/jfs_dinode.h | 2 +-
fs/jfs/jfs_imap.c | 6 +++---
fs/jfs/jfs_incore.h | 2 +-
fs/jfs/jfs_txnmgr.c | 4 ++--
fs/jfs/jfs_xtree.c | 4 ++--
fs/jfs/jfs_xtree.h | 37 +++++++++++++++++++++++--------------
6 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/fs/jfs/jfs_dinode.h b/fs/jfs/jfs_dinode.h
index 6b231d0d0071..603aae17a693 100644
--- a/fs/jfs/jfs_dinode.h
+++ b/fs/jfs/jfs_dinode.h
@@ -96,7 +96,7 @@ struct dinode {
#define di_gengen u._file._u1._imap._gengen
union {
- xtpage_t _xtroot;
+ xtroot_t _xtroot;
struct {
u8 unused[16]; /* 16: */
dxd_t _dxd; /* 16: */
diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c
index 390cbfce391f..85918c0d852b 100644
--- a/fs/jfs/jfs_imap.c
+++ b/fs/jfs/jfs_imap.c
@@ -669,7 +669,7 @@ int diWrite(tid_t tid, struct inode *ip)
* This is the special xtree inside the directory for storing
* the directory table
*/
- xtpage_t *p, *xp;
+ xtroot_t *p, *xp;
xad_t *xad;
jfs_ip->xtlid = 0;
@@ -683,7 +683,7 @@ int diWrite(tid_t tid, struct inode *ip)
* copy xtree root from inode to dinode:
*/
p = &jfs_ip->i_xtroot;
- xp = (xtpage_t *) &dp->di_dirtable;
+ xp = (xtroot_t *) &dp->di_dirtable;
lv = ilinelock->lv;
for (n = 0; n < ilinelock->index; n++, lv++) {
memcpy(&xp->xad[lv->offset], &p->xad[lv->offset],
@@ -712,7 +712,7 @@ int diWrite(tid_t tid, struct inode *ip)
* regular file: 16 byte (XAD slot) granularity
*/
if (type & tlckXTREE) {
- xtpage_t *p, *xp;
+ xtroot_t *p, *xp;
xad_t *xad;
/*
diff --git a/fs/jfs/jfs_incore.h b/fs/jfs/jfs_incore.h
index 721def69e732..dd4264aa9bed 100644
--- a/fs/jfs/jfs_incore.h
+++ b/fs/jfs/jfs_incore.h
@@ -66,7 +66,7 @@ struct jfs_inode_info {
lid_t xtlid; /* lid of xtree lock on directory */
union {
struct {
- xtpage_t _xtroot; /* 288: xtree root */
+ xtroot_t _xtroot; /* 288: xtree root */
struct inomap *_imap; /* 4: inode map header */
} file;
struct {
diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
index ffd4feece078..997cc1b9e628 100644
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@ -778,7 +778,7 @@ struct tlock *txLock(tid_t tid, struct inode *ip, struct metapage * mp,
if (mp->xflag & COMMIT_PAGE)
p = (xtpage_t *) mp->data;
else
- p = &jfs_ip->i_xtroot;
+ p = (xtpage_t *) &jfs_ip->i_xtroot;
xtlck->lwm.offset =
le16_to_cpu(p->header.nextindex);
}
@@ -1671,7 +1671,7 @@ static void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
if (tlck->type & tlckBTROOT) {
lrd->log.redopage.type |= cpu_to_le16(LOG_BTROOT);
- p = &JFS_IP(ip)->i_xtroot;
+ p = (xtpage_t *) &JFS_IP(ip)->i_xtroot;
if (S_ISDIR(ip->i_mode))
lrd->log.redopage.type |=
cpu_to_le16(LOG_DIR_XTREE);
diff --git a/fs/jfs/jfs_xtree.c b/fs/jfs/jfs_xtree.c
index 2d304cee884c..5ee618d17e77 100644
--- a/fs/jfs/jfs_xtree.c
+++ b/fs/jfs/jfs_xtree.c
@@ -1213,7 +1213,7 @@ xtSplitRoot(tid_t tid,
struct xtlock *xtlck;
int rc;
- sp = &JFS_IP(ip)->i_xtroot;
+ sp = (xtpage_t *) &JFS_IP(ip)->i_xtroot;
INCREMENT(xtStat.split);
@@ -2098,7 +2098,7 @@ int xtAppend(tid_t tid, /* transaction id */
*/
void xtInitRoot(tid_t tid, struct inode *ip)
{
- xtpage_t *p;
+ xtroot_t *p;
/*
* acquire a transaction lock on the root
diff --git a/fs/jfs/jfs_xtree.h b/fs/jfs/jfs_xtree.h
index ad7592191d76..0f6cf5a1ce75 100644
--- a/fs/jfs/jfs_xtree.h
+++ b/fs/jfs/jfs_xtree.h
@@ -65,24 +65,33 @@ struct xadlist {
#define XTPAGEMAXSLOT 256
#define XTENTRYSTART 2
-/*
- * xtree page:
- */
-typedef union {
- struct xtheader {
- __le64 next; /* 8: */
- __le64 prev; /* 8: */
+struct xtheader {
+ __le64 next; /* 8: */
+ __le64 prev; /* 8: */
- u8 flag; /* 1: */
- u8 rsrvd1; /* 1: */
- __le16 nextindex; /* 2: next index = number of entries */
- __le16 maxentry; /* 2: max number of entries */
- __le16 rsrvd2; /* 2: */
+ u8 flag; /* 1: */
+ u8 rsrvd1; /* 1: */
+ __le16 nextindex; /* 2: next index = number of entries */
+ __le16 maxentry; /* 2: max number of entries */
+ __le16 rsrvd2; /* 2: */
- pxd_t self; /* 8: self */
- } header; /* (32) */
+ pxd_t self; /* 8: self */
+};
+/*
+ * xtree root (in inode):
+ */
+typedef union {
+ struct xtheader header;
xad_t xad[XTROOTMAXSLOT]; /* 16 * maxentry: xad array */
+} xtroot_t;
+
+/*
+ * xtree page:
+ */
+typedef union {
+ struct xtheader header;
+ xad_t xad[XTPAGEMAXSLOT]; /* 16 * maxentry: xad array */
} xtpage_t;
/*
base-commit: 46df6964c1a9eb72027710f626cb1c6bfb5d58c9
--
2.39.2
1 year, 4 months
- 2
- 1
[PATCH 1/2] usb: dwc3: omap: add missing depopulate in probe error path
by Krzysztof Kozlowski
Depopulate device in probe error paths to fix leak of children
resources.
Fixes: ee249b455494 ("usb: dwc3: omap: remove IRQ_NOAUTOEN used with shared irq")
Cc: <stable(a)vger.kernel.org>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>
---
drivers/usb/dwc3/dwc3-omap.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c
index d5c77db4daa9..2a11fc0ee84f 100644
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@ -522,11 +522,13 @@ static int dwc3_omap_probe(struct platform_device *pdev)
if (ret) {
dev_err(dev, "failed to request IRQ #%d --> %d\n",
omap->irq, ret);
- goto err1;
+ goto err2;
}
dwc3_omap_enable_irqs(omap);
return 0;
+err2:
+ of_platform_depopulate(dev);
err1:
pm_runtime_put_sync(dev);
pm_runtime_disable(dev);
--
2.43.0
1 year, 4 months
- 3
- 5
[merged mm-hotfixes-stable] alloc_tag-mark-pages-reserved-during-cma-activation-as-not-tagged.patch removed from -mm tree
by Andrew Morton
The quilt patch titled
Subject: alloc_tag: mark pages reserved during CMA activation as not tagged
has been removed from the -mm tree. Its filename was
alloc_tag-mark-pages-reserved-during-cma-activation-as-not-tagged.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Suren Baghdasaryan <surenb(a)google.com>
Subject: alloc_tag: mark pages reserved during CMA activation as not tagged
Date: Tue, 13 Aug 2024 08:07:57 -0700
During CMA activation, pages in CMA area are prepared and then freed
without being allocated. This triggers warnings when memory allocation
debug config (CONFIG_MEM_ALLOC_PROFILING_DEBUG) is enabled. Fix this by
marking these pages not tagged before freeing them.
Link: https://lkml.kernel.org/r/20240813150758.855881-2-surenb@google.com
Fixes: d224eb0287fb ("codetag: debug: mark codetags for reserved pages as empty")
Signed-off-by: Suren Baghdasaryan <surenb(a)google.com>
Acked-by: David Hildenbrand <david(a)redhat.com>
Cc: Kees Cook <keescook(a)chromium.org>
Cc: Kent Overstreet <kent.overstreet(a)linux.dev>
Cc: Pasha Tatashin <pasha.tatashin(a)soleen.com>
Cc: Sourav Panda <souravpanda(a)google.com>
Cc: Vlastimil Babka <vbabka(a)suse.cz>
Cc: <stable(a)vger.kernel.org> [6.10]
Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
---
mm/mm_init.c | 2 ++
1 file changed, 2 insertions(+)
--- a/mm/mm_init.c~alloc_tag-mark-pages-reserved-during-cma-activation-as-not-tagged
+++ a/mm/mm_init.c
@@ -2244,6 +2244,8 @@ void __init init_cma_reserved_pageblock(
set_pageblock_migratetype(page, MIGRATE_CMA);
set_page_refcounted(page);
+ /* pages were reserved and not allocated */
+ clear_page_tag_ref(page);
__free_pages(page, pageblock_order);
adjust_managed_page_count(page, pageblock_nr_pages);
_
Patches currently in -mm which might be from surenb(a)google.com are
1 year, 4 months
- 1
- 0
[merged mm-hotfixes-stable] alloc_tag-introduce-clear_page_tag_ref-helper-function.patch removed from -mm tree
by Andrew Morton
The quilt patch titled
Subject: alloc_tag: introduce clear_page_tag_ref() helper function
has been removed from the -mm tree. Its filename was
alloc_tag-introduce-clear_page_tag_ref-helper-function.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Suren Baghdasaryan <surenb(a)google.com>
Subject: alloc_tag: introduce clear_page_tag_ref() helper function
Date: Tue, 13 Aug 2024 08:07:56 -0700
In several cases we are freeing pages which were not allocated using
common page allocators. For such cases, in order to keep allocation
accounting correct, we should clear the page tag to indicate that the page
being freed is expected to not have a valid allocation tag. Introduce
clear_page_tag_ref() helper function to be used for this.
Link: https://lkml.kernel.org/r/20240813150758.855881-1-surenb@google.com
Fixes: d224eb0287fb ("codetag: debug: mark codetags for reserved pages as empty")
Signed-off-by: Suren Baghdasaryan <surenb(a)google.com>
Suggested-by: David Hildenbrand <david(a)redhat.com>
Acked-by: David Hildenbrand <david(a)redhat.com>
Reviewed-by: Pasha Tatashin <pasha.tatashin(a)soleen.com>
Cc: Kees Cook <keescook(a)chromium.org>
Cc: Kent Overstreet <kent.overstreet(a)linux.dev>
Cc: Sourav Panda <souravpanda(a)google.com>
Cc: Vlastimil Babka <vbabka(a)suse.cz>
Cc: <stable(a)vger.kernel.org> [6.10]
Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
---
include/linux/pgalloc_tag.h | 13 +++++++++++++
mm/mm_init.c | 10 +---------
mm/page_alloc.c | 9 +--------
3 files changed, 15 insertions(+), 17 deletions(-)
--- a/include/linux/pgalloc_tag.h~alloc_tag-introduce-clear_page_tag_ref-helper-function
+++ a/include/linux/pgalloc_tag.h
@@ -43,6 +43,18 @@ static inline void put_page_tag_ref(unio
page_ext_put(page_ext_from_codetag_ref(ref));
}
+static inline void clear_page_tag_ref(struct page *page)
+{
+ if (mem_alloc_profiling_enabled()) {
+ union codetag_ref *ref = get_page_tag_ref(page);
+
+ if (ref) {
+ set_codetag_empty(ref);
+ put_page_tag_ref(ref);
+ }
+ }
+}
+
static inline void pgalloc_tag_add(struct page *page, struct task_struct *task,
unsigned int nr)
{
@@ -126,6 +138,7 @@ static inline void pgalloc_tag_sub_pages
static inline union codetag_ref *get_page_tag_ref(struct page *page) { return NULL; }
static inline void put_page_tag_ref(union codetag_ref *ref) {}
+static inline void clear_page_tag_ref(struct page *page) {}
static inline void pgalloc_tag_add(struct page *page, struct task_struct *task,
unsigned int nr) {}
static inline void pgalloc_tag_sub(struct page *page, unsigned int nr) {}
--- a/mm/mm_init.c~alloc_tag-introduce-clear_page_tag_ref-helper-function
+++ a/mm/mm_init.c
@@ -2459,15 +2459,7 @@ void __init memblock_free_pages(struct p
}
/* pages were reserved and not allocated */
- if (mem_alloc_profiling_enabled()) {
- union codetag_ref *ref = get_page_tag_ref(page);
-
- if (ref) {
- set_codetag_empty(ref);
- put_page_tag_ref(ref);
- }
- }
-
+ clear_page_tag_ref(page);
__free_pages_core(page, order, MEMINIT_EARLY);
}
--- a/mm/page_alloc.c~alloc_tag-introduce-clear_page_tag_ref-helper-function
+++ a/mm/page_alloc.c
@@ -5815,14 +5815,7 @@ unsigned long free_reserved_area(void *s
void free_reserved_page(struct page *page)
{
- if (mem_alloc_profiling_enabled()) {
- union codetag_ref *ref = get_page_tag_ref(page);
-
- if (ref) {
- set_codetag_empty(ref);
- put_page_tag_ref(ref);
- }
- }
+ clear_page_tag_ref(page);
ClearPageReserved(page);
init_page_count(page);
__free_page(page);
_
Patches currently in -mm which might be from surenb(a)google.com are
1 year, 4 months
- 1
- 0
[merged mm-hotfixes-stable] selftests-memfd_secret-dont-build-memfd_secret-test-on-unsupported-arches.patch removed from -mm tree
by Andrew Morton
The quilt patch titled
Subject: selftests: memfd_secret: don't build memfd_secret test on unsupported arches
has been removed from the -mm tree. Its filename was
selftests-memfd_secret-dont-build-memfd_secret-test-on-unsupported-arches.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Muhammad Usama Anjum <usama.anjum(a)collabora.com>
Subject: selftests: memfd_secret: don't build memfd_secret test on unsupported arches
Date: Fri, 9 Aug 2024 12:56:42 +0500
[1] mentions that memfd_secret is only supported on arm64, riscv, x86 and
x86_64 for now. It doesn't support other architectures. I found the
build error on arm and decided to send the fix as it was creating noise on
KernelCI:
memfd_secret.c: In function 'memfd_secret':
memfd_secret.c:42:24: error: '__NR_memfd_secret' undeclared (first use in this function);
did you mean 'memfd_secret'?
42 | return syscall(__NR_memfd_secret, flags);
| ^~~~~~~~~~~~~~~~~
| memfd_secret
Hence I'm adding condition that memfd_secret should only be compiled on
supported architectures.
Also check in run_vmtests script if memfd_secret binary is present before
executing it.
Link: https://lkml.kernel.org/r/20240812061522.1933054-1-usama.anjum@collabora.com
Link: https://lore.kernel.org/all/20210518072034.31572-7-rppt@kernel.org/ [1]
Link: https://lkml.kernel.org/r/20240809075642.403247-1-usama.anjum@collabora.com
Fixes: 76fe17ef588a ("secretmem: test: add basic selftest for memfd_secret(2)")
Signed-off-by: Muhammad Usama Anjum <usama.anjum(a)collabora.com>
Reviewed-by: Shuah Khan <skhan(a)linuxfoundation.org>
Acked-by: Mike Rapoport (Microsoft) <rppt(a)kernel.org>
Cc: Albert Ou <aou(a)eecs.berkeley.edu>
Cc: James Bottomley <James.Bottomley(a)HansenPartnership.com>
Cc: Mike Rapoport (Microsoft) <rppt(a)kernel.org>
Cc: Palmer Dabbelt <palmer(a)dabbelt.com>
Cc: Paul Walmsley <paul.walmsley(a)sifive.com>
Cc: <stable(a)vger.kernel.org>
Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
---
tools/testing/selftests/mm/Makefile | 2 ++
tools/testing/selftests/mm/run_vmtests.sh | 3 +++
2 files changed, 5 insertions(+)
--- a/tools/testing/selftests/mm/Makefile~selftests-memfd_secret-dont-build-memfd_secret-test-on-unsupported-arches
+++ a/tools/testing/selftests/mm/Makefile
@@ -53,7 +53,9 @@ TEST_GEN_FILES += madv_populate
TEST_GEN_FILES += map_fixed_noreplace
TEST_GEN_FILES += map_hugetlb
TEST_GEN_FILES += map_populate
+ifneq (,$(filter $(ARCH),arm64 riscv riscv64 x86 x86_64))
TEST_GEN_FILES += memfd_secret
+endif
TEST_GEN_FILES += migration
TEST_GEN_FILES += mkdirty
TEST_GEN_FILES += mlock-random-test
--- a/tools/testing/selftests/mm/run_vmtests.sh~selftests-memfd_secret-dont-build-memfd_secret-test-on-unsupported-arches
+++ a/tools/testing/selftests/mm/run_vmtests.sh
@@ -374,8 +374,11 @@ CATEGORY="hmm" run_test bash ./test_hmm.
# MADV_POPULATE_READ and MADV_POPULATE_WRITE tests
CATEGORY="madv_populate" run_test ./madv_populate
+if [ -x ./memfd_secret ]
+then
(echo 0 | sudo tee /proc/sys/kernel/yama/ptrace_scope 2>&1) | tap_prefix
CATEGORY="memfd_secret" run_test ./memfd_secret
+fi
# KSM KSM_MERGE_TIME_HUGE_PAGES test with size of 100
CATEGORY="ksm" run_test ./ksm_tests -H -s 100
_
Patches currently in -mm which might be from usama.anjum(a)collabora.com are
selftests-mm-fix-build-errors-on-armhf.patch
1 year, 4 months
- 1
- 0
[merged mm-hotfixes-stable] mm-fix-endless-reclaim-on-machines-with-unaccepted-memory.patch removed from -mm tree
by Andrew Morton
The quilt patch titled
Subject: mm: fix endless reclaim on machines with unaccepted memory
has been removed from the -mm tree. Its filename was
mm-fix-endless-reclaim-on-machines-with-unaccepted-memory.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: "Kirill A. Shutemov" <kirill.shutemov(a)linux.intel.com>
Subject: mm: fix endless reclaim on machines with unaccepted memory
Date: Fri, 9 Aug 2024 14:48:47 +0300
Unaccepted memory is considered unusable free memory, which is not counted
as free on the zone watermark check. This causes get_page_from_freelist()
to accept more memory to hit the high watermark, but it creates problems
in the reclaim path.
The reclaim path encounters a failed zone watermark check and attempts to
reclaim memory. This is usually successful, but if there is little or no
reclaimable memory, it can result in endless reclaim with little to no
progress. This can occur early in the boot process, just after start of
the init process when the only reclaimable memory is the page cache of the
init executable and its libraries.
Make unaccepted memory free from watermark check point of view. This way
unaccepted memory will never be the trigger of memory reclaim. Accept
more memory in the get_page_from_freelist() if needed.
Link: https://lkml.kernel.org/r/20240809114854.3745464-2-kirill.shutemov@linux.in…
Fixes: dcdfdd40fa82 ("mm: Add support for unaccepted memory")
Signed-off-by: Kirill A. Shutemov <kirill.shutemov(a)linux.intel.com>
Reported-by: Jianxiong Gao <jxgao(a)google.com>
Acked-by: David Hildenbrand <david(a)redhat.com>
Tested-by: Jianxiong Gao <jxgao(a)google.com>
Cc: Borislav Petkov <bp(a)alien8.de>
Cc: Johannes Weiner <hannes(a)cmpxchg.org>
Cc: Kirill A. Shutemov <kirill.shutemov(a)linux.intel.com>
Cc: Matthew Wilcox <willy(a)infradead.org>
Cc: Mel Gorman <mgorman(a)suse.de>
Cc: Mike Rapoport (Microsoft) <rppt(a)kernel.org>
Cc: Tom Lendacky <thomas.lendacky(a)amd.com>
Cc: Vlastimil Babka <vbabka(a)suse.cz>
Cc: <stable(a)vger.kernel.org> [6.5+]
Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
---
mm/page_alloc.c | 42 ++++++++++++++++++++----------------------
1 file changed, 20 insertions(+), 22 deletions(-)
--- a/mm/page_alloc.c~mm-fix-endless-reclaim-on-machines-with-unaccepted-memory
+++ a/mm/page_alloc.c
@@ -287,7 +287,7 @@ EXPORT_SYMBOL(nr_online_nodes);
static bool page_contains_unaccepted(struct page *page, unsigned int order);
static void accept_page(struct page *page, unsigned int order);
-static bool try_to_accept_memory(struct zone *zone, unsigned int order);
+static bool cond_accept_memory(struct zone *zone, unsigned int order);
static inline bool has_unaccepted_memory(void);
static bool __free_unaccepted(struct page *page);
@@ -3072,9 +3072,6 @@ static inline long __zone_watermark_unus
if (!(alloc_flags & ALLOC_CMA))
unusable_free += zone_page_state(z, NR_FREE_CMA_PAGES);
#endif
-#ifdef CONFIG_UNACCEPTED_MEMORY
- unusable_free += zone_page_state(z, NR_UNACCEPTED);
-#endif
return unusable_free;
}
@@ -3368,6 +3365,8 @@ retry:
}
}
+ cond_accept_memory(zone, order);
+
/*
* Detect whether the number of free pages is below high
* watermark. If so, we will decrease pcp->high and free
@@ -3393,10 +3392,8 @@ check_alloc_wmark:
gfp_mask)) {
int ret;
- if (has_unaccepted_memory()) {
- if (try_to_accept_memory(zone, order))
- goto try_this_zone;
- }
+ if (cond_accept_memory(zone, order))
+ goto try_this_zone;
#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT
/*
@@ -3450,10 +3447,8 @@ try_this_zone:
return page;
} else {
- if (has_unaccepted_memory()) {
- if (try_to_accept_memory(zone, order))
- goto try_this_zone;
- }
+ if (cond_accept_memory(zone, order))
+ goto try_this_zone;
#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT
/* Try again if zone has deferred pages */
@@ -6950,9 +6945,6 @@ static bool try_to_accept_memory_one(str
struct page *page;
bool last;
- if (list_empty(&zone->unaccepted_pages))
- return false;
-
spin_lock_irqsave(&zone->lock, flags);
page = list_first_entry_or_null(&zone->unaccepted_pages,
struct page, lru);
@@ -6978,23 +6970,29 @@ static bool try_to_accept_memory_one(str
return true;
}
-static bool try_to_accept_memory(struct zone *zone, unsigned int order)
+static bool cond_accept_memory(struct zone *zone, unsigned int order)
{
long to_accept;
- int ret = false;
+ bool ret = false;
+
+ if (!has_unaccepted_memory())
+ return false;
+
+ if (list_empty(&zone->unaccepted_pages))
+ return false;
/* How much to accept to get to high watermark? */
to_accept = high_wmark_pages(zone) -
(zone_page_state(zone, NR_FREE_PAGES) -
- __zone_watermark_unusable_free(zone, order, 0));
+ __zone_watermark_unusable_free(zone, order, 0) -
+ zone_page_state(zone, NR_UNACCEPTED));
- /* Accept at least one page */
- do {
+ while (to_accept > 0) {
if (!try_to_accept_memory_one(zone))
break;
ret = true;
to_accept -= MAX_ORDER_NR_PAGES;
- } while (to_accept > 0);
+ }
return ret;
}
@@ -7037,7 +7035,7 @@ static void accept_page(struct page *pag
{
}
-static bool try_to_accept_memory(struct zone *zone, unsigned int order)
+static bool cond_accept_memory(struct zone *zone, unsigned int order)
{
return false;
}
_
Patches currently in -mm which might be from kirill.shutemov(a)linux.intel.com are
mm-reduce-deferred-struct-page-init-ifdeffery.patch
mm-accept-memory-in-__alloc_pages_bulk.patch
mm-introduce-pageunaccepted-page-type.patch
mm-rework-accept-memory-helpers.patch
mm-add-a-helper-to-accept-page.patch
mm-page_isolation-handle-unaccepted-memory-isolation.patch
mm-accept-to-promo-watermark.patch
1 year, 4 months
- 1
- 0
[merged mm-hotfixes-stable] mm-numa-no-task_numa_fault-call-if-pmd-is-changed.patch removed from -mm tree
by Andrew Morton
The quilt patch titled
Subject: mm/numa: no task_numa_fault() call if PMD is changed
has been removed from the -mm tree. Its filename was
mm-numa-no-task_numa_fault-call-if-pmd-is-changed.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Zi Yan <ziy(a)nvidia.com>
Subject: mm/numa: no task_numa_fault() call if PMD is changed
Date: Fri, 9 Aug 2024 10:59:05 -0400
When handling a numa page fault, task_numa_fault() should be called by a
process that restores the page table of the faulted folio to avoid
duplicated stats counting. Commit c5b5a3dd2c1f ("mm: thp: refactor NUMA
fault handling") restructured do_huge_pmd_numa_page() and did not avoid
task_numa_fault() call in the second page table check after a numa
migration failure. Fix it by making all !pmd_same() return immediately.
This issue can cause task_numa_fault() being called more than necessary
and lead to unexpected numa balancing results (It is hard to tell whether
the issue will cause positive or negative performance impact due to
duplicated numa fault counting).
Link: https://lkml.kernel.org/r/20240809145906.1513458-3-ziy@nvidia.com
Fixes: c5b5a3dd2c1f ("mm: thp: refactor NUMA fault handling")
Reported-by: "Huang, Ying" <ying.huang(a)intel.com>
Closes: https://lore.kernel.org/linux-mm/87zfqfw0yw.fsf@yhuang6-desk2.ccr.corp.inte…
Signed-off-by: Zi Yan <ziy(a)nvidia.com>
Acked-by: David Hildenbrand <david(a)redhat.com>
Cc: Baolin Wang <baolin.wang(a)linux.alibaba.com>
Cc: "Huang, Ying" <ying.huang(a)intel.com>
Cc: Kefeng Wang <wangkefeng.wang(a)huawei.com>
Cc: Mel Gorman <mgorman(a)suse.de>
Cc: Yang Shi <shy828301(a)gmail.com>
Cc: <stable(a)vger.kernel.org>
Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
---
mm/huge_memory.c | 29 +++++++++++++----------------
1 file changed, 13 insertions(+), 16 deletions(-)
--- a/mm/huge_memory.c~mm-numa-no-task_numa_fault-call-if-pmd-is-changed
+++ a/mm/huge_memory.c
@@ -1685,7 +1685,7 @@ vm_fault_t do_huge_pmd_numa_page(struct
vmf->ptl = pmd_lock(vma->vm_mm, vmf->pmd);
if (unlikely(!pmd_same(oldpmd, *vmf->pmd))) {
spin_unlock(vmf->ptl);
- goto out;
+ return 0;
}
pmd = pmd_modify(oldpmd, vma->vm_page_prot);
@@ -1728,22 +1728,16 @@ vm_fault_t do_huge_pmd_numa_page(struct
if (!migrate_misplaced_folio(folio, vma, target_nid)) {
flags |= TNF_MIGRATED;
nid = target_nid;
- } else {
- flags |= TNF_MIGRATE_FAIL;
- vmf->ptl = pmd_lock(vma->vm_mm, vmf->pmd);
- if (unlikely(!pmd_same(oldpmd, *vmf->pmd))) {
- spin_unlock(vmf->ptl);
- goto out;
- }
- goto out_map;
- }
-
-out:
- if (nid != NUMA_NO_NODE)
task_numa_fault(last_cpupid, nid, HPAGE_PMD_NR, flags);
+ return 0;
+ }
- return 0;
-
+ flags |= TNF_MIGRATE_FAIL;
+ vmf->ptl = pmd_lock(vma->vm_mm, vmf->pmd);
+ if (unlikely(!pmd_same(oldpmd, *vmf->pmd))) {
+ spin_unlock(vmf->ptl);
+ return 0;
+ }
out_map:
/* Restore the PMD */
pmd = pmd_modify(oldpmd, vma->vm_page_prot);
@@ -1753,7 +1747,10 @@ out_map:
set_pmd_at(vma->vm_mm, haddr, vmf->pmd, pmd);
update_mmu_cache_pmd(vma, vmf->address, vmf->pmd);
spin_unlock(vmf->ptl);
- goto out;
+
+ if (nid != NUMA_NO_NODE)
+ task_numa_fault(last_cpupid, nid, HPAGE_PMD_NR, flags);
+ return 0;
}
/*
_
Patches currently in -mm which might be from ziy(a)nvidia.com are
memory-tiering-read-last_cpupid-correctly-in-do_huge_pmd_numa_page.patch
memory-tiering-introduce-folio_use_access_time-check.patch
memory-tiering-count-pgpromote_success-when-mem-tiering-is-enabled.patch
mm-migrate-move-common-code-to-numa_migrate_check-was-numa_migrate_prep.patch
1 year, 4 months
- 1
- 0
[merged mm-hotfixes-stable] mm-numa-no-task_numa_fault-call-if-pte-is-changed.patch removed from -mm tree
by Andrew Morton
The quilt patch titled
Subject: mm/numa: no task_numa_fault() call if PTE is changed
has been removed from the -mm tree. Its filename was
mm-numa-no-task_numa_fault-call-if-pte-is-changed.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Zi Yan <ziy(a)nvidia.com>
Subject: mm/numa: no task_numa_fault() call if PTE is changed
Date: Fri, 9 Aug 2024 10:59:04 -0400
When handling a numa page fault, task_numa_fault() should be called by a
process that restores the page table of the faulted folio to avoid
duplicated stats counting. Commit b99a342d4f11 ("NUMA balancing: reduce
TLB flush via delaying mapping on hint page fault") restructured
do_numa_page() and did not avoid task_numa_fault() call in the second page
table check after a numa migration failure. Fix it by making all
!pte_same() return immediately.
This issue can cause task_numa_fault() being called more than necessary
and lead to unexpected numa balancing results (It is hard to tell whether
the issue will cause positive or negative performance impact due to
duplicated numa fault counting).
Link: https://lkml.kernel.org/r/20240809145906.1513458-2-ziy@nvidia.com
Fixes: b99a342d4f11 ("NUMA balancing: reduce TLB flush via delaying mapping on hint page fault")
Signed-off-by: Zi Yan <ziy(a)nvidia.com>
Reported-by: "Huang, Ying" <ying.huang(a)intel.com>
Closes: https://lore.kernel.org/linux-mm/87zfqfw0yw.fsf@yhuang6-desk2.ccr.corp.inte…
Acked-by: David Hildenbrand <david(a)redhat.com>
Cc: Baolin Wang <baolin.wang(a)linux.alibaba.com>
Cc: Kefeng Wang <wangkefeng.wang(a)huawei.com>
Cc: Mel Gorman <mgorman(a)suse.de>
Cc: Yang Shi <shy828301(a)gmail.com>
Cc: <stable(a)vger.kernel.org>
Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
---
mm/memory.c | 33 ++++++++++++++++-----------------
1 file changed, 16 insertions(+), 17 deletions(-)
--- a/mm/memory.c~mm-numa-no-task_numa_fault-call-if-pte-is-changed
+++ a/mm/memory.c
@@ -5295,7 +5295,7 @@ static vm_fault_t do_numa_page(struct vm
if (unlikely(!pte_same(old_pte, vmf->orig_pte))) {
pte_unmap_unlock(vmf->pte, vmf->ptl);
- goto out;
+ return 0;
}
pte = pte_modify(old_pte, vma->vm_page_prot);
@@ -5358,23 +5358,19 @@ static vm_fault_t do_numa_page(struct vm
if (!migrate_misplaced_folio(folio, vma, target_nid)) {
nid = target_nid;
flags |= TNF_MIGRATED;
- } else {
- flags |= TNF_MIGRATE_FAIL;
- vmf->pte = pte_offset_map_lock(vma->vm_mm, vmf->pmd,
- vmf->address, &vmf->ptl);
- if (unlikely(!vmf->pte))
- goto out;
- if (unlikely(!pte_same(ptep_get(vmf->pte), vmf->orig_pte))) {
- pte_unmap_unlock(vmf->pte, vmf->ptl);
- goto out;
- }
- goto out_map;
+ task_numa_fault(last_cpupid, nid, nr_pages, flags);
+ return 0;
}
-out:
- if (nid != NUMA_NO_NODE)
- task_numa_fault(last_cpupid, nid, nr_pages, flags);
- return 0;
+ flags |= TNF_MIGRATE_FAIL;
+ vmf->pte = pte_offset_map_lock(vma->vm_mm, vmf->pmd,
+ vmf->address, &vmf->ptl);
+ if (unlikely(!vmf->pte))
+ return 0;
+ if (unlikely(!pte_same(ptep_get(vmf->pte), vmf->orig_pte))) {
+ pte_unmap_unlock(vmf->pte, vmf->ptl);
+ return 0;
+ }
out_map:
/*
* Make it present again, depending on how arch implements
@@ -5387,7 +5383,10 @@ out_map:
numa_rebuild_single_mapping(vmf, vma, vmf->address, vmf->pte,
writable);
pte_unmap_unlock(vmf->pte, vmf->ptl);
- goto out;
+
+ if (nid != NUMA_NO_NODE)
+ task_numa_fault(last_cpupid, nid, nr_pages, flags);
+ return 0;
}
static inline vm_fault_t create_huge_pmd(struct vm_fault *vmf)
_
Patches currently in -mm which might be from ziy(a)nvidia.com are
memory-tiering-read-last_cpupid-correctly-in-do_huge_pmd_numa_page.patch
memory-tiering-introduce-folio_use_access_time-check.patch
memory-tiering-count-pgpromote_success-when-mem-tiering-is-enabled.patch
mm-migrate-move-common-code-to-numa_migrate_check-was-numa_migrate_prep.patch
1 year, 4 months
- 1
- 0
[merged mm-hotfixes-stable] mm-vmalloc-fix-page-mapping-if-vm_area_alloc_pages-with-high-order-fallback-to-order-0.patch removed from -mm tree
by Andrew Morton
The quilt patch titled
Subject: mm/vmalloc: fix page mapping if vm_area_alloc_pages() with high order fallback to order 0
has been removed from the -mm tree. Its filename was
mm-vmalloc-fix-page-mapping-if-vm_area_alloc_pages-with-high-order-fallback-to-order-0.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Hailong Liu <hailong.liu(a)oppo.com>
Subject: mm/vmalloc: fix page mapping if vm_area_alloc_pages() with high order fallback to order 0
Date: Thu, 8 Aug 2024 20:19:56 +0800
The __vmap_pages_range_noflush() assumes its argument pages** contains
pages with the same page shift. However, since commit e9c3cda4d86e ("mm,
vmalloc: fix high order __GFP_NOFAIL allocations"), if gfp_flags includes
__GFP_NOFAIL with high order in vm_area_alloc_pages() and page allocation
failed for high order, the pages** may contain two different page shifts
(high order and order-0). This could lead __vmap_pages_range_noflush() to
perform incorrect mappings, potentially resulting in memory corruption.
Users might encounter this as follows (vmap_allow_huge = true, 2M is for
PMD_SIZE):
kvmalloc(2M, __GFP_NOFAIL|GFP_X)
__vmalloc_node_range_noprof(vm_flags=VM_ALLOW_HUGE_VMAP)
vm_area_alloc_pages(order=9) ---> order-9 allocation failed and fallback to order-0
vmap_pages_range()
vmap_pages_range_noflush()
__vmap_pages_range_noflush(page_shift = 21) ----> wrong mapping happens
We can remove the fallback code because if a high-order allocation fails,
__vmalloc_node_range_noprof() will retry with order-0. Therefore, it is
unnecessary to fallback to order-0 here. Therefore, fix this by removing
the fallback code.
Link: https://lkml.kernel.org/r/20240808122019.3361-1-hailong.liu@oppo.com
Fixes: e9c3cda4d86e ("mm, vmalloc: fix high order __GFP_NOFAIL allocations")
Signed-off-by: Hailong Liu <hailong.liu(a)oppo.com>
Reported-by: Tangquan Zheng <zhengtangquan(a)oppo.com>
Reviewed-by: Baoquan He <bhe(a)redhat.com>
Reviewed-by: Uladzislau Rezki (Sony) <urezki(a)gmail.com>
Acked-by: Barry Song <baohua(a)kernel.org>
Acked-by: Michal Hocko <mhocko(a)suse.com>
Cc: Matthew Wilcox <willy(a)infradead.org>
Cc: <stable(a)vger.kernel.org>
Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
---
mm/vmalloc.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
--- a/mm/vmalloc.c~mm-vmalloc-fix-page-mapping-if-vm_area_alloc_pages-with-high-order-fallback-to-order-0
+++ a/mm/vmalloc.c
@@ -3584,15 +3584,8 @@ vm_area_alloc_pages(gfp_t gfp, int nid,
page = alloc_pages_noprof(alloc_gfp, order);
else
page = alloc_pages_node_noprof(nid, alloc_gfp, order);
- if (unlikely(!page)) {
- if (!nofail)
- break;
-
- /* fall back to the zero order allocations */
- alloc_gfp |= __GFP_NOFAIL;
- order = 0;
- continue;
- }
+ if (unlikely(!page))
+ break;
/*
* Higher order allocations must be able to be treated as
_
Patches currently in -mm which might be from hailong.liu(a)oppo.com are
1 year, 4 months
- 1
- 0
[merged mm-hotfixes-stable] mm-memory-failure-use-raw_spinlock_t-in-struct-memory_failure_cpu.patch removed from -mm tree
by Andrew Morton
The quilt patch titled
Subject: mm/memory-failure: use raw_spinlock_t in struct memory_failure_cpu
has been removed from the -mm tree. Its filename was
mm-memory-failure-use-raw_spinlock_t-in-struct-memory_failure_cpu.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Waiman Long <longman(a)redhat.com>
Subject: mm/memory-failure: use raw_spinlock_t in struct memory_failure_cpu
Date: Tue, 6 Aug 2024 12:41:07 -0400
The memory_failure_cpu structure is a per-cpu structure. Access to its
content requires the use of get_cpu_var() to lock in the current CPU and
disable preemption. The use of a regular spinlock_t for locking purpose
is fine for a non-RT kernel.
Since the integration of RT spinlock support into the v5.15 kernel, a
spinlock_t in a RT kernel becomes a sleeping lock and taking a sleeping
lock in a preemption disabled context is illegal resulting in the
following kind of warning.
[12135.732244] BUG: sleeping function called from invalid context at kernel/locking/spinlock_rt.c:48
[12135.732248] in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 270076, name: kworker/0:0
[12135.732252] preempt_count: 1, expected: 0
[12135.732255] RCU nest depth: 2, expected: 2
:
[12135.732420] Hardware name: Dell Inc. PowerEdge R640/0HG0J8, BIOS 2.10.2 02/24/2021
[12135.732423] Workqueue: kacpi_notify acpi_os_execute_deferred
[12135.732433] Call Trace:
[12135.732436] <TASK>
[12135.732450] dump_stack_lvl+0x57/0x81
[12135.732461] __might_resched.cold+0xf4/0x12f
[12135.732479] rt_spin_lock+0x4c/0x100
[12135.732491] memory_failure_queue+0x40/0xe0
[12135.732503] ghes_do_memory_failure+0x53/0x390
[12135.732516] ghes_do_proc.constprop.0+0x229/0x3e0
[12135.732575] ghes_proc+0xf9/0x1a0
[12135.732591] ghes_notify_hed+0x6a/0x150
[12135.732602] notifier_call_chain+0x43/0xb0
[12135.732626] blocking_notifier_call_chain+0x43/0x60
[12135.732637] acpi_ev_notify_dispatch+0x47/0x70
[12135.732648] acpi_os_execute_deferred+0x13/0x20
[12135.732654] process_one_work+0x41f/0x500
[12135.732695] worker_thread+0x192/0x360
[12135.732715] kthread+0x111/0x140
[12135.732733] ret_from_fork+0x29/0x50
[12135.732779] </TASK>
Fix it by using a raw_spinlock_t for locking instead.
Also move the pr_err() out of the lock critical section and after
put_cpu_ptr() to avoid indeterminate latency and the possibility of sleep
with this call.
[longman(a)redhat.com: don't hold percpu ref across pr_err(), per Miaohe]
Link: https://lkml.kernel.org/r/20240807181130.1122660-1-longman@redhat.com
Link: https://lkml.kernel.org/r/20240806164107.1044956-1-longman@redhat.com
Fixes: 0f383b6dc96e ("locking/spinlock: Provide RT variant")
Signed-off-by: Waiman Long <longman(a)redhat.com>
Acked-by: Miaohe Lin <linmiaohe(a)huawei.com>
Cc: "Huang, Ying" <ying.huang(a)intel.com>
Cc: Juri Lelli <juri.lelli(a)redhat.com>
Cc: Len Brown <len.brown(a)intel.com>
Cc: Naoya Horiguchi <nao.horiguchi(a)gmail.com>
Cc: <stable(a)vger.kernel.org>
Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
---
mm/memory-failure.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
--- a/mm/memory-failure.c~mm-memory-failure-use-raw_spinlock_t-in-struct-memory_failure_cpu
+++ a/mm/memory-failure.c
@@ -2417,7 +2417,7 @@ struct memory_failure_entry {
struct memory_failure_cpu {
DECLARE_KFIFO(fifo, struct memory_failure_entry,
MEMORY_FAILURE_FIFO_SIZE);
- spinlock_t lock;
+ raw_spinlock_t lock;
struct work_struct work;
};
@@ -2443,20 +2443,22 @@ void memory_failure_queue(unsigned long
{
struct memory_failure_cpu *mf_cpu;
unsigned long proc_flags;
+ bool buffer_overflow;
struct memory_failure_entry entry = {
.pfn = pfn,
.flags = flags,
};
mf_cpu = &get_cpu_var(memory_failure_cpu);
- spin_lock_irqsave(&mf_cpu->lock, proc_flags);
- if (kfifo_put(&mf_cpu->fifo, entry))
+ raw_spin_lock_irqsave(&mf_cpu->lock, proc_flags);
+ buffer_overflow = !kfifo_put(&mf_cpu->fifo, entry);
+ if (!buffer_overflow)
schedule_work_on(smp_processor_id(), &mf_cpu->work);
- else
+ raw_spin_unlock_irqrestore(&mf_cpu->lock, proc_flags);
+ put_cpu_var(memory_failure_cpu);
+ if (buffer_overflow)
pr_err("buffer overflow when queuing memory failure at %#lx\n",
pfn);
- spin_unlock_irqrestore(&mf_cpu->lock, proc_flags);
- put_cpu_var(memory_failure_cpu);
}
EXPORT_SYMBOL_GPL(memory_failure_queue);
@@ -2469,9 +2471,9 @@ static void memory_failure_work_func(str
mf_cpu = container_of(work, struct memory_failure_cpu, work);
for (;;) {
- spin_lock_irqsave(&mf_cpu->lock, proc_flags);
+ raw_spin_lock_irqsave(&mf_cpu->lock, proc_flags);
gotten = kfifo_get(&mf_cpu->fifo, &entry);
- spin_unlock_irqrestore(&mf_cpu->lock, proc_flags);
+ raw_spin_unlock_irqrestore(&mf_cpu->lock, proc_flags);
if (!gotten)
break;
if (entry.flags & MF_SOFT_OFFLINE)
@@ -2501,7 +2503,7 @@ static int __init memory_failure_init(vo
for_each_possible_cpu(cpu) {
mf_cpu = &per_cpu(memory_failure_cpu, cpu);
- spin_lock_init(&mf_cpu->lock);
+ raw_spin_lock_init(&mf_cpu->lock);
INIT_KFIFO(mf_cpu->fifo);
INIT_WORK(&mf_cpu->work, memory_failure_work_func);
}
_
Patches currently in -mm which might be from longman(a)redhat.com are
watchdog-handle-the-enodev-failure-case-of-lockup_detector_delay_init-separately.patch
1 year, 4 months
- 1
- 0
[merged mm-hotfixes-stable] mm-hugetlb-fix-hugetlb-vs-core-mm-pt-locking.patch removed from -mm tree
by Andrew Morton
The quilt patch titled
Subject: mm/hugetlb: fix hugetlb vs. core-mm PT locking
has been removed from the -mm tree. Its filename was
mm-hugetlb-fix-hugetlb-vs-core-mm-pt-locking.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: David Hildenbrand <david(a)redhat.com>
Subject: mm/hugetlb: fix hugetlb vs. core-mm PT locking
Date: Thu, 1 Aug 2024 22:47:48 +0200
We recently made GUP's common page table walking code to also walk hugetlb
VMAs without most hugetlb special-casing, preparing for the future of
having less hugetlb-specific page table walking code in the codebase.
Turns out that we missed one page table locking detail: page table locking
for hugetlb folios that are not mapped using a single PMD/PUD.
Assume we have hugetlb folio that spans multiple PTEs (e.g., 64 KiB
hugetlb folios on arm64 with 4 KiB base page size). GUP, as it walks the
page tables, will perform a pte_offset_map_lock() to grab the PTE table
lock.
However, hugetlb that concurrently modifies these page tables would
actually grab the mm->page_table_lock: with USE_SPLIT_PTE_PTLOCKS, the
locks would differ. Something similar can happen right now with hugetlb
folios that span multiple PMDs when USE_SPLIT_PMD_PTLOCKS.
This issue can be reproduced [1], for example triggering:
[ 3105.936100] ------------[ cut here ]------------
[ 3105.939323] WARNING: CPU: 31 PID: 2732 at mm/gup.c:142 try_grab_folio+0x11c/0x188
[ 3105.944634] Modules linked in: [...]
[ 3105.974841] CPU: 31 PID: 2732 Comm: reproducer Not tainted 6.10.0-64.eln141.aarch64 #1
[ 3105.980406] Hardware name: QEMU KVM Virtual Machine, BIOS edk2-20240524-4.fc40 05/24/2024
[ 3105.986185] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--)
[ 3105.991108] pc : try_grab_folio+0x11c/0x188
[ 3105.994013] lr : follow_page_pte+0xd8/0x430
[ 3105.996986] sp : ffff80008eafb8f0
[ 3105.999346] x29: ffff80008eafb900 x28: ffffffe8d481f380 x27: 00f80001207cff43
[ 3106.004414] x26: 0000000000000001 x25: 0000000000000000 x24: ffff80008eafba48
[ 3106.009520] x23: 0000ffff9372f000 x22: ffff7a54459e2000 x21: ffff7a546c1aa978
[ 3106.014529] x20: ffffffe8d481f3c0 x19: 0000000000610041 x18: 0000000000000001
[ 3106.019506] x17: 0000000000000001 x16: ffffffffffffffff x15: 0000000000000000
[ 3106.024494] x14: ffffb85477fdfe08 x13: 0000ffff9372ffff x12: 0000000000000000
[ 3106.029469] x11: 1fffef4a88a96be1 x10: ffff7a54454b5f0c x9 : ffffb854771b12f0
[ 3106.034324] x8 : 0008000000000000 x7 : ffff7a546c1aa980 x6 : 0008000000000080
[ 3106.038902] x5 : 00000000001207cf x4 : 0000ffff9372f000 x3 : ffffffe8d481f000
[ 3106.043420] x2 : 0000000000610041 x1 : 0000000000000001 x0 : 0000000000000000
[ 3106.047957] Call trace:
[ 3106.049522] try_grab_folio+0x11c/0x188
[ 3106.051996] follow_pmd_mask.constprop.0.isra.0+0x150/0x2e0
[ 3106.055527] follow_page_mask+0x1a0/0x2b8
[ 3106.058118] __get_user_pages+0xf0/0x348
[ 3106.060647] faultin_page_range+0xb0/0x360
[ 3106.063651] do_madvise+0x340/0x598
Let's make huge_pte_lockptr() effectively use the same PT locks as any
core-mm page table walker would. Add ptep_lockptr() to obtain the PTE
page table lock using a pte pointer -- unfortunately we cannot convert
pte_lockptr() because virt_to_page() doesn't work with kmap'ed page tables
we can have with CONFIG_HIGHPTE.
Handle CONFIG_PGTABLE_LEVELS correctly by checking in reverse order, such
that when e.g., CONFIG_PGTABLE_LEVELS==2 with
PGDIR_SIZE==P4D_SIZE==PUD_SIZE==PMD_SIZE will work as expected. Document
why that works.
There is one ugly case: powerpc 8xx, whereby we have an 8 MiB hugetlb
folio being mapped using two PTE page tables. While hugetlb wants to take
the PMD table lock, core-mm would grab the PTE table lock of one of both
PTE page tables. In such corner cases, we have to make sure that both
locks match, which is (fortunately!) currently guaranteed for 8xx as it
does not support SMP and consequently doesn't use split PT locks.
[1] https://lore.kernel.org/all/1bbfcc7f-f222-45a5-ac44-c5a1381c596d@redhat.com/
Link: https://lkml.kernel.org/r/20240801204748.99107-1-david@redhat.com
Fixes: 9cb28da54643 ("mm/gup: handle hugetlb in the generic follow_page_mask code")
Signed-off-by: David Hildenbrand <david(a)redhat.com>
Acked-by: Peter Xu <peterx(a)redhat.com>
Reviewed-by: Baolin Wang <baolin.wang(a)linux.alibaba.com>
Tested-by: Baolin Wang <baolin.wang(a)linux.alibaba.com>
Cc: Peter Xu <peterx(a)redhat.com>
Cc: Oscar Salvador <osalvador(a)suse.de>
Cc: Muchun Song <muchun.song(a)linux.dev>
Cc: <stable(a)vger.kernel.org>
Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
---
include/linux/hugetlb.h | 33 ++++++++++++++++++++++++++++++---
include/linux/mm.h | 11 +++++++++++
2 files changed, 41 insertions(+), 3 deletions(-)
--- a/include/linux/hugetlb.h~mm-hugetlb-fix-hugetlb-vs-core-mm-pt-locking
+++ a/include/linux/hugetlb.h
@@ -944,10 +944,37 @@ static inline bool htlb_allow_alloc_fall
static inline spinlock_t *huge_pte_lockptr(struct hstate *h,
struct mm_struct *mm, pte_t *pte)
{
- if (huge_page_size(h) == PMD_SIZE)
+ const unsigned long size = huge_page_size(h);
+
+ VM_WARN_ON(size == PAGE_SIZE);
+
+ /*
+ * hugetlb must use the exact same PT locks as core-mm page table
+ * walkers would. When modifying a PTE table, hugetlb must take the
+ * PTE PT lock, when modifying a PMD table, hugetlb must take the PMD
+ * PT lock etc.
+ *
+ * The expectation is that any hugetlb folio smaller than a PMD is
+ * always mapped into a single PTE table and that any hugetlb folio
+ * smaller than a PUD (but at least as big as a PMD) is always mapped
+ * into a single PMD table.
+ *
+ * If that does not hold for an architecture, then that architecture
+ * must disable split PT locks such that all *_lockptr() functions
+ * will give us the same result: the per-MM PT lock.
+ *
+ * Note that with e.g., CONFIG_PGTABLE_LEVELS=2 where
+ * PGDIR_SIZE==P4D_SIZE==PUD_SIZE==PMD_SIZE, we'd use pud_lockptr()
+ * and core-mm would use pmd_lockptr(). However, in such configurations
+ * split PMD locks are disabled -- they don't make sense on a single
+ * PGDIR page table -- and the end result is the same.
+ */
+ if (size >= PUD_SIZE)
+ return pud_lockptr(mm, (pud_t *) pte);
+ else if (size >= PMD_SIZE || IS_ENABLED(CONFIG_HIGHPTE))
return pmd_lockptr(mm, (pmd_t *) pte);
- VM_BUG_ON(huge_page_size(h) == PAGE_SIZE);
- return &mm->page_table_lock;
+ /* pte_alloc_huge() only applies with !CONFIG_HIGHPTE */
+ return ptep_lockptr(mm, pte);
}
#ifndef hugepages_supported
--- a/include/linux/mm.h~mm-hugetlb-fix-hugetlb-vs-core-mm-pt-locking
+++ a/include/linux/mm.h
@@ -2920,6 +2920,13 @@ static inline spinlock_t *pte_lockptr(st
return ptlock_ptr(page_ptdesc(pmd_page(*pmd)));
}
+static inline spinlock_t *ptep_lockptr(struct mm_struct *mm, pte_t *pte)
+{
+ BUILD_BUG_ON(IS_ENABLED(CONFIG_HIGHPTE));
+ BUILD_BUG_ON(MAX_PTRS_PER_PTE * sizeof(pte_t) > PAGE_SIZE);
+ return ptlock_ptr(virt_to_ptdesc(pte));
+}
+
static inline bool ptlock_init(struct ptdesc *ptdesc)
{
/*
@@ -2944,6 +2951,10 @@ static inline spinlock_t *pte_lockptr(st
{
return &mm->page_table_lock;
}
+static inline spinlock_t *ptep_lockptr(struct mm_struct *mm, pte_t *pte)
+{
+ return &mm->page_table_lock;
+}
static inline void ptlock_cache_init(void) {}
static inline bool ptlock_init(struct ptdesc *ptdesc) { return true; }
static inline void ptlock_free(struct ptdesc *ptdesc) {}
_
Patches currently in -mm which might be from david(a)redhat.com are
mm-turn-use_split_pte_ptlocks-use_split_pte_ptlocks-into-kconfig-options.patch
mm-hugetlb-enforce-that-pmd-pt-sharing-has-split-pmd-pt-locks.patch
powerpc-8xx-document-and-enforce-that-split-pt-locks-are-not-used.patch
mm-simplify-arch_make_folio_accessible.patch
mm-gup-convert-to-arch_make_folio_accessible.patch
s390-uv-drop-arch_make_page_accessible.patch
mm-hugetlb-remove-hugetlb_follow_page_mask-leftover.patch
mm-rmap-cleanup-partially-mapped-handling-in-__folio_remove_rmap.patch
mm-clarify-folio_likely_mapped_shared-documentation-for-ksm-folios.patch
mm-provide-vm_normal_pagefolio_pmd-with-config_pgtable_has_huge_leaves.patch
mm-pagewalk-introduce-folio_walk_start-folio_walk_end.patch
mm-migrate-convert-do_pages_stat_array-from-follow_page-to-folio_walk.patch
mm-migrate-convert-add_page_for_migration-from-follow_page-to-folio_walk.patch
mm-ksm-convert-get_mergeable_page-from-follow_page-to-folio_walk.patch
mm-ksm-convert-scan_get_next_rmap_item-from-follow_page-to-folio_walk.patch
mm-huge_memory-convert-split_huge_pages_pid-from-follow_page-to-folio_walk.patch
mm-huge_memory-convert-split_huge_pages_pid-from-follow_page-to-folio_walk-fix.patch
s390-uv-convert-gmap_destroy_page-from-follow_page-to-folio_walk.patch
s390-mm-fault-convert-do_secure_storage_access-from-follow_page-to-folio_walk.patch
mm-remove-follow_page.patch
mm-ksm-convert-break_ksm-from-walk_page_range_vma-to-folio_walk.patch
mm-rmap-minimize-folio-_nr_pages_mapped-updates-when-batching-pte-unmapping.patch
1 year, 4 months
- 1
- 0
[merged mm-hotfixes-stable] mseal-fix-is_madv_discard.patch removed from -mm tree
by Andrew Morton
The quilt patch titled
Subject: mseal: fix is_madv_discard()
has been removed from the -mm tree. Its filename was
mseal-fix-is_madv_discard.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Pedro Falcato <pedro.falcato(a)gmail.com>
Subject: mseal: fix is_madv_discard()
Date: Wed, 7 Aug 2024 18:33:35 +0100
is_madv_discard did its check wrong. MADV_ flags are not bitwise,
they're normal sequential numbers. So, for instance:
behavior & (/* ... */ | MADV_REMOVE)
tagged both MADV_REMOVE and MADV_RANDOM (bit 0 set) as discard
operations.
As a result the kernel could erroneously block certain madvises (e.g
MADV_RANDOM or MADV_HUGEPAGE) on sealed VMAs due to them sharing bits
with blocked MADV operations (e.g REMOVE or WIPEONFORK).
This is obviously incorrect, so use a switch statement instead.
Link: https://lkml.kernel.org/r/20240807173336.2523757-1-pedro.falcato@gmail.com
Link: https://lkml.kernel.org/r/20240807173336.2523757-2-pedro.falcato@gmail.com
Fixes: 8be7258aad44 ("mseal: add mseal syscall")
Signed-off-by: Pedro Falcato <pedro.falcato(a)gmail.com>
Tested-by: Jeff Xu <jeffxu(a)chromium.org>
Reviewed-by: Jeff Xu <jeffxu(a)chromium.org>
Cc: Kees Cook <kees(a)kernel.org>
Cc: Liam R. Howlett <Liam.Howlett(a)oracle.com>
Cc: Shuah Khan <shuah(a)kernel.org>
Cc: <stable(a)vger.kernel.org>
Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
---
mm/mseal.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
--- a/mm/mseal.c~mseal-fix-is_madv_discard
+++ a/mm/mseal.c
@@ -40,9 +40,17 @@ static bool can_modify_vma(struct vm_are
static bool is_madv_discard(int behavior)
{
- return behavior &
- (MADV_FREE | MADV_DONTNEED | MADV_DONTNEED_LOCKED |
- MADV_REMOVE | MADV_DONTFORK | MADV_WIPEONFORK);
+ switch (behavior) {
+ case MADV_FREE:
+ case MADV_DONTNEED:
+ case MADV_DONTNEED_LOCKED:
+ case MADV_REMOVE:
+ case MADV_DONTFORK:
+ case MADV_WIPEONFORK:
+ return true;
+ }
+
+ return false;
}
static bool is_ro_anon(struct vm_area_struct *vma)
_
Patches currently in -mm which might be from pedro.falcato(a)gmail.com are
selftests-mm-add-mseal-test-for-no-discard-madvise.patch
selftests-mm-add-mseal-test-for-no-discard-madvise-fix.patch
1 year, 4 months
- 1
- 0
[4.19 v2] filelock: Correct the filelock owner in fcntl_setlk/fcntl_setlk64
by Long Li
The locks_remove_posix() function in fcntl_setlk/fcntl_setlk64 is designed
to reliably remove locks when an fcntl/close race is detected. However, it
was passing in the wrong filelock owner, it looks like a mistake and
resulting in a failure to remove locks. More critically, if the lock
removal fails, it could lead to a uaf issue while traversing the locks.
This problem occurs only in the 4.19/5.4 stable version.
Fixes: a561145f3ae9 ("filelock: Fix fcntl/close race recovery compat path")
Fixes: d30ff3304083 ("filelock: Remove locks reliably when fcntl/close race is detected")
Cc: stable(a)vger.kernel.org
Signed-off-by: Long Li <leo.lilong(a)huawei.com>
---
fs/locks.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/locks.c b/fs/locks.c
index 234ebfa8c070..b1201b01867a 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -2313,7 +2313,7 @@ int fcntl_setlk(unsigned int fd, struct file *filp, unsigned int cmd,
f = fcheck(fd);
spin_unlock(¤t->files->file_lock);
if (f != filp) {
- locks_remove_posix(filp, ¤t->files);
+ locks_remove_posix(filp, current->files);
error = -EBADF;
}
}
@@ -2443,7 +2443,7 @@ int fcntl_setlk64(unsigned int fd, struct file *filp, unsigned int cmd,
f = fcheck(fd);
spin_unlock(¤t->files->file_lock);
if (f != filp) {
- locks_remove_posix(filp, ¤t->files);
+ locks_remove_posix(filp, current->files);
error = -EBADF;
}
}
--
2.39.2
1 year, 4 months
- 1
- 0
[obsolete] lib-stackdepot-double-depot_pools_cap-if-kasan-is-enabled.patch removed from -mm tree
by Andrew Morton
The quilt patch titled
Subject: lib/stackdepot: double DEPOT_POOLS_CAP if KASAN is enabled
has been removed from the -mm tree. Its filename was
lib-stackdepot-double-depot_pools_cap-if-kasan-is-enabled.patch
This patch was dropped because it is obsolete
------------------------------------------------------
From: Waiman Long <longman(a)redhat.com>
Subject: lib/stackdepot: double DEPOT_POOLS_CAP if KASAN is enabled
Date: Wed, 7 Aug 2024 12:52:28 -0400
When a wide variety of workloads are run on a debug kernel with KASAN
enabled, the following warning may sometimes be printed.
[ 6818.650674] Stack depot reached limit capacity
[ 6818.650730] WARNING: CPU: 1 PID: 272741 at lib/stackdepot.c:252 depot_alloc_stack+0x39e/0x3d0
:
[ 6818.650907] Call Trace:
[ 6818.650909] [<00047dd453d84b92>] depot_alloc_stack+0x3a2/0x3d0
[ 6818.650916] [<00047dd453d85254>] stack_depot_save_flags+0x4f4/0x5c0
[ 6818.650920] [<00047dd4535872c6>] kasan_save_stack+0x56/0x70
[ 6818.650924] [<00047dd453587328>] kasan_save_track+0x28/0x40
[ 6818.650927] [<00047dd45358a27a>] kasan_save_free_info+0x4a/0x70
[ 6818.650930] [<00047dd45358766a>] __kasan_slab_free+0x12a/0x1d0
[ 6818.650933] [<00047dd45350deb4>] kmem_cache_free+0x1b4/0x580
[ 6818.650938] [<00047dd452c520da>] __put_task_struct+0x24a/0x320
[ 6818.650945] [<00047dd452c6aee4>] delayed_put_task_struct+0x294/0x350
[ 6818.650949] [<00047dd452e9066a>] rcu_do_batch+0x6ea/0x2090
[ 6818.650953] [<00047dd452ea60f4>] rcu_core+0x474/0xa90
[ 6818.650956] [<00047dd452c780c0>] handle_softirqs+0x3c0/0xf90
[ 6818.650960] [<00047dd452c76fbe>] __irq_exit_rcu+0x35e/0x460
[ 6818.650963] [<00047dd452c79992>] irq_exit_rcu+0x22/0xb0
[ 6818.650966] [<00047dd454bd8128>] do_ext_irq+0xd8/0x120
[ 6818.650972] [<00047dd454c0ddd0>] ext_int_handler+0xb8/0xe8
[ 6818.650979] [<00047dd453589cf6>] kasan_check_range+0x236/0x2f0
[ 6818.650982] [<00047dd453378cf0>] filemap_get_pages+0x190/0xaa0
[ 6818.650986] [<00047dd453379940>] filemap_read+0x340/0xa70
[ 6818.650989] [<00047dd3d325d226>] xfs_file_buffered_read+0x2c6/0x400 [xfs]
[ 6818.651431] [<00047dd3d325dfe2>] xfs_file_read_iter+0x2c2/0x550 [xfs]
[ 6818.651663] [<00047dd45364710c>] vfs_read+0x64c/0x8c0
[ 6818.651669] [<00047dd453648ed8>] ksys_read+0x118/0x200
[ 6818.651672] [<00047dd452b6cf5a>] do_syscall+0x27a/0x380
[ 6818.651676] [<00047dd454bd7e74>] __do_syscall+0xf4/0x1a0
[ 6818.651680] [<00047dd454c0db58>] system_call+0x70/0x98
As KASAN is a big user of stackdepot, the current DEPOT_POOLS_CAP of
8192 may not be enough. Double DEPOT_POOLS_CAP if KASAN is enabled to
avoid hitting this problem.
Also use the MIN() macro for defining DEPOT_MAX_POOLS to clarify the
intention.
Link: https://lkml.kernel.org/r/20240807165228.1116831-1-longman@redhat.com
Fixes: 02754e0a484a ("lib/stackdepot.c: bump stackdepot capacity from 16MB to 128MB")
Signed-off-by: Waiman Long <longman(a)redhat.com>
Cc: Andrey Konovalov <andreyknvl(a)google.com>
Cc: Andrey Ryabinin <ryabinin.a.a(a)gmail.com>
Cc: <stable(a)vger.kernel.org>
Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
---
lib/stackdepot.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
--- a/lib/stackdepot.c~lib-stackdepot-double-depot_pools_cap-if-kasan-is-enabled
+++ a/lib/stackdepot.c
@@ -36,11 +36,12 @@
#include <linux/memblock.h>
#include <linux/kasan-enabled.h>
-#define DEPOT_POOLS_CAP 8192
+/* KASAN is a big user of stackdepot, double the cap if KASAN is enabled */
+#define DEPOT_POOLS_CAP (8192 * (IS_ENABLED(CONFIG_KASAN) ? 2 : 1))
+
/* The pool_index is offset by 1 so the first record does not have a 0 handle. */
#define DEPOT_MAX_POOLS \
- (((1LL << (DEPOT_POOL_INDEX_BITS)) - 1 < DEPOT_POOLS_CAP) ? \
- (1LL << (DEPOT_POOL_INDEX_BITS)) - 1 : DEPOT_POOLS_CAP)
+ MIN((1LL << (DEPOT_POOL_INDEX_BITS)) - 1, DEPOT_POOLS_CAP)
static bool stack_depot_disabled;
static bool __stack_depot_early_init_requested __initdata = IS_ENABLED(CONFIG_STACKDEPOT_ALWAYS_INIT);
_
Patches currently in -mm which might be from longman(a)redhat.com are
mm-memory-failure-use-raw_spinlock_t-in-struct-memory_failure_cpu.patch
mm-memory-failure-use-raw_spinlock_t-in-struct-memory_failure_cpu-v3.patch
watchdog-handle-the-enodev-failure-case-of-lockup_detector_delay_init-separately.patch
1 year, 4 months
- 1
- 0
[PATCH 4.19] filelock: Correct the filelock owner in fcntl_setlk/fcntl_setlk64
by Long Li
The locks_remove_posix() function in fcntl_setlk/fcntl_setlk64 is designed
to reliably remove locks when an fcntl/close race is detected. However, it
was passing in the wrong filelock owner, it looks like a mistake and
resulting in a failure to remove locks. More critically, if the lock
removal fails, it could lead to a uaf issue while traversing the locks.
This problem occurs only in the 4.19 stable version.
Fixes: a561145f3ae9 ("filelock: Fix fcntl/close race recovery compat path")
Fixes: d30ff3304083 ("filelock: Remove locks reliably when fcntl/close race is detected")
Cc: stable(a)vger.kernel.org
Signed-off-by: Long Li <leo.lilong(a)huawei.com>
---
fs/locks.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/locks.c b/fs/locks.c
index 234ebfa8c070..b1201b01867a 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -2313,7 +2313,7 @@ int fcntl_setlk(unsigned int fd, struct file *filp, unsigned int cmd,
f = fcheck(fd);
spin_unlock(¤t->files->file_lock);
if (f != filp) {
- locks_remove_posix(filp, ¤t->files);
+ locks_remove_posix(filp, current->files);
error = -EBADF;
}
}
@@ -2443,7 +2443,7 @@ int fcntl_setlk64(unsigned int fd, struct file *filp, unsigned int cmd,
f = fcheck(fd);
spin_unlock(¤t->files->file_lock);
if (f != filp) {
- locks_remove_posix(filp, ¤t->files);
+ locks_remove_posix(filp, current->files);
error = -EBADF;
}
}
--
2.39.2
1 year, 4 months
- 1
- 0
+ mm-slub-add-check-for-s-flags-in-the-alloc_tagging_slab_free_hook.patch added to mm-hotfixes-unstable branch
by Andrew Morton
The patch titled
Subject: mm/slub: add check for s->flags in the alloc_tagging_slab_free_hook
has been added to the -mm mm-hotfixes-unstable branch. Its filename is
mm-slub-add-check-for-s-flags-in-the-alloc_tagging_slab_free_hook.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patche…
This patch will later appear in the mm-hotfixes-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Hao Ge <gehao(a)kylinos.cn>
Subject: mm/slub: add check for s->flags in the alloc_tagging_slab_free_hook
Date: Fri, 16 Aug 2024 09:33:36 +0800
When enable CONFIG_MEMCG & CONFIG_KFENCE & CONFIG_KMEMLEAK, the following
warning always occurs,This is because the following call stack occurred:
mem_pool_alloc
kmem_cache_alloc_noprof
slab_alloc_node
kfence_alloc
Once the kfence allocation is successful,slab->obj_exts will not be empty,
because it has already been assigned a value in kfence_init_pool.
Since in the prepare_slab_obj_exts_hook function,we perform a check for
s->flags & (SLAB_NO_OBJ_EXT | SLAB_NOLEAKTRACE),the alloc_tag_add function
will not be called as a result.Therefore,ref->ct remains NULL.
However,when we call mem_pool_free,since obj_ext is not empty, it
eventually leads to the alloc_tag_sub scenario being invoked. This is
where the warning occurs.
So we should add corresponding checks in the alloc_tagging_slab_free_hook.
For __GFP_NO_OBJ_EXT case,I didn't see the specific case where it's using
kfence,so I won't add the corresponding check in
alloc_tagging_slab_free_hook for now.
[ 3.734349] ------------[ cut here ]------------
[ 3.734807] alloc_tag was not set
[ 3.735129] WARNING: CPU: 4 PID: 40 at ./include/linux/alloc_tag.h:130 kmem_cache_free+0x444/0x574
[ 3.735866] Modules linked in: autofs4
[ 3.736211] CPU: 4 UID: 0 PID: 40 Comm: ksoftirqd/4 Tainted: G W 6.11.0-rc3-dirty #1
[ 3.736969] Tainted: [W]=WARN
[ 3.737258] Hardware name: QEMU KVM Virtual Machine, BIOS unknown 2/2/2022
[ 3.737875] pstate: 60400005 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--)
[ 3.738501] pc : kmem_cache_free+0x444/0x574
[ 3.738951] lr : kmem_cache_free+0x444/0x574
[ 3.739361] sp : ffff80008357bb60
[ 3.739693] x29: ffff80008357bb70 x28: 0000000000000000 x27: 0000000000000000
[ 3.740338] x26: ffff80008207f000 x25: ffff000b2eb2fd60 x24: ffff0000c0005700
[ 3.740982] x23: ffff8000804229e4 x22: ffff800082080000 x21: ffff800081756000
[ 3.741630] x20: fffffd7ff8253360 x19: 00000000000000a8 x18: ffffffffffffffff
[ 3.742274] x17: ffff800ab327f000 x16: ffff800083398000 x15: ffff800081756df0
[ 3.742919] x14: 0000000000000000 x13: 205d344320202020 x12: 5b5d373038343337
[ 3.743560] x11: ffff80008357b650 x10: 000000000000005d x9 : 00000000ffffffd0
[ 3.744231] x8 : 7f7f7f7f7f7f7f7f x7 : ffff80008237bad0 x6 : c0000000ffff7fff
[ 3.744907] x5 : ffff80008237ba78 x4 : ffff8000820bbad0 x3 : 0000000000000001
[ 3.745580] x2 : 68d66547c09f7800 x1 : 68d66547c09f7800 x0 : 0000000000000000
[ 3.746255] Call trace:
[ 3.746530] kmem_cache_free+0x444/0x574
[ 3.746931] mem_pool_free+0x44/0xf4
[ 3.747306] free_object_rcu+0xc8/0xdc
[ 3.747693] rcu_do_batch+0x234/0x8a4
[ 3.748075] rcu_core+0x230/0x3e4
[ 3.748424] rcu_core_si+0x14/0x1c
[ 3.748780] handle_softirqs+0x134/0x378
[ 3.749189] run_ksoftirqd+0x70/0x9c
[ 3.749560] smpboot_thread_fn+0x148/0x22c
[ 3.749978] kthread+0x10c/0x118
[ 3.750323] ret_from_fork+0x10/0x20
[ 3.750696] ---[ end trace 0000000000000000 ]---
Link: https://lkml.kernel.org/r/20240816013336.17505-1-hao.ge@linux.dev
Fixes: 4b8736964640 ("mm/slab: add allocation accounting into slab allocation and free paths")
Signed-off-by: Hao Ge <gehao(a)kylinos.cn>
Cc: Christoph Lameter <cl(a)linux.com>
Cc: David Rientjes <rientjes(a)google.com>
Cc: Hyeonggon Yoo <42.hyeyoo(a)gmail.com>
Cc: Joonsoo Kim <iamjoonsoo.kim(a)lge.com>
Cc: Kees Cook <kees(a)kernel.org>
Cc: Kent Overstreet <kent.overstreet(a)linux.dev>
Cc: Pekka Enberg <penberg(a)kernel.org>
Cc: Roman Gushchin <roman.gushchin(a)linux.dev>
Cc: Suren Baghdasaryan <surenb(a)google.com>
Cc: Vlastimil Babka <vbabka(a)suse.cz>
Cc: <stable(a)vger.kernel.org>
Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
---
mm/slub.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/mm/slub.c~mm-slub-add-check-for-s-flags-in-the-alloc_tagging_slab_free_hook
+++ a/mm/slub.c
@@ -2116,6 +2116,10 @@ alloc_tagging_slab_free_hook(struct kmem
if (!mem_alloc_profiling_enabled())
return;
+ /* slab->obj_exts might not be NULL if it was created for MEMCG accounting. */
+ if (s->flags & (SLAB_NO_OBJ_EXT | SLAB_NOLEAKTRACE))
+ return;
+
obj_exts = slab_obj_exts(slab);
if (!obj_exts)
return;
_
Patches currently in -mm which might be from gehao(a)kylinos.cn are
mm-slub-add-check-for-s-flags-in-the-alloc_tagging_slab_free_hook.patch
mm-cma-change-the-addition-of-totalcma_pages-in-the-cma_init_reserved_mem.patch
1 year, 4 months
- 1
- 0
[PATCH] perf hist: Update hist symbol when updating maps
by Matt Fleming
AddressSanitizer found a use-after-free bug in the symbol code which
manifested as perf top segfaulting.
==1238389==ERROR: AddressSanitizer: heap-use-after-free on address 0x60b00c48844b at pc 0x5650d8035961 bp 0x7f751aaecc90 sp 0x7f751aaecc80
READ of size 1 at 0x60b00c48844b thread T193
#0 0x5650d8035960 in _sort__sym_cmp util/sort.c:310
#1 0x5650d8043744 in hist_entry__cmp util/hist.c:1286
#2 0x5650d8043951 in hists__findnew_entry util/hist.c:614
#3 0x5650d804568f in __hists__add_entry util/hist.c:754
#4 0x5650d8045bf9 in hists__add_entry util/hist.c:772
#5 0x5650d8045df1 in iter_add_single_normal_entry util/hist.c:997
#6 0x5650d8043326 in hist_entry_iter__add util/hist.c:1242
#7 0x5650d7ceeefe in perf_event__process_sample /home/matt/src/linux/tools/perf/builtin-top.c:845
#8 0x5650d7ceeefe in deliver_event /home/matt/src/linux/tools/perf/builtin-top.c:1208
#9 0x5650d7fdb51b in do_flush util/ordered-events.c:245
#10 0x5650d7fdb51b in __ordered_events__flush util/ordered-events.c:324
#11 0x5650d7ced743 in process_thread /home/matt/src/linux/tools/perf/builtin-top.c:1120
#12 0x7f757ef1f133 in start_thread nptl/pthread_create.c:442
#13 0x7f757ef9f7db in clone3 ../sysdeps/unix/sysv/linux/x86_64/clone3.S:81
When updating hist maps it's also necessary to update the hist symbol
reference because the old one gets freed in map__put().
While this bug was probably introduced with 5c24b67aae72 ("perf tools:
Replace map->referenced & maps->removed_maps with map->refcnt"), the
symbol objects were leaked until c087e9480cf3 ("perf machine: Fix
refcount usage when processing PERF_RECORD_KSYMBOL") was merged so the
bug was masked.
Fixes: c087e9480cf3 ("perf machine: Fix refcount usage when processing PERF_RECORD_KSYMBOL")
Signed-off-by: Matt Fleming (Cloudflare) <matt(a)readmodwrite.com>
Reported-by: Yunzhao Li <yunzhao(a)cloudflare.com>
Cc: stable(a)vger.kernel.org # v5.13+
---
tools/perf/util/hist.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 0f554febf9a1..0f9ce2ee2c31 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -639,6 +639,11 @@ static struct hist_entry *hists__findnew_entry(struct hists *hists,
* the history counter to increment.
*/
if (he->ms.map != entry->ms.map) {
+ if (he->ms.sym) {
+ u64 addr = he->ms.sym->start;
+ he->ms.sym = map__find_symbol(entry->ms.map, addr);
+ }
+
map__put(he->ms.map);
he->ms.map = map__get(entry->ms.map);
}
--
2.34.1
1 year, 4 months
- 3
- 2
FAILED: patch "[PATCH] scsi: mpt3sas: Avoid IOMMU page faults on REPORT ZONES" failed to apply to 5.4-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y
git checkout FETCH_HEAD
git cherry-pick -x 82dbb57ac8d06dfe8227ba9ab11a49de2b475ae5
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081113-creamed-unleaded-c696@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^..
Possible dependencies:
82dbb57ac8d0 ("scsi: mpt3sas: Avoid IOMMU page faults on REPORT ZONES")
0c25422d34b4 ("scsi: mpt3sas: Remove scsi_dma_map() error messages")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 82dbb57ac8d06dfe8227ba9ab11a49de2b475ae5 Mon Sep 17 00:00:00 2001
From: Damien Le Moal <dlemoal(a)kernel.org>
Date: Fri, 19 Jul 2024 16:39:12 +0900
Subject: [PATCH] scsi: mpt3sas: Avoid IOMMU page faults on REPORT ZONES
Some firmware versions of the 9600 series SAS HBA byte-swap the REPORT
ZONES command reply buffer from ATA-ZAC devices by directly accessing the
buffer in the host memory. This does not respect the default command DMA
direction and causes IOMMU page faults on architectures with an IOMMU
enforcing write-only mappings for DMA_FROM_DEVICE DMA driection (e.g. AMD
hosts).
scsi 18:0:0:0: Direct-Access-ZBC ATA WDC WSH722020AL W870 PQ: 0 ANSI: 6
scsi 18:0:0:0: SATA: handle(0x0027), sas_addr(0x300062b2083e7c40), phy(0), device_name(0x5000cca29dc35e11)
scsi 18:0:0:0: enclosure logical id (0x300062b208097c40), slot(0)
scsi 18:0:0:0: enclosure level(0x0000), connector name( C0.0)
scsi 18:0:0:0: atapi(n), ncq(y), asyn_notify(n), smart(y), fua(y), sw_preserve(y)
scsi 18:0:0:0: qdepth(32), tagged(1), scsi_level(7), cmd_que(1)
sd 18:0:0:0: Attached scsi generic sg2 type 20
sd 18:0:0:0: [sdc] Host-managed zoned block device
mpt3sas 0000:41:00.0: AMD-Vi: Event logged [IO_PAGE_FAULT domain=0x0021 address=0xfff9b200 flags=0x0050]
mpt3sas 0000:41:00.0: AMD-Vi: Event logged [IO_PAGE_FAULT domain=0x0021 address=0xfff9b300 flags=0x0050]
mpt3sas_cm0: mpt3sas_ctl_pre_reset_handler: Releasing the trace buffer due to adapter reset.
mpt3sas_cm0 fault info from func: mpt3sas_base_make_ioc_ready
mpt3sas_cm0: fault_state(0x2666)!
mpt3sas_cm0: sending diag reset !!
mpt3sas_cm0: diag reset: SUCCESS
sd 18:0:0:0: [sdc] REPORT ZONES start lba 0 failed
sd 18:0:0:0: [sdc] REPORT ZONES: Result: hostbyte=DID_RESET driverbyte=DRIVER_OK
sd 18:0:0:0: [sdc] 0 4096-byte logical blocks: (0 B/0 B)
Avoid such issue by always mapping the buffer of REPORT ZONES commands
using DMA_BIDIRECTIONAL (read+write IOMMU mapping). This is done by
introducing the helper function _base_scsi_dma_map() and using this helper
in _base_build_sg_scmd() and _base_build_sg_scmd_ieee() instead of calling
directly scsi_dma_map().
Fixes: 471ef9d4e498 ("mpt3sas: Build MPI SGL LIST on GEN2 HBAs and IEEE SGL LIST on GEN3 HBAs")
Cc: stable(a)vger.kernel.org
Signed-off-by: Damien Le Moal <dlemoal(a)kernel.org>
Link: https://lore.kernel.org/r/20240719073913.179559-3-dlemoal@kernel.org
Reviewed-by: Christoph Hellwig <hch(a)lst.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn(a)wdc.com>
Signed-off-by: Martin K. Petersen <martin.petersen(a)oracle.com>
diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
index 1092497563b2..c8fb965a6bf0 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -2671,6 +2671,22 @@ _base_build_zero_len_sge_ieee(struct MPT3SAS_ADAPTER *ioc, void *paddr)
_base_add_sg_single_ieee(paddr, sgl_flags, 0, 0, -1);
}
+static inline int _base_scsi_dma_map(struct scsi_cmnd *cmd)
+{
+ /*
+ * Some firmware versions byte-swap the REPORT ZONES command reply from
+ * ATA-ZAC devices by directly accessing in the host buffer. This does
+ * not respect the default command DMA direction and causes IOMMU page
+ * faults on some architectures with an IOMMU enforcing write mappings
+ * (e.g. AMD hosts). Avoid such issue by making the report zones buffer
+ * mapping bi-directional.
+ */
+ if (cmd->cmnd[0] == ZBC_IN && cmd->cmnd[1] == ZI_REPORT_ZONES)
+ cmd->sc_data_direction = DMA_BIDIRECTIONAL;
+
+ return scsi_dma_map(cmd);
+}
+
/**
* _base_build_sg_scmd - main sg creation routine
* pcie_device is unused here!
@@ -2717,7 +2733,7 @@ _base_build_sg_scmd(struct MPT3SAS_ADAPTER *ioc,
sgl_flags = sgl_flags << MPI2_SGE_FLAGS_SHIFT;
sg_scmd = scsi_sglist(scmd);
- sges_left = scsi_dma_map(scmd);
+ sges_left = _base_scsi_dma_map(scmd);
if (sges_left < 0)
return -ENOMEM;
@@ -2861,7 +2877,7 @@ _base_build_sg_scmd_ieee(struct MPT3SAS_ADAPTER *ioc,
}
sg_scmd = scsi_sglist(scmd);
- sges_left = scsi_dma_map(scmd);
+ sges_left = _base_scsi_dma_map(scmd);
if (sges_left < 0)
return -ENOMEM;
1 year, 4 months
- 2
- 1
FAILED: patch "[PATCH] scsi: mpt3sas: Avoid IOMMU page faults on REPORT ZONES" failed to apply to 5.10-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 82dbb57ac8d06dfe8227ba9ab11a49de2b475ae5
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081112-idly-qualify-80f3@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
82dbb57ac8d0 ("scsi: mpt3sas: Avoid IOMMU page faults on REPORT ZONES")
0c25422d34b4 ("scsi: mpt3sas: Remove scsi_dma_map() error messages")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 82dbb57ac8d06dfe8227ba9ab11a49de2b475ae5 Mon Sep 17 00:00:00 2001
From: Damien Le Moal <dlemoal(a)kernel.org>
Date: Fri, 19 Jul 2024 16:39:12 +0900
Subject: [PATCH] scsi: mpt3sas: Avoid IOMMU page faults on REPORT ZONES
Some firmware versions of the 9600 series SAS HBA byte-swap the REPORT
ZONES command reply buffer from ATA-ZAC devices by directly accessing the
buffer in the host memory. This does not respect the default command DMA
direction and causes IOMMU page faults on architectures with an IOMMU
enforcing write-only mappings for DMA_FROM_DEVICE DMA driection (e.g. AMD
hosts).
scsi 18:0:0:0: Direct-Access-ZBC ATA WDC WSH722020AL W870 PQ: 0 ANSI: 6
scsi 18:0:0:0: SATA: handle(0x0027), sas_addr(0x300062b2083e7c40), phy(0), device_name(0x5000cca29dc35e11)
scsi 18:0:0:0: enclosure logical id (0x300062b208097c40), slot(0)
scsi 18:0:0:0: enclosure level(0x0000), connector name( C0.0)
scsi 18:0:0:0: atapi(n), ncq(y), asyn_notify(n), smart(y), fua(y), sw_preserve(y)
scsi 18:0:0:0: qdepth(32), tagged(1), scsi_level(7), cmd_que(1)
sd 18:0:0:0: Attached scsi generic sg2 type 20
sd 18:0:0:0: [sdc] Host-managed zoned block device
mpt3sas 0000:41:00.0: AMD-Vi: Event logged [IO_PAGE_FAULT domain=0x0021 address=0xfff9b200 flags=0x0050]
mpt3sas 0000:41:00.0: AMD-Vi: Event logged [IO_PAGE_FAULT domain=0x0021 address=0xfff9b300 flags=0x0050]
mpt3sas_cm0: mpt3sas_ctl_pre_reset_handler: Releasing the trace buffer due to adapter reset.
mpt3sas_cm0 fault info from func: mpt3sas_base_make_ioc_ready
mpt3sas_cm0: fault_state(0x2666)!
mpt3sas_cm0: sending diag reset !!
mpt3sas_cm0: diag reset: SUCCESS
sd 18:0:0:0: [sdc] REPORT ZONES start lba 0 failed
sd 18:0:0:0: [sdc] REPORT ZONES: Result: hostbyte=DID_RESET driverbyte=DRIVER_OK
sd 18:0:0:0: [sdc] 0 4096-byte logical blocks: (0 B/0 B)
Avoid such issue by always mapping the buffer of REPORT ZONES commands
using DMA_BIDIRECTIONAL (read+write IOMMU mapping). This is done by
introducing the helper function _base_scsi_dma_map() and using this helper
in _base_build_sg_scmd() and _base_build_sg_scmd_ieee() instead of calling
directly scsi_dma_map().
Fixes: 471ef9d4e498 ("mpt3sas: Build MPI SGL LIST on GEN2 HBAs and IEEE SGL LIST on GEN3 HBAs")
Cc: stable(a)vger.kernel.org
Signed-off-by: Damien Le Moal <dlemoal(a)kernel.org>
Link: https://lore.kernel.org/r/20240719073913.179559-3-dlemoal@kernel.org
Reviewed-by: Christoph Hellwig <hch(a)lst.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn(a)wdc.com>
Signed-off-by: Martin K. Petersen <martin.petersen(a)oracle.com>
diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
index 1092497563b2..c8fb965a6bf0 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -2671,6 +2671,22 @@ _base_build_zero_len_sge_ieee(struct MPT3SAS_ADAPTER *ioc, void *paddr)
_base_add_sg_single_ieee(paddr, sgl_flags, 0, 0, -1);
}
+static inline int _base_scsi_dma_map(struct scsi_cmnd *cmd)
+{
+ /*
+ * Some firmware versions byte-swap the REPORT ZONES command reply from
+ * ATA-ZAC devices by directly accessing in the host buffer. This does
+ * not respect the default command DMA direction and causes IOMMU page
+ * faults on some architectures with an IOMMU enforcing write mappings
+ * (e.g. AMD hosts). Avoid such issue by making the report zones buffer
+ * mapping bi-directional.
+ */
+ if (cmd->cmnd[0] == ZBC_IN && cmd->cmnd[1] == ZI_REPORT_ZONES)
+ cmd->sc_data_direction = DMA_BIDIRECTIONAL;
+
+ return scsi_dma_map(cmd);
+}
+
/**
* _base_build_sg_scmd - main sg creation routine
* pcie_device is unused here!
@@ -2717,7 +2733,7 @@ _base_build_sg_scmd(struct MPT3SAS_ADAPTER *ioc,
sgl_flags = sgl_flags << MPI2_SGE_FLAGS_SHIFT;
sg_scmd = scsi_sglist(scmd);
- sges_left = scsi_dma_map(scmd);
+ sges_left = _base_scsi_dma_map(scmd);
if (sges_left < 0)
return -ENOMEM;
@@ -2861,7 +2877,7 @@ _base_build_sg_scmd_ieee(struct MPT3SAS_ADAPTER *ioc,
}
sg_scmd = scsi_sglist(scmd);
- sges_left = scsi_dma_map(scmd);
+ sges_left = _base_scsi_dma_map(scmd);
if (sges_left < 0)
return -ENOMEM;
1 year, 4 months
- 2
- 1
[PATCH v4 RESEND] EDAC/ti: Fix possible null pointer dereference in _emif_get_id()
by Ma Ke
In _emif_get_id(), of_get_address() may return NULL which is later
dereferenced. Fix this bug by adding NULL check. of_translate_address() is
the same.
Found by code review.
Cc: stable(a)vger.kernel.org
Fixes: 86a18ee21e5e ("EDAC, ti: Add support for TI keystone and DRA7xx EDAC")
Signed-off-by: Ma Ke <make24(a)iscas.ac.cn>
---
Changes in v4:
- added the check of of_translate_address() as suggestions.
Changes in v3:
- added the patch operations omitted in PATCH v2 RESEND compared to PATCH
v2. Sorry for my oversight.
Changes in v2:
- added Cc stable line.
---
drivers/edac/ti_edac.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/edac/ti_edac.c b/drivers/edac/ti_edac.c
index 29723c9592f7..f466f12630d3 100644
--- a/drivers/edac/ti_edac.c
+++ b/drivers/edac/ti_edac.c
@@ -207,14 +207,24 @@ static int _emif_get_id(struct device_node *node)
int my_id = 0;
addrp = of_get_address(node, 0, NULL, NULL);
+ if (!addrp)
+ return -EINVAL;
+
my_addr = (u32)of_translate_address(node, addrp);
+ if (my_addr == OF_BAD_ADDR)
+ return -EINVAL;
for_each_matching_node(np, ti_edac_of_match) {
if (np == node)
continue;
addrp = of_get_address(np, 0, NULL, NULL);
+ if (!addrp)
+ return -EINVAL;
+
addr = (u32)of_translate_address(np, addrp);
+ if (addr == OF_BAD_ADDR)
+ return -EINVAL;
edac_printk(KERN_INFO, EDAC_MOD_NAME,
"addr=%x, my_addr=%x\n",
--
2.25.1
1 year, 4 months
- 2
- 1
+ kunit-overflow-fix-ub-in-overflow_allocation_test.patch added to mm-hotfixes-unstable branch
by Andrew Morton
The patch titled
Subject: kunit/overflow: fix UB in overflow_allocation_test
has been added to the -mm mm-hotfixes-unstable branch. Its filename is
kunit-overflow-fix-ub-in-overflow_allocation_test.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patche…
This patch will later appear in the mm-hotfixes-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Ivan Orlov <ivan.orlov0322(a)gmail.com>
Subject: kunit/overflow: fix UB in overflow_allocation_test
Date: Thu, 15 Aug 2024 01:04:31 +0100
The 'device_name' array doesn't exist out of the
'overflow_allocation_test' function scope. However, it is being used as a
driver name when calling 'kunit_driver_create' from
'kunit_device_register'. It produces the kernel panic with KASAN enabled.
Since this variable is used in one place only, remove it and pass the
device name into kunit_device_register directly as an ascii string.
Link: https://lkml.kernel.org/r/20240815000431.401869-1-ivan.orlov0322@gmail.com
Fixes: ca90800a91ba ("test_overflow: Add memory allocation overflow tests")
Signed-off-by: Ivan Orlov <ivan.orlov0322(a)gmail.com>
Tested-by: Erhard Furtner <erhard_f(a)mailbox.org>
Reviewed-by: David Gow <davidgow(a)google.com>
Cc: Kees Cook <kees(a)kernel.org>
Cc: <stable(a)vger.kernel.org>
Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
---
lib/overflow_kunit.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- a/lib/overflow_kunit.c~kunit-overflow-fix-ub-in-overflow_allocation_test
+++ a/lib/overflow_kunit.c
@@ -668,7 +668,6 @@ DEFINE_TEST_ALLOC(devm_kzalloc, devm_kf
static void overflow_allocation_test(struct kunit *test)
{
- const char device_name[] = "overflow-test";
struct device *dev;
int count = 0;
@@ -678,7 +677,7 @@ static void overflow_allocation_test(str
} while (0)
/* Create dummy device for devm_kmalloc()-family tests. */
- dev = kunit_device_register(test, device_name);
+ dev = kunit_device_register(test, "overflow-test");
KUNIT_ASSERT_FALSE_MSG(test, IS_ERR(dev),
"Cannot register test device\n");
_
Patches currently in -mm which might be from ivan.orlov0322(a)gmail.com are
kunit-overflow-fix-ub-in-overflow_allocation_test.patch
1 year, 4 months
- 1
- 0
[PATCH v2] firmware: qcom_scm: Mark get_wq_ctx() as atomic call
by Unnathi Chalicheemala
From: Murali Nalajala <quic_mnalajal(a)quicinc.com>
Currently get_wq_ctx() is wrongly configured as a standard call. When two
SMC calls are in sleep and one SMC wakes up, it calls get_wq_ctx() to
resume the corresponding sleeping thread. But if get_wq_ctx() is
interrupted, goes to sleep and another SMC call is waiting to be allocated
a waitq context, it leads to a deadlock.
To avoid this get_wq_ctx() must be an atomic call and can't be a standard
SMC call. Hence mark get_wq_ctx() as a fast call.
Fixes: 6bf325992236 ("firmware: qcom: scm: Add wait-queue handling logic")
Cc: stable(a)vger.kernel.org
Signed-off-by: Murali Nalajala <quic_mnalajal(a)quicinc.com>
Signed-off-by: Unnathi Chalicheemala <quic_uchalich(a)quicinc.com>
Reviewed-by: Elliot Berman <quic_eberman(a)quicinc.com>
---
Changes in v2:
- Made commit message more clear.
- R-b tag from Elliot.
- Link to v1: https://lore.kernel.org/all/20240611-get_wq_ctx_atomic-v1-1-9189a0a7d1ba@qu…
drivers/firmware/qcom/qcom_scm-smc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/firmware/qcom/qcom_scm-smc.c b/drivers/firmware/qcom/qcom_scm-smc.c
index dca5f3f1883b..2b4c2826f572 100644
--- a/drivers/firmware/qcom/qcom_scm-smc.c
+++ b/drivers/firmware/qcom/qcom_scm-smc.c
@@ -73,7 +73,7 @@ int scm_get_wq_ctx(u32 *wq_ctx, u32 *flags, u32 *more_pending)
struct arm_smccc_res get_wq_res;
struct arm_smccc_args get_wq_ctx = {0};
- get_wq_ctx.args[0] = ARM_SMCCC_CALL_VAL(ARM_SMCCC_STD_CALL,
+ get_wq_ctx.args[0] = ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL,
ARM_SMCCC_SMC_64, ARM_SMCCC_OWNER_SIP,
SCM_SMC_FNID(QCOM_SCM_SVC_WAITQ, QCOM_SCM_WAITQ_GET_WQ_CTX));
--
2.34.1
1 year, 4 months
- 2
- 1
[PATCH v2 0/5] clk: qcom: gcc-sc8180x: Add DFS support and few fixes
by Satya Priya Kakitapalli
This series adds the DFS support for GCC QUPv3 RCGS and also adds the
missing GPLL9 support and fixes the sdcc clocks frequency tables.
Signed-off-by: Satya Priya Kakitapalli <quic_skakitap(a)quicinc.com>
---
Changes in V2:
- Add stable kernel tags and update the commit text for [1/4] patch.
- Added one more fix in V2, to remove the unused cpuss_ahb_clk and its RCG.
---
Satya Priya Kakitapalli (5):
clk: qcom: gcc-sc8180x: Register QUPv3 RCGs for DFS on sc8180x
dt-bindings: clock: qcom: Add GPLL9 support on gcc-sc8180x
clk: qcom: gcc-sc8180x: Add GPLL9 support
clk: qcom: gcc-sc8180x: Fix the sdcc2 and sdcc4 clocks freq table
clk: qcom: gcc-sm8150: De-register gcc_cpuss_ahb_clk_src
drivers/clk/qcom/gcc-sc8180x.c | 438 ++++++++++++++-------------
include/dt-bindings/clock/qcom,gcc-sc8180x.h | 1 +
2 files changed, 232 insertions(+), 207 deletions(-)
---
base-commit: 864b1099d16fc7e332c3ad7823058c65f890486c
change-id: 20240725-gcc-sc8180x-fixes-cf58908142b5
Best regards,
--
Satya Priya Kakitapalli <quic_skakitap(a)quicinc.com>
1 year, 4 months
- 2
- 6
[PATCH v2] clk: qcom: clk-rpmh: Fix overflow in BCM vote
by Imran Shaik
From: Mike Tipton <quic_mdtipton(a)quicinc.com>
Valid frequencies may result in BCM votes that exceed the max HW value.
Set vote ceiling to BCM_TCS_CMD_VOTE_MASK to ensure the votes aren't
truncated, which can result in lower frequencies than desired.
Fixes: 04053f4d23a4 ("clk: qcom: clk-rpmh: Add IPA clock support")
Cc: stable(a)vger.kernel.org
Signed-off-by: Mike Tipton <quic_mdtipton(a)quicinc.com>
Reviewed-by: Taniya Das <quic_tdas(a)quicinc.com>
Signed-off-by: Imran Shaik <quic_imrashai(a)quicinc.com>
---
Changes in v2:
- Updated the overflow check as per the comment from Stephen.
- Link to v1: https://lore.kernel.org/r/20240808-clk-rpmh-bcm-vote-fix-v1-1-109bd1d76189@…
---
drivers/clk/qcom/clk-rpmh.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c
index bb82abeed88f..4acde937114a 100644
--- a/drivers/clk/qcom/clk-rpmh.c
+++ b/drivers/clk/qcom/clk-rpmh.c
@@ -263,6 +263,8 @@ static int clk_rpmh_bcm_send_cmd(struct clk_rpmh *c, bool enable)
cmd_state = 0;
}
+ cmd_state = min(cmd_state, BCM_TCS_CMD_VOTE_MASK);
+
if (c->last_sent_aggr_state != cmd_state) {
cmd.addr = c->res_addr;
cmd.data = BCM_TCS_CMD(1, enable, 0, cmd_state);
---
base-commit: 222a3380f92b8791d4eeedf7cd750513ff428adf
change-id: 20240808-clk-rpmh-bcm-vote-fix-c344e213c9bb
Best regards,
--
Imran Shaik <quic_imrashai(a)quicinc.com>
1 year, 4 months
- 2
- 1
FAILED: patch "[PATCH] drm/amdkfd: don't allow mapping the MMIO HDP page with large" failed to apply to 5.4-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y
git checkout FETCH_HEAD
git cherry-pick -x 24e82654e98e96cece5d8b919c522054456eeec6
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081204-stylist-bobsled-3424@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^..
Possible dependencies:
24e82654e98e ("drm/amdkfd: don't allow mapping the MMIO HDP page with large pages")
b38c074b2b07 ("drm/amdkfd: CRIU Refactor restore BO function")
67a359d85ec2 ("drm/amdkfd: CRIU remove sync and TLB flush on restore")
22804e03f7a5 ("drm/amdkfd: Fix criu_restore_bo error handling")
d8a25e485857 ("drm/amdkfd: fix loop error handling")
e5af61ffaaef ("drm/amdkfd: CRIU fix a NULL vs IS_ERR() check")
be072b06c739 ("drm/amdkfd: CRIU export BOs as prime dmabuf objects")
bef153b70c6e ("drm/amdkfd: CRIU implement gpu_id remapping")
40e8a766a761 ("drm/amdkfd: CRIU checkpoint and restore events")
42c6c48214b7 ("drm/amdkfd: CRIU checkpoint and restore queue mqds")
2485c12c980a ("drm/amdkfd: CRIU restore sdma id for queues")
8668dfc30d3e ("drm/amdkfd: CRIU restore queue ids")
626f7b3190b4 ("drm/amdkfd: CRIU add queues support")
cd9f79103003 ("drm/amdkfd: CRIU Implement KFD unpause operation")
011bbb03024f ("drm/amdkfd: CRIU Implement KFD resume ioctl")
73fa13b6a511 ("drm/amdkfd: CRIU Implement KFD restore ioctl")
5ccbb057c0a1 ("drm/amdkfd: CRIU Implement KFD checkpoint ioctl")
f185381b6481 ("drm/amdkfd: CRIU Implement KFD process_info ioctl")
3698807094ec ("drm/amdkfd: CRIU Introduce Checkpoint-Restore APIs")
f61c40c0757a ("drm/amdkfd: enable heavy-weight TLB flush on Arcturus")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 24e82654e98e96cece5d8b919c522054456eeec6 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher(a)amd.com>
Date: Sun, 14 Apr 2024 13:06:39 -0400
Subject: [PATCH] drm/amdkfd: don't allow mapping the MMIO HDP page with large
pages
We don't get the right offset in that case. The GPU has
an unused 4K area of the register BAR space into which you can
remap registers. We remap the HDP flush registers into this
space to allow userspace (CPU or GPU) to flush the HDP when it
updates VRAM. However, on systems with >4K pages, we end up
exposing PAGE_SIZE of MMIO space.
Fixes: d8e408a82704 ("drm/amdkfd: Expose HDP registers to user space")
Reviewed-by: Felix Kuehling <felix.kuehling(a)amd.com>
Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com>
Cc: stable(a)vger.kernel.org
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
index 6b713fb0b818..fdf171ad4a3c 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
@@ -1144,7 +1144,7 @@ static int kfd_ioctl_alloc_memory_of_gpu(struct file *filep,
goto err_unlock;
}
offset = dev->adev->rmmio_remap.bus_addr;
- if (!offset) {
+ if (!offset || (PAGE_SIZE > 4096)) {
err = -ENOMEM;
goto err_unlock;
}
@@ -2312,7 +2312,7 @@ static int criu_restore_memory_of_gpu(struct kfd_process_device *pdd,
return -EINVAL;
}
offset = pdd->dev->adev->rmmio_remap.bus_addr;
- if (!offset) {
+ if (!offset || (PAGE_SIZE > 4096)) {
pr_err("amdgpu_amdkfd_get_mmio_remap_phys_addr failed\n");
return -ENOMEM;
}
@@ -3354,6 +3354,9 @@ static int kfd_mmio_mmap(struct kfd_node *dev, struct kfd_process *process,
if (vma->vm_end - vma->vm_start != PAGE_SIZE)
return -EINVAL;
+ if (PAGE_SIZE > 4096)
+ return -EINVAL;
+
address = dev->adev->rmmio_remap.bus_addr;
vm_flags_set(vma, VM_IO | VM_DONTCOPY | VM_DONTEXPAND | VM_NORESERVE |
1 year, 4 months
- 2
- 1
FAILED: patch "[PATCH] drm/amdkfd: don't allow mapping the MMIO HDP page with large" failed to apply to 5.10-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 24e82654e98e96cece5d8b919c522054456eeec6
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081203-dreadlock-trodden-9b5f@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
24e82654e98e ("drm/amdkfd: don't allow mapping the MMIO HDP page with large pages")
b38c074b2b07 ("drm/amdkfd: CRIU Refactor restore BO function")
67a359d85ec2 ("drm/amdkfd: CRIU remove sync and TLB flush on restore")
22804e03f7a5 ("drm/amdkfd: Fix criu_restore_bo error handling")
d8a25e485857 ("drm/amdkfd: fix loop error handling")
e5af61ffaaef ("drm/amdkfd: CRIU fix a NULL vs IS_ERR() check")
be072b06c739 ("drm/amdkfd: CRIU export BOs as prime dmabuf objects")
bef153b70c6e ("drm/amdkfd: CRIU implement gpu_id remapping")
40e8a766a761 ("drm/amdkfd: CRIU checkpoint and restore events")
42c6c48214b7 ("drm/amdkfd: CRIU checkpoint and restore queue mqds")
2485c12c980a ("drm/amdkfd: CRIU restore sdma id for queues")
8668dfc30d3e ("drm/amdkfd: CRIU restore queue ids")
626f7b3190b4 ("drm/amdkfd: CRIU add queues support")
cd9f79103003 ("drm/amdkfd: CRIU Implement KFD unpause operation")
011bbb03024f ("drm/amdkfd: CRIU Implement KFD resume ioctl")
73fa13b6a511 ("drm/amdkfd: CRIU Implement KFD restore ioctl")
5ccbb057c0a1 ("drm/amdkfd: CRIU Implement KFD checkpoint ioctl")
f185381b6481 ("drm/amdkfd: CRIU Implement KFD process_info ioctl")
3698807094ec ("drm/amdkfd: CRIU Introduce Checkpoint-Restore APIs")
f61c40c0757a ("drm/amdkfd: enable heavy-weight TLB flush on Arcturus")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 24e82654e98e96cece5d8b919c522054456eeec6 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher(a)amd.com>
Date: Sun, 14 Apr 2024 13:06:39 -0400
Subject: [PATCH] drm/amdkfd: don't allow mapping the MMIO HDP page with large
pages
We don't get the right offset in that case. The GPU has
an unused 4K area of the register BAR space into which you can
remap registers. We remap the HDP flush registers into this
space to allow userspace (CPU or GPU) to flush the HDP when it
updates VRAM. However, on systems with >4K pages, we end up
exposing PAGE_SIZE of MMIO space.
Fixes: d8e408a82704 ("drm/amdkfd: Expose HDP registers to user space")
Reviewed-by: Felix Kuehling <felix.kuehling(a)amd.com>
Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com>
Cc: stable(a)vger.kernel.org
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
index 6b713fb0b818..fdf171ad4a3c 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
@@ -1144,7 +1144,7 @@ static int kfd_ioctl_alloc_memory_of_gpu(struct file *filep,
goto err_unlock;
}
offset = dev->adev->rmmio_remap.bus_addr;
- if (!offset) {
+ if (!offset || (PAGE_SIZE > 4096)) {
err = -ENOMEM;
goto err_unlock;
}
@@ -2312,7 +2312,7 @@ static int criu_restore_memory_of_gpu(struct kfd_process_device *pdd,
return -EINVAL;
}
offset = pdd->dev->adev->rmmio_remap.bus_addr;
- if (!offset) {
+ if (!offset || (PAGE_SIZE > 4096)) {
pr_err("amdgpu_amdkfd_get_mmio_remap_phys_addr failed\n");
return -ENOMEM;
}
@@ -3354,6 +3354,9 @@ static int kfd_mmio_mmap(struct kfd_node *dev, struct kfd_process *process,
if (vma->vm_end - vma->vm_start != PAGE_SIZE)
return -EINVAL;
+ if (PAGE_SIZE > 4096)
+ return -EINVAL;
+
address = dev->adev->rmmio_remap.bus_addr;
vm_flags_set(vma, VM_IO | VM_DONTCOPY | VM_DONTEXPAND | VM_NORESERVE |
1 year, 4 months
- 2
- 1
[PATCH 6.1.y] jfs: define xtree root and page independently
by Sergio González Collado
From: Dave Kleikamp <dave.kleikamp(a)oracle.com>
[ Upstream commit a779ed754e52d582b8c0e17959df063108bd0656 ]
In order to make array bounds checking sane, provide a separate
definition of the in-inode xtree root and the external xtree page.
Signed-off-by: Dave Kleikamp <dave.kleikamp(a)oracle.com>
Tested-by: Manas Ghandat <ghandatmanas(a)gmail.com>
(cherry picked from commit a779ed754e52d582b8c0e17959df063108bd0656)
Signed-off-by: Sergio González Collado <sergio.collado(a)gmail.com>
Reported-by: syzbot+6b1d79dad6cc6b3eef41(a)syzkaller.appspotmail.com
---
fs/jfs/jfs_dinode.h | 2 +-
fs/jfs/jfs_imap.c | 6 +++---
fs/jfs/jfs_incore.h | 2 +-
fs/jfs/jfs_txnmgr.c | 4 ++--
fs/jfs/jfs_xtree.c | 4 ++--
fs/jfs/jfs_xtree.h | 37 +++++++++++++++++++++++--------------
6 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/fs/jfs/jfs_dinode.h b/fs/jfs/jfs_dinode.h
index 6b231d0d0071..603aae17a693 100644
--- a/fs/jfs/jfs_dinode.h
+++ b/fs/jfs/jfs_dinode.h
@@ -96,7 +96,7 @@ struct dinode {
#define di_gengen u._file._u1._imap._gengen
union {
- xtpage_t _xtroot;
+ xtroot_t _xtroot;
struct {
u8 unused[16]; /* 16: */
dxd_t _dxd; /* 16: */
diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c
index ac42f8ee553f..794072cdf192 100644
--- a/fs/jfs/jfs_imap.c
+++ b/fs/jfs/jfs_imap.c
@@ -670,7 +670,7 @@ int diWrite(tid_t tid, struct inode *ip)
* This is the special xtree inside the directory for storing
* the directory table
*/
- xtpage_t *p, *xp;
+ xtroot_t *p, *xp;
xad_t *xad;
jfs_ip->xtlid = 0;
@@ -684,7 +684,7 @@ int diWrite(tid_t tid, struct inode *ip)
* copy xtree root from inode to dinode:
*/
p = &jfs_ip->i_xtroot;
- xp = (xtpage_t *) &dp->di_dirtable;
+ xp = (xtroot_t *) &dp->di_dirtable;
lv = ilinelock->lv;
for (n = 0; n < ilinelock->index; n++, lv++) {
memcpy(&xp->xad[lv->offset], &p->xad[lv->offset],
@@ -713,7 +713,7 @@ int diWrite(tid_t tid, struct inode *ip)
* regular file: 16 byte (XAD slot) granularity
*/
if (type & tlckXTREE) {
- xtpage_t *p, *xp;
+ xtroot_t *p, *xp;
xad_t *xad;
/*
diff --git a/fs/jfs/jfs_incore.h b/fs/jfs/jfs_incore.h
index 721def69e732..dd4264aa9bed 100644
--- a/fs/jfs/jfs_incore.h
+++ b/fs/jfs/jfs_incore.h
@@ -66,7 +66,7 @@ struct jfs_inode_info {
lid_t xtlid; /* lid of xtree lock on directory */
union {
struct {
- xtpage_t _xtroot; /* 288: xtree root */
+ xtroot_t _xtroot; /* 288: xtree root */
struct inomap *_imap; /* 4: inode map header */
} file;
struct {
diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
index ce4b4760fcb1..dccc8b3f1045 100644
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@ -783,7 +783,7 @@ struct tlock *txLock(tid_t tid, struct inode *ip, struct metapage * mp,
if (mp->xflag & COMMIT_PAGE)
p = (xtpage_t *) mp->data;
else
- p = &jfs_ip->i_xtroot;
+ p = (xtpage_t *) &jfs_ip->i_xtroot;
xtlck->lwm.offset =
le16_to_cpu(p->header.nextindex);
}
@@ -1676,7 +1676,7 @@ static void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
if (tlck->type & tlckBTROOT) {
lrd->log.redopage.type |= cpu_to_le16(LOG_BTROOT);
- p = &JFS_IP(ip)->i_xtroot;
+ p = (xtpage_t *) &JFS_IP(ip)->i_xtroot;
if (S_ISDIR(ip->i_mode))
lrd->log.redopage.type |=
cpu_to_le16(LOG_DIR_XTREE);
diff --git a/fs/jfs/jfs_xtree.c b/fs/jfs/jfs_xtree.c
index 2d304cee884c..5ee618d17e77 100644
--- a/fs/jfs/jfs_xtree.c
+++ b/fs/jfs/jfs_xtree.c
@@ -1213,7 +1213,7 @@ xtSplitRoot(tid_t tid,
struct xtlock *xtlck;
int rc;
- sp = &JFS_IP(ip)->i_xtroot;
+ sp = (xtpage_t *) &JFS_IP(ip)->i_xtroot;
INCREMENT(xtStat.split);
@@ -2098,7 +2098,7 @@ int xtAppend(tid_t tid, /* transaction id */
*/
void xtInitRoot(tid_t tid, struct inode *ip)
{
- xtpage_t *p;
+ xtroot_t *p;
/*
* acquire a transaction lock on the root
diff --git a/fs/jfs/jfs_xtree.h b/fs/jfs/jfs_xtree.h
index 142caafc73b1..15da4e16d8b2 100644
--- a/fs/jfs/jfs_xtree.h
+++ b/fs/jfs/jfs_xtree.h
@@ -65,24 +65,33 @@ struct xadlist {
#define XTPAGEMAXSLOT 256
#define XTENTRYSTART 2
-/*
- * xtree page:
- */
-typedef union {
- struct xtheader {
- __le64 next; /* 8: */
- __le64 prev; /* 8: */
+struct xtheader {
+ __le64 next; /* 8: */
+ __le64 prev; /* 8: */
- u8 flag; /* 1: */
- u8 rsrvd1; /* 1: */
- __le16 nextindex; /* 2: next index = number of entries */
- __le16 maxentry; /* 2: max number of entries */
- __le16 rsrvd2; /* 2: */
+ u8 flag; /* 1: */
+ u8 rsrvd1; /* 1: */
+ __le16 nextindex; /* 2: next index = number of entries */
+ __le16 maxentry; /* 2: max number of entries */
+ __le16 rsrvd2; /* 2: */
- pxd_t self; /* 8: self */
- } header; /* (32) */
+ pxd_t self; /* 8: self */
+};
+/*
+ * xtree root (in inode):
+ */
+typedef union {
+ struct xtheader header;
xad_t xad[XTROOTMAXSLOT]; /* 16 * maxentry: xad array */
+} xtroot_t;
+
+/*
+ * xtree page:
+ */
+typedef union {
+ struct xtheader header;
+ xad_t xad[XTPAGEMAXSLOT]; /* 16 * maxentry: xad array */
} xtpage_t;
/*
--
2.39.2
1 year, 4 months
- 2
- 3
[PATCH 6.6.y] jfs: define xtree root and page independently
by Sergio González Collado
From: Dave Kleikamp <dave.kleikamp(a)oracle.com>
[ Upstream commit a779ed754e52d582b8c0e17959df063108bd0656 ]
In order to make array bounds checking sane, provide a separate
definition of the in-inode xtree root and the external xtree page.
Signed-off-by: Dave Kleikamp <dave.kleikamp(a)oracle.com>
Tested-by: Manas Ghandat <ghandatmanas(a)gmail.com>
(cherry picked from commit a779ed754e52d582b8c0e17959df063108bd0656)
Signed-off-by: Sergio González Collado <sergio.collado(a)gmail.com>
---
fs/jfs/jfs_dinode.h | 2 +-
fs/jfs/jfs_imap.c | 6 +++---
fs/jfs/jfs_incore.h | 2 +-
fs/jfs/jfs_txnmgr.c | 4 ++--
fs/jfs/jfs_xtree.c | 4 ++--
fs/jfs/jfs_xtree.h | 37 +++++++++++++++++++++++--------------
6 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/fs/jfs/jfs_dinode.h b/fs/jfs/jfs_dinode.h
index 6b231d0d0071..603aae17a693 100644
--- a/fs/jfs/jfs_dinode.h
+++ b/fs/jfs/jfs_dinode.h
@@ -96,7 +96,7 @@ struct dinode {
#define di_gengen u._file._u1._imap._gengen
union {
- xtpage_t _xtroot;
+ xtroot_t _xtroot;
struct {
u8 unused[16]; /* 16: */
dxd_t _dxd; /* 16: */
diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c
index 4bc589c4dcca..82d88dcf0ea6 100644
--- a/fs/jfs/jfs_imap.c
+++ b/fs/jfs/jfs_imap.c
@@ -673,7 +673,7 @@ int diWrite(tid_t tid, struct inode *ip)
* This is the special xtree inside the directory for storing
* the directory table
*/
- xtpage_t *p, *xp;
+ xtroot_t *p, *xp;
xad_t *xad;
jfs_ip->xtlid = 0;
@@ -687,7 +687,7 @@ int diWrite(tid_t tid, struct inode *ip)
* copy xtree root from inode to dinode:
*/
p = &jfs_ip->i_xtroot;
- xp = (xtpage_t *) &dp->di_dirtable;
+ xp = (xtroot_t *) &dp->di_dirtable;
lv = ilinelock->lv;
for (n = 0; n < ilinelock->index; n++, lv++) {
memcpy(&xp->xad[lv->offset], &p->xad[lv->offset],
@@ -716,7 +716,7 @@ int diWrite(tid_t tid, struct inode *ip)
* regular file: 16 byte (XAD slot) granularity
*/
if (type & tlckXTREE) {
- xtpage_t *p, *xp;
+ xtroot_t *p, *xp;
xad_t *xad;
/*
diff --git a/fs/jfs/jfs_incore.h b/fs/jfs/jfs_incore.h
index d3c35068cb76..10934f9a11be 100644
--- a/fs/jfs/jfs_incore.h
+++ b/fs/jfs/jfs_incore.h
@@ -66,7 +66,7 @@ struct jfs_inode_info {
lid_t xtlid; /* lid of xtree lock on directory */
union {
struct {
- xtpage_t _xtroot; /* 288: xtree root */
+ xtroot_t _xtroot; /* 288: xtree root */
struct inomap *_imap; /* 4: inode map header */
} file;
struct {
diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
index ce4b4760fcb1..dccc8b3f1045 100644
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@ -783,7 +783,7 @@ struct tlock *txLock(tid_t tid, struct inode *ip, struct metapage * mp,
if (mp->xflag & COMMIT_PAGE)
p = (xtpage_t *) mp->data;
else
- p = &jfs_ip->i_xtroot;
+ p = (xtpage_t *) &jfs_ip->i_xtroot;
xtlck->lwm.offset =
le16_to_cpu(p->header.nextindex);
}
@@ -1676,7 +1676,7 @@ static void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
if (tlck->type & tlckBTROOT) {
lrd->log.redopage.type |= cpu_to_le16(LOG_BTROOT);
- p = &JFS_IP(ip)->i_xtroot;
+ p = (xtpage_t *) &JFS_IP(ip)->i_xtroot;
if (S_ISDIR(ip->i_mode))
lrd->log.redopage.type |=
cpu_to_le16(LOG_DIR_XTREE);
diff --git a/fs/jfs/jfs_xtree.c b/fs/jfs/jfs_xtree.c
index 2d304cee884c..5ee618d17e77 100644
--- a/fs/jfs/jfs_xtree.c
+++ b/fs/jfs/jfs_xtree.c
@@ -1213,7 +1213,7 @@ xtSplitRoot(tid_t tid,
struct xtlock *xtlck;
int rc;
- sp = &JFS_IP(ip)->i_xtroot;
+ sp = (xtpage_t *) &JFS_IP(ip)->i_xtroot;
INCREMENT(xtStat.split);
@@ -2098,7 +2098,7 @@ int xtAppend(tid_t tid, /* transaction id */
*/
void xtInitRoot(tid_t tid, struct inode *ip)
{
- xtpage_t *p;
+ xtroot_t *p;
/*
* acquire a transaction lock on the root
diff --git a/fs/jfs/jfs_xtree.h b/fs/jfs/jfs_xtree.h
index ad7592191d76..0f6cf5a1ce75 100644
--- a/fs/jfs/jfs_xtree.h
+++ b/fs/jfs/jfs_xtree.h
@@ -65,24 +65,33 @@ struct xadlist {
#define XTPAGEMAXSLOT 256
#define XTENTRYSTART 2
-/*
- * xtree page:
- */
-typedef union {
- struct xtheader {
- __le64 next; /* 8: */
- __le64 prev; /* 8: */
+struct xtheader {
+ __le64 next; /* 8: */
+ __le64 prev; /* 8: */
- u8 flag; /* 1: */
- u8 rsrvd1; /* 1: */
- __le16 nextindex; /* 2: next index = number of entries */
- __le16 maxentry; /* 2: max number of entries */
- __le16 rsrvd2; /* 2: */
+ u8 flag; /* 1: */
+ u8 rsrvd1; /* 1: */
+ __le16 nextindex; /* 2: next index = number of entries */
+ __le16 maxentry; /* 2: max number of entries */
+ __le16 rsrvd2; /* 2: */
- pxd_t self; /* 8: self */
- } header; /* (32) */
+ pxd_t self; /* 8: self */
+};
+/*
+ * xtree root (in inode):
+ */
+typedef union {
+ struct xtheader header;
xad_t xad[XTROOTMAXSLOT]; /* 16 * maxentry: xad array */
+} xtroot_t;
+
+/*
+ * xtree page:
+ */
+typedef union {
+ struct xtheader header;
+ xad_t xad[XTPAGEMAXSLOT]; /* 16 * maxentry: xad array */
} xtpage_t;
/*
base-commit: 99fd042016c7489192d05ff21a10620c2142301d
--
2.39.2
1 year, 4 months
- 1
- 0
[PATCH 6.5.y] jfs: define xtree root and page independently
by Sergio González Collado
From: Dave Kleikamp <dave.kleikamp(a)oracle.com>
[ Upstream commit a779ed754e52d582b8c0e17959df063108bd0656 ]
In order to make array bounds checking sane, provide a separate
definition of the in-inode xtree root and the external xtree page.
Signed-off-by: Dave Kleikamp <dave.kleikamp(a)oracle.com>
Tested-by: Manas Ghandat <ghandatmanas(a)gmail.com>
(cherry picked from commit a779ed754e52d582b8c0e17959df063108bd0656)
Signed-off-by: Sergio González Collado <sergio.collado(a)gmail.com>
---
fs/jfs/jfs_dinode.h | 2 +-
fs/jfs/jfs_imap.c | 6 +++---
fs/jfs/jfs_incore.h | 2 +-
fs/jfs/jfs_txnmgr.c | 4 ++--
fs/jfs/jfs_xtree.c | 4 ++--
fs/jfs/jfs_xtree.h | 37 +++++++++++++++++++++++--------------
6 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/fs/jfs/jfs_dinode.h b/fs/jfs/jfs_dinode.h
index 6b231d0d0071..603aae17a693 100644
--- a/fs/jfs/jfs_dinode.h
+++ b/fs/jfs/jfs_dinode.h
@@ -96,7 +96,7 @@ struct dinode {
#define di_gengen u._file._u1._imap._gengen
union {
- xtpage_t _xtroot;
+ xtroot_t _xtroot;
struct {
u8 unused[16]; /* 16: */
dxd_t _dxd; /* 16: */
diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c
index 34f1358264e2..8984f9548e24 100644
--- a/fs/jfs/jfs_imap.c
+++ b/fs/jfs/jfs_imap.c
@@ -670,7 +670,7 @@ int diWrite(tid_t tid, struct inode *ip)
* This is the special xtree inside the directory for storing
* the directory table
*/
- xtpage_t *p, *xp;
+ xtroot_t *p, *xp;
xad_t *xad;
jfs_ip->xtlid = 0;
@@ -684,7 +684,7 @@ int diWrite(tid_t tid, struct inode *ip)
* copy xtree root from inode to dinode:
*/
p = &jfs_ip->i_xtroot;
- xp = (xtpage_t *) &dp->di_dirtable;
+ xp = (xtroot_t *) &dp->di_dirtable;
lv = ilinelock->lv;
for (n = 0; n < ilinelock->index; n++, lv++) {
memcpy(&xp->xad[lv->offset], &p->xad[lv->offset],
@@ -713,7 +713,7 @@ int diWrite(tid_t tid, struct inode *ip)
* regular file: 16 byte (XAD slot) granularity
*/
if (type & tlckXTREE) {
- xtpage_t *p, *xp;
+ xtroot_t *p, *xp;
xad_t *xad;
/*
diff --git a/fs/jfs/jfs_incore.h b/fs/jfs/jfs_incore.h
index 721def69e732..dd4264aa9bed 100644
--- a/fs/jfs/jfs_incore.h
+++ b/fs/jfs/jfs_incore.h
@@ -66,7 +66,7 @@ struct jfs_inode_info {
lid_t xtlid; /* lid of xtree lock on directory */
union {
struct {
- xtpage_t _xtroot; /* 288: xtree root */
+ xtroot_t _xtroot; /* 288: xtree root */
struct inomap *_imap; /* 4: inode map header */
} file;
struct {
diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
index ce4b4760fcb1..dccc8b3f1045 100644
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@ -783,7 +783,7 @@ struct tlock *txLock(tid_t tid, struct inode *ip, struct metapage * mp,
if (mp->xflag & COMMIT_PAGE)
p = (xtpage_t *) mp->data;
else
- p = &jfs_ip->i_xtroot;
+ p = (xtpage_t *) &jfs_ip->i_xtroot;
xtlck->lwm.offset =
le16_to_cpu(p->header.nextindex);
}
@@ -1676,7 +1676,7 @@ static void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
if (tlck->type & tlckBTROOT) {
lrd->log.redopage.type |= cpu_to_le16(LOG_BTROOT);
- p = &JFS_IP(ip)->i_xtroot;
+ p = (xtpage_t *) &JFS_IP(ip)->i_xtroot;
if (S_ISDIR(ip->i_mode))
lrd->log.redopage.type |=
cpu_to_le16(LOG_DIR_XTREE);
diff --git a/fs/jfs/jfs_xtree.c b/fs/jfs/jfs_xtree.c
index 2d304cee884c..5ee618d17e77 100644
--- a/fs/jfs/jfs_xtree.c
+++ b/fs/jfs/jfs_xtree.c
@@ -1213,7 +1213,7 @@ xtSplitRoot(tid_t tid,
struct xtlock *xtlck;
int rc;
- sp = &JFS_IP(ip)->i_xtroot;
+ sp = (xtpage_t *) &JFS_IP(ip)->i_xtroot;
INCREMENT(xtStat.split);
@@ -2098,7 +2098,7 @@ int xtAppend(tid_t tid, /* transaction id */
*/
void xtInitRoot(tid_t tid, struct inode *ip)
{
- xtpage_t *p;
+ xtroot_t *p;
/*
* acquire a transaction lock on the root
diff --git a/fs/jfs/jfs_xtree.h b/fs/jfs/jfs_xtree.h
index ad7592191d76..0f6cf5a1ce75 100644
--- a/fs/jfs/jfs_xtree.h
+++ b/fs/jfs/jfs_xtree.h
@@ -65,24 +65,33 @@ struct xadlist {
#define XTPAGEMAXSLOT 256
#define XTENTRYSTART 2
-/*
- * xtree page:
- */
-typedef union {
- struct xtheader {
- __le64 next; /* 8: */
- __le64 prev; /* 8: */
+struct xtheader {
+ __le64 next; /* 8: */
+ __le64 prev; /* 8: */
- u8 flag; /* 1: */
- u8 rsrvd1; /* 1: */
- __le16 nextindex; /* 2: next index = number of entries */
- __le16 maxentry; /* 2: max number of entries */
- __le16 rsrvd2; /* 2: */
+ u8 flag; /* 1: */
+ u8 rsrvd1; /* 1: */
+ __le16 nextindex; /* 2: next index = number of entries */
+ __le16 maxentry; /* 2: max number of entries */
+ __le16 rsrvd2; /* 2: */
- pxd_t self; /* 8: self */
- } header; /* (32) */
+ pxd_t self; /* 8: self */
+};
+/*
+ * xtree root (in inode):
+ */
+typedef union {
+ struct xtheader header;
xad_t xad[XTROOTMAXSLOT]; /* 16 * maxentry: xad array */
+} xtroot_t;
+
+/*
+ * xtree page:
+ */
+typedef union {
+ struct xtheader header;
+ xad_t xad[XTPAGEMAXSLOT]; /* 16 * maxentry: xad array */
} xtpage_t;
/*
base-commit: 4631960b4700dd53f5cebb4f7055fd00ccd556ce
--
2.39.2
1 year, 4 months
- 1
- 0
[PATCH 6.4.y] jfs: define xtree root and page independently
by Sergio González Collado
From: Dave Kleikamp <dave.kleikamp(a)oracle.com>
[ Upstream commit a779ed754e52d582b8c0e17959df063108bd0656 ]
In order to make array bounds checking sane, provide a separate
definition of the in-inode xtree root and the external xtree page.
Signed-off-by: Dave Kleikamp <dave.kleikamp(a)oracle.com>
Tested-by: Manas Ghandat <ghandatmanas(a)gmail.com>
(cherry picked from commit a779ed754e52d582b8c0e17959df063108bd0656)
Signed-off-by: Sergio González Collado <sergio.collado(a)gmail.com>
---
fs/jfs/jfs_dinode.h | 2 +-
fs/jfs/jfs_imap.c | 6 +++---
fs/jfs/jfs_incore.h | 2 +-
fs/jfs/jfs_txnmgr.c | 4 ++--
fs/jfs/jfs_xtree.c | 4 ++--
fs/jfs/jfs_xtree.h | 37 +++++++++++++++++++++++--------------
6 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/fs/jfs/jfs_dinode.h b/fs/jfs/jfs_dinode.h
index 6b231d0d0071..603aae17a693 100644
--- a/fs/jfs/jfs_dinode.h
+++ b/fs/jfs/jfs_dinode.h
@@ -96,7 +96,7 @@ struct dinode {
#define di_gengen u._file._u1._imap._gengen
union {
- xtpage_t _xtroot;
+ xtroot_t _xtroot;
struct {
u8 unused[16]; /* 16: */
dxd_t _dxd; /* 16: */
diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c
index 390cbfce391f..85918c0d852b 100644
--- a/fs/jfs/jfs_imap.c
+++ b/fs/jfs/jfs_imap.c
@@ -669,7 +669,7 @@ int diWrite(tid_t tid, struct inode *ip)
* This is the special xtree inside the directory for storing
* the directory table
*/
- xtpage_t *p, *xp;
+ xtroot_t *p, *xp;
xad_t *xad;
jfs_ip->xtlid = 0;
@@ -683,7 +683,7 @@ int diWrite(tid_t tid, struct inode *ip)
* copy xtree root from inode to dinode:
*/
p = &jfs_ip->i_xtroot;
- xp = (xtpage_t *) &dp->di_dirtable;
+ xp = (xtroot_t *) &dp->di_dirtable;
lv = ilinelock->lv;
for (n = 0; n < ilinelock->index; n++, lv++) {
memcpy(&xp->xad[lv->offset], &p->xad[lv->offset],
@@ -712,7 +712,7 @@ int diWrite(tid_t tid, struct inode *ip)
* regular file: 16 byte (XAD slot) granularity
*/
if (type & tlckXTREE) {
- xtpage_t *p, *xp;
+ xtroot_t *p, *xp;
xad_t *xad;
/*
diff --git a/fs/jfs/jfs_incore.h b/fs/jfs/jfs_incore.h
index 721def69e732..dd4264aa9bed 100644
--- a/fs/jfs/jfs_incore.h
+++ b/fs/jfs/jfs_incore.h
@@ -66,7 +66,7 @@ struct jfs_inode_info {
lid_t xtlid; /* lid of xtree lock on directory */
union {
struct {
- xtpage_t _xtroot; /* 288: xtree root */
+ xtroot_t _xtroot; /* 288: xtree root */
struct inomap *_imap; /* 4: inode map header */
} file;
struct {
diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
index ce4b4760fcb1..dccc8b3f1045 100644
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@ -783,7 +783,7 @@ struct tlock *txLock(tid_t tid, struct inode *ip, struct metapage * mp,
if (mp->xflag & COMMIT_PAGE)
p = (xtpage_t *) mp->data;
else
- p = &jfs_ip->i_xtroot;
+ p = (xtpage_t *) &jfs_ip->i_xtroot;
xtlck->lwm.offset =
le16_to_cpu(p->header.nextindex);
}
@@ -1676,7 +1676,7 @@ static void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
if (tlck->type & tlckBTROOT) {
lrd->log.redopage.type |= cpu_to_le16(LOG_BTROOT);
- p = &JFS_IP(ip)->i_xtroot;
+ p = (xtpage_t *) &JFS_IP(ip)->i_xtroot;
if (S_ISDIR(ip->i_mode))
lrd->log.redopage.type |=
cpu_to_le16(LOG_DIR_XTREE);
diff --git a/fs/jfs/jfs_xtree.c b/fs/jfs/jfs_xtree.c
index 2d304cee884c..5ee618d17e77 100644
--- a/fs/jfs/jfs_xtree.c
+++ b/fs/jfs/jfs_xtree.c
@@ -1213,7 +1213,7 @@ xtSplitRoot(tid_t tid,
struct xtlock *xtlck;
int rc;
- sp = &JFS_IP(ip)->i_xtroot;
+ sp = (xtpage_t *) &JFS_IP(ip)->i_xtroot;
INCREMENT(xtStat.split);
@@ -2098,7 +2098,7 @@ int xtAppend(tid_t tid, /* transaction id */
*/
void xtInitRoot(tid_t tid, struct inode *ip)
{
- xtpage_t *p;
+ xtroot_t *p;
/*
* acquire a transaction lock on the root
diff --git a/fs/jfs/jfs_xtree.h b/fs/jfs/jfs_xtree.h
index ad7592191d76..0f6cf5a1ce75 100644
--- a/fs/jfs/jfs_xtree.h
+++ b/fs/jfs/jfs_xtree.h
@@ -65,24 +65,33 @@ struct xadlist {
#define XTPAGEMAXSLOT 256
#define XTENTRYSTART 2
-/*
- * xtree page:
- */
-typedef union {
- struct xtheader {
- __le64 next; /* 8: */
- __le64 prev; /* 8: */
+struct xtheader {
+ __le64 next; /* 8: */
+ __le64 prev; /* 8: */
- u8 flag; /* 1: */
- u8 rsrvd1; /* 1: */
- __le16 nextindex; /* 2: next index = number of entries */
- __le16 maxentry; /* 2: max number of entries */
- __le16 rsrvd2; /* 2: */
+ u8 flag; /* 1: */
+ u8 rsrvd1; /* 1: */
+ __le16 nextindex; /* 2: next index = number of entries */
+ __le16 maxentry; /* 2: max number of entries */
+ __le16 rsrvd2; /* 2: */
- pxd_t self; /* 8: self */
- } header; /* (32) */
+ pxd_t self; /* 8: self */
+};
+/*
+ * xtree root (in inode):
+ */
+typedef union {
+ struct xtheader header;
xad_t xad[XTROOTMAXSLOT]; /* 16 * maxentry: xad array */
+} xtroot_t;
+
+/*
+ * xtree page:
+ */
+typedef union {
+ struct xtheader header;
+ xad_t xad[XTPAGEMAXSLOT]; /* 16 * maxentry: xad array */
} xtpage_t;
/*
base-commit: ae4e4fc35b4258626644c162a702e2bce2b79190
--
2.39.2
1 year, 4 months
- 1
- 0
[PATCH v4 3/3] x86/sgx: Resolve EREMOVE page vs EAUG page data race
by Dmitrii Kuvaiskii
Two enclave threads may try to add and remove the same enclave page
simultaneously (e.g., if the SGX runtime supports both lazy allocation
and MADV_DONTNEED semantics). Consider some enclave page added to the
enclave. User space decides to temporarily remove this page (e.g.,
emulating the MADV_DONTNEED semantics) on CPU1. At the same time, user
space performs a memory access on the same page on CPU2, which results
in a #PF and ultimately in sgx_vma_fault(). Scenario proceeds as
follows:
/*
* CPU1: User space performs
* ioctl(SGX_IOC_ENCLAVE_REMOVE_PAGES)
* on enclave page X
*/
sgx_encl_remove_pages() {
mutex_lock(&encl->lock);
entry = sgx_encl_load_page(encl);
/*
* verify that page is
* trimmed and accepted
*/
mutex_unlock(&encl->lock);
/*
* remove PTE entry; cannot
* be performed under lock
*/
sgx_zap_enclave_ptes(encl);
/*
* Fault on CPU2 on same page X
*/
sgx_vma_fault() {
/*
* PTE entry was removed, but the
* page is still in enclave's xarray
*/
xa_load(&encl->page_array) != NULL ->
/*
* SGX driver thinks that this page
* was swapped out and loads it
*/
mutex_lock(&encl->lock);
/*
* this is effectively a no-op
*/
entry = sgx_encl_load_page_in_vma();
/*
* add PTE entry
*
* *BUG*: a PTE is installed for a
* page in process of being removed
*/
vmf_insert_pfn(...);
mutex_unlock(&encl->lock);
return VM_FAULT_NOPAGE;
}
/*
* continue with page removal
*/
mutex_lock(&encl->lock);
sgx_encl_free_epc_page(epc_page) {
/*
* remove page via EREMOVE
*/
/*
* free EPC page
*/
sgx_free_epc_page(epc_page);
}
xa_erase(&encl->page_array);
mutex_unlock(&encl->lock);
}
Here, CPU1 removed the page. However CPU2 installed the PTE entry on the
same page. This enclave page becomes perpetually inaccessible (until
another SGX_IOC_ENCLAVE_REMOVE_PAGES ioctl). This is because the page is
marked accessible in the PTE entry but is not EAUGed, and any subsequent
access to this page raises a fault: with the kernel believing there to
be a valid VMA, the unlikely error code X86_PF_SGX encountered by code
path do_user_addr_fault() -> access_error() causes the SGX driver's
sgx_vma_fault() to be skipped and user space receives a SIGSEGV instead.
The userspace SIGSEGV handler cannot perform EACCEPT because the page
was not EAUGed. Thus, the user space is stuck with the inaccessible
page.
Fix this race by forcing the fault handler on CPU2 to back off if the
page is currently being removed (on CPU1). This is achieved by
setting SGX_ENCL_PAGE_BUSY flag right-before the first mutex_unlock() in
sgx_encl_remove_pages(). Upon loading the page, CPU2 checks whether this
page is busy, and if yes then CPU2 backs off and waits until the page is
completely removed. After that, any memory access to this page results
in a normal "allocate and EAUG a page on #PF" flow.
Fixes: 9849bb27152c ("x86/sgx: Support complete page removal")
Cc: stable(a)vger.kernel.org
Signed-off-by: Dmitrii Kuvaiskii <dmitrii.kuvaiskii(a)intel.com>
---
arch/x86/kernel/cpu/sgx/ioctl.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/x86/kernel/cpu/sgx/ioctl.c b/arch/x86/kernel/cpu/sgx/ioctl.c
index 5d390df21440..02441883401d 100644
--- a/arch/x86/kernel/cpu/sgx/ioctl.c
+++ b/arch/x86/kernel/cpu/sgx/ioctl.c
@@ -1141,7 +1141,14 @@ static long sgx_encl_remove_pages(struct sgx_encl *encl,
/*
* Do not keep encl->lock because of dependency on
* mmap_lock acquired in sgx_zap_enclave_ptes().
+ *
+ * Releasing encl->lock leads to a data race: while CPU1
+ * performs sgx_zap_enclave_ptes() and removes the PTE entry
+ * for the enclave page, CPU2 may attempt to load this page
+ * (because the page is still in enclave's xarray). To prevent
+ * CPU2 from loading the page, mark the page as busy.
*/
+ entry->desc |= SGX_ENCL_PAGE_BUSY;
mutex_unlock(&encl->lock);
sgx_zap_enclave_ptes(encl, addr);
--
2.43.0
1 year, 4 months
- 4
- 10
Re: Patch "Input: bcm5974 - check endpoint type before starting traffic" has been added to the 6.6-stable tree
by Dmitry Torokhov
On Thu, Aug 15, 2024 at 08:21:29AM -0400, Sasha Levin wrote:
> This is a note to let you know that I've just added the patch titled
>
> Input: bcm5974 - check endpoint type before starting traffic
>
> to the 6.6-stable tree which can be found at:
> http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum…
>
> The filename of the patch is:
> input-bcm5974-check-endpoint-type-before-starting-tr.patch
> and it can be found in the queue-6.6 subdirectory.
>
> If you, or anyone else, feels it should not be added to the stable tree,
> please let <stable(a)vger.kernel.org> know about it.
I am confused why to pick this up only to have to pick up the revert? It
was not tagged for stable explicitly.
I'd expects stable scripts to check for reverts that happen almost
immediately...
>
>
>
> commit 16ae8b10b473f96b7f63add2e928d8d437c83b07
> Author: Javier Carrasco <javier.carrasco.cruz(a)gmail.com>
> Date: Sat Oct 14 12:20:15 2023 +0200
>
> Input: bcm5974 - check endpoint type before starting traffic
>
> [ Upstream commit 2b9c3eb32a699acdd4784d6b93743271b4970899 ]
>
> syzbot has found a type mismatch between a USB pipe and the transfer
> endpoint, which is triggered by the bcm5974 driver[1].
>
> This driver expects the device to provide input interrupt endpoints and
> if that is not the case, the driver registration should terminate.
>
> Repros are available to reproduce this issue with a certain setup for
> the dummy_hcd, leading to an interrupt/bulk mismatch which is caught in
> the USB core after calling usb_submit_urb() with the following message:
> "BOGUS urb xfer, pipe 1 != type 3"
>
> Some other device drivers (like the appletouch driver bcm5974 is mainly
> based on) provide some checking mechanism to make sure that an IN
> interrupt endpoint is available. In this particular case the endpoint
> addresses are provided by a config table, so the checking can be
> targeted to the provided endpoints.
>
> Add some basic checking to guarantee that the endpoints available match
> the expected type for both the trackpad and button endpoints.
>
> This issue was only found for the trackpad endpoint, but the checking
> has been added to the button endpoint as well for the same reasons.
>
> Given that there was never a check for the endpoint type, this bug has
> been there since the first implementation of the driver (f89bd95c5c94).
>
> [1] https://syzkaller.appspot.com/bug?extid=348331f63b034f89b622
>
> Fixes: f89bd95c5c94 ("Input: bcm5974 - add driver for Macbook Air and Pro Penryn touchpads")
> Signed-off-by: Javier Carrasco <javier.carrasco.cruz(a)gmail.com>
> Reported-and-tested-by: syzbot+348331f63b034f89b622(a)syzkaller.appspotmail.com
> Link: https://lore.kernel.org/r/20231007-topic-bcm5974_bulk-v3-1-d0f38b9d2935@gma…
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov(a)gmail.com>
> Signed-off-by: Sasha Levin <sashal(a)kernel.org>
>
> diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
> index ca150618d32f1..953992b458e9f 100644
> --- a/drivers/input/mouse/bcm5974.c
> +++ b/drivers/input/mouse/bcm5974.c
> @@ -19,6 +19,7 @@
> * Copyright (C) 2006 Nicolas Boichat (nicolas(a)boichat.ch)
> */
>
> +#include "linux/usb.h"
> #include <linux/kernel.h>
> #include <linux/errno.h>
> #include <linux/slab.h>
> @@ -193,6 +194,8 @@ enum tp_type {
>
> /* list of device capability bits */
> #define HAS_INTEGRATED_BUTTON 1
> +/* maximum number of supported endpoints (currently trackpad and button) */
> +#define MAX_ENDPOINTS 2
>
> /* trackpad finger data block size */
> #define FSIZE_TYPE1 (14 * sizeof(__le16))
> @@ -891,6 +894,18 @@ static int bcm5974_resume(struct usb_interface *iface)
> return error;
> }
>
> +static bool bcm5974_check_endpoints(struct usb_interface *iface,
> + const struct bcm5974_config *cfg)
> +{
> + u8 ep_addr[MAX_ENDPOINTS + 1] = {0};
> +
> + ep_addr[0] = cfg->tp_ep;
> + if (cfg->tp_type == TYPE1)
> + ep_addr[1] = cfg->bt_ep;
> +
> + return usb_check_int_endpoints(iface, ep_addr);
> +}
> +
> static int bcm5974_probe(struct usb_interface *iface,
> const struct usb_device_id *id)
> {
> @@ -903,6 +918,11 @@ static int bcm5974_probe(struct usb_interface *iface,
> /* find the product index */
> cfg = bcm5974_get_config(udev);
>
> + if (!bcm5974_check_endpoints(iface, cfg)) {
> + dev_err(&iface->dev, "Unexpected non-int endpoint\n");
> + return -ENODEV;
> + }
> +
> /* allocate memory for our device state and initialize it */
> dev = kzalloc(sizeof(struct bcm5974), GFP_KERNEL);
> input_dev = input_allocate_device();
Thanks.
--
Dmitry
1 year, 4 months
- 1
- 0
[PATCH v4 2/3] x86/sgx: Resolve EAUG race where losing thread returns SIGBUS
by Dmitrii Kuvaiskii
Imagine an mmap()'d file. Two threads touch the same address at the same
time and fault. Both allocate a physical page and race to install a PTE
for that page. Only one will win the race. The loser frees its page, but
still continues handling the fault as a success and returns
VM_FAULT_NOPAGE from the fault handler.
The same race can happen with SGX. But there's a bug: the loser in the
SGX steers into a failure path. The loser EREMOVE's the winner's EPC
page, then returns SIGBUS, likely killing the app.
Fix the SGX loser's behavior. Change the return code to VM_FAULT_NOPAGE
to avoid SIGBUS and call sgx_free_epc_page() which avoids EREMOVE'ing
the winner's page and only frees the page that the loser allocated.
The race can be illustrated as follows:
/* /*
* Fault on CPU1 * Fault on CPU2
* on enclave page X * on enclave page X
*/ */
sgx_vma_fault() { sgx_vma_fault() {
xa_load(&encl->page_array) xa_load(&encl->page_array)
== NULL --> == NULL -->
sgx_encl_eaug_page() { sgx_encl_eaug_page() {
... ...
/* /*
* alloc encl_page * alloc encl_page
*/ */
mutex_lock(&encl->lock);
/*
* alloc EPC page
*/
epc_page = sgx_alloc_epc_page(...);
/*
* add page to enclave's xarray
*/
xa_insert(&encl->page_array, ...);
/*
* add page to enclave via EAUG
* (page is in pending state)
*/
/*
* add PTE entry
*/
vmf_insert_pfn(...);
mutex_unlock(&encl->lock);
return VM_FAULT_NOPAGE;
}
}
/*
* All good up to here: enclave page
* successfully added to enclave,
* ready for EACCEPT from user space
*/
mutex_lock(&encl->lock);
/*
* alloc EPC page
*/
epc_page = sgx_alloc_epc_page(...);
/*
* add page to enclave's xarray,
* this fails with -EBUSY as this
* page was already added by CPU2
*/
xa_insert(&encl->page_array, ...);
err_out_shrink:
sgx_encl_free_epc_page(epc_page) {
/*
* remove page via EREMOVE
*
* *BUG*: page added by CPU2 is
* yanked from enclave while it
* remains accessible from OS
* perspective (PTE installed)
*/
/*
* free EPC page
*/
sgx_free_epc_page(epc_page);
}
mutex_unlock(&encl->lock);
/*
* *BUG*: SIGBUS is returned
* for a valid enclave page
*/
return VM_FAULT_SIGBUS;
}
}
Fixes: 5a90d2c3f5ef ("x86/sgx: Support adding of pages to an initialized enclave")
Cc: stable(a)vger.kernel.org
Reported-by: Marcelina Kościelnicka <mwk(a)invisiblethingslab.com>
Suggested-by: Reinette Chatre <reinette.chatre(a)intel.com>
Signed-off-by: Dmitrii Kuvaiskii <dmitrii.kuvaiskii(a)intel.com>
Reviewed-by: Haitao Huang <haitao.huang(a)linux.intel.com>
Reviewed-by: Jarkko Sakkinen <jarkko(a)kernel.org>
Reviewed-by: Reinette Chatre <reinette.chatre(a)intel.com>
---
arch/x86/kernel/cpu/sgx/encl.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/cpu/sgx/encl.c b/arch/x86/kernel/cpu/sgx/encl.c
index c0a3c00284c8..9f7f9e57cdeb 100644
--- a/arch/x86/kernel/cpu/sgx/encl.c
+++ b/arch/x86/kernel/cpu/sgx/encl.c
@@ -380,8 +380,11 @@ static vm_fault_t sgx_encl_eaug_page(struct vm_area_struct *vma,
* If ret == -EBUSY then page was created in another flow while
* running without encl->lock
*/
- if (ret)
+ if (ret) {
+ if (ret == -EBUSY)
+ vmret = VM_FAULT_NOPAGE;
goto err_out_shrink;
+ }
pginfo.secs = (unsigned long)sgx_get_epc_virt_addr(encl->secs.epc_page);
pginfo.addr = encl_page->desc & PAGE_MASK;
@@ -417,7 +420,7 @@ static vm_fault_t sgx_encl_eaug_page(struct vm_area_struct *vma,
err_out_shrink:
sgx_encl_shrink(encl, va_page);
err_out_epc:
- sgx_encl_free_epc_page(epc_page);
+ sgx_free_epc_page(epc_page);
err_out_unlock:
mutex_unlock(&encl->lock);
kfree(encl_page);
--
2.43.0
1 year, 4 months
- 3
- 4
[PATCH v4 1/3] x86/sgx: Split SGX_ENCL_PAGE_BEING_RECLAIMED into two flags
by Dmitrii Kuvaiskii
SGX_ENCL_PAGE_BEING_RECLAIMED flag is set when the enclave page is being
reclaimed (moved to the backing store). This flag however has two
logical meanings:
1. Don't attempt to load the enclave page (the page is busy).
2. Don't attempt to remove the PCMD page corresponding to this enclave
page (the PCMD page is busy).
To reflect these two meanings, split SGX_ENCL_PAGE_BEING_RECLAIMED into
two flags: SGX_ENCL_PAGE_BUSY and SGX_ENCL_PAGE_PCMD_BUSY. Currently,
both flags are set only when the enclave page is being reclaimed. A
future commit will introduce a new case when the enclave page is being
removed; this new case will set only the SGX_ENCL_PAGE_BUSY flag.
Cc: stable(a)vger.kernel.org
Signed-off-by: Dmitrii Kuvaiskii <dmitrii.kuvaiskii(a)intel.com>
---
arch/x86/kernel/cpu/sgx/encl.c | 16 +++++++---------
arch/x86/kernel/cpu/sgx/encl.h | 10 ++++++++--
arch/x86/kernel/cpu/sgx/main.c | 4 ++--
3 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/arch/x86/kernel/cpu/sgx/encl.c b/arch/x86/kernel/cpu/sgx/encl.c
index 279148e72459..c0a3c00284c8 100644
--- a/arch/x86/kernel/cpu/sgx/encl.c
+++ b/arch/x86/kernel/cpu/sgx/encl.c
@@ -46,10 +46,10 @@ static int sgx_encl_lookup_backing(struct sgx_encl *encl, unsigned long page_ind
* a check if an enclave page sharing the PCMD page is in the process of being
* reclaimed.
*
- * The reclaimer sets the SGX_ENCL_PAGE_BEING_RECLAIMED flag when it
- * intends to reclaim that enclave page - it means that the PCMD page
- * associated with that enclave page is about to get some data and thus
- * even if the PCMD page is empty, it should not be truncated.
+ * The reclaimer sets the SGX_ENCL_PAGE_PCMD_BUSY flag when it intends to
+ * reclaim that enclave page - it means that the PCMD page associated with that
+ * enclave page is about to get some data and thus even if the PCMD page is
+ * empty, it should not be truncated.
*
* Context: Enclave mutex (&sgx_encl->lock) must be held.
* Return: 1 if the reclaimer is about to write to the PCMD page
@@ -77,8 +77,7 @@ static int reclaimer_writing_to_pcmd(struct sgx_encl *encl,
* Stop when reaching the SECS page - it does not
* have a page_array entry and its reclaim is
* started and completed with enclave mutex held so
- * it does not use the SGX_ENCL_PAGE_BEING_RECLAIMED
- * flag.
+ * it does not use the SGX_ENCL_PAGE_PCMD_BUSY flag.
*/
if (addr == encl->base + encl->size)
break;
@@ -91,8 +90,7 @@ static int reclaimer_writing_to_pcmd(struct sgx_encl *encl,
* VA page slot ID uses same bit as the flag so it is important
* to ensure that the page is not already in backing store.
*/
- if (entry->epc_page &&
- (entry->desc & SGX_ENCL_PAGE_BEING_RECLAIMED)) {
+ if (entry->epc_page && (entry->desc & SGX_ENCL_PAGE_PCMD_BUSY)) {
reclaimed = 1;
break;
}
@@ -257,7 +255,7 @@ static struct sgx_encl_page *__sgx_encl_load_page(struct sgx_encl *encl,
/* Entry successfully located. */
if (entry->epc_page) {
- if (entry->desc & SGX_ENCL_PAGE_BEING_RECLAIMED)
+ if (entry->desc & SGX_ENCL_PAGE_BUSY)
return ERR_PTR(-EBUSY);
return entry;
diff --git a/arch/x86/kernel/cpu/sgx/encl.h b/arch/x86/kernel/cpu/sgx/encl.h
index f94ff14c9486..11b09899cd92 100644
--- a/arch/x86/kernel/cpu/sgx/encl.h
+++ b/arch/x86/kernel/cpu/sgx/encl.h
@@ -22,8 +22,14 @@
/* 'desc' bits holding the offset in the VA (version array) page. */
#define SGX_ENCL_PAGE_VA_OFFSET_MASK GENMASK_ULL(11, 3)
-/* 'desc' bit marking that the page is being reclaimed. */
-#define SGX_ENCL_PAGE_BEING_RECLAIMED BIT(3)
+/* 'desc' bit indicating that the page is busy (e.g. being reclaimed). */
+#define SGX_ENCL_PAGE_BUSY BIT(2)
+
+/*
+ * 'desc' bit indicating that PCMD page associated with the enclave page is
+ * busy (e.g. because the enclave page is being reclaimed).
+ */
+#define SGX_ENCL_PAGE_PCMD_BUSY BIT(3)
struct sgx_encl_page {
unsigned long desc;
diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c
index 166692f2d501..e94b09c43673 100644
--- a/arch/x86/kernel/cpu/sgx/main.c
+++ b/arch/x86/kernel/cpu/sgx/main.c
@@ -204,7 +204,7 @@ static void sgx_encl_ewb(struct sgx_epc_page *epc_page,
void *va_slot;
int ret;
- encl_page->desc &= ~SGX_ENCL_PAGE_BEING_RECLAIMED;
+ encl_page->desc &= ~(SGX_ENCL_PAGE_BUSY | SGX_ENCL_PAGE_PCMD_BUSY);
va_page = list_first_entry(&encl->va_pages, struct sgx_va_page,
list);
@@ -340,7 +340,7 @@ static void sgx_reclaim_pages(void)
goto skip;
}
- encl_page->desc |= SGX_ENCL_PAGE_BEING_RECLAIMED;
+ encl_page->desc |= SGX_ENCL_PAGE_BUSY | SGX_ENCL_PAGE_PCMD_BUSY;
mutex_unlock(&encl_page->encl->lock);
continue;
--
2.43.0
1 year, 4 months
- 4
- 8
[PATCH 6.6.y 0/13] arm64: errata: Speculative SSBS workaround
by Mark Rutland
Hi,
This series is a v6.6-only backport (based on v6.6.44) of the upstream
workaround for SSBS errata on Arm Ltd CPUs, as affected parts are likely
to be used with stable kernels. This does not apply to earlier stable
trees, which will receive a separate backport.
The errata mean that an MSR to the SSBS special-purpose register does not
affect subsequent speculative instructions, permitting speculative store
bypassing for a window of time.
The upstream support was original posted as:
* https://lore.kernel.org/linux-arm-kernel/20240508081400.235362-1-mark.rutla…
"arm64: errata: Add workaround for Arm errata 3194386 and 3312417"
Present in v6.10
* https://lore.kernel.org/linux-arm-kernel/20240603111812.1514101-1-mark.rutl…
"arm64: errata: Expand speculative SSBS workaround"
Present in v6.11-rc1
* https://lore.kernel.org/linux-arm-kernel/20240801101803.1982459-1-mark.rutl…
"arm64: errata: Expand speculative SSBS workaround (again)"
Present in v6.11-rc2
This backport applies the patches which are not present in v6.6.y, and
as prerequisites backports the addition of the Neoverse-V2 MIDR values
and the restoration of the spec_bar() macro.
I have tested the backport (when applied to v6.6.44), ensuring that the
detection logic works and that the HWCAP and string in /proc/cpuinfo are
both hidden when the relevant errata are detected.
Mark.Besar Wicaksono (1):
arm64: Add Neoverse-V2 part
Mark Rutland (12):
arm64: barrier: Restore spec_bar() macro
arm64: cputype: Add Cortex-X4 definitions
arm64: cputype: Add Neoverse-V3 definitions
arm64: errata: Add workaround for Arm errata 3194386 and 3312417
arm64: cputype: Add Cortex-X3 definitions
arm64: cputype: Add Cortex-A720 definitions
arm64: cputype: Add Cortex-X925 definitions
arm64: errata: Unify speculative SSBS errata logic
arm64: errata: Expand speculative SSBS workaround
arm64: cputype: Add Cortex-X1C definitions
arm64: cputype: Add Cortex-A725 definitions
arm64: errata: Expand speculative SSBS workaround (again)
Documentation/arch/arm64/silicon-errata.rst | 36 +++++++++++++++++++
arch/arm64/Kconfig | 38 +++++++++++++++++++++
arch/arm64/include/asm/barrier.h | 4 +++
arch/arm64/include/asm/cputype.h | 16 +++++++++
arch/arm64/kernel/cpu_errata.c | 31 +++++++++++++++++
arch/arm64/kernel/cpufeature.c | 12 +++++++
arch/arm64/kernel/proton-pack.c | 12 +++++++
arch/arm64/tools/cpucaps | 1 +
8 files changed, 150 insertions(+)
--
2.30.2
1 year, 4 months
- 2
- 16
[PATCH] drm/amdgpu: Check if NBIO funcs are NULL in amdgpu_device_baco_exit
by Alex Deucher
From: Friedrich Vock <friedrich.vock(a)gmx.de>
The special case for VM passthrough doesn't check adev->nbio.funcs
before dereferencing it. If GPUs that don't have an NBIO block are
passed through, this leads to a NULL pointer dereference on startup.
Signed-off-by: Friedrich Vock <friedrich.vock(a)gmx.de>
Fixes: 1bece222eabe ("drm/amdgpu: Clear doorbell interrupt status for Sienna Cichlid")
Cc: Alex Deucher <alexander.deucher(a)amd.com>
Cc: Christian König <christian.koenig(a)amd.com>
Acked-by: Christian König <christian.koenig(a)amd.com>
Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com>
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3558
Cc: stable(a)vger.kernel.org # 5.15.x
(cherry picked from commit 0cdb3f9740844b9d95ca413e3fcff11f81223ecf)
---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 5f6c32ec674d..300d3b236bb3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -5531,7 +5531,7 @@ int amdgpu_device_baco_exit(struct drm_device *dev)
adev->nbio.funcs->enable_doorbell_interrupt)
adev->nbio.funcs->enable_doorbell_interrupt(adev, true);
- if (amdgpu_passthrough(adev) &&
+ if (amdgpu_passthrough(adev) && adev->nbio.funcs &&
adev->nbio.funcs->clear_doorbell_interrupt)
adev->nbio.funcs->clear_doorbell_interrupt(adev);
--
2.46.0
1 year, 4 months
- 1
- 0
[PATCH 1/1] xhci: Fix Panther point NULL pointer deref at full-speed re-enumeration
by Mathias Nyman
re-enumerating full-speed devices after a failed address device command
can trigger a NULL pointer dereference.
Full-speed devices may need to reconfigure the endpoint 0 Max Packet Size
value during enumeration. Usb core calls usb_ep0_reinit() in this case,
which ends up calling xhci_configure_endpoint().
On Panther point xHC the xhci_configure_endpoint() function will
additionally check and reserve bandwidth in software. Other hosts do
this in hardware
If xHC address device command fails then a new xhci_virt_device structure
is allocated as part of re-enabling the slot, but the bandwidth table
pointers are not set up properly here.
This triggers the NULL pointer dereference the next time usb_ep0_reinit()
is called and xhci_configure_endpoint() tries to check and reserve
bandwidth
[46710.713538] usb 3-1: new full-speed USB device number 5 using xhci_hcd
[46710.713699] usb 3-1: Device not responding to setup address.
[46710.917684] usb 3-1: Device not responding to setup address.
[46711.125536] usb 3-1: device not accepting address 5, error -71
[46711.125594] BUG: kernel NULL pointer dereference, address: 0000000000000008
[46711.125600] #PF: supervisor read access in kernel mode
[46711.125603] #PF: error_code(0x0000) - not-present page
[46711.125606] PGD 0 P4D 0
[46711.125610] Oops: Oops: 0000 [#1] PREEMPT SMP PTI
[46711.125615] CPU: 1 PID: 25760 Comm: kworker/1:2 Not tainted 6.10.3_2 #1
[46711.125620] Hardware name: Gigabyte Technology Co., Ltd.
[46711.125623] Workqueue: usb_hub_wq hub_event [usbcore]
[46711.125668] RIP: 0010:xhci_reserve_bandwidth (drivers/usb/host/xhci.c
Fix this by making sure bandwidth table pointers are set up correctly
after a failed address device command, and additionally by avoiding
checking for bandwidth in cases like this where no actual endpoints are
added or removed, i.e. only context for default control endpoint 0 is
evaluated.
Reported-by: Karel Balej <balejk(a)matfyz.cz>
Closes: https://lore.kernel.org/linux-usb/D3CKQQAETH47.1MUO22RTCH2O3@matfyz.cz/
Cc: stable(a)vger.kernel.org
Fixes: 651aaf36a7d7 ("usb: xhci: Handle USB transaction error on address command")
Signed-off-by: Mathias Nyman <mathias.nyman(a)linux.intel.com>
---
drivers/usb/host/xhci.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 0a8cf6c17f82..efdf4c228b8c 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -2837,7 +2837,7 @@ static int xhci_configure_endpoint(struct xhci_hcd *xhci,
xhci->num_active_eps);
return -ENOMEM;
}
- if ((xhci->quirks & XHCI_SW_BW_CHECKING) &&
+ if ((xhci->quirks & XHCI_SW_BW_CHECKING) && !ctx_change &&
xhci_reserve_bandwidth(xhci, virt_dev, command->in_ctx)) {
if ((xhci->quirks & XHCI_EP_LIMIT_QUIRK))
xhci_free_host_resources(xhci, ctrl_ctx);
@@ -4200,8 +4200,10 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev,
mutex_unlock(&xhci->mutex);
ret = xhci_disable_slot(xhci, udev->slot_id);
xhci_free_virt_device(xhci, udev->slot_id);
- if (!ret)
- xhci_alloc_dev(hcd, udev);
+ if (!ret) {
+ if (xhci_alloc_dev(hcd, udev) == 1)
+ xhci_setup_addressable_virt_dev(xhci, udev);
+ }
kfree(command->completion);
kfree(command);
return -EPROTO;
--
2.25.1
1 year, 4 months
- 1
- 0
[PATCH] Revert "ata: libata-scsi: Honor the D_SENSE bit for CK_COND=1 and no error"
by Niklas Cassel
This reverts commit 28ab9769117ca944cb6eb537af5599aa436287a4.
Sense data can be in either fixed format or descriptor format.
SAT-6 revision 1, "10.4.6 Control mode page", defines the D_SENSE bit:
"The SATL shall support this bit as defined in SPC-5 with the following
exception: if the D_ SENSE bit is set to zero (i.e., fixed format sense
data), then the SATL should return fixed format sense data for ATA
PASS-THROUGH commands."
The libata SATL has always kept D_SENSE set to zero by default. (It is
however possible to change the value using a MODE SELECT SG_IO command.)
Failed ATA PASS-THROUGH commands correctly respected the D_SENSE bit,
however, successful ATA PASS-THROUGH commands incorrectly returned the
sense data in descriptor format (regardless of the D_SENSE bit).
Commit 28ab9769117c ("ata: libata-scsi: Honor the D_SENSE bit for
CK_COND=1 and no error") fixed this bug for successful ATA PASS-THROUGH
commands.
However, after commit 28ab9769117c ("ata: libata-scsi: Honor the D_SENSE
bit for CK_COND=1 and no error"), there were bug reports that hdparm,
hddtemp, and udisks were no longer working as expected.
These applications incorrectly assume the returned sense data is in
descriptor format, without even looking at the RESPONSE CODE field in the
returned sense data (to see which format the returned sense data is in).
Considering that there will be broken versions of these applications around
roughly forever, we are stuck with being bug compatible with older kernels.
Cc: stable(a)vger.kernel.org # 4.19+
Reported-by: Stephan Eisvogel <eisvogel(a)seitics.de>
Reported-by: Christian Heusel <christian(a)heusel.eu>
Closes: https://lore.kernel.org/linux-ide/0bf3f2f0-0fc6-4ba5-a420-c0874ef82d64@heus…
Fixes: 28ab9769117c ("ata: libata-scsi: Honor the D_SENSE bit for CK_COND=1 and no error")
Signed-off-by: Niklas Cassel <cassel(a)kernel.org>
---
drivers/ata/libata-scsi.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index d6f5e25e1ed8..473e00a58a8b 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -951,8 +951,19 @@ static void ata_gen_passthru_sense(struct ata_queued_cmd *qc)
&sense_key, &asc, &ascq);
ata_scsi_set_sense(qc->dev, cmd, sense_key, asc, ascq);
} else {
- /* ATA PASS-THROUGH INFORMATION AVAILABLE */
- ata_scsi_set_sense(qc->dev, cmd, RECOVERED_ERROR, 0, 0x1D);
+ /*
+ * ATA PASS-THROUGH INFORMATION AVAILABLE
+ *
+ * Note: we are supposed to call ata_scsi_set_sense(), which
+ * respects the D_SENSE bit, instead of unconditionally
+ * generating the sense data in descriptor format. However,
+ * because hdparm, hddtemp, and udisks incorrectly assume sense
+ * data in descriptor format, without even looking at the
+ * RESPONSE CODE field in the returned sense data (to see which
+ * format the returned sense data is in), we are stuck with
+ * being bug compatible with older kernels.
+ */
+ scsi_build_sense(cmd, 1, RECOVERED_ERROR, 0, 0x1D);
}
}
--
2.46.0
1 year, 4 months
- 4
- 5
Re: Patch "ext4: convert ext4_da_do_write_end() to take a folio" has been added to the 6.6-stable tree
by Matthew Wilcox
On Thu, Aug 15, 2024 at 08:22:16AM -0400, Sasha Levin wrote:
> This is a note to let you know that I've just added the patch titled
>
> ext4: convert ext4_da_do_write_end() to take a folio
>
> to the 6.6-stable tree which can be found at:
> http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum…
>
> The filename of the patch is:
> ext4-convert-ext4_da_do_write_end-to-take-a-folio.patch
> and it can be found in the queue-6.6 subdirectory.
>
> If you, or anyone else, feels it should not be added to the stable tree,
> please let <stable(a)vger.kernel.org> know about it.
I'd think you'd want to backport 83f4414b8f84 to before folios existing,
so you may as well use the same patch for 6.6 as you'd want to use for
those older kernels. ie:
if (unlikely(!page_buffers(page))) {
unlock_page(page);
put_page(page);
return -EIO;
}
but maybe this has already been discussed and I wasn't cc'd on that
discussion.
1 year, 4 months
- 1
- 0
[PATCH 0/3] drm/mediatek: fixes for ovl_adaptor
by Javier Carrasco
The main fix is a possible memory leak on an early exit in the
for_each_child_of_node() loop. That fix has been divided into a patch
that can be backported (a simple of_node_put()), and another one that
uses the scoped variant of the macro, removing the need for any
of_node_put(). That prevents mistakes if new break/return instructions
are added, but the macro might not be available in older kernels.
When at it, an unused header has been dropped.
Signed-off-by: Javier Carrasco <javier.carrasco.cruz(a)gmail.com>
---
Javier Carrasco (3):
drm/mediatek: ovl_adaptor: drop unused mtk_crtc.h header
drm/mediatek: ovl_adaptor: add missing of_node_put()
drm/mediatek: ovl_adaptor: use scoped variant of for_each_child_of_node()
drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
---
base-commit: f76698bd9a8ca01d3581236082d786e9a6b72bb7
change-id: 20240624-mtk_disp_ovl_adaptor_scoped-0702a6b23443
Best regards,
--
Javier Carrasco <javier.carrasco.cruz(a)gmail.com>
1 year, 4 months
- 3
- 3
Re: [PATCH 6.10 00/22] 6.10.6-rc1 review
by Ronald Warsow
Hi Greg
no regressions here on x86_64 (RKL, Intel 11th Gen. CPU)
Thanks
Tested-by: Ronald Warsow <rwarsow(a)gmx.de>
1 year, 4 months
- 1
- 0
[tip: locking/urgent] rtmutex: Drop rt_mutex::wait_lock before scheduling
by tip-bot2 for Roland Xu
The following commit has been merged into the locking/urgent branch of tip:
Commit-ID: d33d26036a0274b472299d7dcdaa5fb34329f91b
Gitweb: https://git.kernel.org/tip/d33d26036a0274b472299d7dcdaa5fb34329f91b
Author: Roland Xu <mu001999(a)outlook.com>
AuthorDate: Thu, 15 Aug 2024 10:58:13 +08:00
Committer: Thomas Gleixner <tglx(a)linutronix.de>
CommitterDate: Thu, 15 Aug 2024 15:38:53 +02:00
rtmutex: Drop rt_mutex::wait_lock before scheduling
rt_mutex_handle_deadlock() is called with rt_mutex::wait_lock held. In the
good case it returns with the lock held and in the deadlock case it emits a
warning and goes into an endless scheduling loop with the lock held, which
triggers the 'scheduling in atomic' warning.
Unlock rt_mutex::wait_lock in the dead lock case before issuing the warning
and dropping into the schedule for ever loop.
[ tglx: Moved unlock before the WARN(), removed the pointless comment,
massaged changelog, added Fixes tag ]
Fixes: 3d5c9340d194 ("rtmutex: Handle deadlock detection smarter")
Signed-off-by: Roland Xu <mu001999(a)outlook.com>
Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de>
Cc: stable(a)vger.kernel.org
Link: https://lore.kernel.org/all/ME0P300MB063599BEF0743B8FA339C2CECC802@ME0P300M…
---
kernel/locking/rtmutex.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c
index 88d08ee..fba1229 100644
--- a/kernel/locking/rtmutex.c
+++ b/kernel/locking/rtmutex.c
@@ -1644,6 +1644,7 @@ static int __sched rt_mutex_slowlock_block(struct rt_mutex_base *lock,
}
static void __sched rt_mutex_handle_deadlock(int res, int detect_deadlock,
+ struct rt_mutex_base *lock,
struct rt_mutex_waiter *w)
{
/*
@@ -1656,10 +1657,10 @@ static void __sched rt_mutex_handle_deadlock(int res, int detect_deadlock,
if (build_ww_mutex() && w->ww_ctx)
return;
- /*
- * Yell loudly and stop the task right here.
- */
+ raw_spin_unlock_irq(&lock->wait_lock);
+
WARN(1, "rtmutex deadlock detected\n");
+
while (1) {
set_current_state(TASK_INTERRUPTIBLE);
rt_mutex_schedule();
@@ -1713,7 +1714,7 @@ static int __sched __rt_mutex_slowlock(struct rt_mutex_base *lock,
} else {
__set_current_state(TASK_RUNNING);
remove_waiter(lock, waiter);
- rt_mutex_handle_deadlock(ret, chwalk, waiter);
+ rt_mutex_handle_deadlock(ret, chwalk, lock, waiter);
}
/*
1 year, 4 months
- 1
- 0
[PATCH 6.6 0/2] Two patches related to CPU hotplugging
by Bart Van Assche
Hi Greg,
Please consider these two patches for the 6.6 kernel. These patches are
unmodified versions of the corresponding upstream commits.
Thank you,
Bart.
David Stevens (1):
genirq/cpuhotplug: Skip suspended interrupts when restoring affinity
Dongli Zhang (1):
genirq/cpuhotplug: Retry with cpu_online_mask when migration fails
kernel/irq/cpuhotplug.c | 27 ++++++++++++++++++++++++---
kernel/irq/manage.c | 12 ++++++++----
2 files changed, 32 insertions(+), 7 deletions(-)
1 year, 4 months
- 2
- 6
[PATCH 6.6.y 0/2] KVM pgtable fixes
by Will Deacon
Hi stable folks,
I noticed that these two KVM/arm64 pgtable fixes are missing from 6.6.y
so I've done the backports. The second one is also needed in 6.1.y but
it needs some tweaks so I'll post a separate backport for that.
Cheers,
Will
Cc: Marc Zyngier <maz(a)kernel.org>
Cc: Oliver Upton <oliver.upton(a)linux.dev>
cc: kvmarm(a)lists.linux.dev
--->8
Will Deacon (2):
KVM: arm64: Don't defer TLB invalidation when zapping table entries
KVM: arm64: Don't pass a TLBI level hint when zapping table entries
arch/arm64/kvm/hyp/pgtable.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
--
2.46.0.184.g6999bdac58-goog
1 year, 4 months
- 2
- 3
[PATCH 6.1.y] KVM: arm64: Don't pass a TLBI level hint when zapping table entries
by Will Deacon
commit 36e008323926036650299cfbb2dca704c7aba849 upstream.
The TLBI level hints are for leaf entries only, so take care not to pass
them incorrectly after clearing a table entry.
Cc: Gavin Shan <gshan(a)redhat.com>
Cc: Marc Zyngier <maz(a)kernel.org>
Cc: Quentin Perret <qperret(a)google.com>
Fixes: 82bb02445de5 ("KVM: arm64: Implement kvm_pgtable_hyp_unmap() at EL2")
Fixes: 6d9d2115c480 ("KVM: arm64: Add support for stage-2 map()/unmap() in generic page-table")
Reviewed-by: Shaoqin Huang <shahuang(a)redhat.com>
Reviewed-by: Marc Zyngier <maz(a)kernel.org>
Link: https://lore.kernel.org/r/20240327124853.11206-3-will@kernel.org
Signed-off-by: Oliver Upton <oliver.upton(a)linux.dev>
Cc: <stable(a)vger.kernel.org> # 6.1.y only
[will@: Use '0' instead of TLBI_TTL_UNKNOWN_to indicate "no level". Force
level to 0 in stage2_put_pte() if we're clearing a table entry.]
Signed-off-by: Will Deacon <will(a)kernel.org>
---
arch/arm64/kvm/hyp/pgtable.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/kvm/hyp/pgtable.c b/arch/arm64/kvm/hyp/pgtable.c
index ae5f6b5ac80f..f0167dc7438f 100644
--- a/arch/arm64/kvm/hyp/pgtable.c
+++ b/arch/arm64/kvm/hyp/pgtable.c
@@ -475,7 +475,7 @@ static int hyp_unmap_walker(u64 addr, u64 end, u32 level, kvm_pte_t *ptep,
kvm_clear_pte(ptep);
dsb(ishst);
- __tlbi_level(vae2is, __TLBI_VADDR(addr, 0), level);
+ __tlbi_level(vae2is, __TLBI_VADDR(addr, 0), 0);
} else {
if (end - addr < granule)
return -EINVAL;
@@ -699,8 +699,14 @@ static void stage2_put_pte(kvm_pte_t *ptep, struct kvm_s2_mmu *mmu, u64 addr,
* Clear the existing PTE, and perform break-before-make with
* TLB maintenance if it was valid.
*/
- if (kvm_pte_valid(*ptep)) {
+ kvm_pte_t pte = *ptep;
+
+ if (kvm_pte_valid(pte)) {
kvm_clear_pte(ptep);
+
+ if (kvm_pte_table(pte, level))
+ level = 0;
+
kvm_call_hyp(__kvm_tlb_flush_vmid_ipa, mmu, addr, level);
}
--
2.46.0.184.g6999bdac58-goog
1 year, 4 months
- 1
- 0
[PATCH v2 1/1] dt-bindings: usb: microchip,usb2514: Fix reference USB device schema
by Alexander Stein
An USB hub is not a HCD, but an USB device. Fix the referenced schema
accordingly.
Fixes: bfbf2e4b77e2 ("dt-bindings: usb: Document the Microchip USB2514 hub")
Cc: stable(a)vger.kernel.org
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>
Signed-off-by: Alexander Stein <alexander.stein(a)ew.tq-group.com>
---
As this USB hub also can contain an USB (ethernet) sub device, I copied
the subdevice part from usb-hcd.yaml.
I had to add 'additionalProperties: true' as well, because I got that warning
upon dt_binding_check otherwise:
> Documentation/devicetree/bindings/usb/microchip,usb2514.yaml:
> ^.*@[0-9a-f]{1,2}$: Missing additionalProperties/unevaluatedProperties constraint
I added a Fixes tag to keep this schema aligned in v6.10 stable tree.
Changes in v2:
* Do not update the example
* Adjust comit message accordingly
* Add Cc for stable
* Collected Krzysztof's R-b
* Shorten the SHA1 of the Fixes tag
.../devicetree/bindings/usb/microchip,usb2514.yaml | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/usb/microchip,usb2514.yaml b/Documentation/devicetree/bindings/usb/microchip,usb2514.yaml
index 245e8c3ce6699..b14e6f37b2987 100644
--- a/Documentation/devicetree/bindings/usb/microchip,usb2514.yaml
+++ b/Documentation/devicetree/bindings/usb/microchip,usb2514.yaml
@@ -10,7 +10,7 @@ maintainers:
- Fabio Estevam <festevam(a)gmail.com>
allOf:
- - $ref: usb-hcd.yaml#
+ - $ref: usb-device.yaml#
properties:
compatible:
@@ -36,6 +36,13 @@ required:
- compatible
- reg
+patternProperties:
+ "^.*@[0-9a-f]{1,2}$":
+ description: The hard wired USB devices
+ type: object
+ $ref: /schemas/usb/usb-device.yaml
+ additionalProperties: true
+
unevaluatedProperties: false
examples:
--
2.34.1
1 year, 4 months
- 1
- 0
[PATCH 6.6 000/568] 6.6.44-rc1 review
by Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.6.44 release.
There are 568 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 Thu, 01 Aug 2024 15:14:54 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.6.44-rc1…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.6.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 6.6.44-rc1
Seth Forshee (DigitalOcean) <sforshee(a)kernel.org>
fs: don't allow non-init s_user_ns for filesystems without FS_USERNS_MOUNT
Leon Romanovsky <leon(a)kernel.org>
nvme-pci: add missing condition check for existence of mapped data
Pavel Begunkov <asml.silence(a)gmail.com>
io_uring: fix io_match_task must_hold
Artem Chernyshev <artem.chernyshev(a)red-soft.ru>
iommu: sprd: Avoid NULL deref in sprd_iommu_hw_en
Thomas Richter <tmricht(a)linux.ibm.com>
s390/cpum_cf: Fix endless loop in CF_DIAG event stop
Gerd Bayer <gbayer(a)linux.ibm.com>
s390/pci: Allow allocation of more than 1 MSI interrupt
Gerd Bayer <gbayer(a)linux.ibm.com>
s390/pci: Refactor arch_setup_msi_irqs()
ethanwu <ethanwu(a)synology.com>
ceph: fix incorrect kmalloc size of pagevec mempool
Dan Carpenter <dan.carpenter(a)linaro.org>
ASoC: TAS2781: Fix tasdev_load_calibrated_data()
Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>
ASoC: Intel: use soc_intel_is_byt_cr() only when IOSF_MBI is reachable
Conor Dooley <conor.dooley(a)microchip.com>
spi: spidev: add correct compatible for Rohm BH2228FV
Venkata Prasad Potturu <venkataprasad.potturu(a)amd.com>
ASoC: sof: amd: fix for firmware reload failure in Vangogh platform
Bart Van Assche <bvanassche(a)acm.org>
nvme-pci: Fix the instructions for disabling power management
Steve Wilkins <steve.wilkins(a)raymarine.com>
spi: microchip-core: ensure TX and RX FIFOs are empty at start of a transfer
Steve Wilkins <steve.wilkins(a)raymarine.com>
spi: microchip-core: fix init function not setting the master and motorola modes
Yang Yingliang <yangyingliang(a)huawei.com>
spi: microchip-core: switch to use modern name
Steve Wilkins <steve.wilkins(a)raymarine.com>
spi: microchip-core: only disable SPI controller when register value change requires it
Steve Wilkins <steve.wilkins(a)raymarine.com>
spi: microchip-core: defer asserting chip select until just before write to TX FIFO
Naga Sureshkumar Relli <nagasuresh.relli(a)microchip.com>
spi: microchip-core: fix the issues in the isr
Daniel Baluta <daniel.baluta(a)nxp.com>
ASoC: SOF: imx8m: Fix DSP control regmap retrieval
Markus Elfring <elfring(a)users.sourceforge.net>
auxdisplay: ht16k33: Drop reference after LED registration
Al Viro <viro(a)zeniv.linux.org.uk>
lirc: rc_dev_get_from_fd(): fix file leak
Al Viro <viro(a)zeniv.linux.org.uk>
powerpc: fix a file leak in kvm_vcpu_ioctl_enable_cap()
Xiao Liang <shaw.leon(a)gmail.com>
apparmor: Fix null pointer deref when receiving skb during sock creation
Dan Carpenter <dan.carpenter(a)linaro.org>
mISDN: Fix a use after free in hfcmulti_tx()
Fred Li <dracodingfly(a)gmail.com>
bpf: Fix a segment issue when downgrading gso_size
Petr Machata <petrm(a)nvidia.com>
net: nexthop: Initialize all fields in dumped nexthops
Simon Horman <horms(a)kernel.org>
net: stmmac: Correct byte order of perfect_match
Shigeru Yoshida <syoshida(a)redhat.com>
tipc: Return non-zero value from tipc_udp_addr2str() on error
Florian Westphal <fw(a)strlen.de>
netfilter: nft_set_pipapo_avx2: disable softinterrupts
Wojciech Drewek <wojciech.drewek(a)intel.com>
ice: Fix recipe read procedure
Johannes Berg <johannes.berg(a)intel.com>
net: bonding: correctly annotate RCU in bond_should_notify_peers()
Ido Schimmel <idosch(a)nvidia.com>
ipv4: Fix incorrect source address in Record Route option
Gregory CLEMENT <gregory.clement(a)bootlin.com>
MIPS: SMP-CPS: Fix address for GCR_ACCESS register for CM3 and later
Liwei Song <liwei.song.lsong(a)gmail.com>
tools/resolve_btfids: Fix comparison of distinct pointer types warning in resolve_btfids
Hou Tao <houtao1(a)huawei.com>
bpf, events: Use prog to emit ksymbol event for main program
Lance Richardson <rlance(a)google.com>
dma: fix call order in dmam_free_coherent
Michal Luczaj <mhal(a)rbox.co>
af_unix: Disable MSG_OOB handling for sockets in sockmap/sockhash
Andrii Nakryiko <andrii(a)kernel.org>
libbpf: Fix no-args func prototype BTF dumping syntax
Puranjay Mohan <puranjay(a)kernel.org>
selftests/bpf: fexit_sleep: Fix stack allocation for arm64
Masahiro Yamada <masahiroy(a)kernel.org>
kbuild: avoid build error when single DTB is turned into composite DTB
Chao Yu <chao(a)kernel.org>
f2fs: fix to update user block counts in block_operations()
Claudiu Beznea <claudiu.beznea.uj(a)bp.renesas.com>
watchdog: rzg2l_wdt: Check return status of pm_runtime_put()
Claudiu Beznea <claudiu.beznea.uj(a)bp.renesas.com>
watchdog: rzg2l_wdt: Use pm_runtime_resume_and_get()
Sheng Yong <shengyong(a)oppo.com>
f2fs: fix start segno of large section
Johannes Berg <johannes.berg(a)intel.com>
um: time-travel: fix signal blocking race/hang
Johannes Berg <johannes.berg(a)intel.com>
um: time-travel: fix time-travel-start option
Sean Anderson <sean.anderson(a)linux.dev>
phy: zynqmp: Enable reference clock correctly
Ma Ke <make24(a)iscas.ac.cn>
phy: cadence-torrent: Check return value on register read
Vignesh Raghavendra <vigneshr(a)ti.com>
dmaengine: ti: k3-udma: Fix BCHAN count with UHC and HC channels
Jeongjun Park <aha310510(a)gmail.com>
jfs: Fix array-index-out-of-bounds in diFree
Douglas Anderson <dianders(a)chromium.org>
kdb: Use the passed prompt in kdb_position_cursor()
Arnd Bergmann <arnd(a)arndb.de>
kdb: address -Wformat-security warnings
Chao Yu <chao(a)kernel.org>
f2fs: fix to truncate preallocated blocks in f2fs_file_open()
Gerald Schaefer <gerald.schaefer(a)linux.ibm.com>
s390/mm: Fix VM_FAULT_HWPOISON handling in do_exception()
Lukas Wunner <lukas(a)wunner.de>
PCI/DPC: Fix use-after-free on concurrent DPC and hot-removal
Ira Weiny <ira.weiny(a)intel.com>
PCI: Introduce cleanup helpers for device reference counts and locks
Johannes Berg <johannes.berg(a)intel.com>
wifi: mac80211: track capability/opmode NSS separately
Yu Zhao <yuzhao(a)google.com>
mm/mglru: fix ineffective protection calculation
Ryusuke Konishi <konishi.ryusuke(a)gmail.com>
nilfs2: handle inconsistent state in nilfs_btnode_create_block()
Linus Torvalds <torvalds(a)linux-foundation.org>
minmax: scsi: fix mis-use of 'clamp()' in sr.c
WangYuli <wangyuli(a)uniontech.com>
Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x13d3:0x3591
Hilda Wu <hildawu(a)realtek.com>
Bluetooth: btusb: Add RTL8852BE device 0489:e125 to device tables
Lucas Stach <l.stach(a)pengutronix.de>
video: logo: Drop full path of the input filename in generated file
Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de>
lib/build_OID_registry: don't mention the full path of the script in output
Ilya Dryomov <idryomov(a)gmail.com>
rbd: don't assume RBD_LOCK_STATE_LOCKED for exclusive mappings
Ilya Dryomov <idryomov(a)gmail.com>
rbd: rename RBD_LOCK_STATE_RELEASING and releasing_wait
Dragan Simic <dsimic(a)manjaro.org>
drm/panfrost: Mark simple_ondemand governor as softdep
Lucas Stach <l.stach(a)pengutronix.de>
drm/etnaviv: don't block scheduler when GPU is still active
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
MIPS: Loongson64: Test register availability before use
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
MIPS: Loongson64: reset: Prioritise firmware service
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
MIPS: Loongson64: Remove memory node for builtin-dtb
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
MIPS: Loongson64: env: Hook up Loongsson-2K
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
MIPS: dts: loongson: Fix GMAC phy node
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
MIPS: ip30: ip30-console: Add missing include
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
MIPS: dts: loongson: Add ISA node
Aleksandr Mishin <amishin(a)t-argos.ru>
remoteproc: imx_rproc: Fix refcount mistake in imx_rproc_addr_init
Aleksandr Mishin <amishin(a)t-argos.ru>
remoteproc: imx_rproc: Skip over memory region when node value is NULL
Gwenael Treuveur <gwenael.treuveur(a)foss.st.com>
remoteproc: stm32_rproc: Fix mailbox interrupts queuing
Ilya Dryomov <idryomov(a)gmail.com>
rbd: don't assume rbd_is_lock_owner() for exclusive mappings
Eric Biggers <ebiggers(a)kernel.org>
dm-verity: fix dm_is_verity_target() when dm-verity is builtin
Michael Ellerman <mpe(a)ellerman.id.au>
selftests/sigaltstack: Fix ppc64 GCC build
Bart Van Assche <bvanassche(a)acm.org>
RDMA/iwcm: Fix a use-after-free related to destroying CM IDs
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
platform: mips: cpu_hwmon: Disable driver on unsupported hardware
Thomas Gleixner <tglx(a)linutronix.de>
watchdog/perf: properly initialize the turbo mode timestamp and rearm counter
Joy Chakraborty <joychakr(a)google.com>
rtc: abx80x: Fix return value of nvmem callback on read
Joy Chakraborty <joychakr(a)google.com>
rtc: isl1208: Fix return value of nvmem callbacks
Imre Deak <imre.deak(a)intel.com>
drm/i915/dp: Don't switch the LTTPR mode on an active link
Imre Deak <imre.deak(a)intel.com>
drm/i915/dp: Reset intel_dp->link_trained before retraining the link
Ma Ke <make24(a)iscas.ac.cn>
drm/amd/amdgpu: Fix uninitialized variable warnings
ZhenGuo Yin <zhenguo.yin(a)amd.com>
drm/amdgpu: reset vm state machine after gpu reset(vram lost)
Wayne Lin <Wayne.Lin(a)amd.com>
drm/dp_mst: Fix all mstb marked as not probed after suspend/resume
Thomas Zimmermann <tzimmermann(a)suse.de>
drm/udl: Remove DRM_CONNECTOR_POLL_HPD
Alex Deucher <alexander.deucher(a)amd.com>
drm/amdgpu/sdma5.2: Update wptr registers as well as doorbell
Nitin Gote <nitin.r.gote(a)intel.com>
drm/i915/gt: Do not consider preemption during execlists_dequeue for gen8
Adrian Hunter <adrian.hunter(a)intel.com>
perf/x86/intel/pt: Fix a topa_entry base address calculation
Marco Cavenati <cavenati.marco(a)gmail.com>
perf/x86/intel/pt: Fix topa_entry base length
Kan Liang <kan.liang(a)linux.intel.com>
perf/x86/intel/ds: Fix non 0 retire latency on Raptorlake
Kan Liang <kan.liang(a)linux.intel.com>
perf/x86/intel/uncore: Fix the bits of the CHA extended umask for SPR
Kan Liang <kan.liang(a)linux.intel.com>
perf stat: Fix the hard-coded metrics calculation on the hybrid
Frederic Weisbecker <frederic(a)kernel.org>
perf: Fix event leak upon exec and file release
Frederic Weisbecker <frederic(a)kernel.org>
perf: Fix event leak upon exit
Nilesh Javali <njavali(a)marvell.com>
scsi: qla2xxx: validate nvme_local_port correctly
Shreyas Deodhar <sdeodhar(a)marvell.com>
scsi: qla2xxx: Complete command early within lock
Quinn Tran <qutran(a)marvell.com>
scsi: qla2xxx: Fix flash read failure
Quinn Tran <qutran(a)marvell.com>
scsi: qla2xxx: Reduce fabric scan duplicate code
Quinn Tran <qutran(a)marvell.com>
scsi: qla2xxx: Use QP lock to search for bsg
Shreyas Deodhar <sdeodhar(a)marvell.com>
scsi: qla2xxx: Fix for possible memory corruption
Quinn Tran <qutran(a)marvell.com>
scsi: qla2xxx: Unable to act on RSCN for port online
Manish Rangankar <mrangankar(a)marvell.com>
scsi: qla2xxx: During vport delete send async logout explicitly
Justin Tee <justin.tee(a)broadcom.com>
scsi: lpfc: Allow DEVICE_RECOVERY mode after RSCN receipt if in PRLI_ISSUE state
Joy Chakraborty <joychakr(a)google.com>
rtc: cmos: Fix return value of nvmem callbacks
Tvrtko Ursulin <tvrtko.ursulin(a)igalia.com>
mm/numa_balancing: teach mpol_to_str about the balancing mode
Shenwei Wang <shenwei.wang(a)nxp.com>
irqchip/imx-irqsteer: Handle runtime power management correctly
Herve Codina <herve.codina(a)bootlin.com>
irqdomain: Fixed unbalanced fwnode get and put
Zijun Hu <quic_zijuhu(a)quicinc.com>
devres: Fix memory leakage caused by driver API devm_free_percpu()
Zijun Hu <quic_zijuhu(a)quicinc.com>
devres: Fix devm_krealloc() wasting memory
Ahmed Zaki <ahmed.zaki(a)intel.com>
ice: Add a per-VF limit on number of FDIR filters
Bailey Forrest <bcf(a)google.com>
gve: Fix an edge case for TSO skb validity check
Zijun Hu <quic_zijuhu(a)quicinc.com>
kobject_uevent: Fix OOB access within zap_modalias_env()
Takashi Iwai <tiwai(a)suse.de>
ASoC: amd: yc: Support mic on Lenovo Thinkpad E16 Gen 2
Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com>
ASoC: SOF: ipc4-topology: Preserve the DMA Link ID for ChainDMA on unprepare
Nathan Chancellor <nathan(a)kernel.org>
kbuild: Fix '-S -c' in x86 stack protector scripts
Ross Lagerwall <ross.lagerwall(a)citrix.com>
decompress_bunzip2: fix rare decompression failure
Ram Tummala <rtummala(a)nvidia.com>
mm: fix old/young bit handling in the faulting path
Yang Yang <yang.yang(a)vivo.com>
block: fix deadlock between sd_remove & sd_release
Fedor Pchelkin <pchelkin(a)ispras.ru>
ubi: eba: properly rollback inside self_check_eba
Bastien Curutchet <bastien.curutchet(a)bootlin.com>
clk: davinci: da8xx-cfgchip: Initialize clk_init_data before use
Sunmin Jeong <s_min.jeong(a)samsung.com>
f2fs: use meta inode for GC of COW file
Sunmin Jeong <s_min.jeong(a)samsung.com>
f2fs: use meta inode for GC of atomic file
Chao Yu <chao(a)kernel.org>
f2fs: fix return value of f2fs_convert_inline_inode()
Chao Yu <chao(a)kernel.org>
f2fs: fix to don't dirty inode for readonly filesystem
Chao Yu <chao(a)kernel.org>
f2fs: fix to force buffered IO on inline_data inode
Herve Codina <herve.codina(a)bootlin.com>
ASoC: fsl: fsl_qmc_audio: Check devm_kasprintf() returned value
Saurav Kashyap <skashyap(a)marvell.com>
scsi: qla2xxx: Return ENOBUFS if sg_cnt is more than one for ELS cmds
Huacai Chen <chenhuacai(a)kernel.org>
fs/ntfs3: Update log->page_{mask,bits} if log->page_size changed
Qiang Ma <maqianga(a)uniontech.com>
efi/libstub: Zero initialize heap allocated struct screen_info
Johannes Berg <johannes.berg(a)intel.com>
hostfs: fix dev_t handling
tuhaowen <tuhaowen(a)uniontech.com>
dev/parport: fix the array out-of-bounds risk
Carlos Llamas <cmllamas(a)google.com>
binder: fix hang of unregistered readers
Huacai Chen <chenhuacai(a)kernel.org>
PCI: loongson: Enable MSI in LS7A Root Complex
Manivannan Sadhasivam <mani(a)kernel.org>
PCI: rockchip: Use GPIOD_OUT_LOW flag while requesting ep_gpio
Niklas Cassel <cassel(a)kernel.org>
PCI: dw-rockchip: Fix initial PERST# GPIO value
Wei Liu <wei.liu(a)kernel.org>
PCI: hv: Return zero, not garbage, when reading PCI_INTERRUPT_PIN
John David Anglin <dave(a)mx3210.local>
parisc: Fix warning at drivers/pci/msi/msi.h:121
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
hwrng: amd - Convert PCIBIOS_* return codes to errnos
Alan Stern <stern(a)rowland.harvard.edu>
tools/memory-model: Fix bug in lock.cat
wangdicheng <wangdicheng(a)kylinos.cn>
ALSA: usb-audio: Add a quirk for Sonix HD USB Camera
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Move HD Webcam quirk to the right place
wangdicheng <wangdicheng(a)kylinos.cn>
ALSA: usb-audio: Fix microphone sound on HD webcam.
Takashi Iwai <tiwai(a)suse.de>
ALSA: ump: Force 1 Group for MIDI1 FBs
Takashi Iwai <tiwai(a)suse.de>
ALSA: ump: Don't update FB name for static blocks
Sean Christopherson <seanjc(a)google.com>
KVM: nVMX: Request immediate exit iff pending nested event needs injection
Sean Christopherson <seanjc(a)google.com>
KVM: VMX: Split out the non-virtualization part of vmx_interrupt_blocked()
Wentong Wu <wentong.wu(a)intel.com>
media: ivsc: csi: don't count privacy on as error
Ricardo Ribalda <ribalda(a)chromium.org>
media: uvcvideo: Fix integer overflow calculating timestamp
Jan Kara <jack(a)suse.cz>
jbd2: avoid infinite transaction commit loop
Jan Kara <jack(a)suse.cz>
jbd2: precompute number of transaction descriptor blocks
Jan Kara <jack(a)suse.cz>
jbd2: make jbd2_journal_get_max_txn_bufs() internal
Harshit Mogalapalli <harshit.m.mogalapalli(a)oracle.com>
media: imx-pxp: Fix ERR_PTR dereference in pxp_probe()
Wentong Wu <wentong.wu(a)intel.com>
media: ivsc: csi: add separate lock for v4l2 control handler
Javier Carrasco <javier.carrasco.cruz(a)gmail.com>
leds: mt6360: Fix memory leak in mt6360_init_isnk_properties()
Ofir Gal <ofir.gal(a)volumez.com>
md/md-bitmap: fix writing non bitmap pages
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
leds: ss4200: Convert PCIBIOS_* return codes to errnos
Jay Buddhabhatti <jay.buddhabhatti(a)amd.com>
drivers: soc: xilinx: check return status of get_api_version()
Bitterblue Smith <rtl8821cerfe2(a)gmail.com>
wifi: rtw88: usb: Fix disconnection after beacon loss
Rafael Beims <rafael.beims(a)toradex.com>
wifi: mwifiex: Fix interface type change
Mickaël Salaün <mic(a)digikod.net>
selftests/landlock: Add cred_transfer test
levi.yun <yeoreum.yun(a)arm.com>
trace/pid_list: Change gfp flags in pid_list_fill_irq()
Pavel Begunkov <asml.silence(a)gmail.com>
io_uring: tighten task exit cancellations
Baokun Li <libaokun1(a)huawei.com>
ext4: make sure the first directory block is not a hole
Baokun Li <libaokun1(a)huawei.com>
ext4: check dot and dotdot of dx_root before making dir indexed
Paolo Pisati <p.pisati(a)gmail.com>
m68k: amiga: Turn off Warp1260 interrupts during boot
Jan Kara <jack(a)suse.cz>
udf: Avoid using corrupted block bitmap buffer
Frederic Weisbecker <frederic(a)kernel.org>
task_work: Introduce task_work_cancel() again
Frederic Weisbecker <frederic(a)kernel.org>
task_work: s/task_work_cancel()/task_work_cancel_func()/
Steve French <stfrench(a)microsoft.com>
cifs: mount with "unix" mount option for SMB1 incorrectly handled
Steve French <stfrench(a)microsoft.com>
cifs: fix reconnect with SMB1 UNIX Extensions
Steve French <stfrench(a)microsoft.com>
cifs: fix potential null pointer use in destroy_workqueue in init_cifs error path
Fedor Pchelkin <pchelkin(a)ispras.ru>
apparmor: use kvfree_sensitive to free data->data
Sung Joon Kim <sungjoon.kim(a)amd.com>
drm/amd/display: Check for NULL pointer
Shreyas Deodhar <sdeodhar(a)marvell.com>
scsi: qla2xxx: Fix optrom version displayed in FDMI
Ma Ke <make24(a)iscas.ac.cn>
drm/gma500: fix null pointer dereference in psb_intel_lvds_get_modes
Ma Ke <make24(a)iscas.ac.cn>
drm/gma500: fix null pointer dereference in cdv_intel_lvds_get_modes
Pavel Begunkov <asml.silence(a)gmail.com>
io_uring/io-wq: limit retrying worker initialisation
Jan Kara <jack(a)suse.cz>
ext2: Verify bitmap and itable block numbers before using them
Chao Yu <chao(a)kernel.org>
hfs: fix to initialize fields of hfs_inode_info after hfs_alloc_inode()
Igor Pylypiv <ipylypiv(a)google.com>
ata: libata-scsi: Honor the D_SENSE bit for CK_COND=1 and no error
Igor Pylypiv <ipylypiv(a)google.com>
ata: libata-scsi: Do not overwrite valid sense data when CK_COND=1
Dikshita Agarwal <quic_dikshita(a)quicinc.com>
media: venus: fix use after free in vdec_close
Joe Hattori <joe(a)pf.is.s.u-tokyo.ac.jp>
char: tpm: Fix possible memory leak in tpm_bios_measurements_open()
Igor Pylypiv <ipylypiv(a)google.com>
ata: libata-scsi: Fix offsets for the fixed format sense data
Eric Sandeen <sandeen(a)redhat.com>
fuse: verify {g,u}id mount options correctly
Tejun Heo <tj(a)kernel.org>
sched/fair: set_load_weight() must also call reweight_task() for SCHED_IDLE tasks
Chuck Lever <chuck.lever(a)oracle.com>
NFSD: Support write delegations in LAYOUTGET
Nicolas Dichtel <nicolas.dichtel(a)6wind.com>
ipv6: take care of scope when choosing the src addr
Nicolas Dichtel <nicolas.dichtel(a)6wind.com>
ipv4: fix source address selection with route leak
Pavel Begunkov <asml.silence(a)gmail.com>
kernel: rerun task_work while freezing in get_signal()
Filipe Manana <fdmanana(a)suse.com>
btrfs: fix extent map use-after-free when adding pages to compressed bio
Chengen Du <chengen.du(a)canonical.com>
af_packet: Handle outgoing VLAN packets without hardware offloading
Breno Leitao <leitao(a)debian.org>
net: netconsole: Disable target before netpoll cleanup
Yu Liao <liaoyu15(a)huawei.com>
tick/broadcast: Make takeover of broadcast hrtimer reliable
Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>
dt-bindings: thermal: correct thermal zone node name limit
Sungjong Seo <sj1557.seo(a)samsung.com>
exfat: fix potential deadlock on __exfat_get_dentry_set
Ard Biesheuvel <ardb(a)kernel.org>
x86/efistub: Revert to heap allocated boot_params for PE entrypoint
Ard Biesheuvel <ardb(a)kernel.org>
x86/efistub: Avoid returning EFI_SUCCESS on error
Yu Zhao <yuzhao(a)google.com>
mm/mglru: fix overshooting shrinker memory
Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp>
mm: mmap_lock: replace get_memcg_path_buf() with on-stack buffer
Yu Zhao <yuzhao(a)google.com>
mm/mglru: fix div-by-zero in vmpressure_calc_level()
Miaohe Lin <linmiaohe(a)huawei.com>
mm/hugetlb: fix possible recursive locking detected warning
Aristeu Rozanski <aris(a)redhat.com>
hugetlb: force allocating surplus hugepages on mempolicy allowed nodes
Jann Horn <jannh(a)google.com>
landlock: Don't lose track of restrictions on cred_transfer
Tiezhu Yang <yangtiezhu(a)loongson.cn>
LoongArch: Check TIF_LOAD_WATCH to enable user space watchpoint
Yang Yang <yang.yang(a)vivo.com>
sbitmap: fix io hung due to race on sbitmap_word::cleared
linke li <lilinke99(a)qq.com>
sbitmap: use READ_ONCE to access map->word
Carlos López <clopez(a)suse.de>
s390/dasd: fix error checks in dasd_copy_pair_store()
Christophe Leroy <christophe.leroy(a)csgroup.eu>
powerpc/8xx: fix size given to set_huge_pte_at()
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Keep runs for $MFT::$ATTR_DATA and $MFT::$ATTR_BITMAP
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Missed error return
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Fix the format of the "nocase" mount option
Csókás, Bence <csokas.bence(a)prolan.hu>
rtc: interface: Add RTC offset to alarm after fix-up
Ryusuke Konishi <konishi.ryusuke(a)gmail.com>
nilfs2: avoid undefined behavior in nilfs_cnt32_ge macro
David Hildenbrand <david(a)redhat.com>
fs/proc/task_mmu: properly detect PM_MMAP_EXCLUSIVE per page of PMD-mapped THPs
David Hildenbrand <david(a)redhat.com>
fs/proc/task_mmu: don't indicate PM_MMAP_EXCLUSIVE without PM_PRESENT
Hui Zhu <teawater(a)antgroup.com>
fs/proc/task_mmu.c: add_to_pagemap: remove useless parameter addr
David Hildenbrand <david(a)redhat.com>
fs/proc/task_mmu: indicate PM_FILE for PMD-mapped file THP
Geert Uytterhoeven <geert+renesas(a)glider.be>
pinctrl: renesas: r8a779g0: Fix TPU suffixes
Geert Uytterhoeven <geert+renesas(a)glider.be>
pinctrl: renesas: r8a779g0: Fix TCLK suffixes
Geert Uytterhoeven <geert+renesas(a)glider.be>
pinctrl: renesas: r8a779g0: FIX PWM suffixes
Geert Uytterhoeven <geert+renesas(a)glider.be>
pinctrl: renesas: r8a779g0: Fix IRQ suffixes
Geert Uytterhoeven <geert+renesas(a)glider.be>
pinctrl: renesas: r8a779g0: Fix (H)SCIF3 suffixes
Geert Uytterhoeven <geert+renesas(a)glider.be>
pinctrl: renesas: r8a779g0: Fix (H)SCIF1 suffixes
Geert Uytterhoeven <geert+renesas(a)glider.be>
pinctrl: renesas: r8a779g0: Fix FXR_TXEN[AB] suffixes
Geert Uytterhoeven <geert+renesas(a)glider.be>
pinctrl: renesas: r8a779g0: Fix CANFD5 suffix
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Fix field-spanning write in INDEX_HDR
Andy Shevchenko <andriy.shevchenko(a)linux.intel.com>
fs/ntfs3: Drop stray '\' (backslash) in formatting string
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Correct undo if ntfs_create_inode failed
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Replace inode_trylock with inode_lock
Peng Fan <peng.fan(a)nxp.com>
pinctrl: freescale: mxs: Fix refcount of child
Yang Yingliang <yangyingliang(a)huawei.com>
pinctrl: ti: ti-iodelay: fix possible memory leak when pinctrl_enable() fails
Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de>
pinctrl: ti: ti-iodelay: Drop if block with always false condition
Yang Yingliang <yangyingliang(a)huawei.com>
pinctrl: single: fix possible memory leak when pinctrl_enable() fails
Yang Yingliang <yangyingliang(a)huawei.com>
pinctrl: core: fix possible memory leak when pinctrl_enable() fails
Dmitry Yashin <dmt.yashin(a)gmail.com>
pinctrl: rockchip: update rk3308 iomux routes
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Add missing .dirty_folio in address_space_operations
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Fix getting file type
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Missed NI_FLAG_UPDATE_PARENT setting
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Deny getting attr data block in compressed frame
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Fix transform resident to nonresident for compressed files
Konstantin Komarov <almaz.alexandrovich(a)paragon-software.com>
fs/ntfs3: Merge synonym COMPRESSION_UNIT and NTFS_LZNT_CUNIT
Martin Willi <martin(a)strongswan.org>
net: dsa: b53: Limit chip-wide jumbo frame config to CPU ports
Martin Willi <martin(a)strongswan.org>
net: dsa: mv88e6xxx: Limit chip-wide frame size config to CPU ports
Ido Schimmel <idosch(a)nvidia.com>
ipv4: Fix incorrect TOS in fibmatch route get reply
Ido Schimmel <idosch(a)nvidia.com>
ipv4: Fix incorrect TOS in route get reply
Pablo Neira Ayuso <pablo(a)netfilter.org>
net: flow_dissector: use DEBUG_NET_WARN_ON_ONCE
Joshua Washington <joshwash(a)google.com>
gve: Fix XDP TX completion handling when counters overflow
Chen Hanxiao <chenhx.fnst(a)fujitsu.com>
ipvs: properly dereference pe in ip_vs_add_service
Florian Westphal <fw(a)strlen.de>
netfilter: nf_set_pipapo: fix initial map fill
Florian Westphal <fw(a)strlen.de>
netfilter: nft_set_pipapo: constify lookup fn args where possible
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: ctnetlink: use helper function to calculate expect ID
Jack Wang <jinpu.wang(a)ionos.com>
bnxt_re: Fix imm_data endianness
David Ahern <dsahern(a)kernel.org>
RDMA: Fix netdev tracker in ib_device_set_netdev
Jules Irenge <jbi.octave(a)gmail.com>
RDMA/core: Remove NULL check before dev_{put, hold}
Jon Pan-Doh <pandoh(a)google.com>
iommu/vt-d: Fix identity map bounds in si_domain_init()
Chengchang Tang <tangchengchang(a)huawei.com>
RDMA/hns: Fix insufficient extend DB for VFs.
Chengchang Tang <tangchengchang(a)huawei.com>
RDMA/hns: Fix undifined behavior caused by invalid max_sge
Chengchang Tang <tangchengchang(a)huawei.com>
RDMA/hns: Fix shift-out-bounds when max_inline_data is 0
Chengchang Tang <tangchengchang(a)huawei.com>
RDMA/hns: Fix missing pagesize and alignment check in FRMR
Junxian Huang <huangjunxian6(a)hisilicon.com>
RDMA/hns: Fix unmatch exception handling when init eq table fails
Junxian Huang <huangjunxian6(a)hisilicon.com>
RDMA/hns: Check atomic wr length
Nick Bowler <nbowler(a)draconx.ca>
macintosh/therm_windtunnel: fix module unload.
Michael Ellerman <mpe(a)ellerman.id.au>
powerpc/xmon: Fix disassembly CPU feature checks
Frank Li <Frank.Li(a)nxp.com>
PCI: dwc: Fix index 0 incorrectly being interpreted as a free ATU slot
Manivannan Sadhasivam <mani(a)kernel.org>
PCI: qcom-ep: Disable resources unconditionally during PERST# assert
Dominique Martinet <dominique.martinet(a)atmark-techno.com>
MIPS: Octeron: remove source file executable bit
Lorenzo Bianconi <lorenzo(a)kernel.org>
clk: en7523: fix rate divider for slic and spi clocks
Stephen Boyd <swboyd(a)chromium.org>
clk: qcom: Park shared RCGs upon registration
Chen Ni <nichen(a)iscas.ac.cn>
clk: qcom: kpss-xcc: Return of_clk_add_hw_provider to transfer the error
Nivas Varadharajan Mugunthakumar <nivasx.varadharajan.mugunthakumar(a)intel.com>
crypto: qat - extend scope of lock in adf_cfg_add_key_value_param()
Heiko Stuebner <heiko.stuebner(a)cherry.de>
nvmem: rockchip-otp: set add_legacy_fixed_of_cells config option
Denis Arefev <arefev(a)swemel.ru>
net: missing check virtio
Michael S. Tsirkin <mst(a)redhat.com>
vhost/vsock: always initialize seqpacket_allow
Dan Carpenter <dan.carpenter(a)linaro.org>
PCI: endpoint: Fix error handling in epf_ntb_epc_cleanup()
Dan Carpenter <dan.carpenter(a)linaro.org>
PCI: endpoint: Clean up error handling in vpci_scan_bus()
Aleksandr Mishin <amishin(a)t-argos.ru>
ASoC: amd: Adjust error handling in case of absent codec device
Dmitry Torokhov <dmitry.torokhov(a)gmail.com>
Input: elan_i2c - do not leave interrupt disabled on suspend failure
Leon Romanovsky <leon(a)kernel.org>
RDMA/device: Return error earlier if port in not valid
Arnd Bergmann <arnd(a)arndb.de>
mtd: make mtd_test.c a separate module
Chen Ni <nichen(a)iscas.ac.cn>
ASoC: max98088: Check for clk_prepare_enable() error
Nathan Lynch <nathanl(a)linux.ibm.com>
powerpc/prom: Add CPU info to hardware description string later
Harald Freudenberger <freude(a)linux.ibm.com>
hwrng: core - Fix wrong quality calculation at hw rng registration
Huai-Yuan Liu <qq810974084(a)gmail.com>
scsi: lpfc: Fix a possible null pointer dereference
Aleksandr Mishin <amishin(a)t-argos.ru>
ASoC: qcom: Adjust issues in case of DT error in asoc_qcom_lpass_cpu_platform_probe()
Honggang LI <honggangli(a)163.com>
RDMA/rxe: Don't set BTH_ACK_MASK for UC or UD QPs
Or Har-Toov <ohartoov(a)nvidia.com>
RDMA/mlx5: Use sq timestamp as QP timestamp when RoCE is disabled
Leon Romanovsky <leon(a)kernel.org>
RDMA/mlx4: Fix truncated output warning in alias_GUID.c
Leon Romanovsky <leon(a)kernel.org>
RDMA/mlx4: Fix truncated output warning in mad.c
Andrei Lalaev <andrei.lalaev(a)anton-paar.com>
Input: qt1050 - handle CHIP_ID reading error
Konrad Dybcio <konrad.dybcio(a)linaro.org>
interconnect: qcom: qcm2290: Fix mas_snoc_bimc RPM master ID
Taniya Das <quic_tdas(a)quicinc.com>
clk: qcom: gpucc-sa8775p: Update wait_val fields for GPU GDSC's
Taniya Das <quic_tdas(a)quicinc.com>
clk: qcom: gpucc-sa8775p: Park RCG's clk source at XO during disable
Taniya Das <quic_tdas(a)quicinc.com>
clk: qcom: gpucc-sa8775p: Remove the CLK_IS_CRITICAL and ALWAYS_ON flags
Taniya Das <quic_tdas(a)quicinc.com>
clk: qcom: gcc-sa8775p: Update the GDSC wait_val fields and flags
Taniya Das <quic_tdas(a)quicinc.com>
clk: qcom: gpucc-sm8350: Park RCG's clk source at XO during disable
Leon Romanovsky <leon(a)kernel.org>
RDMA/cache: Release GID table even if leak is detected
Neil Armstrong <neil.armstrong(a)linaro.org>
usb: typec-mux: nb7vpq904m: unregister typec switch on probe error and remove
Simon Trimmer <simont(a)opensource.cirrus.com>
ASoC: cs35l56: Accept values greater than 0 as IRQ numbers
Shenghao Ding <shenghao-ding(a)ti.com>
ASoc: tas2781: Enable RCA-based playback without DSP firmware download
Chiara Meiohas <cmeiohas(a)nvidia.com>
RDMA/mlx5: Set mkeys for dmabuf at PAGE_SIZE
James Clark <james.clark(a)arm.com>
coresight: Fix ref leak when of_coresight_parse_endpoint() fails
Shivaprasad G Bhat <sbhat(a)linux.ibm.com>
KVM: PPC: Book3S HV: Fix the get_one_reg of SDAR
Shivaprasad G Bhat <sbhat(a)linux.ibm.com>
KVM: PPC: Book3S HV: Fix the set_one_reg for MMCR3
Antoniu Miclaus <antoniu.miclaus(a)analog.com>
iio: frequency: adrf6780: rm clk provider include
Taniya Das <quic_tdas(a)quicinc.com>
clk: qcom: camcc-sc7280: Add parent dependency to all camera GDSCs
Taniya Das <quic_tdas(a)quicinc.com>
clk: qcom: gcc-sc7280: Update force mem core bit for UFS ICE clock
Minwoo Im <minwoo.im(a)samsung.com>
scsi: ufs: mcq: Fix missing argument 'hba' in MCQ_OPR_OFFSET_n
Marek Vasut <marek.vasut+renesas(a)mailbox.org>
PCI: rcar: Demote WARN() to dev_warn_ratelimited() in rcar_pcie_wakeup()
Aleksandr Mishin <amishin(a)t-argos.ru>
PCI: keystone: Fix NULL pointer dereference in case of DT error in ks_pcie_setup_rc_app_regs()
Siddharth Vadapalli <s-vadapalli(a)ti.com>
PCI: keystone: Don't enable BAR 0 for AM654x
Siddharth Vadapalli <s-vadapalli(a)ti.com>
PCI: keystone: Relocate ks_pcie_set/clear_dbi_mode()
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
PCI: Fix resource double counting on remove & rescan
Chenyuan Yang <chenyuan0y(a)gmail.com>
iio: Fix the sorting functionality in iio_gts_build_avail_time_table
Benjamin Coddington <bcodding(a)redhat.com>
SUNRPC: Fixup gss_status tracepoint error output
Andreas Larsson <andreas(a)gaisler.com>
sparc64: Fix incorrect function signature and add prototype for prom_cif_init
Dan Carpenter <dan.carpenter(a)linaro.org>
leds: flash: leds-qcom-flash: Test the correct variable in init
Jan Kara <jack(a)suse.cz>
ext4: avoid writing unitialized memory to disk in EA inodes
Luis Henriques (SUSE) <luis.henriques(a)linux.dev>
ext4: don't track ranges in fast_commit if inode has inlined data
Olga Kornievskaia <kolga(a)netapp.com>
NFSv4.1 another fix for EXCHGID4_FLAG_USE_PNFS_DS for DS server
NeilBrown <neilb(a)suse.de>
SUNRPC: avoid soft lockup when transmitting UDP to reachable server.
Chuck Lever <chuck.lever(a)oracle.com>
xprtrdma: Fix rpcrdma_reqs_reset()
Javier Carrasco <javier.carrasco.cruz(a)gmail.com>
mfd: omap-usb-tll: Use struct_size to allocate tll
Arnd Bergmann <arnd(a)arndb.de>
mfd: rsmu: Split core code into separate module
Adrian Hunter <adrian.hunter(a)intel.com>
perf intel-pt: Fix exclude_guest setting
Adrian Hunter <adrian.hunter(a)intel.com>
perf intel-pt: Fix aux_watermark calculation for 64-bit size
Dikshita Agarwal <quic_dikshita(a)quicinc.com>
media: venus: flush all buffers in output plane streamoff
Michael Walle <mwalle(a)kernel.org>
drm/mediatek/dp: Fix spurious kfree()
Jani Nikula <jani.nikula(a)intel.com>
drm/mediatek/dp: switch to ->edid_read callback
Luis Henriques (SUSE) <luis.henriques(a)linux.dev>
ext4: fix infinite loop when replaying fast_commit
Hsiao Chien Sung <shawn.sung(a)mediatek.com>
drm/mediatek: Remove less-than-zero comparison of an unsigned value
Luca Ceresoli <luca.ceresoli(a)bootlin.com>
Revert "leds: led-core: Fix refcount leak in of_led_get()"
Chen Ni <nichen(a)iscas.ac.cn>
drm/qxl: Add check for drm_cvt_mode
Lucas Stach <l.stach(a)pengutronix.de>
drm/etnaviv: fix DMA direction handling for cached RW buffers
Namhyung Kim <namhyung(a)kernel.org>
perf report: Fix condition in sort__sym_cmp()
Junhao He <hejunhao3(a)huawei.com>
perf pmus: Fixes always false when compare duplicates aliases
James Clark <james.clark(a)arm.com>
perf test: Make test_arm_callgraph_fp.sh more robust
Abhinav Kumar <quic_abhinavk(a)quicinc.com>
drm/msm/dpu: drop validity checks for clear_pending_flush() ctl op
Jonathan Marek <jonathan(a)marek.ca>
drm/msm/dsi: set VIDEO_COMPRESSION_MODE_CTRL_WC
Hans de Goede <hdegoede(a)redhat.com>
leds: trigger: Unregister sysfs attributes before calling deactivate()
Ming Qian <ming.qian(a)nxp.com>
media: imx-jpeg: Drop initial source change event if capture has been setup
Hsiao Chien Sung <shawn.sung(a)mediatek.com>
drm/mediatek: Add OVL compatible name for MT8195
Hsiao Chien Sung <shawn.sung(a)mediatek.com>
drm/mediatek: Turn off the layers with zero width or height
Hsiao Chien Sung <shawn.sung(a)mediatek.com>
drm/mediatek: Fix destination alpha error in OVL
Hsiao Chien Sung <shawn.sung(a)mediatek.com>
drm/mediatek: Fix XRGB setting error in Mixer
Hsiao Chien Sung <shawn.sung(a)mediatek.com>
drm/mediatek: Fix XRGB setting error in OVL
Hsiao Chien Sung <shawn.sung(a)mediatek.com>
drm/mediatek: Use 8-bit alpha in ETHDR
Hsiao Chien Sung <shawn.sung(a)mediatek.com>
drm/mediatek: Add missing plane settings when async update
Laurent Pinchart <laurent.pinchart+renesas(a)ideasonboard.com>
media: renesas: vsp1: Store RPF partition configuration per RPF instance
Laurent Pinchart <laurent.pinchart+renesas(a)ideasonboard.com>
media: renesas: vsp1: Fix _irqsave and _irq mix
Jacopo Mondi <jacopo.mondi(a)ideasonboard.com>
media: rcar-csi2: Cleanup subdevice in remove()
Jacopo Mondi <jacopo.mondi(a)ideasonboard.com>
media: rcar-csi2: Disable runtime_pm in probe error
Jacopo Mondi <jacopo.mondi(a)ideasonboard.com>
media: rcar-vin: Fix YUYV8_1X16 handling for CSI-2
Sean Anderson <sean.anderson(a)linux.dev>
drm: zynqmp_kms: Fix AUX bus not getting unregistered
Christophe JAILLET <christophe.jaillet(a)wanadoo.fr>
drm: zynqmp_dpsub: Fix an error handling path in zynqmp_dpsub_probe()
Daniel Schaefer <dhs(a)frame.work>
media: uvcvideo: Override default flags
Oleksandr Natalenko <oleksandr(a)natalenko.name>
media: uvcvideo: Add quirk for invalid dev_sof in Logitech C920
Ricardo Ribalda <ribalda(a)chromium.org>
media: uvcvideo: Quirk for invalid dev_sof in Logitech C922
Ricardo Ribalda <ribalda(a)chromium.org>
media: uvcvideo: Disable autosuspend for Insta360 Link
Conor Dooley <conor.dooley(a)microchip.com>
media: i2c: imx219: fix msr access command sequence
Aleksandr Burakov <a.burakov(a)rosalinux.ru>
saa7134: Unchecked i2c_transfer function result fixed
Dan Carpenter <dan.carpenter(a)linaro.org>
ipmi: ssif_bmc: prevent integer overflow on 32bit systems
Jiri Olsa <jolsa(a)kernel.org>
x86/shstk: Make return uprobe work with shadow stack
Irui Wang <irui.wang(a)mediatek.com>
media: mediatek: vcodec: Handle invalid decoder vsi
David Hildenbrand <david(a)redhat.com>
s390/uv: Don't call folio_wait_writeback() without a folio reference
Matthew Wilcox (Oracle) <willy(a)infradead.org>
s390/mm: Convert gmap_make_secure to use a folio
Matthew Wilcox (Oracle) <willy(a)infradead.org>
s390/mm: Convert make_page_secure to use a folio
ChiYuan Huang <cy_huang(a)richtek.com>
media: v4l: async: Fix NULL pointer dereference in adding ancillary links
Bryan O'Donoghue <bryan.odonoghue(a)linaro.org>
media: i2c: Fix imx412 exposure control
Ricardo Ribalda <ribalda(a)chromium.org>
media: imon: Fix race getting ictx->lock
Zheng Yejian <zhengyejian1(a)huawei.com>
media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()
Mikhail Kobuk <m.kobuk(a)ispras.ru>
media: pci: ivtv: Add check for DMA map result
Kuro Chung <kuro.chung(a)ite.com.tw>
drm/bridge: it6505: fix hibernate to resume no display issue
xiazhengqiao <xiazhengqiao(a)huaqin.corp-partner.google.com>
drm/bridge: Fixed a DP link training bug
Douglas Anderson <dianders(a)chromium.org>
drm/panel: boe-tv101wum-nl6: Check for errors on the NOP in prepare()
Douglas Anderson <dianders(a)chromium.org>
drm/panel: boe-tv101wum-nl6: If prepare fails, disable GPIO before regulators
Douglas Anderson <dianders(a)chromium.org>
drm/panel: himax-hx8394: Handle errors from mipi_dsi_dcs_set_display_on() better
Tim Van Patten <timvp(a)google.com>
drm/amdgpu: Remove GC HW IP 9.3.0 from noretry=1
Friedrich Vock <friedrich.vock(a)gmx.de>
drm/amdgpu: Check if NBIO funcs are NULL in amdgpu_device_baco_exit
Lijo Lazar <lijo.lazar(a)amd.com>
drm/amdgpu: Fix memory range calculation
Lijo Lazar <lijo.lazar(a)amd.com>
drm/amd/pm: Fix aldebaran pcie speed reporting
Douglas Anderson <dianders(a)chromium.org>
drm/mipi-dsi: Fix theoretical int overflow in mipi_dsi_generic_write_seq()
Douglas Anderson <dianders(a)chromium.org>
drm/mipi-dsi: Fix theoretical int overflow in mipi_dsi_dcs_write_seq()
Mukul Joshi <mukul.joshi(a)amd.com>
drm/amdkfd: Fix CU Masking for GFX 9.4.3
Faiz Abbas <faiz.abbas(a)arm.com>
drm/arm/komeda: Fix komeda probe failing if there are no links in the secondary pipeline
Andy Yan <andy.yan(a)rock-chips.com>
drm/rockchip: vop2: Fix the port mux of VP2
Elliot Ayrey <elliot.ayrey(a)alliedtelesis.co.nz>
net: bridge: mst: Check vlan state for egress decision
Taehee Yoo <ap420073(a)gmail.com>
xdp: fix invalid wait context of page_pool_destroy()
Neeraj Sanjay Kale <neeraj.sanjaykale(a)nxp.com>
Bluetooth: btnxpuart: Add handling for boot-signature timeout errors
Kiran K <kiran.k(a)intel.com>
Bluetooth: btintel: Refactor btintel_set_ppag()
Sven Peter <sven(a)svenpeter.dev>
Bluetooth: hci_bcm4377: Use correct unit for timeouts
Amit Cohen <amcohen(a)nvidia.com>
selftests: forwarding: devlink_lib: Wait for udev events after reloading
Tengda Wu <wutengda(a)huaweicloud.com>
bpf: Fix null pointer dereference in resolve_prog_type() for BPF_PROG_TYPE_EXT
Alan Maguire <alan.maguire(a)oracle.com>
bpf: Eliminate remaining "make W=1" warnings in kernel/bpf/btf.o
Alexey Kodanev <aleksei.kodanev(a)bell-sw.com>
bna: adjust 'name' buf size of bna_tcb and bna_ccb structures
Alan Maguire <alan.maguire(a)oracle.com>
bpf: annotate BTF show functions with __printf
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
selftests/resctrl: Fix closing IMC fds on error and open-code R+W instead of loops
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
selftests/resctrl: Convert perror() to ksft_perror() or ksft_print_msg()
Maciej Wieczor-Retman <maciej.wieczor-retman(a)intel.com>
selftests/resctrl: Move run_benchmark() to a more fitting file
Geliang Tang <tanggeliang(a)kylinos.cn>
selftests/bpf: Close obj in error path in xdp_adjust_tail
Geliang Tang <tanggeliang(a)kylinos.cn>
selftests/bpf: Null checks for links in bpf_tcp_ca
Geliang Tang <tanggeliang(a)kylinos.cn>
selftests/bpf: Close fd in error path in drop_on_reuseport
John Stultz <jstultz(a)google.com>
locking/rwsem: Add __always_inline annotation to __down_write_common() and inlined callers
Johannes Berg <johannes.berg(a)intel.com>
wifi: virt_wifi: don't use strlen() in const context
Gaosheng Cui <cuigaosheng1(a)huawei.com>
gss_krb5: Fix the error handling path for crypto_sync_skcipher_setkey
En-Wei Wu <en-wei.wu(a)canonical.com>
wifi: virt_wifi: avoid reporting connection success with wrong SSID
Jianbo Liu <jianbol(a)nvidia.com>
xfrm: call xfrm_dev_policy_delete when kill policy
Jianbo Liu <jianbol(a)nvidia.com>
xfrm: fix netdev reference count imbalance
Aleksandr Mishin <amishin(a)t-argos.ru>
wifi: rtw89: Fix array index mistake in rtw89_sta_info_get_iter()
Zhang Rui <rui.zhang(a)intel.com>
perf/x86/intel/cstate: Fix Alderlake/Raptorlake/Meteorlake
Adrian Hunter <adrian.hunter(a)intel.com>
perf: Fix default aux_watermark calculation
Adrian Hunter <adrian.hunter(a)intel.com>
perf: Prevent passing zero nr_pages to rb_alloc_aux()
Adrian Hunter <adrian.hunter(a)intel.com>
perf: Fix perf_aux_size() for greater-than 32-bit size
Adrian Hunter <adrian.hunter(a)intel.com>
perf/x86/intel/pt: Fix pt_topa_entry_for_page() address calculation
Tao Chen <chen.dylane(a)gmail.com>
bpftool: Mount bpffs when pinmaps path not under the bpffs
Steffen Klassert <steffen.klassert(a)secunet.com>
xfrm: Export symbol xfrm_dev_state_delete.
Martin Kaistra <martin.kaistra(a)linutronix.de>
wifi: rtl8xxxu: 8188f: Limit TX power index
Kuan-Chung Chen <damon.chen(a)realtek.com>
wifi: rtw89: 8852b: fix definition of KIP register number
Pablo Neira Ayuso <pablo(a)netfilter.org>
netfilter: nf_tables: rise cap on SELinux secmark context
Ismael Luceno <iluceno(a)suse.de>
ipvs: Avoid unnecessary calls to skb_is_gso_sctp
Steffen Klassert <steffen.klassert(a)secunet.com>
xfrm: Fix unregister netdevice hang on hardware offload.
Donglin Peng <dolinux.peng(a)gmail.com>
libbpf: Checking the btf_type kind when fixing variable offsets
Csókás, Bence <csokas.bence(a)prolan.hu>
net: fec: Fix FEC_ECR_EN1588 being cleared on link-down
Csókás Bence <csokas.bence(a)prolan.hu>
net: fec: Refactor: #define magic constants
Jan Kara <jack(a)suse.cz>
udf: Fix bogus checksum computation in udf_rename()
Baochen Qiang <quic_bqiang(a)quicinc.com>
wifi: cfg80211: handle 2x996 RU allocation in cfg80211_calculate_bitrate_he()
Baochen Qiang <quic_bqiang(a)quicinc.com>
wifi: cfg80211: fix typo in cfg80211_calculate_bitrate_he()
Baochen Qiang <quic_bqiang(a)quicinc.com>
wifi: ath11k: fix wrong handling of CCMP256 and GCMP ciphers
Thomas Gleixner <tglx(a)linutronix.de>
jump_label: Fix concurrency issues in static_key_slow_dec()
Thomas Gleixner <tglx(a)linutronix.de>
perf/x86: Serialize set_attr_rdpmc()
Ido Schimmel <idosch(a)nvidia.com>
mlxsw: spectrum_acl: Fix ACL scale regression and firmware errors
Ido Schimmel <idosch(a)nvidia.com>
mlxsw: spectrum_acl_erp: Fix object nesting warning
Ido Schimmel <idosch(a)nvidia.com>
lib: objagg: Fix general protection fault
Jan Kara <jack(a)suse.cz>
udf: Fix lock ordering in udf_evict_inode()
Geliang Tang <tanggeliang(a)kylinos.cn>
selftests/bpf: Check length of recv in test_sockmap
Guangguan Wang <guangguan.wang(a)linux.alibaba.com>
net/smc: set rmb's SG_MAX_SINGLE_ALLOC limitation only when CONFIG_ARCH_NO_SG_CHAIN is defined
Eric Dumazet <edumazet(a)google.com>
tcp: fix races in tcp_v[46]_err()
Eric Dumazet <edumazet(a)google.com>
tcp: fix race in tcp_write_err()
Eric Dumazet <edumazet(a)google.com>
tcp: add tcp_done_with_error() helper
Baochen Qiang <quic_bqiang(a)quicinc.com>
wifi: ath12k: fix wrong definition of CE ring's base address
Baochen Qiang <quic_bqiang(a)quicinc.com>
wifi: ath11k: fix wrong definition of CE ring's base address
Jeff Johnson <quic_jjohnson(a)quicinc.com>
wifi: ath11k: Update Qualcomm Innovation Center, Inc. copyrights
P Praneesh <quic_ppranees(a)quicinc.com>
wifi: ath12k: fix firmware crash during reo reinject
P Praneesh <quic_ppranees(a)quicinc.com>
wifi: ath12k: fix invalid memory access while processing fragmented packets
P Praneesh <quic_ppranees(a)quicinc.com>
wifi: ath12k: change DMA direction while mapping reinjected packets
Hagar Hemdan <hagarhem(a)amazon.com>
net: esp: cleanup esp_output_tail_tcp() in case of unsupported ESPINTCP
Geliang Tang <tanggeliang(a)kylinos.cn>
selftests/bpf: Fix prog numbers in test_sockmap
Ivan Babrou <ivan(a)cloudflare.com>
bpftool: Un-const bpf_func_info to fix it for llvm 17 and newer
Nithyanantham Paramasivam <quic_nithp(a)quicinc.com>
wifi: ath12k: Fix tx completion ring (WBM2SW) setup failure
Pradeep Kumar Chitrapu <quic_pradeepc(a)quicinc.com>
wifi: ath12k: Correct 6 GHz frequency value in rx status
Samasth Norway Ananda <samasth.norway.ananda(a)oracle.com>
wifi: brcmsmac: LCN PHY code is used for BCM4313 2G-only device
Marek Behún <kabel(a)kernel.org>
firmware: turris-mox-rwtm: Initialize completion before mailbox
Marek Behún <kabel(a)kernel.org>
firmware: turris-mox-rwtm: Fix checking return value of wait_for_completion_timeout()
Marek Behún <kabel(a)kernel.org>
firmware: turris-mox-rwtm: Do not complete if there are no waiters
Christophe Leroy <christophe.leroy(a)csgroup.eu>
vmlinux.lds.h: catch .bss..L* sections into BSS")
Dmitry Torokhov <dmitry.torokhov(a)gmail.com>
ARM: spitz: fix GPIO assignment for backlight
Thorsten Blum <thorsten.blum(a)toblux.com>
m68k: cmpxchg: Fix return value for default case in __arch_xchg()
Dhananjay Ugwekar <Dhananjay.Ugwekar(a)amd.com>
cpufreq/amd-pstate: Fix the scaling_max_freq setting on shared memory CPPC systems
Luca Weiss <luca.weiss(a)fairphone.com>
arm64: dts: qcom: sm6350: Add missing qcom,non-secure-domain property
Chukun Pan <amadeus(a)jmu.edu.cn>
arm64: dts: rockchip: fixes PHY reset for Lunzn Fastrhino R68S
Chukun Pan <amadeus(a)jmu.edu.cn>
arm64: dts: rockchip: disable display subsystem for Lunzn Fastrhino R6xS
Chukun Pan <amadeus(a)jmu.edu.cn>
arm64: dts: rockchip: remove unused usb2 nodes for Lunzn Fastrhino R6xS
Chukun Pan <amadeus(a)jmu.edu.cn>
arm64: dts: rockchip: fix pmu_io supply for Lunzn Fastrhino R6xS
Chukun Pan <amadeus(a)jmu.edu.cn>
arm64: dts: rockchip: fix usb regulator for Lunzn Fastrhino R6xS
Chukun Pan <amadeus(a)jmu.edu.cn>
arm64: dts: rockchip: fix regulator name for Lunzn Fastrhino R6xS
Cristian Ciocaltea <cristian.ciocaltea(a)collabora.com>
arm64: dts: rockchip: Add missing power-domains for rk356x vop_mmu
Chen Ni <nichen(a)iscas.ac.cn>
x86/xen: Convert comma to semicolon
Adam Ford <aford173(a)gmail.com>
arm64: dts: imx8mp: Fix pgc vpu locations
Lucas Stach <l.stach(a)pengutronix.de>
arm64: dts: imx8mp: add HDMI power-domains
Adam Ford <aford173(a)gmail.com>
arm64: dts: imx8mp: Fix pgc_mlmix location
Adam Ford <aford173(a)gmail.com>
arm64: dts: imx8mp: Add NPU Node
Eero Tamminen <oak(a)helsinkinet.fi>
m68k: atari: Fix TT bootup freeze / unexpected (SCU) interrupt messages
Geert Uytterhoeven <geert+renesas(a)glider.be>
arm64: dts: renesas: r9a07g054: Add missing hypervisor virtual timer IRQ
Geert Uytterhoeven <geert+renesas(a)glider.be>
arm64: dts: renesas: r9a07g044: Add missing hypervisor virtual timer IRQ
Geert Uytterhoeven <geert+renesas(a)glider.be>
arm64: dts: renesas: r9a07g043u: Add missing hypervisor virtual timer IRQ
Geert Uytterhoeven <geert+renesas(a)glider.be>
arm64: dts: renesas: r8a779g0: Add missing hypervisor virtual timer IRQ
Geert Uytterhoeven <geert+renesas(a)glider.be>
arm64: dts: renesas: r8a779f0: Add missing hypervisor virtual timer IRQ
Geert Uytterhoeven <geert+renesas(a)glider.be>
arm64: dts: renesas: r8a779a0: Add missing hypervisor virtual timer IRQ
Cristian Ciocaltea <cristian.ciocaltea(a)collabora.com>
arm64: dts: rockchip: Fix mic-in-differential usage on rk3568-evb1-v10
Cristian Ciocaltea <cristian.ciocaltea(a)collabora.com>
arm64: dts: rockchip: Fix mic-in-differential usage on rk3566-roc-pc
Cristian Ciocaltea <cristian.ciocaltea(a)collabora.com>
arm64: dts: rockchip: Drop invalid mic-in-differential on rk3568-rock-3a
Jerome Brunet <jbrunet(a)baylibre.com>
arm64: dts: amlogic: setup hdmi system clock
Jerome Brunet <jbrunet(a)baylibre.com>
arm64: dts: amlogic: add power domain to hdmitx
Jerome Brunet <jbrunet(a)baylibre.com>
arm64: dts: amlogic: gx: correct hdmi clocks
Chen-Yu Tsai <wenst(a)chromium.org>
arm64: dts: mediatek: mt8183-kukui-jacuzzi: Add ports node for anx7625
Hsin-Te Yuan <yuanhsinte(a)chromium.org>
arm64: dts: mediatek: mt8183-kukui: Fix the value of `dlg,jack-det-rate` mismatch
Rafał Miłecki <rafal(a)milecki.pl>
arm64: dts: mediatek: mt7622: fix "emmc" pinctrl mux
Pin-yen Lin <treapking(a)chromium.org>
arm64: dts: mediatek: mt8192-asurada: Add off-on-delay-us for pp3300_mipibrdg
Chen-Yu Tsai <wenst(a)chromium.org>
arm64: dts: mediatek: mt8183-kukui: Drop bogus output-enable property
AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com>
arm64: dts: mediatek: mt8195: Fix GPU thermal zone name for SVS
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix PCIe reset polarity
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix SPI0 chip selects
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix board reset
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix PHY reset
Michael Walle <mwalle(a)kernel.org>
ARM: dts: imx6qdl-kontron-samx6i: fix phy-mode
Jerome Brunet <jbrunet(a)baylibre.com>
arm64: dts: amlogic: sm1: fix spdif compatibles
Jonas Karlman <jonas(a)kwiboo.se>
arm64: dts: rockchip: Increase VOP clk rate on RK3328
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
soc: qcom: pdr: fix parsing of domains lists
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
soc: qcom: pdr: protect locator_addr with the main mutex
Sibi Sankar <quic_sibis(a)quicinc.com>
soc: qcom: icc-bwmon: Fix refcount imbalance seen during bwmon_remove
Komal Bajaj <quic_kbajaj(a)quicinc.com>
arm64: dts: qcom: qdu1000: Add secure qfprom node
Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>
arm64: dts: qcom: qdu1000-idp: drop unused LLCC multi-ch-bit-off
Jai Luthra <j-luthra(a)ti.com>
arm64: dts: ti: k3-am62-verdin: Drop McASP AFIFOs
Jai Luthra <j-luthra(a)ti.com>
arm64: dts: ti: k3-am625-beagleplay: Drop McASP AFIFOs
Jai Luthra <j-luthra(a)ti.com>
arm64: dts: ti: k3-am62x: Drop McASP AFIFOs
Esben Haabendal <esben(a)geanix.com>
memory: fsl_ifc: Make FSL_IFC config visible and selectable
Primoz Fiser <primoz.fiser(a)norik.com>
OPP: ti: Fix ti_opp_supply_probe wrong return values
Primoz Fiser <primoz.fiser(a)norik.com>
cpufreq: ti-cpufreq: Handle deferred probe with dev_err_probe()
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: qrb4210-rb2: make L9A always-on
Marek Vasut <marex(a)denx.de>
ARM: dts: stm32: Add arm,no-tick-in-suspend to STM32MP15xx STGEN timer
Pavel Löbl <pavel(a)loebl.cz>
ARM: dts: sunxi: remove duplicated entries in makefile
Jay Buddhabhatti <jay.buddhabhatti(a)amd.com>
soc: xilinx: rename cpu_number1 to dummy_cpu_number
Sagar Cheluvegowda <quic_scheluve(a)quicinc.com>
arm64: dts: qcom: sa8775p: mark ethernet devices as DMA-coherent
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: msm8996: specify UFS core_clk frequencies
Jonas Karlman <jonas(a)kwiboo.se>
arm64: dts: rockchip: Update WIFi/BT related nodes on rk3308-rock-pi-s
Jonas Karlman <jonas(a)kwiboo.se>
arm64: dts: rockchip: Add mdio and ethernet-phy nodes to rk3308-rock-pi-s
Jonas Karlman <jonas(a)kwiboo.se>
arm64: dts: rockchip: Add pinctrl for UART0 to rk3308-rock-pi-s
Jonas Karlman <jonas(a)kwiboo.se>
arm64: dts: rockchip: Add sdmmc related properties on rk3308-rock-pi-s
Stephen Boyd <swboyd(a)chromium.org>
soc: qcom: rpmh-rsc: Ensure irqs aren't disabled by rpmh_rsc_send_data() callers
Chen Ni <nichen(a)iscas.ac.cn>
soc: qcom: pmic_glink: Handle the return value of pmic_glink_init
Marc Gonzalez <mgonzalez(a)freebox.fr>
arm64: dts: qcom: msm8998: enable adreno_smmu by default
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: sdm850-lenovo-yoga-c630: fix IPA firmware path
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: msm8996-xiaomi-common: drop excton from the USB PHY
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: sm8450: add power-domain to UFS PHY
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: sm8350: add power-domain to UFS PHY
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: sm8250: add power-domain to UFS PHY
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: sm8250: switch UFS QMP PHY to new style of bindings
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: sm6350: add power-domain to UFS PHY
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: sm6115: add power-domain to UFS PHY
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: sdm845: add power-domain to UFS PHY
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: sc8180x: add power-domain to UFS PHY
Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org>
arm64: dts: qcom: sc8180x: switch UFS QMP PHY to new style of bindings
Bjorn Andersson <quic_bjorande(a)quicinc.com>
arm64: dts: qcom: sc8180x: Correct PCIe slave ports
Guenter Roeck <linux(a)roeck-us.net>
hwmon: (max6697) Fix swapped temp{1,8} critical alarms
Guenter Roeck <linux(a)roeck-us.net>
hwmon: (max6697) Fix underflow when writing limit attributes
Uwe Kleine-König <u.kleine-koenig(a)baylibre.com>
pwm: atmel-tcb: Fix race condition and convert to guards
Yao Zi <ziyao(a)disroot.org>
drm/meson: fix canvas release in bind function
Gaosheng Cui <cuigaosheng1(a)huawei.com>
nvmet-auth: fix nvmet_auth hash error handling
Uwe Kleine-König <u.kleine-koenig(a)baylibre.com>
pwm: stm32: Always do lazy disabling
Yu Kuai <yukuai3(a)huawei.com>
md: Don't wait for MD_RECOVERY_NEEDED for HOT_REMOVE_DISK ioctl
Bart Van Assche <bvanassche(a)acm.org>
block/mq-deadline: Fix the tag reservation code
Bart Van Assche <bvanassche(a)acm.org>
block: Call .limit_depth() after .hctx has been set
Wayne Tung <chineweff(a)gmail.com>
hwmon: (adt7475) Fix default duty on fan is disabled
Chen Ridong <chenridong(a)huawei.com>
cgroup/cpuset: Prevent UAF in proc_cpuset_show()
Kees Cook <keescook(a)chromium.org>
kernfs: Convert kernfs_path_from_node_locked() from strlcpy() to strscpy()
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/platform/iosf_mbi: Convert PCIBIOS_* return codes to errnos
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/pci/xen: Fix PCIBIOS_* return code handling
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/pci/intel_mid_pci: Fix PCIBIOS_* return code handling
Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com>
x86/of: Return consistent error type from x86_of_pci_irq_enable()
Chao Yu <chao(a)kernel.org>
hfsplus: fix to avoid false alarm of circular locking
Masahiro Yamada <masahiroy(a)kernel.org>
x86/kconfig: Add as-instr64 macro to properly evaluate AS_WRUSS
Christoph Hellwig <hch(a)lst.de>
block: initialize integrity buffer to zero before writing it to media
Christoph Hellwig <hch(a)lst.de>
ubd: untagle discard vs write zeroes not support handling
Christoph Hellwig <hch(a)lst.de>
ubd: refactor the interrupt handler
Tzung-Bi Shih <tzungbi(a)kernel.org>
platform/chrome: cros_ec_debugfs: fix wrong EC message version
Li Nan <linan122(a)huawei.com>
md: fix deadlock between mddev_suspend and flush bio
Frederic Weisbecker <frederic(a)kernel.org>
rcu/tasks: Fix stale task snaphot for Tasks Trace
Arnd Bergmann <arnd(a)arndb.de>
EDAC, i10nm: make skx_common.o a separate module
Chen Ni <nichen(a)iscas.ac.cn>
spi: atmel-quadspi: Add missing check for clk_prepare
Prajna Rajendra Kumar <prajna.rajendrakumar(a)microchip.com>
spi: spi-microchip-core: Fix the number of chip selects supported
-------------
Diffstat:
.../devicetree/bindings/thermal/thermal-zones.yaml | 5 +-
Makefile | 4 +-
arch/arm/boot/dts/allwinner/Makefile | 62 --
.../arm/boot/dts/nxp/imx/imx6q-kontron-samx6i.dtsi | 23 -
.../boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi | 14 +-
arch/arm/boot/dts/st/stm32mp151.dtsi | 1 +
arch/arm/mach-pxa/spitz.c | 30 +-
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 5 +
arch/arm64/boot/dts/amlogic/meson-g12.dtsi | 4 +
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 10 +-
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 10 +-
arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 8 +-
arch/arm64/boot/dts/freescale/imx8mp.dtsi | 130 +++-
.../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 4 +-
arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 4 +-
.../dts/mediatek/mt8183-kukui-audio-da7219.dtsi | 2 +-
.../boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 25 +-
arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 2 -
arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi | 1 +
arch/arm64/boot/dts/mediatek/mt8195.dtsi | 2 +-
.../arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 1 -
arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +-
arch/arm64/boot/dts/qcom/msm8998.dtsi | 1 -
arch/arm64/boot/dts/qcom/qdu1000.dtsi | 16 +-
arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 2 +
arch/arm64/boot/dts/qcom/sa8775p.dtsi | 2 +
arch/arm64/boot/dts/qcom/sc8180x.dtsi | 28 +-
arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +
.../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 1 +
arch/arm64/boot/dts/qcom/sm6115.dtsi | 2 +
arch/arm64/boot/dts/qcom/sm6350.dtsi | 4 +
arch/arm64/boot/dts/qcom/sm8250.dtsi | 22 +-
arch/arm64/boot/dts/qcom/sm8350.dtsi | 2 +
arch/arm64/boot/dts/qcom/sm8450.dtsi | 2 +
arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 5 +-
arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 5 +-
arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 5 +-
arch/arm64/boot/dts/renesas/r9a07g043u.dtsi | 5 +-
arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 5 +-
arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 5 +-
arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts | 71 +-
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 4 +-
arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 2 +-
arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts | 2 +-
.../boot/dts/rockchip/rk3568-fastrhino-r66s.dts | 4 +
.../boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi | 48 +-
.../boot/dts/rockchip/rk3568-fastrhino-r68s.dts | 16 +-
arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 4 -
arch/arm64/boot/dts/rockchip/rk356x.dtsi | 1 +
arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi | 4 -
arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 2 -
arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi | 2 -
arch/loongarch/kernel/hw_breakpoint.c | 2 +-
arch/loongarch/kernel/ptrace.c | 3 +
arch/m68k/amiga/config.c | 9 +
arch/m68k/atari/ataints.c | 6 +-
arch/m68k/include/asm/cmpxchg.h | 2 +-
arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi | 21 +-
arch/mips/include/asm/mach-loongson64/boot_param.h | 2 +
arch/mips/include/asm/mips-cm.h | 4 +
arch/mips/kernel/smp-cps.c | 5 +-
arch/mips/loongson64/env.c | 8 +
arch/mips/loongson64/reset.c | 38 +-
arch/mips/loongson64/smp.c | 23 +-
arch/mips/pci/pcie-octeon.c | 0
arch/mips/sgi-ip30/ip30-console.c | 1 +
arch/parisc/Kconfig | 1 +
arch/powerpc/kernel/prom.c | 12 +-
arch/powerpc/kvm/book3s_hv.c | 4 +-
arch/powerpc/kvm/powerpc.c | 4 +-
arch/powerpc/mm/nohash/8xx.c | 3 +-
arch/powerpc/xmon/ppc-dis.c | 33 +-
arch/s390/kernel/perf_cpum_cf.c | 14 +-
arch/s390/kernel/uv.c | 58 +-
arch/s390/mm/fault.c | 6 +-
arch/s390/pci/pci_irq.c | 110 ++--
arch/sparc/include/asm/oplib_64.h | 1 +
arch/sparc/prom/init_64.c | 3 -
arch/sparc/prom/p1275.c | 2 +-
arch/um/drivers/ubd_kern.c | 50 +-
arch/um/kernel/time.c | 4 +-
arch/um/os-Linux/signal.c | 118 +++-
arch/x86/Kconfig.assembler | 2 +-
arch/x86/events/core.c | 3 +
arch/x86/events/intel/cstate.c | 7 +-
arch/x86/events/intel/ds.c | 8 +-
arch/x86/events/intel/pt.c | 4 +-
arch/x86/events/intel/pt.h | 4 +-
arch/x86/events/intel/uncore_snbep.c | 6 +-
arch/x86/include/asm/kvm_host.h | 2 +-
arch/x86/include/asm/shstk.h | 2 +
arch/x86/kernel/devicetree.c | 2 +-
arch/x86/kernel/shstk.c | 11 +
arch/x86/kernel/uprobes.c | 7 +-
arch/x86/kvm/vmx/nested.c | 2 +-
arch/x86/kvm/vmx/vmx.c | 11 +-
arch/x86/kvm/vmx/vmx.h | 1 +
arch/x86/kvm/x86.c | 4 +-
arch/x86/pci/intel_mid_pci.c | 4 +-
arch/x86/pci/xen.c | 4 +-
arch/x86/platform/intel/iosf_mbi.c | 4 +-
arch/x86/xen/p2m.c | 4 +-
block/bio-integrity.c | 11 +-
block/blk-mq.c | 12 +-
block/genhd.c | 2 +-
block/mq-deadline.c | 20 +-
drivers/android/binder.c | 4 +-
drivers/ata/libata-scsi.c | 176 ++---
drivers/auxdisplay/ht16k33.c | 1 +
drivers/base/devres.c | 11 +-
drivers/block/rbd.c | 35 +-
drivers/bluetooth/btintel.c | 119 +---
drivers/bluetooth/btnxpuart.c | 52 +-
drivers/bluetooth/btusb.c | 4 +
drivers/bluetooth/hci_bcm4377.c | 2 +-
drivers/char/hw_random/amd-rng.c | 4 +-
drivers/char/hw_random/core.c | 4 +-
drivers/char/ipmi/ssif_bmc.c | 6 +-
drivers/char/tpm/eventlog/common.c | 2 +
drivers/clk/clk-en7523.c | 9 +-
drivers/clk/davinci/da8xx-cfgchip.c | 4 +-
drivers/clk/qcom/camcc-sc7280.c | 5 +
drivers/clk/qcom/clk-rcg2.c | 32 +
drivers/clk/qcom/gcc-sa8775p.c | 40 ++
drivers/clk/qcom/gcc-sc7280.c | 3 +
drivers/clk/qcom/gpucc-sa8775p.c | 41 +-
drivers/clk/qcom/gpucc-sm8350.c | 5 +-
drivers/clk/qcom/kpss-xcc.c | 4 +-
drivers/cpufreq/amd-pstate.c | 43 +-
drivers/cpufreq/ti-cpufreq.c | 2 +-
drivers/crypto/intel/qat/qat_common/adf_cfg.c | 6 +-
drivers/dma/ti/k3-udma.c | 4 +-
drivers/edac/Makefile | 10 +-
drivers/edac/skx_common.c | 21 +-
drivers/edac/skx_common.h | 4 +-
drivers/firmware/efi/libstub/screen_info.c | 2 +
drivers/firmware/efi/libstub/x86-stub.c | 25 +-
drivers/firmware/turris-mox-rwtm.c | 23 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 1 -
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 9 +-
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 +-
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 12 +
drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c | 2 +-
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 2 +-
drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 3 +-
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 4 +-
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 43 +-
drivers/gpu/drm/bridge/ite-it6505.c | 85 ++-
drivers/gpu/drm/display/drm_dp_mst_topology.c | 4 +-
drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 +-
drivers/gpu/drm/etnaviv/etnaviv_sched.c | 9 +-
drivers/gpu/drm/gma500/cdv_intel_lvds.c | 3 +
drivers/gpu/drm/gma500/psb_intel_lvds.c | 3 +
drivers/gpu/drm/i915/display/intel_dp.c | 2 +
.../gpu/drm/i915/display/intel_dp_link_training.c | 55 +-
.../gpu/drm/i915/gt/intel_execlists_submission.c | 6 +-
drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 24 +-
drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 2 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 39 +-
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 2 +-
drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +
drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 +
drivers/gpu/drm/mediatek/mtk_ethdr.c | 21 +-
drivers/gpu/drm/meson/meson_drv.c | 37 +-
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 3 +-
.../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 3 +-
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h | 3 +-
drivers/gpu/drm/msm/dsi/dsi_host.c | 3 +
drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 8 +-
drivers/gpu/drm/panel/panel-himax-hx8394.c | 3 +-
drivers/gpu/drm/panfrost/panfrost_drv.c | 1 +
drivers/gpu/drm/qxl/qxl_display.c | 3 +
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 2 +-
drivers/gpu/drm/udl/udl_modeset.c | 3 +-
drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 1 +
drivers/gpu/drm/xlnx/zynqmp_kms.c | 12 +-
drivers/hwmon/adt7475.c | 2 +-
drivers/hwmon/max6697.c | 5 +-
drivers/hwtracing/coresight/coresight-platform.c | 4 +-
drivers/iio/frequency/adrf6780.c | 1 -
drivers/iio/industrialio-gts-helper.c | 7 +-
drivers/infiniband/core/cache.c | 14 +-
drivers/infiniband/core/device.c | 22 +-
drivers/infiniband/core/iwcm.c | 11 +-
drivers/infiniband/core/lag.c | 3 +-
drivers/infiniband/core/roce_gid_mgmt.c | 3 +-
drivers/infiniband/hw/bnxt_re/ib_verbs.c | 8 +-
drivers/infiniband/hw/bnxt_re/qplib_fp.h | 6 +-
drivers/infiniband/hw/hns/hns_roce_device.h | 6 +
drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 40 +-
drivers/infiniband/hw/hns/hns_roce_mr.c | 5 +
drivers/infiniband/hw/hns/hns_roce_qp.c | 4 +-
drivers/infiniband/hw/hns/hns_roce_srq.c | 2 +-
drivers/infiniband/hw/mlx4/alias_GUID.c | 2 +-
drivers/infiniband/hw/mlx4/mad.c | 2 +-
drivers/infiniband/hw/mlx5/mlx5_ib.h | 13 +
drivers/infiniband/hw/mlx5/odp.c | 6 +-
drivers/infiniband/sw/rxe/rxe_req.c | 7 +-
drivers/input/keyboard/qt1050.c | 7 +-
drivers/input/mouse/elan_i2c_core.c | 2 +
drivers/interconnect/qcom/qcm2290.c | 2 +-
drivers/iommu/intel/iommu.c | 2 +-
drivers/iommu/sprd-iommu.c | 2 +-
drivers/irqchip/irq-imx-irqsteer.c | 24 +-
drivers/isdn/hardware/mISDN/hfcmulti.c | 7 +-
drivers/leds/flash/leds-mt6360.c | 5 +-
drivers/leds/flash/leds-qcom-flash.c | 10 +-
drivers/leds/led-class.c | 1 -
drivers/leds/led-triggers.c | 2 +-
drivers/leds/leds-ss4200.c | 7 +-
drivers/macintosh/therm_windtunnel.c | 2 +-
drivers/md/dm-verity-target.c | 16 +-
drivers/md/md-bitmap.c | 6 +-
drivers/md/md.c | 32 +-
drivers/media/i2c/imx219.c | 2 +-
drivers/media/i2c/imx412.c | 9 +-
drivers/media/pci/intel/ivsc/mei_csi.c | 14 +-
drivers/media/pci/ivtv/ivtv-udma.c | 8 +
drivers/media/pci/ivtv/ivtv-yuv.c | 6 +
drivers/media/pci/ivtv/ivtvfb.c | 6 +-
drivers/media/pci/saa7134/saa7134-dvb.c | 8 +-
.../platform/mediatek/vcodec/decoder/vdec_vpu_if.c | 6 +
drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 3 +
drivers/media/platform/nxp/imx-pxp.c | 3 +
drivers/media/platform/qcom/venus/vdec.c | 3 +-
.../media/platform/renesas/rcar-vin/rcar-csi2.c | 5 +-
drivers/media/platform/renesas/rcar-vin/rcar-dma.c | 16 +-
drivers/media/platform/renesas/vsp1/vsp1_histo.c | 20 +-
drivers/media/platform/renesas/vsp1/vsp1_pipe.h | 2 +-
drivers/media/platform/renesas/vsp1/vsp1_rpf.c | 8 +-
drivers/media/rc/imon.c | 5 +-
drivers/media/rc/lirc_dev.c | 4 +-
drivers/media/usb/dvb-usb/dvb-usb-init.c | 35 +-
drivers/media/usb/uvc/uvc_ctrl.c | 9 +-
drivers/media/usb/uvc/uvc_driver.c | 26 +-
drivers/media/usb/uvc/uvc_video.c | 21 +-
drivers/media/usb/uvc/uvcvideo.h | 2 +
drivers/media/v4l2-core/v4l2-async.c | 3 +
drivers/memory/Kconfig | 2 +-
drivers/mfd/Makefile | 6 +-
drivers/mfd/omap-usb-tll.c | 3 +-
drivers/mfd/rsmu_core.c | 2 +
drivers/mtd/nand/raw/Kconfig | 3 +-
drivers/mtd/tests/Makefile | 34 +-
drivers/mtd/tests/mtd_test.c | 9 +
drivers/mtd/ubi/eba.c | 3 +-
drivers/net/bonding/bond_main.c | 7 +-
drivers/net/dsa/b53/b53_common.c | 3 +
drivers/net/dsa/mv88e6xxx/chip.c | 3 +-
drivers/net/ethernet/brocade/bna/bna_types.h | 2 +-
drivers/net/ethernet/brocade/bna/bnad.c | 11 +-
drivers/net/ethernet/freescale/fec_main.c | 52 +-
drivers/net/ethernet/google/gve/gve_tx.c | 5 +-
drivers/net/ethernet/google/gve/gve_tx_dqo.c | 22 +-
drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c | 2 +-
drivers/net/ethernet/intel/ice/ice_fdir.h | 3 +
drivers/net/ethernet/intel/ice/ice_switch.c | 8 +-
drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c | 16 +
drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.h | 1 +
.../ethernet/mellanox/mlxsw/spectrum_acl_atcam.c | 18 +-
.../mellanox/mlxsw/spectrum_acl_bloom_filter.c | 2 +-
.../net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c | 13 -
.../ethernet/mellanox/mlxsw/spectrum_acl_tcam.h | 9 +-
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 +-
.../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 2 +-
drivers/net/ethernet/stmicro/stmmac/hwif.h | 2 +-
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 +-
drivers/net/netconsole.c | 2 +-
drivers/net/wireless/ath/ath11k/ce.c | 2 +-
drivers/net/wireless/ath/ath11k/ce.h | 5 +-
drivers/net/wireless/ath/ath11k/dbring.c | 1 +
drivers/net/wireless/ath/ath11k/dbring.h | 1 +
drivers/net/wireless/ath/ath11k/debug.c | 1 +
drivers/net/wireless/ath/ath11k/debug.h | 2 +-
drivers/net/wireless/ath/ath11k/debugfs.c | 1 +
drivers/net/wireless/ath/ath11k/debugfs.h | 1 +
.../net/wireless/ath/ath11k/debugfs_htt_stats.c | 2 +-
.../net/wireless/ath/ath11k/debugfs_htt_stats.h | 2 +-
drivers/net/wireless/ath/ath11k/debugfs_sta.c | 1 +
drivers/net/wireless/ath/ath11k/debugfs_sta.h | 1 +
drivers/net/wireless/ath/ath11k/dp.c | 2 +-
drivers/net/wireless/ath/ath11k/dp.h | 2 +-
drivers/net/wireless/ath/ath11k/dp_rx.c | 4 +-
drivers/net/wireless/ath/ath11k/dp_rx.h | 3 +
drivers/net/wireless/ath/ath11k/dp_tx.c | 2 +-
drivers/net/wireless/ath/ath11k/dp_tx.h | 1 +
drivers/net/wireless/ath/ath11k/hal.c | 2 +-
drivers/net/wireless/ath/ath11k/hal.h | 2 +-
drivers/net/wireless/ath/ath11k/hal_desc.h | 1 +
drivers/net/wireless/ath/ath11k/hal_rx.c | 1 +
drivers/net/wireless/ath/ath11k/hal_rx.h | 1 +
drivers/net/wireless/ath/ath11k/hif.h | 1 +
drivers/net/wireless/ath/ath11k/htc.c | 1 +
drivers/net/wireless/ath/ath11k/htc.h | 1 +
drivers/net/wireless/ath/ath11k/hw.c | 2 +-
drivers/net/wireless/ath/ath11k/hw.h | 2 +-
drivers/net/wireless/ath/ath11k/mac.c | 15 +-
drivers/net/wireless/ath/ath11k/mac.h | 1 +
drivers/net/wireless/ath/ath11k/mhi.c | 2 +-
drivers/net/wireless/ath/ath11k/mhi.h | 1 +
drivers/net/wireless/ath/ath11k/pcic.c | 2 +-
drivers/net/wireless/ath/ath11k/peer.c | 2 +-
drivers/net/wireless/ath/ath11k/peer.h | 2 +-
drivers/net/wireless/ath/ath11k/qmi.c | 2 +-
drivers/net/wireless/ath/ath11k/qmi.h | 2 +-
drivers/net/wireless/ath/ath11k/reg.c | 1 +
drivers/net/wireless/ath/ath11k/reg.h | 1 +
drivers/net/wireless/ath/ath11k/rx_desc.h | 1 +
drivers/net/wireless/ath/ath11k/spectral.c | 1 +
drivers/net/wireless/ath/ath11k/spectral.h | 1 +
drivers/net/wireless/ath/ath11k/thermal.c | 1 +
drivers/net/wireless/ath/ath11k/thermal.h | 1 +
drivers/net/wireless/ath/ath11k/trace.h | 1 +
drivers/net/wireless/ath/ath11k/wmi.c | 2 +-
drivers/net/wireless/ath/ath11k/wmi.h | 2 +-
drivers/net/wireless/ath/ath11k/wow.h | 1 +
drivers/net/wireless/ath/ath12k/ce.h | 6 +-
drivers/net/wireless/ath/ath12k/dp.c | 18 +-
drivers/net/wireless/ath/ath12k/dp_rx.c | 27 +-
drivers/net/wireless/ath/ath12k/hw.c | 8 +-
drivers/net/wireless/ath/ath12k/wmi.c | 10 +-
.../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 18 +-
drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 +
.../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c | 15 +
drivers/net/wireless/realtek/rtw88/usb.c | 2 +
drivers/net/wireless/realtek/rtw89/debug.c | 2 +-
drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.c | 2 +-
drivers/net/wireless/virtual/virt_wifi.c | 20 +-
drivers/nvme/host/pci.c | 5 +-
drivers/nvme/target/auth.c | 14 +-
drivers/nvmem/rockchip-otp.c | 1 +
drivers/opp/ti-opp-supply.c | 6 +-
drivers/parport/procfs.c | 24 +-
drivers/pci/controller/dwc/pci-keystone.c | 156 +++--
drivers/pci/controller/dwc/pcie-designware-ep.c | 13 +-
drivers/pci/controller/dwc/pcie-dw-rockchip.c | 2 +-
drivers/pci/controller/dwc/pcie-qcom-ep.c | 6 -
drivers/pci/controller/pci-hyperv.c | 4 +-
drivers/pci/controller/pci-loongson.c | 13 +
drivers/pci/controller/pcie-rcar-host.c | 6 +-
drivers/pci/controller/pcie-rockchip.c | 2 +-
drivers/pci/endpoint/functions/pci-epf-vntb.c | 19 +-
drivers/pci/pci.c | 6 +-
drivers/pci/setup-bus.c | 6 +-
drivers/phy/cadence/phy-cadence-torrent.c | 3 +
drivers/phy/xilinx/phy-zynqmp.c | 14 +-
drivers/pinctrl/core.c | 12 +-
drivers/pinctrl/freescale/pinctrl-mxs.c | 4 +-
drivers/pinctrl/pinctrl-rockchip.c | 17 +-
drivers/pinctrl/pinctrl-single.c | 7 +-
drivers/pinctrl/renesas/pfc-r8a779g0.c | 716 ++++++++++-----------
drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 14 +-
drivers/platform/chrome/cros_ec_debugfs.c | 1 +
drivers/platform/mips/cpu_hwmon.c | 3 +
drivers/pwm/pwm-atmel-tcb.c | 12 +-
drivers/pwm/pwm-stm32.c | 5 +-
drivers/remoteproc/imx_rproc.c | 10 +-
drivers/remoteproc/stm32_rproc.c | 2 +-
drivers/rtc/interface.c | 9 +-
drivers/rtc/rtc-abx80x.c | 12 +-
drivers/rtc/rtc-cmos.c | 10 +-
drivers/rtc/rtc-isl1208.c | 11 +-
drivers/s390/block/dasd_devmap.c | 10 +-
drivers/scsi/lpfc/lpfc_attr.c | 5 +
drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +-
drivers/scsi/qla2xxx/qla_bsg.c | 98 +--
drivers/scsi/qla2xxx/qla_def.h | 17 +-
drivers/scsi/qla2xxx/qla_gbl.h | 6 +-
drivers/scsi/qla2xxx/qla_gs.c | 473 +++++++-------
drivers/scsi/qla2xxx/qla_init.c | 92 ++-
drivers/scsi/qla2xxx/qla_inline.h | 8 +
drivers/scsi/qla2xxx/qla_mid.c | 2 +-
drivers/scsi/qla2xxx/qla_nvme.c | 5 +-
drivers/scsi/qla2xxx/qla_os.c | 19 +-
drivers/scsi/qla2xxx/qla_sup.c | 108 +++-
drivers/scsi/sr_ioctl.c | 2 +-
drivers/soc/qcom/icc-bwmon.c | 4 +-
drivers/soc/qcom/pdr_interface.c | 8 +-
drivers/soc/qcom/pmic_glink.c | 13 +-
drivers/soc/qcom/rpmh-rsc.c | 7 +-
drivers/soc/qcom/rpmh.c | 1 -
drivers/soc/xilinx/xlnx_event_manager.c | 15 +-
drivers/soc/xilinx/zynqmp_power.c | 4 +-
drivers/spi/atmel-quadspi.c | 11 +-
drivers/spi/spi-microchip-core.c | 211 +++---
drivers/spi/spidev.c | 1 +
drivers/ufs/core/ufs-mcq.c | 10 +-
drivers/usb/typec/mux/nb7vpq904m.c | 7 +-
drivers/vhost/vsock.c | 4 +-
drivers/video/logo/pnmtologo.c | 2 -
drivers/watchdog/rzg2l_wdt.c | 22 +-
fs/btrfs/compression.c | 2 +-
fs/ceph/super.c | 3 +-
fs/exfat/dir.c | 2 +-
fs/ext2/balloc.c | 11 +-
fs/ext4/extents_status.c | 2 +
fs/ext4/fast_commit.c | 6 +
fs/ext4/namei.c | 73 ++-
fs/ext4/xattr.c | 6 +
fs/f2fs/checkpoint.c | 10 +-
fs/f2fs/data.c | 6 +-
fs/f2fs/f2fs.h | 19 +-
fs/f2fs/file.c | 47 +-
fs/f2fs/gc.c | 13 +-
fs/f2fs/inline.c | 8 +-
fs/f2fs/inode.c | 14 +-
fs/f2fs/segment.c | 6 +-
fs/f2fs/segment.h | 3 +-
fs/fuse/inode.c | 24 +-
fs/hfs/inode.c | 3 +
fs/hfsplus/bfind.c | 15 +-
fs/hfsplus/extents.c | 9 +-
fs/hfsplus/hfsplus_fs.h | 21 +
fs/hostfs/hostfs.h | 7 +-
fs/hostfs/hostfs_kern.c | 10 +-
fs/hostfs/hostfs_user.c | 7 +-
fs/jbd2/commit.c | 2 +-
fs/jbd2/journal.c | 56 +-
fs/jbd2/transaction.c | 45 +-
fs/jfs/jfs_imap.c | 5 +-
fs/kernfs/dir.c | 34 +-
fs/nfs/nfs4client.c | 6 +-
fs/nfs/nfs4proc.c | 2 +-
fs/nfsd/nfs4proc.c | 5 +-
fs/nilfs2/btnode.c | 25 +-
fs/nilfs2/btree.c | 4 +-
fs/nilfs2/segment.c | 2 +-
fs/ntfs3/attrib.c | 30 +-
fs/ntfs3/bitmap.c | 2 +-
fs/ntfs3/dir.c | 3 +-
fs/ntfs3/file.c | 5 +-
fs/ntfs3/frecord.c | 2 +-
fs/ntfs3/fslog.c | 5 +-
fs/ntfs3/index.c | 4 +-
fs/ntfs3/inode.c | 13 +-
fs/ntfs3/ntfs.h | 12 +-
fs/ntfs3/super.c | 4 +-
fs/proc/task_mmu.c | 43 +-
fs/smb/client/cifsfs.c | 8 +-
fs/smb/client/connect.c | 24 +-
fs/super.c | 11 +
fs/udf/balloc.c | 15 +-
fs/udf/file.c | 2 +
fs/udf/inode.c | 11 +-
fs/udf/namei.c | 2 -
fs/udf/super.c | 3 +-
include/asm-generic/vmlinux.lds.h | 2 +-
include/drm/drm_mipi_dsi.h | 46 +-
include/linux/bpf_verifier.h | 2 +-
include/linux/hugetlb.h | 1 +
include/linux/jbd2.h | 12 +-
include/linux/mlx5/qp.h | 9 +-
include/linux/objagg.h | 1 -
include/linux/pci.h | 2 +
include/linux/perf_event.h | 1 +
include/linux/sbitmap.h | 5 +
include/linux/task_work.h | 3 +-
include/linux/virtio_net.h | 11 +
include/net/ip_fib.h | 1 +
include/net/tcp.h | 1 +
include/net/xfrm.h | 36 +-
include/sound/tas2781-dsp.h | 11 +-
include/trace/events/rpcgss.h | 2 +-
include/uapi/linux/netfilter/nf_tables.h | 2 +-
include/uapi/linux/zorro_ids.h | 3 +
include/ufs/ufshcd.h | 6 +
io_uring/io-wq.c | 10 +-
io_uring/io_uring.c | 5 +-
io_uring/timeout.c | 2 +-
kernel/bpf/btf.c | 10 +-
kernel/cgroup/cgroup-v1.c | 2 +-
kernel/cgroup/cgroup.c | 4 +-
kernel/cgroup/cpuset.c | 15 +-
kernel/debug/kdb/kdb_io.c | 6 +-
kernel/dma/mapping.c | 2 +-
kernel/events/core.c | 77 ++-
kernel/events/internal.h | 2 +-
kernel/events/ring_buffer.c | 4 +-
kernel/irq/irqdomain.c | 7 +-
kernel/irq/manage.c | 2 +-
kernel/jump_label.c | 45 +-
kernel/locking/rwsem.c | 6 +-
kernel/rcu/tasks.h | 10 +
kernel/sched/core.c | 37 +-
kernel/sched/fair.c | 7 +-
kernel/sched/sched.h | 2 +-
kernel/signal.c | 8 +
kernel/task_work.c | 34 +-
kernel/time/tick-broadcast.c | 23 +
kernel/trace/pid_list.c | 4 +-
kernel/watchdog_perf.c | 11 +-
lib/build_OID_registry | 5 +-
lib/decompress_bunzip2.c | 3 +-
lib/kobject_uevent.c | 17 +-
lib/objagg.c | 18 +-
lib/sbitmap.c | 44 +-
mm/hugetlb.c | 49 +-
mm/memory.c | 2 +-
mm/mempolicy.c | 18 +-
mm/mmap_lock.c | 175 +----
mm/vmscan.c | 84 ++-
net/bridge/br_forward.c | 4 +-
net/core/filter.c | 15 +-
net/core/flow_dissector.c | 2 +-
net/core/xdp.c | 4 +-
net/ipv4/esp4.c | 3 +-
net/ipv4/fib_semantics.c | 13 +-
net/ipv4/fib_trie.c | 1 +
net/ipv4/nexthop.c | 7 +-
net/ipv4/route.c | 18 +-
net/ipv4/tcp.c | 2 +-
net/ipv4/tcp_input.c | 32 +-
net/ipv4/tcp_ipv4.c | 11 +-
net/ipv4/tcp_timer.c | 6 +-
net/ipv6/addrconf.c | 3 +-
net/ipv6/esp6.c | 3 +-
net/ipv6/tcp_ipv6.c | 10 +-
net/mac80211/cfg.c | 2 +-
net/mac80211/ieee80211_i.h | 2 +-
net/mac80211/rate.c | 2 +-
net/mac80211/sta_info.h | 6 +-
net/mac80211/vht.c | 46 +-
net/netfilter/ipvs/ip_vs_ctl.c | 10 +-
net/netfilter/ipvs/ip_vs_proto_sctp.c | 4 +-
net/netfilter/nf_conntrack_netlink.c | 3 +-
net/netfilter/nft_set_pipapo.c | 22 +-
net/netfilter/nft_set_pipapo.h | 27 +-
net/netfilter/nft_set_pipapo_avx2.c | 81 ++-
net/packet/af_packet.c | 86 ++-
net/smc/smc_core.c | 5 +-
net/sunrpc/auth_gss/gss_krb5_keys.c | 2 +-
net/sunrpc/clnt.c | 3 +-
net/sunrpc/xprtrdma/frwr_ops.c | 3 +-
net/sunrpc/xprtrdma/verbs.c | 16 +-
net/tipc/udp_media.c | 5 +-
net/unix/af_unix.c | 41 +-
net/unix/unix_bpf.c | 3 +
net/wireless/util.c | 8 +-
net/xfrm/xfrm_policy.c | 5 +-
net/xfrm/xfrm_state.c | 65 +-
net/xfrm/xfrm_user.c | 1 -
scripts/Kconfig.include | 3 +-
scripts/Makefile.lib | 6 +-
scripts/gcc-x86_32-has-stack-protector.sh | 2 +-
scripts/gcc-x86_64-has-stack-protector.sh | 2 +-
security/apparmor/lsm.c | 7 +
security/apparmor/policy.c | 2 +-
security/apparmor/policy_unpack.c | 1 +
security/keys/keyctl.c | 2 +-
security/landlock/cred.c | 11 +-
sound/core/ump.c | 13 +
sound/soc/amd/acp-es8336.c | 4 +-
sound/soc/amd/yc/acp6x-mach.c | 7 +
sound/soc/codecs/cs35l56-shared.c | 2 +-
sound/soc/codecs/max98088.c | 10 +-
sound/soc/codecs/tas2781-fmwlib.c | 20 +-
sound/soc/codecs/tas2781-i2c.c | 39 +-
sound/soc/fsl/fsl_qmc_audio.c | 2 +
sound/soc/intel/common/soc-intel-quirks.h | 2 +-
sound/soc/qcom/lpass-cpu.c | 4 +
sound/soc/sof/amd/pci-vangogh.c | 1 -
sound/soc/sof/imx/imx8m.c | 2 +-
sound/soc/sof/ipc4-topology.c | 8 +-
sound/usb/mixer.c | 7 +
sound/usb/quirks.c | 4 +
tools/bpf/bpftool/common.c | 2 +-
tools/bpf/bpftool/prog.c | 4 +
tools/bpf/resolve_btfids/main.c | 2 +-
tools/lib/bpf/btf_dump.c | 8 +-
tools/lib/bpf/linker.c | 11 +-
tools/memory-model/lock.cat | 20 +-
tools/perf/arch/x86/util/intel-pt.c | 15 +-
tools/perf/tests/shell/test_arm_callgraph_fp.sh | 27 +-
tools/perf/tests/workloads/leafloop.c | 20 +-
tools/perf/util/pmus.c | 5 +-
tools/perf/util/sort.c | 2 +-
tools/perf/util/stat-shadow.c | 7 +
tools/testing/selftests/bpf/DENYLIST.aarch64 | 1 -
.../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 16 +-
.../testing/selftests/bpf/prog_tests/fexit_sleep.c | 8 +-
tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 2 +-
.../selftests/bpf/prog_tests/xdp_adjust_tail.c | 2 +-
.../bpf/progs/btf_dump_test_case_multidim.c | 4 +-
.../bpf/progs/btf_dump_test_case_syntax.c | 4 +-
tools/testing/selftests/bpf/test_sockmap.c | 9 +-
.../drivers/net/mlxsw/spectrum-2/tc_flower.sh | 55 +-
tools/testing/selftests/landlock/base_test.c | 74 +++
tools/testing/selftests/landlock/config | 1 +
tools/testing/selftests/net/fib_tests.sh | 24 +-
.../selftests/net/forwarding/devlink_lib.sh | 2 +
tools/testing/selftests/resctrl/cache.c | 10 +-
tools/testing/selftests/resctrl/cat_test.c | 8 +-
tools/testing/selftests/resctrl/cmt_test.c | 2 +-
tools/testing/selftests/resctrl/fill_buf.c | 2 +-
tools/testing/selftests/resctrl/mba_test.c | 2 +-
tools/testing/selftests/resctrl/mbm_test.c | 2 +-
tools/testing/selftests/resctrl/resctrl.h | 4 +-
tools/testing/selftests/resctrl/resctrl_val.c | 164 +++--
tools/testing/selftests/resctrl/resctrlfs.c | 94 +--
.../selftests/sigaltstack/current_stack_pointer.h | 2 +-
601 files changed, 5320 insertions(+), 3401 deletions(-)
1 year, 4 months
- 14
- 582
[PATCH v2 0/3] MIPS misc patches
by Jiaxun Yang
Signed-off-by: Jiaxun Yang <jiaxun.yang(a)flygoat.com>
---
Changes in v2:
- v1 was sent in mistake, b4 messed up with QEMU again
- Link to v1: https://lore.kernel.org/r/20240621-loongson3-ipi-follow-v1-0-c6e73f2b2844@f…
---
Jiaxun Yang (3):
hw/mips/loongson3_virt: Store core_iocsr into LoongsonMachineState
hw/mips/loongson3_virt: Fix condition of IPI IOCSR connection
linux-user/mips64: Use MIPS64R2-generic as default CPU type
hw/mips/loongson3_virt.c | 5 ++++-
linux-user/mips64/target_elf.h | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
base-commit: 02d9c38236cf8c9826e5c5be61780c4444cb4ae0
change-id: 20240621-loongson3-ipi-follow-1f4919621882
Best regards,
--
Jiaxun Yang <jiaxun.yang(a)flygoat.com>
1 year, 4 months
- 2
- 3
FAILED: patch "[PATCH] drm/i915/gem: Fix Virtual Memory mapping boundaries" failed to apply to 6.1-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 8bdd9ef7e9b1b2a73e394712b72b22055e0e26c3
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081218-quotation-thud-f8b0@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
8bdd9ef7e9b1 ("drm/i915/gem: Fix Virtual Memory mapping boundaries calculation")
8e4ee5e87ce6 ("drm/i915: Wrap all access to i915_vma.node.start|size")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 8bdd9ef7e9b1b2a73e394712b72b22055e0e26c3 Mon Sep 17 00:00:00 2001
From: Andi Shyti <andi.shyti(a)linux.intel.com>
Date: Fri, 2 Aug 2024 10:38:50 +0200
Subject: [PATCH] drm/i915/gem: Fix Virtual Memory mapping boundaries
calculation
Calculating the size of the mapped area as the lesser value
between the requested size and the actual size does not consider
the partial mapping offset. This can cause page fault access.
Fix the calculation of the starting and ending addresses, the
total size is now deduced from the difference between the end and
start addresses.
Additionally, the calculations have been rewritten in a clearer
and more understandable form.
Fixes: c58305af1835 ("drm/i915: Use remap_io_mapping() to prefault all PTE in a single pass")
Reported-by: Jann Horn <jannh(a)google.com>
Co-developed-by: Chris Wilson <chris.p.wilson(a)linux.intel.com>
Signed-off-by: Chris Wilson <chris.p.wilson(a)linux.intel.com>
Signed-off-by: Andi Shyti <andi.shyti(a)linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen(a)linux.intel.com>
Cc: Matthew Auld <matthew.auld(a)intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi(a)intel.com>
Cc: <stable(a)vger.kernel.org> # v4.9+
Reviewed-by: Jann Horn <jannh(a)google.com>
Reviewed-by: Jonathan Cavitt <Jonathan.cavitt(a)intel.com>
[Joonas: Add Requires: tag]
Requires: 60a2066c5005 ("drm/i915/gem: Adjust vma offset for framebuffer mmap offset")
Signed-off-by: Joonas Lahtinen <joonas.lahtinen(a)linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240802083850.103694-3-andi.…
(cherry picked from commit 97b6784753da06d9d40232328efc5c5367e53417)
Signed-off-by: Joonas Lahtinen <joonas.lahtinen(a)linux.intel.com>
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_mman.c b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
index ce10dd259812..cac6d4184506 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_mman.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
@@ -290,6 +290,41 @@ static vm_fault_t vm_fault_cpu(struct vm_fault *vmf)
return i915_error_to_vmf_fault(err);
}
+static void set_address_limits(struct vm_area_struct *area,
+ struct i915_vma *vma,
+ unsigned long obj_offset,
+ unsigned long *start_vaddr,
+ unsigned long *end_vaddr)
+{
+ unsigned long vm_start, vm_end, vma_size; /* user's memory parameters */
+ long start, end; /* memory boundaries */
+
+ /*
+ * Let's move into the ">> PAGE_SHIFT"
+ * domain to be sure not to lose bits
+ */
+ vm_start = area->vm_start >> PAGE_SHIFT;
+ vm_end = area->vm_end >> PAGE_SHIFT;
+ vma_size = vma->size >> PAGE_SHIFT;
+
+ /*
+ * Calculate the memory boundaries by considering the offset
+ * provided by the user during memory mapping and the offset
+ * provided for the partial mapping.
+ */
+ start = vm_start;
+ start -= obj_offset;
+ start += vma->gtt_view.partial.offset;
+ end = start + vma_size;
+
+ start = max_t(long, start, vm_start);
+ end = min_t(long, end, vm_end);
+
+ /* Let's move back into the "<< PAGE_SHIFT" domain */
+ *start_vaddr = (unsigned long)start << PAGE_SHIFT;
+ *end_vaddr = (unsigned long)end << PAGE_SHIFT;
+}
+
static vm_fault_t vm_fault_gtt(struct vm_fault *vmf)
{
#define MIN_CHUNK_PAGES (SZ_1M >> PAGE_SHIFT)
@@ -302,14 +337,18 @@ static vm_fault_t vm_fault_gtt(struct vm_fault *vmf)
struct i915_ggtt *ggtt = to_gt(i915)->ggtt;
bool write = area->vm_flags & VM_WRITE;
struct i915_gem_ww_ctx ww;
+ unsigned long obj_offset;
+ unsigned long start, end; /* memory boundaries */
intel_wakeref_t wakeref;
struct i915_vma *vma;
pgoff_t page_offset;
+ unsigned long pfn;
int srcu;
int ret;
- /* We don't use vmf->pgoff since that has the fake offset */
+ obj_offset = area->vm_pgoff - drm_vma_node_start(&mmo->vma_node);
page_offset = (vmf->address - area->vm_start) >> PAGE_SHIFT;
+ page_offset += obj_offset;
trace_i915_gem_object_fault(obj, page_offset, true, write);
@@ -402,12 +441,14 @@ static vm_fault_t vm_fault_gtt(struct vm_fault *vmf)
if (ret)
goto err_unpin;
+ set_address_limits(area, vma, obj_offset, &start, &end);
+
+ pfn = (ggtt->gmadr.start + i915_ggtt_offset(vma)) >> PAGE_SHIFT;
+ pfn += (start - area->vm_start) >> PAGE_SHIFT;
+ pfn += obj_offset - vma->gtt_view.partial.offset;
+
/* Finally, remap it using the new GTT offset */
- ret = remap_io_mapping(area,
- area->vm_start + (vma->gtt_view.partial.offset << PAGE_SHIFT),
- (ggtt->gmadr.start + i915_ggtt_offset(vma)) >> PAGE_SHIFT,
- min_t(u64, vma->size, area->vm_end - area->vm_start),
- &ggtt->iomap);
+ ret = remap_io_mapping(area, start, pfn, end - start, &ggtt->iomap);
if (ret)
goto err_fence;
1 year, 4 months
- 3
- 2
FAILED: patch "[PATCH] mptcp: fully established after ADD_ADDR echo on MPJ" failed to apply to 6.1-stable tree
by gregkh＠linuxfoundation.org
The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x d67c5649c1541dc93f202eeffc6f49220a4ed71d
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2024081208-motion-jubilant-6af5@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
d67c5649c154 ("mptcp: fully established after ADD_ADDR echo on MPJ")
b3ea6b272d79 ("mptcp: consolidate initial ack seq generation")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From d67c5649c1541dc93f202eeffc6f49220a4ed71d Mon Sep 17 00:00:00 2001
From: "Matthieu Baerts (NGI0)" <matttbe(a)kernel.org>
Date: Wed, 31 Jul 2024 13:05:53 +0200
Subject: [PATCH] mptcp: fully established after ADD_ADDR echo on MPJ
Before this patch, receiving an ADD_ADDR echo on the just connected
MP_JOIN subflow -- initiator side, after the MP_JOIN 3WHS -- was
resulting in an MP_RESET. That's because only ACKs with a DSS or
ADD_ADDRs without the echo bit were allowed.
Not allowing the ADD_ADDR echo after an MP_CAPABLE 3WHS makes sense, as
we are not supposed to send an ADD_ADDR before because it requires to be
in full established mode first. For the MP_JOIN 3WHS, that's different:
the ADD_ADDR can be sent on a previous subflow, and the ADD_ADDR echo
can be received on the recently created one. The other peer will already
be in fully established, so it is allowed to send that.
We can then relax the conditions here to accept the ADD_ADDR echo for
MPJ subflows.
Fixes: 67b12f792d5e ("mptcp: full fully established support after ADD_ADDR")
Cc: stable(a)vger.kernel.org
Reviewed-by: Mat Martineau <martineau(a)kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe(a)kernel.org>
Link: https://patch.msgid.link/20240731-upstream-net-20240731-mptcp-endp-subflow-…
Signed-off-by: Jakub Kicinski <kuba(a)kernel.org>
diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 8a68382a4fe9..ac2f1a54cc43 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -958,7 +958,8 @@ static bool check_fully_established(struct mptcp_sock *msk, struct sock *ssk,
if (subflow->remote_key_valid &&
(((mp_opt->suboptions & OPTION_MPTCP_DSS) && mp_opt->use_ack) ||
- ((mp_opt->suboptions & OPTION_MPTCP_ADD_ADDR) && !mp_opt->echo))) {
+ ((mp_opt->suboptions & OPTION_MPTCP_ADD_ADDR) &&
+ (!mp_opt->echo || subflow->mp_join)))) {
/* subflows are fully established as soon as we get any
* additional ack, including ADD_ADDR.
*/
1 year, 4 months
- 3
- 2