From nobody Mon Apr 27 06:26:17 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4063ACCA47A for ; Thu, 16 Jun 2022 07:16:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1359076AbiFPHQJ (ORCPT ); Thu, 16 Jun 2022 03:16:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1359006AbiFPHQG (ORCPT ); Thu, 16 Jun 2022 03:16:06 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5655D5BE43; Thu, 16 Jun 2022 00:16:05 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id u8so606047wrm.13; Thu, 16 Jun 2022 00:16:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DhkXH2hQcXNUxLsH9NZPMWEsQsvQMqhv2sPzytCmFs8=; b=UYgLyGtBT/5fJjGVbHZQtjPPlWAoGB7ASwBQAtYTqysGuCzAQwQqdhiOCS8ZUWpEMw 99nUr6Sz15wG3Qx3AefUsDa98QXbrOUMGnXIw1+jPZWxXdkiB37eA8SdYNqwP9J4QXVl ro/ewrjl16qVyykKd+L+0MUkMcgaqpO/Vatb5HDMJDLDvmRJEHOLVy9GF/9L6Q3AIpyQ 549TsUsFW6wCKikxl34/FqE4lPZwOiO08L/h+PjSJIgDRIGBcigqyjCyDLbICFiADgIi cN0WImHAmOKMkkSWQMT6aPhWbG0EqI3cixgaG3zhwILeQMZ9zJWJNDQkno1o0wLE4XIy ktxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DhkXH2hQcXNUxLsH9NZPMWEsQsvQMqhv2sPzytCmFs8=; b=Sef8TLeHgZ/y1eEEtE8DaWIAWuofIsb2HZtf4UOwRyB0C2TFHqqH13xmTQoTrXhyBZ WqcZokUGqDojpQLZIQrf4SorQjgD/P1M3SBWIbHmultFrKtUlwFK50uKoHNYqImGsxef FO0mb4PQHG+9Ll8465IwY5BbGlVWg404exftMeu5VVwo6vJTTjuglkZN5nXVW2pmR3Rr pC5tswUI5hM0Neb+O/MTqEhTRLYh6UWfDAAvEYTGYxAmUJTbh/K4I4fIEwvBVD3v4rT+ fJCp+jwBHuniU5JUI5Vq106nJ1dTQSv1p+xU8v+w8SZMcqSlBsLmqLU+3hGuwRbBT1of KRgA== X-Gm-Message-State: AJIora/XBjk0MQaSVAE1eoUbhY7ruzPeHg7crUeX80q9e9q2OKdOpQ2h uOvNvMdTZ+bNZa2tYISir34= X-Google-Smtp-Source: AGRyM1tw4q1NoelOLcCXG5X0H0L2JY5ZMya3xhykm3bs/T2hBaMTXw6MB7tZ4NfIrzCLxAPOsLrlOw== X-Received: by 2002:a5d:40c6:0:b0:21a:36e6:140d with SMTP id b6-20020a5d40c6000000b0021a36e6140dmr1231498wrq.672.1655363763844; Thu, 16 Jun 2022 00:16:03 -0700 (PDT) Received: from localhost.localdomain (host-87-16-96-199.retail.telecomitalia.it. [87.16.96.199]) by smtp.gmail.com with ESMTPSA id o10-20020a1c4d0a000000b003942a244ee6sm1242770wmh.43.2022.06.16.00.16.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jun 2022 00:16:02 -0700 (PDT) From: "Fabio M. De Francesco" To: David Sterba Cc: Chris Mason , Josef Bacik , Nick Terrell , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, "Fabio M. De Francesco" , Andrew Morton , David Sterba , Ira Weiny Subject: [PATCH v3 1/2] highmem: Make __kunmap_{local,atomic}() take "const void *" Date: Thu, 16 Jun 2022 09:15:50 +0200 Message-Id: <20220616071551.12602-2-fmdefrancesco@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220616071551.12602-1-fmdefrancesco@gmail.com> References: <20220616071551.12602-1-fmdefrancesco@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" __kunmap_ {local,atomic}() currently take pointers to void. However, this is semantically incorrect, since these functions do not change the memory their arguments point to. Therefore, make this semantics explicit by modifying the __kunmap_{local,atomic}() prototypes to take pointers to const void. As a side effect, compilers will likely produce more efficient code. Cc: Andrew Morton Suggested-by: David Sterba Suggested-by: Ira Weiny Signed-off-by: Fabio M. De Francesco --- v2->v3: Fix compilation errors for ARCH=3Dparisc. Reported-by: kernel test robot v1->v2: Change the commit message to clearly explain why these functions should require pointers to const void. The fundamental argument=20 behind the commit message changes is semantic correctness. Obviously, there are no changes to the code. Many thanks to David Sterba and Ira Weiny for suggestions and reviews. arch/parisc/include/asm/cacheflush.h | 6 +++--- arch/parisc/kernel/cache.c | 2 +- include/linux/highmem-internal.h | 10 +++++----- mm/highmem.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/parisc/include/asm/cacheflush.h b/arch/parisc/include/asm= /cacheflush.h index 8d03b3b26229..0bdee6724132 100644 --- a/arch/parisc/include/asm/cacheflush.h +++ b/arch/parisc/include/asm/cacheflush.h @@ -22,7 +22,7 @@ void flush_kernel_icache_range_asm(unsigned long, unsigne= d long); void flush_user_dcache_range_asm(unsigned long, unsigned long); void flush_kernel_dcache_range_asm(unsigned long, unsigned long); void purge_kernel_dcache_range_asm(unsigned long, unsigned long); -void flush_kernel_dcache_page_asm(void *); +void flush_kernel_dcache_page_asm(const void *addr); void flush_kernel_icache_page(void *); =20 /* Cache flush operations */ @@ -31,7 +31,7 @@ void flush_cache_all_local(void); void flush_cache_all(void); void flush_cache_mm(struct mm_struct *mm); =20 -void flush_kernel_dcache_page_addr(void *addr); +void flush_kernel_dcache_page_addr(const void *addr); =20 #define flush_kernel_dcache_range(start,size) \ flush_kernel_dcache_range_asm((start), (start)+(size)); @@ -75,7 +75,7 @@ void flush_dcache_page_asm(unsigned long phys_addr, unsig= ned long vaddr); void flush_anon_page(struct vm_area_struct *vma, struct page *page, unsign= ed long vmaddr); =20 #define ARCH_HAS_FLUSH_ON_KUNMAP -static inline void kunmap_flush_on_unmap(void *addr) +static inline void kunmap_flush_on_unmap(const void *addr) { flush_kernel_dcache_page_addr(addr); } diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c index c8a11fcecf4c..824064cafd61 100644 --- a/arch/parisc/kernel/cache.c +++ b/arch/parisc/kernel/cache.c @@ -549,7 +549,7 @@ extern void purge_kernel_dcache_page_asm(unsigned long); extern void clear_user_page_asm(void *, unsigned long); extern void copy_user_page_asm(void *, void *, unsigned long); =20 -void flush_kernel_dcache_page_addr(void *addr) +void flush_kernel_dcache_page_addr(const void *addr) { unsigned long flags; =20 diff --git a/include/linux/highmem-internal.h b/include/linux/highmem-inter= nal.h index cddb42ff0473..034b1106d022 100644 --- a/include/linux/highmem-internal.h +++ b/include/linux/highmem-internal.h @@ -8,7 +8,7 @@ #ifdef CONFIG_KMAP_LOCAL void *__kmap_local_pfn_prot(unsigned long pfn, pgprot_t prot); void *__kmap_local_page_prot(struct page *page, pgprot_t prot); -void kunmap_local_indexed(void *vaddr); +void kunmap_local_indexed(const void *vaddr); void kmap_local_fork(struct task_struct *tsk); void __kmap_local_sched_out(void); void __kmap_local_sched_in(void); @@ -89,7 +89,7 @@ static inline void *kmap_local_pfn(unsigned long pfn) return __kmap_local_pfn_prot(pfn, kmap_prot); } =20 -static inline void __kunmap_local(void *vaddr) +static inline void __kunmap_local(const void *vaddr) { kunmap_local_indexed(vaddr); } @@ -121,7 +121,7 @@ static inline void *kmap_atomic_pfn(unsigned long pfn) return __kmap_local_pfn_prot(pfn, kmap_prot); } =20 -static inline void __kunmap_atomic(void *addr) +static inline void __kunmap_atomic(const void *addr) { kunmap_local_indexed(addr); pagefault_enable(); @@ -197,7 +197,7 @@ static inline void *kmap_local_pfn(unsigned long pfn) return kmap_local_page(pfn_to_page(pfn)); } =20 -static inline void __kunmap_local(void *addr) +static inline void __kunmap_local(const void *addr) { #ifdef ARCH_HAS_FLUSH_ON_KUNMAP kunmap_flush_on_unmap(addr); @@ -224,7 +224,7 @@ static inline void *kmap_atomic_pfn(unsigned long pfn) return kmap_atomic(pfn_to_page(pfn)); } =20 -static inline void __kunmap_atomic(void *addr) +static inline void __kunmap_atomic(const void *addr) { #ifdef ARCH_HAS_FLUSH_ON_KUNMAP kunmap_flush_on_unmap(addr); diff --git a/mm/highmem.c b/mm/highmem.c index 1a692997fac4..e32083e4ce0d 100644 --- a/mm/highmem.c +++ b/mm/highmem.c @@ -561,7 +561,7 @@ void *__kmap_local_page_prot(struct page *page, pgprot_= t prot) } EXPORT_SYMBOL(__kmap_local_page_prot); =20 -void kunmap_local_indexed(void *vaddr) +void kunmap_local_indexed(const void *vaddr) { unsigned long addr =3D (unsigned long) vaddr & PAGE_MASK; pte_t *kmap_pte; --=20 2.36.1 From nobody Mon Apr 27 06:26:17 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04DB1C433EF for ; Thu, 16 Jun 2022 07:16:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358838AbiFPHQR (ORCPT ); Thu, 16 Jun 2022 03:16:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1359075AbiFPHQJ (ORCPT ); Thu, 16 Jun 2022 03:16:09 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2DBC5BE66; Thu, 16 Jun 2022 00:16:07 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id c21so642528wrb.1; Thu, 16 Jun 2022 00:16:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=o9CEbBJBMqTTLdgEBo+YkcFADCtrWK80+bti/fX3CZg=; b=V1R/wJR9YRvV+84FkNElR3q++s5xNjvbw+4nxp4TvXG/knaq5qduOEn6pxURdpT8bf NtsYWxT8ME60Zi3uaZdDNKrk8AZvmHURGa3oYX5pFnTAsN3gc+/QZRBNljaumpgf5052 F/mT8XSKOyXnumqZjeSTx3RYWgRwIX+huoyUHzHbSlKcP9ij6qZniYDFL3cyNo2PqyT0 Cu96MwCU42HmEAUPGnx16yd+AFMvaH8jMpE7+GSc3U6cv/J/hydnyBLGkVUx5Fc7XnW6 hqCAgMFZ0T6ahfL3wVM3Ntj9gG5ZDT4qAmOnNxMB/sf3pryI3mZKlxs85yN8seLCIZlA nhng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=o9CEbBJBMqTTLdgEBo+YkcFADCtrWK80+bti/fX3CZg=; b=Re8N+u2cMePtnapt/Kjxgfo3RfNu9ufWRhjY+aY61y5KKYuoUFXKFI5jyVpQ64YaQ7 bOKLwqKG127yumjgYgeLO2PGfTslXb+U7F3k+Dlr2NXScZ5vU3eupBsfAP8N2ESsFPGy rLCgHG1x8Wxw/T+zs5zOvyX82NUVymYGaA4gximxaaD3lLPT4oEqujuqETpRsoI2CFZx EOoG+VD90IYPhEpsjuaVUnL8TiniimQM0fSCxdKSxpbZNP2wQO7PZ8qJJLXCbwVhsBh9 Y7kuhpjjWegxR/amD2qylvlzkqnBLS4CAJ59rByss13n6o3kCU6hqQWqezoGy+RqhQgd xdAw== X-Gm-Message-State: AJIora9estynnkd2HBb5xL2ud/lKY+tpVNXLEsfaTe71CDfojsPF6JZA YnUHMtaSDlNCvyHWJgn4wm8= X-Google-Smtp-Source: AGRyM1tW5YGEzfUQ55MrqGUZMrZZ0EHQA37C0a0j9DFbwNYNcPvR8lTQIMNUUeYfo7Dfb+tJO6o6iA== X-Received: by 2002:a5d:68d2:0:b0:210:31cc:64a6 with SMTP id p18-20020a5d68d2000000b0021031cc64a6mr3245337wrw.679.1655363765892; Thu, 16 Jun 2022 00:16:05 -0700 (PDT) Received: from localhost.localdomain (host-87-16-96-199.retail.telecomitalia.it. [87.16.96.199]) by smtp.gmail.com with ESMTPSA id o10-20020a1c4d0a000000b003942a244ee6sm1242770wmh.43.2022.06.16.00.16.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jun 2022 00:16:04 -0700 (PDT) From: "Fabio M. De Francesco" To: David Sterba Cc: Chris Mason , Josef Bacik , Nick Terrell , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, "Fabio M. De Francesco" , Filipe Manana , Ira Weiny Subject: [PATCH v3 2/2] btrfs: Replace kmap() with kmap_local_page() in zstd.c Date: Thu, 16 Jun 2022 09:15:51 +0200 Message-Id: <20220616071551.12602-3-fmdefrancesco@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220616071551.12602-1-fmdefrancesco@gmail.com> References: <20220616071551.12602-1-fmdefrancesco@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The use of kmap() is being deprecated in favor of kmap_local_page(). With kmap_local_page(), the mapping is per thread, CPU local and not globally visible. Therefore, use kmap_local_page() / kunmap_local() in zstd.c because in this file the mappings are per thread and are not visible in other contexts; meanwhile refactor zstd_compress_pages() to comply with nested local mapping / unmapping ordering rules. Tested with xfstests on QEMU + KVM 32 bits VM with 4GB of RAM and HIGHMEM64G enabled. These changes passed all tests of the "compress" group. Cc: Filipe Manana Suggested-by: Ira Weiny Signed-off-by: Fabio M. De Francesco --- v2->v3: Remove unnecessary casts to arguments of kunmap_local() now that this API can take pointers to const void. v1->v2: No changes. Thanks to Ira Weiny for his invaluable help and persevering support. Thanks also to Filipe Manana for identifying a fundamental detail I had overlooked in RFC: https://lore.kernel.org/lkml/20220611093411.GA3779054@falcondesktop/ fs/btrfs/zstd.c | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/fs/btrfs/zstd.c b/fs/btrfs/zstd.c index 0fe31a6f6e68..5d2ab0bac9d2 100644 --- a/fs/btrfs/zstd.c +++ b/fs/btrfs/zstd.c @@ -391,6 +391,8 @@ int zstd_compress_pages(struct list_head *ws, struct ad= dress_space *mapping, *out_pages =3D 0; *total_out =3D 0; *total_in =3D 0; + workspace->in_buf.src =3D NULL; + workspace->out_buf.dst =3D NULL; =20 /* Initialize the stream */ stream =3D zstd_init_cstream(¶ms, len, workspace->mem, @@ -403,7 +405,7 @@ int zstd_compress_pages(struct list_head *ws, struct ad= dress_space *mapping, =20 /* map in the first page of input data */ in_page =3D find_get_page(mapping, start >> PAGE_SHIFT); - workspace->in_buf.src =3D kmap(in_page); + workspace->in_buf.src =3D kmap_local_page(in_page); workspace->in_buf.pos =3D 0; workspace->in_buf.size =3D min_t(size_t, len, PAGE_SIZE); =20 @@ -415,7 +417,7 @@ int zstd_compress_pages(struct list_head *ws, struct ad= dress_space *mapping, goto out; } pages[nr_pages++] =3D out_page; - workspace->out_buf.dst =3D kmap(out_page); + workspace->out_buf.dst =3D kmap_local_page(out_page); workspace->out_buf.pos =3D 0; workspace->out_buf.size =3D min_t(size_t, max_out, PAGE_SIZE); =20 @@ -450,9 +452,9 @@ int zstd_compress_pages(struct list_head *ws, struct ad= dress_space *mapping, if (workspace->out_buf.pos =3D=3D workspace->out_buf.size) { tot_out +=3D PAGE_SIZE; max_out -=3D PAGE_SIZE; - kunmap(out_page); + kunmap_local(workspace->out_buf.dst); if (nr_pages =3D=3D nr_dest_pages) { - out_page =3D NULL; + workspace->out_buf.dst =3D NULL; ret =3D -E2BIG; goto out; } @@ -462,7 +464,7 @@ int zstd_compress_pages(struct list_head *ws, struct ad= dress_space *mapping, goto out; } pages[nr_pages++] =3D out_page; - workspace->out_buf.dst =3D kmap(out_page); + workspace->out_buf.dst =3D kmap_local_page(out_page); workspace->out_buf.pos =3D 0; workspace->out_buf.size =3D min_t(size_t, max_out, PAGE_SIZE); @@ -477,15 +479,16 @@ int zstd_compress_pages(struct list_head *ws, struct = address_space *mapping, /* Check if we need more input */ if (workspace->in_buf.pos =3D=3D workspace->in_buf.size) { tot_in +=3D PAGE_SIZE; - kunmap(in_page); + kunmap_local(workspace->out_buf.dst); + kunmap_local(workspace->in_buf.src); put_page(in_page); - start +=3D PAGE_SIZE; len -=3D PAGE_SIZE; in_page =3D find_get_page(mapping, start >> PAGE_SHIFT); - workspace->in_buf.src =3D kmap(in_page); + workspace->in_buf.src =3D kmap_local_page(in_page); workspace->in_buf.pos =3D 0; workspace->in_buf.size =3D min_t(size_t, len, PAGE_SIZE); + workspace->out_buf.dst =3D kmap_local_page(out_page); } } while (1) { @@ -510,9 +513,9 @@ int zstd_compress_pages(struct list_head *ws, struct ad= dress_space *mapping, =20 tot_out +=3D PAGE_SIZE; max_out -=3D PAGE_SIZE; - kunmap(out_page); + kunmap_local(workspace->out_buf.dst); if (nr_pages =3D=3D nr_dest_pages) { - out_page =3D NULL; + workspace->out_buf.dst =3D NULL; ret =3D -E2BIG; goto out; } @@ -522,7 +525,7 @@ int zstd_compress_pages(struct list_head *ws, struct ad= dress_space *mapping, goto out; } pages[nr_pages++] =3D out_page; - workspace->out_buf.dst =3D kmap(out_page); + workspace->out_buf.dst =3D kmap_local_page(out_page); workspace->out_buf.pos =3D 0; workspace->out_buf.size =3D min_t(size_t, max_out, PAGE_SIZE); } @@ -538,12 +541,12 @@ int zstd_compress_pages(struct list_head *ws, struct = address_space *mapping, out: *out_pages =3D nr_pages; /* Cleanup */ - if (in_page) { - kunmap(in_page); + if (workspace->out_buf.dst) + kunmap_local(workspace->out_buf.dst); + if (workspace->in_buf.src) { + kunmap_local(workspace->in_buf.src); put_page(in_page); } - if (out_page) - kunmap(out_page); return ret; } =20 @@ -567,7 +570,7 @@ int zstd_decompress_bio(struct list_head *ws, struct co= mpressed_bio *cb) goto done; } =20 - workspace->in_buf.src =3D kmap(pages_in[page_in_index]); + workspace->in_buf.src =3D kmap_local_page(pages_in[page_in_index]); workspace->in_buf.pos =3D 0; workspace->in_buf.size =3D min_t(size_t, srclen, PAGE_SIZE); =20 @@ -603,14 +606,15 @@ int zstd_decompress_bio(struct list_head *ws, struct = compressed_bio *cb) break; =20 if (workspace->in_buf.pos =3D=3D workspace->in_buf.size) { - kunmap(pages_in[page_in_index++]); + kunmap_local(workspace->in_buf.src); + page_in_index++; if (page_in_index >=3D total_pages_in) { workspace->in_buf.src =3D NULL; ret =3D -EIO; goto done; } srclen -=3D PAGE_SIZE; - workspace->in_buf.src =3D kmap(pages_in[page_in_index]); + workspace->in_buf.src =3D kmap_local_page(pages_in[page_in_index]); workspace->in_buf.pos =3D 0; workspace->in_buf.size =3D min_t(size_t, srclen, PAGE_SIZE); } @@ -619,7 +623,7 @@ int zstd_decompress_bio(struct list_head *ws, struct co= mpressed_bio *cb) zero_fill_bio(cb->orig_bio); done: if (workspace->in_buf.src) - kunmap(pages_in[page_in_index]); + kunmap_local(workspace->in_buf.src); return ret; } =20 --=20 2.36.1