From patchwork Tue Aug 1 11:10:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Song Shuai X-Patchwork-Id: 129222 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2607276vqg; Tue, 1 Aug 2023 04:42:02 -0700 (PDT) X-Google-Smtp-Source: APBJJlFY47tSG+xR+KRPLBZ83gRt0jwMaVIEyMRbX3sgdz3n0Z/3QCESUhEgbrLDb+ntPRYNDkRR X-Received: by 2002:a05:6402:12da:b0:51e:17d:a1c3 with SMTP id k26-20020a05640212da00b0051e017da1c3mr2336454edx.32.1690890121943; Tue, 01 Aug 2023 04:42:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690890121; cv=none; d=google.com; s=arc-20160816; b=Ed0UPat+f4YawizqOfxZC2Rd+57n3N4hxaQ+KfDZup3auVUXTjNp53tHH4uQyOsMBJ yvrHP9G0qg8K88t8vCg/YPDgYe6Yu4rEt9YjeABgUjdo4LgihRDcc7Vj/lkJAkFsfI7O gSxiPEmwLffbznTOKzv5GjAJI5SgE5bdpOLWpDTDJ8D0VISKNvgJhq+LbME6rmN0ijwJ MnyiGo6s6/vQHUEv9dFcPl7TqZKzXB0E4HGpryimg9mWvnmumNdxujlTdYugnwJT1yd5 AymsGb78aps8I8gxB3NgplE92Q2yN/3XT+mif+JO4SsYCDLCIMfjy/BnDO/E3iKTrv4H zxIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=korDIX4sAxkkpV8e2u1lpZVVT/VDItzmnploqLBkDn8=; fh=AMW1kS0xNx0feq7m0ub96GBqWhLs2Ghz5AroWJ9uAdg=; b=DpCR+PcFA9qt1sZF0mk2T2vQhgPULfpuYH/bkmr37Bn9loiih5gszxUiqup2w9qOZv RfShWuJVSpEhTi4EYedtA2hyMXFKIrjuNuBRqpqQ3pjLjr+6fDJKfrbntf0wc5QV4Lve aTDo0sTqN8AAd982ViSS7m5VFMnnJz502f8pPMUvmxuUOCThdwZ3fFC3c3YRRqtOqSCp EKOHzLsnZPFvmedbtDxV2MMbS5C5HgvsrjhylquCpPr865OXtvuqplilEi8UKbXH5tPR uggKi88nTkqIX3r9IPEo198VvDPPpQrHM/vnW78ZlF7yehpFz+27KIFPMfuagkfGKdBN C5/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=Wnq3DcKZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e19-20020a50ec93000000b00521d28a47e5si4024783edr.359.2023.08.01.04.41.37; Tue, 01 Aug 2023 04:42:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=Wnq3DcKZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233603AbjHALOu (ORCPT + 99 others); Tue, 1 Aug 2023 07:14:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234304AbjHALOR (ORCPT ); Tue, 1 Aug 2023 07:14:17 -0400 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9415F2103 for ; Tue, 1 Aug 2023 04:10:32 -0700 (PDT) Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-686f25d045cso3695437b3a.0 for ; Tue, 01 Aug 2023 04:10:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690888232; x=1691493032; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=korDIX4sAxkkpV8e2u1lpZVVT/VDItzmnploqLBkDn8=; b=Wnq3DcKZan5Aboi+g1Wj9nsuA84KdfbJtt+q3/KNQzTxN3hYM4f9QnqXKiLq7+3A1o Guy/RsJkRpJbXECMZwp+ncrLvFsLksgEiV2jrnzbsqRuJgth/Yjh0aj7OmTcaB+B8UEZ wG9REFyMJ2rR8HmLXnwkBooGtg1Erc1E9Ylbas2+BKUg3LK1mlBpbEe/5b4v9nARxycD 6fZKEyLyYMm/Et6ruaDUC9n+hlydZEir8iBIZ4lb6H4O0dXolAG/wybyGdB/eXCvyIPs 2S4LPsJcm4KmFFKy4aanULlgUbNgR/gZBqy8ypMdv1wNlsP5rIPpla2uDZL8TvlJxY/W VsMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690888232; x=1691493032; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=korDIX4sAxkkpV8e2u1lpZVVT/VDItzmnploqLBkDn8=; b=eyfJ1LkH+IihEwK64Txep8ePAzOLkgs+YYAbozIMFOdvPX+MZWwlHc3E/fJ9Y0ZGPo BTWwn9jIVWwYXaORkTtVY/V245HsLxpEsDmP5HdTDT1yxjxnWD+Dy36XMyMkLLxvbWan r7quxtlyHvDEonFbOAleRqhdGmLKZJN4dqmNGvT+SeucZtix+31V4rw2fX05BMtzRL4Z IQHEd94bMuyD6JUXZ12SSmMRrrYj6gNahoFFLLZhMouxjT345g5iUed6CyY3w9GAEVkk HfwSNTkyjtuXh3I3L7OUAI68ryFU4DPRaqfuydJW+W9U05L/JtvAgXjydhlPWajN1/U+ yn5A== X-Gm-Message-State: ABy/qLZqei/Y+KrjQ4SqLm74H0EoF0gpZ3+omGPU4zIbAPxkR5XYAr2a ou7WhTPfmagPxPpjbgnlLh8= X-Received: by 2002:a05:6a21:35c9:b0:131:5995:340 with SMTP id ba9-20020a056a2135c900b0013159950340mr11470828pzc.20.1690888231952; Tue, 01 Aug 2023 04:10:31 -0700 (PDT) Received: from localhost.localdomain ([2408:843e:c00:f3f:aeab:c5ff:e07e:654d]) by smtp.gmail.com with ESMTPSA id g1-20020aa78741000000b00682ad3613eesm9047516pfo.51.2023.08.01.04.10.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Aug 2023 04:10:31 -0700 (PDT) From: Song Shuai To: paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, akpm@linux-foundation.org, guoren@kernel.org, alexghiti@rivosinc.com, sergey.matyukevich@syntacore.com, david@redhat.com, wangkefeng.wang@huawei.com, panqinglin2020@iscas.ac.cn, woodrow.shen@sifive.com Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Song Shuai Subject: [PATCH] riscv: Correct the MODULES_VADDR Date: Tue, 1 Aug 2023 19:10:14 +0800 Message-Id: <20230801111014.1432679-1-suagrfillet@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773026800812481305 X-GMAIL-MSGID: 1773026800812481305 As Documentation/riscv/vm-layout.rst describes, the 2G-sized "modules, BPF" area should lie right before the "kernel" area. But the current definition of MODULES_VADDR isn't consistent with that, so correct it. Before this patch, the size of "modules" from print_vm_layout() is not 2G. [ 0.000000] modules : 0xffffffff2ff2f000 - 0xffffffffae600000 (2022 MB) [ 0.000000] lowmem : 0xff60000000000000 - 0xff60000040000000 (1024 MB) [ 0.000000] kernel : 0xffffffffae600000 - 0xffffffffffffffff (1305 MB) After this patch, the size is 2G. [ 0.000000] modules : 0xffffffff3a000000 - 0xffffffffba000000 (2048 MB) [ 0.000000] lowmem : 0xff60000000000000 - 0xff60000040000000 (1024 MB) [ 0.000000] kernel : 0xffffffffba000000 - 0xffffffffffffffff (1119 MB) Signed-off-by: Song Shuai --- arch/riscv/include/asm/pgtable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 75970ee2bda2..7c57e17fc758 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -53,8 +53,8 @@ #ifdef CONFIG_64BIT /* This is used to define the end of the KASAN shadow region */ #define MODULES_LOWEST_VADDR (KERNEL_LINK_ADDR - SZ_2G) -#define MODULES_VADDR (PFN_ALIGN((unsigned long)&_end) - SZ_2G) #define MODULES_END (PFN_ALIGN((unsigned long)&_start)) +#define MODULES_VADDR (MODULES_END - SZ_2G) #endif /*