[PATCH 07/17] net/tls: handle MSG_EOR for tls_sw TX flow

[Max Gurtovoy]

On 19/04/2023 9:57, Hannes Reinecke wrote:
> tls_sw_sendmsg() / tls_do_sw_sendpage() already checks for an
> 'end of record' by evaluating the 'MSG_MORE' / 'MSG_SENDPAGE_NOTLAST'
> setting. So MSG_EOR can easily be handled by treating it
> as the opposite of MSG_MORE / MSG_SENDPAGE_NOTLAST.
> 

This seems like a nice optimization but seems not mandatory for the 
acceptance of TLS support in nvme/tcp.

I wonder if this can go to net/tls as a standalone patch ?


> Signed-off-by: Hannes Reinecke <hare at suse.de>
> Cc: Jakub Kicinski <kuba at kernel.org>
> ---
>   net/tls/tls_sw.c | 11 ++++++++---
>   1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
> index 827292e29f99..9bee2dcd55bf 100644
> --- a/net/tls/tls_sw.c
> +++ b/net/tls/tls_sw.c
> @@ -953,9 +953,12 @@ int tls_sw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
>   	int pending;
>   
>   	if (msg->msg_flags & ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL |
> -			       MSG_CMSG_COMPAT))
> +			       MSG_EOR | MSG_CMSG_COMPAT))
>   		return -EOPNOTSUPP;
>   
> +	if (msg->msg_flags & MSG_EOR)
> +		eor = true;
> +
>   	ret = mutex_lock_interruptible(&tls_ctx->tx_lock);
>   	if (ret)
>   		return ret;
> @@ -1173,6 +1176,8 @@ static int tls_sw_do_sendpage(struct sock *sk, struct page *page,
>   	bool eor;
>   
>   	eor = !(flags & MSG_SENDPAGE_NOTLAST);
> +	if (flags & MSG_EOR)
> +		eor = true;
>   	sk_clear_bit(SOCKWQ_ASYNC_NOSPACE, sk);
>   
>   	/* Call the sk_stream functions to manage the sndbuf mem. */
> @@ -1274,7 +1279,7 @@ static int tls_sw_do_sendpage(struct sock *sk, struct page *page,
>   int tls_sw_sendpage_locked(struct sock *sk, struct page *page,
>   			   int offset, size_t size, int flags)
>   {
> -	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;
> @@ -1288,7 +1293,7 @@ int tls_sw_sendpage(struct sock *sk, struct page *page,
>   	struct tls_context *tls_ctx = tls_get_ctx(sk);
>   	int ret;
>   
> -	if (flags & ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL |
> +	if (flags & ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL | MSG_EOR |
>   		      MSG_SENDPAGE_NOTLAST | MSG_SENDPAGE_NOPOLICY))
>   		return -EOPNOTSUPP;
>