From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1E4EDC11FF7 for ; Mon, 23 Sep 2019 20:34:53 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CC87C20673 for ; Mon, 23 Sep 2019 20:34:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b="T60+YUHd" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CC87C20673 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=soleen.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 7D5A06B0289; Mon, 23 Sep 2019 16:34:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7AC836B028A; Mon, 23 Sep 2019 16:34:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6733D6B028B; Mon, 23 Sep 2019 16:34:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0045.hostedemail.com [216.40.44.45]) by kanga.kvack.org (Postfix) with ESMTP id 427936B0289 for ; Mon, 23 Sep 2019 16:34:52 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with SMTP id D20C5181AC9BA for ; Mon, 23 Sep 2019 20:34:51 +0000 (UTC) X-FDA: 75967339182.17.match77_81b47d17b6762 X-HE-Tag: match77_81b47d17b6762 X-Filterd-Recvd-Size: 7062 Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by imf18.hostedemail.com (Postfix) with ESMTP for ; Mon, 23 Sep 2019 20:34:51 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id q24so6979341plr.13 for ; Mon, 23 Sep 2019 13:34:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=54zhWvY2wVoS8DJjdyrocZPF+2/4Isg+VJgEApzMseg=; b=T60+YUHd1pT2vUT24jaOnMItUPfL3L23oM9QlMa+jsQhTAMmE/Y6MOdB9kPjxsU2YE s0+Pj9I26CF7T263iX4+bryVjK3tjDXFjfcOSBZdy7hV7MpKa4gjlFgld8gCis5i0WKu DA5x0mdvLTvptlXKZYlRoL1Td1daAq/CiJc4sgJPCp/DOfklSjrpaiuYytsyCwDbIPep RrMtL9f00tDwSIjrtVkqS7eAQK9SjIWmyh9i5SqhoiJMe5ly6HuMgRWYiOWumRtRxhtF MIQP2OUZMi20ZuYed85vWrpjF7HIlaVilmAfvJ0kbcEB92CCSNdKtM1cYEJ0Wqv69SHa Igrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=54zhWvY2wVoS8DJjdyrocZPF+2/4Isg+VJgEApzMseg=; b=Lo49RXwxZwWGw0CnDwp5yCRxSeBj2MQxRrBIZe/zMkhTXFLujRjX4E3T69GAxQEmUt RZr6fUb+8YoOdkfr/Ajwp03lq0FjGyI0dpnNkPqRVJ/xkUuz/MmQDq9hE64BH7bboeZr 7IA20vrSKnbx7JkcbM5Nzsn1+qc6MfZzlIyz+g6ty11pHnQl3yggUofYTmk903G4OB95 L4ltXlp1/pqs/E7pGTThZfwASG/2QH6ViITiJV6PtwLwOvrozruJTlGejZnQBqfJGdxM G/G1Mj+APim022zWxZfZWIUbUD2NlDeWr6Xz1TdrmvVBboFYkJlDQAjJFQIRIUv2hFBK OFJg== X-Gm-Message-State: APjAAAXspm9BE6ZHhjroGzDrngzMRxOqizHLV27qLsRPbGIKiEPra/8L 5Ba1+uhJ4odCek1PTz8edcDciA== X-Google-Smtp-Source: APXvYqwUHTTCL6RSrWrnHViIB5bAHeudUhgSk3W0cjjZa1o+jEKfZ6t0y0OfB7SpczrqbsafTznlZg== X-Received: by 2002:a17:902:a58a:: with SMTP id az10mr1704614plb.42.1569270890214; Mon, 23 Sep 2019 13:34:50 -0700 (PDT) Received: from xakep.corp.microsoft.com (c-73-69-118-222.hsd1.nh.comcast.net. [73.69.118.222]) by smtp.gmail.com with ESMTPSA id n29sm12798676pgm.4.2019.09.23.13.34.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Sep 2019 13:34:49 -0700 (PDT) From: Pavel Tatashin To: pasha.tatashin@soleen.com, jmorris@namei.org, sashal@kernel.org, ebiederm@xmission.com, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, corbet@lwn.net, catalin.marinas@arm.com, will@kernel.org, linux-arm-kernel@lists.infradead.org, marc.zyngier@arm.com, james.morse@arm.com, vladimir.murzin@arm.com, matthias.bgg@gmail.com, bhsharma@redhat.com, linux-mm@kvack.org, mark.rutland@arm.com Subject: [PATCH v5 05/17] arm64: hibernate: remove gotos as they are not needed Date: Mon, 23 Sep 2019 16:34:15 -0400 Message-Id: <20190923203427.294286-6-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190923203427.294286-1-pasha.tatashin@soleen.com> References: <20190923203427.294286-1-pasha.tatashin@soleen.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Usually, gotos are used to handle cleanup after exception, but in case of create_safe_exec_page and swsusp_arch_resume there are no clean-ups. So, simply return the errors directly. Signed-off-by: Pavel Tatashin Reviewed-by: James Morse --- arch/arm64/kernel/hibernate.c | 49 ++++++++++++----------------------- 1 file changed, 17 insertions(+), 32 deletions(-) diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.= c index 34297716643f..83c41a2f8400 100644 --- a/arch/arm64/kernel/hibernate.c +++ b/arch/arm64/kernel/hibernate.c @@ -198,7 +198,6 @@ static int create_safe_exec_page(void *src_start, siz= e_t length, unsigned long dst_addr, phys_addr_t *phys_dst_addr) { - int rc =3D 0; pgd_t *trans_pgd; pgd_t *pgdp; pud_t *pudp; @@ -206,47 +205,37 @@ static int create_safe_exec_page(void *src_start, s= ize_t length, pte_t *ptep; unsigned long dst =3D get_safe_page(GFP_ATOMIC); =20 - if (!dst) { - rc =3D -ENOMEM; - goto out; - } + if (!dst) + return -ENOMEM; =20 memcpy((void *)dst, src_start, length); __flush_icache_range(dst, dst + length); =20 trans_pgd =3D (void *)get_safe_page(GFP_ATOMIC); - if (!trans_pgd) { - rc =3D -ENOMEM; - goto out; - } + if (!trans_pgd) + return -ENOMEM; =20 pgdp =3D pgd_offset_raw(trans_pgd, dst_addr); if (pgd_none(READ_ONCE(*pgdp))) { pudp =3D (void *)get_safe_page(GFP_ATOMIC); - if (!pudp) { - rc =3D -ENOMEM; - goto out; - } + if (!pudp) + return -ENOMEM; pgd_populate(&init_mm, pgdp, pudp); } =20 pudp =3D pud_offset(pgdp, dst_addr); if (pud_none(READ_ONCE(*pudp))) { pmdp =3D (void *)get_safe_page(GFP_ATOMIC); - if (!pmdp) { - rc =3D -ENOMEM; - goto out; - } + if (!pmdp) + return -ENOMEM; pud_populate(&init_mm, pudp, pmdp); } =20 pmdp =3D pmd_offset(pudp, dst_addr); if (pmd_none(READ_ONCE(*pmdp))) { ptep =3D (void *)get_safe_page(GFP_ATOMIC); - if (!ptep) { - rc =3D -ENOMEM; - goto out; - } + if (!ptep) + return -ENOMEM; pmd_populate_kernel(&init_mm, pmdp, ptep); } =20 @@ -272,8 +261,7 @@ static int create_safe_exec_page(void *src_start, siz= e_t length, =20 *phys_dst_addr =3D virt_to_phys((void *)dst); =20 -out: - return rc; + return 0; } =20 #define dcache_clean_range(start, end) __flush_dcache_area(start, (end -= start)) @@ -482,7 +470,7 @@ static int copy_page_tables(pgd_t *dst_pgdp, unsigned= long start, */ int swsusp_arch_resume(void) { - int rc =3D 0; + int rc; void *zero_page; size_t exit_size; pgd_t *tmp_pg_dir; @@ -498,12 +486,11 @@ int swsusp_arch_resume(void) tmp_pg_dir =3D (pgd_t *)get_safe_page(GFP_ATOMIC); if (!tmp_pg_dir) { pr_err("Failed to allocate memory for temporary page tables.\n"); - rc =3D -ENOMEM; - goto out; + return -ENOMEM; } rc =3D copy_page_tables(tmp_pg_dir, PAGE_OFFSET, PAGE_END); if (rc) - goto out; + return rc; =20 /* * We need a zero page that is zero before & after resume in order to @@ -512,8 +499,7 @@ int swsusp_arch_resume(void) zero_page =3D (void *)get_safe_page(GFP_ATOMIC); if (!zero_page) { pr_err("Failed to allocate zero page.\n"); - rc =3D -ENOMEM; - goto out; + return -ENOMEM; } =20 /* @@ -531,7 +517,7 @@ int swsusp_arch_resume(void) &phys_hibernate_exit); if (rc) { pr_err("Failed to create safe executable page for hibernate_exit code.= \n"); - goto out; + return rc; } =20 /* @@ -558,8 +544,7 @@ int swsusp_arch_resume(void) resume_hdr.reenter_kernel, restore_pblist, resume_hdr.__hyp_stub_vectors, virt_to_phys(zero_page)); =20 -out: - return rc; + return 0; } =20 int hibernate_resume_nonboot_cpu_disable(void) --=20 2.23.0