Message-ID: <a5e18a33-3012-de13-705d-9c69c9acedab@amd.com>
Date:   Wed, 22 Feb 2023 17:27:18 -0600
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.2.1
Subject: Re: [PATCH RFC v8 10/56] x86/cpufeatures: Add SEV-SNP CPU feature
Content-Language: en-US
To:     Sathyanarayanan Kuppuswamy 
        <sathyanarayanan.kuppuswamy@linux.intel.com>,
        Michael Roth <michael.roth@amd.com>, kvm@vger.kernel.org
Cc:     linux-coco@lists.linux.dev, linux-mm@kvack.org,
        linux-crypto@vger.kernel.org, x86@kernel.org,
        linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@redhat.com,
        jroedel@suse.de, thomas.lendacky@amd.com, hpa@zytor.com,
        ardb@kernel.org, pbonzini@redhat.com, seanjc@google.com,
        vkuznets@redhat.com, jmattson@google.com, luto@kernel.org,
        dave.hansen@linux.intel.com, slp@redhat.com, pgonda@google.com,
        peterz@infradead.org, srinivas.pandruvada@linux.intel.com,
        rientjes@google.com, dovmurik@linux.ibm.com, tobin@ibm.com,
        bp@alien8.de, vbabka@suse.cz, kirill@shutemov.name,
        ak@linux.intel.com, tony.luck@intel.com, marcorr@google.com,
        alpergun@google.com, dgilbert@redhat.com, jarkko@kernel.org,
        nikunj.dadhania@amd.com, Brijesh Singh <brijesh.singh@amd.com>,
        Jarkko Sakkinen <jarkko@profian.com>
References: <20230220183847.59159-1-michael.roth@amd.com>
 <20230220183847.59159-11-michael.roth@amd.com>
 <856ded9e-facd-fe6d-2f71-bb0cf5b1d546@linux.intel.com>
From:   "Kalra, Ashish" <ashish.kalra@amd.com>
In-Reply-To: <856ded9e-facd-fe6d-2f71-bb0cf5b1d546@linux.intel.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?S3UzNVdiMUVRUFBpK0JubHltMXNtd2ZFSi92ZXJJRDBXdUwrVTVoWWQ5ZDVG?=
 =?utf-8?B?anBhTHVVdEE2Z1lXN1RuUnlSVHBiemNMN0RJUGpzczRRRXk3d3N2bWRweVVi?=
 =?utf-8?B?WC9XM0ZzSEVKU3Uva2dVOEtQUGdWZGlKVnRyQkxuTUNwK2VVVU90Mk9ZbDlU?=
 =?utf-8?B?dVpjY3BrckV4djdJYlN1UzhFbVdyKzVWeFl5WWh4emdPZEZ3ZlNhV1RLazgv?=
 =?utf-8?B?cTdFYzhZbDQxRXpjT1YyS2g1Z0RBaHo2dGJaZ1JsSEROSm5HYllKN2VWaC9X?=
 =?utf-8?B?V3NtQzV3YmNML3IwQ0x1M0xFa3VTekRnclpCOHFwZExpcGVxUXd0L2FUem1Q?=
 =?utf-8?B?QWErV0ZLa0ZhNytmQjVsejVxTGFIK2x5MnUwTUFmTG91Q1lGQ0loL0hyanBR?=
 =?utf-8?B?eE5nNXhXMExmRHN0ZTdQUjFXVUpTUzg5aEl3bFFJUkY5MmlQUjNqTkdoSCt1?=
 =?utf-8?B?OTNyZnMzTDhIOEJhMmVIOUd6NFk3cDNwVTQzNDhQNHFFYXZqZGFTbnRMMGZE?=
 =?utf-8?B?L2xVK2w0UVEwSzZ5S3R6UElKNmNrNU9wY243TER6SUxNYzJPa09tOTFsSk1W?=
 =?utf-8?B?ODRUTnl5Uzhrb2lORDhQM20zZnlSRjNaN3p2WWFjZXpUMXhrYzEvSGF3d2Rp?=
 =?utf-8?B?VnJENUtqcExoekJEMTFTU1V2QUx2NlM0NDk1bHFiblA0YWcydkRQSDlFWFdV?=
 =?utf-8?B?WkNibEdwNUVKcGlSR3I3Rk1mL2dPSVB1YTUrcFZqWnFPdXJEM1ZZdU1hZnVp?=
 =?utf-8?B?NVFBMUIzc1d2ZTEzeXdVZ3NCNGJqU3BIMFY2UXkveVpTUGh0TTFGeXVCWjlG?=
 =?utf-8?B?K2tka2VPaVhRcXZKU2RvZWlMcFRTanVibXNqVU5aRWZnOFppYXZrT0h6Zkt3?=
 =?utf-8?B?VkcwODBTOW8wTlZmalovZGZuZUNtb0hINnlXM0E5R3ZQUEVOa0xNdmp3aE5n?=
 =?utf-8?B?NUdDREVGclM5R3ZOeHhVcVQ2RXN5MGpBbERVenhPMUlMZlhTK3hXbTJaaFVP?=
 =?utf-8?B?eGFiVHNXMFRTWDQ3UExDMTNUZEJQYzVBR0tDZEtKcEU0Z2hPWUVTbFU2OUp1?=
 =?utf-8?B?VFFRU3pOUWlHUXI1TXA5Q2M1MWVHaFNkeWJNWVNjOFFYKzQyOVVZM21pdjJX?=
 =?utf-8?B?blFsRTRnM2kybWpkbWhObGF3UGpTb3hvdk9TdkRDZlc3ZkFEckc0bDRxbFI1?=
 =?utf-8?B?OWpKWjFhemF2cHZlenk0emk3dFZ6Y1pkUEp6SlcxS0FJWCsrZ0FKNVRyeXJI?=
 =?utf-8?B?QmtYbWJnNE9GeGdFVEs2azkvclBYclYwV3Buc2F4aHlidys5cWp0cHJTVXd0?=
 =?utf-8?B?ME44bnJzWTZyQkQ0dVVNYU1HSmlzWUhST3BSOW5kRHBxcW9HcWlGR0VTS2R3?=
 =?utf-8?B?Q0dBTFdHRkw1NnAyNU4rY3JqNmhBWXhCbjJxQ1pIWEd0ZU1sU2ZJODJoYnN2?=
 =?utf-8?B?Q1Q3Vlc2RlBOY3pRYkEvRjhpWVFGSWozN3NjYVUvdE5DdUUyR25MbnpTWEtU?=
 =?utf-8?B?YnF1TVM3UGs2M20wMlJCV0dUU3JQaCtIaEdCQmdBeHgzQm5hWG16WlNBWFJQ?=
 =?utf-8?B?YkowWnd0MkdqM2hWeXY0ZFkvQUlzQWZFbW4vbGhJRjAxVmg3dXIyalpSOGND?=
 =?utf-8?B?TWE5RnJrVFZ2NGlyem5oYTU3bFhiMjBXSmNUV01sQkNDMUtac0U0dVB0M0xN?=
 =?utf-8?B?SFRvOFFkR21rcWp2L2QzUGhZRUtkdGp4Znk1UjAyMXlTTm8zY1ZKVzU3WUNQ?=
 =?utf-8?B?Q2k4T2Fwb3ZJRGJ4UVdNSW5EOEhZZ1lmY0Z1Z3FMVm1OZnp5RmxqY2F4VGVt?=
 =?utf-8?B?dEdxVTEyM21xa3IrSm9COStoTloxbDRra3dCYVR3QkdhendkUjQ5MHBtQ2R3?=
 =?utf-8?B?cFk0UUVFMnM4UFZBYUFsRTcrTGxoRC81TDNHd0ZKUGVCMHQwWFNsYWEwMk1m?=
 =?utf-8?B?QWcvR3dvT09NNzlmdUVSTVZaem9FUU8vQ3l3dEZ3TWRhM0xJY2YyakR5Si9m?=
 =?utf-8?B?b0MvNndwY0NXQmR5d1hXbVBPcTM3cHNMK1pVWCtTakh0eEJUTEVsZkZ0Sm1l?=
 =?utf-8?B?UjQ2WXIxUHgxWUhCWGY4dTlwK3FzNXdQU0ozTDgzTWNJenBnY3plZUZtNTk2?=
 =?utf-8?Q?9ouPWzbdtx3e21f1URKJ6HzWy?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ad76a276-08e3-441c-8a3b-08db152c5a9a
X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2767.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2023 23:27:24.7910
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: FWQpkmzfZjTb91RPK1qy7Ixo/ZyBOv79AJUrloVt5KA3uZB7f28BEhuI9i7mBb/hDu7+jsMh8cMj24S5NqW+Xg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5770
Precedence: bulk
List-ID: <linux-crypto.vger.kernel.org>
X-Mailing-List: linux-crypto@vger.kernel.org

On 2/21/2023 3:21 PM, Sathyanarayanan Kuppuswamy wrote:
> 
> 
> On 2/20/23 10:38 AM, Michael Roth wrote:
>> From: Brijesh Singh <brijesh.singh@amd.com>
>>
>> Add CPU feature detection for Secure Encrypted Virtualization with
>> Secure Nested Paging. This feature adds a strong memory integrity
>> protection to help prevent malicious hypervisor-based attacks like
>> data replay, memory re-mapping, and more.
>>
>> Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>
>> Signed-off-by: Jarkko Sakkinen <jarkko@profian.com>
>> Signed-off-by: Ashish Kalra <Ashish.Kalra@amd.com>
> 
> Too many signed-off-by's. Are you missing Co-developed-by?
> 
>> Signed-off-by: Michael Roth <michael.roth@amd.com>
>> ---
>>   arch/x86/include/asm/cpufeatures.h       | 1 +
>>   arch/x86/kernel/cpu/amd.c                | 5 +++--
>>   tools/arch/x86/include/asm/cpufeatures.h | 1 +
>>   3 files changed, 5 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h
>> index 1419c4e04d45..480b4eaef310 100644
>> --- a/arch/x86/include/asm/cpufeatures.h
>> +++ b/arch/x86/include/asm/cpufeatures.h
>> @@ -420,6 +420,7 @@
>>   #define X86_FEATURE_SEV			(19*32+ 1) /* AMD Secure Encrypted Virtualization */
>>   #define X86_FEATURE_VM_PAGE_FLUSH	(19*32+ 2) /* "" VM Page Flush MSR is supported */
>>   #define X86_FEATURE_SEV_ES		(19*32+ 3) /* AMD Secure Encrypted Virtualization - Encrypted State */
>> +#define X86_FEATURE_SEV_SNP		(19*32+ 4) /* AMD Secure Encrypted Virtualization - Secure Nested Paging */
>>   #define X86_FEATURE_V_TSC_AUX		(19*32+ 9) /* "" Virtual TSC_AUX */
>>   #define X86_FEATURE_SME_COHERENT	(19*32+10) /* "" AMD hardware-enforced cache coherency */
>>   
>> diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
>> index 860b60273df3..c7884198ad5b 100644
>> --- a/arch/x86/kernel/cpu/amd.c
>> +++ b/arch/x86/kernel/cpu/amd.c
>> @@ -558,8 +558,8 @@ static void early_detect_mem_encrypt(struct cpuinfo_x86 *c)
>>   	 *	      SME feature (set in scattered.c).
>>   	 *	      If the kernel has not enabled SME via any means then
>>   	 *	      don't advertise the SME feature.
>> -	 *   For SEV: If BIOS has not enabled SEV then don't advertise the
>> -	 *            SEV and SEV_ES feature (set in scattered.c).
> 
> Did you remove the related scattered.c code mentioned above in a different patch?
>

That is part of the following commit:

commit fb35d30fe5b06cc24444f0405da8fbe0be5330d1
Author: Sean Christopherson <seanjc@google.com>
Date:   Fri Jan 22 12:40:46 2021 -0800

     x86/cpufeatures: Assign dedicated feature word for 
CPUID_0x8000001F[EAX]

     Collect the scattered SME/SEV related feature flags into a dedicated
     word.  There are now five recognized features in CPUID.0x8000001F.EAX,
     with at least one more on the horizon (SEV-SNP).  Using a dedicated 
word
     allows KVM to use its automagic CPUID adjustment logic when reporting
     the set of supported features to userspace.

     No functional change intended.

     Signed-off-by: Sean Christopherson <seanjc@google.com>
     Signed-off-by: Borislav Petkov <bp@suse.de>
     Reviewed-by: Brijesh Singh <brijesh.singh@amd.com>
     Link: 
https://lkml.kernel.org/r/20210122204047.2860075-2-seanjc@google.com

Thanks,
Ashish

>> +	 *   For SEV: If BIOS has not enabled SEV then don't advertise SEV and
>> +	 *	      any additional functionality based on it.
>>   	 *
>>   	 *   In all cases, since support for SME and SEV requires long mode,
>>   	 *   don't advertise the feature under CONFIG_X86_32.
>> @@ -594,6 +594,7 @@ static void early_detect_mem_encrypt(struct cpuinfo_x86 *c)
>>   clear_sev:
>>   		setup_clear_cpu_cap(X86_FEATURE_SEV);
>>   		setup_clear_cpu_cap(X86_FEATURE_SEV_ES);
>> +		setup_clear_cpu_cap(X86_FEATURE_SEV_SNP);
>>   	}
>>   }
>>   
>> diff --git a/tools/arch/x86/include/asm/cpufeatures.h b/tools/arch/x86/include/asm/cpufeatures.h
>> index b71f4f2ecdd5..e81606fcd2ab 100644
>> --- a/tools/arch/x86/include/asm/cpufeatures.h
>> +++ b/tools/arch/x86/include/asm/cpufeatures.h
>> @@ -417,6 +417,7 @@
>>   #define X86_FEATURE_SEV			(19*32+ 1) /* AMD Secure Encrypted Virtualization */
>>   #define X86_FEATURE_VM_PAGE_FLUSH	(19*32+ 2) /* "" VM Page Flush MSR is supported */
>>   #define X86_FEATURE_SEV_ES		(19*32+ 3) /* AMD Secure Encrypted Virtualization - Encrypted State */
>> +#define X86_FEATURE_SEV_SNP		(19*32+ 4) /* AMD Secure Encrypted Virtualization - Secure Nested Paging */
>>   #define X86_FEATURE_V_TSC_AUX		(19*32+ 9) /* "" Virtual TSC_AUX */
>>   #define X86_FEATURE_SME_COHERENT	(19*32+10) /* "" AMD hardware-enforced cache coherency */
>>   
>