Received-SPF: pass (google.com: domain of linux-kernel+bounces-16261-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Message-ID: <76b1660e-4b14-4485-9511-8a96b0f666f7@amd.com>
Date: Wed, 3 Jan 2024 23:35:12 -0600
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v2] x86/sev: Add support for allowing zero SEV ASIDs.
Content-Language: en-US
To: Tom Lendacky <thomas.lendacky@amd.com>, pbonzini@redhat.com
Cc: seanjc@google.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de,
 dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com,
 kvm@vger.kernel.org, linux-kernel@vger.kernel.org, joro@8bytes.org
References: <20240104024656.57821-1-Ashish.Kalra@amd.com>
 <e0d349f4-0267-b339-313c-09dcafb14a71@amd.com>
From: "Kalra, Ashish" <ashish.kalra@amd.com>
In-Reply-To: <e0d349f4-0267-b339-313c-09dcafb14a71@amd.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?ZGJIUTdWNTM4T254OUNDQm1rMmFjbnRyWlltYzV3c05jUUVOQjhUenJodldL?=
 =?utf-8?B?djhSaEpDbWdkdEZlakIxaWNXcng0ai9kOENpTiszMnA1VEdRQ3BsUG1NV1Zj?=
 =?utf-8?B?OGR5WURUTkY0YUVTekR3OHYxWVdMdU9OQ1ZuV214bFQ3WEpYQ0JlMUJhZmx0?=
 =?utf-8?B?a2U4K2RpNi9VOFc4YlpZMXhuT2lFUm5BMVRJUGNYUTVWNk9UUEEzd2M0WjAx?=
 =?utf-8?B?T0xRaVBwNktkaS9xSnNsR3VUT1MySExUMEJSblM3Tk9wY3dkSm8yeXQ0bEhi?=
 =?utf-8?B?Z21vSnJsSVhtT0dOb2FURHcvcjJ0TVlpVnVQeEdNSTNoMkN4bFAzZm1lVmlB?=
 =?utf-8?B?TG5qN0NuYVNuNTc3Wk5zTUdtMXVENEZRbm9XWktWQ01aS250NHhieGZSOVpp?=
 =?utf-8?B?aFo0SUlpWFAwcHRpUHg4YlQvU0JUbUMxQ2xFeTNWek1EOFRoQmh1S0lXSitL?=
 =?utf-8?B?VHNYR2VReFlGYnowd2UwcjJuQVdsaCtXb0hDa1VxOXltWUdRNThwQ2hFN3BD?=
 =?utf-8?B?TW0yd0VUeFFKVFBseUJEOXVkTE1qR1FCbTNHOGJuWkdyUkVEbkFNT2RVQXAr?=
 =?utf-8?B?ZFlaNENRK2FkUXVidGdrYWpjL2JLRVBzdjkwQ0JDbFRxRjMrMktoRFRoK0s2?=
 =?utf-8?B?MjcwMFlpUXFCYURRZWlESkNRSnBOQVdHcmN3cUFrd3EvT3BxNXVoZGQyMmkv?=
 =?utf-8?B?MUFDVTJNMmdRQ3h6MkE4K2hFUDFra2pWRk93SDBlZU1QVUxUY3ArMncrOEs0?=
 =?utf-8?B?S2F2MnNBZE5ieHNHK0FDbWQvbTJZUXZVRWxJN01oSzRWSGFERStTQXFFR05H?=
 =?utf-8?B?UVFjcW16bkZvT3lJRkRxL1FUeGhMSFdqbzlFNnZpTEEwUDY4Sm5VYzJwekZo?=
 =?utf-8?B?V0R5K2hZR2RUMlRoMjZXOThuWk56aDZVVEVCdC9ZeWVUaVd0QmZiWFFQdkZI?=
 =?utf-8?B?VXhkK1RlV2NjY1NOVVM3Qm5IRXJtN3pyRWN3YldUcTBJZS9zS1dQZCtVMU5s?=
 =?utf-8?B?aEtVOVFMKzdmbDhoZ2ZzVlFLTjhiaVlQWnZ1ak52Z0J3V2tLakRzZjUyNWFB?=
 =?utf-8?B?dWlzdjc1YTJhL1ljRFRZcmYyRlhIejZacGs4R21iaXF1bzNmQ3BmbC85L3dG?=
 =?utf-8?B?TmlDcERFY0JpdGkvSFBYbW50UksyMmZLckYvdzUrOUxncjE3U1dhcjN1bHNi?=
 =?utf-8?B?d1EyN2I0MTArZkY0TWt5ZUlXSTZhY1RCU0lORFZyRSs5eGVPSzNxWjk2cHFF?=
 =?utf-8?B?VEJhaDFmcXJmYm5IN1VhZ0NQKzY4emVxeXV0dUgxS1Z3U2U4OHJ1cS9CdTBX?=
 =?utf-8?B?UDNJYXJCdnFxQVJKRmo2OW03aVJQRGozUnVsT01uUzJ3R1gwU2ZCYUdPeTU1?=
 =?utf-8?B?bHFENTMwZ0s2SnZMdjhmWEJ6VWdUME1VeGJxNDg1UVNNZzFKUHkreTdreERC?=
 =?utf-8?B?OHNTZExiTXRVdU83OEkyb29hOW40NHRyK2pTU3lYTjRhMXgvN1N3OFpVWVM5?=
 =?utf-8?B?dnFxS3lXSmZVTXYwMVEwS3habGNtTUdiVnAreTNXTDNHakFLVktoZG1QTzlX?=
 =?utf-8?B?M3c2RlBISFRtTHFUWC8vcldlcUpIWUFIazR5bkgvTWZQODFEKy81RnRSUlVn?=
 =?utf-8?B?NjIvU3poVC8xUTQ5b1IzcUxvUVdTUytoSUptcnR2Vk5DT2VJTnZ3SGJ5aXBL?=
 =?utf-8?B?ckw3SUFNWWZoT1pmeXNnSXRnc0JpRGUrU1dNZGZyNEtDQ1BSanUwVzV1WlRT?=
 =?utf-8?B?Z3dwY2lza1UyY1RKRkhsNjNoNUtOcnViZ1UxQ0ZnckV0M3VJN0lvNk45WTlW?=
 =?utf-8?B?c2czYTREbGg5VDM3QVhoSVRzUWF6SmovcEFzRUFkMEtseis1NWRHa2tkT2Vx?=
 =?utf-8?B?cENVUTZTUGRkWGoyMGZzb2hPSHZ4dUlySXQ0eERZTFJrV0FuQ3Q2L1ZJeVho?=
 =?utf-8?B?SEpPME5DM29wRVJTQXpjNWJXeXV2WG91UkErQVhFdCtOU2lvdEE2bU5VZ1B5?=
 =?utf-8?B?aXJxNVFKbHJpa2wvVE5FTWo1UTM5djc2YzcxT3JBUkVvbU83b2Nla1lwRkxa?=
 =?utf-8?B?NmYyNElFbDFZTk9rQ2FYSGJiUjBmaGVDakpQVHluNm1ialNxbWFGd2Rjb01t?=
 =?utf-8?Q?7T+EHS25/7B3of55NlFfVL8Nc?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 46b93ef9-221a-4d27-d8ba-08dc0ce6ed5f
X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2767.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2024 05:35:14.6026
 (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: 7zKFnsnf9rrvqNzqd+hdJFt+mwlqHADuYt0gnc+U676XN1Yt8yU2oq9FymCYx8uzWWx/swxJHw9GNyoHMRp3cA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7276

On 1/3/2024 11:28 PM, Tom Lendacky wrote:

> On 1/3/24 20:46, Ashish Kalra wrote:
>> From: Ashish Kalra <ashish.kalra@amd.com>
>>
>> Some BIOSes allow the end user to set the minimum SEV ASID value
>> (CPUID 0x8000001F_EDX) to be greater than the maximum number of
>> encrypted guests, or maximum SEV ASID value (CPUID 0x8000001F_ECX)
>> in order to dedicate all the SEV ASIDs to SEV-ES or SEV-SNP.
>>
>> The SEV support, as coded, does not handle the case where the minimum
>> SEV ASID value can be greater than the maximum SEV ASID value.
>> As a result, the following confusing message is issued:
>>
>> [   30.715724] kvm_amd: SEV enabled (ASIDs 1007 - 1006)
>>
>> Fix the support to properly handle this case.
>>
>> Fixes: 916391a2d1dc ("KVM: SVM: Add support for SEV-ES capability in 
>> KVM")
>> Suggested-by: Sean Christopherson <seanjc@google.com>
>> Signed-off-by: Ashish Kalra <ashish.kalra@amd.com>
>> Cc: stable@vger.kernel.org
>> ---
>>   arch/x86/kvm/svm/sev.c | 41 +++++++++++++++++++++++++----------------
>>   1 file changed, 25 insertions(+), 16 deletions(-)
>>
>> diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
>> index 4900c078045a..651d671ff8ae 100644
>> --- a/arch/x86/kvm/svm/sev.c
>> +++ b/arch/x86/kvm/svm/sev.c
>> @@ -143,8 +143,21 @@ static void sev_misc_cg_uncharge(struct 
>> kvm_sev_info *sev)
>>     static int sev_asid_new(struct kvm_sev_info *sev)
>>   {
>> -    int asid, min_asid, max_asid, ret;
>> +    /*
>> +     * SEV-enabled guests must use asid from min_sev_asid to 
>> max_sev_asid.
>> +     * SEV-ES-enabled guest can use from 1 to min_sev_asid - 1.
>> +     * Note: min ASID can end up larger than the max if basic SEV 
>> support is
>> +     * effectively disabled by disallowing use of ASIDs for SEV guests.
>> +     */
>> +    unsigned int min_asid = sev->es_active ? 1 : min_sev_asid;
>> +    unsigned int max_asid = sev->es_active ? min_sev_asid - 1 : 
>> max_sev_asid;
>> +    unsigned int asid;
>> +
>
> Remove this blank line.
>
>>       bool retry = true;
>> +    int ret;
>> +
>> +    if (min_asid > max_asid)
>> +        return -ENOTTY;
>>         WARN_ON(sev->misc_cg);
>>       sev->misc_cg = get_current_misc_cg();
>> @@ -157,12 +170,6 @@ static int sev_asid_new(struct kvm_sev_info *sev)
>>         mutex_lock(&sev_bitmap_lock);
>>   -    /*
>> -     * SEV-enabled guests must use asid from min_sev_asid to 
>> max_sev_asid.
>> -     * SEV-ES-enabled guest can use from 1 to min_sev_asid - 1.
>> -     */
>> -    min_asid = sev->es_active ? 1 : min_sev_asid;
>> -    max_asid = sev->es_active ? min_sev_asid - 1 : max_sev_asid;
>>   again:
>>       asid = find_next_zero_bit(sev_asid_bitmap, max_asid + 1, 
>> min_asid);
>>       if (asid > max_asid) {
>> @@ -246,21 +253,20 @@ static void sev_unbind_asid(struct kvm *kvm, 
>> unsigned int handle)
>>   static int sev_guest_init(struct kvm *kvm, struct kvm_sev_cmd *argp)
>>   {
>>       struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;
>> -    int asid, ret;
>> +    int ret;
>>         if (kvm->created_vcpus)
>>           return -EINVAL;
>>   -    ret = -EBUSY;
>>       if (unlikely(sev->active))
>> -        return ret;
>> +        return -EINVAL;
>>         sev->active = true;
>>       sev->es_active = argp->id == KVM_SEV_ES_INIT;
>> -    asid = sev_asid_new(sev);
>> -    if (asid < 0)
>> +    ret = sev_asid_new(sev);
>> +    if (ret < 0)
>>           goto e_no_asid;
>> -    sev->asid = asid;
>> +    sev->asid = ret;
>>         ret = sev_platform_init(&argp->error);
>>       if (ret)
>> @@ -2229,8 +2235,10 @@ void __init sev_hardware_setup(void)
>>           goto out;
>>       }
>>   -    sev_asid_count = max_sev_asid - min_sev_asid + 1;
>> -    WARN_ON_ONCE(misc_cg_set_capacity(MISC_CG_RES_SEV, 
>> sev_asid_count));
>> +    if (min_sev_asid > max_sev_asid) {
>
> Shouldn't this be: if (min_sev_asid <= max_sev_asid) ?
>
> You only want to do the misc_cg_set_capactity() call if you can have 
> SEV guests.
>
>
Yes, it should be, will fix it and post v3.

Thanks, Ashish

>> +        sev_asid_count = max_sev_asid - min_sev_asid + 1;
>> +        WARN_ON_ONCE(misc_cg_set_capacity(MISC_CG_RES_SEV, 
>> sev_asid_count));
>> +    }
>>       sev_supported = true;
>>         /* SEV-ES support requested? */
>> @@ -2261,7 +2269,8 @@ void __init sev_hardware_setup(void)
>>   out:
>>       if (boot_cpu_has(X86_FEATURE_SEV))
>>           pr_info("SEV %s (ASIDs %u - %u)\n",
>> -            sev_supported ? "enabled" : "disabled",
>> +            sev_supported ? (min_sev_asid <= max_sev_asid ? 
>> "enabled" : "unusable")
>> +            : "disabled",
>>               min_sev_asid, max_sev_asid);
>>       if (boot_cpu_has(X86_FEATURE_SEV_ES))
>>           pr_info("SEV-ES %s (ASIDs %u - %u)\n",