From: Claudio Imbrenda <imbrenda@linux.ibm.com>
To: kvm@vger.kernel.org
Cc: cohuck@redhat.com, borntraeger@de.ibm.com, frankja@linux.ibm.com,
thuth@redhat.com, pasic@linux.ibm.com, david@redhat.com,
linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v6 12/17] KVM: s390: pv: refactoring of kvm_s390_pv_deinit_vm
Date: Fri, 3 Dec 2021 17:58:09 +0100 [thread overview]
Message-ID: <20211203165814.73016-13-imbrenda@linux.ibm.com> (raw)
In-Reply-To: <20211203165814.73016-1-imbrenda@linux.ibm.com>
Refactor kvm_s390_pv_deinit_vm to improve readability and simplify the
improvements that are coming in subsequent patches.
No functional change intended.
[note: this can potentially be squashed into the next patch, I factored
it out to simplify the review process]
Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
---
arch/s390/kvm/pv.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/s390/kvm/pv.c b/arch/s390/kvm/pv.c
index 111f85158cce..a54f6e98fa6f 100644
--- a/arch/s390/kvm/pv.c
+++ b/arch/s390/kvm/pv.c
@@ -182,17 +182,17 @@ int kvm_s390_pv_deinit_vm(struct kvm *kvm, u16 *rc, u16 *rrc)
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);
- if (!cc)
- atomic_dec(&kvm->mm->context.protected_count);
- KVM_UV_EVENT(kvm, 3, "PROTVIRT DESTROY VM: rc %x rrc %x", *rc, *rrc);
- WARN_ONCE(cc, "protvirt destroy vm failed rc %x rrc %x", *rc, *rrc);
- /* Intended memory leak on "impossible" error */
if (!cc) {
+ atomic_dec(&kvm->mm->context.protected_count);
kvm_s390_pv_dealloc_vm(kvm);
- return 0;
+ } else {
+ /* Intended memory leak on "impossible" error */
+ s390_replace_asce(kvm->arch.gmap);
}
- s390_replace_asce(kvm->arch.gmap);
- return -EIO;
+ KVM_UV_EVENT(kvm, 3, "PROTVIRT DESTROY VM: rc %x rrc %x", *rc, *rrc);
+ WARN_ONCE(cc, "protvirt destroy vm failed rc %x rrc %x", *rc, *rrc);
+
+ return cc ? -EIO : 0;
}
static void kvm_s390_pv_mmu_notifier_release(struct mmu_notifier *subscription,
--
2.31.1
next prev parent reply other threads:[~2021-12-03 16:59 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-03 16:57 [PATCH v6 00/17] KVM: s390: pv: implement lazy destroy for reboot Claudio Imbrenda
2021-12-03 16:57 ` [PATCH v6 01/17] KVM: s390: pv: leak the topmost page table when destroy fails Claudio Imbrenda
2021-12-03 16:57 ` [PATCH v6 02/17] KVM: s390: pv: handle secure storage violations for protected guests Claudio Imbrenda
2022-01-13 9:54 ` Janosch Frank
2021-12-03 16:58 ` [PATCH v6 03/17] KVM: s390: pv: handle secure storage exceptions for normal guests Claudio Imbrenda
2022-01-13 9:58 ` Janosch Frank
2021-12-03 16:58 ` [PATCH v6 04/17] KVM: s390: pv: refactor s390_reset_acc Claudio Imbrenda
2021-12-03 16:58 ` [PATCH v6 05/17] KVM: s390: pv: usage counter instead of flag Claudio Imbrenda
2021-12-03 16:58 ` [PATCH v6 06/17] KVM: s390: pv: add export before import Claudio Imbrenda
2021-12-03 16:58 ` [PATCH v6 07/17] KVM: s390: pv: module parameter to fence lazy destroy Claudio Imbrenda
2021-12-03 16:58 ` [PATCH v6 08/17] KVM: s390: pv: make kvm_s390_cpus_from_pv global Claudio Imbrenda
2021-12-03 16:58 ` [PATCH v6 09/17] KVM: s390: pv: clear the state without memset Claudio Imbrenda
2022-01-13 10:30 ` Janosch Frank
2021-12-03 16:58 ` [PATCH v6 10/17] KVM: s390: pv: add mmu_notifier Claudio Imbrenda
2021-12-04 2:32 ` kernel test robot
2021-12-03 16:58 ` [PATCH v6 11/17] s390/mm: KVM: pv: when tearing down, try to destroy protected pages Claudio Imbrenda
2022-01-13 10:38 ` Janosch Frank
2021-12-03 16:58 ` Claudio Imbrenda [this message]
2021-12-03 16:58 ` [PATCH v6 13/17] KVM: s390: pv: cleanup leftover protected VMs if needed Claudio Imbrenda
2021-12-03 16:58 ` [PATCH v6 14/17] KVM: s390: pv: asynchronous destroy for reboot Claudio Imbrenda
2021-12-03 16:58 ` [PATCH v6 15/17] KVM: s390: pv: api documentation for asynchronous destroy Claudio Imbrenda
2021-12-03 16:58 ` [PATCH v6 16/17] KVM: s390: pv: add KVM_CAP_S390_PROT_REBOOT_ASYNC Claudio Imbrenda
2021-12-03 16:58 ` [PATCH v6 17/17] KVM: s390: pv: avoid export before import if possible Claudio Imbrenda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211203165814.73016-13-imbrenda@linux.ibm.com \
--to=imbrenda@linux.ibm.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=pasic@linux.ibm.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).