Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp6325405iob; Tue, 10 May 2022 16:03:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxcGcibCkFb7MytSLx6txG6qpiuhiGPiCVT4xbyuFZHErglMC4wAyQ14HWMBEBTBfpzTuP5 X-Received: by 2002:a05:6402:3214:b0:428:9d92:e5c5 with SMTP id g20-20020a056402321400b004289d92e5c5mr13259178eda.108.1652223812349; Tue, 10 May 2022 16:03:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652223812; cv=none; d=google.com; s=arc-20160816; b=0OdXCv6UpGsKQ+pVCv5t51Fme2nOzO4QxnZogO2PQ98QPv3wGeXBhs83sPu9N0lW5p NgO5nEgq1TuZMwdXwGbfAUoUW2PMQnT3jh2D75xp/SbzhxeSGe4Vbi1MbuLqore367UQ u1qLRlzytebNdoaI2w7Qe4WRC4liC0Ve5NdMhM6Jo1Ka2VVR+QoLmxrEVUvsJxAA4e+g Ilc7KASQkF1F0Zaokdt9+wkF7vx5DhPY/kWvyCaGneNXQKToMkaby8ovISBo1yfJBTbJ dIMJrGKRMx1HGEKl9hiwYuUCib8BCZBGi42qNHM5q2+YoXM94pv3wpmCGaaXSHHPpAVz 2uDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=zomQ09MasjYYPBWxQCtJv93X39Y9KJpEdOg9RwSYDXo=; b=YxLxeLGsHhRiJiHSGE0bkYzLSjt7tznM3J6pm1lsPZRdZIDwt0aYGhvbNhtjlVbECN mOWf/6uc4sLMovJC/cPARQJ71mhoxDar+I9uJ0TZ9S0iBu48GlT8JhUJltSPh5rNE9q4 To/bfnsI+KmblkwyTvQOZqeqNG2IOeCjw18Z7FDa/TV0A9FiNjhBNg9/7ux44zmsfFLm K9raVzrE9cuqvOf5jCyNQTP0WXn9X5BgTvn9SuV4Tk7IQiIJrEtEpgkTFNFA8pVJpbTO uzVpSAGtf7iTP8/jbhieCyIUvZezraJ9TvVmQHbaZsIDq/3AyB8SLGbvjLFrT/jYPz7t KDSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=OXoO3ZXI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g26-20020a50d0da000000b00425bb1f4712si675210edf.103.2022.05.10.16.03.08; Tue, 10 May 2022 16:03:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=OXoO3ZXI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243351AbiEJPXC (ORCPT + 99 others); Tue, 10 May 2022 11:23:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346127AbiEJPWM (ORCPT ); Tue, 10 May 2022 11:22:12 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 244F234642; Tue, 10 May 2022 08:05:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=zomQ09MasjYYPBWxQCtJv93X39Y9KJpEdOg9RwSYDXo=; b=OXoO3ZXIsd+8Ur5z4w2Pe9mL9y kzudrLhCkjg0gpejSNFjq1vrobSB32LNCkDO8x6X1nmJORQwFkbzB5FiTYnRsYHbZbAtfhzSzJA9f 6ss8u2WraOGDeod93K8QHNDOoeS2e5ilpD+fbWLDxpktuAkZgAt+P2Z99cjvW4w6xmw+uXfcHfCIW D37c0E0hE46wgZ5HI1IDYq5Z548fAUknoa9H5WNLc+eE2JPQqiHuO9CSrC/vZUhoao8wgdTeX368G /b1FnO809d2VeEqy2nDWtAWAQcvDlzx1p67r8Q+JVCLZx/H7qEuVltTiZKUpPWjiCOm0WoF/Re3LF KiEV25Yw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1noRPw-004YZz-TA; Tue, 10 May 2022 15:04:53 +0000 Date: Tue, 10 May 2022 16:04:52 +0100 From: Matthew Wilcox To: Filipe Manana Cc: Stephen Rothwell , David Sterba , David Sterba , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the folio tree with the btrfs tree Message-ID: References: <20220510183908.7571cb73@canb.auug.org.au> <55f4b515-1d1c-fd3e-0f93-4cda45261c91@suse.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <55f4b515-1d1c-fd3e-0f93-4cda45261c91@suse.com> X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, May 10, 2022 at 10:43:07AM +0100, Filipe Manana wrote: > On 10/05/22 09:39, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the folio tree got a conflict in: > > > > fs/btrfs/send.c > > > > between commit: > > > > d1a1a97304b4 ("btrfs: send: keep the current inode open while processing it") > > > > from the btrfs tree and commit: > > > > 2ebdd1df3166 ("mm/readahead: Convert page_cache_async_readahead to take a folio") > > > > from the folio tree. > > > > I fixed it up (I think - see below) and can carry the fix as > > Looks correct to me. Me too. The patch this one enables is rather sad. It's yet another reminder that we suck at streaming workloads. But until we fix that, don't you want to use invalidate_inode_pages2_range() rather than truncate_inode_pages_range()? If your send conflicts with someone else's write(), you'll erase their write to the page cache.