net/tls: fixes for NVMe-over-TLS
Subsystems (5)
v4 cover net/tls: fixes for NVMe-over-TLS
Hi all,
here are some small fixes to get NVMe-over-TLS up and running. The first thre are just minor modifications to have MSG_EOR handled for TLS (and adding a test for it), but the last implements the ->read_sock() callback for tls_sw and I guess could do with some reviews.
It does work with my NVMe-TLS test harness, but what do I know :-)
As usual, comments and reviews are welcome.
Changes to the original submission:
- Add a testcase for MSG_EOR handling
Changes to v2:
- Bail out on conflicting message flags
- Rework flag handling
Changes to v3:
- Return -EINVAL on conflicting flags
- Rebase on top of net-next
Hannes Reinecke (4):
net/tls: handle MSG_EOR for tls_sw TX flow
net/tls: handle MSG_EOR for tls_device TX flow
selftests/net/tls: add test for MSG_EOR
net/tls: implement ->read_sock()
net/tls/tls.h | 2 + net/tls/tls_device.c | 25 ++++++++-- net/tls/tls_main.c | 2 + net/tls/tls_sw.c | 78 ++++++++++++++++++++++++++++++- tools/testing/selftests/net/tls.c | 11 +++++ 5 files changed, 111 insertions(+), 7 deletions(-)
Signature · 1 line
2.35.3
PATCH v4 1/4 net/tls: handle MSG_EOR for tls_sw TX flow
tls_sw_sendmsg() / tls_do_sw_sendpage() already handles MSG_MORE / MSG_SENDPAGE_NOTLAST, but bails out on MSG_EOR. But seeing that MSG_EOR is basically the opposite of MSG_MORE / MSG_SENDPAGE_NOTLAST this patch adds handling MSG_EOR by treating it as the negation of MSG_MORE. And erroring out if MSG_EOR is specified with either MSG_MORE or MSG_SENDPAGE_NOTLAST.
--- net/tls/tls_sw.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
net/tls/tls_sw.c +5 -2
@@ -984,6 +984,9 @@ static int tls_sw_sendmsg_locked(struct sock *sk, struct msghdr *msg,int ret =0 ;int pending; +if (!eor && (msg->msg_flags &MSG_EOR )) +return -EINVAL ; +if (unlikely (msg->msg_controllen)) { ret =tls_process_cmsg (sk, msg, &record_type);if (ret) {
@@ -1193,7 +1196,7 @@ int tls_sw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)int ret;if (msg->msg_flags & ~(MSG_MORE |MSG_DONTWAIT |MSG_NOSIGNAL | -MSG_CMSG_COMPAT |MSG_SPLICE_PAGES | +MSG_CMSG_COMPAT |MSG_SPLICE_PAGES |MSG_EOR |MSG_SENDPAGE_NOTLAST |MSG_SENDPAGE_NOPOLICY ))return -EOPNOTSUPP ;
@@ -1287,7 +1290,7 @@ int tls_sw_sendpage_locked(struct sock *sk, struct page *page,struct bio_vec bvec;struct msghdr msg = { .msg_flags = flags |MSG_SPLICE_PAGES , }; -if (flags & ~(MSG_MORE |MSG_DONTWAIT |MSG_NOSIGNAL | +if (flags & ~(MSG_MORE |MSG_DONTWAIT |MSG_NOSIGNAL |MSG_EOR |MSG_SENDPAGE_NOTLAST |MSG_SENDPAGE_NOPOLICY |MSG_NO_SHARED_FRAGS ))return -EOPNOTSUPP ;
Signature · 1 line
2.35.3
Jakub Kicinski
maintainerRe: [PATCH 1/4] net/tls: handle MSG_EOR for tls_sw TX flow
net/tls/tls_sw.c int tls_sw_sendpage_locked(struct sock *sk, struct page *page, · line 1296
Quoted 9 lines · On Wed, 14 Jun 2023 08:22:09 +0200 Hannes Reinecke wrote:
net/tls/tls_sw.c +1
-1@@ -1287,7 +1290,7 @@ int tls_sw_sendpage_locked(struct sock *sk, struct page *page,struct bio_vec bvec;struct msghdr msg = { .msg_flags = flags |MSG_SPLICE_PAGES , }; -if (flags & ~(MSG_MORE |MSG_DONTWAIT |MSG_NOSIGNAL | +if (flags & ~(MSG_MORE |MSG_DONTWAIT |MSG_NOSIGNAL |MSG_EOR |MSG_SENDPAGE_NOTLAST |MSG_SENDPAGE_NOPOLICY |MSG_NO_SHARED_FRAGS ))return -EOPNOTSUPP ;
you added it to sendpage_locked but not normal sendpage
PATCH v4 2/4 net/tls: handle MSG_EOR for tls_device TX flow
In reply to Hannes Reinecketls_push_data() MSG_MORE / MSG_SENDPAGE_NOTLAST, but bails out on MSG_EOR.
But seeing that MSG_EOR is basically the opposite of MSG_MORE / MSG_SENDPAGE_NOTLAST this patch adds handling MSG_EOR by treating it as the absence of MSG_MORE. Consequently we should return an error when both are set.
--- net/tls/tls_device.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-)
net/tls/tls_device.c +20 -5
@@ -440,11 +440,6 @@ static int tls_push_data(struct sock *sk,int copy, rc =0 ;long timeo; -if (flags & - ~(MSG_MORE |MSG_DONTWAIT |MSG_NOSIGNAL |MSG_SENDPAGE_NOTLAST | -MSG_SPLICE_PAGES )) -return -EOPNOTSUPP ; -if (unlikely (sk->sk_err))return -sk->sk_err;
@@ -536,6 +531,10 @@ static int tls_push_data(struct sock *sk, more = true;break ; } +if (flags &MSG_EOR ) { + more = false; +break ; + } done = true; }
@@ -582,6 +581,14 @@ int tls_device_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)if (!tls_ctx->zerocopy_sendfile) msg->msg_flags &= ~MSG_SPLICE_PAGES ; +if (msg->msg_flags & + ~(MSG_MORE |MSG_DONTWAIT |MSG_NOSIGNAL |MSG_SENDPAGE_NOTLAST | +MSG_SPLICE_PAGES |MSG_EOR )) +return -EOPNOTSUPP ; + +if ((msg->msg_flags & (MSG_MORE |MSG_EOR )) == (MSG_MORE |MSG_EOR )) +return -EOPNOTSUPP ; +mutex_lock (&tls_ctx->tx_lock);lock_sock (sk);
@@ -627,9 +634,17 @@ int tls_device_sendpage(struct sock *sk, struct page *page,struct bio_vec bvec;struct msghdr msg = { .msg_flags = flags |MSG_SPLICE_PAGES , }; +if (flags & + ~(MSG_MORE |MSG_DONTWAIT |MSG_NOSIGNAL |MSG_SENDPAGE_NOTLAST | +MSG_SPLICE_PAGES |MSG_EOR )) +return -EOPNOTSUPP ; +if (flags &MSG_SENDPAGE_NOTLAST ) msg.msg_flags |=MSG_MORE ; +if ((msg.msg_flags & (MSG_MORE |MSG_EOR )) == (MSG_MORE |MSG_EOR )) +return -EINVAL ; +if (flags &MSG_OOB )return -EOPNOTSUPP ;
Signature · 1 line
2.35.3
PATCH v4 3/4 selftests/net/tls: add test for MSG_EOR
In reply to Hannes ReineckeAs the recent patch is modifying the behaviour for TLS re MSG_EOR handling we should be having a test for it.
--- tools/testing/selftests/net/tls.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
tools/testing/selftests/net/tls.c +11 -0
@@ -477,6 +477,17 @@ TEST_F(tls, msg_more_unsent)EXPECT_EQ (recv (self->cfd, buf, send_len,MSG_DONTWAIT ),-1 ); } +TEST_F(tls, msg_eor) +{ +char const *test_str ="test_read" ; +int send_len =10 ; +char buf[10 ]; + +EXPECT_EQ (send (self->fd, test_str, send_len,MSG_EOR ), send_len); +EXPECT_EQ (recv (self->cfd, buf, send_len,MSG_WAITALL ), send_len); +EXPECT_EQ (memcmp (buf, test_str, send_len),0 ); +} + TEST_F(tls, sendmsg_single) {struct msghdr msg;
Signature · 1 line
2.35.3
PATCH v4 4/4 net/tls: implement ->read_sock()
In reply to Hannes ReineckeImplement ->read_sock() function for use with nvme-tcp.
--- net/tls/tls.h | 2 ++ net/tls/tls_main.c | 2 ++ net/tls/tls_sw.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+)
net/tls/tls.h +2 -0
@@ -114,6 +114,8 @@ bool tls_sw_sock_is_readable(struct sock *sk);ssize_t tls_sw_splice_read (struct socket *sock,loff_t *ppos,struct pipe_inode_info *pipe,size_t len,unsigned int flags); +int tls_sw_read_sock (struct sock *sk,read_descriptor_t *desc, +sk_read_actor_t read_actor);int tls_device_sendmsg (struct sock *sk,struct msghdr *msg,size_t size);void tls_device_splice_eof (struct socket *sock);
net/tls/tls_main.c +2 -0
@@ -963,10 +963,12 @@ static void build_proto_ops(struct proto_ops ops[TLS_NUM_CONFIG][TLS_NUM_CONFIG] ops[TLS_BASE ][TLS_SW ] = ops[TLS_BASE ][TLS_BASE ]; ops[TLS_BASE ][TLS_SW ].splice_read = tls_sw_splice_read; ops[TLS_BASE ][TLS_SW ].poll = tls_sk_poll; + ops[TLS_BASE ][TLS_SW ].read_sock = tls_sw_read_sock; ops[TLS_SW ][TLS_SW ] = ops[TLS_SW ][TLS_BASE ]; ops[TLS_SW ][TLS_SW ].splice_read = tls_sw_splice_read; ops[TLS_SW ][TLS_SW ].poll = tls_sk_poll; + ops[TLS_SW ][TLS_SW ].read_sock = tls_sw_read_sock;#ifdef CONFIG_TLS_DEVICE ops[TLS_HW ][TLS_BASE ] = ops[TLS_BASE ][TLS_BASE ];
net/tls/tls_sw.c +71 -0
77 lines not on this page · raw message
Signature · 1 line
2.35.3
Jakub Kicinski
maintainerRe: [PATCH 4/4] net/tls: implement ->read_sock()
Quoted 1 line · On Wed, 14 Jun 2023 08:22:12 +0200 Hannes Reinecke wrote:
Implement ->read_sock() function for use with nvme-tcp.
please take tls_rx_reader_lock() :S
Signature · 1 line
pw-bot: cr
Re: [PATCH 4/4] net/tls: implement ->read_sock()
In reply to Hannes Reinecke+ Dan Carpenter
On Wed, Jun 14, 2023 at 08:22:12AM +0200, Hannes Reinecke wrote:
...
Quoted 63 lines
net/tls/tls_sw.c +55
-0@@ -2231,6 +2231,77 @@ ssize_t tls_sw_splice_read(struct socket *sock, loff_t *ppos, goto splice_read_end; } +int tls_sw_read_sock (struct sock *sk,read_descriptor_t *desc, +sk_read_actor_t read_actor) +{ +struct tls_context *tls_ctx =tls_get_ctx (sk); +struct tls_sw_context_rx *ctx =tls_sw_ctx_rx (tls_ctx); +struct strp_msg *rxm =NULL ; +struct tls_msg *tlm; +struct sk_buff *skb; +ssize_t copied =0 ; +int err, used; + +if (!skb_queue_empty (&ctx->rx_list)) { + skb =__skb_dequeue (&ctx->rx_list); + }else { +struct tls_decrypt_arg darg; + + err =tls_rx_rec_wait (sk,NULL , true, true); +if (err <=0 ) +return err; + +memset (&darg.inargs,0 ,sizeof (darg.inargs)); + + err =tls_rx_one_record (sk,NULL , &darg); +if (err <0 ) { +tls_err_abort (sk, -EBADMSG ); +return err; + } + +tls_rx_rec_done (ctx); + skb = darg.skb; + } + + do { + rxm = strp_msg(skb); + tlm = tls_msg(skb); + + /* read_sock does not support reading control messages */ + if (tlm->control != TLS_RECORD_TYPE_DATA) { + err = -EINVAL; + goto read_sock_requeue; + } + + used = read_actor(desc, skb, rxm->offset, rxm->full_len); + if (used <= 0) { + err = used; + goto read_sock_end; + } + + copied += used; + if (used < rxm->full_len) { + rxm->offset += used; + rxm->full_len -= used; + if (!desc->count) + goto read_sock_requeue; + } else {
net/tls/tls_sw.c ssize_t tls_sw_splice_read(struct socket *sock, loff_t *ppos, · line 2298
Quoted 10 lines
net/tls/tls_sw.c +10
-0+consume_skb (skb); +if (desc->count && !skb_queue_empty (&ctx->rx_list)) + skb =__skb_dequeue (&ctx->rx_list); +else + skb =NULL ; + } + }while (skb); + +read_sock_end: +return copied ? : err;
Hi Hannes,
I'm of two minds about raising this or not, but in any case here I am doing so.
Both gcc-12 [-Wmaybe-uninitialized] and Smatch warn that err may be used uninitialised on the line above.
My own analysis is that it cannot occur: I think it is always the case that either copied is non-zero or err is initialised. But still the warning is there. And in future it may create noise that may crowds out real problems.
It also seems to imply that the path is somewhat complex, and hard to analyse: certainly it took my small brain a while.
So I do wonder if there is a value in ensuring err is always set to something appropriate, perhaps set to -EINVAL above the do loop.
I guess that in the end I decided it was best to put this thinking in the open. And let you decide.
Quoted 13 lines
net/tls/tls_sw.c +6
-0+ +read_sock_requeue: +__skb_queue_head (&ctx->rx_list, skb); + goto read_sock_end; +} +bool tls_sw_sock_is_readable (struct sock *sk) {struct tls_context *tls_ctx =tls_get_ctx (sk);Signature · 1 line
2.35.3
Re: [PATCH 4/4] net/tls: implement ->read_sock()
Quoted 12 lines · Simon Horman
+ Dan Carpenter
On Wed, Jun 14, 2023 at 08:22:12AM +0200, Hannes Reinecke wrote:
...
net/tls/tls_sw.c ssize_t tls_sw_splice_read(struct socket *sock, loff_t *ppos, · line 2298
Quoted 3 lines
net/tls/tls_sw.c +3
-0+ +read_sock_end: +return copied ? : err;Hi Hannes,
Quoted 8 lines
I'm of two minds about raising this or not, but in any case here I am doing so.
Both gcc-12 [-Wmaybe-uninitialized] and Smatch warn that err may be used uninitialised on the line above.
My own analysis is that it cannot occur: I think it is always the case that either copied is non-zero or err is initialised.
Hm... Yeah. This is a bug in how Smatch handles:
return copied ? : err;
Smatch wants every return to have a simple literal or variable. So if the return is complicated it gets changed into:
fake_variable = copied ? : err; return fake_variable;
Smatch translates this to:
if (!(fake_variable = copied)) fake_variable = err;
[ Here fake_variable doesn't have side effects but under other
circumstances this transformation could cause double evaluate side effects bugs. So that's another bug in Smatch. ]
Then Smatch parses the fake_variable = copied condition as:
fake_variable = copied;
if (fake_variable) {The problem is that the type of fake_variable is based on the type of tls_sw_read_sock() so it is a 32bit while copied is a 64bit (of unknown value). So Smatch says, "Just because copied is non-zero doesn't mean fake_variable is non-zero because the value might get truncated when we cast away the high 32 bits."
This not a serious proposal but a just to demonstrate that this is what happens there are two ways to silence this warning. Changing the type of tls_sw_read_sock() to long. Or change the code to:
if (copied) return copied; return err;
Probably the right thing is to create a second fake_copied variable based on typeof(copied).
fake_copied = copied; if (fake_copied) fake_return_variable = fake_copied; else fake_return_variable = err;
It's a doable thing. Plus now there are no double evaluate side effects bugs. I have written this code and it silences the warning, but I'll test it out tonight to see what breaks.
regards,
dan carpenter