From patchwork Sun Jan 6 19:00:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Major network performance regression in 3.7 Date: Sun, 06 Jan 2013 09:00:15 -0000 From: Eric Dumazet X-Patchwork-Id: 209794 Message-Id: <1357498815.6919.570.camel@edumazet-glaptop> To: Willy Tarreau Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org On Sun, 2013-01-06 at 10:51 -0800, Eric Dumazet wrote: > > > > (sd->len is usually 4096, which is expected, but sd->total_len value is > > huge in your case, so we always set the flag in fs/splice.c) > > I am testing : > > if (sd->len < sd->total_len && pipe->nrbufs > 1) > more |= MSG_SENDPAGE_NOTLAST; > Yes, this should fix the problem : If there is no following buffer in the pipe, we should not set NOTLAST. --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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); }