From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 E364421770C for ; Wed, 18 Jun 2025 04:24:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750220680; cv=none; b=Y6LehnHcThcNhjtgK5hBrVc9aSDrwKI8NB+6bo8ZbLvSjh3AhYwpnA+IcWI82Zdt5QqYfD71+qjANooZ9ttTO+NwbmadktnngXhjyZ/JsBcVLOHqEtFhz2u5Ypw3UFGDkD6019o+n8FyEYpU5MVZwZWnjhzsxKY0EGVFWz5sL6Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750220680; c=relaxed/simple; bh=RjOGGjzo1gz+MJ4XHnzV65K+mX6uQwTz9v2uyBR8F74=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=DuHRKTmtYrUm9KdwGuOdDykIQL0W4+K391JrkNcGZKTsvacOq+gRLsCZ3xnQs1zNBpdAx9O67f16PEgAtdnpXtuVacY91SLdZxsNYnyaxxmB5MzsG0AazXv8oxnPRCbZbL4ajCt4ezTGkcK9bzsyf2cc2K/csMfUuq7WFNQttUM= 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=LmFG06QS; arc=none smtp.client-ip=209.85.216.74 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="LmFG06QS" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-313c3915345so8435486a91.3 for ; Tue, 17 Jun 2025 21:24:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1750220678; x=1750825478; 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=u7uDKQXpUwdrzKwoUkA90P4kaViu0b/lAOUYW7NM+2o=; b=LmFG06QSpvI9kslH54L9ZBzmL2vQPHE23udaQdw3yxlcbVTs7uMyhHrSalyOq5Y+1X zHZ+E7VCBB2GCaHQwbX46oVP683MBeDZsIv3ik1UxXPu6DiuND2gp6KEYUZXmPFC9ZqX dcF7XM8JHygb1RUSHPyvR10yOVg38uEgMyGrTumDiyNLc2IpmkAZEXk+BLZxRkWl87D7 EkmRiWyWS27tc8le+DSDJAvYk44dVkf3Umq5uzp2ZkQ/RwKYoB99PDRpA4i0b8te5HbP ejrvCSw+3R3G7EGkLDckWgsl+zFBQJuchIdVuKQmH15sBXzg4T0Je9XY3GUDnh4tt/Gv 2y3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750220678; x=1750825478; 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=u7uDKQXpUwdrzKwoUkA90P4kaViu0b/lAOUYW7NM+2o=; b=AbjTMuKWalgW4k+wy0wXUnDZUJxgN+AihgbDwdbdDltoBaw7ihRd0Gh8tIpRFV7TvA pOEKRcix/rBgMCdfrzUvCmNETRknxpNQtRF7yEHeQJTVBaATBmJj1t/+qoP2w+I7UGKf cU19AcPPxOCIulcQz0Ke0kh99+i3R7hfOf4d4TJjo6CXED9FyvX50HhVnaNdivj+hIJV dgHeU9oKCDjWkUaWn+a3x/Q34zkpc65hGxWP5ks66iZWcj13f/tAAk1yRfNPaOfBBBMa J7vt27woPHf1eeIjRyQ5pNdv5dzk8Kj1s6yE76DdWP7Gssc9Cleam4nQCLK3t4V8aKYy ailw== X-Forwarded-Encrypted: i=1; AJvYcCUdCxK/n4l6RMQX5SZTZE/uaw1qe6jMuK1JDn8qLg1xQHqs5rzsn5Osq4J77g4vldl5LRI=@vger.kernel.org X-Gm-Message-State: AOJu0YzrgnzOXXkPkHo5TnkipxFv3d/Y3qISyBVWRNeF2GNx0+3VnOte dARtP5Fdnx08GJbbNLvasApwvJWxuhjbtrgGeDLGLXVIUHbFujXZyFNTKlf9ZGCCs8Ay0uk7Htu t2RSnUkMWMhNw/+umLMMd5A== X-Google-Smtp-Source: AGHT+IEsvRhaA+pgvEn2VcIt6EZL6lLvB8OQlgHyuSOj5NMOQERsIQvH6ATMkLPJIOGQBvW8tdGSJDJWdEvdsdMB X-Received: from pjbsm7.prod.google.com ([2002:a17:90b:2e47:b0:312:f650:c7aa]) (user=jthoughton job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:2d47:b0:312:db8f:9a09 with SMTP id 98e67ed59e1d1-313f1c380f7mr29459716a91.14.1750220677882; Tue, 17 Jun 2025 21:24:37 -0700 (PDT) Date: Wed, 18 Jun 2025 04:24:16 +0000 In-Reply-To: <20250618042424.330664-1-jthoughton@google.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250618042424.330664-1-jthoughton@google.com> X-Mailer: git-send-email 2.50.0.rc2.696.g1fc2a0284f-goog Message-ID: <20250618042424.330664-8-jthoughton@google.com> Subject: [PATCH v3 07/15] KVM: Enable and advertise support for KVM userfault exits From: James Houghton To: Paolo Bonzini , Sean Christopherson , Oliver Upton Cc: Jonathan Corbet , Marc Zyngier , Yan Zhao , James Houghton , Nikita Kalyazin , Anish Moorthy , Peter Gonda , Peter Xu , David Matlack , wei.w.wang@intel.com, 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-Type: text/plain; charset="UTF-8" Now that all architectures (arm64 and x86) that utilize "generic" page faults also support userfault exits, advertise support for KVM_CAP_USERFAULT and let userspace set KVM_MEM_USERFAULT in memslots. Signed-off-by: James Houghton Signed-off-by: Sean Christopherson --- include/uapi/linux/kvm.h | 1 + virt/kvm/kvm_main.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index e3b871506ec85..0ba265f99f033 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -937,6 +937,7 @@ struct kvm_enable_cap { #define KVM_CAP_ARM_EL2 240 #define KVM_CAP_ARM_EL2_E2H0 241 #define KVM_CAP_RISCV_MP_STATE_RESET 242 +#define KVM_CAP_USERFAULT 243 struct kvm_irq_routing_irqchip { __u32 irqchip; diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index bef6760cd1c0e..2962be09d5ebf 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1604,6 +1604,9 @@ static int check_memory_region_flags(struct kvm *kvm, !(mem->flags & KVM_MEM_GUEST_MEMFD)) valid_flags |= KVM_MEM_READONLY; + if (IS_ENABLED(CONFIG_KVM_GENERIC_PAGE_FAULT)) + valid_flags |= KVM_MEM_USERFAULT; + if (mem->flags & ~valid_flags) return -EINVAL; @@ -4881,6 +4884,9 @@ static int kvm_vm_ioctl_check_extension_generic(struct kvm *kvm, long arg) case KVM_CAP_CHECK_EXTENSION_VM: case KVM_CAP_ENABLE_CAP_VM: case KVM_CAP_HALT_POLL: +#ifdef CONFIG_KVM_GENERIC_PAGE_FAULT + case KVM_CAP_USERFAULT: +#endif return 1; #ifdef CONFIG_KVM_MMIO case KVM_CAP_COALESCED_MMIO: -- 2.50.0.rc2.692.g299adb8693-goog