Skip to contentSkip to conversation

KVM: s390: Fix lockdep issue in vm memop

GIT PULL Christian Borntraeger 3 participants 5 messages May 2, 2022

Subsystems (3)
lore
Share & tools
lore

Christian Borntraeger

author maintainer
#0 lore raw

Paolo,

one patch that is sitting already too long in my tree (sorry, was out of office some days).

The following changes since commit 3bcc372c9865bec3ab9bfcf30b2426cf68bc18af:

KVM: s390: selftests: Add error memop tests (2022-03-14 16:12:27 +0100)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git tags/kvm-s390-master-5.18-1

for you to fetch changes up to 4aa5ac75bf79cbbc46369163eb2e3addbff0d434:

KVM: s390: Fix lockdep issue in vm memop (2022-03-23 10:41:04 +0100)

----------------------------------------------------------------
KVM: s390: fix lockdep warning in new MEMOP call

----------------------------------------------------------------
Janis Schoetterl-Glausch (1):
KVM: s390: Fix lockdep issue in vm memop

 arch/s390/kvm/kvm-s390.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
author maintainer
#1 lore raw

From: Janis Schoetterl-Glausch <[email protected]>

Issuing a vm memop on a protected vm does not make sense, neither is the memory readable/writable, nor does it make sense to check storage keys. This is why the ioctl will return -EINVAL when it detects the vm to be protected. However, in order to ensure that the vm cannot become protected during the memop, the kvm->lock would need to be taken for the duration of the ioctl. This is also required because kvm_s390_pv_is_protected asserts that the lock must be held. Instead, don't try to prevent this. If user space enables secure execution concurrently with a memop it must accecpt the possibility of the memop failing.
Still check if the vm is currently protected, but without locking and consider it a heuristic.

Fixes ef11c9463ae0 ("KVM: s390: Add vm IOCTL for key checked guest absolute memory access")
---
 arch/s390/kvm/kvm-s390.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
arch/s390/kvm/kvm-s390.c +10 -1
index b53ff693b66e..7240a781ea82 100644
@@ -2385,7 +2385,16 @@ static int kvm_s390_vm_mem_op(struct kvm *kvm, struct kvm_s390_mem_op *mop)
 		return -EINVAL;
 	if (mop->size > MEM_OP_MAX_SIZE)
 		return -E2BIG;
-	if (kvm_s390_pv_is_protected(kvm))
+	/*
+	 * This is technically a heuristic only, if the kvm->lock is not
+	 * taken, it is not guaranteed that the vm is/remains non-protected.
+	 * This is ok from a kernel perspective, wrongdoing is detected
+	 * on the access, -EFAULT is returned and the vm may crash the
+	 * next time it accesses the memory in question.
+	 * There is no sane usecase to do switching and a memop on two
+	 * different CPUs at the same time.
+	 */
+	if (kvm_s390_pv_get_handle(kvm))
 		return -EINVAL;
 	if (mop->flags & KVM_S390_MEMOP_F_SKEY_PROTECTION) {
 		if (access_key_invalid(mop->key))
Signature · 1 line
2.35.1
maintainer
#2 lore raw
In reply to Christian Borntraeger
Quoted 4 lines · Christian Borntraeger

Paolo,

one patch that is sitting already too long in my tree (sorry, was out of office some days).

Hi Christian,

at this point I don't have much waiting for 5.18. Feel free to send it through the s390 tree.

Paolo

Quoted 22 lines

The following changes since commit 3bcc372c9865bec3ab9bfcf30b2426cf68bc18af:

KVM: s390: selftests: Add error memop tests (2022-03-14 16:12:27 +0100)

are available in the Git repository at:

   git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git  tags/kvm-s390-master-5.18-1

for you to fetch changes up to 4aa5ac75bf79cbbc46369163eb2e3addbff0d434:

KVM: s390: Fix lockdep issue in vm memop (2022-03-23 10:41:04 +0100)

----------------------------------------------------------------
KVM: s390: fix lockdep warning in new MEMOP call

----------------------------------------------------------------
Janis Schoetterl-Glausch (1):
KVM: s390: Fix lockdep issue in vm memop

  arch/s390/kvm/kvm-s390.c | 11 ++++++++++-
  1 file changed, 10 insertions(+), 1 deletion(-)
author maintainer Acked-by
#3 lore raw

Am 02.05.22 um 17:39 schrieb Paolo Bonzini:

Quoted 9 lines · Christian Borntraeger
Quoted 4 lines

Paolo,

one patch that is sitting already too long in my tree (sorry, was out of office some days).

Hi Christian,

at this point I don't have much waiting for 5.18.  Feel free to send it through the s390 tree.

OK.

Heiko, Vasily, can you queue this for your next pull request?

for carrying this via the s390 tree.

Quoted 26 lines

Paolo

Quoted 22 lines

The following changes since commit 3bcc372c9865bec3ab9bfcf30b2426cf68bc18af:

   KVM: s390: selftests: Add error memop tests (2022-03-14 16:12:27 +0100)

are available in the Git repository at:

   git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git  tags/kvm-s390-master-5.18-1

for you to fetch changes up to 4aa5ac75bf79cbbc46369163eb2e3addbff0d434:

   KVM: s390: Fix lockdep issue in vm memop (2022-03-23 10:41:04 +0100)

----------------------------------------------------------------
KVM: s390: fix lockdep warning in new MEMOP call

----------------------------------------------------------------
Janis Schoetterl-Glausch (1):
       KVM: s390: Fix lockdep issue in vm memop

  arch/s390/kvm/kvm-s390.c | 11 ++++++++++-

  1 file changed, 10 insertions(+), 1 deletion(-)
maintainer
#4 lore raw
Quoted 9 lines · Christian Borntraeger

Am 02.05.22 um 17:39 schrieb Paolo Bonzini:

Quoted 8 lines · Christian Borntraeger
Quoted 4 lines

Paolo,

one patch that is sitting already too long in my tree (sorry, was out of office some days).

Hi Christian,

Quoted 8 lines
Quoted 1 line

at this point I don't have much waiting for 5.18.  Feel free to send it through the s390 tree.

OK.

Heiko, Vasily, can you queue this for your next pull request?

for carrying this via the s390 tree.

It's now on the fixes branch:
https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git/log/?h=fixes

Actually I was waiting if some fixes would come in, since the fixes branch also had only one small fix until now.