From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Gibson Subject: Re: [PATCH 03/19] KVM: PPC: Book3S HV: check the IRQ controller type Date: Wed, 9 Jan 2019 15:27:17 +1100 Message-ID: <20190109042717.GD6682@umbus.fritz.box> References: <20190107184331.8429-1-clg@kaod.org> <20190107184331.8429-4-clg@kaod.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="hoZxPH4CaxYzWscb" Cc: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, Paul Mackerras , linuxppc-dev@lists.ozlabs.org To: =?iso-8859-1?Q?C=E9dric?= Le Goater Return-path: Content-Disposition: inline In-Reply-To: <20190107184331.8429-4-clg@kaod.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@lists.ozlabs.org Sender: "Linuxppc-dev" List-Id: kvm.vger.kernel.org --hoZxPH4CaxYzWscb Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jan 07, 2019 at 07:43:15PM +0100, C=E9dric Le Goater wrote: > We will have different KVM devices for interrupts, one for the > XICS-over-XIVE mode and one for the XIVE native exploitation > mode. Let's add some checks to make sure we are not mixing the > interfaces in KVM. >=20 > Signed-off-by: C=E9dric Le Goater Reviewed-by: David Gibson > --- > arch/powerpc/kvm/book3s_xive.c | 6 ++++++ > 1 file changed, 6 insertions(+) >=20 > diff --git a/arch/powerpc/kvm/book3s_xive.c b/arch/powerpc/kvm/book3s_xiv= e.c > index f78d002f0fe0..8a4fa45f07f8 100644 > --- a/arch/powerpc/kvm/book3s_xive.c > +++ b/arch/powerpc/kvm/book3s_xive.c > @@ -819,6 +819,9 @@ u64 kvmppc_xive_get_icp(struct kvm_vcpu *vcpu) > { > struct kvmppc_xive_vcpu *xc =3D vcpu->arch.xive_vcpu; > =20 > + if (!kvmppc_xics_enabled(vcpu)) > + return -EPERM; > + > if (!xc) > return 0; > =20 > @@ -835,6 +838,9 @@ int kvmppc_xive_set_icp(struct kvm_vcpu *vcpu, u64 ic= pval) > u8 cppr, mfrr; > u32 xisr; > =20 > + if (!kvmppc_xics_enabled(vcpu)) > + return -EPERM; > + > if (!xc || !xive) > return -ENOENT; > =20 --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --hoZxPH4CaxYzWscb Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAlw1eCUACgkQbDjKyiDZ s5IZWw//bTObuxMPb1akq3IURR/qXNVRLf1fJPA9YzltAybyrTTIxN2W9iJTOOCc s+sYF4IhNaftoc3Pk5nB0W285GO25GfoQ046KW1G2zSpEs+mbc8liWH+NsoKLO+T fkEuGCG6roS5rzlfeqNPwBwrGmYv6Wxu30okEq8w6YL1kQOqnDKTHBNVDeXomZA7 LajC67onw1+HdMklW0DvddxUa5P0LEEzSS6bQF0b53VwkLBgDcYTO51jq27fiVac tb/reHFySePW1kcnhgOyHB8TMSLimybdqRqTUd3UubY3pjMuo92mMXbrINvjzfCa maXDw/+PL0PHet/s6BtjoHzlwUIOcdkhr10y0qYQF/cDyCuh/CxgJ7MD4qh3NXZ4 KgJAY8iqQphvIkevSg69Pk7A8GMt4Tw+LqpcHv1gxW2LwKnrYWqQDsG51YdMf7yq +OZw5nlcIkmM7BP6uC03jDA2JQrOi5FhZcptqnC5pRFx+kOtby/fWgB0hY61F5OQ OH0Jk6AAgACH/doQgkneU777kmdlxWIpI6nn2Cw8nC0uz/P3XLyAANVBcaDWFKzy b15GycbwFtcOdgmF4FtMkLOlAf48yk0NSYW7cUPHeaQFEVbFFmcbkClfzOknFIWx Kg/U5CKLgEnZmj93XgwOAJtedZzviAv2uXmGuIKqNXIyCCdX+1A= =Jb9o -----END PGP SIGNATURE----- --hoZxPH4CaxYzWscb--