From: Boris Pismenny <borisp@mellanox.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, saeedm@mellanox.com, borisp@mellanox.com,
davejwatson@fb.com, ktkhai@virtuozzo.com,
Ilya Lesokhin <ilyal@mellanox.com>
Subject: [PATCH V6 net-next 08/15] net/tls: Support TLS device offload with IPv6
Date: Sun, 22 Apr 2018 18:19:50 +0300 [thread overview]
Message-ID: <1524410397-108425-9-git-send-email-borisp@mellanox.com> (raw)
In-Reply-To: <1524410397-108425-1-git-send-email-borisp@mellanox.com>
From: Ilya Lesokhin <ilyal@mellanox.com>
Previously get_netdev_for_sock worked only with IPv4.
Signed-off-by: Ilya Lesokhin <ilyal@mellanox.com>
Signed-off-by: Boris Pismenny <borisp@mellanox.com>
---
net/tls/tls_device.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 50 insertions(+), 1 deletion(-)
diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c
index c363cec..b1164d7 100644
--- a/net/tls/tls_device.c
+++ b/net/tls/tls_device.c
@@ -34,6 +34,11 @@
#include <net/inet_common.h>
#include <linux/highmem.h>
#include <linux/netdevice.h>
+#include <net/addrconf.h>
+#include <net/flow.h>
+#include <linux/ipv6.h>
+#include <net/dst.h>
+#include <linux/security.h>
#include <net/tls.h>
#include <crypto/aead.h>
@@ -97,13 +102,57 @@ static void tls_device_queue_ctx_destruction(struct tls_context *ctx)
spin_unlock_irqrestore(&tls_device_lock, flags);
}
+#if IS_ENABLED(CONFIG_IPV6)
+static struct net_device *ipv6_get_netdev(struct sock *sk)
+{
+ struct net_device *dev = NULL;
+ struct inet_sock *inet = inet_sk(sk);
+ struct ipv6_pinfo *np = inet6_sk(sk);
+ struct flowi6 _fl6, *fl6 = &_fl6;
+ struct dst_entry *dst;
+
+ memset(fl6, 0, sizeof(*fl6));
+ fl6->flowi6_proto = sk->sk_protocol;
+ fl6->daddr = sk->sk_v6_daddr;
+ fl6->saddr = np->saddr;
+ fl6->flowlabel = np->flow_label;
+ IP6_ECN_flow_xmit(sk, fl6->flowlabel);
+ fl6->flowi6_oif = sk->sk_bound_dev_if;
+ fl6->flowi6_mark = sk->sk_mark;
+ fl6->fl6_sport = inet->inet_sport;
+ fl6->fl6_dport = inet->inet_dport;
+ fl6->flowi6_uid = sk->sk_uid;
+ security_sk_classify_flow(sk, flowi6_to_flowi(fl6));
+
+ if (ipv6_stub->ipv6_dst_lookup(sock_net(sk), sk, &dst, fl6) < 0)
+ return NULL;
+
+ dev = dst->dev;
+ dev_hold(dev);
+ dst_release(dst);
+
+ return dev;
+}
+#endif
+
/* We assume that the socket is already connected */
static struct net_device *get_netdev_for_sock(struct sock *sk)
{
struct inet_sock *inet = inet_sk(sk);
struct net_device *netdev = NULL;
- netdev = dev_get_by_index(sock_net(sk), inet->cork.fl.flowi_oif);
+ if (sk->sk_family == AF_INET)
+ netdev = dev_get_by_index(sock_net(sk),
+ inet->cork.fl.flowi_oif);
+#if IS_ENABLED(CONFIG_IPV6)
+ else if (sk->sk_family == AF_INET6) {
+ netdev = ipv6_get_netdev(sk);
+ if (!netdev && !sk->sk_ipv6only &&
+ ipv6_addr_type(&sk->sk_v6_daddr) == IPV6_ADDR_MAPPED)
+ netdev = dev_get_by_index(sock_net(sk),
+ inet->cork.fl.flowi_oif);
+ }
+#endif
return netdev;
}
--
1.8.3.1
next prev parent reply other threads:[~2018-04-22 15:27 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-22 15:19 [PATCH V6 net-next 00/15] TLS offload, netdev & MLX5 support Boris Pismenny
2018-04-22 15:19 ` [PATCH V6 net-next 01/15] tcp: Add clean acked data hook Boris Pismenny
2018-04-22 15:19 ` [PATCH V6 net-next 02/15] net: Rename and export copy_skb_header Boris Pismenny
2018-04-22 15:19 ` [PATCH V6 net-next 03/15] net: Add Software fallback infrastructure for socket dependent offloads Boris Pismenny
2018-04-22 15:19 ` [PATCH V6 net-next 04/15] net: Add TLS offload netdev ops Boris Pismenny
2018-04-22 15:19 ` [PATCH V6 net-next 05/15] net: Add TLS TX offload features Boris Pismenny
2018-04-22 15:19 ` [PATCH V6 net-next 06/15] net/tls: Split conf to rx + tx Boris Pismenny
2018-04-22 15:19 ` [PATCH V6 net-next 07/15] net/tls: Add generic NIC offload infrastructure Boris Pismenny
2018-04-24 0:55 ` David Miller
2018-04-22 15:19 ` Boris Pismenny [this message]
2018-04-24 0:56 ` [PATCH V6 net-next 08/15] net/tls: Support TLS device offload with IPv6 David Miller
2018-04-22 15:19 ` [PATCH V6 net-next 09/15] net/mlx5e: Move defines out of ipsec code Boris Pismenny
2018-04-22 15:19 ` [PATCH V6 net-next 10/15] net/mlx5: Accel, Add TLS tx offload interface Boris Pismenny
2018-04-22 15:19 ` [PATCH V6 net-next 11/15] net/mlx5e: TLS, Add Innova TLS TX support Boris Pismenny
2018-04-22 15:19 ` [PATCH V6 net-next 12/15] net/mlx5e: TLS, Add Innova TLS TX offload data path Boris Pismenny
2018-04-22 15:19 ` [PATCH V6 net-next 13/15] net/mlx5e: TLS, Add error statistics Boris Pismenny
2018-04-22 15:19 ` [PATCH V6 net-next 14/15] MAINTAINERS: Update mlx5 innova driver maintainers Boris Pismenny
2018-04-22 15:19 ` [PATCH V6 net-next 15/15] MAINTAINERS: Update TLS maintainers Boris Pismenny
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=1524410397-108425-9-git-send-email-borisp@mellanox.com \
--to=borisp@mellanox.com \
--cc=davejwatson@fb.com \
--cc=davem@davemloft.net \
--cc=ilyal@mellanox.com \
--cc=ktkhai@virtuozzo.com \
--cc=netdev@vger.kernel.org \
--cc=saeedm@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