From patchwork Sun Jan 6 19:00:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 209794 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4D1232C0080 for ; Mon, 7 Jan 2013 06:00:39 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756132Ab3AFTAT (ORCPT ); Sun, 6 Jan 2013 14:00:19 -0500 Received: from mail-pb0-f47.google.com ([209.85.160.47]:49165 "EHLO mail-pb0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756097Ab3AFTAS (ORCPT ); Sun, 6 Jan 2013 14:00:18 -0500 Received: by mail-pb0-f47.google.com with SMTP id un1so10109031pbc.34 for ; Sun, 06 Jan 2013 11:00:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:subject:from:to:cc:in-reply-to:references:content-type :date:message-id:mime-version:x-mailer:content-transfer-encoding; bh=3bFu9Oqa9CagQlqJwksW6VpSvZ+JEPR99l+UZyap7PY=; b=oQa+UoRDmEEN4dipcR7TExnsEAuQ2c/kjEiXZAwwQV9Zh8quieW5fFMhzLYUviLWH4 oJCrXyE/wZuW4V4/EEw7ZEKBcJyK/eKKSrNAWBc6A+WZRnzRAZL2NJuA6YqUcijw+FIp ImtVg3TnEmyIRYSecoXFT/mdEQ4fHJJjIvDHt+huwDKwqwwwxTxrErmfsh5h23np4Hw6 amzN5uwL0SQCuW0MkN5YCL9d053RG7yLVdHcqKLg9vKDOh+7id0UfGt/M7v6zx6c30UV z/ezJ8OOxCTJhw7swcw08ed1BZFOJwwxNQeUqAkW27b6ZVhR6awFjbMppOrNrKx4COi8 FTOQ== X-Received: by 10.68.223.35 with SMTP id qr3mr181463748pbc.27.1357498817503; Sun, 06 Jan 2013 11:00:17 -0800 (PST) Received: from [172.26.54.35] ([172.26.54.35]) by mx.google.com with ESMTPS id f5sm37215202pav.22.2013.01.06.11.00.16 (version=SSLv3 cipher=OTHER); Sun, 06 Jan 2013 11:00:16 -0800 (PST) Subject: Re: Major network performance regression in 3.7 From: Eric Dumazet To: Willy Tarreau Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <1357498276.6919.547.camel@edumazet-glaptop> References: <1357437086.1678.5135.camel@edumazet-glaptop> <1357438591.1678.5205.camel@edumazet-glaptop> <20130106025256.GY16031@1wt.eu> <1357457724.1678.5941.camel@edumazet-glaptop> <20130106092435.GZ16031@1wt.eu> <1357484342.6919.61.camel@edumazet-glaptop> <20130106155123.GB16031@1wt.eu> <1357490393.6919.267.camel@edumazet-glaptop> <20130106164416.GF16031@1wt.eu> <1357492255.6919.336.camel@edumazet-glaptop> <20130106173543.GB22432@1wt.eu> <1357497541.6919.519.camel@edumazet-glaptop> <1357497809.6919.529.camel@edumazet-glaptop> <1357498276.6919.547.camel@edumazet-glaptop> Date: Sun, 06 Jan 2013 11:00:15 -0800 Message-ID: <1357498815.6919.570.camel@edumazet-glaptop> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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); }