From patchwork Tue Feb 21 11:34:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 59883 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1812803wrn; Tue, 21 Feb 2023 03:37:46 -0800 (PST) X-Google-Smtp-Source: AK7set/oZy2A8qV95YC+cto011vgC79cBSDAMSELAam1Tq+m1J50Sr+VfqQQVbCQM/I0rXesUpAQ X-Received: by 2002:a05:6402:14cf:b0:4aa:a442:4213 with SMTP id f15-20020a05640214cf00b004aaa4424213mr3118297edx.35.1676979466756; Tue, 21 Feb 2023 03:37:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676979466; cv=none; d=google.com; s=arc-20160816; b=mOQu3qK/O8zkzC7ow3bc/RNHdKt+XYNplPq9+dIBj6jpuYfU7k/5LOwIe5TNxGwhkL 7z8ZO4sdR691DCHttrS26JCoDrLpXa9A7VcPG7VrRn+KxmGZ8KsuFIGdX/1hE52z+hOe f/6QpXHniLx4ntDwBgnSBEjodi5NkUNxtXvsJ9Be+blFFZ9+1pJYymiER896m+TDiNYq Onle122zxo2pUIlSnZbC1k3qVSSaCVa8xD19QSoDkanwNrdFURfGQ3ffIxVg+6mvvrnD wiBziuEQiJ76gIDtG5EhIU7vTZxrtqrxUP+q56JleBl775xCNtkS5nafhx+fIPJy9aOm gpDg== 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=wMLtYXuc5BGk0w9E3FUUBpeS9UTJcavYP/fXSU1SRGlUKEYCzqI4TfwydTYwjoUXva SDwb+13AfcsQdLwK87urqpMhZZQqZ7G2rZ3iZxtaq0QMpuqnBJnWK+Yefpv8glry29wl FRKH6qKUWVtuM2dkUQ9cK6Deogt+zXFPyFnIHohAt39VJ51fRRSBMAZBFVf3E5/rGBYS AYCogv6R33ckhb5gEGfOPndS7o/nfC0qiEyfro+iF+pHrNVZKUA4qE2cZwhSKFSzZ7fJ fLE2YYBSp0zOLB39VZElIT6Eu7BQAV7gu6cIYVq6CIRu+BpHkiNkzgk0kIX+rh4gTS0Y gyPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@alien8.de header.s=dkim header.b=K1Qiusbp; 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 a11-20020aa7cf0b000000b004acc77edc4asi5108351edy.124.2023.02.21.03.37.23; Tue, 21 Feb 2023 03:37:46 -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=K1Qiusbp; 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 S233902AbjBULfH (ORCPT + 99 others); Tue, 21 Feb 2023 06:35:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233826AbjBULeo (ORCPT ); Tue, 21 Feb 2023 06:34:44 -0500 Received: from mail.skyhub.de (mail.skyhub.de [IPv6:2a01:4f8:190:11c2::b:1457]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34D142594D for ; Tue, 21 Feb 2023 03:34:41 -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 622981EC067C; Tue, 21 Feb 2023 12:34:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=dkim; t=1676979279; 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=K1QiusbpWj/Qs2KDQUM2zv48odDuqatgdvqb+53IWyQa4LC5CALTvIvubvy2eo9E9G6rZU eYWVG4ZIm6Y+K0DYbPI2ORGO2krxBpnOV/ypXVV1Cpzzi5yWN7xVeMBMQX2YEcK8r9NLO/ 2vFZEvidXnah5e+KwhGGTDoWCQkvolY= 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 -v2 07/11] virt/coco/sev-guest: Convert the sw_exit_info_2 checking to a switch-case Date: Tue, 21 Feb 2023 12:34:24 +0100 Message-Id: <20230221113428.19324-8-bp@alien8.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230221113428.19324-1-bp@alien8.de> References: <20230221113428.19324-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 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?1758440421006524102?= X-GMAIL-MSGID: =?utf-8?q?1758440421006524102?= 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: