[PATCH net-next 3/3] xfrm: Add ESN support for IPSec HW offload

[yossefe]

From: Yossef Efraim <yoss...@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 <yoss...@mellanox.com>
---
 include/linux/netdevice.h |  1 +
 include/net/xfrm.h        | 12 ++++++++++++
 net/xfrm/xfrm_device.c    |  4 ++--
 net/xfrm/xfrm_replay.c    |  2 ++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 7de7656..d4e9198 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -825,6 +825,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 dc28a98..372bfcb 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -1863,6 +1863,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;
@@ -1920,6 +1928,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 dc68d9c..fc7e1e44 100644
--- a/net/xfrm/xfrm_device.c
+++ b/net/xfrm/xfrm_device.c
@@ -65,8 +65,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);
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);
-- 
2.8.1