From patchwork Wed Jul 6 11:15:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fabio M. De Francesco" X-Patchwork-Id: 12907988 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 A698EC433EF for ; Wed, 6 Jul 2022 11:15:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3E6E06B0073; Wed, 6 Jul 2022 07:15:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 370278E0001; Wed, 6 Jul 2022 07:15:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1E9A46B0075; Wed, 6 Jul 2022 07:15:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 0C34E6B0073 for ; Wed, 6 Jul 2022 07:15:32 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id C744A60A37 for ; Wed, 6 Jul 2022 11:15:31 +0000 (UTC) X-FDA: 79656419262.20.45D9643 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by imf17.hostedemail.com (Postfix) with ESMTP id 6EA5E4003C for ; Wed, 6 Jul 2022 11:15:31 +0000 (UTC) Received: by mail-wr1-f54.google.com with SMTP id d16so15254257wrv.10 for ; Wed, 06 Jul 2022 04:15:31 -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=/NoGihGglllHOrI9iplyTzbn10ta3Cg0gKoqCUXt7Pg=; b=jedl9OaLrhvlMSijCa3fqTIeRWDoSeNtzBf1lPOl9u36IyUunoaJyePUfdb6e9prZK HMuZzSTsQWfXhdfwr9pVwN0lSo+QUqs86Jwge4hS4gf3/DS6m0RqEONGeAg+ehldHcA5 O3wEIIo05I/GF0kBJG8inlP+EQjdmhWiHkO8cHU1/4jYotUSSbiozooVa3zWr2nH9O9a iMyu+uJcVSTLF675I79osE8Tzn8SDUXVp0p/eLHF0G/iFSqynWC/QyAV9W8622rUdRbt m8gar2esyISHsZ8b21dOIgM/V1QQHfHXiCMlzwQN8dZkyThQeyxqMZSh/xULUhWQTPnO B1kg== 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=/NoGihGglllHOrI9iplyTzbn10ta3Cg0gKoqCUXt7Pg=; b=w7w+4K+gQZAnowLeNNbmtB1HPLJePU0zp1nqptsTNrnVqgT4rIFKgycixGLyW4vun6 bGCkHoqL3a4LXcQ0jmcVPIXjFXQnJ3TVnLj4cc4cKFmcUWVO2Jv6qrZNHTGNb8UiJ7bh HfmCr1xQ1cX146KP+Ltf3JsDvQus0saguLDEWV1r3Y4w/ZVPPtACgNgr6b7A0MAXLzEG TfhD9f1Hkxto2NhngTjddgkl0pmrUzppfOrrwWQjIm3/pQIgIu7Cq59I/h+VaIi4wSsJ YfxlPuCBOnJ8lo+7GGP6U8AogFJNtgYJmC/DBvrmTET/3S5Pd3xYONbmluH36o39g2aJ OIaA== X-Gm-Message-State: AJIora+QrpjYNQIAq7yZVzxZ0pahzJ/KlS2dwmr61OvJwZnwjs//RJhL TZG3BNm+GpO4lYbQKmhVSFJgf5iznZg= X-Google-Smtp-Source: AGRyM1vTkZWX4J5ZaynVafZzoUbGrWrFkQ4MDBLbLLn7b5Oh/yP+cm3dGSwX9NK7KBdxAE5QVRi4pQ== X-Received: by 2002:a5d:584c:0:b0:21c:1395:f0c4 with SMTP id i12-20020a5d584c000000b0021c1395f0c4mr36548584wrf.24.1657106130188; Wed, 06 Jul 2022 04:15:30 -0700 (PDT) Received: from localhost.localdomain (host-79-53-109-127.retail.telecomitalia.it. [79.53.109.127]) by smtp.gmail.com with ESMTPSA id k1-20020adff5c1000000b0020d07d90b71sm34830696wrp.66.2022.07.06.04.15.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 04:15:28 -0700 (PDT) From: "Fabio M. De Francesco" To: David Sterba , Chris Mason , Josef Bacik , Nick Terrell , linux-btrfs@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Ira Weiny , Andrew Morton , Matthew Wilcox , Kees Cook , Sebastian Andrzej Siewior , "James E. J. Bottomley" , Helge Deller , John David Anglin , linux-parisc@vger.kernel.org Cc: "Fabio M. De Francesco" , David Sterba Subject: [PATCH v6 1/2] highmem: Make __kunmap_{local,atomic}() take "const void *" Date: Wed, 6 Jul 2022 13:15:19 +0200 Message-Id: <20220706111520.12858-2-fmdefrancesco@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220706111520.12858-1-fmdefrancesco@gmail.com> References: <20220706111520.12858-1-fmdefrancesco@gmail.com> MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1657106131; a=rsa-sha256; cv=none; b=pVef3iBS5L3Y9O0gmcqRNB8oeWxOXE+WyRqvI0lJbFYwnWKZC/fzHYqb2ypVwiU/R/7gtT CumlvTpLMXjRalEY/jd3cgDlUzx4ACb9+N0nA0Dgbg/dWqd+zc8KonouEsVtg2bYph+UxT oxxWiQy6smUrX8tSVHO5QNW5ljTjGJw= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=jedl9OaL; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf17.hostedemail.com: domain of fmdefrancesco@gmail.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=fmdefrancesco@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1657106131; 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=/NoGihGglllHOrI9iplyTzbn10ta3Cg0gKoqCUXt7Pg=; b=oJCS8bUHhLvjsHLTmNOs6f/23+DTJNWX+Sv4LIEny7q2ZO7qWyPj4lM1UQSAydHRFwvdMV p0lnJk7Q4bZPhuMSHqm2F43xO6zTJWVB+t0b2OBolV8yVmSr4P99LaNLD6cILlfjDT7Hj1 ku7R9qn59+tDFuq++/Tul2X1IvskVqo= X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 6EA5E4003C X-Rspam-User: Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=jedl9OaL; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf17.hostedemail.com: domain of fmdefrancesco@gmail.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=fmdefrancesco@gmail.com X-Stat-Signature: ipg5rwf55stqkukkkazojqoax5xu5y1x X-HE-Tag: 1657106131-86416 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: __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 Reviewed-by: Ira Weiny Signed-off-by: Fabio M. De Francesco Acked-by: Andrew Morton Acked-by: Helge Deller # parisc --- 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, unsigned 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 *); /* 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); -void flush_kernel_dcache_page_addr(void *addr); +void flush_kernel_dcache_page_addr(const void *addr); #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, unsigned long vaddr); void flush_anon_page(struct vm_area_struct *vma, struct page *page, unsigned long vmaddr); #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 a9bc578e4c52..993999a65e54 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); -void flush_kernel_dcache_page_addr(void *addr) +void flush_kernel_dcache_page_addr(const void *addr) { unsigned long flags; diff --git a/include/linux/highmem-internal.h b/include/linux/highmem-internal.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); } -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); } -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)); } -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)); } -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); -void kunmap_local_indexed(void *vaddr) +void kunmap_local_indexed(const void *vaddr) { unsigned long addr = (unsigned long) vaddr & PAGE_MASK; pte_t *kmap_pte; From patchwork Wed Jul 6 11:15:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fabio M. De Francesco" X-Patchwork-Id: 12907989 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 D207AC43334 for ; Wed, 6 Jul 2022 11:15:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 398388E0002; Wed, 6 Jul 2022 07:15:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 322818E0001; Wed, 6 Jul 2022 07:15:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 19AAB8E0002; Wed, 6 Jul 2022 07:15:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 072468E0001 for ; Wed, 6 Jul 2022 07:15:35 -0400 (EDT) Received: from smtpin31.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id CAE9760A25 for ; Wed, 6 Jul 2022 11:15:34 +0000 (UTC) X-FDA: 79656419388.31.6850700 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by imf17.hostedemail.com (Postfix) with ESMTP id 77F304001E for ; Wed, 6 Jul 2022 11:15:34 +0000 (UTC) Received: by mail-wr1-f47.google.com with SMTP id h17so8421122wrx.0 for ; Wed, 06 Jul 2022 04:15:34 -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=niVwwgyPI5g9Z7n7TEokSXWWLyf66aMv7zsWLvy4BA4=; b=RrQp/binz0VbQrxecSi2P0fVnvwi0uACybF3/YorN1BqeSR6f0wEQq0s2Jv2Hh+jop 3WguWhb+CcOyGnh7kMu4zCsDNIBWj9SGrSdrI7epqys4jKZre+g4gyC4oiI8gDa7cf6J 3CetJ0cl7/L44iGBxrxYnCU39XqVYucfe5PT3UFH3B/TdLhCwi1rL+bb32vIgGbIyY1t JaHHLr1M+qYxwa6Mg3tnLc6JhQqb1lpT9HTA0uDymMNOcf99uhzCqlcNUsonImys16xd DM+6Kq49GXquSRj6gPdNNp2yjULACSCnp1lZhGFuNlxRTz21VHPI+gDBz5hgrUNMirlB ZEOg== 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=niVwwgyPI5g9Z7n7TEokSXWWLyf66aMv7zsWLvy4BA4=; b=tlGIPjWPX3q1UV1dxjSrSNIlGif2A138Cl09NuDu3POUb/wxc12tEpjBYfXqidp4yN suqru13w32RuzG47GXDz5u4PAZ36WRtmMz9Iiyz+oz3RIWFC/7GQNoMWVGQ/+tVqwZ3Y nBx3zio8gOqEYXJmoQDCKJMgpT+8X6y0Kf6fYtv1Ix784NexPLC99DbFV0T4lV+14RLi xR+oEW4lQmE+QBLoHUZRqxAFI4ypgLYq4Bif8bODB+09xTlpZRznFfKn1vd+W3HSzPez gKnUrfFKHr7c1e500gVJMSCNqRBIks+heZYScQvIp1VnEwdBkzaHQC59tEQYW2b7HdQK llSQ== X-Gm-Message-State: AJIora9B4LX8aLfuSawwPk7ZQEaXKmVoy0ejtZn4TvedMgKz+XQNGErk J9dnJSelOJtXVD8OTYM8l/c= X-Google-Smtp-Source: AGRyM1sCRkHNU5DKUc1bbWrCxoR7ukoiDZt7Ny2+aZ/pNySHWQ1/b7JGhwQiFZcLA5cU20pOFnmy1Q== X-Received: by 2002:adf:f1d1:0:b0:21d:7f88:d638 with SMTP id z17-20020adff1d1000000b0021d7f88d638mr1232090wro.586.1657106133302; Wed, 06 Jul 2022 04:15:33 -0700 (PDT) Received: from localhost.localdomain (host-79-53-109-127.retail.telecomitalia.it. [79.53.109.127]) by smtp.gmail.com with ESMTPSA id k1-20020adff5c1000000b0020d07d90b71sm34830696wrp.66.2022.07.06.04.15.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 04:15:31 -0700 (PDT) From: "Fabio M. De Francesco" To: David Sterba , Chris Mason , Josef Bacik , Nick Terrell , linux-btrfs@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Ira Weiny , Andrew Morton , Matthew Wilcox , Kees Cook , Sebastian Andrzej Siewior , "James E. J. Bottomley" , Helge Deller , John David Anglin , linux-parisc@vger.kernel.org Cc: "Fabio M. De Francesco" , Filipe Manana Subject: [PATCH v6 2/2] btrfs: Replace kmap() with kmap_local_page() in zstd.c Date: Wed, 6 Jul 2022 13:15:20 +0200 Message-Id: <20220706111520.12858-3-fmdefrancesco@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220706111520.12858-1-fmdefrancesco@gmail.com> References: <20220706111520.12858-1-fmdefrancesco@gmail.com> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1657106134; 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=niVwwgyPI5g9Z7n7TEokSXWWLyf66aMv7zsWLvy4BA4=; b=A7iv2YdJQYKdRaH45h8GRKiPRGt14woUbkdd/zXk8jtyNZanOc4VTPUSKSl5mSoCKFegFC nGSoQQSZ4PTWAWbTL5a1UNaJbmmE3PMZDL5pWiZLhO+90mOkEaCc+gACJHc2S7aOap5evP vm1BSlKxhx+R+RNXe0TLp/bvNBunsDI= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="RrQp/bin"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf17.hostedemail.com: domain of fmdefrancesco@gmail.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=fmdefrancesco@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1657106134; a=rsa-sha256; cv=none; b=I/hOwVpX5g6eq0AT6WR8moYinmmO2j6nPn2sRJicCkXpgnCaskxBrb49m/i13OzaOcXM0H cKiZWZCGcJARvvrQrY6gswEGsKtML8qAJuzSnP7ZW5yNf6uQ9akvJRYyUUi5lWwzcq2fdC ZRGtq8OUE5iSZoe3fhFYkkYtnKyDAPs= X-Rspamd-Server: rspam11 X-Rspam-User: X-Stat-Signature: ym1zphhup6a6nhsn7ypjc469pi46kk3u X-Rspamd-Queue-Id: 77F304001E Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="RrQp/bin"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf17.hostedemail.com: domain of fmdefrancesco@gmail.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=fmdefrancesco@gmail.com X-HE-Tag: 1657106134-158586 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: 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. In the meanwhile use plain page_address() on pages allocated with the GFP_NOFS flag instead of calling kmap*() on them (since they are always allocated from ZONE_NORMAL). Tested with xfstests on QEMU + KVM 32 bits VM with 4GB of RAM, booting a kernel with HIGHMEM64G enabled. Cc: Filipe Manana Suggested-by: Ira Weiny Signed-off-by: Fabio M. De Francesco --- fs/btrfs/zstd.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/fs/btrfs/zstd.c b/fs/btrfs/zstd.c index 0fe31a6f6e68..35a0224d4eb7 100644 --- a/fs/btrfs/zstd.c +++ b/fs/btrfs/zstd.c @@ -403,7 +403,7 @@ int zstd_compress_pages(struct list_head *ws, struct address_space *mapping, /* map in the first page of input data */ in_page = find_get_page(mapping, start >> PAGE_SHIFT); - workspace->in_buf.src = kmap(in_page); + workspace->in_buf.src = kmap_local_page(in_page); workspace->in_buf.pos = 0; workspace->in_buf.size = min_t(size_t, len, PAGE_SIZE); @@ -415,7 +415,7 @@ int zstd_compress_pages(struct list_head *ws, struct address_space *mapping, goto out; } pages[nr_pages++] = out_page; - workspace->out_buf.dst = kmap(out_page); + workspace->out_buf.dst = page_address(out_page); workspace->out_buf.pos = 0; workspace->out_buf.size = min_t(size_t, max_out, PAGE_SIZE); @@ -450,9 +450,7 @@ int zstd_compress_pages(struct list_head *ws, struct address_space *mapping, if (workspace->out_buf.pos == workspace->out_buf.size) { tot_out += PAGE_SIZE; max_out -= PAGE_SIZE; - kunmap(out_page); if (nr_pages == nr_dest_pages) { - out_page = NULL; ret = -E2BIG; goto out; } @@ -462,7 +460,7 @@ int zstd_compress_pages(struct list_head *ws, struct address_space *mapping, goto out; } pages[nr_pages++] = out_page; - workspace->out_buf.dst = kmap(out_page); + workspace->out_buf.dst = page_address(out_page); workspace->out_buf.pos = 0; workspace->out_buf.size = min_t(size_t, max_out, PAGE_SIZE); @@ -477,13 +475,12 @@ int zstd_compress_pages(struct list_head *ws, struct address_space *mapping, /* Check if we need more input */ if (workspace->in_buf.pos == workspace->in_buf.size) { tot_in += PAGE_SIZE; - kunmap(in_page); + kunmap_local(workspace->in_buf.src); put_page(in_page); - start += PAGE_SIZE; len -= PAGE_SIZE; in_page = find_get_page(mapping, start >> PAGE_SHIFT); - workspace->in_buf.src = kmap(in_page); + workspace->in_buf.src = kmap_local_page(in_page); workspace->in_buf.pos = 0; workspace->in_buf.size = min_t(size_t, len, PAGE_SIZE); } @@ -510,9 +507,7 @@ int zstd_compress_pages(struct list_head *ws, struct address_space *mapping, tot_out += PAGE_SIZE; max_out -= PAGE_SIZE; - kunmap(out_page); if (nr_pages == nr_dest_pages) { - out_page = NULL; ret = -E2BIG; goto out; } @@ -522,7 +517,7 @@ int zstd_compress_pages(struct list_head *ws, struct address_space *mapping, goto out; } pages[nr_pages++] = out_page; - workspace->out_buf.dst = kmap(out_page); + workspace->out_buf.dst = page_address(out_page); workspace->out_buf.pos = 0; workspace->out_buf.size = min_t(size_t, max_out, PAGE_SIZE); } @@ -537,13 +532,10 @@ int zstd_compress_pages(struct list_head *ws, struct address_space *mapping, *total_out = tot_out; out: *out_pages = nr_pages; - /* Cleanup */ - if (in_page) { - kunmap(in_page); + if (workspace->in_buf.src) { + kunmap_local(workspace->in_buf.src); put_page(in_page); } - if (out_page) - kunmap(out_page); return ret; } @@ -567,7 +559,7 @@ int zstd_decompress_bio(struct list_head *ws, struct compressed_bio *cb) goto done; } - workspace->in_buf.src = kmap(pages_in[page_in_index]); + workspace->in_buf.src = kmap_local_page(pages_in[page_in_index]); workspace->in_buf.pos = 0; workspace->in_buf.size = min_t(size_t, srclen, PAGE_SIZE); @@ -603,14 +595,15 @@ int zstd_decompress_bio(struct list_head *ws, struct compressed_bio *cb) break; if (workspace->in_buf.pos == workspace->in_buf.size) { - kunmap(pages_in[page_in_index++]); + kunmap_local(workspace->in_buf.src); + page_in_index++; if (page_in_index >= total_pages_in) { workspace->in_buf.src = NULL; ret = -EIO; goto done; } srclen -= PAGE_SIZE; - workspace->in_buf.src = kmap(pages_in[page_in_index]); + workspace->in_buf.src = kmap_local_page(pages_in[page_in_index]); workspace->in_buf.pos = 0; workspace->in_buf.size = min_t(size_t, srclen, PAGE_SIZE); } @@ -619,7 +612,7 @@ int zstd_decompress_bio(struct list_head *ws, struct compressed_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; }