From patchwork Tue Mar 7 19:24:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 65822 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2631270wrd; Tue, 7 Mar 2023 11:58:21 -0800 (PST) X-Google-Smtp-Source: AK7set+CI2YgiDKUPtwhjEB+eiWBwWghCHA/xZ3MXUfYdv1axxLpxsdivBAhDBInUojj1bYd8VOW X-Received: by 2002:a17:907:31c3:b0:8af:2d2e:5d31 with SMTP id xf3-20020a17090731c300b008af2d2e5d31mr21052214ejb.31.1678219101243; Tue, 07 Mar 2023 11:58:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678219101; cv=none; d=google.com; s=arc-20160816; b=0kO5qSVbX2nti7RGHs+ecfxKRd2nuSC7xq3xHdlPPQspb9ypv7aOEm90ygfDxen4p9 0HOLAc5P4cumeQyarhR/Wz8AyE8VTZKrGUEcPsd0ByANzpL+VShLTz3dpZJZJogzt+Yx lXKctEk6e4HvzHTb/asHDNd5phdLw/wdJpRuDHb/VvrPuQqB2/ekHc3o8dalGz7Scd84 hbAQDCgxuHzjRFHIO0hm1K+rHrLePZnd6QP9hwng3mqBlhNIRPqOO4gdYADl9CJ0mggV HD9f09GH0ZRClFeLBPtA2kQt++6nd8rCOuHwfSM36RFW4qaJRO5wuAcxgZrFDUjV9d58 rqCg== 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=WcyoixC2EelL7IpGg5rrSKxc8ATNU7FnXy0NB/gPXKs=; b=E7metzVy6nQDV36074XKgLCIDPtCb6BEaxRSPZAB9x4kAqcArq2cDiDaBXZA311fKW 5AKMa0v5qcluRN5IBV8yo/wQ/vIu9klr/RJ7qrqVTqPLf1gvLkaCLR1awK8uwGG4wIYu 6YBG7MkjAbzudhmMZxjabcxyq+5z4y80qnKmKbjYW9Nvt4ymB+48EqWtryO24evqAWwc 4JBHpLqIS0439XeOBjOh+dBD+Th4YMHM022WTh+vcM4pLYBHtphZLLBu+HWxzq4dF4CI yfBZrau+nCfHaDtfwl8QNQhUkoKOq7xJRYYK7e2D1AfObIppoVj++n6A1cLqZQYYSPZ+ sM/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@alien8.de header.s=dkim header.b=YpXdP0Zf; 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 c17-20020a170906d19100b008d3be841ccdsi423244ejz.326.2023.03.07.11.57.57; Tue, 07 Mar 2023 11:58:21 -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=YpXdP0Zf; 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 S231995AbjCGTiM (ORCPT + 99 others); Tue, 7 Mar 2023 14:38:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234242AbjCGThj (ORCPT ); Tue, 7 Mar 2023 14:37:39 -0500 Received: from mail.skyhub.de (mail.skyhub.de [IPv6:2a01:4f8:190:11c2::b:1457]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 091E6B8624 for ; Tue, 7 Mar 2023 11:24:59 -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 2A6651EC068F; Tue, 7 Mar 2023 20:24:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=dkim; t=1678217098; 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=WcyoixC2EelL7IpGg5rrSKxc8ATNU7FnXy0NB/gPXKs=; b=YpXdP0ZfYnL1cACp6ZkqWwJZe2QsMmfIY4zKeossGJiHp/rw2hmpHwhsKHwKAgo3xLYvcA h3FsHBe/rka5PsA/4/qp2hwCs0/Es3Yyr4vxelGRFGzhw6otPIheJuuqSWdFoJ2ENRVxvZ KUsFF7RN2v9z4W3AwK8SGIirj981q4o= 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 04/11] virt/coco/sev-guest: Remove the disable_vmpck label in handle_guest_request() Date: Tue, 7 Mar 2023 20:24:42 +0100 Message-Id: <20230307192449.24732-5-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?1759740272337661957?= X-GMAIL-MSGID: =?utf-8?q?1759740272337661957?= 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 e61db0b15b7a..a51bd4afd5ab 100644 --- a/drivers/virt/coco/sev-guest/sev-guest.c +++ b/drivers/virt/coco/sev-guest/sev-guest.c @@ -405,7 +405,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); @@ -413,14 +414,11 @@ 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; } 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)