From patchwork Thu Oct 13 16:00:39 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: 2086 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp353837wrs; Thu, 13 Oct 2022 09:02:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4XetP0EboZ0LOgS2h6uKTyXuaaQ3nL67MUwxH4hzo5j13oi5EW4QHJfxK3qHV2TQMdccdy X-Received: by 2002:a17:90b:4f46:b0:20d:1fe8:dcd2 with SMTP id pj6-20020a17090b4f4600b0020d1fe8dcd2mr11940329pjb.235.1665676933156; Thu, 13 Oct 2022 09:02:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665676933; cv=none; d=google.com; s=arc-20160816; b=ICt0wmQdENh1N1boOt7jii3pLcH99d1bcB5l0yF4u4h8JNeVyIgVrMSyQBdt8HZuSv jtnm2OFm0BzlMs0/U6NXj18/+M0jw48tJdcAKz3QHQMsuwKAjGmF2YpAsnETdVXMJ2ta i5D1v9UA6Iyff12VB/VSnRoKxXbXodC5s3F5iadncXT4eNhFOdSkRWlg4FxaOZNQGpLr 1lnZV+1lmD2VfsHSmuaW0bfDY/OEc2XLG3VvefKZSP7j6gSWv9bTkZuR6zX6zigvgq5X JBIO2sueZmi1hvmgUjO88mQWNFNgOWUHuOYM1s9O/z1Pk/zM17liWA8zDGBa6C3aBTlU 6BmQ== 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=MFIZXP+0RvRDVkccAAekEgFLUK+lQGqw03T8y+VqePQ=; b=JQjqkt5XR2ONoQ2gV3mKGJ6AjR5Bronq0OjQrVbv3dc6z27TXGeFvL/IksKKXJs8Sy yLhC4vAU4uuoufxLB6gBzIRcf+0iBq3Lu0krAr63icyhuS8D+UyQAD6QrA6wnXMP2/Ol T3u9+YSwrJa2u6TGOTQ7kAqY2wIIFRF4mFn2ZZQUQT9RbQWOWk8bLXTsC/twgDmnPcQF N9ZMkiBlXKiv/LqQzGce+/kjTaojhliCxvtKkSPSyP0aBbL5piJUN/tpmdFkkEo53g90 ZdUqkmdOYvvdMqsNSFE7hsSlIYS0cBQ31WnHr3g5ItM8crmg8xw+k3J46nFl9JcJ3xIs acmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=MAazyoS2; 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 d19-20020a63ed13000000b004479c5e73ffsi21329133pgi.474.2022.10.13.09.01.50; Thu, 13 Oct 2022 09:02:13 -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=MAazyoS2; 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 S229660AbiJMQBC (ORCPT + 99 others); Thu, 13 Oct 2022 12:01:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229513AbiJMQBA (ORCPT ); Thu, 13 Oct 2022 12:01:00 -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 5012EFE927 for ; Thu, 13 Oct 2022 09:00:59 -0700 (PDT) Received: by mail-pl1-x649.google.com with SMTP id o1-20020a170902d4c100b00177f59a9889so1549758plg.13 for ; Thu, 13 Oct 2022 09:00:59 -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=MFIZXP+0RvRDVkccAAekEgFLUK+lQGqw03T8y+VqePQ=; b=MAazyoS2V7THRiFDYYrrOq38Kf4Z8t7qlDLZXLyAdEelxB2juuPZPHrgmYaXI7/l09 cC9pivN4wW60IymPa9roTYnEkbv7Lw8k42QPDv6xI+aIwyoXgjCe5dchPx5XvtE5dazN NSeoxzxNxRSohb2VJoENXopTKZiZ3LGN95Cs8eRVA/feFNHmkJ547gOMu0aqiynUoAUs Ac6j35o9lmhM1rWlUuPtmqQhZwCD3UxlJotuiAOHxXsOY4QbNO2N6KlyXV0y9TDWZPJ1 eisp1tLqUa8QAjs1IxZSSXTTLY169aJPJPVdF+tor5cdtnZ6WHZRXvJ9zNZ6leYmjXao +u3w== 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=MFIZXP+0RvRDVkccAAekEgFLUK+lQGqw03T8y+VqePQ=; b=c4XQRTK3HT63HgGsw2MWquFpWxRh9Lr7TpETBOd4bgYTtjCVnn7K7OVxRlGWUizhYt O/TDnNAMs+/TVBP49J91yNV/4AvWOYeSSdgkqhnX4zLv4caRS8TKMs2OG+09ttcfGyCR IDWgQNgkBZsdyo3nErzHABWhBttIrEBrGrjpHaTbulWClduDlmkqGQI8zhMpRrEm+g7l HQA3GGjt03luBjUSJ8SryLyQUxx/7WAx3fDnP7gWZrabjhc0kxWTU7wLg2iX3PQIBbgL u7HL0rStmuDQgsnmc8+9pxN1Xm62So627MFpVJO+JjdruoFEq122YaHYejxrq2vpXdKM i78w== X-Gm-Message-State: ACrzQf2p8cDJ0/74ZcLW5O1437zxl0qvs6RlOT7ysubXiUrSH7leOPqb 1PbyvmCup9wXIwRfwTCCqcZTv8q6D+R2pDpi+ggp3ELrcKviacbCvm6yWpuxQlGG3InPgv+zPdh iCRg06vS47ayXjUsU/69Xw3Aj4Z7C3Sd1phFeF/kRfidxi2Kj0eFI2Bs0qqpL1qKELDx7TpJdAF HshHU7nm0= X-Received: from dionnaglaze.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:2ee6]) (user=dionnaglaze job=sendgmr) by 2002:a05:6a00:17a9:b0:563:3255:8601 with SMTP id s41-20020a056a0017a900b0056332558601mr288210pfg.12.1665676858718; Thu, 13 Oct 2022 09:00:58 -0700 (PDT) Date: Thu, 13 Oct 2022 16:00:39 +0000 In-Reply-To: <20221013160040.2858732-1-dionnaglaze@google.com> Mime-Version: 1.0 References: <20221013160040.2858732-1-dionnaglaze@google.com> X-Mailer: git-send-email 2.38.0.413.g74048e4d9e-goog Message-ID: <20221013160040.2858732-2-dionnaglaze@google.com> Subject: [PATCH 1/2] x86/sev: Rename 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 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?1746588855839166463?= X-GMAIL-MSGID: =?utf-8?q?1746588855839166463?= 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. Cc: Tom Lendacky Cc: Paolo Bonzini Cc: Joerg Roedel Cc: Peter Gonda Cc: Thomas Gleixner Cc: Dave Hansen Signed-off-by: Dionna Glaze --- arch/x86/include/asm/sev.h | 4 ++-- arch/x86/kernel/sev.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/sev.h b/arch/x86/include/asm/sev.h index ebc271bb6d8e..4312d6be129f 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, unsigned long *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) + unsigned long *exitinfo2) { return -ENOTTY; } diff --git a/arch/x86/kernel/sev.c b/arch/x86/kernel/sev.c index a428c62330d3..a4eca63e8b90 100644 --- a/arch/x86/kernel/sev.c +++ b/arch/x86/kernel/sev.c @@ -2175,7 +2175,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, unsigned long *exitinfo2) { struct ghcb_state state; struct es_em_ctxt ctxt; @@ -2186,7 +2186,7 @@ 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; /* @@ -2218,7 +2218,7 @@ int snp_issue_guest_request(u64 exit_code, struct snp_req_data *input, unsigned 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; + *exitinfo2 = ghcb->save.sw_exit_info_2; ret = -EIO; }