From patchwork Tue Jul 25 22:01:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Afranji X-Patchwork-Id: 125847 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp40563vqo; Tue, 25 Jul 2023 15:17:00 -0700 (PDT) X-Google-Smtp-Source: APBJJlHkJZ4+0SSTbE7mNjZSzzvMmME9zynAISmwuJQOwW9We/nPBMlSEtt84KKNuFY9Ao/H+hPe X-Received: by 2002:a17:906:116:b0:98d:cd3e:c18f with SMTP id 22-20020a170906011600b0098dcd3ec18fmr121985eje.72.1690323419964; Tue, 25 Jul 2023 15:16:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690323419; cv=none; d=google.com; s=arc-20160816; b=o0LQvcncebUYJUM2CvKIzDGzoOPjA/DX7URQpB13HDbkn3ep4QvEe6OK/8JakSugl7 N9nSrGb09bO85vDr4ckpi5YusnXsDDOQ1ikAcdF9VznuR/yxrfX31LmolAW4CvdfSwfb AfxYh2VIc15pnAa45GJpW0Foxy88aQ9MGRdAO0aENYFFCaqjKsNdi8XbfMf60IV1h0o/ 7ra3Rr8cq+5dM3tL1d1U/L+2zYVdMdAktgF/nRH8ac4M5RQym1y3T+eoaxmZ3zJDy0kq boHAcWTEpXoDTlfQF6ODh+S5lxTgaKYD8tQ7m+Xc67vf6OLY9o4XayfiHZxZCGz72f6/ Axqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:dkim-signature; bh=g4KcxLrzQkXOChykEZFXIv5nUY2y8T7+ZlIOw1AWFkc=; fh=1/sgOwi5AuU8IZymeFKs1Rjnf4QELnrK+C7GntqU2hA=; b=V8Y/it6tCPfbEw4huPGUfmzRXwG9IyKAsWtUTHyATTl1VjroXv42nFq1z8N5ogb74g oAjaffwk9B2fYZqM2ZcFYWAJGRI0+v0EYFmPVPf+ILgRT1GF0RoFbc029ep60ueVmbar 30yVVvnzl9cwi1Cf2Dm4UBwoPwnM2JqLWV8+Edq7JPJZ1fQQyLYSLH7cqtmLVM5dmifr +o6iu5G2k2wilqYXzUKQhJ0Erj0f6EJOenGjgOFDqv4v4NM/ZbVtRcd8rQ/yTSWlIpWJ Q0hwXqaI8cdYE8Lx7murJtymqU25XeTcAP0tqdC5wjrzgDxyzvm/5wAqJ+pCdtuGvszj uPSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=fkrYsLWy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j22-20020a170906831600b009829077b479si8509880ejx.860.2023.07.25.15.16.35; Tue, 25 Jul 2023 15:16:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=fkrYsLWy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231704AbjGYWDV (ORCPT + 99 others); Tue, 25 Jul 2023 18:03:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47568 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231847AbjGYWCt (ORCPT ); Tue, 25 Jul 2023 18:02:49 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 54F60273E for ; Tue, 25 Jul 2023 15:02:21 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-56cf9a86277so77993547b3.3 for ; Tue, 25 Jul 2023 15:02:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1690322520; x=1690927320; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=g4KcxLrzQkXOChykEZFXIv5nUY2y8T7+ZlIOw1AWFkc=; b=fkrYsLWyogUVFgS4vePJWwymNPenlzaFl9gf8Jak3i3FMyFQEfdiYt85RuLv7nnYWq 4RNZ8BVD4lIIBvw8v1OiGn8I6qHrsP4bghvqX0r8CTRYxPxc57oeDSeDrRFtZWqZVT7U fLgnE+HTKSsYGyOUcElr+LrKwCgPCE0YspD22KaNwn3TmWJRa2JF4dhyXdFIAgFH5JxV U7be3pIOdvuFA/eWH7c1uy+2IARQb2dU+Sbhj37Fn487aAWBoPCsmWsrbsHUMk+dt8Yw ziELdfhK5qQrLT47kvGQjjWnRq9MRHlHOfE5sS5dRSgGXYiuYpDZ31KyBQIvRdKLkKvu 4g0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690322520; x=1690927320; 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=g4KcxLrzQkXOChykEZFXIv5nUY2y8T7+ZlIOw1AWFkc=; b=GIV3w9HZb8Ocf6yaiT7S+OqpSKEsFX4idL7U+uBrrr0xLYZD79draUdoczKPVI4aQ4 u1SgD/M4rKqF6mmCEAos46rfYGy6RslmvdpnWQ3Av0UkZnBDDJg4K3w8vh/rgZFYr37G BOL7HLTIaSXUOw1/xr16wzf7oJvEyowEVaDb6UHVbfE44eEpKnocblggAu/kkIV+gPy3 U9lPJpCr31Gaiea2ngDiJxvEg9lViO7I0s5AU71IboyaNw8HA6znaPZtRMBS5x/csWdH /8hCKbPoQ+mQwEadMcpSFhj8VoFBSr7nkbUnYZYq0UD0DI/cmwtllPWAL22xXpi2Tddg Tzzw== X-Gm-Message-State: ABy/qLZJVPHsmkwGCKUjU1ZikIA8yHB71R8l9rNnfVFD3LWg+trIH1UV 91c+J9J08YAo3A/37Yp4G8MmTIsKGYvL X-Received: from afranji.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:47f1]) (user=afranji job=sendgmr) by 2002:a81:b614:0:b0:579:fc33:b3a2 with SMTP id u20-20020a81b614000000b00579fc33b3a2mr4504ywh.10.1690322519981; Tue, 25 Jul 2023 15:01:59 -0700 (PDT) Date: Tue, 25 Jul 2023 22:01:00 +0000 In-Reply-To: <20230725220132.2310657-1-afranji@google.com> Mime-Version: 1.0 References: <20230725220132.2310657-1-afranji@google.com> X-Mailer: git-send-email 2.41.0.487.g6d72f3e995-goog Message-ID: <20230725220132.2310657-8-afranji@google.com> Subject: [PATCH v4 07/28] KVM: selftests: TDX: Update load_td_memory_region for VM memory backed by guest memfd From: Ryan Afranji To: linux-kselftest@vger.kernel.org Cc: pbonzini@redhat.com, seanjc@google.com, isaku.yamahata@intel.com, sagis@google.com, erdemaktas@google.com, afranji@google.com, runanwang@google.com, shuah@kernel.org, drjones@redhat.com, maz@kernel.org, bgardon@google.com, jmattson@google.com, dmatlack@google.com, peterx@redhat.com, oupton@google.com, ricarkol@google.com, yang.zhong@intel.com, wei.w.wang@intel.com, xiaoyao.li@intel.com, pgonda@google.com, eesposit@redhat.com, borntraeger@de.ibm.com, eric.auger@redhat.com, wangyanan55@huawei.com, aaronlewis@google.com, vkuznets@redhat.com, pshier@google.com, axelrasmussen@google.com, zhenzhong.duan@intel.com, maciej.szmigiero@oracle.com, like.xu@linux.intel.com, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, ackerleytng@google.com X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772432570578874939 X-GMAIL-MSGID: 1772432570578874939 From: Ackerley Tng If guest memory is backed by restricted memfd + UPM is being used, hence encrypted memory region has to be registered + Can avoid making a copy of guest memory before getting TDX to initialize the memory region Signed-off-by: Ackerley Tng Change-Id: I43a5a444d5d2b5bf0d6750f6ef82c16e3d7d755e Signed-off-by: Ryan Afranji --- .../selftests/kvm/lib/x86_64/tdx/tdx_util.c | 41 +++++++++++++++---- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/kvm/lib/x86_64/tdx/tdx_util.c b/tools/testing/selftests/kvm/lib/x86_64/tdx/tdx_util.c index 95c6fb263583..c30801f4f759 100644 --- a/tools/testing/selftests/kvm/lib/x86_64/tdx/tdx_util.c +++ b/tools/testing/selftests/kvm/lib/x86_64/tdx/tdx_util.c @@ -199,6 +199,21 @@ static void tdx_td_finalizemr(struct kvm_vm *vm) tdx_ioctl(vm->fd, KVM_TDX_FINALIZE_VM, 0, NULL); } +/* + * Other ioctls + */ + +/** + * Register a memory region that may contain encrypted data in KVM. + */ +static void register_encrypted_memory_region( + struct kvm_vm *vm, struct userspace_mem_region *region) +{ + vm_set_memory_attributes(vm, region->region.guest_phys_addr, + region->region.memory_size, + KVM_MEMORY_ATTRIBUTE_PRIVATE); +} + /* * TD creation/setup/finalization */ @@ -383,30 +398,38 @@ static void load_td_memory_region(struct kvm_vm *vm, if (!sparsebit_any_set(pages)) return; + + if (region->region.gmem_fd != -1) + register_encrypted_memory_region(vm, region); + sparsebit_for_each_set_range(pages, i, j) { const uint64_t size_to_load = (j - i + 1) * vm->page_size; const uint64_t offset = (i - lowest_page_in_region) * vm->page_size; const uint64_t hva = hva_base + offset; const uint64_t gpa = gpa_base + offset; - void *source_addr; + void *source_addr = (void *)hva; /* * KVM_TDX_INIT_MEM_REGION ioctl cannot encrypt memory in place, * hence we have to make a copy if there's only one backing * memory source */ - source_addr = mmap(NULL, size_to_load, PROT_READ | PROT_WRITE, - MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); - TEST_ASSERT( - source_addr, - "Could not allocate memory for loading memory region"); - - memcpy(source_addr, (void *)hva, size_to_load); + if (region->region.gmem_fd == -1) { + source_addr = mmap(NULL, size_to_load, PROT_READ | PROT_WRITE, + MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); + TEST_ASSERT( + source_addr, + "Could not allocate memory for loading memory region"); + + memcpy(source_addr, (void *)hva, size_to_load); + memset((void *)hva, 0, size_to_load); + } tdx_init_mem_region(vm, source_addr, gpa, size_to_load); - munmap(source_addr, size_to_load); + if (region->region.gmem_fd == -1) + munmap(source_addr, size_to_load); } }