6.15.3-rc1 review
Subsystems (10)
Greg Kroah-Hartman
maintainerPATCH 117/780 drm/v3d: fix client obtained from axi_ids on V3D 4.1
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jose Maria Casanova Crespo <[email protected]>
[ Upstream commit d0e4c6537005dd106b101d4434a0c3dafd936d05 ]
In the case of MMU errors caused by the TFU unit, the client that causes the MMU error is expected to be reported. But in the case of MMU TFU errors, a non existing client was being reported. This happened because the client calculation was taking into account more than the bits 0-7 from the axi_id that were representing the client.
[ 27.845132] v3d fec00000.v3d: MMU error from client ? (13) at 0x3bb1000, pte invalid
Masking the bits and using the correct axi_id ranges fixes the calculation to report the real guilty client on V3D 4.1 and 4.2.
Make the MMU error print axi_id with hexadecimal as used in the ranges.
--- drivers/gpu/drm/v3d/v3d_irq.c | 37 +++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 13 deletions(-)
drivers/gpu/drm/v3d/v3d_irq.c +24 -13
@@ -186,27 +186,38 @@ v3d_hub_irq(int irq, void *arg)u32 axi_id =V3D_READ (V3D_MMU_VIO_ID );u64 vio_addr = ((u64 )V3D_READ (V3D_MMU_VIO_ADDR ) << (v3d->va_width -32 )); -static const char *const v3d41_axi_ids[] = { -"L2T" , -"PTB" , -"PSE" , -"TLB" , -"CLE" , -"TFU" , -"MMU" , -"GMP" , +static const struct { +u32 begin; +u32 end; +const char *client; + } v3d41_axi_ids[] = { + {0x00 ,0x20 ,"L2T" }, + {0x20 ,0x21 ,"PTB" }, + {0x40 ,0x41 ,"PSE" }, + {0x60 ,0x80 ,"TLB" }, + {0x80 ,0x88 ,"CLE" }, + {0xA0 ,0xA1 ,"TFU" }, + {0xC0 ,0xE0 ,"MMU" }, + {0xE0 ,0xE1 ,"GMP" }, };const char *client ="?" ;V3D_WRITE (V3D_MMU_CTL ,V3D_READ (V3D_MMU_CTL ));if (v3d->ver >=V3D_GEN_41 ) { - axi_id = axi_id >>5 ; -if (axi_id <ARRAY_SIZE (v3d41_axi_ids)) - client = v3d41_axi_ids[axi_id]; +size_t i; + + axi_id = axi_id &0xFF ; +for (i =0 ; i <ARRAY_SIZE (v3d41_axi_ids); i++) { +if (axi_id >= v3d41_axi_ids[i].begin && + axi_id < v3d41_axi_ids[i].end) { + client = v3d41_axi_ids[i].client; +break ; + } + } } - dev_err(v3d->drm.dev, "MMU error from client %s (%d) at 0x%llx%s%s%s\n", + dev_err(v3d->drm.dev, "MMU error from client %s (0x%x) at 0x%llx%s%s%s\n", client, axi_id, (long long)vio_addr, ((intsts & V3D_HUB_INT_MMU_WRV) ? ", write violation" : ""),
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 118/780 drm/v3d: client ranges from axi_ids are different with V3D 7.1
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jose Maria Casanova Crespo <[email protected]>
[ Upstream commit a22e0051f9eb2281b181218d97f77cebc299310d ]
The client mask has been reduced from 8 bits on V3D 4.1 to 7 bits on V3D 7.1, so the ranges for each client are not compatible.
On V3D 7.1, the CSD client can also report MMU errors. Therefore, add its AXI ID to the IDs list.
--- drivers/gpu/drm/v3d/v3d_irq.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)
drivers/gpu/drm/v3d/v3d_irq.c +22 -1
@@ -199,12 +199,33 @@ v3d_hub_irq(int irq, void *arg) {0xA0, 0xA1, "TFU"}, {0xC0, 0xE0, "MMU"}, {0xE0, 0xE1, "GMP"}, + }, v3d71_axi_ids[] = { + {0x00, 0x30, "L2T"}, + {0x30, 0x38, "CLE"}, + {0x38, 0x39, "PTB"}, + {0x39, 0x3A, "PSE"}, + {0x3A, 0x3B, "CSD"}, + {0x40, 0x60, "TLB"}, + {0x60, 0x70, "MMU"}, + {0x7C, 0x7E, "TFU"}, + {0x7F, 0x80, "GMP"}, };const char *client ="?" ;V3D_WRITE (V3D_MMU_CTL ,V3D_READ (V3D_MMU_CTL )); -if (v3d->ver >=V3D_GEN_41 ) { +if (v3d->ver >=V3D_GEN_71 ) { +size_t i; + + axi_id = axi_id &0x7F ; +for (i =0 ; i <ARRAY_SIZE (v3d71_axi_ids); i++) { +if (axi_id >= v3d71_axi_ids[i].begin && + axi_id < v3d71_axi_ids[i].end) { + client = v3d71_axi_ids[i].client; +break ; + } + } + }else if (v3d->ver >=V3D_GEN_41 ) {size_t i; axi_id = axi_id &0xFF ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 119/780 fs/ntfs3: handle hdr_first_de() return value
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrey Vatoropin <[email protected]>
[ Upstream commit af5cab0e5b6f8edb0be51a9f47f3f620e0b4fd70 ]
The hdr_first_de() function returns a pointer to a struct NTFS_DE. This pointer may be NULL. To handle the NULL error effectively, it is important to implement an error handler. This will help manage potential errors consistently.
Additionally, error handling for the return value already exists at other points where this function is called.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- fs/ntfs3/index.c | 8 ++++++++ 1 file changed, 8 insertions(+)
fs/ntfs3/index.c +8 -0
@@ -2182,6 +2182,10 @@ static int indx_get_entry_to_replace(struct ntfs_index *indx, e =hdr_first_de (&n->index->ihdr);fnd_push (fnd, n, e); +if (!e) { + err = -EINVAL ; + goto out; + }if (!de_is_last (e)) {/*
@@ -2203,6 +2207,10 @@ static int indx_get_entry_to_replace(struct ntfs_index *indx, n = fnd->nodes[level]; te =hdr_first_de (&n->index->ihdr); +if (!te) { + err = -EINVAL ; + goto out; + }/* Copy the candidate entry into the replacement entry buffer. */ re =kmalloc (le16_to_cpu (te->size) +sizeof (u64),GFP_NOFS );if (!re) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 120/780 fs/ntfs3: Add missing direct_IO in ntfs_aops_cmpr
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lizhi Xu <[email protected]>
[ Upstream commit 8b26c8c376b29cf29710fbfd093df194cefe26ad ]
The ntfs3 can use the page cache directly, so its address_space_operations need direct_IO. Exit ntfs_direct_IO() if it is a compressed file.
--- fs/ntfs3/inode.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/ntfs3/inode.c +5 -0
@@ -805,6 +805,10 @@ static ssize_t ntfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter) ret =0 ; goto out; } +if (is_compressed (ni)) { + ret =0 ; + goto out; + } ret = blockdev_direct_IO(iocb, inode, iter, wr ? ntfs_get_block_direct_IO_W :
@@ -2068,5 +2072,6 @@ const struct address_space_operations ntfs_aops_cmpr = { .read_folio = ntfs_read_folio, .readahead = ntfs_readahead, .dirty_folio = block_dirty_folio, + .direct_IO = ntfs_direct_IO, };// clang-format on
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 121/780 kunit/usercopy: Disable u64 test on 32-bit SPARC
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Weißschuh <[email protected]>
[ Upstream commit 0d6efa20e384a41a7f4afdcd8a0aec442c19d33e ]
usercopy of 64 bit values does not work on 32-bit SPARC:
# usercopy_test_valid: EXPECTATION FAILED at lib/tests/usercopy_kunit.c:209
Expected val_u64 == 0x5a5b5c5d6a6b6c6d, but
val_u64 == 1515936861 (0x5a5b5c5d)
0x5a5b5c5d6a6b6c6d == 6510899242581322861 (0x5a5b5c5d6a6b6c6d)Disable the test.
--- lib/tests/usercopy_kunit.c | 1 + 1 file changed, 1 insertion(+)
lib/tests/usercopy_kunit.c +1 -0
@@ -27,6 +27,7 @@ !defined(CONFIG_MICROBLAZE) && \ !defined(CONFIG_NIOS2) && \ !defined(CONFIG_PPC32) && \ + !defined(CONFIG_SPARC32) && \ !defined(CONFIG_SUPERH))# define TEST_U64 #endif
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 122/780 watchdog: exar: Shorten identity name to fit correctly
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
[ Upstream commit 8e28276a569addb8a2324439ae473848ee52b056 ]
The static initializer for struct watchdog_info::identity is too long and gets initialized without a trailing NUL byte. Since the length of "identity" is part of UAPI and tied to ioctls, just shorten the name of the device. Avoids the warning seen with GCC 15's -Wunterminated-string-initialization option:
drivers/watchdog/exar_wdt.c:224:27: warning: initializer-string for array of 'unsigned char' truncates NUL terminator but destination lacks 'nonstring' attribute (33 chars into 32 available) [-Wunterminated-string-initialization]
224 | .identity = "Exar/MaxLinear XR28V38x Watchdog",
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--- drivers/watchdog/exar_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/exar_wdt.c +1 -1
@@ -221,7 +221,7 @@ static const struct watchdog_info exar_wdt_info = { .options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE, - .identity = "Exar/MaxLinear XR28V38x Watchdog", + .identity = "Exar XR28V38x Watchdog", };static const struct watchdog_ops exar_wdt_ops = {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 123/780 m68k: mac: Fix macintosh_config for Mac II
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Finn Thain <[email protected]>
[ Upstream commit 52ae3f5da7e5adbe3d1319573b55dac470abb83c ]
When booted on my Mac II, the kernel prints this:
Detected Macintosh model: 6
Apple Macintosh Unknown
The catch-all entry ("Unknown") is mac_data_table[0] which is only needed in the unlikely event that the bootinfo model ID can't be matched. When model ID is 6, the search should begin and end at mac_data_table[1]. Fix the off-by-one error that causes this problem.
--- arch/m68k/mac/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/m68k/mac/config.c +1 -1
@@ -793,7 +793,7 @@ static void __init mac_identify(void) } macintosh_config = mac_data_table; -for (m = macintosh_config; m->ident !=-1 ; m++) { +for (m = &mac_data_table[1 ]; m->ident !=-1 ; m++) {if (m->ident == model) { macintosh_config = m;break ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 124/780 firmware: psci: Fix refcount leak in psci_dt_init
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miaoqian Lin <[email protected]>
[ Upstream commit 7ff37d29fd5c27617b9767e1b8946d115cf93a1e ]
Fix a reference counter leak in psci_dt_init() where of_node_put(np) was missing after of_find_matching_node_and_match() when np is unavailable.
--- drivers/firmware/psci/psci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/firmware/psci/psci.c +3 -1
@@ -804,8 +804,10 @@ int __init psci_dt_init(void) np =of_find_matching_node_and_match (NULL , psci_of_match, &matched_np); -if (!np || !of_device_is_available (np)) +if (!np || !of_device_is_available (np)) { +of_node_put (np);return -ENODEV ; + } init_fn = (psci_initcall_t )matched_np->data; ret =init_fn (np);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 125/780 arm64: Support ARM64_VA_BITS=52 when setting ARCH_MMAP_RND_BITS_MAX
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kornel Dulęba <[email protected]>
[ Upstream commit f101c56447717c595d803894ba0e215f56c6fba4 ]
When the 52-bit virtual addressing was introduced the select like ARCH_MMAP_RND_BITS_MAX logic was never updated to account for it. Because of that the rnd max bits knob is set to the default value of 18 when ARM64_VA_BITS=52.
Fix this by setting ARCH_MMAP_RND_BITS_MAX to the same value that would be used if 48-bit addressing was used. Higher values can't used here because 52-bit addressing is used only if the caller provides a hint to mmap, with a fallback to 48-bit. The knob in question is an upper bound for what the user can set in /proc/sys/vm/mmap_rnd_bits, which in turn is used to determine how many random bits can be inserted into the base address used for mmap allocations. Since 48-bit allocations are legal with ARM64_VA_BITS=52, we need to make sure that the base address is small enough to facilitate this.
--- arch/arm64/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/Kconfig +3 -3
@@ -333,9 +333,9 @@ config ARCH_MMAP_RND_BITS_MAX default 24 if ARM64_VA_BITS=39 default 27 if ARM64_VA_BITS=42 default 30 if ARM64_VA_BITS=47 - default 29 if ARM64_VA_BITS=48 && ARM64_64K_PAGES - default 31 if ARM64_VA_BITS=48 && ARM64_16K_PAGES - default 33 if ARM64_VA_BITS=48 + default 29 if (ARM64_VA_BITS=48 || ARM64_VA_BITS=52) && ARM64_64K_PAGES + default 31 if (ARM64_VA_BITS=48 || ARM64_VA_BITS=52) && ARM64_16K_PAGES + default 33 if (ARM64_VA_BITS=48 || ARM64_VA_BITS=52) default 14 if ARM64_64K_PAGES default 16 if ARM64_16K_PAGES default 18
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 126/780 arm64/fpsimd: Avoid warning when sve_to_fpsimd() is unused
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mark Rutland <[email protected]>
[ Upstream commit f699c66691fb7e08a5a631c5baf5f2a19b7a6468 ]
Historically fpsimd_to_sve() and sve_to_fpsimd() were (conditionally) called by functions which were defined regardless of CONFIG_ARM64_SVE. Hence it was necessary that both fpsimd_to_sve() and sve_to_fpsimd() were always defined and not guarded by ifdeffery.
As a result of the removal of fpsimd_signal_preserve_current_state() in commit:
929fa99b1215966f ("arm64/fpsimd: signal: Always save+flush state early")
... sve_to_fpsimd() has no callers when CONFIG_ARM64_SVE=n, resulting in a build-time warnign that it is unused:
| arch/arm64/kernel/fpsimd.c:676:13: warning: unused function 'sve_to_fpsimd' [-Wunused-function] | 676 | static void sve_to_fpsimd(struct task_struct *task) | | ^~~~~~~~~~~~~ | 1 warning generated.
In contrast, fpsimd_to_sve() still has callers which are defined when CONFIG_ARM64_SVE=n, and it would be awkward to hide this behind ifdeffery and/or to use stub functions.
For now, suppress the warning by marking both fpsimd_to_sve() and sve_to_fpsimd() as 'static inline', as we usually do for stub functions. The compiler will no longer warn if either function is unused.
Aside from suppressing the warning, there should be no functional change as a result of this patch.
--- arch/arm64/kernel/fpsimd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/kernel/fpsimd.c +2 -2
@@ -651,7 +651,7 @@ static void __fpsimd_to_sve(void *sst, struct user_fpsimd_state const *fst,* task->thread.uw.fpsimd_state must be up to date before calling this * function. */ -static void fpsimd_to_sve (struct task_struct *task) +static inline void fpsimd_to_sve (struct task_struct *task) {unsigned int vq;void *sst = task->thread.sve_state;
@@ -675,7 +675,7 @@ static void fpsimd_to_sve(struct task_struct *task)* bytes of allocated kernel memory. * task->thread.sve_state must be up to date before calling this function. */ -static void sve_to_fpsimd (struct task_struct *task) +static inline void sve_to_fpsimd (struct task_struct *task) {unsigned int vq, vl;void const *sst = task->thread.sve_state;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 127/780 selftests/seccomp: fix syscall_restart test for arm compat
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Neill Kapron <[email protected]>
[ Upstream commit 797002deed03491215a352ace891749b39741b69 ]
The inconsistencies in the systcall ABI between arm and arm-compat can can cause a failure in the syscall_restart test due to the logic attempting to work around the differences. The 'machine' field for an ARM64 device running in compat mode can report 'armv8l' or 'armv8b' which matches with the string 'arm' when only examining the first three characters of the string.
This change adds additional validation to the workaround logic to make sure we only take the arm path when running natively, not in arm-compat.
--- tools/testing/selftests/seccomp/seccomp_bpf.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
tools/testing/selftests/seccomp/seccomp_bpf.c +5 -2
@@ -3166,12 +3166,15 @@ TEST(syscall_restart) ret =get_syscall (_metadata, child_pid);#if defined(__arm__)/* -* FIXME: * - native ARM registers do NOT expose true syscall. * - compat ARM registers on ARM64 DO expose true syscall. +* - values of utsbuf.machine include 'armv8l' or 'armb8b' +* for ARM64 running in compat mode. */ ASSERT_EQ (0 ,uname (&utsbuf)); -if (strncmp (utsbuf.machine,"arm" ,3 ) ==0 ) { +if ((strncmp (utsbuf.machine,"arm" ,3 ) ==0 ) && + (strncmp (utsbuf.machine,"armv8l" ,6 ) !=0 ) && + (strncmp (utsbuf.machine,"armv8b" ,6 ) !=0 )) {EXPECT_EQ (__NR_nanosleep, ret); } else#endif
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 128/780 drm/msm/dpu: enable SmartDMA on SM8150
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 6a2343de0b6f70a21bf503ac4688dc905cb068e1 ]
Reworking of the catalog dropped the SmartDMA feature bit on the SM8150 platform. Renable SmartDMA support on this SoC.
Patchwork: https://patchwork.freedesktop.org/patch/650418/
--- .../drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h +8 -8
@@ -76,7 +76,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = { { .name = "sspp_0", .id = SSPP_VIG0, .base = 0x4000, .len = 0x1f0, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_SDMA, .sblk = &dpu_vig_sblk_qseed3_1_4, .xin_id = 0, .type = SSPP_TYPE_VIG,
@@ -84,7 +84,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = { }, { .name = "sspp_1", .id = SSPP_VIG1, .base = 0x6000, .len = 0x1f0, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_SDMA, .sblk = &dpu_vig_sblk_qseed3_1_4, .xin_id = 4, .type = SSPP_TYPE_VIG,
@@ -92,7 +92,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = { }, { .name = "sspp_2", .id = SSPP_VIG2, .base = 0x8000, .len = 0x1f0, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_SDMA, .sblk = &dpu_vig_sblk_qseed3_1_4, .xin_id = 8, .type = SSPP_TYPE_VIG,
@@ -100,7 +100,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = { }, { .name = "sspp_3", .id = SSPP_VIG3, .base = 0xa000, .len = 0x1f0, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_SDMA, .sblk = &dpu_vig_sblk_qseed3_1_4, .xin_id = 12, .type = SSPP_TYPE_VIG,
@@ -108,7 +108,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = { }, { .name = "sspp_8", .id = SSPP_DMA0, .base = 0x24000, .len = 0x1f0, - .features = DMA_SDM845_MASK, + .features = DMA_SDM845_MASK_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 1, .type = SSPP_TYPE_DMA,
@@ -116,7 +116,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = { }, { .name = "sspp_9", .id = SSPP_DMA1, .base = 0x26000, .len = 0x1f0, - .features = DMA_SDM845_MASK, + .features = DMA_SDM845_MASK_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 5, .type = SSPP_TYPE_DMA,
@@ -124,7 +124,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = { }, { .name = "sspp_10", .id = SSPP_DMA2, .base = 0x28000, .len = 0x1f0, - .features = DMA_CURSOR_SDM845_MASK, + .features = DMA_CURSOR_SDM845_MASK_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 9, .type = SSPP_TYPE_DMA,
@@ -132,7 +132,7 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = { }, { .name = "sspp_11", .id = SSPP_DMA3, .base = 0x2a000, .len = 0x1f0, - .features = DMA_CURSOR_SDM845_MASK, + .features = DMA_CURSOR_SDM845_MASK_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 13, .type = SSPP_TYPE_DMA,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 129/780 drm/msm/dpu: enable SmartDMA on SC8180X
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 8dcccd7a156ffb3157de7f527cc7c6100e9a455a ]
Reworking of the catalog dropped the SmartDMA feature bit on the SC8180X platform. Renable SmartDMA support on this SoC.
Patchwork: https://patchwork.freedesktop.org/patch/650421/
--- .../drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h +8 -8
@@ -75,7 +75,7 @@ static const struct dpu_sspp_cfg sc8180x_sspp[] = { { .name = "sspp_0", .id = SSPP_VIG0, .base = 0x4000, .len = 0x1f0, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_SDMA, .sblk = &dpu_vig_sblk_qseed3_1_4, .xin_id = 0, .type = SSPP_TYPE_VIG,
@@ -83,7 +83,7 @@ static const struct dpu_sspp_cfg sc8180x_sspp[] = { }, { .name = "sspp_1", .id = SSPP_VIG1, .base = 0x6000, .len = 0x1f0, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_SDMA, .sblk = &dpu_vig_sblk_qseed3_1_4, .xin_id = 4, .type = SSPP_TYPE_VIG,
@@ -91,7 +91,7 @@ static const struct dpu_sspp_cfg sc8180x_sspp[] = { }, { .name = "sspp_2", .id = SSPP_VIG2, .base = 0x8000, .len = 0x1f0, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_SDMA, .sblk = &dpu_vig_sblk_qseed3_1_4, .xin_id = 8, .type = SSPP_TYPE_VIG,
@@ -99,7 +99,7 @@ static const struct dpu_sspp_cfg sc8180x_sspp[] = { }, { .name = "sspp_3", .id = SSPP_VIG3, .base = 0xa000, .len = 0x1f0, - .features = VIG_SDM845_MASK, + .features = VIG_SDM845_MASK_SDMA, .sblk = &dpu_vig_sblk_qseed3_1_4, .xin_id = 12, .type = SSPP_TYPE_VIG,
@@ -107,7 +107,7 @@ static const struct dpu_sspp_cfg sc8180x_sspp[] = { }, { .name = "sspp_8", .id = SSPP_DMA0, .base = 0x24000, .len = 0x1f0, - .features = DMA_SDM845_MASK, + .features = DMA_SDM845_MASK_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 1, .type = SSPP_TYPE_DMA,
@@ -115,7 +115,7 @@ static const struct dpu_sspp_cfg sc8180x_sspp[] = { }, { .name = "sspp_9", .id = SSPP_DMA1, .base = 0x26000, .len = 0x1f0, - .features = DMA_SDM845_MASK, + .features = DMA_SDM845_MASK_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 5, .type = SSPP_TYPE_DMA,
@@ -123,7 +123,7 @@ static const struct dpu_sspp_cfg sc8180x_sspp[] = { }, { .name = "sspp_10", .id = SSPP_DMA2, .base = 0x28000, .len = 0x1f0, - .features = DMA_CURSOR_SDM845_MASK, + .features = DMA_CURSOR_SDM845_MASK_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 9, .type = SSPP_TYPE_DMA,
@@ -131,7 +131,7 @@ static const struct dpu_sspp_cfg sc8180x_sspp[] = { }, { .name = "sspp_11", .id = SSPP_DMA3, .base = 0x2a000, .len = 0x1f0, - .features = DMA_CURSOR_SDM845_MASK, + .features = DMA_CURSOR_SDM845_MASK_SDMA, .sblk = &dpu_dma_sblk, .xin_id = 13, .type = SSPP_TYPE_DMA,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 130/780 drm/msm/dpu: remove DSC feature bit for PINGPONG on MSM8937
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit b43c524134e0b0ae38acecc4e1dc585940ff6f88 ]
The MSM8937 platform doesn't have DSC blocks nor does have it DSC registers in the PINGPONG block. Drop the DPU_PINGPONG_DSC feature bit from the PINGPONG's feature mask and, as it is the only remaining bit, drop the .features assignment completely.
Patchwork: https://patchwork.freedesktop.org/patch/640299/
--- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_14_msm8937.h | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_14_msm8937.h +0 -2
@@ -100,14 +100,12 @@ static const struct dpu_pingpong_cfg msm8937_pp[] = { { .name = "pingpong_0", .id = PINGPONG_0, .base = 0x70000, .len = 0xd4, - .features = PINGPONG_MSM8996_MASK, .sblk = &msm8996_pp_sblk, .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), .intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12), }, { .name = "pingpong_1", .id = PINGPONG_1, .base = 0x70800, .len = 0xd4, - .features = PINGPONG_MSM8996_MASK, .sblk = &msm8996_pp_sblk, .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), .intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13),
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 131/780 drm/msm/dpu: remove DSC feature bit for PINGPONG on MSM8917
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 5be98120115c46907921e29344291628cf79912a ]
The MSM8917 platform doesn't have DSC blocks nor does have it DSC registers in the PINGPONG block. Drop the DPU_PINGPONG_DSC feature bit from the PINGPONG's feature mask and, as it is the only remaining bit, drop the .features assignment completely.
Patchwork: https://patchwork.freedesktop.org/patch/640301/
--- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_15_msm8917.h | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_15_msm8917.h +0 -1
@@ -93,7 +93,6 @@ static const struct dpu_pingpong_cfg msm8917_pp[] = { { .name = "pingpong_0", .id = PINGPONG_0, .base = 0x70000, .len = 0xd4, - .features = PINGPONG_MSM8996_MASK, .sblk = &msm8996_pp_sblk, .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), .intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12),
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 132/780 drm/msm/dpu: remove DSC feature bit for PINGPONG on MSM8953
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 5232a29ebc74df4abf790147a06db451d824cd92 ]
The MSM8953 platform doesn't have DSC blocks nor does have it DSC registers in the PINGPONG block. Drop the DPU_PINGPONG_DSC feature bit from the PINGPONG's feature mask and, as it is the only remaining bit, drop the .features assignment completely.
Patchwork: https://patchwork.freedesktop.org/patch/640303/
--- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_16_msm8953.h | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_16_msm8953.h +0 -2
@@ -100,14 +100,12 @@ static const struct dpu_pingpong_cfg msm8953_pp[] = { { .name = "pingpong_0", .id = PINGPONG_0, .base = 0x70000, .len = 0xd4, - .features = PINGPONG_MSM8996_MASK, .sblk = &msm8996_pp_sblk, .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), .intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12), }, { .name = "pingpong_1", .id = PINGPONG_1, .base = 0x70800, .len = 0xd4, - .features = PINGPONG_MSM8996_MASK, .sblk = &msm8996_pp_sblk, .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), .intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13),
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 133/780 drm: rcar-du: Fix memory leak in rcar_du_vsps_init()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Biju Das <[email protected]>
[ Upstream commit 91e3bf09a90bb4340c0c3c51396e7531555efda4 ]
The rcar_du_vsps_init() doesn't free the np allocated by of_parse_phandle_with_fixed_args() for the non-error case.
Fix memory leak for the non-error case.
While at it, replace the label 'error'->'done' as it applies to non-error case as well and update the error check condition for rcar_du_vsp_init() to avoid breakage in future, if it returns positive value.
--- drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c +4 -6
@@ -705,7 +705,7 @@ static int rcar_du_vsps_init(struct rcar_du_device *rcdu) ret =of_parse_phandle_with_fixed_args (np, vsps_prop_name, cells, i, &args);if (ret <0 ) - goto error; + goto done;/* * Add the VSP to the list or update the corresponding existing
@@ -743,13 +743,11 @@ static int rcar_du_vsps_init(struct rcar_du_device *rcdu) vsp->dev = rcdu; ret =rcar_du_vsp_init (vsp, vsps[i].np, vsps[i].crtcs_mask); -if (ret <0 ) - goto error; +if (ret) + goto done; } -return 0 ; - -error: +done:for (i =0 ; i <ARRAY_SIZE (vsps); ++i)of_node_put (vsps[i].np);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 134/780 drm/vkms: Adjust vkms_state->active_planes allocation type
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
[ Upstream commit 258aebf100540d36aba910f545d4d5ddf4ecaf0b ]
In preparation for making the kmalloc family of allocators type aware, we need to make sure that the returned type from the allocation matches the type of the variable being assigned. (Before, the allocator would always return "void *", which can be implicitly cast to any pointer type.)
The assigned type is "struct vkms_plane_state **", but the returned type will be "struct drm_plane **". These are the same size (pointer size), but the types don't match. Adjust the allocation type to match the assignment.
--- drivers/gpu/drm/vkms/vkms_crtc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/vkms/vkms_crtc.c +1 -1
@@ -194,7 +194,7 @@ static int vkms_crtc_atomic_check(struct drm_crtc *crtc, i++; } - vkms_state->active_planes =kcalloc (i,sizeof (plane),GFP_KERNEL ); + vkms_state->active_planes =kcalloc (i,sizeof (*vkms_state->active_planes),GFP_KERNEL );if (!vkms_state->active_planes)return -ENOMEM ; vkms_state->num_active_planes = i;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 135/780 drm/tegra: rgb: Fix the unbound reference count
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Biju Das <[email protected]>
[ Upstream commit 3c3642335065c3bde0742b0edc505b6ea8fdc2b3 ]
The of_get_child_by_name() increments the refcount in tegra_dc_rgb_probe, but the driver does not decrement the refcount during unbind. Fix the unbound reference count using devm_add_action_or_reset() helper.
--- drivers/gpu/drm/tegra/rgb.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/gpu/drm/tegra/rgb.c +13 -1
@@ -200,6 +200,11 @@ static const struct drm_encoder_helper_funcs tegra_rgb_encoder_helper_funcs = { .atomic_check = tegra_rgb_encoder_atomic_check, }; +static void tegra_dc_of_node_put (void *data) +{ +of_node_put (data); +} +int tegra_dc_rgb_probe (struct tegra_dc *dc) {struct device_node *np;
@@ -207,7 +212,14 @@ int tegra_dc_rgb_probe(struct tegra_dc *dc)int err; np =of_get_child_by_name (dc->dev->of_node,"rgb" ); -if (!np || !of_device_is_available (np)) +if (!np) +return -ENODEV ; + + err =devm_add_action_or_reset (dc->dev, tegra_dc_of_node_put, np); +if (err <0 ) +return err; + +if (!of_device_is_available (np))return -ENODEV ; rgb =devm_kzalloc (dc->dev,sizeof (*rgb),GFP_KERNEL );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 136/780 drm/amd/display: Dont check for NULL divisor in fixpt code
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Harry Wentland <[email protected]>
[ Upstream commit d01ca8708d95a561f6462a15cad94a2c0bec7042 ]
[Why]
We check for a NULL divisor but don't act on it. This check does nothing other than throw a warning. It does confuse static checkers though:
See https://lkml.org/lkml/2025/4/26/371
[How]
Drop the ASSERTs in both DC and SPL variants.
--- drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c | 5 ----- drivers/gpu/drm/amd/display/dc/sspl/spl_fixpt31_32.c | 4 ---- 2 files changed, 9 deletions(-)
drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c +0 -5
@@ -51,8 +51,6 @@ static inline unsigned long long complete_integer_division_u64( {unsigned long long result; -ASSERT (divisor); - result =div64_u64_rem (dividend, divisor, remainder);return result;
@@ -213,9 +211,6 @@ struct fixed31_32 dc_fixpt_recip(struct fixed31_32 arg)* @note * Good idea to use Newton's method */ - -ASSERT (arg.value); -return dc_fixpt_from_fraction ( dc_fixpt_one.value, arg.value);
drivers/gpu/drm/amd/display/dc/sspl/spl_fixpt31_32.c +0 -4
@@ -29,8 +29,6 @@ static inline unsigned long long spl_complete_integer_division_u64( {unsigned long long result; -SPL_ASSERT (divisor); - result =spl_div64_u64_rem (dividend, divisor, remainder);return result;
@@ -196,8 +194,6 @@ struct spl_fixed31_32 spl_fixpt_recip(struct spl_fixed31_32 arg)* Good idea to use Newton's method */ -SPL_ASSERT (arg.value); -return spl_fixpt_from_fraction ( spl_fixpt_one.value, arg.value);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 137/780 firmware: SDEI: Allow sdei initialization without ACPI_APEI_GHES
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Huang Yiwei <[email protected]>
[ Upstream commit 59529bbe642de4eb2191a541d9b4bae7eb73862e ]
SDEI usually initialize with the ACPI table, but on platforms where ACPI is not used, the SDEI feature can still be used to handle specific firmware calls or other customized purposes. Therefore, it is not necessary for ARM_SDE_INTERFACE to depend on ACPI_APEI_GHES.
In commit dc4e8c07e9e2 ("ACPI: APEI: explicit init of HEST and GHES in acpi_init()"), to make APEI ready earlier, sdei_init was moved into acpi_ghes_init instead of being a standalone initcall, adding ACPI_APEI_GHES dependency to ARM_SDE_INTERFACE. This restricts the flexibility and usability of SDEI.
This patch corrects the dependency in Kconfig and splits sdei_init() into two separate functions: sdei_init() and acpi_sdei_init(). sdei_init() will be called by arch_initcall and will only initialize the platform driver, while acpi_sdei_init() will initialize the device from acpi_ghes_init() when ACPI is ready. This allows the initialization of SDEI without ACPI_APEI_GHES enabled.
--- drivers/acpi/apei/Kconfig | 1 + drivers/acpi/apei/ghes.c | 2 +- drivers/firmware/Kconfig | 1 - drivers/firmware/arm_sdei.c | 11 ++++++++--- include/linux/arm_sdei.h | 4 ++-- 5 files changed, 12 insertions(+), 7 deletions(-)
drivers/acpi/apei/Kconfig +1 -0
@@ -23,6 +23,7 @@ config ACPI_APEI_GHES select ACPI_HED select IRQ_WORK select GENERIC_ALLOCATOR + select ARM_SDE_INTERFACE if ARM64 help Generic Hardware Error Source provides a way to report platform hardware errors (such as that from chipset). It
drivers/acpi/apei/ghes.c +1 -1
@@ -1715,7 +1715,7 @@ void __init acpi_ghes_init(void) {int rc; -sdei_init (); +acpi_sdei_init ();if (acpi_disabled)return ;
drivers/firmware/Kconfig +0 -1
@@ -31,7 +31,6 @@ config ARM_SCPI_PROTOCOL config ARM_SDE_INTERFACE bool "ARM Software Delegated Exception Interface (SDEI)" depends on ARM64 - depends on ACPI_APEI_GHES help The Software Delegated Exception Interface (SDEI) is an ARM standard for registering callbacks from the platform firmware
drivers/firmware/arm_sdei.c +8 -3
@@ -1062,13 +1062,12 @@ static bool __init sdei_present_acpi(void)return true; } -void __init sdei_init (void ) +void __init acpi_sdei_init (void ) {struct platform_device *pdev;int ret; - ret =platform_driver_register (&sdei_driver); -if (ret || !sdei_present_acpi ()) +if (!sdei_present_acpi ())return ; pdev = platform_device_register_simple(sdei_driver.driver.name,
@@ -1081,6 +1080,12 @@ void __init sdei_init(void) } } +static int __init sdei_init (void ) +{ +return platform_driver_register (&sdei_driver); +} +arch_initcall (sdei_init); +int sdei_event_handler (struct pt_regs *regs,struct sdei_registered_event *arg) {
include/linux/arm_sdei.h +2 -2
@@ -46,12 +46,12 @@ int sdei_unregister_ghes(struct ghes *ghes);/* For use by arch code when CPU hotplug notifiers are not appropriate. */ int sdei_mask_local_cpu (void );int sdei_unmask_local_cpu (void ); -void __init sdei_init (void ); +void __init acpi_sdei_init (void );void sdei_handler_abort (void );#else static inline int sdei_mask_local_cpu (void ) {return 0 ; }static inline int sdei_unmask_local_cpu (void ) {return 0 ; } -static inline void sdei_init (void ) { } +static inline void acpi_sdei_init (void ) { }static inline void sdei_handler_abort (void ) { }#endif /* CONFIG_ARM_SDE_INTERFACE */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 138/780 kselftest/arm64: fp-ptrace: Fix expected FPMR value when PSTATE.SM is changed
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mark Rutland <[email protected]>
[ Upstream commit 78b23877dbba7dbcda2b89383d17bed82ce8f663 ]
The fp-ptrace test suite expects that FPMR is set to zero when PSTATE.SM is changed via ptrace, but ptrace has never altered FPMR in this way, and the test logic erroneously relies upon (and has concealed) a bug where task_fpsimd_load() would unexpectedly and non-deterministically clobber FPMR.
Using ptrace, FPMR can only be altered by writing to the NT_ARM_FPMR regset. The value of PSTATE.SM can be altered by writing to the NT_ARM_SVE or NT_ARM_SSVE regsets, and/or by changing the SME vector length (when writing to the NT_ARM_SVE, NT_ARM_SSVE, or NT_ARM_ZA regsets), but none of these writes will change the value of FPMR.
The task_fpsimd_load() bug was introduced with the initial FPMR support in commit:
203f2b95a882 ("arm64/fpsimd: Support FEAT_FPMR")
The incorrect FPMR test code was introduced in commit:
7dbd26d0b22d ("kselftest/arm64: Add FPMR coverage to fp-ptrace")
Subsequently, the task_fpsimd_load() bug was fixed in commit:
e5fa85fce08b ("arm64/fpsimd: Don't corrupt FPMR when streaming mode changes")
... whereupon the fp-ptrace FPMR tests started failing reliably, e.g.
| # # Mismatch in saved FPMR: 915058000 != 0 | # not ok 25 SVE write, SVE 64->64, SME 64/0->64/1
Fix this by changing the test to expect that FPMR is *NOT* changed when PSTATE.SM is changed via ptrace, matching the extant behaviour.
I've chosen to update the test code rather than modifying ptrace to zero FPMR when PSTATE.SM changes. Not zeroing FPMR is simpler overall, and allows the NT_ARM_FPMR regset to be handled independently from other regsets, leaving less scope for error.
--- tools/testing/selftests/arm64/fp/fp-ptrace.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-)
tools/testing/selftests/arm64/fp/fp-ptrace.c +1 -13
@@ -891,18 +891,11 @@ static void set_initial_values(struct test_config *config) {int vq =__sve_vq_from_vl (vl_in (config));int sme_vq =__sve_vq_from_vl (config->sme_vl_in); -bool sm_change; svcr_in = config->svcr_in; svcr_expected = config->svcr_expected; svcr_out =0 ; -if (sme_supported () && - (svcr_in &SVCR_SM ) != (svcr_expected &SVCR_SM )) - sm_change = true; -else - sm_change = false; -fill_random (&v_in,sizeof (v_in));memcpy (v_expected, v_in,sizeof (v_in));memset (v_out,0 ,sizeof (v_out));
@@ -953,12 +946,7 @@ static void set_initial_values(struct test_config *config)if (fpmr_supported ()) {fill_random (&fpmr_in,sizeof (fpmr_in)); fpmr_in &=FPMR_SAFE_BITS ; - -/* Entering or exiting streaming mode clears FPMR */ -if (sm_change) - fpmr_expected =0 ; -else - fpmr_expected = fpmr_in; + fpmr_expected = fpmr_in; }else { fpmr_in =0 ; fpmr_expected =0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 139/780 overflow: Fix direct struct member initialization in _DEFINE_FLEX()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gustavo A. R. Silva <[email protected]>
[ Upstream commit 47e36ed7840661a9f7fb53554a1b04a5f8daffea ]
Currently, to statically initialize the struct members of the type object created by _DEFINE_FLEX(), the internal obj member must be explicitly referenced at the call site. See:
struct flex {
int a;
int b;
struct foo flex_array[];
};_DEFINE_FLEX(struct flex, instance, flex_array,
FIXED_SIZE, = {
.obj = {
.a = 0,
.b = 1,
},
});This leaks _DEFINE_FLEX() internal implementation details and make the helper harder to use and read.
Fix this and allow for a more natural and intuitive C99 init-style:
_DEFINE_FLEX(struct flex, instance, flex_array,
FIXED_SIZE, = {
.a = 0,
.b = 1,
});Note that before these changes, the initializer argument was optional, but now it's required.
Also, update "counter" member initialization in DEFINE_FLEX().
--- include/linux/overflow.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/linux/overflow.h +3 -3
@@ -396,7 +396,7 @@ static inline size_t __must_check size_sub(size_t minuend, size_t subtrahend)* @name: Name for a variable to define. * @member: Name of the array member. * @count: Number of elements in the array; must be compile-time const. -* @initializer: initializer expression (could be empty for no init). +* @initializer: Initializer expression (e.g., pass `= { }` at minimum). */ #define _DEFINE_FLEX(type, name, member, count, initializer...) \ _Static_assert(__builtin_constant_p(count), \
@@ -404,7 +404,7 @@ static inline size_t __must_check size_sub(size_t minuend, size_t subtrahend)union { \u8 bytes[struct_size_t (type, member, count)]; \type obj; \ - } name##_u initializer; \ + } name##_u = { .obj initializer }; \ type *name = (type *)&name##_u/**
@@ -438,6 +438,6 @@ static inline size_t __must_check size_sub(size_t minuend, size_t subtrahend)* Use __struct_size(@NAME) to get compile-time size of it afterwards. */ #define DEFINE_FLEX (TYPE ,NAME ,MEMBER ,COUNTER ,COUNT ) \ - _DEFINE_FLEX(TYPE, NAME, MEMBER, COUNT, = { .obj.COUNTER = COUNT, }) + _DEFINE_FLEX(TYPE, NAME, MEMBER, COUNT, = { .COUNTER = COUNT, })#endif /* __LINUX_OVERFLOW_H */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 140/780 scsi: qedf: Use designated initializer for struct qed_fcoe_cb_ops
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
[ Upstream commit d8720235d5b5cad86c1f07f65117ef2a96f8bec7 ]
Recent fixes to the randstruct GCC plugin allowed it to notice that this structure is entirely function pointers and is therefore subject to randomization, but doing so requires that it always use designated initializers. Explicitly specify the "common" member as being initialized. Silences:
drivers/scsi/qedf/qedf_main.c:702:9: error: positional initialization of field in 'struct' declared with 'designated_init' attribute [-Werror=designated-init]
702 | {
| ^--- drivers/scsi/qedf/qedf_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qedf/qedf_main.c +1 -1
@@ -699,7 +699,7 @@ static u32 qedf_get_login_failures(void *cookie) }static struct qed_fcoe_cb_ops qedf_cb_ops = { - { + .common = { .link_update = qedf_link_update, .bw_update = qedf_bw_update, .schedule_recovery_handler = qedf_schedule_recovery_handler,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 141/780 media: synopsys: hdmirx: Renamed frame_idx to sequence
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolas Dufresne <[email protected]>
[ Upstream commit 0400bee67f49753b878c2576c02c1bc454f091ed ]
This variable is used to fill the v4l2_buffer.sequence, let's name it the exact same way to reduce confusion.
No functional changes.
--- drivers/media/platform/synopsys/hdmirx/snps_hdmirx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/media/platform/synopsys/hdmirx/snps_hdmirx.c +5 -5
@@ -114,7 +114,7 @@ struct hdmirx_stream {spinlock_t vbq_lock;/* to lock video buffer queue */ bool stopping;wait_queue_head_t wq_stopped; -u32 frame_idx; +u32 sequence;u32 line_flag_int_cnt;u32 irq_stat; };
@@ -1540,7 +1540,7 @@ static int hdmirx_start_streaming(struct vb2_queue *queue, unsigned int count)int line_flag;mutex_lock (&hdmirx_dev->stream_lock); - stream->frame_idx =0 ; + stream->sequence =0 ; stream->line_flag_int_cnt =0 ; stream->curr_buf =NULL ; stream->next_buf =NULL ;
@@ -1948,7 +1948,7 @@ static void dma_idle_int_handler(struct snps_hdmirx_dev *hdmirx_dev,if (vb_done) { vb_done->vb2_buf.timestamp =ktime_get_ns (); - vb_done->sequence = stream->frame_idx; + vb_done->sequence = stream->sequence;if (bt->interlaced) vb_done->field =V4L2_FIELD_INTERLACED_TB ;
@@ -1956,8 +1956,8 @@ static void dma_idle_int_handler(struct snps_hdmirx_dev *hdmirx_dev, vb_done->field =V4L2_FIELD_NONE ;hdmirx_vb_done (stream, vb_done); - stream->frame_idx++; -if (stream->frame_idx ==30 ) + stream->sequence++; +if (stream->sequence ==30 )v4l2_dbg (1 , debug, v4l2_dev,"rcv frames\n" ); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 142/780 media: synopsys: hdmirx: Count dropped frames
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolas Dufresne <[email protected]>
[ Upstream commit 57c8d79adf05244b171964d1d6c7e6fabbe5f5fd ]
The sequence number communicate the lost frames to userspace. For this reason, it must be incremented even when a frame is skipped. This allows userspace such as GStreamer to report the loss.
--- drivers/media/platform/synopsys/hdmirx/snps_hdmirx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/media/platform/synopsys/hdmirx/snps_hdmirx.c +4 -4
@@ -1956,10 +1956,6 @@ static void dma_idle_int_handler(struct snps_hdmirx_dev *hdmirx_dev, vb_done->field =V4L2_FIELD_NONE ;hdmirx_vb_done (stream, vb_done); - stream->sequence++; -if (stream->sequence ==30 ) -v4l2_dbg (1 , debug, v4l2_dev, -"rcv frames\n" ); } stream->curr_buf =NULL ;
@@ -1971,6 +1967,10 @@ static void dma_idle_int_handler(struct snps_hdmirx_dev *hdmirx_dev,v4l2_dbg (3 , debug, v4l2_dev,"%s: next_buf NULL, skip vb_done\n" , __func__); } + + stream->sequence++; +if (stream->sequence ==30 ) +v4l2_dbg (1 , debug, v4l2_dev,"rcv frames\n" ); } DMA_IDLE_OUT:
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 143/780 perf/amlogic: Replace smp_processor_id() with raw_smp_processor_id() in meson_ddr_pmu_create()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anand Moon <[email protected]>
[ Upstream commit 097469a2b0f12b91b4f27b9e9e4f2c46484cde30 ]
The Amlogic DDR PMU driver meson_ddr_pmu_create() function incorrectly uses smp_processor_id(), which assumes disabled preemption. This leads to kernel warnings during module loading because meson_ddr_pmu_create() can be called in a preemptible context.
Following kernel warning and stack trace:
[ 31.745138] [ T2289] BUG: using smp_processor_id() in preemptible [00000000] code: (udev-worker)/2289 [ 31.745154] [ T2289] caller is debug_smp_processor_id+0x28/0x38 [ 31.745172] [ T2289] CPU: 4 UID: 0 PID: 2289 Comm: (udev-worker) Tainted: GW 6.14.0-0-MANJARO-ARM #1 59519addcbca6ba8de735e151fd7b9e97aac7ff0 [ 31.745181] [ T2289] Tainted: [W]=WARN [ 31.745183] [ T2289] Hardware name: Hardkernel ODROID-N2Plus (DT) [ 31.745188] [ T2289] Call trace: [ 31.745191] [ T2289] show_stack+0x28/0x40 (C) [ 31.745199] [ T2289] dump_stack_lvl+0x4c/0x198 [ 31.745205] [ T2289] dump_stack+0x20/0x50 [ 31.745209] [ T2289] check_preemption_disabled+0xec/0xf0 [ 31.745213] [ T2289] debug_smp_processor_id+0x28/0x38 [ 31.745216] [ T2289] meson_ddr_pmu_create+0x200/0x560 [meson_ddr_pmu_g12 8095101c49676ad138d9961e3eddaee10acca7bd] [ 31.745237] [ T2289] g12_ddr_pmu_probe+0x20/0x38 [meson_ddr_pmu_g12 8095101c49676ad138d9961e3eddaee10acca7bd] [ 31.745246] [ T2289] platform_probe+0x98/0xe0 [ 31.745254] [ T2289] really_probe+0x144/0x3f8 [ 31.745258] [ T2289] __driver_probe_device+0xb8/0x180 [ 31.745261] [ T2289] driver_probe_device+0x54/0x268 [ 31.745264] [ T2289] __driver_attach+0x11c/0x288 [ 31.745267] [ T2289] bus_for_each_dev+0xfc/0x160 [ 31.745274] [ T2289] driver_attach+0x34/0x50 [ 31.745277] [ T2289] bus_add_driver+0x160/0x2b0 [ 31.745281] [ T2289] driver_register+0x78/0x120 [ 31.745285] [ T2289] __platform_driver_register+0x30/0x48 [ 31.745288] [ T2289] init_module+0x30/0xfe0 [meson_ddr_pmu_g12 8095101c49676ad138d9961e3eddaee10acca7bd] [ 31.745298] [ T2289] do_one_initcall+0x11c/0x438 [ 31.745303] [ T2289] do_init_module+0x68/0x228 [ 31.745311] [ T2289] load_module+0x118c/0x13a8 [ 31.745315] [ T2289] __arm64_sys_finit_module+0x274/0x390 [ 31.745320] [ T2289] invoke_syscall+0x74/0x108 [ 31.745326] [ T2289] el0_svc_common+0x90/0xf8 [ 31.745330] [ T2289] do_el0_svc+0x2c/0x48 [ 31.745333] [ T2289] el0_svc+0x60/0x150 [ 31.745337] [ T2289] el0t_64_sync_handler+0x80/0x118 [ 31.745341] [ T2289] el0t_64_sync+0x1b8/0x1c0
Changes replaces smp_processor_id() with raw_smp_processor_id() to ensure safe CPU ID retrieval in preemptible contexts.
--- drivers/perf/amlogic/meson_ddr_pmu_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/perf/amlogic/meson_ddr_pmu_core.c +1 -1
@@ -511,7 +511,7 @@ int meson_ddr_pmu_create(struct platform_device *pdev)fmt_attr_fill (pmu->info.hw_info->fmt_attr); - pmu->cpu =smp_processor_id (); + pmu->cpu =raw_smp_processor_id (); name =devm_kasprintf (&pdev->dev,GFP_KERNEL ,DDR_PERF_DEV_NAME );if (!name)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 144/780 selftests/seccomp: fix negative_ENOSYS tracer tests on arm32
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Terry Tritton <[email protected]>
[ Upstream commit 73989c998814d82c71d523c104c398925470d59e ]
TRACE_syscall.ptrace.negative_ENOSYS and TRACE_syscall.seccomp.negative_ENOSYS on arm32 are being reported as failures instead of skipping.
The teardown_trace_fixture function sets the test to KSFT_FAIL in case of a non 0 return value from the tracer process.
Due to _metadata now being shared between the forked processes the tracer is returning the KSFT_SKIP value set by the tracee which is non 0.
Remove the setting of the _metadata.exit_code in teardown_trace_fixture.
--- tools/testing/selftests/seccomp/seccomp_bpf.c | 6 ------ 1 file changed, 6 deletions(-)
tools/testing/selftests/seccomp/seccomp_bpf.c +0 -6
@@ -1629,14 +1629,8 @@ void teardown_trace_fixture(struct __test_metadata *_metadata, {if (tracer) {int status; -/* -* Extract the exit code from the other process and -* adopt it for ourselves in case its asserts failed. -*/ ASSERT_EQ (0 ,kill (tracer,SIGUSR1 ));ASSERT_EQ (tracer,waitpid (tracer, &status,0 )); -if (WEXITSTATUS (status)) - _metadata->exit_code =KSFT_FAIL ; } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 145/780 drm/msm/a6xx: Disable rgb565_predicator on Adreno 7c3
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 5a9c1bea011fb42088ba08ceaa252fb20e695626 ]
This feature is supposed to be enabled with UBWC v4 or later. Implementations of this SKU feature an effective UBWC version of 3, so disable it, in line with the BSP kernel.
Patchwork: https://patchwork.freedesktop.org/patch/651759/
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +0 -1
@@ -655,7 +655,6 @@ static void a6xx_calc_ubwc_config(struct adreno_gpu *gpu)if (adreno_is_7c3 (gpu)) { gpu->ubwc_config.highest_bank_bit =14 ; gpu->ubwc_config.amsbc =1 ; - gpu->ubwc_config.rgb565_predicator =1 ; gpu->ubwc_config.uavflagprd_inv =2 ; gpu->ubwc_config.macrotile_mode =1 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 146/780 drm/msm/dp: Fix support of LTTPR initialization
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aleksandrs Vinarskis <[email protected]>
[ Upstream commit 9351d3d302060d114de2f0c648579c0aadbd8f72 ]
Initialize LTTPR before msm_dp_panel_read_sink_caps, as DPTX shall (re)read DPRX caps after LTTPR detection, as required by DP 2.1a, Section 3.6.7.6.1.
Patchwork: https://patchwork.freedesktop.org/patch/652301/
--- drivers/gpu/drm/msm/dp/dp_display.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/dp/dp_display.c +9 -4
@@ -367,12 +367,12 @@ static int msm_dp_display_send_hpd_notification(struct msm_dp_display_private *dreturn 0 ; } -static void msm_dp_display_lttpr_init (struct msm_dp_display_private *dp) +static void msm_dp_display_lttpr_init (struct msm_dp_display_private *dp,u8 *dpcd) {u8 lttpr_caps[DP_LTTPR_COMMON_CAP_SIZE ];int rc; -if (drm_dp_read_lttpr_common_caps (dp->aux, dp->panel->dpcd, lttpr_caps)) +if (drm_dp_read_lttpr_common_caps (dp->aux, dpcd, lttpr_caps))return ; rc =drm_dp_lttpr_init (dp->aux,drm_dp_lttpr_count (lttpr_caps));
@@ -385,12 +385,17 @@ static int msm_dp_display_process_hpd_high(struct msm_dp_display_private *dp)struct drm_connector *connector = dp->msm_dp_display.connector;const struct drm_display_info *info = &connector->display_info;int rc =0 ; +u8 dpcd[DP_RECEIVER_CAP_SIZE ]; - rc =msm_dp_panel_read_sink_caps (dp->panel, connector); + rc =drm_dp_read_dpcd_caps (dp->aux, dpcd);if (rc) goto end; -msm_dp_display_lttpr_init (dp); +msm_dp_display_lttpr_init (dp, dpcd); + + rc =msm_dp_panel_read_sink_caps (dp->panel, connector); +if (rc) + goto end;msm_dp_link_process_request (dp->link);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 147/780 drm/msm/dp: Account for LTTPRs capabilities
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aleksandrs Vinarskis <[email protected]>
[ Upstream commit c156fe2dd46774321c8eaaff9a6f04b64e6b9742 ]
Take into account LTTPR capabilities when selecting maximum allowed link rate, number of data lines.
Patchwork: https://patchwork.freedesktop.org/patch/652302/
--- drivers/gpu/drm/msm/dp/dp_display.c | 5 ++--- drivers/gpu/drm/msm/dp/dp_link.h | 3 +++ drivers/gpu/drm/msm/dp/dp_panel.c | 12 +++++++++++- 3 files changed, 16 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/dp/dp_display.c +2 -3
@@ -369,13 +369,12 @@ static int msm_dp_display_send_hpd_notification(struct msm_dp_display_private *dstatic void msm_dp_display_lttpr_init (struct msm_dp_display_private *dp,u8 *dpcd) { -u8 lttpr_caps[DP_LTTPR_COMMON_CAP_SIZE ];int rc; -if (drm_dp_read_lttpr_common_caps (dp->aux, dpcd, lttpr_caps)) +if (drm_dp_read_lttpr_common_caps (dp->aux, dpcd, dp->link->lttpr_common_caps))return ; - rc =drm_dp_lttpr_init (dp->aux,drm_dp_lttpr_count (lttpr_caps)); + rc =drm_dp_lttpr_init (dp->aux,drm_dp_lttpr_count (dp->link->lttpr_common_caps));if (rc)DRM_ERROR ("failed to set LTTPRs transparency mode, rc=%d\n" , rc); }
drivers/gpu/drm/msm/dp/dp_link.h +3 -0
@@ -7,6 +7,7 @@#define _DP_LINK_H_#include "dp_aux.h" +#include <drm/display/drm_dp_helper.h> #define DS_PORT_STATUS_CHANGED 0x200#define DP_TEST_BIT_DEPTH_UNKNOWN 0xFFFFFFFF
@@ -60,6 +61,8 @@ struct msm_dp_link_phy_params { };struct msm_dp_link { +u8 lttpr_common_caps[DP_LTTPR_COMMON_CAP_SIZE ]; +u32 sink_request;u32 test_response;
drivers/gpu/drm/msm/dp/dp_panel.c +11 -1
@@ -47,7 +47,7 @@ static void msm_dp_panel_read_psr_cap(struct msm_dp_panel_private *panel)static int msm_dp_panel_read_dpcd (struct msm_dp_panel *msm_dp_panel) { -int rc; +int rc, max_lttpr_lanes, max_lttpr_rate;struct msm_dp_panel_private *panel;struct msm_dp_link_info *link_info;u8 *dpcd, major, minor;
@@ -75,6 +75,16 @@ static int msm_dp_panel_read_dpcd(struct msm_dp_panel *msm_dp_panel)if (link_info->rate > msm_dp_panel->max_dp_link_rate) link_info->rate = msm_dp_panel->max_dp_link_rate; +/* Limit data lanes from LTTPR capabilities, if any */ + max_lttpr_lanes =drm_dp_lttpr_max_lane_count (panel->link->lttpr_common_caps); +if (max_lttpr_lanes && max_lttpr_lanes < link_info->num_lanes) + link_info->num_lanes = max_lttpr_lanes; + +/* Limit link rate from LTTPR capabilities, if any */ + max_lttpr_rate =drm_dp_lttpr_max_link_rate (panel->link->lttpr_common_caps); +if (max_lttpr_rate && max_lttpr_rate < link_info->rate) + link_info->rate = max_lttpr_rate; +drm_dbg_dp (panel->drm_dev,"version: %d.%d\n" , major, minor);drm_dbg_dp (panel->drm_dev,"link_rate=%d\n" , link_info->rate);drm_dbg_dp (panel->drm_dev,"lane_count=%d\n" , link_info->num_lanes);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 148/780 drm/msm/dp: Prepare for link training per-segment for LTTPRs
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aleksandrs Vinarskis <[email protected]>
[ Upstream commit 7513ccb8840b54e35579f3c2cce08c3443a6e2d4 ]
Per-segment link training requires knowing the number of LTTPRs (if any) present. Store the count during LTTPRs' initialization.
Patchwork: https://patchwork.freedesktop.org/patch/652306/
--- drivers/gpu/drm/msm/dp/dp_display.c | 17 +++++++++++------ drivers/gpu/drm/msm/dp/dp_link.h | 1 + 2 files changed, 12 insertions(+), 6 deletions(-)
drivers/gpu/drm/msm/dp/dp_display.c +11 -6
@@ -367,16 +367,21 @@ static int msm_dp_display_send_hpd_notification(struct msm_dp_display_private *dreturn 0 ; } -static void msm_dp_display_lttpr_init (struct msm_dp_display_private *dp,u8 *dpcd) +static int msm_dp_display_lttpr_init (struct msm_dp_display_private *dp,u8 *dpcd) { -int rc; +int rc, lttpr_count;if (drm_dp_read_lttpr_common_caps (dp->aux, dpcd, dp->link->lttpr_common_caps)) -return ; +return 0 ; - rc =drm_dp_lttpr_init (dp->aux,drm_dp_lttpr_count (dp->link->lttpr_common_caps)); -if (rc) + lttpr_count =drm_dp_lttpr_count (dp->link->lttpr_common_caps); + rc =drm_dp_lttpr_init (dp->aux, lttpr_count); +if (rc) {DRM_ERROR ("failed to set LTTPRs transparency mode, rc=%d\n" , rc); +return 0 ; + } + +return lttpr_count; }static int msm_dp_display_process_hpd_high (struct msm_dp_display_private *dp)
@@ -390,7 +395,7 @@ static int msm_dp_display_process_hpd_high(struct msm_dp_display_private *dp)if (rc) goto end; -msm_dp_display_lttpr_init (dp, dpcd); + dp->link->lttpr_count =msm_dp_display_lttpr_init (dp, dpcd); rc =msm_dp_panel_read_sink_caps (dp->panel, connector);if (rc)
drivers/gpu/drm/msm/dp/dp_link.h +1 -0
@@ -62,6 +62,7 @@ struct msm_dp_link_phy_params {struct msm_dp_link {u8 lttpr_common_caps[DP_LTTPR_COMMON_CAP_SIZE ]; +int lttpr_count;u32 sink_request;u32 test_response;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 149/780 drm/i915/dp_mst: Use the correct connector while computing the link BPP limit on MST
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Imre Deak <[email protected]>
[ Upstream commit a92e390e0d438e021de0e52065121484b6cca675 ]
Atm, on an MST link in DSC mode intel_dp_compute_config_link_bpp_limits() calculates the maximum link bpp limit using the MST root connector's DSC capabilities. That's not correct in general: the decompression could be performed by a branch device downstream of the root branch device or the sink itself.
Fix the above by passing to intel_dp_compute_config_link_bpp_limits() the actual connector being modeset, containing the correct DSC capabilities.
--- drivers/gpu/drm/i915/display/intel_dp.c | 7 ++++--- drivers/gpu/drm/i915/display/intel_dp.h | 1 + drivers/gpu/drm/i915/display/intel_dp_mst.c | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/display/intel_dp.c +4 -3
@@ -2523,6 +2523,7 @@ intel_dp_dsc_compute_pipe_bpp_limits(struct intel_dp *intel_dp, bool intel_dp_compute_config_limits(struct intel_dp *intel_dp, + struct intel_connector *connector, struct intel_crtc_state *crtc_state, bool respect_downstream_limits, bool dsc,
@@ -2576,7 +2577,7 @@ intel_dp_compute_config_limits(struct intel_dp *intel_dp,intel_dp_test_compute_config (intel_dp, crtc_state, limits);return intel_dp_compute_config_link_bpp_limits (intel_dp, - intel_dp->attached_connector, + connector, crtc_state, dsc, limits);
@@ -2637,7 +2638,7 @@ intel_dp_compute_link_config(struct intel_encoder *encoder, joiner_needs_dsc =intel_dp_joiner_needs_dsc (display, num_joined_pipes); dsc_needed = joiner_needs_dsc || intel_dp->force_dsc_en || - !intel_dp_compute_config_limits (intel_dp, pipe_config, + !intel_dp_compute_config_limits (intel_dp, connector, pipe_config, respect_downstream_limits, false, &limits);
@@ -2671,7 +2672,7 @@ intel_dp_compute_link_config(struct intel_encoder *encoder,str_yes_no (ret),str_yes_no (joiner_needs_dsc), str_yes_no(intel_dp->force_dsc_en)); -if (!intel_dp_compute_config_limits (intel_dp, pipe_config, +if (!intel_dp_compute_config_limits (intel_dp, connector, pipe_config, respect_downstream_limits, true, &limits))
drivers/gpu/drm/i915/display/intel_dp.h +1 -0
@@ -194,6 +194,7 @@ void intel_dp_wait_source_oui(struct intel_dp *intel_dp);int intel_dp_output_bpp (enum intel_output_format output_format,int bpp); bool intel_dp_compute_config_limits(struct intel_dp *intel_dp, + struct intel_connector *connector, struct intel_crtc_state *crtc_state, bool respect_downstream_limits, bool dsc,
drivers/gpu/drm/i915/display/intel_dp_mst.c +3 -2
@@ -590,12 +590,13 @@ adjust_limits_for_dsc_hblank_expansion_quirk(struct intel_dp *intel_dp,static bool mst_stream_compute_config_limits (struct intel_dp *intel_dp, -const struct intel_connector *connector, +struct intel_connector *connector,struct intel_crtc_state *crtc_state,bool dsc,struct link_config_limits *limits) { -if (!intel_dp_compute_config_limits (intel_dp, crtc_state, false, dsc, +if (!intel_dp_compute_config_limits (intel_dp, connector, + crtc_state, false, dsc, limits))return false;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 150/780 drm/mediatek: mtk_drm_drv: Fix kobject put for mtk_mutex device ptr
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: AngeloGioacchino Del Regno <[email protected]>
[ Upstream commit 22918591fb747a6d16801e74a170cf98e886f83b ]
This driver is taking a kobject for mtk_mutex only once per mmsys device for each drm-mediatek driver instance, differently from the behavior with other components, but it is decrementing the kobj's refcount in a loop and once per mmsys: this is not right and will result in a refcount_t underflow warning when mediatek-drm returns multiple probe deferrals in one boot (or when manually bound and unbound).
Besides that, the refcount for mutex_dev was not decremented for error cases in mtk_drm_bind(), causing another refcount_t warning but this time for overflow, when the failure happens not during driver bind but during component bind.
In order to fix one of the reasons why this is happening, remove the put_device(xx->mutex_dev) loop from the mtk_drm_kms_init()'s put_mutex_dev label (and drop the label) and add a single call to correctly free the single incremented refcount of mutex_dev to the mtk_drm_unbind() function to fix the refcount_t underflow.
Moreover, add the same call to the error cases in mtk_drm_bind() to fix the refcount_t overflow.
--- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
drivers/gpu/drm/mediatek/mtk_drm_drv.c +10 -7
@@ -470,7 +470,7 @@ static int mtk_drm_kms_init(struct drm_device *drm) ret =drmm_mode_config_init (drm);if (ret) - goto put_mutex_dev; +return ret; drm->mode_config.min_width =64 ; drm->mode_config.min_height =64 ;
@@ -489,7 +489,7 @@ static int mtk_drm_kms_init(struct drm_device *drm) drm->dev_private = private->all_drm_private[i]; ret =component_bind_all (private->all_drm_private[i]->dev, drm);if (ret) - goto put_mutex_dev; +return ret; }/*
@@ -582,9 +582,6 @@ static int mtk_drm_kms_init(struct drm_device *drm) err_component_unbind:for (i =0 ; i < private->data->mmsys_dev_num; i++)component_unbind_all (private->all_drm_private[i]->dev, drm); -put_mutex_dev: -for (i =0 ; i < private->data->mmsys_dev_num; i++) -put_device (private->all_drm_private[i]->mutex_dev);return ret; }
@@ -655,8 +652,10 @@ static int mtk_drm_bind(struct device *dev)return 0 ; drm =drm_dev_alloc (&mtk_drm_driver, dev); -if (IS_ERR (drm)) -return PTR_ERR (drm); +if (IS_ERR (drm)) { + ret =PTR_ERR (drm); + goto err_put_dev; + } private->drm_master = true; drm->dev_private = private;
@@ -682,6 +681,8 @@ static int mtk_drm_bind(struct device *dev)drm_dev_put (drm);for (i =0 ; i < private->data->mmsys_dev_num; i++) private->all_drm_private[i]->drm =NULL ; +err_put_dev: +put_device (private->mutex_dev);return ret; }
@@ -694,6 +695,8 @@ static void mtk_drm_unbind(struct device *dev)drm_dev_unregister (private->drm);mtk_drm_kms_deinit (private->drm);drm_dev_put (private->drm); + +put_device (private->mutex_dev); } private->mtk_drm_bound = false; private->drm_master = false;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 151/780 drm/mediatek: Fix kobject put for component sub-drivers
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: AngeloGioacchino Del Regno <[email protected]>
[ Upstream commit 80805b62ea5b95eda54c225b989f929ca0691ab0 ]
In function mtk_drm_get_all_drm_priv(), this driver is incrementing the refcount for the sub-drivers of mediatek-drm with a call to device_find_child() when taking a reference to all of those child devices.
When the component bind fails multiple times this results in a refcount_t overflow, as the reference count is never decremented:
fix that by adding a call to put_device() for all of the mmsys devices in a loop, in error cases of mtk_drm_bind() and in the mtk_drm_unbind() callback.
--- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/gpu/drm/mediatek/mtk_drm_drv.c +9 -0
@@ -682,6 +682,10 @@ static int mtk_drm_bind(struct device *dev)for (i =0 ; i < private->data->mmsys_dev_num; i++) private->all_drm_private[i]->drm =NULL ; err_put_dev: +for (i =0 ; i < private->data->mmsys_dev_num; i++) { +/* For device_find_child in mtk_drm_get_all_priv() */ +put_device (private->all_drm_private[i]->dev); + }put_device (private->mutex_dev);return ret; }
@@ -689,6 +693,7 @@ static int mtk_drm_bind(struct device *dev)static void mtk_drm_unbind (struct device *dev) {struct mtk_drm_private *private =dev_get_drvdata (dev); +int i;/* for multi mmsys dev, unregister drm dev in mmsys master */ if (private->drm_master) {
@@ -696,6 +701,10 @@ static void mtk_drm_unbind(struct device *dev)mtk_drm_kms_deinit (private->drm);drm_dev_put (private->drm); +for (i =0 ; i < private->data->mmsys_dev_num; i++) { +/* For device_find_child in mtk_drm_get_all_priv() */ +put_device (private->all_drm_private[i]->dev); + }put_device (private->mutex_dev); } private->mtk_drm_bound = false;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 152/780 drm/mediatek: mtk_drm_drv: Unbind secondary mmsys components on err
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: AngeloGioacchino Del Regno <[email protected]>
[ Upstream commit 94c933716567084bfb9e79dcd81eb2b2308e84e1 ]
When calling component_bind_all(), if a component that is included in the list fails, all of those that have been successfully bound will be unbound, but this driver has two components lists for two actual devices, as in, each mmsys instance has its own components list.
In case mmsys0 (or actually vdosys0) is able to bind all of its components, but the secondary one fails, all of the components of the first are kept bound, while the ones of mmsys1/vdosys1 are correctly cleaned up.
This is not right because, in case of a failure, the components are re-bound for all of the mmsys/vdosys instances without caring about the ones that were previously left in a bound state.
Fix that by calling component_unbind_all() on all of the previous component masters that succeeded binding all subdevices when any of the other masters errors out.
--- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/mediatek/mtk_drm_drv.c +4 -1
@@ -488,8 +488,11 @@ static int mtk_drm_kms_init(struct drm_device *drm)for (i =0 ; i < private->data->mmsys_dev_num; i++) { drm->dev_private = private->all_drm_private[i]; ret =component_bind_all (private->all_drm_private[i]->dev, drm); -if (ret) +if (ret) { +while (--i >=0 ) +component_unbind_all (private->all_drm_private[i]->dev, drm);return ret; + } }/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 153/780 media: verisilicon: Free post processor buffers on error
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Detlev Casanova <[email protected]>
[ Upstream commit 11beb0fc346e00c412b3bfd19013206f6b655604 ]
During initialization, the post processor allocates the same number of buffers as the buf queue.
As the init function is called in streamon(), if an allocation fails, streamon will return an error and streamoff() will not be called, keeping all post processor buffers allocated.
To avoid that, all post proc buffers are freed in case of an allocation error.
--- drivers/media/platform/verisilicon/hantro_postproc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/platform/verisilicon/hantro_postproc.c +3 -1
@@ -250,8 +250,10 @@ int hantro_postproc_init(struct hantro_ctx *ctx)for (i =0 ; i < num_buffers; i++) { ret =hantro_postproc_alloc (ctx, i); -if (ret) +if (ret) { +hantro_postproc_free (ctx);return ret; + } }return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 154/780 svcrdma: Reduce the number of rdma_rw contexts per-QP
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chuck Lever <[email protected]>
[ Upstream commit 59243315890578a040a2d50ae9e001a2ef2fcb62 ]
There is an upper bound on the number of rdma_rw contexts that can be created per QP.
This invisible upper bound is because rdma_create_qp() adds one or more additional SQEs for each ctxt that the ULP requests via qp_attr.cap.max_rdma_ctxs. The QP's actual Send Queue length is on the order of the sum of qp_attr.cap.max_send_wr and a factor times qp_attr.cap.max_rdma_ctxs. The factor can be up to three, depending on whether MR operations are required before RDMA Reads.
This limit is not visible to RDMA consumers via dev->attrs. When the limit is surpassed, QP creation fails with -ENOMEM. For example:
svcrdma's estimate of the number of rdma_rw contexts it needs is three times the number of pages in RPCSVC_MAXPAGES. When MAXPAGES is about 260, the internally-computed SQ length should be:
64 credits + 10 backlog + 3 * (3 * 260) = 2414
Which is well below the advertised qp_max_wr of 32768.
If RPCSVC_MAXPAGES is increased to 4MB, that's 1040 pages:
64 credits + 10 backlog + 3 * (3 * 1040) = 9434
However, QP creation fails. Dynamic printk for mlx5 shows:
calc_sq_size:618:(pid 1514): send queue size (9326 * 256 / 64 -> 65536) exceeds limits(32768)
Although 9326 is still far below qp_max_wr, QP creation still fails.
Because the total SQ length calculation is opaque to RDMA consumers, there doesn't seem to be much that can be done about this except for consumers to try to keep the requested rdma_rw ctxt count low.
--- net/sunrpc/xprtrdma/svc_rdma_transport.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
net/sunrpc/xprtrdma/svc_rdma_transport.c +8 -6
@@ -406,12 +406,12 @@ static void svc_rdma_xprt_done(struct rpcrdma_notification *rn)*/ static struct svc_xprt *svc_rdma_accept (struct svc_xprt *xprt) { +unsigned int ctxts, rq_depth, maxpayload;struct svcxprt_rdma *listen_rdma;struct svcxprt_rdma *newxprt =NULL ;struct rdma_conn_param conn_param;struct rpcrdma_connect_private pmsg;struct ib_qp_init_attr qp_attr; -unsigned int ctxts, rq_depth;struct ib_device *dev;int ret =0 ; RPC_IFDEBUG(struct sockaddr *sap);
@@ -462,12 +462,14 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt) newxprt->sc_max_bc_requests =2 ; } -/* Arbitrarily estimate the number of rw_ctxs needed for -* this transport. This is enough rw_ctxs to make forward -* progress even if the client is using one rkey per page -* in each Read chunk. +/* Arbitrary estimate of the needed number of rdma_rw contexts. */ - ctxts =3 *RPCSVC_MAXPAGES ; + maxpayload =min (xprt->xpt_server->sv_max_payload, +RPCSVC_MAXPAYLOAD_RDMA ); + ctxts = newxprt->sc_max_requests *3 * +rdma_rw_mr_factor (dev, newxprt->sc_port_num, + maxpayload >>PAGE_SHIFT ); + newxprt->sc_sq_depth = rq_depth + ctxts;if (newxprt->sc_sq_depth > dev->attrs.max_qp_wr) newxprt->sc_sq_depth = dev->attrs.max_qp_wr;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 155/780 xen/x86: fix initial memory balloon target
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roger Pau Monne <[email protected]>
[ Upstream commit 74287971dbb3fe322bb316afd9e7fb5807e23bee ]
When adding extra memory regions as ballooned pages also adjust the balloon target, otherwise when the balloon driver is started it will populate memory to match the target value and consume all the extra memory regions added.
This made the usage of the Xen dom0_mem=,max: command line parameter for dom0 not work as expected, as the target won't be adjusted and when the balloon is started it will populate memory straight to the 'max:' value. It would equally affect domUs that have memory != maxmem.
Kernels built with CONFIG_XEN_UNPOPULATED_ALLOC are not affected, because the extra memory regions are consumed by the unpopulated allocation driver, and then balloon_add_regions() becomes a no-op.
Message-ID: <[email protected]>
--- drivers/xen/balloon.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/xen/balloon.c +8 -5
@@ -704,15 +704,18 @@ static int __init balloon_add_regions(void)/* * Extra regions are accounted for in the physmap, but need -* decreasing from current_pages to balloon down the initial -* allocation, because they are already accounted for in -* total_pages. +* decreasing from current_pages and target_pages to balloon +* down the initial allocation, because they are already +* accounted for in total_pages. */ -if (extra_pfn_end - start_pfn >= balloon_stats.current_pages) { + pages = extra_pfn_end - start_pfn; +if (pages >= balloon_stats.current_pages || + pages >= balloon_stats.target_pages) {WARN (1 ,"Extra pages underflow current target" );return -ERANGE ; } - balloon_stats.current_pages -= extra_pfn_end - start_pfn; + balloon_stats.current_pages -= pages; + balloon_stats.target_pages -= pages; }return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 156/780 drm/xe/guc: Refactor GuC debugfs initialization
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Wajdeczko <[email protected]>
[ Upstream commit e15826bb3c2c5377eedc757f2adec8dcaa5255f7 ]
We don't have to drmm_kmalloc() local copy of debugfs_list to write there our pointer to the struct xe_guc as we can extract pointer to the struct xe_gt from the grandparent debugfs entry, in similar way to what we did for GT debugfs files.
Note that there is no change in file/directory structure, just refactored how files are created and how functions are called.
Stable-dep-of: e22d7acf9f47 ("drm/xe/guc: Make creation of SLPC debugfs files conditional")
--- drivers/gpu/drm/xe/xe_guc_debugfs.c | 130 ++++++++++++++-------------- 1 file changed, 67 insertions(+), 63 deletions(-)
drivers/gpu/drm/xe/xe_guc_debugfs.c +67 -63
@@ -17,101 +17,105 @@#include "xe_macros.h" #include "xe_pm.h" -static struct xe_guc *node_to_guc (struct drm_info_node *node) -{ -return node->info_ent->data; -} - -static int guc_info (struct seq_file *m,void *data) +/* +* guc_debugfs_show - A show callback for struct drm_info_list +* @m: the &seq_file +* @data: data used by the drm debugfs helpers +* +* This callback can be used in struct drm_info_list to describe debugfs +* files that are &xe_guc specific in similar way how we handle &xe_gt +* specific files using &xe_gt_debugfs_simple_show. +* +* It is assumed that those debugfs files will be created on directory entry +* which grandparent struct dentry d_inode->i_private points to &xe_gt. +* +* /sys/kernel/debug/dri/0/ +* ├── gt0 # dent->d_parent->d_parent (d_inode->i_private == gt) +* │ ├── uc # dent->d_parent +* │ │ ├── guc_info # dent +* │ │ ├── guc_... +* +* This function assumes that &m->private will be set to the &struct +* drm_info_node corresponding to the instance of the info on a given &struct +* drm_minor (see struct drm_info_list.show for details). +* +* This function also assumes that struct drm_info_list.data will point to the +* function code that will actually print a file content:: +* +* int (*print)(struct xe_guc *, struct drm_printer *) +* +* Example:: +* +* int foo(struct xe_guc *guc, struct drm_printer *p) +* { +* drm_printf(p, "enabled %d\n", guc->submission_state.enabled); +* return 0; +* } +* +* static const struct drm_info_list bar[] = { +* { name = "foo", .show = guc_debugfs_show, .data = foo }, +* }; +* +* parent = debugfs_create_dir("uc", gtdir); +* drm_debugfs_create_files(bar, ARRAY_SIZE(bar), parent, minor); +* +* Return: 0 on success or a negative error code on failure. +*/ +static int guc_debugfs_show (struct seq_file *m,void *data) { -struct xe_guc *guc =node_to_guc (m->private); -struct xe_device *xe =guc_to_xe (guc);struct drm_printer p =drm_seq_file_printer (m); +struct drm_info_node *node = m->private; +struct dentry *parent = node->dent->d_parent; +struct dentry *grandparent = parent->d_parent; +struct xe_gt *gt = grandparent->d_inode->i_private; +struct xe_device *xe =gt_to_xe (gt); +int (*print)(struct xe_guc *,struct drm_printer *) = node->info_ent->data; +int ret;xe_pm_runtime_get (xe); -xe_guc_print_info (guc, &p); + ret =xe_pm_runtime_put (xe); -return 0 ; +return ret; } -static int guc_log (struct seq_file *m,void *data) +static int guc_log (struct xe_guc *guc,struct drm_printer *p) { -struct xe_guc *guc =node_to_guc (m->private); -struct xe_device *xe =guc_to_xe (guc); -struct drm_printer p =drm_seq_file_printer (m); - -xe_pm_runtime_get (xe); -xe_guc_log_print (&guc->log, &p); -xe_pm_runtime_put (xe); - +xe_guc_log_print (&guc->log, p);return 0 ; } -static int guc_log_dmesg (struct seq_file *m,void *data) +static int guc_log_dmesg (struct xe_guc *guc,struct drm_printer *p) { -struct xe_guc *guc =node_to_guc (m->private); -struct xe_device *xe =guc_to_xe (guc); - -xe_pm_runtime_get (xe);xe_guc_log_print_dmesg (&guc->log); -xe_pm_runtime_put (xe); -return 0 ; } -static int guc_ctb (struct seq_file *m,void *data) +static int guc_ctb (struct xe_guc *guc,struct drm_printer *p) { -struct xe_guc *guc =node_to_guc (m->private); -struct xe_device *xe =guc_to_xe (guc); -struct drm_printer p =drm_seq_file_printer (m); - -xe_pm_runtime_get (xe); -xe_guc_ct_print (&guc->ct, &p, true); -xe_pm_runtime_put (xe); - +xe_guc_ct_print (&guc->ct, p, true);return 0 ; } -static int guc_pc (struct seq_file *m,void *data) +static int guc_pc (struct xe_guc *guc,struct drm_printer *p) { -struct xe_guc *guc =node_to_guc (m->private); -struct xe_device *xe =guc_to_xe (guc); -struct drm_printer p =drm_seq_file_printer (m); - -xe_pm_runtime_get (xe); -xe_guc_pc_print (&guc->pc, &p); -xe_pm_runtime_put (xe); - +xe_guc_pc_print (&guc->pc, p);return 0 ; }static const struct drm_info_list debugfs_list[] = { - {"guc_info" , guc_info,0 }, - {"guc_log" , guc_log,0 }, - {"guc_log_dmesg" , guc_log_dmesg,0 }, - {"guc_ctb" , guc_ctb,0 }, - {"guc_pc" , guc_pc,0 }, + {"guc_info" , .show = guc_debugfs_show, .data = xe_guc_print_info }, + {"guc_log" , .show = guc_debugfs_show, .data = guc_log }, + {"guc_log_dmesg" , .show = guc_debugfs_show, .data = guc_log_dmesg }, + {"guc_ctb" , .show = guc_debugfs_show, .data = guc_ctb }, + {"guc_pc" , .show = guc_debugfs_show, .data = guc_pc }, };void xe_guc_debugfs_register (struct xe_guc *guc,struct dentry *parent) {struct drm_minor *minor =guc_to_xe (guc)->drm.primary; -struct drm_info_list *local; -int i; - -#define DEBUGFS_SIZE (ARRAY_SIZE(debugfs_list) * sizeof(struct drm_info_list)) - local =drmm_kmalloc (&guc_to_xe (guc)->drm,DEBUGFS_SIZE ,GFP_KERNEL ); -if (!local) -return ; - -memcpy (local, debugfs_list,DEBUGFS_SIZE ); -#undef DEBUGFS_SIZE - -for (i =0 ; i <ARRAY_SIZE (debugfs_list); ++i) - local[i].data = guc; -drm_debugfs_create_files (local, +drm_debugfs_create_files (debugfs_list,ARRAY_SIZE (debugfs_list), parent, minor); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 157/780 drm/xe/guc: Dont expose GuC privileged debugfs files if VF
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Wajdeczko <[email protected]>
[ Upstream commit 387444984d7b53dbaee263887cad4ea7c8e57b34 ]
Some of the GuC debugfs files require access to the data that is not available on the VFs. Don't expose those files on the VF driver.
Stable-dep-of: e22d7acf9f47 ("drm/xe/guc: Make creation of SLPC debugfs files conditional")
--- drivers/gpu/drm/xe/xe_guc_debugfs.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
drivers/gpu/drm/xe/xe_guc_debugfs.c +18 -4
@@ -103,11 +103,20 @@ static int guc_pc(struct xe_guc *guc, struct drm_printer *p)return 0 ; } -static const struct drm_info_list debugfs_list[] = { +/* +* only for GuC debugfs files which can be safely used on the VF as well: +* - without access to the GuC privileged registers +* - without access to the PF specific GuC objects +*/ +static const struct drm_info_list vf_safe_debugfs_list[] = { {"guc_info" , .show = guc_debugfs_show, .data = xe_guc_print_info }, + {"guc_ctb" , .show = guc_debugfs_show, .data = guc_ctb }, +}; + +/* everything else should be added here */ +static const struct drm_info_list pf_only_debugfs_list[] = { {"guc_log" , .show = guc_debugfs_show, .data = guc_log }, {"guc_log_dmesg" , .show = guc_debugfs_show, .data = guc_log_dmesg }, - {"guc_ctb" , .show = guc_debugfs_show, .data = guc_ctb }, {"guc_pc" , .show = guc_debugfs_show, .data = guc_pc }, };
@@ -115,7 +124,12 @@ void xe_guc_debugfs_register(struct xe_guc *guc, struct dentry *parent) {struct drm_minor *minor =guc_to_xe (guc)->drm.primary; -drm_debugfs_create_files (debugfs_list, -ARRAY_SIZE (debugfs_list), +drm_debugfs_create_files (vf_safe_debugfs_list, +ARRAY_SIZE (vf_safe_debugfs_list), parent, minor); + +if (!IS_SRIOV_VF (guc_to_xe (guc))) +drm_debugfs_create_files (pf_only_debugfs_list, +ARRAY_SIZE (pf_only_debugfs_list), + parent, minor); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 158/780 drm/xe/guc: Make creation of SLPC debugfs files conditional
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aradhya Bhatia <[email protected]>
[ Upstream commit e22d7acf9f47b01c9a538f3dac5c8e8d46fbca96 ]
Platforms that do not support SLPC are exempted from the GuC PC support. The GuC PC does not get initialized, and neither do its BOs get created.
This causes a problem because the GuC PC debugfs file is still being created. Whenever the file is attempted to read, it causes a NULL pointer dereference on the supposed BO of the GuC PC.
So, make the creation of SLPC debugfs files conditional to when SLPC features are supported.
--- drivers/gpu/drm/xe/xe_guc_debugfs.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
drivers/gpu/drm/xe/xe_guc_debugfs.c +14 -3
@@ -113,23 +113,34 @@ static const struct drm_info_list vf_safe_debugfs_list[] = { { "guc_ctb", .show = guc_debugfs_show, .data = guc_ctb }, }; +/* For GuC debugfs files that require the SLPC support */ +static const struct drm_info_list slpc_debugfs_list[] = { + {"guc_pc" , .show = guc_debugfs_show, .data = guc_pc }, +}; +/* everything else should be added here */ static const struct drm_info_list pf_only_debugfs_list[] = { {"guc_log" , .show = guc_debugfs_show, .data = guc_log }, {"guc_log_dmesg" , .show = guc_debugfs_show, .data = guc_log_dmesg }, - {"guc_pc" , .show = guc_debugfs_show, .data = guc_pc }, };void xe_guc_debugfs_register (struct xe_guc *guc,struct dentry *parent) { -struct drm_minor *minor =guc_to_xe (guc)->drm.primary; +struct xe_device *xe =guc_to_xe (guc); +struct drm_minor *minor = xe->drm.primary;drm_debugfs_create_files (vf_safe_debugfs_list,ARRAY_SIZE (vf_safe_debugfs_list), parent, minor); -if (!IS_SRIOV_VF (guc_to_xe (guc))) +if (!IS_SRIOV_VF (xe)) {drm_debugfs_create_files (pf_only_debugfs_list,ARRAY_SIZE (pf_only_debugfs_list), parent, minor); + +if (!xe->info.skip_guc_pc) +drm_debugfs_create_files (slpc_debugfs_list, +ARRAY_SIZE (slpc_debugfs_list), + parent, minor); + } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 159/780 drm/panic: clean Clippy warning
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miguel Ojeda <[email protected]>
[ Upstream commit 57145afa3326947154c3a890b1118774b55212a0 ]
Clippy warns:
error: manual implementation of an assign operation
--> drivers/gpu/drm/drm_panic_qr.rs:418:25
|
418 | self.carry = self.carry % pow;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: replace it with: `self.carry %= pow`
|
= help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#assign_op_patternThus clean it up.
Stable-dep-of: 675008f196ca ("drm/panic: Use a decimal fifo to avoid u64 by u64 divide")
--- drivers/gpu/drm/drm_panic_qr.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_panic_qr.rs +1 -1
@@ -415,7 +415,7 @@ impl Iterator for SegmentIterator<'_> { self.carry_len -= out_len;let pow = u64::pow (10 , self.carry_lenas u32 );let out = (self.carry / pow)as u16 ; - self.carry = self.carry % pow; + self.carry %= pow;Some ((out,NUM_CHARS_BITS [out_len])) } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 160/780 drm/panic: Use a decimal fifo to avoid u64 by u64 divide
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jocelyn Falempe <[email protected]>
[ Upstream commit 675008f196ca5c8d8413204e861cc2a2238581aa ]
On 32bits ARM, u64/u64 is not supported [1], so change the algorithm to use a simple fifo with decimal digits as u8 instead. This is slower but should compile on all architecture.
--- drivers/gpu/drm/drm_panic_qr.rs | 71 ++++++++++++++++++++++----------- 1 file changed, 48 insertions(+), 23 deletions(-)
drivers/gpu/drm/drm_panic_qr.rs +48 -23
@@ -366,8 +366,48 @@ impl Segment<'_> {SegmentIterator { segment: self, offset:0 , - carry:0 , - carry_len:0 , + decfifo:Default ::default (), + } + } +} + +/// Max fifo size is 17 (max push) + 2 (max remaining) +const MAX_FIFO_SIZE :usize =19 ; + +/// A simple Decimal digit FIFO +#[derive( Default )] +struct DecFifo { + decimals: [u8 ;MAX_FIFO_SIZE ], + len:usize , +} + +impl DecFifo { +fn push (&mut self, data:u64 , len:usize ) { +let mut chunk = data; +for iin (0 ..self.len).rev () { + self.decimals[i + len] = self.decimals[i]; + } +for iin 0 ..len { + self.decimals[i] = (chunk %10 )as u8 ; + chunk /=10 ; + } + self.len += len; + } + +/// Pop 3 decimal digits from the FIFO +fn pop3 (&mut self) ->Option <(u16 ,usize )> { +if self.len ==0 { +None + }else { +let poplen =3 .min (self.len); + self.len -= poplen; +let mut out =0 ; +let mut exp =1 ; +for iin 0 ..poplen { + out += self.decimals[self.len + i]as u16 * exp; + exp *=10 ; + } +Some ((out,NUM_CHARS_BITS [poplen])) } } }
@@ -375,8 +415,7 @@ impl Segment<'_> {struct SegmentIterator <'a> { segment: &'aSegment <'a>, offset:usize , - carry:u64 , - carry_len:usize , + decfifo:DecFifo , }impl Iterator for SegmentIterator <'_> {
@@ -394,31 +433,17 @@ impl Iterator for SegmentIterator<'_> { } } Segment::Numeric(data) => { -if self.carry_len <3 && self.offset < data.len () { -// If there are less than 3 decimal digits in the carry, -// take the next 7 bytes of input, and add them to the carry. +if self.decfifo.len <3 && self.offset < data.len () { +// If there are less than 3 decimal digits in the fifo, +// take the next 7 bytes of input, and push them to the fifo. let mut buf = [0u8 ;8 ];let len =7 .min (data.len () - self.offset); buf[..len].copy_from_slice (&data[self.offset..self.offset + len]);let chunk = u64::from_le_bytes (buf); -let pow = u64::pow (10 ,BYTES_TO_DIGITS [len]as u32 ); - self.carry = chunk + self.carry * pow; + self.decfifo.push (chunk,BYTES_TO_DIGITS [len]); self.offset += len; - self.carry_len +=BYTES_TO_DIGITS [len]; - } -match self.carry_len { -0 =>None , - len => { -// take the next 3 decimal digits of the carry -// and return 10bits of numeric data. -let out_len =3 .min (len); - self.carry_len -= out_len; -let pow = u64::pow (10 , self.carry_lenas u32 ); -let out = (self.carry / pow)as u16 ; - self.carry %= pow; -Some ((out,NUM_CHARS_BITS [out_len])) - } } + self.decfifo.pop3 () } } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 161/780 wifi: ath12k: fix NULL access in assign channel context handler
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Karthikeyan Periyasamy <[email protected]>
[ Upstream commit ea24531d00f782f4e659e8c74578b7ac144720ca ]
Currently, when ath12k_mac_assign_vif_to_vdev() fails, the radio handle (ar) gets accessed from the link VIF handle (arvif) for debug logging, This is incorrect. In the fail scenario, radio handle is NULL. Fix the NULL access, avoid radio handle access by moving to the hardware debug logging helper function (ath12k_hw_warn).
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
--- drivers/net/wireless/ath/ath12k/mac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath12k/mac.c +2 -2
@@ -9462,8 +9462,8 @@ ath12k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw, ar =ath12k_mac_assign_vif_to_vdev (hw, arvif, ctx);if (!ar) { -ath12k_warn (arvif->ar->ab,"failed to assign chanctx for vif %pM link id %u link vif is already started" , - vif->addr, link_id); +ath12k_hw_warn (ah,"failed to assign chanctx for vif %pM link id %u link vif is already started" , + vif->addr, link_id);return -EINVAL ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 162/780 wifi: ath11k: fix node corruption in ar->arvifs list
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stone Zhang <[email protected]>
[ Upstream commit 31e98e277ae47f56632e4d663b1d4fd12ba33ea8 ]
In current WLAN recovery code flow, ath11k_core_halt() only reinitializes the "arvifs" list head. This will cause the list node immediately following the list head to become an invalid list node. Because the prev of that node still points to the list head "arvifs", but the next of the list head "arvifs" no longer points to that list node.
When a WLAN recovery occurs during the execution of a vif removal, and it happens before the spin_lock_bh(&ar->data_lock) in ath11k_mac_op_remove_interface(), list_del() will detect the previously mentioned situation, thereby triggering a kernel panic.
The fix is to remove and reinitialize all vif list nodes from the list head "arvifs" during WLAN halt. The reinitialization is to make the list nodes valid, ensuring that the list_del() in ath11k_mac_op_remove_interface() can execute normally.
Call trace: __list_del_entry_valid_or_report+0xb8/0xd0 ath11k_mac_op_remove_interface+0xb0/0x27c [ath11k] drv_remove_interface+0x48/0x194 [mac80211] ieee80211_do_stop+0x6e0/0x844 [mac80211] ieee80211_stop+0x44/0x17c [mac80211] __dev_close_many+0xac/0x150 __dev_change_flags+0x194/0x234 dev_change_flags+0x24/0x6c devinet_ioctl+0x3a0/0x670 inet_ioctl+0x200/0x248 sock_do_ioctl+0x60/0x118 sock_ioctl+0x274/0x35c __arm64_sys_ioctl+0xac/0xf0 invoke_syscall+0x48/0x114
...
Tested-on: QCA6698AQ hw2.1 PCI WLAN.HSP.1.1-04591-QCAHSPSWPL_V1_V2_SILICONZ_IOE-1
--- drivers/net/wireless/ath/ath11k/core.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath11k/core.c +7 -1
@@ -2050,6 +2050,7 @@ static int ath11k_core_reconfigure_on_crash(struct ath11k_base *ab)void ath11k_core_halt (struct ath11k *ar) {struct ath11k_base *ab = ar->ab; +struct list_head *pos, *n;lockdep_assert_held (&ar->conf_mutex);
@@ -2065,7 +2066,12 @@ void ath11k_core_halt(struct ath11k *ar)rcu_assign_pointer (ab->pdevs_active[ar->pdev_idx],NULL );synchronize_rcu (); -INIT_LIST_HEAD (&ar->arvifs); + +spin_lock_bh (&ar->data_lock); +list_for_each_safe (pos, n, &ar->arvifs) +list_del_init (pos); +spin_unlock_bh (&ar->data_lock); +idr_init (&ar->txmgmt_idr); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 163/780 libbpf: Fix implicit memfd_create() for bionic
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Carlos Llamas <[email protected]>
[ Upstream commit 75011ad69bc54396703867b5434f1622343a848e ]
Since memfd_create() is not consistently available across different bionic libc implementations, using memfd_create() directly can break some Android builds:
tools/lib/bpf/linker.c:576:7: error: implicit declaration of function 'memfd_create' [-Werror,-Wimplicit-function-declaration]
576 | fd = memfd_create(filename, 0);
| ^To fix this, relocate and inline the sys_memfd_create() helper so that it can be used in "linker.c". Similar issues were previously fixed by commit 9fa5e1a180aa ("libbpf: Call memfd_create() syscall directly").
--- tools/lib/bpf/libbpf.c | 9 --------- tools/lib/bpf/libbpf_internal.h | 9 +++++++++ tools/lib/bpf/linker.c | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-)
tools/lib/bpf/libbpf.c +0 -9
@@ -1725,15 +1725,6 @@ static Elf64_Sym *find_elf_var_sym(const struct bpf_object *obj, const char *namreturn ERR_PTR (-ENOENT ); } -/* Some versions of Android don't provide memfd_create() in their libc -* implementation, so avoid complications and just go straight to Linux -* syscall. -*/ -static int sys_memfd_create (const char *name,unsigned flags) -{ -return syscall (__NR_memfd_create, name, flags); -} -#ifndef MFD_CLOEXEC #define MFD_CLOEXEC 0x0001U#endif
tools/lib/bpf/libbpf_internal.h +9 -0
@@ -667,6 +667,15 @@ static inline int sys_dup3(int oldfd, int newfd, int flags)return syscall (__NR_dup3, oldfd, newfd, flags); } +/* Some versions of Android don't provide memfd_create() in their libc +* implementation, so avoid complications and just go straight to Linux +* syscall. +*/ +static inline int sys_memfd_create (const char *name,unsigned flags) +{ +return syscall (__NR_memfd_create, name, flags); +} +/* Point *fixed_fd* to the same file that *tmp_fd* points to. * Regardless of success, *tmp_fd* is closed. * Whatever *fixed_fd* pointed to is closed silently.
tools/lib/bpf/linker.c +1 -1
@@ -573,7 +573,7 @@ int bpf_linker__add_buf(struct bpf_linker *linker, void *buf, size_t buf_sz,snprintf (filename,sizeof (filename),"mem:%p+%zu" , buf, buf_sz); - fd =memfd_create (filename,0 ); + fd =sys_memfd_create (filename,0 );if (fd <0 ) { ret = -errno;pr_warn ("failed to create memfd '%s': %s\n" , filename,errstr (ret));
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 164/780 wifi: ath12k: Fix memory leak during vdev_id mismatch
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: P Praneesh <[email protected]>
[ Upstream commit 75ec94db880b1e4b4f9182885d60db0db6e2ee56 ]
Currently driver enables vdev_id check as part of the bank configuration in ath12k_dp_tx_get_vdev_bank_config(). This check ensures that the vdev_id configured in the bank register aligns with the vdev_id in the packet's address search table within the firmware. If there is a mismatch, the firmware forwards the packet with the HTT status HAL_WBM_REL_HTT_TX_COMP_STATUS_VDEVID_MISMATCH. Since driver does not handle this vdev_id mismatch HTT status, the corresponding buffers are not freed properly, causing a memory leak. Fix this issue by adding handling to free the buffers when a vdev_id mismatch HTT status is encountered.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-
--- drivers/net/wireless/ath/ath12k/dp_tx.c | 1 + drivers/net/wireless/ath/ath12k/hal_desc.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath12k/dp_tx.c +1 -0
@@ -585,6 +585,7 @@ ath12k_dp_tx_process_htt_tx_complete(struct ath12k_base *ab,case HAL_WBM_REL_HTT_TX_COMP_STATUS_TTL :case HAL_WBM_REL_HTT_TX_COMP_STATUS_REINJ :case HAL_WBM_REL_HTT_TX_COMP_STATUS_INSPECT : +case HAL_WBM_REL_HTT_TX_COMP_STATUS_VDEVID_MISMATCH :ath12k_dp_tx_free_txbuf (ab, msdu, mac_id, tx_ring);break ;case HAL_WBM_REL_HTT_TX_COMP_STATUS_MEC_NOTIFY :
drivers/net/wireless/ath/ath12k/hal_desc.h +2 -1
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved. -* Copyright (c) 2021-2022, 2024 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2022, 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "core.h"
@@ -1298,6 +1298,7 @@ enum hal_wbm_htt_tx_comp_status {HAL_WBM_REL_HTT_TX_COMP_STATUS_REINJ ,HAL_WBM_REL_HTT_TX_COMP_STATUS_INSPECT ,HAL_WBM_REL_HTT_TX_COMP_STATUS_MEC_NOTIFY , +HAL_WBM_REL_HTT_TX_COMP_STATUS_VDEVID_MISMATCH , HAL_WBM_REL_HTT_TX_COMP_STATUS_MAX, };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 165/780 wifi: ath12k: Fix memory corruption during MLO multicast tx
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: P Praneesh <[email protected]>
[ Upstream commit 6f8a27a584b23e9dedefd6cb110dd2587b84a6d4 ]
The struct sk_buff's control buffer is shared by mac80211's struct ieee80211_tx_info and ath12k's struct ath12k_skb_cb. When the driver wants to transmit an skb, it caches all the mac80211-specific information from struct ieee80211_tx_info, then performs a memset on the control buffer before writing the ath12k-specific information using struct ath12k_skb_cb. However, during multicast tx, the key is being filled into the driver data, which overwrites some crucial members like link_id and flags in struct ath12k_skb_cb. This causes invalid information retrieval when the driver accesses these fields during ath12k_dp_tx(). Fix this issue by removing the key filling logic during MLO multicast tx, as it is not used anywhere in the tx path.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
--- drivers/net/wireless/ath/ath12k/mac.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/wireless/ath/ath12k/mac.c +0 -2
@@ -7429,7 +7429,6 @@ static void ath12k_mac_op_tx(struct ieee80211_hw *hw, info_flags); skb_cb =ATH12K_SKB_CB (msdu_copied); - info =IEEE80211_SKB_CB (msdu_copied); skb_cb->link_id = link_id;/* For open mode, skip peer find logic */
@@ -7452,7 +7451,6 @@ static void ath12k_mac_op_tx(struct ieee80211_hw *hw,if (key) { skb_cb->cipher = key->cipher; skb_cb->flags |=ATH12K_SKB_CIPHER_SET ; - info->control.hw_key = key; hdr = (struct ieee80211_hdr *)msdu_copied->data;if (!ieee80211_has_protected (hdr->frame_control))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 166/780 wifi: ath12k: Fix invalid memory access while forming 802.11 header
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: P Praneesh <[email protected]>
[ Upstream commit be908d2360341f8bbc982fff5a5e4f8030c17f74 ]
While forming the 802.11 header from the rx descriptor, skb_push() is performed for the 802.11 header length and then calls ath12k_dp_rx_desc_get_dot11_hdr(). Since skb_push() moves the skb->data pointer backwards by the 802.11 header length, the rx descriptor points to a different memory area than intended, causing invalid information to be fetched from the rx descriptor.
Also, when IV and ICV are not stripped from the given MSDU, mac80211 performs PN validation for these MSDUs, which requires the crypto header. Before forming the crypto header from the given rx descriptor, skb_push() is performed for the crypto header length, which overwrites the memory pointed to by the rx descriptor, causing invalid information to form the 802.11 header.
Fix these issues by moving all rx descriptor accesses before the skb_push() operation which ensures the proper 802.11 headers are generated from the given rx descriptor and removing ath12k_dp_rxdesc_get_mpdu_frame_ctrl() for filling frame control, as this information is already fetched by ath12k_dp_rx_desc_get_dot11_hdr().
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
--- drivers/net/wireless/ath/ath12k/dp_rx.c | 27 +++++++++---------------- drivers/net/wireless/ath/ath12k/hal.c | 19 ----------------- drivers/net/wireless/ath/ath12k/hal.h | 1 - 3 files changed, 9 insertions(+), 38 deletions(-)
drivers/net/wireless/ath/ath12k/dp_rx.c +9 -18
@@ -228,12 +228,6 @@ static void ath12k_dp_rx_desc_get_crypto_header(struct ath12k_base *ab, ab->hal_rx_ops->rx_desc_get_crypto_header (desc, crypto_hdr, enctype); } -static u16 ath12k_dp_rxdesc_get_mpdu_frame_ctrl (struct ath12k_base *ab, -struct hal_rx_desc *desc) -{ -return ab->hal_rx_ops->rx_desc_get_mpdu_frame_ctl (desc); -} -static inline u8 ath12k_dp_rx_get_msdu_src_link (struct ath12k_base *ab,struct hal_rx_desc *desc) {
@@ -2122,10 +2116,13 @@ static void ath12k_get_dot11_hdr_from_rx_desc(struct ath12k *ar,struct hal_rx_desc *rx_desc = rxcb->rx_desc;struct ath12k_base *ab = ar->ab;size_t hdr_len, crypto_len; -struct ieee80211_hdr *hdr; +struct ieee80211_hdr hdr;u16 qos_ctl; -__le16 fc; -u8 *crypto_hdr; +u8 *crypto_hdr, mesh_ctrl; + +ath12k_dp_rx_desc_get_dot11_hdr (ab, rx_desc, &hdr); + hdr_len =ieee80211_hdrlen (hdr.frame_control); + mesh_ctrl =ath12k_dp_rx_h_mesh_ctl_present (ab, rx_desc);if (!(status->flag &RX_FLAG_IV_STRIPPED )) { crypto_len =ath12k_dp_rx_crypto_param_len (ar, enctype);
@@ -2133,22 +2130,16 @@ static void ath12k_get_dot11_hdr_from_rx_desc(struct ath12k *ar,ath12k_dp_rx_desc_get_crypto_header (ab, rx_desc, crypto_hdr, enctype); } - fc =cpu_to_le16 (ath12k_dp_rxdesc_get_mpdu_frame_ctrl (ab, rx_desc)); - hdr_len =ieee80211_hdrlen (fc);skb_push (msdu, hdr_len); - hdr = (struct ieee80211_hdr *)msdu->data; - hdr->frame_control = fc; - -/* Get wifi header from rx_desc */ -ath12k_dp_rx_desc_get_dot11_hdr (ab, rx_desc, hdr); +memcpy (msdu->data, &hdr,min (hdr_len,sizeof (hdr)));if (rxcb->is_mcbc) status->flag &= ~RX_FLAG_PN_VALIDATED ;/* Add QOS header */ -if (ieee80211_is_data_qos (hdr->frame_control)) { +if (ieee80211_is_data_qos (hdr.frame_control)) { qos_ctl = rxcb->tid; -if (ath12k_dp_rx_h_mesh_ctl_present (ab, rx_desc)) +if (mesh_ctrl) qos_ctl |=IEEE80211_QOS_CTL_MESH_CONTROL_PRESENT ;/* TODO: Add other QoS ctl fields when required */
drivers/net/wireless/ath/ath12k/hal.c +0 -19
@@ -511,11 +511,6 @@ static void ath12k_hw_qcn9274_rx_desc_get_crypto_hdr(struct hal_rx_desc *desc, crypto_hdr[7 ] =HAL_RX_MPDU_INFO_PN_GET_BYTE2 (desc->u.qcn9274.mpdu_start.pn[1 ]); } -static u16 ath12k_hw_qcn9274_rx_desc_get_mpdu_frame_ctl (struct hal_rx_desc *desc) -{ -return __le16_to_cpu (desc->u.qcn9274.mpdu_start.frame_ctrl); -} -static int ath12k_hal_srng_create_config_qcn9274 (struct ath12k_base *ab) {struct ath12k_hal *hal = &ab->hal;
@@ -736,7 +731,6 @@ const struct hal_rx_ops hal_rx_qcn9274_ops = { .rx_desc_is_da_mcbc = ath12k_hw_qcn9274_rx_desc_is_da_mcbc, .rx_desc_get_dot11_hdr = ath12k_hw_qcn9274_rx_desc_get_dot11_hdr, .rx_desc_get_crypto_header = ath12k_hw_qcn9274_rx_desc_get_crypto_hdr, - .rx_desc_get_mpdu_frame_ctl = ath12k_hw_qcn9274_rx_desc_get_mpdu_frame_ctl, .dp_rx_h_msdu_done = ath12k_hw_qcn9274_dp_rx_h_msdu_done, .dp_rx_h_l4_cksum_fail = ath12k_hw_qcn9274_dp_rx_h_l4_cksum_fail, .dp_rx_h_ip_cksum_fail = ath12k_hw_qcn9274_dp_rx_h_ip_cksum_fail,
@@ -975,11 +969,6 @@ ath12k_hw_qcn9274_compact_rx_desc_get_crypto_hdr(struct hal_rx_desc *desc,HAL_RX_MPDU_INFO_PN_GET_BYTE2 (desc->u.qcn9274_compact.mpdu_start.pn[1 ]); } -static u16 ath12k_hw_qcn9274_compact_rx_desc_get_mpdu_frame_ctl (struct hal_rx_desc *desc) -{ -return __le16_to_cpu (desc->u.qcn9274_compact.mpdu_start.frame_ctrl); -} -static bool ath12k_hw_qcn9274_compact_dp_rx_h_msdu_done (struct hal_rx_desc *desc) { return !!le32_get_bits(desc->u.qcn9274_compact.msdu_end.info14,
@@ -1080,8 +1069,6 @@ const struct hal_rx_ops hal_rx_qcn9274_compact_ops = { .rx_desc_is_da_mcbc = ath12k_hw_qcn9274_compact_rx_desc_is_da_mcbc, .rx_desc_get_dot11_hdr = ath12k_hw_qcn9274_compact_rx_desc_get_dot11_hdr, .rx_desc_get_crypto_header = ath12k_hw_qcn9274_compact_rx_desc_get_crypto_hdr, - .rx_desc_get_mpdu_frame_ctl = - ath12k_hw_qcn9274_compact_rx_desc_get_mpdu_frame_ctl, .dp_rx_h_msdu_done = ath12k_hw_qcn9274_compact_dp_rx_h_msdu_done, .dp_rx_h_l4_cksum_fail = ath12k_hw_qcn9274_compact_dp_rx_h_l4_cksum_fail, .dp_rx_h_ip_cksum_fail = ath12k_hw_qcn9274_compact_dp_rx_h_ip_cksum_fail,
@@ -1330,11 +1317,6 @@ static void ath12k_hw_wcn7850_rx_desc_get_crypto_hdr(struct hal_rx_desc *desc, crypto_hdr[7 ] =HAL_RX_MPDU_INFO_PN_GET_BYTE2 (desc->u.wcn7850.mpdu_start.pn[1 ]); } -static u16 ath12k_hw_wcn7850_rx_desc_get_mpdu_frame_ctl (struct hal_rx_desc *desc) -{ -return __le16_to_cpu (desc->u.wcn7850.mpdu_start.frame_ctrl); -} -static int ath12k_hal_srng_create_config_wcn7850 (struct ath12k_base *ab) {struct ath12k_hal *hal = &ab->hal;
@@ -1555,7 +1537,6 @@ const struct hal_rx_ops hal_rx_wcn7850_ops = { .rx_desc_is_da_mcbc = ath12k_hw_wcn7850_rx_desc_is_da_mcbc, .rx_desc_get_dot11_hdr = ath12k_hw_wcn7850_rx_desc_get_dot11_hdr, .rx_desc_get_crypto_header = ath12k_hw_wcn7850_rx_desc_get_crypto_hdr, - .rx_desc_get_mpdu_frame_ctl = ath12k_hw_wcn7850_rx_desc_get_mpdu_frame_ctl, .dp_rx_h_msdu_done = ath12k_hw_wcn7850_dp_rx_h_msdu_done, .dp_rx_h_l4_cksum_fail = ath12k_hw_wcn7850_dp_rx_h_l4_cksum_fail, .dp_rx_h_ip_cksum_fail = ath12k_hw_wcn7850_dp_rx_h_ip_cksum_fail,
drivers/net/wireless/ath/ath12k/hal.h +0 -1
@@ -1068,7 +1068,6 @@ struct hal_rx_ops {bool (*rx_desc_is_da_mcbc)(struct hal_rx_desc *desc);void (*rx_desc_get_dot11_hdr)(struct hal_rx_desc *desc,struct ieee80211_hdr *hdr); -u16 (*rx_desc_get_mpdu_frame_ctl)(struct hal_rx_desc *desc);void (*rx_desc_get_crypto_header)(struct hal_rx_desc *desc,u8 *crypto_hdr,enum hal_encrypt_type enctype);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 167/780 IB/cm: use rwlock for MAD agent lock
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jacob Moroni <[email protected]>
[ Upstream commit 4dab26bed543584577b64b36aadb8b5b165bf44f ]
In workloads where there are many processes establishing connections using RDMA CM in parallel (large scale MPI), there can be heavy contention for mad_agent_lock in cm_alloc_msg.
This contention can occur while inside of a spin_lock_irq region, leading to interrupts being disabled for extended durations on many cores. Furthermore, it leads to the serialization of rdma_create_ah calls, which has negative performance impacts for NICs which are capable of processing multiple address handle creations in parallel.
The end result is the machine becoming unresponsive, hung task warnings, netdev TX timeouts, etc.
Since the lock appears to be only for protection from cm_remove_one, it can be changed to a rwlock to resolve these issues.
Reproducer:
Server:
for i in $(seq 1 512); do
ucmatose -c 32 -p $((i + 5000)) &
done
Client:
for i in $(seq 1 512); do
ucmatose -c 32 -p $((i + 5000)) -s 10.2.0.52 &
done
--- drivers/infiniband/core/cm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/infiniband/core/cm.c +8 -8
@@ -167,7 +167,7 @@ struct cm_port {struct cm_device {struct kref kref;struct list_head list; -spinlock_t mad_agent_lock; +rwlock_t mad_agent_lock;struct ib_device *ib_device;u8 ack_delay;int going_down;
@@ -285,7 +285,7 @@ static struct ib_mad_send_buf *cm_alloc_msg(struct cm_id_private *cm_id_priv)if (!cm_id_priv->av.port)return ERR_PTR (-EINVAL ); -spin_lock (&cm_id_priv->av.port->cm_dev->mad_agent_lock); +read_lock (&cm_id_priv->av.port->cm_dev->mad_agent_lock); mad_agent = cm_id_priv->av.port->mad_agent;if (!mad_agent) { m =ERR_PTR (-EINVAL );
@@ -311,7 +311,7 @@ static struct ib_mad_send_buf *cm_alloc_msg(struct cm_id_private *cm_id_priv) m->ah = ah; out: -spin_unlock (&cm_id_priv->av.port->cm_dev->mad_agent_lock); +read_unlock (&cm_id_priv->av.port->cm_dev->mad_agent_lock);return m; }
@@ -1297,10 +1297,10 @@ static __be64 cm_form_tid(struct cm_id_private *cm_id_priv)if (!cm_id_priv->av.port)return cpu_to_be64 (low_tid); -spin_lock (&cm_id_priv->av.port->cm_dev->mad_agent_lock); +read_lock (&cm_id_priv->av.port->cm_dev->mad_agent_lock);if (cm_id_priv->av.port->mad_agent) hi_tid = ((u64 )cm_id_priv->av.port->mad_agent->hi_tid) <<32 ; -spin_unlock (&cm_id_priv->av.port->cm_dev->mad_agent_lock); +read_unlock (&cm_id_priv->av.port->cm_dev->mad_agent_lock);return cpu_to_be64 (hi_tid | low_tid); }
@@ -4378,7 +4378,7 @@ static int cm_add_one(struct ib_device *ib_device)return -ENOMEM ;kref_init (&cm_dev->kref); -spin_lock_init (&cm_dev->mad_agent_lock); +rwlock_init (&cm_dev->mad_agent_lock); cm_dev->ib_device = ib_device; cm_dev->ack_delay = ib_device->attrs.local_ca_ack_delay; cm_dev->going_down =0 ;
@@ -4494,9 +4494,9 @@ static void cm_remove_one(struct ib_device *ib_device, void *client_data)* The above ensures no call paths from the work are running, * the remaining paths all take the mad_agent_lock. */ -spin_lock (&cm_dev->mad_agent_lock); +write_lock (&cm_dev->mad_agent_lock); port->mad_agent =NULL ; -spin_unlock (&cm_dev->mad_agent_lock); +write_unlock (&cm_dev->mad_agent_lock);ib_unregister_mad_agent (mad_agent);ib_port_unregister_client_groups (ib_device, i, cm_counter_groups);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 168/780 bpf: Check link_create.flags parameter for multi_kprobe
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tao Chen <[email protected]>
[ Upstream commit 243911982aa9faf4361aa952f879331ad66933fe ]
The link_create.flags are currently not used for multi-kprobes, so return -EINVAL if it is set, same as for other attach APIs.
We allow target_fd, on the other hand, to have an arbitrary value for multi-kprobe, as there are existing users (libbpf) relying on this.
--- kernel/trace/bpf_trace.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/trace/bpf_trace.c +3 -0
@@ -2987,6 +2987,9 @@ int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *prif (sizeof (u64) !=sizeof (void *))return -EOPNOTSUPP ; +if (attr->link_create.flags) +return -EINVAL ; +if (!is_kprobe_multi (prog))return -EINVAL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 169/780 bpf: Check link_create.flags parameter for multi_uprobe
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tao Chen <[email protected]>
[ Upstream commit a76116f422c442ab691b4dcabb25613486d34360 ]
The link_create.flags are currently not used for multi-uprobes, so return -EINVAL if it is set, same as for other attach APIs.
We allow target_fd to have an arbitrary value for multi-uprobe, though, as there are existing users (libbpf) relying on this.
--- kernel/trace/bpf_trace.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/trace/bpf_trace.c +3 -0
@@ -3379,6 +3379,9 @@ int bpf_uprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *prif (sizeof (u64) !=sizeof (void *))return -EOPNOTSUPP ; +if (attr->link_create.flags) +return -EINVAL ; +if (!is_uprobe_multi (prog))return -EINVAL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 170/780 selftests/bpf: Fix bpf_nf selftest failure
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Saket Kumar Bhaskar <[email protected]>
[ Upstream commit 967e8def1100cb4b08c28a54d27ce69563fdf281 ]
For systems with missing iptables-legacy tool this selftest fails.
Add check to find if iptables-legacy tool is available and skip the test if the tool is missing.
--- tools/testing/selftests/bpf/prog_tests/bpf_nf.c | 6 ++++++ 1 file changed, 6 insertions(+)
tools/testing/selftests/bpf/prog_tests/bpf_nf.c +6 -0
@@ -63,6 +63,12 @@ static void test_bpf_nf_ct(int mode) .repeat = 1, ); +if (SYS_NOFAIL ("iptables-legacy --version" )) { +fprintf (stdout,"Missing required iptables-legacy tool\n" ); +test__skip (); +return ; + } + skel =test_bpf_nf__open_and_load ();if (!ASSERT_OK_PTR (skel,"test_bpf_nf__open_and_load" ))return ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 171/780 bpf: fix ktls panic with sockmap
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiayuan Chen <[email protected]>
[ Upstream commit 54a3ecaeeeae8176da8badbd7d72af1017032c39 ]
[ 2172.936997] ------------[ cut here ]------------ [ 2172.936999] kernel BUG at lib/iov_iter.c:629! ...... [ 2172.944996] PKRU: 55555554 [ 2172.945155] Call Trace: [ 2172.945299] <TASK> [ 2172.945428] ? die+0x36/0x90 [ 2172.945601] ? do_trap+0xdd/0x100 [ 2172.945795] ? iov_iter_revert+0x178/0x180 [ 2172.946031] ? iov_iter_revert+0x178/0x180 [ 2172.946267] ? do_error_trap+0x7d/0x110 [ 2172.946499] ? iov_iter_revert+0x178/0x180 [ 2172.946736] ? exc_invalid_op+0x50/0x70 [ 2172.946961] ? iov_iter_revert+0x178/0x180 [ 2172.947197] ? asm_exc_invalid_op+0x1a/0x20 [ 2172.947446] ? iov_iter_revert+0x178/0x180 [ 2172.947683] ? iov_iter_revert+0x5c/0x180 [ 2172.947913] tls_sw_sendmsg_locked.isra.0+0x794/0x840 [ 2172.948206] tls_sw_sendmsg+0x52/0x80 [ 2172.948420] ? inet_sendmsg+0x1f/0x70 [ 2172.948634] __sys_sendto+0x1cd/0x200 [ 2172.948848] ? find_held_lock+0x2b/0x80 [ 2172.949072] ? syscall_trace_enter+0x140/0x270 [ 2172.949330] ? __lock_release.isra.0+0x5e/0x170 [ 2172.949595] ? find_held_lock+0x2b/0x80 [ 2172.949817] ? syscall_trace_enter+0x140/0x270 [ 2172.950211] ? lockdep_hardirqs_on_prepare+0xda/0x190 [ 2172.950632] ? ktime_get_coarse_real_ts64+0xc2/0xd0 [ 2172.951036] __x64_sys_sendto+0x24/0x30 [ 2172.951382] do_syscall_64+0x90/0x170
......
After calling bpf_exec_tx_verdict(), the size of msg_pl->sg may increase, e.g., when the BPF program executes bpf_msg_push_data().
If the BPF program sets cork_bytes and sg.size is smaller than cork_bytes, it will return -ENOSPC and attempt to roll back to the non-zero copy logic. However, during rollback, msg->msg_iter is reset, but since msg_pl->sg.size has been increased, subsequent executions will exceed the actual size of msg_iter.
'''iov_iter_revert(&msg->msg_iter, msg_pl->sg.size - orig_size); '''
The changes in this commit are based on the following considerations:
1. When cork_bytes is set, rolling back to non-zero copy logic is pointless and can directly go to zero-copy logic.
2. We can not calculate the correct number of bytes to revert msg_iter.
Assume the original data is "abcdefgh" (8 bytes), and after 3 pushes by the BPF program, it becomes 11-byte data: "abc?de?fgh?". Then, we set cork_bytes to 6, which means the first 6 bytes have been processed, and the remaining 5 bytes "?fgh?" will be cached until the length meets the cork_bytes requirement.
However, some data in "?fgh?" is not within 'sg->msg_iter' (but in msg_pl instead), especially the data "?" we pushed.
So it doesn't seem as simple as just reverting through an offset of msg_iter.
3. For non-TLS sockets in tcp_bpf_sendmsg, when a "cork" situation occurs, the user-space send() doesn't return an error, and the returned length is the same as the input length parameter, even if some data is cached.
Additionally, I saw that the current non-zero-copy logic for handling corking is written as:
'''
line 1177
else if (ret != -EAGAIN) {
if (ret == -ENOSPC)
ret = 0;
goto send_end;'''
So it's ok to just return 'copied' without error when a "cork" situation occurs.
--- net/tls/tls_sw.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
net/tls/tls_sw.c +6 -2
@@ -1120,9 +1120,13 @@ static int tls_sw_sendmsg_locked(struct sock *sk, struct msghdr *msg, num_async++; else if (ret == -ENOMEM) goto wait_for_memory; - else if (ctx->open_rec && ret == -ENOSPC) + else if (ctx->open_rec && ret == -ENOSPC) { +if (msg_pl->cork_bytes) { + ret =0 ; + goto send_end; + } goto rollback_iter; - else if (ret != -EAGAIN) + } else if (ret != -EAGAIN) goto send_end; }continue ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 172/780 bpf, sockmap: fix duplicated data transmission
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiayuan Chen <[email protected]>
[ Upstream commit 3b4f14b794287be137ea2c6158765d1ea1e018a4 ]
In the !ingress path under sk_psock_handle_skb(), when sending data to the remote under snd_buf limitations, partial skb data might be transmitted.
Although we preserved the partial transmission state (offset/length), the state wasn't properly consumed during retries. This caused the retry path to resend the entire skb data instead of continuing from the previous offset, resulting in data overlap at the receiver side.
--- net/core/skmsg.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
net/core/skmsg.c +9 -5
@@ -656,11 +656,6 @@ static void sk_psock_backlog(struct work_struct *work)int ret;mutex_lock (&psock->work_mutex); -if (unlikely (state->len)) { - len = state->len; - off = state->off; - } -while ((skb =skb_peek (&psock->ingress_skb))) { len = skb->len; off =0 ;
@@ -670,6 +665,13 @@ static void sk_psock_backlog(struct work_struct *work) off = stm->offset; len = stm->full_len; } + +/* Resume processing from previous partial state */ +if (unlikely (state->len)) { + len = state->len; + off = state->off; + } + ingress =skb_bpf_ingress (skb);skb_bpf_redirect_clear (skb); do {
@@ -697,6 +699,8 @@ static void sk_psock_backlog(struct work_struct *work) len -= ret; }while (len); +/* The entire skb sent, clear state */ +sk_psock_skb_state (psock, state,0 ,0 ); skb =skb_dequeue (&psock->ingress_skb);kfree_skb (skb); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 173/780 bpf, sockmap: Fix panic when calling skb_linearize
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiayuan Chen <[email protected]>
[ Upstream commit 5ca2e29f6834c64c0e5a9ccf1278c21fb49b827e ]
The panic can be reproduced by executing the command:
./bench sockmap -c 2 -p 1 -a --rx-verdict-ingress --rx-strp 100000
Then a kernel panic was captured:
'''
[ 657.460555] kernel BUG at net/core/skbuff.c:2178! [ 657.462680] Tainted: [W]=WARN [ 657.463287] Workqueue: events sk_psock_backlog ... [ 657.469610] <TASK> [ 657.469738] ? die+0x36/0x90 [ 657.469916] ? do_trap+0x1d0/0x270 [ 657.470118] ? pskb_expand_head+0x612/0xf40 [ 657.470376] ? pskb_expand_head+0x612/0xf40 [ 657.470620] ? do_error_trap+0xa3/0x170 [ 657.470846] ? pskb_expand_head+0x612/0xf40 [ 657.471092] ? handle_invalid_op+0x2c/0x40 [ 657.471335] ? pskb_expand_head+0x612/0xf40 [ 657.471579] ? exc_invalid_op+0x2d/0x40 [ 657.471805] ? asm_exc_invalid_op+0x1a/0x20 [ 657.472052] ? pskb_expand_head+0xd1/0xf40 [ 657.472292] ? pskb_expand_head+0x612/0xf40 [ 657.472540] ? lock_acquire+0x18f/0x4e0 [ 657.472766] ? find_held_lock+0x2d/0x110 [ 657.472999] ? __pfx_pskb_expand_head+0x10/0x10 [ 657.473263] ? __kmalloc_cache_noprof+0x5b/0x470 [ 657.473537] ? __pfx___lock_release.isra.0+0x10/0x10 [ 657.473826] __pskb_pull_tail+0xfd/0x1d20 [ 657.474062] ? __kasan_slab_alloc+0x4e/0x90 [ 657.474707] sk_psock_skb_ingress_enqueue+0x3bf/0x510 [ 657.475392] ? __kasan_kmalloc+0xaa/0xb0 [ 657.476010] sk_psock_backlog+0x5cf/0xd70 [ 657.476637] process_one_work+0x858/0x1a20
'''
The panic originates from the assertion BUG_ON(skb_shared(skb)) in skb_linearize(). A previous commit(see Fixes tag) introduced skb_get() to avoid race conditions between skb operations in the backlog and skb release in the recvmsg path. However, this caused the panic to always occur when skb_linearize is executed.
The "--rx-strp 100000" parameter forces the RX path to use the strparser module which aggregates data until it reaches 100KB before calling sockmap logic. The 100KB payload exceeds MAX_MSG_FRAGS, triggering skb_linearize.
To fix this issue, just move skb_get into sk_psock_skb_ingress_enqueue.
'''sk_psock_backlog:
sk_psock_handle_skb
skb_get(skb) <== we move it into 'sk_psock_skb_ingress_enqueue'
sk_psock_skb_ingress____________
↓
|
| → sk_psock_skb_ingress_self
| sk_psock_skb_ingress_enqueuesk_psock_verdict_apply_________________↑ skb_linearize
'''
Note that for verdict_apply path, the skb_get operation is unnecessary so we add 'take_ref' param to control it's behavior.
--- net/core/skmsg.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-)
net/core/skmsg.c +16 -15
@@ -530,16 +530,22 @@ static int sk_psock_skb_ingress_enqueue(struct sk_buff *skb, u32 off, u32 len, struct sk_psock *psock, struct sock *sk, - struct sk_msg *msg) + struct sk_msg *msg, + bool take_ref) { int num_sge, copied; +/* skb_to_sgvec will fail when the total number of fragments in +* frag_list and frags exceeds MAX_MSG_FRAGS. For example, the +* caller may aggregate multiple skbs. +*/ num_sge =skb_to_sgvec (skb, msg->sg.data, off, len);if (num_sge <0 ) {/* skb linearize may fail with ENOMEM, but lets simply try again * later if this happens. Under memory pressure we don't want to * drop the skb. We need to linearize the skb so that the mapping * in skb_to_sgvec can not error. +* Note that skb_linearize requires the skb not to be shared. */ if (skb_linearize (skb))return -EAGAIN ;
@@ -556,7 +562,7 @@ static int sk_psock_skb_ingress_enqueue(struct sk_buff *skb, msg->sg.start =0 ; msg->sg.size = copied; msg->sg.end = num_sge; - msg->skb = skb; + msg->skb = take_ref ?skb_get (skb) : skb;sk_psock_queue_msg (psock, msg);sk_psock_data_ready (sk, psock);
@@ -564,7 +570,7 @@ static int sk_psock_skb_ingress_enqueue(struct sk_buff *skb, }static int sk_psock_skb_ingress_self (struct sk_psock *psock,struct sk_buff *skb, -u32 off,u32 len); +u32 off,u32 len,bool take_ref);static int sk_psock_skb_ingress (struct sk_psock *psock,struct sk_buff *skb,u32 off,u32 len)
@@ -578,7 +584,7 @@ static int sk_psock_skb_ingress(struct sk_psock *psock, struct sk_buff *skb,* correctly. */ if (unlikely (skb->sk == sk)) -return sk_psock_skb_ingress_self (psock, skb, off, len); +return sk_psock_skb_ingress_self (psock, skb, off, len, true); msg =sk_psock_create_ingress_msg (sk, skb);if (!msg)return -EAGAIN ;
@@ -590,7 +596,7 @@ static int sk_psock_skb_ingress(struct sk_psock *psock, struct sk_buff *skb,* into user buffers. */ skb_set_owner_r (skb, sk); - err =sk_psock_skb_ingress_enqueue (skb, off, len, psock, sk, msg); + err =sk_psock_skb_ingress_enqueue (skb, off, len, psock, sk, msg, true);if (err <0 )kfree (msg);return err;
@@ -601,7 +607,7 @@ static int sk_psock_skb_ingress(struct sk_psock *psock, struct sk_buff *skb,* because the skb is already accounted for here. */ static int sk_psock_skb_ingress_self (struct sk_psock *psock,struct sk_buff *skb, -u32 off,u32 len) +u32 off,u32 len,bool take_ref) {struct sk_msg *msg =alloc_sk_msg (GFP_ATOMIC );struct sock *sk = psock->sk;
@@ -610,7 +616,7 @@ static int sk_psock_skb_ingress_self(struct sk_psock *psock, struct sk_buff *skbif (unlikely (!msg))return -EAGAIN ;skb_set_owner_r (skb, sk); - err =sk_psock_skb_ingress_enqueue (skb, off, len, psock, sk, msg); + err =sk_psock_skb_ingress_enqueue (skb, off, len, psock, sk, msg, take_ref);if (err <0 )kfree (msg);return err;
@@ -619,18 +625,13 @@ static int sk_psock_skb_ingress_self(struct sk_psock *psock, struct sk_buff *skbstatic int sk_psock_handle_skb (struct sk_psock *psock,struct sk_buff *skb,u32 off,u32 len,bool ingress) { -int err =0 ; -if (!ingress) {if (!sock_writeable (psock->sk))return -EAGAIN ;return skb_send_sock (psock->sk, skb, off, len); } -skb_get (skb); - err =sk_psock_skb_ingress (psock, skb, off, len); -if (err <0 ) -kfree_skb (skb); -return err; + +return sk_psock_skb_ingress (psock, skb, off, len); } static void sk_psock_skb_state(struct sk_psock *psock,
@@ -1018,7 +1019,7 @@ static int sk_psock_verdict_apply(struct sk_psock *psock, struct sk_buff *skb, off = stm->offset; len = stm->full_len; } - err =sk_psock_skb_ingress_self (psock, skb, off, len); + err =sk_psock_skb_ingress_self (psock, skb, off, len, false); }if (err <0 ) {spin_lock_bh (&psock->ingress_lock);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 174/780 f2fs: zone: fix to avoid inconsistence in between SIT and SSA
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit 773704c1ef96a8b70d0d186ab725f50548de82c4 ]
w/ below testcase, it will cause inconsistence in between SIT and SSA.
create_null_blk 512 2 1024 1024
mkfs.f2fs -m /dev/nullb0
mount /dev/nullb0 /mnt/f2fs/
touch /mnt/f2fs/filef2fs_io pinfile set /mnt/f2fs/file
fallocate -l 4GiB /mnt/f2fs/file
F2FS-fs (nullb0): Inconsistent segment (0) type [1, 0] in SSA and SIT
CPU: 5 UID: 0 PID: 2398 Comm: fallocate Tainted: G O 6.13.0-rc1 #84 Tainted: [O]=OOT_MODULE Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS VirtualBox 12/01/2006 Call Trace: <TASK> dump_stack_lvl+0xb3/0xd0 dump_stack+0x14/0x20 f2fs_handle_critical_error+0x18c/0x220 [f2fs] f2fs_stop_checkpoint+0x38/0x50 [f2fs] do_garbage_collect+0x674/0x6e0 [f2fs] f2fs_gc_range+0x12b/0x230 [f2fs] f2fs_allocate_pinning_section+0x5c/0x150 [f2fs] f2fs_expand_inode_data+0x1cc/0x3c0 [f2fs] f2fs_fallocate+0x3c3/0x410 [f2fs] vfs_fallocate+0x15f/0x4b0 __x64_sys_fallocate+0x4a/0x80 x64_sys_call+0x15e8/0x1b80 do_syscall_64+0x68/0x130 entry_SYSCALL_64_after_hwframe+0x67/0x6f RIP: 0033:0x7f9dba5197ca
F2FS-fs (nullb0): Stopped filesystem due to reason: 4
The reason is f2fs_gc_range() may try to migrate block in curseg, however, its SSA block is not uptodate due to the last summary block data is still in cache of curseg.
In this patch, we add a condition in f2fs_gc_range() to check whether section is opened or not, and skip block migration for opened section.
--- fs/f2fs/gc.c | 3 +++ 1 file changed, 3 insertions(+)
fs/f2fs/gc.c +3 -0
@@ -2066,6 +2066,9 @@ int f2fs_gc_range(struct f2fs_sb_info *sbi, .iroot = RADIX_TREE_INIT(gc_list.iroot, GFP_NOFS), }; +if (IS_CURSEC (sbi,GET_SEC_FROM_SEG (sbi, segno))) +continue ; +do_garbage_collect (sbi, segno, &gc_list,FG_GC , true, false);put_gc_inode (&gc_list);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 175/780 net: phy: mediatek: permit to compile test GE SOC PHY driver
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Marangi <[email protected]>
[ Upstream commit e5566162af8b9690e096d2e6089e4ed955a0d13d ]
When commit 462a3daad679 ("net: phy: mediatek: fix compile-test dependencies") fixed the dependency, it should have also introduced an or on COMPILE_TEST to permit this driver to be compile-tested even if NVMEM_MTK_EFUSE wasn't selected. The driver makes use of NVMEM API that are always compiled (return error) so the driver can actually be compiled even without that config.
Fix and simplify the dependency condition of this kernel config.
--- drivers/net/phy/mediatek/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/phy/mediatek/Kconfig +1 -2
@@ -15,8 +15,7 @@ config MEDIATEK_GE_PHY config MEDIATEK_GE_SOC_PHY tristate "MediaTek SoC Ethernet PHYs" - depends on (ARM64 && ARCH_MEDIATEK) || COMPILE_TEST - depends on NVMEM_MTK_EFUSE + depends on (ARM64 && ARCH_MEDIATEK && NVMEM_MTK_EFUSE) || COMPILE_TEST select MTK_NET_PHYLIB help Supports MediaTek SoC built-in Gigabit Ethernet PHYs.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 176/780 wifi: ath12k: fix cleanup path after mhi init
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Raj Kumar Bhagat <[email protected]>
[ Upstream commit 6177c97fb6f05bf0473a2806e3bece7e77693209 ]
Currently, the 'err_pci_msi_free' label is misplaced, causing the cleanup sequence to be incorrect. Fix this by moving the 'err_pci_msi_free' label to the correct position after 'err_irq_affinity_cleanup'.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00209-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/pci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath12k/pci.c +3 -3
@@ -1710,12 +1710,12 @@ static int ath12k_pci_probe(struct pci_dev *pdev, err_mhi_unregister:ath12k_mhi_unregister (ab_pci); -err_pci_msi_free: -ath12k_pci_msi_free (ab_pci); - err_irq_affinity_cleanup:ath12k_pci_set_irq_affinity_hint (ab_pci,NULL ); +err_pci_msi_free: +ath12k_pci_msi_free (ab_pci); + err_pci_free_region:ath12k_pci_free_region (ab_pci);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 177/780 wifi: ath12k: Resolve multicast packet drop by populating key_cipher in ath12k_install_key()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aaradhana Sahu <[email protected]>
[ Upstream commit d61c0b3c63462d17e63e5a2b4815e0f1ad17f57e ]
Currently, the key_cipher in the ath12k_vif structure, which represents the group cipher of the MLD AP, is populated when the link address matches the ieee80211_vif address within ath12k_install_key().
However, in MLD AP, the link address and ieee80211_vif address can differ. Due to this key_cipher is not populated and multicast packets don't get the correct cipher information and resulting multicast packets drop.
To fix this, compare the link address with the arvif->bssid instead of the ieee80211_vif address.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00209-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/mac.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/ath/ath12k/mac.c +1 -2
@@ -4605,7 +4605,6 @@ static int ath12k_install_key(struct ath12k_link_vif *arvif, .macaddr = macaddr, };struct ath12k_vif *ahvif = arvif->ahvif; -struct ieee80211_vif *vif =ath12k_ahvif_to_vif (ahvif);lockdep_assert_wiphy (ath12k_ar_to_hw (ar)->wiphy);
@@ -4658,7 +4657,7 @@ static int ath12k_install_key(struct ath12k_link_vif *arvif,if (!wait_for_completion_timeout (&ar->install_key_done,1 *HZ ))return -ETIMEDOUT ; -if (ether_addr_equal (macaddr, vif->addr)) +if (ether_addr_equal (macaddr, arvif->bssid)) ahvif->key_cipher = key->cipher;return ar->install_key_status ? -EINVAL :0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 178/780 wifi: ath12k: Fix WMI tag for EHT rate in peer assoc
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ramya Gnanasekar <[email protected]>
[ Upstream commit 1a0e65750b55d2cf5de4a9bf7d6d55718784bdb7 ]
Incorrect WMI tag is used for EHT rate update from host to firmware while encoding peer assoc WMI.
Correct the WMI tag used for EHT rate update from WMI_TAG_HE_RATE_SET
to the proper tag. This ensures firmware does not mistakenly update HE rate during parsing.
Found during code review. Compile tested only.
--- drivers/net/wireless/ath/ath12k/wmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath12k/wmi.c +1 -1
@@ -2351,7 +2351,7 @@ int ath12k_wmi_send_peer_assoc_cmd(struct ath12k *ar,for (i =0 ; i < arg->peer_eht_mcs_count; i++) { eht_mcs = ptr; - eht_mcs->tlv_header =ath12k_wmi_tlv_cmd_hdr (WMI_TAG_HE_RATE_SET , + eht_mcs->tlv_header =ath12k_wmi_tlv_cmd_hdr (WMI_TAG_EHT_RATE_SET ,sizeof (*eht_mcs)); eht_mcs->rx_mcs_set =cpu_to_le32 (arg->peer_eht_rx_mcs_set[i]);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 179/780 wifi: ath12k: Fix buffer overflow in debugfs
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 8c7a5031a6b0d42e640fbd2d5d05f61f74e32dce ]
If the user tries to write more than 32 bytes then it results in memory corruption. Fortunately, this is debugfs so it's limited to root users.
--- drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c +3 -0
@@ -5377,6 +5377,9 @@ static ssize_t ath12k_write_htt_stats_type(struct file *file,const int size =32 ;int num_args; +if (count > size) +return -EINVAL ; + char *buf __free(kfree) = kzalloc(size, GFP_KERNEL);if (!buf)return -ENOMEM ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 180/780 wifi: ath12k: fix SLUB BUG - Object already free in ath12k_reg_free()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aditya Kumar Singh <[email protected]>
[ Upstream commit 6d019abc402f58b25a7cab30b2d9af2f3173e4df ]
During rmmod of ath12k module with SLUB debug enabled, following print is seen -
=============================================================================
BUG kmalloc-1k (Not tainted): Object already free
-----------------------------------------------------------------------------
Allocated in ath12k_reg_build_regd+0x94/0xa20 [ath12k] age=10470 cpu=0 pid=0
__kmalloc_noprof+0xf4/0x368 ath12k_reg_build_regd+0x94/0xa20 [ath12k] ath12k_wmi_op_rx+0x199c/0x2c14 [ath12k] ath12k_htc_rx_completion_handler+0x398/0x554 [ath12k] ath12k_ce_per_engine_service+0x248/0x368 [ath12k] ath12k_pci_ce_workqueue+0x28/0x50 [ath12k] process_one_work+0x14c/0x28c bh_worker+0x22c/0x27c workqueue_softirq_action+0x80/0x90 tasklet_action+0x14/0x3c handle_softirqs+0x108/0x240 __do_softirq+0x14/0x20 Freed in ath12k_reg_free+0x40/0x74 [ath12k] age=136 cpu=2 pid=166 kfree+0x148/0x248 ath12k_reg_free+0x40/0x74 [ath12k] ath12k_core_hw_group_destroy+0x68/0xac [ath12k] ath12k_core_deinit+0xd8/0x124 [ath12k] ath12k_pci_remove+0x6c/0x130 [ath12k] pci_device_remove+0x44/0xe8 device_remove+0x4c/0x80 device_release_driver_internal+0x1d0/0x22c driver_detach+0x50/0x98 bus_remove_driver+0x70/0xf4 driver_unregister+0x30/0x60 pci_unregister_driver+0x24/0x9c ath12k_pci_exit+0x18/0x24 [ath12k] __arm64_sys_delete_module+0x1a0/0x2a8 invoke_syscall+0x48/0x110 el0_svc_common.constprop.0+0x40/0xe0
Slab 0xfffffdffc0033600 objects=10 used=6 fp=0xffff000000cdcc00 flags=0x3fffe0000000240(workingset|head|node=0|zone=0|lastcpupid=0x1ffff) Object 0xffff000000cdcc00 @offset=19456 fp=0xffff000000cde400
[...]
This issue arises because in ath12k_core_hw_group_destroy(), each device calls ath12k_core_soc_destroy() for itself and all its partners within the same group. Since ath12k_core_hw_group_destroy() is invoked for each device, this results in a double free condition, eventually causing the SLUB bug.
To resolve this, set the freed pointers to NULL. And since there could be a race condition to read these pointers, guard these with the available mutex lock.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
--- drivers/net/wireless/ath/ath12k/reg.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/ath/ath12k/reg.c +4 -0
@@ -777,8 +777,12 @@ void ath12k_reg_free(struct ath12k_base *ab) {int i; +mutex_lock (&ab->core_lock);for (i =0 ; i < ab->hw_params->max_radios; i++) {kfree (ab->default_regd[i]);kfree (ab->new_regd[i]); + ab->default_regd[i] =NULL ; + ab->new_regd[i] =NULL ; } +mutex_unlock (&ab->core_lock); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 181/780 wifi: ath12k: fix ATH12K_FLAG_REGISTERED flag handling
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aditya Kumar Singh <[email protected]>
[ Upstream commit 6af396942bf132a1a49523e8fe2f816dc1ebd913 ]
Commit a5686ae820fa ("wifi: ath12k: move ATH12K_FLAG_REGISTERED handling to ath12k_mac_register()") relocated the setting of the ATH12K_FLAG_REGISTERED flag to the ath12k_mac_register() function. However, this function only accesses the first device (ab) via ag->ab[0], resulting in the flag being set only for the first device in the group. Similarly, ath12k_mac_unregister() only unsets the flag for the first device. The flag should actually be set for all devices in the group to avoid issues during recovery.
Hence, move setting and clearing of this flag in the function ath12k_core_hw_group_start() and ath12k_core_hw_group_stop() respectively.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
--- drivers/net/wireless/ath/ath12k/core.c | 5 +++++ drivers/net/wireless/ath/ath12k/mac.c | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-)
drivers/net/wireless/ath/ath12k/core.c +5 -0
@@ -891,6 +891,9 @@ static void ath12k_core_hw_group_stop(struct ath12k_hw_group *ag) ab = ag->ab[i];if (!ab)continue ; + +clear_bit (ATH12K_FLAG_REGISTERED , &ab->dev_flags); +ath12k_core_device_cleanup (ab); }
@@ -1026,6 +1029,8 @@ static int ath12k_core_hw_group_start(struct ath12k_hw_group *ag)mutex_lock (&ab->core_lock); +set_bit (ATH12K_FLAG_REGISTERED , &ab->dev_flags); + ret =ath12k_core_pdev_create (ab);if (ret) {ath12k_err (ab,"failed to create pdev core %d\n" , ret);
drivers/net/wireless/ath/ath12k/mac.c +0 -6
@@ -11569,7 +11569,6 @@ void ath12k_mac_mlo_teardown(struct ath12k_hw_group *ag)int ath12k_mac_register (struct ath12k_hw_group *ag) { -struct ath12k_base *ab = ag->ab[0 ];struct ath12k_hw *ah;int i;int ret;
@@ -11582,8 +11581,6 @@ int ath12k_mac_register(struct ath12k_hw_group *ag) goto err; } -set_bit (ATH12K_FLAG_REGISTERED , &ab->dev_flags); -return 0 ; err:
@@ -11600,12 +11597,9 @@ int ath12k_mac_register(struct ath12k_hw_group *ag)void ath12k_mac_unregister (struct ath12k_hw_group *ag) { -struct ath12k_base *ab = ag->ab[0 ];struct ath12k_hw *ah;int i; -clear_bit (ATH12K_FLAG_REGISTERED , &ab->dev_flags); -for (i = ag->num_hw -1 ; i >=0 ; i--) { ah =ath12k_ag_to_ah (ag, i);if (!ah)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 182/780 f2fs: clean up unnecessary indentation
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jaegeuk Kim <[email protected]>
[ Upstream commit 05d3273ad03fa5ea1177b4f3dfeeb6de4899b504 ]
No functional change.
Stable-dep-of: d26fecb03e1f ("f2fs: prevent the current section from being selected as a victim during GC")
--- fs/f2fs/segment.h | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-)
fs/f2fs/segment.h +24 -16
@@ -429,7 +429,6 @@ static inline void __set_free(struct f2fs_sb_info *sbi, unsigned int segno)unsigned int secno =GET_SEC_FROM_SEG (sbi, segno);unsigned int start_segno =GET_SEG_FROM_SEC (sbi, secno);unsigned int next; -unsigned int usable_segs =f2fs_usable_segs_in_sec (sbi);spin_lock (&free_i->segmap_lock);clear_bit (segno, free_i->free_segmap);
@@ -437,7 +436,7 @@ static inline void __set_free(struct f2fs_sb_info *sbi, unsigned int segno) next =find_next_bit (free_i->free_segmap, start_segno +SEGS_PER_SEC (sbi), start_segno); -if (next >= start_segno + usable_segs) { +if (next >= start_segno +f2fs_usable_segs_in_sec (sbi)) {clear_bit (secno, free_i->free_secmap); free_i->free_sections++; }
@@ -463,22 +462,31 @@ static inline void __set_test_and_free(struct f2fs_sb_info *sbi,unsigned int secno =GET_SEC_FROM_SEG (sbi, segno);unsigned int start_segno =GET_SEG_FROM_SEC (sbi, secno);unsigned int next; -unsigned int usable_segs =f2fs_usable_segs_in_sec (sbi); +bool ret;spin_lock (&free_i->segmap_lock); -if (test_and_clear_bit (segno, free_i->free_segmap)) { - free_i->free_segments++; - -if (!inmem &&IS_CURSEC (sbi, secno)) - goto skip_free; - next =find_next_bit (free_i->free_segmap, - start_segno +SEGS_PER_SEC (sbi), start_segno); -if (next >= start_segno + usable_segs) { -if (test_and_clear_bit (secno, free_i->free_secmap)) - free_i->free_sections++; - } - } -skip_free: + ret =test_and_clear_bit (segno, free_i->free_segmap); +if (!ret) + goto unlock_out; + + free_i->free_segments++; + +if (!inmem &&IS_CURSEC (sbi, secno)) + goto unlock_out; + +/* check large section */ + next =find_next_bit (free_i->free_segmap, + start_segno +SEGS_PER_SEC (sbi), start_segno); +if (next < start_segno +f2fs_usable_segs_in_sec (sbi)) + goto unlock_out; + + ret =test_and_clear_bit (secno, free_i->free_secmap); +if (!ret) + goto unlock_out; + + free_i->free_sections++; + +unlock_out:spin_unlock (&free_i->segmap_lock); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 183/780 f2fs: prevent the current section from being selected as a victim during GC
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: yohan.joung <[email protected]>
[ Upstream commit d26fecb03e1f1069480d41fa2a6cea87ebbb89b8 ]
When selecting a victim using next_victim_seg in a large section, the selected section might already have been cleared and designated as the new current section, making it actively in use.
This behavior causes inconsistency between the SIT and SSA.
F2FS-fs (dm-54): Inconsistent segment (70961) type [0, 1] in SSA and SIT
Call trace: dump_backtrace+0xe8/0x10c show_stack+0x18/0x28 dump_stack_lvl+0x50/0x6c dump_stack+0x18/0x28 f2fs_stop_checkpoint+0x1c/0x3c do_garbage_collect+0x41c/0x271c f2fs_gc+0x27c/0x828 gc_thread_func+0x290/0x88c kthread+0x11c/0x164 ret_from_fork+0x10/0x20
issue scenario
segs_per_sec=2
- seg#0 and seg#1 are all dirty
- all valid blocks are removed in seg#1
- gc select this sec and next_victim_seg=seg#0
- migrate seg#0, next_victim_seg=seg#1
- checkpoint -> sec(seg#0, seg#1) becomes free
- allocator assigns sec(seg#0, seg#1) to curseg
- gc tries to migrate seg#1
--- fs/f2fs/segment.h | 5 +++++ 1 file changed, 5 insertions(+)
fs/f2fs/segment.h +5 -0
@@ -486,6 +486,11 @@ static inline void __set_test_and_free(struct f2fs_sb_info *sbi, free_i->free_sections++; +if (GET_SEC_FROM_SEG (sbi, sbi->next_victim_seg[BG_GC ]) == secno) + sbi->next_victim_seg[BG_GC ] =NULL_SEGNO ; +if (GET_SEC_FROM_SEG (sbi, sbi->next_victim_seg[FG_GC ]) == secno) + sbi->next_victim_seg[FG_GC ] =NULL_SEGNO ; + unlock_out:spin_unlock (&free_i->segmap_lock); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 184/780 f2fs: fix to do sanity check on sbi->total_valid_block_count
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit 05872a167c2cab80ef186ef23cc34a6776a1a30c ]
syzbot reported a f2fs bug as below:
------------[ cut here ]------------ kernel BUG at fs/f2fs/f2fs.h:2521! RIP: 0010:dec_valid_block_count+0x3b2/0x3c0 fs/f2fs/f2fs.h:2521 Call Trace: f2fs_truncate_data_blocks_range+0xc8c/0x11a0 fs/f2fs/file.c:695 truncate_dnode+0x417/0x740 fs/f2fs/node.c:973 truncate_nodes+0x3ec/0xf50 fs/f2fs/node.c:1014 f2fs_truncate_inode_blocks+0x8e3/0x1370 fs/f2fs/node.c:1197 f2fs_do_truncate_blocks+0x840/0x12b0 fs/f2fs/file.c:810 f2fs_truncate_blocks+0x10d/0x300 fs/f2fs/file.c:838 f2fs_truncate+0x417/0x720 fs/f2fs/file.c:888 f2fs_setattr+0xc4f/0x12f0 fs/f2fs/file.c:1112 notify_change+0xbca/0xe90 fs/attr.c:552 do_truncate+0x222/0x310 fs/open.c:65 handle_truncate fs/namei.c:3466 [inline] do_open fs/namei.c:3849 [inline] path_openat+0x2e4f/0x35d0 fs/namei.c:4004 do_filp_open+0x284/0x4e0 fs/namei.c:4031 do_sys_openat2+0x12b/0x1d0 fs/open.c:1429 do_sys_open fs/open.c:1444 [inline] __do_sys_creat fs/open.c:1522 [inline] __se_sys_creat fs/open.c:1516 [inline] __x64_sys_creat+0x124/0x170 fs/open.c:1516 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0xf3/0x230 arch/x86/entry/syscall_64.c:94
The reason is: in fuzzed image, sbi->total_valid_block_count is inconsistent w/ mapped blocks indexed by inode, so, we should not trigger panic for such case, instead, let's print log and set fsck flag.
--- fs/f2fs/f2fs.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
fs/f2fs/f2fs.h +8 -2
@@ -2518,8 +2518,14 @@ static inline void dec_valid_block_count(struct f2fs_sb_info *sbi,blkcnt_t sectors = count <<F2FS_LOG_SECTORS_PER_BLOCK ;spin_lock (&sbi->stat_lock); -f2fs_bug_on (sbi, sbi->total_valid_block_count < (block_t ) count); - sbi->total_valid_block_count -= (block_t )count; +if (unlikely (sbi->total_valid_block_count < count)) { +f2fs_warn (sbi,"Inconsistent total_valid_block_count:%u, ino:%lu, count:%u" , + sbi->total_valid_block_count, inode->i_ino, count); + sbi->total_valid_block_count =0 ; +set_sbi_flag (sbi,SBI_NEED_FSCK ); + }else { + sbi->total_valid_block_count -= count; + }if (sbi->reserved_blocks && sbi->current_reserved_blocks < sbi->reserved_blocks) sbi->current_reserved_blocks = min(sbi->reserved_blocks,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 185/780 udp_tunnel: create a fastpath GRO lookup.
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Abeni <[email protected]>
[ Upstream commit a36283e2b683f172aa1760c77325e50b16c0f792 ]
Most UDP tunnels bind a socket to a local port, with ANY address, no peer and no interface index specified.
Additionally it's quite common to have a single tunnel device per namespace.
Track in each namespace the UDP tunnel socket respecting the above. When only a single one is present, store a reference in the netns.
When such reference is not NULL, UDP tunnel GRO lookup just need to match the incoming packet destination port vs the socket local port.
The tunnel socket never sets the reuse[port] flag[s]. When bound to no address and interface, no other socket can exist in the same netns matching the specified local port.
Matching packets with non-local destination addresses will be aggregated, and eventually segmented as needed - no behavior changes intended.
Restrict the optimization to kernel sockets only: it covers all the relevant use-cases, and user-space owned sockets could be disconnected and rebound after setup_udp_tunnel_sock(), breaking the uniqueness assumption
Note that the UDP tunnel socket reference is stored into struct netns_ipv4 for both IPv4 and IPv6 tunnels. That is intentional to keep all the fastpath-related netns fields in the same struct and allow cacheline-based optimization. Currently both the IPv4 and IPv6 socket pointer share the same cacheline as the udp_table field.
Stable-dep-of: c26c192c3d48 ("udp: properly deal with xfrm encap and ADDRFORM")
--- include/linux/udp.h | 16 ++++++++++++++++ include/net/netns/ipv4.h | 11 +++++++++++ include/net/udp.h | 1 + include/net/udp_tunnel.h | 12 ++++++++++++ net/ipv4/udp.c | 13 ++++++++++++- net/ipv4/udp_offload.c | 37 +++++++++++++++++++++++++++++++++++++ net/ipv4/udp_tunnel_core.c | 13 +++++++++++++ net/ipv6/udp.c | 2 ++ net/ipv6/udp_offload.c | 5 +++++ 9 files changed, 109 insertions(+), 1 deletion(-)
include/linux/udp.h +16 -0
@@ -101,6 +101,13 @@ struct udp_sock {/* Cache friendly copy of sk->sk_peek_off >= 0 */ bool peeking_with_offset; + +/* +* Accounting for the tunnel GRO fastpath. +* Unprotected by compilers guard, as it uses space available in +* the last UDP socket cacheline. +*/ +struct hlist_node tunnel_list; };#define udp_test_bit (nr, sk) \
@@ -219,4 +226,13 @@ static inline void udp_allow_gso(struct sock *sk)#define IS_UDPLITE (__sk) (__sk->sk_protocol == IPPROTO_UDPLITE) +static inline struct sock *udp_tunnel_sk (const struct net *net,bool is_ipv6) +{ +#if IS_ENABLED (CONFIG_NET_UDP_TUNNEL ) +return rcu_dereference (net->ipv4.udp_tunnel_gro[is_ipv6].sk); +#else +return NULL ; +#endif +} +#endif /* _LINUX_UDP_H */
include/net/netns/ipv4.h +11 -0
@@ -47,6 +47,11 @@ struct sysctl_fib_multipath_hash_seed { };#endif +struct udp_tunnel_gro { +struct sock __rcu *sk; +struct hlist_head list; +}; +struct netns_ipv4 {/* Cacheline organization can be found documented in * Documentation/networking/net_cachelines/netns_ipv4_sysctl.rst.
@@ -85,6 +90,11 @@ struct netns_ipv4 {struct inet_timewait_death_row tcp_death_row;struct udp_table *udp_table; +#if IS_ENABLED (CONFIG_NET_UDP_TUNNEL ) +/* Not in a pernet subsys because need to be available at GRO stage */ +struct udp_tunnel_gro udp_tunnel_gro[2 ]; +#endif +#ifdef CONFIG_SYSCTL struct ctl_table_header *forw_hdr;struct ctl_table_header *frags_hdr;
@@ -277,4 +287,5 @@ struct netns_ipv4 {struct hlist_head *inet_addr_lst; struct delayed_work addr_chk_work; }; +#endif
include/net/udp.h +1 -0
@@ -290,6 +290,7 @@ static inline void udp_lib_init_sock(struct sock *sk)struct udp_sock *up =udp_sk (sk);skb_queue_head_init (&up->reader_queue); +INIT_HLIST_NODE (&up->tunnel_list); up->forward_threshold = sk->sk_rcvbuf >>2 ;set_bit (SOCK_CUSTOM_SOCKOPT , &sk->sk_socket->flags); }
include/net/udp_tunnel.h +12 -0
@@ -191,6 +191,18 @@ static inline int udp_tunnel_handle_offloads(struct sk_buff *skb, bool udp_csum) }#endif +#if IS_ENABLED (CONFIG_NET_UDP_TUNNEL ) +void udp_tunnel_update_gro_lookup (struct net *net,struct sock *sk,bool add); +#else +static inline void udp_tunnel_update_gro_lookup (struct net *net, +struct sock *sk,bool add) {} +#endif + +static inline void udp_tunnel_cleanup_gro (struct sock *sk) +{ +udp_tunnel_update_gro_lookup (sock_net (sk), sk, false); +} +static inline void udp_tunnel_encap_enable (struct sock *sk) {if (udp_test_and_set_bit (ENCAP_ENABLED , sk))
net/ipv4/udp.c +12 -1
@@ -2897,8 +2897,10 @@ void udp_destroy_sock(struct sock *sk)if (encap_destroy)encap_destroy (sk); } -if (udp_test_bit (ENCAP_ENABLED , sk)) +if (udp_test_bit (ENCAP_ENABLED , sk)) {static_branch_dec (&udp_encap_needed_key); +udp_tunnel_cleanup_gro (sk); + } } }
@@ -3810,6 +3812,15 @@ static void __net_init udp_set_table(struct net *net)static int __net_init udp_pernet_init (struct net *net) { +#if IS_ENABLED (CONFIG_NET_UDP_TUNNEL ) +int i; + +/* No tunnel is configured */ +for (i =0 ; i <ARRAY_SIZE (net->ipv4.udp_tunnel_gro); ++i) { +INIT_HLIST_HEAD (&net->ipv4.udp_tunnel_gro[i].list); +RCU_INIT_POINTER (net->ipv4.udp_tunnel_gro[i].sk,NULL ); + } +#endif udp_sysctl_init (net);udp_set_table (net);
net/ipv4/udp_offload.c +37 -0
@@ -12,6 +12,38 @@#include <net/udp.h> #include <net/protocol.h> #include <net/inet_common.h> +#include <net/udp_tunnel.h> + +#if IS_ENABLED (CONFIG_NET_UDP_TUNNEL ) +static DEFINE_SPINLOCK (udp_tunnel_gro_lock); + +void udp_tunnel_update_gro_lookup (struct net *net,struct sock *sk,bool add) +{ +bool is_ipv6 = sk->sk_family ==AF_INET6 ; +struct udp_sock *tup, *up =udp_sk (sk); +struct udp_tunnel_gro *udp_tunnel_gro; + +spin_lock (&udp_tunnel_gro_lock); + udp_tunnel_gro = &net->ipv4.udp_tunnel_gro[is_ipv6]; +if (add) +hlist_add_head (&up->tunnel_list, &udp_tunnel_gro->list); +else if (up->tunnel_list.pprev) +hlist_del_init (&up->tunnel_list); + +if (udp_tunnel_gro->list.first && + !udp_tunnel_gro->list.first->next) { + tup = hlist_entry(udp_tunnel_gro->list.first, struct udp_sock, + tunnel_list); + +rcu_assign_pointer (udp_tunnel_gro->sk, (struct sock *)tup); + }else { +RCU_INIT_POINTER (udp_tunnel_gro->sk,NULL ); + } + +spin_unlock (&udp_tunnel_gro_lock); +} +EXPORT_SYMBOL_GPL (udp_tunnel_update_gro_lookup); +#endif static struct sk_buff *__skb_udp_tunnel_segment(struct sk_buff *skb, netdev_features_t features,
@@ -694,8 +726,13 @@ static struct sock *udp4_gro_lookup_skb(struct sk_buff *skb, __be16 sport, {const struct iphdr *iph =skb_gro_network_header (skb);struct net *net =dev_net_rcu (skb->dev); +struct sock *sk;int iif, sdif; + sk =udp_tunnel_sk (net, false); +if (sk && dport ==htons (sk->sk_num)) +return sk; +inet_get_iif_sdif (skb, &iif, &sdif); return __udp4_lib_lookup(net, iph->saddr, sport,
net/ipv4/udp_tunnel_core.c +13 -0
@@ -58,6 +58,15 @@ int udp_sock_create4(struct net *net, struct udp_port_cfg *cfg, }EXPORT_SYMBOL (udp_sock_create4); +static bool sk_saddr_any (struct sock *sk) +{ +#if IS_ENABLED (CONFIG_IPV6 ) +return ipv6_addr_any (&sk->sk_v6_rcv_saddr); +#else +return !sk->sk_rcv_saddr; +#endif +} +void setup_udp_tunnel_sock (struct net *net,struct socket *sock,struct udp_tunnel_sock_cfg *cfg) {
@@ -80,6 +89,10 @@ void setup_udp_tunnel_sock(struct net *net, struct socket *sock,udp_sk (sk)->gro_complete = cfg->gro_complete;udp_tunnel_encap_enable (sk); + +if (!sk->sk_dport && !sk->sk_bound_dev_if &&sk_saddr_any (sk) && + sk->sk_kern_sock) +udp_tunnel_update_gro_lookup (net, sk, true); }EXPORT_SYMBOL_GPL (setup_udp_tunnel_sock);
net/ipv6/udp.c +2 -0
@@ -46,6 +46,7 @@#include <net/tcp_states.h> #include <net/ip6_checksum.h> #include <net/ip6_tunnel.h> +#include <net/udp_tunnel.h> #include <net/xfrm.h> #include <net/inet_hashtables.h> #include <net/inet6_hashtables.h>
@@ -1825,6 +1826,7 @@ void udpv6_destroy_sock(struct sock *sk)if (udp_test_bit (ENCAP_ENABLED , sk)) {static_branch_dec (&udpv6_encap_needed_key);udp_encap_disable (); +udp_tunnel_cleanup_gro (sk); } } }
net/ipv6/udp_offload.c +5 -0
@@ -118,8 +118,13 @@ static struct sock *udp6_gro_lookup_skb(struct sk_buff *skb, __be16 sport, {const struct ipv6hdr *iph =skb_gro_network_header (skb);struct net *net =dev_net_rcu (skb->dev); +struct sock *sk;int iif, sdif; + sk =udp_tunnel_sk (net, true); +if (sk && dport ==htons (sk->sk_num)) +return sk; +inet6_get_iif_sdif (skb, &iif, &sdif); return __udp6_lib_lookup(net, &iph->saddr, sport,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 186/780 udp_tunnel: use static call for GRO hooks when possible
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Abeni <[email protected]>
[ Upstream commit 5d7f5b2f6b935517ee5fd8058dc32342a5cba3e1 ]
It's quite common to have a single UDP tunnel type active in the whole system. In such a case we can replace the indirect call for the UDP tunnel GRO callback with a static call.
Add the related accounting in the control path and switch to static call when possible. To keep the code simple use a static array for the registered tunnel types, and size such array based on the kernel config.
Note that there are valid kernel configurations leading to UDP_MAX_TUNNEL_TYPES == 0 even with IS_ENABLED(CONFIG_NET_UDP_TUNNEL), Explicitly skip the accounting in such a case, to avoid compile warning when accessing "udp_tunnel_gro_types".
Stable-dep-of: c26c192c3d48 ("udp: properly deal with xfrm encap and ADDRFORM")
--- include/net/udp_tunnel.h | 4 ++ net/ipv4/udp_offload.c | 135 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 138 insertions(+), 1 deletion(-)
include/net/udp_tunnel.h +4 -0
@@ -193,13 +193,16 @@ static inline int udp_tunnel_handle_offloads(struct sk_buff *skb, bool udp_csum)#if IS_ENABLED (CONFIG_NET_UDP_TUNNEL )void udp_tunnel_update_gro_lookup (struct net *net,struct sock *sk,bool add); +void udp_tunnel_update_gro_rcv (struct sock *sk,bool add);#else static inline void udp_tunnel_update_gro_lookup (struct net *net,struct sock *sk,bool add) {} +static inline void udp_tunnel_update_gro_rcv (struct sock *sk,bool add) {}#endif static inline void udp_tunnel_cleanup_gro (struct sock *sk) { +udp_tunnel_update_gro_rcv (sk, false);udp_tunnel_update_gro_lookup (sock_net (sk), sk, false); }
@@ -212,6 +215,7 @@ static inline void udp_tunnel_encap_enable(struct sock *sk)if (READ_ONCE (sk->sk_family) ==PF_INET6 ) ipv6_stub->udpv6_encap_enable ();#endif +udp_tunnel_update_gro_rcv (sk, true);udp_encap_enable (); }
net/ipv4/udp_offload.c +134 -1
158 lines not on this page · raw message
Signature · 1 line
2.39.5
Re: [PATCH 6.15 186/780] udp_tunnel: use static call for GRO hooks when possible
Quoted 22 lines · Greg Kroah-Hartman
6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Abeni <[email protected]>
[ Upstream commit
5d7f5b2f6b935517ee5fd8058dc32342a5cba3e1]It's quite common to have a single UDP tunnel type active in the whole system. In such a case we can replace the indirect call for the UDP tunnel GRO callback with a static call.
Add the related accounting in the control path and switch to static call when possible. To keep the code simple use a static array for the registered tunnel types, and size such array based on the kernel config.
Note that there are valid kernel configurations leading to
UDP_MAX_TUNNEL_TYPES== 0 even withIS_ENABLED(CONFIG_NET_UDP_TUNNEL), Explicitly skip the accounting in such a case, to avoid compile warning when accessing "udp_tunnel_gro_types".
Quoted 6 lines
Signed-off-by Paolo Abeni <[email protected]>Reviewed-by Willem de Bruijn <[email protected]>Link https://patch.msgid.link/53d156cdfddcc9678449e873cc83e68fa1582653.1744040675.git.pabeni@redhat.com open hereSigned-off-by Jakub Kicinski <[email protected]>Stable-dep-of:
c26c192c3d48("udp: properly deal with xfrm encap and ADDRFORM")Signed-off-by Sasha Levin <[email protected]>
This, the previous patch (185/780 - udp_tunnel: create a fastpath GRO lookup.) and the next one (187/780 - udp: properly deal with xfrm encap and ADDRFORM) are not intended for stable trees.
185 && 186 are about performance improvement, and 187 fixes a bug introduced by them, and is irrelevant otherwise.
Thanks,
Paolo
Greg Kroah-Hartman
maintainerRe: [PATCH 6.15 186/780] udp_tunnel: use static call for GRO hooks when possible
Quoted 30 lines · Paolo Abeni
Quoted 22 lines · Greg Kroah-Hartman
6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Abeni <[email protected]>
[ Upstream commit
5d7f5b2f6b935517ee5fd8058dc32342a5cba3e1]It's quite common to have a single UDP tunnel type active in the whole system. In such a case we can replace the indirect call for the UDP tunnel GRO callback with a static call.
Add the related accounting in the control path and switch to static call when possible. To keep the code simple use a static array for the registered tunnel types, and size such array based on the kernel config.
Note that there are valid kernel configurations leading to
UDP_MAX_TUNNEL_TYPES== 0 even withIS_ENABLED(CONFIG_NET_UDP_TUNNEL), Explicitly skip the accounting in such a case, to avoid compile warning when accessing "udp_tunnel_gro_types".Quoted 6 lines
Signed-off-by Paolo Abeni <[email protected]>Reviewed-by Willem de Bruijn <[email protected]>Link https://patch.msgid.link/53d156cdfddcc9678449e873cc83e68fa1582653.1744040675.git.pabeni@redhat.com open hereSigned-off-by Jakub Kicinski <[email protected]>Stable-dep-of:
c26c192c3d48("udp: properly deal with xfrm encap and ADDRFORM")Signed-off-by Sasha Levin <[email protected]>
Quoted 6 lines
This, the previous patch (185/780 -
udp_tunnel: create a fastpath GRO lookup.) and the next one (187/780 - udp: properly deal with xfrm encap and ADDRFORM) are not intended for stable trees.185 && 186 are about performance improvement, and 187 fixes a bug introduced by them, and is irrelevant otherwise.
Thanks for letting me know, all now dropped.
greg k-h
Greg Kroah-Hartman
maintainerPATCH 187/780 udp: properly deal with xfrm encap and ADDRFORM
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Abeni <[email protected]>
[ Upstream commit c26c192c3d486a2a7d83d254bae294c2f8f50abf ]
UDP GRO accounting assumes that the GRO receive callback is always set when the UDP tunnel is enabled, but syzkaller proved otherwise, leading tot the following splat:
WARNING: CPU: 0 PID: 5837 at net/ipv4/udp_offload.c:123 udp_tunnel_update_gro_rcv+0x28d/0x4c0 net/ipv4/udp_offload.c:123
Modules linked in:
CPU: 0 UID: 0 PID: 5837 Comm: syz-executor850 Not tainted 6.14.0-syzkaller-13320-g420aabef3ab5 #0 PREEMPT(full)
Hardware name: Google Compute Engine/Google Compute Engine, BIOS Google 02/12/2025
RIP: 0010:udp_tunnel_update_gro_rcv+0x28d/0x4c0 net/ipv4/udp_offload.c:123
Code: 00 00 e8 c6 5a 2f f7 48 c1 e5 04 48 8d b5 20 53 c7 9a ba 10
00 00 00 4c 89 ff e8 ce 87 99 f7 e9 ce 00 00 00 e8 a4 5a 2f
f7 90 <0f> 0b 90 e9 de fd ff ff bf 01 00 00 00 89 ee e8 cf
5e 2f f7 85 ed
RSP: 0018:ffffc90003effa88 EFLAGS: 00010293
RAX: ffffffff8a93fc9c RBX: 0000000000000000 RCX: ffff8880306f9e00
RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000000
RBP: 0000000000000000 R08: ffffffff8a93fabe R09: 1ffffffff20bfb2e
R10: dffffc0000000000 R11: fffffbfff20bfb2f R12: ffff88814ef21738
R13: dffffc0000000000 R14: ffff88814ef21778 R15: 1ffff11029de42ef
FS: 0000000000000000(0000) GS:ffff888124f96000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007f04eec760d0 CR3: 000000000eb38000 CR4: 00000000003526f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Call Trace:
<TASK>
udp_tunnel_cleanup_gro include/net/udp_tunnel.h:205 [inline]
udpv6_destroy_sock+0x212/0x270 net/ipv6/udp.c:1829
sk_common_release+0x71/0x2e0 net/core/sock.c:3896
inet_release+0x17d/0x200 net/ipv4/af_inet.c:435
__sock_release net/socket.c:647 [inline]
sock_close+0xbc/0x240 net/socket.c:1391
__fput+0x3e9/0x9f0 fs/file_table.c:465
task_work_run+0x251/0x310 kernel/task_work.c:227
exit_task_work include/linux/task_work.h:40 [inline]
do_exit+0xa11/0x27f0 kernel/exit.c:953
do_group_exit+0x207/0x2c0 kernel/exit.c:1102
__do_sys_exit_group kernel/exit.c:1113 [inline]
__se_sys_exit_group kernel/exit.c:1111 [inline]
__x64_sys_exit_group+0x3f/0x40 kernel/exit.c:1111
x64_sys_call+0x26c3/0x26d0 arch/x86/include/generated/asm/syscalls_64.h:232
do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline]
do_syscall_64+0xf3/0x230 arch/x86/entry/syscall_64.c:94
entry_SYSCALL_64_after_hwframe+0x77/0x7f
RIP: 0033:0x7f04eebfac79
Code: Unable to access opcode bytes at 0x7f04eebfac4f.
RSP: 002b:00007fffdcaa34a8 EFLAGS: 00000246 ORIG_RAX: 00000000000000e7
RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f04eebfac79
RDX: 000000000000003c RSI: 00000000000000e7 RDI: 0000000000000000
RBP: 00007f04eec75270 R08: ffffffffffffffb8 R09: 00007fffdcaa36c8
R10: 0000200000000000 R11: 0000000000000246 R12: 00007f04eec75270
R13: 0000000000000000 R14: 00007f04eec75cc0 R15: 00007f04eebcca70Address the issue moving the accounting hook into setup_udp_tunnel_sock() and set_xfrm_gro_udp_encap_rcv(), where the GRO callback is actually set.
set_xfrm_gro_udp_encap_rcv() is prone to races with IPV6_ADDRFORM, run the relevant setsockopt under the socket lock to ensure using consistent values of sk_family and up->encap_type.
Refactor the GRO callback selection code, to make it clear that the function pointer is always initialized.
--- include/net/udp_tunnel.h | 1 - net/ipv4/udp.c | 31 ++++++++++++++++++++++++++----- net/ipv4/udp_tunnel_core.c | 2 ++ 3 files changed, 28 insertions(+), 6 deletions(-)
include/net/udp_tunnel.h +0 -1
@@ -215,7 +215,6 @@ static inline void udp_tunnel_encap_enable(struct sock *sk)if (READ_ONCE (sk->sk_family) ==PF_INET6 ) ipv6_stub->udpv6_encap_enable ();#endif -udp_tunnel_update_gro_rcv (sk, true);udp_encap_enable (); }
net/ipv4/udp.c +26 -5
@@ -2904,15 +2904,33 @@ void udp_destroy_sock(struct sock *sk) } } +typedef struct sk_buff *(*udp_gro_receive_t )(struct sock *sk, +struct list_head *head, +struct sk_buff *skb); +static void set_xfrm_gro_udp_encap_rcv (__u16 encap_type,unsigned short family,struct sock *sk) {#ifdef CONFIG_XFRM +udp_gro_receive_t new_gro_receive; +if (udp_test_bit (GRO_ENABLED , sk) && encap_type ==UDP_ENCAP_ESPINUDP ) { -if (family ==AF_INET ) -WRITE_ONCE (udp_sk (sk)->gro_receive, xfrm4_gro_udp_encap_rcv); -else if (IS_ENABLED (CONFIG_IPV6 ) && family ==AF_INET6 ) -WRITE_ONCE (udp_sk (sk)->gro_receive, ipv6_stub->xfrm6_gro_udp_encap_rcv); +if (IS_ENABLED (CONFIG_IPV6 ) && family ==AF_INET6 ) + new_gro_receive = ipv6_stub->xfrm6_gro_udp_encap_rcv; +else + new_gro_receive = xfrm4_gro_udp_encap_rcv; + +if (udp_sk (sk)->gro_receive != new_gro_receive) { +/* +* With IPV6_ADDRFORM the gro callback could change +* after being set, unregister the old one, if valid. +*/ +if (udp_sk (sk)->gro_receive) +udp_tunnel_update_gro_rcv (sk, false); + +WRITE_ONCE (udp_sk (sk)->gro_receive, new_gro_receive); +udp_tunnel_update_gro_rcv (sk, true); + } }#endif }
@@ -2962,6 +2980,7 @@ int udp_lib_setsockopt(struct sock *sk, int level, int optname,break ;case UDP_ENCAP : +sockopt_lock_sock (sk);switch (val) {case 0 :#ifdef CONFIG_XFRM
@@ -2985,6 +3004,7 @@ int udp_lib_setsockopt(struct sock *sk, int level, int optname, err = -ENOPROTOOPT ;break ; } +sockopt_release_sock (sk);break ;case UDP_NO_CHECK6_TX :
@@ -3002,13 +3022,14 @@ int udp_lib_setsockopt(struct sock *sk, int level, int optname,break ;case UDP_GRO : - +sockopt_lock_sock (sk);/* when enabling GRO, accept the related GSO packet type */ if (valbool)udp_tunnel_encap_enable (sk);udp_assign_bit (GRO_ENABLED , sk, valbool);udp_assign_bit (ACCEPT_L4 , sk, valbool);set_xfrm_gro_udp_encap_rcv (up->encap_type, sk->sk_family, sk); +sockopt_release_sock (sk);break ;/*
net/ipv4/udp_tunnel_core.c +2 -0
@@ -90,6 +90,8 @@ void setup_udp_tunnel_sock(struct net *net, struct socket *sock,udp_tunnel_encap_enable (sk); +udp_tunnel_update_gro_rcv (sk, true); +if (!sk->sk_dport && !sk->sk_bound_dev_if &&sk_saddr_any (sk) && sk->sk_kern_sock)udp_tunnel_update_gro_lookup (net, sk, true);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 188/780 page_pool: Move pp_magic check into helper functions
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Toke Høiland-Jørgensen <[email protected]>
[ Upstream commit cd3c93167da0e760b5819246eae7a4ea30fd014b ]
Since we are about to stash some more information into the pp_magic field, let's move the magic signature checks into a pair of helper functions so it can be changed in one place.
Stable-dep-of: ee62ce7a1d90 ("page_pool: Track DMA-mapped pages and unmap them when destroying the pool")
--- .../net/ethernet/mellanox/mlx5/core/en/xdp.c | 4 ++-- include/linux/mm.h | 20 +++++++++++++++++++ mm/page_alloc.c | 8 ++------ net/core/netmem_priv.h | 5 +++++ net/core/skbuff.c | 16 ++------------- net/core/xdp.c | 4 ++-- 6 files changed, 33 insertions(+), 24 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c +2 -2
@@ -707,8 +707,8 @@ static void mlx5e_free_xdpsq_desc(struct mlx5e_xdpsq *sq, xdpi =mlx5e_xdpi_fifo_pop (xdpi_fifo); page = xdpi.page.page; -/* No need to check ((page->pp_magic & ~0x3UL) == PP_SIGNATURE) -* as we know this is a page_pool page. +/* No need to check page_pool_page_is_pp() as we +* know this is a page_pool page. */ page_pool_recycle_direct (page->pp, page); }while (++n < num);
include/linux/mm.h +20 -0
@@ -4265,4 +4265,24 @@ int arch_lock_shadow_stack_status(struct task_struct *t, unsigned long status);#define VM_SEALED_SYSMAP VM_NONE#endif +/* Mask used for checking in page_pool_page_is_pp() below. page->pp_magic is +* OR'ed with PP_SIGNATURE after the allocation in order to preserve bit 0 for +* the head page of compound page and bit 1 for pfmemalloc page. +* page_is_pfmemalloc() is checked in __page_pool_put_page() to avoid recycling +* the pfmemalloc page. +*/ +#define PP_MAGIC_MASK ~0x3UL + +#ifdef CONFIG_PAGE_POOL +static inline bool page_pool_page_is_pp (struct page *page) +{ +return (page->pp_magic &PP_MAGIC_MASK ) ==PP_SIGNATURE ; +} +#else +static inline bool page_pool_page_is_pp (struct page *page) +{ +return false; +} +#endif +#endif /* _LINUX_MM_H */
mm/page_alloc.c +2 -6
@@ -898,9 +898,7 @@ static inline bool page_expected_state(struct page *page,#ifdef CONFIG_MEMCG page->memcg_data | #endif -#ifdef CONFIG_PAGE_POOL - ((page->pp_magic & ~0x3UL) == PP_SIGNATURE) | -#endif +page_pool_page_is_pp (page) | (page->flags & check_flags))) return false;
@@ -927,10 +925,8 @@ static const char *page_bad_reason(struct page *page, unsigned long flags)if (unlikely (page->memcg_data)) bad_reason ="page still charged to cgroup" ;#endif -#ifdef CONFIG_PAGE_POOL -if (unlikely ((page->pp_magic & ~0x3UL ) ==PP_SIGNATURE )) +if (unlikely (page_pool_page_is_pp (page))) bad_reason ="page_pool leak" ; -#endif return bad_reason; }
net/core/netmem_priv.h +5 -0
@@ -18,6 +18,11 @@ static inline void netmem_clear_pp_magic(netmem_ref netmem)__netmem_clear_lsb (netmem)->pp_magic =0 ; } +static inline bool netmem_is_pp (netmem_ref netmem) +{ +return (netmem_get_pp_magic (netmem) &PP_MAGIC_MASK ) ==PP_SIGNATURE ; +} +static inline void netmem_set_pp (netmem_ref netmem,struct page_pool *pool) {__netmem_clear_lsb (netmem)->pp = pool;
net/core/skbuff.c +2 -14
@@ -893,11 +893,6 @@ static void skb_clone_fraglist(struct sk_buff *skb)skb_get (list); } -static bool is_pp_netmem (netmem_ref netmem) -{ -return (netmem_get_pp_magic (netmem) & ~0x3UL ) ==PP_SIGNATURE ; -} -int skb_pp_cow_data (struct page_pool *pool,struct sk_buff **pskb,unsigned int headroom) {
@@ -995,14 +990,7 @@ bool napi_pp_put_page(netmem_ref netmem) { netmem =netmem_compound_head (netmem); -/* page->pp_magic is OR'ed with PP_SIGNATURE after the allocation -* in order to preserve any existing bits, such as bit 0 for the -* head page of compound page and bit 1 for pfmemalloc page, so -* mask those bits for freeing side when doing below checking, -* and page_is_pfmemalloc() is checked in __page_pool_put_page() -* to avoid recycling the pfmemalloc page. -*/ -if (unlikely (!is_pp_netmem (netmem))) +if (unlikely (!netmem_is_pp (netmem)))return false;page_pool_put_full_netmem (netmem_get_pp (netmem), netmem, false);
@@ -1042,7 +1030,7 @@ static int skb_pp_frag_ref(struct sk_buff *skb)for (i =0 ; i < shinfo->nr_frags; i++) { head_netmem =netmem_compound_head (shinfo->frags[i].netmem); -if (likely (is_pp_netmem (head_netmem))) +if (likely (netmem_is_pp (head_netmem)))page_pool_ref_netmem (head_netmem);else page_ref_inc (netmem_to_page (head_netmem));
net/core/xdp.c +2 -2
@@ -437,8 +437,8 @@ void __xdp_return(netmem_ref netmem, enum xdp_mem_type mem_type, netmem =netmem_compound_head (netmem);if (napi_direct &&xdp_return_frame_no_direct ()) napi_direct = false; -/* No need to check ((page->pp_magic & ~0x3UL) == PP_SIGNATURE) -* as mem->type knows this a page_pool page +/* No need to check netmem_is_pp() as mem->type knows this a +* page_pool page */ page_pool_put_full_netmem (netmem_get_pp (netmem), netmem, napi_direct);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 189/780 page_pool: Track DMA-mapped pages and unmap them when destroying the pool
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Toke Høiland-Jørgensen <[email protected]>
[ Upstream commit ee62ce7a1d909ccba0399680a03c2dee83bcae95 ]
When enabling DMA mapping in page_pool, pages are kept DMA mapped until they are released from the pool, to avoid the overhead of re-mapping the pages every time they are used. This causes resource leaks and/or crashes when there are pages still outstanding while the device is torn down, because page_pool will attempt an unmap through a non-existent DMA device on the subsequent page return.
To fix this, implement a simple tracking of outstanding DMA-mapped pages in page pool using an xarray. This was first suggested by Mina[0], and turns out to be fairly straight forward: We simply store pointers to pages directly in the xarray with xa_alloc() when they are first DMA mapped, and remove them from the array on unmap. Then, when a page pool is torn down, it can simply walk the xarray and unmap all pages still present there before returning, which also allows us to get rid of the get/put_device() calls in page_pool. Using xa_cmpxchg(), no additional synchronisation is needed, as a page will only ever be unmapped once.
To avoid having to walk the entire xarray on unmap to find the page reference, we stash the ID assigned by xa_alloc() into the page structure itself, using the upper bits of the pp_magic field. This requires a couple of defines to avoid conflicting with the POINTER_POISON_DELTA define, but this is all evaluated at compile-time, so does not affect run-time performance. The bitmap calculations in this patch gives the following number of bits for different architectures:
- 23 bits on 32-bit architectures
- 21 bits on PPC64 (because of the definition of ILLEGAL_POINTER_VALUE)
- 32 bits on other 64-bit architectures
Stashing a value into the unused bits of pp_magic does have the effect that it can make the value stored there lie outside the unmappable range (as governed by the mmap_min_addr sysctl), for architectures that don't define ILLEGAL_POINTER_VALUE. This means that if one of the pointers that is aliased to the pp_magic field (such as page->lru.next) is dereferenced while the page is owned by page_pool, that could lead to a dereference into userspace, which is a security concern. The risk of this is mitigated by the fact that (a) we always clear pp_magic before releasing a page from page_pool, and (b) this would need a use-after-free bug for struct page, which can have many other risks since page->lru.next is used as a generic list pointer in multiple places in the kernel. As such, with this patch we take the position that this risk is negligible in practice. For more discussion, see[1].
Since all the tracking added in this patch is performed on DMA map/unmap, no additional code is needed in the fast path, meaning the performance overhead of this tracking is negligible there. A micro-benchmark shows that the total overhead of the tracking itself is about 400 ns (39 cycles(tsc) 395.218 ns; sum for both map and unmap[2]). Since this cost is only paid on DMA map and unmap, it seems like an acceptable cost to fix the late unmap issue. Further optimisation can narrow the cases where this cost is paid (for instance by eliding the tracking when DMA map/unmap is a no-op).
The extra memory needed to track the pages is neatly encapsulated inside xarray, which uses the 'struct xa_node' structure to track items. This structure is 576 bytes long, with slots for 64 items, meaning that a full node occurs only 9 bytes of overhead per slot it tracks (in practice, it probably won't be this efficient, but in any case it should be an acceptable overhead).
[0] https://lore.kernel.org/all/CAHS8izPg7B5DwKfSuzz-iOop_YRbk3Sd6Y4rX7KBG9DcVJcyWg@mail.gmail.com/
[1] https://lore.kernel.org/r/[email protected]
[2] https://lore.kernel.org/r/[email protected]
--- include/linux/mm.h | 46 ++++++++++++++++++-- include/linux/poison.h | 4 ++ include/net/page_pool/types.h | 6 +++ net/core/netmem_priv.h | 28 +++++++++++- net/core/page_pool.c | 81 +++++++++++++++++++++++++++++------ 5 files changed, 147 insertions(+), 18 deletions(-)
include/linux/mm.h +42 -4
@@ -4265,13 +4265,51 @@ int arch_lock_shadow_stack_status(struct task_struct *t, unsigned long status);#define VM_SEALED_SYSMAP VM_NONE#endif +/* +* DMA mapping IDs for page_pool +* +* When DMA-mapping a page, page_pool allocates an ID (from an xarray) and +* stashes it in the upper bits of page->pp_magic. We always want to be able to +* unambiguously identify page pool pages (using page_pool_page_is_pp()). Non-PP +* pages can have arbitrary kernel pointers stored in the same field as pp_magic +* (since it overlaps with page->lru.next), so we must ensure that we cannot +* mistake a valid kernel pointer with any of the values we write into this +* field. +* +* On architectures that set POISON_POINTER_DELTA, this is already ensured, +* since this value becomes part of PP_SIGNATURE; meaning we can just use the +* space between the PP_SIGNATURE value (without POISON_POINTER_DELTA), and the +* lowest bits of POISON_POINTER_DELTA. On arches where POISON_POINTER_DELTA is +* 0, we make sure that we leave the two topmost bits empty, as that guarantees +* we won't mistake a valid kernel pointer for a value we set, regardless of the +* VMSPLIT setting. +* +* Altogether, this means that the number of bits available is constrained by +* the size of an unsigned long (at the upper end, subtracting two bits per the +* above), and the definition of PP_SIGNATURE (with or without +* POISON_POINTER_DELTA). +*/ +#define PP_DMA_INDEX_SHIFT (1 + __fls(PP_SIGNATURE - POISON_POINTER_DELTA)) +#if POISON_POINTER_DELTA >0 +/* PP_SIGNATURE includes POISON_POINTER_DELTA, so limit the size of the DMA +* index to not overlap with that if set +*/ +#define PP_DMA_INDEX_BITS MIN(32, __ffs(POISON_POINTER_DELTA) - PP_DMA_INDEX_SHIFT) +#else +/* Always leave out the topmost two; see above. */ +#define PP_DMA_INDEX_BITS MIN(32, BITS_PER_LONG - PP_DMA_INDEX_SHIFT - 2) +#endif + +#define PP_DMA_INDEX_MASK GENMASK(PP_DMA_INDEX_BITS + PP_DMA_INDEX_SHIFT - 1, \ + PP_DMA_INDEX_SHIFT) +/* Mask used for checking in page_pool_page_is_pp() below. page->pp_magic is * OR'ed with PP_SIGNATURE after the allocation in order to preserve bit 0 for -* the head page of compound page and bit 1 for pfmemalloc page. -* page_is_pfmemalloc() is checked in __page_pool_put_page() to avoid recycling -* the pfmemalloc page. +* the head page of compound page and bit 1 for pfmemalloc page, as well as the +* bits used for the DMA index. page_is_pfmemalloc() is checked in +* __page_pool_put_page() to avoid recycling the pfmemalloc page. */ -#define PP_MAGIC_MASK ~0x3UL +#define PP_MAGIC_MASK ~(PP_DMA_INDEX_MASK | 0x3UL)#ifdef CONFIG_PAGE_POOL static inline bool page_pool_page_is_pp (struct page *page)
include/linux/poison.h +4 -0
@@ -70,6 +70,10 @@#define KEY_DESTROY 0xbd/********** net/core/page_pool.c **********/ +/* +* page_pool uses additional free bits within this value to store data, see the +* definition of PP_DMA_INDEX_MASK in mm.h +*/ #define PP_SIGNATURE (0x40 + POISON_POINTER_DELTA)/********** net/core/skbuff.c **********/
include/net/page_pool/types.h +6 -0
@@ -6,6 +6,7 @@#include <linux/dma-direction.h> #include <linux/ptr_ring.h> #include <linux/types.h> +#include <linux/xarray.h> #include <net/netmem.h> #define PP_FLAG_DMA_MAP BIT(0)/* Should page_pool do the DMA
@@ -33,6 +34,9 @@#define PP_FLAG_ALL (PP_FLAG_DMA_MAP | PP_FLAG_DMA_SYNC_DEV | \ PP_FLAG_SYSTEM_POOL | PP_FLAG_ALLOW_UNREADABLE_NETMEM) +/* Index limit to stay within PP_DMA_INDEX_BITS for DMA indices */ +#define PP_DMA_INDEX_LIMIT XA_LIMIT(1, BIT(PP_DMA_INDEX_BITS) - 1) +/* * Fast allocation side cache array/stack *
@@ -221,6 +225,8 @@ struct page_pool {void *mp_priv;const struct memory_provider_ops *mp_ops; +struct xarray dma_mapped; +#ifdef CONFIG_PAGE_POOL_STATS /* recycle stats are per-cpu to avoid locking */ struct page_pool_recycle_stats __percpu *recycle_stats;
net/core/netmem_priv.h +27 -1
@@ -5,7 +5,7 @@static inline unsigned long netmem_get_pp_magic (netmem_ref netmem) { -return __netmem_clear_lsb (netmem)->pp_magic; +return __netmem_clear_lsb (netmem)->pp_magic & ~PP_DMA_INDEX_MASK ; }static inline void netmem_or_pp_magic (netmem_ref netmem,unsigned long pp_magic)
@@ -15,6 +15,8 @@ static inline void netmem_or_pp_magic(netmem_ref netmem, unsigned long pp_magic)static inline void netmem_clear_pp_magic (netmem_ref netmem) { +WARN_ON_ONCE (__netmem_clear_lsb (netmem)->pp_magic &PP_DMA_INDEX_MASK ); +__netmem_clear_lsb (netmem)->pp_magic =0 ; }
@@ -33,4 +35,28 @@ static inline void netmem_set_dma_addr(netmem_ref netmem, {__netmem_clear_lsb (netmem)->dma_addr = dma_addr; } + +static inline unsigned long netmem_get_dma_index (netmem_ref netmem) +{ +unsigned long magic; + +if (WARN_ON_ONCE (netmem_is_net_iov (netmem))) +return 0 ; + + magic =__netmem_clear_lsb (netmem)->pp_magic; + +return (magic &PP_DMA_INDEX_MASK ) >>PP_DMA_INDEX_SHIFT ; +} + +static inline void netmem_set_dma_index (netmem_ref netmem, +unsigned long id) +{ +unsigned long magic; + +if (WARN_ON_ONCE (netmem_is_net_iov (netmem))) +return ; + + magic =netmem_get_pp_magic (netmem) | (id <<PP_DMA_INDEX_SHIFT ); +__netmem_clear_lsb (netmem)->pp_magic = magic; +}#endif
net/core/page_pool.c +68 -13
153 lines not on this page · raw message
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 190/780 net/mlx5: HWS, Fix matcher action template attach
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vlad Dogaru <[email protected]>
[ Upstream commit 36ef2575e78d1a3c699dc3f1c9dee9be742c9bdd ]
The procedure of attaching an action template to an existing matcher had a few issues:
1. Attaching accidentally overran the at array in bwc_matcher, which would result in memory corruption. This bug wasn't triggered, but it is possible to trigger it by attaching action templates beyond the initial buffer size of 8. Fix this by converting to a dynamically sized buffer and reallocating if needed.
2. Similarly, the at array inside the native matcher was never reallocated. Fix this the same as above.
3. The bwc layer treated any error in action template attach as a signal that the matcher should be rehashed to account for a larger number of action STEs. In reality, there are other unrelated errors that can arise and they should be propagated upstack. Fix this by adding a need_rehash output parameter that's orthogonal to error codes.
--- .../mellanox/mlx5/core/steering/hws/bwc.c | 55 ++++++++++++++++--- .../mellanox/mlx5/core/steering/hws/bwc.h | 9 ++- .../mellanox/mlx5/core/steering/hws/matcher.c | 48 +++++++++++++--- .../mellanox/mlx5/core/steering/hws/matcher.h | 4 ++ .../mellanox/mlx5/core/steering/hws/mlx5hws.h | 5 +- 5 files changed, 97 insertions(+), 24 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/steering/hws/bwc.c +46 -9
@@ -90,13 +90,19 @@ int mlx5hws_bwc_matcher_create_simple(struct mlx5hws_bwc_matcher *bwc_matcher, bwc_matcher->priority = priority; bwc_matcher->size_log =MLX5HWS_BWC_MATCHER_INIT_SIZE_LOG ; + bwc_matcher->size_of_at_array =MLX5HWS_BWC_MATCHER_ATTACH_AT_NUM ; + bwc_matcher->at =kcalloc (bwc_matcher->size_of_at_array, +sizeof (*bwc_matcher->at),GFP_KERNEL ); +if (!bwc_matcher->at) + goto free_bwc_matcher_rules; +/* create dummy action template */ bwc_matcher->at[0 ] =mlx5hws_action_template_create (action_types ? action_types : init_action_types);if (!bwc_matcher->at[0 ]) {mlx5hws_err (table->ctx,"BWC matcher: failed creating action template\n" ); - goto free_bwc_matcher_rules; + goto free_bwc_matcher_at_array; } bwc_matcher->num_of_at =1 ;
@@ -126,6 +132,8 @@ int mlx5hws_bwc_matcher_create_simple(struct mlx5hws_bwc_matcher *bwc_matcher,mlx5hws_match_template_destroy (bwc_matcher->mt); free_at:mlx5hws_action_template_destroy (bwc_matcher->at[0 ]); +free_bwc_matcher_at_array: +kfree (bwc_matcher->at); free_bwc_matcher_rules:kfree (bwc_matcher->rules); err:
@@ -192,6 +200,7 @@ int mlx5hws_bwc_matcher_destroy_simple(struct mlx5hws_bwc_matcher *bwc_matcher)for (i =0 ; i < bwc_matcher->num_of_at; i++)mlx5hws_action_template_destroy (bwc_matcher->at[i]); +kfree (bwc_matcher->at);mlx5hws_match_template_destroy (bwc_matcher->mt);kfree (bwc_matcher->rules);
@@ -520,6 +529,23 @@ hws_bwc_matcher_extend_at(struct mlx5hws_bwc_matcher *bwc_matcher, struct mlx5hws_rule_action rule_actions[]) {enum mlx5hws_action_type action_types[MLX5HWS_BWC_MAX_ACTS ]; +void *p; + +if (unlikely (bwc_matcher->num_of_at >= bwc_matcher->size_of_at_array)) { +if (bwc_matcher->size_of_at_array >=MLX5HWS_MATCHER_MAX_AT ) +return -ENOMEM ; + bwc_matcher->size_of_at_array *=2 ; + p =krealloc (bwc_matcher->at, + bwc_matcher->size_of_at_array * +sizeof (*bwc_matcher->at), + __GFP_ZERO |GFP_KERNEL ); +if (!p) { + bwc_matcher->size_of_at_array /=2 ; +return -ENOMEM ; + } + + bwc_matcher->at = p; + }hws_bwc_rule_actions_to_action_types (rule_actions, action_types);
@@ -777,6 +803,7 @@ int mlx5hws_bwc_rule_create_simple(struct mlx5hws_bwc_rule *bwc_rule,struct mlx5hws_rule_attr rule_attr;struct mutex *queue_lock;/* Protect the queue */ u32 num_of_rules; +bool need_rehash;int ret =0 ;int at_idx;
@@ -803,10 +830,14 @@ int mlx5hws_bwc_rule_create_simple(struct mlx5hws_bwc_rule *bwc_rule, at_idx = bwc_matcher->num_of_at -1 ; ret =mlx5hws_matcher_attach_at (bwc_matcher->matcher, - bwc_matcher->at[at_idx]); + bwc_matcher->at[at_idx], + &need_rehash);if (unlikely (ret)) { -/* Action template attach failed, possibly due to -* requiring more action STEs. +hws_bwc_unlock_all_queues (ctx); +return ret; + } +if (unlikely (need_rehash)) { +/* The new action template requires more action STEs. * Need to attempt creating new matcher with all * the action templates, including the new one. */
@@ -942,6 +973,7 @@ hws_bwc_rule_action_update(struct mlx5hws_bwc_rule *bwc_rule,struct mlx5hws_context *ctx = bwc_matcher->matcher->tbl->ctx;struct mlx5hws_rule_attr rule_attr;struct mutex *queue_lock;/* Protect the queue */ +bool need_rehash;int at_idx, ret;u16 idx;
@@ -973,12 +1005,17 @@ hws_bwc_rule_action_update(struct mlx5hws_bwc_rule *bwc_rule, at_idx = bwc_matcher->num_of_at -1 ; ret =mlx5hws_matcher_attach_at (bwc_matcher->matcher, - bwc_matcher->at[at_idx]); + bwc_matcher->at[at_idx], + &need_rehash);if (unlikely (ret)) { -/* Action template attach failed, possibly due to -* requiring more action STEs. -* Need to attempt creating new matcher with all -* the action templates, including the new one. +hws_bwc_unlock_all_queues (ctx); +return ret; + } +if (unlikely (need_rehash)) { +/* The new action template requires more action +* STEs. Need to attempt creating new matcher +* with all the action templates, including the +* new one. */ ret =hws_bwc_matcher_rehash_at (bwc_matcher);if (unlikely (ret)) {
drivers/net/ethernet/mellanox/mlx5/core/steering/hws/bwc.h +4 -5
@@ -10,9 +10,7 @@#define MLX5HWS_BWC_MATCHER_REHASH_BURST_TH 32/* Max number of AT attach operations for the same matcher. -* When the limit is reached, next attempt to attach new AT -* will result in creation of a new matcher and moving all -* the rules to this matcher. +* When the limit is reached, a larger buffer is allocated for the ATs. */ #define MLX5HWS_BWC_MATCHER_ATTACH_AT_NUM 8
@@ -23,10 +21,11 @@struct mlx5hws_bwc_matcher {struct mlx5hws_matcher *matcher;struct mlx5hws_match_template *mt; -struct mlx5hws_action_template *at[MLX5HWS_BWC_MATCHER_ATTACH_AT_NUM ]; -u32 priority; +struct mlx5hws_action_template **at;u8 num_of_at; +u8 size_of_at_array;u8 size_log; +u32 priority;atomic_t num_of_rules;struct list_head *rules; };
drivers/net/ethernet/mellanox/mlx5/core/steering/hws/matcher.c +39 -9
77 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/steering/hws/matcher.h +4 -0
@@ -23,6 +23,9 @@*/ #define MLX5HWS_MATCHER_ACTION_RTC_UPDATE_MULT 1 +/* Maximum number of action templates that can be attached to a matcher. */ +#define MLX5HWS_MATCHER_MAX_AT 128 +enum mlx5hws_matcher_offset {MLX5HWS_MATCHER_OFFSET_TAG_DW1 =12 ,MLX5HWS_MATCHER_OFFSET_TAG_DW0 =13 ,
@@ -72,6 +75,7 @@ struct mlx5hws_matcher {struct mlx5hws_match_template *mt;struct mlx5hws_action_template *at;u8 num_of_at; +u8 size_of_at_array;u8 num_of_mt;/* enum mlx5hws_matcher_flags */ u8 flags;
drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws.h +4 -1
@@ -399,11 +399,14 @@ int mlx5hws_matcher_destroy(struct mlx5hws_matcher *matcher);* * @matcher: Matcher to attach the action template to. * @at: Action template to be attached to the matcher. +* @need_rehash: Output parameter that tells callers if the matcher needs to be +* rehashed. * * Return: Zero on success, non-zero otherwise. */ int mlx5hws_matcher_attach_at (struct mlx5hws_matcher *matcher, -struct mlx5hws_action_template *at); +struct mlx5hws_action_template *at, +bool *need_rehash);/** * mlx5hws_matcher_resize_set_target - Link two matchers and enable moving rules.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 191/780 pinctrl: qcom: tlmm-test: Fix potential null dereference in tlmm kunit test
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Charles Han <[email protected]>
[ Upstream commit 1938be9fbad1bd87a1dcd9c3ca88e454565f0609 ]
kunit_kzalloc() may return a NULL pointer, dereferencing it without NULL check may lead to NULL dereference.
Add a NULL check for grp.
--- drivers/pinctrl/qcom/tlmm-test.c | 1 + 1 file changed, 1 insertion(+)
drivers/pinctrl/qcom/tlmm-test.c +1 -0
@@ -547,6 +547,7 @@ static int tlmm_test_init(struct kunit *test)struct tlmm_test_priv *priv; priv =kunit_kzalloc (test,sizeof (*priv),GFP_KERNEL ); +KUNIT_ASSERT_NOT_ERR_OR_NULL (test, priv);atomic_set (&priv->intr_count,0 );atomic_set (&priv->thread_count,0 );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 192/780 net: ncsi: Fix GCPS 64-bit member variables
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hari Kalavakunta <[email protected]>
[ Upstream commit e8a1bd8344054ce27bebf59f48e3f6bc10bc419b ]
Correct Get Controller Packet Statistics (GCPS) 64-bit wide member variables, as per DSP0222 v1.0.0 and forward specs. The Driver currently collects these stats, but they are yet to be exposed to the user. Therefore, no user impact.
Statistics fixes:
Total Bytes Received (byte range 28..35)
Total Bytes Transmitted (byte range 36..43) Total Unicast Packets Received (byte range 44..51) Total Multicast Packets Received (byte range 52..59) Total Broadcast Packets Received (byte range 60..67) Total Unicast Packets Transmitted (byte range 68..75) Total Multicast Packets Transmitted (byte range 76..83) Total Broadcast Packets Transmitted (byte range 84..91) Valid Bytes Received (byte range 204..11)
--- net/ncsi/internal.h | 21 ++++++++++----------- net/ncsi/ncsi-pkt.h | 23 +++++++++++------------ net/ncsi/ncsi-rsp.c | 21 ++++++++++----------- 3 files changed, 31 insertions(+), 34 deletions(-)
net/ncsi/internal.h +10 -11
@@ -143,16 +143,15 @@ struct ncsi_channel_vlan_filter { };struct ncsi_channel_stats { -u32 hnc_cnt_hi;/* Counter cleared */ -u32 hnc_cnt_lo;/* Counter cleared */ -u32 hnc_rx_bytes;/* Rx bytes */ -u32 hnc_tx_bytes;/* Tx bytes */ -u32 hnc_rx_uc_pkts;/* Rx UC packets */ -u32 hnc_rx_mc_pkts;/* Rx MC packets */ -u32 hnc_rx_bc_pkts;/* Rx BC packets */ -u32 hnc_tx_uc_pkts;/* Tx UC packets */ -u32 hnc_tx_mc_pkts;/* Tx MC packets */ -u32 hnc_tx_bc_pkts;/* Tx BC packets */ +u64 hnc_cnt;/* Counter cleared */ +u64 hnc_rx_bytes;/* Rx bytes */ +u64 hnc_tx_bytes;/* Tx bytes */ +u64 hnc_rx_uc_pkts;/* Rx UC packets */ +u64 hnc_rx_mc_pkts;/* Rx MC packets */ +u64 hnc_rx_bc_pkts;/* Rx BC packets */ +u64 hnc_tx_uc_pkts;/* Tx UC packets */ +u64 hnc_tx_mc_pkts;/* Tx MC packets */ +u64 hnc_tx_bc_pkts;/* Tx BC packets */ u32 hnc_fcs_err;/* FCS errors */ u32 hnc_align_err;/* Alignment errors */ u32 hnc_false_carrier;/* False carrier detection */
@@ -181,7 +180,7 @@ struct ncsi_channel_stats {u32 hnc_tx_1023_frames;/* Tx 512-1023 bytes frames */ u32 hnc_tx_1522_frames;/* Tx 1024-1522 bytes frames */ u32 hnc_tx_9022_frames;/* Tx 1523-9022 bytes frames */ -u32 hnc_rx_valid_bytes;/* Rx valid bytes */ +u64 hnc_rx_valid_bytes;/* Rx valid bytes */ u32 hnc_rx_runt_pkts;/* Rx error runt packets */ u32 hnc_rx_jabber_pkts;/* Rx error jabber packets */ u32 ncsi_rx_cmds;/* Rx NCSI commands */
net/ncsi/ncsi-pkt.h +11 -12
@@ -252,16 +252,15 @@ struct ncsi_rsp_gp_pkt {/* Get Controller Packet Statistics */ struct ncsi_rsp_gcps_pkt {struct ncsi_rsp_pkt_hdr rsp;/* Response header */ -__be32 cnt_hi;/* Counter cleared */ -__be32 cnt_lo;/* Counter cleared */ -__be32 rx_bytes;/* Rx bytes */ -__be32 tx_bytes;/* Tx bytes */ -__be32 rx_uc_pkts;/* Rx UC packets */ -__be32 rx_mc_pkts;/* Rx MC packets */ -__be32 rx_bc_pkts;/* Rx BC packets */ -__be32 tx_uc_pkts;/* Tx UC packets */ -__be32 tx_mc_pkts;/* Tx MC packets */ -__be32 tx_bc_pkts;/* Tx BC packets */ +__be64 cnt;/* Counter cleared */ +__be64 rx_bytes;/* Rx bytes */ +__be64 tx_bytes;/* Tx bytes */ +__be64 rx_uc_pkts;/* Rx UC packets */ +__be64 rx_mc_pkts;/* Rx MC packets */ +__be64 rx_bc_pkts;/* Rx BC packets */ +__be64 tx_uc_pkts;/* Tx UC packets */ +__be64 tx_mc_pkts;/* Tx MC packets */ +__be64 tx_bc_pkts;/* Tx BC packets */ __be32 fcs_err;/* FCS errors */ __be32 align_err;/* Alignment errors */ __be32 false_carrier;/* False carrier detection */
@@ -290,11 +289,11 @@ struct ncsi_rsp_gcps_pkt {__be32 tx_1023_frames;/* Tx 512-1023 bytes frames */ __be32 tx_1522_frames;/* Tx 1024-1522 bytes frames */ __be32 tx_9022_frames;/* Tx 1523-9022 bytes frames */ -__be32 rx_valid_bytes;/* Rx valid bytes */ +__be64 rx_valid_bytes;/* Rx valid bytes */ __be32 rx_runt_pkts;/* Rx error runt packets */ __be32 rx_jabber_pkts;/* Rx error jabber packets */ __be32 checksum;/* Checksum */ -}; +} __packed__aligned(4) ;/* Get NCSI Statistics */ struct ncsi_rsp_gns_pkt {
net/ncsi/ncsi-rsp.c +10 -11
@@ -926,16 +926,15 @@ static int ncsi_rsp_handler_gcps(struct ncsi_request *nr)/* Update HNC's statistics */ ncs = &nc->stats; - ncs->hnc_cnt_hi =ntohl (rsp->cnt_hi); - ncs->hnc_cnt_lo =ntohl (rsp->cnt_lo); - ncs->hnc_rx_bytes =ntohl (rsp->rx_bytes); - ncs->hnc_tx_bytes =ntohl (rsp->tx_bytes); - ncs->hnc_rx_uc_pkts =ntohl (rsp->rx_uc_pkts); - ncs->hnc_rx_mc_pkts =ntohl (rsp->rx_mc_pkts); - ncs->hnc_rx_bc_pkts =ntohl (rsp->rx_bc_pkts); - ncs->hnc_tx_uc_pkts =ntohl (rsp->tx_uc_pkts); - ncs->hnc_tx_mc_pkts =ntohl (rsp->tx_mc_pkts); - ncs->hnc_tx_bc_pkts =ntohl (rsp->tx_bc_pkts); + ncs->hnc_cnt =be64_to_cpu (rsp->cnt); + ncs->hnc_rx_bytes =be64_to_cpu (rsp->rx_bytes); + ncs->hnc_tx_bytes =be64_to_cpu (rsp->tx_bytes); + ncs->hnc_rx_uc_pkts =be64_to_cpu (rsp->rx_uc_pkts); + ncs->hnc_rx_mc_pkts =be64_to_cpu (rsp->rx_mc_pkts); + ncs->hnc_rx_bc_pkts =be64_to_cpu (rsp->rx_bc_pkts); + ncs->hnc_tx_uc_pkts =be64_to_cpu (rsp->tx_uc_pkts); + ncs->hnc_tx_mc_pkts =be64_to_cpu (rsp->tx_mc_pkts); + ncs->hnc_tx_bc_pkts =be64_to_cpu (rsp->tx_bc_pkts); ncs->hnc_fcs_err =ntohl (rsp->fcs_err); ncs->hnc_align_err =ntohl (rsp->align_err); ncs->hnc_false_carrier =ntohl (rsp->false_carrier);
@@ -964,7 +963,7 @@ static int ncsi_rsp_handler_gcps(struct ncsi_request *nr) ncs->hnc_tx_1023_frames =ntohl (rsp->tx_1023_frames); ncs->hnc_tx_1522_frames =ntohl (rsp->tx_1522_frames); ncs->hnc_tx_9022_frames =ntohl (rsp->tx_9022_frames); - ncs->hnc_rx_valid_bytes =ntohl (rsp->rx_valid_bytes); + ncs->hnc_rx_valid_bytes =be64_to_cpu (rsp->rx_valid_bytes); ncs->hnc_rx_runt_pkts =ntohl (rsp->rx_runt_pkts); ncs->hnc_rx_jabber_pkts =ntohl (rsp->rx_jabber_pkts);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 193/780 libbpf: Fix buffer overflow in bpf_object__init_prog
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Viktor Malik <[email protected]>
[ Upstream commit ee684de5c1b0ac01821320826baec7da93f3615b ]
As shown in [1], it is possible to corrupt a BPF ELF file such that arbitrary BPF instructions are loaded by libbpf. This can be done by setting a symbol (BPF program) section offset to a large (unsigned) number such that <section start + symbol offset> overflows and points before the section data in the memory.
Consider the situation below where:
- prog_start = sec_start + symbol_offset <-- size_t overflow here
- prog_end = prog_start + prog_size
prog_start sec_start prog_end sec_end
| | | |
v v v v
.....................|################################|............
The report in [1] also provides a corrupted BPF ELF which can be used as a reproducer:
$ readelf -S crash
Section Headers:
[Nr] Name Type Address Offset
Size EntSize Flags Link Info Align
...
[ 2] uretprobe.mu[...] PROGBITS 0000000000000000 00000040
0000000000000068 0000000000000000 AX 0 0 8 $ readelf -s crash
Symbol table '.symtab' contains 8 entries:
Num: Value Size Type Bind Vis Ndx Name
...
6: ffffffffffffffb8 104 FUNC GLOBAL DEFAULT 2 handle_tpHere, the handle_tp prog has section offset ffffffffffffffb8, i.e. will point before the actual memory where section 2 is allocated.
This is also reported by AddressSanitizer:
=================================================================
==1232==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x7c7302fe0000 at pc 0x7fc3046e4b77 bp 0x7ffe64677cd0 sp 0x7ffe64677490
READ of size 104 at 0x7c7302fe0000 thread T0
#0 0x7fc3046e4b76 in memcpy (/lib64/libasan.so.8+0xe4b76)
#1 0x00000040df3e in bpf_object__init_prog /src/libbpf/src/libbpf.c:856
#2 0x00000040df3e in bpf_object__add_programs /src/libbpf/src/libbpf.c:928
#3 0x00000040df3e in bpf_object__elf_collect /src/libbpf/src/libbpf.c:3930
#4 0x00000040df3e in bpf_object_open /src/libbpf/src/libbpf.c:8067
#5 0x00000040f176 in bpf_object__open_file /src/libbpf/src/libbpf.c:8090
#6 0x000000400c16 in main /poc/poc.c:8
#7 0x7fc3043d25b4 in __libc_start_call_main (/lib64/libc.so.6+0x35b4)
#8 0x7fc3043d2667 in __libc_start_main@@GLIBC_2.34 (/lib64/libc.so.6+0x3667)
#9 0x000000400b34 in _start (/poc/poc+0x400b34)
0x7c7302fe0000 is located 64 bytes before 104-byte region [0x7c7302fe0040,0x7c7302fe00a8)
allocated by thread T0 here:
#0 0x7fc3046e716b in malloc (/lib64/libasan.so.8+0xe716b)
#1 0x7fc3045ee600 in __libelf_set_rawdata_wrlock (/lib64/libelf.so.1+0xb600)
#2 0x7fc3045ef018 in __elf_getdata_rdlock (/lib64/libelf.so.1+0xc018)
#3 0x00000040642f in elf_sec_data /src/libbpf/src/libbpf.c:3740The problem here is that currently, libbpf only checks that the program end is within the section bounds. There used to be a check while (sec_off < sec_sz) in bpf_object__add_programs, however, it was removed by commit 6245947c1b3c ("libbpf: Allow gaps in BPF program sections to support overriden weak functions").
Add a check for detecting the overflow of sec_off + prog_sz to bpf_object__init_prog to fix this issue.
[1] https://github.com/lmarch2/poc/blob/main/libbpf/libbpf.md
--- tools/lib/bpf/libbpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/bpf/libbpf.c +1 -1
@@ -896,7 +896,7 @@ bpf_object__add_programs(struct bpf_object *obj, Elf_Data *sec_data,return -LIBBPF_ERRNO__FORMAT ; } -if (sec_off + prog_sz > sec_sz) { +if (sec_off + prog_sz > sec_sz || sec_off + prog_sz < sec_off) {pr_warn ("sec '%s': program at offset %zu crosses section boundary\n" , sec_name, sec_off);return -LIBBPF_ERRNO__FORMAT ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 194/780 net/mlx5: Avoid using xso.real_dev unnecessarily
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cosmin Ratiu <[email protected]>
[ Upstream commit d79444e8c3d40b11f5e155e5591d53bd1e512e1f ]
xso.real_dev is the active device of an offloaded xfrm state and is managed by bonding. As such, it's subject to change when states are migrated to a new device. Using it in places other than offloading/unoffloading the states is risky.
This commit saves the device into the driver-specific struct mlx5e_ipsec_sa_entry and switches mlx5e_ipsec_init_macs() and mlx5e_ipsec_netevent_event() to make use of it.
Additionally, mlx5e_xfrm_update_stats() used xso.real_dev to validate that correct net locks are held. But in a bonding config, the net of the master device is the same as the underlying devices, and the net is already a local var, so use that instead.
The only remaining references to xso.real_dev are now in the .xdo_dev_state_add() / .xdo_dev_state_delete() path.
Stable-dep-of: fd4e41ebf66c ("bonding: Mark active offloaded xfrm_states")
--- .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 16 +++++----------- .../ethernet/mellanox/mlx5/core/en_accel/ipsec.h | 1 + 2 files changed, 6 insertions(+), 11 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c +5 -11
@@ -259,8 +259,7 @@ static void mlx5e_ipsec_init_macs(struct mlx5e_ipsec_sa_entry *sa_entry, struct mlx5_accel_esp_xfrm_attrs *attrs) {struct mlx5_core_dev *mdev =mlx5e_ipsec_sa2dev (sa_entry); -struct xfrm_state *x = sa_entry->x; -struct net_device *netdev; +struct net_device *netdev = sa_entry->dev;struct neighbour *n;u8 addr[ETH_ALEN ];const void *pkey;
@@ -270,8 +269,6 @@ static void mlx5e_ipsec_init_macs(struct mlx5e_ipsec_sa_entry *sa_entry, attrs->type != XFRM_DEV_OFFLOAD_PACKET)return ; - netdev = x->xso.real_dev; -mlx5_query_mac_address (mdev, addr);switch (attrs->dir) {case XFRM_DEV_OFFLOAD_IN :
@@ -713,6 +710,7 @@ static int mlx5e_xfrm_add_state(struct xfrm_state *x,return -ENOMEM ; sa_entry->x = x; + sa_entry->dev = netdev; sa_entry->ipsec = ipsec;/* Check if this SA is originated from acquire flow temporary SA */ if (x->xso.flags &XFRM_DEV_OFFLOAD_FLAG_ACQ )
@@ -855,8 +853,6 @@ static int mlx5e_ipsec_netevent_event(struct notifier_block *nb,struct mlx5e_ipsec_sa_entry *sa_entry;struct mlx5e_ipsec *ipsec;struct neighbour *n = ptr; -struct net_device *netdev; -struct xfrm_state *x;unsigned long idx;if (event !=NETEVENT_NEIGH_UPDATE || !(n->nud_state &NUD_VALID ))
@@ -876,11 +872,9 @@ static int mlx5e_ipsec_netevent_event(struct notifier_block *nb,continue ; } - x = sa_entry->x; - netdev = x->xso.real_dev; data = sa_entry->work->data; -neigh_ha_snapshot (data->addr, n, netdev); +neigh_ha_snapshot (data->addr, n, sa_entry->dev);queue_work (ipsec->wq, &sa_entry->work->work); }
@@ -996,8 +990,8 @@ static void mlx5e_xfrm_update_stats(struct xfrm_state *x)size_t headers;lockdep_assert (lockdep_is_held (&x->lock) || -lockdep_is_held (&dev_net (x->xso.real_dev)->xfrm.xfrm_cfg_mutex) || -lockdep_is_held (&dev_net (x->xso.real_dev)->xfrm.xfrm_state_lock)); +lockdep_is_held (&net->xfrm.xfrm_cfg_mutex) || +lockdep_is_held (&net->xfrm.xfrm_state_lock));if (x->xso.flags &XFRM_DEV_OFFLOAD_FLAG_ACQ )return ;
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h +1 -0
@@ -274,6 +274,7 @@ struct mlx5e_ipsec_limits {struct mlx5e_ipsec_sa_entry {struct mlx5e_ipsec_esn_state esn_state;struct xfrm_state *x; +struct net_device *dev;struct mlx5e_ipsec *ipsec;struct mlx5_accel_esp_xfrm_attrs attrs; void (*set_iv_op)(struct sk_buff *skb, struct xfrm_state *x,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 195/780 xfrm: Use xdo.dev instead of xdo.real_dev
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cosmin Ratiu <[email protected]>
[ Upstream commit 25ac138f58e7d5c8bffa31e8891418d2819180c4 ]
The policy offload struct was reused from the state offload and real_dev was copied from dev, but it was never set to anything else. Simplify the code by always using xdo.dev for policies.
Stable-dep-of: fd4e41ebf66c ("bonding: Mark active offloaded xfrm_states")
--- drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 2 +- net/xfrm/xfrm_device.c | 2 -- net/xfrm/xfrm_state.c | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c +1 -1
@@ -1164,7 +1164,7 @@ mlx5e_ipsec_build_accel_pol_attrs(struct mlx5e_ipsec_pol_entry *pol_entry,static int mlx5e_xfrm_add_policy (struct xfrm_policy *x,struct netlink_ext_ack *extack) { -struct net_device *netdev = x->xdo.real_dev; +struct net_device *netdev = x->xdo.dev;struct mlx5e_ipsec_pol_entry *pol_entry;struct mlx5e_priv *priv;int err;
net/xfrm/xfrm_device.c +0 -2
@@ -378,7 +378,6 @@ int xfrm_dev_policy_add(struct net *net, struct xfrm_policy *xp, xdo->dev = dev;netdev_tracker_alloc (dev, &xdo->dev_tracker,GFP_ATOMIC ); - xdo->real_dev = dev; xdo->type =XFRM_DEV_OFFLOAD_PACKET ;switch (dir) {case XFRM_POLICY_IN :
@@ -400,7 +399,6 @@ int xfrm_dev_policy_add(struct net *net, struct xfrm_policy *xp, err = dev->xfrmdev_ops->xdo_dev_policy_add (xp, extack);if (err) { xdo->dev =NULL ; - xdo->real_dev =NULL ; xdo->type =XFRM_DEV_OFFLOAD_UNSPECIFIED ; xdo->dir =0 ;netdev_put (dev, &xdo->dev_tracker);
net/xfrm/xfrm_state.c +0 -2
@@ -1552,7 +1552,6 @@ xfrm_state_find(const xfrm_address_t *daddr, const xfrm_address_t *saddr, xso->type =XFRM_DEV_OFFLOAD_PACKET ; xso->dir = xdo->dir; xso->dev = xdo->dev; - xso->real_dev = xdo->real_dev; xso->flags =XFRM_DEV_OFFLOAD_FLAG_ACQ ;netdev_hold (xso->dev, &xso->dev_tracker,GFP_ATOMIC ); error = xso->dev->xfrmdev_ops->xdo_dev_state_add (x,NULL );
@@ -1560,7 +1559,6 @@ xfrm_state_find(const xfrm_address_t *daddr, const xfrm_address_t *saddr, xso->dir =0 ;netdev_put (xso->dev, &xso->dev_tracker); xso->dev =NULL ; - xso->real_dev =NULL ; xso->type =XFRM_DEV_OFFLOAD_UNSPECIFIED ; x->km.state =XFRM_STATE_DEAD ; to_put = x;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 196/780 xfrm: Add explicit dev to .xdo_dev_state_{add,delete,free}
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cosmin Ratiu <[email protected]>
[ Upstream commit 43eca05b6a3b917c600e10cc6b06bfa57fa57401 ]
Previously, device driver IPSec offload implementations would fall into two categories:
1. Those that used xso.dev to determine the offload device.
2. Those that used xso.real_dev to determine the offload device.
The first category didn't work with bonding while the second did. In a non-bonding setup the two pointers are the same.
This commit adds explicit pointers for the offload netdevice to .xdo_dev_state_add() / .xdo_dev_state_delete() / .xdo_dev_state_free() which eliminates the confusion and allows drivers from the first category to work with bonding.
xso.real_dev now becomes a private pointer managed by the bonding driver.
Stable-dep-of: fd4e41ebf66c ("bonding: Mark active offloaded xfrm_states")
--- Documentation/networking/xfrm_device.rst | 10 +++-- drivers/net/bonding/bond_main.c | 33 ++++++++------- .../net/ethernet/chelsio/cxgb4/cxgb4_main.c | 20 +++++---- .../inline_crypto/ch_ipsec/chcr_ipsec.c | 18 +++++--- .../net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 41 +++++++++++-------- drivers/net/ethernet/intel/ixgbevf/ipsec.c | 21 ++++++---- .../marvell/octeontx2/nic/cn10k_ipsec.c | 18 ++++---- .../mellanox/mlx5/core/en_accel/ipsec.c | 12 +++--- .../net/ethernet/netronome/nfp/crypto/ipsec.c | 11 +++-- drivers/net/netdevsim/ipsec.c | 15 ++++--- include/linux/netdevice.h | 10 +++-- include/net/xfrm.h | 8 ++++ net/xfrm/xfrm_device.c | 4 +- net/xfrm/xfrm_state.c | 14 ++++--- 14 files changed, 136 insertions(+), 99 deletions(-)
Documentation/networking/xfrm_device.rst +7 -3
@@ -65,9 +65,13 @@ Callbacks to implement /* from include/linux/netdevice.h */ struct xfrmdev_ops { /* Crypto and Packet offload callbacks */ - int (*xdo_dev_state_add) (struct xfrm_state *x, struct netlink_ext_ack *extack); - void (*xdo_dev_state_delete) (struct xfrm_state *x); - void (*xdo_dev_state_free) (struct xfrm_state *x); + int (*xdo_dev_state_add)(struct net_device *dev, + struct xfrm_state *x, + struct netlink_ext_ack *extack); + void (*xdo_dev_state_delete)(struct net_device *dev, + struct xfrm_state *x); + void (*xdo_dev_state_free)(struct net_device *dev, + struct xfrm_state *x); bool (*xdo_dev_offload_ok) (struct sk_buff *skb, struct xfrm_state *x); void (*xdo_dev_state_advance_esn) (struct xfrm_state *x);
drivers/net/bonding/bond_main.c +19 -14
@@ -453,13 +453,14 @@ static struct net_device *bond_ipsec_dev(struct xfrm_state *xs)/** * bond_ipsec_add_sa - program device with a security association +* @bond_dev: pointer to the bond net device * @xs: pointer to transformer state struct * @extack: extack point to fill failure reason **/ -static int bond_ipsec_add_sa (struct xfrm_state *xs, +static int bond_ipsec_add_sa (struct net_device *bond_dev, +struct xfrm_state *xs,struct netlink_ext_ack *extack) { -struct net_device *bond_dev = xs->xso.dev;struct net_device *real_dev;netdevice_tracker tracker;struct bond_ipsec *ipsec;
@@ -496,7 +497,7 @@ static int bond_ipsec_add_sa(struct xfrm_state *xs, } xs->xso.real_dev = real_dev; - err = real_dev->xfrmdev_ops->xdo_dev_state_add (xs, extack); + err = real_dev->xfrmdev_ops->xdo_dev_state_add (real_dev, xs, extack);if (!err) { ipsec->xs = xs;INIT_LIST_HEAD (&ipsec->list);
@@ -540,7 +541,8 @@ static void bond_ipsec_add_sa_all(struct bonding *bond)continue ; ipsec->xs->xso.real_dev = real_dev; -if (real_dev->xfrmdev_ops->xdo_dev_state_add (ipsec->xs,NULL )) { +if (real_dev->xfrmdev_ops->xdo_dev_state_add (real_dev, + ipsec->xs,NULL )) {slave_warn (bond_dev, real_dev,"%s: failed to add SA\n" , __func__); ipsec->xs->xso.real_dev =NULL ; }
@@ -551,11 +553,12 @@ static void bond_ipsec_add_sa_all(struct bonding *bond)/** * bond_ipsec_del_sa - clear out this specific SA +* @bond_dev: pointer to the bond net device * @xs: pointer to transformer state struct **/ -static void bond_ipsec_del_sa (struct xfrm_state *xs) +static void bond_ipsec_del_sa (struct net_device *bond_dev, +struct xfrm_state *xs) { -struct net_device *bond_dev = xs->xso.dev;struct net_device *real_dev;netdevice_tracker tracker;struct bond_ipsec *ipsec;
@@ -587,7 +590,7 @@ static void bond_ipsec_del_sa(struct xfrm_state *xs) goto out; } - real_dev->xfrmdev_ops->xdo_dev_state_delete (xs); + real_dev->xfrmdev_ops->xdo_dev_state_delete (real_dev, xs); out:netdev_put (real_dev, &tracker);mutex_lock (&bond->ipsec_lock);
@@ -624,18 +627,20 @@ static void bond_ipsec_del_sa_all(struct bonding *bond)slave_warn (bond_dev, real_dev,"%s: no slave xdo_dev_state_delete\n" , __func__); - }else { - real_dev->xfrmdev_ops->xdo_dev_state_delete (ipsec->xs); -if (real_dev->xfrmdev_ops->xdo_dev_state_free) - real_dev->xfrmdev_ops->xdo_dev_state_free (ipsec->xs); +continue ; } + real_dev->xfrmdev_ops->xdo_dev_state_delete (real_dev, + ipsec->xs); +if (real_dev->xfrmdev_ops->xdo_dev_state_free) + real_dev->xfrmdev_ops->xdo_dev_state_free (real_dev, + ipsec->xs); }mutex_unlock (&bond->ipsec_lock); } -static void bond_ipsec_free_sa (struct xfrm_state *xs) +static void bond_ipsec_free_sa (struct net_device *bond_dev, +struct xfrm_state *xs) { -struct net_device *bond_dev = xs->xso.dev;struct net_device *real_dev;netdevice_tracker tracker;struct bonding *bond;
@@ -661,7 +666,7 @@ static void bond_ipsec_free_sa(struct xfrm_state *xs)if (real_dev && real_dev->xfrmdev_ops && real_dev->xfrmdev_ops->xdo_dev_state_free) - real_dev->xfrmdev_ops->xdo_dev_state_free (xs); + real_dev->xfrmdev_ops->xdo_dev_state_free (real_dev, xs); out:netdev_put (real_dev, &tracker); }
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +11 -9
@@ -6480,10 +6480,11 @@ static const struct tlsdev_ops cxgb4_ktls_ops = {#if IS_ENABLED (CONFIG_CHELSIO_IPSEC_INLINE ) -static int cxgb4_xfrm_add_state (struct xfrm_state *x, +static int cxgb4_xfrm_add_state (struct net_device *dev, +struct xfrm_state *x,struct netlink_ext_ack *extack) { -struct adapter *adap =netdev2adap (x->xso.dev); +struct adapter *adap =netdev2adap (dev);int ret;if (!mutex_trylock (&uld_mutex)) {
@@ -6494,7 +6495,8 @@ static int cxgb4_xfrm_add_state(struct xfrm_state *x,if (ret) goto out_unlock; - ret = adap->uld[CXGB4_ULD_IPSEC ].xfrmdev_ops->xdo_dev_state_add (x, extack); + ret = adap->uld[CXGB4_ULD_IPSEC ].xfrmdev_ops->xdo_dev_state_add (dev, x, + extack); out_unlock:mutex_unlock (&uld_mutex);
@@ -6502,9 +6504,9 @@ static int cxgb4_xfrm_add_state(struct xfrm_state *x,return ret; } -static void cxgb4_xfrm_del_state (struct xfrm_state *x) +static void cxgb4_xfrm_del_state (struct net_device *dev,struct xfrm_state *x) { -struct adapter *adap =netdev2adap (x->xso.dev); +struct adapter *adap =netdev2adap (dev);if (!mutex_trylock (&uld_mutex)) { dev_dbg(adap->pdev_dev,
@@ -6514,15 +6516,15 @@ static void cxgb4_xfrm_del_state(struct xfrm_state *x)if (chcr_offload_state (adap,CXGB4_XFRMDEV_OPS )) goto out_unlock; - adap->uld[CXGB4_ULD_IPSEC ].xfrmdev_ops->xdo_dev_state_delete (x); + adap->uld[CXGB4_ULD_IPSEC ].xfrmdev_ops->xdo_dev_state_delete (dev, x); out_unlock:mutex_unlock (&uld_mutex); } -static void cxgb4_xfrm_free_state (struct xfrm_state *x) +static void cxgb4_xfrm_free_state (struct net_device *dev,struct xfrm_state *x) { -struct adapter *adap =netdev2adap (x->xso.dev); +struct adapter *adap =netdev2adap (dev);if (!mutex_trylock (&uld_mutex)) { dev_dbg(adap->pdev_dev,
@@ -6532,7 +6534,7 @@ static void cxgb4_xfrm_free_state(struct xfrm_state *x)if (chcr_offload_state (adap,CXGB4_XFRMDEV_OPS )) goto out_unlock; - adap->uld[CXGB4_ULD_IPSEC ].xfrmdev_ops->xdo_dev_state_free (x); + adap->uld[CXGB4_ULD_IPSEC ].xfrmdev_ops->xdo_dev_state_free (dev, x); out_unlock:mutex_unlock (&uld_mutex);
drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.c +12 -6
@@ -75,9 +75,12 @@ static int ch_ipsec_uld_state_change(void *handle, enum cxgb4_state new_state);static int ch_ipsec_xmit (struct sk_buff *skb,struct net_device *dev);static void *ch_ipsec_uld_add (const struct cxgb4_lld_info *infop);static void ch_ipsec_advance_esn_state (struct xfrm_state *x); -static void ch_ipsec_xfrm_free_state (struct xfrm_state *x); -static void ch_ipsec_xfrm_del_state (struct xfrm_state *x); -static int ch_ipsec_xfrm_add_state (struct xfrm_state *x, +static void ch_ipsec_xfrm_free_state (struct net_device *dev, +struct xfrm_state *x); +static void ch_ipsec_xfrm_del_state (struct net_device *dev, +struct xfrm_state *x); +static int ch_ipsec_xfrm_add_state (struct net_device *dev, +struct xfrm_state *x,struct netlink_ext_ack *extack);static const struct xfrmdev_ops ch_ipsec_xfrmdev_ops = {
@@ -223,7 +226,8 @@ static int ch_ipsec_setkey(struct xfrm_state *x,* returns 0 on success, negative error if failed to send message to FPGA * positive error if FPGA returned a bad response */ -static int ch_ipsec_xfrm_add_state (struct xfrm_state *x, +static int ch_ipsec_xfrm_add_state (struct net_device *dev, +struct xfrm_state *x,struct netlink_ext_ack *extack) {struct ipsec_sa_entry *sa_entry;
@@ -302,14 +306,16 @@ static int ch_ipsec_xfrm_add_state(struct xfrm_state *x,return res; } -static void ch_ipsec_xfrm_del_state (struct xfrm_state *x) +static void ch_ipsec_xfrm_del_state (struct net_device *dev, +struct xfrm_state *x) {/* do nothing */ if (!x->xso.offload_handle)return ; } -static void ch_ipsec_xfrm_free_state (struct xfrm_state *x) +static void ch_ipsec_xfrm_free_state (struct net_device *dev, +struct xfrm_state *x) {struct ipsec_sa_entry *sa_entry;
drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c +23 -18
144 lines not on this page · raw message
drivers/net/ethernet/intel/ixgbevf/ipsec.c +13 -8
@@ -201,6 +201,7 @@ struct xfrm_state *ixgbevf_ipsec_find_rx_state(struct ixgbevf_ipsec *ipsec,/** * ixgbevf_ipsec_parse_proto_keys - find the key and salt based on the protocol +* @dev: pointer to net device to program * @xs: pointer to xfrm_state struct * @mykey: pointer to key array to populate * @mysalt: pointer to salt value to populate
@@ -208,10 +209,10 @@ struct xfrm_state *ixgbevf_ipsec_find_rx_state(struct ixgbevf_ipsec *ipsec,* This copies the protocol keys and salt to our own data tables. The * 82599 family only supports the one algorithm. **/ -static int ixgbevf_ipsec_parse_proto_keys (struct xfrm_state *xs, +static int ixgbevf_ipsec_parse_proto_keys (struct net_device *dev, +struct xfrm_state *xs,u32 *mykey,u32 *mysalt) { -struct net_device *dev = xs->xso.real_dev;unsigned char *key_data;char *alg_name =NULL ;int key_len;
@@ -256,13 +257,14 @@ static int ixgbevf_ipsec_parse_proto_keys(struct xfrm_state *xs,/** * ixgbevf_ipsec_add_sa - program device with a security association +* @dev: pointer to net device to program * @xs: pointer to transformer state struct * @extack: extack point to fill failure reason **/ -static int ixgbevf_ipsec_add_sa (struct xfrm_state *xs, +static int ixgbevf_ipsec_add_sa (struct net_device *dev, +struct xfrm_state *xs,struct netlink_ext_ack *extack) { -struct net_device *dev = xs->xso.real_dev;struct ixgbevf_adapter *adapter;struct ixgbevf_ipsec *ipsec;u16 sa_idx;
@@ -310,7 +312,8 @@ static int ixgbevf_ipsec_add_sa(struct xfrm_state *xs, rsa.decrypt = xs->ealg || xs->aead;/* get the key and salt */ - ret =ixgbevf_ipsec_parse_proto_keys (xs, rsa.key, &rsa.salt); + ret =ixgbevf_ipsec_parse_proto_keys (dev, xs, rsa.key, + &rsa.salt);if (ret) {NL_SET_ERR_MSG_MOD (extack,"Failed to get key data for Rx SA table" );return ret;
@@ -363,7 +366,8 @@ static int ixgbevf_ipsec_add_sa(struct xfrm_state *xs,if (xs->id.proto &IPPROTO_ESP ) tsa.encrypt = xs->ealg || xs->aead; - ret =ixgbevf_ipsec_parse_proto_keys (xs, tsa.key, &tsa.salt); + ret =ixgbevf_ipsec_parse_proto_keys (dev, xs, tsa.key, + &tsa.salt);if (ret) {NL_SET_ERR_MSG_MOD (extack,"Failed to get key data for Tx SA table" );memset (&tsa,0 ,sizeof (tsa));
@@ -388,11 +392,12 @@ static int ixgbevf_ipsec_add_sa(struct xfrm_state *xs,/** * ixgbevf_ipsec_del_sa - clear out this specific SA +* @dev: pointer to net device to program * @xs: pointer to transformer state struct **/ -static void ixgbevf_ipsec_del_sa (struct xfrm_state *xs) +static void ixgbevf_ipsec_del_sa (struct net_device *dev, +struct xfrm_state *xs) { -struct net_device *dev = xs->xso.real_dev;struct ixgbevf_adapter *adapter;struct ixgbevf_ipsec *ipsec;u16 sa_idx;
drivers/net/ethernet/marvell/octeontx2/nic/cn10k_ipsec.c +9 -9
@@ -663,10 +663,10 @@ static int cn10k_ipsec_inb_add_state(struct xfrm_state *x,return -EOPNOTSUPP ; } -static int cn10k_ipsec_outb_add_state (struct xfrm_state *x, +static int cn10k_ipsec_outb_add_state (struct net_device *dev, +struct xfrm_state *x,struct netlink_ext_ack *extack) { -struct net_device *netdev = x->xso.dev;struct cn10k_tx_sa_s *sa_entry;struct qmem *sa_info;struct otx2_nic *pf;
@@ -676,7 +676,7 @@ static int cn10k_ipsec_outb_add_state(struct xfrm_state *x,if (err)return err; - pf =netdev_priv (netdev); + pf =netdev_priv (dev); err =qmem_alloc (pf->dev, &sa_info, pf->ipsec.sa_size,OTX2_ALIGN );if (err)
@@ -700,18 +700,18 @@ static int cn10k_ipsec_outb_add_state(struct xfrm_state *x,return 0 ; } -static int cn10k_ipsec_add_state (struct xfrm_state *x, +static int cn10k_ipsec_add_state (struct net_device *dev, +struct xfrm_state *x,struct netlink_ext_ack *extack) {if (x->xso.dir ==XFRM_DEV_OFFLOAD_IN )return cn10k_ipsec_inb_add_state (x, extack);else -return cn10k_ipsec_outb_add_state (x, extack); +return cn10k_ipsec_outb_add_state (dev, x, extack); } -static void cn10k_ipsec_del_state (struct xfrm_state *x) +static void cn10k_ipsec_del_state (struct net_device *dev,struct xfrm_state *x) { -struct net_device *netdev = x->xso.dev;struct cn10k_tx_sa_s *sa_entry;struct qmem *sa_info;struct otx2_nic *pf;
@@ -720,7 +720,7 @@ static void cn10k_ipsec_del_state(struct xfrm_state *x)if (x->xso.dir ==XFRM_DEV_OFFLOAD_IN )return ; - pf =netdev_priv (netdev); + pf =netdev_priv (dev); sa_info = (struct qmem *)x->xso.offload_handle; sa_entry = (struct cn10k_tx_sa_s *)sa_info->base;
@@ -732,7 +732,7 @@ static void cn10k_ipsec_del_state(struct xfrm_state *x) err =cn10k_outb_write_sa (pf, sa_info);if (err) -netdev_err (netdev,"Error (%d) deleting SA\n" , err); +netdev_err (dev,"Error (%d) deleting SA\n" , err); x->xso.offload_handle =0 ;qmem_free (pf->dev, sa_info);
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c +6 -6
@@ -689,17 +689,17 @@ static int mlx5e_ipsec_create_dwork(struct mlx5e_ipsec_sa_entry *sa_entry)return 0 ; } -static int mlx5e_xfrm_add_state (struct xfrm_state *x, +static int mlx5e_xfrm_add_state (struct net_device *dev, +struct xfrm_state *x,struct netlink_ext_ack *extack) {struct mlx5e_ipsec_sa_entry *sa_entry =NULL ; -struct net_device *netdev = x->xso.real_dev;struct mlx5e_ipsec *ipsec;struct mlx5e_priv *priv;gfp_t gfp;int err; - priv =netdev_priv (netdev); + priv =netdev_priv (dev);if (!priv->ipsec)return -EOPNOTSUPP ;
@@ -710,7 +710,7 @@ static int mlx5e_xfrm_add_state(struct xfrm_state *x,return -ENOMEM ; sa_entry->x = x; - sa_entry->dev = netdev; + sa_entry->dev = dev; sa_entry->ipsec = ipsec;/* Check if this SA is originated from acquire flow temporary SA */ if (x->xso.flags &XFRM_DEV_OFFLOAD_FLAG_ACQ )
@@ -807,7 +807,7 @@ static int mlx5e_xfrm_add_state(struct xfrm_state *x,return err; } -static void mlx5e_xfrm_del_state (struct xfrm_state *x) +static void mlx5e_xfrm_del_state (struct net_device *dev,struct xfrm_state *x) {struct mlx5e_ipsec_sa_entry *sa_entry =to_ipsec_sa_entry (x);struct mlx5e_ipsec *ipsec = sa_entry->ipsec;
@@ -820,7 +820,7 @@ static void mlx5e_xfrm_del_state(struct xfrm_state *x)WARN_ON (old != sa_entry); } -static void mlx5e_xfrm_free_state (struct xfrm_state *x) +static void mlx5e_xfrm_free_state (struct net_device *dev,struct xfrm_state *x) {struct mlx5e_ipsec_sa_entry *sa_entry =to_ipsec_sa_entry (x);struct mlx5e_ipsec *ipsec = sa_entry->ipsec;
drivers/net/ethernet/netronome/nfp/crypto/ipsec.c +5 -6
@@ -266,17 +266,17 @@ static void set_sha2_512hmac(struct nfp_ipsec_cfg_add_sa *cfg, int *trunc_len) } } -static int nfp_net_xfrm_add_state (struct xfrm_state *x, +static int nfp_net_xfrm_add_state (struct net_device *dev, +struct xfrm_state *x,struct netlink_ext_ack *extack) { -struct net_device *netdev = x->xso.real_dev;struct nfp_ipsec_cfg_mssg msg = {};int i, key_len, trunc_len, err =0 ;struct nfp_ipsec_cfg_add_sa *cfg;struct nfp_net *nn;unsigned int saidx; - nn =netdev_priv (netdev); + nn =netdev_priv (dev); cfg = &msg.cfg_add_sa;/* General */
@@ -546,17 +546,16 @@ static int nfp_net_xfrm_add_state(struct xfrm_state *x,return 0 ; } -static void nfp_net_xfrm_del_state (struct xfrm_state *x) +static void nfp_net_xfrm_del_state (struct net_device *dev,struct xfrm_state *x) {struct nfp_ipsec_cfg_mssg msg = { .cmd =NFP_IPSEC_CFG_MSSG_INV_SA , .sa_idx = x->xso.offload_handle -1 , }; -struct net_device *netdev = x->xso.real_dev;struct nfp_net *nn;int err; - nn =netdev_priv (netdev); + nn =netdev_priv (dev); err =nfp_net_sched_mbox_amsg_work (nn,NFP_NET_CFG_MBOX_CMD_IPSEC , &msg,sizeof (msg), nfp_net_ipsec_cfg);if (err)
drivers/net/netdevsim/ipsec.c +7 -8
@@ -85,11 +85,11 @@ static int nsim_ipsec_find_empty_idx(struct nsim_ipsec *ipsec)return -ENOSPC ; } -static int nsim_ipsec_parse_proto_keys (struct xfrm_state *xs, +static int nsim_ipsec_parse_proto_keys (struct net_device *dev, +struct xfrm_state *xs,u32 *mykey,u32 *mysalt) {const char aes_gcm_name[] ="rfc4106(gcm(aes))" ; -struct net_device *dev = xs->xso.real_dev;unsigned char *key_data;char *alg_name =NULL ;int key_len;
@@ -129,17 +129,16 @@ static int nsim_ipsec_parse_proto_keys(struct xfrm_state *xs,return 0 ; } -static int nsim_ipsec_add_sa (struct xfrm_state *xs, +static int nsim_ipsec_add_sa (struct net_device *dev, +struct xfrm_state *xs,struct netlink_ext_ack *extack) {struct nsim_ipsec *ipsec; -struct net_device *dev;struct netdevsim *ns;struct nsim_sa sa;u16 sa_idx;int ret; - dev = xs->xso.real_dev; ns =netdev_priv (dev); ipsec = &ns->ipsec;
@@ -174,7 +173,7 @@ static int nsim_ipsec_add_sa(struct xfrm_state *xs, sa.crypt = xs->ealg || xs->aead;/* get the key and salt */ - ret =nsim_ipsec_parse_proto_keys (xs, sa.key, &sa.salt); + ret =nsim_ipsec_parse_proto_keys (dev, xs, sa.key, &sa.salt);if (ret) {NL_SET_ERR_MSG_MOD (extack,"Failed to get key data for SA table" );return ret;
@@ -200,9 +199,9 @@ static int nsim_ipsec_add_sa(struct xfrm_state *xs,return 0 ; } -static void nsim_ipsec_del_sa (struct xfrm_state *xs) +static void nsim_ipsec_del_sa (struct net_device *dev,struct xfrm_state *xs) { -struct netdevsim *ns =netdev_priv (xs->xso.real_dev); +struct netdevsim *ns =netdev_priv (dev);struct nsim_ipsec *ipsec = &ns->ipsec;u16 sa_idx;
include/linux/netdevice.h +7 -3
@@ -1012,9 +1012,13 @@ struct netdev_bpf { #ifdef CONFIG_XFRM_OFFLOAD struct xfrmdev_ops { - int (*xdo_dev_state_add) (struct xfrm_state *x, struct netlink_ext_ack *extack); - void (*xdo_dev_state_delete) (struct xfrm_state *x); - void (*xdo_dev_state_free) (struct xfrm_state *x); + int (*xdo_dev_state_add)(struct net_device *dev, + struct xfrm_state *x, + struct netlink_ext_ack *extack); + void (*xdo_dev_state_delete)(struct net_device *dev, + struct xfrm_state *x); + void (*xdo_dev_state_free)(struct net_device *dev, + struct xfrm_state *x); bool (*xdo_dev_offload_ok) (struct sk_buff *skb, struct xfrm_state *x); void (*xdo_dev_state_advance_esn) (struct xfrm_state *x);
include/net/xfrm.h +8 -0
@@ -147,8 +147,16 @@ enum { };struct xfrm_dev_offload { +/* The device for this offload. +* Device drivers should not use this directly, as that will prevent +* them from working with bonding device. Instead, the device passed +* to the add/delete callbacks should be used. +*/ struct net_device *dev;netdevice_tracker dev_tracker; +/* This is a private pointer used by the bonding driver. +* Device drivers should not use it. +*/ struct net_device *real_dev;unsigned long offload_handle;u8 dir :2 ;
net/xfrm/xfrm_device.c +1 -3
@@ -314,7 +314,6 @@ int xfrm_dev_state_add(struct net *net, struct xfrm_state *x, xso->dev = dev;netdev_tracker_alloc (dev, &xso->dev_tracker,GFP_ATOMIC ); - xso->real_dev = dev;if (xuo->flags &XFRM_OFFLOAD_INBOUND ) xso->dir =XFRM_DEV_OFFLOAD_IN ;
@@ -326,11 +325,10 @@ int xfrm_dev_state_add(struct net *net, struct xfrm_state *x,else xso->type =XFRM_DEV_OFFLOAD_CRYPTO ; - err = dev->xfrmdev_ops->xdo_dev_state_add (x, extack); + err = dev->xfrmdev_ops->xdo_dev_state_add (dev, x, extack);if (err) { xso->dev =NULL ; xso->dir =0 ; - xso->real_dev =NULL ;netdev_put (dev, &xso->dev_tracker); xso->type =XFRM_DEV_OFFLOAD_UNSPECIFIED ;
net/xfrm/xfrm_state.c +8 -6
@@ -767,7 +767,7 @@ void xfrm_dev_state_delete(struct xfrm_state *x)struct net_device *dev =READ_ONCE (xso->dev);if (dev) { - dev->xfrmdev_ops->xdo_dev_state_delete (x); + dev->xfrmdev_ops->xdo_dev_state_delete (dev, x);spin_lock_bh (&xfrm_state_dev_gc_lock);hlist_add_head (&x->dev_gclist, &xfrm_state_dev_gc_list);spin_unlock_bh (&xfrm_state_dev_gc_lock);
@@ -789,7 +789,7 @@ void xfrm_dev_state_free(struct xfrm_state *x)spin_unlock_bh (&xfrm_state_dev_gc_lock);if (dev->xfrmdev_ops->xdo_dev_state_free) - dev->xfrmdev_ops->xdo_dev_state_free (x); + dev->xfrmdev_ops->xdo_dev_state_free (dev, x);WRITE_ONCE (xso->dev,NULL ); xso->type =XFRM_DEV_OFFLOAD_UNSPECIFIED ;netdev_put (dev, &xso->dev_tracker);
@@ -1548,16 +1548,18 @@ xfrm_state_find(const xfrm_address_t *daddr, const xfrm_address_t *saddr,if (pol->xdo.type ==XFRM_DEV_OFFLOAD_PACKET ) {struct xfrm_dev_offload *xdo = &pol->xdo;struct xfrm_dev_offload *xso = &x->xso; +struct net_device *dev = xdo->dev; xso->type =XFRM_DEV_OFFLOAD_PACKET ; xso->dir = xdo->dir; - xso->dev = xdo->dev; + xso->dev = dev; xso->flags =XFRM_DEV_OFFLOAD_FLAG_ACQ ; -netdev_hold (xso->dev, &xso->dev_tracker,GFP_ATOMIC ); - error = xso->dev->xfrmdev_ops->xdo_dev_state_add (x,NULL ); +netdev_hold (dev, &xso->dev_tracker,GFP_ATOMIC ); + error = dev->xfrmdev_ops->xdo_dev_state_add (dev, x, +NULL );if (error) { xso->dir =0 ; -netdev_put (xso->dev, &xso->dev_tracker); +netdev_put (dev, &xso->dev_tracker); xso->dev =NULL ; xso->type =XFRM_DEV_OFFLOAD_UNSPECIFIED ; x->km.state =XFRM_STATE_DEAD ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 197/780 bonding: Mark active offloaded xfrm_states
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cosmin Ratiu <[email protected]>
[ Upstream commit fd4e41ebf66cb8b43de2f640b97314c4ee3b4499 ]
When the active link is changed for a bond device, the existing xfrm states need to be migrated over to the new link. This is done with:
- bond_ipsec_del_sa_all() goes through the offloaded states list and removes all of them from hw.
- bond_ipsec_add_sa_all() re-offloads all states to the new device.
But because the offload status of xfrm states isn't marked in any way, there can be bugs.
When all bond links are down, bond_ipsec_del_sa_all() unoffloads everything from the previous active link. If the same link then comes back up, nothing gets reoffloaded by bond_ipsec_add_sa_all(). This results in a stack trace like this a bit later when user space removes the offloaded rules, because mlx5e_xfrm_del_state() is asked to remove a rule that's no longer offloaded:
[] Call Trace:
[] <TASK> [] ? __warn+0x7d/0x110 [] ? mlx5e_xfrm_del_state+0x90/0xa0 [mlx5_core] [] ? report_bug+0x16d/0x180 [] ? handle_bug+0x4f/0x90 [] ? exc_invalid_op+0x14/0x70 [] ? asm_exc_invalid_op+0x16/0x20 [] ? mlx5e_xfrm_del_state+0x73/0xa0 [mlx5_core] [] ? mlx5e_xfrm_del_state+0x90/0xa0 [mlx5_core] [] bond_ipsec_del_sa+0x1ab/0x200 [bonding] [] xfrm_dev_state_delete+0x1f/0x60 [] __xfrm_state_delete+0x196/0x200 [] xfrm_state_delete+0x21/0x40 [] xfrm_del_sa+0x69/0x110 [] xfrm_user_rcv_msg+0x11d/0x300 [] ? release_pages+0xca/0x140 [] ? copy_to_user_tmpl.part.0+0x110/0x110 [] netlink_rcv_skb+0x54/0x100 [] xfrm_netlink_rcv+0x31/0x40 [] netlink_unicast+0x1fc/0x2d0 [] netlink_sendmsg+0x1e4/0x410 [] __sock_sendmsg+0x38/0x60 [] sock_write_iter+0x94/0xf0 [] vfs_write+0x338/0x3f0 [] ksys_write+0xba/0xd0 [] do_syscall_64+0x4c/0x100 [] entry_SYSCALL_64_after_hwframe+0x4b/0x53
There's also another theoretical bug:
Calling bond_ipsec_del_sa_all() multiple times can result in corruption in the driver implementation if the double-free isn't tolerated. This isn't nice.
Before the "Fixes" commit, xs->xso.real_dev was set to NULL when an xfrm state was unoffloaded from a device, but a race with netdevsim's .xdo_dev_offload_ok() accessing real_dev was considered a sufficient reason to not set real_dev to NULL anymore. This unfortunately introduced the new bugs.
Since .xdo_dev_offload_ok() was significantly refactored by [1] and there are no more users in the stack of xso.real_dev, that race is now gone and xs->xso.real_dev can now once again be used to represent which device (if any) currently holds the offloaded rule.
Go one step further and set real_dev after add/before delete calls, to catch any future driver misuses of real_dev.
[1] https://lore.kernel.org/netdev/[email protected]/
--- drivers/net/bonding/bond_main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/bonding/bond_main.c +5 -3
@@ -496,9 +496,9 @@ static int bond_ipsec_add_sa(struct net_device *bond_dev, goto out; } - xs->xso.real_dev = real_dev; err = real_dev->xfrmdev_ops->xdo_dev_state_add (real_dev, xs, extack);if (!err) { + xs->xso.real_dev = real_dev; ipsec->xs = xs;INIT_LIST_HEAD (&ipsec->list);mutex_lock (&bond->ipsec_lock);
@@ -540,12 +540,12 @@ static void bond_ipsec_add_sa_all(struct bonding *bond)if (ipsec->xs->xso.real_dev == real_dev)continue ; - ipsec->xs->xso.real_dev = real_dev;if (real_dev->xfrmdev_ops->xdo_dev_state_add (real_dev, ipsec->xs,NULL )) {slave_warn (bond_dev, real_dev,"%s: failed to add SA\n" , __func__); - ipsec->xs->xso.real_dev =NULL ; +continue ; } + ipsec->xs->xso.real_dev = real_dev; } out:mutex_unlock (&bond->ipsec_lock);
@@ -629,6 +629,7 @@ static void bond_ipsec_del_sa_all(struct bonding *bond) __func__);continue ; } + ipsec->xs->xso.real_dev =NULL ; real_dev->xfrmdev_ops->xdo_dev_state_delete (real_dev, ipsec->xs);if (real_dev->xfrmdev_ops->xdo_dev_state_free)
@@ -664,6 +665,7 @@ static void bond_ipsec_free_sa(struct net_device *bond_dev,WARN_ON (xs->xso.real_dev != real_dev); + xs->xso.real_dev =NULL ;if (real_dev && real_dev->xfrmdev_ops && real_dev->xfrmdev_ops->xdo_dev_state_free) real_dev->xfrmdev_ops->xdo_dev_state_free (real_dev, xs);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 198/780 bonding: Fix multiple long standing offload races
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cosmin Ratiu <[email protected]>
[ Upstream commit d2fddbd3479928e52061e1c8dd302006b6283ce8 ]
Refactor the bonding ipsec offload operations to fix a number of long-standing control plane races between state migration and user deletion and a few other issues.
xfrm state deletion can happen concurrently with bond_change_active_slave() operation. This manifests itself as a bond_ipsec_del_sa() call with x->lock held, followed by a bond_ipsec_free_sa() a bit later from a wq. The alternate path of these calls coming from xfrm_dev_state_flush() can't happen, as that needs the RTNL lock and bond_change_active_slave() already holds it.
1. bond_ipsec_del_sa_all() might call xdo_dev_state_delete() a second time on an xfrm state that was concurrently killed. This is bad.
2. bond_ipsec_add_sa_all() can add a state on the new device, but pending bond_ipsec_free_sa() calls from the old device will then hit the WARN_ON() and then, worse, call xdo_dev_state_free() on the new device without a corresponding xdo_dev_state_delete().
3. Resolve a sleeping in atomic context introduced by the mentioned "Fixes" commit.
bond_ipsec_del_sa_all() and bond_ipsec_add_sa_all() now acquire x->lock and check for x->km.state to help with problems 1 and 2. And since xso.real_dev is now a private pointer managed by the bonding driver in xfrm state, make better use of it to fully fix problems 1 and 2. In bond_ipsec_del_sa_all(), set xso.real_dev to NULL while holding both the mutex and x->lock, which makes sure that neither bond_ipsec_del_sa() nor bond_ipsec_free_sa() could run concurrently.
Fix problem 3 by moving the list cleanup (which requires the mutex) from bond_ipsec_del_sa() (called from atomic context) to bond_ipsec_free_sa()
Finally, simplify bond_ipsec_del_sa() and bond_ipsec_free_sa() by using xso->real_dev directly, since it's now protected by locks and can be trusted to always reflect the offload device.
--- drivers/net/bonding/bond_main.c | 82 +++++++++++++++------------------ include/net/xfrm.h | 7 ++- 2 files changed, 41 insertions(+), 48 deletions(-)
drivers/net/bonding/bond_main.c +36 -46
@@ -545,7 +545,20 @@ static void bond_ipsec_add_sa_all(struct bonding *bond)slave_warn (bond_dev, real_dev,"%s: failed to add SA\n" , __func__);continue ; } + +spin_lock_bh (&ipsec->xs->lock); +/* xs might have been killed by the user during the migration +* to the new dev, but bond_ipsec_del_sa() should have done +* nothing, as xso.real_dev is NULL. +* Delete it from the device we just added it to. The pending +* bond_ipsec_free_sa() call will do the rest of the cleanup. +*/ +if (ipsec->xs->km.state ==XFRM_STATE_DEAD && + real_dev->xfrmdev_ops->xdo_dev_state_delete) + real_dev->xfrmdev_ops->xdo_dev_state_delete (real_dev, + ipsec->xs); ipsec->xs->xso.real_dev = real_dev; +spin_unlock_bh (&ipsec->xs->lock); } out:mutex_unlock (&bond->ipsec_lock);
@@ -560,48 +573,20 @@ static void bond_ipsec_del_sa(struct net_device *bond_dev, struct xfrm_state *xs) {struct net_device *real_dev; -netdevice_tracker tracker; -struct bond_ipsec *ipsec; -struct bonding *bond; -struct slave *slave; -if (!bond_dev) +if (!bond_dev || !xs->xso.real_dev)return ; -rcu_read_lock (); - bond =netdev_priv (bond_dev); - slave =rcu_dereference (bond->curr_active_slave); - real_dev = slave ? slave->dev :NULL ; -netdev_hold (real_dev, &tracker,GFP_ATOMIC ); -rcu_read_unlock (); - -if (!slave) - goto out; - -if (!xs->xso.real_dev) - goto out; - -WARN_ON (xs->xso.real_dev != real_dev); + real_dev = xs->xso.real_dev;if (!real_dev->xfrmdev_ops || !real_dev->xfrmdev_ops->xdo_dev_state_delete ||netif_is_bond_master (real_dev)) {slave_warn (bond_dev, real_dev,"%s: no slave xdo_dev_state_delete\n" , __func__); - goto out; +return ; } real_dev->xfrmdev_ops->xdo_dev_state_delete (real_dev, xs); -out: -netdev_put (real_dev, &tracker); -mutex_lock (&bond->ipsec_lock); -list_for_each_entry (ipsec, &bond->ipsec_list, list) { -if (ipsec->xs == xs) { -list_del (&ipsec->list); -kfree (ipsec); -break ; - } - } -mutex_unlock (&bond->ipsec_lock); }static void bond_ipsec_del_sa_all (struct bonding *bond)
@@ -629,9 +614,15 @@ static void bond_ipsec_del_sa_all(struct bonding *bond) __func__);continue ; } + +spin_lock_bh (&ipsec->xs->lock); ipsec->xs->xso.real_dev =NULL ; - real_dev->xfrmdev_ops->xdo_dev_state_delete (real_dev, - ipsec->xs); +/* Don't double delete states killed by the user. */ +if (ipsec->xs->km.state !=XFRM_STATE_DEAD ) + real_dev->xfrmdev_ops->xdo_dev_state_delete (real_dev, + ipsec->xs); +spin_unlock_bh (&ipsec->xs->lock); +if (real_dev->xfrmdev_ops->xdo_dev_state_free) real_dev->xfrmdev_ops->xdo_dev_state_free (real_dev, ipsec->xs);
@@ -643,34 +634,33 @@ static void bond_ipsec_free_sa(struct net_device *bond_dev, struct xfrm_state *xs) {struct net_device *real_dev; -netdevice_tracker tracker; +struct bond_ipsec *ipsec;struct bonding *bond; -struct slave *slave;if (!bond_dev)return ; -rcu_read_lock (); bond =netdev_priv (bond_dev); - slave =rcu_dereference (bond->curr_active_slave); - real_dev = slave ? slave->dev :NULL ; -netdev_hold (real_dev, &tracker,GFP_ATOMIC ); -rcu_read_unlock (); - -if (!slave) - goto out; +mutex_lock (&bond->ipsec_lock);if (!xs->xso.real_dev) goto out; -WARN_ON (xs->xso.real_dev != real_dev); + real_dev = xs->xso.real_dev; xs->xso.real_dev =NULL ; -if (real_dev && real_dev->xfrmdev_ops && +if (real_dev->xfrmdev_ops && real_dev->xfrmdev_ops->xdo_dev_state_free) real_dev->xfrmdev_ops->xdo_dev_state_free (real_dev, xs); out: -netdev_put (real_dev, &tracker); +list_for_each_entry (ipsec, &bond->ipsec_list, list) { +if (ipsec->xs == xs) { +list_del (&ipsec->list); +kfree (ipsec); +break ; + } + } +mutex_unlock (&bond->ipsec_lock); }/**
include/net/xfrm.h +5 -2
@@ -154,8 +154,11 @@ struct xfrm_dev_offload {*/ struct net_device *dev;netdevice_tracker dev_tracker; -/* This is a private pointer used by the bonding driver. -* Device drivers should not use it. +/* This is a private pointer used by the bonding driver (and eventually +* should be moved there). Device drivers should not use it. +* Protected by xfrm_state.lock AND bond.ipsec_lock in most cases, +* except in the .xdo_dev_state_del() flow, where only xfrm_state.lock +* is held. */ struct net_device *real_dev;unsigned long offload_handle;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 199/780 wifi: rtw88: sdio: map mgmt frames to queue TX_DESC_QSEL_MGMT
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhen XIN <[email protected]>
[ Upstream commit b2effcdc237979dcc533d446a792fc54fd0e1213 ]
The rtw88-sdio do not work in AP mode due to the lack of TX status report for management frames.
Map the management frames to queue TX_DESC_QSEL_MGMT, which enables the chip to generate TX reports for these frames
Tested-on: rtl8723ds
--- drivers/net/wireless/realtek/rtw88/sdio.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/net/wireless/realtek/rtw88/sdio.c +1 -4
@@ -718,10 +718,7 @@ static u8 rtw_sdio_get_tx_qsel(struct rtw_dev *rtwdev, struct sk_buff *skb,case RTW_TX_QUEUE_H2C :return TX_DESC_QSEL_H2C ;case RTW_TX_QUEUE_MGMT : -if (rtw_chip_wcpu_11n (rtwdev)) -return TX_DESC_QSEL_HIGH ; -else -return TX_DESC_QSEL_MGMT ; +return TX_DESC_QSEL_MGMT ;case RTW_TX_QUEUE_HI0 :return TX_DESC_QSEL_HIGH ;default :
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 200/780 wifi: rtw88: sdio: call rtw_sdio_indicate_tx_status unconditionally
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhen XIN <[email protected]>
[ Upstream commit fc5f5a0ec463ae6a07850428bd3082947e01d276 ]
The rtw88-sdio do not work in AP mode due to the lack of TX status report for management frames.
Make the invocation of rtw_sdio_indicate_tx_status unconditional and cover all packet queues
Tested-on: rtl8723ds
--- drivers/net/wireless/realtek/rtw88/sdio.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/net/wireless/realtek/rtw88/sdio.c +1 -4
@@ -1224,10 +1224,7 @@ static void rtw_sdio_process_tx_queue(struct rtw_dev *rtwdev,return ; } -if (queue <=RTW_TX_QUEUE_VO ) -rtw_sdio_indicate_tx_status (rtwdev, skb); -else -dev_kfree_skb_any (skb); +rtw_sdio_indicate_tx_status (rtwdev, skb); }static void rtw_sdio_tx_handler (struct work_struct *work)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 201/780 wifi: rtw88: do not ignore hardware read error during DPK
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Antipov <[email protected]>
[ Upstream commit 20d3c19bd8f9b498173c198eadf54580c8caa336 ]
In 'rtw8822c_dpk_cal_coef1()', do not ignore error returned by 'check_hw_ready()' but issue a warning to denote possible DPK issue. Compile tested only.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/net/wireless/realtek/rtw88/rtw8822c.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw88/rtw8822c.c +2 -1
@@ -3951,7 +3951,8 @@ static void rtw8822c_dpk_cal_coef1(struct rtw_dev *rtwdev)rtw_write32 (rtwdev,REG_NCTL0 ,0x00001148 );rtw_write32 (rtwdev,REG_NCTL0 ,0x00001149 ); -check_hw_ready (rtwdev,0x2d9c ,MASKBYTE0 ,0x55 ); +if (!check_hw_ready (rtwdev,0x2d9c ,MASKBYTE0 ,0x55 )) +rtw_warn (rtwdev,"DPK stuck, performance may be suboptimal" );rtw_write8 (rtwdev,0x1b10 ,0x0 );rtw_write32_mask (rtwdev,REG_NCTL0 ,BIT_SUBPAGE ,0x0000000c );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 202/780 wifi: ath12k: Handle error cases during extended skb allocation
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: P Praneesh <[email protected]>
[ Upstream commit 37a068fc9dc4feb8d76e8896bb33883d06c11a6b ]
Currently, in the case of extended skb allocation, the buffer is freed before the DMA unmap operation. This premature deletion can result in skb->data corruption, as the memory region could be re-allocated for other purposes. Fix this issue by reordering the failure cases by calling dma_unmap_single() first, then followed by the corresponding kfree_skb(). This helps avoid data corruption in case of failures in dp_tx().
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
--- drivers/net/wireless/ath/ath12k/dp_tx.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/net/wireless/ath/ath12k/dp_tx.c +11 -11
@@ -229,7 +229,7 @@ int ath12k_dp_tx(struct ath12k *ar, struct ath12k_link_vif *arvif,struct ath12k_skb_cb *skb_cb =ATH12K_SKB_CB (skb);struct hal_tcl_data_cmd *hal_tcl_desc;struct hal_tx_msdu_ext_desc *msg; -struct sk_buff *skb_ext_desc; +struct sk_buff *skb_ext_desc =NULL ;struct hal_srng *tcl_ring;struct ieee80211_hdr *hdr = (void *)skb->data;struct ath12k_vif *ahvif = arvif->ahvif;
@@ -415,18 +415,15 @@ int ath12k_dp_tx(struct ath12k *ar, struct ath12k_link_vif *arvif,if (ret <0 ) {ath12k_dbg (ab,ATH12K_DBG_DP_TX ,"Failed to add HTT meta data, dropping packet\n" ); -kfree_skb (skb_ext_desc); - goto fail_unmap_dma; + goto fail_free_ext_skb; } } ti.paddr =dma_map_single (ab->dev, skb_ext_desc->data, skb_ext_desc->len,DMA_TO_DEVICE ); ret =dma_mapping_error (ab->dev, ti.paddr); -if (ret) { -kfree_skb (skb_ext_desc); - goto fail_unmap_dma; - } +if (ret) + goto fail_free_ext_skb; ti.data_len = skb_ext_desc->len; ti.type =HAL_TCL_DESC_TYPE_EXT_DESC ;
@@ -462,7 +459,7 @@ int ath12k_dp_tx(struct ath12k *ar, struct ath12k_link_vif *arvif, ring_selector++; } - goto fail_unmap_dma; + goto fail_unmap_dma_ext; }ath12k_hal_tx_cmd_desc_setup (ab, hal_tcl_desc, &ti);
@@ -478,13 +475,16 @@ int ath12k_dp_tx(struct ath12k *ar, struct ath12k_link_vif *arvif,return 0 ; -fail_unmap_dma: -dma_unmap_single (ab->dev, ti.paddr, ti.data_len,DMA_TO_DEVICE ); - +fail_unmap_dma_ext:if (skb_cb->paddr_ext_desc)dma_unmap_single (ab->dev, skb_cb->paddr_ext_desc,sizeof (struct hal_tx_msdu_ext_desc ),DMA_TO_DEVICE ); +fail_free_ext_skb: +kfree_skb (skb_ext_desc); + +fail_unmap_dma: +dma_unmap_single (ab->dev, ti.paddr, ti.data_len,DMA_TO_DEVICE ); fail_remove_tx_buf:ath12k_dp_tx_release_txbuf (dp, tx_desc, pool_id);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 203/780 wifi: ath12k: fix invalid access to memory
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sarika Sharma <[email protected]>
[ Upstream commit 9f17747fbda6fca934854463873c4abf8061491d ]
In ath12k_dp_rx_msdu_coalesce(), rxcb is fetched from skb and boolean is_continuation is part of rxcb.
Currently, after freeing the skb, the rxcb->is_continuation accessed again which is wrong since the memory is already freed. This might lead use-after-free error.
Hence, fix by locally defining bool is_continuation from rxcb, so that after freeing skb, is_continuation can be used.
Compile tested only.
--- drivers/net/wireless/ath/ath12k/dp_rx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath12k/dp_rx.c +4 -2
@@ -1817,6 +1817,7 @@ static int ath12k_dp_rx_msdu_coalesce(struct ath12k *ar,struct hal_rx_desc *ldesc;int space_extra, rem_len, buf_len;u32 hal_rx_desc_sz = ar->ab->hal.hal_desc_sz; +bool is_continuation;/* As the msdu is spread across multiple rx buffers, * find the offset to the start of msdu for computing
@@ -1865,7 +1866,8 @@ static int ath12k_dp_rx_msdu_coalesce(struct ath12k *ar, rem_len = msdu_len - buf_first_len;while ((skb =__skb_dequeue (msdu_list)) !=NULL && rem_len >0 ) { rxcb =ATH12K_SKB_RXCB (skb); -if (rxcb->is_continuation) + is_continuation = rxcb->is_continuation; +if (is_continuation) buf_len =DP_RX_BUFFER_SIZE - hal_rx_desc_sz;else buf_len = rem_len;
@@ -1883,7 +1885,7 @@ static int ath12k_dp_rx_msdu_coalesce(struct ath12k *ar,dev_kfree_skb_any (skb); rem_len -= buf_len; -if (!rxcb->is_continuation) +if (!is_continuation)break ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 204/780 wifi: ath12k: Add MSDU length validation for TKIP MIC error
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: P Praneesh <[email protected]>
[ Upstream commit 763216fe6c5df95d122c71ef34c342427c987820 ]
In the WBM error path, while processing TKIP MIC errors, MSDU length is fetched from the hal_rx_desc's msdu_end. This MSDU length is directly passed to skb_put() without validation. In stress test scenarios, the WBM error ring may receive invalid descriptors, which could lead to an invalid MSDU length.
To fix this, add a check to drop the skb when the calculated MSDU length is greater than the skb size.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
--- drivers/net/wireless/ath/ath12k/dp_rx.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/net/wireless/ath/ath12k/dp_rx.c +9 -0
@@ -3824,6 +3824,15 @@ static bool ath12k_dp_rx_h_tkip_mic_err(struct ath12k *ar, struct sk_buff *msdu, l3pad_bytes =ath12k_dp_rx_h_l3pad (ab, desc); msdu_len =ath12k_dp_rx_h_msdu_len (ab, desc); + +if ((hal_rx_desc_sz + l3pad_bytes + msdu_len) >DP_RX_BUFFER_SIZE ) { +ath12k_dbg (ab,ATH12K_DBG_DATA , +"invalid msdu len in tkip mic err %u\n" , msdu_len); +ath12k_dbg_dump (ab,ATH12K_DBG_DATA ,NULL ,"" , desc, +sizeof (*desc)); +return true; + } +skb_put (msdu, hal_rx_desc_sz + l3pad_bytes + msdu_len);skb_pull (msdu, hal_rx_desc_sz + l3pad_bytes);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 205/780 wifi: ath12k: Fix the QoS control field offset to build QoS header
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ramasamy Kaliappan <[email protected]>
[ Upstream commit 8599d4cc4191c8c1af34207a8b9414acca4afb59 ]
Currently, in the mac80211 layer, received EAPOL packets are dropped when the HT control field is present in the QoS header. This issue arises due to an incorrect QoS control field offset used to build the QoS header in the MSDU data, leading to a corrupted header in the mac80211 layer. This issue also applies to other frames that contain the QoS control field, such as QoS data or Null frames. To resolve this, use ieee80211_get_qos_ctl() to obtain the correct QoS control offset from the MSDU data. Additionally, ensure the QoS control header is copied in little-endian format within the MSDU data.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
--- drivers/net/wireless/ath/ath12k/dp_rx.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/net/wireless/ath/ath12k/dp_rx.c +6 -6
@@ -2119,7 +2119,7 @@ static void ath12k_get_dot11_hdr_from_rx_desc(struct ath12k *ar,struct ath12k_base *ab = ar->ab;size_t hdr_len, crypto_len;struct ieee80211_hdr hdr; -u16 qos_ctl; +__le16 qos_ctl;u8 *crypto_hdr, mesh_ctrl;ath12k_dp_rx_desc_get_dot11_hdr (ab, rx_desc, &hdr);
@@ -2140,13 +2140,13 @@ static void ath12k_get_dot11_hdr_from_rx_desc(struct ath12k *ar,/* Add QOS header */ if (ieee80211_is_data_qos (hdr.frame_control)) { - qos_ctl = rxcb->tid; +struct ieee80211_hdr *qos_ptr = (struct ieee80211_hdr *)msdu->data; + + qos_ctl =cpu_to_le16 (rxcb->tid &IEEE80211_QOS_CTL_TID_MASK );if (mesh_ctrl) - qos_ctl |=IEEE80211_QOS_CTL_MESH_CONTROL_PRESENT ; + qos_ctl |=cpu_to_le16 (IEEE80211_QOS_CTL_MESH_CONTROL_PRESENT ); -/* TODO: Add other QoS ctl fields when required */ -memcpy (msdu->data + (hdr_len -IEEE80211_QOS_CTL_LEN ), - &qos_ctl,IEEE80211_QOS_CTL_LEN ); +memcpy (ieee80211_get_qos_ctl (qos_ptr), &qos_ctl,IEEE80211_QOS_CTL_LEN ); } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 206/780 wifi: ath12k: Add extra TLV tag parsing support in monitor Rx path
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: P Praneesh <[email protected]>
[ Upstream commit 3973cda5ef496fd412fdec2c7c3403ac90e391b8 ]
Currently, the monitor Rx parser handler is inherited from the ath11k. However, the ath12k 802.11be hardware does not report the Rx TLV header in the MSDU data. Instead, the hardware reports those TLVs under the following TLV tags:
1. Buffer address
2. MPDU start
3. MPDU end
4. MSDU end
Therefore, add support for parsing the above TLVs in the Rx monitor path and use this information for MSDU buffer and status updates.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
Stable-dep-of: f5d6b15d9503 ("wifi: ath12k: fix wrong handling of CCMP256 and GCMP ciphers")
--- drivers/net/wireless/ath/ath12k/dp.h | 2 + drivers/net/wireless/ath/ath12k/dp_mon.c | 157 ++++++++++++++++++++++- drivers/net/wireless/ath/ath12k/dp_mon.h | 4 +- drivers/net/wireless/ath/ath12k/dp_rx.c | 2 + drivers/net/wireless/ath/ath12k/hal_rx.h | 12 +- 5 files changed, 170 insertions(+), 7 deletions(-)
drivers/net/wireless/ath/ath12k/dp.h +2 -0
@@ -106,6 +106,8 @@ struct dp_mon_mpdu {struct list_head list;struct sk_buff *head;struct sk_buff *tail; +u32 err_bitmap; +u8 decap_format; };#define DP_MON_MAX_STATUS_BUF 32
drivers/net/wireless/ath/ath12k/dp_mon.c +152 -5
201 lines not on this page · raw message
drivers/net/wireless/ath/ath12k/dp_mon.h +3 -1
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved. -* Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH12K_DP_MON_H
@@ -9,6 +9,8 @@#include "core.h" +#define ATH12K_MON_RX_DOT11_OFFSET 5 +enum dp_monitor_mode {ATH12K_DP_TX_MONITOR_MODE ,ATH12K_DP_RX_MONITOR_MODE
drivers/net/wireless/ath/ath12k/dp_rx.c +2 -0
@@ -4482,6 +4482,8 @@ int ath12k_dp_rx_pdev_mon_attach(struct ath12k *ar) pmon->mon_last_linkdesc_paddr =0 ; pmon->mon_last_buf_cookie =DP_RX_DESC_COOKIE_MAX +1 ; +INIT_LIST_HEAD (&pmon->dp_rx_mon_mpdu_list); + pmon->mon_mpdu =NULL ;spin_lock_init (&pmon->mon_lock);return 0 ;
drivers/net/wireless/ath/ath12k/hal_rx.h +11 -1
@@ -108,11 +108,12 @@ enum hal_rx_mon_status {HAL_RX_MON_STATUS_PPDU_DONE ,HAL_RX_MON_STATUS_BUF_DONE ,HAL_RX_MON_STATUS_BUF_ADDR , +HAL_RX_MON_STATUS_MPDU_START ,HAL_RX_MON_STATUS_MPDU_END , HAL_RX_MON_STATUS_MSDU_END, }; -#define HAL_RX_MAX_MPDU 256 +#define HAL_RX_MAX_MPDU 1024#define HAL_RX_NUM_WORDS_PER_PPDU_BITMAP (HAL_RX_MAX_MPDU >> 5) struct hal_rx_user_status {
@@ -506,6 +507,15 @@ struct hal_rx_mpdu_start {__le32 rsvd2[16 ]; } __packed; +struct hal_rx_msdu_end { +__le32 info0; +__le32 rsvd0[18 ]; +__le32 info1; +__le32 rsvd1[10 ]; +__le32 info2; +__le32 rsvd2; +} __packed; +#define HAL_RX_PPDU_END_DURATION GENMASK(23, 0)struct hal_rx_ppdu_end_duration {__le32 rsvd0[9 ];
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 207/780 wifi: ath12k: Avoid fetch Error bitmap and decap format from Rx TLV
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: P Praneesh <[email protected]>
[ Upstream commit a6621bf6397ae6981b5041ba0a127e7dbeade746 ]
Currently, error bitmap and decap format information are fetched from the MSDU Rx TLV data. This logic is inherited from ath11k. However, for ath12k 802.11be hardware, the Rx TLV will not be present in the MSDU data. Instead, this information is reported separately under the MSDU END TLV tag. Therefore, remove the existing fetch code, handle the MSDU END TLV tag and fetch the above information to store it in the mon_mpdu data structure for use in the merge MSDU procedure.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
Stable-dep-of: f5d6b15d9503 ("wifi: ath12k: fix wrong handling of CCMP256 and GCMP ciphers")
--- drivers/net/wireless/ath/ath12k/dp_mon.c | 58 ++++++++++-------------- 1 file changed, 23 insertions(+), 35 deletions(-)
drivers/net/wireless/ath/ath12k/dp_mon.c +23 -35
@@ -1702,30 +1702,26 @@ static void ath12k_dp_mon_rx_msdus_set_payload(struct ath12k *ar,static struct sk_buff *ath12k_dp_mon_rx_merg_msdus (struct ath12k *ar, -struct sk_buff *head_msdu,struct sk_buff *tail_msdu, -struct ieee80211_rx_status *rxs,bool *fcs_err) +struct dp_mon_mpdu *mon_mpdu, +struct ieee80211_rx_status *rxs) {struct ath12k_base *ab = ar->ab;struct sk_buff *msdu, *mpdu_buf, *prev_buf, *head_frag_list; +struct sk_buff *head_msdu, *tail_msdu;struct hal_rx_desc *rx_desc, *tail_rx_desc; -u8 *hdr_desc, *dest, decap_format; +u8 *hdr_desc, *dest, decap_format = mon_mpdu->decap_format;struct ieee80211_hdr_3addr *wh; -u32 err_bitmap, frag_list_sum_len =0 ; +u32 frag_list_sum_len =0 ; mpdu_buf =NULL ; + head_msdu = mon_mpdu->head; + tail_msdu = mon_mpdu->tail;if (!head_msdu) goto err_merge_fail; - rx_desc = (struct hal_rx_desc *)head_msdu->data; tail_rx_desc = (struct hal_rx_desc *)tail_msdu->data; - err_bitmap =ath12k_dp_rx_h_mpdu_err (ab, tail_rx_desc); -if (err_bitmap &HAL_RX_MPDU_ERR_FCS ) - *fcs_err = true; - - decap_format =ath12k_dp_rx_h_decap_type (ab, tail_rx_desc); -ath12k_dp_rx_h_ppdu (ar, tail_rx_desc, rxs);if (decap_format ==DP_RX_DECAP_TYPE_RAW ) {
@@ -1954,7 +1950,8 @@ static void ath12k_dp_mon_update_radiotap(struct ath12k *ar, static void ath12k_dp_mon_rx_deliver_msdu(struct ath12k *ar, struct napi_struct *napi, struct sk_buff *msdu, - struct ieee80211_rx_status *status) + struct ieee80211_rx_status *status, + u8 decap) { static const struct ieee80211_radiotap_he known = { .data1 = cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA1_DATA_MCS_KNOWN |
@@ -1966,7 +1963,6 @@ static void ath12k_dp_mon_rx_deliver_msdu(struct ath12k *ar, struct napi_structstruct ieee80211_sta *pubsta =NULL ;struct ath12k_peer *peer;struct ath12k_skb_rxcb *rxcb =ATH12K_SKB_RXCB (msdu); -u8 decap =DP_RX_DECAP_TYPE_RAW ;bool is_mcbc = rxcb->is_mcbc;bool is_eapol_tkip = rxcb->is_eapol;
@@ -1977,8 +1973,6 @@ static void ath12k_dp_mon_rx_deliver_msdu(struct ath12k *ar, struct napi_struct status->flag |=RX_FLAG_RADIOTAP_HE ; } -if (!(status->flag &RX_FLAG_ONLY_MONITOR )) - decap =ath12k_dp_rx_h_decap_type (ar->ab, rxcb->rx_desc);spin_lock_bh (&ar->ab->base_lock); peer =ath12k_dp_rx_h_find_peer (ar->ab, msdu);if (peer && peer->sta) {
@@ -2035,25 +2029,23 @@ static void ath12k_dp_mon_rx_deliver_msdu(struct ath12k *ar, struct napi_struct }static int ath12k_dp_mon_rx_deliver (struct ath12k *ar, -struct sk_buff *head_msdu,struct sk_buff *tail_msdu, +struct dp_mon_mpdu *mon_mpdu,struct hal_rx_mon_ppdu_info *ppduinfo,struct napi_struct *napi) {struct ath12k_pdev_dp *dp = &ar->dp;struct sk_buff *mon_skb, *skb_next, *header;struct ieee80211_rx_status *rxs = &dp->rx_status; -bool fcs_err = false; +u8 decap =DP_RX_DECAP_TYPE_RAW ; - mon_skb =ath12k_dp_mon_rx_merg_msdus (ar, - head_msdu, tail_msdu, - rxs, &fcs_err); + mon_skb =ath12k_dp_mon_rx_merg_msdus (ar, mon_mpdu, rxs);if (!mon_skb) goto mon_deliver_fail; header = mon_skb; rxs->flag =0 ; -if (fcs_err) +if (mon_mpdu->err_bitmap &HAL_RX_MPDU_ERR_FCS ) rxs->flag =RX_FLAG_FAILED_FCS_CRC ; do {
@@ -2070,8 +2062,12 @@ static int ath12k_dp_mon_rx_deliver(struct ath12k *ar, rxs->flag |=RX_FLAG_ALLOW_SAME_PN ; } rxs->flag |=RX_FLAG_ONLY_MONITOR ; + +if (!(rxs->flag &RX_FLAG_ONLY_MONITOR )) + decap = mon_mpdu->decap_format; +ath12k_dp_mon_update_radiotap (ar, ppduinfo, mon_skb, rxs); -ath12k_dp_mon_rx_deliver_msdu (ar, napi, mon_skb, rxs); +ath12k_dp_mon_rx_deliver_msdu (ar, napi, mon_skb, rxs, decap); mon_skb = skb_next; }while (mon_skb); rxs->flag =0 ;
@@ -2079,7 +2075,7 @@ static int ath12k_dp_mon_rx_deliver(struct ath12k *ar,return 0 ; mon_deliver_fail: - mon_skb = head_msdu; + mon_skb = mon_mpdu->head;while (mon_skb) { skb_next = mon_skb->next;dev_kfree_skb_any (mon_skb);
@@ -2285,7 +2281,6 @@ ath12k_dp_mon_rx_parse_mon_status(struct ath12k *ar,struct hal_rx_mon_ppdu_info *ppdu_info = &pmon->mon_ppdu_info;struct dp_mon_mpdu *tmp;struct dp_mon_mpdu *mon_mpdu = pmon->mon_mpdu; -struct sk_buff *head_msdu, *tail_msdu;enum hal_rx_mon_status hal_status; hal_status =ath12k_dp_mon_parse_rx_dest (ar, pmon, skb);
@@ -2294,13 +2289,9 @@ ath12k_dp_mon_rx_parse_mon_status(struct ath12k *ar,list_for_each_entry_safe (mon_mpdu, tmp, &pmon->dp_rx_mon_mpdu_list, list) {list_del (&mon_mpdu->list); - head_msdu = mon_mpdu->head; - tail_msdu = mon_mpdu->tail; -if (head_msdu && tail_msdu) { -ath12k_dp_mon_rx_deliver (ar, head_msdu, - tail_msdu, ppdu_info, napi); - } +if (mon_mpdu->head && mon_mpdu->tail) +ath12k_dp_mon_rx_deliver (ar, mon_mpdu, ppdu_info, napi);kfree (mon_mpdu); }
@@ -2985,16 +2976,13 @@ ath12k_dp_mon_tx_process_ppdu_info(struct ath12k *ar, struct dp_mon_tx_ppdu_info *tx_ppdu_info) {struct dp_mon_mpdu *tmp, *mon_mpdu; -struct sk_buff *head_msdu, *tail_msdu;list_for_each_entry_safe (mon_mpdu, tmp, &tx_ppdu_info->dp_tx_mon_mpdu_list, list) {list_del (&mon_mpdu->list); - head_msdu = mon_mpdu->head; - tail_msdu = mon_mpdu->tail; -if (head_msdu) -ath12k_dp_mon_rx_deliver (ar, head_msdu, tail_msdu, +if (mon_mpdu->head) +ath12k_dp_mon_rx_deliver (ar, mon_mpdu, &tx_ppdu_info->rx_status, napi);kfree (mon_mpdu);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 208/780 wifi: ath12k: Replace band define G with GHZ where appropriate
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Karthikeyan Periyasamy <[email protected]>
[ Upstream commit 6a88093f79ea0b131e5feab9cdc045a007fad26e ]
Currently, band define and enum are with the word 'G'. Replace it with more appropriate 'GHZ' for clarity and correctness.
No functional changes. Only compile tested.
Stable-dep-of: f5d6b15d9503 ("wifi: ath12k: fix wrong handling of CCMP256 and GCMP ciphers")
--- drivers/net/wireless/ath/ath12k/core.h | 8 ++-- drivers/net/wireless/ath/ath12k/debugfs.c | 4 +- drivers/net/wireless/ath/ath12k/dp_rx.c | 4 +- drivers/net/wireless/ath/ath12k/mac.c | 52 +++++++++++------------ drivers/net/wireless/ath/ath12k/wmi.c | 36 ++++++++-------- drivers/net/wireless/ath/ath12k/wmi.h | 16 +++---- 6 files changed, 60 insertions(+), 60 deletions(-)
drivers/net/wireless/ath/ath12k/core.h +4 -4
@@ -533,11 +533,11 @@ struct ath12k_sta {enum ieee80211_sta_state state; }; -#define ATH12K_MIN_5G_FREQ 4150 -#define ATH12K_MIN_6G_FREQ 5925 -#define ATH12K_MAX_6G_FREQ 7115 +#define ATH12K_MIN_5GHZ_FREQ 4150 +#define ATH12K_MIN_6GHZ_FREQ 5925 +#define ATH12K_MAX_6GHZ_FREQ 7115#define ATH12K_NUM_CHANS 101 -#define ATH12K_MAX_5G_CHAN 173 +#define ATH12K_MAX_5GHZ_CHAN 173enum ath12k_hw_state {ATH12K_HW_STATE_OFF ,
drivers/net/wireless/ath/ath12k/debugfs.c +2 -2
@@ -88,8 +88,8 @@ static int ath12k_get_tpc_ctl_mode_idx(struct wmi_tpc_stats_arg *tpc_stats,u32 chan_freq =le32_to_cpu (tpc_stats->tpc_config.chan_freq);u8 band; - band = ((chan_freq >ATH12K_MIN_6G_FREQ ) ?NL80211_BAND_6GHZ : - ((chan_freq >ATH12K_MIN_5G_FREQ ) ?NL80211_BAND_5GHZ : + band = ((chan_freq >ATH12K_MIN_6GHZ_FREQ ) ?NL80211_BAND_6GHZ : + ((chan_freq >ATH12K_MIN_5GHZ_FREQ ) ?NL80211_BAND_5GHZ :NL80211_BAND_2GHZ ));if (band ==NL80211_BAND_5GHZ || band ==NL80211_BAND_6GHZ ) {
drivers/net/wireless/ath/ath12k/dp_rx.c +2 -2
@@ -2426,8 +2426,8 @@ void ath12k_dp_rx_h_ppdu(struct ath12k *ar, struct hal_rx_desc *rx_desc, channel_num = meta_data; center_freq = meta_data >>16 ; -if (center_freq >=ATH12K_MIN_6G_FREQ && - center_freq <=ATH12K_MAX_6G_FREQ ) { +if (center_freq >=ATH12K_MIN_6GHZ_FREQ && + center_freq <=ATH12K_MAX_6GHZ_FREQ ) { rx_status->band =NL80211_BAND_6GHZ ; rx_status->freq = center_freq; }else if (channel_num >=1 && channel_num <=14 ) {
drivers/net/wireless/ath/ath12k/mac.c +26 -26
183 lines not on this page · raw message
drivers/net/wireless/ath/ath12k/wmi.c +18 -18
@@ -520,10 +520,10 @@ ath12k_pull_mac_phy_cap_svc_ready_ext(struct ath12k_wmi_pdev *wmi_handle,* band to band for a single radio, need to see how this should be * handled. */ -if (le32_to_cpu (mac_caps->supported_bands) &WMI_HOST_WLAN_2G_CAP ) { +if (le32_to_cpu (mac_caps->supported_bands) &WMI_HOST_WLAN_2GHZ_CAP ) { pdev_cap->tx_chain_mask =le32_to_cpu (mac_caps->tx_chain_mask_2g); pdev_cap->rx_chain_mask =le32_to_cpu (mac_caps->rx_chain_mask_2g); - }else if (le32_to_cpu (mac_caps->supported_bands) &WMI_HOST_WLAN_5G_CAP ) { + }else if (le32_to_cpu (mac_caps->supported_bands) &WMI_HOST_WLAN_5GHZ_CAP ) { pdev_cap->vht_cap =le32_to_cpu (mac_caps->vht_cap_info_5g); pdev_cap->vht_mcs =le32_to_cpu (mac_caps->vht_supp_mcs_5g); pdev_cap->he_mcs =le32_to_cpu (mac_caps->he_supp_mcs_5g);
@@ -546,7 +546,7 @@ ath12k_pull_mac_phy_cap_svc_ready_ext(struct ath12k_wmi_pdev *wmi_handle, pdev_cap->rx_chain_mask_shift =find_first_bit ((unsigned long *)&pdev_cap->rx_chain_mask,32 ); -if (le32_to_cpu (mac_caps->supported_bands) &WMI_HOST_WLAN_2G_CAP ) { +if (le32_to_cpu (mac_caps->supported_bands) &WMI_HOST_WLAN_2GHZ_CAP ) { cap_band = &pdev_cap->band[NL80211_BAND_2GHZ ]; cap_band->phy_id =le32_to_cpu (mac_caps->phy_id); cap_band->max_bw_supported =le32_to_cpu (mac_caps->max_bw_supported_2g);
@@ -566,7 +566,7 @@ ath12k_pull_mac_phy_cap_svc_ready_ext(struct ath12k_wmi_pdev *wmi_handle,le32_to_cpu (mac_caps->he_ppet2g.ppet16_ppet8_ru3_ru0[i]); } -if (le32_to_cpu (mac_caps->supported_bands) &WMI_HOST_WLAN_5G_CAP ) { +if (le32_to_cpu (mac_caps->supported_bands) &WMI_HOST_WLAN_5GHZ_CAP ) { cap_band = &pdev_cap->band[NL80211_BAND_5GHZ ]; cap_band->phy_id =le32_to_cpu (mac_caps->phy_id); cap_band->max_bw_supported =
@@ -3646,15 +3646,15 @@ ath12k_fill_band_to_mac_param(struct ath12k_base *soc, arg[i].pdev_id = pdev->pdev_id;switch (pdev->cap.supported_bands) { -case WMI_HOST_WLAN_2G_5G_CAP : +case WMI_HOST_WLAN_2GHZ_5GHZ_CAP : arg[i].start_freq = hal_reg_cap->low_2ghz_chan; arg[i].end_freq = hal_reg_cap->high_5ghz_chan;break ; -case WMI_HOST_WLAN_2G_CAP : +case WMI_HOST_WLAN_2GHZ_CAP : arg[i].start_freq = hal_reg_cap->low_2ghz_chan; arg[i].end_freq = hal_reg_cap->high_2ghz_chan;break ; -case WMI_HOST_WLAN_5G_CAP : +case WMI_HOST_WLAN_5GHZ_CAP : arg[i].start_freq = hal_reg_cap->low_5ghz_chan; arg[i].end_freq = hal_reg_cap->high_5ghz_chan;break ;
@@ -4699,7 +4699,7 @@ ath12k_wmi_tlv_mac_phy_caps_ext_parse(struct ath12k_base *ab, bands = pdev->cap.supported_bands; } -if (bands &WMI_HOST_WLAN_2G_CAP ) { +if (bands &WMI_HOST_WLAN_2GHZ_CAP ) { ath12k_wmi_eht_caps_parse(pdev, NL80211_BAND_2GHZ, caps->eht_cap_mac_info_2ghz, caps->eht_cap_phy_info_2ghz,
@@ -4708,7 +4708,7 @@ ath12k_wmi_tlv_mac_phy_caps_ext_parse(struct ath12k_base *ab, caps->eht_cap_info_internal); } -if (bands &WMI_HOST_WLAN_5G_CAP ) { +if (bands &WMI_HOST_WLAN_5GHZ_CAP ) { ath12k_wmi_eht_caps_parse(pdev, NL80211_BAND_5GHZ, caps->eht_cap_mac_info_5ghz, caps->eht_cap_phy_info_5ghz,
@@ -4922,7 +4922,7 @@ static u8 ath12k_wmi_ignore_num_extra_rules(struct ath12k_wmi_reg_rule_ext_paramfor (count =0 ; count < num_reg_rules; count++) { start_freq =le32_get_bits (rule[count].freq_info,REG_RULE_START_FREQ ); -if (start_freq >=ATH12K_MIN_6G_FREQ ) +if (start_freq >=ATH12K_MIN_6GHZ_FREQ ) num_invalid_5ghz_rules++; }
@@ -4992,9 +4992,9 @@ static int ath12k_pull_reg_chan_list_ext_update_ev(struct ath12k_base *ab,for (i =0 ; i <WMI_REG_CURRENT_MAX_AP_TYPE ; i++) { num_6g_reg_rules_ap[i] = reg_info->num_6g_reg_rules_ap[i]; -if (num_6g_reg_rules_ap[i] >MAX_6G_REG_RULES ) { +if (num_6g_reg_rules_ap[i] >MAX_6GHZ_REG_RULES ) {ath12k_warn (ab,"Num 6G reg rules for AP mode(%d) exceeds max limit (num_6g_reg_rules_ap: %d, max_rules: %d)\n" , - i, num_6g_reg_rules_ap[i],MAX_6G_REG_RULES ); + i, num_6g_reg_rules_ap[i],MAX_6GHZ_REG_RULES );kfree (tb);return -EINVAL ; }
@@ -5015,9 +5015,9 @@ static int ath12k_pull_reg_chan_list_ext_update_ev(struct ath12k_base *ab, reg_info->num_6g_reg_rules_cl[WMI_REG_VLP_AP ][i]; total_reg_rules += num_6g_reg_rules_cl[WMI_REG_VLP_AP ][i]; -if (num_6g_reg_rules_cl[WMI_REG_INDOOR_AP ][i] >MAX_6G_REG_RULES || - num_6g_reg_rules_cl[WMI_REG_STD_POWER_AP ][i] >MAX_6G_REG_RULES || - num_6g_reg_rules_cl[WMI_REG_VLP_AP ][i] >MAX_6G_REG_RULES ) { +if (num_6g_reg_rules_cl[WMI_REG_INDOOR_AP ][i] >MAX_6GHZ_REG_RULES || + num_6g_reg_rules_cl[WMI_REG_STD_POWER_AP ][i] >MAX_6GHZ_REG_RULES || + num_6g_reg_rules_cl[WMI_REG_VLP_AP ][i] >MAX_6GHZ_REG_RULES ) {ath12k_warn (ab,"Num 6g client reg rules exceeds max limit, for client(type: %d)\n" , i);kfree (tb);
@@ -6317,13 +6317,13 @@ static void ath12k_mgmt_rx_event(struct ath12k_base *ab, struct sk_buff *skb)if (rx_ev.status &WMI_RX_STATUS_ERR_MIC ) status->flag |=RX_FLAG_MMIC_ERROR ; -if (rx_ev.chan_freq >=ATH12K_MIN_6G_FREQ && - rx_ev.chan_freq <=ATH12K_MAX_6G_FREQ ) { +if (rx_ev.chan_freq >=ATH12K_MIN_6GHZ_FREQ && + rx_ev.chan_freq <=ATH12K_MAX_6GHZ_FREQ ) { status->band =NL80211_BAND_6GHZ ; status->freq = rx_ev.chan_freq; }else if (rx_ev.channel >=1 && rx_ev.channel <=14 ) { status->band =NL80211_BAND_2GHZ ; - }else if (rx_ev.channel >=36 && rx_ev.channel <=ATH12K_MAX_5G_CHAN ) { + }else if (rx_ev.channel >=36 && rx_ev.channel <=ATH12K_MAX_5GHZ_CHAN ) { status->band =NL80211_BAND_5GHZ ; }else {/* Shouldn't happen unless list of advertised channels to
drivers/net/wireless/ath/ath12k/wmi.h +8 -8
@@ -216,9 +216,9 @@ enum wmi_host_hw_mode_priority { };enum WMI_HOST_WLAN_BAND { -WMI_HOST_WLAN_2G_CAP =1 , -WMI_HOST_WLAN_5G_CAP =2 , -WMI_HOST_WLAN_2G_5G_CAP =3 , +WMI_HOST_WLAN_2GHZ_CAP =1 , +WMI_HOST_WLAN_5GHZ_CAP =2 , +WMI_HOST_WLAN_2GHZ_5GHZ_CAP =3 , };enum wmi_cmd_group {
@@ -2690,8 +2690,8 @@ enum wmi_channel_width {* 2 - index for 160 MHz, first 3 bytes valid * 3 - index for 320 MHz, first 3 bytes valid */ -#define WMI_MAX_EHT_SUPP_MCS_2G_SIZE 2 -#define WMI_MAX_EHT_SUPP_MCS_5G_SIZE 4 +#define WMI_MAX_EHT_SUPP_MCS_2GHZ_SIZE 2 +#define WMI_MAX_EHT_SUPP_MCS_5GHZ_SIZE 4#define WMI_EHTCAP_TXRX_MCS_NSS_IDX_80 0#define WMI_EHTCAP_TXRX_MCS_NSS_IDX_160 1
@@ -2730,8 +2730,8 @@ struct ath12k_wmi_caps_ext_params {struct ath12k_wmi_ppe_threshold_params eht_ppet_2ghz;struct ath12k_wmi_ppe_threshold_params eht_ppet_5ghz;__le32 eht_cap_info_internal; -__le32 eht_supp_mcs_ext_2ghz[WMI_MAX_EHT_SUPP_MCS_2G_SIZE ]; -__le32 eht_supp_mcs_ext_5ghz[WMI_MAX_EHT_SUPP_MCS_5G_SIZE ]; +__le32 eht_supp_mcs_ext_2ghz[WMI_MAX_EHT_SUPP_MCS_2GHZ_SIZE ]; +__le32 eht_supp_mcs_ext_5ghz[WMI_MAX_EHT_SUPP_MCS_5GHZ_SIZE ];__le32 eml_capability;__le32 mld_capability; } __packed;
@@ -4108,7 +4108,7 @@ struct ath12k_wmi_eht_rate_set_params {#define MAX_REG_RULES 10#define REG_ALPHA2_LEN 2 -#define MAX_6G_REG_RULES 5 +#define MAX_6GHZ_REG_RULES 5enum wmi_start_event_param {WMI_VDEV_START_RESP_EVENT =0 ,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 209/780 wifi: ath12k: change the status update in the monitor Rx
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: P Praneesh <[email protected]>
[ Upstream commit 5393dcb4520911f2b4a980e7e3c2c0de2bbf9ec7 ]
Currently, in the monitor Rx path, status is filled from the RX TLV header present in the MSDU data. This logic is inherited from ath11k. However, in the ath12k 802.11be hardware, the Rx TLV header is not present in the MSDU data. This information is reported under various TLV tags. Therefore, avoid the existing status filling by accumulating the needed information in the PPDU information structure and fill the status.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
Stable-dep-of: f5d6b15d9503 ("wifi: ath12k: fix wrong handling of CCMP256 and GCMP ciphers")
--- drivers/net/wireless/ath/ath12k/core.h | 16 ++- drivers/net/wireless/ath/ath12k/dp_mon.c | 138 ++++++++++++++++++++++- drivers/net/wireless/ath/ath12k/hal_rx.h | 5 +- 3 files changed, 151 insertions(+), 8 deletions(-)
drivers/net/wireless/ath/ath12k/core.h +13 -3
@@ -533,9 +533,19 @@ struct ath12k_sta {enum ieee80211_sta_state state; }; -#define ATH12K_MIN_5GHZ_FREQ 4150 -#define ATH12K_MIN_6GHZ_FREQ 5925 -#define ATH12K_MAX_6GHZ_FREQ 7115 +#define ATH12K_HALF_20MHZ_BW 10 +#define ATH12K_2GHZ_MIN_CENTER 2412 +#define ATH12K_2GHZ_MAX_CENTER 2484 +#define ATH12K_5GHZ_MIN_CENTER 4900 +#define ATH12K_5GHZ_MAX_CENTER 5920 +#define ATH12K_6GHZ_MIN_CENTER 5935 +#define ATH12K_6GHZ_MAX_CENTER 7115 +#define ATH12K_MIN_2GHZ_FREQ (ATH12K_2GHZ_MIN_CENTER - ATH12K_HALF_20MHZ_BW - 1) +#define ATH12K_MAX_2GHZ_FREQ (ATH12K_2GHZ_MAX_CENTER + ATH12K_HALF_20MHZ_BW + 1) +#define ATH12K_MIN_5GHZ_FREQ (ATH12K_5GHZ_MIN_CENTER - ATH12K_HALF_20MHZ_BW) +#define ATH12K_MAX_5GHZ_FREQ (ATH12K_5GHZ_MAX_CENTER + ATH12K_HALF_20MHZ_BW) +#define ATH12K_MIN_6GHZ_FREQ (ATH12K_6GHZ_MIN_CENTER - ATH12K_HALF_20MHZ_BW) +#define ATH12K_MAX_6GHZ_FREQ (ATH12K_6GHZ_MAX_CENTER + ATH12K_HALF_20MHZ_BW)#define ATH12K_NUM_CHANS 101#define ATH12K_MAX_5GHZ_CHAN 173
drivers/net/wireless/ath/ath12k/dp_mon.c +134 -4
168 lines not on this page · raw message
drivers/net/wireless/ath/ath12k/hal_rx.h +4 -1
@@ -509,7 +509,10 @@ struct hal_rx_mpdu_start {struct hal_rx_msdu_end {__le32 info0; -__le32 rsvd0[18 ]; +__le32 rsvd0[9 ]; +__le16 info00; +__le16 info01; +__le32 rsvd00[8 ];__le32 info1;__le32 rsvd1[10 ];__le32 info2;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 210/780 wifi: ath12k: add rx_info to capture required field from rx descriptor
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: P Praneesh <[email protected]>
[ Upstream commit e88e6e3c9ada84ceed3fa223ce11af94fcaf3ad3 ]
In ath12k_dp_rx_h_mpdu(), as part of undecap to native wifi mode, the rx descriptor memory is getting overwritten. After this function call, all the rx descriptor related memory accesses give invalid values. To handle this scenario, introduce a new structure ath12k_dp_rx_info which pre-caches all the required fields from the rx descriptor before calling ath12k_dp_rx_h_ppdu(). This rx_info structure will be used in the next patch.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
Stable-dep-of: f5d6b15d9503 ("wifi: ath12k: fix wrong handling of CCMP256 and GCMP ciphers")
--- drivers/net/wireless/ath/ath12k/dp_rx.c | 80 ++++++++++++++++++------- drivers/net/wireless/ath/ath12k/dp_rx.h | 18 ++++++ 2 files changed, 78 insertions(+), 20 deletions(-)
drivers/net/wireless/ath/ath12k/dp_rx.c +60 -20
@@ -2405,6 +2405,30 @@ static void ath12k_dp_rx_h_rate(struct ath12k *ar, struct hal_rx_desc *rx_desc, } } +static void ath12k_dp_rx_h_fetch_info (struct ath12k_base *ab, +struct hal_rx_desc *rx_desc, +struct ath12k_dp_rx_info *rx_info) +{ + rx_info->ip_csum_fail =ath12k_dp_rx_h_ip_cksum_fail (ab, rx_desc); + rx_info->l4_csum_fail =ath12k_dp_rx_h_l4_cksum_fail (ab, rx_desc); + rx_info->is_mcbc =ath12k_dp_rx_h_is_da_mcbc (ab, rx_desc); + rx_info->decap_type =ath12k_dp_rx_h_decap_type (ab, rx_desc); + rx_info->pkt_type =ath12k_dp_rx_h_pkt_type (ab, rx_desc); + rx_info->sgi =ath12k_dp_rx_h_sgi (ab, rx_desc); + rx_info->rate_mcs =ath12k_dp_rx_h_rate_mcs (ab, rx_desc); + rx_info->bw =ath12k_dp_rx_h_rx_bw (ab, rx_desc); + rx_info->nss =ath12k_dp_rx_h_nss (ab, rx_desc); + rx_info->tid =ath12k_dp_rx_h_tid (ab, rx_desc); + rx_info->peer_id =ath12k_dp_rx_h_peer_id (ab, rx_desc); + rx_info->phy_meta_data =ath12k_dp_rx_h_freq (ab, rx_desc); + +if (ath12k_dp_rxdesc_mac_addr2_valid (ab, rx_desc)) { +ether_addr_copy (rx_info->addr2, +ath12k_dp_rxdesc_get_mpdu_start_addr2 (ab, rx_desc)); + rx_info->addr2_present = true; + } +} +void ath12k_dp_rx_h_ppdu (struct ath12k *ar,struct hal_rx_desc *rx_desc,struct ieee80211_rx_status *rx_status) {
@@ -2567,7 +2591,7 @@ static bool ath12k_dp_rx_check_nwifi_hdr_len_valid(struct ath12k_base *ab,static int ath12k_dp_rx_process_msdu (struct ath12k *ar,struct sk_buff *msdu,struct sk_buff_head *msdu_list, -struct ieee80211_rx_status *rx_status) +struct ath12k_dp_rx_info *rx_info) {struct ath12k_base *ab = ar->ab;struct hal_rx_desc *rx_desc, *lrx_desc;
@@ -2627,10 +2651,11 @@ static int ath12k_dp_rx_process_msdu(struct ath12k *ar, goto free_out; } -ath12k_dp_rx_h_ppdu (ar, rx_desc, rx_status); -ath12k_dp_rx_h_mpdu (ar, msdu, rx_desc, rx_status); +ath12k_dp_rx_h_fetch_info (ab, rx_desc, rx_info); +ath12k_dp_rx_h_ppdu (ar, rx_desc, rx_info->rx_status); +ath12k_dp_rx_h_mpdu (ar, msdu, rx_desc, rx_info->rx_status); - rx_status->flag |=RX_FLAG_SKIP_MONITOR |RX_FLAG_DUP_VALIDATED ; + rx_info->rx_status->flag |=RX_FLAG_SKIP_MONITOR |RX_FLAG_DUP_VALIDATED ;return 0 ;
@@ -2650,12 +2675,16 @@ static void ath12k_dp_rx_process_received_packets(struct ath12k_base *ab,struct ath12k *ar;struct ath12k_hw_link *hw_links = ag->hw_links;struct ath12k_base *partner_ab; +struct ath12k_dp_rx_info rx_info;u8 hw_link_id, pdev_id;int ret;if (skb_queue_empty (msdu_list))return ; + rx_info.addr2_present = false; + rx_info.rx_status = &rx_status; +rcu_read_lock ();while ((msdu =__skb_dequeue (msdu_list))) {
@@ -2676,7 +2705,7 @@ static void ath12k_dp_rx_process_received_packets(struct ath12k_base *ab,continue ; } - ret =ath12k_dp_rx_process_msdu (ar, msdu, msdu_list, &rx_status); + ret =ath12k_dp_rx_process_msdu (ar, msdu, msdu_list, &rx_info);if (ret) {ath12k_dbg (ab,ATH12K_DBG_DATA ,"Unable to process msdu %d" , ret);
@@ -2977,6 +3006,7 @@ static int ath12k_dp_rx_h_verify_tkip_mic(struct ath12k *ar, struct ath12k_peerstruct ieee80211_rx_status *rxs =IEEE80211_SKB_RXCB (msdu);struct ieee80211_key_conf *key_conf;struct ieee80211_hdr *hdr; +struct ath12k_dp_rx_info rx_info;u8 mic[IEEE80211_CCMP_MIC_LEN ];int head_len, tail_len, ret;size_t data_len;
@@ -2987,6 +3017,9 @@ static int ath12k_dp_rx_h_verify_tkip_mic(struct ath12k *ar, struct ath12k_peerif (ath12k_dp_rx_h_enctype (ab, rx_desc) !=HAL_ENCRYPT_TYPE_TKIP_MIC )return 0 ; + rx_info.addr2_present = false; + rx_info.rx_status = rxs; + hdr = (struct ieee80211_hdr *)(msdu->data + hal_rx_desc_sz); hdr_len =ieee80211_hdrlen (hdr->frame_control); head_len = hdr_len + hal_rx_desc_sz +IEEE80211_TKIP_IV_LEN ;
@@ -3013,6 +3046,8 @@ static int ath12k_dp_rx_h_verify_tkip_mic(struct ath12k *ar, struct ath12k_peer (ATH12K_SKB_RXCB (msdu))->is_first_msdu = true; (ATH12K_SKB_RXCB (msdu))->is_last_msdu = true; +ath12k_dp_rx_h_fetch_info (ab, rx_desc, &rx_info); + rxs->flag |=RX_FLAG_MMIC_ERROR |RX_FLAG_MMIC_STRIPPED |RX_FLAG_IV_STRIPPED |RX_FLAG_DECRYPTED ;skb_pull (msdu, hal_rx_desc_sz);
@@ -3709,7 +3744,7 @@ static void ath12k_dp_rx_null_q_desc_sg_drop(struct ath12k *ar, }static int ath12k_dp_rx_h_null_q_desc (struct ath12k *ar,struct sk_buff *msdu, -struct ieee80211_rx_status *status, +struct ath12k_dp_rx_info *rx_info,struct sk_buff_head *msdu_list) {struct ath12k_base *ab = ar->ab;
@@ -3765,9 +3800,9 @@ static int ath12k_dp_rx_h_null_q_desc(struct ath12k *ar, struct sk_buff *msdu,if (unlikely (!ath12k_dp_rx_check_nwifi_hdr_len_valid (ab, desc, msdu)))return -EINVAL ; -ath12k_dp_rx_h_ppdu (ar, desc, status); - -ath12k_dp_rx_h_mpdu (ar, msdu, desc, status); +ath12k_dp_rx_h_fetch_info (ab, desc, rx_info); +ath12k_dp_rx_h_ppdu (ar, desc, rx_info->rx_status); +ath12k_dp_rx_h_mpdu (ar, msdu, desc, rx_info->rx_status); rxcb->tid =ath12k_dp_rx_h_tid (ab, desc);
@@ -3779,7 +3814,7 @@ static int ath12k_dp_rx_h_null_q_desc(struct ath12k *ar, struct sk_buff *msdu, }static bool ath12k_dp_rx_h_reo_err (struct ath12k *ar,struct sk_buff *msdu, -struct ieee80211_rx_status *status, +struct ath12k_dp_rx_info *rx_info,struct sk_buff_head *msdu_list) {struct ath12k_skb_rxcb *rxcb =ATH12K_SKB_RXCB (msdu);
@@ -3789,7 +3824,7 @@ static bool ath12k_dp_rx_h_reo_err(struct ath12k *ar, struct sk_buff *msdu,switch (rxcb->err_code) {case HAL_REO_DEST_RING_ERROR_CODE_DESC_ADDR_ZERO : -if (ath12k_dp_rx_h_null_q_desc (ar, msdu, status, msdu_list)) +if (ath12k_dp_rx_h_null_q_desc (ar, msdu, rx_info, msdu_list)) drop = true;break ;case HAL_REO_DEST_RING_ERROR_CODE_PN_CHECK_FAILED :
@@ -3810,7 +3845,7 @@ static bool ath12k_dp_rx_h_reo_err(struct ath12k *ar, struct sk_buff *msdu, }static bool ath12k_dp_rx_h_tkip_mic_err (struct ath12k *ar,struct sk_buff *msdu, -struct ieee80211_rx_status *status) +struct ath12k_dp_rx_info *rx_info) {struct ath12k_base *ab = ar->ab;u16 msdu_len;
@@ -3839,18 +3874,18 @@ static bool ath12k_dp_rx_h_tkip_mic_err(struct ath12k *ar, struct sk_buff *msdu,if (unlikely (!ath12k_dp_rx_check_nwifi_hdr_len_valid (ab, desc, msdu)))return true; -ath12k_dp_rx_h_ppdu (ar, desc, status); +ath12k_dp_rx_h_ppdu (ar, desc, rx_info->rx_status); - status->flag |= (RX_FLAG_MMIC_STRIPPED |RX_FLAG_MMIC_ERROR | -RX_FLAG_DECRYPTED ); + rx_info->rx_status->flag |= (RX_FLAG_MMIC_STRIPPED |RX_FLAG_MMIC_ERROR | +RX_FLAG_DECRYPTED );ath12k_dp_rx_h_undecap (ar, msdu, desc, -HAL_ENCRYPT_TYPE_TKIP_MIC , status, false); +HAL_ENCRYPT_TYPE_TKIP_MIC , rx_info->rx_status, false);return false; }static bool ath12k_dp_rx_h_rxdma_err (struct ath12k *ar,struct sk_buff *msdu, -struct ieee80211_rx_status *status) +struct ath12k_dp_rx_info *rx_info) {struct ath12k_base *ab = ar->ab;struct ath12k_skb_rxcb *rxcb =ATH12K_SKB_RXCB (msdu);
@@ -3865,7 +3900,8 @@ static bool ath12k_dp_rx_h_rxdma_err(struct ath12k *ar, struct sk_buff *msdu,case HAL_REO_ENTR_RING_RXDMA_ECODE_TKIP_MIC_ERR : err_bitmap =ath12k_dp_rx_h_mpdu_err (ab, rx_desc);if (err_bitmap &HAL_RX_MPDU_ERR_TKIP_MIC ) { - drop =ath12k_dp_rx_h_tkip_mic_err (ar, msdu, status); +ath12k_dp_rx_h_fetch_info (ab, rx_desc, rx_info); + drop =ath12k_dp_rx_h_tkip_mic_err (ar, msdu, rx_info);break ; } fallthrough;
@@ -3887,14 +3923,18 @@ static void ath12k_dp_rx_wbm_err(struct ath12k *ar, {struct ath12k_skb_rxcb *rxcb =ATH12K_SKB_RXCB (msdu);struct ieee80211_rx_status rxs = {0 }; +struct ath12k_dp_rx_info rx_info;bool drop = true; + rx_info.addr2_present = false; + rx_info.rx_status = &rxs; +switch (rxcb->err_rel_src) {case HAL_WBM_REL_SRC_MODULE_REO : - drop =ath12k_dp_rx_h_reo_err (ar, msdu, &rxs, msdu_list); + drop =ath12k_dp_rx_h_reo_err (ar, msdu, &rx_info, msdu_list);break ;case HAL_WBM_REL_SRC_MODULE_RXDMA : - drop =ath12k_dp_rx_h_rxdma_err (ar, msdu, &rxs); + drop =ath12k_dp_rx_h_rxdma_err (ar, msdu, &rx_info);break ;default :/* msdu will get freed */
drivers/net/wireless/ath/ath12k/dp_rx.h +18 -0
@@ -65,6 +65,24 @@ struct ath12k_dp_rx_rfc1042_hdr {__be16 snap_type; } __packed; +struct ath12k_dp_rx_info { +struct ieee80211_rx_status *rx_status; +u32 phy_meta_data; +u16 peer_id; +u8 decap_type; +u8 pkt_type; +u8 sgi; +u8 rate_mcs; +u8 bw; +u8 nss; +u8 addr2[ETH_ALEN ]; +u8 tid; +bool ip_csum_fail; +bool l4_csum_fail; +bool is_mcbc; +bool addr2_present; +}; +static inline u32 ath12k_he_gi_to_nl80211_he_gi (u8 sgi) {u32 ret =0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 211/780 wifi: ath12k: replace the usage of rx desc with rx_info
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: P Praneesh <[email protected]>
[ Upstream commit bd00cc7e8a4c1048d14c9a9e9790c582119785fb ]
In ath12k_dp_rx_h_mpdu(), during the undecap to native wifi mode, the rx descriptor memory is overwritten. After this function call, any subsequent accesses to rx descriptor related memory yield invalid values. Fix this by replacing instances where rx_desc was used with the pre-cached information in rx_info. This ensures that the values populated from the rx descriptor are accurate and prevents invalid memory access.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
Stable-dep-of: f5d6b15d9503 ("wifi: ath12k: fix wrong handling of CCMP256 and GCMP ciphers")
--- drivers/net/wireless/ath/ath12k/dp_mon.c | 4 +- drivers/net/wireless/ath/ath12k/dp_rx.c | 107 ++++++++++------------- drivers/net/wireless/ath/ath12k/dp_rx.h | 8 +- 3 files changed, 52 insertions(+), 67 deletions(-)
drivers/net/wireless/ath/ath12k/dp_mon.c +3 -1
@@ -2093,6 +2093,7 @@ static void ath12k_dp_mon_rx_deliver_msdu(struct ath12k *ar, struct napi_structstruct ieee80211_sta *pubsta =NULL ;struct ath12k_peer *peer;struct ath12k_skb_rxcb *rxcb =ATH12K_SKB_RXCB (msdu); +struct ath12k_dp_rx_info rx_info;bool is_mcbc = rxcb->is_mcbc;bool is_eapol_tkip = rxcb->is_eapol;
@@ -2104,7 +2105,8 @@ static void ath12k_dp_mon_rx_deliver_msdu(struct ath12k *ar, struct napi_struct }spin_lock_bh (&ar->ab->base_lock); - peer =ath12k_dp_rx_h_find_peer (ar->ab, msdu); + rx_info.addr2_present = false; + peer =ath12k_dp_rx_h_find_peer (ar->ab, msdu, &rx_info);if (peer && peer->sta) { pubsta = peer->sta;if (pubsta->valid_links) {
drivers/net/wireless/ath/ath12k/dp_rx.c +44 -63
264 lines not on this page · raw message
drivers/net/wireless/ath/ath12k/dp_rx.h +5 -3
@@ -149,13 +149,13 @@ int ath12k_dp_rx_peer_frag_setup(struct ath12k *ar, const u8 *peer_mac, int vdevu8 ath12k_dp_rx_h_l3pad (struct ath12k_base *ab,struct hal_rx_desc *desc);struct ath12k_peer * -ath12k_dp_rx_h_find_peer (struct ath12k_base *ab,struct sk_buff *msdu); +ath12k_dp_rx_h_find_peer (struct ath12k_base *ab,struct sk_buff *msdu, +struct ath12k_dp_rx_info *rx_info);u8 ath12k_dp_rx_h_decap_type (struct ath12k_base *ab,struct hal_rx_desc *desc);u32 ath12k_dp_rx_h_mpdu_err (struct ath12k_base *ab,struct hal_rx_desc *desc); -void ath12k_dp_rx_h_ppdu (struct ath12k *ar,struct hal_rx_desc *rx_desc, -struct ieee80211_rx_status *rx_status); +void ath12k_dp_rx_h_ppdu (struct ath12k *ar,struct ath12k_dp_rx_info *rx_info);int ath12k_dp_rxdma_ring_sel_config_qcn9274 (struct ath12k_base *ab);int ath12k_dp_rxdma_ring_sel_config_wcn7850 (struct ath12k_base *ab);
@@ -163,4 +163,6 @@ int ath12k_dp_htt_tlv_iter(struct ath12k_base *ab, const void *ptr, size_t len,int (*iter)(struct ath12k_base *ar,u16 tag,u16 len,const void *ptr,void *data), void *data); +void ath12k_dp_rx_h_fetch_info (struct ath12k_base *ab,struct hal_rx_desc *rx_desc, +struct ath12k_dp_rx_info *rx_info);#endif /* ATH12K_DP_RX_H */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 212/780 wifi: ath12k: fix wrong handling of CCMP256 and GCMP ciphers
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rameshkumar Sundaram <[email protected]>
[ Upstream commit f5d6b15d9503263d9425dcde9cc2fd401a32b0f2 ]
Currently for CCMP256, GCMP128 and GCMP256 ciphers, in ath12k_install_key() IEEE80211_KEY_FLAG_GENERATE_IV_MGMT is not set and in ath12k_mac_mgmt_tx_wmi() a length of IEEE80211_CCMP_MIC_LEN is reserved for all ciphers.
This results in unexpected drop of protected management frames in case either of above 3 ciphers is used. The reason is, without IEEE80211_KEY_FLAG_GENERATE_IV_MGMT set, mac80211 will not generate CCMP/GCMP headers in TX frame for ath12k.
Also MIC length reserved is wrong and such frames are dropped by hardware.
Fix this by setting IEEE80211_KEY_FLAG_GENERATE_IV_MGMT flag for above ciphers and by reserving proper MIC length for those ciphers.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
--- drivers/net/wireless/ath/ath12k/dp_rx.c | 3 +-- drivers/net/wireless/ath/ath12k/dp_rx.h | 3 +++ drivers/net/wireless/ath/ath12k/mac.c | 16 ++++++++++------ 3 files changed, 14 insertions(+), 8 deletions(-)
drivers/net/wireless/ath/ath12k/dp_rx.c +1 -2
@@ -1917,8 +1917,7 @@ static void ath12k_dp_rx_h_csum_offload(struct sk_buff *msdu, CHECKSUM_NONE :CHECKSUM_UNNECESSARY ; } -static int ath12k_dp_rx_crypto_mic_len (struct ath12k *ar, -enum hal_encrypt_type enctype) +int ath12k_dp_rx_crypto_mic_len (struct ath12k *ar,enum hal_encrypt_type enctype) {switch (enctype) {case HAL_ENCRYPT_TYPE_OPEN :
drivers/net/wireless/ath/ath12k/dp_rx.h +3 -0
@@ -165,4 +165,7 @@ int ath12k_dp_htt_tlv_iter(struct ath12k_base *ab, const void *ptr, size_t len, void *data);void ath12k_dp_rx_h_fetch_info (struct ath12k_base *ab,struct hal_rx_desc *rx_desc,struct ath12k_dp_rx_info *rx_info); + +int ath12k_dp_rx_crypto_mic_len (struct ath12k *ar,enum hal_encrypt_type enctype); +#endif /* ATH12K_DP_RX_H */
drivers/net/wireless/ath/ath12k/mac.c +10 -6
@@ -4623,8 +4623,8 @@ static int ath12k_install_key(struct ath12k_link_vif *arvif,switch (key->cipher) {case WLAN_CIPHER_SUITE_CCMP : +case WLAN_CIPHER_SUITE_CCMP_256 : arg.key_cipher =WMI_CIPHER_AES_CCM ; -/* TODO: Re-check if flag is valid */ key->flags |=IEEE80211_KEY_FLAG_GENERATE_IV_MGMT ;break ;case WLAN_CIPHER_SUITE_TKIP :
@@ -4632,12 +4632,10 @@ static int ath12k_install_key(struct ath12k_link_vif *arvif, arg.key_txmic_len =8 ; arg.key_rxmic_len =8 ;break ; -case WLAN_CIPHER_SUITE_CCMP_256 : - arg.key_cipher =WMI_CIPHER_AES_CCM ; -break ;case WLAN_CIPHER_SUITE_GCMP :case WLAN_CIPHER_SUITE_GCMP_256 : arg.key_cipher =WMI_CIPHER_AES_GCM ; + key->flags |=IEEE80211_KEY_FLAG_GENERATE_IV_MGMT ;break ;default :ath12k_warn (ar->ab,"cipher %d is not supported\n" , key->cipher);
@@ -7041,6 +7039,8 @@ static int ath12k_mac_mgmt_tx_wmi(struct ath12k *ar, struct ath12k_link_vif *arvstruct ath12k_base *ab = ar->ab;struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;struct ieee80211_tx_info *info; +enum hal_encrypt_type enctype; +unsigned int mic_len;dma_addr_t paddr;int buf_id;int ret;
@@ -7056,12 +7056,16 @@ static int ath12k_mac_mgmt_tx_wmi(struct ath12k *ar, struct ath12k_link_vif *arvreturn -ENOSPC ; info =IEEE80211_SKB_CB (skb); -if (!(info->flags &IEEE80211_TX_CTL_HW_80211_ENCAP )) { +if ((ATH12K_SKB_CB (skb)->flags &ATH12K_SKB_CIPHER_SET ) && + !(info->flags &IEEE80211_TX_CTL_HW_80211_ENCAP )) {if ((ieee80211_is_action (hdr->frame_control) ||ieee80211_is_deauth (hdr->frame_control) ||ieee80211_is_disassoc (hdr->frame_control)) &&ieee80211_has_protected (hdr->frame_control)) { -skb_put (skb,IEEE80211_CCMP_MIC_LEN ); + enctype = +ath12k_dp_tx_get_encrypt_type (ATH12K_SKB_CB (skb)->cipher); + mic_len =ath12k_dp_rx_crypto_mic_len (ar, enctype); +skb_put (skb, mic_len); } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 213/780 wifi: ath12k: Prevent sending WMI commands to firmware during firmware crash
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maharaja Kennadyrajan <[email protected]>
[ Upstream commit e9e094a9734ea3bd4d4d117c915ccf129ac61ba1 ]
Currently, we encounter the following kernel call trace when a firmware crash occurs. This happens because the host sends WMI commands to the firmware while it is in recovery, causing the commands to fail and resulting in the kernel call trace.
Set the ATH12K_FLAG_CRASH_FLUSH and ATH12K_FLAG_RECOVERY flags when the host driver receives the firmware crash notification from MHI. This prevents sending WMI commands to the firmware during recovery.
Call Trace: <TASK> dump_stack_lvl+0x75/0xc0 register_lock_class+0x6be/0x7a0 ? __lock_acquire+0x644/0x19a0 __lock_acquire+0x95/0x19a0 lock_acquire+0x265/0x310 ? ath12k_ce_send+0xa2/0x210 [ath12k] ? find_held_lock+0x34/0xa0 ? ath12k_ce_send+0x56/0x210 [ath12k] _raw_spin_lock_bh+0x33/0x70 ? ath12k_ce_send+0xa2/0x210 [ath12k] ath12k_ce_send+0xa2/0x210 [ath12k] ath12k_htc_send+0x178/0x390 [ath12k] ath12k_wmi_cmd_send_nowait+0x76/0xa0 [ath12k] ath12k_wmi_cmd_send+0x62/0x190 [ath12k] ath12k_wmi_pdev_bss_chan_info_request+0x62/0xc0 [ath1 ath12k_mac_op_get_survey+0x2be/0x310 [ath12k] ieee80211_dump_survey+0x99/0x240 [mac80211] nl80211_dump_survey+0xe7/0x470 [cfg80211] ? kmalloc_reserve+0x59/0xf0 genl_dumpit+0x24/0x70 netlink_dump+0x177/0x360 __netlink_dump_start+0x206/0x280 genl_family_rcv_msg_dumpit.isra.22+0x8a/0xe0 ? genl_family_rcv_msg_attrs_parse.isra.23+0xe0/0xe0 ? genl_op_lock.part.12+0x10/0x10 ? genl_dumpit+0x70/0x70 genl_rcv_msg+0x1d0/0x290 ? nl80211_del_station+0x330/0x330 [cfg80211] ? genl_get_cmd_both+0x50/0x50 netlink_rcv_skb+0x4f/0x100 genl_rcv+0x1f/0x30 netlink_unicast+0x1b6/0x260 netlink_sendmsg+0x31a/0x450 __sock_sendmsg+0xa8/0xb0 ____sys_sendmsg+0x1e4/0x260 ___sys_sendmsg+0x89/0xe0 ? local_clock_noinstr+0xb/0xc0 ? rcu_is_watching+0xd/0x40 ? kfree+0x1de/0x370 ? __sys_sendmsg+0x7a/0xc0
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/mhi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath12k/mhi.c +5 -2
@@ -1,7 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2020-2021 The Linux Foundation. All rights reserved. -* Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include <linux/msi.h>
@@ -285,8 +285,11 @@ static void ath12k_mhi_op_status_cb(struct mhi_controller *mhi_cntrl,break ; } -if (!(test_bit (ATH12K_FLAG_UNREGISTERING , &ab->dev_flags))) +if (!(test_bit (ATH12K_FLAG_UNREGISTERING , &ab->dev_flags))) { +set_bit (ATH12K_FLAG_CRASH_FLUSH , &ab->dev_flags); +set_bit (ATH12K_FLAG_RECOVERY , &ab->dev_flags);queue_work (ab->workqueue_aux, &ab->reset_work); + }break ;default :break ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 214/780 wifi: ath12k: fix node corruption in ar->arvifs list
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maharaja Kennadyrajan <[email protected]>
[ Upstream commit 823435bd23108d6f8be89ea2d025c0e2e3769c51 ]
In current WLAN recovery code flow, ath12k_core_halt() only reinitializes the "arvifs" list head. This will cause the list node immediately following the list head to become an invalid list node. Because the prev of that node still points to the list head "arvifs", but the next of the list head "arvifs" no longer points to that list node.
When a WLAN recovery occurs during the execution of a vif removal, and it happens before the spin_lock_bh(&ar->data_lock) in ath12k_mac_vdev_delete(), list_del() will detect the previously mentioned situation, thereby triggering a kernel panic.
The fix is to remove and reinitialize all vif list nodes from the list head "arvifs" during WLAN halt. The reinitialization is to make the list nodes valid, ensuring that the list_del() in ath12k_mac_vdev_delete() can execute normally.
Call trace: __list_del_entry_valid_or_report+0xd4/0x100 (P) ath12k_mac_remove_link_interface.isra.0+0xf8/0x2e4 [ath12k] ath12k_scan_vdev_clean_work+0x40/0x164 [ath12k] cfg80211_wiphy_work+0xfc/0x100 process_one_work+0x164/0x2d0 worker_thread+0x254/0x380 kthread+0xfc/0x100 ret_from_fork+0x10/0x20
The change is mostly copied from the ath11k patch:
https://lore.kernel.org/all/[email protected]/
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/core.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath12k/core.c +7 -1
@@ -1251,6 +1251,7 @@ static void ath12k_rfkill_work(struct work_struct *work)void ath12k_core_halt (struct ath12k *ar) { +struct list_head *pos, *n;struct ath12k_base *ab = ar->ab;lockdep_assert_wiphy (ath12k_ar_to_hw (ar)->wiphy);
@@ -1266,7 +1267,12 @@ void ath12k_core_halt(struct ath12k *ar)rcu_assign_pointer (ab->pdevs_active[ar->pdev_idx],NULL );synchronize_rcu (); -INIT_LIST_HEAD (&ar->arvifs); + +spin_lock_bh (&ar->data_lock); +list_for_each_safe (pos, n, &ar->arvifs) +list_del_init (pos); +spin_unlock_bh (&ar->data_lock); +idr_init (&ar->txmgmt_idr); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 215/780 RDMA/rxe: Fix "trying to register non-static key in rxe_qp_do_cleanup" bug
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhu Yanjun <[email protected]>
[ Upstream commit 1c7eec4d5f3b39cdea2153abaebf1b7229a47072 ]
Call Trace: <TASK> __dump_stack lib/dump_stack.c:94 [inline] dump_stack_lvl+0x116/0x1f0 lib/dump_stack.c:120 assign_lock_key kernel/locking/lockdep.c:986 [inline] register_lock_class+0x4a3/0x4c0 kernel/locking/lockdep.c:1300 __lock_acquire+0x99/0x1ba0 kernel/locking/lockdep.c:5110 lock_acquire kernel/locking/lockdep.c:5866 [inline] lock_acquire+0x179/0x350 kernel/locking/lockdep.c:5823 __timer_delete_sync+0x152/0x1b0 kernel/time/timer.c:1644 rxe_qp_do_cleanup+0x5c3/0x7e0 drivers/infiniband/sw/rxe/rxe_qp.c:815 execute_in_process_context+0x3a/0x160 kernel/workqueue.c:4596 __rxe_cleanup+0x267/0x3c0 drivers/infiniband/sw/rxe/rxe_pool.c:232 rxe_create_qp+0x3f7/0x5f0 drivers/infiniband/sw/rxe/rxe_verbs.c:604 create_qp+0x62d/0xa80 drivers/infiniband/core/verbs.c:1250 ib_create_qp_kernel+0x9f/0x310 drivers/infiniband/core/verbs.c:1361 ib_create_qp include/rdma/ib_verbs.h:3803 [inline] rdma_create_qp+0x10c/0x340 drivers/infiniband/core/cma.c:1144 rds_ib_setup_qp+0xc86/0x19a0 net/rds/ib_cm.c:600 rds_ib_cm_initiate_connect+0x1e8/0x3d0 net/rds/ib_cm.c:944 rds_rdma_cm_event_handler_cmn+0x61f/0x8c0 net/rds/rdma_transport.c:109 cma_cm_event_handler+0x94/0x300 drivers/infiniband/core/cma.c:2184 cma_work_handler+0x15b/0x230 drivers/infiniband/core/cma.c:3042 process_one_work+0x9cc/0x1b70 kernel/workqueue.c:3238 process_scheduled_works kernel/workqueue.c:3319 [inline] worker_thread+0x6c8/0xf10 kernel/workqueue.c:3400 kthread+0x3c2/0x780 kernel/kthread.c:464 ret_from_fork+0x45/0x80 arch/x86/kernel/process.c:153 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:245 </TASK>
The root cause is as below:
In the function rxe_create_qp, the function rxe_qp_from_init is called to create qp, if this function rxe_qp_from_init fails, rxe_cleanup will be called to handle all the allocated resources, including the timers:retrans_timer and rnr_nak_timer.
The function rxe_qp_from_init calls the function rxe_qp_init_req to initialize the timers: retrans_timer and rnr_nak_timer.
But these timers are initialized in the end of rxe_qp_init_req. If some errors occur before the initialization of these timers, this problem will occur.
The solution is to check whether these timers are initialized or not. If these timers are not initialized, ignore these timers.
--- drivers/infiniband/sw/rxe/rxe_qp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/infiniband/sw/rxe/rxe_qp.c +6 -1
@@ -811,7 +811,12 @@ static void rxe_qp_do_cleanup(struct work_struct *work)spin_unlock_irqrestore (&qp->state_lock, flags); qp->qp_timeout_jiffies =0 ; -if (qp_type (qp) ==IB_QPT_RC ) { +/* In the function timer_setup, .function is initialized. If .function +* is NULL, it indicates the function timer_setup is not called, the +* timer is not initialized. Or else, the timer is initialized. +*/ +if (qp_type (qp) ==IB_QPT_RC && qp->retrans_timer.function && + qp->rnr_nak_timer.function) {timer_delete_sync (&qp->retrans_timer);timer_delete_sync (&qp->rnr_nak_timer); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 216/780 RDMA/hns: Include hnae3.h in hns_roce_hw_v2.h
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Junxian Huang <[email protected]>
[ Upstream commit 2b11d33de23262cb20d1dcb24b586dbb8f54d463 ]
hns_roce_hw_v2.h has a direct dependency on hnae3.h due to the inline function hns_roce_write64(), but it doesn't include this header currently. This leads to that files including hns_roce_hw_v2.h must also include hnae3.h to avoid compilation errors, even if they themselves don't really rely on hnae3.h. This doesn't make sense, hns_roce_hw_v2.h should include hnae3.h directly.
--- drivers/infiniband/hw/hns/hns_roce_ah.c | 1 - drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 1 - drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 1 + drivers/infiniband/hw/hns/hns_roce_main.c | 1 - drivers/infiniband/hw/hns/hns_roce_restrack.c | 1 - 5 files changed, 1 insertion(+), 4 deletions(-)
drivers/infiniband/hw/hns/hns_roce_ah.c +0 -1
@@ -33,7 +33,6 @@#include <linux/pci.h> #include <rdma/ib_addr.h> #include <rdma/ib_cache.h> -#include "hnae3.h" #include "hns_roce_device.h" #include "hns_roce_hw_v2.h"
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +0 -1
@@ -43,7 +43,6 @@#include <rdma/ib_umem.h> #include <rdma/uverbs_ioctl.h> -#include "hnae3.h" #include "hns_roce_common.h" #include "hns_roce_device.h" #include "hns_roce_cmd.h"
drivers/infiniband/hw/hns/hns_roce_hw_v2.h +1 -0
@@ -34,6 +34,7 @@#define _HNS_ROCE_HW_V2_H#include <linux/bitops.h> +#include "hnae3.h" #define HNS_ROCE_V2_MAX_RC_INL_INN_SZ 32#define HNS_ROCE_V2_MTT_ENTRY_SZ 64
drivers/infiniband/hw/hns/hns_roce_main.c +0 -1
@@ -37,7 +37,6 @@#include <rdma/ib_smi.h> #include <rdma/ib_user_verbs.h> #include <rdma/ib_cache.h> -#include "hnae3.h" #include "hns_roce_common.h" #include "hns_roce_device.h" #include "hns_roce_hem.h"
drivers/infiniband/hw/hns/hns_roce_restrack.c +0 -1
@@ -4,7 +4,6 @@#include <rdma/rdma_cm.h> #include <rdma/restrack.h> #include <uapi/rdma/rdma_netlink.h> -#include "hnae3.h" #include "hns_roce_common.h" #include "hns_roce_device.h" #include "hns_roce_hw_v2.h"
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 217/780 scsi: hisi_sas: Call I_T_nexus after soft reset for SATA disk
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yihang Li <[email protected]>
[ Upstream commit e4d953ca557e02edd3aed7390043e1b8ad1c9723 ]
In commit 21c7e972475e ("scsi: hisi_sas: Disable SATA disk phy for severe I_T nexus reset failure"), if the softreset fails upon certain conditions, the PHY connected to the disk is disabled directly. Manual recovery is required, which is inconvenient for users in actual use.
In addition, SATA disks do not support simultaneous connection of multiple hosts. Therefore, when multiple controllers are connected to a SATA disk at the same time, the controller which is connected later failed to issue an ATA softreset to the SATA disk. As a result, the PHY associated with the disk is disabled and cannot be automatically recovered.
Now that, we will not focus on the execution result of softreset. No matter whether the execution is successful or not, we will directly carry out I_T_nexus_reset.
--- drivers/scsi/hisi_sas/hisi_sas_main.c | 29 +++++---------------------- 1 file changed, 5 insertions(+), 24 deletions(-)
drivers/scsi/hisi_sas/hisi_sas_main.c +5 -24
@@ -1885,33 +1885,14 @@ static int hisi_sas_I_T_nexus_reset(struct domain_device *device) }hisi_sas_dereg_device (hisi_hba, device); - rc =hisi_sas_debug_I_T_nexus_reset (device); -if (rc ==TMF_RESP_FUNC_COMPLETE &&dev_is_sata (device)) { -struct sas_phy *local_phy; - +if (dev_is_sata (device)) { rc =hisi_sas_softreset_ata_disk (device); -switch (rc) { -case -ECOMM : - rc = -ENODEV ; -break ; -case TMF_RESP_FUNC_FAILED : -case -EMSGSIZE : -case -EIO : - local_phy =sas_get_local_phy (device); - rc =sas_phy_enable (local_phy,0 ); -if (!rc) { - local_phy->enabled =0 ; -dev_err (dev,"Disabled local phy of ATA disk %016llx due to softreset fail (%d)\n" , -SAS_ADDR (device->sas_addr), rc); - rc = -ENODEV ; - } -sas_put_local_phy (local_phy); -break ; -default : -break ; - } +if (rc ==TMF_RESP_FUNC_FAILED ) +dev_err (dev,"ata disk %016llx reset (%d)\n" , +SAS_ADDR (device->sas_addr), rc); } + rc =hisi_sas_debug_I_T_nexus_reset (device);if ((rc ==TMF_RESP_FUNC_COMPLETE ) || (rc == -ENODEV ))hisi_sas_release_task (hisi_hba, device);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 218/780 libbpf: Fix event name too long error
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Feng Yang <[email protected]>
[ Upstream commit 4dde20b1aa85d69c4281eaac9a7cfa7d2b62ecf0 ]
When the binary path is excessively long, the generated probe_name in libbpf exceeds the kernel's MAX_EVENT_NAME_LEN limit (64 bytes).
This causes legacy uprobe event attachment to fail with error code -22.
The fix reorders the fields to place the unique ID before the name. This ensures that even if truncation occurs via snprintf, the unique ID remains intact, preserving event name uniqueness. Additionally, explicit checks with MAX_EVENT_NAME_LEN are added to enforce length constraints.
Before Fix:
./test_progs -t attach_probe/kprobe-long_name ...... libbpf: failed to add legacy kprobe event for 'bpf_testmod_looooooooooooooooooooooooooooooong_name+0x0': -EINVAL libbpf: prog 'handle_kprobe': failed to create kprobe 'bpf_testmod_looooooooooooooooooooooooooooooong_name+0x0' perf event: -EINVAL test_attach_kprobe_long_event_name:FAIL:attach_kprobe_long_event_name unexpected error: -22 test_attach_probe:PASS:uprobe_ref_ctr_cleanup 0 nsec #13/11 attach_probe/kprobe-long_name:FAIL #13 attach_probe:FAIL ./test_progs -t attach_probe/uprobe-long_name ...... libbpf: failed to add legacy uprobe event for /root/linux-bpf/bpf-next/tools/testing/selftests/bpf/test_progs:0x13efd9: -EINVAL libbpf: prog 'handle_uprobe': failed to create uprobe '/root/linux-bpf/bpf-next/tools/testing/selftests/bpf/test_progs:0x13efd9' perf event: -EINVAL test_attach_uprobe_long_event_name:FAIL:attach_uprobe_long_event_name unexpected error: -22 #13/10 attach_probe/uprobe-long_name:FAIL #13 attach_probe:FAIL
After Fix:
./test_progs -t attach_probe/uprobe-long_name
#13/10 attach_probe/uprobe-long_name:OK
#13 attach_probe:OK
Summary: 1/1 PASSED, 0 SKIPPED, 0 FAILED
./test_progs -t attach_probe/kprobe-long_name
#13/11 attach_probe/kprobe-long_name:OK
#13 attach_probe:OK
Summary: 1/1 PASSED, 0 SKIPPED, 0 FAILED
--- tools/lib/bpf/libbpf.c | 43 ++++++++++++++++-------------------------- 1 file changed, 16 insertions(+), 27 deletions(-)
tools/lib/bpf/libbpf.c +16 -27
@@ -60,6 +60,8 @@#define BPF_FS_MAGIC 0xcafe4a11#endif +#define MAX_EVENT_NAME_LEN 64 +#define BPF_FS_DEFAULT_PATH "/sys/fs/bpf"#define BPF_INSN_SZ (sizeof(struct bpf_insn))
@@ -11112,16 +11114,16 @@ static const char *tracefs_available_filter_functions_addrs(void) : TRACEFS"/available_filter_functions_addrs"; } -static void gen_kprobe_legacy_event_name (char *buf,size_t buf_sz, -const char *kfunc_name,size_t offset) +static void gen_probe_legacy_event_name (char *buf,size_t buf_sz, +const char *name,size_t offset) {static int index =0 ;int i; -snprintf (buf, buf_sz,"libbpf_%u_%s_0x%zx_%d" ,getpid (), kfunc_name, offset, -__sync_fetch_and_add (&index,1 )); +snprintf (buf, buf_sz,"libbpf_%u_%d_%s_0x%zx" ,getpid (), +__sync_fetch_and_add (&index,1 ), name, offset); -/* sanitize binary_path in the probe name */ +/* sanitize name in the probe name */ for (i =0 ; buf[i]; i++) {if (!isalnum (buf[i])) buf[i] ='_' ;
@@ -11246,9 +11248,9 @@ int probe_kern_syscall_wrapper(int token_fd)return pfd >=0 ?1 :0 ; }else {/* legacy mode */ -char probe_name[128 ]; +char probe_name[MAX_EVENT_NAME_LEN ]; -gen_kprobe_legacy_event_name (probe_name,sizeof (probe_name), syscall_name,0 ); +gen_probe_legacy_event_name (probe_name,sizeof (probe_name), syscall_name,0 );if (add_kprobe_event_legacy (probe_name, false, syscall_name,0 ) <0 )return 0 ;
@@ -11304,10 +11306,10 @@ bpf_program__attach_kprobe_opts(const struct bpf_program *prog, func_name, offset, -1 /* pid */, 0 /* ref_ctr_off */); }else { -char probe_name[256 ]; +char probe_name[MAX_EVENT_NAME_LEN ]; -gen_kprobe_legacy_event_name (probe_name,sizeof (probe_name), - func_name, offset); +gen_probe_legacy_event_name (probe_name,sizeof (probe_name), + func_name, offset); legacy_probe =strdup (probe_name);if (!legacy_probe)
@@ -11851,20 +11853,6 @@ static int attach_uprobe_multi(const struct bpf_program *prog, long cookie, strureturn ret; } -static void gen_uprobe_legacy_event_name (char *buf,size_t buf_sz, -const char *binary_path,uint64_t offset) -{ -int i; - -snprintf (buf, buf_sz,"libbpf_%u_%s_0x%zx" ,getpid (), binary_path, (size_t )offset); - -/* sanitize binary_path in the probe name */ -for (i =0 ; buf[i]; i++) { -if (!isalnum (buf[i])) - buf[i] ='_' ; - } -} -static inline int add_uprobe_event_legacy (const char *probe_name,bool retprobe,const char *binary_path,size_t offset) {
@@ -12288,13 +12276,14 @@ bpf_program__attach_uprobe_opts(const struct bpf_program *prog, pid_t pid, pfd =perf_event_open_probe (true/* uprobe */ , retprobe, binary_path, func_offset, pid, ref_ctr_off); }else { -char probe_name[PATH_MAX +64 ]; +char probe_name[MAX_EVENT_NAME_LEN ];if (ref_ctr_off)return libbpf_err_ptr (-EINVAL ); -gen_uprobe_legacy_event_name (probe_name,sizeof (probe_name), - binary_path, func_offset); +gen_probe_legacy_event_name (probe_name,sizeof (probe_name), +strrchr (binary_path,'/' ) ? : binary_path, + func_offset); legacy_probe =strdup (probe_name);if (!legacy_probe)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 219/780 wifi: iwlwifi: re-add IWL_AMSDU_8K case
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miri Korenblit <[email protected]>
[ Upstream commit bdd6d93d7a109ba1080336fe07d0b4eb815efaf9 ]
This case in iwl_trans_get_rb_size_order was accidently combined with the IWL_AMSDU_12K case. Fix this.
--- drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/intel/iwlwifi/iwl-trans.h +1 -0
@@ -328,6 +328,7 @@ iwl_trans_get_rb_size_order(enum iwl_amsdu_size rb_size)case IWL_AMSDU_4K :return get_order (4 *1024 );case IWL_AMSDU_8K : +return get_order (8 *1024 );case IWL_AMSDU_12K :return get_order (16 *1024 );default :
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 220/780 libbpf: Remove sample_period init in perf_buffer
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tao Chen <[email protected]>
[ Upstream commit 64821d25f05ac468d435e61669ae745ce5a633ea ]
It seems that sample_period is not used in perf buffer. Actually, only wakeup_events are meaningful to enable events aggregation for wakeup notification. Remove sample_period setting code to avoid confusion.
--- tools/lib/bpf/libbpf.c | 1 - 1 file changed, 1 deletion(-)
tools/lib/bpf/libbpf.c +0 -1
@@ -13351,7 +13351,6 @@ struct perf_buffer *perf_buffer__new(int map_fd, size_t page_cnt, attr.config =PERF_COUNT_SW_BPF_OUTPUT ; attr.type =PERF_TYPE_SOFTWARE ; attr.sample_type =PERF_SAMPLE_RAW ; - attr.sample_period = sample_period; attr.wakeup_events = sample_period; p.attr = &attr;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 221/780 Use thread-safe function pointer in libbpf_print
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonathan Wiepert <[email protected]>
[ Upstream commit 91dbac4076537b464639953c055c460d2bdfc7ea ]
This patch fixes a thread safety bug where libbpf_print uses the global variable storing the print function pointer rather than the local variable that had the print function set via __atomic_load_n.
--- tools/lib/bpf/libbpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/bpf/libbpf.c +1 -1
@@ -286,7 +286,7 @@ void libbpf_print(enum libbpf_print_level level, const char *format, ...) old_errno = errno;va_start (args, format); -__libbpf_pr (level, format, args); +print_fn (level, format, args);va_end (args); errno = old_errno;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 222/780 iommu: ipmmu-vmsa: avoid Wformat-security warning
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit 33647d0be323f9e2f27cd1e86de5cfd965cec654 ]
iommu_device_sysfs_add() requires a constant format string, otherwise a W=1 build produces a warning:
drivers/iommu/ipmmu-vmsa.c:1093:62: error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security]
1093 | ret = iommu_device_sysfs_add(&mmu->iommu, &pdev->dev, NULL, dev_name(&pdev->dev));
| ^~~~~~~~~~~~~~~~~~~~drivers/iommu/ipmmu-vmsa.c:1093:62: note: treat the string as an argument to avoid this
1093 | ret = iommu_device_sysfs_add(&mmu->iommu, &pdev->dev, NULL, dev_name(&pdev->dev));
| ^
| "%s",This was an old bug but I saw it now because the code was changed as part of commit d9d3cede4167 ("iommu/ipmmu-vmsa: Register in a sensible order").
--- drivers/iommu/ipmmu-vmsa.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/iommu/ipmmu-vmsa.c +2 -1
@@ -1090,7 +1090,8 @@ static int ipmmu_probe(struct platform_device *pdev)if (mmu->features->has_cache_leaf_nodes &&ipmmu_is_root (mmu))return 0 ; - ret =iommu_device_sysfs_add (&mmu->iommu, &pdev->dev,NULL ,dev_name (&pdev->dev)); + ret =iommu_device_sysfs_add (&mmu->iommu, &pdev->dev,NULL ,"%s" , +dev_name (&pdev->dev));if (ret)return ret;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 223/780 iommu/io-pgtable-arm: dynamically allocate selftest device struct
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit fa26198d30f3cdd7627ce47362057848219de765 ]
In general a 'struct device' is way too large to be put on the kernel stack. Apparently something just caused it to grow a slightly larger, which pushed the arm_lpae_do_selftests() function over the warning limit in some configurations:
drivers/iommu/io-pgtable-arm.c:1423:19: error: stack frame size (1032) exceeds limit (1024) in 'arm_lpae_do_selftests' [-Werror,-Wframe-larger-than]
1423 | static int __init arm_lpae_do_selftests(void)
| ^
Change the function to use a dynamically allocated faux_device instead of the on-stack device structure.
--- drivers/iommu/io-pgtable-arm.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/iommu/io-pgtable-arm.c +9 -4
@@ -13,6 +13,7 @@#include <linux/bitops.h> #include <linux/io-pgtable.h> #include <linux/kernel.h> +#include <linux/device/faux.h> #include <linux/sizes.h> #include <linux/slab.h> #include <linux/types.h>
@@ -1433,15 +1434,17 @@ static int __init arm_lpae_do_selftests(void) };int i, j, k, pass =0 , fail =0 ; -struct device dev; +struct faux_device *dev;struct io_pgtable_cfg cfg = { .tlb = &dummy_tlb_ops, .coherent_walk = true, - .iommu_dev = &dev, }; -/* __arm_lpae_alloc_pages() merely needs dev_to_node() to work */ -set_dev_node (&dev,NUMA_NO_NODE ); + dev =faux_device_create ("io-pgtable-test" ,NULL ,0 ); +if (!dev) +return -ENOMEM ; + + cfg.iommu_dev = &dev->dev;for (i =0 ; i <ARRAY_SIZE (pgsize); ++i) {for (j =0 ; j <ARRAY_SIZE (address_size); ++j) {
@@ -1461,6 +1464,8 @@ static int __init arm_lpae_do_selftests(void) }pr_info ("selftest: completed with %d PASS %d FAIL\n" , pass, fail); +faux_device_destroy (dev); +return fail ? -EFAULT :0 ; }subsys_initcall (arm_lpae_do_selftests);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 224/780 iommu: Protect against overflow in iommu_pgsize()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Gunthorpe <[email protected]>
[ Upstream commit e586e22974d2b7acbef3c6c3e01b2d5ce69efe33 ]
On a 32 bit system calling:
iommu_map(0, 0x40000000)
When using the AMD V1 page table type with a domain->pgsize of 0xfffff000 causes iommu_pgsize() to miscalculate a result of:
size=0x40000000 count=2
count should be 1. This completely corrupts the mapping process.
This is because the final test to adjust the pagesize malfunctions when the addition overflows. Use check_add_overflow() to prevent this.
--- drivers/iommu/iommu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/iommu/iommu.c +3 -1
@@ -2399,6 +2399,7 @@ static size_t iommu_pgsize(struct iommu_domain *domain, unsigned long iova,unsigned int pgsize_idx, pgsize_idx_next;unsigned long pgsizes;size_t offset, pgsize, pgsize_next; +size_t offset_end;unsigned long addr_merge = paddr | iova;/* Page sizes supported by the hardware and small enough for @size */
@@ -2439,7 +2440,8 @@ static size_t iommu_pgsize(struct iommu_domain *domain, unsigned long iova,* If size is big enough to accommodate the larger page, reduce * the number of smaller pages. */ -if (offset + pgsize_next <= size) +if (!check_add_overflow (offset, pgsize_next, &offset_end) && + offset_end <= size) size = offset; out_set_count:
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 225/780 bonding: assign random address if device address is same as bond
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hangbin Liu <[email protected]>
[ Upstream commit 5c3bf6cba7911f470afd748606be5c03a9512fcc ]
This change addresses a MAC address conflict issue in failover scenarios, similar to the problem described in commit a951bc1e6ba5 ("bonding: correct the MAC address for 'follow' fail_over_mac policy").
In fail_over_mac=follow mode, the bonding driver expects the formerly active slave to swap MAC addresses with the newly active slave during failover. However, under certain conditions, two slaves may end up with the same MAC address, which breaks this policy:
1) ip link set eth0 master bond0
-> bond0 adopts eth0's MAC address (MAC0).
2) ip link set eth1 master bond0
-> eth1 is added as a backup with its own MAC (MAC1).
3) ip link set eth0 nomaster
-> eth0 is released and restores its MAC (MAC0).
-> eth1 becomes the active slave, and bond0 assigns MAC0 to eth1.
4) ip link set eth0 master bond0
-> eth0 is re-added to bond0, now both eth0 and eth1 have MAC0.
This results in a MAC address conflict and violates the expected behavior of the failover policy.
To fix this, we assign a random MAC address to any newly added slave if its current MAC address matches that of the bond. The original (permanent) MAC address is saved and will be restored when the device is released from the bond.
This ensures that each slave has a unique MAC address during failover transitions, preserving the integrity of the fail_over_mac=follow policy.
--- drivers/net/bonding/bond_main.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-)
drivers/net/bonding/bond_main.c +18 -7
@@ -2115,15 +2115,26 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,* set the master's mac address to that of the first slave */ memcpy (ss.__data, bond_dev->dev_addr, bond_dev->addr_len); - ss.ss_family = slave_dev->type; - res =dev_set_mac_address (slave_dev, (struct sockaddr *)&ss, - extack); -if (res) { -slave_err (bond_dev, slave_dev,"Error %d calling set_mac_address\n" , res); - goto err_restore_mtu; - } + }else if (bond->params.fail_over_mac ==BOND_FOM_FOLLOW && +BOND_MODE (bond) ==BOND_MODE_ACTIVEBACKUP && +memcmp (slave_dev->dev_addr, bond_dev->dev_addr, bond_dev->addr_len) ==0 ) { +/* Set slave to random address to avoid duplicate mac +* address in later fail over. +*/ +eth_random_addr (ss.__data); + }else { + goto skip_mac_set; } + ss.ss_family = slave_dev->type; + res =dev_set_mac_address (slave_dev, (struct sockaddr *)&ss, extack); +if (res) { +slave_err (bond_dev, slave_dev,"Error %d calling set_mac_address\n" , res); + goto err_restore_mtu; + } + +skip_mac_set: +/* set no_addrconf flag before open to prevent IPv6 addrconf */ slave_dev->priv_flags |=IFF_NO_ADDRCONF ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 226/780 f2fs: clean up w/ fscrypt_is_bounce_page()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit 0c708e35cf26449ca317fcbfc274704660b6d269 ]
Just cleanup, no logic changes.
Stable-dep-of: aa1be8dd6416 ("f2fs: fix to detect gcing page in f2fs_is_cp_guaranteed()")
--- fs/f2fs/data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/data.c +1 -1
@@ -53,7 +53,7 @@ bool f2fs_is_cp_guaranteed(struct page *page)struct inode *inode;struct f2fs_sb_info *sbi; -if (!mapping) +if (fscrypt_is_bounce_page (page))return false; inode = mapping->host;
Signature · 1 line
2.39.5
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.15.3 release. There are 780 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, 19 Jun 2025 15:22:30 +0000. Anything received after that time might be too late.
Tested on a ThinkPad E14 Gen 3 with a AMD Ryzen 5 5500U CPU and on the Steam Deck (LCD variant) aswell as a Framework Desktop.
Greg Kroah-Hartman
maintainerPATCH 227/780 f2fs: fix to detect gcing page in f2fs_is_cp_guaranteed()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit aa1be8dd64163eca4dde7fd2557eb19927a06a47 ]
Jan Prusakowski reported a f2fs bug as below:
f2fs/007 will hang kernel during testing w/ below configs:
kernel 6.12.18 (from pixel-kernel/android16-6.12)
export MKFS_OPTIONS="-O encrypt -O extra_attr -O project_quota -O quota"
export F2FS_MOUNT_OPTIONS="test_dummy_encryption,discard,fsync_mode=nobarrier,reserve_root=32768,checkpoint_merge,atgc"
cat /proc/<umount_proc_id>/stack
f2fs_wait_on_all_pages+0xa3/0x130 do_checkpoint+0x40c/0x5d0 f2fs_write_checkpoint+0x258/0x550 kill_f2fs_super+0x14f/0x190 deactivate_locked_super+0x30/0xb0 cleanup_mnt+0xba/0x150 task_work_run+0x59/0xa0 syscall_exit_to_user_mode+0x12d/0x130 do_syscall_64+0x57/0x110 entry_SYSCALL_64_after_hwframe+0x76/0x7e
cat /sys/kernel/debug/f2fs/status
- IO_W (CP: -256, Data: 256, Flush: ( 0 0 1), Discard: ( 0 0)) cmd: 0 undiscard: 0
CP IOs reference count becomes negative.
The root cause is:
After 4961acdd65c9 ("f2fs: fix to tag gcing flag on page during block migration"), we will tag page w/ gcing flag for raw page of cluster during its migration.
However, if the inode is both encrypted and compressed, during ioc_decompress(), it will tag page w/ gcing flag, and it increase F2FS_WB_DATA reference count:
- f2fs_write_multi_page
- f2fs_write_raw_page
- f2fs_write_single_page
- do_write_page
- f2fs_submit_page_write
- WB_DATA_TYPE(bio_page, fio->compressed_page)
: bio_page is encrypted, so mapping is NULL, and fio->compressed_page
is NULL, it returns F2FS_WB_DATA
- inc_page_count(.., F2FS_WB_DATA)
Then, during end_io(), it decrease F2FS_WB_CP_DATA reference count:
- f2fs_write_end_io
- f2fs_compress_write_end_io
- fscrypt_pagecache_folio
: get raw page from encrypted page
- WB_DATA_TYPE(&folio->page, false)
: raw page has gcing flag, it returns F2FS_WB_CP_DATA
- dec_page_count(.., F2FS_WB_CP_DATA)
In order to fix this issue, we need to detect gcing flag in raw page in f2fs_is_cp_guaranteed().
--- fs/f2fs/data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/data.c +1 -1
@@ -54,7 +54,7 @@ bool f2fs_is_cp_guaranteed(struct page *page)struct f2fs_sb_info *sbi;if (fscrypt_is_bounce_page (page)) -return false; +return page_private_gcing (fscrypt_pagecache_page (page)); inode = mapping->host; sbi =F2FS_I_SB (inode);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 228/780 f2fs: zone: fix to calculate first_zoned_segno correctly
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit dc6d9ef57fcf42fac1b3be4bff5ac5b3f1e8f9f3 ]
A zoned device can has both conventional zones and sequential zones, so we should not treat first segment of zoned device as first_zoned_segno, instead, we need to check zone type for each zone during traversing zoned device to find first_zoned_segno.
Otherwise, for below case, first_zoned_segno will be 0, which could be wrong.
create_null_blk 512 2 1024 1024
mkfs.f2fs -m /dev/nullb0
Testcase:
export SCRIPTS_PATH=/share/git/scripts
test multiple devices w/ zoned device
for ((i=0;i<8;i++)) do {
zonesize=$((2<<$i))
conzone=$((4096/$zonesize))
seqzone=$((4096/$zonesize))
$SCRIPTS_PATH/nullblk_create.sh 512 $zonesize $conzone $seqzone
mkfs.f2fs -f -m /dev/vdb -c /dev/nullb0
mount /dev/vdb /mnt/f2fs
touch /mnt/f2fs/file
f2fs_io pinfile set /mnt/f2fs/file $((8589934592*2))
stat /mnt/f2fs/file
df
cat /proc/fs/f2fs/vdb/segment_info
umount /mnt/f2fs
$SCRIPTS_PATH/nullblk_remove.sh 0
} donetest single zoned device
for ((i=0;i<8;i++)) do {
zonesize=$((2<<$i))
conzone=$((4096/$zonesize))
seqzone=$((4096/$zonesize))
$SCRIPTS_PATH/nullblk_create.sh 512 $zonesize $conzone $seqzone
mkfs.f2fs -f -m /dev/nullb0
mount /dev/nullb0 /mnt/f2fs
touch /mnt/f2fs/file
f2fs_io pinfile set /mnt/f2fs/file $((8589934592*2))
stat /mnt/f2fs/file
df
cat /proc/fs/f2fs/nullb0/segment_info
umount /mnt/f2fs
$SCRIPTS_PATH/nullblk_remove.sh 0
} done--- fs/f2fs/data.c | 2 +- fs/f2fs/f2fs.h | 36 ++++++++++++++++++++++++++++-------- fs/f2fs/segment.c | 10 +++++----- fs/f2fs/super.c | 41 +++++++++++++++++++++++++++++++++++------ 4 files changed, 69 insertions(+), 20 deletions(-)
fs/f2fs/data.c +1 -1
@@ -3966,7 +3966,7 @@ static int check_swap_activate(struct swap_info_struct *sis,if ((pblock -SM_I (sbi)->main_blkaddr) % blks_per_sec || nr_pblocks % blks_per_sec || - !f2fs_valid_pinned_area (sbi, pblock)) { +f2fs_is_sequential_zone_area (sbi, pblock)) {bool last_extent = false; not_aligned++;
fs/f2fs/f2fs.h +28 -8
@@ -1780,7 +1780,7 @@ struct f2fs_sb_info {unsigned int dirty_device;/* for checkpoint data flush */ spinlock_t dev_lock;/* protect dirty_device */ bool aligned_blksize;/* all devices has the same logical blksize */ -unsigned int first_zoned_segno;/* first zoned segno */ +unsigned int first_seq_zone_segno;/* first segno in sequential zone */ /* For write statistics */ u64 sectors_written_start;
@@ -4628,12 +4628,16 @@ F2FS_FEATURE_FUNCS(readonly, RO);F2FS_FEATURE_FUNCS (device_alias,DEVICE_ALIAS );#ifdef CONFIG_BLK_DEV_ZONED -static inline bool f2fs_blkz_is_seq (struct f2fs_sb_info *sbi,int devi, -block_t blkaddr) +static inline bool f2fs_zone_is_seq (struct f2fs_sb_info *sbi,int devi, +unsigned int zone) { -unsigned int zno = blkaddr / sbi->blocks_per_blkz; +return test_bit (zone,FDEV (devi).blkz_seq); +} -return test_bit (zno,FDEV (devi).blkz_seq); +static inline bool f2fs_blkz_is_seq (struct f2fs_sb_info *sbi,int devi, +block_t blkaddr) +{ +return f2fs_zone_is_seq (sbi, devi, blkaddr / sbi->blocks_per_blkz); }#endif
@@ -4705,15 +4709,31 @@ static inline bool f2fs_lfs_mode(struct f2fs_sb_info *sbi)return F2FS_OPTION (sbi).fs_mode ==FS_MODE_LFS ; } -static inline bool f2fs_valid_pinned_area (struct f2fs_sb_info *sbi, +static inline bool f2fs_is_sequential_zone_area (struct f2fs_sb_info *sbi,block_t blkaddr) {if (f2fs_sb_has_blkzoned (sbi)) { +#ifdef CONFIG_BLK_DEV_ZONED int devi =f2fs_target_device_index (sbi, blkaddr); -return !bdev_is_zoned (FDEV (devi).bdev); +if (!bdev_is_zoned (FDEV (devi).bdev)) +return false; + +if (f2fs_is_multi_device (sbi)) { +if (blkaddr <FDEV (devi).start_blk || + blkaddr >FDEV (devi).end_blk) { +f2fs_err (sbi,"Invalid block %x" , blkaddr); +return false; + } + blkaddr -=FDEV (devi).start_blk; + } + +return f2fs_blkz_is_seq (sbi, devi, blkaddr); +#else +return false; +#endif } -return true; +return false; }static inline bool f2fs_low_mem_mode (struct f2fs_sb_info *sbi)
fs/f2fs/segment.c +5 -5
@@ -2777,7 +2777,7 @@ static int get_new_segment(struct f2fs_sb_info *sbi,if (sbi->blkzone_alloc_policy ==BLKZONE_ALLOC_PRIOR_CONV || pinning) segno =0 ;else - segno =max (sbi->first_zoned_segno, *newseg); + segno =max (sbi->first_seq_zone_segno, *newseg); hint = GET_SEC_FROM_SEG(sbi, segno); }#endif
@@ -2789,7 +2789,7 @@ static int get_new_segment(struct f2fs_sb_info *sbi,if (secno >=MAIN_SECS (sbi) &&f2fs_sb_has_blkzoned (sbi)) {/* Write only to sequential zones */ if (sbi->blkzone_alloc_policy ==BLKZONE_ALLOC_ONLY_SEQ ) { - hint =GET_SEC_FROM_SEG (sbi, sbi->first_zoned_segno); + hint =GET_SEC_FROM_SEG (sbi, sbi->first_seq_zone_segno); secno =find_next_zero_bit (free_i->free_secmap,MAIN_SECS (sbi), hint); }else secno = find_first_zero_bit(free_i->free_secmap,
@@ -2838,9 +2838,9 @@ static int get_new_segment(struct f2fs_sb_info *sbi,/* set it as dirty segment in free segmap */ f2fs_bug_on (sbi,test_bit (segno, free_i->free_segmap)); -/* no free section in conventional zone */ +/* no free section in conventional device or conventional zone */ if (new_sec && pinning && - !f2fs_valid_pinned_area (sbi,START_BLOCK (sbi, segno))) { +f2fs_is_sequential_zone_area (sbi,START_BLOCK (sbi, segno))) { ret = -EAGAIN ; goto out_unlock; }
@@ -3311,7 +3311,7 @@ int f2fs_allocate_pinning_section(struct f2fs_sb_info *sbi)if (f2fs_sb_has_blkzoned (sbi) && err == -EAGAIN && gc_required) {f2fs_down_write (&sbi->gc_lock); - err =f2fs_gc_range (sbi,0 ,GET_SEGNO (sbi,FDEV (0 ).end_blk), + err =f2fs_gc_range (sbi,0 , sbi->first_seq_zone_segno -1 , true,ZONED_PIN_SEC_REQUIRED_COUNT );f2fs_up_write (&sbi->gc_lock);
fs/f2fs/super.c +35 -6
62 lines not on this page · raw message
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 229/780 scsi: lpfc: Avoid potential ndlp use-after-free in dev_loss_tmo_callbk
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Justin Tee <[email protected]>
[ Upstream commit b5162bb6aa1ec04dff4509b025883524b6d7e7ca ]
Smatch detected a potential use-after-free of an ndlp oject in dev_loss_tmo_callbk during driver unload or fatal error handling.
Fix by reordering code to avoid potential use-after-free if initial nodelist reference has been previously removed.
--- drivers/scsi/lpfc/lpfc_hbadisc.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-)
drivers/scsi/lpfc/lpfc_hbadisc.c +17 -15
@@ -161,7 +161,7 @@ lpfc_dev_loss_tmo_callbk(struct fc_rport *rport)struct lpfc_hba *phba;struct lpfc_work_evt *evtp;unsigned long iflags; -bool nvme_reg = false; +bool drop_initial_node_ref = false; ndlp = ((struct lpfc_rport_data *)rport->dd_data)->pnode;if (!ndlp)
@@ -188,8 +188,13 @@ lpfc_dev_loss_tmo_callbk(struct fc_rport *rport)spin_lock_irqsave (&ndlp->lock, iflags); ndlp->rport =NULL ; -if (ndlp->fc4_xpt_flags &NVME_XPT_REGD ) - nvme_reg = true; +/* Only 1 thread can drop the initial node reference. +* If not registered for NVME and NLP_DROPPED flag is +* clear, remove the initial reference. +*/ +if (!(ndlp->fc4_xpt_flags &NVME_XPT_REGD )) +if (!test_and_set_bit (NLP_DROPPED , &ndlp->nlp_flag)) + drop_initial_node_ref = true;/* The scsi_transport is done with the rport so lpfc cannot * call to unregister.
@@ -200,13 +205,16 @@ lpfc_dev_loss_tmo_callbk(struct fc_rport *rport)/* If NLP_XPT_REGD was cleared in lpfc_nlp_unreg_node, * unregister calls were made to the scsi and nvme * transports and refcnt was already decremented. Clear -* the NLP_XPT_REGD flag only if the NVME Rport is +* the NLP_XPT_REGD flag only if the NVME nrport is * confirmed unregistered. */ -if (!nvme_reg && ndlp->fc4_xpt_flags &NLP_XPT_REGD ) { - ndlp->fc4_xpt_flags &= ~NLP_XPT_REGD ; +if (ndlp->fc4_xpt_flags &NLP_XPT_REGD ) { +if (!(ndlp->fc4_xpt_flags &NVME_XPT_REGD )) + ndlp->fc4_xpt_flags &= ~NLP_XPT_REGD ;spin_unlock_irqrestore (&ndlp->lock, iflags); -lpfc_nlp_put (ndlp);/* may free ndlp */ + +/* Release scsi transport reference */ +lpfc_nlp_put (ndlp); }else {spin_unlock_irqrestore (&ndlp->lock, iflags); }
@@ -214,14 +222,8 @@ lpfc_dev_loss_tmo_callbk(struct fc_rport *rport)spin_unlock_irqrestore (&ndlp->lock, iflags); } -/* Only 1 thread can drop the initial node reference. If -* another thread has set NLP_DROPPED, this thread is done. -*/ -if (nvme_reg ||test_bit (NLP_DROPPED , &ndlp->nlp_flag)) -return ; - -set_bit (NLP_DROPPED , &ndlp->nlp_flag); -lpfc_nlp_put (ndlp); +if (drop_initial_node_ref) +lpfc_nlp_put (ndlp);return ; }
Signature · 1 line
2.39.5