Skip to contentSkip to conversation

netfilter: nf_tables: Fix percpu address space issues in nf_tables_api.c

PATCH Applied Uros Bizjak 3 participants 10 messages Aug 29, 2024 – Oct 4, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v2 cover netfilter: nf_tables: Fix percpu address space issues in nf_tables_api.c

Use {ERR_PTR,IS_ERR,PTR_ERR}_PCPU() macros when crossing between generic and percpu address spaces and add __percpu annotation to *stats pointer to fix percpu address space issues.

NOTE: The patch depends on a patch that introduces *_PCPU() macros [1] that is on the way to mainline through the mm tree. For convience, the patch is included in this patch series, so CI tester is able to test the second patch without compile failures.

[1] https://lore.kernel.org/lkml/[email protected]/

The netfilter patch obsoletes patch [2].

[2] https://patchwork.ozlabs.org/project/netfilter-devel/patch/[email protected]/

Cc Pablo Neira Ayuso <[email protected]>
Cc Jozsef Kadlecsik <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Eric Dumazet <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc Paolo Abeni <[email protected]>

Uros Bizjak (2):
err.h: Add ERR_PTR_PCPU(), PTR_ERR_PCPU() and IS_ERR_PCPU() macros
netfilter: nf_tables: Fix percpu address space issues in
nf_tables_api.c

 include/linux/err.h           |  9 +++++++++
 net/netfilter/nf_tables_api.c | 16 ++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)
Signature · 1 line
2.42.0
#1 lore raw

PATCH v2 1/2 err.h: Add ERR_PTR_PCPU(), PTR_ERR_PCPU() and IS_ERR_PCPU() macros

Add ERR_PTR_PCPU(), PTR_ERR_PCPU() and IS_ERR_PCPU() macros that operate on pointers in the percpu address space.

These macros remove the need for (__force void *) function argument casts (to avoid sparse -Wcast-from-as warnings).

The patch will also avoid future build errors due to pointer address space mismatch with enabled strict percpu address space checks.

---
 include/linux/err.h | 9 +++++++++
 1 file changed, 9 insertions(+)
include/linux/err.h +9 -0
index b5d9bb2a2349..a4dacd745fcf 100644
@@ -41,6 +41,9 @@ static inline void * __must_check ERR_PTR(long error)
 	return (void *) error;
 }
 
+/* Return the pointer in the percpu address space. */
+#define ERR_PTR_PCPU(error) ((void __percpu *)(unsigned long)ERR_PTR(error))
+
 /**
  * PTR_ERR - Extract the error code from an error pointer.
  * @ptr: An error pointer.
@@ -51,6 +54,9 @@ static inline long __must_check PTR_ERR(__force const void *ptr)
 	return (long) ptr;
 }
 
+/* Read an error pointer from the percpu address space. */
+#define PTR_ERR_PCPU(ptr) (PTR_ERR((const void *)(__force const unsigned long)(ptr)))
+
 /**
  * IS_ERR - Detect an error pointer.
  * @ptr: The pointer to check.
@@ -61,6 +67,9 @@ static inline bool __must_check IS_ERR(__force const void *ptr)
 	return IS_ERR_VALUE((unsigned long)ptr);
 }
 
+/* Read an error pointer from the percpu address space. */
+#define IS_ERR_PCPU(ptr) (IS_ERR((const void *)(__force const unsigned long)(ptr)))
+
 /**
  * IS_ERR_OR_NULL - Detect an error pointer or a null pointer.
  * @ptr: The pointer to check.
Signature · 1 line
2.42.0
#2 lore raw

PATCH v2 2/2 netfilter: nf_tables: Fix percpu address space issues in nf_tables_api.c

In reply to Uros Bizjak

Compiling nf_tables_api.c results in several sparse warnings:

nf_tables_api.c:2077:31: warning: incorrect type in return expression (different address spaces) nf_tables_api.c:2080:31: warning: incorrect type in return expression (different address spaces) nf_tables_api.c:2084:31: warning: incorrect type in return expression (different address spaces)

nf_tables_api.c:2740:23: warning: incorrect type in assignment (different address spaces) nf_tables_api.c:2752:38: warning: incorrect type in assignment (different address spaces) nf_tables_api.c:2798:21: warning: incorrect type in argument 1 (different address spaces)

Use {ERR_PTR,IS_ERR,PTR_ERR}_PCPU() macros when crossing between generic and percpu address spaces and add __percpu annotation to *stats pointer to fix these warnings.

Found by GCC's named address space checks.

There were no changes in the resulting object files.

Cc Pablo Neira Ayuso <[email protected]>
Cc Jozsef Kadlecsik <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Eric Dumazet <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc Paolo Abeni <[email protected]>

---
v2: Also use {ERR_PTR,IS_ERR,PTR_ERR}_PCPU() macros.

---
 net/netfilter/nf_tables_api.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
net/netfilter/nf_tables_api.c +8 -8
index 0a2f79346958..46f362d4859d 100644
@@ -2074,14 +2074,14 @@ static struct nft_stats __percpu *nft_stats_alloc(const struct nlattr *attr)
 	err = nla_parse_nested_deprecated(tb, NFTA_COUNTER_MAX, attr,
 					  nft_counter_policy, NULL);
 	if (err < 0)
-		return ERR_PTR(err);
+		return ERR_PTR_PCPU(err);
 
 	if (!tb[NFTA_COUNTER_BYTES] || !tb[NFTA_COUNTER_PACKETS])
-		return ERR_PTR(-EINVAL);
+		return ERR_PTR_PCPU(-EINVAL);
 
 	newstats = netdev_alloc_pcpu_stats(struct nft_stats);
 	if (newstats == NULL)
-		return ERR_PTR(-ENOMEM);
+		return ERR_PTR_PCPU(-ENOMEM);
 
 	/* Restore old counters on this cpu, no problem. Per-cpu statistics
 	 * are not exposed to userspace.
@@ -2525,10 +2525,10 @@ static int nf_tables_addchain(struct nft_ctx *ctx, u8 family, u8 genmask,
 
 		if (nla[NFTA_CHAIN_COUNTERS]) {
 			stats = nft_stats_alloc(nla[NFTA_CHAIN_COUNTERS]);
-			if (IS_ERR(stats)) {
+			if (IS_ERR_PCPU(stats)) {
 				nft_chain_release_hook(&hook);
 				kfree(basechain);
-				return PTR_ERR(stats);
+				return PTR_ERR_PCPU(stats);
 			}
 			rcu_assign_pointer(basechain->stats, stats);
 		}
@@ -2642,7 +2642,7 @@ static int nf_tables_updchain(struct nft_ctx *ctx, u8 genmask, u8 policy,
 	struct nft_table *table = ctx->table;
 	struct nft_chain *chain = ctx->chain;
 	struct nft_chain_hook hook = {};
-	struct nft_stats *stats = NULL;
+	struct nft_stats __percpu *stats = NULL;
 	struct nft_hook *h, *next;
 	struct nf_hook_ops *ops;
 	struct nft_trans *trans;
@@ -2738,8 +2738,8 @@ static int nf_tables_updchain(struct nft_ctx *ctx, u8 genmask, u8 policy,
 		}
 
 		stats = nft_stats_alloc(nla[NFTA_CHAIN_COUNTERS]);
-		if (IS_ERR(stats)) {
-			err = PTR_ERR(stats);
+		if (IS_ERR_PCPU(stats)) {
+			err = PTR_ERR_PCPU(stats);
 			goto err_hooks;
 		}
 	}
Signature · 1 line
2.42.0
reviewer Reviewed-by on v2 2/2
#3 lore raw
Quoted 25 lines · Uros Bizjak

Compiling nf_tables_api.c results in several sparse warnings:

nf_tables_api.c:2077:31: warning: incorrect type in return expression (different address spaces) nf_tables_api.c:2080:31: warning: incorrect type in return expression (different address spaces) nf_tables_api.c:2084:31: warning: incorrect type in return expression (different address spaces)

nf_tables_api.c:2740:23: warning: incorrect type in assignment (different address spaces) nf_tables_api.c:2752:38: warning: incorrect type in assignment (different address spaces) nf_tables_api.c:2798:21: warning: incorrect type in argument 1 (different address spaces)

Use {ERR_PTR,IS_ERR,PTR_ERR}_PCPU() macros when crossing between generic and percpu address spaces and add __percpu annotation to *stats pointer to fix these warnings.

Found by GCC's named address space checks.

There were no changes in the resulting object files.

Cc Pablo Neira Ayuso <[email protected]>
Cc Jozsef Kadlecsik <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Eric Dumazet <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc Paolo Abeni <[email protected]>
Quoted 2 lines

---
v2: Also use {ERR_PTR,IS_ERR,PTR_ERR}_PCPU() macros.

maintainer Applied
#4 lore raw
In reply to Uros Bizjak
Quoted 10 lines · Uros Bizjak

Compiling nf_tables_api.c results in several sparse warnings:

nf_tables_api.c:2077:31: warning: incorrect type in return expression (different address spaces) nf_tables_api.c:2080:31: warning: incorrect type in return expression (different address spaces) nf_tables_api.c:2084:31: warning: incorrect type in return expression (different address spaces)

nf_tables_api.c:2740:23: warning: incorrect type in assignment (different address spaces) nf_tables_api.c:2752:38: warning: incorrect type in assignment (different address spaces) nf_tables_api.c:2798:21: warning: incorrect type in argument 1 (different address spaces)

Quoted 7 lines

Use {ERR_PTR,IS_ERR,PTR_ERR}_PCPU() macros when crossing between generic and percpu address spaces and add __percpu annotation to *stats pointer to fix these warnings.

Found by GCC's named address space checks.

There were no changes in the resulting object files.

ERR_PTR,IS_ERR,PTR_ERR}_PCPU() dependency is now in nf-next.git.

Applied, thanks

#5 lore raw
In reply to Uros Bizjak

Hi,

Quoted 3 lines · Uros Bizjak

Use {ERR_PTR,IS_ERR,PTR_ERR}_PCPU() macros when crossing between generic and percpu address spaces and add __percpu annotation to *stats pointer to fix percpu address space issues.

IIRC, you submitted patch 1/2 in this series to the mm tree.

Let us know if this patch gets upstreamed via MM tree (if mm maintainers are fine with it) or maybe MM maintainers prefer an alternative path for this.

Thanks.

Quoted 30 lines

NOTE: The patch depends on a patch that introduces *_PCPU() macros [1] that is on the way to mainline through the mm tree. For convience, the patch is included in this patch series, so CI tester is able to test the second patch without compile failures.

[1] https://lore.kernel.org/lkml/[email protected]/

The netfilter patch obsoletes patch [2].

[2] https://patchwork.ozlabs.org/project/netfilter-devel/patch/[email protected]/

Cc Pablo Neira Ayuso <[email protected]>
Cc Jozsef Kadlecsik <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Eric Dumazet <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc Paolo Abeni <[email protected]>

Uros Bizjak (2):
err.h: Add ERR_PTR_PCPU(), PTR_ERR_PCPU() and IS_ERR_PCPU() macros
netfilter: nf_tables: Fix percpu address space issues in
nf_tables_api.c

 include/linux/err.h           |  9 +++++++++
 net/netfilter/nf_tables_api.c | 16 ++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)
Signature · 1 line
2.42.0
#6 lore raw
Quoted 9 lines · Pablo Neira Ayuso

Hi,

Quoted 3 lines · Uros Bizjak

Use {ERR_PTR,IS_ERR,PTR_ERR}_PCPU() macros when crossing between generic and percpu address spaces and add __percpu annotation to *stats pointer to fix percpu address space issues.

IIRC, you submitted patch 1/2 in this series to the mm tree.

Yes, patch 1/2 is in this series just for convenience.

Quoted 3 lines

Let us know if this patch gets upstreamed via MM tree (if mm maintainers are fine with it) or maybe MM maintainers prefer an alternative path for this.

The patch is accepted into the MM tree [1].

[1] https://lore.kernel.org/mm-commits/[email protected]/

Thanks,
Uros.

Quoted 33 lines

Thanks.

Quoted 30 lines

NOTE: The patch depends on a patch that introduces *_PCPU() macros [1] that is on the way to mainline through the mm tree. For convience, the patch is included in this patch series, so CI tester is able to test the second patch without compile failures.

[1] https://lore.kernel.org/lkml/[email protected]/

The netfilter patch obsoletes patch [2].

[2] https://patchwork.ozlabs.org/project/netfilter-devel/patch/[email protected]/

Cc Pablo Neira Ayuso <[email protected]>
Cc Jozsef Kadlecsik <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Eric Dumazet <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc Paolo Abeni <[email protected]>

Uros Bizjak (2):
err.h: Add ERR_PTR_PCPU(), PTR_ERR_PCPU() and IS_ERR_PCPU() macros
netfilter: nf_tables: Fix percpu address space issues in
nf_tables_api.c

 include/linux/err.h           |  9 +++++++++
 net/netfilter/nf_tables_api.c | 16 ++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

--
2.42.0

#7 lore raw
Quoted 13 lines · Uros Bizjak
Quoted 9 lines · Pablo Neira Ayuso

Hi,

Quoted 3 lines · Uros Bizjak

Use {ERR_PTR,IS_ERR,PTR_ERR}_PCPU() macros when crossing between generic and percpu address spaces and add __percpu annotation to *stats pointer to fix percpu address space issues.

IIRC, you submitted patch 1/2 in this series to the mm tree.

Yes, patch 1/2 is in this series just for convenience.

Quoted 7 lines
Quoted 3 lines

Let us know if this patch gets upstreamed via MM tree (if mm maintainers are fine with it) or maybe MM maintainers prefer an alternative path for this.

The patch is accepted into the MM tree [1].

[1] https://lore.kernel.org/mm-commits/[email protected]/

Thanks, I will wait for it to propagate to the netdev tree.

#8 lore raw
In reply to Pablo Neira Ayuso
Quoted 8 lines · Pablo Neira Ayuso

Hi,

Quoted 3 lines · Uros Bizjak

Use {ERR_PTR,IS_ERR,PTR_ERR}_PCPU() macros when crossing between generic and percpu address spaces and add __percpu annotation to *stats pointer to fix percpu address space issues.

Quoted 5 lines

IIRC, you submitted patch 1/2 in this series to the mm tree.

Let us know if this patch gets upstreamed via MM tree (if mm maintainers are fine with it) or maybe MM maintainers prefer an alternative path for this.

Dear maintainers,

I would just like to inform you that patch 1/2 got mainlined [1] as commit a759e37fb467.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a759e37fb46708029c9c3c56c3b62e6f24d85cf5

Best regards,
Uros.

Quoted 32 lines

Thanks.

Quoted 30 lines

NOTE: The patch depends on a patch that introduces *_PCPU() macros [1] that is on the way to mainline through the mm tree. For convience, the patch is included in this patch series, so CI tester is able to test the second patch without compile failures.

[1] https://lore.kernel.org/lkml/[email protected]/

The netfilter patch obsoletes patch [2].

[2] https://patchwork.ozlabs.org/project/netfilter-devel/patch/[email protected]/

Cc Pablo Neira Ayuso <[email protected]>
Cc Jozsef Kadlecsik <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Eric Dumazet <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc Paolo Abeni <[email protected]>

Uros Bizjak (2):
err.h: Add ERR_PTR_PCPU(), PTR_ERR_PCPU() and IS_ERR_PCPU() macros
netfilter: nf_tables: Fix percpu address space issues in
nf_tables_api.c

 include/linux/err.h           |  9 +++++++++
 net/netfilter/nf_tables_api.c | 16 ++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

--
2.42.0

#9 lore raw
Quoted 11 lines · Uros Bizjak
Quoted 10 lines · Pablo Neira Ayuso

Hi,

Quoted 3 lines · Uros Bizjak

Use {ERR_PTR,IS_ERR,PTR_ERR}_PCPU() macros when crossing between generic and percpu address spaces and add __percpu annotation to *stats pointer to fix percpu address space issues.

IIRC, you submitted patch 1/2 in this series to the mm tree.

Quoted 8 lines
Quoted 3 lines

Let us know if this patch gets upstreamed via MM tree (if mm maintainers are fine with it) or maybe MM maintainers prefer an alternative path for this.

Dear maintainers,

I would just like to inform you that patch 1/2 got mainlined [1] as commit a759e37fb467.

Thanks for your follow up to notify this, I will place this in nf-next.

Quoted 4 lines

[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a759e37fb46708029c9c3c56c3b62e6f24d85cf5

Best regards,
Uros.