From patchwork Tue Dec 12 20:46:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sagi Shahar X-Patchwork-Id: 13489866 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 0AE17C4332F for ; Tue, 12 Dec 2023 20:47:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4F9976B036F; Tue, 12 Dec 2023 15:47:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 482886B0372; Tue, 12 Dec 2023 15:47:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2AE086B0373; Tue, 12 Dec 2023 15:47:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 13D166B036F for ; Tue, 12 Dec 2023 15:47:13 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id E5BE480B21 for ; Tue, 12 Dec 2023 20:47:12 +0000 (UTC) X-FDA: 81559351104.05.F15CCC2 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) by imf30.hostedemail.com (Postfix) with ESMTP id E852980008 for ; Tue, 12 Dec 2023 20:47:10 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=ucFf5h2M; spf=pass (imf30.hostedemail.com: domain of 3zcZ4ZQUKCHAgOUWgUccUZS.QcaZWbil-aaYjOQY.cfU@flex--sagis.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3zcZ4ZQUKCHAgOUWgUccUZS.QcaZWbil-aaYjOQY.cfU@flex--sagis.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702414031; a=rsa-sha256; cv=none; b=XUxKRdxwfDgmWNROpPI+LuoEm8bNil5G/cNUhS798Dw9Nz101nb/tpXQ3S2OrTlieZTWDD VUoOzYwSvApJdpDVjPhfr/9jSY16d7V2yqm/ZfN1XAOz5gpdRMZabrGiaUX9Fn5wwHsOTl 4qyGRgV4PXKRZEQRAm7Opg42yJLVu8A= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=ucFf5h2M; spf=pass (imf30.hostedemail.com: domain of 3zcZ4ZQUKCHAgOUWgUccUZS.QcaZWbil-aaYjOQY.cfU@flex--sagis.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3zcZ4ZQUKCHAgOUWgUccUZS.QcaZWbil-aaYjOQY.cfU@flex--sagis.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702414031; 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=vZ+55M1H0qZo6X91hhLwa23PvdZhvqeKwQZ30mHQwEs=; b=wj0EbHpUeFravnICJHH4zdAl47aq9ctbbi6n7iEU9/niPnh2pN0Gxko3cRMAPDOxahqq9F ajydSmcCZjqhnjzhXeB5o9b5Kl4fuEQLerUSgNMLz5z9J8/RpKX/4aKbwAhl6epGPahmEY 1xbPjacPDHQQA50OvW2lIPUbO5ZrpmA= Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-1d341b6945dso4249605ad.0 for ; Tue, 12 Dec 2023 12:47:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1702414030; x=1703018830; 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=vZ+55M1H0qZo6X91hhLwa23PvdZhvqeKwQZ30mHQwEs=; b=ucFf5h2MxnjeQJGfMw/cyPdWIBwea985aeh8rcHIg7YZ2AsH/Bnq4KNriMtiSCaSdt t5f4z2qtMdfjr9khZMEK6kejkboaXgaznGFyvREty7ud7Q75bucTiMiRK41tUX00/RNz 3qkEJ2NYb6sXebxLhfwQ1SaAzHNK6NX8KgLLiH9PwEMjFJtNGJpZsnu5HN0qQPAExkTv KgOjvXhSMjzabo0zwJ/ITR3sVns70n3wtHfZqnaKqzDlAyed5isHlXQmFtGyYFEwdqgb f4fbicvw8yntW6R+Lbn+FtcWTubWAKe7GUL+ViymzlhWCG+EPikbiSmlEIy6DDjWLQfn cNHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702414030; x=1703018830; 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=vZ+55M1H0qZo6X91hhLwa23PvdZhvqeKwQZ30mHQwEs=; b=U+fIcfhF1NgJnoF35Swt3dGvDBZLvQWl/bg2ix7Eiohxz/5YQG5X0y7vCU298DSZSM 40e+4Zz18klJuVp+0VCqm2+suD7Wg/0WmmO6qhk7/5nmWQvsXEkzXEdofbClCZV3jzZl Ob3ME25WQ4GHFQMUjHYcTFDNdBD27uGfsDkXW13aiEWW7hcnVZdYJuhIIMxIkE5d78jK e9mYxDIvX/GPMCC2ej0wnEVg5Y5GgVGYORvq2R7gMl3Jws5dPGqc/iY++iLxrr2WgGSf bnusTGA3/rCzVmnrOwaog8pYK2xgXYVPGZClOebBE/NVBIt+iNQHiHD53GUCcpO1o5+h iMEg== X-Gm-Message-State: AOJu0Yz7dnosQNZuiMLnQI62nYJ+rFo92/OQAbg9Yma1f1GPhSCyzDM9 R4oe/3RN5NN7ps5ilYSzbYRHBj+Q+A== X-Google-Smtp-Source: AGHT+IGrrCQ4I7TQxCpkYqcamRceKsuPqXvFL+HKwNI2jpNCtkJmM866iSTSbXOwhW4q37bO7UDTRHUXAQ== X-Received: from sagi.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:241b]) (user=sagis job=sendgmr) by 2002:a17:902:e84a:b0:1d0:c738:73ad with SMTP id t10-20020a170902e84a00b001d0c73873admr49342plg.7.1702414029871; Tue, 12 Dec 2023 12:47:09 -0800 (PST) Date: Tue, 12 Dec 2023 12:46:22 -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-8-sagis@google.com> Subject: [RFC PATCH v5 07/29] KVM: selftests: TDX: Update load_td_memory_region for VM memory backed by guest memfd 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 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: E852980008 X-Stat-Signature: pz5cx9uhjzuz4ssmdikxpetgtuz6na7y X-Rspam-User: X-HE-Tag: 1702414030-622909 X-HE-Meta: U2FsdGVkX1+XG+vEaFf9Gjb8yRh6fOx+B++hgYzV4aRlDjXa/yj5F71f81bCKEcRbguXp4GHfGJ4+hQjquSwNksj8T3b3KLWVDiXHQ8z5CIZrlJ30I0uDU/AXR7zZDdP/tSjrPPnCYqOmX14raKwry4vhpLfsvgyYiFEJ6HjNwtq/2o9emlwTesMPzlLYIHqOdEpHzwNlD2DekmbPzJ27Wdm1zgJ5sMNWPRw7TMSXkAm1CSuITYStqgx/+UbzhVLfPuECRVX3MRg7DAZu+kL1Ogsf16kZMeCR8JEfdxjZAewxUxLRzQ4pR23J8WnXpsSQYTlpSBy7CR4r6vTqfEZND/eTgR7zri0VDR/FuxTjmQTnNzwhnd5fXxm7PsbQzBVwWpQLedN2ZMQc814j2YvaXT2amdiIyVT9jdWNR8tKBnoGRleo+veRtIHolEsR3xyHafHB/HH16bsw7zdBE0Z08rT5UY8MpVlylo9yUcTdl7Ob8ctMa/vYyH3y4yBHva76IzuR4wc2stnZwF/47+/9LvDMxoYmQQ7gYG6HurtWA1xSJ2fjMK8kdV/IRmOWNMepn+ouITDH+wxBOTCuSE90PbFSndjFIgpNjkAUgSi+MJvipq4B9N8peCMyqIR226XucrtadSyW7zp+tZMGt1S/BarpJ3fE9Rjbxf/9tSHjZhK0tOVpHb79RZUQu/WMP8xHhkiCV24oH/r+v/VHM1In7SYNO/0KAy4ZCgufOkHGFM4X/1UvtDZfwJfxBaHMnQK5QVg4tR0B/aCtvUfnkoqTQWLkR4zlZ0OjN9lyedoju0rW6CnP+wmTME2YnucjkbUVO1Nc3nha5XsuLE2B9rDN2qWqPf/75ommKc1ARx3RYOS8WblUvbRLxWQ5ijc8Lsn3aBn9EKvITrvgEPG19Xc1KSm5ClyTEiGWz/nPUNbtaU82olRk9vlKAQbGd3UVmy1LyjSnEqjn/PVUdzPBAs hIoKFRQF /V6Fu1Q5EUjCrs/gOPMUr04w5CnppVDx6q++p0mxqFtFaFYfjMNY/0jTnpWHaSMBPn9aWjsl5knX1Qcxrqys8a19osbRXY79mmZPP7pAzAiyh63zrvNASymBXI2TRg40nVKdZZiWDB1LhAAp4jkeL5txR2ZnQtdSdvvi5z8ZBqc2nSEgi+cJm7ut+ywkXT37VvyuEhTqBJhaQXyZgip7yBRAysnBcZs53f0KryFWXp+VVMVwimd+d4HVvgsGUiSNLOHzIrwg62NJJYs8d+NogW6HGOdhrCc2WV3eRHTdytp3YYkk961qXIVZHG3Kb2S1cKGXeTskbsKqPZDjEmOFVZcBsVacekCU6LxNNlknNsFy1AOus9TfXiAQaO7MAm1LsLgSEVA/F3i+x07v6w5EeOWUjjQQYvFXcgaqgQWBZVfF98+VT0/wAt5bcILXeItwuISq1jxfYpdQrHCyIb7EuUsuFnunUpKVp35mb2mawX7SVjd1MZLfKvN358++lMgWsJ0jqKnD5LdyOXKpk4Cgpx8i9GnUM9d4bOVikcynHuBhB05umq/CSRoMlXqbu11dlp49Sx65MLmIscEtwqjsW0Q+yJInjN+rChCTQQwZZmxEU5hsMAOcsdYSOg3d14FKMdmY/UTOmmDAPqWAm4YpiGMz+UuGHYpE03mw9zalrcz6heIZxkxUSFni0EA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000006, 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 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 Signed-off-by: Ryan Afranji Signed-off-by: Sagi Shahar --- .../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 6b995c3f6153..063ff486fb86 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 @@ -192,6 +192,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 */ @@ -376,30 +391,38 @@ static void load_td_memory_region(struct kvm_vm *vm, if (!sparsebit_any_set(pages)) return; + + if (region->region.guest_memfd != -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.guest_memfd == -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.guest_memfd == -1) + munmap(source_addr, size_to_load); } }