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:   Thu, 30 Jun 2022 15:21:00 -0700
From:   Ira Weiny <ira.weiny@intel.com>
To:     "Fabio M. De Francesco" <fmdefrancesco@gmail.com>
CC:     Chris Mason <clm@fb.com>, Josef Bacik <josef@toxicpanda.com>,
        David Sterba <dsterba@suse.com>,
        Nick Terrell <terrelln@fb.com>,
        Chris Down <chris@chrisdown.name>,
        Filipe Manana <fdmanana@suse.com>, Qu Wenruo <wqu@suse.com>,
        Nikolay Borisov <nborisov@suse.com>,
        Gabriel Niebler <gniebler@suse.com>,
        <linux-btrfs@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] btrfs: Convert zlib_decompress_bio() to use
 kmap_local_page()
Message-ID: <Yr4hzN+BTeIQ6ruI@iweiny-desk3>
References: <20220618091901.25034-1-fmdefrancesco@gmail.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20220618091901.25034-1-fmdefrancesco@gmail.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?c+VxntQCToMmK46WS2eX6XtGbTHNsgNonWEe9Y166tgB7R3bz/20zfUm92IJ?=
 =?us-ascii?Q?8/Nb+agbxxXjxBOZkWJtuXj5/kP40QbkyZN94uVmFZ7JgijyHSMfrHTWEQnM?=
 =?us-ascii?Q?A+1V0/9Mf7cabnp+otgj3Q42rUWR2AmVVtJubPzFeanEqrlWWlRmCZAWZdC5?=
 =?us-ascii?Q?CJTQiZGNxJUA/FtCrY4dSm0LAaegBPg2joeRk0K6irqegHAKmXou3s+WaClL?=
 =?us-ascii?Q?bAs28WpoOSbStgOS4n0dKIeCqPHvU59xrylIdQJ+5q5LqegzfkK30ILD4UNc?=
 =?us-ascii?Q?jYNHKqlyChzXipQr5HsrqQRzDxvCuGifTvNK22+PXVCFRHGreh418uT0fPY2?=
 =?us-ascii?Q?fcC1QoUGTJuR40PKqTQzg8H2caL1gSfVY7T+y5xW3OnRgQVoWGpB2kWr7L52?=
 =?us-ascii?Q?0tGPJcYH+IjMTjywm+Jdbc/mYcoXB1n38AedJhtpXrjh0wexg6kmjCCJSbtg?=
 =?us-ascii?Q?o5Y4smTM1DhGXM0bZqc5eQ3xwKv6JTHdeTAJICoZ9m0pIlB2tR3uv0o8/81r?=
 =?us-ascii?Q?+SvFHvNoUTIUEro5RlygqOP4QARhBiJaMtkJ32TyML1QLtFqWB8yJwCjVIg2?=
 =?us-ascii?Q?JP0PE+PISqHusuBJanVnn8V87+1PgJV5idUIDmQ7P/G6xnE/5sP+R0rS6+dN?=
 =?us-ascii?Q?aNJ++ItwX63eBwL17S5k36hdtVjvY6610w8brOpHzpgsjic6iGccDRrEzLIQ?=
 =?us-ascii?Q?to7b4igI5aBiH3SgM2DLA7gyp9AZojL1kQkRVtJ0kcEAse1HvRx0LJTa4JI5?=
 =?us-ascii?Q?/66D825NEVZY5rk3cRwERMkcs9Wo7KLu+PynnL/XcmDk0BmQJ0/Z9p8QaXNG?=
 =?us-ascii?Q?s6iXO4MFojhX1sHX+jPRSBHFuEsKa63wa9u+OIKebh3lDP6gOEOHP76jxA42?=
 =?us-ascii?Q?ZdQL3Vabmg5ij2PLRNcX60FI1UzSHyEZg1pO31dhc1ZRYu0hSBuX+A1lQZT5?=
 =?us-ascii?Q?9LrfrELDFFenPMGMLD1AX8DMblvFvIZE/aO4Cmb6vDPgWGHUyXmJkRntbEjT?=
 =?us-ascii?Q?U+N2K8NgXTHdiD6oZmTbePRQf+i5kNFQevPyxpgTIpyBFR6uBvgvTtJ4ZhU0?=
 =?us-ascii?Q?VMg/HCtk/xTkW8pTtDRG6vzxmzRnywFlll9Fmn6Mbi5fJq24ozdZuRH7vuGO?=
 =?us-ascii?Q?0uveA5ca8j1atvk6DL6tAwnx5jdhFnijCCv6i5x3chS7qeA5Nn7vqtGVMqyW?=
 =?us-ascii?Q?zjb5g7TyDlLhlJF4+/WYmKLDXBmiq5LaEDIw8khNB7uBuu6JIFXoQPygsXxr?=
 =?us-ascii?Q?G0m/HfLtrflKLom84Ov27ln+65msckB064H6TgI7h2bZhA3e5yK6WJwWT0Ry?=
 =?us-ascii?Q?eqizJhGAICqf6TDKZdI0Vo+tWBejpJDUeuwra61wJvEU+xCl3oJzSqftbf5z?=
 =?us-ascii?Q?W7W80blvtAfNTS6gQuuFi7/bIzVuGoBEJL3RM3WsbLb2Re7QQfUGdObbpiKd?=
 =?us-ascii?Q?UCU4gcNizsKexshgJGEiuK8/SFqFYGfKH8ezk2ghAe5wJNRW3+ND8NB24yjO?=
 =?us-ascii?Q?6Tz4hzKKA9DvOJX9yzivOcp8C/OBOvKZiNJA3D/2gD9jncZhRaUmOSpf9J+A?=
 =?us-ascii?Q?3ZCs1lUwvReyqRei39ti+Ru7zKuwmxAzhhn12vis6MLR3nS3CWrss+OX1SXW?=
 =?us-ascii?Q?8tsPk6wsfdbfWTcdIKdreXkhWMr+EAxrPLd0MxdKZihk?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 2d9f6029-19d4-4fe6-0319-08da5ae6d45f
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB6311.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2022 22:21:07.9883
 (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: jztU6jiWefZkjlXIeksbBIRqlbRBkX9+9rwtgMALldft+F7S7/opTDHkXLHHrg3KKAsU8PdvFuUFSHjuYzz0Sg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB5143
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        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 Sat, Jun 18, 2022 at 11:19:01AM +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 zlib_decompress_bio()
> because in this function the mappings are per thread and are not visible
> in other contexts.
> 
> Tested with xfstests on QEMU + KVM 32-bits VM with 4GB of RAM and
> HIGHMEM64G enabled. This patch passes 26/26 tests of group "compress".
> 
> Suggested-by: Ira Weiny <ira.weiny@intel.com>

Reviewed-by: Ira Weiny <ira.weiny@intel.com>

> Reviewed-by: Qu Wenruo <wqu@suse.com>
> Signed-off-by: Fabio M. De Francesco <fmdefrancesco@gmail.com>
> ---
>  fs/btrfs/zlib.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/fs/btrfs/zlib.c b/fs/btrfs/zlib.c
> index 2cd4f6fb1537..966e17cea981 100644
> --- a/fs/btrfs/zlib.c
> +++ b/fs/btrfs/zlib.c
> @@ -284,7 +284,7 @@ int zlib_decompress_bio(struct list_head *ws, struct compressed_bio *cb)
>  	unsigned long buf_start;
>  	struct page **pages_in = cb->compressed_pages;
>  
> -	data_in = kmap(pages_in[page_in_index]);
> +	data_in = kmap_local_page(pages_in[page_in_index]);
>  	workspace->strm.next_in = data_in;
>  	workspace->strm.avail_in = min_t(size_t, srclen, PAGE_SIZE);
>  	workspace->strm.total_in = 0;
> @@ -306,7 +306,7 @@ int zlib_decompress_bio(struct list_head *ws, struct compressed_bio *cb)
>  
>  	if (Z_OK != zlib_inflateInit2(&workspace->strm, wbits)) {
>  		pr_warn("BTRFS: inflateInit failed\n");
> -		kunmap(pages_in[page_in_index]);
> +		kunmap_local(data_in);
>  		return -EIO;
>  	}
>  	while (workspace->strm.total_in < srclen) {
> @@ -333,13 +333,13 @@ int zlib_decompress_bio(struct list_head *ws, struct compressed_bio *cb)
>  
>  		if (workspace->strm.avail_in == 0) {
>  			unsigned long tmp;
> -			kunmap(pages_in[page_in_index]);
> +			kunmap_local(data_in);
>  			page_in_index++;
>  			if (page_in_index >= total_pages_in) {
>  				data_in = NULL;
>  				break;
>  			}
> -			data_in = kmap(pages_in[page_in_index]);
> +			data_in = kmap_local_page(pages_in[page_in_index]);
>  			workspace->strm.next_in = data_in;
>  			tmp = srclen - workspace->strm.total_in;
>  			workspace->strm.avail_in = min(tmp, PAGE_SIZE);
> @@ -352,7 +352,7 @@ int zlib_decompress_bio(struct list_head *ws, struct compressed_bio *cb)
>  done:
>  	zlib_inflateEnd(&workspace->strm);
>  	if (data_in)
> -		kunmap(pages_in[page_in_index]);
> +		kunmap_local(data_in);
>  	if (!ret)
>  		zero_fill_bio(cb->orig_bio);
>  	return ret;
> -- 
> 2.36.1
>