From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 21F542500C8; Mon, 25 Nov 2024 03:58:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732507126; cv=none; b=uUFoAjMY3O2p1WuGHZKKJ1u2oPP9nyK7Mlmd8HTdm0uIhHHSH3oc5vfqc28h9/40uK3mJBYHdyhrWMsIKLe3e7JTAM9E5Xk36hO6Xi4QQ3BGZJIkfgKtds79Cyuwc/7bwW8KJo5ijRcM6bMnrcNBReq/m/3tu90pbvcdO1HV8fw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732507126; c=relaxed/simple; bh=neQUOlOJW1u87EBBFoOioJrDEn84H5u5RrK+fg1NqW8=; h=Date:From:To:Cc:Subject:Message-Id:In-Reply-To:References: Mime-Version:Content-Type; b=DKzjvH8oLLATGSsCcA/QF2IUcVIlpuO4yhOdOIU7qDERxF55w3OgGNWVrd17PI/eBtgTJc8i/xw6GIiP/R0RbLXQ+CnKPQpa5rvuMf0j9i9gu/3zAkipjGaF8Fk7UqMXXmspRh9WfXrIlgb0f1GGq6ne+sUdEyZKehFERT/N+Uk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZuLuSzej; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZuLuSzej" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DD360C4CECE; Mon, 25 Nov 2024 03:58:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1732507125; bh=neQUOlOJW1u87EBBFoOioJrDEn84H5u5RrK+fg1NqW8=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=ZuLuSzejZ7FLOYuaFnDZzdoRjHCcyMaJw+XbPuLMZZhKsrWhitqCyluVLWKEiu2TW 1gqSLD6ZLoFqsnqOucoUB25jz93oZgakSulkzSOkMgvZWgsj2fqxMSbFtcZapJe2DG JUejI858vsAJhXHxP+gsHbpt46tvL+LOuFD5IWEBy0nZTH9uSKLyUckVNyqlR0tF3S QyH0tj1dlDRAIoKQgX0qpuRzK5d0ouJQfMI2r/gmU9pK4lsovBWXPYHza/6pKGR5cx a1uTHG9GevuGwWD3rGSzk0/IUiAtteg5SZnxBuowksj53Ry5HnVXnzG/eUY3cJZ6w5 VvlsPhKvBBNbw== Date: Mon, 25 Nov 2024 12:58:40 +0900 From: Masami Hiramatsu (Google) To: Mike Rapoport Cc: Andrew Morton , Borislav Petkov , Dave Hansen , Ingo Molnar , Masami Hiramatsu , Steven Rostedt , Thomas Gleixner , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, x86@kernel.org Subject: Re: [PATCH] x86/ftrace: fix boot time slowdown Message-Id: <20241125125840.72ff35d6ee542b2c176852af@kernel.org> In-Reply-To: <20241124140705.2883-1-rppt@kernel.org> References: <20241124140705.2883-1-rppt@kernel.org> X-Mailer: Sylpheed 3.8.0beta1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Sun, 24 Nov 2024 16:07:05 +0200 Mike Rapoport wrote: > From: "Mike Rapoport (Microsoft)" > > Steven Rostedt reported slowdown by over 30ms caused by commit 9bfc4824fd48 > ("x86/module: prepare module loading for ROX allocations of text") > > Before: > > # cat /sys/kernel/tracing/dyn_ftrace_total_info > 57695 pages:231 groups: 9 > ftrace boot update time = 14733459 (ns) > ftrace module total update time = 449016 (ns) > > After: > > # cat /sys/kernel/tracing/dyn_ftrace_total_info > 57708 pages:231 groups: 9 > ftrace boot update time = 47195374 (ns) > ftrace module total update time = 592080 (ns) > > The slowdown happened because initial patching of kernel code for ftrace > was switched from text_poke_early() to text_poke() to accommodate ftrace > updates of module text allocated as ROX. > > Restore the use of text_poke_early() for boot time patching of the kernel > code. > Looks good to me. Reviewed-by: Masami Hiramatsu (Google) Thank you! > Reported-by: Steven Rostedt > Closes: https://lore.kernel.org/all/20241118132501.4eddb46c@gandalf.local.home > Fixes: 9bfc4824fd48 ("x86/module: prepare module loading for ROX allocations of text") > Signed-off-by: Mike Rapoport (Microsoft) > --- > arch/x86/kernel/ftrace.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c > index 4dd0ad6c94d6..9e50288abbaa 100644 > --- a/arch/x86/kernel/ftrace.c > +++ b/arch/x86/kernel/ftrace.c > @@ -111,7 +111,7 @@ 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) > @@ -120,6 +120,8 @@ ftrace_modify_code_direct(unsigned long ip, const char *old_code, > /* replace the text with the new text */ > if (ftrace_poke_late) { > text_poke_queue((void *)ip, new_code, MCOUNT_INSN_SIZE, NULL); > + } 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); > @@ -145,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 > @@ -164,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); > } > > /* > > base-commit: 9f16d5e6f220661f73b36a4be1b21575651d8833 > -- > 2.45.2 > -- Masami Hiramatsu (Google)