From nobody Wed Nov 27 08:27:19 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1700033232; cv=none; d=zohomail.com; s=zohoarc; b=b+TwuMa+AX0RarKeLsklIhk8op2ny/Mngd0GGdiaU/wS4KTE/Z0SUkuecGb3W/z1inT1Jt63BwoNKLaDYQol5hru/v0MH6d+6cRuT3KjNZRJNzZ3+qtr8siv89YoTcGERyfmPY/vJTxowBkX5+ANAnPXlg/+incXkGgWmrFiwjM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700033232; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=u++3IQOhUKJHcahYKIs1IO4YdmqefTZl4YteYF+aSGo=; b=cx0v2V20gV4XNYkBGnVrj1GOhIN1HAx2VhK4jUjzqpJOovM7QlIrnmh+/ml26roexxN9H28a8R0pU0xs7ZRVfFLAoiAIBMMbgEm7pIuo+LFp9fWCRbq2KUW5VyPjk5oTg+5Qq3AGfC7miAT4Bv6Rlfh7muffTcLSUnZ3gjUGT+E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1700033232663142.25342466100687; Tue, 14 Nov 2023 23:27:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3AEs-00088y-2s; Wed, 15 Nov 2023 02:23:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r3AEX-0007gK-ED for qemu-devel@nongnu.org; Wed, 15 Nov 2023 02:22:51 -0500 Received: from mgamail.intel.com ([192.55.52.115]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r3AET-0005LS-Pp for qemu-devel@nongnu.org; Wed, 15 Nov 2023 02:22:43 -0500 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2023 23:22:39 -0800 Received: from lxy-clx-4s.sh.intel.com ([10.239.48.52]) by orsmga003.jf.intel.com with ESMTP; 14 Nov 2023 23:22:34 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700032961; x=1731568961; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XQvEk1+ah0pgpmFOmh/FSPSPEu7bLWQNERBsI+mWVMA=; b=HnQKdeXnIlU/zMZagndDEHhoI32tTxg9vDy4maW6B/GYDhnBYv4WnTRH vkspmJfkknROceOngEYWO8u/K+GnkJLjIimYVxx8rp22b6Sp6xtuA+9qz wppfRph78k/9lSWrGR/Nz4aq94qowDZGMsm/f2Oc2iLIGANI68GBCAzUW Zu4/7OmTrQ6ZphB3TZaQKtvj06eECUitYZTmeL/QQDQeX8cKeQoZp+bsa /0RUAagl35nai0EG02kPx8MHl39Plgqlg+UdNwYgjSmoCStsQAYzdHbN6 KTjWMWur2QJYVFE9jy5j+rA22gGKCNt5SicPXW9R3/bAmcKceixzMmI9Z g==; X-IronPort-AV: E=McAfee;i="6600,9927,10894"; a="390623468" X-IronPort-AV: E=Sophos;i="6.03,304,1694761200"; d="scan'208";a="390623468" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10894"; a="714800283" X-IronPort-AV: E=Sophos;i="6.03,304,1694761200"; d="scan'208";a="714800283" From: Xiaoyao Li To: Paolo Bonzini , David Hildenbrand , Igor Mammedov , "Michael S . Tsirkin" , Marcel Apfelbaum , Richard Henderson , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cornelia Huck , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Eric Blake , Markus Armbruster , Marcelo Tosatti Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, xiaoyao.li@intel.com, Michael Roth , Sean Christopherson , Claudio Fontana , Gerd Hoffmann , Isaku Yamahata , Chenyi Qiang Subject: [PATCH v3 54/70] i386/tdx: handle TDG.VP.VMCALL hypercall Date: Wed, 15 Nov 2023 02:15:03 -0500 Message-Id: <20231115071519.2864957-55-xiaoyao.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231115071519.2864957-1-xiaoyao.li@intel.com> References: <20231115071519.2864957-1-xiaoyao.li@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.115; envelope-from=xiaoyao.li@intel.com; helo=mgamail.intel.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HK_RANDOM_ENVFROM=0.999, HK_RANDOM_FROM=0.999, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1700033233472100004 Content-Type: text/plain; charset="utf-8" From: Isaku Yamahata MapGPA is a hypercall to convert GPA from/to private GPA to/from shared GPA. As the conversion function is already implemented as kvm_convert_memory, wire it to TDX hypercall exit. Signed-off-by: Isaku Yamahata Signed-off-by: Xiaoyao Li --- accel/kvm/kvm-all.c | 2 +- include/sysemu/kvm.h | 2 ++ target/i386/kvm/tdx.c | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 89e7183a2738..65bc92265369 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -2929,7 +2929,7 @@ static void kvm_eat_signals(CPUState *cpu) } while (sigismember(&chkset, SIG_IPI)); } =20 -static int kvm_convert_memory(hwaddr start, hwaddr size, bool to_private) +int kvm_convert_memory(hwaddr start, hwaddr size, bool to_private) { MemoryRegionSection section; ram_addr_t offset; diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 2f6592859ac6..e0061848b053 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -544,4 +544,6 @@ int kvm_create_guest_memfd(uint64_t size, uint64_t flag= s, Error **errp); =20 int kvm_set_memory_attributes_private(hwaddr start, hwaddr size); int kvm_set_memory_attributes_shared(hwaddr start, hwaddr size); + +int kvm_convert_memory(hwaddr start, hwaddr size, bool to_private); #endif diff --git a/target/i386/kvm/tdx.c b/target/i386/kvm/tdx.c index 3b87c36c485e..b17258f17fd0 100644 --- a/target/i386/kvm/tdx.c +++ b/target/i386/kvm/tdx.c @@ -1001,6 +1001,7 @@ static void tdx_guest_class_init(ObjectClass *oc, voi= d *data) { } =20 +#define TDG_VP_VMCALL_MAP_GPA 0x10001ULL #define TDG_VP_VMCALL_GET_QUOTE 0x10002ULL #define TDG_VP_VMCALL_SETUP_EVENT_NOTIFY_INTERRUPT 0x10004ULL =20 @@ -1060,6 +1061,39 @@ static hwaddr tdx_shared_bit(X86CPU *cpu) return (cpu->phys_bits > 48) ? BIT_ULL(51) : BIT_ULL(47); } =20 +static void tdx_handle_map_gpa(X86CPU *cpu, struct kvm_tdx_vmcall *vmcall) +{ + hwaddr shared_bit =3D tdx_shared_bit(cpu); + hwaddr gpa =3D vmcall->in_r12 & ~shared_bit; + bool private =3D !(vmcall->in_r12 & shared_bit); + hwaddr size =3D vmcall->in_r13; + int ret =3D 0; + + vmcall->status_code =3D TDG_VP_VMCALL_INVALID_OPERAND; + + if (!QEMU_IS_ALIGNED(gpa, 4096) || !QEMU_IS_ALIGNED(size, 4096)) { + vmcall->status_code =3D TDG_VP_VMCALL_ALIGN_ERROR; + return; + } + + /* Overflow case. */ + if (gpa + size < gpa) { + return; + } + if (gpa >=3D (1ULL << cpu->phys_bits) || + gpa + size >=3D (1ULL << cpu->phys_bits)) { + return; + } + + if (size > 0) { + ret =3D kvm_convert_memory(gpa, size, private); + } + + if (!ret) { + vmcall->status_code =3D TDG_VP_VMCALL_SUCCESS; + } +} + struct tdx_get_quote_task { uint32_t apic_id; hwaddr gpa; @@ -1455,6 +1489,9 @@ static void tdx_handle_vmcall(X86CPU *cpu, struct kvm= _tdx_vmcall *vmcall) } =20 switch (vmcall->subfunction) { + case TDG_VP_VMCALL_MAP_GPA: + tdx_handle_map_gpa(cpu, vmcall); + break; case TDG_VP_VMCALL_GET_QUOTE: tdx_handle_get_quote(cpu, vmcall); break; --=20 2.34.1