From: Janosch Frank <frankja@linux.ibm.com>
To: Claudio Imbrenda <imbrenda@linux.ibm.com>, kvm@vger.kernel.org
Cc: cohuck@redhat.com, borntraeger@de.ibm.com, thuth@redhat.com,
pasic@linux.ibm.com, david@redhat.com,
linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org,
Ulrich.Weigand@de.ibm.com
Subject: Re: [PATCH v5 04/14] KVM: s390: pv: avoid stalls when making pages secure
Date: Tue, 12 Oct 2021 09:43:55 +0200 [thread overview]
Message-ID: <2ce2d86e-d3cc-fb9c-60b7-6143f37f6dac@linux.ibm.com> (raw)
In-Reply-To: <20210920132502.36111-5-imbrenda@linux.ibm.com>
On 9/20/21 15:24, Claudio Imbrenda wrote:
> Improve make_secure_pte to avoid stalls when the system is heavily
> overcommitted. This was especially problematic in kvm_s390_pv_unpack,
> because of the loop over all pages that needed unpacking.
>
> Due to the locks being held, it was not possible to simply replace
> uv_call with uv_call_sched. A more complex approach was
> needed, in which uv_call is replaced with __uv_call, which does not
> loop. When the UVC needs to be executed again, -EAGAIN is returned, and
> the caller (or its caller) will try again.
>
> When -EAGAIN is returned, the path is the same as when the page is in
> writeback (and the writeback check is also performed, which is
> harmless).
>
> Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
> Fixes: 214d9bbcd3a672 ("s390/mm: provide memory management functions for protected KVM guests")
Reviewed-by: Janosch Frank <frankja@linux.ibm.com>
> ---
> arch/s390/kernel/uv.c | 29 +++++++++++++++++++++++------
> arch/s390/kvm/intercept.c | 5 +++++
> 2 files changed, 28 insertions(+), 6 deletions(-)
>
> diff --git a/arch/s390/kernel/uv.c b/arch/s390/kernel/uv.c
> index aeb0a15bcbb7..68a8fbafcb9c 100644
> --- a/arch/s390/kernel/uv.c
> +++ b/arch/s390/kernel/uv.c
> @@ -180,7 +180,7 @@ static int make_secure_pte(pte_t *ptep, unsigned long addr,
> {
> pte_t entry = READ_ONCE(*ptep);
> struct page *page;
> - int expected, rc = 0;
> + int expected, cc = 0;
>
> if (!pte_present(entry))
> return -ENXIO;
> @@ -196,12 +196,25 @@ static int make_secure_pte(pte_t *ptep, unsigned long addr,
> if (!page_ref_freeze(page, expected))
> return -EBUSY;
> set_bit(PG_arch_1, &page->flags);
> - rc = uv_call(0, (u64)uvcb);
> + /*
> + * If the UVC does not succeed or fail immediately, we don't want to
> + * loop for long, or we might get stall notifications.
> + * On the other hand, this is a complex scenario and we are holding a lot of
> + * locks, so we can't easily sleep and reschedule. We try only once,
> + * and if the UVC returned busy or partial completion, we return
> + * -EAGAIN and we let the callers deal with it.
> + */
> + cc = __uv_call(0, (u64)uvcb);
> page_ref_unfreeze(page, expected);
> - /* Return -ENXIO if the page was not mapped, -EINVAL otherwise */
> - if (rc)
> - rc = uvcb->rc == 0x10a ? -ENXIO : -EINVAL;
> - return rc;
> + /*
> + * Return -ENXIO if the page was not mapped, -EINVAL for other errors.
> + * If busy or partially completed, return -EAGAIN.
> + */
> + if (cc == UVC_CC_OK)
> + return 0;
> + else if (cc == UVC_CC_BUSY || cc == UVC_CC_PARTIAL)
> + return -EAGAIN;
> + return uvcb->rc == 0x10a ? -ENXIO : -EINVAL;
> }
>
> /*
> @@ -254,6 +267,10 @@ int gmap_make_secure(struct gmap *gmap, unsigned long gaddr, void *uvcb)
> mmap_read_unlock(gmap->mm);
>
> if (rc == -EAGAIN) {
> + /*
> + * If we are here because the UVC returned busy or partial
> + * completion, this is just a useless check, but it is safe.
> + */
> wait_on_page_writeback(page);
> } else if (rc == -EBUSY) {
> /*
> diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c
> index 72b25b7cc6ae..47833ade4da5 100644
> --- a/arch/s390/kvm/intercept.c
> +++ b/arch/s390/kvm/intercept.c
> @@ -516,6 +516,11 @@ static int handle_pv_uvc(struct kvm_vcpu *vcpu)
> */
> if (rc == -EINVAL)
> return 0;
> + /*
> + * If we got -EAGAIN here, we simply return it. It will eventually
> + * get propagated all the way to userspace, which should then try
> + * again.
> + */
> return rc;
> }
>
>
next prev parent reply other threads:[~2021-10-12 7:44 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-20 13:24 [PATCH v5 00/14] KVM: s390: pv: implement lazy destroy for reboot Claudio Imbrenda
2021-09-20 13:24 ` [PATCH v5 01/14] KVM: s390: pv: add macros for UVC CC values Claudio Imbrenda
2021-10-05 13:08 ` Janosch Frank
2021-09-20 13:24 ` [PATCH v5 02/14] KVM: s390: pv: avoid double free of sida page Claudio Imbrenda
2021-10-05 13:11 ` Janosch Frank
2021-10-05 13:38 ` Christian Borntraeger
2021-09-20 13:24 ` [PATCH v5 03/14] KVM: s390: pv: avoid stalls for kvm_s390_pv_init_vm Claudio Imbrenda
2021-10-05 13:20 ` Janosch Frank
2021-09-20 13:24 ` [PATCH v5 04/14] KVM: s390: pv: avoid stalls when making pages secure Claudio Imbrenda
2021-10-06 15:54 ` Christian Borntraeger
2021-10-06 16:14 ` Claudio Imbrenda
2021-10-12 7:43 ` Janosch Frank [this message]
2021-10-12 8:59 ` Christian Borntraeger
2021-09-20 13:24 ` [PATCH v5 05/14] KVM: s390: pv: leak the topmost page table when destroy fails Claudio Imbrenda
2021-10-12 7:58 ` Janosch Frank
2021-10-12 8:33 ` Claudio Imbrenda
2021-09-20 13:24 ` [PATCH v5 06/14] KVM: s390: pv: properly handle page flags for protected guests Claudio Imbrenda
2021-10-12 7:59 ` Janosch Frank
2021-10-26 11:53 ` Christian Borntraeger
2021-09-20 13:24 ` [PATCH v5 07/14] KVM: s390: pv: handle secure storage violations " Claudio Imbrenda
2021-09-20 13:24 ` [PATCH v5 08/14] KVM: s390: pv: handle secure storage exceptions for normal guests Claudio Imbrenda
2021-10-12 8:16 ` Janosch Frank
2021-10-12 8:35 ` Claudio Imbrenda
2021-10-12 12:31 ` Janosch Frank
2021-09-20 13:24 ` [PATCH v5 09/14] KVM: s390: pv: refactor s390_reset_acc Claudio Imbrenda
2021-09-20 13:24 ` [PATCH v5 10/14] KVM: s390: pv: usage counter instead of flag Claudio Imbrenda
2021-09-20 13:24 ` [PATCH v5 11/14] KVM: s390: pv: add export before import Claudio Imbrenda
2021-09-20 13:25 ` [PATCH v5 12/14] KVM: s390: pv: module parameter to fence lazy destroy Claudio Imbrenda
2021-09-20 13:25 ` [PATCH v5 13/14] KVM: s390: pv: lazy destroy for reboot Claudio Imbrenda
2021-09-20 13:25 ` [PATCH v5 14/14] KVM: s390: pv: avoid export before import if possible Claudio Imbrenda
2021-10-05 13:26 ` [PATCH v5 00/14] KVM: s390: pv: implement lazy destroy for reboot Janosch Frank
2021-10-05 14:15 ` Christian Borntraeger
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=2ce2d86e-d3cc-fb9c-60b7-6143f37f6dac@linux.ibm.com \
--to=frankja@linux.ibm.com \
--cc=Ulrich.Weigand@de.ibm.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=imbrenda@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).