fou: remove sparse errors
Subsystems (2)
PATCH 1/1 fou: remove sparse errors
From: Eric Dumazet <[email protected]>
We need to add __rcu qualifier to avoid these errors:
net/ipv4/fou.c:250:18: warning: incorrect type in assignment (different address spaces)net/ipv4/fou.c:250:18: expected struct net_offload const **offloadsnet/ipv4/fou.c:250:18: got struct net_offload const [noderef] __rcu **net/ipv4/fou.c:251:15: error: incompatible types in comparison expression (different address spaces):net/ipv4/fou.c:251:15: struct net_offload const [noderef] __rcu *net/ipv4/fou.c:251:15: struct net_offload const *net/ipv4/fou.c:272:18: warning: incorrect type in assignment (different address spaces)net/ipv4/fou.c:272:18: expected struct net_offload const **offloadsnet/ipv4/fou.c:272:18: got struct net_offload const [noderef] __rcu **net/ipv4/fou.c:273:15: error: incompatible types in comparison expression (different address spaces):net/ipv4/fou.c:273:15: struct net_offload const [noderef] __rcu *net/ipv4/fou.c:273:15: struct net_offload const *net/ipv4/fou.c:442:18: warning: incorrect type in assignment (different address spaces)net/ipv4/fou.c:442:18: expected struct net_offload const **offloadsnet/ipv4/fou.c:442:18: got struct net_offload const [noderef] __rcu **net/ipv4/fou.c:443:15: error: incompatible types in comparison expression (different address spaces):net/ipv4/fou.c:443:15: struct net_offload const [noderef] __rcu *net/ipv4/fou.c:443:15: struct net_offload const *net/ipv4/fou.c:489:18: warning: incorrect type in assignment (different address spaces)net/ipv4/fou.c:489:18: expected struct net_offload const **offloadsnet/ipv4/fou.c:489:18: got struct net_offload const [noderef] __rcu **net/ipv4/fou.c:490:15: error: incompatible types in comparison expression (different address spaces):net/ipv4/fou.c:490:15: struct net_offload const [noderef] __rcu *net/ipv4/fou.c:490:15: struct net_offload const *net/ipv4/udp_offload.c:170:26: warning: incorrect type in assignment (different address spaces)net/ipv4/udp_offload.c:170:26: expected struct net_offload const **offloadsnet/ipv4/udp_offload.c:170:26: got struct net_offload const [noderef] __rcu **net/ipv4/udp_offload.c:171:23: error: incompatible types in comparison expression (different address spaces):net/ipv4/udp_offload.c:171:23: struct net_offload const [noderef] __rcu *net/ipv4/udp_offload.c:171:23: struct net_offload const *
--- net/ipv4/fou.c | 10 +++++----- net/ipv4/udp_offload.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
net/ipv4/fou.c +5 -5
@@ -230,8 +230,8 @@ static struct sk_buff *fou_gro_receive(struct sock *sk,struct list_head *head, struct sk_buff *skb) { + const struct net_offload __rcu **offloads;u8 proto =fou_from_sock (sk)->protocol; -const struct net_offload **offloads;const struct net_offload *ops;struct sk_buff *pp =NULL ;
@@ -263,10 +263,10 @@ static struct sk_buff *fou_gro_receive(struct sock *sk,static int fou_gro_complete (struct sock *sk,struct sk_buff *skb,int nhoff) { -const struct net_offload *ops; +const struct net_offload __rcu **offloads;u8 proto =fou_from_sock (sk)->protocol; +const struct net_offload *ops;int err = -ENOSYS ; -const struct net_offload **offloads;rcu_read_lock (); offloads =NAPI_GRO_CB (skb)->is_ipv6 ? inet6_offloads : inet_offloads;
@@ -311,7 +311,7 @@ static struct sk_buff *gue_gro_receive(struct sock *sk,struct list_head *head, struct sk_buff *skb) { - const struct net_offload **offloads; + const struct net_offload __rcu **offloads;const struct net_offload *ops;struct sk_buff *pp =NULL ;struct sk_buff *p;
@@ -457,8 +457,8 @@ static struct sk_buff *gue_gro_receive(struct sock *sk,static int gue_gro_complete (struct sock *sk,struct sk_buff *skb,int nhoff) { -const struct net_offload **offloads;struct guehdr *guehdr = (struct guehdr *)(skb->data + nhoff); +const struct net_offload __rcu **offloads;const struct net_offload *ops;unsigned int guehlen =0 ;u8 proto;
net/ipv4/udp_offload.c +1 -1
@@ -152,8 +152,8 @@ struct sk_buff *skb_udp_tunnel_segment(struct sk_buff *skb, netdev_features_t features, bool is_ipv6) { +const struct net_offload __rcu **offloads;__be16 protocol = skb->protocol; -const struct net_offload **offloads;const struct net_offload *ops;struct sk_buff *segs =ERR_PTR (-EINVAL ); struct sk_buff *(*gso_inner_segment)(struct sk_buff *skb,
Signature · 1 line
2.33.0.259.gc128427fd7-goog
This patch was applied to netdev/net-next.git (refs/heads/master):
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
Quoted 35 lines · On Mon, 30 Aug 2021 20:26:08 -0700 you wrote:
From: Eric Dumazet <[email protected]>
We need to add
__rcuqualifier to avoid these errors:
net/ipv4/fou.c:250:18: warning: incorrect type in assignment (different address spaces)net/ipv4/fou.c:250:18: expected structnet_offloadconst **offloadsnet/ipv4/fou.c:250:18: got structnet_offloadconst [noderef]__rcu**net/ipv4/fou.c:251:15: error: incompatible types in comparison expression (different address spaces):net/ipv4/fou.c:251:15: structnet_offloadconst [noderef]__rcu*net/ipv4/fou.c:251:15: structnet_offloadconst *net/ipv4/fou.c:272:18: warning: incorrect type in assignment (different address spaces)net/ipv4/fou.c:272:18: expected structnet_offloadconst **offloadsnet/ipv4/fou.c:272:18: got structnet_offloadconst [noderef]__rcu**net/ipv4/fou.c:273:15: error: incompatible types in comparison expression (different address spaces):net/ipv4/fou.c:273:15: structnet_offloadconst [noderef]__rcu*net/ipv4/fou.c:273:15: structnet_offloadconst *net/ipv4/fou.c:442:18: warning: incorrect type in assignment (different address spaces)net/ipv4/fou.c:442:18: expected structnet_offloadconst **offloadsnet/ipv4/fou.c:442:18: got structnet_offloadconst [noderef]__rcu**net/ipv4/fou.c:443:15: error: incompatible types in comparison expression (different address spaces):net/ipv4/fou.c:443:15: structnet_offloadconst [noderef]__rcu*net/ipv4/fou.c:443:15: structnet_offloadconst *net/ipv4/fou.c:489:18: warning: incorrect type in assignment (different address spaces)net/ipv4/fou.c:489:18: expected structnet_offloadconst **offloadsnet/ipv4/fou.c:489:18: got structnet_offloadconst [noderef]__rcu**net/ipv4/fou.c:490:15: error: incompatible types in comparison expression (different address spaces):net/ipv4/fou.c:490:15: structnet_offloadconst [noderef]__rcu*net/ipv4/fou.c:490:15: structnet_offloadconst *net/ipv4/udp_offload.c:170:26: warning: incorrect type in assignment (different address spaces)net/ipv4/udp_offload.c:170:26: expected structnet_offloadconst **offloadsnet/ipv4/udp_offload.c:170:26: got structnet_offloadconst [noderef]__rcu**net/ipv4/udp_offload.c:171:23: error: incompatible types in comparison expression (different address spaces):net/ipv4/udp_offload.c:171:23: structnet_offloadconst [noderef]__rcu*net/ipv4/udp_offload.c:171:23: structnet_offloadconst *
Quoted 1 line
[...]
Here is the summary with links:
- [net-next] fou: remove sparse errors
https://git.kernel.org/netdev/net-next/c/8d65cd8d25fa
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html