netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] tls splice: remove inappropriate flags checking for MSG_PEEK
@ 2021-05-12  9:00 Jim Ma
  2021-05-12 21:40 ` patchwork-bot+netdevbpf
  0 siblings, 1 reply; 2+ messages in thread
From: Jim Ma @ 2021-05-12  9:00 UTC (permalink / raw)
  To: kuba, borisp, john.fastabend, daniel; +Cc: netdev, Jim Ma

In function tls_sw_splice_read, before call tls_sw_advance_skb
it checks likely(!(flags & MSG_PEEK)), while MSG_PEEK is used
for recvmsg, splice supports SPLICE_F_NONBLOCK, SPLICE_F_MOVE,
SPLICE_F_MORE, should remove this checking.

Signed-off-by: Jim Ma <majinjing3@gmail.com>
---
 net/tls/tls_sw.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 1dcb34dfd56b..7b59ec9a24c5 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -2018,8 +2018,7 @@ ssize_t tls_sw_splice_read(struct socket *sock,  loff_t *ppos,
 	if (copied < 0)
 		goto splice_read_end;
 
-	if (likely(!(flags & MSG_PEEK)))
-		tls_sw_advance_skb(sk, skb, copied);
+	tls_sw_advance_skb(sk, skb, copied);
 
 splice_read_end:
 	release_sock(sk);
-- 
2.31.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] tls splice: remove inappropriate flags checking for MSG_PEEK
  2021-05-12  9:00 [PATCH] tls splice: remove inappropriate flags checking for MSG_PEEK Jim Ma
@ 2021-05-12 21:40 ` patchwork-bot+netdevbpf
  0 siblings, 0 replies; 2+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-05-12 21:40 UTC (permalink / raw)
  To: Jim Ma; +Cc: kuba, borisp, john.fastabend, daniel, netdev

Hello:

This patch was applied to netdev/net-next.git (refs/heads/master):

On Wed, 12 May 2021 17:00:11 +0800 you wrote:
> In function tls_sw_splice_read, before call tls_sw_advance_skb
> it checks likely(!(flags & MSG_PEEK)), while MSG_PEEK is used
> for recvmsg, splice supports SPLICE_F_NONBLOCK, SPLICE_F_MOVE,
> SPLICE_F_MORE, should remove this checking.
> 
> Signed-off-by: Jim Ma <majinjing3@gmail.com>
> 
> [...]

Here is the summary with links:
  - tls splice: remove inappropriate flags checking for MSG_PEEK
    https://git.kernel.org/netdev/net-next/c/d8654f4f9300

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-05-12 21:58 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-12  9:00 [PATCH] tls splice: remove inappropriate flags checking for MSG_PEEK Jim Ma
2021-05-12 21:40 ` patchwork-bot+netdevbpf

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).