From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (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 00950161328 for ; Wed, 10 Jul 2024 23:42:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720654971; cv=none; b=Kv4L6bBsUfw3e/qRmv8mLdEtb/k2o2KfwhLcfZIvAkNd3xkk8n4kIkbAlfgpjkDiRZgg9oPyr/MC5XhqM6a8+LxtribvYp+D83PHOE2FFK885ChH/cw01RyIE7MmfbvVTSLAbxRb9v45vykn4CFng8BedL0Wprkkt04/1k3xwVU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720654971; c=relaxed/simple; bh=51xqz35xJjNqxl6o9J1L1+yTufTjMwvN6j0qSUdwPuQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=JJujOoTWwTVUy0vhw6lYy/T5MwJl1CMUjoFw7BoFldsc+hb4uCk4uaKPv+QvHD3CtlpcqUUM9ZaDH/csFyXwiGBMUMwCD6Jpjowit7uFWMY8BO2tzBIwHES50MGGPZKDBBYW9jywbm21d7fFRDrTFRUhLro9YTyTZHX7Xwp21rg= 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=IRlMyS95; arc=none smtp.client-ip=209.85.219.201 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="IRlMyS95" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-e03a694ba5aso439256276.3 for ; Wed, 10 Jul 2024 16:42:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1720654968; x=1721259768; 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=m+X5KVuFwrRiCUCCxSkgB4VRafKsM+RRSJ9rZMEadTc=; b=IRlMyS95Lhv3xco1tDJVbO1pV0gIrt71ZkqmscMUXFHuFR06BhT3y1BHspETH2JepH riK+kJ3p3pnFAJd1Vnq2oP/EWZc3d68wzZBKC3T0YDcKzpJ+2TCMW8HmTZsLnfJ8qniF dvij7ccz4XLrdoUgebta80/HqZBQiT5HxIJT4P9y0OUyWz3Jua39BU8FQv5kZfLhvK2S gev67RqpOwO/242+pVPQbSJUtzjq5JJQ2muuIGmv/0cIHtYDpz2MqgqGK+zoZZvoodNu PM42uXOUipGVJvONulC2Qb1zNKwNx3nAmGT9l3s+DqWjWUw03WUDsJ7mN5SOF6Av1xoE xsfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720654968; x=1721259768; 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=m+X5KVuFwrRiCUCCxSkgB4VRafKsM+RRSJ9rZMEadTc=; b=BWGxWjIUUIvrCJCyv4tERFPJo4RCG7ap8YGokGX7HremICfeg5cARBCZsv7omJg8su P6OXQDEZyF3TK1D80kNfLGAhDBfp6sRVkQ1H6I88sNa0S8kwgPEEGqIA4SdhVtRIGgcz MmgppSQYItAjj1YmD1T+PhXm0+Dv0ta1DBHbg4pNTa+FtQ7+fdjNgmVWEbkpkfUM1N9u rke5b5rG4DZ0p5VK/hi8GuE/YwLJHWGm5nYKuZ71l+a0lhUmfltj8dmXwnvKAESwag9M br3NYiksL4KXYefgvarIhYXeFrFGBlxVZ5yeHzopY8DAZXB5rGbnuKHIhL73GYwQDr8R cmBA== X-Forwarded-Encrypted: i=1; AJvYcCUqTfxiONbLaZd/eYFGtnc4v/own/Cyo9s/jLWDB726hVA9JMt7UaMYZg3JuccUpQo0K6K3Dr/s9/HMbbBIXyIiHg/D9Ebp X-Gm-Message-State: AOJu0Yw1t7U5GpH/2qIa1CdUaZ24+ekKXufmrKlqetCZXefkx5hg9NBp 0u51nyjg83cFd/vJimJsPGn+yIEKedawl47l6aG7i4170cofstz7qDyzz76Xg0yYCrbj2FIYuiF zJ7g/uonypvCNsCFpeA== X-Google-Smtp-Source: AGHT+IEiMSeqlL0E6QDriJWFXsS3O5CZdgADUq/m5UJK+f9Pzpz6qFNvBqMVhziD7REowA6fLBLwvMzZP6ooxfuZ X-Received: from jthoughton.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:2a4f]) (user=jthoughton job=sendgmr) by 2002:a05:6902:2089:b0:e03:2bfe:40c9 with SMTP id 3f1490d57ef6-e041b032f48mr13750276.3.1720654967914; Wed, 10 Jul 2024 16:42:47 -0700 (PDT) Date: Wed, 10 Jul 2024 23:42:14 +0000 In-Reply-To: <20240710234222.2333120-1-jthoughton@google.com> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev 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-11-jthoughton@google.com> Subject: [RFC PATCH 10/18] KVM: arm64: Add KVM Userfault support 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-Type: text/plain; charset="UTF-8" Support comes in three parts: 1. When KVM Userfault is enabled, only install PAGE_SIZE PTEs. This prevents us from being able to map a userfault-enabled pfn with a huge PTE in response to a fault on a non-userfault pfn. 2. When we get KVM_PFN_ERR_USERFAULT from __gfn_to_pfn_memslot, return a memory fault to userspace. 3. When KVM Userfault is enabled for a particular kvm_gfn_range, unmap it, so that we can get faults on it. Signed-off-by: James Houghton --- arch/arm64/kvm/Kconfig | 1 + arch/arm64/kvm/mmu.c | 36 ++++++++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig index 58f09370d17e..358153d91d58 100644 --- a/arch/arm64/kvm/Kconfig +++ b/arch/arm64/kvm/Kconfig @@ -37,6 +37,7 @@ menuconfig KVM select HAVE_KVM_VCPU_RUN_PID_CHANGE select SCHED_INFO select GUEST_PERF_EVENTS if PERF_EVENTS + select KVM_USERFAULT help Support hosting virtualized guest machines. diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 8bcab0cc3fe9..ac283e606516 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1434,7 +1434,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, * logging_active is guaranteed to never be true for VM_PFNMAP * memslots. */ - if (logging_active) { + if (logging_active || kvm->userfault) { force_pte = true; vma_shift = PAGE_SHIFT; } else { @@ -1494,8 +1494,15 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, kvm_send_hwpoison_signal(hva, vma_shift); return 0; } - if (is_error_noslot_pfn(pfn)) + if (is_error_noslot_pfn(pfn)) { + if (pfn == KVM_PFN_ERR_USERFAULT) + kvm_prepare_memory_fault_exit(vcpu, gfn << PAGE_SHIFT, + PAGE_SIZE, write_fault, + /*exec=*/false, + /*private=*/false, + /*userfault=*/true); return -EFAULT; + } if (kvm_is_device_pfn(pfn)) { /* @@ -2105,3 +2112,28 @@ void kvm_toggle_cache(struct kvm_vcpu *vcpu, bool was_enabled) trace_kvm_toggle_cache(*vcpu_pc(vcpu), was_enabled, now_enabled); } + +#ifdef CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES +bool kvm_arch_pre_set_memory_attributes(struct kvm *kvm, + struct kvm_gfn_range *range) +{ + unsigned long attrs = range->arg.attributes; + + /* + * We only need to unmap if we're enabling userfault. Disabling it + * does not need an unmap. An unmap to get huge mappings will come + * later. + */ + if (attrs & KVM_MEMORY_ATTRIBUTE_USERFAULT) + kvm_unmap_gfn_range(kvm, range); + + return false; +} + +bool kvm_arch_post_set_memory_attributes(struct kvm *kvm, + struct kvm_gfn_range *range) +{ + /* Nothing to do! */ + return false; +} +#endif -- 2.45.2.993.g49e7a77208-goog