Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1;
Message-ID: <8f6ab889-d177-1bd8-1aad-396d9ba5128c@amd.com>
Date:   Sat, 14 Oct 2023 20:19:52 +0530
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.13.0
Subject: Re: [PATCH] KVM: SVM: Don't intercept IRET when injecting NMI and
 vNMI is enabled
Content-Language: en-US
From:   Santosh Shukla <santosh.shukla@amd.com>
To:     Sean Christopherson <seanjc@google.com>,
        Maxim Levitsky <mlevitsk@redhat.com>
Cc:     Paolo Bonzini <pbonzini@redhat.com>, kvm@vger.kernel.org,
        linux-kernel@vger.kernel.org
References: <20231009212919.221810-1-seanjc@google.com>
 <e348e75dac85efce9186b6b10a6da1c6532a3378.camel@redhat.com>
 <ZSVju-lerDbxwamL@google.com> <a18658e5-3788-b3f3-db0d-1ab29ea89f88@amd.com>
In-Reply-To: <a18658e5-3788-b3f3-db0d-1ab29ea89f88@amd.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VTE4ZWtNcWpZb3dXMmQ3Smx4WVh2bnpPdXphcmtjZ1h1M0NrdU9VVGVqbDRC?=
 =?utf-8?B?SXpNYjFnMWgwYjZmamFGNnlzVXNXM25BcW1CSXJrMURFc2svUzhXTHk2Y3du?=
 =?utf-8?B?ME91NWovZDM0Ui9tODhLOGY5U3c2RXU2UWJzYVlsZUFvQVViUjBnb1lrQmw2?=
 =?utf-8?B?elpLcCtINVVrbGRSSG1rYW5EZzE0bnRGWk1MU3liTExCVGZlYkF3VEw1NUNZ?=
 =?utf-8?B?ZHZoRmp2QUlHL29DUmEvK0ZBS1FQTTNVUmJ3cjFBbmZkUnh4Tkg0MGpxbCtV?=
 =?utf-8?B?aVVmVGNtTlhOdGg3RDN2Yk5TcDNCMFBLUjcwNWJpSkFjNEVHYlFPN1NGN2Rz?=
 =?utf-8?B?RDNQeVhvbDEyTWk4YXVPYjB5WDZTTGhkOHJndFdoNnI0T0NOR1lMRGhITmt4?=
 =?utf-8?B?bTdJdzZVOHRVVnRmYk02NVVza3dCZzhTSENRWjlZcDQzQy9kVTVHYmdWWHll?=
 =?utf-8?B?WGsrMWJRVXhWQm9qdFV4WjI5UkM2WFU4aXlSMkJWdW5OZHBObDZvWHJLRjIx?=
 =?utf-8?B?dmtucENnYXN2UU5jay8veGgraEpLVlhXRktEMUowSDV2OHhFREJ6dlZ3V210?=
 =?utf-8?B?SFd2OUdKVnVzWDVmRWJ1VXZrTW1zRStwY1ZLbTJDbWd4N05xY2JDNHhpWmMv?=
 =?utf-8?B?NzZ6QlJmV2Q4RWRQdVRjU2Z3L3M0M0kyQ3lMN0lHdVA3TU50Mi9sQ0dWVXlu?=
 =?utf-8?B?azNBL2FXQWNpaENQY3REaDhxdGY0ZGFCYlpzbkJrVVU3Nk83L0UvNDdrb3Y1?=
 =?utf-8?B?TTN3alNZOUZrNEUrcHEyekQrMU96MjdEaElIMDl5VzI1VUhnRlQyNzdwaUQ5?=
 =?utf-8?B?YmhBNUphK1crWGtEU09aTTA1Z2lEZTNEMXZHRW5lTjU1V01MTmNuTlV4aXVm?=
 =?utf-8?B?OFdUci9UajVFK05GQytDUUdXYUdlNFlDR09ISmcxT0NFNGxDYVBFd2cwMDhD?=
 =?utf-8?B?SmxTeUFaODhrS3FpQmxKRTRoRXU3eWxpRndZVWRUckFudEg3c0hvRzdEUEpN?=
 =?utf-8?B?amZXWHg0Q3NTeG1VcWdhNWZDUytZdlJicnEwSGNqK1VicWRsclVYc2xDTlNl?=
 =?utf-8?B?Q01tZVQwc3dUVTV1RHFnMTdzQjVuTWdQWWYwZEhvejFwRE50TXY1azR3My9L?=
 =?utf-8?B?YStGZE9pVDJWYWwzQUNLODVzSGhrenRmeU9lVnl3WHNhWnl5UEY0Q3VIR1pE?=
 =?utf-8?B?Tm13dWpKZ1pIcVNIakZud0FtS2MrNFU4cndZK3d2Vk91cHcxT1RILzB5b3pw?=
 =?utf-8?B?RnBGWlV2VnNDbFQvcGpjZk5mZ2Rwek4zanZUR1cwd1NodWNJU2FUc21GTDI4?=
 =?utf-8?B?eVRwTVRQaVNDc0RTeXJWOEhHRjhRQ1Y3cndJSXVYWThIWHJiUTM3RzU4RmdG?=
 =?utf-8?B?ZkdvcEZoRjdab2ZDTjQ1THdQS1RZUW5Td2d1RUtOdlY1Y2pQYTBPQldBajhF?=
 =?utf-8?B?MWdsWENCbUhIcFdOMmMxb29WWW5TaWVxSlJmbUJRcGJxOU9nMnMreEcyTzZN?=
 =?utf-8?B?SW5rc3F3VjZnYkJFMGo1Rm9GQkw1WHZ0dUNyTE5BTWNkVFZQTXhpQ1lRNjND?=
 =?utf-8?B?ZFFyMDF4LzRFTGFGZXlxZVVBRmFyL1hGak5TVEUxNXpDT01YOHF3Vm1UOFNh?=
 =?utf-8?B?bytxaUxBTzhGRm5telIrN2d5RzJ4eVM1RWZHQUlBTmszT3hEaTZNVTFXOHFB?=
 =?utf-8?B?SnlaSmljRFgxbVUwOUhvUC9xZGFBaXFEaWhqTU1QNVVWZXp3dFRzNmU1Zmpy?=
 =?utf-8?B?SGNnSkMyOWNkcEkrNnJ2cEtjeUVqSWFaSlo1ZkljaTd2OXltbkY2SUx2d1JK?=
 =?utf-8?B?K2t2MjhDTXI2Um9RSkJPUzYzT2hEQ1RlK0ZLK2hCdlNVNWtoNmJrTGovOVN0?=
 =?utf-8?B?dDFYYWZDeEp6MFFSWi9yTFJiQUZvNk95UU9GUk9zYTBKWFpvcnV1YjNzVWox?=
 =?utf-8?B?NXk3blVlRzk5cmo3YTZNcVY4ZVc5RDNoOG41WDZwSzdPZGIwOHVEYiszbld2?=
 =?utf-8?B?ZnJWL2ZDblhlTFdoWmZuRC8xK21MTy9qc2F3RHEyZ3hvNU5CQ0h1WTRzYWNs?=
 =?utf-8?B?ZWxrTmVZTDFScmYxd1o4Slg1UklVN0JSSlRkdmZNM3VOTUIxNGVIdWJnSE03?=
 =?utf-8?Q?DzRAUoKZJCHba1XJguiqfI2DQ?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0c785343-8e9e-4cc9-1c09-08dbccc4dcc2
X-MS-Exchange-CrossTenant-AuthSource: CY5PR12MB6323.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Oct 2023 14:50:09.8309
 (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: w+ma8Umgrr1AiOrl0vpN+YvAkJEPFwCmBpyA5Z5JCvHYOJE1Tc6k/T5CnvoMwS6GEAsNxIsVaQaE8hrZvBJodQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB5267
X-Spam-Status: No, score=-4.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Sat, 14 Oct 2023 07:54:26 -0700 (PDT)


On 10/14/2023 3:46 PM, Santosh Shukla wrote:
> 
> 
> On 10/10/2023 8:16 PM, Sean Christopherson wrote:
>> On Tue, Oct 10, 2023, Maxim Levitsky wrote:
>>> У пн, 2023-10-09 у 14:29 -0700, Sean Christopherson пише:
>>>> Note, per the APM, hardware sets the BLOCKING flag when software directly
>>>> directly injects an NMI:
>>>>
>>>>   If Event Injection is used to inject an NMI when NMI Virtualization is
>>>>   enabled, VMRUN sets V_NMI_MASK in the guest state.
>>>
>>> I think that this comment is not needed in the commit message. It describes
>>> a different unrelated concern and can be put somewhere in the code but
>>> not in the commit message.
>>
>> I strongly disagree, this blurb in the APM directly affects the patch.  If hardware
>> didn't set V_NMI_MASK, then the patch would need to be at least this:
>>
HW sets the V_NMI_MASK.

>> --
>> diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
>> index b7472ad183b9..d34ee3b8293e 100644
>> --- a/arch/x86/kvm/svm/svm.c
>> +++ b/arch/x86/kvm/svm/svm.c
>> @@ -3569,8 +3569,12 @@ static void svm_inject_nmi(struct kvm_vcpu *vcpu)
>>  	if (svm->nmi_l1_to_l2)
>>  		return;
>>  
>> -	svm->nmi_masked = true;
>> -	svm_set_iret_intercept(svm);
>> +	if (is_vnmi_enabled(svm)) {
>> +		svm->vmcb->control.int_ctl |= V_NMI_BLOCKING_MASK;
>> +	} else {
>> +		svm->nmi_masked = true;
>> +		svm_set_iret_intercept(svm);
>> +	}
>>  	++vcpu->stat.nmi_injections;
>>  }
>>  
>>
> 
> quick testing worked fine, KUT test ran fine and tested for non-nested mode so far.
> Will do more nested testing and share the feedback.
> 

Sean - I have tested original patch[1] for nested and KUT, worked fine.

Thanks,
Santosh 

[1] https://lore.kernel.org/r/20231009212919.221810-1-seanjc@google.com 

> Thanks,
> Santosh
> 
>> base-commit: 86701e115030e020a052216baa942e8547e0b487
>