From patchwork Tue Oct 25 20:06:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Zijlstra X-Patchwork-Id: 10970 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1196543wru; Tue, 25 Oct 2022 13:13:53 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4jfWaGFNI6RVDLafkey11qNKCz2adAaxliv7m5cTlurBQb6ozwCX1iOm/xIzVoUTQidzOd X-Received: by 2002:a17:902:7786:b0:178:48c0:a083 with SMTP id o6-20020a170902778600b0017848c0a083mr40851783pll.125.1666728822665; Tue, 25 Oct 2022 13:13:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666728822; cv=none; d=google.com; s=arc-20160816; b=a1BJ5wWdAkdU/9lSYbZ+icumhwZHmYtdlE/Of4aJ1oM9KpazBTOF4qAyEedAJdqW4i gu5Nzfk9bb9vGJhZI9t0FyaMcj2/V7YpKxj7RCUi5XZ68+Fkuupx6MfKHfMRCe21Ttt5 3lnnf3x6AhYnOHAkABQOQZkasQxkRF1mZboV1xxxn+6o+xzg3MvL7G2OD9CKUhpY1hCE Oh7zwhPaVrkKG39t+Pqxh2KIFB+9aK+MHtl7FyyGGDri3TOKTBRrUeA8ulorEOgtFxmk bi/oR8pup+HSrqwgtzBxhrZsChHI+mCU7SR+/jn76NTYpF4s9bNqKy5Tu9yXSwiF/RUV s/qQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id:dkim-signature; bh=vqWW09KISKCCkh6u5sz08Jb6XS7CEV1aGc6COZk9VFQ=; b=IiaT+0dvYG+pM7iSA3K6Vp+ZR6/VaKoJtQ2bfsdZuf5gU/9qbVy4iM+5CifMnY4TSb KyJNfpLuA2CHV0H18CauD0g146BPIwthtBe9Fb8E6gFQZwo5bxDApy4OsZxF1Y8dsH1m OJkAgNnO510Vl+nuTY69klQMzTenSTpFx4UWal40pdGS/O+KMjVft4Asfwq2F7uwNWeo rZYhNgHi5QbAArshLczD2ddqt3KtMFC7o3n0gemoBLcp7KPhXk1ULrPstz+pPE3dYf2q 3MVOPVv8OytKTH04QzEEUJ/8CnkGLMPvK4GKumCBhYthAal7Di5CHgX6PPAXVTeUkc0I bdcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=desiato.20200630 header.b=jI2MOKll; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k1-20020a170902c40100b001869e7dea17si4862653plk.129.2022.10.25.13.13.21; Tue, 25 Oct 2022 13:13:42 -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=@infradead.org header.s=desiato.20200630 header.b=jI2MOKll; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231833AbiJYUL4 (ORCPT + 99 others); Tue, 25 Oct 2022 16:11:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231455AbiJYULj (ORCPT ); Tue, 25 Oct 2022 16:11:39 -0400 Received: from desiato.infradead.org (desiato.infradead.org [IPv6:2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D1127A745 for ; Tue, 25 Oct 2022 13:11:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:MIME-Version:References: Subject:Cc:To:From:Date:Message-ID:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:In-Reply-To; bh=vqWW09KISKCCkh6u5sz08Jb6XS7CEV1aGc6COZk9VFQ=; b=jI2MOKllzRXOLxYgNpNI5zP8AR 6vVHJ9pMxNaFqfykRbCzkdDD5JoPCx8VxkPq3CsnbrS/Vi8rwS0u1F1+0egrRNW6rE9OY0T634rfo zPi8k7n/tsYogemzZhDQBc9/+IUcoDgaebRmNKbIbp3GooFmTyWswoXcfB03Ig0uI+GcaWW4bgAtj /2dfF8jHhHI48rkAOHWUA8mVvZ34zkXUCwzhRtUxAwhL6W64Aj6uzdGOgs7CZMnfmgIQVVRjxm2WZ cGX2XXJDq1EnEjaqPly5FCf9MVwiy1jNNNk8z1AwDJKIgHN4pwDCw7nRnJrjd7k+wFSIEB3Wcs9Xx cznA5bhQ==; Received: from j130084.upc-j.chello.nl ([24.132.130.84] helo=noisy.programming.kicks-ass.net) by desiato.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1onQGh-006OK6-T4; Tue, 25 Oct 2022 20:11:26 +0000 Received: from hirez.programming.kicks-ass.net (hirez.programming.kicks-ass.net [192.168.1.225]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by noisy.programming.kicks-ass.net (Postfix) with ESMTPS id ACCDA30035C; Tue, 25 Oct 2022 22:11:22 +0200 (CEST) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 0) id 95F2F2C4502E8; Tue, 25 Oct 2022 22:11:22 +0200 (CEST) Message-ID: <20221025201057.881703081@infradead.org> User-Agent: quilt/0.66 Date: Tue, 25 Oct 2022 22:06:59 +0200 From: Peter Zijlstra To: torvalds@linux-foundation.org, rostedt@goodmis.org, dave.hansen@intel.com Cc: linux-kernel@vger.kernel.org, peterz@infradead.org, x86@kernel.org, keescook@chromium.org, seanjc@google.com Subject: [PATCH 3/5] x86/mm: Initialize text poking earlier References: <20221025200656.951281799@infradead.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,URIBL_BLOCKED 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?1747691841767562493?= X-GMAIL-MSGID: =?utf-8?q?1747691841767562493?= Move poking_init() up a bunch; specifically move it right after mm_init() which is right before ftrace_init(). This will allow simplifying ftrace text poking which currently has a bunch of exceptions for early boot. Signed-off-by: Peter Zijlstra (Intel) --- init/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/init/main.c +++ b/init/main.c @@ -996,7 +996,7 @@ asmlinkage __visible void __init __no_sa sort_main_extable(); trap_init(); mm_init(); - + poking_init(); ftrace_init(); /* trace_printk can be enabled here */ @@ -1135,7 +1135,6 @@ asmlinkage __visible void __init __no_sa taskstats_init_early(); delayacct_init(); - poking_init(); check_bugs(); acpi_subsystem_init();