From patchwork Wed Jun 22 21:36:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 12891503 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0C2FC43334 for ; Wed, 22 Jun 2022 21:37:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3A8978E00F9; Wed, 22 Jun 2022 17:37:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 359128E00F6; Wed, 22 Jun 2022 17:37:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 15D948E00F9; Wed, 22 Jun 2022 17:37:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 036E18E00F6 for ; Wed, 22 Jun 2022 17:37:19 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id CA0FB3311D for ; Wed, 22 Jun 2022 21:37:18 +0000 (UTC) X-FDA: 79607182956.26.C9A9C2F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf05.hostedemail.com (Postfix) with ESMTP id 63458100099 for ; Wed, 22 Jun 2022 21:37:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655933834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+Bc6oiDMKyczPP3MnRg+YG2Ibpmu1/F27D1fgoc2Uo0=; b=IRRA0hk0pBZwHlXawGyh5ExZ6aRUiWeX2VENXIe6vsfZWuiQn5hgOil9vJn++AhZXsEHzM oaco1fnISj4g2EjFlRf0fTTTTufr4Za9+7p5/xU5mt/Xnm3wF9OCWoPInZ0UEbGJIiZFEH mRRZlYnRFNlyQWgjGYdUZKrVIEyND4o= Received: from mail-io1-f72.google.com (mail-io1-f72.google.com [209.85.166.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-587-bBvgcT68N4q97f1-4t7wuw-1; Wed, 22 Jun 2022 17:37:11 -0400 X-MC-Unique: bBvgcT68N4q97f1-4t7wuw-1 Received: by mail-io1-f72.google.com with SMTP id f18-20020a5d8592000000b0067289239d1dso520491ioj.22 for ; Wed, 22 Jun 2022 14:37:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+Bc6oiDMKyczPP3MnRg+YG2Ibpmu1/F27D1fgoc2Uo0=; b=SBrYoLzJC1YS/8IlAw5KCCRi2X2Q7AgdMyDGSlxrcIhVlJs9r6txupKH82Jy9Ek1Pk +lq/uXzRd9WKdi4QpVtNHv/Z+f0OI7b7a16ewtth775edqKcT5perEqopzPSKQeuVrY6 68cVmJN9DPyv7B9m1ObwVXg7Ty6OEvQBd9w3WK5c8ogDpFz/LIUyIGDtHV+CpsLDyyOl EcX4aWNMwpXoJDjerwzgULP4RvgaoOPolixh8P9lbwZN21t/sBqMNLVdyKC/Jh/A2WwB 3RzIYQKZ+lYspJwqSuE12xrBbIHQK6LS4WI6Pkqaw18zFln3jbqLgcFDn0nyuxxxWLsV zj2w== X-Gm-Message-State: AJIora9Xq680JETDkoO+/ltVcnmFKw3X6I/mZiNKmm5hTngQ38AS10vL 5pQvPEyqhQ7rtXP1LHIPSwH/nSwcs9qUNu86+UHxFtXSxR2+P3FyEyvjC2Q+g+Z0TTnoeVWPqRa Ti7BmYHPejrg= X-Received: by 2002:a05:6638:3043:b0:314:7ce2:4a6e with SMTP id u3-20020a056638304300b003147ce24a6emr3407091jak.258.1655933830728; Wed, 22 Jun 2022 14:37:10 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tXYF1gATLPxilQ8J8azYs80FKmrYKCExwZSpp2Y52+zhUd9Cgm+xA8CMppEVs8Il5ycEHTqA== X-Received: by 2002:a05:6638:3043:b0:314:7ce2:4a6e with SMTP id u3-20020a056638304300b003147ce24a6emr3407077jak.258.1655933830514; Wed, 22 Jun 2022 14:37:10 -0700 (PDT) Received: from localhost.localdomain (cpec09435e3e0ee-cmc09435e3e0ec.cpe.net.cable.rogers.com. [99.241.198.116]) by smtp.gmail.com with ESMTPSA id g7-20020a0566380c4700b00339d892cc89sm1510446jal.83.2022.06.22.14.37.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 22 Jun 2022 14:37:09 -0700 (PDT) From: Peter Xu To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: peterx@redhat.com, Paolo Bonzini , Andrew Morton , David Hildenbrand , "Dr . David Alan Gilbert" , Andrea Arcangeli , Linux MM Mailing List , Sean Christopherson Subject: [PATCH 4/4] kvm/x86: Allow to respond to generic signals during slow page faults Date: Wed, 22 Jun 2022 17:36:56 -0400 Message-Id: <20220622213656.81546-5-peterx@redhat.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220622213656.81546-1-peterx@redhat.com> References: <20220622213656.81546-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-type: text/plain ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=IRRA0hk0; dmarc=pass (policy=none) header.from=redhat.com; spf=none (imf05.hostedemail.com: domain of peterx@redhat.com has no SPF policy when checking 170.10.129.124) smtp.mailfrom=peterx@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655933835; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=+Bc6oiDMKyczPP3MnRg+YG2Ibpmu1/F27D1fgoc2Uo0=; b=1YGQTov5q3Vn9zAmKmcAPLBw0HvzSNwfFv/uBIQp+YPZrPZv2iyIC7mrhN0B/EcSOd+ccP MsjxxLQd5Nn8ccfVnHHqF4BLCICkuqiedFA+7GN4QE50sMD+ynU6QHGXV47cFXmYXLACqQ /r0h0EwoY005BxHfA4732M8GgWeiYpM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655933835; a=rsa-sha256; cv=none; b=d08mCYJKg2XZTSFB8KU3Mmi3p1IW3x21Ls8RpTXYRYU3D1fhvgv9Gt+l8tti9lweKziZqi ZG0ZrXOjKsgsf7mneOZV9CmY/zT63YZPnycQHNvIKn+j5YlYnFmI5PlPJ8KbWtk6DpIevg oOO9E8Ktyivv/Ky3ARSjMQZph/FFeFg= X-Rspam-User: Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=IRRA0hk0; dmarc=pass (policy=none) header.from=redhat.com; spf=none (imf05.hostedemail.com: domain of peterx@redhat.com has no SPF policy when checking 170.10.129.124) smtp.mailfrom=peterx@redhat.com X-Stat-Signature: 7r84k8g9mezo4ixci9c6ewufou8skoaq X-Rspamd-Queue-Id: 63458100099 X-Rspamd-Server: rspam12 X-HE-Tag: 1655933835-450173 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: All the facilities should be ready for this, what we need to do is to add a new KVM_GTP_INTERRUPTIBLE flag showing that we're willing to be interrupted by common signals during the __gfn_to_pfn_memslot() request, and wire it up with a FOLL_INTERRUPTIBLE flag that we've just introduced. Note that only x86 slow page fault routine will set this new bit. The new bit is not used in non-x86 arch or on other gup paths even for x86. However it can actually be used elsewhere too but not yet covered. When we see the PFN fetching was interrupted, do early exit to userspace with an KVM_EXIT_INTR exit reason. Signed-off-by: Peter Xu --- arch/x86/kvm/mmu/mmu.c | 9 +++++++++ include/linux/kvm_host.h | 1 + virt/kvm/kvm_main.c | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index e92f1ab63d6a..b39acb7cb16d 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -3012,6 +3012,13 @@ static int kvm_handle_bad_page(struct kvm_vcpu *vcpu, gfn_t gfn, kvm_pfn_t pfn) static int handle_abnormal_pfn(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault, unsigned int access) { + /* NOTE: not all error pfn is fatal; handle intr before the other ones */ + if (unlikely(is_intr_pfn(fault->pfn))) { + vcpu->run->exit_reason = KVM_EXIT_INTR; + ++vcpu->stat.signal_exits; + return -EINTR; + } + /* The pfn is invalid, report the error! */ if (unlikely(is_error_pfn(fault->pfn))) return kvm_handle_bad_page(vcpu, fault->gfn, fault->pfn); @@ -4017,6 +4024,8 @@ static int kvm_faultin_pfn(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault) } } + /* Allow to respond to generic signals in slow page faults */ + flags |= KVM_GTP_INTERRUPTIBLE; fault->pfn = __gfn_to_pfn_memslot(slot, fault->gfn, flags, NULL, &fault->map_writable, &fault->hva); return RET_PF_CONTINUE; diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 4f84a442f67f..c8d98e435537 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -1163,6 +1163,7 @@ typedef unsigned int __bitwise kvm_gtp_flag_t; #define KVM_GTP_WRITE ((__force kvm_gtp_flag_t) BIT(0)) #define KVM_GTP_ATOMIC ((__force kvm_gtp_flag_t) BIT(1)) +#define KVM_GTP_INTERRUPTIBLE ((__force kvm_gtp_flag_t) BIT(2)) kvm_pfn_t __gfn_to_pfn_memslot(const struct kvm_memory_slot *slot, gfn_t gfn, kvm_gtp_flag_t gtp_flags, bool *async, diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 952400b42ee9..b3873cac5672 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2462,6 +2462,8 @@ static int hva_to_pfn_slow(unsigned long addr, bool *async, flags |= FOLL_WRITE; if (async) flags |= FOLL_NOWAIT; + if (gtp_flags & KVM_GTP_INTERRUPTIBLE) + flags |= FOLL_INTERRUPTIBLE; npages = get_user_pages_unlocked(addr, 1, &page, flags); if (npages != 1) @@ -2599,6 +2601,8 @@ kvm_pfn_t hva_to_pfn(unsigned long addr, kvm_gtp_flag_t gtp_flags, bool *async, npages = hva_to_pfn_slow(addr, async, gtp_flags, writable, &pfn); if (npages == 1) return pfn; + if (npages == -EINTR) + return KVM_PFN_ERR_INTR; mmap_read_lock(current->mm); if (npages == -EHWPOISON ||