Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 5 Jul 2022 12:04:04 -0700
From:   Ira Weiny <ira.weiny@intel.com>
To:     "Fabio M. De Francesco" <fmdefrancesco@gmail.com>
CC:     David Sterba <dsterba@suse.com>, Chris Mason <clm@fb.com>,
        Josef Bacik <josef@toxicpanda.com>,
        Nick Terrell <terrelln@fb.com>, <linux-btrfs@vger.kernel.org>,
        <linux-mm@kvack.org>, <linux-kernel@vger.kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        Matthew Wilcox <willy@infradead.org>,
        Kees Cook <keescook@chromium.org>,
        Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
        "James E. J. Bottomley" <James.Bottomley@hansenpartnership.com>,
        Helge Deller <deller@gmx.de>,
        "John David Anglin" <dave.anglin@bell.net>,
        <linux-parisc@vger.kernel.org>,
        "Filipe Manana" <fdmanana@kernel.org>
Subject: Re: [PATCH v5 2/2] btrfs: Replace kmap() with kmap_local_page() in
 zstd.c
Message-ID: <YsSLJBzwB5bCyuNR@iweiny-desk3>
References: <20220704152322.20955-1-fmdefrancesco@gmail.com>
 <20220704152322.20955-3-fmdefrancesco@gmail.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20220704152322.20955-3-fmdefrancesco@gmail.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?gzRDVE1CgP/06jEg1IjizIKWQspU5zycxdWXj3e9gHlqSKcDIRUxL1WET+6v?=
 =?us-ascii?Q?a75hGLvFJo2Puk2VcjuI628lOtYI/T+P9k3vZRFykgaMP1tVtgXp4QuZCx4h?=
 =?us-ascii?Q?RVSz6qdvFxJqRh9guaPaW3VzbfyS9NLGGDoeM+bkcH8vBvOZ2tVTeeqKlPIi?=
 =?us-ascii?Q?KL7ATYEBbPUGFaMBUIb6Amp7/ZJgIjF+b7ikae/EZ6ASmFWZEpyaJAHBB+dt?=
 =?us-ascii?Q?5VM7l9UEYWF03drdeAZK3QoS+v+vTNFIGS3PVYz1gdhHuFR28mZOf8XbMH9T?=
 =?us-ascii?Q?OdOHrc1IKm3wkAHqDdTgWWx/TyXaFRgYcF0PHCIoI8pJiNhIFwAPkwtGxwQ4?=
 =?us-ascii?Q?cxnc6grVgXxoiCUXwBr3oacnm4D6iK1Aziwl8HHc77JrobCXzzdLpkxcoWrI?=
 =?us-ascii?Q?xWzT44IFVRvOIyLwIhA0haTsgToBRmI0oWMob3cdUgM0rfIS52XYY6OW80EH?=
 =?us-ascii?Q?fyr3N0rPdEX/TPNEqNHQKh7rt8NPgytpdPI8dsr3rDGKqD8oHXP0kTfh8SLA?=
 =?us-ascii?Q?qcqxAUo1uG4RSBh+8iEHiGpBKI+vk1obvltBws0OcH/giiwzzoSGzj/nANFW?=
 =?us-ascii?Q?4PVoQkYL5nYVgUc9AmlF/qJ+GCNWFF0rgyDXk9XEqyXY67RWwXJpnlccHBV1?=
 =?us-ascii?Q?QkGW6rKenHl6AVx6wH3+d/qEGXcQrGRle4ODr326yqo4muj/cQAT5c6RdaZV?=
 =?us-ascii?Q?Gjmg3m4G5U7UcGmilLwEYqHjnzZhDdOaRFk2kv0oiVk7pVbgJp0jFd1XlNhk?=
 =?us-ascii?Q?BYv8xIZ+4yIqwjGIqlTLYfsD68A9DnN8ciOEQe+qzfo5ySqDNLgyi7FbEXy5?=
 =?us-ascii?Q?ObP+OBGs50dWwhcIZekRtkpQUesJf1nKAR9DIvJ7xWZQ5a/uvHNwiYiMYGId?=
 =?us-ascii?Q?ABJq56p05yWP40/kErOi2jJ3Cy02RyGK6XyiztsJgOOnC48SvjnjKkt6ACUm?=
 =?us-ascii?Q?/m632IhAgfUmAJ97Qj2U+tQZks2ORH3hQ0NuApqor7AnY2uoIFAQhEkTOW0v?=
 =?us-ascii?Q?NeF6792x0lrXf8F19HE03Gc93SGGzUYLHCgDRppuXMN4phzTkeKbWHu+kxld?=
 =?us-ascii?Q?qiWnh9FDoUtA/iyFhBWa80O5Z0EX27oF9nbEKlIayZMBIm4l6ppJ2LDFw5qn?=
 =?us-ascii?Q?Nw/hSsiRnPq9KS/HbcrCsJ8LVMYSGnfutKdrfYm/b/XDYK/8I7qeJkQYnkRN?=
 =?us-ascii?Q?+yfwCXavIe51DNHZaBk+KJvbH4aStrFHIxqflZOJ9cIvxmlzx8FpdUtqogZR?=
 =?us-ascii?Q?VH9rndlUfZwJW3Z3b0XA811Q/R2Wn9/Y31k5Ae72i/pJiej5gTNUbQPgxjbF?=
 =?us-ascii?Q?yMQGjke1Ic14bZ6a1KWIIDPVsRCCpAwRSKg/gLLEY0Dsrt90aHAUkwL2Duzf?=
 =?us-ascii?Q?x5jv+FP/xoTfEacXz2bnlGweRL+0QDVx1bSvtGKRJkC8zgUMi6lmt45z5UOh?=
 =?us-ascii?Q?3tC1E3qJh0hO3FDgwER/+ElQWxKE3RcskHwVH6mNn7HDhJOHr0DK/PXmoV9U?=
 =?us-ascii?Q?h4rPKIxNRpEhx/FLj74DY4h1D8tAsU2pU1o9rrB+LBjyjTANzwO8oc71geEQ?=
 =?us-ascii?Q?7d158P9+k1u/ZLgOUIp+7g5VA5ZDeblJJQjusnRu6AuW/QOo5tJIQDMvekpg?=
 =?us-ascii?Q?nV4hMNZ1//GBIibFxVQiFnDJGrLY44Rn9ssJRzNUAlvb?=
X-MS-Exchange-CrossTenant-Network-Message-Id: d574cba3-752b-479f-15a9-08da5eb9256c
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB6311.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2022 19:04:11.9428
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 28TZi8/J19lY91xCI4Lj6xXYoD443ed7X49Zw2+W9gYWl7U2GtSpreTkXvrNcR57s8ZG/HpslMHttg9ED8mSQQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8PR11MB5736
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI,
        SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, Jul 04, 2022 at 05:23:22PM +0200, Fabio M. De Francesco wrote:
> 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 and
> booting a kernel with HIGHMEM64G enabled.
> 
> Cc: Filipe Manana <fdmanana@kernel.org>
> Suggested-by: Ira Weiny <ira.weiny@intel.com>
> Signed-off-by: Fabio M. De Francesco <fmdefrancesco@gmail.com>
> ---
>  fs/btrfs/zstd.c | 34 ++++++++++++++--------------------
>  1 file changed, 14 insertions(+), 20 deletions(-)
> 
> diff --git a/fs/btrfs/zstd.c b/fs/btrfs/zstd.c
> index 0fe31a6f6e68..78e0272e770e 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,15 +475,15 @@ 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);
> +			workspace->out_buf.dst = page_address(out_page);

Why is this needed?

The rest looks good,
Ira

[snip]