From: Tianyu Lan <ltykernel@gmail.com>
To: Tom Lendacky <thomas.lendacky@amd.com>,
kys@microsoft.com, haiyangz@microsoft.com,
sthemmin@microsoft.com, wei.liu@kernel.org, decui@microsoft.com,
tglx@linutronix.de, mingo@redhat.com, bp@alien8.de,
x86@kernel.org, hpa@zytor.com, dave.hansen@linux.intel.com,
luto@kernel.org, peterz@infradead.org, davem@davemloft.net,
kuba@kernel.org, gregkh@linuxfoundation.org, arnd@arndb.de,
brijesh.singh@amd.com, jroedel@suse.de, Tianyu.Lan@microsoft.com,
pgonda@google.com, akpm@linux-foundation.org, rppt@kernel.org,
kirill.shutemov@linux.intel.com, saravanand@fb.com,
aneesh.kumar@linux.ibm.com, rientjes@google.com, tj@kernel.org,
michael.h.kelley@microsoft.com
Cc: linux-arch@vger.kernel.org, linux-hyperv@vger.kernel.org,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
vkuznets@redhat.com, konrad.wilk@oracle.com, hch@lst.de,
robin.murphy@arm.com, joro@8bytes.org, parri.andrea@gmail.com,
dave.hansen@intel.com
Subject: Re: [PATCH V6 5/8] x86/hyperv: Add Write/Read MSR registers via ghcb page
Date: Fri, 1 Oct 2021 21:44:51 +0800 [thread overview]
Message-ID: <5d13faf8-0733-10cc-6e2e-c43b400f7d69@gmail.com> (raw)
In-Reply-To: <0f33ca85-f1c6-bab3-5bdb-233c09f86621@amd.com>
Hi Tom:
Thanks for your review.
On 10/1/2021 2:27 AM, Tom Lendacky wrote:
> On 9/30/21 8:05 AM, Tianyu Lan wrote:
>> From: Tianyu Lan <Tianyu.Lan@microsoft.com>
>>
>
> ...
>
>> diff --git a/arch/x86/kernel/sev-shared.c b/arch/x86/kernel/sev-shared.c
>> index 9f90f460a28c..dd7f37de640b 100644
>> --- a/arch/x86/kernel/sev-shared.c
>> +++ b/arch/x86/kernel/sev-shared.c
>> @@ -94,10 +94,9 @@ static void vc_finish_insn(struct es_em_ctxt *ctxt)
>> ctxt->regs->ip += ctxt->insn.length;
>> }
>> -static enum es_result sev_es_ghcb_hv_call(struct ghcb *ghcb,
>> - struct es_em_ctxt *ctxt,
>> - u64 exit_code, u64 exit_info_1,
>> - u64 exit_info_2)
>> +enum es_result sev_es_ghcb_hv_call_simple(struct ghcb *ghcb,
>> + u64 exit_code, u64 exit_info_1,
>> + u64 exit_info_2)
>> {
>> enum es_result ret;
>> @@ -109,29 +108,45 @@ static enum es_result sev_es_ghcb_hv_call(struct
>> ghcb *ghcb,
>> ghcb_set_sw_exit_info_1(ghcb, exit_info_1);
>> ghcb_set_sw_exit_info_2(ghcb, exit_info_2);
>> - sev_es_wr_ghcb_msr(__pa(ghcb));
>> VMGEXIT();
>> - if ((ghcb->save.sw_exit_info_1 & 0xffffffff) == 1) {
>> - u64 info = ghcb->save.sw_exit_info_2;
>> - unsigned long v;
>> -
>> - info = ghcb->save.sw_exit_info_2;
>> - v = info & SVM_EVTINJ_VEC_MASK;
>> -
>> - /* Check if exception information from hypervisor is sane. */
>> - if ((info & SVM_EVTINJ_VALID) &&
>> - ((v == X86_TRAP_GP) || (v == X86_TRAP_UD)) &&
>> - ((info & SVM_EVTINJ_TYPE_MASK) == SVM_EVTINJ_TYPE_EXEPT)) {
>> - ctxt->fi.vector = v;
>> - if (info & SVM_EVTINJ_VALID_ERR)
>> - ctxt->fi.error_code = info >> 32;
>> - ret = ES_EXCEPTION;
>> - } else {
>> - ret = ES_VMM_ERROR;
>> - }
>> - } else {
>> + if ((ghcb->save.sw_exit_info_1 & 0xffffffff) == 1)
>
> Really, any non-zero value indicates an error, so this should be:
>
> if (ghcb->save.sw_exit_info_1 & 0xffffffff) >
>> + ret = ES_VMM_ERROR;
>> + else
>> ret = ES_OK;
>> +
>> + return ret;
>> +}
>> +
>> +static enum es_result sev_es_ghcb_hv_call(struct ghcb *ghcb,
>> + struct es_em_ctxt *ctxt,
>> + u64 exit_code, u64 exit_info_1,
>> + u64 exit_info_2)
>> +{
>> + unsigned long v;
>> + enum es_result ret;
>> + u64 info;
>> +
>> + sev_es_wr_ghcb_msr(__pa(ghcb));
>> +
>> + ret = sev_es_ghcb_hv_call_simple(ghcb, exit_code, exit_info_1,
>> + exit_info_2);
>> + if (ret == ES_OK)
>> + return ret;
>> +
>
> And then here, the explicit check for 1 should be performed and if not
> 1, then return ES_VMM_ERROR. If it is 1, then check the event injection
> values. >
> Thanks,
> Tom
Good suggestion. Will update.
>
>> + info = ghcb->save.sw_exit_info_2;
>> + v = info & SVM_EVTINJ_VEC_MASK;
>> +
>> + /* Check if exception information from hypervisor is sane. */
>> + if ((info & SVM_EVTINJ_VALID) &&
>> + ((v == X86_TRAP_GP) || (v == X86_TRAP_UD)) &&
>> + ((info & SVM_EVTINJ_TYPE_MASK) == SVM_EVTINJ_TYPE_EXEPT)) {
>> + ctxt->fi.vector = v;
>> + if (info & SVM_EVTINJ_VALID_ERR)
>> + ctxt->fi.error_code = info >> 32;
>> + ret = ES_EXCEPTION;
>> + } else {
>> + ret = ES_VMM_ERROR;
>> }
>> return ret;
next prev parent reply other threads:[~2021-10-01 13:45 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-30 13:05 [PATCH V6 0/8] x86/Hyper-V: Add Hyper-V Isolation VM support(First part) Tianyu Lan
2021-09-30 13:05 ` [PATCH V6 1/8] x86/hyperv: Initialize GHCB page in Isolation VM Tianyu Lan
2021-09-30 13:05 ` [PATCH V6 2/8] x86/hyperv: Initialize shared memory boundary in the " Tianyu Lan
2021-09-30 13:05 ` [PATCH V6 3/8] x86/hyperv: Add new hvcall guest address host visibility support Tianyu Lan
2021-09-30 18:02 ` Borislav Petkov
2021-10-01 13:17 ` Tianyu Lan
2021-09-30 13:05 ` [PATCH V6 4/8] Drivers: hv: vmbus: Mark vmbus ring buffer visible to host in Isolation VM Tianyu Lan
2021-09-30 13:05 ` [PATCH V6 5/8] x86/hyperv: Add Write/Read MSR registers via ghcb page Tianyu Lan
2021-09-30 18:20 ` Borislav Petkov
2021-10-01 13:31 ` Tianyu Lan
2021-09-30 18:27 ` Tom Lendacky
2021-09-30 18:33 ` Borislav Petkov
2021-10-01 13:44 ` Tianyu Lan [this message]
2021-09-30 18:34 ` Tom Lendacky
2021-09-30 13:05 ` [PATCH V6 6/8] x86/hyperv: Add ghcb hvcall support for SNP VM Tianyu Lan
2021-09-30 13:05 ` [PATCH V6 7/8] Drivers: hv: vmbus: Add SNP support for VMbus channel initiate message Tianyu Lan
2021-10-02 13:26 ` Michael Kelley
2021-10-02 14:39 ` Tianyu Lan
2021-10-04 2:39 ` Michael Kelley
2021-09-30 13:05 ` [PATCH V6 8/8] Drivers: hv : vmbus: Initialize VMbus ring buffer for Isolation VM Tianyu Lan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5d13faf8-0733-10cc-6e2e-c43b400f7d69@gmail.com \
--to=ltykernel@gmail.com \
--cc=Tianyu.Lan@microsoft.com \
--cc=akpm@linux-foundation.org \
--cc=aneesh.kumar@linux.ibm.com \
--cc=arnd@arndb.de \
--cc=bp@alien8.de \
--cc=brijesh.singh@amd.com \
--cc=dave.hansen@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=davem@davemloft.net \
--cc=decui@microsoft.com \
--cc=gregkh@linuxfoundation.org \
--cc=haiyangz@microsoft.com \
--cc=hch@lst.de \
--cc=hpa@zytor.com \
--cc=joro@8bytes.org \
--cc=jroedel@suse.de \
--cc=kirill.shutemov@linux.intel.com \
--cc=konrad.wilk@oracle.com \
--cc=kuba@kernel.org \
--cc=kys@microsoft.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=michael.h.kelley@microsoft.com \
--cc=mingo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=parri.andrea@gmail.com \
--cc=peterz@infradead.org \
--cc=pgonda@google.com \
--cc=rientjes@google.com \
--cc=robin.murphy@arm.com \
--cc=rppt@kernel.org \
--cc=saravanand@fb.com \
--cc=sthemmin@microsoft.com \
--cc=tglx@linutronix.de \
--cc=thomas.lendacky@amd.com \
--cc=tj@kernel.org \
--cc=vkuznets@redhat.com \
--cc=wei.liu@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).