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 v4 03/12] net: tunnel: add skb_vlan_inet_prepare_reason() helper
Date: Tue, 1 Oct 2024 15:32:16 +0800 [thread overview]
Message-ID: <20241001073225.807419-4-dongml2@chinatelecom.cn> (raw)
In-Reply-To: <20241001073225.807419-1-dongml2@chinatelecom.cn>
Introduce the function skb_vlan_inet_prepare_reason() and make
skb_vlan_inet_prepare an inline call to it. The drop reasons of it just
come from pskb_may_pull_reason.
Signed-off-by: Menglong Dong <dongml2@chinatelecom.cn>
---
v3:
- fix some format problems, as Alexander advised
---
include/net/ip_tunnels.h | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h
index 7fc2f7bf837a..d00d8835e789 100644
--- a/include/net/ip_tunnels.h
+++ b/include/net/ip_tunnels.h
@@ -465,13 +465,14 @@ static inline bool pskb_inet_may_pull(struct sk_buff *skb)
return pskb_inet_may_pull_reason(skb) == SKB_NOT_DROPPED_YET;
}
-/* Variant of pskb_inet_may_pull().
+/* Variant of pskb_inet_may_pull_reason().
*/
-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_reason(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,20 @@ 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 bool skb_vlan_inet_prepare(struct sk_buff *skb,
+ bool inner_proto_inherit)
+{
+ return skb_vlan_inet_prepare_reason(skb, inner_proto_inherit) ==
+ 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-01 7:34 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-01 7:32 [PATCH net-next v4 00/12] net: vxlan: add skb drop reasons support Menglong Dong
2024-10-01 7:32 ` [PATCH net-next v4 01/12] net: skb: add pskb_network_may_pull_reason() helper Menglong Dong
2024-10-02 13:36 ` Simon Horman
2024-10-01 7:32 ` [PATCH net-next v4 02/12] net: tunnel: add pskb_inet_may_pull_reason() helper Menglong Dong
2024-10-02 13:37 ` Simon Horman
2024-10-03 3:11 ` Kalesh Anakkur Purayil
2024-10-01 7:32 ` Menglong Dong [this message]
2024-10-02 13:37 ` [PATCH net-next v4 03/12] net: tunnel: add skb_vlan_inet_prepare_reason() helper Simon Horman
2024-10-04 16:43 ` Jakub Kicinski
2024-10-06 3:51 ` Menglong Dong
2024-10-01 7:32 ` [PATCH net-next v4 04/12] net: vxlan: add skb drop reasons to vxlan_rcv() Menglong Dong
2024-10-02 13:37 ` Simon Horman
2024-10-01 7:32 ` [PATCH net-next v4 05/12] net: vxlan: make vxlan_remcsum() return drop reasons Menglong Dong
2024-10-02 13:38 ` Simon Horman
2024-10-03 3:09 ` Kalesh Anakkur Purayil
2024-10-01 7:32 ` [PATCH net-next v4 06/12] net: vxlan: make vxlan_snoop() " Menglong Dong
2024-10-02 13:35 ` Simon Horman
2024-10-03 1:40 ` Menglong Dong
2024-10-01 7:32 ` [PATCH net-next v4 07/12] net: vxlan: make vxlan_set_mac() " Menglong Dong
2024-10-02 13:38 ` Simon Horman
2024-10-04 16:46 ` Jakub Kicinski
2024-10-06 3:52 ` Menglong Dong
2024-10-01 7:32 ` [PATCH net-next v4 08/12] net: vxlan: use kfree_skb_reason() in vxlan_xmit() Menglong Dong
2024-10-02 13:38 ` Simon Horman
2024-10-04 16:45 ` Jakub Kicinski
2024-10-06 3:52 ` Menglong Dong
2024-10-01 7:32 ` [PATCH net-next v4 09/12] net: vxlan: add drop reasons support to vxlan_xmit_one() Menglong Dong
2024-10-02 13:38 ` Simon Horman
2024-10-01 7:32 ` [PATCH net-next v4 10/12] net: vxlan: use kfree_skb_reason() in vxlan_mdb_xmit() Menglong Dong
2024-10-02 13:39 ` Simon Horman
2024-10-01 7:32 ` [PATCH net-next v4 11/12] net: vxlan: use kfree_skb_reason() in vxlan_encap_bypass() Menglong Dong
2024-10-02 13:39 ` Simon Horman
2024-10-01 7:32 ` [PATCH net-next v4 12/12] net: vxlan: use kfree_skb_reason() in encap_bypass_if_local() Menglong Dong
2024-10-02 13:39 ` Simon Horman
2024-10-03 3:08 ` Kalesh Anakkur Purayil
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=20241001073225.807419-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
all inboxes | Powered by JetHome®