From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 B09081586F5 for ; Tue, 18 Jun 2024 11:42:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718710946; cv=none; b=EOhYTkmqSlrq2PKy5/kQSWbrCekyHKoBioGs+VpwXGSvvgQJ13nrb3GWPPlCBpNt7KveJXxsmj5Q3HuIgwAbjxQfA0fGKYs5OltfvBkdOIwdaKN79lIZoJcjWsZgCV+Vz9DSZV+C1FcT/YofO+C313Myri+PbLCU7EbedMYuDgc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718710946; c=relaxed/simple; bh=Pv9YG5VmtMAr1ULh/ECdcRJmYzVUxCUyifaRaj0QWRw=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=I6/cBLCgWC0sajoq1wNE+/ZxdqZdYyOjSIPjqgMX+RZkvRSuGpm5TrpFt5aPHkB/3Z7+B5WFdQKS5YbtjEALnxycGm60HOKR2XGc2iz6lmQriJ66rmcUfmdqi0yceF3j1t8ZfRLB3BITYv+jF4kphMiw+6aTg02/HOXDaqTW5sI= 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=Vx/Ymzmc; arc=none smtp.client-ip=209.85.128.51 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="Vx/Ymzmc" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-421bb51d81aso40373365e9.3 for ; Tue, 18 Jun 2024 04:42:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1718710941; x=1719315741; 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=f7UmkjiJBk958rN0+3CFAHXb73T4tiq+66V/cS7zu0M=; b=Vx/Ymzmcf7iz53Bu2Zmd1c14yJxA/bpGABPuE4h8AtVXYg+ffJkRnrtSmPpIGar3lT TTNQlEDjDm9bGFYyJpRUlakhinCuMVbPIyU27xzq+D7Q3DQItqWlf0OMt06EJBF97WSZ hPdM2mKw4zyw2RwLJnrNfZt0cB/xP+bn29xfo5Nsee4Dx0uhprZ7GVTGlge4lJyXVMnl bN8TpDyVK7xmEwFsy0G6NMwTvtkOsVonzDXuapkHX1fSCuj5Wn+zv6pn2a8zKz7UBoHD FF58tuvgXw6c4uO20JGEycVO3ja4wfhKVyteS8oN+G9ZsOGcmf4moKEyU41wsv3rNunU WLzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718710941; x=1719315741; 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=f7UmkjiJBk958rN0+3CFAHXb73T4tiq+66V/cS7zu0M=; b=Q9dEWquKuzZzzR74IfSunCppnj2ejFBGSfYYmCCfiwHPPHaq7dXau9bu3pLfxNeoUI u5L+0tbgiGWvVzVYhdHYWSeEBNucLAmQVJ64jPUHEPQdmSy6zk1jf1Be4xGjF5NltFSp xcg5iS77jED4YkDEDIqDkct+CzbQG9B/fmWXJoI/Hi4v+HyGNK0Wvo+fG1qkoo+emF/Y htAjfPMUIKPYocbMyAgCRjcIbUh469sdlqtIp1QFA3OwxCO6ptD0SFbLS65N+jW2S36C t9KVEzrV6IK+Dl/MCmf+Us6YNvV40HtZ52RRuCBW6l+eA1zZMAxaqSbAFvn1N1zPoX6N Eiuw== X-Forwarded-Encrypted: i=1; AJvYcCWn13Ejk2RNhKh03BVuAN97/vLteJxUmkVtMI8xuggRGDlpDQ02oLoy3LMULW43TWbNlsegMvBZzD/haqyy6A/Wci6Htkuo6N7acs4r X-Gm-Message-State: AOJu0Yy3DemJTi4tjjIDy8Mg/NLj0LN5M6AzD7dHEmHNfzji9zs+sdx/ URkMXWat+z4V4hemac7rh4SSasCksmQXXaxLI1X1dKCx1/5dt08AjKV/PQs61K0= X-Google-Smtp-Source: AGHT+IGybvnpNsXwNwdYnMA93MRhlhEbgIgkEd2VLdninN0UheKxGBH+tOGStyLG2+JGR2GxN7v2TQ== X-Received: by 2002:a05:600c:1553:b0:422:1609:a7db with SMTP id 5b1f17b1804b1-42304822a02mr96279175e9.8.1718710940945; Tue, 18 Jun 2024 04:42:20 -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-360750ad082sm13780507f8f.59.2024.06.18.04.42.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 18 Jun 2024 04:42:20 -0700 (PDT) Message-ID: Date: Tue, 18 Jun 2024 14:42:19 +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 3/9] x86/virt/tdx: Support global metadata read for all element sizes 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: <210f7747058e01c4d2ed683660a4cb18c5d88440.1718538552.git.kai.huang@intel.com> From: Nikolay Borisov Content-Language: en-US In-Reply-To: <210f7747058e01c4d2ed683660a4cb18c5d88440.1718538552.git.kai.huang@intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit > > -static int read_sys_metadata_field16(u64 field_id, > - int offset, > - void *stbuf) > +/* > + * Read one global metadata field and store the data to a location of a > + * given buffer specified by the offset and size (in bytes). > + */ > +static int stbuf_read_sysmd_field(u64 field_id, void *stbuf, int offset, read_system_metadat_field or read_sys_metadata_field or simply read_metadata_field > + int bytes) s/bytes/size > { > - u16 *st_member = stbuf + offset; > + void *st_member = stbuf + offset; Again, this could be renamed to just 'member', what value does the 'st' prefix bring? > u64 tmp; > int ret; > > - if (WARN_ON_ONCE(MD_FIELD_ID_ELE_SIZE_CODE(field_id) != > - MD_FIELD_ID_ELE_SIZE_16BIT)) > + if (WARN_ON_ONCE(MD_FIELD_BYTES(field_id) != bytes)) > return -EINVAL; > > ret = read_sys_metadata_field(field_id, &tmp); > if (ret) > return ret; > > - *st_member = tmp; > + memcpy(st_member, &tmp, bytes); > > return 0; > } > @@ -294,11 +296,13 @@ static int read_sys_metadata_field16(u64 field_id, > struct field_mapping { > u64 field_id; > int offset; > + int size; > }; > > -#define TD_SYSINFO_MAP(_field_id, _struct, _member) \ > - { .field_id = MD_FIELD_ID_##_field_id, \ > - .offset = offsetof(_struct, _member) } > +#define TD_SYSINFO_MAP(_field_id, _struct, _member) \ > + { .field_id = MD_FIELD_ID_##_field_id, \ > + .offset = offsetof(_struct, _member), \ > + .size = sizeof(typeof(((_struct *)0)->_member)) } > > #define TD_SYSINFO_MAP_TDMR_INFO(_field_id, _member) \ > TD_SYSINFO_MAP(_field_id, struct tdx_tdmr_sysinfo, _member) > @@ -319,9 +323,8 @@ static int get_tdx_tdmr_sysinfo(struct tdx_tdmr_sysinfo *tdmr_sysinfo) > > /* Populate 'tdmr_sysinfo' fields using the mapping structure above: */ > for (i = 0; i < ARRAY_SIZE(fields); i++) { > - ret = read_sys_metadata_field16(fields[i].field_id, > - fields[i].offset, > - tdmr_sysinfo); > + ret = stbuf_read_sysmd_field(fields[i].field_id, tdmr_sysinfo, > + fields[i].offset, fields[i].size); > if (ret) > return ret; > } > diff --git a/arch/x86/virt/vmx/tdx/tdx.h b/arch/x86/virt/vmx/tdx/tdx.h > index b701f69485d3..812943516946 100644 > --- a/arch/x86/virt/vmx/tdx/tdx.h > +++ b/arch/x86/virt/vmx/tdx/tdx.h > @@ -53,7 +53,8 @@ > #define MD_FIELD_ID_ELE_SIZE_CODE(_field_id) \ > (((_field_id) & GENMASK_ULL(33, 32)) >> 32) > > -#define MD_FIELD_ID_ELE_SIZE_16BIT 1 > +#define MD_FIELD_BYTES(_field_id) \ Just name it MD_FIELD_SIZE, even the MD_FIELD_ID member is called ELEMENT_SIZE_CODE, rather than ELEMENT_BYTES_CODE or some such. > + (1 << MD_FIELD_ID_ELE_SIZE_CODE(_field_id)) > > struct tdmr_reserved_area { > u64 offset;