From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82018C54FB9 for ; Fri, 17 Nov 2023 18:15:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EE5CE6B0504; Fri, 17 Nov 2023 13:15:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E96046B0506; Fri, 17 Nov 2023 13:15:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D84E86B0507; Fri, 17 Nov 2023 13:15:08 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id C8F716B0504 for ; Fri, 17 Nov 2023 13:15:08 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id A6BA9C0557 for ; Fri, 17 Nov 2023 18:15:08 +0000 (UTC) X-FDA: 81468247896.01.D3BBA66 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf08.hostedemail.com (Postfix) with ESMTP id 7ADD2160011 for ; Fri, 17 Nov 2023 18:15:05 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=pYyjBQyM; dmarc=none; spf=none (imf08.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1700244906; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=c88nVbuS+XNcf0hScLatSF9sACZVShvDbKMQHve3QZs=; b=1/xCSjkvZEVcS5WM0ZyR1p+g7AME60D1R3lQ8jr0pruntdEGYvEiKjeIre/6/vGsz/4tG8 NzLQ13DMioG5TG5aqWdifZ2cV1vsOQNDB4YuiQyGumydW5jQauAvxqZfrz4awqb2lXhrY4 /eMtcLkS8tWPbe7YLZY8a7PcvWf6Krs= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=pYyjBQyM; dmarc=none; spf=none (imf08.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700244906; a=rsa-sha256; cv=none; b=NTD+gxNWHK0hIDacBromFENIopWSO2QJ2bOHxs5qyB3zqmjoB0RFYIvThU6ocNSyaMve4m w0vdNzLtPtDSZFviHCINW0nCffQKguQU0gsF0W5DCrvA+WoRY+dFI6Tu1PzqT+E23oLrcb jXObf6EjXxnuriBCW3+bq0LIEUakGMc= 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=c88nVbuS+XNcf0hScLatSF9sACZVShvDbKMQHve3QZs=; b=pYyjBQyM5GMj22F8RdYrZtAsF/ v17634ADBC/2wOv0eIiHXe83jamFxiXsLeuhq0xQIvUh0KS1FE4HNulwBXApfdwfHhvF47c/yEAki C14ExBtN4G0lvUKiKeIsqjeGbcYmEBw0Ub0GMZVBD4HWDlW0olgUvjz/7GJLlN6mj+EPPNpuSh87f fGOZ7DrWWXK86kGbOkKmMBNRZugk8pLdPR9UcFqDCnPqan8NO1SMyq/ZRWRA3EoQS2QO/Py2hYv+T q7hEtwSc7JGNImErgn0E/PDjA5GId9JlfWPDobim0paS5fkgoHH2Cqaj+qaAivc2ubKL3Iul8kuby zsmg/CXg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1r43Ml-00Ar31-OH; Fri, 17 Nov 2023 18:14:55 +0000 Date: Fri, 17 Nov 2023 18:14:55 +0000 From: Matthew Wilcox To: Andrew Morton Cc: Naoya Horiguchi , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Paolo Bonzini , Stephen Rothwell Subject: Re: [PATCH 6/6] fs: Convert error_remove_page to error_remove_folio Message-ID: References: <20231117161447.2461643-1-willy@infradead.org> <20231117161447.2461643-7-willy@infradead.org> <20231117092833.f143fa4bbf0abfbd2e58661d@linux-foundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231117092833.f143fa4bbf0abfbd2e58661d@linux-foundation.org> X-Rspamd-Queue-Id: 7ADD2160011 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: r4dwi7fpp71c19mwejfes5ojhxahb9mn X-HE-Tag: 1700244905-646226 X-HE-Meta: U2FsdGVkX191Ek2mURVH97Co3ovMSw6uI8wG0hzfMPLtsBEdhZTrf74+7nGweKdtXQXMdK2udAySPrxgiu2/ppiyjtHD6TumNGKHR9X9dDz0s5p55dqVHAF3uWVAyCQjBBGWuCm0FP6RswTxaP2cxqVVan+b9qdZE4jVa1dmCIDfaYcISidFgYcWKeCKpcv2SZJcBot3NjZFdIY/RP9IBwpbPYJ6akSHlyirxvoptPO+//OeiDYbTnUz5cR6f7+Ho0F2Socd7MKcLW/8jPxI1siZHeqgdbIJJC5eCQ7jH1Ym6X7XU+3kUx8t92t1OImrYWTzlEYTJfaOhZDK8q7zI+El12STjerImU4J1C7UbmCZnyRBxe9lrb3VhTGy+RfQT59TdlKnv7U3gHvwrVnBWg462l4oHXvWpw10LHkwe4+Qe7PVesXJCm0E3bLpDP6fndBTQTj9NsFDH3pi4cio2ef8v91xPzmcuFIBLojsLV+JF2/XiWoGECDEHq7j6p43EX3uC0HC1im1GabwPDNygPJe3J0sq5ccp9HzJVx78Yfoa697xqINtXY7QxyFIIaWhYXpVNHol5arhdCaxUvMsRTWJeg+wUB5BGpGXbEPelz7PGcn/U9I3ZjMECbzPxrYmZuynnemVD6PCMsnHIC4DTd9Tm2jxTjaQzoqfuN95u5wPtQ9GfywP5awX7Uecb7qo860v5Huexk9wFdZVmfO6SO/UiR2kJhexYF7SUXVClszVyTqZWv7OQYL0FJleJouwPJDuiVCGxNW9na/oiNvHBI5W1DGyCcxx6rCuLDgcCvkk/TtRx7XJkfc544cNa/ydFG8hpnPKfCIl7+FwyV0IJ1I/vZtXVeQGRLVgU7EBYy2JE+dSagkV2G1NVanmuSG+iABd6m4WHJKmZU0hKbzT3pW/fqNtu32C0fbtU04S+NFUnH1m4rGlvGliSXiYKpc2y12wwEHkUF21ctfHbi kilK6gvx p2+xkUVetsnGev4JlW3PJU3BuewROf8tQrgdXcOacTu3YwnEzeV0zDd4hg/yOUx2L+d+dKtOgVak4EttB4zcmY9DWMg39OT4+Qg65OzOay4zGeW1YhwHmTcgg3wy6sGLQclFGgeevU9qtQsYDyf3HMwP9nTLuMjIJB7pgVd53+OywTjq7EnwUR6a5hQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Fri, Nov 17, 2023 at 09:28:33AM -0800, Andrew Morton wrote: > > virt/kvm/guest_memfd.c | 9 +++++---- > > virt/kvm/guest_memfd.c exists only in the KVM tree (and hence > linux-next). So I assume Stephen will use the change from this patch > when doing his resolution. Guilty of developing against linux-next ;-) Sorry, I didn't notice it depended on something else; thanks for alerting Stephen. > This: > > --- a/virt/kvm/guest_memfd.c > +++ b/virt/kvm/guest_memfd.c > @@ -267,7 +267,8 @@ static int kvm_gmem_migrate_folio(struct address_space *mapping, > return -EINVAL; > } > > -static int kvm_gmem_error_page(struct address_space *mapping, struct page *page) > +static int kvm_gmem_error_folio(struct address_space *mapping, > + struct folio *folio) > { > struct list_head *gmem_list = &mapping->private_list; > struct kvm_gmem *gmem; > @@ -275,8 +276,8 @@ static int kvm_gmem_error_page(struct address_space *mapping, struct page *page) > > filemap_invalidate_lock_shared(mapping); > > - start = page->index; > - end = start + thp_nr_pages(page); > + start = folio->index; > + end = start + folio_nr_pages(folio); > > list_for_each_entry(gmem, gmem_list, entry) > kvm_gmem_invalidate_begin(gmem, start, end); > @@ -303,7 +304,7 @@ static const struct address_space_operations kvm_gmem_aops = { > #ifdef CONFIG_MIGRATION > .migrate_folio = kvm_gmem_migrate_folio, > #endif > - .error_remove_page = kvm_gmem_error_page, > + .error_remove_folio = kvm_gmem_error_folio, > }; > > static int kvm_gmem_getattr(struct mnt_idmap *idmap, const struct path *path, > -- > 2.42.0