From nobody Wed Dec 17 12:06:50 2025 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D400716A954 for ; Wed, 10 Jul 2024 23:42:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720654974; cv=none; b=eE1aJfuAFxOLGBSRxITKeQnBkVi41R+ZR+bM0Z2cKOH48Ghugm9AbKVErAW7HO9KZ1BQMSw0BrNh+0mr7uFiw7mQkUh29tU7OHMLYN/oPlDmqufH0hY/IGPMGNElk2OOkeo1g5DvnzYhHVhy6DT8aup4XLn4+w/1j1axWuWaF70= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720654974; c=relaxed/simple; bh=u+awbVx9aoPKS0xGDQreI8aQ8m7YRSIdZYPdiuLJprA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=qhcX83LzxztHOGGJSqEW7/pNEkC+qUzAaXCcglIkzlZ3rpGXFOOJEZiX183onhix6T7kKVQ2hfGixeTjT26wOnMOOUcy20ryqMeN1d8/OILeTdGkgzRXV95SImxSxaN4xv/yOhZQTyCaFdRuUr5/vqvyXDBXX6qeH9pZ5FQ22KI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jthoughton.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=e6NELnNh; arc=none smtp.client-ip=209.85.128.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--jthoughton.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="e6NELnNh" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-65b985bb059so4749837b3.2 for ; Wed, 10 Jul 2024 16:42:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1720654971; x=1721259771; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=QcajhSgtnKDY4bKjbf4ZVWmvqiJNI58ACmEJvGd9BEA=; b=e6NELnNh7DbSwWwtHHEldQJH7sr8xKLGh90dcELCZM/kGuCX6P9o53v/cw1f2kDu4b ZfUSQ5xYn+DP5swZ5BsTWD6leZ5xcV3edNNxeM56kih9lKIfKzuPMfP3AplfhTZ9M8xc XTsgy54wbezX6YiaA+3FcTyEcZeCmbgBvIOcU0jp4srrEoMRIwPtWUxHGsYwKfOnYPS+ u0qdLlyKasM4cdWBA8wdzKKFlq2uFHP7KRZwiKwXohYbP9I2jJRtDhy/aOjnn/KOtWRz okVqjQr+kEPPOVxGWZWhninG8zhSy92CU8wHG+ifGpWL2auqJsCVBRwFH2XKk1+ife46 JpzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720654971; x=1721259771; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=QcajhSgtnKDY4bKjbf4ZVWmvqiJNI58ACmEJvGd9BEA=; b=ndi86jGYtOuP8Ng8Wf2C1Zv6hhYnUqHJYychjK1IAET0/+AHe4pPs6uva1C8AfB5G1 YRpCtflVs1DzRY086FDFFbPn+c/YMNl7uSEZahQD+bpdDQCbalqGKPKY6XLAY7l1Zqef 2hchxNI2cZv9o55HD8uPI3sTXUQ1NWPgDBt4OgeiMcJhu4FF1PaScz9rj+PmWhoLvfXP /6Aae0ZoiDWAUYEHQEUJ59V8Qwv6ta4anHZO40wyZ+8yArAq8NE5wyxxmLsRzJ5DGtQH IYzYxezkVBqch7Cb+vND1AcCBgOV3kv3/6HSnstr4FoSn3TOmaVqXV1Q1c7sh0eUOQny QWBQ== X-Forwarded-Encrypted: i=1; AJvYcCVauSl9wyPEYN8rL4jQl/14j41cQcnadKkjog8HCIeGxHnht2obatI+0XJkHEm6h3YgBmGjcQoNqSgUdCyeGI/Vlj3TqgRTXCLCmEKR X-Gm-Message-State: AOJu0YxNC9AFsEIXZg5rFV1FPPzET8BcHiGV9ZUMrQlLbted/RuaA4eX Iyvn9/K+lc3J+/uo/xLfViBFqMdpshhMq77hEnNCb2cYXyGYOgxqpDrDlNrNprtSUh/4T8/T1NR g+lEXdJUCy0rAuZpCwA== X-Google-Smtp-Source: AGHT+IEC/EQtrNezpt+9blgHEpHxd1YhFnUWh0/2vBf3Usnz5Irc0nFTjIjjYgCU/UmvBPArza1QUIUaWp5gpwOj X-Received: from jthoughton.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:2a4f]) (user=jthoughton job=sendgmr) by 2002:a05:690c:6d0d:b0:61c:89a4:dd5f with SMTP id 00721157ae682-658ebabc90amr1126767b3.0.1720654970940; Wed, 10 Jul 2024 16:42:50 -0700 (PDT) Date: Wed, 10 Jul 2024 23:42:17 +0000 In-Reply-To: <20240710234222.2333120-1-jthoughton@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240710234222.2333120-1-jthoughton@google.com> X-Mailer: git-send-email 2.45.2.993.g49e7a77208-goog Message-ID: <20240710234222.2333120-14-jthoughton@google.com> Subject: [RFC PATCH 13/18] KVM: Add atomic parameter to __gfn_to_hva_many From: James Houghton To: Paolo Bonzini Cc: Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Zenghui Yu , Sean Christopherson , Shuah Khan , Peter Xu , Axel Rasmussen , David Matlack , James Houghton , kvm@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Atomic translations cannot wait for userspace to resolve a userfault. Add an atomic parameter for later use with KVM Userfault. Signed-off-by: James Houghton --- virt/kvm/kvm_main.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 77eb9f0de02d..4ac018cac704 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2679,7 +2679,7 @@ static bool memslot_is_readonly(const struct kvm_memo= ry_slot *slot) } =20 static unsigned long __gfn_to_hva_many(const struct kvm_memory_slot *slot,= gfn_t gfn, - gfn_t *nr_pages, bool write) + gfn_t *nr_pages, bool write, bool atomic) { if (!slot || slot->flags & KVM_MEMSLOT_INVALID) return KVM_HVA_ERR_BAD; @@ -2699,7 +2699,7 @@ static unsigned long __gfn_to_hva_many(const struct k= vm_memory_slot *slot, gfn_t static unsigned long gfn_to_hva_many(struct kvm_memory_slot *slot, gfn_t g= fn, gfn_t *nr_pages) { - return __gfn_to_hva_many(slot, gfn, nr_pages, true); + return __gfn_to_hva_many(slot, gfn, nr_pages, true, false); } =20 unsigned long gfn_to_hva_memslot(struct kvm_memory_slot *slot, @@ -2732,7 +2732,7 @@ EXPORT_SYMBOL_GPL(kvm_vcpu_gfn_to_hva); unsigned long gfn_to_hva_memslot_prot(struct kvm_memory_slot *slot, gfn_t gfn, bool *writable) { - unsigned long hva =3D __gfn_to_hva_many(slot, gfn, NULL, false); + unsigned long hva =3D __gfn_to_hva_many(slot, gfn, NULL, false, false); =20 if (!kvm_is_error_hva(hva) && writable) *writable =3D !memslot_is_readonly(slot); @@ -3002,7 +3002,8 @@ kvm_pfn_t __gfn_to_pfn_memslot(const struct kvm_memor= y_slot *slot, gfn_t gfn, bool atomic, bool interruptible, bool *async, bool write_fault, bool *writable, hva_t *hva) { - unsigned long addr =3D __gfn_to_hva_many(slot, gfn, NULL, write_fault); + unsigned long addr =3D __gfn_to_hva_many(slot, gfn, NULL, write_fault, + atomic); =20 if (hva) *hva =3D addr; @@ -3074,7 +3075,7 @@ int gfn_to_page_many_atomic(struct kvm_memory_slot *s= lot, gfn_t gfn, unsigned long addr; gfn_t entry =3D 0; =20 - addr =3D gfn_to_hva_many(slot, gfn, &entry); + addr =3D __gfn_to_hva_many(slot, gfn, &entry, true, true); if (kvm_is_error_hva(addr)) return -1; =20 --=20 2.45.2.993.g49e7a77208-goog