public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor cleanup:

Browse source 
- phys_to_virt conversion
  - Improvement of VSIE AP management
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEwGNS88vfc9+v45Yq41TmuOI4ufgFAmRBTJoACgkQ41TmuOI4
 ufiEkA/8C9Px89sI6iw1/w70mjreJeVXYpXudgDH8YhTs+4udLMJHXjBlYWmJijZ
 WRW7s9rHInLPXrLOx6fHrlFA+xd4giD/Ub4UHepqUCFdlhRMlykUsqS3XFfcaJ/T
 l72ik/Xq41fOrGuRrBzPqWckM+5/rpae6tdzuT5MQLaxwifH+IFi+w2jQl3gqnW5
 3BFekbflqPPdRgsTKUfP7dhk9MFQ6caGLMvGxJsjQGEziOljrpJ9apK4zrZXhaDU
 tJdA+Cd6jqsIWY3oYyinXqJYB0iEcoVMW9RpP05MrdrSMseJYSZoMB/mT2OS3xPa
 byAibx8Iu1U7HUohotWnlLj6SM8xsl5RJ2hi2kPL+7rUNIT6azd2IJ/xcgH+cUwG
 wDWTRfEH51WWirBsCLd0nvjACClcj0rEwBsRgYbvfqo82TABe7xAKslNSTL4NwVV
 TT3Lba9jQrAUNsg+UOfNVTNwy6pmkKVc4dqSmOSUC5bxKUKJO735u/442aUjc98C
 eb+FuxUNU040YEe0dG970zXkyJDJbDtQ+VX88Ko0L22iWJBGNoAXj1dpgd1sQCHY
 fc+WcHLhP1QlIfRKCff1WHWxETcepHrQizA7pJeHXgxl50VtOzUAkc1Sc4piEfpl
 ul4XTHZfBwautvqRLak9zTBK3weh3UXvFrX5u8Cl8IBzYUbuGFE=
 =IjLn
 -----END PGP SIGNATURE-----

Merge tag 'kvm-s390-next-6.4-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD

Minor cleanup:
 - phys_to_virt conversion
 - Improvement of VSIE AP management
This commit is contained in:
Paolo Bonzini 2023-04-26 15:43:15 -04:00
commit b3c129e33e
3 changed files with 32 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/s390/kvm/interrupt.c
View file

@ -305,7 +305,7 @@ static inline u8 gisa_get_ipm_or_restore_iam(struct kvm_s390_gisa_interrupt *gi)
static inline int gisa_in_alert_list(struct kvm_s390_gisa *gisa) static inline int gisa_in_alert_list(struct kvm_s390_gisa *gisa)
{ {
return READ_ONCE(gisa->next_alert) != (u32)(u64)gisa; return READ_ONCE(gisa->next_alert) != (u32)virt_to_phys(gisa);
} }
static inline void gisa_set_ipm_gisc(struct kvm_s390_gisa *gisa, u32 gisc) static inline void gisa_set_ipm_gisc(struct kvm_s390_gisa *gisa, u32 gisc)
@ -3168,7 +3168,7 @@ void kvm_s390_gisa_init(struct kvm *kvm)
hrtimer_init(&gi->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); hrtimer_init(&gi->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
gi->timer.function = gisa_vcpu_kicker; gi->timer.function = gisa_vcpu_kicker;
memset(gi->origin, 0, sizeof(struct kvm_s390_gisa)); memset(gi->origin, 0, sizeof(struct kvm_s390_gisa));
gi->origin->next_alert = (u32)(u64)gi->origin; gi->origin->next_alert = (u32)virt_to_phys(gi->origin);
VM_EVENT(kvm, 3, "gisa 0x%pK initialized", gi->origin); VM_EVENT(kvm, 3, "gisa 0x%pK initialized", gi->origin);
} }

2
arch/s390/kvm/pci.c
View file

@ -112,7 +112,7 @@ static int zpci_reset_aipb(u8 nisc)
return -EINVAL; return -EINVAL;
aift->sbv = zpci_aif_sbv; aift->sbv = zpci_aif_sbv;
aift->gait = (struct zpci_gaite *)zpci_aipb->aipb.gait; aift->gait = phys_to_virt(zpci_aipb->aipb.gait);
return 0; return 0;
} }

50
arch/s390/kvm/vsie.c
View file

@ -138,11 +138,15 @@ static int prepare_cpuflags(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)
} }
/* Copy to APCB FORMAT1 from APCB FORMAT0 */ /* Copy to APCB FORMAT1 from APCB FORMAT0 */
static int setup_apcb10(struct kvm_vcpu *vcpu, struct kvm_s390_apcb1 *apcb_s, static int setup_apcb10(struct kvm_vcpu *vcpu, struct kvm_s390_apcb1 *apcb_s,
unsigned long apcb_o, struct kvm_s390_apcb1 *apcb_h) unsigned long crycb_gpa, struct kvm_s390_apcb1 *apcb_h)
{ {
struct kvm_s390_apcb0 tmp; struct kvm_s390_apcb0 tmp;
unsigned long apcb_gpa;
if (read_guest_real(vcpu, apcb_o, &tmp, sizeof(struct kvm_s390_apcb0))) apcb_gpa = crycb_gpa + offsetof(struct kvm_s390_crypto_cb, apcb0);
if (read_guest_real(vcpu, apcb_gpa, &tmp,
sizeof(struct kvm_s390_apcb0)))
return -EFAULT; return -EFAULT;
apcb_s->apm[0] = apcb_h->apm[0] & tmp.apm[0]; apcb_s->apm[0] = apcb_h->apm[0] & tmp.apm[0];
@ -157,15 +161,19 @@ static int setup_apcb10(struct kvm_vcpu *vcpu, struct kvm_s390_apcb1 *apcb_s,
* setup_apcb00 - Copy to APCB FORMAT0 from APCB FORMAT0 * setup_apcb00 - Copy to APCB FORMAT0 from APCB FORMAT0
* @vcpu: pointer to the virtual CPU * @vcpu: pointer to the virtual CPU
* @apcb_s: pointer to start of apcb in the shadow crycb * @apcb_s: pointer to start of apcb in the shadow crycb
* @apcb_o: pointer to start of original apcb in the guest2 * @crycb_gpa: guest physical address to start of original guest crycb
* @apcb_h: pointer to start of apcb in the guest1 * @apcb_h: pointer to start of apcb in the guest1
* *
* Returns 0 and -EFAULT on error reading guest apcb * Returns 0 and -EFAULT on error reading guest apcb
*/ */
static int setup_apcb00(struct kvm_vcpu *vcpu, unsigned long *apcb_s, static int setup_apcb00(struct kvm_vcpu *vcpu, unsigned long *apcb_s,
unsigned long apcb_o, unsigned long *apcb_h) unsigned long crycb_gpa, unsigned long *apcb_h)
{ {
if (read_guest_real(vcpu, apcb_o, apcb_s, unsigned long apcb_gpa;
apcb_gpa = crycb_gpa + offsetof(struct kvm_s390_crypto_cb, apcb0);
if (read_guest_real(vcpu, apcb_gpa, apcb_s,
sizeof(struct kvm_s390_apcb0))) sizeof(struct kvm_s390_apcb0)))
return -EFAULT; return -EFAULT;
@ -178,16 +186,20 @@ static int setup_apcb00(struct kvm_vcpu *vcpu, unsigned long *apcb_s,
* setup_apcb11 - Copy the FORMAT1 APCB from the guest to the shadow CRYCB * setup_apcb11 - Copy the FORMAT1 APCB from the guest to the shadow CRYCB
* @vcpu: pointer to the virtual CPU * @vcpu: pointer to the virtual CPU
* @apcb_s: pointer to start of apcb in the shadow crycb * @apcb_s: pointer to start of apcb in the shadow crycb
* @apcb_o: pointer to start of original guest apcb * @crycb_gpa: guest physical address to start of original guest crycb
* @apcb_h: pointer to start of apcb in the host * @apcb_h: pointer to start of apcb in the host
* *
* Returns 0 and -EFAULT on error reading guest apcb * Returns 0 and -EFAULT on error reading guest apcb
*/ */
static int setup_apcb11(struct kvm_vcpu *vcpu, unsigned long *apcb_s, static int setup_apcb11(struct kvm_vcpu *vcpu, unsigned long *apcb_s,
unsigned long apcb_o, unsigned long crycb_gpa,
unsigned long *apcb_h) unsigned long *apcb_h)
{ {
if (read_guest_real(vcpu, apcb_o, apcb_s, unsigned long apcb_gpa;
apcb_gpa = crycb_gpa + offsetof(struct kvm_s390_crypto_cb, apcb1);
if (read_guest_real(vcpu, apcb_gpa, apcb_s,
sizeof(struct kvm_s390_apcb1))) sizeof(struct kvm_s390_apcb1)))
return -EFAULT; return -EFAULT;
@ -200,7 +212,7 @@ static int setup_apcb11(struct kvm_vcpu *vcpu, unsigned long *apcb_s,
* setup_apcb - Create a shadow copy of the apcb. * setup_apcb - Create a shadow copy of the apcb.
* @vcpu: pointer to the virtual CPU * @vcpu: pointer to the virtual CPU
* @crycb_s: pointer to shadow crycb * @crycb_s: pointer to shadow crycb
* @crycb_o: pointer to original guest crycb * @crycb_gpa: guest physical address of original guest crycb
* @crycb_h: pointer to the host crycb * @crycb_h: pointer to the host crycb
* @fmt_o: format of the original guest crycb. * @fmt_o: format of the original guest crycb.
* @fmt_h: format of the host crycb. * @fmt_h: format of the host crycb.
@ -211,50 +223,46 @@ static int setup_apcb11(struct kvm_vcpu *vcpu, unsigned long *apcb_s,
* Return 0 or an error number if the guest and host crycb are incompatible. * Return 0 or an error number if the guest and host crycb are incompatible.
*/ */
static int setup_apcb(struct kvm_vcpu *vcpu, struct kvm_s390_crypto_cb *crycb_s, static int setup_apcb(struct kvm_vcpu *vcpu, struct kvm_s390_crypto_cb *crycb_s,
const u32 crycb_o, const u32 crycb_gpa,
struct kvm_s390_crypto_cb *crycb_h, struct kvm_s390_crypto_cb *crycb_h,
int fmt_o, int fmt_h) int fmt_o, int fmt_h)
{ {
struct kvm_s390_crypto_cb *crycb;
crycb = (struct kvm_s390_crypto_cb *) (unsigned long)crycb_o;
switch (fmt_o) { switch (fmt_o) {
case CRYCB_FORMAT2: case CRYCB_FORMAT2:
if ((crycb_o & PAGE_MASK) != ((crycb_o + 256) & PAGE_MASK)) if ((crycb_gpa & PAGE_MASK) != ((crycb_gpa + 256) & PAGE_MASK))
return -EACCES; return -EACCES;
if (fmt_h != CRYCB_FORMAT2) if (fmt_h != CRYCB_FORMAT2)
return -EINVAL; return -EINVAL;
return setup_apcb11(vcpu, (unsigned long *)&crycb_s->apcb1, return setup_apcb11(vcpu, (unsigned long *)&crycb_s->apcb1,
(unsigned long) &crycb->apcb1, crycb_gpa,
(unsigned long *)&crycb_h->apcb1); (unsigned long *)&crycb_h->apcb1);
case CRYCB_FORMAT1: case CRYCB_FORMAT1:
switch (fmt_h) { switch (fmt_h) {
case CRYCB_FORMAT2: case CRYCB_FORMAT2:
return setup_apcb10(vcpu, &crycb_s->apcb1, return setup_apcb10(vcpu, &crycb_s->apcb1,
(unsigned long) &crycb->apcb0, crycb_gpa,
&crycb_h->apcb1); &crycb_h->apcb1);
case CRYCB_FORMAT1: case CRYCB_FORMAT1:
return setup_apcb00(vcpu, return setup_apcb00(vcpu,
(unsigned long *) &crycb_s->apcb0, (unsigned long *) &crycb_s->apcb0,
(unsigned long) &crycb->apcb0, crycb_gpa,
(unsigned long *) &crycb_h->apcb0); (unsigned long *) &crycb_h->apcb0);
} }
break; break;
case CRYCB_FORMAT0: case CRYCB_FORMAT0:
if ((crycb_o & PAGE_MASK) != ((crycb_o + 32) & PAGE_MASK)) if ((crycb_gpa & PAGE_MASK) != ((crycb_gpa + 32) & PAGE_MASK))
return -EACCES; return -EACCES;
switch (fmt_h) { switch (fmt_h) {
case CRYCB_FORMAT2: case CRYCB_FORMAT2:
return setup_apcb10(vcpu, &crycb_s->apcb1, return setup_apcb10(vcpu, &crycb_s->apcb1,
(unsigned long) &crycb->apcb0, crycb_gpa,
&crycb_h->apcb1); &crycb_h->apcb1);
case CRYCB_FORMAT1: case CRYCB_FORMAT1:
case CRYCB_FORMAT0: case CRYCB_FORMAT0:
return setup_apcb00(vcpu, return setup_apcb00(vcpu,
(unsigned long *) &crycb_s->apcb0, (unsigned long *) &crycb_s->apcb0,
(unsigned long) &crycb->apcb0, crycb_gpa,
(unsigned long *) &crycb_h->apcb0); (unsigned long *) &crycb_h->apcb0);
} }
} }