Received-SPF: pass (google.com: domain of linux-kernel+bounces-31650-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Sat, 20 Jan 2024 11:44:12 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Paolo Bonzini <pbonzini@redhat.com>, Randy Dunlap
 <rdunlap@infradead.org>, Huacai Chen <chenhuacai@loongson.cn>, Huacai Chen
 <chenhuacai@kernel.org>, Tianrui Zhao <zhaotianrui@loongson.cn>, Bibo Mao
 <maobibo@loongson.cn>, kvm@vger.kernel.org, loongarch@lists.linux.dev,
 linux-kernel@vger.kernel.org, Xuerui Wang <kernel@xen0n.name>, Jiaxun Yang
 <jiaxun.yang@flygoat.com>
Subject: Re: [PATCH] LoongArch: KVM: Fix build due to API changes
Message-ID: <20240120114412.2208a8c1@canb.auug.org.au>
In-Reply-To: <20231220144024.7d9fd46b@canb.auug.org.au>
References: <20231115090735.2404866-1-chenhuacai@loongson.cn>
	<15ba5868-42de-4563-9903-ccd0297e2075@infradead.org>
	<20231220144024.7d9fd46b@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Uo2ujjpjD/I=Dix6LsNA.i+";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/Uo2ujjpjD/I=Dix6LsNA.i+
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Wed, 20 Dec 2023 14:40:24 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> On Fri, 15 Dec 2023 21:08:06 -0800 Randy Dunlap <rdunlap@infradead.org> w=
rote:
> >
> > Someone please merge this patch... =20
>=20
> I have applied it to my merge of the kvm tree today and will keep
> applying it until it is applied to the kvm tree ...
>=20
> It looks like this:
>=20
> From: Huacai Chen <chenhuacai@loongson.cn>
> To: Paolo Bonzini <pbonzini@redhat.com>,
> 	Huacai Chen <chenhuacai@kernel.org>,
> 	Tianrui Zhao <zhaotianrui@loongson.cn>,
> 	Bibo Mao <maobibo@loongson.cn>
> Cc: kvm@vger.kernel.org,
> 	loongarch@lists.linux.dev,
> 	linux-kernel@vger.kernel.org,
> 	Xuerui Wang <kernel@xen0n.name>,
> 	Jiaxun Yang <jiaxun.yang@flygoat.com>,
> 	Huacai Chen <chenhuacai@loongson.cn>
> Subject: [PATCH] LoongArch: KVM: Fix build due to API changes
> Date: Wed, 15 Nov 2023 17:07:35 +0800
>=20
> Commit 8569992d64b8f750e34b7858eac ("KVM: Use gfn instead of hva for
> mmu_notifier_retry") replaces mmu_invalidate_retry_hva() usage with
> mmu_invalidate_retry_gfn() for X86, LoongArch also need similar changes
> to fix build.
>=20
> Fixes: 8569992d64b8 ("KVM: Use gfn instead of hva for mmu_notifier_retry")
> Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Tested-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
> Acked-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  arch/loongarch/kvm/mmu.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>=20
> diff --git a/arch/loongarch/kvm/mmu.c b/arch/loongarch/kvm/mmu.c
> index 80480df5f550..9463ebecd39b 100644
> --- a/arch/loongarch/kvm/mmu.c
> +++ b/arch/loongarch/kvm/mmu.c
> @@ -627,7 +627,7 @@ static bool fault_supports_huge_mapping(struct kvm_me=
mory_slot *memslot,
>   *
>   * There are several ways to safely use this helper:
>   *
> - * - Check mmu_invalidate_retry_hva() after grabbing the mapping level, =
before
> + * - Check mmu_invalidate_retry_gfn() after grabbing the mapping level, =
before
>   *   consuming it.  In this case, mmu_lock doesn't need to be held durin=
g the
>   *   lookup, but it does need to be held while checking the MMU notifier.
>   *
> @@ -807,7 +807,7 @@ static int kvm_map_page(struct kvm_vcpu *vcpu, unsign=
ed long gpa, bool write)
> =20
>  	/* Check if an invalidation has taken place since we got pfn */
>  	spin_lock(&kvm->mmu_lock);
> -	if (mmu_invalidate_retry_hva(kvm, mmu_seq, hva)) {
> +	if (mmu_invalidate_retry_gfn(kvm, mmu_seq, gfn)) {
>  		/*
>  		 * This can happen when mappings are changed asynchronously, but
>  		 * also synchronously if a COW is triggered by
> --=20
> 2.39.3
>=20
> Though my Signed-off-by is not necessary if it applied to the kvm tree.

OK, so it needed to be applied to the merge commit when the loongarch
tree was merged by Linus, but appears to have been forgotten. :-(

--=20
Cheers,
Stephen Rothwell

--Sig_/Uo2ujjpjD/I=Dix6LsNA.i+
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWrF1wACgkQAVBC80lX
0GznHwf+J9OteK9Y4TvrZARvcVljc/vhMzpH0IOshhkyHVBuTKd4HGZC+feioXt8
wrw0wYaXqR6UvcOl0ZRbhpIHPjgM5nvDC/YKgmR7i7Mpf+ui7OZ3GtXiOl2VjKWN
68beXUCalkCnl60EhVVYDHhQhzPn4nCOcfcV7iNAcUcahDHwliglktfsQHL2nB1/
iCoxmeHjplk/LoeFpe4Vrez+bRfoPxp/xvVaWy5TbtvUpkKb90XuLxnpRyA9CkTt
0p4BZpGbEaqMh8KLyqu9r4vLfN8pQqrQeTXbpM2Kyz5dSZfQ9hVwvWdcHU3So1lr
QCKupRyJOOwEpP7m3icFsf7qJz9Kqg==
=Aan9
-----END PGP SIGNATURE-----

--Sig_/Uo2ujjpjD/I=Dix6LsNA.i+--