From patchwork Tue Feb 21 11:34:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 59876 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1812158wrn; Tue, 21 Feb 2023 03:35:51 -0800 (PST) X-Google-Smtp-Source: AK7set/J+0JfFjbylGbeh3NY0Wt/5TdExt6w0dCE6ACZKGoCjJMf5wHwBHCxYhvzcrbhJig/FFMl X-Received: by 2002:a05:6a20:2451:b0:c0:b55b:8259 with SMTP id t17-20020a056a20245100b000c0b55b8259mr16335826pzc.0.1676979351219; Tue, 21 Feb 2023 03:35:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676979351; cv=none; d=google.com; s=arc-20160816; b=mCyyx4agPjPCPAuUXOxFNd9eKRkKChS/alCnXss8bqX38zakgbaYm1GsngbFs9E3tf kvCGr3piCwqV/qJA7911cV4FD3htMhsdbvOT1hCiayOPicCIpAtR+8PZACTAdR5hEmbH cNvMs7Dsgat6J4kGIWdNrlYI2nil3Z1kdlkNl+ByMGOPT37oPz7V0hxNGbp986gz3XPc 4XWvfzycYEsRz3WdLW82GHNgXJ8RSnGbEI/+8b2mCj1xzDXeQ84pjXKlPNmMROU9S/kH qnecQwntGays+rjMz5SWN/VAFc3LOAfJiY3dtEysXLSjw/+moG6M/t2fC6sgfiRLfqoL N11A== 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=eIxV1gF+0xxMeTGWWux4B6qDSXGFkU3ZGwakcGga7O0=; b=rU9aqQdQBlc+fPBJ35gVskLa3c5eE5+K0MaOYpmqXe30+TAXslHAL4lyj5Zv76m5jk O99AKO6mMoKTCyk792HIX3JXQlONQMHng+Y4fi/uMRhBpN8uVgaXmVDBNBKCZj7k9phh tbYNq1epwMJmV4FIVlcdTRFZ/LK0+DEhAj6m3gRHqb+m02Y1c6p/uEvR0NJsyuEwZT6y bq6+Q5toC3wjRlRwHMYJSQkQJqHmI7E1Eu2d6gh8LSEdPK7IFuV1C0neDaNEbmWozVQJ CfI8KTj3BHfEnnsztsXUEcg6R0zDb4HSav0wscpRhJjjq+60w+6/DjXOjDGuU6f5+IAu 08HA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@alien8.de header.s=dkim header.b=ZpmskPJi; 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 fd5-20020a056a002e8500b005924b9f5b9dsi5414885pfb.333.2023.02.21.03.35.38; Tue, 21 Feb 2023 03:35:51 -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=ZpmskPJi; 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 S234166AbjBULew (ORCPT + 99 others); Tue, 21 Feb 2023 06:34:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233151AbjBULel (ORCPT ); Tue, 21 Feb 2023 06:34:41 -0500 Received: from mail.skyhub.de (mail.skyhub.de [5.9.137.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7249F234E0 for ; Tue, 21 Feb 2023 03:34:39 -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 C8C8F1EC0662; Tue, 21 Feb 2023 12:34:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=dkim; t=1676979277; 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=eIxV1gF+0xxMeTGWWux4B6qDSXGFkU3ZGwakcGga7O0=; b=ZpmskPJims9Hyc9dnmgeiYuGxje5mn0CO+IORb6lkVE++tmyaqBr+fekPt4jmfGXeUcGPu zLDVvfAhZZ/TR3k89W4U7PKjtyjOQMfQy8+ZXxp7Tc6VPmKeOOpLJxJxpWIvy4p3ibOT1K acb4yQU4Ykknp8PzRcHsdMYUx1ARNL8= 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 04/11] virt/coco/sev-guest: Remove the disable_vmpck label in handle_guest_request() Date: Tue, 21 Feb 2023 12:34:21 +0100 Message-Id: <20230221113428.19324-5-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?1758440300387319258?= X-GMAIL-MSGID: =?utf-8?q?1758440300387319258?= From: "Borislav Petkov (AMD)" Call the function directly instead. No functional changes. Signed-off-by: Borislav Petkov (AMD) --- drivers/virt/coco/sev-guest/sev-guest.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/virt/coco/sev-guest/sev-guest.c b/drivers/virt/coco/sev-guest/sev-guest.c index 5b4cddf44a3a..c0ecc5885573 100644 --- a/drivers/virt/coco/sev-guest/sev-guest.c +++ b/drivers/virt/coco/sev-guest/sev-guest.c @@ -388,7 +388,8 @@ static int handle_guest_request(struct snp_guest_dev *snp_dev, u64 exit_code, in dev_alert(snp_dev->dev, "Detected error from ASP request. rc: %d, fw_err: %llu\n", rc, *fw_err); - goto disable_vmpck; + snp_disable_vmpck(snp_dev); + return rc; } rc = verify_and_dec_payload(snp_dev, resp_buf, resp_sz); @@ -396,17 +397,14 @@ static int handle_guest_request(struct snp_guest_dev *snp_dev, u64 exit_code, in dev_alert(snp_dev->dev, "Detected unexpected decode failure from ASP. rc: %d\n", rc); - goto disable_vmpck; + snp_disable_vmpck(snp_dev); + return rc; } /* Increment to new message sequence after payload decryption was successful. */ snp_inc_msg_seqno(snp_dev); return 0; - -disable_vmpck: - snp_disable_vmpck(snp_dev); - return rc; } static int get_report(struct snp_guest_dev *snp_dev, struct snp_guest_request_ioctl *arg)