From patchwork Tue Sep 28 03:13:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 12521631 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 B7216C433EF for ; Tue, 28 Sep 2021 03:13:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 93D8E61279 for ; Tue, 28 Sep 2021 03:13:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238759AbhI1DPd (ORCPT ); Mon, 27 Sep 2021 23:15:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:60792 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238748AbhI1DPd (ORCPT ); Mon, 27 Sep 2021 23:15:33 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 67DEA61247; Tue, 28 Sep 2021 03:13:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1632798833; bh=A5JjSqQqqmNCBm8EoFfpWALTQCWo2oxS2dNo7ehbaeQ=; h=From:To:Cc:Subject:Date:From; b=Ot+PCdK3dU0X+LceWvmfaJuDOBaK4NO9Hr5SMqUbrM3Eb6wzQudl2SXsIFcgKYgpY AbN9XZ2Sz0WpJSXMw9oPtQ29rzcf+yef8zo19B+lwnaCKZHYNSc1vLijHjrbwzSgGR 06uV/6Dwz0R3kJhVDfEiU75Exx4RVOgRJLqrznIUanEHeUBHu2ESgovFgdhPMgXxCN mnVoeCxh8tD8f+/Y0kqnts4+vYMl9dPDMuaX32mT7PBn4AkZ+yQZ4AVz9q50uMYruf 2dD6R7joVR79jFXS4B22dRS/x5PWiyYZQBpFCpr/hutzlo3fe7GpBdhyPMdFm04j+F fCLsVrGqsubCQ== 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, linux-sgx@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 1/2] x86/sgx: Rename fallback labels in sgx_init() Date: Tue, 28 Sep 2021 06:13:49 +0300 Message-Id: <20210928031350.63464-1-jarkko@kernel.org> X-Mailer: git-send-email 2.25.1 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);