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, 14 Jun 2022 07:13:49 -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: [RFC PATCH] btrfs: Replace kmap() with kmap_local_page() in
 zlib.c
Message-ID: <YqiXnc2YyCkE2huj@iweiny-desk3>
References: <20220614104718.9193-1-fmdefrancesco@gmail.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20220614104718.9193-1-fmdefrancesco@gmail.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Qj9y+I8majgxTFX8AVByMkB2FZIdvCtxDcne5dfj9sn4wwdw7p/AMYCZkwMC?=
 =?us-ascii?Q?HCndyp41ryXJ/HrkH4TPwKyrK7ea15UBuYH+bxzxmWdYPexrkUuWHJr2ItqI?=
 =?us-ascii?Q?L49QaxwKu5ZZmo5nXLnDpbUbznqCR8j+yT6vJL3g6BNI9GPaeQZ7JDmMbv91?=
 =?us-ascii?Q?H7u2jcIyVpnbsHyh3bxUhBkuhks7fyJUkoes/LWR3MSDJsWIeCkXr/sTmFV+?=
 =?us-ascii?Q?/Pj9kWx+Dmf6B8sbUjYOC97maWq+5eRcjcb6PlwYWCy7Qe4iOe/pxZZ1K7c/?=
 =?us-ascii?Q?kvBDfV6j/48Ky9Tj70dZd7ZPyUUbhudeldh6mJE/FNHpmxmMNeHBvh40KgI1?=
 =?us-ascii?Q?PvYILlNCxYp4VvprFMx1liY8Tb0W3v5sdfyGzRBao1iZ8GGSRdWQ3xYalj9B?=
 =?us-ascii?Q?CorrQ2CNZpF3KWenbijZyORn9SruZ5Sh8QqVSGBQwrFI+/sxa0C4qk8zssJ9?=
 =?us-ascii?Q?vOSDG5sMsZvSABZLO4G9CIZz4agWt8QPcLAXSQQcrgekmQEVOBMg2FbFLWIm?=
 =?us-ascii?Q?yIf1empUbEtIHAuZZSex3t/W0Ets2eXaN9zZj5y/TMDr/iLFem1mfABZT4Sm?=
 =?us-ascii?Q?JpUxxiT9Yf0euerKNabqZBBqljMR9Ps2jfPtfVo4ii1eyyp/uhiCSc9Yt+K3?=
 =?us-ascii?Q?ggjvSvuUd9TjKCn72QAEYFWBrDL8c5OOhCzFaqITZ5D7yagoaylpx7K8rAk4?=
 =?us-ascii?Q?/S2WmPDa18bUwg5T5dS4URo6JxWwgWT6dCrFT6e/HFP0wzHVgo4bea7Ul3lK?=
 =?us-ascii?Q?wR4617B6D6Usp+O17JxNQ6i4CMAtUBpMUL2F+TJ738yHudK6OllFUmR5YLBa?=
 =?us-ascii?Q?thhOomz3onMLrkGCobhqrQptiZOijaO5bwsgTW4NGvaL7Q+vccIxgutvhMvs?=
 =?us-ascii?Q?Dg09/mWbLqZC7IPTKgiF6V+jWL/gbyvIIfGXfpK7kUrerOR7eno3ZjG/Juoi?=
 =?us-ascii?Q?yCUoLYIX20sUYqXbINVwM/8D27CGkdEHl2oUttZFWVxn/L0l61NM1/vsTuf/?=
 =?us-ascii?Q?t+cE4pNROtbY+H29dhNi5fNC5wItiJB3GbkfaMtmxR77xHku0Au+b3eV5d+w?=
 =?us-ascii?Q?wspdywnyM3eLNoRXXqk/pbPBewOIzmen6raE12EMVidE5i1nxw4KF+i+4xXH?=
 =?us-ascii?Q?wiYwIjj8fPyGR8Bv8xSHqtV3yXXgvl2Tusibw8bOhOTgql688QIlYxIHfDnV?=
 =?us-ascii?Q?9CBRm8NcjWOWrwH871uV6kEv/JWeJYWyymWi1k3G3gF7TGgTmu7tPMpMprAx?=
 =?us-ascii?Q?nuUSJJx2UQ42FjaNnFR1XAuOhYeVSGdX7W5Envued9J/cWzLtrj0Km6kwViL?=
 =?us-ascii?Q?mebHxPFsd5OCLk6tNob9QZEwnxqfNskqipyDRWOu/HEuG1ePY54fo24nrHR7?=
 =?us-ascii?Q?eiQOwAQ9RQQPqdrneScNvndvOoqJ7WgKtNUxx3xnau7KQcP19UpotsNJWIqz?=
 =?us-ascii?Q?6ykgA7by0Ds5Ntyo01Tilr51EIoUM+ijE65Yhs9mBUZsXqOoWdWyAeMP43Ss?=
 =?us-ascii?Q?CbiuFzENFYf9cz1yviw5EyoCCEnSE9xOUSzwinNOT2lpzGmQU90U+HuP81Q2?=
 =?us-ascii?Q?uBnlF1PlqAuZUYxoTFNdr1250W4bq0xfGEN5loWMOxwImK4PsK0kxriMYMVc?=
 =?us-ascii?Q?0OGPeoGSCILd6phd5kksF0W7HmEUYgqCp6IM3TnzMv7Aw0PvnFnqNyXiCY8V?=
 =?us-ascii?Q?2vVG25JMMR7JQSp19RG3GjPKUDOD5Bs+JEj+QQFQQl+/wvP9sTn/yNL4YICW?=
 =?us-ascii?Q?cJvsFOKNg24tv+rspPph0XXjgMADGr8=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: a4a7b797-3ed8-4b46-06e8-08da4e101cfe
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB6311.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2022 14:13:54.0918
 (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: kNRzKLdKMhIX3d6eZ+Krd2pmJfSaJFHD1EEs/ghrlokPXKRrGcR1h5ZR8geFP1OY09bHQx6Mk6oLfsiOA+tJGQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR11MB4988
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-5.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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 Tue, Jun 14, 2022 at 12:47:18PM +0200, Fabio M. De Francesco wrote:

[snip]

> @@ -148,26 +148,26 @@ int zlib_compress_pages(struct list_head *ws, struct address_space *mapping,
>  				int i;
>  
>  				for (i = 0; i < in_buf_pages; i++) {
> -					if (in_page) {
> -						kunmap(in_page);
> +					if (data_in) {
> +						kunmap_local(data_in);
>  						put_page(in_page);
>  					}
>  					in_page = find_get_page(mapping,
>  								start >> PAGE_SHIFT);
> -					data_in = kmap(in_page);
> +					data_in = kmap_local_page(in_page);
>  					memcpy(workspace->buf + i * PAGE_SIZE,
>  					       data_in, PAGE_SIZE);
>  					start += PAGE_SIZE;

This is moving start forward...

>  				}
>  				workspace->strm.next_in = workspace->buf;
>  			} else {
> -				if (in_page) {
> -					kunmap(in_page);
> +				if (data_in) {
> +					kunmap_local(data_in);
>  					put_page(in_page);
>  				}
>  				in_page = find_get_page(mapping,
>  							start >> PAGE_SHIFT);
> -				data_in = kmap(in_page);
> +				data_in = kmap_local_page(in_page);
>  				start += PAGE_SIZE;
>  				workspace->strm.next_in = data_in;
>  			}
> @@ -196,9 +196,14 @@ int zlib_compress_pages(struct list_head *ws, struct address_space *mapping,
>  		 * the stream end if required
>  		 */
>  		if (workspace->strm.avail_out == 0) {
> -			kunmap(out_page);
> +			kunmap_local(data_in);
> +			data_in = NULL;
> +			put_page(in_page);

I don't think you need to put/get the page to do the remapping.

> +
> +			kunmap_local(cpage_out);
>  			if (nr_pages == nr_dest_pages) {
> -				out_page = NULL;
> +				cpage_out = NULL;
> +				put_page(out_page);
>  				ret = -E2BIG;
>  				goto out;
>  			}
> @@ -207,7 +212,14 @@ int zlib_compress_pages(struct list_head *ws, struct address_space *mapping,
>  				ret = -ENOMEM;
>  				goto out;
>  			}
> -			cpage_out = kmap(out_page);
> +			cpage_out = kmap_local_page(out_page);
> +
> +			in_page = find_get_page(mapping, start >> PAGE_SHIFT);

I think start is the wrong value here.  It got incremented above.

> +			data_in = kmap_local_page(in_page);
> +			workspace->strm.next_in = data_in;
> +			workspace->strm.avail_in = min(bytes_left,
> +						       (unsigned long)workspace->buf_size);

I'm not sure about changing avail_in here either because nothing has happened
with the in buffer whilst doing this re-mapping AFAICS.

[snip]

I think the issue with the tests is contained to zlib_compress_pages().
But an idea to verify that is to split this patch between the changes in
zlib_compress_pages() [above] and zlib_decompress_bio() [below] because below
looks very straight forward.

Ira

> @@ -287,7 +311,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;
> @@ -309,7 +333,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) {
> @@ -336,13 +360,14 @@ 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);
> @@ -355,7 +380,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
>