Re: [PATCH 2/4] net/tls: handle MSG_EOR for tls_device TX flow

Sabrina Dubroca
2023-06-20T17:12:52Z

2023-06-20, 12:28:54 +0200, Hannes Reinecke wrote:
> tls_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.
>
> Cc: Jakub Kicinski <kuba@kernel.org>
> Cc: netdev@vger.kernel.org
> Signed-off-by: Hannes Reinecke <hare@suse.de>
> ---
> net/tls/tls_device.c | 25 ++++++++++++++++++++-----
> 1 file changed, 20 insertions(+), 5 deletions(-)
>
> diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c
> index b82770f68807..ebefd148ecf5 100644
> --- a/net/tls/tls_device.c
> +++ b/net/tls/tls_device.c
> @@ -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;

Why the break here? We don't want to close and push the record in that
case? (the "if (done || ...)" block just below)

> + }
>
> done = true;
> }

Thanks,

--
Sabrina