From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) (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 0B80C36C0B2 for ; Fri, 23 Jan 2026 15:00:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.17 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769180441; cv=none; b=l/GupCmWuTX0yl2SaJdI6Knva2UPziftaaBhpLM4Pw/fixO5Bl5o6xety0hefGCyUUP3FIQXw1vrY8X7X1FV3V7hqZ6Zn8GdVSiw1Y/dOI5YRpNARhhDdTN0aG4AN+rdkzl6//l++I09UmdFSpIJoDDO6NUyENdrhsPFB244NdY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769180441; c=relaxed/simple; bh=vvzbZrmWpmV4juJ40Ifm3lvVv14EgpU1dMvILRTmZHk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N1DeapHdrlazFfOKRE9T3KCrNNXKJV7g7VszKyphiPVlM12PvvtR7akBPXYujB3VuH3pSudKF+os5syz+Gc92qMjlwVfAhPjYxOZIR/W1pLhDZ/rN+tEQlv35nTJjttV1NxACUtijSNf7Q2fcx5OiBIMv8Po9t+qFkfPiVR1ZfU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=JhItdOqe; arc=none smtp.client-ip=192.198.163.17 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="JhItdOqe" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1769180439; x=1800716439; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vvzbZrmWpmV4juJ40Ifm3lvVv14EgpU1dMvILRTmZHk=; b=JhItdOqem5Q2CUwRkSzrRZe2kevhHUxmPA87mdo+PYdXQLrraUa/0bMA NtGxrFDIcJ/fH9VAiWKZkBwkdUwbJ+WFqnY6G99r+V8hKoYIv0pmRZzcq km7JxMwOR65X5bi3qtpI7cEYNsPhdW89L1Q3iUqwSqZacWeRBc5GPI8Fm 81mjXaYaChae9bHx6XRqE/OJlJCNQTxJrm0B0DGIENGkG0GSg+Lw81hos YIIkC2BRLuDcp0Lc1EZwGIHUXMoKXRGRlX4s2Fv8fT5GfD0AcHLDsSaYz Bod2Xmn9i1BYTxgDw4XbqTEfbWBCVwHB5BaFQzynuDxa8a0TnfjQ+Hy+3 A==; X-CSE-ConnectionGUID: UpiwL9yMTq2tnkaaYxZcYA== X-CSE-MsgGUID: VbxQ1YoFQTaXCN7p4tYVlA== X-IronPort-AV: E=McAfee;i="6800,10657,11680"; a="70334533" X-IronPort-AV: E=Sophos;i="6.21,248,1763452800"; d="scan'208";a="70334533" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jan 2026 07:00:21 -0800 X-CSE-ConnectionGUID: +sdwN0EGS4GqpGe5TPcqoA== X-CSE-MsgGUID: xnPA9BEAT1OlpSc2sHrXWg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,248,1763452800"; d="scan'208";a="237697219" Received: from 984fee019967.jf.intel.com ([10.23.153.244]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jan 2026 07:00:21 -0800 From: Chao Gao To: linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, x86@kernel.org Cc: reinette.chatre@intel.com, ira.weiny@intel.com, kai.huang@intel.com, dan.j.williams@intel.com, yilun.xu@linux.intel.com, sagis@google.com, vannapurve@google.com, paulmck@kernel.org, nik.borisov@suse.com, zhenzhong.duan@intel.com, seanjc@google.com, rick.p.edgecombe@intel.com, kas@kernel.org, dave.hansen@linux.intel.com, vishal.l.verma@intel.com, Chao Gao , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" Subject: [PATCH v3 24/26] x86/virt/seamldr: Extend sigstruct to 16KB Date: Fri, 23 Jan 2026 06:55:32 -0800 Message-ID: <20260123145645.90444-25-chao.gao@intel.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260123145645.90444-1-chao.gao@intel.com> References: <20260123145645.90444-1-chao.gao@intel.com> Precedence: bulk X-Mailing-List: linux-coco@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Currently, each TDX Module has a 4KB sigstruct that is passed to the P-SEAMLDR during module updates to authenticate the TDX Module binary. Future TDX Module versions will pack additional information into the sigstruct, which will exceed the current 4KB size limit. To accommodate this, the sigstruct is being extended to support up to 16KB. Update seamldr_params and tdx-blob structures to handle the larger sigstruct size. Signed-off-by: Chao Gao --- arch/x86/virt/vmx/tdx/seamldr.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/arch/x86/virt/vmx/tdx/seamldr.c b/arch/x86/virt/vmx/tdx/seamldr.c index d2d85114d6c4..9e77b24f659c 100644 --- a/arch/x86/virt/vmx/tdx/seamldr.c +++ b/arch/x86/virt/vmx/tdx/seamldr.c @@ -29,6 +29,8 @@ /* P-SEAMLDR can accept up to 496 4KB pages for TDX module binary */ #define SEAMLDR_MAX_NR_MODULE_4KB_PAGES 496 +#define SEAMLDR_MAX_NR_SIG_4KB_PAGES 4 + /* scenario field in struct seamldr_params */ #define SEAMLDR_SCENARIO_UPDATE 1 @@ -40,8 +42,8 @@ struct seamldr_params { u32 version; u32 scenario; - u64 sigstruct_pa; - u8 reserved[104]; + u64 sigstruct_pa[SEAMLDR_MAX_NR_SIG_4KB_PAGES]; + u8 reserved[80]; u64 num_module_pages; u64 mod_pages_pa_list[SEAMLDR_MAX_NR_MODULE_4KB_PAGES]; } __packed; @@ -121,7 +123,10 @@ static struct seamldr_params *alloc_seamldr_params(const void *module, unsigned if (module_size > SEAMLDR_MAX_NR_MODULE_4KB_PAGES * SZ_4K) return ERR_PTR(-EINVAL); - if (!IS_ALIGNED(module_size, SZ_4K) || sig_size != SZ_4K || + if (sig_size > SEAMLDR_MAX_NR_SIG_4KB_PAGES * SZ_4K) + return ERR_PTR(-EINVAL); + + if (!IS_ALIGNED(module_size, SZ_4K) || !IS_ALIGNED(sig_size, SZ_4K) || !IS_ALIGNED((unsigned long)module, SZ_4K) || !IS_ALIGNED((unsigned long)sig, SZ_4K)) return ERR_PTR(-EINVAL); @@ -132,12 +137,17 @@ static struct seamldr_params *alloc_seamldr_params(const void *module, unsigned params->scenario = SEAMLDR_SCENARIO_UPDATE; - /* - * Don't assume @sig is page-aligned although it is 4KB-aligned. - * Always add the in-page offset to get the physical address. - */ - params->sigstruct_pa = (vmalloc_to_pfn(sig) << PAGE_SHIFT) + - ((unsigned long)sig & ~PAGE_MASK); + ptr = sig; + for (i = 0; i < sig_size / SZ_4K; i++) { + /* + * Don't assume @sig is page-aligned although it is 4KB-aligned. + * Always add the in-page offset to get the physical address. + */ + params->sigstruct_pa[i] = (vmalloc_to_pfn(ptr) << PAGE_SHIFT) + + ((unsigned long)ptr & ~PAGE_MASK); + ptr += SZ_4K; + } + params->num_module_pages = module_size / SZ_4K; ptr = module; -- 2.47.3