From: Jakub Kicinski <jakub.kicinski@netronome.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, oss-drivers@netronome.com,
davejwatson@fb.com, borisp@mellanox.com, aviadye@mellanox.com,
john.fastabend@gmail.com, daniel@iogearbox.net,
atul.gupta@chelsio.com,
Jakub Kicinski <jakub.kicinski@netronome.com>,
John Hurley <john.hurley@netronome.com>,
Simon Horman <simon.horman@netronome.com>
Subject: [PATCH net-next 5/6] net/tls: rename tls_hw_* functions tls_toe_*
Date: Thu, 3 Oct 2019 11:18:58 -0700 [thread overview]
Message-ID: <20191003181859.24958-6-jakub.kicinski@netronome.com> (raw)
In-Reply-To: <20191003181859.24958-1-jakub.kicinski@netronome.com>
The tls_hw_* functions are quite confusingly named, since they
are related to the TOE-offload, not TLS_HW offload which doesn't
require TOE. Rename them.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: John Hurley <john.hurley@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
---
include/net/tls_toe.h | 6 +++---
net/tls/tls_main.c | 6 +++---
net/tls/tls_toe.c | 12 ++++++------
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/include/net/tls_toe.h b/include/net/tls_toe.h
index 3bb39c795aed..b3aa7593ce2c 100644
--- a/include/net/tls_toe.h
+++ b/include/net/tls_toe.h
@@ -69,9 +69,9 @@ struct tls_toe_device {
struct kref kref;
};
-int tls_hw_prot(struct sock *sk);
-int tls_hw_hash(struct sock *sk);
-void tls_hw_unhash(struct sock *sk);
+int tls_toe_bypass(struct sock *sk);
+int tls_toe_hash(struct sock *sk);
+void tls_toe_unhash(struct sock *sk);
void tls_toe_register_device(struct tls_toe_device *device);
void tls_toe_unregister_device(struct tls_toe_device *device);
diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c
index 9d0cf14b2f7e..483dda6c3155 100644
--- a/net/tls/tls_main.c
+++ b/net/tls/tls_main.c
@@ -681,8 +681,8 @@ static void build_protos(struct proto prot[TLS_NUM_CONFIG][TLS_NUM_CONFIG],
#endif
prot[TLS_HW_RECORD][TLS_HW_RECORD] = *base;
- prot[TLS_HW_RECORD][TLS_HW_RECORD].hash = tls_hw_hash;
- prot[TLS_HW_RECORD][TLS_HW_RECORD].unhash = tls_hw_unhash;
+ prot[TLS_HW_RECORD][TLS_HW_RECORD].hash = tls_toe_hash;
+ prot[TLS_HW_RECORD][TLS_HW_RECORD].unhash = tls_toe_unhash;
}
static int tls_init(struct sock *sk)
@@ -692,7 +692,7 @@ static int tls_init(struct sock *sk)
tls_build_proto(sk);
- if (tls_hw_prot(sk))
+ if (tls_toe_bypass(sk))
return 0;
/* The TLS ulp is currently supported only for TCP sockets
diff --git a/net/tls/tls_toe.c b/net/tls/tls_toe.c
index 89a7014a05f7..7e1330f19165 100644
--- a/net/tls/tls_toe.c
+++ b/net/tls/tls_toe.c
@@ -41,7 +41,7 @@
static LIST_HEAD(device_list);
static DEFINE_SPINLOCK(device_spinlock);
-static void tls_hw_sk_destruct(struct sock *sk)
+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);
@@ -52,7 +52,7 @@ static void tls_hw_sk_destruct(struct sock *sk)
tls_ctx_free(sk, ctx);
}
-int tls_hw_prot(struct sock *sk)
+int tls_toe_bypass(struct sock *sk)
{
struct tls_toe_device *dev;
struct tls_context *ctx;
@@ -66,7 +66,7 @@ int tls_hw_prot(struct sock *sk)
goto out;
ctx->sk_destruct = sk->sk_destruct;
- sk->sk_destruct = tls_hw_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);
@@ -79,7 +79,7 @@ int tls_hw_prot(struct sock *sk)
return rc;
}
-void tls_hw_unhash(struct sock *sk)
+void tls_toe_unhash(struct sock *sk)
{
struct tls_context *ctx = tls_get_ctx(sk);
struct tls_toe_device *dev;
@@ -98,7 +98,7 @@ void tls_hw_unhash(struct sock *sk)
ctx->sk_proto->unhash(sk);
}
-int tls_hw_hash(struct sock *sk)
+int tls_toe_hash(struct sock *sk)
{
struct tls_context *ctx = tls_get_ctx(sk);
struct tls_toe_device *dev;
@@ -118,7 +118,7 @@ int tls_hw_hash(struct sock *sk)
spin_unlock_bh(&device_spinlock);
if (err)
- tls_hw_unhash(sk);
+ tls_toe_unhash(sk);
return err;
}
--
2.21.0
next prev parent reply other threads:[~2019-10-03 18:19 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-03 18:18 [PATCH net-next 0/6] net/tls: separate the TLS TOE code out Jakub Kicinski
2019-10-03 18:18 ` [PATCH net-next 1/6] net/tls: move TOE-related structures to a separate header Jakub Kicinski
2019-10-03 18:18 ` [PATCH net-next 2/6] net/tls: rename tls_device to tls_toe_device Jakub Kicinski
2019-10-03 18:18 ` [PATCH net-next 3/6] net/tls: move tls_build_proto() on init path Jakub Kicinski
2019-10-03 18:18 ` [PATCH net-next 4/6] net/tls: move TOE-related code to a separate file Jakub Kicinski
2019-10-03 18:18 ` Jakub Kicinski [this message]
2019-10-03 18:18 ` [PATCH net-next 6/6] net/tls: allow compiling TLS TOE out Jakub Kicinski
2019-10-04 14:31 ` [PATCH net-next 0/6] net/tls: separate the TLS TOE code out John Fastabend
2019-10-04 21:07 ` David Miller
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=20191003181859.24958-6-jakub.kicinski@netronome.com \
--to=jakub.kicinski@netronome.com \
--cc=atul.gupta@chelsio.com \
--cc=aviadye@mellanox.com \
--cc=borisp@mellanox.com \
--cc=daniel@iogearbox.net \
--cc=davejwatson@fb.com \
--cc=davem@davemloft.net \
--cc=john.fastabend@gmail.com \
--cc=john.hurley@netronome.com \
--cc=netdev@vger.kernel.org \
--cc=oss-drivers@netronome.com \
--cc=simon.horman@netronome.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).