From: Shannon Nelson <shannon.nelson@oracle.com>
To: yossefe@mellanox.com, Jonathan Corbet <corbet@lwn.net>,
"David S. Miller" <davem@davemloft.net>,
Steffen Klassert <steffen.klassert@secunet.com>,
Herbert Xu <herbert@gondor.apana.org.au>,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org
Cc: borisp@mellanox.com, kliteyn@mellanox.com, yossiku@mellanox.com
Subject: Re: [PATCH net-next v3] xfrm: Add ESN support for IPSec HW offload
Date: Mon, 15 Jan 2018 10:06:06 -0800 [thread overview]
Message-ID: <7db05f81-24ec-36de-9182-e99cf297560e@oracle.com> (raw)
In-Reply-To: <1515922757-14792-1-git-send-email-yossefe@mellanox.com>
On 1/14/2018 1:39 AM, yossefe@mellanox.com wrote:
> From: Yossef Efraim <yossefe@mellanox.com>
>
> This patch adds ESN support to IPsec device offload.
> Adding new xfrm device operation to synchronize device ESN.
>
> Signed-off-by: Yossef Efraim <yossefe@mellanox.com>
> ---
> Changes from v1:
> - Added documentation
>
> Changes from v2:
> - Due to Shannon Nelson's request, xfrm_dev_state_add() fails if ESN is
> requested and xdo_dev_state_advance_esn() is not implemented
This works for me - thanks!
Signed-off-by: Shannon Nelson <shannon.nelson@oracle.com>
> ---
> Documentation/networking/xfrm_device.txt | 3 +++
> include/linux/netdevice.h | 1 +
> include/net/xfrm.h | 12 ++++++++++++
> net/xfrm/xfrm_device.c | 11 +++++++++--
> net/xfrm/xfrm_replay.c | 2 ++
> 5 files changed, 27 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/networking/xfrm_device.txt b/Documentation/networking/xfrm_device.txt
> index 2d9d588c..50c34ca 100644
> --- a/Documentation/networking/xfrm_device.txt
> +++ b/Documentation/networking/xfrm_device.txt
> @@ -41,6 +41,7 @@ struct xfrmdev_ops {
> void (*xdo_dev_state_free) (struct xfrm_state *x);
> bool (*xdo_dev_offload_ok) (struct sk_buff *skb,
> struct xfrm_state *x);
> + void (*xdo_dev_state_advance_esn) (struct xfrm_state *x);
> };
>
> The NIC driver offering ipsec offload will need to implement these
> @@ -117,6 +118,8 @@ the stack in xfrm_input().
>
> hand the packet to napi_gro_receive() as usual
>
> +In ESN mode, xdo_dev_state_advance_esn() is called from xfrm_replay_advance_esn().
> +Driver will check packet seq number and update HW ESN state machine if needed.
>
> When the SA is removed by the user, the driver's xdo_dev_state_delete()
> is asked to disable the offload. Later, xdo_dev_state_free() is called
> diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
> index 352066e..3c81cd7 100644
> --- a/include/linux/netdevice.h
> +++ b/include/linux/netdevice.h
> @@ -842,6 +842,7 @@ struct xfrmdev_ops {
> void (*xdo_dev_state_free) (struct xfrm_state *x);
> bool (*xdo_dev_offload_ok) (struct sk_buff *skb,
> struct xfrm_state *x);
> + void (*xdo_dev_state_advance_esn) (struct xfrm_state *x);
> };
> #endif
>
> diff --git a/include/net/xfrm.h b/include/net/xfrm.h
> index 079ea94..1ca2e6e 100644
> --- a/include/net/xfrm.h
> +++ b/include/net/xfrm.h
> @@ -1901,6 +1901,14 @@ int xfrm_dev_state_add(struct net *net, struct xfrm_state *x,
> struct xfrm_user_offload *xuo);
> bool xfrm_dev_offload_ok(struct sk_buff *skb, struct xfrm_state *x);
>
> +static inline void xfrm_dev_state_advance_esn(struct xfrm_state *x)
> +{
> + struct xfrm_state_offload *xso = &x->xso;
> +
> + if (xso->dev && xso->dev->xfrmdev_ops->xdo_dev_state_advance_esn)
> + xso->dev->xfrmdev_ops->xdo_dev_state_advance_esn(x);
> +}
> +
> static inline bool xfrm_dst_offload_ok(struct dst_entry *dst)
> {
> struct xfrm_state *x = dst->xfrm;
> @@ -1971,6 +1979,10 @@ static inline bool xfrm_dev_offload_ok(struct sk_buff *skb, struct xfrm_state *x
> return false;
> }
>
> +static inline void xfrm_dev_state_advance_esn(struct xfrm_state *x)
> +{
> +}
> +
> static inline bool xfrm_dst_offload_ok(struct dst_entry *dst)
> {
> return false;
> diff --git a/net/xfrm/xfrm_device.c b/net/xfrm/xfrm_device.c
> index 7598250..93520106 100644
> --- a/net/xfrm/xfrm_device.c
> +++ b/net/xfrm/xfrm_device.c
> @@ -147,8 +147,8 @@ int xfrm_dev_state_add(struct net *net, struct xfrm_state *x,
> if (!x->type_offload)
> return -EINVAL;
>
> - /* We don't yet support UDP encapsulation, TFC padding and ESN. */
> - if (x->encap || x->tfcpad || (x->props.flags & XFRM_STATE_ESN))
> + /* We don't yet support UDP encapsulation and TFC padding. */
> + if (x->encap || x->tfcpad)
> return -EINVAL;
>
> dev = dev_get_by_index(net, xuo->ifindex);
> @@ -178,6 +178,13 @@ int xfrm_dev_state_add(struct net *net, struct xfrm_state *x,
> return 0;
> }
>
> + if (x->props.flags & XFRM_STATE_ESN &&
> + !dev->xfrmdev_ops->xdo_dev_state_advance_esn) {
> + xso->dev = NULL;
> + dev_put(dev);
> + return -EINVAL;
> + }
> +
> xso->dev = dev;
> xso->num_exthdrs = 1;
> xso->flags = xuo->flags;
> diff --git a/net/xfrm/xfrm_replay.c b/net/xfrm/xfrm_replay.c
> index 0250181..1d38c6a 100644
> --- a/net/xfrm/xfrm_replay.c
> +++ b/net/xfrm/xfrm_replay.c
> @@ -551,6 +551,8 @@ static void xfrm_replay_advance_esn(struct xfrm_state *x, __be32 net_seq)
> bitnr = replay_esn->replay_window - (diff - pos);
> }
>
> + xfrm_dev_state_advance_esn(x);
> +
> nr = bitnr >> 5;
> bitnr = bitnr & 0x1F;
> replay_esn->bmp[nr] |= (1U << bitnr);
>
next prev parent reply other threads:[~2018-01-15 18:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-14 9:39 [PATCH net-next v3] xfrm: Add ESN support for IPSec HW offload yossefe
2018-01-15 18:06 ` Shannon Nelson [this message]
2018-01-19 9:03 ` Steffen Klassert
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=7db05f81-24ec-36de-9182-e99cf297560e@oracle.com \
--to=shannon.nelson@oracle.com \
--cc=borisp@mellanox.com \
--cc=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=kliteyn@mellanox.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=steffen.klassert@secunet.com \
--cc=yossefe@mellanox.com \
--cc=yossiku@mellanox.com \
/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).