Received-SPF: pass (google.com: domain of linux-kernel+bounces-5890-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Precedence: bulk
MIME-Version: 1.0
References: <19e305896a2357d305f955fa14cc379e40e512bd.1702977429.git.chen.haonan2@zte.com.cn>
In-Reply-To: <19e305896a2357d305f955fa14cc379e40e512bd.1702977429.git.chen.haonan2@zte.com.cn>
From: "Rafael J. Wysocki" <rafael@kernel.org>
Date: Tue, 19 Dec 2023 20:57:01 +0100
Message-ID: <CAJZ5v0g3mkga3++RR-z4uHk2wAt6DYAi+h0rPAu4PurTugdkuQ@mail.gmail.com>
Subject: Re: [PATCH linux-next v2] kernel/power: Use kmap_local_page() in snapshot.c
To: chenguanxi11234@163.com
Cc: rafael@kernel.org, len.brown@intel.com, pavel@ucw.cz, 
	linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, 
	Chen Haonan <chen.haonan2@zte.com.cn>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Tue, Dec 19, 2023 at 2:19=E2=80=AFPM <chenguanxi11234@163.com> wrote:
>
> From: Chen Haonan <chen.haonan2@zte.com.cn>
>
> kmap_atomic() has been deprecated in favor of kmap_local_page().
>
> kmap_atomic() disables page-faults and preemption (the latter
> only for !PREEMPT_RT kernels).The code between the mapping and
> un-mapping in this patch does not depend on the above-mentioned
> side effects.So simply replaced kmap_atomic() with kmap_local_page().
>
> Signed-off-by: Chen Haonan <chen.haonan2@zte.com.cn>
> ---
>  kernel/power/snapshot.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
> index e3e8f1c6e75f..5c96ff067c64 100644
> --- a/kernel/power/snapshot.c
> +++ b/kernel/power/snapshot.c
> @@ -1487,11 +1487,11 @@ static bool copy_data_page(unsigned long dst_pfn,=
 unsigned long src_pfn)
>         s_page =3D pfn_to_page(src_pfn);
>         d_page =3D pfn_to_page(dst_pfn);
>         if (PageHighMem(s_page)) {
> -               src =3D kmap_atomic(s_page);
> -               dst =3D kmap_atomic(d_page);
> +               src =3D kmap_local_page(s_page);
> +               dst =3D kmap_local_page(d_page);
>                 zeros_only =3D do_copy_page(dst, src);
> -               kunmap_atomic(dst);
> -               kunmap_atomic(src);
> +               kunmap_local(dst);
> +               kunmap_local(src);
>         } else {
>                 if (PageHighMem(d_page)) {
>                         /*
> @@ -1499,9 +1499,9 @@ static bool copy_data_page(unsigned long dst_pfn, u=
nsigned long src_pfn)
>                          * data modified by kmap_atomic()
>                          */
>                         zeros_only =3D safe_copy_page(buffer, s_page);
> -                       dst =3D kmap_atomic(d_page);
> +                       dst =3D kmap_local_page(d_page);
>                         copy_page(dst, buffer);
> -                       kunmap_atomic(dst);
> +                       kunmap_local(dst);
>                 } else {
>                         zeros_only =3D safe_copy_page(page_address(d_page=
), s_page);
>                 }
> --

Applied (under edited subject) as 6.8 material, thanks!