From patchwork Thu Sep 16 23:13:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pasha Tatashin X-Patchwork-Id: 12500515 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=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 7ED4BC433F5 for ; Thu, 16 Sep 2021 23:27:03 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 49459604E9 for ; Thu, 16 Sep 2021 23:27:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 49459604E9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=soleen.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=o9/j+kCgptvNeVCI9nYFsbIeb482t1j+GlhSUrVzrXw=; b=rRKHPmdnidbli+ wkJX4ilSJ0rv3KNChAVrKDSyva7mmqk86rMkcWRUHa4KoCtcDkjbNZRl3oxXigewwFTOnoD6B7zgp rXZ7Y45xtvNYj4vI+SYCqRRnX0icVReFP8mxw80BD/bsfj6pBI6QTmxmSuN63h/5I7pSYIWJcQNjQ PTr9DUljKs6t6I+eSKCJWPNuvc7bPexaHa7cDIJIrywtFExxAVKttnUXAvkYYLeXbdnMR4ptwBnyn AadZOSown3uZNq12UWjRgpf4JS2SUgBpMG09TKcp/dOvS1/QF2ueLRlf4Gco5I2/KnOnzVdX2pn6D YpyxeVXOUb47L1NMZhgQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mR0k8-00Cey6-Px; Thu, 16 Sep 2021 23:24:37 +0000 Received: from mail-qv1-xf2d.google.com ([2607:f8b0:4864:20::f2d]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mR0Zj-00CaI4-7R for linux-arm-kernel@lists.infradead.org; Thu, 16 Sep 2021 23:13:53 +0000 Received: by mail-qv1-xf2d.google.com with SMTP id di6so5319671qvb.1 for ; Thu, 16 Sep 2021 16:13:50 -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=Y1Uk63vpkrh4HSEXHQNbtcSjOksblIyIRxi91WKbEAM=; b=ZX6T1oIM4R3goFT9v/2cf0FQGFBs9qoQ1Dv0TkKRDmuJXkp0fJ4WJqes6t87z1iuLS 2dvwca0W8lx+DFNgimo62pYY1v2NlFLAvt6vo2HthGJRqDkA1Ogsd1ivXC/NEzdln8KQ kC/vjnO88YyNTPWT214IP97mzvlq7sozyzRAtDw78VAOk43svmZFJuicv3ozQSnczCBf Uy+BK2ojCcJhc8bdfYtDAvjzrxlx/H7zJkRdVeS8tHN5S5i3ZVsCxPzLB+zVPcxwCzuZ ygQjb4HPG6I7UqyVUggGHNtedtZTV6stzxnmQ6pDF1ArDvMDsiNABNm17COwOLbtS/gz pAfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Y1Uk63vpkrh4HSEXHQNbtcSjOksblIyIRxi91WKbEAM=; b=Roh+mjPQZ3iWMaiXfVQdvqCWVqcjfvKgyQaXZlFO9Bfr+6EQqWAaUwjvLtbbAEO3J2 ODdzyEN3MWlB9EZTZn3dq7L2jhtPUiwOKa2gQhZ2Gh/qb4eCediyD79x/4oMsFf9WkpS TAJZhqcAmwURvcbMQOW7MmF72pBKmh20NZviBxvyZ5/yhBEszQTcQn/wFZF08hKiWVEr NmAy6MGgHFxlKTElOtjx+aMTU+40Xkx7OOACWLCFKCoH5Iavva5bjAQLywvz4FEvvdrl Qyh2F4+zVErFg+DNHGQFsL7czZF19pRDMQkaRtZ6/tustuItKLT77tN/c0txDJMX4+hr WhTw== X-Gm-Message-State: AOAM530bUBJQITtJoouzC+XPMu/8BAl+ZF3pS6/6+Fu5tyDlGZ22PYnK 1Y/IKtI1USF+dzu5yiYW2nm4NA== X-Google-Smtp-Source: ABdhPJzANQuYEdGyFPzM2h5cBvhaMadksnrGaWSms5XeNGsc2+WLwnbrziOAQEnBWBa9YCXfDzrokQ== X-Received: by 2002:ad4:54b2:: with SMTP id r18mr8169426qvy.6.1631834029839; Thu, 16 Sep 2021 16:13:49 -0700 (PDT) Received: from localhost.localdomain (c-73-69-118-222.hsd1.nh.comcast.net. [73.69.118.222]) by smtp.gmail.com with ESMTPSA id az6sm3312891qkb.70.2021.09.16.16.13.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 16:13:49 -0700 (PDT) From: Pasha 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, kernelfans@gmail.com, akpm@linux-foundation.org, madvenka@linux.microsoft.com Subject: [PATCH v17 15/15] arm64: trans_pgd: remove trans_pgd_map_page() Date: Thu, 16 Sep 2021 19:13:25 -0400 Message-Id: <20210916231325.125533-16-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916231325.125533-1-pasha.tatashin@soleen.com> References: <20210916231325.125533-1-pasha.tatashin@soleen.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210916_161351_411532_81D8A1C5 X-CRM114-Status: GOOD ( 13.65 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The intend of trans_pgd_map_page() was to map contiguous range of VA memory to the memory that is getting relocated during kexec. However, since we are now using linear map instead of contiguous range this function is not needed Suggested-by: Pingfan Liu Signed-off-by: Pasha Tatashin --- arch/arm64/include/asm/trans_pgd.h | 5 +-- arch/arm64/mm/trans_pgd.c | 57 ------------------------------ 2 files changed, 1 insertion(+), 61 deletions(-) diff --git a/arch/arm64/include/asm/trans_pgd.h b/arch/arm64/include/asm/trans_pgd.h index 7b04d32b102c..033d400a4ea4 100644 --- a/arch/arm64/include/asm/trans_pgd.h +++ b/arch/arm64/include/asm/trans_pgd.h @@ -15,7 +15,7 @@ /* * trans_alloc_page * - Allocator that should return exactly one zeroed page, if this - * allocator fails, trans_pgd_create_copy() and trans_pgd_map_page() + * allocator fails, trans_pgd_create_copy() and trans_pgd_idmap_page() * return -ENOMEM error. * * trans_alloc_arg @@ -30,9 +30,6 @@ struct trans_pgd_info { int trans_pgd_create_copy(struct trans_pgd_info *info, pgd_t **trans_pgd, unsigned long start, unsigned long end); -int trans_pgd_map_page(struct trans_pgd_info *info, pgd_t *trans_pgd, - void *page, unsigned long dst_addr, pgprot_t pgprot); - int trans_pgd_idmap_page(struct trans_pgd_info *info, phys_addr_t *trans_ttbr0, unsigned long *t0sz, void *page); diff --git a/arch/arm64/mm/trans_pgd.c b/arch/arm64/mm/trans_pgd.c index 26bd8f2d95af..d7da8ca40d2e 100644 --- a/arch/arm64/mm/trans_pgd.c +++ b/arch/arm64/mm/trans_pgd.c @@ -217,63 +217,6 @@ int trans_pgd_create_copy(struct trans_pgd_info *info, pgd_t **dst_pgdp, return rc; } -/* - * 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; - pud_t *pudp; - pmd_t *pmdp; - pte_t *ptep; - - pgdp = pgd_offset_pgd(trans_pgd, dst_addr); - if (pgd_none(READ_ONCE(*pgdp))) { - p4dp = trans_alloc(info); - if (!pgdp) - return -ENOMEM; - pgd_populate(NULL, pgdp, p4dp); - } - - p4dp = p4d_offset(pgdp, dst_addr); - if (p4d_none(READ_ONCE(*p4dp))) { - pudp = trans_alloc(info); - if (!pudp) - return -ENOMEM; - p4d_populate(NULL, p4dp, pudp); - } - - pudp = pud_offset(p4dp, dst_addr); - if (pud_none(READ_ONCE(*pudp))) { - pmdp = trans_alloc(info); - if (!pmdp) - return -ENOMEM; - pud_populate(NULL, pudp, pmdp); - } - - pmdp = pmd_offset(pudp, dst_addr); - if (pmd_none(READ_ONCE(*pmdp))) { - ptep = trans_alloc(info); - if (!ptep) - return -ENOMEM; - pmd_populate_kernel(NULL, pmdp, ptep); - } - - ptep = pte_offset_kernel(pmdp, dst_addr); - set_pte(ptep, pfn_pte(virt_to_pfn(page), pgprot)); - - return 0; -} - /* * The page we want to idmap may be outside the range covered by VA_BITS that * can be built using the kernel's p?d_populate() helpers. As a one off, for a