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;
Message-ID: <9e6ef8ae-f55f-0b47-02de-2d6827b123ff@suse.com>
Date:   Tue, 10 May 2022 16:06:47 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.8.1
Subject: Re: linux-next: manual merge of the folio tree with the btrfs tree
Content-Language: en-US
To:     Matthew Wilcox <willy@infradead.org>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        David Sterba <dsterba@suse.cz>,
        David Sterba <dsterba@suse.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20220510183908.7571cb73@canb.auug.org.au>
 <55f4b515-1d1c-fd3e-0f93-4cda45261c91@suse.com>
 <Ynp/FDvASFnsVf13@casper.infradead.org>
From:   Filipe Manana <fdmanana@suse.com>
In-Reply-To: <Ynp/FDvASFnsVf13@casper.infradead.org>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?WW8rT2ZZeEZqVUI5a0U4am8vc3dIVlhBSUIwa1ZvMU41bkc1V2h0L2ZSRGk2?=
 =?utf-8?B?TW9VaW1NOTFhQ01XUllHVytwbnM0L2MxTHZEK2JrcDdydmtYc2xGdXFWYnNC?=
 =?utf-8?B?ZldSamdXbm42WU45cXlYcmxmdjZjeDdjU2FRUjllQVNLOW81UzArM2Y3SnNO?=
 =?utf-8?B?S3g4YStQZ0thLzd2SGJJZ1U1eVl1Ti9SYTFIaTU3RXIwdk94YkhxT3hSUWta?=
 =?utf-8?B?RDRSQmVmNE5SMWtHR2pNR1N1eVplTnprNU03QlFjUGhOZmJNUWdmRExBdDdr?=
 =?utf-8?B?U2VqT1JwMHBUeDJDTTBUamdvNzZqcHkwSktmYzJWTFVPNWRQSkZnTjkvTlNn?=
 =?utf-8?B?R2JCb2ZZOTdudnhFak94WmhMK2ZXNGZSZURPcXY5Qk80eXFoNXNmbS9GUVFT?=
 =?utf-8?B?Slgybk5JU1laTVNuSllrc2N6SVZNVUJ3S3dTVEg5dGhUYXZJNkJxZlZJQ3F0?=
 =?utf-8?B?SGx6eWhib3pIWHFsNW9UZEVHRGF0TU9VS0E0My9jeWlIZjZhbEJiNWFab1d2?=
 =?utf-8?B?QkY3V3cyS0o1Sy8rMXVUY2tNVy9VN1FlL25QTGxoRWZKdVY1L2lESEtEOTZX?=
 =?utf-8?B?RXBFUVkvMm0zYWxGeHB2blVIU09lOTBkdXlaRm9ESnBiQi9CYVc2OXdaTlc2?=
 =?utf-8?B?YzBNVGhFNWRraDhUYVVrZ2dkNTJVRWsva1RraVBTV3lLa1Bkc1ZnclFlRXli?=
 =?utf-8?B?YzhHekJNMlJ0YjF3UXFGTlVVNjR3ZTVOTW5CSVZDMTdSS3VtOFFuNzc4cmxO?=
 =?utf-8?B?MGlsUUs3R1IwcWZHMnNyVVJvcytOUU9VdXhGcUNOUWpUVUFzNWppeEJGM281?=
 =?utf-8?B?NXRlaHNORkwvc2FUQ2ZvcnpqM2RvK29VZFdnOFNHMm1DMmZhNTV6dDR0SzRt?=
 =?utf-8?B?REZlalJJTnFHWk1zOVNNdGpnaVA1VTNNemFmcFNOWXhXblUzMzhsWVI1U1R3?=
 =?utf-8?B?ZmtlN1ZhL29OYkJva1FwZGlBa1UwaFMwUHU3bEh4RU9kZFhMUjFZWHk4NWNR?=
 =?utf-8?B?dE5mUkdaVG5VclBmcU1TZ1hJZEdZeTM4WVpPUFBIMS82QTU1QStEQlZMWWJB?=
 =?utf-8?B?ME9UYkM5eTFEYk9xaW8wWHMxUFR1OVR3Vjd4bEU2RzB1akpNQjhxRXhnMDIv?=
 =?utf-8?B?ZzZLelczeWJKL2g4aTJ4cVd5R0krMWZaaCswSGdmeHl4L05UbTk2RmtzRlpD?=
 =?utf-8?B?aDdFRjRiUkpSVFBOMGovZEdHcVRvaHlaQ2hVSnpOcElqT3ZrbnVmclZHbkJL?=
 =?utf-8?B?TmszVk1UZXZxc3VRbkhVWkRvUm9tTWY0SEd4Q3BjUnZZcGx1dmpSS2V4NlFO?=
 =?utf-8?B?TGphTFNvN3RxT2pSUTk4eGszQU1BVEhBaitwbjJYWjErdnhVa2RpRW54OU4r?=
 =?utf-8?B?MFpuZ1FXZndKelZDYnk3akdRZnQvS2tuQms2MEtCQWdMVmV5RHhwRW5uelZa?=
 =?utf-8?B?ZFg4dEgyc2lVMnNPcjhmYjA2NWFoSkxHRjZ5dHgzTFVuMGUvSXRqRmpJQVJn?=
 =?utf-8?B?ckE1OEIzMzRobkgxcWZhUC9iUHRqR3BiUTFkeHpzR2ZPWVBQS0RuY25mU2U4?=
 =?utf-8?B?OGFwci8vQzNSSmEvUWs3RVg4K2V6VmtxT0NGRm5TcTQ3VmQ5aUJ4YU5mOFlO?=
 =?utf-8?B?L0FlSVFVbEtPZTM5dGNRZnpwZE5wTHczdGFTZTZPRzkyUDdiOFZhN216K0xM?=
 =?utf-8?B?VG1BRTI5ZEdaMW1XZU12cDc4aVdTZUdFU1A2YnkrcGdrK284Wm5EVnU1RUto?=
 =?utf-8?B?aGh0cVg2U1NTa2VqK3FvYld6WEhQRlNmbW1ZbTZVZGRMd1pCcmFGaDdpbEpK?=
 =?utf-8?B?aTJvOEx3d213d0ltSTZlVE04REk4SW42ekVqd3A0dFJHeWJBWE5tdE5wWVNi?=
 =?utf-8?B?TkpUQklxZEVZQ1Y0MHRMbTgwNkVZekZhQ2NRT25rTkxWRXE4TnNSb2Vyay9R?=
 =?utf-8?B?eUp1TGJRQ0QzaVBjMlUvM2dEc3JqVVd4bXZ2NWIwQ09PRHhIVjdjRTZvbE9w?=
 =?utf-8?B?MDg3bDkxa20yYTVCSnpoUklNN0JwY055NHJFbnpkQXdBWXNRd3FUN2hRaEdG?=
 =?utf-8?B?Q0k1cVhzY250K2l4dHI1bmVKNFNMQUpGRDNFZmllMXd5anZRNndIeU5uNXZ5?=
 =?utf-8?B?SEkrczcwRHkxZ3VQUHFadXlzcjRIeTh4MXpneEhMRzV1Um5qQjdYNjBXUDVy?=
 =?utf-8?B?dlIycCs2bFZ6TGxJL2xPbnBTbFZQM3BUUytvK1FQRktiazRaUldsRU0xNTBN?=
 =?utf-8?B?b3k1MUwzZjdwWkllcFBWbkhFazJvc1F1VmJPSUl4QWR6WVdRazB3Yk41YzZl?=
 =?utf-8?B?dXdCQjlSMVIyVERaMUpzTGx1dWc1WnEzSHpkOXoxWERMb3F6amgvWCtSanpO?=
 =?utf-8?Q?wUB7C7W5YhgjP5xAeo/VHxLEomoF86OPlXNSfyXYOP+OP?=
X-MS-Exchange-AntiSpam-MessageData-1: Hc3zfWclUrYvDA==
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a8e6b176-bc9c-4d04-d430-08da3296b5ed
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5392.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2022 15:06:50.8373
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: YVtfOJJySn3LPbpeZFOTJPkvgQayshxxRjXUqhxU6HFHYLKLiUTUjKQwhxlRhNIVqmGV/BEY2LH5S8qHM0+NaA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR04MB9443
X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_LOW,
        SPF_HELO_NONE,SPF_PASS,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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 10/05/22 16:04, Matthew Wilcox wrote:
> 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.

Send operates only on readonly trees, so it can't happen.
Thanks.

>