From patchwork Tue Mar 7 19:24:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 65824 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2631452wrd; Tue, 7 Mar 2023 11:58:50 -0800 (PST) X-Google-Smtp-Source: AK7set8OI+HTEcNB7zcMedZVL85wzQWm0nO1SDXFvqmXThAuu/W0SGIHP9dSOFa6GvmMGnfacgjc X-Received: by 2002:aa7:c491:0:b0:4bf:b759:67bc with SMTP id m17-20020aa7c491000000b004bfb75967bcmr14781095edq.6.1678219130645; Tue, 07 Mar 2023 11:58:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678219130; cv=none; d=google.com; s=arc-20160816; b=GiEQHLMZIBYIrGynwnSGduAmln2OjqcB/6WaRcNqJUe5sn9pz82Y7CfiDdVdhQf6tr g/FmFwaxw1aUOEzq+23vEspCZil3aTe2D6bUnNT6jLFArTmfH9sV50TgSN5Q6KGaih8j bhn5FsU3G4Vi/AbY+MUThkuQUAifhxTs/Opj9/cpRg6YbLLfxgUi/NUDOogZeuKLKmHK 4tHUN4/dTddK9mxugAQlQHpc6ZPsG6QrCYXx5JtPF3+0rGyrsBcvcVIxvW34UP2YLprx /l8qVzt9C9+ef/pVXULY2emkTUNAGAq+SvFPVCM8DsbpLC7bGwbUyiQB7oAjqXamexas C2qA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=KR4vVsJESSCg86kIVXeeVz75YYrz3rzwdB6btBRiLEY=; b=m7u+icfgyLS6WDUZWEPHcwoGrfBWeLIPUsh0B4kdcHgkjomqeyvVs9Y1ds9J/JjEHX 8qwfdpU4dm+E+4kYNIJ+RMJ4X578ThqX7wT2l2guNMLsKA8wsj3yAj/kR4bwWf/3KA3n MD7ea6OEFlcpzzTvrLljBMdiFxcENuobHyEXtHxB4XxYyHXHR4rzH0JVGeJpL+ctoM0j 1kkWkc0J46aPF6rLT2tf3Tfq/cmiplfXUu0PTUouhuLLRHIzGyA8BHlPrrulY1+7ZyHM Eja804VZ26S7iNrcDsbUipPaHXAAYiHGOt2AOc9cs3GdZGQhBho9Vjsb2cfReBXcZg4V VKAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@alien8.de header.s=dkim header.b=BKZLhVL+; 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=NONE sp=NONE dis=NONE) header.from=alien8.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n24-20020a05640206d800b004accb663177si12879185edy.330.2023.03.07.11.58.26; Tue, 07 Mar 2023 11:58:50 -0800 (PST) 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=@alien8.de header.s=dkim header.b=BKZLhVL+; 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=NONE sp=NONE dis=NONE) header.from=alien8.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234287AbjCGTib (ORCPT + 99 others); Tue, 7 Mar 2023 14:38:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234173AbjCGThk (ORCPT ); Tue, 7 Mar 2023 14:37:40 -0500 Received: from mail.skyhub.de (mail.skyhub.de [5.9.137.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57EFDB862C for ; Tue, 7 Mar 2023 11:25:01 -0800 (PST) Received: from zn.tnic (p5de8e9fe.dip0.t-ipconnect.de [93.232.233.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.skyhub.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id BE4F71EC06A7; Tue, 7 Mar 2023 20:24:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=dkim; t=1678217099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KR4vVsJESSCg86kIVXeeVz75YYrz3rzwdB6btBRiLEY=; b=BKZLhVL+3GYzcNwfp+LpeD+VNii/UoHvTiUyjiyMJJ03TEqyChGvpkdxgvbOA/B77RPXyq P9z7zBmV6saBzpWcQCfELsHFTMgC5Js6SkplfvWSpxmXoq1Mh38WKKyjI38bwiMJG5rGmI 75q526oRCYxPK8ji45jbYL0k36xUQ68= From: Borislav Petkov To: LKML Cc: Dionna Glaze , Joerg Roedel , Michael Roth , Nikunj A Dadhania , Peter Gonda , Tom Lendacky , linux-coco@lists.linux.dev, x86@kernel.org Subject: [PATCH -v3 07/11] virt/coco/sev-guest: Convert the sw_exit_info_2 checking to a switch-case Date: Tue, 7 Mar 2023 20:24:45 +0100 Message-Id: <20230307192449.24732-8-bp@alien8.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230307192449.24732-1-bp@alien8.de> References: <20230307192449.24732-1-bp@alien8.de> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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?1759740303378230388?= X-GMAIL-MSGID: =?utf-8?q?1759740303378230388?= From: "Borislav Petkov (AMD)" snp_issue_guest_request() checks the value returned by the hypervisor in sw_exit_info_2 and returns a different error depending on it. Convert those checks into a switch-case to make it more readable when more error values are going to be checked in the future. No functional changes. Signed-off-by: Borislav Petkov (AMD) --- arch/x86/kernel/sev.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/sev.c b/arch/x86/kernel/sev.c index 6a3e1425ba17..d67884fb38c1 100644 --- a/arch/x86/kernel/sev.c +++ b/arch/x86/kernel/sev.c @@ -2210,15 +2210,21 @@ int snp_issue_guest_request(u64 exit_code, struct snp_req_data *input, unsigned goto e_put; *fw_err = ghcb->save.sw_exit_info_2; - if (ghcb->save.sw_exit_info_2) { + switch (*fw_err) { + case 0: + break; + + case SNP_GUEST_REQ_INVALID_LEN: /* 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) { + if (exit_code == SVM_VMGEXIT_EXT_GUEST_REQUEST) { input->data_npages = ghcb_get_rbx(ghcb); ret = -ENOSPC; - } else { - ret = -EIO; + break; } + fallthrough; + default: + ret = -EIO; + break; } e_put: