From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2EA31503BFA for ; Fri, 18 Sep 2026 13:50:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789739451; cv=none; b=VV/zEEFGl1utYps2iZUQNpP4bKqBpo1QQgdzeuBxL0R8fMkPLxVJqaPP7JoRBWZLt+LHjzay4JNsfHoligzpnmIg6SRmaZMnaKPVtivlQUBgWc7cTkmKp3tBqepNdQGXr2lEqvQyppH7FwV+D1Fg5FF+ONZeJMn674QohCbTsuc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789739451; c=relaxed/simple; bh=ky/0zBW3SsazdNgqXRf2aqeTi9S9r8aT/eIFkq2Ltxk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=arnwi1Dn8onvhEpU2nb2sUv1gvGRJyrs3nuxaaRlypsg6BfjldWUw7TrpOgBnWfY0Cw7uHYrVtmRj1QAX3owNRZlI0afHhOLh5S+to+TfS9SW7lyb5M8JaZQS1WqHH4PRmk3067BDbi5raDvNcPSQw2PnjpvFP37J7HT0lc61zQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=e8ZRbRlz; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="e8ZRbRlz" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789739448; 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=U10ovodjICS0r0mGD3gnkliOmwXLHV5zQrwDY8NdGjk=; b=e8ZRbRlzxn1dCBWyHgKUOPCUHEmBbVRD+AACVbhmhKd27VU+p4WwT98tAYOtc3s++sFk4B gDqfg6r8eKmwFGXnJFjumVK2UeMZYbF4jrMvHfU/NTGE7SaAhvKgkrcj8HL0DX+BRkJph7 Wz1s8weH5FWAa+jW7jyZ+N7OBBQ9blE= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-453-nnuIec7sPXOGDbNSQoTgJw-1; Fri, 18 Sep 2026 09:50:45 -0400 X-MC-Unique: nnuIec7sPXOGDbNSQoTgJw-1 X-Mimecast-MFC-AGG-ID: nnuIec7sPXOGDbNSQoTgJw_1789739444 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 10CCB195E937; Fri, 18 Sep 2026 13:50:44 +0000 (UTC) Received: from virtlab1023.virt.eng.rdu2.dc.redhat.com (virtlab1023.virt.eng.rdu2.dc.redhat.com [10.18.48.26]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 677C7433; Fri, 18 Sep 2026 13:50:43 +0000 (UTC) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: nsaenz@amazon.com, vkuznets@redhat.com, snambakam@linux.microsoft.com Subject: [PATCH 14/31] KVM: Include memory protections in result of gfn->hva conversion Date: Fri, 18 Sep 2026 09:50:13 -0400 Message-ID: <20260918135030.171564-15-pbonzini@redhat.com> In-Reply-To: <20260918135030.171564-1-pbonzini@redhat.com> References: <20260918135030.171564-1-pbonzini@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 From: Nicolas Saenz Julienne All paths that lead to guest memory accesses now need to check whether memory attributes allow that access. Users of gfn_to_hva, kvm_vcpu_gfn_to_hva and their *_prot variant can get it more or less for free via erroneous return values, so do this first. Note however that this is not true of the variants that take a cached kvm_memslots pointer. These include caches (gfn-to-hva and gfn-to-pfn) and page faults, both of which will need specific changes; but the more optimized functions in virt/kvm/kvm_main.c such as kvm_read_guest() and kvm_write_guest() also retrieve the memslot high in the call chain, and therefore they will need changes in __kvm_read/write_guest_page(). Signed-off-by: Nicolas Saenz Julienne Signed-off-by: Paolo Bonzini --- include/linux/kvm_host.h | 18 +++++++++++++ virt/kvm/kvm_main.c | 55 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 69 insertions(+), 4 deletions(-) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index c215e3bdf043..01223301f0e5 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -2620,8 +2620,26 @@ static inline bool kvm_mem_is_private(struct kvm *kvm, gfn_t gfn) { return false; } +static inline unsigned long kvm_get_memory_attributes(struct kvm *kvm, gfn_t gfn) +{ + return 0; +} #endif /* CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES */ +static inline int kvm_mem_attributes_may_read_gfn(struct kvm *kvm, gfn_t gfn) +{ + unsigned long attrs = kvm_get_memory_attributes(kvm, gfn); + + return kvm_mem_attributes_may_read(attrs); +} + +static inline int kvm_mem_attributes_may_write_gfn(struct kvm *kvm, gfn_t gfn) +{ + unsigned long attrs = kvm_get_memory_attributes(kvm, gfn); + + return kvm_mem_attributes_may_write(attrs); +} + #ifdef CONFIG_KVM_GUEST_MEMFD int kvm_gmem_get_pfn(struct kvm *kvm, struct kvm_memory_slot *slot, gfn_t gfn, kvm_pfn_t *pfn, struct page **page, diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index da80ce6b380e..3b43a0d2a5d8 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2765,13 +2765,38 @@ EXPORT_SYMBOL_FOR_KVM_INTERNAL(gfn_to_hva_memslot); unsigned long gfn_to_hva(struct kvm *kvm, gfn_t gfn) { - return gfn_to_hva_many(gfn_to_memslot(kvm, gfn), gfn, NULL); + unsigned long addr; + + addr = gfn_to_hva_many(gfn_to_memslot(kvm, gfn), gfn, NULL); + if (kvm_is_error_hva(addr)) + return addr; + + if (!kvm_mem_attributes_may_read_gfn(kvm, gfn)) + return KVM_HVA_ERR_BAD; + + if (!kvm_mem_attributes_may_write_gfn(kvm, gfn)) + return KVM_HVA_ERR_RO_BAD; + + return addr; } EXPORT_SYMBOL_FOR_KVM_INTERNAL(gfn_to_hva); unsigned long kvm_vcpu_gfn_to_hva(struct kvm_vcpu *vcpu, gfn_t gfn) { - return gfn_to_hva_many(kvm_vcpu_gfn_to_memslot(vcpu, gfn), gfn, NULL); + struct kvm *kvm = vcpu->kvm; + unsigned long addr; + + addr = gfn_to_hva_many(kvm_vcpu_gfn_to_memslot(vcpu, gfn), gfn, NULL); + if (kvm_is_error_hva(addr)) + return addr; + + if (!kvm_mem_attributes_may_read_gfn(kvm, gfn)) + return KVM_HVA_ERR_BAD; + + if (!kvm_mem_attributes_may_write_gfn(kvm, gfn)) + return KVM_HVA_ERR_RO_BAD; + + return addr; } EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_vcpu_gfn_to_hva); @@ -2797,15 +2822,37 @@ unsigned long gfn_to_hva_memslot_prot(struct kvm_memory_slot *slot, unsigned long gfn_to_hva_prot(struct kvm *kvm, gfn_t gfn, bool *writable) { struct kvm_memory_slot *slot = gfn_to_memslot(kvm, gfn); + unsigned long addr; - return gfn_to_hva_memslot_prot(slot, gfn, writable); + addr = gfn_to_hva_memslot_prot(slot, gfn, writable); + if (kvm_is_error_hva(addr)) + return addr; + + if (!kvm_mem_attributes_may_read_gfn(kvm, gfn)) + return KVM_HVA_ERR_BAD; + + if (writable && !kvm_mem_attributes_may_write_gfn(kvm, gfn)) + *writable = false; + + return addr; } unsigned long kvm_vcpu_gfn_to_hva_prot(struct kvm_vcpu *vcpu, gfn_t gfn, bool *writable) { struct kvm_memory_slot *slot = kvm_vcpu_gfn_to_memslot(vcpu, gfn); + unsigned long addr; - return gfn_to_hva_memslot_prot(slot, gfn, writable); + addr = gfn_to_hva_memslot_prot(slot, gfn, writable); + if (kvm_is_error_hva(addr)) + return addr; + + if (!kvm_mem_attributes_may_read_gfn(vcpu->kvm, gfn)) + return KVM_HVA_ERR_BAD; + + if (writable && !kvm_mem_attributes_may_write_gfn(vcpu->kvm, gfn)) + *writable = false; + + return addr; } static bool kvm_is_ad_tracked_page(struct page *page) -- 2.52.0