From patchwork Fri Jul 15 13:48:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 12919313 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id D8E82C43334 for ; Fri, 15 Jul 2022 13:58:09 +0000 (UTC) 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:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=rPBUTaKQuNK7RCBZv4myo5WgoZoX7cQuqXiWcp89c6w=; b=L52wh74AYfWz7d 57x5U1PEpYX3jHQjGgUYHu22iXvf7yAyMdbEISAo2nmQPFfGUmzsyrJxpGkohIbkk0zPRaNZP4dji 4UCAmQvFTTjAHLNHQhOTcADJHBByK3GK1qy1KLkdZ5+McyuUjirAZbih7ojmXBumfO/iBD9RsYinE VkD3ozf17ho3Vl0+zVLtuBBS8lOy4Fbq1eIrN3HmNX2Fx9A+5mzsiThPiCzjuTBST8Vt6/1wRqG0v +HF5sI026Ec94QDEJLToOLXTMkHeiTNy439eJ90gjQGfVtMfDlcxgIJksQiweJpvVNE1n/Qq6m6XG SCXer4qNgtaMz4gnLDXA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oCLpN-007QWV-FT; Fri, 15 Jul 2022 13:57:57 +0000 Received: from sin.source.kernel.org ([2604:1380:40e1:4800::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oCLpK-007QUQ-VL for linux-riscv@lists.infradead.org; Fri, 15 Jul 2022 13:57:56 +0000 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 sin.source.kernel.org (Postfix) with ESMTPS id 1EBC2CE2FAC; Fri, 15 Jul 2022 13:57:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E54BCC34115; Fri, 15 Jul 2022 13:57:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1657893469; bh=EG4+eyeSWG6p8MlL7myTufaqwBpKi2OXqFxrvHcxxqk=; h=From:To:Cc:Subject:Date:From; b=H/NtYc2qH5vOLGbu9x44ie3b74tKGwAGm9igLGf1rL2YHQLeiQk7Yab1Z4PzzvBLx IPBeVog8S0aW1Rr4XGEQQ3Y20eVg1AyKNFAiFOzpm+g5cqxPz8CYss56D40SG31bAY tbAOUaJnHeqCRFvu2VfmLXXaSQJdH38IJL8C9xo/UzghG7qIdvny8Q0tpgQxuZPk7M n4DGWUWlt/AjMg1CLlxDEhvtQysZBjTJCRAHjc9Ib/FrBKFp7Ky8BB7hlCciP+/PRQ d8SJzg9IIU3nz7t226BI1Y667Dxz5ZUOevXDaNO78XPiSTdvq61ZVmCXeNFJe3SdWk 17zWo0xQl+rEQ== From: Jisheng Zhang To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , Alexandre Ghiti Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com Subject: [PATCH v5 0/2] use static key to optimize pgtable_l4_enabled Date: Fri, 15 Jul 2022 21:48:45 +0800 Message-Id: <20220715134847.2190-1-jszhang@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220715_065755_468597_56E97539 X-CRM114-Status: GOOD ( 12.23 ) X-BeenThere: linux-riscv@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-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org The pgtable_l4|[l5]_enabled check sits at hot code path, performance is impacted a lot. Since pgtable_l4|[l5]_enabled isn't changed after boot, so static key can be used to solve the performance issue[1]. An unified way static key was introduced in [2], but it only targets riscv isa extension. We dunno whether SV48 and SV57 will be considered as isa extension, so the unified solution isn't used for pgtable_l4[l5]_enabled now. patch1 fixes a NULL pointer deference if static key is used a bit earlier. patch2 uses the static key to optimize pgtable_l4|[l5]_enabled. [1] http://lists.infradead.org/pipermail/linux-riscv/2021-December/011164.html [2] https://lore.kernel.org/linux-riscv/20220517184453.3558-1-jszhang@kernel.org/T/#t Since v4: - rebased on v5.19-rcN - collect Reviewed-by tags - Fix kernel panic issue if SPARSEMEM is enabled by moving the riscv_finalise_pgtable_lx() after sparse_init() Since v3: - fix W=1 call to undeclared function 'static_branch_likely' error Since v2: - move the W=1 warning fix to a separate patch - move the unified way to use static key to a new patch series. Since v1: - Add a W=1 warning fix - Fix W=1 error - Based on v5.18-rcN, since SV57 support is added, so convert pgtable_l5_enabled as well. Jisheng Zhang (2): riscv: move sbi_init() earlier before jump_label_init() riscv: turn pgtable_l4|[l5]_enabled to static key for RV64 arch/riscv/include/asm/pgalloc.h | 16 ++++---- arch/riscv/include/asm/pgtable-32.h | 3 ++ arch/riscv/include/asm/pgtable-64.h | 60 ++++++++++++++++++--------- arch/riscv/include/asm/pgtable.h | 5 +-- arch/riscv/kernel/cpu.c | 4 +- arch/riscv/kernel/setup.c | 2 +- arch/riscv/mm/init.c | 64 ++++++++++++++++++----------- arch/riscv/mm/kasan_init.c | 16 ++++---- 8 files changed, 104 insertions(+), 66 deletions(-)