From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B1A0237C102 for ; Thu, 21 Aug 2025 20:08:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755806913; cv=none; b=UJK/xzq29kY5NrrtBz3ABah2vvixXns8F8Mz/XFlLmsE2y2R36rr9qP4j6JtOJ7cwNYU0FVRwAyTgYWu2Wnzjko2cMFfRSdBiDWZjQdC6gUEiWUp7d5xvSphQZ4hyRetj+E5brQ+GHPZFSZrgn8JHzetOHEgm/7gZkyFygi7/so= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755806913; c=relaxed/simple; bh=3RfOoWzbZTj8EGhrr7OVQfmCtFM6TSZBuGB7jdppkcE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sJiEI57V1LioNMvyaflnxGFpvez7RmQFYC2NTfDn5xiqNYjtbf2HA42liYE5Gve9VSmkp1+W2IL3FFB7RzC6sJEgZ8NY1pZVvzR+UnEM5acPfRyGZjWIrMaZNV7YEPVJJ0GFco5MujLKyt6sRFoRU98dxLsPVbF05lwxZ0cahWc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=R4EQGjBJ; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="R4EQGjBJ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755806907; 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=jaRFM4K4Pg6WYlxhcM2k1BGbQ/DW6XfjnDsCttbmjXY=; b=R4EQGjBJpD3TWSiSJh/ZhhANSMz07Pp0pGnctxGthmBHpPvgjd7ryAM74+rV9fxpy4vgL8 LtgkNVeNCqyk4AuYGIGO7t1AfY9gpU2dikGZTbvM2/l+/QVXr5J0nMrjBDXUSRJVYeqX6e iWJDZgccd969oesQG4Z7dpoaR4seggs= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-428-xmYycV8COx2Hn_pvcxvEDg-1; Thu, 21 Aug 2025 16:08:09 -0400 X-MC-Unique: xmYycV8COx2Hn_pvcxvEDg-1 X-Mimecast-MFC-AGG-ID: xmYycV8COx2Hn_pvcxvEDg_1755806883 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3b9dc566cb4so996489f8f.1 for ; Thu, 21 Aug 2025 13:08:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755806883; x=1756411683; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jaRFM4K4Pg6WYlxhcM2k1BGbQ/DW6XfjnDsCttbmjXY=; b=RrWYAjxXlOOLCAFLWELFfA6nSdYL8RQ8X6LpDd2cSiBmSFZ7l/y5OkIJk9KHXMAbdq /jjZdShwYX0S8At267z8IoXatcC+EIl2+JZl3w45F9+Qxco3zPghcL5/FVBCFajfzW/1 aDkxvibz1ZArnlkeHtQ4f0F+Zo6g+DlzBx3RZBf42T1kzYoGwle+7D51HdpOjjiUmnaT yeb7NB6i0l/eqGJA4kJH7WFtB9a9HdUjlmmI1g59TznOqmd/tkIQ/zDSwIE6wMrEh6sM LlkEf73ApqDvMsga5MY1gOllU35XG43yPQRVjYy/HTWDmNawdPPRDkIaHEJkSYIVWDWF Ch8g== X-Forwarded-Encrypted: i=1; AJvYcCULlrdczjRKN6cdVnqJDlm1tJgid63DewQZtuZFuB6O6QV79IaLuh6eTDLtq3FCbp98sADiQydHtaA=@vger.kernel.org X-Gm-Message-State: AOJu0YwWlihw/9razL73U1jTyXFcd8bSgQ8DqUnVAoUeZZkVinb1TwV2 rcx4Rnd88LvRAqCwhe8mt6Z2zcgFfSltJnoXBhPgfpk3O5suoL+5GupF65Ck3GKGVX4K+7wKbeu ATrhpUkL5MLfeEa28XhYIKrJzM+QqrMQF3h9UKgM45rYXH7sZJQ+aQtoATW/59g== X-Gm-Gg: ASbGncvX80qN5tEDTplRby7l/5ruET70e8ovfwEbhEmvhxm+mLrjLwogViMWfTUzb5s XiyjKeVIYf1albRKvFD5EhXRPzHry1/bQcFS3gh+aUiUIHq9JIZ/zxGnsmWNrrEYMisKGFRUmwI BUinXEUZlv4byNmzB/R+RbK70tCaMo7kurXbmx3kXj0P8W33RMd0R6GLgf1wMz7E6LquuieTKrH QeWNNxlsFPW/0d+jE7mY+Gb2Vngo7kRU5e4rpIj7BnsmHffrSw7toDa62pZm7+LXqbJk++TD6ew EUwZVObYSGzpP75fGktfZPsICDvSpJhHX3TCs2Kwwvbuz1mLNsathTH288lBP9Y6cUc+PD0l5eC sbh6nh7d9HDinWo5UqD9THg== X-Received: by 2002:a05:6000:2012:b0:3b7:dd87:d741 with SMTP id ffacd0b85a97d-3c5dcc095c3mr196178f8f.42.1755806882799; Thu, 21 Aug 2025 13:08:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFiRO9AsztHDXjXXwtKcCswXKV/HQQvQjujQOlltIgK9F5s1Ca8ikdDYrX2bvCVEtKZoFK6NA== X-Received: by 2002:a05:6000:2012:b0:3b7:dd87:d741 with SMTP id ffacd0b85a97d-3c5dcc095c3mr196155f8f.42.1755806882316; Thu, 21 Aug 2025 13:08:02 -0700 (PDT) Received: from localhost (p200300d82f26ba0008036ec5991806fd.dip0.t-ipconnect.de. [2003:d8:2f26:ba00:803:6ec5:9918:6fd]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-45b50e0b299sm8957945e9.22.2025.08.21.13.08.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 21 Aug 2025 13:08:01 -0700 (PDT) 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 RFC 20/35] mips: mm: convert __flush_dcache_pages() to __flush_dcache_folio_pages() Date: Thu, 21 Aug 2025 22:06:46 +0200 Message-ID: <20250821200701.1329277-21-david@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250821200701.1329277-1-david@redhat.com> References: <20250821200701.1329277-1-david@redhat.com> Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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. 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 1f14132b3fc98..8a2de28936e07 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); +extern 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, folio_nr_pages(folio)); 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