From patchwork Wed Jun 14 04:52:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 107711 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1029639vqr; Tue, 13 Jun 2023 23:14:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4hn6Z9IIQucjwZlAZmgp/9FF06OMAa7N55xbEtY1YkkVwiJqTNfJALBAy7a667TR60XWA5 X-Received: by 2002:a17:902:830c:b0:1b5:79b:8b14 with SMTP id bd12-20020a170902830c00b001b5079b8b14mr88584plb.26.1686723277139; Tue, 13 Jun 2023 23:14:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686723277; cv=none; d=google.com; s=arc-20160816; b=NqXBbSPUe5TWoPB+QcHMYs04WnB5uIiF426ROM0cri55u4JE95HXYd6Vih54MXiU9t CdldGWRev2gp4WsCHYOR3ODpS3JpDB4Ry5ixwNt4k39GOCzbFtBL2IS8UchzdTt2JBwN /+t/3bRO7hH17EtlhPpX0ui8/Gipy4TwD5EXnurpcHzMwFkiZ97a3Qj2WAp9yL3ydx0B 6V9ag81lHF4sih2pq91f0l7MJKrnVToKoyYv1n+vJjmrYCNIqriUCwrgDFMSbXTd6Jhb plKNrCct07ZT45MDjOu3rcw1KIvd4Q2FToIDPry6/fiEdITinMohWvoXm1D4Vu82p2MP Xw7w== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=wqw+pfXvRxFyKtNsvJYgxpMTw9Cw0YTqu9wRT0MEL7w=; b=wu0y+zQV4RILhIsvgDQSdlXcz/PqsQ4qxjcudbgl+hJW/iro2fI/iLVt1bf2qiR2qi UYiUUlGLjNCYU+txvAn1tnXNsGd94pOTGS3CHlS/yeV+jX3xk/xQKJ9bMVSCQkNTI2WZ GaPpDpeUiUNKbf/LbI1hH4E0qx6w1E80cpq/R2YHM9ZrEQDtDuFOJUNVNgkf0r6TLaq6 30BOXlbK/zr/vWYiZL1Pk8nVASVMmGSoRK5hHaffofltAKF4uHSMurj+yfXHO/CHSf3Q 43OSkpdr8aSwN7L8jUb34mYFv04zpOJ6i7IL7zkSufXCvQqLyZxmER9p/TVXOjTv6IvN UR2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=OimPmjXC; 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 p15-20020a170902e74f00b001b3d1203160si4907987plf.650.2023.06.13.23.14.21; Tue, 13 Jun 2023 23:14:37 -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=OimPmjXC; 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 S242531AbjFNEw3 (ORCPT + 99 others); Wed, 14 Jun 2023 00:52:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233244AbjFNEwY (ORCPT ); Wed, 14 Jun 2023 00:52:24 -0400 Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF21C184 for ; Tue, 13 Jun 2023 21:52:23 -0700 (PDT) Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-1b3c0c47675so28067395ad.1 for ; Tue, 13 Jun 2023 21:52:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686718343; x=1689310343; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wqw+pfXvRxFyKtNsvJYgxpMTw9Cw0YTqu9wRT0MEL7w=; b=OimPmjXCG8okhtcLCLa7VYDFJqQQBCmFVW5QxbTi/cal0RAl1RvumolnmY/ZWjUCoV oAMg/p+5sJnSfGLa1Xgim8Gjoj6vSVlhLWg6RI+cpiA//YXzuXnOnMsIoCQmW9CiYUFp f9G02GCCyRDuSQ3CiBOUAfoeGzBbmOsTYD4KmHXoOej4GW5tb3SbIBXbqncciwlS2+lz q6ej+NWHVzvPRmC6PhlhVWpjst8vogmOy6yvHFUh6xELCDDufLxDg1YLhsYI6YQ+xCnx pFuK5gzixEZjso6CajRcYB+wVKQUCqd8aA3ecRaRhDJ4Huuklx9j7Bv1V/tmNfrDHg8o B7OQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686718343; x=1689310343; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wqw+pfXvRxFyKtNsvJYgxpMTw9Cw0YTqu9wRT0MEL7w=; b=GZdUsxgXwBpnYT8zKdC81WTNcAPV/XirzjdS4TK9UYDI/va4OsLGSQ/zsdDpG+TfTJ znkjJ5i4v2U5aOAq1YIS43be4qZbKyjhlrb8/57AKBPSfwqkqXMwb0NGn2zN9PXcg9IQ Xq9NgVUfc6L399Y6cXkobOMGhYMfijDW81mLVkLry/wT/LZEwPV5k0ZtcCpAvYdIq3C7 Bd7c8A830uRCGzOnKKwzBTKxhT/tXRLCxJgAZrPSIdN/3u4Sf1aRvOCQDTNVG7QHXc1A ZBeOLXW53ISob8/YdFf7ZYYZRKuodehLlZJpX8K7usQO/bdk/HGsrlGJlmirToCwsFH3 9JgQ== X-Gm-Message-State: AC+VfDx9T7UFFJICE3RvNZLi3KKqoDpU5WGzYexTSll7lEiauekZUQRG sypD3x46SA7J4QtesU4oPT2dGqjl/EQ= X-Received: by 2002:a17:902:e842:b0:1b2:4fea:c62 with SMTP id t2-20020a170902e84200b001b24fea0c62mr12789996plg.30.1686718342949; Tue, 13 Jun 2023 21:52:22 -0700 (PDT) Received: from octofox.hsd1.ca.comcast.net ([2601:641:401:1d20:bf5f:2e99:78f2:6007]) by smtp.gmail.com with ESMTPSA id z18-20020a170903019200b001acad86ebc5sm11089790plg.33.2023.06.13.21.52.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Jun 2023 21:52:22 -0700 (PDT) From: Max Filippov To: linux-kernel@vger.kernel.org Cc: Chris Zankel , Max Filippov Subject: [PATCH 1/4] xtensa: move early_trap_init from kasan_early_init to init_arch Date: Tue, 13 Jun 2023 21:52:09 -0700 Message-Id: <20230614045212.2534746-2-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230614045212.2534746-1-jcmvbkbc@gmail.com> References: <20230614045212.2534746-1-jcmvbkbc@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, FROM_LOCAL_NOVOWEL,HK_RANDOM_ENVFROM,HK_RANDOM_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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768657546805186483?= X-GMAIL-MSGID: =?utf-8?q?1768657546805186483?= There may be other users for the early traps besides KASAN. Move call to the early_trap_init from kasan_early_init. Protect init_exc_table initializer with ifdef to make sure it builds on noMMU configurations. Signed-off-by: Max Filippov --- arch/xtensa/include/asm/traps.h | 2 ++ arch/xtensa/kernel/setup.c | 6 ++++++ arch/xtensa/mm/kasan_init.c | 2 -- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/xtensa/include/asm/traps.h b/arch/xtensa/include/asm/traps.h index 6f74ccc0c7ea..acffb02f8760 100644 --- a/arch/xtensa/include/asm/traps.h +++ b/arch/xtensa/include/asm/traps.h @@ -64,8 +64,10 @@ void do_unhandled(struct pt_regs *regs); static inline void __init early_trap_init(void) { static struct exc_table init_exc_table __initdata = { +#ifdef CONFIG_MMU .fast_kernel_handler[EXCCAUSE_DTLB_MISS] = fast_second_level_miss, +#endif }; xtensa_set_sr(&init_exc_table, excsave1); } diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index 94aafa19771b..5c0c0fcac144 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c @@ -47,6 +47,7 @@ #include #include #include +#include #if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE) struct screen_info screen_info = { @@ -242,6 +243,11 @@ void __init early_init_devtree(void *params) void __init init_arch(bp_tag_t *bp_start) { + /* Initialize basic exception handling if configuration may need it */ + + if (IS_ENABLED(CONFIG_KASAN)) + early_trap_init(); + /* Initialize MMU. */ init_mmu(); diff --git a/arch/xtensa/mm/kasan_init.c b/arch/xtensa/mm/kasan_init.c index 1fef24db2ff6..f00d122aa806 100644 --- a/arch/xtensa/mm/kasan_init.c +++ b/arch/xtensa/mm/kasan_init.c @@ -14,7 +14,6 @@ #include #include #include -#include void __init kasan_early_init(void) { @@ -31,7 +30,6 @@ void __init kasan_early_init(void) BUG_ON(!pmd_none(*pmd)); set_pmd(pmd, __pmd((unsigned long)kasan_early_shadow_pte)); } - early_trap_init(); } static void __init populate(void *start, void *end)