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 A288BC11FF7 for ; Mon, 23 Sep 2019 20:35:09 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5812C207FD for ; Mon, 23 Sep 2019 20:35:09 +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="K7zeKlOy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5812C207FD 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 E8DB36B0296; Mon, 23 Sep 2019 16:35:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E3AC66B0297; Mon, 23 Sep 2019 16:35:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D2D766B0298; Mon, 23 Sep 2019 16:35:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0195.hostedemail.com [216.40.44.195]) by kanga.kvack.org (Postfix) with ESMTP id A8B676B0296 for ; Mon, 23 Sep 2019 16:35:08 -0400 (EDT) Received: from smtpin04.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with SMTP id 3226C181AC9BA for ; Mon, 23 Sep 2019 20:35:08 +0000 (UTC) X-FDA: 75967339896.04.help37_841479b563237 X-HE-Tag: help37_841479b563237 X-Filterd-Recvd-Size: 9841 Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by imf03.hostedemail.com (Postfix) with ESMTP for ; Mon, 23 Sep 2019 20:35:07 +0000 (UTC) Received: by mail-pl1-f196.google.com with SMTP id e5so7000327pls.9 for ; Mon, 23 Sep 2019 13:35:07 -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=VFJvvULlApx2IXv/Kz+u5IAN/WZ7ZN12CZD/AhXv5tU=; b=K7zeKlOyuVbfaJM9f2HkRaMTHAYXYPBFf7ZdwVlehakJOdLiPs8lP0RAZWhJj4EYBP PhyKAtKOH9dkyp6M7wYpr7cX8h+iWREc5K6J4GHspK8BOjQbl8EcYZbXIcF9es8S5PXj pacARn0ENPoGiqhwhLVE+Hs8EnRRU/2+TryiR0F/4/+Se2cGfk76IU1fKkJr2utwKPCH swrtENf/Eub9badnJ+S4LAn+dxJdho8uypOf7m/EBvIWyidj46rI8qh2jHHNjvUfX/XN lHm4aHUBdBYOpiGIrKlQwZKQbINSFeTLHrlLcSuDpV/mTA1JFzp8MvYSOgrQYZkrdUZ6 a7Qg== 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=VFJvvULlApx2IXv/Kz+u5IAN/WZ7ZN12CZD/AhXv5tU=; b=YbnBUJMa4SZzrb92eusTgg6ISzOac2Mx3bmj7RWhF6XxjV6uyKAU6UlOXIOPAi0GUP CZaJHvhOvGhQhOz8j4R3t8NdCAKpLMPcXnKR55W6o2tSTd+LjQPeQV0hEDLLcmenf3ae /C4UkjWS2gsBh4iU5c7sx9omXSZtEWGr6ATixM9faKbO2athN2e5xRzRmze3XC8PVFwv faRGv5w1fGNG7nV3BAUjRygduZAGevmtA6aBRIWlfjtv/B5qfA3wggxW6SPfF09FbPce Xfp+N/JOkpkrVk4wCoS4sYyKi10GL7CZLot2ATY4nPUBiiWyDj0A0ca6Zl25RemYeN1k CPlQ== X-Gm-Message-State: APjAAAU6PBXlocOOKSVX6JeBO1ohv/GHGNs1sfAwoynSzRv7OU6HRDiO EnbMgSk6AP0RhybrxhCHy6j7Cg== X-Google-Smtp-Source: APXvYqxZRRJfknWu5/RwKPd05GrIV0tdCB7qimxV6vcsVXLj+pAFybjBV6ZkK10HAiKYcn3odMhXVA== X-Received: by 2002:a17:902:b704:: with SMTP id d4mr1640872pls.204.1569270906435; Mon, 23 Sep 2019 13:35:06 -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.35.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Sep 2019 13:35:05 -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 11/17] arm64: trans_pgd: pass allocator trans_pgd_create_copy Date: Mon, 23 Sep 2019 16:34:21 -0400 Message-Id: <20190923203427.294286-12-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: Make trans_pgd_create_copy and its subroutines to use allocator that is passed as an argument Signed-off-by: Pavel Tatashin --- arch/arm64/include/asm/trans_pgd.h | 4 +-- arch/arm64/kernel/hibernate.c | 7 ++++- arch/arm64/mm/trans_pgd.c | 44 ++++++++++++++++++------------ 3 files changed, 35 insertions(+), 20 deletions(-) diff --git a/arch/arm64/include/asm/trans_pgd.h b/arch/arm64/include/asm/= trans_pgd.h index bb38f73aa7aa..56613e83aa53 100644 --- a/arch/arm64/include/asm/trans_pgd.h +++ b/arch/arm64/include/asm/trans_pgd.h @@ -25,8 +25,8 @@ struct trans_pgd_info { void *trans_alloc_arg; }; =20 -int trans_pgd_create_copy(pgd_t **dst_pgdp, unsigned long start, - unsigned long end); +int trans_pgd_create_copy(struct trans_pgd_info *info, pgd_t **trans_pgd= , + unsigned long start, unsigned long end); =20 int trans_pgd_map_page(struct trans_pgd_info *info, pgd_t *trans_pgd, void *page, unsigned long dst_addr, pgprot_t pgprot); diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.= c index 7f0a5e152c45..038d8214df8d 100644 --- a/arch/arm64/kernel/hibernate.c +++ b/arch/arm64/kernel/hibernate.c @@ -322,6 +322,10 @@ int swsusp_arch_resume(void) phys_addr_t phys_hibernate_exit; void __noreturn (*hibernate_exit)(phys_addr_t, phys_addr_t, void *, void *, phys_addr_t, phys_addr_t); + struct trans_pgd_info trans_info =3D { + .trans_alloc_page =3D hibernate_page_alloc, + .trans_alloc_arg =3D (void *)GFP_ATOMIC, + }; =20 /* * Restoring the memory image will overwrite the ttbr1 page tables. @@ -333,7 +337,8 @@ int swsusp_arch_resume(void) pr_err("Failed to allocate memory for temporary page tables.\n"); return -ENOMEM; } - rc =3D trans_pgd_create_copy(&tmp_pg_dir, PAGE_OFFSET, PAGE_END); + rc =3D trans_pgd_create_copy(&trans_info, &tmp_pg_dir, PAGE_OFFSET, + PAGE_END); if (rc) return rc; =20 diff --git a/arch/arm64/mm/trans_pgd.c b/arch/arm64/mm/trans_pgd.c index 1142dde8c02f..df3a10d36f62 100644 --- a/arch/arm64/mm/trans_pgd.c +++ b/arch/arm64/mm/trans_pgd.c @@ -57,14 +57,14 @@ static void _copy_pte(pte_t *dst_ptep, pte_t *src_pte= p, unsigned long addr) } } =20 -static int copy_pte(pmd_t *dst_pmdp, pmd_t *src_pmdp, unsigned long star= t, - unsigned long end) +static int copy_pte(struct trans_pgd_info *info, pmd_t *dst_pmdp, + pmd_t *src_pmdp, unsigned long start, unsigned long end) { pte_t *src_ptep; pte_t *dst_ptep; unsigned long addr =3D start; =20 - dst_ptep =3D (pte_t *)get_safe_page(GFP_ATOMIC); + dst_ptep =3D trans_alloc(info); if (!dst_ptep) return -ENOMEM; pmd_populate_kernel(&init_mm, dst_pmdp, dst_ptep); @@ -78,8 +78,8 @@ static int copy_pte(pmd_t *dst_pmdp, pmd_t *src_pmdp, u= nsigned long start, return 0; } =20 -static int copy_pmd(pud_t *dst_pudp, pud_t *src_pudp, unsigned long star= t, - unsigned long end) +static int copy_pmd(struct trans_pgd_info *info, pud_t *dst_pudp, + pud_t *src_pudp, unsigned long start, unsigned long end) { pmd_t *src_pmdp; pmd_t *dst_pmdp; @@ -87,7 +87,7 @@ static int copy_pmd(pud_t *dst_pudp, pud_t *src_pudp, u= nsigned long start, unsigned long addr =3D start; =20 if (pud_none(READ_ONCE(*dst_pudp))) { - dst_pmdp =3D (pmd_t *)get_safe_page(GFP_ATOMIC); + dst_pmdp =3D trans_alloc(info); if (!dst_pmdp) return -ENOMEM; pud_populate(&init_mm, dst_pudp, dst_pmdp); @@ -102,7 +102,7 @@ static int copy_pmd(pud_t *dst_pudp, pud_t *src_pudp,= unsigned long start, if (pmd_none(pmd)) continue; if (pmd_table(pmd)) { - if (copy_pte(dst_pmdp, src_pmdp, addr, next)) + if (copy_pte(info, dst_pmdp, src_pmdp, addr, next)) return -ENOMEM; } else { set_pmd(dst_pmdp, @@ -113,7 +113,8 @@ static int copy_pmd(pud_t *dst_pudp, pud_t *src_pudp,= unsigned long start, return 0; } =20 -static int copy_pud(pgd_t *dst_pgdp, pgd_t *src_pgdp, unsigned long star= t, +static int copy_pud(struct trans_pgd_info *info, pgd_t *dst_pgdp, + pgd_t *src_pgdp, unsigned long start, unsigned long end) { pud_t *dst_pudp; @@ -122,7 +123,7 @@ static int copy_pud(pgd_t *dst_pgdp, pgd_t *src_pgdp,= unsigned long start, unsigned long addr =3D start; =20 if (pgd_none(READ_ONCE(*dst_pgdp))) { - dst_pudp =3D (pud_t *)get_safe_page(GFP_ATOMIC); + dst_pudp =3D trans_alloc(info); if (!dst_pudp) return -ENOMEM; pgd_populate(&init_mm, dst_pgdp, dst_pudp); @@ -137,7 +138,7 @@ static int copy_pud(pgd_t *dst_pgdp, pgd_t *src_pgdp,= unsigned long start, if (pud_none(pud)) continue; if (pud_table(pud)) { - if (copy_pmd(dst_pudp, src_pudp, addr, next)) + if (copy_pmd(info, dst_pudp, src_pudp, addr, next)) return -ENOMEM; } else { set_pud(dst_pudp, @@ -148,8 +149,8 @@ static int copy_pud(pgd_t *dst_pgdp, pgd_t *src_pgdp,= unsigned long start, return 0; } =20 -static int copy_page_tables(pgd_t *dst_pgdp, unsigned long start, - unsigned long end) +static int copy_page_tables(struct trans_pgd_info *info, pgd_t *dst_pgdp= , + unsigned long start, unsigned long end) { unsigned long next; unsigned long addr =3D start; @@ -160,25 +161,34 @@ static int copy_page_tables(pgd_t *dst_pgdp, unsign= ed long start, next =3D pgd_addr_end(addr, end); if (pgd_none(READ_ONCE(*src_pgdp))) continue; - if (copy_pud(dst_pgdp, src_pgdp, addr, next)) + if (copy_pud(info, dst_pgdp, src_pgdp, addr, next)) return -ENOMEM; } while (dst_pgdp++, src_pgdp++, addr =3D next, addr !=3D end); =20 return 0; } =20 -int trans_pgd_create_copy(pgd_t **dst_pgdp, unsigned long start, - unsigned long end) +/* + * Create trans_pgd and copy linear map. + * info: contains allocator and its argument + * dst_pgdp: new page table that is created, and to which map is copied. + * start: Start of the interval (inclusive). + * end: End of the interval (exclusive). + * + * Returns 0 on success, and -ENOMEM on failure. + */ +int trans_pgd_create_copy(struct trans_pgd_info *info, pgd_t **dst_pgdp, + unsigned long start, unsigned long end) { int rc; - pgd_t *trans_pgd =3D (pgd_t *)get_safe_page(GFP_ATOMIC); + pgd_t *trans_pgd =3D trans_alloc(info); =20 if (!trans_pgd) { pr_err("Failed to allocate memory for temporary page tables.\n"); return -ENOMEM; } =20 - rc =3D copy_page_tables(trans_pgd, start, end); + rc =3D copy_page_tables(info, trans_pgd, start, end); if (!rc) *dst_pgdp =3D trans_pgd; =20 --=20 2.23.0