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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 812D0C433E6 for ; Mon, 25 Jan 2021 19:19:37 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 252D920E65 for ; Mon, 25 Jan 2021 19:19:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 252D920E65 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 565C38D001F; Mon, 25 Jan 2021 14:19:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 518198D0001; Mon, 25 Jan 2021 14:19:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 40AD68D001F; Mon, 25 Jan 2021 14:19:33 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0111.hostedemail.com [216.40.44.111]) by kanga.kvack.org (Postfix) with ESMTP id 22B1E8D0001 for ; Mon, 25 Jan 2021 14:19:33 -0500 (EST) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id D78B2180AE7F3 for ; Mon, 25 Jan 2021 19:19:32 +0000 (UTC) X-FDA: 77745261384.01.air78_16113c527588 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin01.hostedemail.com (Postfix) with ESMTP id B5666100483E3 for ; Mon, 25 Jan 2021 19:19:32 +0000 (UTC) X-HE-Tag: air78_16113c527588 X-Filterd-Recvd-Size: 8927 Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com [209.85.160.179]) by imf38.hostedemail.com (Postfix) with ESMTP for ; Mon, 25 Jan 2021 19:19:32 +0000 (UTC) Received: by mail-qt1-f179.google.com with SMTP id t14so6905607qto.8 for ; Mon, 25 Jan 2021 11:19:32 -0800 (PST) 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=uo4pw5FNnmKWVvyw7b3Lb3eRlMWvIqi1VadyjI7Jm9U=; b=IE28xogklAT4sOez1Dy/Fu+fa8eNdiI9L10ZSXU1+5/yWipPF2Sx81TPKmgb+uw1dh jGYoNPksCaDXyypSXPaeWhb5sxug0tr/JO/83cvLPQ3M6Sp5JxgFVfXeuiQK0TBWG+0I Efgtb7wfBRSoCphyFE0zXigGVWsMBfWzO0k3CmG0zwG7rP+CUEgCjweGjk4Owkako7sg kGRSDnlmgy8f/demaZoW6ffBD7eiyP6ABCLBJuVkvjc3wuLlN02lRkjcwMkp/bRVrkrH l8gA4TsGufT1dkwtXchxNDTuRNc+TAcrp7WwV6d68TZzzukHJtRV0qHNiDJy4CL7/tD5 95Aw== 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=uo4pw5FNnmKWVvyw7b3Lb3eRlMWvIqi1VadyjI7Jm9U=; b=b21DBsbCeIXMfkDVAbm7qb8EMHLSY8phhygFRW6wK1GuivzLOBlCrb8K5KW/kiMtCn XTESh7l9v2fg2hbLOoPLytATLXdW6oR0qJm+687sfl25eWZI8acXsm8DzjLd4szkPfm+ 3gDQcrIu9kWXAmRh0t/IZnmQMQBSbuCPxJLwuoOsDKw0Dlgq4cn2OS8PKtKK69SDP2Wp NE+ahB6OGzXxk/rChfIeoeB/oTlBc91tE33+RWdHVTxYC2Xwe5+RC4bkqf9l8lsbdKfu EnP6FhkWBaD3LEPcsHYJ62jHHP7+iuoKeI/dZ2y9OFpY7Z8rjIMiqoZGj+bIL0ezsItv 2eTQ== X-Gm-Message-State: AOAM533AGj3pU1caITCCM64rWQcKBwrgOBtSh4luCkPZYsGmpfen2MQ+ B/+gEZ07tPmF6VE12fUQzjSeKQ== X-Google-Smtp-Source: ABdhPJzZPCVq7UEdZey87cJYsvOc8buPPhi2/MEfXEKJx3amijR4SVfdPvhZKax11XK2NKqWOtCGUA== X-Received: by 2002:ac8:604b:: with SMTP id k11mr1970803qtm.321.1611602371717; Mon, 25 Jan 2021 11:19:31 -0800 (PST) Received: from localhost.localdomain (c-73-69-118-222.hsd1.nh.comcast.net. [73.69.118.222]) by smtp.gmail.com with ESMTPSA id s6sm9047638qtx.63.2021.01.25.11.19.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jan 2021 11:19:31 -0800 (PST) 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, maz@kernel.org, james.morse@arm.com, vladimir.murzin@arm.com, matthias.bgg@gmail.com, linux-mm@kvack.org, mark.rutland@arm.com, steve.capper@arm.com, rfontana@redhat.com, tglx@linutronix.de, selindag@gmail.com, tyhicks@linux.microsoft.com Subject: [PATCH v10 04/18] arm64: trans_pgd: make trans_pgd_map_page generic Date: Mon, 25 Jan 2021 14:19:09 -0500 Message-Id: <20210125191923.1060122-5-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210125191923.1060122-1-pasha.tatashin@soleen.com> References: <20210125191923.1060122-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: kexec is going to use a different allocator, so make trans_pgd_map_page to accept allocator as an argument, and also kexec is going to use a different map protection, so also pass it via argument. Signed-off-by: Pavel Tatashin Reviewed-by: Matthias Brugger --- arch/arm64/include/asm/trans_pgd.h | 19 +++++++++++++++++-- arch/arm64/kernel/hibernate.c | 12 +++++++++++- arch/arm64/mm/trans_pgd.c | 30 ++++++++++++++++++++++-------- 3 files changed, 50 insertions(+), 11 deletions(-) diff --git a/arch/arm64/include/asm/trans_pgd.h b/arch/arm64/include/asm/= trans_pgd.h index 23153c13d1ce..b46409b25234 100644 --- a/arch/arm64/include/asm/trans_pgd.h +++ b/arch/arm64/include/asm/trans_pgd.h @@ -12,10 +12,25 @@ #include #include =20 +/* + * trans_alloc_page + * - Allocator that should return exactly one zeroed page, if this + * allocator fails, trans_pgd_create_copy() and trans_pgd_map_page() + * return -ENOMEM error. + * + * trans_alloc_arg + * - Passed to trans_alloc_page as an argument + */ + +struct trans_pgd_info { + void * (*trans_alloc_page)(void *arg); + void *trans_alloc_arg; +}; + int trans_pgd_create_copy(pgd_t **dst_pgdp, unsigned long start, unsigned long end); =20 -int trans_pgd_map_page(pgd_t *trans_pgd, void *page, unsigned long dst_a= ddr, - pgprot_t pgprot); +int trans_pgd_map_page(struct trans_pgd_info *info, pgd_t *trans_pgd, + void *page, unsigned long dst_addr, pgprot_t pgprot); =20 #endif /* _ASM_TRANS_TABLE_H */ diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.= c index 4a38662f0d90..c173f280bfea 100644 --- a/arch/arm64/kernel/hibernate.c +++ b/arch/arm64/kernel/hibernate.c @@ -176,6 +176,11 @@ int arch_hibernation_header_restore(void *addr) } EXPORT_SYMBOL(arch_hibernation_header_restore); =20 +static void *hibernate_page_alloc(void *arg) +{ + return (void *)get_safe_page((gfp_t)(unsigned long)arg); +} + /* * Copies length bytes, starting at src_start into an new page, * perform cache maintenance, then maps it at the specified address low @@ -192,6 +197,11 @@ static int create_safe_exec_page(void *src_start, si= ze_t length, unsigned long dst_addr, phys_addr_t *phys_dst_addr) { + struct trans_pgd_info trans_info =3D { + .trans_alloc_page =3D hibernate_page_alloc, + .trans_alloc_arg =3D (void *)GFP_ATOMIC, + }; + void *page =3D (void *)get_safe_page(GFP_ATOMIC); pgd_t *trans_pgd; int rc; @@ -206,7 +216,7 @@ static int create_safe_exec_page(void *src_start, siz= e_t length, if (!trans_pgd) return -ENOMEM; =20 - rc =3D trans_pgd_map_page(trans_pgd, page, dst_addr, + rc =3D trans_pgd_map_page(&trans_info, trans_pgd, page, dst_addr, PAGE_KERNEL_EXEC); if (rc) return rc; diff --git a/arch/arm64/mm/trans_pgd.c b/arch/arm64/mm/trans_pgd.c index e048d1f5c912..f28eceba2242 100644 --- a/arch/arm64/mm/trans_pgd.c +++ b/arch/arm64/mm/trans_pgd.c @@ -25,6 +25,11 @@ #include #include =20 +static void *trans_alloc(struct trans_pgd_info *info) +{ + return info->trans_alloc_page(info->trans_alloc_arg); +} + static void _copy_pte(pte_t *dst_ptep, pte_t *src_ptep, unsigned long ad= dr) { pte_t pte =3D READ_ONCE(*src_ptep); @@ -201,9 +206,18 @@ int trans_pgd_create_copy(pgd_t **dst_pgdp, unsigned= long start, return rc; } =20 -int trans_pgd_map_page(pgd_t *trans_pgd, void *page, - unsigned long dst_addr, - pgprot_t pgprot) +/* + * Add map entry to trans_pgd for a base-size page at PTE level. + * info: contains allocator and its argument + * trans_pgd: page table in which new map is added. + * page: page to be mapped. + * dst_addr: new VA address for the page + * pgprot: protection for the page. + * + * Returns 0 on success, and -ENOMEM on failure. + */ +int trans_pgd_map_page(struct trans_pgd_info *info, pgd_t *trans_pgd, + void *page, unsigned long dst_addr, pgprot_t pgprot) { pgd_t *pgdp; p4d_t *p4dp; @@ -213,7 +227,7 @@ int trans_pgd_map_page(pgd_t *trans_pgd, void *page, =20 pgdp =3D pgd_offset_pgd(trans_pgd, dst_addr); if (pgd_none(READ_ONCE(*pgdp))) { - p4dp =3D (void *)get_safe_page(GFP_ATOMIC); + p4dp =3D trans_alloc(info); if (!pgdp) return -ENOMEM; pgd_populate(&init_mm, pgdp, p4dp); @@ -221,7 +235,7 @@ int trans_pgd_map_page(pgd_t *trans_pgd, void *page, =20 p4dp =3D p4d_offset(pgdp, dst_addr); if (p4d_none(READ_ONCE(*p4dp))) { - pudp =3D (void *)get_safe_page(GFP_ATOMIC); + pudp =3D trans_alloc(info); if (!pudp) return -ENOMEM; p4d_populate(&init_mm, p4dp, pudp); @@ -229,7 +243,7 @@ int trans_pgd_map_page(pgd_t *trans_pgd, void *page, =20 pudp =3D pud_offset(p4dp, dst_addr); if (pud_none(READ_ONCE(*pudp))) { - pmdp =3D (void *)get_safe_page(GFP_ATOMIC); + pmdp =3D trans_alloc(info); if (!pmdp) return -ENOMEM; pud_populate(&init_mm, pudp, pmdp); @@ -237,14 +251,14 @@ int trans_pgd_map_page(pgd_t *trans_pgd, void *page= , =20 pmdp =3D pmd_offset(pudp, dst_addr); if (pmd_none(READ_ONCE(*pmdp))) { - ptep =3D (void *)get_safe_page(GFP_ATOMIC); + ptep =3D trans_alloc(info); if (!ptep) return -ENOMEM; pmd_populate_kernel(&init_mm, pmdp, ptep); } =20 ptep =3D pte_offset_kernel(pmdp, dst_addr); - set_pte(ptep, pfn_pte(virt_to_pfn(page), PAGE_KERNEL_EXEC)); + set_pte(ptep, pfn_pte(virt_to_pfn(page), pgprot)); =20 return 0; } --=20 2.25.1