From patchwork Tue Nov 2 16:48:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 12599381 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91189C433EF for ; Tue, 2 Nov 2021 16:48:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 73F8E6112F for ; Tue, 2 Nov 2021 16:48:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234759AbhKBQvM (ORCPT ); Tue, 2 Nov 2021 12:51:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:52258 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234966AbhKBQvB (ORCPT ); Tue, 2 Nov 2021 12:51:01 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7B06D60EB8; Tue, 2 Nov 2021 16:48:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1635871706; bh=JcmE633qNoTx2/kV2kafIRHAI69ez3qXVDLyj130NYw=; h=From:To:Cc:Subject:Date:From; b=PPRl302Uigu9WsZFYtlwkQ57vPNmuJHpjfri9BpNne4jVGKpHUsqqqqGP6DaAM7AS GYQYyCH/U+FT+5pzZGLxXkHU3FhmJqL8umEY7T+q0NLEnDDiTH+F3CzuWo5PBN1iW7 iYX4DnLM56BgywZi6OxG3OmCIGrEET01MXvjFUu3HDOzkomK/RW0iDx2NolhRG3BqA ff4975q6iMw2CqRBxZNPhY5MNM4yq7ntL1+m8x0IBqdOfUAKhncoZwRIwB24vJNaED bgIV/BAcIRQqPBHmZ+ER3m9vsr4J2DZCr1K3dyHFEPT80yqDyEQg81MAZsgJj08G/N PzH1G104bgEpA== From: Jarkko Sakkinen To: Jarkko Sakkinen , Dave Hansen , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" Cc: reinette.chatre@intel.com, tony.luck@intel.com, nathaniel@profian.com, linux-sgx@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v10 1/2] x86/sgx: Rename fallback labels in sgx_init() Date: Tue, 2 Nov 2021 18:48:18 +0200 Message-Id: <20211102164820.593385-1-jarkko@kernel.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-sgx@vger.kernel.org It's hard to add new content to this function because it is time consuming to match fallback and its cause. Rename labels in a way that the name of error label refers to the site where failure happened. This way it is easier to keep on track what is going on. Signed-off-by: Jarkko Sakkinen --- v5: * A new patch. --- arch/x86/kernel/cpu/sgx/main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c index 63d3de02bbcc..a6e313f1a82d 100644 --- a/arch/x86/kernel/cpu/sgx/main.c +++ b/arch/x86/kernel/cpu/sgx/main.c @@ -803,12 +803,12 @@ static int __init sgx_init(void) if (!sgx_page_reclaimer_init()) { ret = -ENOMEM; - goto err_page_cache; + goto err_reclaimer; } ret = misc_register(&sgx_dev_provision); if (ret) - goto err_kthread; + goto err_provision; /* * Always try to initialize the native *and* KVM drivers. @@ -821,17 +821,17 @@ static int __init sgx_init(void) ret = sgx_drv_init(); if (sgx_vepc_init() && ret) - goto err_provision; + goto err_driver; return 0; -err_provision: +err_driver: misc_deregister(&sgx_dev_provision); -err_kthread: +err_provision: kthread_stop(ksgxd_tsk); -err_page_cache: +err_reclaimer: for (i = 0; i < sgx_nr_epc_sections; i++) { vfree(sgx_epc_sections[i].pages); memunmap(sgx_epc_sections[i].virt_addr);