From patchwork Sun Jul 3 14:12:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 12904374 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5484C43334 for ; Sun, 3 Jul 2022 14:13:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 57554900004; Sun, 3 Jul 2022 10:13:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5259E6B0080; Sun, 3 Jul 2022 10:13:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 41438900004; Sun, 3 Jul 2022 10:13:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 330E66B007E for ; Sun, 3 Jul 2022 10:13:33 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 0E31E20837 for ; Sun, 3 Jul 2022 14:13:33 +0000 (UTC) X-FDA: 79645981506.15.44694B3 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf20.hostedemail.com (Postfix) with ESMTP id 821A31C001B for ; Sun, 3 Jul 2022 14:13:32 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 5608DB80AC8; Sun, 3 Jul 2022 14:13:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AEC39C341D0; Sun, 3 Jul 2022 14:13:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1656857611; bh=6IMY6G/9LpTJ3ScO+xpUOM9ynBAP6MkPT8qRCrRHJy0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I40wJmQKY2KwY2m/hKCzAs5JbgysfgdixxQJI1NORaBkzcBg6qe8Em8LtCTBDaSyn Tt7OnjP69KujVbVnFFEVwTTOr+bEFtJQ8/rrpu0dE5UyOVhywqOUv7+gXmfe3zC9+s A/bAO7HkaBzboAiEdmRpiFBci65LbFsFPMAMNGgNvM8nRG5u0h+iYFx9V1moyrNHxw TUWAHJl4VjtFKmjpHSkTczFVXsvKGXZnCzqwT+WhbZMaHlkNxojR2M6/AfJN/QKurR LCQppfLNUmYmpPgf3a66WMXPU/VNx5sQGdK07h08y7AhpP6a58hO1zOBWdI2VH9Dcv qvfvCrekRt8bA== From: Mike Rapoport To: Andrew Morton Cc: Arnd Bergmann , Dinh Nguyen , Guo Ren , Helge Deller , Huacai Chen , "James E.J. Bottomley" , Matthew Wilcox , Max Filippov , Mike Rapoport , Mike Rapoport , Thomas Bogendoerfer , WANG Xuerui , linux-arch@vger.kernel.org, linux-csky@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, linux-parisc@vger.kernel.org, linux-xtensa@linux-xtensa.org, loongarch@lists.linux.dev Subject: [PATCH 12/14] loongarch: drop definition of PGD_ORDER Date: Sun, 3 Jul 2022 17:12:01 +0300 Message-Id: <20220703141203.147893-13-rppt@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220703141203.147893-1-rppt@kernel.org> References: <20220703141203.147893-1-rppt@kernel.org> MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1656857612; a=rsa-sha256; cv=none; b=P/hrLLISNGXHlrggzLcxufcNWokygT6iOSVrvRbvXqE1hAhQrKr9rJI6t+IBtDPkFJZpMN t6R904qEA8RNez5fIdevjYwWMWOlknY3FujmSf2FNTRCRXWDdpnT7seXEjXJxiDL3N6wfy bt6wSIirlvS8bD4WwrmNifX1zAEWeG8= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=I40wJmQK; spf=pass (imf20.hostedemail.com: domain of rppt@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1656857612; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=apcP12IueD9EvIRJhQt70GRHaq7Ny+cvawfIR44fwiQ=; b=KInio7P0LkRzivkerJupeBuDr01PFzHxswSOpdJRk7rs/boiBy8v/V/NBPrjupLd/aKb44 DdiO8+7T7VUu0UTSiOrbRuJwGEjvkJvfxLaL9vzALlD4Hp5iiZ/xehOfcyGBsMwQ9689t9 9bJy9vpUojpXP/WHFNdXQl40y9aszVw= X-Rspam-User: X-Rspamd-Server: rspam04 Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=I40wJmQK; spf=pass (imf20.hostedemail.com: domain of rppt@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org X-Stat-Signature: w7jkmohi3hd7wsqan98s1ont6aucxi6b X-Rspamd-Queue-Id: 821A31C001B X-HE-Tag: 1656857612-105331 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: From: Mike Rapoport This is the order of the page table allocation, not the order of a PGD. Since its always hardwired to 0, simply drop it. Signed-off-by: Mike Rapoport --- arch/loongarch/include/asm/pgtable.h | 6 ++---- arch/loongarch/kernel/asm-offsets.c | 1 - arch/loongarch/mm/pgtable.c | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/loongarch/include/asm/pgtable.h b/arch/loongarch/include/asm/pgtable.h index a97996fefaed..e03443abaf7d 100644 --- a/arch/loongarch/include/asm/pgtable.h +++ b/arch/loongarch/include/asm/pgtable.h @@ -21,8 +21,6 @@ #include #endif -#define PGD_ORDER 0 - #if CONFIG_PGTABLE_LEVELS == 2 #define PGDIR_SHIFT (PAGE_SHIFT + (PAGE_SHIFT - 3)) #elif CONFIG_PGTABLE_LEVELS == 3 @@ -43,9 +41,9 @@ #define PGDIR_SIZE (1UL << PGDIR_SHIFT) #define PGDIR_MASK (~(PGDIR_SIZE-1)) -#define VA_BITS (PGDIR_SHIFT + (PAGE_SHIFT + PGD_ORDER - 3)) +#define VA_BITS (PGDIR_SHIFT + (PAGE_SHIFT - 3)) -#define PTRS_PER_PGD ((PAGE_SIZE << PGD_ORDER) >> 3) +#define PTRS_PER_PGD (PAGE_SIZE >> 3) #if CONFIG_PGTABLE_LEVELS > 3 #define PTRS_PER_PUD (PAGE_SIZE >> 3) #endif diff --git a/arch/loongarch/kernel/asm-offsets.c b/arch/loongarch/kernel/asm-offsets.c index aa4ef42d759f..72f431a7289d 100644 --- a/arch/loongarch/kernel/asm-offsets.c +++ b/arch/loongarch/kernel/asm-offsets.c @@ -190,7 +190,6 @@ void output_mm_defines(void) #endif DEFINE(_PTE_T_LOG2, PTE_T_LOG2); BLANK(); - DEFINE(_PGD_ORDER, PGD_ORDER); BLANK(); DEFINE(_PMD_SHIFT, PMD_SHIFT); DEFINE(_PGDIR_SHIFT, PGDIR_SHIFT); diff --git a/arch/loongarch/mm/pgtable.c b/arch/loongarch/mm/pgtable.c index 0569647152e9..ee179ccd3e3f 100644 --- a/arch/loongarch/mm/pgtable.c +++ b/arch/loongarch/mm/pgtable.c @@ -13,7 +13,7 @@ pgd_t *pgd_alloc(struct mm_struct *mm) { pgd_t *ret, *init; - ret = (pgd_t *) __get_free_pages(GFP_KERNEL, PGD_ORDER); + ret = (pgd_t *) __get_free_page(GFP_KERNEL); if (ret) { init = pgd_offset(&init_mm, 0UL); pgd_init((unsigned long)ret);