From: Boris Pismenny <borisp@mellanox.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, davejwatson@fb.com, aviadye@mellanox.com,
borisp@mellanox.com, saeedm@mellanox.com
Subject: [PATCH v5 net-next 07/18] tls: Split tls_sw_release_resources_rx
Date: Fri, 13 Jul 2018 14:33:41 +0300 [thread overview]
Message-ID: <1531481632-12335-8-git-send-email-borisp@mellanox.com> (raw)
In-Reply-To: <1531481632-12335-1-git-send-email-borisp@mellanox.com>
This patch splits tls_sw_release_resources_rx into two functions one
which releases all inner software tls structures and another that also
frees the containing structure.
In TLS_DEVICE we will need to release the software structures without
freeeing the containing structure, which contains other information.
Signed-off-by: Boris Pismenny <borisp@mellanox.com>
---
include/net/tls.h | 1 +
net/tls/tls_sw.c | 10 +++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/include/net/tls.h b/include/net/tls.h
index 49b8922..7a485de 100644
--- a/include/net/tls.h
+++ b/include/net/tls.h
@@ -223,6 +223,7 @@ int tls_sw_sendpage(struct sock *sk, struct page *page,
void tls_sw_close(struct sock *sk, long timeout);
void tls_sw_free_resources_tx(struct sock *sk);
void tls_sw_free_resources_rx(struct sock *sk);
+void tls_sw_release_resources_rx(struct sock *sk);
int tls_sw_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
int nonblock, int flags, int *addr_len);
unsigned int tls_sw_poll(struct file *file, struct socket *sock,
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 99d0347..86e22bc 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -1039,7 +1039,7 @@ void tls_sw_free_resources_tx(struct sock *sk)
kfree(ctx);
}
-void tls_sw_free_resources_rx(struct sock *sk)
+void tls_sw_release_resources_rx(struct sock *sk)
{
struct tls_context *tls_ctx = tls_get_ctx(sk);
struct tls_sw_context_rx *ctx = tls_sw_ctx_rx(tls_ctx);
@@ -1058,6 +1058,14 @@ void tls_sw_free_resources_rx(struct sock *sk)
strp_done(&ctx->strp);
lock_sock(sk);
}
+}
+
+void tls_sw_free_resources_rx(struct sock *sk)
+{
+ struct tls_context *tls_ctx = tls_get_ctx(sk);
+ struct tls_sw_context_rx *ctx = tls_sw_ctx_rx(tls_ctx);
+
+ tls_sw_release_resources_rx(sk);
kfree(ctx);
}
--
1.8.3.1
next prev parent reply other threads:[~2018-07-13 11:48 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-13 11:33 [PATCH v5 net-next 00/18] TLS offload rx, netdev & mlx5 Boris Pismenny
2018-07-13 11:33 ` [PATCH v5 net-next 01/18] net: Add decrypted field to skb Boris Pismenny
2018-07-13 11:33 ` [PATCH v5 net-next 02/18] net: Add TLS RX offload feature Boris Pismenny
2018-07-13 11:33 ` [PATCH v5 net-next 03/18] net: Add TLS rx resync NDO Boris Pismenny
2018-07-13 11:33 ` [PATCH v5 net-next 04/18] tcp: Don't coalesce decrypted and encrypted SKBs Boris Pismenny
2018-07-13 11:33 ` [PATCH v5 net-next 05/18] tls: Refactor tls_offload variable names Boris Pismenny
2018-07-13 11:33 ` [PATCH v5 net-next 06/18] tls: Split decrypt_skb to two functions Boris Pismenny
2018-07-13 11:33 ` Boris Pismenny [this message]
2018-07-13 11:33 ` [PATCH v5 net-next 08/18] tls: Fill software context without allocation Boris Pismenny
2018-07-13 11:33 ` [PATCH v5 net-next 09/18] tls: Add rx inline crypto offload Boris Pismenny
2018-07-13 11:33 ` [PATCH v5 net-next 10/18] tls: Fix zerocopy_from_iter iov handling Boris Pismenny
2018-07-13 11:33 ` [PATCH v5 net-next 11/18] net/mlx5e: TLS, refactor variable names Boris Pismenny
2018-07-13 11:33 ` [PATCH v5 net-next 12/18] net/mlx5: Accel, add TLS rx offload routines Boris Pismenny
2018-07-13 11:33 ` [PATCH v5 net-next 13/18] net/mlx5e: TLS, add innova rx support Boris Pismenny
2018-07-13 11:33 ` [PATCH v5 net-next 14/18] net/mlx5e: TLS, add Innova TLS rx data path Boris Pismenny
2018-07-13 11:33 ` [PATCH v5 net-next 15/18] net/mlx5e: TLS, add software statistics Boris Pismenny
2018-07-13 11:33 ` [PATCH v5 net-next 16/18] net/mlx5e: TLS, build TLS netdev from capabilities Boris Pismenny
2018-07-13 11:33 ` [PATCH v5 net-next 17/18] net/mlx5: Accel, add common metadata functions Boris Pismenny
2018-07-13 11:33 ` [PATCH v5 net-next 18/18] net/mlx5e: IPsec, fix byte count in CQE Boris Pismenny
2018-07-16 7:17 ` [PATCH v5 net-next 00/18] TLS offload rx, netdev & mlx5 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=1531481632-12335-8-git-send-email-borisp@mellanox.com \
--to=borisp@mellanox.com \
--cc=aviadye@mellanox.com \
--cc=davejwatson@fb.com \
--cc=davem@davemloft.net \
--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;
as well as URLs for NNTP newsgroup(s).