From patchwork Thu Nov 3 01:10:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dionna Amalie Glaze X-Patchwork-Id: 14575 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp245893wru; Wed, 2 Nov 2022 18:13:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM65YyLnesSsaahwcC/7FojwBPTRLXVTn4ibWWeEYH4ct8m4uID2UQmqu9ctD47uVxAaOI1U X-Received: by 2002:aa7:c389:0:b0:463:5926:7254 with SMTP id k9-20020aa7c389000000b0046359267254mr20096863edq.255.1667438037358; Wed, 02 Nov 2022 18:13:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667438037; cv=none; d=google.com; s=arc-20160816; b=ArGU5L7gelmfc5STIK625y0UEghJ9EsKaEshwugqEo7MUR6ucENjBmKEHlsA4Yu6Ik Bqhh/Etrs6OcecPzB73NWqi5eGj71yvpMbopOqfUIRpnTLmQl1qLvl2v3wQlZymziLbo 8fKpP5cfzrmFqheVc3vnbg1dbciyO5DCc3+RzA2qjq7+qPzdlHrZEhvIL/FkhOGecLZW nqS3AFlZi/fDU6fjl25t9mTkTtB7DvjKd1pWB8/xSXEtnrqDxbrOZjyhcyn6k1XbI1mF v9+MiSW8ARD6mknQ0g1PYeISTlZMIIloBw1HKMDaTvzwdepe6tPqjon2beXa/thBUbL3 EIWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:dkim-signature; bh=dOS13YU2U5T+1AmdnlWuqTgjd7kbK/oQZXyXRqKO1MM=; b=an2PSNv8ewMI6uuDxbuwhATh1xd7KHWxaKQ4nZlbL4k94Rwt2o20b25NwKWo66fQJR hp5dICsY2/e6wvEBcciRNlo6nYoaneeJ8XaF9LtoDhayRrieTOKGX6YMPQVKoCn3Rx2c B7lkiwCrO0+EdkiB8xoNxYY0eWUX4IjSD5gDroPU+vmAM0leuLNtuW2iL361sPnSnoDe Vs1rdbVe32DGSc8BPaH5lR3me0m8Ad01Up8xcG+gZ/IfY1WfI5UyqLbFuPf/ojmFcIzR mcyaZlN+LeuX//P6EOq+FKFBGUE91cmh0/THg6d0bjhJtGEZigheCCuOYz+78KlD0trJ 1phA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=iHkfIdFp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b14-20020a056402278e00b0046308b9a02dsi19243240ede.50.2022.11.02.18.13.33; Wed, 02 Nov 2022 18:13:57 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=iHkfIdFp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230244AbiKCBKw (ORCPT + 99 others); Wed, 2 Nov 2022 21:10:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230153AbiKCBKt (ORCPT ); Wed, 2 Nov 2022 21:10:49 -0400 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 899BD1261D for ; Wed, 2 Nov 2022 18:10:48 -0700 (PDT) Received: by mail-pl1-x649.google.com with SMTP id n12-20020a170902e54c00b00188515e81a6so361763plf.23 for ; Wed, 02 Nov 2022 18:10:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=dOS13YU2U5T+1AmdnlWuqTgjd7kbK/oQZXyXRqKO1MM=; b=iHkfIdFpf8EHwnvDvtg8UzS/2L7X4UjsKG/DzVXQoIjesUTRw0T6saIOgHA6TMS3KT XpsBpR796NmTL/pOw5ERty7FsJnyDp/NaMQSgVpRFfS75khNaVe/qk779HAoYDI6L2Wz wszfpqX05O4T2WWKU2mmr9OiDhrE+ZB9s0bSRiMbgh6Zg25DFqmwA02a8kZg+SxqeqSg 2F+MCtZCuRxgok/MF68Jh/Bli2PJkHtuSh75P9MpKenGK+x5XKCNHEE0VwKVd2UtlXet oxOAiR5rPtxizZmi7jrPfM2B661oJNN6Mbh87Eek1YRJ7RFE0Qz4CHl7G3OzHhHR9xGu H+rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=dOS13YU2U5T+1AmdnlWuqTgjd7kbK/oQZXyXRqKO1MM=; b=JYRHwy3HAcOHXSEBug/lGOd1ZfXk/jJutmELYLYb3DgbAOoOtoYHLDNSybna88BjRi bYHz4RYoQpdilpDSo2yORkz5YB3p3gO4ERwUeZHLcCaAVIcUJnuT/q9djf2bGIq6B73J eXQm6S8/gUAo3d2l4ibE09bGCLnO5xr6qoLzMKX0dojBmGrpjYdFBc5GNaH7UOnEJals ilqZM4lW4nibuFoTD46dxgRgV3OZllTERtgEfTjf92+6FKtm4bhhH4hVKte/iDx2RJph 1gkJiLYtEAbmC7sxHvRanXKAbP0kq7onPBHmYjnQJzkpPL3Q5f+YWi8e2MT1d9GVQE4E XW3A== X-Gm-Message-State: ACrzQf0HvasJwtexzemLjswBO5R3W0dN2d8/3ybmxNa0PG/DbzQBbf3/ j6Efg1zGaId1kR6pUi5vFWpXwz+uXfJq6qpJI43QS8h/T1lEIgHKmN4ZAUYKdErBld2PKIpRlHB MysdeeJP4A32TWXz3brit1XsN5aT9h68RoeDPkiuKUDrSj78tuvdOvUbi2se3Vg3I5uH6utxKd3 +E3ex7sxk= X-Received: from dionnaglaze.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:2ee6]) (user=dionnaglaze job=sendgmr) by 2002:a62:4c6:0:b0:55f:c739:51e0 with SMTP id 189-20020a6204c6000000b0055fc73951e0mr27365239pfe.49.1667437847829; Wed, 02 Nov 2022 18:10:47 -0700 (PDT) Date: Thu, 3 Nov 2022 01:10:36 +0000 In-Reply-To: <20221103011038.1542614-1-dionnaglaze@google.com> Mime-Version: 1.0 References: <20221103011038.1542614-1-dionnaglaze@google.com> X-Mailer: git-send-email 2.38.1.273.g43a17bfeac-goog Message-ID: <20221103011038.1542614-3-dionnaglaze@google.com> Subject: [PATCH v6 2/4] x86/sev: Change snp_guest_issue_request's fw_err From: Dionna Glaze To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Dionna Glaze , Tom Lendacky , Paolo Bonzini , Joerg Roedel , Peter Gonda , Thomas Gleixner , Dave Hansen , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , Venu Busireddy , Michael Roth , "Kirill A. Shutemov" , Michael Sterritt X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748435507433865207?= X-GMAIL-MSGID: =?utf-8?q?1748435507433865207?= The GHCB specification declares that the firmware error value for a guest request will be stored in the lower 32 bits of EXIT_INFO_2. The upper 32 bits are for the VMM's own error code. The fw_err argument is thus a misnomer, and callers will need access to all 64 bits. The type of unsigned long also causes problems, since sw_exit_info2 is u64 (unsigned long long) vs the argument's previous unsigned long*. The signature change requires the follow-up change to drivers/virt/coco/sev-guest to use the new expected type in order to compile. The firmware might not even be called, so we bookend the call with the no firmware call error and clearing the error. Cc: Tom Lendacky Cc: Paolo Bonzini Cc: Joerg Roedel Cc: Peter Gonda Cc: Thomas Gleixner Cc: Dave Hansen Cc: Ingo Molnar Cc: Borislav Petkov Cc: "H. Peter Anvin" Cc: Venu Busireddy Cc: Michael Roth Cc: "Kirill A. Shutemov" Cc: Michael Sterritt Fixes: d5af44dde546 ("x86/sev: Provide support for SNP guest request NAEs") Signed-off-by: Dionna Glaze --- arch/x86/include/asm/sev.h | 4 ++-- arch/x86/kernel/sev.c | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/sev.h b/arch/x86/include/asm/sev.h index ebc271bb6d8e..05de34d10d89 100644 --- a/arch/x86/include/asm/sev.h +++ b/arch/x86/include/asm/sev.h @@ -196,7 +196,7 @@ void snp_set_memory_private(unsigned long vaddr, unsigned int npages); void snp_set_wakeup_secondary_cpu(void); bool snp_init(struct boot_params *bp); void __init __noreturn snp_abort(void); -int snp_issue_guest_request(u64 exit_code, struct snp_req_data *input, unsigned long *fw_err); +int snp_issue_guest_request(u64 exit_code, struct snp_req_data *input, u64 *exitinfo2); #else static inline void sev_es_ist_enter(struct pt_regs *regs) { } static inline void sev_es_ist_exit(void) { } @@ -217,7 +217,7 @@ static inline void snp_set_wakeup_secondary_cpu(void) { } static inline bool snp_init(struct boot_params *bp) { return false; } static inline void snp_abort(void) { } static inline int snp_issue_guest_request(u64 exit_code, struct snp_req_data *input, - unsigned long *fw_err) + u64 *exitinfo2) { return -ENOTTY; } diff --git a/arch/x86/kernel/sev.c b/arch/x86/kernel/sev.c index a428c62330d3..148f17cb07b5 100644 --- a/arch/x86/kernel/sev.c +++ b/arch/x86/kernel/sev.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -2175,7 +2176,7 @@ static int __init init_sev_config(char *str) } __setup("sev=", init_sev_config); -int snp_issue_guest_request(u64 exit_code, struct snp_req_data *input, unsigned long *fw_err) +int snp_issue_guest_request(u64 exit_code, struct snp_req_data *input, u64 *exitinfo2) { struct ghcb_state state; struct es_em_ctxt ctxt; @@ -2186,9 +2187,11 @@ int snp_issue_guest_request(u64 exit_code, struct snp_req_data *input, unsigned if (!cc_platform_has(CC_ATTR_GUEST_SEV_SNP)) return -ENODEV; - if (!fw_err) + if (!exitinfo2) return -EINVAL; + *exitinfo2 = SEV_RET_NO_FW_CALL; + /* * __sev_get_ghcb() needs to run with IRQs disabled because it is using * a per-CPU GHCB. @@ -2212,14 +2215,13 @@ int snp_issue_guest_request(u64 exit_code, struct snp_req_data *input, unsigned if (ret) goto e_put; + *exitinfo2 = ghcb->save.sw_exit_info_2; if (ghcb->save.sw_exit_info_2) { /* Number of expected pages are returned in RBX */ if (exit_code == SVM_VMGEXIT_EXT_GUEST_REQUEST && ghcb->save.sw_exit_info_2 == SNP_GUEST_REQ_INVALID_LEN) input->data_npages = ghcb_get_rbx(ghcb); - *fw_err = ghcb->save.sw_exit_info_2; - ret = -EIO; }