David Howells wrote:
> Now that ->sendpage() has been removed, MSG_SENDPAGE_NOTLAST can be cleaned
> up.  Things were converted to use MSG_MORE instead, but the protocol
> sendpage stubs still convert MSG_SENDPAGE_NOTLAST to MSG_MORE, which is now
> unnecessary.
> 
> Signed-off-by: David Howells <dhowe...@redhat.com>
> cc: "David S. Miller" <da...@davemloft.net>
> cc: Eric Dumazet <eduma...@google.com>
> cc: Jakub Kicinski <k...@kernel.org>
> cc: Paolo Abeni <pab...@redhat.com>
> cc: Jens Axboe <ax...@kernel.dk>
> cc: Matthew Wilcox <wi...@infradead.org>
> cc: b...@vger.kernel.org
> cc: d...@vger.kernel.org
> cc: linux-...@lists.infradead.org
> cc: linux-arm-...@vger.kernel.org
> cc: linux-...@vger.kernel.org
> cc: linux-cry...@vger.kernel.org
> cc: linux-...@vger.kernel.org
> cc: linux-h...@vger.kernel.org
> cc: linux-perf-us...@vger.kernel.org
> cc: linux-r...@vger.kernel.org
> cc: linux-s...@vger.kernel.org
> cc: linux-w...@vger.kernel.org
> cc: linux-...@vger.kernel.org
> cc: mp...@lists.linux.dev
> cc: net...@vger.kernel.org
> cc: rds-de...@oss.oracle.com
> cc: tipc-discuss...@lists.sourceforge.net
> cc: virtualization@lists.linux-foundation.org
> ---
>  include/linux/socket.h                         | 4 +---
>  net/ipv4/tcp_bpf.c                             | 4 +++-
>  net/tls/tls_device.c                           | 3 +--
>  net/tls/tls_main.c                             | 2 +-
>  net/tls/tls_sw.c                               | 2 +-
>  tools/perf/trace/beauty/include/linux/socket.h | 1 -
>  tools/perf/trace/beauty/msg_flags.c            | 3 ---
>  7 files changed, 7 insertions(+), 12 deletions(-)
>
 
> @@ -90,7 +90,9 @@ static int tcp_bpf_push(struct sock *sk, struct sk_msg 
> *msg, u32 apply_bytes,
>  {
>       bool apply = apply_bytes;
>       struct scatterlist *sge;
> -     struct msghdr msghdr = { .msg_flags = flags | MSG_SPLICE_PAGES, };
> +     struct msghdr msghdr = {
> +             .msg_flags = flags | MSG_SPLICE_PAGES | MSG_MORE,
> +     };
>       struct page *page;
>       int size, ret = 0;
>       u32 off;

Is it intentional to add MSG_MORE here in this patch?

I do see that patch 3 removes this branch:

@@ -111,9 +111,6 @@  static int tcp_bpf_push(struct sock *sk, struct sk_msg 
*msg, u32 apply_bytes,
                if (has_tx_ulp)
                        msghdr.msg_flags |= MSG_SENDPAGE_NOPOLICY;
 
-               if (flags & MSG_SENDPAGE_NOTLAST)
-                       msghdr.msg_flags |= MSG_MORE;
-
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

Reply via email to