From: Menglong Dong <menglong8.dong@gmail.com>
To: idosch@nvidia.com, kuba@kernel.org, aleksander.lobakin@intel.com,
horms@kernel.org
Cc: davem@davemloft.net, edumazet@google.com, pabeni@redhat.com,
dsahern@kernel.org, dongml2@chinatelecom.cn, amcohen@nvidia.com,
gnault@redhat.com, bpoirier@nvidia.com, b.galvani@gmail.com,
razor@blackwall.org, petrm@nvidia.com,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH net-next v5 03/12] net: tunnel: make skb_vlan_inet_prepare() return drop reasons
Date: Sun, 6 Oct 2024 14:56:07 +0800 [thread overview]
Message-ID: <20241006065616.2563243-4-dongml2@chinatelecom.cn> (raw)
In-Reply-To: <20241006065616.2563243-1-dongml2@chinatelecom.cn>
Make skb_vlan_inet_prepare return the skb drop reasons, which is just
what pskb_may_pull_reason() returns. Meanwhile, adjust all the call of
it.
Signed-off-by: Menglong Dong <dongml2@chinatelecom.cn>
---
v5:
- make skb_vlan_inet_prepare() return drop reasons, instead of introduce
a wrapper for it.
v3:
- fix some format problems, as Alexander advised
---
drivers/net/bareudp.c | 4 ++--
drivers/net/geneve.c | 4 ++--
drivers/net/vxlan/vxlan_core.c | 2 +-
include/net/ip_tunnels.h | 13 ++++++++-----
4 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/drivers/net/bareudp.c b/drivers/net/bareudp.c
index e057526448d7..fa2dd76ba3d9 100644
--- a/drivers/net/bareudp.c
+++ b/drivers/net/bareudp.c
@@ -317,7 +317,7 @@ static int bareudp_xmit_skb(struct sk_buff *skb, struct net_device *dev,
__be32 saddr;
int err;
- if (!skb_vlan_inet_prepare(skb, skb->protocol != htons(ETH_P_TEB)))
+ if (skb_vlan_inet_prepare(skb, skb->protocol != htons(ETH_P_TEB)))
return -EINVAL;
if (!sock)
@@ -387,7 +387,7 @@ static int bareudp6_xmit_skb(struct sk_buff *skb, struct net_device *dev,
__be16 sport;
int err;
- if (!skb_vlan_inet_prepare(skb, skb->protocol != htons(ETH_P_TEB)))
+ if (skb_vlan_inet_prepare(skb, skb->protocol != htons(ETH_P_TEB)))
return -EINVAL;
if (!sock)
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index 7f611c74eb62..2f29b1386b1c 100644
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -827,7 +827,7 @@ static int geneve_xmit_skb(struct sk_buff *skb, struct net_device *dev,
__be16 sport;
int err;
- if (!skb_vlan_inet_prepare(skb, inner_proto_inherit))
+ if (skb_vlan_inet_prepare(skb, inner_proto_inherit))
return -EINVAL;
if (!gs4)
@@ -937,7 +937,7 @@ static int geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev,
__be16 sport;
int err;
- if (!skb_vlan_inet_prepare(skb, inner_proto_inherit))
+ if (skb_vlan_inet_prepare(skb, inner_proto_inherit))
return -EINVAL;
if (!gs6)
diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c
index 53dcb9fffc04..0359c750d81e 100644
--- a/drivers/net/vxlan/vxlan_core.c
+++ b/drivers/net/vxlan/vxlan_core.c
@@ -2356,7 +2356,7 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
__be32 vni = 0;
no_eth_encap = flags & VXLAN_F_GPE && skb->protocol != htons(ETH_P_TEB);
- if (!skb_vlan_inet_prepare(skb, no_eth_encap))
+ if (skb_vlan_inet_prepare(skb, no_eth_encap))
goto drop;
old_iph = ip_hdr(skb);
diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h
index 7fc2f7bf837a..4e4f9e24c9c1 100644
--- a/include/net/ip_tunnels.h
+++ b/include/net/ip_tunnels.h
@@ -467,11 +467,12 @@ static inline bool pskb_inet_may_pull(struct sk_buff *skb)
/* Variant of pskb_inet_may_pull().
*/
-static inline bool skb_vlan_inet_prepare(struct sk_buff *skb,
- bool inner_proto_inherit)
+static inline enum skb_drop_reason
+skb_vlan_inet_prepare(struct sk_buff *skb, bool inner_proto_inherit)
{
int nhlen = 0, maclen = inner_proto_inherit ? 0 : ETH_HLEN;
__be16 type = skb->protocol;
+ enum skb_drop_reason reason;
/* Essentially this is skb_protocol(skb, true)
* And we get MAC len.
@@ -492,11 +493,13 @@ static inline bool skb_vlan_inet_prepare(struct sk_buff *skb,
/* For ETH_P_IPV6/ETH_P_IP we make sure to pull
* a base network header in skb->head.
*/
- if (!pskb_may_pull(skb, maclen + nhlen))
- return false;
+ reason = pskb_may_pull_reason(skb, maclen + nhlen);
+ if (reason)
+ return reason;
skb_set_network_header(skb, maclen);
- return true;
+
+ return SKB_NOT_DROPPED_YET;
}
static inline int ip_encap_hlen(struct ip_tunnel_encap *e)
--
2.39.5
next prev parent reply other threads:[~2024-10-06 6:57 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-06 6:56 [PATCH net-next v5 00/12] net: vxlan: add skb drop reasons support Menglong Dong
2024-10-06 6:56 ` [PATCH net-next v5 01/12] net: skb: add pskb_network_may_pull_reason() helper Menglong Dong
2024-10-06 6:56 ` [PATCH net-next v5 02/12] net: tunnel: add pskb_inet_may_pull_reason() helper Menglong Dong
2024-10-06 6:56 ` Menglong Dong [this message]
2024-10-06 6:56 ` [PATCH net-next v5 04/12] net: vxlan: add skb drop reasons to vxlan_rcv() Menglong Dong
2024-10-06 6:56 ` [PATCH net-next v5 05/12] net: vxlan: make vxlan_remcsum() return drop reasons Menglong Dong
2024-10-06 6:56 ` [PATCH net-next v5 06/12] net: vxlan: make vxlan_snoop() " Menglong Dong
2024-10-06 6:56 ` [PATCH net-next v5 07/12] net: vxlan: make vxlan_set_mac() " Menglong Dong
2024-10-06 6:56 ` [PATCH net-next v5 08/12] net: vxlan: use kfree_skb_reason() in vxlan_xmit() Menglong Dong
2024-10-06 8:53 ` Guillaume Nault
2024-10-07 2:00 ` Menglong Dong
2024-10-08 12:28 ` Simon Horman
2024-10-08 14:06 ` Menglong Dong
2024-10-06 6:56 ` [PATCH net-next v5 09/12] net: vxlan: add drop reasons support to vxlan_xmit_one() Menglong Dong
2024-10-06 6:56 ` [PATCH net-next v5 10/12] net: vxlan: use kfree_skb_reason() in vxlan_mdb_xmit() Menglong Dong
2024-10-06 6:56 ` [PATCH net-next v5 11/12] net: vxlan: use kfree_skb_reason() in vxlan_encap_bypass() Menglong Dong
2024-10-06 6:56 ` [PATCH net-next v5 12/12] net: vxlan: use kfree_skb_reason() in encap_bypass_if_local() Menglong Dong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241006065616.2563243-4-dongml2@chinatelecom.cn \
--to=menglong8.dong@gmail.com \
--cc=aleksander.lobakin@intel.com \
--cc=amcohen@nvidia.com \
--cc=b.galvani@gmail.com \
--cc=bpoirier@nvidia.com \
--cc=davem@davemloft.net \
--cc=dongml2@chinatelecom.cn \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=gnault@redhat.com \
--cc=horms@kernel.org \
--cc=idosch@nvidia.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=petrm@nvidia.com \
--cc=razor@blackwall.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox