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;
From:   "Fabio M. De Francesco" <fmdefrancesco@gmail.com>
To:     Bob Peterson <rpeterso@redhat.com>,
        Andreas Gruenbacher <agruenba@redhat.com>,
        cluster-devel@redhat.com, linux-kernel@vger.kernel.org,
        Deepak R Varma <drv@mailo.com>
Cc:     Ira Weiny <ira.weiny@intel.com>,
        Sumitra Sharma <sumitraartsy@gmail.com>,
        Deepak R Varma <drv@mailo.com>
Subject: Re: [PATCH v2] gfs2: Replace deprecated kmap_atomic() by kmap_local_page()
Date:   Tue, 27 Jun 2023 13:41:59 +0200
Message-ID: <14943541.tv2OnDr8pf@suse>
In-Reply-To: <ZJk1XTtgLFxIcxzp@bu2204.myguest.virtualbox.org>
References: <ZJk1XTtgLFxIcxzp@bu2204.myguest.virtualbox.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="iso-8859-1"
Precedence: bulk

On luned=EC 26 giugno 2023 08:51:09 CEST Deepak R Varma wrote:
> kmap_atomic() is deprecated in favor of kmap_local_{folio,page}().
>=20
> Therefore, replace kmap_atomic() with kmap_local_page() in
> gfs2_internal_read() and stuffed_readpage().
>=20
> kmap_atomic() disables page-faults and preemption (the latter only for
> !PREEMPT_RT kernels), However, the code within the mapping/un-mapping in
> gfs2_internal_read() and stuffed_readpage() does not depend on the
> above-mentioned side effects.
>=20
> Therefore, a mere replacement of the old API with the new one is all that
> is required (i.e., there is no need to explicitly add any calls to
> pagefault_disable() and/or preempt_disable()).
>=20
> Signed-off-by: Deepak R Varma <drv@mailo.com>
> ---
> Note: The Patch is build tested only. I will be happy to run recommended
> testing with some guidance if required.
>=20
> Changes in v2:
>    - Update patch description to correct the replacement function name fr=
om
>      kmap_local_folio to kmap_local _page

Ah, well done. I didn't note this with the comment on v1.
=20
>  fs/gfs2/aops.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>=20
> diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c
> index 3b41542d6697..7bd92054d353 100644
> --- a/fs/gfs2/aops.c
> +++ b/fs/gfs2/aops.c
> @@ -432,10 +432,10 @@ static int stuffed_readpage(struct gfs2_inode *ip,
> struct page *page) if (error)
>  		return error;
>=20
> -	kaddr =3D kmap_atomic(page);
> +	kaddr =3D kmap_local_page(page);
>  	memcpy(kaddr, dibh->b_data + sizeof(struct gfs2_dinode), dsize);
>  	memset(kaddr + dsize, 0, PAGE_SIZE - dsize);
> -	kunmap_atomic(kaddr);
> +	kunmap_local(kaddr);
>  	flush_dcache_page(page);
>  	brelse(dibh);
>  	SetPageUptodate(page);
> @@ -498,12 +498,12 @@ int gfs2_internal_read(struct gfs2_inode *ip, char=
=20
*buf,
> loff_t *pos, continue;
>  			return PTR_ERR(page);
>  		}
> -		p =3D kmap_atomic(page);
> +		p =3D kmap_local_page(page);
>  		amt =3D size - copied;
>  		if (offset + size > PAGE_SIZE)
>  			amt =3D PAGE_SIZE - offset;
>  		memcpy(buf + copied, p + offset, amt);

As said in the comment on v1, the memcpy_from_page() helper is better suite=
d=20
here, unless you noted something that prevents its use and that I'm not abl=
e=20
to see at the moment.

Thanks,

=46abio

> -		kunmap_atomic(p);
> +		kunmap_local(p);
>  		put_page(page);
>  		copied +=3D amt;
>  		index++;
> --
> 2.34.1