From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ua1-f73.google.com (mail-ua1-f73.google.com [209.85.222.73]) (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 7A7602054E7 for ; Thu, 9 Jan 2025 20:49:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736455801; cv=none; b=HiAb3uCsCRi2XQKiOgV4CEWL1xQgCBvlKvyY+5dM2bmA+mL41FYr4IMz92NJosI6WEk+Xh3fgzL5PH0uoSQrYUQdY45wPHpX5KuNR7zm5Rl9tOAmxPgIB1lK7Fe2JrDt5CtGqa5WDyDx9BJs5sMC6ui7mfBttdLby9oDR2DQ4gg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736455801; c=relaxed/simple; bh=tSVByeVc+YvO1YwpxO6WQbJnBeXOFHCPwH2YC78/pxw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=T2pbdxWv0x0jBSo9ZXDQ+EZPvDLEI043o2IalZOpxJHkbsOi5vrz76kVybcmf3aVtY4zuXdoij9GfmJEncxVafSvSKEYeEAxgB/+nsejmwZid7AivsBWVIxWZP7ykCd6IT3pBt/V5KHumfZGjTwz4yc/IizwNcC/wYJ0h/y4b9k= 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=4C4wBnbX; arc=none smtp.client-ip=209.85.222.73 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="4C4wBnbX" Received: by mail-ua1-f73.google.com with SMTP id a1e0cc1a2514c-85bbbba5b59so331044241.0 for ; Thu, 09 Jan 2025 12:49:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1736455798; x=1737060598; darn=lists.linux.dev; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=1DrcQjgptnhIcToWnmFksBp0MRaAX2CW6X5qNo+eD6A=; b=4C4wBnbXPc3cT9XR7PTZmoq5+z7/EMFwGnszD5IASFSXUx47EOYaybQYwY4CIsMxyR gv+AnqHtgjRp1+HrDLmxlSx2B4YBvg2ena6pfAVmXjGyA0xMbYg6uWnVxVcJaCsl+/QL RhSMUUeyVGc5nZKUINfsJAIo/yAde0DwMjB/OzgG6O2x5e/Ge/Ewhnphyz3+Pv9TQv9H IBHcW3bWyyi5oWzV52VIyRRmtsJq8Q/sv2xztxSONQdUdOkfXjegNnk6EaFTrg0IRa1y JPVLmzXY0PS5U7jMYD0TDvk/yHzlZGegwi++8id2I8bZVCIjGriF6zt4WVYuQDQzszii vLaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736455798; x=1737060598; 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=1DrcQjgptnhIcToWnmFksBp0MRaAX2CW6X5qNo+eD6A=; b=n67BQXmhQP03ZtmkCWFYb+1cSiEGSFGHJk1y4XdKwAZLJ2jaeTx6fk8gcCfR1HwQnp Y32lHtdijP05YzZK+WnTVKNp8YqwaUiHdOkrZhy6GXW8x8URRb8HxxC5Z3s5lqRafcX3 1yrwVVM86QEc7IWc49P8d2K9LlL30tF8/pmGTVOopZi5xMnF+qdT35WcILt4rFTxr1hi xprR9bIF926J9+LxplL/zJSX6DvWi1CKRBP6Qh8KGyZQhtmHYRIP7HTIOtr7IoKnFe+W AC8n6Dr5ZTWXChF65cf+X6SlehP+JujKey7uVGpg+wz154hHvnO8Wwgz2qz1ykfvzIW9 aiDg== X-Forwarded-Encrypted: i=1; AJvYcCVb/dbL8/aTDk/LrCh9PiMep9rU0QDDB9LMOQ0JmLCuxzpsnGtAQOEPocuDWV2Ct/JTlHWpw60=@lists.linux.dev X-Gm-Message-State: AOJu0YzqS+NTZnOTahBfV0a+gYmlCA1da+CWQQqrDzW9GAQu4GaPTggS kSqI9/TcSNyZNWxpdWdrAtkVPXw5ypHp3KdAK7Pb1d43KuxSAkkNn/gHcRiNZb9DPGoZ4/EXJxk xoAo0JrZtrOFFr5l6xw== X-Google-Smtp-Source: AGHT+IEK0449o9KbC3fWak3S16jydYyIqzxOV/2eZ44AIR7w7I0DQuvF+HeqMnZYowZ6lm/VqNUOgc0IX+KhZU1E X-Received: from vscv18.prod.google.com ([2002:a05:6102:3312:b0:4af:df7b:f439]) (user=jthoughton job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6102:2c02:b0:4af:d487:45f3 with SMTP id ada2fe7eead31-4b3d0ffc73fmr8314563137.23.1736455798514; Thu, 09 Jan 2025 12:49:58 -0800 (PST) Date: Thu, 9 Jan 2025 20:49:20 +0000 In-Reply-To: <20250109204929.1106563-1-jthoughton@google.com> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250109204929.1106563-1-jthoughton@google.com> X-Mailer: git-send-email 2.47.1.613.gc27f4b7a9f-goog Message-ID: <20250109204929.1106563-5-jthoughton@google.com> Subject: [PATCH v2 04/13] KVM: Advertise KVM_CAP_USERFAULT in KVM_CHECK_EXTENSION From: James Houghton To: Paolo Bonzini , Sean Christopherson Cc: Jonathan Corbet , Marc Zyngier , Oliver Upton , 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" Advertise support for KVM_CAP_USERFAULT when kvm_has_userfault() returns true. Currently this is merely IS_ENABLED(CONFIG_HAVE_KVM_USERFAULT), so it is somewhat redundant. Signed-off-by: James Houghton --- include/uapi/linux/kvm.h | 1 + virt/kvm/kvm_main.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index c302edf1c984..defcad38d423 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -936,6 +936,7 @@ struct kvm_enable_cap { #define KVM_CAP_PRE_FAULT_MEMORY 236 #define KVM_CAP_X86_APIC_BUS_CYCLES_NS 237 #define KVM_CAP_X86_GUEST_MODE 238 +#define KVM_CAP_USERFAULT 239 struct kvm_irq_routing_irqchip { __u32 irqchip; diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 882c1f7b4aa8..30f09141df64 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -4811,6 +4811,10 @@ static int kvm_vm_ioctl_check_extension_generic(struct kvm *kvm, long arg) #ifdef CONFIG_KVM_PRIVATE_MEM case KVM_CAP_GUEST_MEMFD: return !kvm || kvm_arch_has_private_mem(kvm); +#endif +#ifdef CONFIG_HAVE_KVM_USERFAULT + case KVM_CAP_USERFAULT: + return kvm_has_userfault(kvm); #endif default: break; -- 2.47.1.613.gc27f4b7a9f-goog