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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 85696CA0FFF for ; Mon, 1 Sep 2025 15:19:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B92AD8E0083; Mon, 1 Sep 2025 11:10:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B42858E0024; Mon, 1 Sep 2025 11:10:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9E3938E0083; Mon, 1 Sep 2025 11:10:09 -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 86C808E0024 for ; Mon, 1 Sep 2025 11:10:09 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 47A5E1A0891 for ; Mon, 1 Sep 2025 15:10:09 +0000 (UTC) X-FDA: 83841016938.16.0CC4A4F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf10.hostedemail.com (Postfix) with ESMTP id 8AC3CC000F for ; Mon, 1 Sep 2025 15:10:07 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="abk12R/m"; spf=pass (imf10.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1756739407; 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=uU2NKjv7pCAnTWqWuT9I20VPbssYf2aSlCzQiIN12S0=; b=QoKnRgBuq1nZ6PobljeEs1c2+LfUtuMJKAW5fHn53EN9Vtz6ho2R/rs+4kn7rKkjiX7cGi ekA2NEGhb3vNBCxWTvPNHuyAbLoDFoPNMHA7M6qiORqZnS+ti1TiasTlpL0AbCbgnVamNm xN3h+dKf7maBS92G+uDHAxP6SyZ7C44= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="abk12R/m"; spf=pass (imf10.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1756739407; a=rsa-sha256; cv=none; b=R20T+LgPFDGhEHeiZcY+tS/1HtW95K7IEcaOw+EtiCSjpphk6vxrO6s6d+akFEbYxkPClq BUlADQLJ1e7J/VOdXEETKeJlXoc71SsMxUuJ/JzwkHH45WiMDZnt+FNgBqwVuu7oHfr3sM aeIO8WWu9PadbF738Yw6+ya7Ubt300U= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1756739406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uU2NKjv7pCAnTWqWuT9I20VPbssYf2aSlCzQiIN12S0=; b=abk12R/ma+kKQ0EYyXa7AWpnOwlc9cjEm6ce9o0GskDsaTgeBw2rtIoDuuGRc7kjylrzoy brlvztVhbyrHx3lSu2fyQpgaPqp+WcsOoL6XGrOhNhTL7kQaObcqhgERn3G6MhjuaGqyJS u8xw8gzH01xDpfNOij20qnAPIcUfBIs= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-292-1HVSq5buOB-VfBHfHyNaeA-1; Mon, 01 Sep 2025 11:10:03 -0400 X-MC-Unique: 1HVSq5buOB-VfBHfHyNaeA-1 X-Mimecast-MFC-AGG-ID: 1HVSq5buOB-VfBHfHyNaeA_1756739398 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7363A180034F; Mon, 1 Sep 2025 15:09:58 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.22.88.45]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B1B6A180029B; Mon, 1 Sep 2025 15:09:43 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: David Hildenbrand , Thomas Bogendoerfer , Alexander Potapenko , Andrew Morton , Brendan Jackman , Christoph Lameter , Dennis Zhou , Dmitry Vyukov , dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, iommu@lists.linux.dev, io-uring@vger.kernel.org, Jason Gunthorpe , Jens Axboe , Johannes Weiner , John Hubbard , kasan-dev@googlegroups.com, kvm@vger.kernel.org, "Liam R. Howlett" , Linus Torvalds , linux-arm-kernel@axis.com, linux-arm-kernel@lists.infradead.org, linux-crypto@vger.kernel.org, linux-ide@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mips@vger.kernel.org, linux-mmc@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-scsi@vger.kernel.org, Lorenzo Stoakes , Marco Elver , Marek Szyprowski , Michal Hocko , Mike Rapoport , Muchun Song , netdev@vger.kernel.org, Oscar Salvador , Peter Xu , Robin Murphy , Suren Baghdasaryan , Tejun Heo , virtualization@lists.linux.dev, Vlastimil Babka , wireguard@lists.zx2c4.com, x86@kernel.org, Zi Yan Subject: [PATCH v2 21/37] mips: mm: convert __flush_dcache_pages() to __flush_dcache_folio_pages() Date: Mon, 1 Sep 2025 17:03:42 +0200 Message-ID: <20250901150359.867252-22-david@redhat.com> In-Reply-To: <20250901150359.867252-1-david@redhat.com> References: <20250901150359.867252-1-david@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Rspamd-Queue-Id: 8AC3CC000F X-Rspam-User: X-Stat-Signature: 1xpqf4jd73875q6tidhp11a3fmgxj8mr X-Rspamd-Server: rspam09 X-HE-Tag: 1756739407-764314 X-HE-Meta: U2FsdGVkX1/1SBEtfsIxxlVi3x46qKTyC/IMQvxd3ovCRRw4WKxiLUkDgvfaj+RvUm783ZSxKDvzFud6krfSj4dcBj8SvwrKS9nG+NX+p3wZ56Li6Iio1kyiyl1Cy6YlrJiSEn9G2lIkwk9a/LF0WSeGUH8u40TF2BYX9RWOtls9RT2A+7fdA8MR4D3fL0R9/9ZPIjfPH0u4UxFaQnHUJUCITmTrvWy4dxggenCf16wCsUZev8YIZ2L8AIpMJRIQoDh0rFmAMRwvdbYo+AHXbIr6d6wzHIpwLyQn7RBP6Dv7LTNEYkXximeS0hB+H5b6mVSKUPD/K3iLRSL6pFOfmwbHJvXVWRbPwR3JAWvML9MnBY+29Vkdw5eQvNU0jlbv2B6ugT1L2gVquvOPNWgRJyaaMrJynbACgGkW30X4Xv+dWhoJFberOzbgOjECiGd0HTKzNqbxuWezDQaN0tbj+KXTfiQ1UliQUS/yUodk3cy/7qOfxMOMBza4tnxaWwTEIWCR5yhGdaAbyaBc4kf3BVvT+U3pWb0LpaYsHHOcUxyCFNMNx/zq31p1Ig3q/FVQsAooHhfuUIboaMfMt4eJHvDYL85r/Wfubf6yVMV8e5iP6EUfVg0dtZB3BP6rk5okmQQFOA0eJJblN27TMJQZL2BaMwrS+XrbCstE5AkIdRKHRYjfOH+HlDlKTlGnQgJXl5m+1VpE8aF6XOg1P/GMZe3PqQMniavda1bRFnmV12G8BIkc2u9rYXcmBCjDxHe4LKsROHzt41VTTAZ/tC+ds78iV3cdmpY6sRHKbLFVC+XGV68W9PqWcm/hZIgJoCcPDF4s306U0IiOoADvgI5FePF1X1BG9GPZPe/DkN8FSRUdOSt1KTEcYAJxRmOdZfV102yo6ktWnVan+Uj6OcPY1/PxJQNdnrgWw0YA8k5FOjTOD2pnWNYaaXB1c29FQViCwC1d6kTDLL1UmyZqub2 ThaMzUyK yaEVTvelLi/0rmiZSBevQJEtr/LfciWp+4yu0OI3cC8URVD1JCUFcbzJxA2Iank11huT6hANiAxDQhCKvmqN9QKbBsZnaoBevNMA5OdHLIq5NPkaj/zThJYtUM7Y/TzK2FZW3yT46deok3S77rA2lJ5JZWfKzNtdFqm5O53eFd8kERTp76eVQBhJp9lfhqu2DI4jY2bP5hrTr+7p35nUSlSYHpba7B+MJhaHLcuchR5NU5tIig175biNGnHhPsHbKUrb4+49j1EKoDOTHYLE8/LjE7b5+tCZQLvcrCCLUq7gnxmf7O5Tx6HEwtfNmGLRxot0kXZfRHi8aZxEVIcy+JNIrZkvv5WFaUcoXNDVVtcx3RYYvc/WROQBnQtDtPP49222L 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: Let's make it clearer that we are operating within a single folio by providing both the folio and the page. This implies that for flush_dcache_folio() we'll now avoid one more page->folio lookup, and that we can safely drop the "nth_page" usage. While at it, drop the "extern" from the function declaration. Cc: Thomas Bogendoerfer Signed-off-by: David Hildenbrand --- arch/mips/include/asm/cacheflush.h | 11 +++++++---- arch/mips/mm/cache.c | 8 ++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/arch/mips/include/asm/cacheflush.h b/arch/mips/include/asm/cacheflush.h index 5d283ef89d90d..5099c1b65a584 100644 --- a/arch/mips/include/asm/cacheflush.h +++ b/arch/mips/include/asm/cacheflush.h @@ -50,13 +50,14 @@ extern void (*flush_cache_mm)(struct mm_struct *mm); extern void (*flush_cache_range)(struct vm_area_struct *vma, unsigned long start, unsigned long end); extern void (*flush_cache_page)(struct vm_area_struct *vma, unsigned long page, unsigned long pfn); -extern void __flush_dcache_pages(struct page *page, unsigned int nr); +void __flush_dcache_folio_pages(struct folio *folio, struct page *page, unsigned int nr); #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1 static inline void flush_dcache_folio(struct folio *folio) { if (cpu_has_dc_aliases) - __flush_dcache_pages(&folio->page, folio_nr_pages(folio)); + __flush_dcache_folio_pages(folio, folio_page(folio, 0), + folio_nr_pages(folio)); else if (!cpu_has_ic_fills_f_dc) folio_set_dcache_dirty(folio); } @@ -64,10 +65,12 @@ static inline void flush_dcache_folio(struct folio *folio) static inline void flush_dcache_page(struct page *page) { + struct folio *folio = page_folio(page); + if (cpu_has_dc_aliases) - __flush_dcache_pages(page, 1); + __flush_dcache_folio_pages(folio, page, 1); else if (!cpu_has_ic_fills_f_dc) - folio_set_dcache_dirty(page_folio(page)); + folio_set_dcache_dirty(folio); } #define flush_dcache_mmap_lock(mapping) do { } while (0) diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c index bf9a37c60e9f0..e3b4224c9a406 100644 --- a/arch/mips/mm/cache.c +++ b/arch/mips/mm/cache.c @@ -99,9 +99,9 @@ SYSCALL_DEFINE3(cacheflush, unsigned long, addr, unsigned long, bytes, return 0; } -void __flush_dcache_pages(struct page *page, unsigned int nr) +void __flush_dcache_folio_pages(struct folio *folio, struct page *page, + unsigned int nr) { - struct folio *folio = page_folio(page); struct address_space *mapping = folio_flush_mapping(folio); unsigned long addr; unsigned int i; @@ -117,12 +117,12 @@ void __flush_dcache_pages(struct page *page, unsigned int nr) * get faulted into the tlb (and thus flushed) anyways. */ for (i = 0; i < nr; i++) { - addr = (unsigned long)kmap_local_page(nth_page(page, i)); + addr = (unsigned long)kmap_local_page(page + i); flush_data_cache_page(addr); kunmap_local((void *)addr); } } -EXPORT_SYMBOL(__flush_dcache_pages); +EXPORT_SYMBOL(__flush_dcache_folio_pages); void __flush_anon_page(struct page *page, unsigned long vmaddr) { -- 2.50.1