From patchwork Wed Aug 2 15:13:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13338361 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 928EEC04A6A for ; Wed, 2 Aug 2023 15:15:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B8D092801A9; Wed, 2 Aug 2023 11:14:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B14B02801A3; Wed, 2 Aug 2023 11:14:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8A3CC2801A9; Wed, 2 Aug 2023 11:14:22 -0400 (EDT) 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 6EF362801A8 for ; Wed, 2 Aug 2023 11:14:22 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 1232140F9D for ; Wed, 2 Aug 2023 15:14:22 +0000 (UTC) X-FDA: 81079510764.20.572CADC Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf21.hostedemail.com (Postfix) with ESMTP id 6EA491C0015 for ; Wed, 2 Aug 2023 15:14:20 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Zm+0Cngx; spf=none (imf21.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1690989260; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=b/IhDBaU8cZlRIdYXmEsOGIK2MyXItqBYHaddfMXiGg=; b=GNgXkYA035bf31NE3c6N+oJOO3iZZK8lTxBYK9J0qD84gX3gfGWK1NgYL2QJehzCimwIdX vooVwhd/FJCYYdK3qvOlYIGrZ/mqcZBWvz91wCv32vAP6FZCzKRceQxZxaERZGKmHOliGI M+qVCgImoj32oQF5B0gfMQrxaErRdAw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690989260; a=rsa-sha256; cv=none; b=V9hPUR84pphMfSh4UsKm6JXDqoPq75u1CNFE9ETsX3FtdGOkGBTBWhUmsXbr4M1vNLxghC hIfKhlSwaE5uJxxLsjlPa8NaFeqhqymkcEZs0QZvVHL/Eo5UlbnHqqVUmFPs4wHs8L3UMr cFi5VxX9gNiKsVdcWVwOxDbmGEtLsT0= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Zm+0Cngx; spf=none (imf21.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=b/IhDBaU8cZlRIdYXmEsOGIK2MyXItqBYHaddfMXiGg=; b=Zm+0CngxzGv2WvFuZEvaffMNDW 900jXk5SzkrupjIQ7n3/oJO/nQpbRA9NgknwrvLWC1+mx/mOvwBSfT3ilnCcqtACLz178mHdY9NkG 75MxbgLE0lPjlUnGR47kISHpFPDKxjK8ViGYw2CKWaJ6IgWrM/EWkLU/BR9/us7m+nvbwcLRH6sUz yRPoUS0oH/x8Or3Ab48V8Oxz5/nVXGB1XIhCpA8YumYbmL5/mCHv4P6mS2bblmJLQtnmXXGEILa3a BBt0ThaJ8CUzlQzl3xvJ/dvu125kH20h0I8NgtQ7ag7NhcndvuXo/merf9kqInQk900kJg8smhJHO jTowKZtg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qRDY8-00Ffik-Ce; Wed, 02 Aug 2023 15:14:08 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Mike Rapoport , Anshuman Khandual Subject: [PATCH v6 05/38] mm: Remove ARCH_IMPLEMENTS_FLUSH_DCACHE_FOLIO Date: Wed, 2 Aug 2023 16:13:33 +0100 Message-Id: <20230802151406.3735276-6-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230802151406.3735276-1-willy@infradead.org> References: <20230802151406.3735276-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 6EA491C0015 X-Rspam-User: X-Stat-Signature: ihkufx5xbodns8op3bycmgk1zu8nenim X-Rspamd-Server: rspam03 X-HE-Tag: 1690989260-106509 X-HE-Meta: U2FsdGVkX18qGuT5gtAp4ts+kSQzy6iKuzCCk5OTV82ubP7zNI5WDZF+igIVYC8mCbygMZ6+v3Ewcihla/DXqD8Q0zjdL1VN2YGdntPZ0Lb2rtA5z85fD8r/Raj45DWTMr6ln9hEGtdoTeVPajo8oDxhjPYJVasJGbC52OdTLFR/CMVopRSz3isAwggi4h/e/J/BdaV9b0mDjWtnb4FjBwYhjhr8/ViGmLou89KaNVKWCU32GhSM0sapWUNPDEE3jldAhXqvh0YmS1nnGPMH8hNV18RmQM5hiKLoAKpmSXlaJ0qKcJw8+ywONjSTVOA9mvxc1X7qbVoDZNheq/tr76iuhH1uoxUfRDULDFMly6CKugEMdvY6KtdBoC/6JIYu3sXvQIU6VuR5wP7CiMoSCmHGvYKnutlzV8GctajjQbkV4UMFMUKjsNWrdyWo8NyQw0JQLTauy86LdVuef1PE7z1dBsNgmJqFSTFrOinmJh/SE8Z0Qcn4xCfLN+8y7LUFksm2QA+yqkEvi8tPNvnZIL6+OM+vrN13KVHMtbRiUyHZisWrEkdXu2/WKC4UCBdrWTyL1kk82hFNIc4ZES/4C1ZwOIkMK+hMEyNt+MDURJYvZ0CSzyQjtUbIAZ4xAmh1oD2H653gUzemkhFAGdkJK11tF2LRHyFj64g4raO2GYbZ6vw6PbRZmV/GgRAuu98zSRVm+i6gYDiYjff0FkgPXch49FCvh1uenHL+2vVAU8Qm2jCfQCZYqsOSNj+Df8TsxDPOT7nOq8GGLz71bFIIKRp62sGpVPszMv3rLiyPRXEE/ALoeYhKGX144wz139FgT047IP1ZGMTVVixSWZU9xJVpGI+O/az0+t37X5zQSATbgCVxY1w40HySNbPmjgirm1ADmPxi9INye0yUsSy9WM8/JabHoE5T4+Oy9tMW5q9G1ts+amKWLON6UMDpgj4OyScnuWvaXxqezybbg0x WXKfjHH2 lagdpeDnimZlojiRK5sSO1jeHJIjqJVoWssy8t57aNGMfQM0gW7BG5CVQTnR3Ra0YGMD/+++js6OknGSLri6KwNyHXgt+2vc2zmYNDy8wSiGoRL+XOqOYfqUMYybjrXMKassktH701GvDkyLcEohlxPaXXqDHeoPCF92VHxR/sXofMBCnsSwP2efNTuq2OeemuWNDnfoDRAWahy1YqisCEZBI6St3rlngsmDTYMD+mEkcskTNTjNlH+foK7zMhjHtTBPro9rS9WA/Z2gpkp0I3ksW7PQ1H53MTbN8po0Nm0slHGQ8KHc+e6y+GlGpDvH8cu6cHFRWSBM4jtk0reMQPDgBSEXmHf4yW8gY 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: Current best practice is to reuse the name of the function as a define to indicate that the function is implemented by the architecture. Signed-off-by: Matthew Wilcox (Oracle) Acked-by: Mike Rapoport (IBM) Reviewed-by: Anshuman Khandual --- Documentation/core-api/cachetlb.rst | 24 +++++++++--------------- include/linux/cacheflush.h | 4 ++-- mm/util.c | 2 +- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/Documentation/core-api/cachetlb.rst b/Documentation/core-api/cachetlb.rst index b645947954fb..889fc84ccd1b 100644 --- a/Documentation/core-api/cachetlb.rst +++ b/Documentation/core-api/cachetlb.rst @@ -273,7 +273,7 @@ maps this page at its virtual address. If D-cache aliasing is not an issue, these two routines may simply call memcpy/memset directly and do nothing more. - ``void flush_dcache_page(struct page *page)`` + ``void flush_dcache_folio(struct folio *folio)`` This routines must be called when: @@ -281,7 +281,7 @@ maps this page at its virtual address. and / or in high memory b) the kernel is about to read from a page cache page and user space shared/writable mappings of this page potentially exist. Note - that {get,pin}_user_pages{_fast} already call flush_dcache_page + that {get,pin}_user_pages{_fast} already call flush_dcache_folio on any page found in the user address space and thus driver code rarely needs to take this into account. @@ -295,7 +295,7 @@ maps this page at its virtual address. The phrase "kernel writes to a page cache page" means, specifically, that the kernel executes store instructions that dirty data in that - page at the page->virtual mapping of that page. It is important to + page at the kernel virtual mapping of that page. It is important to flush here to handle D-cache aliasing, to make sure these kernel stores are visible to user space mappings of that page. @@ -306,18 +306,18 @@ maps this page at its virtual address. If D-cache aliasing is not an issue, this routine may simply be defined as a nop on that architecture. - There is a bit set aside in page->flags (PG_arch_1) as "architecture + There is a bit set aside in folio->flags (PG_arch_1) as "architecture private". The kernel guarantees that, for pagecache pages, it will clear this bit when such a page first enters the pagecache. This allows these interfaces to be implemented much more efficiently. It allows one to "defer" (perhaps indefinitely) the actual flush if there are currently no user processes mapping this - page. See sparc64's flush_dcache_page and update_mmu_cache_range + page. See sparc64's flush_dcache_folio and update_mmu_cache_range implementations for an example of how to go about doing this. - The idea is, first at flush_dcache_page() time, if - page_file_mapping() returns a mapping, and mapping_mapped on that + The idea is, first at flush_dcache_folio() time, if + folio_flush_mapping() returns a mapping, and mapping_mapped() on that mapping returns %false, just mark the architecture private page flag bit. Later, in update_mmu_cache_range(), a check is made of this flag bit, and if set the flush is done and the flag bit @@ -331,12 +331,6 @@ maps this page at its virtual address. dirty. Again, see sparc64 for examples of how to deal with this. - ``void flush_dcache_folio(struct folio *folio)`` - This function is called under the same circumstances as - flush_dcache_page(). It allows the architecture to - optimise for flushing the entire folio of pages instead - of flushing one page at a time. - ``void copy_to_user_page(struct vm_area_struct *vma, struct page *page, unsigned long user_vaddr, void *dst, void *src, int len)`` ``void copy_from_user_page(struct vm_area_struct *vma, struct page *page, @@ -357,7 +351,7 @@ maps this page at its virtual address. When the kernel needs to access the contents of an anonymous page, it calls this function (currently only - get_user_pages()). Note: flush_dcache_page() deliberately + get_user_pages()). Note: flush_dcache_folio() deliberately doesn't work for an anonymous page. The default implementation is a nop (and should remain so for all coherent architectures). For incoherent architectures, it should flush @@ -374,7 +368,7 @@ maps this page at its virtual address. ``void flush_icache_page(struct vm_area_struct *vma, struct page *page)`` All the functionality of flush_icache_page can be implemented in - flush_dcache_page and update_mmu_cache_range. In the future, the hope + flush_dcache_folio and update_mmu_cache_range. In the future, the hope is to remove this interface completely. The final category of APIs is for I/O to deliberately aliased address diff --git a/include/linux/cacheflush.h b/include/linux/cacheflush.h index a6189d21f2ba..82136f3fcf54 100644 --- a/include/linux/cacheflush.h +++ b/include/linux/cacheflush.h @@ -7,14 +7,14 @@ struct folio; #if ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE -#ifndef ARCH_IMPLEMENTS_FLUSH_DCACHE_FOLIO +#ifndef flush_dcache_folio void flush_dcache_folio(struct folio *folio); #endif #else static inline void flush_dcache_folio(struct folio *folio) { } -#define ARCH_IMPLEMENTS_FLUSH_DCACHE_FOLIO 0 +#define flush_dcache_folio flush_dcache_folio #endif /* ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE */ #endif /* _LINUX_CACHEFLUSH_H */ diff --git a/mm/util.c b/mm/util.c index 5e9305189c3f..cde229b05eb3 100644 --- a/mm/util.c +++ b/mm/util.c @@ -1119,7 +1119,7 @@ void page_offline_end(void) } EXPORT_SYMBOL(page_offline_end); -#ifndef ARCH_IMPLEMENTS_FLUSH_DCACHE_FOLIO +#ifndef flush_dcache_folio void flush_dcache_folio(struct folio *folio) { long i, nr = folio_nr_pages(folio);