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 08:46:03 -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>, Qu Wenruo <wqu@suse.com>,
        Filipe Manana <fdmanana@suse.com>,
        Gabriel Niebler <gniebler@suse.com>,
        <linux-btrfs@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        David Sterba <dsterba@suse.cz>
Subject: Re: [PATCH] btrfs: Replace kmap_atomic() with kmap_local_page()
Message-ID: <Yr3FO7IZT79QEh6s@iweiny-desk3>
References: <20220627174849.29962-1-fmdefrancesco@gmail.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20220627174849.29962-1-fmdefrancesco@gmail.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?1DBUKj7ud3c3gNgt9y2AeNcU1tg2CHog1Lv1Mw1b/5Sqcuh2QZQZb0kcLkG2?=
 =?us-ascii?Q?woy2pogXyr5C42F+CAg6UlB/xQvv8NLwZ6lcgvh/rbz/HXepZBbXOf7OGqbE?=
 =?us-ascii?Q?Hjb5RI03VELKII5SRzKtjDOXMlQ+xn3lW++qjzuOirCdl5PA5lSsf3KqY6To?=
 =?us-ascii?Q?aEPtSlC/TrlKAer/xYoO0gJT9MGsOVYnfgw6bCcfU0K4Lou0GtmJwQ7gk7iT?=
 =?us-ascii?Q?aV5YapHIwLAULRhpaBmi2GbkXNlY4ltuUM+ZqaV6uXFdKzoNB+FBibMUyjna?=
 =?us-ascii?Q?HB86sncoEZDdp0CRkaRbT6spoQW6rWbYsnasHFxNNZDGjkV5Af0YDcA4ykht?=
 =?us-ascii?Q?kz8SFg1odeGURXGOZ4Kfapb/b+RQbMznu8f70xumEUzjxtlh8CBRUr14UdZp?=
 =?us-ascii?Q?+z5lT5AmlmOrqp2EmSMCzMAqZgwbsx5yImdxeLqObumtQTUVup53oBAcWgTz?=
 =?us-ascii?Q?rqUZ+26olrQ+bqHnWP18gxRDWuzyACFVJ9x3cCP5wiO64P8JrVWMmd0ZqA4w?=
 =?us-ascii?Q?iuCgskFStEhUoEtKOla4FueJ0J2khkYwDcvpdjNFCMjDI+uc0Rcb4cV2xX03?=
 =?us-ascii?Q?eXsfGQGKgJEUPQGAmdov2/QxRhtxlz6f1i08zxWvzVuxqk1sA+L+sVZacyht?=
 =?us-ascii?Q?m23whb01pcsQnqWJ3ZuVZqxmWTBbk1IR2ZmP39NXwP2tgFaxlCvejCBKAska?=
 =?us-ascii?Q?NARIIu535VELiAW9BMZKVOcXVz8xnQAkj2tIgLyzjBb1nHzaQbyeV5zNtskw?=
 =?us-ascii?Q?PsTA4Gzql0cysPBYYxGh7mbAxhGJwgerD7KT5nPXqBKoX93XWHz/k3ePfrDI?=
 =?us-ascii?Q?aiyOCGR/7YWixVEULqQiWG2vAinI1wwGuOY+lVe2SnsddR8Nkn61e/FWOshK?=
 =?us-ascii?Q?FT8NOfu7ZhXGoXkMhNsML07A6J4qW1wsi+aMZki3X86sUZVw/4GooDTYiYYk?=
 =?us-ascii?Q?VmKKBq2iK5rI0Poq1ESiyGo4b1KDM5NfE6oCBo29RwaBtThPotuoUPvwUMhU?=
 =?us-ascii?Q?Q2huiGxeV1dIHFsgLreohU/h2phJ9aheiCyj9edoeS80ycdJAdBPlzUYQk89?=
 =?us-ascii?Q?kLYepDaoRx74yuXPEznpg1+XOdrkkBM3HW88T7KwRuYdmrKcYE1qaKQFb72x?=
 =?us-ascii?Q?PgGEjZgmVqfy+SqHZhnxThSJ1FJUR5tC1OAOuFNGURSSETi2f699P+JTrD/O?=
 =?us-ascii?Q?Oz2PjtFEiFlQYV3FtkgAV3a+g+yk2aSv9jHD9Z02Vs4Jk3zjcn7RE8FD9K7w?=
 =?us-ascii?Q?xeMZYoSW7g8BgoXjFvicAyhmWHfd7YFJjv4RmbmgMt26CEFyOK2TuSaCZG0P?=
 =?us-ascii?Q?mNX/X7tegDWLvkp6u+Wy+1oNgn3nXHzLdrXT2WoZ7hwaDoLcvUSXkSu4rQEY?=
 =?us-ascii?Q?U6T/BgM+KB9JYVVLWVi/Vcw6qe7VkAIDOQUICPWQjlSkRUNqERY1zJmUBjMa?=
 =?us-ascii?Q?xlpNNN3Gi7/re3ktlhfw7nQ/UB874wpoJSPHXRI1jXWDZ56Tm1b+tmX9jfCj?=
 =?us-ascii?Q?BOWJ9GDK5CFXqhds9cF8dsVP/OEzPw2C3Fda46kNqsG2v0eWJ3FXUVxBcZgY?=
 =?us-ascii?Q?vfewMVDj8xDSR5OCmGspxs2qvCzQEzE6ztwFvgdUSE16pzo8yIPoYnQhVP+1?=
 =?us-ascii?Q?9shTET+4T3IgaIhKgBnXfRFve5GXAKtQAFGUVlQMVM8r?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 787d6763-57f5-4bac-801c-08da5aafa788
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB6311.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2022 15:46:10.4269
 (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: PDkQSNTJru1D/yxO2iHn8iKuZlesJkGzwlzUgT0bkIPfUEzTqBOc0rDEY5gRcu3FQ5f/D9JudK7qVLfbMg9TbQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB2778
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_PASS,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, Jun 27, 2022 at 07:48:49PM +0200, Fabio M. De Francesco wrote:
> kmap_atomic() is being deprecated in favor of kmap_local_page() where it
> is feasible. With kmap_local_page() mappings are per thread, CPU local,
> and not globally visible.
> 
> As far as I can see, the kmap_atomic() calls in compression.c and in
> inode.c can be safely converted.
> 
> Above all else, David Sterba has confirmed that "The context in
> check_compressed_csum is atomic [...]" and that "kmap_atomic() in inode.c
> [...] also can be replaced by kmap_local_page().".[1]
> 
> Therefore, convert all kmap_atomic() calls currently still left in fs/btrfs
> to kmap_local_page().
> 
> Tested with xfstests on a QEMU + KVM 32-bits VM with 4GB RAM and booting a
> kernel with HIGHMEM64GB enabled.
> 
> [1] https://lore.kernel.org/linux-btrfs/20220601132545.GM20
> 633@twin.jikos.cz/
> 
> Suggested-by: Ira Weiny <ira.weiny@intel.com>

Test failures aside this looks ok to me.

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

> Suggested-by: David Sterba <dsterba@suse.cz>
> Signed-off-by: Fabio M. De Francesco <fmdefrancesco@gmail.com>
> ---
> 
> Tests of groups "quick" and "compress" output several errors largely due
> to memory leaks and shift-out-of-bounds. However, these errors are exactly
> the same which are output without this and other conversions of mine to use
> kmap_local_page(). Therefore, it looks like these changes don't introduce
> regressions.
> 
> The previous RFC PATCH can be ignored:
> https://lore.kernel.org/lkml/20220624084215.7287-1-fmdefrancesco@gmail.com/
> 
> With this patch, in fs/btrfs there are no longer call sites of kmap() and
> kmap_atomic().
> 
>  fs/btrfs/compression.c |  4 ++--
>  fs/btrfs/inode.c       | 12 ++++++------
>  2 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
> index f4564f32f6d9..b49719ae45b4 100644
> --- a/fs/btrfs/compression.c
> +++ b/fs/btrfs/compression.c
> @@ -175,10 +175,10 @@ static int check_compressed_csum(struct btrfs_inode *inode, struct bio *bio,
>  		/* Hash through the page sector by sector */
>  		for (pg_offset = 0; pg_offset < bytes_left;
>  		     pg_offset += sectorsize) {
> -			kaddr = kmap_atomic(page);
> +			kaddr = kmap_local_page(page);
>  			crypto_shash_digest(shash, kaddr + pg_offset,
>  					    sectorsize, csum);
> -			kunmap_atomic(kaddr);
> +			kunmap_local(kaddr);
>  
>  			if (memcmp(&csum, cb_sum, csum_size) != 0) {
>  				btrfs_print_data_csum_error(inode, disk_start,
> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
> index e921d6c432ac..0a7a621710f6 100644
> --- a/fs/btrfs/inode.c
> +++ b/fs/btrfs/inode.c
> @@ -332,9 +332,9 @@ static int insert_inline_extent(struct btrfs_trans_handle *trans,
>  			cur_size = min_t(unsigned long, compressed_size,
>  				       PAGE_SIZE);
>  
> -			kaddr = kmap_atomic(cpage);
> +			kaddr = kmap_local_page(cpage);
>  			write_extent_buffer(leaf, kaddr, ptr, cur_size);
> -			kunmap_atomic(kaddr);
> +			kunmap_local(kaddr);
>  
>  			i++;
>  			ptr += cur_size;
> @@ -345,9 +345,9 @@ static int insert_inline_extent(struct btrfs_trans_handle *trans,
>  	} else {
>  		page = find_get_page(inode->vfs_inode.i_mapping, 0);
>  		btrfs_set_file_extent_compression(leaf, ei, 0);
> -		kaddr = kmap_atomic(page);
> +		kaddr = kmap_local_page(page);
>  		write_extent_buffer(leaf, kaddr, ptr, size);
> -		kunmap_atomic(kaddr);
> +		kunmap_local(kaddr);
>  		put_page(page);
>  	}
>  	btrfs_mark_buffer_dirty(leaf);
> @@ -3357,11 +3357,11 @@ static int check_data_csum(struct inode *inode, struct btrfs_bio *bbio,
>  	offset_sectors = bio_offset >> fs_info->sectorsize_bits;
>  	csum_expected = ((u8 *)bbio->csum) + offset_sectors * csum_size;
>  
> -	kaddr = kmap_atomic(page);
> +	kaddr = kmap_local_page(page);
>  	shash->tfm = fs_info->csum_shash;
>  
>  	crypto_shash_digest(shash, kaddr + pgoff, len, csum);
> -	kunmap_atomic(kaddr);
> +	kunmap_local(kaddr);
>  
>  	if (memcmp(csum, csum_expected, csum_size))
>  		goto zeroit;
> -- 
> 2.36.1
>