public inbox for netdev@vger.kernel.org
 help / color / mirror / Atom feed
From: Eric Dumazet <eric.dumazet@gmail.com>
To: Willy Tarreau <w@1wt.eu>, David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] tcp: fix MSG_SENDPAGE_NOTLAST logic
Date: Sun, 06 Jan 2013 20:21:49 -0800	[thread overview]
Message-ID: <1357532509.6919.1715.camel@edumazet-glaptop> (raw)
In-Reply-To: <20130106195359.GN16031@1wt.eu>

From: Eric Dumazet <edumazet@google.com>

commit 35f9c09fe9c72e (tcp: tcp_sendpages() should call tcp_push() once)
added an internal flag : MSG_SENDPAGE_NOTLAST meant to be set on all
frags but the last one for a splice() call.

The condition used to set the flag in pipe_to_sendpage() relied on
splice() user passing the exact number of bytes present in the pipe,
or a smaller one.

But some programs pass an arbitrary high value, and the test fails.

The effect of this bug is a lack of tcp_push() at the end of a
splice(pipe -> socket) call, and possibly very slow or erratic TCP
sessions.

We should both test sd->total_len and fact that another fragment
is in the pipe (pipe->nrbufs > 1)

Many thanks to Willy for providing very clear bug report, bisection
and test programs.

Reported-by: Willy Tarreau <w@1wt.eu>
Bisected-by: Willy Tarreau <w@1wt.eu>
Tested-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Eric Dumazet <edumazet@google.com>
---
 fs/splice.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/splice.c b/fs/splice.c
index 8890604..6909d89 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -696,8 +696,10 @@ static int pipe_to_sendpage(struct pipe_inode_info *pipe,
 		return -EINVAL;
 
 	more = (sd->flags & SPLICE_F_MORE) ? MSG_MORE : 0;
-	if (sd->len < sd->total_len)
+
+	if (sd->len < sd->total_len && pipe->nrbufs > 1)
 		more |= MSG_SENDPAGE_NOTLAST;
+
 	return file->f_op->sendpage(file, buf->page, buf->offset,
 				    sd->len, &pos, more);
 }

  reply	other threads:[~2013-01-07  4:21 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-05 21:49 Major network performance regression in 3.7 Willy Tarreau
2013-01-05 23:18 ` Eric Dumazet
2013-01-05 23:29   ` Willy Tarreau
2013-01-06  0:02     ` Eric Dumazet
2013-01-06  0:50       ` Willy Tarreau
2013-01-06  1:21         ` Eric Dumazet
2013-01-06  1:30           ` Willy Tarreau
2013-01-06  1:40             ` Eric Dumazet
2013-01-06  1:51               ` Eric Dumazet
2013-01-06  2:16                 ` Eric Dumazet
2013-01-06  2:18                   ` Willy Tarreau
2013-01-06  2:22                     ` Eric Dumazet
2013-01-06  2:32                       ` Willy Tarreau
2013-01-06  2:44                         ` Eric Dumazet
2013-01-06  2:52                   ` Willy Tarreau
2013-01-06  7:31                     ` [PATCH net-next] net: splice: avoid high order page splitting Eric Dumazet
2013-01-07  5:07                       ` David Miller
2013-01-06  7:35                     ` Major network performance regression in 3.7 Eric Dumazet
2013-01-06  9:24                       ` Willy Tarreau
2013-01-06 10:25                         ` Willy Tarreau
2013-01-06 11:46                           ` Romain Francoise
2013-01-06 11:53                             ` Willy Tarreau
2013-01-06 12:01                           ` Willy Tarreau
2013-01-06 14:59                         ` Eric Dumazet
2013-01-06 15:51                           ` Willy Tarreau
2013-01-06 16:39                             ` Eric Dumazet
2013-01-06 16:44                               ` Willy Tarreau
2013-01-06 17:10                                 ` Eric Dumazet
2013-01-06 17:35                                   ` Willy Tarreau
2013-01-06 18:39                                     ` Eric Dumazet
2013-01-06 18:43                                       ` Eric Dumazet
2013-01-06 18:51                                         ` Eric Dumazet
2013-01-06 19:00                                           ` Eric Dumazet
2013-01-06 19:34                                             ` Willy Tarreau
2013-01-06 19:39                                               ` Eric Dumazet
2013-01-06 19:53                                                 ` Willy Tarreau
2013-01-07  4:21                                                   ` Eric Dumazet [this message]
2013-01-07  4:59                                                     ` [PATCH] tcp: fix MSG_SENDPAGE_NOTLAST logic David Miller
2013-01-06 21:49                                               ` Major network performance regression in 3.7 John Stoffel
2013-01-06 21:52                                                 ` Willy Tarreau
2013-01-06 21:55                                                   ` John Stoffel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1357532509.6919.1715.camel@edumazet-glaptop \
    --to=eric.dumazet@gmail.com \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=w@1wt.eu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox