From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45EAAC4332F for ; Tue, 12 Dec 2023 20:48:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C4ECF6B038E; Tue, 12 Dec 2023 15:47:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BFD8F6B0390; Tue, 12 Dec 2023 15:47:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9DA7E6B0391; Tue, 12 Dec 2023 15:47:41 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 8A2266B038E for ; Tue, 12 Dec 2023 15:47:41 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 63654120A2F for ; Tue, 12 Dec 2023 20:47:41 +0000 (UTC) X-FDA: 81559352322.16.8A995EC Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf03.hostedemail.com (Postfix) with ESMTP id 8D91F2000D for ; Tue, 12 Dec 2023 20:47:39 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=fs1ltcbU; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf03.hostedemail.com: domain of 36sZ4ZQUKCI09rxz9x55x2v.t532z4BE-331Crt1.58x@flex--sagis.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=36sZ4ZQUKCI09rxz9x55x2v.t532z4BE-331Crt1.58x@flex--sagis.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702414059; h=from:from:sender: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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=H/Dndi1239gwCc2M1UpDzeOelUNamAjzhLbQUW3a080=; b=x+fW80+DksZuq+30lAr8mlRlzaHXFFxhpShJg19qqueOrtBztrHmwrEqeqDW8CoKU5skyQ AHpqO/2zaRy+PvYeX2xzIQoT5rx/b8QXq+oqz00q5lmd8d9y4ihsEuGZWzHeJMS2d6Kt+X 7Rq9oQxhnJsCrde2f5/t1G/UVDFNdns= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=fs1ltcbU; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf03.hostedemail.com: domain of 36sZ4ZQUKCI09rxz9x55x2v.t532z4BE-331Crt1.58x@flex--sagis.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=36sZ4ZQUKCI09rxz9x55x2v.t532z4BE-331Crt1.58x@flex--sagis.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702414059; a=rsa-sha256; cv=none; b=Jtjh3fGAvS6WT/m/jpDyUbt/Kol+Rj/pFZLFeGmAg6bzwC0cdjHqIBOXCj0/yIy+WqqiLh vZgfplYClN42aPY9F7QpeAZlppVOyjumFZk7aJOt0t1106RsLc+JkMAjtJhD+dmmbVmpPA UEArsNQW94uLxrFH24uwxt0gE/+7pOI= Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-1d34b1ea914so696835ad.1 for ; Tue, 12 Dec 2023 12:47:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1702414058; x=1703018858; darn=kvack.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=H/Dndi1239gwCc2M1UpDzeOelUNamAjzhLbQUW3a080=; b=fs1ltcbUv6t2+jY4gnowuWgyUYNYJLIUOfyG+E/XCA0uPkVBYEyhuEVSf1uV2hhtqL iLV4uJ6AWa5f3hWJ/OwqtyWLRGaAMXnAa3MgsUZpiiOzGuFjgwqCHASJtTbJCVdLRXoz QZJHrX2cM9WZqOjhAXnfas+zd0Z/fhJYzQRru/GvOLJ+/AjsQbZGaJNGmLRCzKfP+6Z5 lDSthDW3MpPgo0yWzY3vQ0Z3qXwSk1QbbCFvj74bmzVJ7X7ubZCH2RNVFMKzWKXSU8pb ZrajvR8OM+5MenFAwRgECtnVcC3E1ILdUu0ShNHftbWAVvzrV/EOQeA2ZhEwqFh2xhon 3+1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702414058; x=1703018858; 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=H/Dndi1239gwCc2M1UpDzeOelUNamAjzhLbQUW3a080=; b=w2SBmB+Z7d1pmJvR5V4OsM6DZhfKpAl3JhirBAb4xq/cYaV6OAdZw/2Xphbhp83tjP 7EINkPlkIvyK1doUrVMD91dnqcdUblDeT9VnhyS+lhkM4qzT0iJkXmEoAiOR+OpI9vF0 EBbUCqF53dL4D7/Z5llA2IM9d7rc0sT8V7HMOR1VW7nf4OtSVV6DzbqKvoGwRRYvjzvw bKgOJXFLVDj51oYatb5H0pfZ1iSsrvAFeTJ5e+16It244exZtNEiYVMj8XSFKlo02d1G PQoIl82SEnwN5ObcyKYdmaVSjzDKMpRP2zMvPnWluI6I0ga/1jN/iJlNI0+ELcoQBRsA fU6A== X-Gm-Message-State: AOJu0Yyu2PVaFTdgLzPwbh/KnnsgiPq4woCm4FvPV5rLn9gTZ5f5OkpL lwpkEMUZQFX4pbvH1LQFup0k4/BL+g== X-Google-Smtp-Source: AGHT+IF90pAMjCwjeHxfySVElT6LDGL6d14S5h4fspD1Gay3dn08vhLUXCGLUkTCyivuxiIl7pjXKXPVEw== X-Received: from sagi.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:241b]) (user=sagis job=sendgmr) by 2002:a17:903:2292:b0:1d0:bf4c:163d with SMTP id b18-20020a170903229200b001d0bf4c163dmr56827plh.2.1702414058496; Tue, 12 Dec 2023 12:47:38 -0800 (PST) Date: Tue, 12 Dec 2023 12:46:37 -0800 In-Reply-To: <20231212204647.2170650-1-sagis@google.com> Mime-Version: 1.0 References: <20231212204647.2170650-1-sagis@google.com> X-Mailer: git-send-email 2.43.0.472.g3155946c3a-goog Message-ID: <20231212204647.2170650-23-sagis@google.com> Subject: [RFC PATCH v5 22/29] KVM: selftests: Add functions to allow mapping as shared From: Sagi Shahar To: linux-kselftest@vger.kernel.org, Ackerley Tng , Ryan Afranji , Erdem Aktas , Sagi Shahar , Isaku Yamahata Cc: Sean Christopherson , Paolo Bonzini , Shuah Khan , Peter Gonda , Haibo Xu , Chao Peng , Vishal Annapurve , Roger Wang , Vipin Sharma , jmattson@google.com, dmatlack@google.com, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-mm@kvack.org Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Stat-Signature: 9ji11tc5yps6dj4kyz8wgotr85g5kpu1 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 8D91F2000D X-HE-Tag: 1702414059-310865 X-HE-Meta: U2FsdGVkX18SAr+sXx09C1Nxf81sb3RaAiY61qPdetpHWo7CfWYbDdojAZzewKDaxsGH/4axD9qG1lkr5M0CKXvBZG7Mt1VqZvL4QZ+aYYM5NbJwtVfKcu5Pd5h+oZ7qbJVtHeuJwxf81ijOQFbGlz5pc1FalGQuVBd0TcKhaiAk5HBNd+KQHua1OSYRjM/dD7AtnQOcaulkAN0RxLe5pRpdBc3+d+ihJToZ0a2SJIDn7p0nN8QT9t5jjC9BsXUsx0VNizn3BEY5rS+pvcVPqSFDXN9uTDEqfRHDyz5hCTHK+zC6hRSL+7sZEXGQCfRG8jX6yu7Sh3AQ0ShZCiVaNLvTXSdADFDiKQ10RViztsFxh1s7Lset5dR95+txLt2+I2uKCINwxmcA7hsw5QuBhEviEdZ87JG5X0xRM8vS6MyLg46A3wyO7eKEBoSWQ+iw5S1ekNO9DnVYY5WWUsw2StVd2GeC3fCteXeQw6VnYKHrV7OT0NY/qi/ezrRJc8ON7u1vGwnT34KnjpWhT6SThH6tEX/2R7lqZP7h3tOAxRvGlPcgaqDyydHnx8hvWdk73NWlEJVrrpFAT4BxMyZrpwtvituXR4fkAHv81wvHmuuj3y3p7WRhjygMho8IVWfZ8rUsMabjo7J8XITKXNicJX4YThUg3XiAA+BEgnLc5hrNOmwaVhuGdsxjlwnfENI44++ficwKTHeZXAH5cfIfEJeBhAKbgY5WALsLUBZBm7+VYyHkMVZAM/ryib2FrjhRxZqajMpToSZLX5p6RHIxrbS8+gF/I6Y88WEd9/eaktj/8VAeVxcW6X2vqpWyudJUI1CXmijPCVGVJePNqiq25dpB1xwYe0RkEb9wMeTImcLWnV3nUA0rFd2wXqKnbO/fqXtWq+l1SQIGXY4yZES9FeyJR0ut2JIxS/hfS28XzXTJdqO8wdcOko2Tzz4X0HINFB2l+LUHD2JRAf9b6dx SNPvYvU1 X9UZEfg+mm9O97F/35Y6WyBZeeE1voIWhRISHItSl52treX4RqdmFV0ZpBCGV3ThEqRfIuGAR/nkDQ3pBJxFClV7/4jnd+tAWtuZKNvxdJ3ma/HnZbQbQO0EezNLS73f3+aRFMpvx7QoZ4wkJgtAbi876hWiibualm6fJTUbABCn7stUuYyQlCiwemDUuAWZcCI+itS4513Z9uHnXXmPrhcIswYPbuzHxtUQ0UP4RYbM56ST/3Swxk338MZ/LBcukcQeK4sdhhPzXOUFXCveNGXqM946QgQd7oFVfwrYc7MsoLbW6VxTKyGPrLTmNtucG5sHlsCDTo8rCnLA2B92oJwso1xfz5APw8NdjOqaSDTBzISYTJQ6kAtrHAU5h3WtkN7RmApwTgPUz23uUrVrg06YGF8xXf538anfw0S/sFSW1kaOqswwIEXt50F36++z2fyeGbwvNSRjUYpDIip+EpG5zDcOxKjKCift+gOgw1ltoDLP0pWZKumK73C+oSoelJMZWAKDTDfDMMsapxwVENx91a7jloYIw1snab/Ellfqq2oHX1lq4dMOKxCYuPHQpHXktm4t7MqEJkTkOSplUGfNUOlCaAaW2s834 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000007, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Ackerley Tng Signed-off-by: Ackerley Tng Signed-off-by: Ryan Afranji Signed-off-by: Sagi Shahar --- .../selftests/kvm/include/kvm_util_base.h | 24 ++++++++++++++ tools/testing/selftests/kvm/lib/kvm_util.c | 32 +++++++++++++++++++ .../selftests/kvm/lib/x86_64/processor.c | 15 +++++++-- 3 files changed, 69 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h index b353617fcdd1..efd7ae8abb20 100644 --- a/tools/testing/selftests/kvm/include/kvm_util_base.h +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h @@ -574,6 +574,8 @@ vm_vaddr_t vm_vaddr_alloc_page(struct kvm_vm *vm); void virt_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, unsigned int npages); +void virt_map_shared(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, + unsigned int npages); void *addr_gpa2hva(struct kvm_vm *vm, vm_paddr_t gpa); void *addr_gva2hva(struct kvm_vm *vm, vm_vaddr_t gva); vm_paddr_t addr_hva2gpa(struct kvm_vm *vm, void *hva); @@ -1034,6 +1036,28 @@ static inline void virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr virt_arch_pg_map(vm, vaddr, paddr); } +/* + * VM Virtual Page Map as Shared + * + * Input Args: + * vm - Virtual Machine + * vaddr - VM Virtual Address + * paddr - VM Physical Address + * memslot - Memory region slot for new virtual translation tables + * + * Output Args: None + * + * Return: None + * + * Within @vm, creates a virtual translation for the page starting + * at @vaddr to the page starting at @paddr. + */ +void virt_arch_pg_map_shared(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr); + +static inline void virt_pg_map_shared(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr) +{ + virt_arch_pg_map_shared(vm, vaddr, paddr); +} /* * Address Guest Virtual to Guest Physical diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index 4f1ae0f1eef0..28780fa1f0f2 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -1573,6 +1573,38 @@ void virt_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, } } +/* + * Map a range of VM virtual address to the VM's physical address as shared + * + * Input Args: + * vm - Virtual Machine + * vaddr - Virtuall address to map + * paddr - VM Physical Address + * npages - The number of pages to map + * + * Output Args: None + * + * Return: None + * + * Within the VM given by @vm, creates a virtual translation for + * @npages starting at @vaddr to the page range starting at @paddr. + */ +void virt_map_shared(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, + unsigned int npages) +{ + size_t page_size = vm->page_size; + size_t size = npages * page_size; + + TEST_ASSERT(vaddr + size > vaddr, "Vaddr overflow"); + TEST_ASSERT(paddr + size > paddr, "Paddr overflow"); + + while (npages--) { + virt_pg_map_shared(vm, vaddr, paddr); + vaddr += page_size; + paddr += page_size; + } +} + /* * Address VM Physical to Host Virtual * diff --git a/tools/testing/selftests/kvm/lib/x86_64/processor.c b/tools/testing/selftests/kvm/lib/x86_64/processor.c index 566d82829da4..aa2a57ddb8d3 100644 --- a/tools/testing/selftests/kvm/lib/x86_64/processor.c +++ b/tools/testing/selftests/kvm/lib/x86_64/processor.c @@ -190,7 +190,8 @@ static uint64_t *virt_create_upper_pte(struct kvm_vm *vm, return pte; } -void __virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, int level) +static void ___virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, + int level, bool protected) { const uint64_t pg_size = PG_LEVEL_SIZE(level); uint64_t *pml4e, *pdpe, *pde; @@ -235,17 +236,27 @@ void __virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, int level) "PTE already present for 4k page at vaddr: 0x%lx\n", vaddr); *pte = PTE_PRESENT_MASK | PTE_WRITABLE_MASK | (paddr & PHYSICAL_PAGE_MASK); - if (vm_is_gpa_protected(vm, paddr)) + if (protected) *pte |= vm->arch.c_bit; else *pte |= vm->arch.s_bit; } +void __virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, int level) +{ + ___virt_pg_map(vm, vaddr, paddr, level, vm_is_gpa_protected(vm, paddr)); +} + void virt_arch_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr) { __virt_pg_map(vm, vaddr, paddr, PG_LEVEL_4K); } +void virt_arch_pg_map_shared(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr) +{ + ___virt_pg_map(vm, vaddr, paddr, PG_LEVEL_4K, false); +} + void virt_map_level(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, uint64_t nr_bytes, int level) { -- 2.43.0.472.g3155946c3a-goog