KVM: s390: Add support for protected VMs
Subsystems (10)
v3 cover KVM: s390: Add support for protected VMs
mm people: This series contains a "pretty small" common code memory management change that will allow paging, guest backing with files etc almost just like normal VMs. It should be a no-op for all architectures not opting in. And it should be usable for others that also try to get notified on "the pages are in the process of being used for things like I/O". This time I included error handling and an ACK from Will Deacon.
mm-related patches CCed on linux-mm, the complete list can be found on the KVM and linux-s390 list.
Andrew, any chance to either take " mm:gup/writeback: add callbacks for inaccessible pages" or ACK so that I can take it?
Overview
--------
Protected VMs (PVM) are KVM VMs, where KVM can't access the VM's state like guest memory and guest registers anymore. Instead the PVMs are mostly managed by a new entity called Ultravisor (UV), which provides an API, so KVM and the PV can request management actions.
PVMs are encrypted at rest and protected from hypervisor access while running. They switch from a normal operation into protected mode, so we can still use the standard boot process to load a encrypted blob and then move it into protected mode.
Rebooting is only possible by passing through the unprotected/normal mode and switching to protected again.
All patches are in the protvirtv4 branch of the korg s390 kvm git
https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git/log/?h=protvirtv5
Claudio presented the technology at his presentation at KVM Forum 2019.
https://static.sched.com/hosted_files/kvmforum2019/3b/ibm_protected_vms_s390x.pdf
v2 -> v3
- rebase against v5.6-rc2
- move some checks into the callers
- typo fixes
- extend UV query size
- do a tlb flush when entering/exiting protected mode
- more comments
- change interface to PV_ENABLE/DISABLE instead of vcpu/vm create/destroy
- lockdep checks for *is_protected calls
- locking improments
- move facility 161 to qemu
- checkpatch fixes
- merged error handling in mm patch
- removed vcpu pv commands
- use mp_state for setting the IPL PSW
v1 -> v2
- rebase on top of kvm/master
- pipe through rc and rrc. This might have created some churn here and there
- turn off sclp masking when rebooting into "unsecure"
- memory management simplification
- prefix page handling now via intercept 112
- io interrupt intervention request fix (do not use GISA)
- api.txt conversion to rst
- sample patches on top of mm/gup/writeback
- tons of review feedback
- kvm_uv debug feature fixes and unifications
- ultravisor information for /sys/firmware
-
RFCv2 -> v1 (you can diff the protvirtv2 and the protvirtv3 branch)
- tons of review feedback integrated (see mail thread)
- memory management now complete and working
- Documentation patches merged
- interrupt patches merged
- CONFIG_KVM_S390_PROTECTED_VIRTUALIZATION_HOST removed
- SIDA interface integrated into memop
- for merged patches I removed reviews that were not in all patches
Christian Borntraeger (5):
KVM: s390/mm: Make pages accessible before destroying the guest
KVM: s390: protvirt: Add SCLP interrupt handling
KVM: s390: protvirt: do not inject interrupts after start
KVM: s390: rstify new ioctls in api.rst
KVM: s390: protvirt: introduce and enable KVM_CAP_S390_PROTECTED
Claudio Imbrenda (3):
mm:gup/writeback: add callbacks for inaccessible pages s390/mm: provide memory management functions for protected KVM guests
KVM: s390/mm: handle guest unpin events
Janosch Frank (24):
KVM: s390: protvirt: Add UV debug trace
KVM: s390: add new variants of UV CALL
KVM: s390: protvirt: Add initial vm and cpu lifecycle handling
KVM: s390: protvirt: Add KVM api documentation
KVM: s390: protvirt: Secure memory is not mergeable
KVM: s390: protvirt: Handle SE notification interceptions
KVM: s390: protvirt: Instruction emulation
KVM: s390: protvirt: Handle spec exception loops
KVM: s390: protvirt: Add new gprs location handling
KVM: S390: protvirt: Introduce instruction data area bounce buffer
KVM: s390: protvirt: handle secure guest prefix pages
KVM: s390: protvirt: Write sthyi data to instruction data area
KVM: s390: protvirt: STSI handling
KVM: s390: protvirt: disallow one_reg
KVM: s390: protvirt: Do only reset registers that are accessible
KVM: s390: protvirt: Only sync fmt4 registers
KVM: s390: protvirt: Add program exception injection
KVM: s390: protvirt: UV calls in support of diag308 0, 1
KVM: s390: protvirt: Report CPU state to Ultravisor
KVM: s390: protvirt: Support cmd 5 operation state
KVM: s390: protvirt: Mask PSW interrupt bits for interception 104 and
112
KVM: s390: protvirt: Add UV cpu reset calls
DOCUMENTATION: Protected virtual machine introduction and IPL
s390: protvirt: Add sysfs firmware interface for Ultravisor
information
Michael Mueller (1):
KVM: s390: protvirt: Implement interrupt injection
Ulrich Weigand (1):
KVM: s390/interrupt: do not pin adapter interrupt pages
Vasily Gorbik (3):
s390/protvirt: introduce host side setup s390/protvirt: add ultravisor initialization s390/mm: add (non)secure page access exceptions handlers
.../admin-guide/kernel-parameters.txt | 5 + Documentation/virt/kvm/api.rst | 91 +++- Documentation/virt/kvm/devices/s390_flic.rst | 11 +- Documentation/virt/kvm/index.rst | 2 + Documentation/virt/kvm/s390-pv-boot.rst | 83 +++ Documentation/virt/kvm/s390-pv.rst | 116 ++++ MAINTAINERS | 1 + arch/s390/boot/Makefile | 2 +- arch/s390/boot/uv.c | 21 +- arch/s390/include/asm/gmap.h | 6 + arch/s390/include/asm/kvm_host.h | 113 +++- arch/s390/include/asm/mmu.h | 2 + arch/s390/include/asm/mmu_context.h | 1 + arch/s390/include/asm/page.h | 5 + arch/s390/include/asm/pgtable.h | 35 +- arch/s390/include/asm/uv.h | 252 ++++++++- arch/s390/kernel/Makefile | 1 + arch/s390/kernel/pgm_check.S | 4 +- arch/s390/kernel/setup.c | 9 +- arch/s390/kernel/uv.c | 413 ++++++++++++++ arch/s390/kvm/Makefile | 2 +- arch/s390/kvm/diag.c | 4 + arch/s390/kvm/intercept.c | 115 +++- arch/s390/kvm/interrupt.c | 399 ++++++++------ arch/s390/kvm/kvm-s390.c | 509 +++++++++++++++--- arch/s390/kvm/kvm-s390.h | 51 +- arch/s390/kvm/priv.c | 11 +- arch/s390/kvm/pv.c | 286 ++++++++++ arch/s390/mm/fault.c | 78 +++ arch/s390/mm/gmap.c | 65 ++- include/linux/gfp.h | 6 + include/uapi/linux/kvm.h | 43 +- mm/gup.c | 15 +- mm/page-writeback.c | 5 + 34 files changed, 2442 insertions(+), 320 deletions(-) create mode 100644 Documentation/virt/kvm/s390-pv-boot.rst create mode 100644 Documentation/virt/kvm/s390-pv.rst create mode 100644 arch/s390/kernel/uv.c create mode 100644 arch/s390/kvm/pv.c
Signature · 1 line
2.25.0
PATCH v3 1/37 mm:gup/writeback: add callbacks for inaccessible pages
From: Claudio Imbrenda <[email protected]>
With the introduction of protected KVM guests on s390 there is now a concept of inaccessible pages. These pages need to be made accessible before the host can access them.
While cpu accesses will trigger a fault that can be resolved, I/O accesses will just fail. We need to add a callback into architecture code for places that will do I/O, namely when writeback is started or when a page reference is taken.
This is not only to enable paging, file backing etc, it is also necessary to protect the host against a malicious user space. For example a bad QEMU could simply start direct I/O on such protected memory. We do not want userspace to be able to trigger I/O errors and thus we the logic is "whenever somebody accesses that page (gup) or doing I/O, make sure that this page can be accessed. When the guest tries to access that page we will wait in the page fault handler for writeback to have finished and for the page_ref to be the expected value.
--- include/linux/gfp.h | 6 ++++++ mm/gup.c | 15 ++++++++++++--- mm/page-writeback.c | 5 +++++ 3 files changed, 23 insertions(+), 3 deletions(-)
include/linux/gfp.h +6 -0
@@ -485,6 +485,12 @@ static inline void arch_free_page(struct page *page, int order) { }#ifndef HAVE_ARCH_ALLOC_PAGE static inline void arch_alloc_page (struct page *page,int order) { }#endif +#ifndef HAVE_ARCH_MAKE_PAGE_ACCESSIBLE +static inline int arch_make_page_accessible (struct page *page) +{ +return 0 ; +} +#endif struct page * __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order, int preferred_nid,
mm/gup.c +12 -3
@@ -193,6 +193,7 @@ static struct page *follow_page_pte(struct vm_area_struct *vma,struct page *page;spinlock_t *ptl;pte_t *ptep, pte; +int ret;/* FOLL_GET and FOLL_PIN are mutually exclusive. */ if (WARN_ON_ONCE((flags & (FOLL_PIN | FOLL_GET)) ==
@@ -250,8 +251,6 @@ static struct page *follow_page_pte(struct vm_area_struct *vma,if (is_zero_pfn (pte_pfn (pte))) { page =pte_page (pte); }else { -int ret; - ret =follow_pfn_pte (vma, address, ptep, flags); page =ERR_PTR (ret); goto out;
@@ -259,7 +258,6 @@ static struct page *follow_page_pte(struct vm_area_struct *vma, }if (flags &FOLL_SPLIT &&PageTransCompound (page)) { -int ret;get_page (page);pte_unmap_unlock (ptep, ptl);lock_page (page);
@@ -276,6 +274,12 @@ static struct page *follow_page_pte(struct vm_area_struct *vma, page =ERR_PTR (-ENOMEM ); goto out; } + ret =arch_make_page_accessible (page); +if (ret) { +put_page (page); + page =ERR_PTR (ret); + goto out; + } }if (flags &FOLL_TOUCH ) { if ((flags & FOLL_WRITE) &&
@@ -1919,6 +1923,11 @@ static int gup_pte_range(pmd_t pmd, unsigned long addr, unsigned long end,VM_BUG_ON_PAGE (compound_head (page) != head, page); + ret =arch_make_page_accessible (page); +if (ret) { +put_page (head); + goto pte_unmap; + }SetPageReferenced (page); pages[*nr] = page; (*nr)++;
mm/page-writeback.c +5 -0
@@ -2807,6 +2807,11 @@ int __test_set_page_writeback(struct page *page, bool keep_write)inc_zone_page_state (page,NR_ZONE_WRITE_PENDING ); }unlock_page_memcg (page); +/* +* If writeback has been triggered on a page that cannot be made +* accessible, it is too late. +*/ +WARN_ON (arch_make_page_accessible (page));return ret; }
Signature · 1 line
2.25.0
Re: [PATCH v3 01/37] mm:gup/writeback: add callbacks for inaccessible pages
Quoted 11 lines · Christian Borntraeger
From: Claudio Imbrenda <[email protected]>
With the introduction of protected KVM guests on s390 there is now a concept of inaccessible pages. These pages need to be made accessible before the host can access them.
While cpu accesses will trigger a fault that can be resolved, I/O accesses will just fail. We need to add a callback into architecture code for places that will do I/O, namely when writeback is started or when a page reference is taken.
Quoted 9 lines
This is not only to enable paging, file backing etc, it is also necessary to protect the host against a malicious user space. For example a bad QEMU could simply start direct I/O on such protected memory. We do not want userspace to be able to trigger I/O errors and thus we the logic is "whenever somebody accesses that page (gup) or doing I/O, make sure that this page can be accessed. When the guest tries to access that page we will wait in the page fault handler for writeback to have finished and for the
page_refto be the expected value.
Subject: "mm: gup..."
And I'd probably add that on s390x, it's unlikely to ever return !0. (why the WARN_ON is okay and has to be tackled once relevant)
Quoted 4 lines
Signed-off-by Claudio Imbrenda <[email protected]>Acked-by Will Deacon <[email protected]>Signed-off-by Christian Borntraeger <[email protected]>
Signature · 3 lines
Thanks, David / dhildenb
PATCH v3 2/37 KVM: s390/interrupt: do not pin adapter interrupt pages
In reply to Christian BorntraegerFrom: Ulrich Weigand <[email protected]>
The adapter interrupt page containing the indicator bits is currently pinned. That means that a guest with many devices can pin a lot of memory pages in the host. This also complicates the reference tracking which is needed for memory management handling of protected virtual machines. It might also have some strange side effects for madvise MADV_DONTNEED and other things.
We can simply try to get the userspace page set the bits and free the page. By storing the userspace address in the irq routing entry instead of the guest address we can actually avoid many lookups and list walks so that this variant is very likely not slower.
If userspace messes around with the memory slots the worst thing that can happen is that we write to some other memory within that process. As we get the the page with FOLL_WRITE this can also not be used to write to shared read-only pages.
--- Documentation/virt/kvm/devices/s390_flic.rst | 11 +- arch/s390/include/asm/kvm_host.h | 3 - arch/s390/kvm/interrupt.c | 170 ++++++------------- 3 files changed, 53 insertions(+), 131 deletions(-)
Documentation/virt/kvm/devices/s390_flic.rst +2 -9
@@ -108,16 +108,9 @@ Groups: mask or unmask the adapter, as specified in mask KVM_S390_IO_ADAPTER_MAP - perform a gmap translation for the guest address provided in addr, - pin a userspace page for the translated address and add it to the - list of mappings - - .. note:: A new mapping will be created unconditionally; therefore, - the calling code should avoid making duplicate mappings. - + This is now a no-op. The mapping is purely done by the irq route. KVM_S390_IO_ADAPTER_UNMAP - release a userspace page for the translated address specified in addr - from the list of mappings + This is now a no-op. The mapping is purely done by the irq route. KVM_DEV_FLIC_AISM modify the adapter-interruption-suppression mode for a given isc if the
arch/s390/include/asm/kvm_host.h +0 -3
@@ -701,9 +701,6 @@ struct s390_io_adapter {bool masked;bool swap;bool suppressible; -struct rw_semaphore maps_lock; -struct list_head maps; -atomic_t nr_maps; };#define MAX_S390_IO_ADAPTERS ((MAX_ISC + 1) * 8)
arch/s390/kvm/interrupt.c +51 -119
240 lines not on this page · raw message
Signature · 1 line
2.25.0
PATCH v3 2/37 KVM: s390/interrupt: do not pin adapter interrupt pages
From: Ulrich Weigand <[email protected]>
The adapter interrupt page containing the indicator bits is currently pinned. That means that a guest with many devices can pin a lot of memory pages in the host. This also complicates the reference tracking which is needed for memory management handling of protected virtual machines. It might also have some strange side effects for madvise MADV_DONTNEED and other things.
We can simply try to get the userspace page set the bits and free the page. By storing the userspace address in the irq routing entry instead of the guest address we can actually avoid many lookups and list walks so that this variant is very likely not slower.
If userspace messes around with the memory slots the worst thing that can happen is that we write to some other memory within that process. As we get the the page with FOLL_WRITE this can also not be used to write to shared read-only pages.
--- Documentation/virt/kvm/devices/s390_flic.rst | 11 +- arch/s390/include/asm/kvm_host.h | 3 - arch/s390/kvm/interrupt.c | 172 ++++++------------- 3 files changed, 52 insertions(+), 134 deletions(-)
Documentation/virt/kvm/devices/s390_flic.rst +2 -9
@@ -108,16 +108,9 @@ Groups: mask or unmask the adapter, as specified in mask KVM_S390_IO_ADAPTER_MAP - perform a gmap translation for the guest address provided in addr, - pin a userspace page for the translated address and add it to the - list of mappings - - .. note:: A new mapping will be created unconditionally; therefore, - the calling code should avoid making duplicate mappings. - + This is now a no-op. The mapping is purely done by the irq route. KVM_S390_IO_ADAPTER_UNMAP - release a userspace page for the translated address specified in addr - from the list of mappings + This is now a no-op. The mapping is purely done by the irq route. KVM_DEV_FLIC_AISM modify the adapter-interruption-suppression mode for a given isc if the
arch/s390/include/asm/kvm_host.h +0 -3
@@ -701,9 +701,6 @@ struct s390_io_adapter {bool masked;bool swap;bool suppressible; -struct rw_semaphore maps_lock; -struct list_head maps; -atomic_t nr_maps; };#define MAX_S390_IO_ADAPTERS ((MAX_ISC + 1) * 8)
arch/s390/kvm/interrupt.c +50 -122
246 lines not on this page · raw message
Signature · 1 line
2.25.0
Re: [PATCH v3.1 02/37] KVM: s390/interrupt: do not pin adapter interrupt pages
Quoted 314 lines · Christian Borntraeger
From: Ulrich Weigand <[email protected]>
The adapter interrupt page containing the indicator bits is currently pinned. That means that a guest with many devices can pin a lot of memory pages in the host. This also complicates the reference tracking which is needed for memory management handling of protected virtual machines. It might also have some strange side effects for madvise
MADV_DONTNEEDand other things.We can simply try to get the userspace page set the bits and free the page. By storing the userspace address in the irq routing entry instead of the guest address we can actually avoid many lookups and list walks so that this variant is very likely not slower.
If userspace messes around with the memory slots the worst thing that can happen is that we write to some other memory within that process. As we get the the page with
FOLL_WRITEthis can also not be used to write to shared read-only pages.Signed-off-by Ulrich Weigand <[email protected]>[[email protected]: patch simplification]Signed-off-by Christian Borntraeger <[email protected]>--- Documentation/virt/kvm/devices/s390_flic.rst | 11 +- arch/s390/include/asm/kvm_host.h | 3 - arch/s390/kvm/interrupt.c | 172 ++++++------------- 3 files changed, 52 insertions(+), 134 deletions(-)Documentation/virt/kvm/devices/s390_flic.rst +2
-9@@ -108,16 +108,9 @@ Groups: mask or unmask the adapter, as specified in mask KVM_S390_IO_ADAPTER_MAP - perform a gmap translation for the guest address provided in addr, - pin a userspace page for the translated address and add it to the - list of mappings - - .. note:: A new mapping will be created unconditionally; therefore, - the calling code should avoid making duplicate mappings. - + This is now a no-op. The mapping is purely done by the irq route. KVM_S390_IO_ADAPTER_UNMAP - release a userspace page for the translated address specified in addr - from the list of mappings + This is now a no-op. The mapping is purely done by the irq route. KVM_DEV_FLIC_AISM modify the adapter-interruption-suppression mode for a given isc if thearch/s390/include/asm/kvm_host.h +0
-3@@ -701,9 +701,6 @@ struct s390_io_adapter {bool masked;bool swap;bool suppressible; -struct rw_semaphore maps_lock; -struct list_head maps; -atomic_t nr_maps; };#define MAX_S390_IO_ADAPTERS ((MAX_ISC + 1) * 8)arch/s390/kvm/interrupt.c +48
-119@@ -2,7 +2,7 @@/* * handling kvm guest interrupts * -* Copyright IBM Corp. 2008, 2015 +* Copyright IBM Corp. 2008, 2020 * * Author(s): Carsten Otte <[email protected]> */ @@ -2327,9 +2327,6 @@ static int register_io_adapter(struct kvm_device *dev,if (!adapter)return -ENOMEM ; -INIT_LIST_HEAD (&adapter->maps); -init_rwsem (&adapter->maps_lock); -atomic_set (&adapter->nr_maps,0 ); adapter->id = adapter_info.id; adapter->isc = adapter_info.isc; adapter->maskable = adapter_info.maskable;@@ -2354,87 +2351,12 @@ int kvm_s390_mask_adapter(struct kvm *kvm, unsigned int id, bool masked)return ret; } -static int kvm_s390_adapter_map (struct kvm *kvm,unsigned int id,__u64 addr) -{ -struct s390_io_adapter *adapter =get_io_adapter (kvm, id); -struct s390_map_info *map; -int ret; - -if (!adapter || !addr) -return -EINVAL ; - - map =kzalloc (sizeof (*map),GFP_KERNEL ); -if (!map) { - ret = -ENOMEM ; - goto out; - } -INIT_LIST_HEAD (&map->list); - map->guest_addr = addr; - map->addr =gmap_translate (kvm->arch.gmap, addr); -if (map->addr == -EFAULT ) { - ret = -EFAULT ; - goto out; - } - ret =get_user_pages_fast (map->addr,1 ,FOLL_WRITE , &map->page); -if (ret <0 ) - goto out; -BUG_ON (ret !=1 ); -down_write (&adapter->maps_lock); -if (atomic_inc_return (&adapter->nr_maps) <MAX_S390_ADAPTER_MAPS ) { -list_add_tail (&map->list, &adapter->maps); - ret =0 ; - }else { -put_page (map->page); - ret = -EINVAL ; - } -up_write (&adapter->maps_lock); -out: -if (ret) -kfree (map); -return ret; -} - -static int kvm_s390_adapter_unmap (struct kvm *kvm,unsigned int id,__u64 addr) -{ -struct s390_io_adapter *adapter =get_io_adapter (kvm, id); -struct s390_map_info *map, *tmp; -int found =0 ; - -if (!adapter || !addr) -return -EINVAL ; - -down_write (&adapter->maps_lock); -list_for_each_entry_safe (map, tmp, &adapter->maps, list) { -if (map->guest_addr == addr) { - found =1 ; -atomic_dec (&adapter->nr_maps); -list_del (&map->list); -put_page (map->page); -kfree (map); -break ; - } - } -up_write (&adapter->maps_lock); - -return found ?0 : -EINVAL ; -} -void kvm_s390_destroy_adapters (struct kvm *kvm) {int i; -struct s390_map_info *map, *tmp; -for (i =0 ; i <MAX_S390_IO_ADAPTERS ; i++) { -if (!kvm->arch.adapters[i]) -continue ; -list_for_each_entry_safe (map, tmp, - &kvm->arch.adapters[i]->maps, list) { -list_del (&map->list); -put_page (map->page); -kfree (map); - } +for (i =0 ; i <MAX_S390_IO_ADAPTERS ; i++)kfree (kvm->arch.adapters[i]); - } } static int modify_io_adapter(struct kvm_device *dev,@@ -2456,12 +2378,13 @@ static int modify_io_adapter(struct kvm_device *dev,if (ret >0 ) ret =0 ;break ; +/* +* We resolve the gpa to hva when setting the IRQ routing. the set_irq +* code uses get_user_pages_remote() to do the actual write. +*/ case KVM_S390_IO_ADAPTER_MAP : - ret =kvm_s390_adapter_map (dev->kvm, req.id, req.addr); -break ;case KVM_S390_IO_ADAPTER_UNMAP : - ret =kvm_s390_adapter_unmap (dev->kvm, req.id, req.addr); -break ; +return 0 ;default : ret = -EINVAL ; }@@ -2699,19 +2622,17 @@ static unsigned long get_ind_bit(__u64 addr, unsigned long bit_nr, bool swap)return swap ? (bit ^ (BITS_PER_LONG -1 )) : bit; } -static struct s390_map_info *get_map_info (struct s390_io_adapter *adapter, -u64 addr) +static struct page *get_map_page (struct kvm *kvm, +struct s390_io_adapter *adapter, +u64 uaddr) { -struct s390_map_info *map; - -if (!adapter) -return NULL ; +struct page *page =NULL ; -list_for_each_entry (map, &adapter->maps, list) { -if (map->guest_addr == addr) -return map; - } -return NULL ; +down_read (&kvm->mm->mmap_sem); +get_user_pages_remote (NULL , kvm->mm, uaddr,1 ,FOLL_WRITE , + &page,NULL ,NULL ); +up_read (&kvm->mm->mmap_sem); +return page; } static int adapter_indicators_set(struct kvm *kvm,@@ -2720,30 +2641,35 @@ static int adapter_indicators_set(struct kvm *kvm, {unsigned long bit;int summary_set, idx; -struct s390_map_info *info; +struct page *ind_page, *summary_page;void *map; - info =get_map_info (adapter, adapter_int->ind_addr); -if (!info) + ind_page =get_map_page (kvm, adapter, adapter_int->ind_addr); +if (!ind_page)return -1 ; - map =page_address (info->page); - bit =get_ind_bit (info->addr, adapter_int->ind_offset, adapter->swap); -set_bit (bit, map); - idx =srcu_read_lock (&kvm->srcu); -mark_page_dirty (kvm, info->guest_addr >>PAGE_SHIFT ); -set_page_dirty_lock (info->page); - info =get_map_info (adapter, adapter_int->summary_addr); -if (!info) { -srcu_read_unlock (&kvm->srcu, idx); + summary_page =get_map_page (kvm, adapter, adapter_int->summary_addr); +if (!summary_page) { +put_page (ind_page);return -1 ; } - map =page_address (info->page); - bit =get_ind_bit (info->addr, adapter_int->summary_offset, - adapter->swap); + + idx =srcu_read_lock (&kvm->srcu); + map =page_address (ind_page); + bit =get_ind_bit (adapter_int->ind_addr, + adapter_int->ind_offset, adapter->swap); +set_bit (bit, map); +mark_page_dirty (kvm, adapter_int->ind_addr >>PAGE_SHIFT ); +set_page_dirty_lock (ind_page); + map =page_address (summary_page); + bit =get_ind_bit (adapter_int->summary_addr, + adapter_int->summary_offset, adapter->swap); summary_set =test_and_set_bit (bit, map); -mark_page_dirty (kvm, info->guest_addr >>PAGE_SHIFT ); -set_page_dirty_lock (info->page); +mark_page_dirty (kvm, adapter_int->summary_addr >>PAGE_SHIFT ); +set_page_dirty_lock (summary_page);srcu_read_unlock (&kvm->srcu, idx); + +put_page (ind_page); +put_page (summary_page);return summary_set ?0 :1 ; }@@ -2765,9 +2691,7 @@ static int set_adapter_int(struct kvm_kernel_irq_routing_entry *e, adapter =get_io_adapter (kvm, e->adapter.adapter_id);if (!adapter)return -1 ; -down_read (&adapter->maps_lock); ret =adapter_indicators_set (kvm, adapter, &e->adapter); -up_read (&adapter->maps_lock);if ((ret >0 ) && !adapter->masked) { ret =kvm_s390_inject_airq (kvm, adapter);if (ret ==0 )@@ -2818,23 +2742,27 @@ int kvm_set_routing_entry(struct kvm *kvm,struct kvm_kernel_irq_routing_entry *e, const struct kvm_irq_routing_entry *ue) { - int ret; + u64 uaddr;switch (ue->type) { +/* we store the userspace addresses instead of the guest addresses */ case KVM_IRQ_ROUTING_S390_ADAPTER : e->set = set_adapter_int; - e->adapter.summary_addr = ue->u.adapter.summary_addr; - e->adapter.ind_addr = ue->u.adapter.ind_addr; + uaddr =gmap_translate (kvm->arch.gmap, ue->u.adapter.summary_addr); +if (uaddr == -EFAULT ) +return -EFAULT ; + e->adapter.summary_addr = uaddr; + uaddr =gmap_translate (kvm->arch.gmap, ue->u.adapter.ind_addr); +if (uaddr == -EFAULT ) +return -EFAULT ; + e->adapter.ind_addr = uaddr; e->adapter.summary_offset = ue->u.adapter.summary_offset; e->adapter.ind_offset = ue->u.adapter.ind_offset; e->adapter.adapter_id = ue->u.adapter.adapter_id; - ret =0 ; -break ;
arch/s390/kvm/interrupt.c int kvm_set_routing_entry(struct kvm *kvm, · line 2768
Quoted 10 lines
arch/s390/kvm/interrupt.c +2
-3+return 0 ;default : - ret = -EINVAL ; +return -EINVAL ; } - -return ret; } int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e, struct kvm *kvm,
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH v3.1 02/37] KVM: s390/interrupt: do not pin adapter interrupt pages
In reply to Christian BorntraegerQuoted 27 lines · On Fri, 21 Feb 2020 03:09:42 -0500 Christian Borntraeger…
From: Ulrich Weigand <[email protected]>
The adapter interrupt page containing the indicator bits is currently pinned. That means that a guest with many devices can pin a lot of memory pages in the host. This also complicates the reference tracking which is needed for memory management handling of protected virtual machines. It might also have some strange side effects for madvise
MADV_DONTNEEDand other things.We can simply try to get the userspace page set the bits and free the page. By storing the userspace address in the irq routing entry instead of the guest address we can actually avoid many lookups and list walks so that this variant is very likely not slower.
If userspace messes around with the memory slots the worst thing that can happen is that we write to some other memory within that process. As we get the the page with
FOLL_WRITEthis can also not be used to write to shared read-only pages.Signed-off-by Ulrich Weigand <[email protected]>[[email protected]: patch simplification]Signed-off-by Christian Borntraeger <[email protected]>--- Documentation/virt/kvm/devices/s390_flic.rst | 11 +- arch/s390/include/asm/kvm_host.h | 3 - arch/s390/kvm/interrupt.c | 172 ++++++------------- 3 files changed, 52 insertions(+), 134 deletions(-)
(...)
arch/s390/kvm/interrupt.c static int modify_io_adapter(struct kvm_device *dev, · line 2384
Quoted 8 lines
arch/s390/kvm/interrupt.c +4
-0@@ -2456,12 +2378,13 @@ static int modify_io_adapter(struct kvm_device *dev,if (ret >0 ) ret =0 ;break ; +/* +* We resolve the gpa to hva when setting the IRQ routing. the set_irq +* code uses get_user_pages_remote() to do the actual write. +*/
What about:
"The following operations are no longer needed and therefore no-ops. The gpa to hva translation is done when an IRQ route is set up. The set_irq code uses get_user_pages_remote() to do the actual write."
arch/s390/kvm/interrupt.c static int modify_io_adapter(struct kvm_device *dev, · line 2387
Quoted 7 lines
arch/s390/kvm/interrupt.c +1
-4case KVM_S390_IO_ADAPTER_MAP : - ret =kvm_s390_adapter_map (dev->kvm, req.id, req.addr); -break ;case KVM_S390_IO_ADAPTER_UNMAP : - ret =kvm_s390_adapter_unmap (dev->kvm, req.id, req.addr); -break ; +return 0 ;
I think
ret = 0; break;
would be better, as the other cases do not do a direct return, either.
arch/s390/kvm/interrupt.c static unsigned long get_ind_bit(__u64 addr, unsigned long bit_nr, bool swap) · line 2626
Quoted 11 lines
arch/s390/kvm/interrupt.c +2
-2default : ret = -EINVAL ; }@@ -2699,19 +2622,17 @@ static unsigned long get_ind_bit(__u64 addr, unsigned long bit_nr, bool swap)return swap ? (bit ^ (BITS_PER_LONG -1 )) : bit; } -static struct s390_map_info *get_map_info (struct s390_io_adapter *adapter, -u64 addr) +static struct page *get_map_page(struct kvm *kvm, + struct s390_io_adapter *adapter,
adapter seems to be unused in this function now? Should we remove it from the parameter list?
Quoted 120 lines
arch/s390/kvm/interrupt.c +41
-36+ u64 uaddr) { -struct s390_map_info *map; - -if (!adapter) -return NULL ; +struct page *page =NULL ; -list_for_each_entry (map, &adapter->maps, list) { -if (map->guest_addr == addr) -return map; - } -return NULL ; +down_read (&kvm->mm->mmap_sem); +get_user_pages_remote (NULL , kvm->mm, uaddr,1 ,FOLL_WRITE , + &page,NULL ,NULL ); +up_read (&kvm->mm->mmap_sem); +return page; } static int adapter_indicators_set(struct kvm *kvm,@@ -2720,30 +2641,35 @@ static int adapter_indicators_set(struct kvm *kvm, {unsigned long bit;int summary_set, idx; -struct s390_map_info *info; +struct page *ind_page, *summary_page;void *map; - info =get_map_info (adapter, adapter_int->ind_addr); -if (!info) + ind_page =get_map_page (kvm, adapter, adapter_int->ind_addr); +if (!ind_page)return -1 ; - map =page_address (info->page); - bit =get_ind_bit (info->addr, adapter_int->ind_offset, adapter->swap); -set_bit (bit, map); - idx =srcu_read_lock (&kvm->srcu); -mark_page_dirty (kvm, info->guest_addr >>PAGE_SHIFT ); -set_page_dirty_lock (info->page); - info =get_map_info (adapter, adapter_int->summary_addr); -if (!info) { -srcu_read_unlock (&kvm->srcu, idx); + summary_page =get_map_page (kvm, adapter, adapter_int->summary_addr); +if (!summary_page) { +put_page (ind_page);return -1 ; } - map =page_address (info->page); - bit =get_ind_bit (info->addr, adapter_int->summary_offset, - adapter->swap); + + idx =srcu_read_lock (&kvm->srcu); + map =page_address (ind_page); + bit =get_ind_bit (adapter_int->ind_addr, + adapter_int->ind_offset, adapter->swap); +set_bit (bit, map); +mark_page_dirty (kvm, adapter_int->ind_addr >>PAGE_SHIFT ); +set_page_dirty_lock (ind_page); + map =page_address (summary_page); + bit =get_ind_bit (adapter_int->summary_addr, + adapter_int->summary_offset, adapter->swap); summary_set =test_and_set_bit (bit, map); -mark_page_dirty (kvm, info->guest_addr >>PAGE_SHIFT ); -set_page_dirty_lock (info->page); +mark_page_dirty (kvm, adapter_int->summary_addr >>PAGE_SHIFT ); +set_page_dirty_lock (summary_page);srcu_read_unlock (&kvm->srcu, idx); + +put_page (ind_page); +put_page (summary_page);return summary_set ?0 :1 ; }@@ -2765,9 +2691,7 @@ static int set_adapter_int(struct kvm_kernel_irq_routing_entry *e, adapter =get_io_adapter (kvm, e->adapter.adapter_id);if (!adapter)return -1 ; -down_read (&adapter->maps_lock); ret =adapter_indicators_set (kvm, adapter, &e->adapter); -up_read (&adapter->maps_lock);if ((ret >0 ) && !adapter->masked) { ret =kvm_s390_inject_airq (kvm, adapter);if (ret ==0 )@@ -2818,23 +2742,27 @@ int kvm_set_routing_entry(struct kvm *kvm,struct kvm_kernel_irq_routing_entry *e, const struct kvm_irq_routing_entry *ue) { - int ret; + u64 uaddr;switch (ue->type) { +/* we store the userspace addresses instead of the guest addresses */ case KVM_IRQ_ROUTING_S390_ADAPTER : e->set = set_adapter_int; - e->adapter.summary_addr = ue->u.adapter.summary_addr; - e->adapter.ind_addr = ue->u.adapter.ind_addr; + uaddr =gmap_translate (kvm->arch.gmap, ue->u.adapter.summary_addr); +if (uaddr == -EFAULT ) +return -EFAULT ; + e->adapter.summary_addr = uaddr; + uaddr =gmap_translate (kvm->arch.gmap, ue->u.adapter.ind_addr); +if (uaddr == -EFAULT ) +return -EFAULT ; + e->adapter.ind_addr = uaddr; e->adapter.summary_offset = ue->u.adapter.summary_offset; e->adapter.ind_offset = ue->u.adapter.ind_offset; e->adapter.adapter_id = ue->u.adapter.adapter_id; - ret =0 ; -break ; +return 0 ;default : - ret = -EINVAL ; +return -EINVAL ; } - -return ret; } int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e, struct kvm *kvm,
Re: [PATCH v3.1 02/37] KVM: s390/interrupt: do not pin adapter interrupt pages
Quoted 44 lines · Cornelia Huck
Quoted 27 lines · On Fri, 21 Feb 2020 03:09:42 -0500 Christian Borntraeger…
From: Ulrich Weigand <[email protected]>
The adapter interrupt page containing the indicator bits is currently pinned. That means that a guest with many devices can pin a lot of memory pages in the host. This also complicates the reference tracking which is needed for memory management handling of protected virtual machines. It might also have some strange side effects for madvise
MADV_DONTNEEDand other things.We can simply try to get the userspace page set the bits and free the page. By storing the userspace address in the irq routing entry instead of the guest address we can actually avoid many lookups and list walks so that this variant is very likely not slower.
If userspace messes around with the memory slots the worst thing that can happen is that we write to some other memory within that process. As we get the the page with
FOLL_WRITEthis can also not be used to write to shared read-only pages.Signed-off-by Ulrich Weigand <[email protected]>[[email protected]: patch simplification]Signed-off-by Christian Borntraeger <[email protected]>--- Documentation/virt/kvm/devices/s390_flic.rst | 11 +- arch/s390/include/asm/kvm_host.h | 3 - arch/s390/kvm/interrupt.c | 172 ++++++------------- 3 files changed, 52 insertions(+), 134 deletions(-)(...)
arch/s390/kvm/interrupt.c static int modify_io_adapter(struct kvm_device *dev, · line 2384
Quoted 8 lines
arch/s390/kvm/interrupt.c +4
-0@@ -2456,12 +2378,13 @@ static int modify_io_adapter(struct kvm_device *dev,if (ret >0 ) ret =0 ;break ; +/* +* We resolve the gpa to hva when setting the IRQ routing. the set_irq +* code uses get_user_pages_remote() to do the actual write. +*/ What about:
Quoted 3 lines
"The following operations are no longer needed and therefore no-ops. The gpa to hva translation is done when an IRQ route is set up. The
set_irqcode usesget_user_pages_remote()to do the actual write."
ack, reads better.
Quoted 10 lines
arch/s390/kvm/interrupt.c static int modify_io_adapter(struct kvm_device *dev, · line 2387
Quoted 8 lines
arch/s390/kvm/interrupt.c +1
-4case KVM_S390_IO_ADAPTER_MAP : - ret =kvm_s390_adapter_map (dev->kvm, req.id, req.addr); -break ;case KVM_S390_IO_ADAPTER_UNMAP : - ret =kvm_s390_adapter_unmap (dev->kvm, req.id, req.addr); -break ; +return 0 ;I think
Quoted 3 lines
ret = 0; break;would be better, as the other cases do not do a direct return, either.
fine with me. ack
Quoted 8 lines
Quoted 8 lines
arch/s390/kvm/interrupt.c +0
-0default : ret = -EINVAL ; }@@ -2699,19 +2622,17 @@ static unsigned long get_ind_bit(__u64 addr, unsigned long bit_nr, bool swap)return swap ? (bit ^ (BITS_PER_LONG -1 )) : bit; }
Quoted 6 lines
arch/s390/kvm/interrupt.c static unsigned long get_ind_bit(__u64 addr, unsigned long bit_nr, bool swap) · line 2626
Quoted 4 lines
arch/s390/kvm/interrupt.c +2
-2-static struct s390_map_info *get_map_info (struct s390_io_adapter *adapter, -u64 addr) +static struct page *get_map_page(struct kvm *kvm, + struct s390_io_adapter *adapter,adapter seems to be unused in this function now? Should we remove it from the parameter list?
yep, thanks. removed.
PATCH v3 3/37 s390/protvirt: introduce host side setup
In reply to Christian BorntraegerFrom: Vasily Gorbik <[email protected]>
Add "prot_virt" command line option which controls if the kernel protected VMs support is enabled at early boot time. This has to be done early, because it needs large amounts of memory and will disable some features like STP time sync for the lpar.
Extend ultravisor info definitions and expose it via uv_info struct filled in during startup.
--- .../admin-guide/kernel-parameters.txt | 5 ++ arch/s390/boot/Makefile | 2 +- arch/s390/boot/uv.c | 21 +++++++- arch/s390/include/asm/uv.h | 46 +++++++++++++++- arch/s390/kernel/Makefile | 1 + arch/s390/kernel/setup.c | 4 -- arch/s390/kernel/uv.c | 52 +++++++++++++++++++ 7 files changed, 123 insertions(+), 8 deletions(-) create mode 100644 arch/s390/kernel/uv.c
Documentation/admin-guide/kernel-parameters.txt +5 -0
@@ -3795,6 +3795,11 @@ before loading. See Documentation/admin-guide/blockdev/ramdisk.rst. + prot_virt= [S390] enable hosting protected virtual machines + isolated from the hypervisor (if hardware supports + that). + Format: <bool> + psi= [KNL] Enable or disable pressure stall information tracking. Format: <bool>
arch/s390/boot/Makefile +1 -1
@@ -37,7 +37,7 @@ CFLAGS_sclp_early_core.o += -I$(srctree)/drivers/s390/char obj-y := head.o als.o startup.o mem_detect.o ipl_parm.o ipl_report.o obj-y += string.o ebcdic.o sclp_early_core.o mem.o ipl_vmparm.o cmdline.o obj-y += version.o pgm_check_info.o ctype.o text_dma.o -obj-$(CONFIG_PROTECTED_VIRTUALIZATION_GUEST) += uv.o +obj-$(findstring y, $(CONFIG_PROTECTED_VIRTUALIZATION_GUEST) $(CONFIG_PGSTE)) += uv.o obj-$(CONFIG_RELOCATABLE) += machine_kexec_reloc.o obj-$(CONFIG_RANDOMIZE_BASE) += kaslr.o targets := bzImage startup.a section_cmp.boot.data section_cmp.boot.preserved.data $(obj-y)
arch/s390/boot/uv.c +20 -1
@@ -3,7 +3,13 @@#include <asm/facility.h> #include <asm/sections.h> +/* will be used in arch/s390/kernel/uv.c */ +#ifdef CONFIG_PROTECTED_VIRTUALIZATION_GUEST int __bootdata_preserved (prot_virt_guest ); +#endif +#if IS_ENABLED (CONFIG_KVM ) +struct uv_info __bootdata_preserved (uv_info ); +#endif void uv_query_info (void ) {
@@ -19,7 +25,20 @@ void uv_query_info(void)if (uv_call (0 , (uint64_t )&uvcb) && uvcb.header.rc !=0x100 )return ; -if (test_bit_inv (BIT_UVC_CMD_SET_SHARED_ACCESS , (unsigned long *)uvcb.inst_calls_list) && +if (IS_ENABLED (CONFIG_KVM )) { +memcpy (uv_info.inst_calls_list, uvcb.inst_calls_list,sizeof (uv_info.inst_calls_list)); + uv_info.uv_base_stor_len = uvcb.uv_base_stor_len; + uv_info.guest_base_stor_len = uvcb.conf_base_phys_stor_len; + uv_info.guest_virt_base_stor_len = uvcb.conf_base_virt_stor_len; + uv_info.guest_virt_var_stor_len = uvcb.conf_virt_var_stor_len; + uv_info.guest_cpu_stor_len = uvcb.cpu_stor_len; + uv_info.max_sec_stor_addr =ALIGN (uvcb.max_guest_stor_addr,PAGE_SIZE ); + uv_info.max_num_sec_conf = uvcb.max_num_sec_conf; + uv_info.max_guest_cpus = uvcb.max_guest_cpus; + } + +if (IS_ENABLED (CONFIG_PROTECTED_VIRTUALIZATION_GUEST ) && +test_bit_inv (BIT_UVC_CMD_SET_SHARED_ACCESS , (unsigned long *)uvcb.inst_calls_list) &&test_bit_inv (BIT_UVC_CMD_REMOVE_SHARED_ACCESS , (unsigned long *)uvcb.inst_calls_list)) prot_virt_guest =1 ; }
arch/s390/include/asm/uv.h +44 -2
68 lines not on this page · raw message
arch/s390/kernel/Makefile +1 -0
@@ -78,6 +78,7 @@ obj-$(CONFIG_PERF_EVENTS) += perf_cpum_cf_events.o perf_regs.o obj-$(CONFIG_PERF_EVENTS) += perf_cpum_cf_diag.o obj-$(CONFIG_TRACEPOINTS) += trace.o +obj-$(findstring y, $(CONFIG_PROTECTED_VIRTUALIZATION_GUEST) $(CONFIG_PGSTE)) += uv.o # vdso obj-y += vdso64/
arch/s390/kernel/setup.c +0 -4
@@ -92,10 +92,6 @@ char elf_platform[ELF_PLATFORM_SIZE];unsigned long int_hwcap =0 ; -#ifdef CONFIG_PROTECTED_VIRTUALIZATION_GUEST -int __bootdata_preserved (prot_virt_guest ); -#endif -int __bootdata (noexec_disabled );int __bootdata (memory_end_set );unsigned long __bootdata (memory_end );
arch/s390/kernel/uv.c new file +52 -0
52 lines not on this page · raw message
Signature · 1 line
2.25.0
Re: [PATCH v3 03/37] s390/protvirt: introduce host side setup
Quoted 15 lines · On Thu, 20 Feb 2020 05:39:46 -0500 Christian Borntraeger…
From: Vasily Gorbik <[email protected]>
Add "
prot_virt" command line option which controls if the kernel protected VMs support is enabled at early boot time. This has to be done early, because it needs large amounts of memory and will disable some features like STP time sync for the lpar.Extend ultravisor info definitions and expose it via
uv_infostruct filled in during startup.Signed-off-by Vasily Gorbik <[email protected]>Reviewed-by Thomas Huth <[email protected]>[[email protected]: patch merging, splitting, fixing]Signed-off-by Christian Borntraeger <[email protected]>
Quoted 10 lines
--- .../admin-guide/kernel-parameters.txt | 5 ++ arch/s390/boot/Makefile | 2 +- arch/s390/boot/uv.c | 21 +++++++- arch/s390/include/asm/uv.h | 46 +++++++++++++++- arch/s390/kernel/Makefile | 1 + arch/s390/kernel/setup.c | 4 -- arch/s390/kernel/uv.c | 52 +++++++++++++++++++ 7 files changed, 123 insertions(+), 8 deletions(-) create mode 100644 arch/s390/kernel/uv.c
PATCH v3 4/37 s390/protvirt: add ultravisor initialization
In reply to Christian BorntraegerFrom: Vasily Gorbik <[email protected]>
Before being able to host protected virtual machines, donate some of the memory to the ultravisor. Besides that the ultravisor might impose addressing limitations for memory used to back protected VM storage. Treat that limit as protected virtualization host's virtual memory limit.
--- arch/s390/include/asm/uv.h | 15 ++++++++++++ arch/s390/kernel/setup.c | 5 ++++ arch/s390/kernel/uv.c | 48 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+)
arch/s390/include/asm/uv.h +15 -0
@@ -23,12 +23,14 @@#define UVC_RC_NO_RESUME 0x0007#define UVC_CMD_QUI 0x0001 +#define UVC_CMD_INIT_UV 0x000f#define UVC_CMD_SET_SHARED_ACCESS 0x1000#define UVC_CMD_REMOVE_SHARED_ACCESS 0x1001/* Bits in installed uv calls */ enum uv_cmds_inst {BIT_UVC_CMD_QUI =0 , +BIT_UVC_CMD_INIT_UV =1 ,BIT_UVC_CMD_SET_SHARED_ACCESS =8 ,BIT_UVC_CMD_REMOVE_SHARED_ACCESS =9 , };
@@ -59,6 +61,14 @@ struct uv_cb_qui {u8 reserveda0[200 -160 ]; } __packed__aligned(8) ; +struct uv_cb_init { +struct uv_cb_header header; +u64 reserved08[2 ]; +u64 stor_origin; +u64 stor_len; +u64 reserved28[4 ]; +} __packed__aligned(8) ; +struct uv_cb_share {struct uv_cb_header header;u64 reserved08[3 ];
@@ -160,8 +170,13 @@ static inline int is_prot_virt_host(void) {return prot_virt_host; } + +void setup_uv (void ); +void adjust_to_uv_max (unsigned long *vmax);#else #define is_prot_virt_host () 0 +static inline void setup_uv (void ) {} +static inline void adjust_to_uv_max (unsigned long *vmax) {}#endif #if defined(CONFIG_PROTECTED_VIRTUALIZATION_GUEST) || \
arch/s390/kernel/setup.c +5 -0
@@ -560,6 +560,9 @@ static void __init setup_memory_end(void) vmax = _REGION1_SIZE;/* 4-level kernel page table */ } +if (is_prot_virt_host ()) +adjust_to_uv_max (&vmax); +/* module area is at the end of the kernel address space. */ MODULES_END = vmax;MODULES_VADDR =MODULES_END -MODULES_LEN ;
@@ -1134,6 +1137,8 @@ void __init setup_arch(char **cmdline_p)*/ memblock_trim_memory (1UL << (MAX_ORDER -1 +PAGE_SHIFT )); +if (is_prot_virt_host ()) +setup_uv ();setup_memory_end ();setup_memory ();dma_contiguous_reserve (memory_end);
arch/s390/kernel/uv.c +48 -0
52 lines not on this page · raw message
Signature · 1 line
2.25.0
PATCH v3 5/37 s390/mm: provide memory management functions for protected KVM guests
In reply to Christian BorntraegerFrom: Claudio Imbrenda <[email protected]>
This provides the basic ultravisor calls and page table handling to cope with secure guests:
- provide arch_make_page_accessible
- make pages accessible after unmapping of secure guests
- provide the ultravisor commands convert to/from secure
- provide the ultravisor commands pin/unpin shared
- provide callbacks to make pages secure (inacccessible)
- we check for the expected pin count to only make pages secure if the host is not accessing them
- we fence hugetlbfs for secure pages
--- arch/s390/include/asm/gmap.h | 4 + arch/s390/include/asm/mmu.h | 2 + arch/s390/include/asm/mmu_context.h | 1 + arch/s390/include/asm/page.h | 5 + arch/s390/include/asm/pgtable.h | 35 ++++- arch/s390/include/asm/uv.h | 31 ++++ arch/s390/kernel/uv.c | 227 ++++++++++++++++++++++++++++ 7 files changed, 300 insertions(+), 5 deletions(-)
arch/s390/include/asm/gmap.h +4 -0
@@ -9,6 +9,7 @@#ifndef _ASM_S390_GMAP_H#define _ASM_S390_GMAP_H +#include <linux/radix-tree.h> #include <linux/refcount.h> /* Generic bits for GMAP notification on DAT table entry changes. */
@@ -31,6 +32,7 @@* @table: pointer to the page directory * @asce: address space control element for gmap page table * @pfault_enabled: defines if pfaults are applicable for the guest +* @guest_handle: protected virtual machine handle for the ultravisor * @host_to_rmap: radix tree with gmap_rmap lists * @children: list of shadow gmap structures * @pt_list: list of all page tables used in the shadow guest address space
@@ -54,6 +56,8 @@ struct gmap {unsigned long asce_end;void *private;bool pfault_enabled; +/* only set for protected virtual machines */ +unsigned long guest_handle;/* Additional data for shadow guest address spaces */ struct radix_tree_root host_to_rmap;struct list_head children;
arch/s390/include/asm/mmu.h +2 -0
@@ -16,6 +16,8 @@ typedef struct {unsigned long asce;unsigned long asce_limit;unsigned long vdso_base; +/* The mmu context belongs to a secure guest. */ +atomic_t is_protected;/* * The following bitfields need a down_write on the mm * semaphore when they are written to. As they are only
arch/s390/include/asm/mmu_context.h +1 -0
@@ -23,6 +23,7 @@ static inline int init_new_context(struct task_struct *tsk,INIT_LIST_HEAD (&mm->context.gmap_list);cpumask_clear (&mm->context.cpu_attach_mask);atomic_set (&mm->context.flush_count,0 ); +atomic_set (&mm->context.is_protected,0 ); mm->context.gmap_asce =0 ; mm->context.flush_mm =0 ; mm->context.compat_mm =test_thread_flag (TIF_31BIT );
arch/s390/include/asm/page.h +5 -0
@@ -153,6 +153,11 @@ static inline int devmem_is_allowed(unsigned long pfn)#define HAVE_ARCH_FREE_PAGE #define HAVE_ARCH_ALLOC_PAGE +#if IS_ENABLED (CONFIG_PGSTE ) +int arch_make_page_accessible (struct page *page); +#define HAVE_ARCH_MAKE_PAGE_ACCESSIBLE +#endif +#endif /* !__ASSEMBLY__ */ #define __PAGE_OFFSET 0x0UL
arch/s390/include/asm/pgtable.h +30 -5
@@ -19,6 +19,7 @@#include <linux/atomic.h> #include <asm/bug.h> #include <asm/page.h> +#include <asm/uv.h> extern pgd_t swapper_pg_dir[];extern void paging_init (void );
@@ -520,6 +521,15 @@ static inline int mm_has_pgste(struct mm_struct *mm)return 0 ; } +static inline int mm_is_protected (struct mm_struct *mm) +{ +#ifdef CONFIG_PGSTE +if (unlikely (atomic_read (&mm->context.is_protected))) +return 1 ; +#endif +return 0 ; +} +static inline int mm_alloc_pgste (struct mm_struct *mm) {#ifdef CONFIG_PGSTE
@@ -1061,7 +1071,12 @@ static inline int ptep_clear_flush_young(struct vm_area_struct *vma,static inline pte_t ptep_get_and_clear (struct mm_struct *mm,unsigned long addr,pte_t *ptep) { -return ptep_xchg_lazy (mm, addr, ptep,__pte (_PAGE_INVALID)); +pte_t res; + + res =ptep_xchg_lazy (mm, addr, ptep,__pte (_PAGE_INVALID)); +if (mm_is_protected (mm) &&pte_present (res)) +uv_convert_from_secure (pte_val (res) &PAGE_MASK ); +return res; }#define __HAVE_ARCH_PTEP_MODIFY_PROT_TRANSACTION
@@ -1073,7 +1088,12 @@ void ptep_modify_prot_commit(struct vm_area_struct *, unsigned long,static inline pte_t ptep_clear_flush (struct vm_area_struct *vma,unsigned long addr,pte_t *ptep) { -return ptep_xchg_direct (vma->vm_mm, addr, ptep,__pte (_PAGE_INVALID)); +pte_t res; + + res =ptep_xchg_direct (vma->vm_mm, addr, ptep,__pte (_PAGE_INVALID)); +if (mm_is_protected (vma->vm_mm) &&pte_present (res)) +uv_convert_from_secure (pte_val (res) &PAGE_MASK ); +return res; }/*
@@ -1088,12 +1108,17 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm,unsigned long addr, pte_t *ptep, int full) { + pte_t res; +if (full) { - pte_t pte = *ptep; + res = *ptep; *ptep =__pte (_PAGE_INVALID); -return pte; + }else { + res =ptep_xchg_lazy (mm, addr, ptep,__pte (_PAGE_INVALID)); } -return ptep_xchg_lazy (mm, addr, ptep,__pte (_PAGE_INVALID)); +if (mm_is_protected (mm) &&pte_present (res)) +uv_convert_from_secure (pte_val (res) &PAGE_MASK ); +return res; }#define __HAVE_ARCH_PTEP_SET_WRPROTECT
arch/s390/include/asm/uv.h +31 -0
@@ -15,6 +15,7 @@#include <linux/errno.h> #include <linux/bug.h> #include <asm/page.h> +#include <asm/gmap.h> #define UVC_RC_EXECUTED 0x0001#define UVC_RC_INV_CMD 0x0002
@@ -24,6 +25,10 @@#define UVC_CMD_QUI 0x0001#define UVC_CMD_INIT_UV 0x000f +#define UVC_CMD_CONV_TO_SEC_STOR 0x0200 +#define UVC_CMD_CONV_FROM_SEC_STOR 0x0201 +#define UVC_CMD_PIN_PAGE_SHARED 0x0341 +#define UVC_CMD_UNPIN_PAGE_SHARED 0x0342#define UVC_CMD_SET_SHARED_ACCESS 0x1000#define UVC_CMD_REMOVE_SHARED_ACCESS 0x1001
@@ -31,8 +36,12 @@enum uv_cmds_inst {BIT_UVC_CMD_QUI =0 ,BIT_UVC_CMD_INIT_UV =1 , +BIT_UVC_CMD_CONV_TO_SEC_STOR =6 , +BIT_UVC_CMD_CONV_FROM_SEC_STOR =7 ,BIT_UVC_CMD_SET_SHARED_ACCESS =8 ,BIT_UVC_CMD_REMOVE_SHARED_ACCESS =9 , +BIT_UVC_CMD_PIN_PAGE_SHARED =21 , +BIT_UVC_CMD_UNPIN_PAGE_SHARED =22 , };struct uv_cb_header {
@@ -69,6 +78,19 @@ struct uv_cb_init {u64 reserved28[4 ]; } __packed__aligned(8) ; +struct uv_cb_cts { +struct uv_cb_header header; +u64 reserved08[2 ]; +u64 guest_handle; +u64 gaddr; +} __packed__aligned(8) ; + +struct uv_cb_cfs { +struct uv_cb_header header; +u64 reserved08[2 ]; +u64 paddr; +} __packed__aligned(8) ; +struct uv_cb_share {struct uv_cb_header header;u64 reserved08[3 ];
@@ -171,12 +193,21 @@ static inline int is_prot_virt_host(void)return prot_virt_host; } +int gmap_make_secure (struct gmap *gmap,unsigned long gaddr,void *uvcb); +int uv_convert_from_secure (unsigned long paddr); +int gmap_convert_to_secure (struct gmap *gmap,unsigned long gaddr); +void setup_uv (void );void adjust_to_uv_max (unsigned long *vmax);#else #define is_prot_virt_host () 0static inline void setup_uv (void ) {}static inline void adjust_to_uv_max (unsigned long *vmax) {} + +static inline int uv_convert_from_secure (unsigned long paddr) +{ +return 0 ; +}#endif #if defined(CONFIG_PROTECTED_VIRTUALIZATION_GUEST) || \
arch/s390/kernel/uv.c +227 -0
237 lines not on this page · raw message
Signature · 1 line
2.25.0
Re: [PATCH v3 05/37] s390/mm: provide memory management functions for protected KVM guests
Quoted 13 lines · Christian Borntraeger
From: Claudio Imbrenda <[email protected]>
This provides the basic ultravisor calls and page table handling to cope with secure guests:
- providearch_make_page_accessible
- make pages accessible after unmapping of secure guests
- provide the ultravisor commands convert to/from secure
- provide the ultravisor commands pin/unpin shared
- provide callbacks to make pages secure (inacccessible)
- we check for the expected pin count to only make pages secure if the host is not accessing them
- we fence hugetlbfs for secure pages
Quoted 5 lines
Co-developed-by Ulrich Weigand <[email protected]>Signed-off-by Ulrich Weigand <[email protected]>Signed-off-by Claudio Imbrenda <[email protected]>[[email protected]: patch merging, splitting, fixing]Signed-off-by Christian Borntraeger <[email protected]>
Signature · 3 lines
Thanks, David / dhildenb
PATCH v3 6/37 s390/mm: add (non)secure page access exceptions handlers
In reply to Christian BorntraegerFrom: Vasily Gorbik <[email protected]>
Add exceptions handlers performing transparent transition of non-secure pages to secure (import) upon guest access and secure pages to non-secure (export) upon hypervisor access.
--- arch/s390/kernel/pgm_check.S | 4 +- arch/s390/mm/fault.c | 78 ++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 2 deletions(-)
arch/s390/kernel/pgm_check.S +2 -2
@@ -78,8 +78,8 @@ PGM_CHECK(do_dat_exception) /* 39 */ PGM_CHECK(do_dat_exception) /* 3a */ PGM_CHECK(do_dat_exception) /* 3b */ PGM_CHECK_DEFAULT /* 3c */ -PGM_CHECK_DEFAULT /* 3d */ -PGM_CHECK_DEFAULT /* 3e */ +PGM_CHECK(do_secure_storage_access) /* 3d */ +PGM_CHECK(do_non_secure_storage_access) /* 3e */ PGM_CHECK_DEFAULT /* 3f */ PGM_CHECK(monitor_event_exception) /* 40 */ PGM_CHECK_DEFAULT /* 41 */
arch/s390/mm/fault.c +78 -0
87 lines not on this page · raw message
Signature · 1 line
2.25.0
Re: [PATCH v3 06/37] s390/mm: add (non)secure page access exceptions handlers
Quoted 117 lines · Christian Borntraeger
From: Vasily Gorbik <[email protected]>
Add exceptions handlers performing transparent transition of non-secure pages to secure (import) upon guest access and secure pages to non-secure (export) upon hypervisor access.
Signed-off-by Vasily Gorbik <[email protected]>[[email protected]: adding checks for failures]Signed-off-by Janosch Frank <[email protected]>[[email protected]: adding a check for gmap fault]Signed-off-by Claudio Imbrenda <[email protected]>[[email protected]: patch merging, splitting, fixing]Signed-off-by Christian Borntraeger <[email protected]>--- arch/s390/kernel/pgm_check.S | 4 +- arch/s390/mm/fault.c | 78 ++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 2 deletions(-)arch/s390/kernel/pgm_check.S +2
-2@@ -78,8 +78,8 @@ PGM_CHECK(do_dat_exception) /* 39 */ PGM_CHECK(do_dat_exception) /* 3a */ PGM_CHECK(do_dat_exception) /* 3b */ PGM_CHECK_DEFAULT /* 3c */ -PGM_CHECK_DEFAULT /* 3d */ -PGM_CHECK_DEFAULT /* 3e */ +PGM_CHECK(do_secure_storage_access) /* 3d */ +PGM_CHECK(do_non_secure_storage_access) /* 3e */ PGM_CHECK_DEFAULT /* 3f */ PGM_CHECK(monitor_event_exception) /* 40 */ PGM_CHECK_DEFAULT /* 41 */arch/s390/mm/fault.c +68
-0@@ -38,6 +38,7 @@#include <asm/irq.h> #include <asm/mmu_context.h> #include <asm/facility.h> +#include <asm/uv.h> #include "../kernel/entry.h" #define __FAIL_ADDR_MASK -4096L@@ -816,3 +817,80 @@ static int __init pfault_irq_init(void)early_initcall (pfault_irq_init);#endif /* CONFIG_PFAULT */ + +#if IS_ENABLED (CONFIG_PGSTE ) +void do_secure_storage_access (struct pt_regs *regs) +{ +unsigned long addr = regs->int_parm_long & __FAIL_ADDR_MASK; +struct vm_area_struct *vma; +struct mm_struct *mm; +struct page *page; +int rc; + +switch (get_fault_type (regs)) { +case USER_FAULT : + mm = current->mm; +down_read (&mm->mmap_sem); + vma =find_vma (mm, addr); +if (!vma) { +up_read (&mm->mmap_sem); +do_fault_error (regs,VM_READ |VM_WRITE ,VM_FAULT_BADMAP ); +break ; + } + page =follow_page (vma, addr,FOLL_WRITE |FOLL_GET ); +if (IS_ERR_OR_NULL (page)) { +up_read (&mm->mmap_sem); +break ; + } +if (arch_make_page_accessible (page)) +send_sig (SIGSEGV , current,0 ); +put_page (page); +up_read (&mm->mmap_sem); +break ; +case KERNEL_FAULT : + page =phys_to_page (addr); +if (unlikely (!try_get_page (page))) +break ; + rc =arch_make_page_accessible (page); +put_page (page); +if (rc) +BUG (); +break ; +case VDSO_FAULT : +/* fallthrough */ +case GMAP_FAULT : +/* fallthrough */ +default : +do_fault_error (regs,VM_READ |VM_WRITE ,VM_FAULT_BADMAP ); +WARN_ON_ONCE (1 ); + } +} +NOKPROBE_SYMBOL (do_secure_storage_access); + +void do_non_secure_storage_access (struct pt_regs *regs) +{ +unsigned long gaddr = regs->int_parm_long & __FAIL_ADDR_MASK; +struct gmap *gmap = (struct gmap *)S390_lowcore.gmap; + +if (get_fault_type (regs) !=GMAP_FAULT ) { +do_fault_error (regs,VM_READ |VM_WRITE ,VM_FAULT_BADMAP ); +WARN_ON_ONCE (1 ); +return ; + } + +if (gmap_convert_to_secure (gmap, gaddr) == -EINVAL ) +send_sig (SIGSEGV , current,0 ); +} +NOKPROBE_SYMBOL (do_non_secure_storage_access); + +#else
arch/s390/mm/fault.c static int __init pfault_irq_init(void) · line 896
Quoted 10 lines
arch/s390/mm/fault.c +10
-0+void do_secure_storage_access (struct pt_regs *regs) +{ +default_trap_handler (regs); +} + +void do_non_secure_storage_access (struct pt_regs *regs) +{ +default_trap_handler (regs); +} +#endif
Signature · 3 lines
Thanks, David / dhildenb
PATCH v3 7/37 KVM: s390: protvirt: Add UV debug trace
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
Let's have some debug traces which stay around for longer than the guest.
--- arch/s390/kvm/kvm-s390.c | 9 ++++++++- arch/s390/kvm/kvm-s390.h | 11 +++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-)
arch/s390/kvm/kvm-s390.c +8 -1
@@ -220,6 +220,7 @@ static struct kvm_s390_vm_cpu_subfunc kvm_s390_available_subfunc;static struct gmap_notifier gmap_notifier;static struct gmap_notifier vsie_gmap_notifier;debug_info_t *kvm_s390_dbf; +debug_info_t *kvm_s390_dbf_uv;/* Section: not file related */ int kvm_arch_hardware_enable (void )
@@ -460,7 +461,12 @@ int kvm_arch_init(void *opaque)if (!kvm_s390_dbf)return -ENOMEM ; -if (debug_register_view (kvm_s390_dbf, &debug_sprintf_view)) + kvm_s390_dbf_uv =debug_register ("kvm-uv" ,32 ,1 ,7 *sizeof (long )); +if (!kvm_s390_dbf_uv) + goto out; + +if (debug_register_view (kvm_s390_dbf, &debug_sprintf_view) || +debug_register_view (kvm_s390_dbf_uv, &debug_sprintf_view)) goto out;kvm_s390_cpu_feat_init ();
@@ -487,6 +493,7 @@ void kvm_arch_exit(void) {kvm_s390_gib_destroy ();debug_unregister (kvm_s390_dbf); +debug_unregister (kvm_s390_dbf_uv); }/* Section: device related */
arch/s390/kvm/kvm-s390.h +11 -0
@@ -25,6 +25,17 @@#define IS_ITDB_VALID (vcpu) ((*(char *)vcpu->arch.sie_block->itdba == TDB_FORMAT1))extern debug_info_t *kvm_s390_dbf; +extern debug_info_t *kvm_s390_dbf_uv; + +#define KVM_UV_EVENT(d_kvm, d_loglevel, d_string, d_args...)\ +do { \ + debug_sprintf_event((d_kvm)->arch.dbf, d_loglevel, d_string "\n", \ + d_args); \ + debug_sprintf_event(kvm_s390_dbf_uv, d_loglevel, \ + "%d: " d_string "\n", (d_kvm)->userspace_pid, \ + d_args); \ +} while (0) + #define KVM_EVENT(d_loglevel, d_string, d_args...)\ do { \ debug_sprintf_event(kvm_s390_dbf, d_loglevel, d_string "\n", \
Signature · 1 line
2.25.0
PATCH v3 8/37 KVM: s390: add new variants of UV CALL
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
This adds two new helper functions for doing UV CALLs.
The first variant handles UV CALLs that might have longer busy conditions or just need longer when doing partial completion. We should schedule when necessary.
The second variant handles UV CALLs that only need the handle but have no payload (e.g. destroying a VM). We can provide a simple wrapper for those.
--- arch/s390/include/asm/uv.h | 65 +++++++++++++++++++++++++++++++++++--- 1 file changed, 60 insertions(+), 5 deletions(-)
arch/s390/include/asm/uv.h +60 -5
@@ -14,6 +14,7 @@#include <linux/types.h> #include <linux/errno.h> #include <linux/bug.h> +#include <linux/sched.h> #include <asm/page.h> #include <asm/gmap.h>
@@ -91,6 +92,19 @@ struct uv_cb_cfs {u64 paddr; } __packed__aligned(8) ; +/* +* A common UV call struct for calls that take no payload +* Examples: +* Destroy cpu/config +* Verify +*/ +struct uv_cb_nodata { +struct uv_cb_header header; +u64 reserved08[2 ]; +u64 handle; +u64 reserved20[4 ]; +} __packed__aligned(8) ; +struct uv_cb_share {struct uv_cb_header header;u64 reserved08[3 ];
@@ -98,21 +112,62 @@ struct uv_cb_share {u64 reserved28; } __packed__aligned(8) ; -static inline int uv_call (unsigned long r1,unsigned long r2) +static inline int __uv_call (unsigned long r1,unsigned long r2) {int cc; asmvolatile ( -"0: .insn rrf,0xB9A40000,%[r1],%[r2],0,0\n" -" brc 3,0b\n" -" ipm %[cc]\n" -" srl %[cc],28\n" +" .insn rrf,0xB9A40000,%[r1],%[r2],0,0\n" +" ipm %[cc]\n" +" srl %[cc],28\n" : [cc]"=d" (cc) : [r1]"a" (r1), [r2]"a" (r2) :"memory" ,"cc" );return cc; } +static inline int uv_call (unsigned long r1,unsigned long r2) +{ +int cc; + +do { + cc =__uv_call (r1, r2); + }while (cc >1 ); +return cc; +} + +/* Low level uv_call that avoids stalls for long running busy conditions */ +static inline int uv_call_sched (unsigned long r1,unsigned long r2) +{ +int cc; + +do { + cc =__uv_call (r1, r2); +cond_resched (); + }while (cc >1 ); +return cc; +} + +/* +* special variant of uv_call that only transports the cpu or guest +* handle and the command, like destroy or verify. +*/ +static inline int uv_cmd_nodata (u64 handle,u16 cmd,u16 *rc,u16 *rrc) +{ +struct uv_cb_nodata uvcb = { + .header.cmd = cmd, + .header.len =sizeof (uvcb), + .handle = handle, + }; +int cc; + +WARN (!handle,"No handle provided to Ultravisor call cmd %x\n" , cmd); + cc =uv_call_sched (0 , (u64)&uvcb); + *rc = uvcb.header.rc; + *rrc = uvcb.header.rrc; +return cc ? -EINVAL :0 ; +} +struct uv_info {unsigned long inst_calls_list[4 ];unsigned long uv_base_stor_len;
Signature · 1 line
2.25.0
PATCH v3 9/37 KVM: s390: protvirt: Add initial vm and cpu lifecycle handling
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
This contains 3 main changes:
1. changes in SIE control block handling for secure guests
2. helper functions for create/destroy/unpack secure guests
3. KVM_S390_PV_COMMAND ioctl to allow userspace dealing with secure machines
--- arch/s390/include/asm/kvm_host.h | 24 ++- arch/s390/include/asm/uv.h | 69 +++++++++ arch/s390/kvm/Makefile | 2 +- arch/s390/kvm/kvm-s390.c | 188 ++++++++++++++++++++++- arch/s390/kvm/kvm-s390.h | 35 +++++ arch/s390/kvm/pv.c | 256 +++++++++++++++++++++++++++++++ include/uapi/linux/kvm.h | 31 ++++ 7 files changed, 601 insertions(+), 4 deletions(-) create mode 100644 arch/s390/kvm/pv.c
arch/s390/include/asm/kvm_host.h +22 -2
@@ -160,7 +160,13 @@ struct kvm_s390_sie_block {__u8 reserved08[4 ];/* 0x0008 */ #define PROG_IN_SIE (1<<0)__u32 prog0c;/* 0x000c */ -__u8 reserved10[16 ];/* 0x0010 */ +union { +__u8 reserved10[16 ];/* 0x0010 */ +struct { +__u64 pv_handle_cpu; +__u64 pv_handle_config; + }; + };#define PROG_BLOCK_SIE (1<<0)#define PROG_REQUEST (1<<1)atomic_t prog20;/* 0x0020 */
@@ -233,7 +239,7 @@ struct kvm_s390_sie_block {#define ECB3_RI 0x01__u8 ecb3;/* 0x0063 */ __u32 scaol;/* 0x0064 */ -__u8 reserved68;/* 0x0068 */ +__u8 sdf;/* 0x0068 */ __u8 epdx;/* 0x0069 */ __u8 reserved6a[2 ];/* 0x006a */ __u32 todpr;/* 0x006c */
@@ -645,6 +651,11 @@ struct kvm_guestdbg_info_arch {unsigned long last_bp; }; +struct kvm_s390_pv_vcpu { +u64 handle; +unsigned long stor_base; +}; +struct kvm_vcpu_arch {struct kvm_s390_sie_block *sie_block;/* if vsie is active, currently executed shadow sie control block */
@@ -673,6 +684,7 @@ struct kvm_vcpu_arch {__u64 cputm_start;bool gs_enabled;bool skey_enabled; +struct kvm_s390_pv_vcpu pv; };struct kvm_vm_stat {
@@ -843,6 +855,13 @@ struct kvm_s390_gisa_interrupt {DECLARE_BITMAP (kicked_mask,KVM_MAX_VCPUS ); }; +struct kvm_s390_pv { +u64 handle; +u64 guest_len; +unsigned long stor_base; +void *stor_var; +}; +struct kvm_arch {void *sca;int use_esca;
@@ -878,6 +897,7 @@ struct kvm_arch{DECLARE_BITMAP (cpu_feat,KVM_S390_VM_CPU_FEAT_NR_BITS );DECLARE_BITMAP (idle_mask,KVM_MAX_VCPUS );struct kvm_s390_gisa_interrupt gisa_int; +struct kvm_s390_pv pv; };#define KVM_HVA_ERR_BAD (-1UL)
arch/s390/include/asm/uv.h +69 -0
126 lines not on this page · raw message
arch/s390/kvm/Makefile +1 -1
@@ -9,6 +9,6 @@ common-objs = $(KVM)/kvm_main.o $(KVM)/eventfd.o $(KVM)/async_pf.o $(KVM)/irqch ccflags-y := -Ivirt/kvm -Iarch/s390/kvm kvm-objs := $(common-objs) kvm-s390.o intercept.o interrupt.o priv.o sigp.o -kvm-objs += diag.o gaccess.o guestdbg.o vsie.o +kvm-objs += diag.o gaccess.o guestdbg.o vsie.o pv.o obj-$(CONFIG_KVM) += kvm.o
arch/s390/kvm/kvm-s390.c +187 -1
253 lines not on this page · raw message
arch/s390/kvm/kvm-s390.h +35 -0
@@ -15,6 +15,7 @@#include <linux/hrtimer.h> #include <linux/kvm.h> #include <linux/kvm_host.h> +#include <linux/lockdep.h> #include <asm/facility.h> #include <asm/processor.h> #include <asm/sclp.h>
@@ -207,6 +208,40 @@ static inline int kvm_s390_user_cpu_state_ctrl(struct kvm *kvm)return kvm->arch.user_cpu_state_ctrl !=0 ; } +/* implemented in pv.c */ +void kvm_s390_pv_dealloc_vm (struct kvm *kvm); +int kvm_s390_pv_alloc_vm (struct kvm *kvm); +int kvm_s390_pv_create_vm (struct kvm *kvm,u16 *rc,u16 *rrc); +int kvm_s390_pv_create_cpu (struct kvm_vcpu *vcpu,u16 *rc,u16 *rrc); +int kvm_s390_pv_destroy_vm (struct kvm *kvm,u16 *rc,u16 *rrc); +void kvm_s390_pv_destroy_cpu (struct kvm_vcpu *vcpu,u16 *rc,u16 *rrc); +int kvm_s390_pv_set_sec_parms (struct kvm *kvm,void *hdr,u64 length,u16 *rc, +u16 *rrc); +int kvm_s390_pv_unpack (struct kvm *kvm,unsigned long addr,unsigned long size, +unsigned long tweak,u16 *rc,u16 *rrc); + +static inline u64 kvm_s390_pv_get_handle (struct kvm *kvm) +{ +return kvm->arch.pv.handle; +} + +static inline u64 kvm_s390_pv_cpu_get_handle (struct kvm_vcpu *vcpu) +{ +return vcpu->arch.pv.handle; +} + +static inline bool kvm_s390_pv_is_protected (struct kvm *kvm) +{ +lockdep_assert_held (&kvm->lock); +return !!kvm_s390_pv_get_handle (kvm); +} + +static inline bool kvm_s390_pv_cpu_is_protected (struct kvm_vcpu *vcpu) +{ +lockdep_assert_held (&vcpu->mutex); +return !!kvm_s390_pv_cpu_get_handle (vcpu); +} +/* implemented in interrupt.c */ int kvm_s390_handle_wait (struct kvm_vcpu *vcpu);void kvm_s390_vcpu_wakeup (struct kvm_vcpu *vcpu);
arch/s390/kvm/pv.c new file +256 -0
256 lines not on this page · raw message
include/uapi/linux/kvm.h +31 -0
@@ -1478,6 +1478,37 @@ struct kvm_enc_region {#define KVM_S390_NORMAL_RESET _IO(KVMIO, 0xc3)#define KVM_S390_CLEAR_RESET _IO(KVMIO, 0xc4) +struct kvm_s390_pv_sec_parm { +__u64 origin; +__u64 length; +}; + +struct kvm_s390_pv_unp { +__u64 addr; +__u64 size; +__u64 tweak; +}; + +enum pv_cmd_id { +KVM_PV_ENABLE , +KVM_PV_DISABLE , +KVM_PV_VM_SET_SEC_PARMS , +KVM_PV_VM_UNPACK , +KVM_PV_VM_VERIFY , +}; + +struct kvm_pv_cmd { +__u32 cmd;/* Command to be executed */ +__u16 rc;/* Ultravisor return code */ +__u16 rrc;/* Ultravisor return reason code */ +__u64 data;/* Data or address */ +__u32 flags;/* flags for future extensions. Must be 0 for now */ +__u32 reserved[3 ]; +}; + +/* Available with KVM_CAP_S390_PROTECTED */ +#define KVM_S390_PV_COMMAND _IOWR(KVMIO, 0xc5, struct kvm_pv_cmd) +/* Secure Encrypted Virtualization command */ enum sev_cmd_id {/* Guest initialization commands */
Signature · 1 line
2.25.0
Re: [PATCH v3 09/37] KVM: s390: protvirt: Add initial vm and cpu lifecycle handling
Quoted 12 lines
arch/s390/kvm/kvm-s390.c +11
-0+static int kvm_s390_handle_pv (struct kvm *kvm,struct kvm_pv_cmd *cmd) +{ +int r =0 ; +u16 dummy; +void __user *argp = (void __user *)cmd->data; + +switch (cmd->cmd) { +case KVM_PV_ENABLE : { + r = -EINVAL ; +if (kvm_s390_pv_is_protected (kvm)) +break ;
arch/s390/kvm/kvm-s390.c static int kvm_s390_set_cmma_bits(struct kvm *kvm, · line 2222
Quoted 10 lines
arch/s390/kvm/kvm-s390.c +10
-0+ + r =kvm_s390_pv_alloc_vm (kvm); +if (r) +break ; + +/* FMT 4 SIE needs esca */ + r =sca_switch_to_extended (kvm); +if (r) { +kvm_s390_pv_dealloc_vm (kvm); +kvm_s390_vcpu_unblock_all (kvm);
You forgot to remove that.
Review
Quoted 1 line
(quoted diff) +1
-0+ mutex_unlock(&kvm->lock);
That's certainly wrong as well.
arch/s390/kvm/kvm-s390.c static int kvm_s390_set_cmma_bits(struct kvm *kvm, · line 2230
Quoted 7 lines
arch/s390/kvm/kvm-s390.c +7
-0+break ; + } + r =kvm_s390_pv_create_vm (kvm, &cmd->rc, &cmd->rrc); +if (!r) + r =kvm_s390_cpus_to_pv (kvm, &cmd->rc, &cmd->rrc); +if (r) +kvm_s390_pv_destroy_vm (kvm, &dummy, &dummy);
Should there be a kvm_s390_pv_dealloc_vm() as well?
arch/s390/kvm/kvm-s390.c static int kvm_s390_set_cmma_bits(struct kvm *kvm, · line 2242
Quoted 12 lines
arch/s390/kvm/kvm-s390.c +12
-0+ +break ; + } +case KVM_PV_DISABLE : { + r = -EINVAL ; +if (!kvm_s390_pv_is_protected (kvm)) +break ; + +kvm_s390_cpus_from_pv (kvm, &cmd->rc, &cmd->rrc); + r =kvm_s390_pv_destroy_vm (kvm, &cmd->rc, &cmd->rrc); +if (!r) +kvm_s390_pv_dealloc_vm (kvm);
Hm, if destroy fails, the CPUs would already have been removed.
Is there a way to make kvm_s390_pv_destroy_vm() never fail? The return value is always ignored except here ... which looks wrong.
Quoted 2 lines
(quoted diff) +2
-0+ break; + }
[...]
Quoted 6 lines
arch/s390/kvm/kvm-s390.c +1
-0@@ -2558,10 +2724,21 @@ static void kvm_free_vcpus(struct kvm *kvm)void kvm_arch_destroy_vm (struct kvm *kvm) { +u16 rc, rrc;kvm_free_vcpus (kvm);
arch/s390/kvm/kvm-s390.c static void kvm_free_vcpus(struct kvm *kvm) · line 2737
Quoted 10 lines
arch/s390/kvm/kvm-s390.c +7
-1sca_dispose (kvm); -debug_unregister (kvm->arch.dbf);kvm_s390_gisa_destroy (kvm); +/* +* We are already at the end of life and kvm->lock is not taken. +* This is ok as the file descriptor is closed by now and nobody +* can mess with the pv state. To avoid lockdep_assert_held from +* complaining we do not use kvm_s390_pv_is_protected. +*/ +if (kvm_s390_pv_get_handle (kvm)) {
I'd prefer something like kvm_s390_pv_is_protected_unlocked(), but I guess for these few use cases, this is fine.
Quoted 26 lines
arch/s390/kvm/kvm-s390.c +8
-0+kvm_s390_pv_destroy_vm (kvm, &rc, &rrc); +kvm_s390_pv_dealloc_vm (kvm); + } +debug_unregister (kvm->arch.dbf);free_page ((unsigned long )kvm->arch.sie_page2);if (!kvm_is_ucontrol (kvm))gmap_remove (kvm->arch.gmap);@@ -2657,6 +2834,9 @@ static int sca_switch_to_extended(struct kvm *kvm)unsigned int vcpu_idx;u32 scaol, scaoh; +if (kvm->arch.use_esca) +return 0 ; + new_sca =alloc_pages_exact (sizeof (*new_sca),GFP_KERNEL |__GFP_ZERO);if (!new_sca)return -ENOMEM ;@@ -2908,6 +3088,7 @@ static void kvm_s390_vcpu_setup_model(struct kvm_vcpu *vcpu)static int kvm_s390_vcpu_setup (struct kvm_vcpu *vcpu) {int rc =0 ; +u16 uvrc, uvrrc; atomic_set(&vcpu->arch.sie_block->cpuflags, CPUSTAT_ZARCH | CPUSTAT_SM |
arch/s390/kvm/kvm-s390.c static int kvm_s390_vcpu_setup(struct kvm_vcpu *vcpu) · line 3162
Quoted 7 lines
arch/s390/kvm/kvm-s390.c +4
-0@@ -2975,6 +3156,11 @@ static int kvm_s390_vcpu_setup(struct kvm_vcpu *vcpu)kvm_s390_vcpu_crypto_setup (vcpu); +mutex_lock (&vcpu->kvm->lock); +if (kvm_s390_pv_is_protected (vcpu->kvm)) + rc =kvm_s390_pv_create_cpu (vcpu, &uvrc, &uvrrc); +mutex_unlock (&vcpu->kvm->lock);
Do we have to cleanup anything? (e.g., cmma page) I *think* kvm_arch_vcpu_destroy() is not called when kvm_arch_vcpu_create() fails ...
Quoted 33 lines
arch/s390/kvm/kvm-s390.c +1
-0+return rc; }arch/s390/kvm/kvm-s390.h +14
-0@@ -15,6 +15,7 @@#include <linux/hrtimer.h> #include <linux/kvm.h> #include <linux/kvm_host.h> +#include <linux/lockdep.h> #include <asm/facility.h> #include <asm/processor.h> #include <asm/sclp.h> @@ -207,6 +208,40 @@ static inline int kvm_s390_user_cpu_state_ctrl(struct kvm *kvm)return kvm->arch.user_cpu_state_ctrl !=0 ; } +/* implemented in pv.c */ +void kvm_s390_pv_dealloc_vm (struct kvm *kvm); +int kvm_s390_pv_alloc_vm (struct kvm *kvm); +int kvm_s390_pv_create_vm (struct kvm *kvm,u16 *rc,u16 *rrc); +int kvm_s390_pv_create_cpu (struct kvm_vcpu *vcpu,u16 *rc,u16 *rrc); +int kvm_s390_pv_destroy_vm (struct kvm *kvm,u16 *rc,u16 *rrc); +void kvm_s390_pv_destroy_cpu (struct kvm_vcpu *vcpu,u16 *rc,u16 *rrc); +int kvm_s390_pv_set_sec_parms (struct kvm *kvm,void *hdr,u64 length,u16 *rc, +u16 *rrc); +int kvm_s390_pv_unpack (struct kvm *kvm,unsigned long addr,unsigned long size, +unsigned long tweak,u16 *rc,u16 *rrc); + +static inline u64 kvm_s390_pv_get_handle (struct kvm *kvm)
arch/s390/kvm/kvm-s390.h static inline int kvm_s390_user_cpu_state_ctrl(struct kvm *kvm) · line 233
Quoted 10 lines
arch/s390/kvm/kvm-s390.h +10
-0+{ +return kvm->arch.pv.handle; +} + +static inline u64 kvm_s390_pv_cpu_get_handle (struct kvm_vcpu *vcpu) +{ +return vcpu->arch.pv.handle; +} + +static inline bool kvm_s390_pv_is_protected (struct kvm *kvm)
Could have been "kvm_s390_is_protected" or "kvm_s390_is_pv", but also fine with me. (maybe I even suggested that one without caring about that detail :) )
[...]
Quoted 10 lines
arch/s390/kvm/kvm-s390.h +1
-0+/* implemented in interrupt.c */ int kvm_s390_handle_wait (struct kvm_vcpu *vcpu);void kvm_s390_vcpu_wakeup (struct kvm_vcpu *vcpu);arch/s390/kvm/pv.c new file +0
-0
arch/s390/kvm/pv.c line 6
Quoted 6 lines
arch/s390/kvm/pv.c new file +6
-0@@ -0,0 +1,256 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Hosting Secure Execution virtual machines +* +* Copyright IBM Corp. 2019 +* Author(s): Janosch Frank <[email protected]>
I'd assume you're an author as well at this point ;)
[...]
Quoted 4 lines
arch/s390/kvm/pv.c new file +4
-0+ +int kvm_s390_pv_set_sec_parms (struct kvm *kvm,void *hdr,u64 length,u16 *rc, +u16 *rrc) +{
arch/s390/kvm/pv.c line 195
Quoted 10 lines
arch/s390/kvm/pv.c new file +10
-0+struct uv_cb_ssc uvcb = { + .header.cmd =UVC_CMD_SET_SEC_CONF_PARAMS , + .header.len =sizeof (uvcb), + .sec_header_origin = (u64 )hdr, + .sec_header_len = length, + .guest_handle =kvm_s390_pv_get_handle (kvm), + }; +int cc; + + cc =uv_call (0 , (u64)&uvcb);
int cc = ... could be done.
Quoted 13 lines
arch/s390/kvm/pv.c new file +13
-0+ *rc = uvcb.header.rc; + *rrc = uvcb.header.rrc; +KVM_UV_EVENT (kvm,3 ,"PROTVIRT VM SET PARMS: rc %x rrc %x" , + *rc, *rrc); +if (cc) +return -EINVAL ; +return 0 ; +} + +static int unpack_one (struct kvm *kvm,unsigned long addr,u64 tweak[2 ], +u16 *rc,u16 *rrc) +{ +struct uv_cb_unp uvcb = {
arch/s390/kvm/pv.c line 218
Quoted 10 lines
arch/s390/kvm/pv.c new file +10
-0+ .header.cmd = UVC_CMD_UNPACK_IMG, + .header.len = sizeof(uvcb), + .guest_handle = kvm_s390_pv_get_handle(kvm), + .gaddr = addr, + .tweak[0] = tweak[0], + .tweak[1] = tweak[1], + }; +int ret; + + ret =gmap_make_secure (kvm->arch.gmap, addr, &uvcb);
... similarly, with ret.
arch/s390/kvm/pv.c line 231
Quoted 13 lines
arch/s390/kvm/pv.c new file +13
-0+ *rc = uvcb.header.rc; + *rrc = uvcb.header.rrc; + +if (ret && ret != -EAGAIN ) +KVM_UV_EVENT (kvm,3 ,"PROTVIRT VM UNPACK: failed addr %llx with rc %x rrc %x" , + uvcb.gaddr, *rc, *rrc); +return ret; +} + +int kvm_s390_pv_unpack (struct kvm *kvm,unsigned long addr,unsigned long size, +unsigned long tweak,u16 *rc,u16 *rrc) +{ +u64 tw[2 ] = {tweak,0 };
I have no idea what tweaks are in this context. So I have to trust you guys on the implementation, because I don't understand it.
Especially, why can't we simply have
s/tweak/tweak/
offset = 0;
while (offset < size) {
...
ret = unpack_one(kvm, addr, tweak, offset, rc, rrc);
^ no idea what tweak is
...
... offset += PAGE_SIZE;
}But maybe I am missing what the whole array is about.
Quoted 24 lines
arch/s390/kvm/pv.c new file +24
-0+int ret =0 ; + +if (addr & ~PAGE_MASK || !size || size & ~PAGE_MASK ) +return -EINVAL ; + +KVM_UV_EVENT (kvm,3 ,"PROTVIRT VM UNPACK: start addr %lx size %lx" , + addr, size); + + while (tw[1] < size) {> + ret = unpack_one(kvm, addr, tw, rc, rrc); +if (ret == -EAGAIN ) { +cond_resched (); +if (fatal_signal_pending (current)) +break ; +continue ; + } +if (ret) +break ; + addr +=PAGE_SIZE ; + tw[1 ] +=PAGE_SIZE ; + } +if (!ret) +KVM_UV_EVENT (kvm,3 ,"%s" ,"PROTVIRT VM UNPACK: successful" ); +return ret; +}
[...]
arch/s390/kvm/pv.c
Quoted 6 lines
arch/s390/kvm/pv.c new file +6
-0+enum pv_cmd_id { +KVM_PV_ENABLE , +KVM_PV_DISABLE , +KVM_PV_VM_SET_SEC_PARMS , +KVM_PV_VM_UNPACK , +KVM_PV_VM_VERIFY ,
I wonder if we should just drop "_VM" from all of these ...
[...]
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH v3 09/37] KVM: s390: protvirt: Add initial vm and cpu lifecycle handling
Quoted 16 lines · David Hildenbrand
Quoted 16 lines
arch/s390/kvm/kvm-s390.c +15
-0+static int kvm_s390_handle_pv (struct kvm *kvm,struct kvm_pv_cmd *cmd) +{ +int r =0 ; +u16 dummy; +void __user *argp = (void __user *)cmd->data; + +switch (cmd->cmd) { +case KVM_PV_ENABLE : { + r = -EINVAL ; +if (kvm_s390_pv_is_protected (kvm)) +break ; + + r =kvm_s390_pv_alloc_vm (kvm); +if (r) +break ;
Quoted 8 lines
arch/s390/kvm/kvm-s390.c static int kvm_s390_set_cmma_bits(struct kvm *kvm, · line 2222
Quoted 6 lines
arch/s390/kvm/kvm-s390.c +6
-0+ +/* FMT 4 SIE needs esca */ + r =sca_switch_to_extended (kvm); +if (r) { +kvm_s390_pv_dealloc_vm (kvm); +kvm_s390_vcpu_unblock_all (kvm);You forgot to remove that.
ack.
Quoted 4 lines
Review
Quoted 2 lines
(quoted diff) +1
-0+ mutex_unlock(&kvm->lock);That's certainly wrong as well.
ack.
Quoted 10 lines
arch/s390/kvm/kvm-s390.c static int kvm_s390_set_cmma_bits(struct kvm *kvm, · line 2230
Quoted 8 lines
arch/s390/kvm/kvm-s390.c +7
-0+break ; + } + r =kvm_s390_pv_create_vm (kvm, &cmd->rc, &cmd->rrc); +if (!r) + r =kvm_s390_cpus_to_pv (kvm, &cmd->rc, &cmd->rrc); +if (r) +kvm_s390_pv_destroy_vm (kvm, &dummy, &dummy);Should there be a
kvm_s390_pv_dealloc_vm()as well?
Hmm yes. But only if destroy does not fail...... see below.
Quoted 16 lines
arch/s390/kvm/kvm-s390.c static int kvm_s390_set_cmma_bits(struct kvm *kvm, · line 2242
Quoted 13 lines
arch/s390/kvm/kvm-s390.c +12
-0+ +break ; + } +case KVM_PV_DISABLE : { + r = -EINVAL ; +if (!kvm_s390_pv_is_protected (kvm)) +break ; + +kvm_s390_cpus_from_pv (kvm, &cmd->rc, &cmd->rrc); + r =kvm_s390_pv_destroy_vm (kvm, &cmd->rc, &cmd->rrc); +if (!r) +kvm_s390_pv_dealloc_vm (kvm);Hm, if destroy fails, the CPUs would already have been removed.
Quoted 2 lines
Is there a way to make
kvm_s390_pv_destroy_vm()never fail? The return value is always ignored except here ... which looks wrong.
This should not fail. But if it does we should not free the memory that we donated to the ultravisor. We then do have a memory leak, but this is necessary to keep the integrity of the host.
I will fix the other places to only call dealloc when destroy succeeded.
Same for VCPU destroy. If that fails I should not free arch.pv.stor_base will fix.
Quoted 17 lines
Quoted 3 lines
(quoted diff) +2
-0+ break; + }[...]
Quoted 11 lines
arch/s390/kvm/kvm-s390.c +3
-1@@ -2558,10 +2724,21 @@ static void kvm_free_vcpus(struct kvm *kvm)void kvm_arch_destroy_vm (struct kvm *kvm) { +u16 rc, rrc;kvm_free_vcpus (kvm);sca_dispose (kvm); -debug_unregister (kvm->arch.dbf);kvm_s390_gisa_destroy (kvm); +/* +* We are already at the end of life and kvm->lock is not taken.
Quoted 8 lines
arch/s390/kvm/kvm-s390.c static void kvm_free_vcpus(struct kvm *kvm) · line 2737
Quoted 5 lines
arch/s390/kvm/kvm-s390.c +5
-0+* This is ok as the file descriptor is closed by now and nobody +* can mess with the pv state. To avoid lockdep_assert_held from +* complaining we do not use kvm_s390_pv_is_protected. +*/ +if (kvm_s390_pv_get_handle (kvm)) {I'd prefer something like
kvm_s390_pv_is_protected_unlocked(), but I guess for these few use cases, this is fine.
yes lets leave it as is... :-)
Quoted 31 lines
Quoted 31 lines
arch/s390/kvm/kvm-s390.c +8
-0+kvm_s390_pv_destroy_vm (kvm, &rc, &rrc); +kvm_s390_pv_dealloc_vm (kvm); + } +debug_unregister (kvm->arch.dbf);free_page ((unsigned long )kvm->arch.sie_page2);if (!kvm_is_ucontrol (kvm))gmap_remove (kvm->arch.gmap);@@ -2657,6 +2834,9 @@ static int sca_switch_to_extended(struct kvm *kvm)unsigned int vcpu_idx;u32 scaol, scaoh; +if (kvm->arch.use_esca) +return 0 ; + new_sca =alloc_pages_exact (sizeof (*new_sca),GFP_KERNEL |__GFP_ZERO);if (!new_sca)return -ENOMEM ;@@ -2908,6 +3088,7 @@ static void kvm_s390_vcpu_setup_model(struct kvm_vcpu *vcpu)static int kvm_s390_vcpu_setup (struct kvm_vcpu *vcpu) {int rc =0 ; +u16 uvrc, uvrrc; atomic_set(&vcpu->arch.sie_block->cpuflags, CPUSTAT_ZARCH | CPUSTAT_SM |@@ -2975,6 +3156,11 @@ static int kvm_s390_vcpu_setup(struct kvm_vcpu *vcpu)kvm_s390_vcpu_crypto_setup (vcpu);
Quoted 7 lines
arch/s390/kvm/kvm-s390.c static int kvm_s390_vcpu_setup(struct kvm_vcpu *vcpu) · line 3162
Quoted 4 lines
arch/s390/kvm/kvm-s390.c +4
-0+mutex_lock (&vcpu->kvm->lock); +if (kvm_s390_pv_is_protected (vcpu->kvm)) + rc =kvm_s390_pv_create_cpu (vcpu, &uvrc, &uvrrc); +mutex_unlock (&vcpu->kvm->lock);Do we have to cleanup anything? (e.g., cmma page) I *think*
kvm_arch_vcpu_destroy()is not called whenkvm_arch_vcpu_create()fails ...
Right we need to call kvm_s390_vcpu_unsetup_cmma. To me it looks like this can be done unconditionally if rc!=0:
@@ -3156,8 +3158,11 @@ static int kvm_s390_vcpu_setup(struct kvm_vcpu *vcpu)
kvm_s390_vcpu_crypto_setup(vcpu);
mutex_lock(&vcpu->kvm->lock);
- if (kvm_s390_pv_is_protected(vcpu->kvm))
+ if (kvm_s390_pv_is_protected(vcpu->kvm)) {
rc = kvm_s390_pv_create_cpu(vcpu, &uvrc, &uvrrc);
+ if (rc)
+ kvm_s390_vcpu_unsetup_cmma(vcpu);
+ }
mutex_unlock(&vcpu->kvm->lock);
return rc;Everything else looks ok, no need to deallocate or so.
[...]
*/
Quoted 8 lines
Quoted 8 lines
arch/s390/kvm/kvm-s390.h +0
-0int kvm_s390_handle_wait (struct kvm_vcpu *vcpu);void kvm_s390_vcpu_wakeup (struct kvm_vcpu *vcpu);arch/s390/kvm/pv.c new file +0
-0@@ -0,0 +1,256 @@
Quoted 8 lines
arch/s390/kvm/pv.c line 6
Quoted 6 lines
arch/s390/kvm/pv.c new file +6
-0+// SPDX-License-Identifier: GPL-2.0 +/* +* Hosting Secure Execution virtual machines +* +* Copyright IBM Corp. 2019 +* Author(s): Janosch Frank <[email protected]> I'd assume you're an author as well at this point ;)
I personally prefer to not have authors in files and after all I am just cleaning up so that Janosch can take care of QEMU. But I will at least fixup the Copyright year.
Quoted 20 lines
[...]
Quoted 4 lines
arch/s390/kvm/pv.c new file +4
-0+ +int kvm_s390_pv_set_sec_parms (struct kvm *kvm,void *hdr,u64 length,u16 *rc, +u16 *rrc) +{arch/s390/kvm/pv.c line 195
Quoted 10 lines
arch/s390/kvm/pv.c new file +10
-0+struct uv_cb_ssc uvcb = { + .header.cmd =UVC_CMD_SET_SEC_CONF_PARAMS , + .header.len =sizeof (uvcb), + .sec_header_origin = (u64 )hdr, + .sec_header_len = length, + .guest_handle =kvm_s390_pv_get_handle (kvm), + }; +int cc; + + cc =uv_call (0 , (u64)&uvcb);int cc = ... could be done.
ack.
Quoted 18 lines
Quoted 18 lines
arch/s390/kvm/pv.c new file +17
-0+ *rc = uvcb.header.rc; + *rrc = uvcb.header.rrc; +KVM_UV_EVENT (kvm,3 ,"PROTVIRT VM SET PARMS: rc %x rrc %x" , + *rc, *rrc); +if (cc) +return -EINVAL ; +return 0 ; +} + +static int unpack_one (struct kvm *kvm,unsigned long addr,u64 tweak[2 ], +u16 *rc,u16 *rrc) +{ +struct uv_cb_unp uvcb = { + .header.cmd =UVC_CMD_UNPACK_IMG , + .header.len =sizeof (uvcb), + .guest_handle =kvm_s390_pv_get_handle (kvm), + .gaddr = addr,
Quoted 8 lines
arch/s390/kvm/pv.c line 218
Quoted 6 lines
arch/s390/kvm/pv.c new file +6
-0+ .tweak[0] = tweak[0], + .tweak[1] = tweak[1], + }; +int ret; + + ret =gmap_make_secure (kvm->arch.gmap, addr, &uvcb);... similarly, with ret.
ack
Quoted 17 lines
Quoted 4 lines
arch/s390/kvm/pv.c new file +3
-0+ *rc = uvcb.header.rc; + *rrc = uvcb.header.rrc; +arch/s390/kvm/pv.c line 231
Quoted 10 lines
arch/s390/kvm/pv.c new file +10
-0+if (ret && ret != -EAGAIN ) +KVM_UV_EVENT (kvm,3 ,"PROTVIRT VM UNPACK: failed addr %llx with rc %x rrc %x" , + uvcb.gaddr, *rc, *rrc); +return ret; +} + +int kvm_s390_pv_unpack (struct kvm *kvm,unsigned long addr,unsigned long size, +unsigned long tweak,u16 *rc,u16 *rrc) +{ +u64 tw[2 ] = {tweak,0 };I have no idea what tweaks are in this context. So I have to trust you guys on the implementation, because I don't understand it.
Its the crypto term. Basically similar idea like salt or nonce.
Quoted 4 lines
Especially, why can't we simply have
s/tweak/tweak/
?
Quoted 11 lines
offset = 0;
while (offset < size) { ... ret = unpack_one(kvm, addr, tweak, offset, rc, rrc); ^ no idea what tweak is ... ... offset += PAGE_SIZE; }
Quoted 1 line
But maybe I am missing what the whole array is about.
Both values (the initial 64bit value and the address) form the 128 bit tweak for the decryption. So the offset is actually part of the tweak.
So yes we could rewrite that using offset and not passing through an array but tweak + offset as separate u64.
will check if this makes it any clearer
Quoted 37 lines
Quoted 10 lines
arch/s390/kvm/pv.c new file +9
-0+int ret =0 ; + +if (addr & ~PAGE_MASK || !size || size & ~PAGE_MASK ) +return -EINVAL ; + +KVM_UV_EVENT (kvm,3 ,"PROTVIRT VM UNPACK: start addr %lx size %lx" , + addr, size); + +while (tw[1 ] < size) {arch/s390/kvm/pv.c new file +1
-0+ ret =unpack_one (kvm, addr, tw, rc, rrc);Quoted 15 lines
arch/s390/kvm/pv.c new file +15
-0+if (ret == -EAGAIN ) { +cond_resched (); +if (fatal_signal_pending (current)) +break ; +continue ; + } +if (ret) +break ; + addr +=PAGE_SIZE ; + tw[1 ] +=PAGE_SIZE ; + } +if (!ret) +KVM_UV_EVENT (kvm,3 ,"%s" ,"PROTVIRT VM UNPACK: successful" ); +return ret; +}[...]
arch/s390/kvm/pv.c
Quoted 6 lines
arch/s390/kvm/pv.c new file +6
-0+enum pv_cmd_id { +KVM_PV_ENABLE , +KVM_PV_DISABLE , +KVM_PV_VM_SET_SEC_PARMS , +KVM_PV_VM_UNPACK , +KVM_PV_VM_VERIFY ,I wonder if we should just drop "
_VM" from all of these ...
PATCH v3 9/37 KVM: s390: protvirt: Add initial vm and cpu lifecycle handling
From: Janosch Frank <[email protected]>
This contains 3 main changes:
1. changes in SIE control block handling for secure guests
2. helper functions for create/destroy/unpack secure guests
3. KVM_S390_PV_COMMAND ioctl to allow userspace dealing with secure machines
--- arch/s390/include/asm/kvm_host.h | 24 ++- arch/s390/include/asm/uv.h | 69 +++++++++ arch/s390/kvm/Makefile | 2 +- arch/s390/kvm/kvm-s390.c | 193 ++++++++++++++++++++++- arch/s390/kvm/kvm-s390.h | 35 +++++ arch/s390/kvm/pv.c | 253 +++++++++++++++++++++++++++++++ include/uapi/linux/kvm.h | 31 ++++ 7 files changed, 603 insertions(+), 4 deletions(-) create mode 100644 arch/s390/kvm/pv.c
arch/s390/include/asm/kvm_host.h +22 -2
@@ -160,7 +160,13 @@ struct kvm_s390_sie_block {__u8 reserved08[4 ];/* 0x0008 */ #define PROG_IN_SIE (1<<0)__u32 prog0c;/* 0x000c */ -__u8 reserved10[16 ];/* 0x0010 */ +union { +__u8 reserved10[16 ];/* 0x0010 */ +struct { +__u64 pv_handle_cpu; +__u64 pv_handle_config; + }; + };#define PROG_BLOCK_SIE (1<<0)#define PROG_REQUEST (1<<1)atomic_t prog20;/* 0x0020 */
@@ -233,7 +239,7 @@ struct kvm_s390_sie_block {#define ECB3_RI 0x01__u8 ecb3;/* 0x0063 */ __u32 scaol;/* 0x0064 */ -__u8 reserved68;/* 0x0068 */ +__u8 sdf;/* 0x0068 */ __u8 epdx;/* 0x0069 */ __u8 reserved6a[2 ];/* 0x006a */ __u32 todpr;/* 0x006c */
@@ -645,6 +651,11 @@ struct kvm_guestdbg_info_arch {unsigned long last_bp; }; +struct kvm_s390_pv_vcpu { +u64 handle; +unsigned long stor_base; +}; +struct kvm_vcpu_arch {struct kvm_s390_sie_block *sie_block;/* if vsie is active, currently executed shadow sie control block */
@@ -673,6 +684,7 @@ struct kvm_vcpu_arch {__u64 cputm_start;bool gs_enabled;bool skey_enabled; +struct kvm_s390_pv_vcpu pv; };struct kvm_vm_stat {
@@ -843,6 +855,13 @@ struct kvm_s390_gisa_interrupt {DECLARE_BITMAP (kicked_mask,KVM_MAX_VCPUS ); }; +struct kvm_s390_pv { +u64 handle; +u64 guest_len; +unsigned long stor_base; +void *stor_var; +}; +struct kvm_arch {void *sca;int use_esca;
@@ -878,6 +897,7 @@ struct kvm_arch{DECLARE_BITMAP (cpu_feat,KVM_S390_VM_CPU_FEAT_NR_BITS );DECLARE_BITMAP (idle_mask,KVM_MAX_VCPUS );struct kvm_s390_gisa_interrupt gisa_int; +struct kvm_s390_pv pv; };#define KVM_HVA_ERR_BAD (-1UL)
arch/s390/include/asm/uv.h +69 -0
126 lines not on this page · raw message
arch/s390/kvm/Makefile +1 -1
@@ -9,6 +9,6 @@ common-objs = $(KVM)/kvm_main.o $(KVM)/eventfd.o $(KVM)/async_pf.o $(KVM)/irqch ccflags-y := -Ivirt/kvm -Iarch/s390/kvm kvm-objs := $(common-objs) kvm-s390.o intercept.o interrupt.o priv.o sigp.o -kvm-objs += diag.o gaccess.o guestdbg.o vsie.o +kvm-objs += diag.o gaccess.o guestdbg.o vsie.o pv.o obj-$(CONFIG_KVM) += kvm.o
arch/s390/kvm/kvm-s390.c +192 -1
258 lines not on this page · raw message
arch/s390/kvm/kvm-s390.h +35 -0
@@ -15,6 +15,7 @@#include <linux/hrtimer.h> #include <linux/kvm.h> #include <linux/kvm_host.h> +#include <linux/lockdep.h> #include <asm/facility.h> #include <asm/processor.h> #include <asm/sclp.h>
@@ -207,6 +208,40 @@ static inline int kvm_s390_user_cpu_state_ctrl(struct kvm *kvm)return kvm->arch.user_cpu_state_ctrl !=0 ; } +/* implemented in pv.c */ +void kvm_s390_pv_dealloc_vm (struct kvm *kvm); +int kvm_s390_pv_alloc_vm (struct kvm *kvm); +int kvm_s390_pv_create_vm (struct kvm *kvm,u16 *rc,u16 *rrc); +int kvm_s390_pv_create_cpu (struct kvm_vcpu *vcpu,u16 *rc,u16 *rrc); +int kvm_s390_pv_destroy_vm (struct kvm *kvm,u16 *rc,u16 *rrc); +void kvm_s390_pv_destroy_cpu (struct kvm_vcpu *vcpu,u16 *rc,u16 *rrc); +int kvm_s390_pv_set_sec_parms (struct kvm *kvm,void *hdr,u64 length,u16 *rc, +u16 *rrc); +int kvm_s390_pv_unpack (struct kvm *kvm,unsigned long addr,unsigned long size, +unsigned long tweak,u16 *rc,u16 *rrc); + +static inline u64 kvm_s390_pv_get_handle (struct kvm *kvm) +{ +return kvm->arch.pv.handle; +} + +static inline u64 kvm_s390_pv_cpu_get_handle (struct kvm_vcpu *vcpu) +{ +return vcpu->arch.pv.handle; +} + +static inline bool kvm_s390_pv_is_protected (struct kvm *kvm) +{ +lockdep_assert_held (&kvm->lock); +return !!kvm_s390_pv_get_handle (kvm); +} + +static inline bool kvm_s390_pv_cpu_is_protected (struct kvm_vcpu *vcpu) +{ +lockdep_assert_held (&vcpu->mutex); +return !!kvm_s390_pv_cpu_get_handle (vcpu); +} +/* implemented in interrupt.c */ int kvm_s390_handle_wait (struct kvm_vcpu *vcpu);void kvm_s390_vcpu_wakeup (struct kvm_vcpu *vcpu);
arch/s390/kvm/pv.c new file +253 -0
253 lines not on this page · raw message
include/uapi/linux/kvm.h +31 -0
@@ -1478,6 +1478,37 @@ struct kvm_enc_region {#define KVM_S390_NORMAL_RESET _IO(KVMIO, 0xc3)#define KVM_S390_CLEAR_RESET _IO(KVMIO, 0xc4) +struct kvm_s390_pv_sec_parm { +__u64 origin; +__u64 length; +}; + +struct kvm_s390_pv_unp { +__u64 addr; +__u64 size; +__u64 tweak; +}; + +enum pv_cmd_id { +KVM_PV_ENABLE , +KVM_PV_DISABLE , +KVM_PV_SET_SEC_PARMS , +KVM_PV_UNPACK , +KVM_PV_VERIFY , +}; + +struct kvm_pv_cmd { +__u32 cmd;/* Command to be executed */ +__u16 rc;/* Ultravisor return code */ +__u16 rrc;/* Ultravisor return reason code */ +__u64 data;/* Data or address */ +__u32 flags;/* flags for future extensions. Must be 0 for now */ +__u32 reserved[3 ]; +}; + +/* Available with KVM_CAP_S390_PROTECTED */ +#define KVM_S390_PV_COMMAND _IOWR(KVMIO, 0xc5, struct kvm_pv_cmd) +/* Secure Encrypted Virtualization command */ enum sev_cmd_id {/* Guest initialization commands */
Signature · 1 line
2.25.0
Re: [PATCH v3.1 09/37] KVM: s390: protvirt: Add initial vm and cpu lifecycle handling
Quoted 7 lines
arch/s390/kvm/kvm-s390.c +6
-0+static int kvm_s390_handle_pv (struct kvm *kvm,struct kvm_pv_cmd *cmd) +{ +int r =0 ; +u16 dummy; +void __user *argp = (void __user *)cmd->data; +
arch/s390/kvm/kvm-s390.c static int kvm_s390_set_cmma_bits(struct kvm *kvm, · line 2217
Quoted 10 lines
arch/s390/kvm/kvm-s390.c +10
-0+switch (cmd->cmd) { +case KVM_PV_ENABLE : { + r = -EINVAL ; +if (kvm_s390_pv_is_protected (kvm)) +break ; + + r =kvm_s390_pv_alloc_vm (kvm); +if (r) +break ; +
To make this nicer, can we simply merge alloc+create into init
/* FMT 4 SIE needs esca */ r = sca_switch_to_extended(kvm); if (r) break; r = kvm_s390_pv_init_vm(); if (r) break; r = kvm_s390_cpus_to_pv(kvm, &cmd->rc, &cmd->rrc); if (r) kvm_s390_pv_deinit_vm(); break;
I remember the split dates back to an earlier UAPI interface.
Similarly from deinit.
The you can just make deinit never fail and handle that freeing special-case in there and add a comment.
[...]
arch/s390/kvm/pv.c line 194
Quoted 11 lines
arch/s390/kvm/pv.c new file +11
-0+int kvm_s390_pv_set_sec_parms (struct kvm *kvm,void *hdr,u64 length,u16 *rc, +u16 *rrc) +{ +struct uv_cb_ssc uvcb = { + .header.cmd =UVC_CMD_SET_SEC_CONF_PARAMS , + .header.len =sizeof (uvcb), + .sec_header_origin = (u64 )hdr, + .sec_header_len = length, + .guest_handle =kvm_s390_pv_get_handle (kvm), + }; +int cc =uv_call (0 , (u64)&uvcb);
empty line.
Quoted 1 line
(quoted diff) +1
-0+ *rc = uvcb.header.rc;
[...]
Quoted 15 lines
arch/s390/kvm/pv.c new file +15
-0+int kvm_s390_pv_unpack (struct kvm *kvm,unsigned long addr,unsigned long size, +unsigned long tweak,u16 *rc,u16 *rrc) +{ +u64 offset =0 ; +int ret =0 ; + +if (addr & ~PAGE_MASK || !size || size & ~PAGE_MASK ) +return -EINVAL ; + +KVM_UV_EVENT (kvm,3 ,"PROTVIRT VM UNPACK: start addr %lx size %lx" , + addr, size); + +while (offset < size) { + ret =unpack_one (kvm, addr, tweak, offset, rc, rrc); +if (ret == -EAGAIN ) {
arch/s390/kvm/pv.c line 249
Quoted 10 lines
arch/s390/kvm/pv.c new file +10
-0+cond_resched (); +if (fatal_signal_pending (current)) +break ; +continue ; + } +if (ret) +break ; + addr +=PAGE_SIZE ; + offset +=PAGE_SIZE ; + }
Much better :)
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH v3.1 09/37] KVM: s390: protvirt: Add initial vm and cpu lifecycle handling
Quoted 34 lines · David Hildenbrand
Quoted 7 lines
arch/s390/kvm/kvm-s390.c +6
-0+static int kvm_s390_handle_pv (struct kvm *kvm,struct kvm_pv_cmd *cmd) +{ +int r =0 ; +u16 dummy; +void __user *argp = (void __user *)cmd->data; +arch/s390/kvm/kvm-s390.c static int kvm_s390_set_cmma_bits(struct kvm *kvm, · line 2217
Quoted 10 lines
arch/s390/kvm/kvm-s390.c +10
-0+switch (cmd->cmd) { +case KVM_PV_ENABLE : { + r = -EINVAL ; +if (kvm_s390_pv_is_protected (kvm)) +break ; + + r =kvm_s390_pv_alloc_vm (kvm); +if (r) +break ; +To make this nicer, can we simply merge alloc+create into init
/* FMT 4 SIE needs esca */ r = sca_switch_to_extended(kvm); if (r) break; r = kvm_s390_pv_init_vm(); if (r) break; r = kvm_s390_cpus_to_pv(kvm, &cmd->rc, &cmd->rrc); if (r) kvm_s390_pv_deinit_vm(); break;
Quoted 6 lines
I remember the split dates back to an earlier UAPI interface.
Similarly from deinit.
The you can just make deinit never fail and handle that freeing special-case in there and add a comment.
We want to tell userspace that PV_DISABLE failed, so I need the return. But I can still simplify things a bit.
Will send an 3.2. I still have the alloc/dealloc as static helpers inside pv.c
Re: [PATCH v3.1 09/37] KVM: s390: protvirt: Add initial vm and cpu lifecycle handling
Quoted 39 lines · Christian Borntraeger
Quoted 36 lines · David Hildenbrand
Quoted 7 lines
arch/s390/kvm/kvm-s390.c +6
-0+static int kvm_s390_handle_pv (struct kvm *kvm,struct kvm_pv_cmd *cmd) +{ +int r =0 ; +u16 dummy; +void __user *argp = (void __user *)cmd->data; +arch/s390/kvm/kvm-s390.c static int kvm_s390_set_cmma_bits(struct kvm *kvm, · line 2217
Quoted 10 lines
arch/s390/kvm/kvm-s390.c +10
-0+switch (cmd->cmd) { +case KVM_PV_ENABLE : { + r = -EINVAL ; +if (kvm_s390_pv_is_protected (kvm)) +break ; + + r =kvm_s390_pv_alloc_vm (kvm); +if (r) +break ; +To make this nicer, can we simply merge alloc+create into init
/* FMT 4 SIE needs esca */ r = sca_switch_to_extended(kvm); if (r) break; r = kvm_s390_pv_init_vm(); if (r) break; r = kvm_s390_cpus_to_pv(kvm, &cmd->rc, &cmd->rrc); if (r) kvm_s390_pv_deinit_vm(); break;I remember the split dates back to an earlier UAPI interface.
Quoted 7 lines
Quoted 4 lines
Similarly from deinit.
The you can just make deinit never fail and handle that freeing special-case in there and add a comment.
We want to tell userspace that
PV_DISABLEfailed, so I need the return. But I can still simplify things a bit.
Yes, makes sense. But having handling wrapped in a single function makes sense.
Quoted 2 lines
Will send an 3.2. I still have the alloc/dealloc as static helpers inside
pv.c
Ack.
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH v3 09/37] KVM: s390: protvirt: Add initial vm and cpu lifecycle handling
In reply to Christian BorntraegerQuoted 18 lines
Quoted 15 lines
arch/s390/kvm/kvm-s390.c static int kvm_s390_set_cmma_bits(struct kvm *kvm, · line 2242
Quoted 12 lines
arch/s390/kvm/kvm-s390.c +12
-0+ +break ; + } +case KVM_PV_DISABLE : { + r = -EINVAL ; +if (!kvm_s390_pv_is_protected (kvm)) +break ; + +kvm_s390_cpus_from_pv (kvm, &cmd->rc, &cmd->rrc); + r =kvm_s390_pv_destroy_vm (kvm, &cmd->rc, &cmd->rrc); +if (!r) +kvm_s390_pv_dealloc_vm (kvm);Hm, if destroy fails, the CPUs would already have been removed.
Quoted 2 lines
Is there a way to make
kvm_s390_pv_destroy_vm()never fail? The return value is always ignored except here ... which looks wrong.
Quoted 7 lines
This should not fail. But if it does we should not free the memory that we donated to the ultravisor. We then do have a memory leak, but this is necessary to keep the integrity of the host.
I will fix the other places to only call dealloc when destroy succeeded.Same for VCPU destroy. If that fails I should not free arch.pv.stor_base will fix.
A comment would be nice, documenting exactly that.
Quoted 18 lines
*/
Quoted 8 lines
Quoted 8 lines
int
kvm_s390_handle_wait(struct kvm_vcpu *vcpu); voidkvm_s390_vcpu_wakeup(struct kvm_vcpu *vcpu);arch/s390/kvm/pv.c new file +0
-0@@ -0,0 +1,256 @@Quoted 8 lines
arch/s390/kvm/pv.c line 6
Quoted 6 lines
arch/s390/kvm/pv.c new file +6
-0+// SPDX-License-Identifier: GPL-2.0 +/* +* Hosting Secure Execution virtual machines +* +* Copyright IBM Corp. 2019 +* Author(s): Janosch Frank <[email protected]> I'd assume you're an author as well at this point ;)
Quoted 3 lines
I personally prefer to not have authors in files and after all I am just cleaning up so that Janosch can take care of QEMU. But I will at least fixup the Copyright year.
For me, that counts as co-author, but yeah, totally your decision :)
Quoted 17 lines
Quoted 8 lines
Quoted 8 lines
arch/s390/kvm/pv.c new file +8
-0+ *rc = uvcb.header.rc; + *rrc = uvcb.header.rrc; + +if (ret && ret != -EAGAIN ) +KVM_UV_EVENT (kvm,3 ,"PROTVIRT VM UNPACK: failed addr %llx with rc %x rrc %x" , + uvcb.gaddr, *rc, *rrc); +return ret; +}Quoted 8 lines
arch/s390/kvm/pv.c line 231
Quoted 5 lines
arch/s390/kvm/pv.c new file +5
-0+ +int kvm_s390_pv_unpack (struct kvm *kvm,unsigned long addr,unsigned long size, +unsigned long tweak,u16 *rc,u16 *rrc) +{ +u64 tw[2 ] = {tweak,0 };I have no idea what tweaks are in this context. So I have to trust you guys on the implementation, because I don't understand it.
Quoted 1 line
Its the crypto term. Basically similar idea like salt or nonce.
Understood. "offset"/"address" makes this clearer in this code - although it will be used as a salt in HW.
Quoted 7 lines
Quoted 5 lines
Especially, why can't we simply have
s/tweak/tweak/
?
Ignore, it was part of the process of me figuring out what's going on in this code :)
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH v3 09/37] KVM: s390: protvirt: Add initial vm and cpu lifecycle handling
Quoted 23 lines · David Hildenbrand
Quoted 23 lines
Quoted 15 lines
Review
Quoted 12 lines
(quoted diff) +12
-0+ + break; + } + case KVM_PV_DISABLE: { + r = -EINVAL; + if (!kvm_s390_pv_is_protected(kvm)) + break; + + kvm_s390_cpus_from_pv(kvm, &cmd->rc, &cmd->rrc); + r = kvm_s390_pv_destroy_vm(kvm, &cmd->rc, &cmd->rrc); + if (!r) + kvm_s390_pv_dealloc_vm(kvm);Hm, if destroy fails, the CPUs would already have been removed.
Quoted 2 lines
Is there a way to make
kvm_s390_pv_destroy_vm()never fail? The return value is always ignored except here ... which looks wrong.This should not fail. But if it does we should not free the memory that we donated to the ultravisor. We then do have a memory leak, but this is necessary to keep the integrity of the host.
I will fix the other places to only call dealloc when destroy succeeded.
Quoted 4 lines
Quoted 2 lines
Same for VCPU destroy. If that fails I should not free arch.pv.stor_base will fix.
A comment would be nice, documenting exactly that.
something like this on top:
arch/s390/kvm/kvm-s390.c +6 -0
@@ -2173,6 +2173,11 @@ static void kvm_s390_cpus_from_pv(struct kvm *kvm, u16 *rc, u16 *rrc)struct kvm_vcpu *vcpu;int i; +/* +* we ignore failures and try to destroy as many CPUs as possible. +* At the same time we must not free the assigned ressources when +* this fails, as the ultravisor has still access to that memory. +*/ kvm_for_each_vcpu (i, vcpu, kvm) {mutex_lock (&vcpu->mutex);kvm_s390_pv_destroy_cpu (vcpu, rc, rrc);
@@ -2221,6 +2226,7 @@ static int kvm_s390_handle_pv(struct kvm *kvm, struct kvm_pv_cmd *cmd)kvm_s390_pv_dealloc_vm (kvm);break ; } +/* we never switch back to bsca from esca */ r =kvm_s390_pv_create_vm (kvm, &cmd->rc, &cmd->rrc);if (r) {kvm_s390_pv_dealloc_vm (kvm);
arch/s390/kvm/pv.c +2 -0
@@ -16,6 +16,7 @@#include <asm/mman.h> #include "kvm-s390.h" +/* only free ressources when the destroy was successful */ void kvm_s390_pv_dealloc_vm (struct kvm *kvm) {vfree (kvm->arch.pv.stor_var);
@@ -62,6 +63,7 @@ int kvm_s390_pv_alloc_vm(struct kvm *kvm)return -ENOMEM ; } +/* this should not fail, but if it does we must not free the donated memory */ int kvm_s390_pv_destroy_vm (struct kvm *kvm,u16 *rc,u16 *rrc) {int cc;
Re: [PATCH v3 09/37] KVM: s390: protvirt: Add initial vm and cpu lifecycle handling
See my other mail, maybe we can merge alloc+create and handle most of that conditional freeing in there.
arch/s390/kvm/kvm-s390.c static void kvm_s390_cpus_from_pv(struct kvm *kvm, u16 *rc, u16 *rrc) · line 2180
Quoted 13 lines
arch/s390/kvm/kvm-s390.c +5
-0@@ -2173,6 +2173,11 @@ static void kvm_s390_cpus_from_pv(struct kvm *kvm, u16 *rc, u16 *rrc)struct kvm_vcpu *vcpu;int i; +/* +* we ignore failures and try to destroy as many CPUs as possible. +* At the same time we must not free the assigned ressources when +* this fails, as the ultravisor has still access to that memory. +*/
Makes sense.
arch/s390/kvm/kvm-s390.c static int kvm_s390_handle_pv(struct kvm *kvm, struct kvm_pv_cmd *cmd) · line 2230
Quoted 9 lines
arch/s390/kvm/kvm-s390.c +1
-0kvm_for_each_vcpu (i, vcpu, kvm) {mutex_lock (&vcpu->mutex);kvm_s390_pv_destroy_cpu (vcpu, rc, rrc);@@ -2221,6 +2226,7 @@ static int kvm_s390_handle_pv(struct kvm *kvm, struct kvm_pv_cmd *cmd)kvm_s390_pv_dealloc_vm (kvm);break ; } +/* we never switch back to bsca from esca */ r =kvm_s390_pv_create_vm (kvm, &cmd->rc, &cmd->rrc);
Helpful.
Signature · 3 lines
Thanks, David / dhildenb
PATCH v3 10/37 KVM: s390: protvirt: Add KVM api documentation
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
Add documentation for KVM_CAP_S390_PROTECTED capability and the KVM_S390_PV_COMMAND and KVM_S390_PV_COMMAND_VCPU ioctls.
--- Documentation/virt/kvm/api.rst | 52 ++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+)
Documentation/virt/kvm/api.rst +52 -0
@@ -4646,6 +4646,51 @@ the clear cpu reset definition in the POP. However, the cpu is not put into ESA mode. This reset is a superset of the initial reset. +4.125 KVM_S390_PV_COMMAND +------------------------- + +:Capability: KVM_CAP_S390_PROTECTED +:Architectures: s390 +:Type: vm ioctl +:Parameters: struct kvm_pv_cmd +:Returns: 0 on success, < 0 on error + +:: + + struct kvm_pv_cmd { + __u32 cmd; /* Command to be executed */ + __u16 rc; /* Ultravisor return code */ + __u16 rrc; /* Ultravisor return reason code */ + __u64 data; /* Data or address */ + __u32 flags; /* flags for future extensions. Must be 0 for now */ + __u32 reserved[3]; + }; + +cmd values: + +KVM_PV_ENABLE + Allocate memory and register the VM with the Ultravisor, thereby + donating memory to the Ultravisor making it inaccessible to KVM. + Also converts all existing CPUs to protected ones. Future hotplug + CPUs will become protected during creation. + +KVM_PV_DISABLE + Deregisters the VM from the Ultravisor and frees memory that was + donated, so the kernel can use it again. All registered VCPUs are + converted back to non-protected ones. + +KVM_PV_VM_SET_SEC_PARMS + Pass the image header from VM memory to the Ultravisor in + preparation of image unpacking and verification. + +KVM_PV_VM_UNPACK + Unpack (protect and decrypt) a page of the encrypted boot image. + +KVM_PV_VM_VERIFY + Verify the integrity of the unpacked image. Only if this succeeds, + KVM is allowed to start protected VCPUs. + + 5. The kvm_run structure ========================
@@ -6024,3 +6069,10 @@ Architectures: s390 This capability indicates that the KVM_S390_NORMAL_RESET and KVM_S390_CLEAR_RESET ioctls are available. + +8.23 KVM_CAP_S390_PROTECTED + +Architecture: s390 + +This capability indicates that KVM can start protected VMs and the +Ultravisor has therefore been initialized.
Signature · 1 line
2.25.0
Re: [PATCH v3 10/37] KVM: s390: protvirt: Add KVM api documentation
Quoted 4 lines · Christian Borntraeger
From: Janosch Frank <[email protected]>
Add documentation for
KVM_CAP_S390_PROTECTEDcapability and theKVM_S390_PV_COMMANDandKVM_S390_PV_COMMAND_VCPUioctls.
Outdated.
I suggest moving this after "[PATCH v3 37/37] KVM: s390: protvirt:
introduce and enable KVM_CAP_S390_PROTECTED" or even squashing it into that one.
Quoted 66 lines
Signed-off-by Janosch Frank <[email protected]>[[email protected]: patch merging, splitting, fixing]Signed-off-by Christian Borntraeger <[email protected]>--- Documentation/virt/kvm/api.rst | 52 ++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+)Documentation/virt/kvm/api.rst +45
-0@@ -4646,6 +4646,51 @@ the clear cpu reset definition in the POP. However, the cpu is not put into ESA mode. This reset is a superset of the initial reset. +4.125 KVM_S390_PV_COMMAND +------------------------- + +:Capability: KVM_CAP_S390_PROTECTED +:Architectures: s390 +:Type: vm ioctl +:Parameters: struct kvm_pv_cmd +:Returns: 0 on success, < 0 on error + +:: + + struct kvm_pv_cmd { + __u32 cmd; /* Command to be executed */ + __u16 rc; /* Ultravisor return code */ + __u16 rrc; /* Ultravisor return reason code */ + __u64 data; /* Data or address */ + __u32 flags; /* flags for future extensions. Must be 0 for now */ + __u32 reserved[3]; + }; + +cmd values: + +KVM_PV_ENABLE + Allocate memory and register the VM with the Ultravisor, thereby + donating memory to the Ultravisor making it inaccessible to KVM. + Also converts all existing CPUs to protected ones. Future hotplug + CPUs will become protected during creation. + +KVM_PV_DISABLE + Deregisters the VM from the Ultravisor and frees memory that was + donated, so the kernel can use it again. All registered VCPUs are + converted back to non-protected ones. + +KVM_PV_VM_SET_SEC_PARMS + Pass the image header from VM memory to the Ultravisor in + preparation of image unpacking and verification. + +KVM_PV_VM_UNPACK + Unpack (protect and decrypt) a page of the encrypted boot image. + +KVM_PV_VM_VERIFY + Verify the integrity of the unpacked image. Only if this succeeds, + KVM is allowed to start protected VCPUs. + + 5. The kvm_run structure ========================
Documentation/virt/kvm/api.rst Architectures: s390 · line 6078
Quoted 10 lines
Documentation/virt/kvm/api.rst +7
-0@@ -6024,3 +6069,10 @@ Architectures: s390 This capability indicates that the KVM_S390_NORMAL_RESET and KVM_S390_CLEAR_RESET ioctls are available. + +8.23 KVM_CAP_S390_PROTECTED + +Architecture: s390 + +This capability indicates that KVM can start protected VMs and the +Ultravisor has therefore been initialized.
Maybe document that KVM_S390_PV_COMMAND and the new MP is available. Also maybe that MP commands can now fail.
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH v3 10/37] KVM: s390: protvirt: Add KVM api documentation
Quoted 7 lines · David Hildenbrand
Quoted 4 lines · Christian Borntraeger
From: Janosch Frank <[email protected]>
Add documentation for
KVM_CAP_S390_PROTECTEDcapability and theKVM_S390_PV_COMMANDandKVM_S390_PV_COMMAND_VCPUioctls.Outdated.
ACK.
Quoted 4 lines
I suggest moving this after "[PATCH v3 37/37] KVM: s390: protvirt:
introduce and enableKVM_CAP_S390_PROTECTED" or even squashing it into that one.
Will move at the end.
[...]
Quoted 10 lines
Review
Quoted 7 lines
+8.23
KVM_CAP_S390_PROTECTED(quoted diff) +5
-0+ +Architecture: s390 + +This capability indicates that KVM can start protected VMs and the +Ultravisor has therefore been initialized.Maybe document that
KVM_S390_PV_COMMANDand the new MP is available. Also maybe that MP commands can now fail.
Documentation/virt/kvm/api.rst +3 -0
@@ -6081,3 +6081,6 @@ Architecture: s390 This capability indicates that KVM can start protected VMs and the Ultravisor has therefore been initialized. +This will provide the new KVM_S390_PV_COMMAND ioctl and it will allow +KVM_MP_STATE_LOAD as new MP_STATE. KVM_SET_MP_STATE can now fail for +protected guests when the state change is invalid.
PATCH v3 11/37 KVM: s390: protvirt: Secure memory is not mergeable
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
KSM will not work on secure pages, because when the kernel reads a secure page, it will be encrypted and hence no two pages will look the same.
Let's mark the guest pages as unmergeable when we transition to secure mode.
--- arch/s390/include/asm/gmap.h | 1 + arch/s390/kvm/kvm-s390.c | 7 +++++++ arch/s390/mm/gmap.c | 30 ++++++++++++++++++++---------- 3 files changed, 28 insertions(+), 10 deletions(-)
arch/s390/include/asm/gmap.h +1 -0
@@ -148,4 +148,5 @@ int gmap_mprotect_notify(struct gmap *, unsigned long start,void gmap_sync_dirty_log_pmd (struct gmap *gmap,unsigned long dirty_bitmap[4 ],unsigned long gaddr,unsigned long vmaddr); +int gmap_mark_unmergeable (void );#endif /* _ASM_S390_GMAP_H */
arch/s390/kvm/kvm-s390.c +7 -0
@@ -2215,6 +2215,13 @@ static int kvm_s390_handle_pv(struct kvm *kvm, struct kvm_pv_cmd *cmd)if (r)break ; +down_write (¤t->mm->mmap_sem); + r =gmap_mark_unmergeable (); +up_write (¤t->mm->mmap_sem); +if (r) { +kvm_s390_pv_dealloc_vm (kvm); +break ; + }/* FMT 4 SIE needs esca */ r =sca_switch_to_extended (kvm);if (r) {
arch/s390/mm/gmap.c +20 -10
@@ -2548,6 +2548,22 @@ int s390_enable_sie(void) }EXPORT_SYMBOL_GPL (s390_enable_sie); +int gmap_mark_unmergeable (void ) +{ +struct mm_struct *mm = current->mm; +struct vm_area_struct *vma; + +for (vma = mm->mmap; vma; vma = vma->vm_next) { +if (ksm_madvise (vma, vma->vm_start, vma->vm_end, +MADV_UNMERGEABLE , &vma->vm_flags)) { +return -ENOMEM ; + } + } + mm->def_flags &= ~VM_MERGEABLE ; +return 0 ; +} +EXPORT_SYMBOL_GPL (gmap_mark_unmergeable); +/* * Enable storage key handling from now on and initialize the storage * keys with the default key.
@@ -2593,7 +2609,6 @@ static const struct mm_walk_ops enable_skey_walk_ops = {int s390_enable_skey (void ) {struct mm_struct *mm = current->mm; -struct vm_area_struct *vma;int rc =0 ;down_write (&mm->mmap_sem);
@@ -2601,16 +2616,11 @@ int s390_enable_skey(void) goto out_up; mm->context.uses_skeys =1 ; -for (vma = mm->mmap; vma; vma = vma->vm_next) { -if (ksm_madvise (vma, vma->vm_start, vma->vm_end, -MADV_UNMERGEABLE , &vma->vm_flags)) { - mm->context.uses_skeys =0 ; - rc = -ENOMEM ; - goto out_up; - } + rc =gmap_mark_unmergeable (); +if (rc) { + mm->context.uses_skeys =0 ; + goto out_up; } - mm->def_flags &= ~VM_MERGEABLE ; -walk_page_range (mm,0 ,TASK_SIZE , &enable_skey_walk_ops,NULL ); out_up:
Signature · 1 line
2.25.0
Re: [PATCH v3 11/37] KVM: s390: protvirt: Secure memory is not mergeable
Quoted 14 lines · On Thu, 20 Feb 2020 05:39:54 -0500 Christian Borntraeger…
From: Janosch Frank <[email protected]>
KSM will not work on secure pages, because when the kernel reads a secure page, it will be encrypted and hence no two pages will look the same.
Let's mark the guest pages as unmergeable when we transition to secure mode.
Signed-off-by Janosch Frank <[email protected]>Reviewed-by Thomas Huth <[email protected]>Reviewed-by David Hildenbrand <[email protected]>[[email protected]: patch merging, splitting, fixing]Signed-off-by Christian Borntraeger <[email protected]>
Quoted 5 lines
--- arch/s390/include/asm/gmap.h | 1 + arch/s390/kvm/kvm-s390.c | 7 +++++++ arch/s390/mm/gmap.c | 30 ++++++++++++++++++++---------- 3 files changed, 28 insertions(+), 10 deletions(-)
PATCH v3 12/37 KVM: s390/mm: Make pages accessible before destroying the guest
In reply to Christian BorntraegerBefore we destroy the secure configuration, we better make all pages accessible again. This also happens during reboot, where we reboot into a non-secure guest that then can go again into secure mode. As this "new" secure guest will have a new ID we cannot reuse the old page state.
--- arch/s390/include/asm/gmap.h | 1 + arch/s390/kvm/pv.c | 2 ++ arch/s390/mm/gmap.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+)
arch/s390/include/asm/gmap.h +1 -0
@@ -149,4 +149,5 @@ int gmap_mprotect_notify(struct gmap *, unsigned long start,void gmap_sync_dirty_log_pmd (struct gmap *gmap,unsigned long dirty_bitmap[4 ],unsigned long gaddr,unsigned long vmaddr);int gmap_mark_unmergeable (void ); +void s390_reset_acc (struct mm_struct *mm);#endif /* _ASM_S390_GMAP_H */
arch/s390/kvm/pv.c +2 -0
@@ -66,6 +66,8 @@ int kvm_s390_pv_destroy_vm(struct kvm *kvm, u16 *rc, u16 *rrc) {int cc; +/* make all pages accessible before destroying the guest */ +s390_reset_acc (kvm->mm); cc =uv_cmd_nodata (kvm_s390_pv_get_handle (kvm),UVC_CMD_DESTROY_SEC_CONF , rc, rrc);WRITE_ONCE (kvm->arch.gmap->guest_handle,0 );
arch/s390/mm/gmap.c +35 -0
@@ -2650,3 +2650,38 @@ void s390_reset_cmma(struct mm_struct *mm)up_write (&mm->mmap_sem); }EXPORT_SYMBOL_GPL (s390_reset_cmma); + +/* +* make inaccessible pages accessible again +*/ +static int __s390_reset_acc (pte_t *ptep,unsigned long addr, +unsigned long next,struct mm_walk *walk) +{ +pte_t pte =READ_ONCE (*ptep); + +if (pte_present (pte)) +WARN_ON_ONCE (uv_convert_from_secure (pte_val (pte) &PAGE_MASK )); +return 0 ; +} + +static const struct mm_walk_ops reset_acc_walk_ops = { + .pte_entry = __s390_reset_acc, +}; + +#include <linux/sched/mm.h> +void s390_reset_acc (struct mm_struct *mm) +{ +/* +* we might be called during +* reset: we walk the pages and clear +* close of all kvm file descriptors: we walk the pages and clear +* exit of process on fd closure: vma already gone, do nothing +*/ +if (!mmget_not_zero (mm)) +return ; +down_read (&mm->mmap_sem); +walk_page_range (mm,0 ,TASK_SIZE , &reset_acc_walk_ops,NULL ); +up_read (&mm->mmap_sem); +mmput (mm); +} +EXPORT_SYMBOL_GPL (s390_reset_acc);
Signature · 1 line
2.25.0
PATCH v3 13/37 KVM: s390: protvirt: Handle SE notification interceptions
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
Since there is no interception for load control and load psw instruction in the protected mode, we need a new way to get notified whenever we can inject an IRQ right after the guest has just enabled the possibility for receiving them.
The new interception codes solve that problem by providing a notification for changes to IRQ enablement relevant bits in CRs 0, 6 and 14, as well a the machine check mask bit in the PSW.
No special handling is needed for these interception codes, the KVM pre-run code will consult all necessary CRs and PSW bits and inject IRQs the guest is enabled for.
--- arch/s390/include/asm/kvm_host.h | 2 ++ arch/s390/kvm/intercept.c | 9 +++++++++ 2 files changed, 11 insertions(+)
arch/s390/include/asm/kvm_host.h +2 -0
@@ -215,6 +215,8 @@ struct kvm_s390_sie_block {#define ICPT_PARTEXEC 0x38#define ICPT_IOINST 0x40#define ICPT_KSS 0x5c +#define ICPT_MCHKREQ 0x60 +#define ICPT_INT_ENABLE 0x64__u8 icptcode;/* 0x0050 */ __u8 icptstatus;/* 0x0051 */ __u16 ihcpu;/* 0x0052 */
arch/s390/kvm/intercept.c +9 -0
@@ -480,6 +480,15 @@ int kvm_handle_sie_intercept(struct kvm_vcpu *vcpu)case ICPT_KSS : rc =kvm_s390_skey_check_enable (vcpu);break ; +case ICPT_MCHKREQ : +case ICPT_INT_ENABLE : +/* +* PSW bit 13 or a CR (0, 6, 14) changed and we might +* now be able to deliver interrupts. The pre-run code +* will take care of this. +*/ + rc =0 ; +break ;default :return -EOPNOTSUPP ; }
Signature · 1 line
2.25.0
PATCH v3 14/37 KVM: s390: protvirt: Instruction emulation
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
We have two new SIE exit codes dealing with instructions. 104 (0x68) for a secure instruction interception, on which the SIE needs hypervisor action to complete the instruction. We can piggy-back on the existing instruction handlers.
108 which is merely a notification and provides data for tracking and management. For example this is used to tell the host about a new value for the prefix register. As there will be several special case handlers in later patches, we handle this in a separate function.
--- arch/s390/include/asm/kvm_host.h | 2 ++ arch/s390/kvm/intercept.c | 11 +++++++++++ 2 files changed, 13 insertions(+)
arch/s390/include/asm/kvm_host.h +2 -0
@@ -217,6 +217,8 @@ struct kvm_s390_sie_block {#define ICPT_KSS 0x5c#define ICPT_MCHKREQ 0x60#define ICPT_INT_ENABLE 0x64 +#define ICPT_PV_INSTR 0x68 +#define ICPT_PV_NOTIFY 0x6c__u8 icptcode;/* 0x0050 */ __u8 icptstatus;/* 0x0051 */ __u16 ihcpu;/* 0x0052 */
arch/s390/kvm/intercept.c +11 -0
@@ -444,6 +444,11 @@ static int handle_operexc(struct kvm_vcpu *vcpu)return kvm_s390_inject_program_int (vcpu,PGM_OPERATION ); } +static int handle_pv_notification (struct kvm_vcpu *vcpu) +{ +return handle_instruction (vcpu); +} +int kvm_handle_sie_intercept (struct kvm_vcpu *vcpu) {int rc, per_rc =0 ;
@@ -489,6 +494,12 @@ int kvm_handle_sie_intercept(struct kvm_vcpu *vcpu)*/ rc =0 ;break ; +case ICPT_PV_INSTR : + rc =handle_instruction (vcpu); +break ; +case ICPT_PV_NOTIFY : + rc =handle_pv_notification (vcpu); +break ;default :return -EOPNOTSUPP ; }
Signature · 1 line
2.25.0
PATCH v3 15/37 KVM: s390: protvirt: Implement interrupt injection
In reply to Christian BorntraegerFrom: Michael Mueller <[email protected]>
This defines the necessary data structures in the SIE control block to inject machine checks,external and I/O interrupts. We first define the the interrupt injection control, which defines the next interrupt to inject. Then we define the fields that contain the payload for machine checks,external and I/O interrupts.
This is then used to implement interruption injection for the following list of interruption types:
- I/O (uses inject io interruption)
__deliver_io
- External (uses inject external interruption)
__deliver_cpu_timer
__deliver_ckc
__deliver_emergency_signal
__deliver_external_call
- cpu restart (uses inject restart interruption) __deliver_restart
- machine checks (uses mcic, failing address and external damage) __write_machine_check
Please note that posted interrupts (GISA) are not used for protected guests as of today.
The service interrupt is handled in a followup patch.
--- arch/s390/include/asm/kvm_host.h | 62 +++++++++++++---- arch/s390/kvm/interrupt.c | 115 +++++++++++++++++++++++-------- 2 files changed, 138 insertions(+), 39 deletions(-)
arch/s390/include/asm/kvm_host.h +50 -12
@@ -222,7 +222,15 @@ struct kvm_s390_sie_block {__u8 icptcode;/* 0x0050 */ __u8 icptstatus;/* 0x0051 */ __u16 ihcpu;/* 0x0052 */ -__u8 reserved54[2 ];/* 0x0054 */ +__u8 reserved54;/* 0x0054 */ +#define IICTL_CODE_NONE 0x00 +#define IICTL_CODE_MCHK 0x01 +#define IICTL_CODE_EXT 0x02 +#define IICTL_CODE_IO 0x03 +#define IICTL_CODE_RESTART 0x04 +#define IICTL_CODE_SPECIFICATION 0x10 +#define IICTL_CODE_OPERAND 0x11 +__u8 iictl;/* 0x0055 */ __u16 ipa;/* 0x0056 */ __u32 ipb;/* 0x0058 */ __u32 scaoh;/* 0x005c */
@@ -259,24 +267,48 @@ struct kvm_s390_sie_block {#define HPID_KVM 0x4#define HPID_VSIE 0x5__u8 hpid;/* 0x00b8 */ -__u8 reservedb9[11 ];/* 0x00b9 */ -__u16 extcpuaddr;/* 0x00c4 */ -__u16 eic;/* 0x00c6 */ +__u8 reservedb9[7 ];/* 0x00b9 */ +union { +struct { +__u32 eiparams;/* 0x00c0 */ +__u16 extcpuaddr;/* 0x00c4 */ +__u16 eic;/* 0x00c6 */ + }; +__u64 mcic;/* 0x00c0 */ + } __packed;__u32 reservedc8;/* 0x00c8 */ -__u16 pgmilc;/* 0x00cc */ -__u16 iprcc;/* 0x00ce */ -__u32 dxc;/* 0x00d0 */ -__u16 mcn;/* 0x00d4 */ -__u8 perc;/* 0x00d6 */ -__u8 peratmid;/* 0x00d7 */ +union { +struct { +__u16 pgmilc;/* 0x00cc */ +__u16 iprcc;/* 0x00ce */ + }; +__u32 edc;/* 0x00cc */ + } __packed; +union { +struct { +__u32 dxc;/* 0x00d0 */ +__u16 mcn;/* 0x00d4 */ +__u8 perc;/* 0x00d6 */ +__u8 peratmid;/* 0x00d7 */ + }; +__u64 faddr;/* 0x00d0 */ + } __packed;__u64 peraddr;/* 0x00d8 */ __u8 eai;/* 0x00e0 */ __u8 peraid;/* 0x00e1 */ __u8 oai;/* 0x00e2 */ __u8 armid;/* 0x00e3 */ __u8 reservede4[4 ];/* 0x00e4 */ -__u64 tecmc;/* 0x00e8 */ -__u8 reservedf0[12 ];/* 0x00f0 */ +union { +__u64 tecmc;/* 0x00e8 */ +struct { +__u16 subchannel_id;/* 0x00e8 */ +__u16 subchannel_nr;/* 0x00ea */ +__u32 io_int_parm;/* 0x00ec */ +__u32 io_int_word;/* 0x00f0 */ + }; + } __packed; +__u8 reservedf4[8 ];/* 0x00f4 */ #define CRYCB_FORMAT_MASK 0x00000003#define CRYCB_FORMAT0 0x00000000#define CRYCB_FORMAT1 0x00000001
@@ -546,6 +578,12 @@ enum irq_types {#define IRQ_PEND_MCHK_MASK ((1UL << IRQ_PEND_MCHK_REP) | \ (1UL << IRQ_PEND_MCHK_EX)) +#define IRQ_PEND_EXT_II_MASK ((1UL << IRQ_PEND_EXT_CPU_TIMER) | \ + (1UL << IRQ_PEND_EXT_CLOCK_COMP) | \ + (1UL << IRQ_PEND_EXT_EMERGENCY) | \ + (1UL << IRQ_PEND_EXT_EXTERNAL) | \ + (1UL << IRQ_PEND_EXT_SERVICE)) +struct kvm_s390_interrupt_info {struct list_head list;u64 type;
arch/s390/kvm/interrupt.c +88 -27
194 lines not on this page · raw message
Signature · 1 line
2.25.0
PATCH v3 16/37 KVM: s390: protvirt: Add SCLP interrupt handling
In reply to Christian BorntraegerThe sclp interrupt is kind of special. The ultravisor polices that we do not inject an sclp interrupt with payload if no sccb is outstanding. On the other hand we have "asynchronous" event interrupts, e.g. for console input.
We separate both variants into sclp interrupt and sclp event interrupt. The sclp interrupt is masked until a previous servc instruction has finished (sie exit 108).
--- arch/s390/include/asm/kvm_host.h | 6 +- arch/s390/kvm/intercept.c | 27 +++++++++ arch/s390/kvm/interrupt.c | 95 ++++++++++++++++++++++++++------ arch/s390/kvm/kvm-s390.c | 4 ++ 4 files changed, 113 insertions(+), 19 deletions(-)
arch/s390/include/asm/kvm_host.h +5 -1
@@ -518,6 +518,7 @@ enum irq_types {IRQ_PEND_PFAULT_INIT ,IRQ_PEND_EXT_HOST ,IRQ_PEND_EXT_SERVICE , +IRQ_PEND_EXT_SERVICE_EV ,IRQ_PEND_EXT_TIMING ,IRQ_PEND_EXT_CPU_TIMER , IRQ_PEND_EXT_CLOCK_COMP,
@@ -562,6 +563,7 @@ enum irq_types { (1UL <<IRQ_PEND_EXT_TIMING ) | \ (1UL <<IRQ_PEND_EXT_HOST ) | \ (1UL <<IRQ_PEND_EXT_SERVICE ) | \ + (1UL <<IRQ_PEND_EXT_SERVICE_EV ) | \ (1UL <<IRQ_PEND_VIRTIO ) | \ (1UL <<IRQ_PEND_PFAULT_INIT ) | \ (1UL << IRQ_PEND_PFAULT_DONE))
@@ -582,7 +584,8 @@ enum irq_types { (1UL << IRQ_PEND_EXT_CLOCK_COMP) | \ (1UL << IRQ_PEND_EXT_EMERGENCY) | \ (1UL << IRQ_PEND_EXT_EXTERNAL) | \ - (1UL << IRQ_PEND_EXT_SERVICE)) + (1UL << IRQ_PEND_EXT_SERVICE) | \ + (1UL << IRQ_PEND_EXT_SERVICE_EV)) struct kvm_s390_interrupt_info { struct list_head list;
@@ -642,6 +645,7 @@ struct kvm_s390_local_interrupt {struct kvm_s390_float_interrupt {unsigned long pending_irqs; +unsigned long masked_irqs;spinlock_t lock;struct list_head lists[FIRQ_LIST_COUNT ];int counters[FIRQ_MAX_COUNT ];
arch/s390/kvm/intercept.c +27 -0
@@ -444,8 +444,35 @@ static int handle_operexc(struct kvm_vcpu *vcpu)return kvm_s390_inject_program_int (vcpu,PGM_OPERATION ); } +static int handle_pv_sclp (struct kvm_vcpu *vcpu) +{ +struct kvm_s390_float_interrupt *fi = &vcpu->kvm->arch.float_int; + +spin_lock (&fi->lock); +/* +* 2 cases: +* a: an sccb answering interrupt was already pending or in flight. +* As the sccb value is not known we can simply set some value to +* trigger delivery of a saved SCCB. UV will then use its saved +* copy of the SCCB value. +* b: an error SCCB interrupt needs to be injected so we also inject +* a fake SCCB address. Firmware will use the proper one. +* This makes sure, that both errors and real sccb returns will only +* be delivered after a notification intercept (instruction has +* finished) but not after others. +*/ + fi->srv_signal.ext_params |=0x43000 ; +set_bit (IRQ_PEND_EXT_SERVICE , &fi->pending_irqs); +clear_bit (IRQ_PEND_EXT_SERVICE , &fi->masked_irqs); +spin_unlock (&fi->lock); +return 0 ; +} +static int handle_pv_notification (struct kvm_vcpu *vcpu) { +if (vcpu->arch.sie_block->ipa ==0xb220 ) +return handle_pv_sclp (vcpu); +return handle_instruction (vcpu); }
arch/s390/kvm/interrupt.c +77 -18
163 lines not on this page · raw message
arch/s390/kvm/kvm-s390.c +4 -0
@@ -2236,6 +2236,8 @@ static int kvm_s390_handle_pv(struct kvm *kvm, struct kvm_pv_cmd *cmd)if (r)kvm_s390_pv_destroy_vm (kvm, &dummy, &dummy); +/* we need to block service interrupts from now on */ +set_bit (IRQ_PEND_EXT_SERVICE , &kvm->arch.float_int.masked_irqs);break ; }case KVM_PV_DISABLE : {
@@ -2247,6 +2249,8 @@ static int kvm_s390_handle_pv(struct kvm *kvm, struct kvm_pv_cmd *cmd) r =kvm_s390_pv_destroy_vm (kvm, &cmd->rc, &cmd->rrc);if (!r)kvm_s390_pv_dealloc_vm (kvm); +/* no need to block service interrupts any more */ +clear_bit (IRQ_PEND_EXT_SERVICE , &kvm->arch.float_int.masked_irqs);break ; }case KVM_PV_VM_SET_SEC_PARMS : {
Signature · 1 line
2.25.0
PATCH v3 17/37 KVM: s390: protvirt: Handle spec exception loops
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
SIE intercept code 8 is used only on exception loops for protected guests. That means we need to stop the guest when we see it. This is done by userspace.
--- arch/s390/kvm/intercept.c | 7 +++++++ 1 file changed, 7 insertions(+)
arch/s390/kvm/intercept.c +7 -0
@@ -231,6 +231,13 @@ static int handle_prog(struct kvm_vcpu *vcpu) vcpu->stat.exit_program_interruption++; +/* +* Intercept 8 indicates a loop of specification exceptions +* for protected guests. +*/ +if (kvm_s390_pv_cpu_is_protected (vcpu)) +return -EOPNOTSUPP ; +if (guestdbg_enabled (vcpu) &&per_event (vcpu)) { rc =kvm_s390_handle_per_event (vcpu);if (rc)
Signature · 1 line
2.25.0
PATCH v3 18/37 KVM: s390: protvirt: Add new gprs location handling
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
Guest registers for protected guests are stored at offset 0x380. We will copy those to the usual places. Long term we could refactor this or use register access functions.
--- arch/s390/include/asm/kvm_host.h | 4 +++- arch/s390/kvm/kvm-s390.c | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-)
arch/s390/include/asm/kvm_host.h +3 -1
@@ -343,7 +343,9 @@ struct kvm_s390_itdb {struct sie_page {struct kvm_s390_sie_block sie_block;struct mcck_volatile_info mcck_info;/* 0x0200 */ -__u8 reserved218[1000 ];/* 0x0218 */ +__u8 reserved218[360 ];/* 0x0218 */ +__u64 pv_grregs[16 ];/* 0x0380 */ +__u8 reserved400[512 ];/* 0x0400 */ struct kvm_s390_itdb itdb;/* 0x0600 */ __u8 reserved700[2304 ];/* 0x0700 */ };
arch/s390/kvm/kvm-s390.c +11 -0
@@ -4035,6 +4035,7 @@ static int vcpu_post_run(struct kvm_vcpu *vcpu, int exit_reason)static int __vcpu_run (struct kvm_vcpu *vcpu) {int rc, exit_reason; +struct sie_page *sie_page = (struct sie_page *)vcpu->arch.sie_block;/* * We try to hold kvm->srcu during most of vcpu_run (except when run-
@@ -4056,8 +4057,18 @@ static int __vcpu_run(struct kvm_vcpu *vcpu)guest_enter_irqoff ();__disable_cpu_timer_accounting (vcpu);local_irq_enable (); +if (kvm_s390_pv_cpu_is_protected (vcpu)) { +memcpy (sie_page->pv_grregs, + vcpu->run->s.regs.gprs, +sizeof (sie_page->pv_grregs)); + } exit_reason =sie64a (vcpu->arch.sie_block, vcpu->run->s.regs.gprs); +if (kvm_s390_pv_cpu_is_protected (vcpu)) { +memcpy (vcpu->run->s.regs.gprs, + sie_page->pv_grregs, +sizeof (sie_page->pv_grregs)); + }local_irq_disable ();__enable_cpu_timer_accounting (vcpu);guest_exit_irqoff ();
Signature · 1 line
2.25.0
PATCH v3 19/37 KVM: S390: protvirt: Introduce instruction data area bounce buffer
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
Now that we can't access guest memory anymore, we have a dedicated satellite block that's a bounce buffer for instruction data.
We re-use the memop interface to copy the instruction data to / from userspace. This lets us re-use a lot of QEMU code which used that interface to make logical guest memory accesses which are not possible anymore in protected mode anyway.
--- arch/s390/include/asm/kvm_host.h | 11 +++++- arch/s390/kvm/kvm-s390.c | 65 ++++++++++++++++++++++++++++---- arch/s390/kvm/pv.c | 10 +++++ include/uapi/linux/kvm.h | 9 ++++- 4 files changed, 84 insertions(+), 11 deletions(-)
arch/s390/include/asm/kvm_host.h +10 -1
@@ -127,6 +127,12 @@ struct mcck_volatile_info {#define CR14_INITIAL_MASK (CR14_UNUSED_32 | CR14_UNUSED_33 | \ CR14_EXTERNAL_DAMAGE_SUBMASK) +#define SIDAD_SIZE_MASK 0xff +#define sida_origin (sie_block) \ + ((sie_block)->sidad & PAGE_MASK) +#define sida_size (sie_block) \ + ((((sie_block)->sidad & SIDAD_SIZE_MASK) + 1) * PAGE_SIZE) +#define CPUSTAT_STOPPED 0x80000000#define CPUSTAT_WAIT 0x10000000#define CPUSTAT_ECALL_PEND 0x08000000
@@ -315,7 +321,10 @@ struct kvm_s390_sie_block {#define CRYCB_FORMAT2 0x00000003__u32 crycbd;/* 0x00fc */ __u64 gcr[16 ];/* 0x0100 */ -__u64 gbea;/* 0x0180 */ +union { +__u64 gbea;/* 0x0180 */ +__u64 sidad; + };__u8 reserved188[8 ];/* 0x0188 */ __u64 sdnxo;/* 0x0190 */ __u8 reserved198[8 ];/* 0x0198 */
arch/s390/kvm/kvm-s390.c +57 -8
102 lines not on this page · raw message
arch/s390/kvm/pv.c +10 -0
@@ -93,10 +93,12 @@ void kvm_s390_pv_destroy_cpu(struct kvm_vcpu *vcpu, u16 *rc, u16 *rrc)free_pages (vcpu->arch.pv.stor_base,get_order (uv_info.guest_cpu_stor_len)); +free_page (sida_origin (vcpu->arch.sie_block)); vcpu->arch.sie_block->pv_handle_cpu =0 ; vcpu->arch.sie_block->pv_handle_config =0 ;memset (&vcpu->arch.pv,0 ,sizeof (vcpu->arch.pv)); vcpu->arch.sie_block->sdf =0 ; + vcpu->arch.sie_block->gbea =1 ;kvm_make_request (KVM_REQ_TLB_FLUSH , vcpu); }
@@ -122,6 +124,14 @@ int kvm_s390_pv_create_cpu(struct kvm_vcpu *vcpu, u16 *rc, u16 *rrc) uvcb.state_origin = (u64 )vcpu->arch.sie_block; uvcb.stor_origin = (u64 )vcpu->arch.pv.stor_base; +/* Alloc Secure Instruction Data Area Designation */ + vcpu->arch.sie_block->sidad =__get_free_page (GFP_KERNEL | __GFP_ZERO); +if (!vcpu->arch.sie_block->sidad) { +free_pages (vcpu->arch.pv.stor_base, +get_order (uv_info.guest_cpu_stor_len)); +return -ENOMEM ; + } + cc =uv_call (0 , (u64)&uvcb); *rc = uvcb.header.rc; *rrc = uvcb.header.rrc;
include/uapi/linux/kvm.h +7 -2
@@ -474,12 +474,17 @@ struct kvm_s390_mem_op {__u32 size;/* amount of bytes */ __u32 op;/* type of operation */ __u64 buf;/* buffer in userspace */ -__u8 ar;/* the access register number */ -__u8 reserved[31 ];/* should be set to 0 */ +union { +__u8 ar;/* the access register number */ +__u32 sida_offset;/* offset into the sida */ +__u8 reserved[32 ];/* should be set to 0 */ + }; };/* types for kvm_s390_mem_op->op */ #define KVM_S390_MEMOP_LOGICAL_READ 0#define KVM_S390_MEMOP_LOGICAL_WRITE 1 +#define KVM_S390_MEMOP_SIDA_READ 2 +#define KVM_S390_MEMOP_SIDA_WRITE 3/* flags for kvm_s390_mem_op->flags */ #define KVM_S390_MEMOP_F_CHECK_ONLY (1ULL << 0)#define KVM_S390_MEMOP_F_INJECT_EXCEPTION (1ULL << 1)
Signature · 1 line
2.25.0
PATCH v3 20/37 KVM: s390: protvirt: handle secure guest prefix pages
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
The SPX instruction is handled by the ultravisor. We do get a notification intercept, though. Let us update our internal view.
In addition to that, when the guest prefix page is not secure, an intercept 112 (0x70) is indicated. Let us make the prefix pages secure again.
--- arch/s390/include/asm/kvm_host.h | 1 + arch/s390/kvm/intercept.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+)
arch/s390/include/asm/kvm_host.h +1 -0
@@ -225,6 +225,7 @@ struct kvm_s390_sie_block {#define ICPT_INT_ENABLE 0x64#define ICPT_PV_INSTR 0x68#define ICPT_PV_NOTIFY 0x6c +#define ICPT_PV_PREF 0x70__u8 icptcode;/* 0x0050 */ __u8 icptstatus;/* 0x0051 */ __u16 ihcpu;/* 0x0052 */
arch/s390/kvm/intercept.c +18 -0
@@ -451,6 +451,15 @@ static int handle_operexc(struct kvm_vcpu *vcpu)return kvm_s390_inject_program_int (vcpu,PGM_OPERATION ); } +static int handle_pv_spx (struct kvm_vcpu *vcpu) +{ +u32 pref = *(u32 *)vcpu->arch.sie_block->sidad; + +kvm_s390_set_prefix (vcpu, pref); +trace_kvm_s390_handle_prefix (vcpu,1 , pref); +return 0 ; +} +static int handle_pv_sclp (struct kvm_vcpu *vcpu) {struct kvm_s390_float_interrupt *fi = &vcpu->kvm->arch.float_int;
@@ -477,6 +486,8 @@ static int handle_pv_sclp(struct kvm_vcpu *vcpu)static int handle_pv_notification (struct kvm_vcpu *vcpu) { +if (vcpu->arch.sie_block->ipa ==0xb210 ) +return handle_pv_spx (vcpu);if (vcpu->arch.sie_block->ipa ==0xb220 )return handle_pv_sclp (vcpu);
@@ -534,6 +545,13 @@ int kvm_handle_sie_intercept(struct kvm_vcpu *vcpu)case ICPT_PV_NOTIFY : rc =handle_pv_notification (vcpu);break ; +case ICPT_PV_PREF : + rc =0 ; +gmap_convert_to_secure (vcpu->arch.gmap, +kvm_s390_get_prefix (vcpu)); +gmap_convert_to_secure (vcpu->arch.gmap, +kvm_s390_get_prefix (vcpu) +PAGE_SIZE ); +break ;default :return -EOPNOTSUPP ; }
Signature · 1 line
2.25.0
PATCH v3 21/37 KVM: s390/mm: handle guest unpin events
In reply to Christian BorntraegerFrom: Claudio Imbrenda <[email protected]>
The current code tries to first pin shared pages, if that fails (e.g. because the page is not shared) it will export them. For shared pages this means that we get a new intercept telling us that the guest is unsharing that page. We will make the page secure at that point in time and revoke the host access. This is synchronized with other host events, e.g. the code will wait until host I/O has finished.
--- arch/s390/kvm/intercept.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
arch/s390/kvm/intercept.c +24 -0
@@ -16,6 +16,7 @@#include <asm/asm-offsets.h> #include <asm/irq.h> #include <asm/sysinfo.h> +#include <asm/uv.h> #include "kvm-s390.h" #include "gaccess.h"
@@ -484,12 +485,35 @@ static int handle_pv_sclp(struct kvm_vcpu *vcpu)return 0 ; } +static int handle_pv_uvc (struct kvm_vcpu *vcpu) +{ +struct uv_cb_share *guest_uvcb = (void *)vcpu->arch.sie_block->sidad; +struct uv_cb_cts uvcb = { + .header.cmd =UVC_CMD_UNPIN_PAGE_SHARED , + .header.len =sizeof (uvcb), + .guest_handle =kvm_s390_pv_get_handle (vcpu->kvm), + .gaddr = guest_uvcb->paddr, + }; +int rc; + +if (guest_uvcb->header.cmd !=UVC_CMD_REMOVE_SHARED_ACCESS ) { +WARN_ONCE (1 ,"Unexpected UVC 0x%x!\n" , guest_uvcb->header.cmd); +return 0 ; + } + rc =gmap_make_secure (vcpu->arch.gmap, uvcb.gaddr, &uvcb); +if (rc == -EINVAL ) +return 0 ; +return rc; +} +static int handle_pv_notification (struct kvm_vcpu *vcpu) {if (vcpu->arch.sie_block->ipa ==0xb210 )return handle_pv_spx (vcpu);if (vcpu->arch.sie_block->ipa ==0xb220 )return handle_pv_sclp (vcpu); +if (vcpu->arch.sie_block->ipa ==0xb9a4 ) +return handle_pv_uvc (vcpu);return handle_instruction (vcpu); }
Signature · 1 line
2.25.0
PATCH v3 22/37 KVM: s390: protvirt: Write sthyi data to instruction data area
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
STHYI data has to go through the bounce buffer.
--- arch/s390/kvm/intercept.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
arch/s390/kvm/intercept.c +10 -5
@@ -392,7 +392,7 @@ int handle_sthyi(struct kvm_vcpu *vcpu) goto out; } -if (addr & ~PAGE_MASK ) +if (!kvm_s390_pv_cpu_is_protected (vcpu) && (addr & ~PAGE_MASK ))return kvm_s390_inject_program_int (vcpu,PGM_SPECIFICATION ); sctns = (void *)get_zeroed_page (GFP_KERNEL );
@@ -403,10 +403,15 @@ int handle_sthyi(struct kvm_vcpu *vcpu) out:if (!cc) { - r =write_guest (vcpu, addr, reg2, sctns,PAGE_SIZE ); -if (r) { -free_page ((unsigned long )sctns); -return kvm_s390_inject_prog_cond (vcpu, r); +if (kvm_s390_pv_cpu_is_protected (vcpu)) { +memcpy ((void *)(sida_origin (vcpu->arch.sie_block)), + sctns,PAGE_SIZE ); + }else { + r =write_guest (vcpu, addr, reg2, sctns,PAGE_SIZE ); +if (r) { +free_page ((unsigned long )sctns); +return kvm_s390_inject_prog_cond (vcpu, r); + } } }
Signature · 1 line
2.25.0
PATCH v3 23/37 KVM: s390: protvirt: STSI handling
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
Save response to sidad and disable address checking for protected guests.
--- arch/s390/kvm/priv.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
arch/s390/kvm/priv.c +8 -3
@@ -872,7 +872,7 @@ static int handle_stsi(struct kvm_vcpu *vcpu) operand2 =kvm_s390_get_base_disp_s (vcpu, &ar); -if (operand2 &0xfff ) +if (!kvm_s390_pv_cpu_is_protected (vcpu) && (operand2 &0xfff ))return kvm_s390_inject_program_int (vcpu,PGM_SPECIFICATION );switch (fc) {
@@ -893,8 +893,13 @@ static int handle_stsi(struct kvm_vcpu *vcpu)handle_stsi_3_2_2 (vcpu, (void *) mem);break ; } - - rc =write_guest (vcpu, operand2, ar, (void *)mem,PAGE_SIZE ); +if (kvm_s390_pv_cpu_is_protected (vcpu)) { +memcpy ((void *)sida_origin (vcpu->arch.sie_block), (void *)mem, +PAGE_SIZE ); + rc =0 ; + }else { + rc =write_guest (vcpu, operand2, ar, (void *)mem,PAGE_SIZE ); + }if (rc) { rc =kvm_s390_inject_prog_cond (vcpu, rc); goto out;
Signature · 1 line
2.25.0
PATCH v3 24/37 KVM: s390: protvirt: disallow one_reg
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
A lot of the registers are controlled by the Ultravisor and never visible to KVM. Some fields in the sie control block are overlayed, like gbea. As no known userspace uses the ONE_REG interface on s390 if sync regs are available, no functionality is lost if it is disabled for protected guests.
--- Documentation/virt/kvm/api.rst | 6 ++++-- arch/s390/kvm/kvm-s390.c | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-)
Documentation/virt/kvm/api.rst +4 -2
@@ -2117,7 +2117,8 @@ Errors: ====== ============================================================ ENOENT no such register - EINVAL invalid register ID, or no such register + EINVAL invalid register ID, or no such register or used with VMs in + protected virtualization mode on s390 EPERM (arm64) register access not allowed before vcpu finalization ====== ============================================================
@@ -2552,7 +2553,8 @@ Errors include: ======== ============================================================ ENOENT no such register - EINVAL invalid register ID, or no such register + EINVAL invalid register ID, or no such register or used with VMs in + protected virtualization mode on s390 EPERM (arm64) register access not allowed before vcpu finalization ======== ============================================================
arch/s390/kvm/kvm-s390.c +3 -0
@@ -4649,6 +4649,9 @@ long kvm_arch_vcpu_ioctl(struct file *filp,case KVM_SET_ONE_REG :case KVM_GET_ONE_REG : {struct kvm_one_reg reg; + r = -EINVAL ; +if (kvm_s390_pv_cpu_is_protected (vcpu)) +break ; r = -EFAULT ;if (copy_from_user (®, argp,sizeof (reg)))break ;
Signature · 1 line
2.25.0
PATCH v3 25/37 KVM: s390: protvirt: Do only reset registers that are accessible
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
For protected VMs the hypervisor can not access guest breaking event address, program parameter, bpbc and todpr. Do not reset those fields as the control block does not provide access to these fields.
--- arch/s390/kvm/kvm-s390.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
arch/s390/kvm/kvm-s390.c +6 -4
@@ -3478,14 +3478,16 @@ static void kvm_arch_vcpu_ioctl_initial_reset(struct kvm_vcpu *vcpu)kvm_s390_set_prefix (vcpu,0 );kvm_s390_set_cpu_timer (vcpu,0 ); vcpu->arch.sie_block->ckc =0 ; - vcpu->arch.sie_block->todpr =0 ;memset (vcpu->arch.sie_block->gcr,0 ,sizeof (vcpu->arch.sie_block->gcr)); vcpu->arch.sie_block->gcr[0 ] =CR0_INITIAL_MASK ; vcpu->arch.sie_block->gcr[14 ] =CR14_INITIAL_MASK ; vcpu->run->s.regs.fpc =0 ; - vcpu->arch.sie_block->gbea =1 ; - vcpu->arch.sie_block->pp =0 ; - vcpu->arch.sie_block->fpf &= ~FPF_BPBC ; +if (!kvm_s390_pv_cpu_is_protected (vcpu)) { + vcpu->arch.sie_block->gbea =1 ; + vcpu->arch.sie_block->pp =0 ; + vcpu->arch.sie_block->fpf &= ~FPF_BPBC ; + vcpu->arch.sie_block->todpr =0 ; + } }static void kvm_arch_vcpu_ioctl_clear_reset (struct kvm_vcpu *vcpu)
Signature · 1 line
2.25.0
Re: [PATCH v3 25/37] KVM: s390: protvirt: Do only reset registers that are accessible
Quoted 29 lines · Christian Borntraeger
From: Janosch Frank <[email protected]>
For protected VMs the hypervisor can not access guest breaking event address, program parameter, bpbc and todpr. Do not reset those fields as the control block does not provide access to these fields.
Signed-off-by Janosch Frank <[email protected]>[[email protected]: patch merging, splitting, fixing]Signed-off-by Christian Borntraeger <[email protected]>--- arch/s390/kvm/kvm-s390.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)arch/s390/kvm/kvm-s390.c +0
-3@@ -3478,14 +3478,16 @@ static void kvm_arch_vcpu_ioctl_initial_reset(struct kvm_vcpu *vcpu)kvm_s390_set_prefix (vcpu,0 );kvm_s390_set_cpu_timer (vcpu,0 ); vcpu->arch.sie_block->ckc =0 ; - vcpu->arch.sie_block->todpr =0 ;memset (vcpu->arch.sie_block->gcr,0 ,sizeof (vcpu->arch.sie_block->gcr)); vcpu->arch.sie_block->gcr[0 ] =CR0_INITIAL_MASK ; vcpu->arch.sie_block->gcr[14 ] =CR14_INITIAL_MASK ; vcpu->run->s.regs.fpc =0 ; - vcpu->arch.sie_block->gbea =1 ; - vcpu->arch.sie_block->pp =0 ;
arch/s390/kvm/kvm-s390.c static void kvm_arch_vcpu_ioctl_initial_reset(struct kvm_vcpu *vcpu) · line 3493
Quoted 10 lines
arch/s390/kvm/kvm-s390.c +6
-1- vcpu->arch.sie_block->fpf &= ~FPF_BPBC ; +if (!kvm_s390_pv_cpu_is_protected (vcpu)) { + vcpu->arch.sie_block->gbea =1 ; + vcpu->arch.sie_block->pp =0 ; + vcpu->arch.sie_block->fpf &= ~FPF_BPBC ; + vcpu->arch.sie_block->todpr =0 ; + } }static void kvm_arch_vcpu_ioctl_clear_reset (struct kvm_vcpu *vcpu)
Signature · 3 lines
Thanks, David / dhildenb
PATCH v3 26/37 KVM: s390: protvirt: Only sync fmt4 registers
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
A lot of the registers are controlled by the Ultravisor and never visible to KVM. Also some registers are overlayed, like gbea is with sidad, which might leak data to userspace.
Hence we sync a minimal set of registers for both SIE formats and then check and sync format 2 registers if necessary.
--- arch/s390/kvm/kvm-s390.c | 110 +++++++++++++++++++++++++-------------- 1 file changed, 70 insertions(+), 40 deletions(-)
arch/s390/kvm/kvm-s390.c +70 -40
@@ -4084,7 +4084,7 @@ static int __vcpu_run(struct kvm_vcpu *vcpu)return rc; } -static void sync_regs (struct kvm_vcpu *vcpu,struct kvm_run *kvm_run) +static void sync_regs_fmt2 (struct kvm_vcpu *vcpu,struct kvm_run *kvm_run) {struct runtime_instr_cb *riccb;struct gs_cb *gscb;
@@ -4093,16 +4093,7 @@ static void sync_regs(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) gscb = (struct gs_cb *) &kvm_run->s.regs.gscb; vcpu->arch.sie_block->gpsw.mask = kvm_run->psw_mask; vcpu->arch.sie_block->gpsw.addr = kvm_run->psw_addr; -if (kvm_run->kvm_dirty_regs &KVM_SYNC_PREFIX ) -kvm_s390_set_prefix (vcpu, kvm_run->s.regs.prefix); -if (kvm_run->kvm_dirty_regs &KVM_SYNC_CRS ) { -memcpy (&vcpu->arch.sie_block->gcr, &kvm_run->s.regs.crs,128 ); -/* some control register changes require a tlb flush */ -kvm_make_request (KVM_REQ_TLB_FLUSH , vcpu); - }if (kvm_run->kvm_dirty_regs &KVM_SYNC_ARCH0 ) { -kvm_s390_set_cpu_timer (vcpu, kvm_run->s.regs.cputm); - vcpu->arch.sie_block->ckc = kvm_run->s.regs.ckc; vcpu->arch.sie_block->todpr = kvm_run->s.regs.todpr; vcpu->arch.sie_block->pp = kvm_run->s.regs.pp; vcpu->arch.sie_block->gbea = kvm_run->s.regs.gbea;
@@ -4143,6 +4134,36 @@ static void sync_regs(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) vcpu->arch.sie_block->fpf &= ~FPF_BPBC ; vcpu->arch.sie_block->fpf |= kvm_run->s.regs.bpbc ?FPF_BPBC :0 ; } +if (MACHINE_HAS_GS ) { +preempt_disable (); +__ctl_set_bit (2 ,4 ); +if (current->thread.gs_cb) { + vcpu->arch.host_gscb = current->thread.gs_cb; +save_gs_cb (vcpu->arch.host_gscb); + } +if (vcpu->arch.gs_enabled) { + current->thread.gs_cb = (struct gs_cb *) + &vcpu->run->s.regs.gscb; +restore_gs_cb (current->thread.gs_cb); + } +preempt_enable (); + } +/* SIE will load etoken directly from SDNX and therefore kvm_run */ +} + +static void sync_regs (struct kvm_vcpu *vcpu,struct kvm_run *kvm_run) +{ +if (kvm_run->kvm_dirty_regs &KVM_SYNC_PREFIX ) +kvm_s390_set_prefix (vcpu, kvm_run->s.regs.prefix); +if (kvm_run->kvm_dirty_regs &KVM_SYNC_CRS ) { +memcpy (&vcpu->arch.sie_block->gcr, &kvm_run->s.regs.crs,128 ); +/* some control register changes require a tlb flush */ +kvm_make_request (KVM_REQ_TLB_FLUSH , vcpu); + } +if (kvm_run->kvm_dirty_regs &KVM_SYNC_ARCH0 ) { +kvm_s390_set_cpu_timer (vcpu, kvm_run->s.regs.cputm); + vcpu->arch.sie_block->ckc = kvm_run->s.regs.ckc; + }save_access_regs (vcpu->arch.host_acrs);restore_access_regs (vcpu->run->s.regs.acrs);/* save host (userspace) fprs/vrs */
@@ -4157,23 +4178,47 @@ static void sync_regs(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)if (test_fp_ctl (current->thread.fpu.fpc))/* User space provided an invalid FPC, let's clear it */ current->thread.fpu.fpc =0 ; + +/* Sync fmt2 only data */ +if (likely (!kvm_s390_pv_cpu_is_protected (vcpu))) { +sync_regs_fmt2 (vcpu, kvm_run); + }else { +/* +* In several places we have to modify our internal view to +* not do things that are disallowed by the ultravisor. For +* example we must not inject interrupts after specific exits +* (e.g. 112 prefix page not secure). We do this by turning +* off the machine check, external and I/O interrupt bits +* of our PSW copy. To avoid getting validity intercepts, we +* do only accept the condition code from userspace. +*/ + vcpu->arch.sie_block->gpsw.mask &= ~PSW_MASK_CC ; + vcpu->arch.sie_block->gpsw.mask |= kvm_run->psw_mask & +PSW_MASK_CC ; + } + + kvm_run->kvm_dirty_regs =0 ; +} + +static void store_regs_fmt2 (struct kvm_vcpu *vcpu,struct kvm_run *kvm_run) +{ + kvm_run->s.regs.todpr = vcpu->arch.sie_block->todpr; + kvm_run->s.regs.pp = vcpu->arch.sie_block->pp; + kvm_run->s.regs.gbea = vcpu->arch.sie_block->gbea; + kvm_run->s.regs.bpbc = (vcpu->arch.sie_block->fpf &FPF_BPBC ) ==FPF_BPBC ;if (MACHINE_HAS_GS ) { -preempt_disable ();__ctl_set_bit (2 ,4 ); -if (current->thread.gs_cb) { - vcpu->arch.host_gscb = current->thread.gs_cb; -save_gs_cb (vcpu->arch.host_gscb); - } -if (vcpu->arch.gs_enabled) { - current->thread.gs_cb = (struct gs_cb *) - &vcpu->run->s.regs.gscb; -restore_gs_cb (current->thread.gs_cb); - } +if (vcpu->arch.gs_enabled) +save_gs_cb (current->thread.gs_cb); +preempt_disable (); + current->thread.gs_cb = vcpu->arch.host_gscb; +restore_gs_cb (vcpu->arch.host_gscb);preempt_enable (); +if (!vcpu->arch.host_gscb) +__ctl_clear_bit (2 ,4 ); + vcpu->arch.host_gscb =NULL ; } -/* SIE will load etoken directly from SDNX and therefore kvm_run */ - - kvm_run->kvm_dirty_regs =0 ; +/* SIE will save etoken directly into SDNX and therefore kvm_run */ }static void store_regs (struct kvm_vcpu *vcpu,struct kvm_run *kvm_run)
@@ -4184,13 +4229,9 @@ static void store_regs(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)memcpy (&kvm_run->s.regs.crs, &vcpu->arch.sie_block->gcr,128 ); kvm_run->s.regs.cputm =kvm_s390_get_cpu_timer (vcpu); kvm_run->s.regs.ckc = vcpu->arch.sie_block->ckc; - kvm_run->s.regs.todpr = vcpu->arch.sie_block->todpr; - kvm_run->s.regs.pp = vcpu->arch.sie_block->pp; - kvm_run->s.regs.gbea = vcpu->arch.sie_block->gbea; kvm_run->s.regs.pft = vcpu->arch.pfault_token; kvm_run->s.regs.pfs = vcpu->arch.pfault_select; kvm_run->s.regs.pfc = vcpu->arch.pfault_compare; - kvm_run->s.regs.bpbc = (vcpu->arch.sie_block->fpf &FPF_BPBC ) ==FPF_BPBC ;save_access_regs (vcpu->run->s.regs.acrs);restore_access_regs (vcpu->arch.host_acrs);/* Save guest register state */
@@ -4199,19 +4240,8 @@ static void store_regs(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)/* Restore will be done lazily at return */ current->thread.fpu.fpc = vcpu->arch.host_fpregs.fpc; current->thread.fpu.regs = vcpu->arch.host_fpregs.regs; -if (MACHINE_HAS_GS ) { -__ctl_set_bit (2 ,4 ); -if (vcpu->arch.gs_enabled) -save_gs_cb (current->thread.gs_cb); -preempt_disable (); - current->thread.gs_cb = vcpu->arch.host_gscb; -restore_gs_cb (vcpu->arch.host_gscb); -preempt_enable (); -if (!vcpu->arch.host_gscb) -__ctl_clear_bit (2 ,4 ); - vcpu->arch.host_gscb =NULL ; - } -/* SIE will save etoken directly into SDNX and therefore kvm_run */ +if (likely (!kvm_s390_pv_cpu_is_protected (vcpu))) +store_regs_fmt2 (vcpu, kvm_run); }int kvm_arch_vcpu_ioctl_run (struct kvm_vcpu *vcpu,struct kvm_run *kvm_run)
Signature · 1 line
2.25.0
Re: [PATCH v3 26/37] KVM: s390: protvirt: Only sync fmt4 registers
Quoted 9 lines · Christian Borntraeger
From: Janosch Frank <[email protected]>
A lot of the registers are controlled by the Ultravisor and never visible to KVM. Also some registers are overlayed, like gbea is with sidad, which might leak data to userspace.
Hence we sync a minimal set of registers for both SIE formats and then check and sync format 2 registers if necessary.
Signature · 3 lines
Thanks, David / dhildenb
PATCH v3 27/37 KVM: s390: protvirt: Add program exception injection
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
Only two program exceptions can be injected for a protected guest:
specification and operand.
For both, a code needs to be specified in the interrupt injection control of the state description, as the guest prefix page is not accessible to KVM for such guests.
--- arch/s390/kvm/interrupt.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
arch/s390/kvm/interrupt.c +19 -0
@@ -836,6 +836,21 @@ static int __must_check __deliver_external_call(struct kvm_vcpu *vcpu)return rc ? -EFAULT :0 ; } +static int __deliver_prog_pv (struct kvm_vcpu *vcpu,u16 code) +{ +switch (code) { +case PGM_SPECIFICATION : + vcpu->arch.sie_block->iictl =IICTL_CODE_SPECIFICATION ; +break ; +case PGM_OPERAND : + vcpu->arch.sie_block->iictl =IICTL_CODE_OPERAND ; +break ; +default : +return -EINVAL ; + } +return 0 ; +} +static int __must_check __deliver_prog (struct kvm_vcpu *vcpu) {struct kvm_s390_local_interrupt *li = &vcpu->arch.local_int;
@@ -856,6 +871,10 @@ static int __must_check __deliver_prog(struct kvm_vcpu *vcpu)trace_kvm_s390_deliver_interrupt (vcpu->vcpu_id,KVM_S390_PROGRAM_INT , pgm_info.code,0 ); +/* PER is handled by the ultravisor */ +if (kvm_s390_pv_cpu_is_protected (vcpu)) +return __deliver_prog_pv (vcpu, pgm_info.code & ~PGM_PER ); +switch (pgm_info.code & ~PGM_PER ) {case PGM_AFX_TRANSLATION :case PGM_ASX_TRANSLATION :
Signature · 1 line
2.25.0
PATCH v3 28/37 KVM: s390: protvirt: UV calls in support of diag308 0, 1
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
diag 308 subcode 0 and 1 require several KVM and Ultravisor interactions. Specific to these "soft" reboots are
* The "unshare all" UVC
* The "prepare for reset" UVC
--- arch/s390/include/asm/uv.h | 4 ++++ arch/s390/kvm/kvm-s390.c | 22 ++++++++++++++++++++++ include/uapi/linux/kvm.h | 2 ++ 3 files changed, 28 insertions(+)
arch/s390/include/asm/uv.h +4 -0
@@ -36,6 +36,8 @@#define UVC_CMD_SET_SEC_CONF_PARAMS 0x0300#define UVC_CMD_UNPACK_IMG 0x0301#define UVC_CMD_VERIFY_IMG 0x0302 +#define UVC_CMD_PREPARE_RESET 0x0320 +#define UVC_CMD_SET_UNSHARE_ALL 0x0340#define UVC_CMD_PIN_PAGE_SHARED 0x0341#define UVC_CMD_UNPIN_PAGE_SHARED 0x0342#define UVC_CMD_SET_SHARED_ACCESS 0x1000
@@ -56,6 +58,8 @@ enum uv_cmds_inst {BIT_UVC_CMD_SET_SEC_PARMS =11 ,BIT_UVC_CMD_UNPACK_IMG =13 ,BIT_UVC_CMD_VERIFY_IMG =14 , +BIT_UVC_CMD_PREPARE_RESET =18 , +BIT_UVC_CMD_UNSHARE_ALL =20 ,BIT_UVC_CMD_PIN_PAGE_SHARED =21 , BIT_UVC_CMD_UNPIN_PAGE_SHARED = 22, };
arch/s390/kvm/kvm-s390.c +22 -0
@@ -2310,6 +2310,28 @@ static int kvm_s390_handle_pv(struct kvm *kvm, struct kvm_pv_cmd *cmd) cmd->rrc);break ; } +case KVM_PV_VM_PREP_RESET : { + r = -EINVAL ; +if (!kvm_s390_pv_is_protected (kvm)) +break ; + + r =uv_cmd_nodata (kvm_s390_pv_get_handle (kvm), +UVC_CMD_PREPARE_RESET , &cmd->rc, &cmd->rrc); +KVM_UV_EVENT (kvm,3 ,"PROTVIRT PREP RESET: rc %x rrc %x" , + cmd->rc, cmd->rrc); +break ; + } +case KVM_PV_VM_UNSHARE_ALL : { + r = -EINVAL ; +if (!kvm_s390_pv_is_protected (kvm)) +break ; + + r =uv_cmd_nodata (kvm_s390_pv_get_handle (kvm), +UVC_CMD_SET_UNSHARE_ALL , &cmd->rc, &cmd->rrc); +KVM_UV_EVENT (kvm,3 ,"PROTVIRT UNSHARE: rc %x rrc %x" , + cmd->rc, cmd->rrc); +break ; + }default :return -ENOTTY ; }
include/uapi/linux/kvm.h +2 -0
@@ -1500,6 +1500,8 @@ enum pv_cmd_id {KVM_PV_VM_SET_SEC_PARMS ,KVM_PV_VM_UNPACK ,KVM_PV_VM_VERIFY , +KVM_PV_VM_PREP_RESET , + KVM_PV_VM_UNSHARE_ALL, }; struct kvm_pv_cmd {
Signature · 1 line
2.25.0
Re: [PATCH v3 28/37] KVM: s390: protvirt: UV calls in support of diag308 0, 1
Quoted 62 lines · Christian Borntraeger
From: Janosch Frank <[email protected]>
diag 308 subcode 0 and 1 require several KVM and Ultravisor interactions. Specific to these "soft" reboots are
* The "unshare all" UVC
* The "prepare for reset" UVCSigned-off-by Janosch Frank <[email protected]>[[email protected]: patch merging, splitting, fixing]Signed-off-by Christian Borntraeger <[email protected]>--- arch/s390/include/asm/uv.h | 4 ++++ arch/s390/kvm/kvm-s390.c | 22 ++++++++++++++++++++++ include/uapi/linux/kvm.h | 2 ++ 3 files changed, 28 insertions(+)arch/s390/include/asm/uv.h +4
-0@@ -36,6 +36,8 @@#define UVC_CMD_SET_SEC_CONF_PARAMS 0x0300#define UVC_CMD_UNPACK_IMG 0x0301#define UVC_CMD_VERIFY_IMG 0x0302 +#define UVC_CMD_PREPARE_RESET 0x0320 +#define UVC_CMD_SET_UNSHARE_ALL 0x0340#define UVC_CMD_PIN_PAGE_SHARED 0x0341#define UVC_CMD_UNPIN_PAGE_SHARED 0x0342#define UVC_CMD_SET_SHARED_ACCESS 0x1000@@ -56,6 +58,8 @@ enum uv_cmds_inst {BIT_UVC_CMD_SET_SEC_PARMS =11 ,BIT_UVC_CMD_UNPACK_IMG =13 ,BIT_UVC_CMD_VERIFY_IMG =14 , +BIT_UVC_CMD_PREPARE_RESET =18 , +BIT_UVC_CMD_UNSHARE_ALL =20 ,BIT_UVC_CMD_PIN_PAGE_SHARED =21 , BIT_UVC_CMD_UNPIN_PAGE_SHARED = 22, };arch/s390/kvm/kvm-s390.c +15
-0@@ -2310,6 +2310,28 @@ static int kvm_s390_handle_pv(struct kvm *kvm, struct kvm_pv_cmd *cmd) cmd->rrc);break ; } +case KVM_PV_VM_PREP_RESET : { + r = -EINVAL ; +if (!kvm_s390_pv_is_protected (kvm)) +break ; + + r =uv_cmd_nodata (kvm_s390_pv_get_handle (kvm), +UVC_CMD_PREPARE_RESET , &cmd->rc, &cmd->rrc); +KVM_UV_EVENT (kvm,3 ,"PROTVIRT PREP RESET: rc %x rrc %x" , + cmd->rc, cmd->rrc); +break ; + } +case KVM_PV_VM_UNSHARE_ALL : { + r = -EINVAL ; +if (!kvm_s390_pv_is_protected (kvm)) +break ;
arch/s390/kvm/kvm-s390.c static int kvm_s390_handle_pv(struct kvm *kvm, struct kvm_pv_cmd *cmd) · line 2337
Quoted 10 lines
arch/s390/kvm/kvm-s390.c +7
-0+ + r =uv_cmd_nodata (kvm_s390_pv_get_handle (kvm), +UVC_CMD_SET_UNSHARE_ALL , &cmd->rc, &cmd->rrc); +KVM_UV_EVENT (kvm,3 ,"PROTVIRT UNSHARE: rc %x rrc %x" , + cmd->rc, cmd->rrc); +break ; + }default :return -ENOTTY ; }
Signature · 3 lines
Thanks, David / dhildenb
PATCH v3 29/37 KVM: s390: protvirt: Report CPU state to Ultravisor
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
VCPU states have to be reported to the ultravisor for SIGP interpretation, kdump, kexec and reboot.
--- arch/s390/include/asm/uv.h | 15 +++++++++++++++ arch/s390/kvm/diag.c | 4 ++++ arch/s390/kvm/intercept.c | 4 ++++ arch/s390/kvm/kvm-s390.c | 33 ++++++++++++++++++++++----------- arch/s390/kvm/kvm-s390.h | 5 +++-- arch/s390/kvm/pv.c | 18 ++++++++++++++++++ 6 files changed, 66 insertions(+), 13 deletions(-)
arch/s390/include/asm/uv.h +15 -0
@@ -37,6 +37,7 @@#define UVC_CMD_UNPACK_IMG 0x0301#define UVC_CMD_VERIFY_IMG 0x0302#define UVC_CMD_PREPARE_RESET 0x0320 +#define UVC_CMD_CPU_SET_STATE 0x0330#define UVC_CMD_SET_UNSHARE_ALL 0x0340#define UVC_CMD_PIN_PAGE_SHARED 0x0341#define UVC_CMD_UNPIN_PAGE_SHARED 0x0342
@@ -58,6 +59,7 @@ enum uv_cmds_inst {BIT_UVC_CMD_SET_SEC_PARMS =11 ,BIT_UVC_CMD_UNPACK_IMG =13 ,BIT_UVC_CMD_VERIFY_IMG =14 , +BIT_UVC_CMD_CPU_SET_STATE =17 ,BIT_UVC_CMD_PREPARE_RESET =18 ,BIT_UVC_CMD_UNSHARE_ALL =20 , BIT_UVC_CMD_PIN_PAGE_SHARED = 21,
@@ -164,6 +166,19 @@ struct uv_cb_unp {u64 reserved38[3 ]; } __packed__aligned(8) ; +#define PV_CPU_STATE_OPR 1 +#define PV_CPU_STATE_STP 2 +#define PV_CPU_STATE_CHKSTP 3 + +struct uv_cb_cpu_set_state { +struct uv_cb_header header; +u64 reserved08[2 ]; +u64 cpu_handle; +u8 reserved20[7 ]; +u8 state; +u64 reserved28[5 ]; +}; +/* * A common UV call struct for calls that take no payload * Examples:
arch/s390/kvm/diag.c +4 -0
@@ -201,6 +201,10 @@ static int __diag_ipl_functions(struct kvm_vcpu *vcpu)return -EOPNOTSUPP ; } +/* +* no need to check the return value of vcpu_stop as it can only have +* an error for protvirt, but protvirt means user cpu state +*/ if (!kvm_s390_user_cpu_state_ctrl (vcpu->kvm))kvm_s390_vcpu_stop (vcpu); vcpu->run->s390_reset_flags |=KVM_S390_RESET_SUBSYSTEM ;
arch/s390/kvm/intercept.c +4 -0
@@ -80,6 +80,10 @@ static int handle_stop(struct kvm_vcpu *vcpu)return rc; } +/* +* no need to check the return value of vcpu_stop as it can only have +* an error for protvirt, but protvirt means user cpu state +*/ if (!kvm_s390_user_cpu_state_ctrl (vcpu->kvm))kvm_s390_vcpu_stop (vcpu);return -EOPNOTSUPP ;
arch/s390/kvm/kvm-s390.c +22 -11
@@ -2438,6 +2438,8 @@ long kvm_arch_vm_ioctl(struct file *filp,case KVM_S390_PV_COMMAND : {struct kvm_pv_cmd args; +/* protvirt means user sigp */ + kvm->arch.user_cpu_state_ctrl =1 ; r =0 ;if (!is_prot_virt_host ()) { r = -EINVAL ;
@@ -3699,10 +3701,10 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,switch (mp_state->mp_state) {case KVM_MP_STATE_STOPPED : -kvm_s390_vcpu_stop (vcpu); + rc =kvm_s390_vcpu_stop (vcpu);break ;case KVM_MP_STATE_OPERATING : -kvm_s390_vcpu_start (vcpu); + rc =kvm_s390_vcpu_start (vcpu);break ;case KVM_MP_STATE_LOAD :case KVM_MP_STATE_CHECK_STOP :
@@ -4287,6 +4289,10 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)kvm_sigset_activate (vcpu); +/* +* no need to check the return value of vcpu_start as it can only have +* an error for protvirt, but protvirt means user cpu state +*/ if (!kvm_s390_user_cpu_state_ctrl (vcpu->kvm)) {kvm_s390_vcpu_start (vcpu); }else if (is_vcpu_stopped (vcpu)) {
@@ -4424,12 +4430,12 @@ static void __enable_ibs_on_vcpu(struct kvm_vcpu *vcpu)kvm_s390_sync_request (KVM_REQ_ENABLE_IBS , vcpu); } -void kvm_s390_vcpu_start (struct kvm_vcpu *vcpu) +int kvm_s390_vcpu_start (struct kvm_vcpu *vcpu) { -int i, online_vcpus, started_vcpus =0 ; +int i, online_vcpus, r=0 , started_vcpus =0 ;if (!is_vcpu_stopped (vcpu)) -return ; +return 0 ;trace_kvm_s390_vcpu_start_stop (vcpu->vcpu_id,1 );/* Only one cpu at a time may enter/leave the STOPPED state. */
@@ -4452,7 +4458,9 @@ void kvm_s390_vcpu_start(struct kvm_vcpu *vcpu)*/ __disable_ibs_on_all_vcpus (vcpu->kvm); } - +/* Let's tell the UV that we want to start again */ +if (kvm_s390_pv_cpu_is_protected (vcpu)) + r =kvm_s390_pv_set_cpu_state (vcpu,PV_CPU_STATE_OPR );kvm_s390_clear_cpuflags (vcpu,CPUSTAT_STOPPED );/* * Another VCPU might have used IBS while we were offline.
@@ -4460,16 +4468,16 @@ void kvm_s390_vcpu_start(struct kvm_vcpu *vcpu)*/ kvm_make_request (KVM_REQ_TLB_FLUSH , vcpu);spin_unlock (&vcpu->kvm->arch.start_stop_lock); -return ; +return r; } -void kvm_s390_vcpu_stop (struct kvm_vcpu *vcpu) +int kvm_s390_vcpu_stop (struct kvm_vcpu *vcpu) { -int i, online_vcpus, started_vcpus =0 ; +int i, online_vcpus, r =0 , started_vcpus =0 ;struct kvm_vcpu *started_vcpu =NULL ;if (is_vcpu_stopped (vcpu)) -return ; +return 0 ;trace_kvm_s390_vcpu_start_stop (vcpu->vcpu_id,0 );/* Only one cpu at a time may enter/leave the STOPPED state. */
@@ -4480,6 +4488,9 @@ void kvm_s390_vcpu_stop(struct kvm_vcpu *vcpu)kvm_s390_clear_stop_irq (vcpu);kvm_s390_set_cpuflags (vcpu,CPUSTAT_STOPPED ); +/* Let's tell the UV that we successfully stopped the vcpu */ +if (kvm_s390_pv_cpu_is_protected (vcpu)) + r =kvm_s390_pv_set_cpu_state (vcpu,PV_CPU_STATE_STP );__disable_ibs_on_vcpu (vcpu);for (i =0 ; i < online_vcpus; i++) {
@@ -4498,7 +4509,7 @@ void kvm_s390_vcpu_stop(struct kvm_vcpu *vcpu) }spin_unlock (&vcpu->kvm->arch.start_stop_lock); -return ; +return r; } static int kvm_vcpu_ioctl_enable_cap(struct kvm_vcpu *vcpu,
arch/s390/kvm/kvm-s390.h +3 -2
@@ -219,6 +219,7 @@ int kvm_s390_pv_set_sec_parms(struct kvm *kvm, void *hdr, u64 length, u16 *rc, u16 *rrc);int kvm_s390_pv_unpack (struct kvm *kvm,unsigned long addr,unsigned long size,unsigned long tweak,u16 *rc,u16 *rrc); +int kvm_s390_pv_set_cpu_state (struct kvm_vcpu *vcpu,u8 state);static inline u64 kvm_s390_pv_get_handle (struct kvm *kvm) {
@@ -332,8 +333,8 @@ void kvm_s390_set_tod_clock(struct kvm *kvm,long kvm_arch_fault_in_page (struct kvm_vcpu *vcpu,gpa_t gpa,int writable);int kvm_s390_store_status_unloaded (struct kvm_vcpu *vcpu,unsigned long addr);int kvm_s390_vcpu_store_status (struct kvm_vcpu *vcpu,unsigned long addr); -void kvm_s390_vcpu_start (struct kvm_vcpu *vcpu); -void kvm_s390_vcpu_stop (struct kvm_vcpu *vcpu); +int kvm_s390_vcpu_start (struct kvm_vcpu *vcpu); +int kvm_s390_vcpu_stop (struct kvm_vcpu *vcpu);void kvm_s390_vcpu_block (struct kvm_vcpu *vcpu);void kvm_s390_vcpu_unblock (struct kvm_vcpu *vcpu);bool kvm_s390_vcpu_sie_inhibited (struct kvm_vcpu *vcpu);
arch/s390/kvm/pv.c +18 -0
@@ -266,3 +266,21 @@ int kvm_s390_pv_unpack(struct kvm *kvm, unsigned long addr, unsigned long size,KVM_UV_EVENT (kvm,3 ,"%s" ,"PROTVIRT VM UNPACK: successful" );return ret; } + +int kvm_s390_pv_set_cpu_state (struct kvm_vcpu *vcpu,u8 state) +{ +struct uv_cb_cpu_set_state uvcb = { + .header.cmd =UVC_CMD_CPU_SET_STATE , + .header.len =sizeof (uvcb), + .cpu_handle =kvm_s390_pv_cpu_get_handle (vcpu), + .state = state, + }; +int cc; + + cc =uv_call (0 , (u64)&uvcb); +KVM_UV_EVENT (vcpu->kvm,3 ,"PROTVIRT SET CPU %d STATE %d rc %x rrc %x" , + vcpu->vcpu_id, state, uvcb.header.rc, uvcb.header.rrc); +if (cc) +return -EINVAL ; +return 0 ; +}
Signature · 1 line
2.25.0
PATCH v3 30/37 KVM: s390: protvirt: Support cmd 5 operation state
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
Code 5 for the set cpu state UV call tells the UV to load a PSW from the SE header (first IPL) or from guest location 0x0 (diag 308 subcode 0/1). Also it sets the cpu into operating state afterwards, so we can start it.
--- arch/s390/include/asm/uv.h | 1 + arch/s390/kvm/kvm-s390.c | 6 ++++++ 2 files changed, 7 insertions(+)
arch/s390/include/asm/uv.h +1 -0
@@ -169,6 +169,7 @@ struct uv_cb_unp {#define PV_CPU_STATE_OPR 1#define PV_CPU_STATE_STP 2#define PV_CPU_STATE_CHKSTP 3 +#define PV_CPU_STATE_OPR_LOAD 5struct uv_cb_cpu_set_state {struct uv_cb_header header;
arch/s390/kvm/kvm-s390.c +6 -0
@@ -3707,6 +3707,12 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu, rc =kvm_s390_vcpu_start (vcpu);break ;case KVM_MP_STATE_LOAD : +if (!kvm_s390_pv_cpu_is_protected (vcpu)) { + rc = -ENXIO ; +break ; + } + rc =kvm_s390_pv_set_cpu_state (vcpu,PV_CPU_STATE_OPR_LOAD ); +break ;case KVM_MP_STATE_CHECK_STOP :/* fall through - CHECK_STOP and LOAD are not supported yet */ default :
Signature · 1 line
2.25.0
PATCH v3 31/37 KVM: s390: protvirt: Mask PSW interrupt bits for interception 104 and 112
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
We're not allowed to inject interrupts on intercepts that leave the guest state in an "in-between" state where the next SIE entry will do a continuation, namely secure instruction interception (104) and secure prefix interception (112).
As our PSW is just a copy of the real one that will be replaced on the next exit, we can mask out the interrupt bits in the PSW to make sure that we do not inject anything.
--- arch/s390/kvm/kvm-s390.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
arch/s390/kvm/kvm-s390.c +11 -0
@@ -4064,6 +4064,7 @@ static int vcpu_post_run(struct kvm_vcpu *vcpu, int exit_reason)return vcpu_post_run_fault_in_sie (vcpu); } +#define PSW_INT_MASK (PSW_MASK_EXT | PSW_MASK_IO | PSW_MASK_MCHECK)static int __vcpu_run (struct kvm_vcpu *vcpu) {int rc, exit_reason;
@@ -4100,6 +4101,16 @@ static int __vcpu_run(struct kvm_vcpu *vcpu)memcpy (vcpu->run->s.regs.gprs, sie_page->pv_grregs,sizeof (sie_page->pv_grregs)); +/* +* We're not allowed to inject interrupts on intercepts +* that leave the guest state in an "in-between" state +* where the next SIE entry will do a continuation. +* Fence interrupts in our "internal" PSW. +*/ +if (vcpu->arch.sie_block->icptcode ==ICPT_PV_INSTR || + vcpu->arch.sie_block->icptcode ==ICPT_PV_PREF ) { + vcpu->arch.sie_block->gpsw.mask &= ~PSW_INT_MASK ; + } }local_irq_disable ();__enable_cpu_timer_accounting (vcpu);
Signature · 1 line
2.25.0
PATCH v3 32/37 KVM: s390: protvirt: do not inject interrupts after start
In reply to Christian BorntraegerAs PSW restart is handled by the ultravisor (and we only get a start notification) we must re-check the PSW after a start before injecting interrupts.
--- arch/s390/kvm/kvm-s390.c | 7 +++++++ 1 file changed, 7 insertions(+)
arch/s390/kvm/kvm-s390.c +7 -0
@@ -4479,6 +4479,13 @@ int kvm_s390_vcpu_start(struct kvm_vcpu *vcpu)if (kvm_s390_pv_cpu_is_protected (vcpu)) r =kvm_s390_pv_set_cpu_state (vcpu,PV_CPU_STATE_OPR );kvm_s390_clear_cpuflags (vcpu,CPUSTAT_STOPPED ); +/* +* The real PSW might have changed due to a RESTART interpreted by the +* ultravisor. We block all interrupts and let the next sie exit +* refresh our view. +*/ +if (kvm_s390_pv_cpu_is_protected (vcpu)) + vcpu->arch.sie_block->gpsw.mask &= ~PSW_INT_MASK ;/* * Another VCPU might have used IBS while we were offline. * Let's play safe and flush the VCPU at startup.
Signature · 1 line
2.25.0
PATCH v3 33/37 KVM: s390: protvirt: Add UV cpu reset calls
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
For protected VMs, the VCPU resets are done by the Ultravisor, as KVM has no access to the VCPU registers.
Note that the ultravisor will only accept a call for the exact reset that has been requested.
--- arch/s390/include/asm/uv.h | 6 ++++++ arch/s390/kvm/kvm-s390.c | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+)
arch/s390/include/asm/uv.h +6 -0
@@ -36,7 +36,10 @@#define UVC_CMD_SET_SEC_CONF_PARAMS 0x0300#define UVC_CMD_UNPACK_IMG 0x0301#define UVC_CMD_VERIFY_IMG 0x0302 +#define UVC_CMD_CPU_RESET 0x0310 +#define UVC_CMD_CPU_RESET_INITIAL 0x0311#define UVC_CMD_PREPARE_RESET 0x0320 +#define UVC_CMD_CPU_RESET_CLEAR 0x0321#define UVC_CMD_CPU_SET_STATE 0x0330#define UVC_CMD_SET_UNSHARE_ALL 0x0340#define UVC_CMD_PIN_PAGE_SHARED 0x0341
@@ -59,8 +62,11 @@ enum uv_cmds_inst {BIT_UVC_CMD_SET_SEC_PARMS =11 ,BIT_UVC_CMD_UNPACK_IMG =13 ,BIT_UVC_CMD_VERIFY_IMG =14 , +BIT_UVC_CMD_CPU_RESET =15 , +BIT_UVC_CMD_CPU_RESET_INITIAL =16 ,BIT_UVC_CMD_CPU_SET_STATE =17 ,BIT_UVC_CMD_PREPARE_RESET =18 , +BIT_UVC_CMD_CPU_PERFORM_CLEAR_RESET =19 ,BIT_UVC_CMD_UNSHARE_ALL =20 ,BIT_UVC_CMD_PIN_PAGE_SHARED =21 , BIT_UVC_CMD_UNPIN_PAGE_SHARED = 22,
arch/s390/kvm/kvm-s390.c +20 -0
@@ -4705,6 +4705,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp,void __user *argp = (void __user *)arg;int idx;long r; +u16 rc, rrc;vcpu_load (vcpu);
@@ -4726,14 +4727,33 @@ long kvm_arch_vcpu_ioctl(struct file *filp,case KVM_S390_CLEAR_RESET : r =0 ;kvm_arch_vcpu_ioctl_clear_reset (vcpu); +if (kvm_s390_pv_cpu_is_protected (vcpu)) { + r =uv_cmd_nodata (kvm_s390_pv_cpu_get_handle (vcpu), +UVC_CMD_CPU_RESET_CLEAR , &rc, &rrc); +VCPU_EVENT (vcpu,3 ,"PROTVIRT RESET CLEAR VCPU: rc %x rrc %x" , + rc, rrc); + }break ;case KVM_S390_INITIAL_RESET : r =0 ;kvm_arch_vcpu_ioctl_initial_reset (vcpu); +if (kvm_s390_pv_cpu_is_protected (vcpu)) { + r =uv_cmd_nodata (kvm_s390_pv_cpu_get_handle (vcpu), +UVC_CMD_CPU_RESET_INITIAL , + &rc, &rrc); +VCPU_EVENT (vcpu,3 ,"PROTVIRT RESET INITIAL VCPU: rc %x rrc %x" , + rc, rrc); + }break ;case KVM_S390_NORMAL_RESET : r =0 ;kvm_arch_vcpu_ioctl_normal_reset (vcpu); +if (kvm_s390_pv_cpu_is_protected (vcpu)) { + r =uv_cmd_nodata (kvm_s390_pv_cpu_get_handle (vcpu), +UVC_CMD_CPU_RESET , &rc, &rrc); +VCPU_EVENT (vcpu,3 ,"PROTVIRT RESET NORMAL VCPU: rc %x rrc %x" , + rc, rrc); + }break ;case KVM_SET_ONE_REG :case KVM_GET_ONE_REG : {
Signature · 1 line
2.25.0
PATCH v3 34/37 DOCUMENTATION: Protected virtual machine introduction and IPL
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
Add documentation about protected KVM guests and description of changes that are necessary to move a KVM VM into Protected Virtualization mode.
--- Documentation/virt/kvm/index.rst | 2 + Documentation/virt/kvm/s390-pv-boot.rst | 83 +++++++++++++++++ Documentation/virt/kvm/s390-pv.rst | 116 ++++++++++++++++++++++++ MAINTAINERS | 1 + 4 files changed, 202 insertions(+) create mode 100644 Documentation/virt/kvm/s390-pv-boot.rst create mode 100644 Documentation/virt/kvm/s390-pv.rst
Documentation/virt/kvm/index.rst +2 -0
@@ -18,6 +18,8 @@ KVM nested-vmx ppc-pv s390-diag + s390-pv + s390-pv-boot timekeeping vcpu-requests
Documentation/virt/kvm/s390-pv-boot.rst new file +83 -0
83 lines not on this page · raw message
Documentation/virt/kvm/s390-pv.rst new file +116 -0
116 lines not on this page · raw message
MAINTAINERS +1 -0
@@ -9209,6 +9209,7 @@ L: [email protected] W: http://www.ibm.com/developerworks/linux/linux390/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git S: Supported +F: Documentation/virt/kvm/s390* F: arch/s390/include/uapi/asm/kvm* F: arch/s390/include/asm/gmap.h F: arch/s390/include/asm/kvm*
Signature · 1 line
2.25.0
PATCH v3 35/37 s390: protvirt: Add sysfs firmware interface for Ultravisor information
In reply to Christian BorntraegerFrom: Janosch Frank <[email protected]>
That information, e.g. the maximum number of guests or installed Ultravisor facilities, is interesting for QEMU, Libvirt and administrators.
Let's provide an easily parsable API to get that information.
--- arch/s390/kernel/uv.c | 86 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+)
arch/s390/kernel/uv.c +86 -0
@@ -323,5 +323,91 @@ int arch_make_page_accessible(struct page *page)return rc; }EXPORT_SYMBOL_GPL (arch_make_page_accessible); +#endif + +#if defined(CONFIG_PROTECTED_VIRTUALIZATION_GUEST ) ||IS_ENABLED (CONFIG_KVM ) +static ssize_t uv_query_facilities (struct kobject *kobj, +struct kobj_attribute *attr,char *page) +{ +return snprintf (page,PAGE_SIZE ,"%lx\n%lx\n%lx\n%lx\n" , + uv_info.inst_calls_list[0 ], + uv_info.inst_calls_list[1 ], + uv_info.inst_calls_list[2 ], + uv_info.inst_calls_list[3 ]); +} + +static struct kobj_attribute uv_query_facilities_attr = +__ATTR (facilities,0444 , uv_query_facilities,NULL ); + +static ssize_t uv_query_max_guest_cpus (struct kobject *kobj, +struct kobj_attribute *attr,char *page) +{ +return snprintf (page,PAGE_SIZE ,"%d\n" , + uv_info.max_guest_cpus); +} + +static struct kobj_attribute uv_query_max_guest_cpus_attr = +__ATTR (max_cpus,0444 , uv_query_max_guest_cpus,NULL ); + +static ssize_t uv_query_max_guest_vms (struct kobject *kobj, +struct kobj_attribute *attr,char *page) +{ +return snprintf (page,PAGE_SIZE ,"%d\n" , + uv_info.max_num_sec_conf); +} + +static struct kobj_attribute uv_query_max_guest_vms_attr = +__ATTR (max_guests,0444 , uv_query_max_guest_vms,NULL ); + +static ssize_t uv_query_max_guest_addr (struct kobject *kobj, +struct kobj_attribute *attr,char *page) +{ +return snprintf (page,PAGE_SIZE ,"%lx\n" , + uv_info.max_sec_stor_addr); +} + +static struct kobj_attribute uv_query_max_guest_addr_attr = +__ATTR (max_address,0444 , uv_query_max_guest_addr,NULL ); + +static struct attribute *uv_query_attrs[] = { + &uv_query_facilities_attr.attr, + &uv_query_max_guest_cpus_attr.attr, + &uv_query_max_guest_vms_attr.attr, + &uv_query_max_guest_addr_attr.attr, +NULL , +}; + +static struct attribute_group uv_query_attr_group = { + .attrs = uv_query_attrs, +}; +static struct kset *uv_query_kset; +struct kobject *uv_kobj; + +static int __init uv_info_init (void ) +{ +int rc = -ENOMEM ; + +if (!test_facility (158 )) +return 0 ; + + uv_kobj =kobject_create_and_add ("uv" , firmware_kobj); +if (!uv_kobj) +return -ENOMEM ; + + uv_query_kset =kset_create_and_add ("query" ,NULL , uv_kobj); +if (!uv_query_kset) + goto out_kobj; + + rc =sysfs_create_group (&uv_query_kset->kobj, &uv_query_attr_group); +if (!rc) +return 0 ; + +kset_unregister (uv_query_kset); +out_kobj: +kobject_del (uv_kobj); +kobject_put (uv_kobj); +return rc; +} +device_initcall (uv_info_init);#endif
Signature · 1 line
2.25.0
Re: [PATCH v3 35/37] s390: protvirt: Add sysfs firmware interface for Ultravisor information
Quoted 100 lines · Christian Borntraeger
From: Janosch Frank <[email protected]>
That information, e.g. the maximum number of guests or installed Ultravisor facilities, is interesting for QEMU, Libvirt and administrators.
Let's provide an easily parsable API to get that information.
Signed-off-by Janosch Frank <[email protected]>--- arch/s390/kernel/uv.c | 86 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+)arch/s390/kernel/uv.c +77
-0@@ -323,5 +323,91 @@ int arch_make_page_accessible(struct page *page)return rc; }EXPORT_SYMBOL_GPL (arch_make_page_accessible); +#endif + +#if defined(CONFIG_PROTECTED_VIRTUALIZATION_GUEST ) ||IS_ENABLED (CONFIG_KVM ) +static ssize_t uv_query_facilities (struct kobject *kobj, +struct kobj_attribute *attr,char *page) +{ +return snprintf (page,PAGE_SIZE ,"%lx\n%lx\n%lx\n%lx\n" , + uv_info.inst_calls_list[0 ], + uv_info.inst_calls_list[1 ], + uv_info.inst_calls_list[2 ], + uv_info.inst_calls_list[3 ]); +} + +static struct kobj_attribute uv_query_facilities_attr = +__ATTR (facilities,0444 , uv_query_facilities,NULL ); + +static ssize_t uv_query_max_guest_cpus (struct kobject *kobj, +struct kobj_attribute *attr,char *page) +{ +return snprintf (page,PAGE_SIZE ,"%d\n" , + uv_info.max_guest_cpus); +} + +static struct kobj_attribute uv_query_max_guest_cpus_attr = +__ATTR (max_cpus,0444 , uv_query_max_guest_cpus,NULL ); + +static ssize_t uv_query_max_guest_vms (struct kobject *kobj, +struct kobj_attribute *attr,char *page) +{ +return snprintf (page,PAGE_SIZE ,"%d\n" , + uv_info.max_num_sec_conf); +} + +static struct kobj_attribute uv_query_max_guest_vms_attr = +__ATTR (max_guests,0444 , uv_query_max_guest_vms,NULL ); + +static ssize_t uv_query_max_guest_addr (struct kobject *kobj, +struct kobj_attribute *attr,char *page) +{ +return snprintf (page,PAGE_SIZE ,"%lx\n" , + uv_info.max_sec_stor_addr); +} + +static struct kobj_attribute uv_query_max_guest_addr_attr = +__ATTR (max_address,0444 , uv_query_max_guest_addr,NULL ); + +static struct attribute *uv_query_attrs[] = { + &uv_query_facilities_attr.attr, + &uv_query_max_guest_cpus_attr.attr, + &uv_query_max_guest_vms_attr.attr, + &uv_query_max_guest_addr_attr.attr, +NULL , +}; + +static struct attribute_group uv_query_attr_group = { + .attrs = uv_query_attrs, +}; +static struct kset *uv_query_kset; +struct kobject *uv_kobj; + +static int __init uv_info_init (void ) +{ +int rc = -ENOMEM ; + +if (!test_facility (158 )) +return 0 ; + + uv_kobj =kobject_create_and_add ("uv" , firmware_kobj); +if (!uv_kobj) +return -ENOMEM ; + + uv_query_kset =kset_create_and_add ("query" ,NULL , uv_kobj); +if (!uv_query_kset) + goto out_kobj; + + rc =sysfs_create_group (&uv_query_kset->kobj, &uv_query_attr_group); +if (!rc)
arch/s390/kernel/uv.c int arch_make_page_accessible(struct page *page) · line 413
Quoted 10 lines
arch/s390/kernel/uv.c +9
-0+return 0 ; + +kset_unregister (uv_query_kset); +out_kobj: +kobject_del (uv_kobj); +kobject_put (uv_kobj); + return rc; +} +device_initcall (uv_info_init);#endif
Signature · 3 lines
Thanks, David / dhildenb
PATCH v3 36/37 KVM: s390: rstify new ioctls in api.rst
In reply to Christian BorntraegerWe also need to rstify the new ioctls that we added in parallel to the rstification of the kvm docs.
--- Documentation/virt/kvm/api.rst | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-)
Documentation/virt/kvm/api.rst +18 -15
@@ -4613,35 +4613,38 @@ unpins the VPA pages and releases all the device pages that are used to track the secure pages by hypervisor. 4.122 KVM_S390_NORMAL_RESET +--------------------------- -Capability: KVM_CAP_S390_VCPU_RESETS -Architectures: s390 -Type: vcpu ioctl -Parameters: none -Returns: 0 +:Capability: KVM_CAP_S390_VCPU_RESETS +:Architectures: s390 +:Type: vcpu ioctl +:Parameters: none +:Returns: 0 This ioctl resets VCPU registers and control structures according to the cpu reset definition in the POP (Principles Of Operation). 4.123 KVM_S390_INITIAL_RESET +---------------------------- -Capability: none -Architectures: s390 -Type: vcpu ioctl -Parameters: none -Returns: 0 +:Capability: none +:Architectures: s390 +:Type: vcpu ioctl +:Parameters: none +:Returns: 0 This ioctl resets VCPU registers and control structures according to the initial cpu reset definition in the POP. However, the cpu is not put into ESA mode. This reset is a superset of the normal reset. 4.124 KVM_S390_CLEAR_RESET +-------------------------- -Capability: KVM_CAP_S390_VCPU_RESETS -Architectures: s390 -Type: vcpu ioctl -Parameters: none -Returns: 0 +:Capability: KVM_CAP_S390_VCPU_RESETS +:Architectures: s390 +:Type: vcpu ioctl +:Parameters: none +:Returns: 0 This ioctl resets VCPU registers and control structures according to the clear cpu reset definition in the POP. However, the cpu is not put
Signature · 1 line
2.25.0
Re: [PATCH v3 36/37] KVM: s390: rstify new ioctls in api.rst
Quoted 57 lines · Christian Borntraeger
We also need to rstify the new ioctls that we added in parallel to the rstification of the kvm docs.
Signed-off-by Christian Borntraeger <[email protected]>--- Documentation/virt/kvm/api.rst | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-)Documentation/virt/kvm/api.rst +13
-13@@ -4613,35 +4613,38 @@ unpins the VPA pages and releases all the device pages that are used to track the secure pages by hypervisor. 4.122 KVM_S390_NORMAL_RESET +--------------------------- -Capability: KVM_CAP_S390_VCPU_RESETS -Architectures: s390 -Type: vcpu ioctl -Parameters: none -Returns: 0 +:Capability: KVM_CAP_S390_VCPU_RESETS +:Architectures: s390 +:Type: vcpu ioctl +:Parameters: none +:Returns: 0 This ioctl resets VCPU registers and control structures according to the cpu reset definition in the POP (Principles Of Operation). 4.123 KVM_S390_INITIAL_RESET +---------------------------- -Capability: none -Architectures: s390 -Type: vcpu ioctl -Parameters: none -Returns: 0 +:Capability: none +:Architectures: s390 +:Type: vcpu ioctl +:Parameters: none +:Returns: 0 This ioctl resets VCPU registers and control structures according to the initial cpu reset definition in the POP. However, the cpu is not put into ESA mode. This reset is a superset of the normal reset. 4.124 KVM_S390_CLEAR_RESET +-------------------------- -Capability: KVM_CAP_S390_VCPU_RESETS -Architectures: s390 -Type: vcpu ioctl
Documentation/virt/kvm/api.rst unpins the VPA pages and releases all the device pages that are used to · line 4650
Quoted 10 lines
Documentation/virt/kvm/api.rst +5
-2-Parameters: none -Returns: 0 +:Capability: KVM_CAP_S390_VCPU_RESETS +:Architectures: s390 +:Type: vcpu ioctl +:Parameters: none +:Returns: 0 This ioctl resets VCPU registers and control structures according to the clear cpu reset definition in the POP. However, the cpu is not put
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH v3 36/37] KVM: s390: rstify new ioctls in api.rst
In reply to Christian BorntraegerQuoted 2 lines · On Thu, 20 Feb 2020 05:40:19 -0500 Christian Borntraeger…
We also need to rstify the new ioctls that we added in parallel to the rstification of the kvm docs.
This looks like it could be merged independently of the protected virt patches?
Quoted 5 lines
Signed-off-by Christian Borntraeger <[email protected]>--- Documentation/virt/kvm/api.rst | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-)
Re: [PATCH v3 36/37] KVM: s390: rstify new ioctls in api.rst
Quoted 9 lines · Cornelia Huck
Quoted 2 lines · On Thu, 20 Feb 2020 05:40:19 -0500 Christian Borntraeger…
We also need to rstify the new ioctls that we added in parallel to the rstification of the kvm docs.
This looks like it could be merged independently of the protected virt patches?
Yes, but I did that while doing the other patch. Will go via kvm/master.
Quoted 8 lines
Quoted 5 lines
Signed-off-by Christian Borntraeger <[email protected]>--- Documentation/virt/kvm/api.rst | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-)Reviewed-by Cornelia Huck <[email protected]>
PATCH v3 37/37 KVM: s390: protvirt: introduce and enable KVM_CAP_S390_PROTECTED
In reply to Christian BorntraegerNow that everything is in place, we can announce the feature.
--- arch/s390/kvm/kvm-s390.c | 3 +++ include/uapi/linux/kvm.h | 1 + 2 files changed, 4 insertions(+)
arch/s390/kvm/kvm-s390.c +3 -0
@@ -574,6 +574,9 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)case KVM_CAP_S390_BPB : r =test_facility (82 );break ; +case KVM_CAP_S390_PROTECTED : + r =is_prot_virt_host (); +break ;default : r =0 ; }
include/uapi/linux/kvm.h +1 -0
@@ -1015,6 +1015,7 @@ struct kvm_ppc_resize_hpt {#define KVM_CAP_ARM_NISV_TO_USER 177#define KVM_CAP_ARM_INJECT_EXT_DABT 178#define KVM_CAP_S390_VCPU_RESETS 179 +#define KVM_CAP_S390_PROTECTED 180#ifdef KVM_CAP_IRQ_ROUTING
Signature · 1 line
2.25.0
Re: [PATCH v3 37/37] KVM: s390: protvirt: introduce and enable KVM_CAP_S390_PROTECTED
Quoted 27 lines · Christian Borntraeger
Now that everything is in place, we can announce the feature.
Signed-off-by Christian Borntraeger <[email protected]>--- arch/s390/kvm/kvm-s390.c | 3 +++ include/uapi/linux/kvm.h | 1 + 2 files changed, 4 insertions(+)arch/s390/kvm/kvm-s390.c +3
-0@@ -574,6 +574,9 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)case KVM_CAP_S390_BPB : r =test_facility (82 );break ; +case KVM_CAP_S390_PROTECTED : + r =is_prot_virt_host (); +break ;default : r =0 ; }include/uapi/linux/kvm.h +0
-0
include/uapi/linux/kvm.h struct kvm_ppc_resize_hpt { · line 1020
Quoted 6 lines
include/uapi/linux/kvm.h +1
-0@@ -1015,6 +1015,7 @@ struct kvm_ppc_resize_hpt {#define KVM_CAP_ARM_NISV_TO_USER 177#define KVM_CAP_ARM_INJECT_EXT_DABT 178#define KVM_CAP_S390_VCPU_RESETS 179 +#define KVM_CAP_S390_PROTECTED 180#ifdef KVM_CAP_IRQ_ROUTING
Signature · 3 lines
Thanks, David / dhildenb
Quoted 7 lines · Christian Borntraeger
mm people: This series contains a "pretty small" common code memory management change that will allow paging, guest backing with files etc almost just like normal VMs. It should be a no-op for all architectures not opting in. And it should be usable for others that also try to get notified on "the pages are in the process of being used for things like I/O". This time I included error handling and an ACK from Will Deacon.
Quoted 5 lines
mm-related patches CCed on linux-mm, the complete list can be found on the KVM and linux-s390 list.
Andrew, any chance to either take " mm:gup/writeback: add callbacks for inaccessible pages" or ACK so that I can take it?
Summary: Mostly LGTM. Especially
- UAPI interface is minimal and clean
- Core MM changes are minimal and clean (and AFAIKT Andrea was involved when discussing the approach, so it can't be wrong ;) )
- Is no longer prototype quality ;)
There are still some things I want to double check (esp. how KVM memory slots are handled - I somewhat dislike that we cannot replace/add new ones while in PV. One would have to fence that somehow in QEMU as long as the guest is in PV mode e.g., once we would support memory hotplug ... but looks like this is what the HW requires us to enforce for now), certain races, etc. but I assume these things could be fixed later on.
Can we get a new version once the other reviewers are done, so at least I can have a final look?
Thanks!
Signature · 3 lines
Thanks, David / dhildenb
Quoted 20 lines · David Hildenbrand
Quoted 7 lines · Christian Borntraeger
mm people: This series contains a "pretty small" common code memory management change that will allow paging, guest backing with files etc almost just like normal VMs. It should be a no-op for all architectures not opting in. And it should be usable for others that also try to get notified on "the pages are in the process of being used for things like I/O". This time I included error handling and an ACK from Will Deacon.
Quoted 5 lines
mm-related patches CCed on linux-mm, the complete list can be found on the KVM and linux-s390 list.
Andrew, any chance to either take " mm:gup/writeback: add callbacks for inaccessible pages" or ACK so that I can take it?
Summary: Mostly LGTM. Especially
- UAPI interface is minimal and clean
- Core MM changes are minimal and clean (and AFAIKT Andrea was involved when discussing the approach, so it can't be wrong ;) )
- Is no longer prototype quality ;)
Quoted 6 lines
There are still some things I want to double check (esp. how KVM memory slots are handled - I somewhat dislike that we cannot replace/add new ones while in PV. One would have to fence that somehow in QEMU as long as the guest is in PV mode e.g., once we would support memory hotplug ... but looks like this is what the HW requires us to enforce for now), certain races, etc. but I assume these things could be fixed later on.
In fact you can do that. The hardware checks the integrity on guest physical address. So it is perfectly possible to remap a kvm slot as long as the eńcrypted content matches what counter, guest content hash and guest address tell. (It is like swapping, you move the encrypted content from one host page to another).
For new pages (not unpacked and never touched by the guest) the ultravisor will bring a zeroed out page on first import.
What does not work is when the user space address changes for a guest virtio indicator. But this was already broken before (we never did an adapter unmap/remap).
Quoted 3 lines
Can we get a new version once the other reviewers are done, so at least I can have a final look?
Just the updated patches as reply (e.g. a 3.2 for patch 9) or the full monty?
Quoted 8 lines
In fact you can do that. The hardware checks the integrity on guest physical address. So it is perfectly possible to remap a kvm slot as long as the eńcrypted content matches what counter, guest content hash and guest address tell. (It is like swapping, you move the encrypted content from one host page to another).
For new pages (not unpacked and never touched by the guest) the ultravisor will bring a zeroed out page on first import.
Quoted 4 lines
What does not work is when the user space address changes for a guest virtio indicator. But this was already broken before (we never did an adapter unmap/remap).
Thanks for the info!
Quoted 5 lines
Quoted 3 lines
Can we get a new version once the other reviewers are done, so at least I can have a final look?
Just the updated patches as reply (e.g. a 3.2 for patch 9) or the full monty?
Whatever you others prefer. I can see that Conny has some feedback. maybe wait for that and then (selectively) resend.
Signature · 3 lines
Thanks, David / dhildenb
Quoted 7 lines · On Fri, 21 Feb 2020 12:28:51 +0100 David Hildenbrand <[email protected]> wrote:
Quoted 4 lines
Quoted 2 lines
Can we get a new version once the other reviewers are done, so at least I can have a final look?
Just the updated patches as reply (e.g. a 3.2 for patch 9) or the full monty?
Whatever you others prefer. I can see that Conny has some feedback. maybe wait for that and then (selectively) resend.
I was still looking over this version. And to be honest, I find those 3.x patches utterly confusing, especially as this is all coming in so quickly as to make it hard to keep up.
That said, I'll probably not be able to do much (or any) reviewing today or on Monday, so feel free to send a new version next week.