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 AE64CC11FF5 for ; Mon, 23 Sep 2019 20:34:50 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6433320673 for ; Mon, 23 Sep 2019 20:34:50 +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="dFemtziU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6433320673 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 16C416B0287; Mon, 23 Sep 2019 16:34:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 11E186B0288; Mon, 23 Sep 2019 16:34:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 032376B0289; Mon, 23 Sep 2019 16:34:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0233.hostedemail.com [216.40.44.233]) by kanga.kvack.org (Postfix) with ESMTP id D180F6B0287 for ; Mon, 23 Sep 2019 16:34:49 -0400 (EDT) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with SMTP id 48FDC180AD808 for ; Mon, 23 Sep 2019 20:34:49 +0000 (UTC) X-FDA: 75967339098.19.chalk06_814f482299d5b X-HE-Tag: chalk06_814f482299d5b X-Filterd-Recvd-Size: 6274 Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by imf22.hostedemail.com (Postfix) with ESMTP for ; Mon, 23 Sep 2019 20:34:48 +0000 (UTC) Received: by mail-pl1-f196.google.com with SMTP id q15so6991138pll.11 for ; Mon, 23 Sep 2019 13:34:48 -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=MH284WpfdMmTT4sRM0t5AqX3XpYou6gu7tWPymm7DjQ=; b=dFemtziUUFaRYULYpBmu8NJmI/dbD4cbh1SYA7qB7chGTOR6LFk7fQr6OFdm2Yx62O 3dpbS1qsBx8c9nCZNRgwfg9bKOijVMBFikwwnEjYXpVcTl4t9HBqGQBnjciA7ttafi8d KDKRj/LLWiGmuAfNEqz8+vSSUcdJjH/QdS1UQxIoe1gBHiZcgrte8geeaSyAdZTwwgLr ne2TUvQVTeDJ520F9gX/mMBrJUUtKsJzX7KjCXEYNUuUVdoGWzR/nWBrwoLWgDp/YPlr 6/2j4PssNh9GleF3Uvl7WCswZ7cirfpyTjmuaAZPVr6MymjPpiGuXB2sVm1Q3Hym4IFq cVvw== 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=MH284WpfdMmTT4sRM0t5AqX3XpYou6gu7tWPymm7DjQ=; b=EYUbNaL1+nV+bVxVRnxPB55ydFaFRNQgQlEl5EjwzzJgSc1KkRuSl97BsVWyEXDQ96 7UHwInf1D4AxXDjPzMgceKkqSgsSqI7KY2NjAuMHOiwtpFBMgzgfWVp5/hNBsLdjOxT5 quo9g6+t8DYPO2R5RdsLltzjW8fe+uQa/X8N52BGLr0P7/jSGOyP5T7SNrFHyzUJbDIG CmZ2Epl1HZUtrTVa2tvCEabeGFXUB21VqwqWE5TIeiJrZKV7EdnBPuzcZZk3JCoXk3SJ 94oDqyMcNHPuBidjGl9YD7SwQbnZHGNFYUgnp8tdk43rKfFnZEZjWdvJZ9utGCao5ueO NIJw== X-Gm-Message-State: APjAAAVzehPlJWwgPSFT9+bmUsG2AHdlw+8Tg+Vi8jnHxf/GwzGttJPq Dua9/6BUpLVYx7JgBk2RxALlkg== X-Google-Smtp-Source: APXvYqzsQjO1TnwmDcDODrVrxdzYDe42E+P66K/SdBySMPGcvfbOVfLz14Ppu7ESXE+9kNDFkqZ90w== X-Received: by 2002:a17:902:8bca:: with SMTP id r10mr1657503plo.43.1569270887591; Mon, 23 Sep 2019 13:34:47 -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.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Sep 2019 13:34:46 -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 04/17] arm64: hibernate: use get_safe_page directly Date: Mon, 23 Sep 2019 16:34:14 -0400 Message-Id: <20190923203427.294286-5-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: create_safe_exec_page() uses hibernate's allocator to create a set of pag= e table to map a single page that will contain the relocation code. Remove the allocator related arguments, and use get_safe_page directly, a= s it is done in other local functions in this file to simplify function prototype. Removing this function pointer makes it easier to refactor the code later= . Signed-off-by: Pavel Tatashin Reviewed-by: Matthias Brugger --- arch/arm64/kernel/hibernate.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.= c index ef46ce66d7e8..34297716643f 100644 --- a/arch/arm64/kernel/hibernate.c +++ b/arch/arm64/kernel/hibernate.c @@ -196,9 +196,7 @@ EXPORT_SYMBOL(arch_hibernation_header_restore); */ static int create_safe_exec_page(void *src_start, size_t length, unsigned long dst_addr, - phys_addr_t *phys_dst_addr, - void *(*allocator)(gfp_t mask), - gfp_t mask) + phys_addr_t *phys_dst_addr) { int rc =3D 0; pgd_t *trans_pgd; @@ -206,7 +204,7 @@ static int create_safe_exec_page(void *src_start, siz= e_t length, pud_t *pudp; pmd_t *pmdp; pte_t *ptep; - unsigned long dst =3D (unsigned long)allocator(mask); + unsigned long dst =3D get_safe_page(GFP_ATOMIC); =20 if (!dst) { rc =3D -ENOMEM; @@ -216,7 +214,7 @@ static int create_safe_exec_page(void *src_start, siz= e_t length, memcpy((void *)dst, src_start, length); __flush_icache_range(dst, dst + length); =20 - trans_pgd =3D allocator(mask); + trans_pgd =3D (void *)get_safe_page(GFP_ATOMIC); if (!trans_pgd) { rc =3D -ENOMEM; goto out; @@ -224,7 +222,7 @@ static int create_safe_exec_page(void *src_start, siz= e_t length, =20 pgdp =3D pgd_offset_raw(trans_pgd, dst_addr); if (pgd_none(READ_ONCE(*pgdp))) { - pudp =3D allocator(mask); + pudp =3D (void *)get_safe_page(GFP_ATOMIC); if (!pudp) { rc =3D -ENOMEM; goto out; @@ -234,7 +232,7 @@ static int create_safe_exec_page(void *src_start, siz= e_t length, =20 pudp =3D pud_offset(pgdp, dst_addr); if (pud_none(READ_ONCE(*pudp))) { - pmdp =3D allocator(mask); + pmdp =3D (void *)get_safe_page(GFP_ATOMIC); if (!pmdp) { rc =3D -ENOMEM; goto out; @@ -244,7 +242,7 @@ static int create_safe_exec_page(void *src_start, siz= e_t length, =20 pmdp =3D pmd_offset(pudp, dst_addr); if (pmd_none(READ_ONCE(*pmdp))) { - ptep =3D allocator(mask); + ptep =3D (void *)get_safe_page(GFP_ATOMIC); if (!ptep) { rc =3D -ENOMEM; goto out; @@ -530,8 +528,7 @@ int swsusp_arch_resume(void) */ rc =3D create_safe_exec_page(__hibernate_exit_text_start, exit_size, (unsigned long)hibernate_exit, - &phys_hibernate_exit, - (void *)get_safe_page, GFP_ATOMIC); + &phys_hibernate_exit); if (rc) { pr_err("Failed to create safe executable page for hibernate_exit code.= \n"); goto out; --=20 2.23.0