Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20221104201616.2268815-1-dionnaglaze@google.com> <20221104201616.2268815-5-dionnaglaze@google.com>
In-Reply-To: <20221104201616.2268815-5-dionnaglaze@google.com>
From:   Peter Gonda <pgonda@google.com>
Date:   Fri, 4 Nov 2022 15:50:49 -0600
Message-ID: <CAMkAt6qmgOTqLOy5V4=zLuqjVusCRtGD0AeXndYO4mkAVgu1oA@mail.gmail.com>
Subject: Re: [PATCH v7 4/4] virt: sev-guest: interpret VMM errors from guest request
To:     Dionna Glaze <dionnaglaze@google.com>
Cc:     linux-kernel@vger.kernel.org, x86@kernel.org,
        Tom Lendacky <Thomas.Lendacky@amd.com>,
        Borislav Petkov <bp@suse.de>,
        Liam Merwick <liam.merwick@oracle.com>,
        Yang Yingliang <yangyingliang@huawei.com>,
        Haowen Bai <baihaowen@meizu.com>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

> diff --git a/include/uapi/linux/sev-guest.h b/include/uapi/linux/sev-guest.h
> index 256aaeff7e65..8e4144aa78c9 100644
> --- a/include/uapi/linux/sev-guest.h
> +++ b/include/uapi/linux/sev-guest.h
> @@ -52,8 +52,15 @@ struct snp_guest_request_ioctl {
>         __u64 req_data;
>         __u64 resp_data;
>
> -       /* firmware error code on failure (see psp-sev.h) */
> -       __u64 fw_err;
> +       /* bits[63:32]: VMM error code, bits[31:0] firmware error code (see psp-sev.h) */
> +       union {
> +               __u64 exitinfo2;
> +               __u64 fw_err; /* Name deprecated in favor of others */
> +               struct {
> +                       __u32 fw_error;
> +                       __u32 vmm_error;
> +               };
> +       };
>  };

LGTM, especially with feedback on the last path for just passing
snp_guest_request_ioctl. But thats a nit.

>
>  struct snp_ext_report_req {
> @@ -77,4 +84,11 @@ struct snp_ext_report_req {
>  /* Get SNP extended report as defined in the GHCB specification version 2. */
>  #define SNP_GET_EXT_REPORT _IOWR(SNP_GUEST_REQ_IOC_TYPE, 0x2, struct snp_guest_request_ioctl)
>
> +/* Guest message request EXIT_INFO_2 constants */
> +#define SNP_GUEST_FW_ERR_MASK          GENMASK_ULL(31, 0)
> +#define SNP_GUEST_VMM_ERR_SHIFT                32
> +
> +#define SNP_GUEST_VMM_ERR_INVALID_LEN  1
> +#define SNP_GUEST_VMM_ERR_BUSY         2
> +
>  #endif /* __UAPI_LINUX_SEV_GUEST_H_ */
> --
> 2.38.1.431.g37b22c650d-goog
>