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 E5C42C00528 for ; Thu, 3 Aug 2023 23:38:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5B3592802A3; Thu, 3 Aug 2023 19:38:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5632928022C; Thu, 3 Aug 2023 19:38:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 42A862802A3; Thu, 3 Aug 2023 19:38:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 33CF528022C for ; Thu, 3 Aug 2023 19:38:22 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 08787402D6 for ; Thu, 3 Aug 2023 23:38:22 +0000 (UTC) X-FDA: 81084409644.15.39C4E94 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf06.hostedemail.com (Postfix) with ESMTP id 5868A180011 for ; Thu, 3 Aug 2023 23:38:19 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=la4NSnbi; spf=pass (imf06.hostedemail.com: domain of nathan@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=nathan@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1691105899; 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=1u9yC5gNSwZaOX/YMVdtIC6Rlbi3+UZWYq1+5whG+4g=; b=Jq1M6M1UdiY/iFxYZ8/g53OvN9lYx2H5l2ExIy8bHql0lBnxzwGQWQluPOoa1gn+dlxnn9 77756UCxQeiAv3fowKEp8w9SjHTZCBCo5Nm6uohQrBdJoitfl+3QEDaPPUPqY7Qax/qAD4 lZDhU0ZmOZJgt3Lo67RYF7iwl1BKLxA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691105899; a=rsa-sha256; cv=none; b=C+2BI8nkW+njQYTscijJidJZdZgn9e03kEP7MHVi1XhK+Vkp6nWro7q2IWwaGF3pFJJv7I cUzHIJwZzQjzInL5VdBKXoXd+P3PxyfLrJtpI3JoETpyFOabH4A6QcpeYOR9LHqOr49QKQ WnfW005ZASKYuKXHHD843uRGG6bQZnk= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=la4NSnbi; spf=pass (imf06.hostedemail.com: domain of nathan@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=nathan@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1DB3D61EA4; Thu, 3 Aug 2023 23:38:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C072AC433C7; Thu, 3 Aug 2023 23:38:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691105897; bh=aLQlhR8HSv2POSv3geI9bcoaAzfbwflFBUhnJPVztHg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=la4NSnbiNxZ3stnWKrgOJrpkat+ogvN9qenUH8RVXH/e4czSZwcay/ddAhuE0rnue SrxJ8704bIwxzR6b0vvbEjlg1AzO09WwM5YIK1nmf3BC3Q9L5hLkCCnxYXn2Fro5je gAJiuHjyHDGtVoDZkyz9VAIEHwRL9YmUYQWfHOLKkXRrnqs/TohQZdlYrh04iDU7aa ejvJaBtTuKcyaeGWUPMkFIY5OYJNtHL8eglm2w+mOma2MSBmxvXHz9Ya+YZMs6bPC5 PLr7Ns/Tc8gPKIZzSJ7S6pLtoFzM1xxGI9Nu/M1QApddPkz6G0Ut015b9OXJ7v7fGU fjmdWBbdiG5AQ== Date: Thu, 3 Aug 2023 16:38:14 -0700 From: Nathan Chancellor To: "Matthew Wilcox (Oracle)" Cc: Andrew Morton , linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Mike Rapoport , Michael Ellerman , Nicholas Piggin , Christophe Leroy , linuxppc-dev@lists.ozlabs.org Subject: Re: [PATCH v6 21/38] powerpc: Implement the new page table range API Message-ID: <20230803233814.GA2515372@dev-arch.thelio-3990X> References: <20230802151406.3735276-1-willy@infradead.org> <20230802151406.3735276-22-willy@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230802151406.3735276-22-willy@infradead.org> X-Stat-Signature: eki3sfmar8z1eoutqru6iwpp1b61a4h4 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 5868A180011 X-Rspam-User: X-HE-Tag: 1691105899-447873 X-HE-Meta: U2FsdGVkX1+NlkftOfaL9Nd0looNAnJM64TuyDRWbcqaHunLsHY8Gg03EPi5gObmBe6O6H0qw7CtBvfyAGDjdXZjALMidk8dDhwvTYDzxBMF+pS84V+xs4XBBCnohynBf/Z2C1xRLSmSD0QW48/fQZhYZPYUqBL8zpWx41ECAlM2aeLgiWs6pYrMMq9rF7rS5ttssETjf3PV0g5KuEmlDkC8LATIKGpMey1RjblU0fJejKhWYrNg+DKZ8uk8j5kRz6rPJayO1XaDu6g13wR285W0jCdBTvzs/o2wuNr6rUp9KU9qoCFMj1kU9XPd7kmFPFRS5Zs3Qzs+E4m07BPJ9gnwrbh8stCyUIDq86nIiGsGM5A+BJ0lt0R9DyEKg0E3VnU4XZ0DMPR8MgfIKC76iGHgLCWLJThZfWQNgdVfUvHyFgn9CzZkO5gMPW8NaEN8p9AVcx/NdfN6w7PJN7rTLhZO54IA7P1zDtEsUJjss9prcK9wdcIBcdYSHHarkClh+RnFbDHu+0k72BmDCa2DkDO4GSbKQ191+ZT2/2fPwFfwZoKWY7NaJjewjYDxVxrFjZu6ZXkzoBwd11AwjjfnII1E9qQ2LjptTe/8kf9qo4RAtLnNIFGcUDhc4rhiYbs53bRbFGLZ+G8mhaq77lSZcZE6h5zLLTubDsxSdXJaEzc8wifw8DgvLWdqbypl0a5YTDpZMvuLF+8wIp0Z8R/wfD0/VfVwabDwPg6EGYpZODPskYh4ttCavUL525Qu8oRDMqP0VceAvind3ALvM9G+qzUQIvUmzmqXUKWMrX1Zkr37NXZifM0Oig0mE0BdyVLruhJPaesdq7/oNAephfxjm9bO16mqiK6YF6keyyJKwRqL4e9vj1b8lyNsKUsRukHMr5sSE00hstrg25FU4t6bKM0Q3d6RefgdNW9nq1oKwga4kXKxWlT/wGC5+8+24q9LMXKpWaAXmETnh+rLlif cdJCysbQ sSiIQBQUhyMdACQ+t+S7AnL5sg8Ocw2W+rxzu1zWJt5U4yo7oQfEikEOgKIcm+7JIdqhTl34uG3b3NWhy9chxVpvZ68DXAnVelQ7yAykCsEk6FXXU51i2tquoygto1vLB3D0zzzKCt4VkpfUF/boX3eeTgR8ErETd99p5QRO5nU9qXnKWSPMXlABBX+V3e+sTRXKWcyEagp6yKHELA2V0/5jp9yinuWdIJVGWf78voc15RY6x9BTTtJhyl/WKKyfr0WXDAZAgFkgBCmSLAMfahH+Slr23O2Df+/SIiqhMx7I3bAv9dzc+8qzF3AtnajPrXrc3fJ9Z/owCQlEr0/79j2KoEAu07j89cLpC05FzTsoGCe1QuzTH5abDM3P2SAdE6MzQvdfjYG/lMlXIyt54UTeOo0k25kfkAX6HQALbZdTKc4urE1Fb20YNY8tgRzkwFvlcRm+TLr0EWBSsVD7yvoMFW2XspVgp+j6UvivSpg/NoFfDTEethPJqfUJnKV3A8h/v63dD+1AemD9XjvayHBfVD/V+geG7/pvh1i36zmL2QUs= 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: Hi Matthew, On Wed, Aug 02, 2023 at 04:13:49PM +0100, Matthew Wilcox (Oracle) wrote: > Add set_ptes(), update_mmu_cache_range() and flush_dcache_folio(). > Change the PG_arch_1 (aka PG_dcache_dirty) flag from being per-page to > per-folio. > > Signed-off-by: Matthew Wilcox (Oracle) > Acked-by: Mike Rapoport (IBM) > Cc: Michael Ellerman > Cc: Nicholas Piggin > Cc: Christophe Leroy > Cc: linuxppc-dev@lists.ozlabs.org ... > diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h > index d16d80ad2ae4..b4da8514af43 100644 > --- a/arch/powerpc/include/asm/kvm_ppc.h > +++ b/arch/powerpc/include/asm/kvm_ppc.h > @@ -894,7 +894,7 @@ void kvmppc_init_lpid(unsigned long nr_lpids); > > static inline void kvmppc_mmu_flush_icache(kvm_pfn_t pfn) > { > - struct page *page; > + struct folio *folio; > /* > * We can only access pages that the kernel maps > * as memory. Bail out for unmapped ones. > @@ -903,10 +903,10 @@ static inline void kvmppc_mmu_flush_icache(kvm_pfn_t pfn) > return; > > /* Clear i-cache for new pages */ > - page = pfn_to_page(pfn); > - if (!test_bit(PG_dcache_clean, &page->flags)) { > - flush_dcache_icache_page(page); > - set_bit(PG_dcache_clean, &page->flags); > + folio = page_folio(pfn_to_page(pfn)); > + if (!test_bit(PG_dcache_clean, &folio->flags)) { > + flush_dcache_icache_folio(folio); > + set_bit(PG_dcache_clean, &folio->flags); > } > } ... > diff --git a/arch/powerpc/mm/cacheflush.c b/arch/powerpc/mm/cacheflush.c > index 0e9b4879c0f9..8760d2223abe 100644 > --- a/arch/powerpc/mm/cacheflush.c > +++ b/arch/powerpc/mm/cacheflush.c > @@ -148,44 +148,30 @@ static void __flush_dcache_icache(void *p) > invalidate_icache_range(addr, addr + PAGE_SIZE); > } > > -static void flush_dcache_icache_hugepage(struct page *page) > +void flush_dcache_icache_folio(struct folio *folio) > { > - int i; > - int nr = compound_nr(page); > + unsigned int i, nr = folio_nr_pages(folio); > > - if (!PageHighMem(page)) { > + if (flush_coherent_icache()) > + return; > + > + if (!folio_test_highmem(folio)) { > + void *addr = folio_address(folio); > for (i = 0; i < nr; i++) > - __flush_dcache_icache(lowmem_page_address(page + i)); > - } else { > + __flush_dcache_icache(addr + i * PAGE_SIZE); > + } else if (IS_ENABLED(CONFIG_BOOKE) || sizeof(phys_addr_t) > sizeof(void *)) { > for (i = 0; i < nr; i++) { > - void *start = kmap_local_page(page + i); > + void *start = kmap_local_folio(folio, i * PAGE_SIZE); > > __flush_dcache_icache(start); > kunmap_local(start); > } > - } > -} > - > -void flush_dcache_icache_page(struct page *page) > -{ > - if (flush_coherent_icache()) > - return; > - > - if (PageCompound(page)) > - return flush_dcache_icache_hugepage(page); > - > - if (!PageHighMem(page)) { > - __flush_dcache_icache(lowmem_page_address(page)); > - } else if (IS_ENABLED(CONFIG_BOOKE) || sizeof(phys_addr_t) > sizeof(void *)) { > - void *start = kmap_local_page(page); > - > - __flush_dcache_icache(start); > - kunmap_local(start); > } else { > - flush_dcache_icache_phys(page_to_phys(page)); > + unsigned long pfn = folio_pfn(folio); > + for (i = 0; i < nr; i++) > + flush_dcache_icache_phys((pfn + i) * PAGE_SIZE); > } > } > -EXPORT_SYMBOL(flush_dcache_icache_page); Apologies if this has already been fixed or reported, I searched lore and did not find anything. The dropping of this export in combination with the conversion above appears to cause ARCH=powerpc allmodconfig to fail with: ERROR: modpost: "flush_dcache_icache_folio" [arch/powerpc/kvm/kvm-pr.ko] undefined! I don't know if this should be re-exported or not but that does obviously resolve the issue. Cheers, Nathan