diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/ethtool/common.c | 1 | ||||
| -rw-r--r-- | net/tls/Kconfig | 10 | ||||
| -rw-r--r-- | net/tls/Makefile | 1 | ||||
| -rw-r--r-- | net/tls/tls_main.c | 17 | ||||
| -rw-r--r-- | net/tls/tls_toe.c | 141 |
5 files changed, 0 insertions, 170 deletions
diff --git a/net/ethtool/common.c b/net/ethtool/common.c index a24d3a8a9ec1..23db40618fed 100644 --- a/net/ethtool/common.c +++ b/net/ethtool/common.c @@ -67,7 +67,6 @@ const char netdev_features_strings[NETDEV_FEATURE_COUNT][ETH_GSTRING_LEN] = { [NETIF_F_HW_ESP_BIT] = "esp-hw-offload", [NETIF_F_HW_ESP_TX_CSUM_BIT] = "esp-tx-csum-hw-offload", [NETIF_F_RX_UDP_TUNNEL_PORT_BIT] = "rx-udp_tunnel-port-offload", - [NETIF_F_HW_TLS_RECORD_BIT] = "tls-hw-record", [NETIF_F_HW_TLS_TX_BIT] = "tls-hw-tx-offload", [NETIF_F_HW_TLS_RX_BIT] = "tls-hw-rx-offload", [NETIF_F_GRO_FRAGLIST_BIT] = "rx-gro-list", diff --git a/net/tls/Kconfig b/net/tls/Kconfig index a25bf57f2673..4f4d5973a28f 100644 --- a/net/tls/Kconfig +++ b/net/tls/Kconfig @@ -27,13 +27,3 @@ config TLS_DEVICE Enable kernel support for HW offload of the TLS protocol. If unsure, say N. - -config TLS_TOE - bool "Transport Layer Security TCP stack bypass" - depends on TLS - default n - help - Enable kernel support for legacy HW offload of the TLS protocol, - which is incompatible with the Linux networking stack semantics. - - If unsure, say N. diff --git a/net/tls/Makefile b/net/tls/Makefile index e41c800489ac..4c7d296081ee 100644 --- a/net/tls/Makefile +++ b/net/tls/Makefile @@ -9,5 +9,4 @@ obj-$(CONFIG_TLS) += tls.o tls-y := tls_main.o tls_sw.o tls_proc.o trace.o tls_strp.o -tls-$(CONFIG_TLS_TOE) += tls_toe.o tls-$(CONFIG_TLS_DEVICE) += tls_device.o tls_device_fallback.o diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index c10a3fd7fc17..13c88a7b8787 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -43,8 +43,6 @@ #include <net/snmp.h> #include <net/tls.h> -#include <net/tls_toe.h> - #include "tls.h" MODULE_AUTHOR("Mellanox Technologies"); @@ -963,9 +961,6 @@ static void build_proto_ops(struct proto_ops ops[TLS_NUM_CONFIG][TLS_NUM_CONFIG] ops[TLS_HW ][TLS_HW ] = ops[TLS_HW ][TLS_SW ]; #endif -#ifdef CONFIG_TLS_TOE - ops[TLS_HW_RECORD][TLS_HW_RECORD] = *base; -#endif } static void tls_build_proto(struct sock *sk) @@ -1037,11 +1032,6 @@ static void build_protos(struct proto prot[TLS_NUM_CONFIG][TLS_NUM_CONFIG], prot[TLS_HW][TLS_HW] = prot[TLS_HW][TLS_SW]; #endif -#ifdef CONFIG_TLS_TOE - prot[TLS_HW_RECORD][TLS_HW_RECORD] = *base; - prot[TLS_HW_RECORD][TLS_HW_RECORD].hash = tls_toe_hash; - prot[TLS_HW_RECORD][TLS_HW_RECORD].unhash = tls_toe_unhash; -#endif } static int tls_init(struct sock *sk) @@ -1051,11 +1041,6 @@ static int tls_init(struct sock *sk) tls_build_proto(sk); -#ifdef CONFIG_TLS_TOE - if (tls_toe_bypass(sk)) - return 0; -#endif - /* The TLS ulp is currently supported only for TCP sockets * in ESTABLISHED state. * Supporting sockets in LISTEN state will require us @@ -1111,8 +1096,6 @@ static u16 tls_user_config(struct tls_context *ctx, bool tx) return TLS_CONF_SW; case TLS_HW: return TLS_CONF_HW; - case TLS_HW_RECORD: - return TLS_CONF_HW_RECORD; } return 0; } diff --git a/net/tls/tls_toe.c b/net/tls/tls_toe.c deleted file mode 100644 index 825669e1ab47..000000000000 --- a/net/tls/tls_toe.c +++ /dev/null @@ -1,141 +0,0 @@ -/* - * Copyright (c) 2016-2017, Mellanox Technologies. All rights reserved. - * Copyright (c) 2016-2017, Dave Watson <davejwatson@fb.com>. All rights reserved. - * - * This software is available to you under a choice of one of two - * licenses. You may choose to be licensed under the terms of the GNU - * General Public License (GPL) Version 2, available from the file - * COPYING in the main directory of this source tree, or the - * OpenIB.org BSD license below: - * - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * - Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * - * - Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -#include <linux/list.h> -#include <linux/rcupdate.h> -#include <linux/spinlock.h> -#include <net/inet_connection_sock.h> -#include <net/tls.h> -#include <net/tls_toe.h> - -#include "tls.h" - -static LIST_HEAD(device_list); -static DEFINE_SPINLOCK(device_spinlock); - -static void tls_toe_sk_destruct(struct sock *sk) -{ - struct inet_connection_sock *icsk = inet_csk(sk); - struct tls_context *ctx = tls_get_ctx(sk); - - ctx->sk_destruct(sk); - /* Free ctx */ - rcu_assign_pointer(icsk->icsk_ulp_data, NULL); - tls_ctx_free(sk, ctx); -} - -int tls_toe_bypass(struct sock *sk) -{ - struct tls_toe_device *dev; - struct tls_context *ctx; - int rc = 0; - - spin_lock_bh(&device_spinlock); - list_for_each_entry(dev, &device_list, dev_list) { - if (dev->feature && dev->feature(dev)) { - ctx = tls_ctx_create(sk); - if (!ctx) - goto out; - - ctx->sk_destruct = sk->sk_destruct; - sk->sk_destruct = tls_toe_sk_destruct; - ctx->rx_conf = TLS_HW_RECORD; - ctx->tx_conf = TLS_HW_RECORD; - update_sk_prot(sk, ctx); - rc = 1; - break; - } - } -out: - spin_unlock_bh(&device_spinlock); - return rc; -} - -void tls_toe_unhash(struct sock *sk) -{ - struct tls_context *ctx = tls_get_ctx(sk); - struct tls_toe_device *dev; - - spin_lock_bh(&device_spinlock); - list_for_each_entry(dev, &device_list, dev_list) { - if (dev->unhash) { - kref_get(&dev->kref); - spin_unlock_bh(&device_spinlock); - dev->unhash(dev, sk); - kref_put(&dev->kref, dev->release); - spin_lock_bh(&device_spinlock); - } - } - spin_unlock_bh(&device_spinlock); - ctx->sk_proto->unhash(sk); -} - -int tls_toe_hash(struct sock *sk) -{ - struct tls_context *ctx = tls_get_ctx(sk); - struct tls_toe_device *dev; - int err; - - err = ctx->sk_proto->hash(sk); - spin_lock_bh(&device_spinlock); - list_for_each_entry(dev, &device_list, dev_list) { - if (dev->hash) { - kref_get(&dev->kref); - spin_unlock_bh(&device_spinlock); - err |= dev->hash(dev, sk); - kref_put(&dev->kref, dev->release); - spin_lock_bh(&device_spinlock); - } - } - spin_unlock_bh(&device_spinlock); - - if (err) - tls_toe_unhash(sk); - return err; -} - -void tls_toe_register_device(struct tls_toe_device *device) -{ - spin_lock_bh(&device_spinlock); - list_add_tail(&device->dev_list, &device_list); - spin_unlock_bh(&device_spinlock); -} -EXPORT_SYMBOL(tls_toe_register_device); - -void tls_toe_unregister_device(struct tls_toe_device *device) -{ - spin_lock_bh(&device_spinlock); - list_del(&device->dev_list); - spin_unlock_bh(&device_spinlock); -} -EXPORT_SYMBOL(tls_toe_unregister_device); |