From patchwork Sun Aug 21 14:09:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 12949954 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 3F2ABC00140 for ; Sun, 21 Aug 2022 14:19:16 +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=yomf3mVN/g3+lO1ZfOIHeGHuQITgI+7J7V2Wtv7cX8c=; b=KNrW4gmKbjYsb4 dtjBdjPbggf3tSCHaMb5oPVi24BK6VKZ9MRss9Zqkqd7B/6gJMusCK/2Z43kJoyU/X5vVSV06GhTn Md+jXIIcFXTXpPkRAMfmrqiwvP0MGEm2vEii1LHucbRNDlUoOdWX2Gcr1zIuW+dVqXvLT5ZMzSZDh 0i1zWhw98T0Ha/f6RS/NartB8msiduNalkGDfEYX0A+xP4V8aZ95anIq8J2VKGgDdDHSU461SHnh0 j2k4xttTAbsXgc9bAS3FmnfkjJlJTKstNSGxbaKcmCf75zJz/U7lZGS409jz4DTMQrgCRILUbkUgg QThik4grjZxlHCxZmiUQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oPlmh-00BCnG-T6; Sun, 21 Aug 2022 14:18:39 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oPlmd-00BCe5-4l for linux-riscv@lists.infradead.org; Sun, 21 Aug 2022 14:18:37 +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 ams.source.kernel.org (Postfix) with ESMTPS id A3283B80D7E; Sun, 21 Aug 2022 14:18:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5E092C433D6; Sun, 21 Aug 2022 14:18:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1661091511; bh=sdwpwSSJkNEgWy/Lv/s04spV+PKzs77/UypcZYQvt/I=; h=From:To:Cc:Subject:Date:From; b=ml7H9mfMsOgq3mL7UmcExeWD8n+Y/Fu0exLpwz72WBT9DFOFg6Sl7+5irG3G5jCec uwwxoO2rVndvczdIvjog9uMC0FbaSFgwDTKdSTUOWGUpuG6ttRM1DYe9Tsh3Mwmtep q9tUdgtk0t0QP7gWLlwIma22e90tluRKq4V10tbxjrx36aTv4b5zxn2+Oe1by+YTl9 tgc0Mh0BGzhQIQpX5DjiPzUn6EcfyLI0fVrEe7YDSeJp6ve/JqsNIxgKgH3oS0W4KN YQeDDzQOPIGOfTdH36ZNk27tGSWDXibJ5IMI2727ebE43I/NwmzLS+fxWi26P+qFH4 iAGQgJqtLD9Fg== 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 v6 RESEND 0/2] use static key to optimize pgtable_l4_enabled Date: Sun, 21 Aug 2022 22:09:16 +0800 Message-Id: <20220821140918.3613-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-20220821_071835_427592_A877DBF6 X-CRM114-Status: GOOD ( 11.90 ) 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 v5: - Use DECLARE_STATIC_KEY_FALSE 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(-)