From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D68DD3C906 for ; Sat, 19 Oct 2024 12:11:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8DCFC6B0082; Sat, 19 Oct 2024 08:11:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 88A3D6B0083; Sat, 19 Oct 2024 08:11:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 72A7B6B0085; Sat, 19 Oct 2024 08:11:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 55A496B0082 for ; Sat, 19 Oct 2024 08:11:06 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id C8085AC0F3 for ; Sat, 19 Oct 2024 12:10:39 +0000 (UTC) X-FDA: 82690235292.17.C601256 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf23.hostedemail.com (Postfix) with ESMTP id 2E6E2140008 for ; Sat, 19 Oct 2024 12:10:55 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ji+u5mIf; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf23.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729339701; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ewdrroxFiAygB0WZp3b0IKE5tVJl7cLRD8sB4bftnQg=; b=OK17seZSabm3pJgsofSE9nHt6ZZuHsogh2kd/3xmMHMOTxFeU5NfknG8v8aJYQdBTtKFnJ AowCK02Ip9LTvk+XDGzydMZYUZVmNl4ZtT6nBubrvsgP31Lqd0UqrlQSCLP0i+HQ/ij4JD OF3vn1zSdugwBAb70N4/PtF1YyOGdic= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729339701; a=rsa-sha256; cv=none; b=7VRUvyQjYTiE2f3Q1CwUTdKwSfsgZ5eAnrP0GIq6RR5FA4xuctZtmll/AEL8KR8VFvdMvp +tX+kdYyxquAnyWEcOcUK9E+Dx7CpzeoOuNZJ9TEQJBgdqR0R5HjgronXd39e2Gw4CHopy e+c2zvX9OwCjZNCs8N5QPnZiYpd+pDA= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ji+u5mIf; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf23.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id EE9435C5C74; Sat, 19 Oct 2024 12:10:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0C444C4CEC5; Sat, 19 Oct 2024 12:10:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729339862; bh=FSuVpxp8ZC8+I9iOSenx9AlHNi52QSz7zz+w4xwBZFU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ji+u5mIf1nBg2Nj6gLisAF5MRqi/wx3vBw5aJxxyqXCZq6i3mNEIjudfG3JajAqFI WJRVPOIUQSQMsfw+JO35XVRk0koV9Zi9I3YAvvjqBLsmrQOq5ay1ac5pdb0lvGGzR1 j08uXL+V5r/xzvXwZInMDzkCPiTd8EFrbVzmdTCt/13Ip6ENRmE+El1EXUc14T5/hg fuuSACJI10Sa/jG2tlc11AxV3tkbudw+OnnTaatlKtiS8TlF8dKP0jJBWpV4zxhOjz kxntgxyzd/tCBOSTcO89LQ6Xv/hweCp+LHVMbTjkYPRC9v5XPDgpwR4Gn2FpyhtFiC QsF+azFAwnoMg== Date: Sat, 19 Oct 2024 15:07:00 +0300 From: Mike Rapoport To: Steven Rostedt Cc: Andrew Morton , Luis Chamberlain , Andreas Larsson , Andy Lutomirski , Ard Biesheuvel , Arnd Bergmann , Borislav Petkov , Brian Cain , Catalin Marinas , Christoph Hellwig , Christophe Leroy , Dave Hansen , Dinh Nguyen , Geert Uytterhoeven , Guo Ren , Helge Deller , Huacai Chen , Ingo Molnar , Johannes Berg , John Paul Adrian Glaubitz , Kent Overstreet , "Liam R. Howlett" , Mark Rutland , Masami Hiramatsu , Matt Turner , Max Filippov , Michael Ellerman , Michal Simek , Oleg Nesterov , Palmer Dabbelt , Peter Zijlstra , Richard Weinberger , Russell King , Song Liu , Stafford Horne , Suren Baghdasaryan , Thomas Bogendoerfer , Thomas Gleixner , Uladzislau Rezki , Vineet Gupta , Will Deacon , bpf@vger.kernel.org, linux-alpha@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, linux-modules@vger.kernel.org, linux-openrisc@vger.kernel.org, linux-parisc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-sh@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-trace-kernel@vger.kernel.org, linux-um@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, loongarch@lists.linux.dev, sparclinux@vger.kernel.org, x86@kernel.org Subject: Re: [PATCH v6 6/8] x86/module: prepare module loading for ROX allocations of text Message-ID: References: <20241016122424.1655560-1-rppt@kernel.org> <20241016122424.1655560-7-rppt@kernel.org> <20241016170128.7afeb8b0@gandalf.local.home> <20241017101712.5a052712@gandalf.local.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20241017101712.5a052712@gandalf.local.home> X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 2E6E2140008 X-Stat-Signature: 5z6hzfdmhy9mj7ay8q9k1mhoh91oz9mp X-Rspam-User: X-HE-Tag: 1729339855-857671 X-HE-Meta: U2FsdGVkX18DRzT6bUi+DFyvDU2WLh3BNlFvHDGwBPAvY8u0uFUS3flfM6hO1jLreTxXiD6EeIL5kQXvgFd0yFNjfR9MoxhUkdGKU62inMHyzVKPaQbFIT6rrCol1PleHPa8IzoPqQ+0TqEoFLceiHlkAyQs6DTtKWP8hfNg2QXlNO3EpPBnK8xZrxpi4KUolUEn2O9aUINLIa4ZgdPbajLIMGVRS4++jyJvtpx1JntvmoYq4YDykjE+B6A0j67kkRwVEs4Ekn7+/5WvLLHfgTvQLps47KIn4pC5QNQEyfkLax38MjN63znNN6gNPvlCtrTnbO4ASLVoD3USKCW4iGwPIp57zDZTE+fSR4uaBgVGh6sSFx1uc7Afr3AxmWH4Cqw0Oe1JgW/jpOKlBjZYZbn4JouSb1Jr+ylIYDsiyZ7kMHiusPKM3KgcFoOduCMDaTqqKFCb93G8wZdoVb2trtSmUL60CXxN2vdwOGLxTV9wfpNNO5tpyoj8GX5zk/hM9EJjvMwAK5uBqmSstJbMM6e+ptKyELlmKm05KRS9oyTHdgZuhn6tr+s5Z4exTlfjIYb1HGr0EKzx0/MagsNCyLxInOGlQSFFlOunk8sT5NLwQD3RH0C1HvAnfdMp1w2JR/zAv/rtuebc/nE6ZXo6XWEE4iZ1VmS7+t7SBIIbifTsBRa48iiMsjU1FlZehTr16t2rnh0m6Zjqu9XN9jO4yHcwvHI4xtZVwT1Vde0NFMif+e3R2EgE64zZLLFEEjuBXpVuDFkAb9itYj0vWR/oyamj/JDSpZ/SIXxSBRVLXA5Wy4JD6pb7xz1xm5S55Az30QA6T9oDMT419uUKet70ltgYPEpYF1XWTyfm1EBdaPDZD6WJYMHMN1YigFaBzqhbR5bFuule1XXtS6s1olU7HrdqDKMPV1+XVyo4XRCTlygFQWBbixFAVZ+4ffyakUXREYKZ3Be6Ejo6vyQdKn3 RyD46Y9M 4PxRyeualzPUo9VwyE0bEmIPJ9jJOXdb/3C0dxJeI/jmlGZ1XXj+ZAnMc/enba3xsgDvrEh5+Qn2bKvBBuSoFcH8vD/yqWFpTOcDi73srctre4Gsfj/N0CLgYz3Dhnu5lYbIsqrdbDcSH92zGmx4hzowS8/KGmgpzc6iGQWLuB8IYHRdr//TsPNTiiK4F15EdGKgKaCW2XptNNRJ8jbL6LvtmRUtIGdxuk2mPv2nZdd4fpWoecTbFU94FdqEgOgRt8Rb49QNOPCAd3ip0FL+WnDxFuh/4ox+nQxVGaIf/+SqHxLM711mxikl6fA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Thu, Oct 17, 2024 at 10:17:12AM -0400, Steven Rostedt wrote: > On Wed, 16 Oct 2024 17:01:28 -0400 > Steven Rostedt wrote: > > > If this is only needed for module load, can we at least still use the > > text_poke_early() at boot up? > > > > if (ftrace_poke_late) { > > text_poke_queue((void *)ip, new_code, MCOUNT_INSN_SIZE, NULL); > > } else if (system_state == SYSTEM_BOOTING) { > > text_poke_early((void *)ip, new_code, MCOUNT_INSN_SIZE); > > } else { > > mutex_lock(&text_mutex); > > text_poke((void *)ip, new_code, MCOUNT_INSN_SIZE); > > mutex_unlock(&text_mutex); > > } > > > > ? > > > > The above if statement looks to slow things down just slightly, but only by > > 2ms, which is more reasonable. > > I changed the above to this (yes it's a little hacky) and got my 2ms back! > > -- Steve > > DEFINE_STATIC_KEY_TRUE(ftrace_modify_boot); > > static int __init ftrace_boot_init_done(void) > { > static_branch_disable(&ftrace_modify_boot); > return 0; > } > /* Ftrace updates happen before core init */ > core_initcall(ftrace_boot_init_done); We can also pass mod to ftrace_modify_code_direct() and use that to distinguish early boot and ftrace_module_init. With this I get very similar numbers like with the static branch diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index 8da0e66ca22d..859902dd06fc 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c @@ -111,17 +111,22 @@ static int ftrace_verify_code(unsigned long ip, const char *old_code) */ static int __ref ftrace_modify_code_direct(unsigned long ip, const char *old_code, - const char *new_code) + const char *new_code, struct module *mod) { int ret = ftrace_verify_code(ip, old_code); if (ret) return ret; /* replace the text with the new text */ - if (ftrace_poke_late) + if (ftrace_poke_late) { text_poke_queue((void *)ip, new_code, MCOUNT_INSN_SIZE, NULL); - else + } else if (!mod) { text_poke_early((void *)ip, new_code, MCOUNT_INSN_SIZE); + } else { + mutex_lock(&text_mutex); + text_poke((void *)ip, new_code, MCOUNT_INSN_SIZE); + mutex_unlock(&text_mutex); + } return 0; } @@ -142,7 +147,7 @@ int ftrace_make_nop(struct module *mod, struct dyn_ftrace *rec, unsigned long ad * just modify the code directly. */ if (addr == MCOUNT_ADDR) - return ftrace_modify_code_direct(ip, old, new); + return ftrace_modify_code_direct(ip, old, new, mod); /* * x86 overrides ftrace_replace_code -- this function will never be used @@ -161,7 +166,7 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) new = ftrace_call_replace(ip, addr); /* Should only be called when module is loaded */ - return ftrace_modify_code_direct(rec->ip, old, new); + return ftrace_modify_code_direct(rec->ip, old, new, NULL); } /* -- Sincerely yours, Mike.