From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 61C1715921B for ; Tue, 18 Jun 2024 11:47:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718711277; cv=none; b=jE/tO3keDmVdXC+vgBex/5GvBOxGxGOMX24RPGMcibzwRdCzdpGr1bbNKhaofEnnuZlcFc+4fddEXAPq8WMM6+7KQ47dNRKXvv3F1drhHbhM3m3XVQ82qQe53pGOPc4pwYcgJ03sKAqvuHUeFThIxD4A7RZd9NLWnw3m6Ee0MF8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718711277; c=relaxed/simple; bh=8KyRiP9WiflJYBT6I7DVWkR9yfJ2369HxCuvXgk0HaE=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=WItOKVRuAWfqaA+FuQnnCC32e2j6R8s4IWZJ1Pm7nTda9Slz4V4kr61cXtMoNl8a1XNY4fHZzumxj7vLjMKPPny5XoxaBwxSdEP3sVqsv8YvITG/I0jKpJdiJqUt/NwadQMcS6oIGGT55tMFZOSepTqrAFRnJf4WUO7c9y+aiyI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=XySjWfI0; arc=none smtp.client-ip=209.85.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="XySjWfI0" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-42108856c33so39192305e9.1 for ; Tue, 18 Jun 2024 04:47:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1718711274; x=1719316074; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:content-language:from :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=Jj10dJJU5AiMUvm3apxRXa89eKvzjsWdJm9QNQLwuKI=; b=XySjWfI0JFAe908m9JxgTa9lgi6dUd7GWYV7QS1T0shmFPmZ0n6R8ZXAGMpjMn+lJi hqvkf6WCsG+KCzM6heAQkdCb1edaW2udFcQIxKks3sjXvIErLTTzh32Stl6AxQ0rw3bq HJ9lY/khnxGlUzWQ52ScWnay/jAPgAGXS2Qi956D07RJXXe2HOkrq24iMYZ82vtVWK3C SlzWrg8eLYuKrd5o/d8sIZX9cYbqxO2+2WTiOjiJmDXCJICeouIZrQ8G/io9DLdZh7bH o8XoPpqjTxiayXGT9trKNELfxhvDYzbl/SyDhNqBhZmzxG4f4x3+fuHLaN8Hfbt4t2BQ rjMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718711274; x=1719316074; h=content-transfer-encoding:in-reply-to:content-language:from :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Jj10dJJU5AiMUvm3apxRXa89eKvzjsWdJm9QNQLwuKI=; b=toH7j0AR7kyYaQIzft0kL0rxi8/215vIBMDFWiHMrwhpBuoQpw3Cp0MTBzwZcq03oD uDx1nbF6sbLCh/b1sG1WNBx0fIHhNjsFElVysdzGOqXg/DwZeswAaF+hMpAekZUlLsxB 1IvjAAtO9tL1xQEj3HU5Zg510i/bWlDjOrG4A9vH97x6gYfw9ZskARsQUqYFHSteGCRu uQ6j7ARfdYWCKYfrxg1pAgGXfNO51YKz/FtH0RVnD/4JAN8Vwuc5Vd8v2t6xmW9YVxP1 JI0Vbb3eUh27NaE3iRhLHMVeD0G23HkPLPqPmIeyoWwanMZpxGQs956kXbzCPgHk1/Sn l1yw== X-Forwarded-Encrypted: i=1; AJvYcCXXYiE2f8rGCI87JtVFmHBO8bOmuR2F8gdPdLn40UfTUqom9JU/6X3cPSKDaqmpy0LOX6/K7IQS34jpQxvDLZCXq8rEBnIVHf66jgM8 X-Gm-Message-State: AOJu0YxQSTu0i13sql0esHTghv2KnWLLC02Ibv6CimUbfbE1rlvq1txb aNSqsgeN1fAx+OdTK3P2sXuDb7M7wi1K72xCbwdVGFx95j+F3Jf+E0pxuPJ9OjA= X-Google-Smtp-Source: AGHT+IEvhOi7L2z1SD6V9koNWqnqqSQTRIPdrtKihELObJMqBmi0jvkkLHYN9A/aGRpCNMMLv871Cw== X-Received: by 2002:adf:f30b:0:b0:360:9500:9bbb with SMTP id ffacd0b85a97d-3609ea67f75mr2215637f8f.12.1718711273674; Tue, 18 Jun 2024 04:47:53 -0700 (PDT) Received: from ?IPV6:2a10:bac0:b000:7579:7285:c2ff:fedd:7e3a? ([2a10:bac0:b000:7579:7285:c2ff:fedd:7e3a]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-361a85074a2sm1388769f8f.25.2024.06.18.04.47.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 18 Jun 2024 04:47:53 -0700 (PDT) Message-ID: Date: Tue, 18 Jun 2024 14:47:51 +0300 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 5/9] x86/virt/tdx: Move field mapping table of getting TDMR info to function local To: Kai Huang , linux-kernel@vger.kernel.org Cc: x86@kernel.org, dave.hansen@intel.com, dan.j.williams@intel.com, kirill.shutemov@linux.intel.com, rick.p.edgecombe@intel.com, peterz@infradead.org, tglx@linutronix.de, bp@alien8.de, mingo@redhat.com, hpa@zytor.com, seanjc@google.com, pbonzini@redhat.com, kvm@vger.kernel.org, isaku.yamahata@intel.com, binbin.wu@linux.intel.com References: From: Nikolay Borisov Content-Language: en-US In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 16.06.24 г. 15:01 ч., Kai Huang wrote: > For now the kernel only reads "TD Memory Region" (TDMR) related global > metadata fields to a 'struct tdx_tdmr_sysinfo' for initializing the TDX > module. The kernel populates the relevant metadata fields into the > structure using a "field mapping table" of metadata field IDs and the > structure members. > > Currently the scope of this "field mapping table" is the entire C file. > Future changes will need to read more global metadata fields that will > be organized in other structures and use this kind of field mapping > tables for other structures too. > > Move the field mapping table to the function local to limit its scope so > that the same name can also be used by other functions. nit: I think all of this could be condensed simply to : "The mapping table is only used by foo() so move it there, no functional changes". The consideration for future usage seems somewhat moot with respect to such a trivial change. In any case: Reviewed-by: Nikolay Borisov > > Signed-off-by: Kai Huang > --- > arch/x86/virt/vmx/tdx/tdx.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/arch/x86/virt/vmx/tdx/tdx.c b/arch/x86/virt/vmx/tdx/tdx.c > index c68fbaf4aa15..fad42014ca37 100644 > --- a/arch/x86/virt/vmx/tdx/tdx.c > +++ b/arch/x86/virt/vmx/tdx/tdx.c > @@ -322,17 +322,17 @@ static int stbuf_read_sysmd_multi(const struct field_mapping *fields, > #define TD_SYSINFO_MAP_TDMR_INFO(_field_id, _member) \ > TD_SYSINFO_MAP(_field_id, struct tdx_tdmr_sysinfo, _member) > > -/* Map TD_SYSINFO fields into 'struct tdx_tdmr_sysinfo': */ > -static const struct field_mapping fields[] = { > - TD_SYSINFO_MAP_TDMR_INFO(MAX_TDMRS, max_tdmrs), > - TD_SYSINFO_MAP_TDMR_INFO(MAX_RESERVED_PER_TDMR, max_reserved_per_tdmr), > - TD_SYSINFO_MAP_TDMR_INFO(PAMT_4K_ENTRY_SIZE, pamt_entry_size[TDX_PS_4K]), > - TD_SYSINFO_MAP_TDMR_INFO(PAMT_2M_ENTRY_SIZE, pamt_entry_size[TDX_PS_2M]), > - TD_SYSINFO_MAP_TDMR_INFO(PAMT_1G_ENTRY_SIZE, pamt_entry_size[TDX_PS_1G]), > -}; > - > static int get_tdx_tdmr_sysinfo(struct tdx_tdmr_sysinfo *tdmr_sysinfo) > { > + /* Map TD_SYSINFO fields into 'struct tdx_tdmr_sysinfo': */ > + static const struct field_mapping fields[] = { > + TD_SYSINFO_MAP_TDMR_INFO(MAX_TDMRS, max_tdmrs), > + TD_SYSINFO_MAP_TDMR_INFO(MAX_RESERVED_PER_TDMR, max_reserved_per_tdmr), > + TD_SYSINFO_MAP_TDMR_INFO(PAMT_4K_ENTRY_SIZE, pamt_entry_size[TDX_PS_4K]), > + TD_SYSINFO_MAP_TDMR_INFO(PAMT_2M_ENTRY_SIZE, pamt_entry_size[TDX_PS_2M]), > + TD_SYSINFO_MAP_TDMR_INFO(PAMT_1G_ENTRY_SIZE, pamt_entry_size[TDX_PS_1G]), > + }; > + > /* Populate 'tdmr_sysinfo' fields using the mapping structure above: */ > return stbuf_read_sysmd_multi(fields, ARRAY_SIZE(fields), tdmr_sysinfo); > }