kvm: s390: pv: Mark mm as protected after the set secure parameters and improve cleanup
Janosch Frank
maintainerPATCH 1/1 kvm: s390: pv: Mark mm as protected after the set secure parameters and improve cleanup
We can only have protected guest pages after a successful set secure parameters call as only then the UV allows imports and unpacks.
By moving the test we can now also check for it in s390_reset_acc() and do an early return if it is 0.
--- arch/s390/kvm/kvm-s390.c | 2 +- arch/s390/kvm/pv.c | 3 ++- arch/s390/mm/gmap.c | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-)
arch/s390/kvm/kvm-s390.c +1 -1
@@ -2312,7 +2312,7 @@ static int kvm_s390_handle_pv(struct kvm *kvm, struct kvm_pv_cmd *cmd)struct kvm_s390_pv_unp unp = {}; r = -EINVAL ; -if (!kvm_s390_pv_is_protected (kvm)) +if (!kvm_s390_pv_is_protected (kvm) || !mm_is_protected (kvm->mm))break ; r = -EFAULT ;
arch/s390/kvm/pv.c +2 -1
@@ -208,7 +208,6 @@ int kvm_s390_pv_init_vm(struct kvm *kvm, u16 *rc, u16 *rrc)return -EIO ; } kvm->arch.gmap->guest_handle = uvcb.guest_handle; -atomic_set (&kvm->mm->context.is_protected,1 );return 0 ; }
@@ -228,6 +227,8 @@ int kvm_s390_pv_set_sec_parms(struct kvm *kvm, void *hdr, u64 length, u16 *rc, *rrc = uvcb.header.rrc;KVM_UV_EVENT (kvm,3 ,"PROTVIRT VM SET PARMS: rc %x rrc %x" , *rc, *rrc); +if (!cc) +atomic_set (&kvm->mm->context.is_protected,1 );return cc ? -EINVAL :0 ; }
arch/s390/mm/gmap.c +2 -0
@@ -2690,6 +2690,8 @@ static const struct mm_walk_ops reset_acc_walk_ops = {#include <linux/sched/mm.h> void s390_reset_acc (struct mm_struct *mm) { +if (!mm_is_protected (mm)) +return ;/* * we might be called during * reset: we walk the pages and clear
Signature · 1 line
2.25.1
Quoted 7 lines · Janosch Frank
We can only have protected guest pages after a successful set secure parameters call as only then the UV allows imports and unpacks.
By moving the test we can now also check for it in
s390_reset_acc()and do an early return if it is 0.Signed-off-by Janosch Frank <[email protected]>
Can we check this into devel to give it some test coverage?
Quoted 54 lines
--- arch/s390/kvm/kvm-s390.c | 2 +- arch/s390/kvm/pv.c | 3 ++- arch/s390/mm/gmap.c | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-)arch/s390/kvm/kvm-s390.c +1
-1@@ -2312,7 +2312,7 @@ static int kvm_s390_handle_pv(struct kvm *kvm, struct kvm_pv_cmd *cmd)struct kvm_s390_pv_unp unp = {}; r = -EINVAL ; -if (!kvm_s390_pv_is_protected (kvm)) +if (!kvm_s390_pv_is_protected (kvm) || !mm_is_protected (kvm->mm))break ; r = -EFAULT ;arch/s390/kvm/pv.c +2
-1@@ -208,7 +208,6 @@ int kvm_s390_pv_init_vm(struct kvm *kvm, u16 *rc, u16 *rrc)return -EIO ; } kvm->arch.gmap->guest_handle = uvcb.guest_handle; -atomic_set (&kvm->mm->context.is_protected,1 );return 0 ; }@@ -228,6 +227,8 @@ int kvm_s390_pv_set_sec_parms(struct kvm *kvm, void *hdr, u64 length, u16 *rc, *rrc = uvcb.header.rrc;KVM_UV_EVENT (kvm,3 ,"PROTVIRT VM SET PARMS: rc %x rrc %x" , *rc, *rrc); +if (!cc) +atomic_set (&kvm->mm->context.is_protected,1 );return cc ? -EINVAL :0 ; }arch/s390/mm/gmap.c +2
-0@@ -2690,6 +2690,8 @@ static const struct mm_walk_ops reset_acc_walk_ops = {#include <linux/sched/mm.h> void s390_reset_acc (struct mm_struct *mm) { +if (!mm_is_protected (mm)) +return ;/* * we might be called during * reset: we walk the pages and clear
Janosch Frank
maintainerQuoted 10 lines · Christian Borntraeger
Quoted 7 lines · Janosch Frank
We can only have protected guest pages after a successful set secure parameters call as only then the UV allows imports and unpacks.
By moving the test we can now also check for it in
s390_reset_acc()and do an early return if it is 0.Signed-off-by Janosch Frank <[email protected]>Can we check this into devel to give it some test coverage?
I think this also lacks:
lifecycle handling")
Quoted 55 lines
Quoted 55 lines
--- arch/s390/kvm/kvm-s390.c | 2 +- arch/s390/kvm/pv.c | 3 ++- arch/s390/mm/gmap.c | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-)arch/s390/kvm/kvm-s390.c +1
-1@@ -2312,7 +2312,7 @@ static int kvm_s390_handle_pv(struct kvm *kvm, struct kvm_pv_cmd *cmd)struct kvm_s390_pv_unp unp = {}; r = -EINVAL ; -if (!kvm_s390_pv_is_protected (kvm)) +if (!kvm_s390_pv_is_protected (kvm) || !mm_is_protected (kvm->mm))break ; r = -EFAULT ;arch/s390/kvm/pv.c +2
-1@@ -208,7 +208,6 @@ int kvm_s390_pv_init_vm(struct kvm *kvm, u16 *rc, u16 *rrc)return -EIO ; } kvm->arch.gmap->guest_handle = uvcb.guest_handle; -atomic_set (&kvm->mm->context.is_protected,1 );return 0 ; }@@ -228,6 +227,8 @@ int kvm_s390_pv_set_sec_parms(struct kvm *kvm, void *hdr, u64 length, u16 *rc, *rrc = uvcb.header.rrc;KVM_UV_EVENT (kvm,3 ,"PROTVIRT VM SET PARMS: rc %x rrc %x" , *rc, *rrc); +if (!cc) +atomic_set (&kvm->mm->context.is_protected,1 );return cc ? -EINVAL :0 ; }arch/s390/mm/gmap.c +2
-0@@ -2690,6 +2690,8 @@ static const struct mm_walk_ops reset_acc_walk_ops = {#include <linux/sched/mm.h> void s390_reset_acc (struct mm_struct *mm) { +if (!mm_is_protected (mm)) +return ;/* * we might be called during * reset: we walk the pages and clear
Quoted 8 lines · Janosch Frank
Quoted 7 lines · Christian Borntraeger
Quoted 6 lines · Janosch Frank
We can only have protected guest pages after a successful set secure parameters call as only then the UV allows imports and unpacks.
By moving the test we can now also check for it in
s390_reset_acc()and do an early return if it is 0.
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Janosch Frank <[email protected]>Can we check this into devel to give it some test coverage?
I think this also lacks:
Fixes 29b40f105ec8 ("KVM: s390: protvirt: Add initial vm and cpulifecycle handling")
Yes, it does. I will schedule for kvm/master.
Quoted 7 lines · Janosch Frank
We can only have protected guest pages after a successful set secure parameters call as only then the UV allows imports and unpacks.
By moving the test we can now also check for it in
s390_reset_acc()and do an early return if it is 0.Signed-off-by Janosch Frank <[email protected]>
Looks sane.
As said in my other mail lets give it some days for the CI to test this.
Quoted 54 lines
--- arch/s390/kvm/kvm-s390.c | 2 +- arch/s390/kvm/pv.c | 3 ++- arch/s390/mm/gmap.c | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-)arch/s390/kvm/kvm-s390.c +1
-1@@ -2312,7 +2312,7 @@ static int kvm_s390_handle_pv(struct kvm *kvm, struct kvm_pv_cmd *cmd)struct kvm_s390_pv_unp unp = {}; r = -EINVAL ; -if (!kvm_s390_pv_is_protected (kvm)) +if (!kvm_s390_pv_is_protected (kvm) || !mm_is_protected (kvm->mm))break ; r = -EFAULT ;arch/s390/kvm/pv.c +2
-1@@ -208,7 +208,6 @@ int kvm_s390_pv_init_vm(struct kvm *kvm, u16 *rc, u16 *rrc)return -EIO ; } kvm->arch.gmap->guest_handle = uvcb.guest_handle; -atomic_set (&kvm->mm->context.is_protected,1 );return 0 ; }@@ -228,6 +227,8 @@ int kvm_s390_pv_set_sec_parms(struct kvm *kvm, void *hdr, u64 length, u16 *rc, *rrc = uvcb.header.rrc;KVM_UV_EVENT (kvm,3 ,"PROTVIRT VM SET PARMS: rc %x rrc %x" , *rc, *rrc); +if (!cc) +atomic_set (&kvm->mm->context.is_protected,1 );return cc ? -EINVAL :0 ; }arch/s390/mm/gmap.c +2
-0@@ -2690,6 +2690,8 @@ static const struct mm_walk_ops reset_acc_walk_ops = {#include <linux/sched/mm.h> void s390_reset_acc (struct mm_struct *mm) { +if (!mm_is_protected (mm)) +return ;/* * we might be called during * reset: we walk the pages and clear
Janosch Frank
maintainerQuoted 4 lines · Christian Borntraeger
Quoted 3 lines · Janosch Frank
We can only have protected guest pages after a successful set secure parameters call as only then the UV allows imports and unpacks.
Quoted 8 lines
Quoted 4 lines
By moving the test we can now also check for it in
s390_reset_acc()and do an early return if it is 0.Signed-off-by Janosch Frank <[email protected]>Looks sane.
Reviewed-by Christian Borntraeger <[email protected]>
Thanks
Quoted 2 lines
As said in my other mail lets give it some days for the CI to test this.
Sure, I'll push it in a minute
Quoted 55 lines
Quoted 55 lines
--- arch/s390/kvm/kvm-s390.c | 2 +- arch/s390/kvm/pv.c | 3 ++- arch/s390/mm/gmap.c | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-)arch/s390/kvm/kvm-s390.c +1
-1@@ -2312,7 +2312,7 @@ static int kvm_s390_handle_pv(struct kvm *kvm, struct kvm_pv_cmd *cmd)struct kvm_s390_pv_unp unp = {}; r = -EINVAL ; -if (!kvm_s390_pv_is_protected (kvm)) +if (!kvm_s390_pv_is_protected (kvm) || !mm_is_protected (kvm->mm))break ; r = -EFAULT ;arch/s390/kvm/pv.c +2
-1@@ -208,7 +208,6 @@ int kvm_s390_pv_init_vm(struct kvm *kvm, u16 *rc, u16 *rrc)return -EIO ; } kvm->arch.gmap->guest_handle = uvcb.guest_handle; -atomic_set (&kvm->mm->context.is_protected,1 );return 0 ; }@@ -228,6 +227,8 @@ int kvm_s390_pv_set_sec_parms(struct kvm *kvm, void *hdr, u64 length, u16 *rc, *rrc = uvcb.header.rrc;KVM_UV_EVENT (kvm,3 ,"PROTVIRT VM SET PARMS: rc %x rrc %x" , *rc, *rrc); +if (!cc) +atomic_set (&kvm->mm->context.is_protected,1 );return cc ? -EINVAL :0 ; }arch/s390/mm/gmap.c +2
-0@@ -2690,6 +2690,8 @@ static const struct mm_walk_ops reset_acc_walk_ops = {#include <linux/sched/mm.h> void s390_reset_acc (struct mm_struct *mm) { +if (!mm_is_protected (mm)) +return ;/* * we might be called during * reset: we walk the pages and clear
Quoted 6 lines · On Fri, 30 Oct 2020 10:01:41 -0400 Janosch Frank <[email protected]> wrote:
We can only have protected guest pages after a successful set secure parameters call as only then the UV allows imports and unpacks.
By moving the test we can now also check for it in
s390_reset_acc()and do an early return if it is 0.
Quoted 6 lines
Signed-off-by Janosch Frank <[email protected]>--- arch/s390/kvm/kvm-s390.c | 2 +- arch/s390/kvm/pv.c | 3 ++- arch/s390/mm/gmap.c | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-)
Seems reasonable to me. I assume it has been given some coverage by now?