From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Gibson Subject: Re: [PATCH 14/19] KVM: PPC: Book3S HV: add a control to make the XIVE EQ pages dirty Date: Mon, 4 Feb 2019 16:18:34 +1100 Message-ID: <20190204051833.GG1927@umbus.fritz.box> References: <20190107184331.8429-1-clg@kaod.org> <20190107184331.8429-15-clg@kaod.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="m0vRWufqUC70IDnR" 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-15-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 --m0vRWufqUC70IDnR Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jan 07, 2019 at 07:43:26PM +0100, C=E9dric Le Goater wrote: > When the VM is stopped in a migration sequence, the sources are masked > and the XIVE IC is synced to stabilize the EQs. When done, the KVM > ioctl KVM_DEV_XIVE_SAVE_EQ_PAGES is called to mark dirty the EQ pages. >=20 > The migration can then transfer the remaining dirty pages to the > destination and start collecting the state of the devices. Is there a reason to make this a separate step from the SYNC operation? >=20 > Signed-off-by: C=E9dric Le Goater > --- > arch/powerpc/include/uapi/asm/kvm.h | 1 + > arch/powerpc/kvm/book3s_xive_native.c | 40 +++++++++++++++++++++++++++ > 2 files changed, 41 insertions(+) >=20 > diff --git a/arch/powerpc/include/uapi/asm/kvm.h b/arch/powerpc/include/u= api/asm/kvm.h > index f3b859223b80..1a8740629acf 100644 > --- a/arch/powerpc/include/uapi/asm/kvm.h > +++ b/arch/powerpc/include/uapi/asm/kvm.h > @@ -680,6 +680,7 @@ struct kvm_ppc_cpu_char { > #define KVM_DEV_XIVE_GET_ESB_FD 1 > #define KVM_DEV_XIVE_GET_TIMA_FD 2 > #define KVM_DEV_XIVE_VC_BASE 3 > +#define KVM_DEV_XIVE_SAVE_EQ_PAGES 4 > #define KVM_DEV_XIVE_GRP_SOURCES 2 /* 64-bit source attributes */ > #define KVM_DEV_XIVE_GRP_SYNC 3 /* 64-bit source attributes */ > =20 > diff --git a/arch/powerpc/kvm/book3s_xive_native.c b/arch/powerpc/kvm/boo= k3s_xive_native.c > index a8052867afc1..f2de1bcf3b35 100644 > --- a/arch/powerpc/kvm/book3s_xive_native.c > +++ b/arch/powerpc/kvm/book3s_xive_native.c > @@ -373,6 +373,43 @@ static int kvmppc_xive_native_get_tima_fd(struct kvm= ppc_xive *xive, u64 addr) > return put_user(ret, ubufp); > } > =20 > +static int kvmppc_xive_native_vcpu_save_eq_pages(struct kvm_vcpu *vcpu) > +{ > + struct kvmppc_xive_vcpu *xc =3D vcpu->arch.xive_vcpu; > + unsigned int prio; > + > + if (!xc) > + return -ENOENT; > + > + for (prio =3D 0; prio < KVMPPC_XIVE_Q_COUNT; prio++) { > + struct xive_q *q =3D &xc->queues[prio]; > + > + if (!q->qpage) > + continue; > + > + /* Mark EQ page dirty for migration */ > + mark_page_dirty(vcpu->kvm, gpa_to_gfn(q->guest_qpage)); > + } > + return 0; > +} > + > +static int kvmppc_xive_native_save_eq_pages(struct kvmppc_xive *xive) > +{ > + struct kvm *kvm =3D xive->kvm; > + struct kvm_vcpu *vcpu; > + unsigned int i; > + > + pr_devel("%s\n", __func__); > + > + mutex_lock(&kvm->lock); > + kvm_for_each_vcpu(i, vcpu, kvm) { > + kvmppc_xive_native_vcpu_save_eq_pages(vcpu); > + } > + mutex_unlock(&kvm->lock); > + > + return 0; > +} > + > static int xive_native_validate_queue_size(u32 qsize) > { > switch (qsize) { > @@ -498,6 +535,8 @@ static int kvmppc_xive_native_set_attr(struct kvm_dev= ice *dev, > switch (attr->attr) { > case KVM_DEV_XIVE_VC_BASE: > return kvmppc_xive_native_set_vc_base(xive, attr->addr); > + case KVM_DEV_XIVE_SAVE_EQ_PAGES: > + return kvmppc_xive_native_save_eq_pages(xive); > } > break; > case KVM_DEV_XIVE_GRP_SOURCES: > @@ -538,6 +577,7 @@ static int kvmppc_xive_native_has_attr(struct kvm_dev= ice *dev, > case KVM_DEV_XIVE_GET_ESB_FD: > case KVM_DEV_XIVE_GET_TIMA_FD: > case KVM_DEV_XIVE_VC_BASE: > + case KVM_DEV_XIVE_SAVE_EQ_PAGES: > return 0; > } > break; --=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 --m0vRWufqUC70IDnR Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAlxXyykACgkQbDjKyiDZ s5Lo8RAAtJxKIsQQTqRRCdy2Ceug0oOAku4wnCWEQZKjNSzTY/38prpNSKatRPFm mPWb/Vlbe8ebNjU9KYTOh+i4Gamry5yzMgD0PqsNf2iFTpomvJwUuPO1ElePdqBk fplJfspEgHdu0wSmz4KCDNTnBLqgptpw9FAUK9IlZVBwTYMM26hpKWOx8Th2CRkv CCSprh8AzeS8PIhjsZweNYCDmO+CfMvWseiuXw5loTjvMQwzPw1yogXwrsh72qti 0D/Oj8ikRU+xXsPn7LEKNtxGu2u/Yp9YWhGWoRtdBY6S45y7OyHxkD/P9vjHXqKz pGDKIH1wYbdthYTXdBUpVen43scC6cAQtDVLfEdEdQNXoVn/FCYZC8k6N5kfuuZQ uAj+q4VZAUlIYdDCAdaY93JP0jjLEpj4DGcTWAXlGj+1mvm/OrZgaSMqjowXGhzz iJIDlJGl2Az2gnn24HDsECMhlHLWAPs9o7Tl/pkF5Mqdd7pENVeCKk7deGGZrM3c TA1Gnl9kZS1yPCZtxoR0OyxYNJR/m7nf6FXeqjMPmwYeRZ/46vv6wRZqNh3h0YlG boHLZ7zqJLJUwl0eC3TI2tyyGVON7txcKY0f4kLHsN41aVqJgpURTw0DXaodynuw bfWDb9rIghSdqe39408RPH7wfO4/oCAG9W3vjwIwBjsrhO89kVY= =+JoK -----END PGP SIGNATURE----- --m0vRWufqUC70IDnR--