From: Steffen Klassert <steffen.klassert@secunet.com>
To: David Miller <davem@davemloft.net>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
Steffen Klassert <steffen.klassert@secunet.com>,
<netdev@vger.kernel.org>
Subject: [PATCH 02/19] xfrm: add is_ipip to struct xfrm_input_afinfo
Date: Thu, 30 Jul 2020 07:41:13 +0200 [thread overview]
Message-ID: <20200730054130.16923-3-steffen.klassert@secunet.com> (raw)
In-Reply-To: <20200730054130.16923-1-steffen.klassert@secunet.com>
From: Xin Long <lucien.xin@gmail.com>
This patch is to add a new member is_ipip to struct xfrm_input_afinfo,
to allow another group family of callback functions to be registered
with is_ipip set.
This will be used for doing a callback for struct xfrm(6)_tunnel of
ipip/ipv6 tunnels in xfrm_input() by calling xfrm_rcv_cb(), which is
needed by ipip/ipv6 tunnels' support in ip(6)_vti and xfrm interface
in the next patches.
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---
include/net/xfrm.h | 3 ++-
net/xfrm/xfrm_input.c | 24 +++++++++++++-----------
2 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index e20b2b27ec48..4666bc9e59ab 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -373,7 +373,8 @@ struct xfrm_state_afinfo *xfrm_state_get_afinfo(unsigned int family);
struct xfrm_state_afinfo *xfrm_state_afinfo_get_rcu(unsigned int family);
struct xfrm_input_afinfo {
- unsigned int family;
+ u8 family;
+ bool is_ipip;
int (*callback)(struct sk_buff *skb, u8 protocol,
int err);
};
diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c
index bd984ff17c2d..37456d022cfa 100644
--- a/net/xfrm/xfrm_input.c
+++ b/net/xfrm/xfrm_input.c
@@ -42,7 +42,7 @@ struct xfrm_trans_cb {
#define XFRM_TRANS_SKB_CB(__skb) ((struct xfrm_trans_cb *)&((__skb)->cb[0]))
static DEFINE_SPINLOCK(xfrm_input_afinfo_lock);
-static struct xfrm_input_afinfo const __rcu *xfrm_input_afinfo[AF_INET6 + 1];
+static struct xfrm_input_afinfo const __rcu *xfrm_input_afinfo[2][AF_INET6 + 1];
static struct gro_cells gro_cells;
static struct net_device xfrm_napi_dev;
@@ -53,14 +53,14 @@ int xfrm_input_register_afinfo(const struct xfrm_input_afinfo *afinfo)
{
int err = 0;
- if (WARN_ON(afinfo->family >= ARRAY_SIZE(xfrm_input_afinfo)))
+ if (WARN_ON(afinfo->family > AF_INET6))
return -EAFNOSUPPORT;
spin_lock_bh(&xfrm_input_afinfo_lock);
- if (unlikely(xfrm_input_afinfo[afinfo->family] != NULL))
+ if (unlikely(xfrm_input_afinfo[afinfo->is_ipip][afinfo->family]))
err = -EEXIST;
else
- rcu_assign_pointer(xfrm_input_afinfo[afinfo->family], afinfo);
+ rcu_assign_pointer(xfrm_input_afinfo[afinfo->is_ipip][afinfo->family], afinfo);
spin_unlock_bh(&xfrm_input_afinfo_lock);
return err;
}
@@ -71,11 +71,11 @@ int xfrm_input_unregister_afinfo(const struct xfrm_input_afinfo *afinfo)
int err = 0;
spin_lock_bh(&xfrm_input_afinfo_lock);
- if (likely(xfrm_input_afinfo[afinfo->family] != NULL)) {
- if (unlikely(xfrm_input_afinfo[afinfo->family] != afinfo))
+ if (likely(xfrm_input_afinfo[afinfo->is_ipip][afinfo->family])) {
+ if (unlikely(xfrm_input_afinfo[afinfo->is_ipip][afinfo->family] != afinfo))
err = -EINVAL;
else
- RCU_INIT_POINTER(xfrm_input_afinfo[afinfo->family], NULL);
+ RCU_INIT_POINTER(xfrm_input_afinfo[afinfo->is_ipip][afinfo->family], NULL);
}
spin_unlock_bh(&xfrm_input_afinfo_lock);
synchronize_rcu();
@@ -83,15 +83,15 @@ int xfrm_input_unregister_afinfo(const struct xfrm_input_afinfo *afinfo)
}
EXPORT_SYMBOL(xfrm_input_unregister_afinfo);
-static const struct xfrm_input_afinfo *xfrm_input_get_afinfo(unsigned int family)
+static const struct xfrm_input_afinfo *xfrm_input_get_afinfo(u8 family, bool is_ipip)
{
const struct xfrm_input_afinfo *afinfo;
- if (WARN_ON_ONCE(family >= ARRAY_SIZE(xfrm_input_afinfo)))
+ if (WARN_ON_ONCE(family > AF_INET6))
return NULL;
rcu_read_lock();
- afinfo = rcu_dereference(xfrm_input_afinfo[family]);
+ afinfo = rcu_dereference(xfrm_input_afinfo[is_ipip][family]);
if (unlikely(!afinfo))
rcu_read_unlock();
return afinfo;
@@ -100,9 +100,11 @@ static const struct xfrm_input_afinfo *xfrm_input_get_afinfo(unsigned int family
static int xfrm_rcv_cb(struct sk_buff *skb, unsigned int family, u8 protocol,
int err)
{
+ bool is_ipip = (protocol == IPPROTO_IPIP || protocol == IPPROTO_IPV6);
+ const struct xfrm_input_afinfo *afinfo;
int ret;
- const struct xfrm_input_afinfo *afinfo = xfrm_input_get_afinfo(family);
+ afinfo = xfrm_input_get_afinfo(family, is_ipip);
if (!afinfo)
return -EAFNOSUPPORT;
--
2.17.1
next prev parent reply other threads:[~2020-07-30 5:42 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-30 5:41 pull request (net-next): ipsec-next 2020-07-30 Steffen Klassert
2020-07-30 5:41 ` [PATCH 01/19] xfrm: introduce oseq-may-wrap flag Steffen Klassert
2020-07-30 5:41 ` Steffen Klassert [this message]
2020-07-30 5:41 ` [PATCH 03/19] tunnel4: add cb_handler to struct xfrm_tunnel Steffen Klassert
2020-07-30 5:41 ` [PATCH 04/19] tunnel6: add tunnel6_input_afinfo for ipip and ipv6 tunnels Steffen Klassert
2020-07-30 5:41 ` [PATCH 05/19] ip_vti: support IPIP tunnel processing with .cb_handler Steffen Klassert
2020-07-30 5:41 ` [PATCH 06/19] ip_vti: support IPIP6 tunnel processing Steffen Klassert
2020-07-30 5:41 ` [PATCH 07/19] ip6_vti: support IP6IP6 tunnel processing with .cb_handler Steffen Klassert
2020-07-30 5:41 ` [PATCH 08/19] ip6_vti: support IP6IP tunnel processing Steffen Klassert
2020-07-30 5:41 ` [PATCH 09/19] ipcomp: assign if_id to child tunnel from parent tunnel Steffen Klassert
2020-07-30 5:41 ` [PATCH 10/19] xfrm: interface: support IP6IP6 and IP6IP tunnels processing with .cb_handler Steffen Klassert
2020-10-02 14:44 ` Nicolas Dichtel
2020-10-03 9:41 ` Xin Long
2020-10-05 15:11 ` Nicolas Dichtel
2020-10-07 15:40 ` Nicolas Dichtel
2020-10-07 16:26 ` Xin Long
2020-10-07 18:44 ` Nicolas Dichtel
2020-07-30 5:41 ` [PATCH 11/19] xfrm: interface: support IPIP and IPIP6 " Steffen Klassert
2020-07-30 5:41 ` [PATCH 12/19] xfrm interface: avoid xi lookup in xfrmi_decode_session() Steffen Klassert
2020-07-30 5:41 ` [PATCH 13/19] xfrm interface: store xfrmi contexts in a hash by if_id Steffen Klassert
2020-07-30 5:41 ` [PATCH 14/19] ip_vti: not register vti_ipip_handler twice Steffen Klassert
2020-07-30 5:41 ` [PATCH 15/19] ip6_vti: not register vti_ipv6_handler twice Steffen Klassert
2020-07-30 5:41 ` [PATCH 16/19] xfrm: interface: not xfrmi_ipv6/ipip_handler twice Steffen Klassert
2020-07-30 5:41 ` [PATCH 17/19] xfrm: interface: use IS_REACHABLE to avoid some compile errors Steffen Klassert
2020-07-30 5:41 ` [PATCH 18/19] ip6_vti: " Steffen Klassert
2020-07-30 5:41 ` [PATCH 19/19] xfrm: Make the policy hold queue work with VTI Steffen Klassert
2020-07-30 21:40 ` pull request (net-next): ipsec-next 2020-07-30 David Miller
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=20200730054130.16923-3-steffen.klassert@secunet.com \
--to=steffen.klassert@secunet.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=netdev@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).