net: Allow IPsec GSO for local sockets

This patch allows local sockets to make use of XFRM GSO code path.

Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Ilan Tayari <ilant@mellanox.com>

diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 5a360100136ca092f485e1707d46d0649fe3c301..18d7de34a5c30138a7837bab2a45f2824ab40c1f 100644 (file)
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -1858,6 +1858,20 @@ 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 bool xfrm_dst_offload_ok(struct dst_entry *dst)
+{
+       struct xfrm_state *x = dst->xfrm;
+
+       if (!x || !x->type_offload)
+               return false;
+
+       if (x->xso.offload_handle && (x->xso.dev == dst->path->dev) &&
+           !dst->child->xfrm)
+               return true;
+
+       return false;
+}
+
 static inline void xfrm_dev_state_delete(struct xfrm_state *x)
 {
        struct xfrm_state_offload *xso = &x->xso;
@@ -1900,6 +1914,11 @@ static inline bool xfrm_dev_offload_ok(struct sk_buff *skb, struct xfrm_state *x
 {
        return false;
 }
+
+static inline bool xfrm_dst_offload_ok(struct dst_entry *dst)
+{
+       return false;
+}
 #endif
 
 static inline int xfrm_mark_get(struct nlattr **attrs, struct xfrm_mark *m)

diff --git a/net/core/sock.c b/net/core/sock.c
index 742f68c9c84a2b73f2df6069ad24469f0c233088..564f835f408a29786928dafbe0427fa66ae63d4a 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1757,7 +1757,7 @@ void sk_setup_caps(struct sock *sk, struct dst_entry *dst)
                sk->sk_route_caps |= NETIF_F_GSO_SOFTWARE;
        sk->sk_route_caps &= ~sk->sk_route_nocaps;
        if (sk_can_gso(sk)) {
-               if (dst->header_len) {
+               if (dst->header_len && !xfrm_dst_offload_ok(dst)) {
                        sk->sk_route_caps &= ~NETIF_F_GSO_MASK;
                } else {
                        sk->sk_route_caps |= NETIF_F_SG | NETIF_F_HW_CSUM;