From patchwork Mon Jan 12 13:15:17 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarek Poplawski X-Patchwork-Id: 17933 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 2F718DE07C for ; Tue, 13 Jan 2009 00:15:31 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752049AbZALNP0 (ORCPT ); Mon, 12 Jan 2009 08:15:26 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751523AbZALNPZ (ORCPT ); Mon, 12 Jan 2009 08:15:25 -0500 Received: from qw-out-2122.google.com ([74.125.92.26]:4535 "EHLO qw-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751494AbZALNPY (ORCPT ); Mon, 12 Jan 2009 08:15:24 -0500 Received: by qw-out-2122.google.com with SMTP id 3so9640673qwe.37 for ; Mon, 12 Jan 2009 05:15:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=YJ5a7ArHeVw+cn2TMBseV3XGKz3e+Wkx6kRZ7i3svbA=; b=lrqi15s6DngrCEij3u+nTfhNqn9WAC82CFR8ELCTowWSb0RIgGBRS4dxsYNuxecDkG uX2w3l0MB6eY6915lWpEh84foZM2ydP46IyOhLXJcYAOEremCqUZjsqwNPS7pQwMc1jT 5T+8lg3F1AWfQQtMNevozFZRB5g0UsFQrAtM0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=HKEQCeES50RbgB12kBb3ToLt10cyWJyoARDRNdQJBzA3PjRhbdJR7xasamvN9aWCR1 PmlZxW/xPQ6XOcv1e8VNKQnTJZEdU7h7MXchpNsGc8UXcE8Lq8VwQun3MRZCjYG/mO0k Xs9BJ716cYpY5TEWFf4MzCsbKdc30K4JWHJO8= Received: by 10.214.11.9 with SMTP id 9mr24973468qak.329.1231766122947; Mon, 12 Jan 2009 05:15:22 -0800 (PST) Received: from ff.dom.local (bv170.internetdsl.tpnet.pl [80.53.205.170]) by mx.google.com with ESMTPS id 34sm88132971nfu.42.2009.01.12.05.15.21 (version=SSLv3 cipher=RC4-MD5); Mon, 12 Jan 2009 05:15:22 -0800 (PST) Date: Mon, 12 Jan 2009 13:15:17 +0000 From: Jarek Poplawski To: Herbert Xu Cc: "David S. Miller" , Jens Axboe , Willy Tarreau , Changli Gao , Evgeniy Polyakov , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: Re: Data corruption issue with splice() on 2.6.27.10 Message-ID: <20090112131517.GD5901@ff.dom.local> References: <20090106094138.GE25644@1wt.eu> <20090106100112.GB9513@ff.dom.local> <20090106155715.GA28783@1wt.eu> <20090107093915.GA6899@ff.dom.local> <20090107122205.GA6051@1wt.eu> <20090107123153.GA9597@ff.dom.local> <20090107123504.GN32491@kernel.dk> <20090107124946.GA9677@ff.dom.local> <20090107125217.GA26235@gondor.apana.org.au> <20090112120257.GA5697@gondor.apana.org.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20090112120257.GA5697@gondor.apana.org.au> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Mon, Jan 12, 2009 at 11:02:57PM +1100, Herbert Xu wrote: > On Wed, Jan 07, 2009 at 11:52:17PM +1100, Herbert Xu wrote: > > On Wed, Jan 07, 2009 at 12:49:46PM +0000, Jarek Poplawski wrote: > > > > > > Hmm... in any case: take 3 > > > > Yes this should fix the corruption but it kind of defeats the > > purpose of splice by copying the data. > > However, as we don't have a better fix yet, we probably should > take Jarek's patch for now since data corruption is bad. > I've wondered if something like this could work as a temporary hack? !!! not compiled/tested !!! --- -- 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/net/ipv4/tcp.c b/net/ipv4/tcp.c index ce572f9..99b0876 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -264,6 +264,7 @@ #include #include #include +#include #include #include @@ -776,7 +777,8 @@ ssize_t tcp_sendpage(struct socket *sock, struct page *page, int offset, struct sock *sk = sock->sk; if (!(sk->sk_route_caps & NETIF_F_SG) || - !(sk->sk_route_caps & NETIF_F_ALL_CSUM)) + !(sk->sk_route_caps & NETIF_F_ALL_CSUM) || + PageSlab(page)) return sock_no_sendpage(sock, page, offset, size, flags); lock_sock(sk);