net/chelsio/libcxgb: Add __percpu annotations to libcxgb_ppm.c
Subsystems (2)
PATCH v2 1/1 net/chelsio/libcxgb: Add __percpu annotations to libcxgb_ppm.c
Compiling libcxgb_ppm.c results in several sparse warnings:
libcxgb_ppm.c:368:15: warning: incorrect type in assignment (different address spaces)
libcxgb_ppm.c:368:15: expected struct cxgbi_ppm_pool *pools
libcxgb_ppm.c:368:15: got void [noderef] __percpu *_res
libcxgb_ppm.c:374:48: warning: incorrect type in initializer (different address spaces)
libcxgb_ppm.c:374:48: expected void const [noderef] __percpu *__vpp_verify
libcxgb_ppm.c:374:48: got struct cxgbi_ppm_pool *
libcxgb_ppm.c:484:19: warning: incorrect type in assignment (different address spaces)
libcxgb_ppm.c:484:19: expected struct cxgbi_ppm_pool [noderef] __percpu *pool
libcxgb_ppm.c:484:19: got struct cxgbi_ppm_pool *[assigned] pool
libcxgb_ppm.c:511:21: warning: incorrect type in argument 1 (different address spaces)
libcxgb_ppm.c:511:21: expected void [noderef] __percpu *__pdata
libcxgb_ppm.c:511:21: got struct cxgbi_ppm_pool *[assigned] pool
Add __percpu annotation to *pools and *pool percpu pointers and to ppm_alloc_cpu_pool() function that returns percpu pointer to fix these warnings.
Compile tested only, but there is no difference in the resulting object file.
---
v2: Limit source to less than 80 columns wide.
--- drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.c +4 -4
@@ -342,10 +342,10 @@ int cxgbi_ppm_release(struct cxgbi_ppm *ppm) }EXPORT_SYMBOL (cxgbi_ppm_release); -static struct cxgbi_ppm_pool *ppm_alloc_cpu_pool (unsigned int *total, -unsigned int *pcpu_ppmax) +static struct cxgbi_ppm_pool __percpu * +ppm_alloc_cpu_pool (unsigned int *total,unsigned int *pcpu_ppmax) { -struct cxgbi_ppm_pool *pools; +struct cxgbi_ppm_pool __percpu *pools;unsigned int ppmax = (*total) /num_possible_cpus ();unsigned int max = (PCPU_MIN_UNIT_SIZE -sizeof (*pools)) <<3 ;unsigned int bmap;
@@ -392,7 +392,7 @@ int cxgbi_ppm_init(void **ppm_pp, struct net_device *ndev, unsigned int iscsi_edram_size) {struct cxgbi_ppm *ppm = (struct cxgbi_ppm *)(*ppm_pp); -struct cxgbi_ppm_pool *pool =NULL ; +struct cxgbi_ppm_pool __percpu *pool =NULL ;unsigned int pool_index_max =0 ;unsigned int ppmax_pool =0 ;unsigned int ppod_bmap_size;
Signature · 1 line
2.45.2
Quoted 21 lines · Uros Bizjak
Compiling
libcxgb_ppm.cresults in several sparse warnings:libcxgb_ppm.c:368:15: warning: incorrect type in assignment (different address spaces)
libcxgb_ppm.c:368:15: expected structcxgbi_ppm_pool*pools
libcxgb_ppm.c:368:15: got void [noderef]__percpu*_res
libcxgb_ppm.c:374:48: warning: incorrect type in initializer (different address spaces)
libcxgb_ppm.c:374:48: expected void const [noderef]__percpu*__vpp_verify
libcxgb_ppm.c:374:48: got structcxgbi_ppm_pool*
libcxgb_ppm.c:484:19: warning: incorrect type in assignment (different address spaces)
libcxgb_ppm.c:484:19: expected structcxgbi_ppm_pool[noderef]__percpu*pool
libcxgb_ppm.c:484:19: got structcxgbi_ppm_pool*[assigned] pool
libcxgb_ppm.c:511:21: warning: incorrect type in argument 1 (different address spaces)
libcxgb_ppm.c:511:21: expected void [noderef]__percpu*__pdata
libcxgb_ppm.c:511:21: got structcxgbi_ppm_pool*[assigned] poolAdd
__percpuannotation to *pools and *pool percpu pointers and toppm_alloc_cpu_pool()function that returns percpu pointer to fix these warnings.Compile tested only, but there is no difference in the resulting object file.
Quoted 7 lines
Signed-off-by Uros Bizjak <[email protected]>Cc "David S. Miller" <[email protected]>Cc Eric Dumazet <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Paolo Abeni <[email protected]>---
v2: Limit source to less than 80 columns wide.
Thanks for the update.
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 15 lines · On Sun, 4 Aug 2024 17:46:09 +0200 you wrote:
Compiling
libcxgb_ppm.cresults in several sparse warnings:libcxgb_ppm.c:368:15: warning: incorrect type in assignment (different address spaces)
libcxgb_ppm.c:368:15: expected structcxgbi_ppm_pool*pools
libcxgb_ppm.c:368:15: got void [noderef]__percpu*_res
libcxgb_ppm.c:374:48: warning: incorrect type in initializer (different address spaces)
libcxgb_ppm.c:374:48: expected void const [noderef]__percpu*__vpp_verify
libcxgb_ppm.c:374:48: got structcxgbi_ppm_pool*
libcxgb_ppm.c:484:19: warning: incorrect type in assignment (different address spaces)
libcxgb_ppm.c:484:19: expected structcxgbi_ppm_pool[noderef]__percpu*pool
libcxgb_ppm.c:484:19: got structcxgbi_ppm_pool*[assigned] pool
libcxgb_ppm.c:511:21: warning: incorrect type in argument 1 (different address spaces)
libcxgb_ppm.c:511:21: expected void [noderef]__percpu*__pdata
libcxgb_ppm.c:511:21: got structcxgbi_ppm_pool*[assigned] pool
Quoted 1 line
[...]
Here is the summary with links:
- [v2] net/chelsio/libcxgb: Add __percpu annotations to libcxgb_ppm.c
https://git.kernel.org/netdev/net-next/c/acd221a6507c
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html