| Message ID | 20180125132848.175942-3-borntraeger@de.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 25.01.2018 14:28, Christian Borntraeger wrote: > From: Michael Mueller <mimu@linux.vnet.ibm.com> > > In preperation to support pass-through adapter interrupts, the Guest > Interruption State Area (GISA) and the Adapter Interruption Virtualization > (AIV) features will be introduced here. > > This patch introduces format-0 GISA (that is defines the struct describing > the GISA, allocates storage for it, and introduces fields for the > GISA address in kvm_s390_sie_block and kvm_s390_vsie). > > As the GISA requires storage below 2GB, it is put in sie_page2, which is > already allocated in ZONE_DMA. In addition, The GISA requires alignment to > its integral boundary. This is already naturally aligned via the > padding in the sie_page2. > > Signed-off-by: Michael Mueller <mimu@linux.vnet.ibm.com> > Reviewed-by: Pierre Morel <pmorel@linux.vnet.ibm.com> > Reviewed-by: Halil Pasic <pasic@linux.vnet.ibm.com> > Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com> > Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> > --- > arch/s390/include/asm/kvm_host.h | 23 +++++++++++++++++++---- > arch/s390/kvm/kvm-s390.c | 1 + > 2 files changed, 20 insertions(+), 4 deletions(-) > > diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h > index 9981721..77acade 100644 > --- a/arch/s390/include/asm/kvm_host.h > +++ b/arch/s390/include/asm/kvm_host.h > @@ -183,6 +183,7 @@ struct kvm_s390_sie_block { > #define ECA_IB 0x40000000 > #define ECA_SIGPI 0x10000000 > #define ECA_MVPGI 0x01000000 > +#define ECA_AIV 0x00200000 > #define ECA_VX 0x00020000 > #define ECA_PROTEXCI 0x00002000 > #define ECA_SII 0x00000001 > @@ -227,7 +228,8 @@ struct kvm_s390_sie_block { > __u8 epdx; /* 0x0069 */ > __u8 reserved6a[2]; /* 0x006a */ > __u32 todpr; /* 0x006c */ > - __u8 reserved70[16]; /* 0x0070 */ > + __u32 gd; /* 0x0070 */ > + __u8 reserved74[12]; /* 0x0074 */ > __u64 mso; /* 0x0080 */ > __u64 msl; /* 0x0088 */ > psw_t gpsw; /* 0x0090 */ > @@ -703,14 +705,27 @@ struct kvm_s390_crypto_cb { > struct kvm_s390_apcb1 apcb1; /* 0x0080 */ > }; > > +struct kvm_s390_gisa { > + u32 next_alert; > + u8 ipm; > + u8 reserved01; > + u8 : 6; > + u8 g : 1; > + u8 c : 1; > + u8 iam; > + u8 reserved02[4]; > + u32 airq_count; > +}; > + > /* > - * sie_page2 has to be allocated as DMA because fac_list and crycb need > - * 31bit addresses in the sie control block. > + * sie_page2 has to be allocated as DMA because fac_list, crycb and > + * gisa need 31bit addresses in the sie control block. > */ > struct sie_page2 { > __u64 fac_list[S390_ARCH_FAC_LIST_SIZE_U64]; /* 0x0000 */ > struct kvm_s390_crypto_cb crycb; /* 0x0800 */ > - u8 reserved900[0x1000 - 0x900]; /* 0x0900 */ > + struct kvm_s390_gisa gisa; /* 0x0900 */ > + u8 reserved910[0x1000 - 0x910]; /* 0x0910 */ > }; > > struct kvm_s390_vsie { > diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c > index de16c22..48f0099 100644 > --- a/arch/s390/kvm/kvm-s390.c > +++ b/arch/s390/kvm/kvm-s390.c > @@ -1915,6 +1915,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) > if (!kvm->arch.dbf) > goto out_err; > > + BUILD_BUG_ON(sizeof(struct sie_page2) != 4096); > kvm->arch.sie_page2 = > (struct sie_page2 *) get_zeroed_page(GFP_KERNEL | GFP_DMA); > if (!kvm->arch.sie_page2) > Reviewed-by: David Hildenbrand <david@redhat.com>
On Thu, 25 Jan 2018 14:28:38 +0100 Christian Borntraeger <borntraeger@de.ibm.com> wrote: > From: Michael Mueller <mimu@linux.vnet.ibm.com> > > In preperation to support pass-through adapter interrupts, the Guest > Interruption State Area (GISA) and the Adapter Interruption Virtualization > (AIV) features will be introduced here. > > This patch introduces format-0 GISA (that is defines the struct describing > the GISA, allocates storage for it, and introduces fields for the > GISA address in kvm_s390_sie_block and kvm_s390_vsie). > > As the GISA requires storage below 2GB, it is put in sie_page2, which is > already allocated in ZONE_DMA. In addition, The GISA requires alignment to > its integral boundary. This is already naturally aligned via the > padding in the sie_page2. > > Signed-off-by: Michael Mueller <mimu@linux.vnet.ibm.com> > Reviewed-by: Pierre Morel <pmorel@linux.vnet.ibm.com> > Reviewed-by: Halil Pasic <pasic@linux.vnet.ibm.com> > Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com> > Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> > --- > arch/s390/include/asm/kvm_host.h | 23 +++++++++++++++++++---- > arch/s390/kvm/kvm-s390.c | 1 + > 2 files changed, 20 insertions(+), 4 deletions(-) Acked-by: Cornelia Huck <cohuck@redhat.com>
diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h index 9981721..77acade 100644 --- a/arch/s390/include/asm/kvm_host.h +++ b/arch/s390/include/asm/kvm_host.h @@ -183,6 +183,7 @@ struct kvm_s390_sie_block { #define ECA_IB 0x40000000 #define ECA_SIGPI 0x10000000 #define ECA_MVPGI 0x01000000 +#define ECA_AIV 0x00200000 #define ECA_VX 0x00020000 #define ECA_PROTEXCI 0x00002000 #define ECA_SII 0x00000001 @@ -227,7 +228,8 @@ struct kvm_s390_sie_block { __u8 epdx; /* 0x0069 */ __u8 reserved6a[2]; /* 0x006a */ __u32 todpr; /* 0x006c */ - __u8 reserved70[16]; /* 0x0070 */ + __u32 gd; /* 0x0070 */ + __u8 reserved74[12]; /* 0x0074 */ __u64 mso; /* 0x0080 */ __u64 msl; /* 0x0088 */ psw_t gpsw; /* 0x0090 */ @@ -703,14 +705,27 @@ struct kvm_s390_crypto_cb { struct kvm_s390_apcb1 apcb1; /* 0x0080 */ }; +struct kvm_s390_gisa { + u32 next_alert; + u8 ipm; + u8 reserved01; + u8 : 6; + u8 g : 1; + u8 c : 1; + u8 iam; + u8 reserved02[4]; + u32 airq_count; +}; + /* - * sie_page2 has to be allocated as DMA because fac_list and crycb need - * 31bit addresses in the sie control block. + * sie_page2 has to be allocated as DMA because fac_list, crycb and + * gisa need 31bit addresses in the sie control block. */ struct sie_page2 { __u64 fac_list[S390_ARCH_FAC_LIST_SIZE_U64]; /* 0x0000 */ struct kvm_s390_crypto_cb crycb; /* 0x0800 */ - u8 reserved900[0x1000 - 0x900]; /* 0x0900 */ + struct kvm_s390_gisa gisa; /* 0x0900 */ + u8 reserved910[0x1000 - 0x910]; /* 0x0910 */ }; struct kvm_s390_vsie { diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index de16c22..48f0099 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -1915,6 +1915,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) if (!kvm->arch.dbf) goto out_err; + BUILD_BUG_ON(sizeof(struct sie_page2) != 4096); kvm->arch.sie_page2 = (struct sie_page2 *) get_zeroed_page(GFP_KERNEL | GFP_DMA); if (!kvm->arch.sie_page2)