From nobody Tue Dec 2 02:58:12 2025 Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4E72220C490 for ; Tue, 18 Nov 2025 12:37:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.196 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763469423; cv=none; b=DrBQcStJJrwCiWDr6SjSQjvQ475l12b9haLEtzobNwMZ/7gtshu32rLcdGei8VieHAY+OlAgiil8X4jnkWUTcYExilpHjFx4dXA108tyhA4ieBZ2K0hfacD3IoqxEER2gv51MI9empcoD9UB4YeG0f6f+HSmFulWeH0IMVsVyno= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763469423; c=relaxed/simple; bh=yw0+14vG3MTkylBTsNGEjI1rTbbl51z2DrBpLhZnx4s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iLAOURJCgMTMx1A0/aaikDEtbWHSWFQePYpWEZXEpwm2vjV08S7HsoZFl1JhUeqLgx7ifGddAw2M6ryLNYTBxrDQr9SICWClpCTS+RNqak8NP6rOefd11GKW1v7fXOQi7L0EIo0VDu+wOPq8t5/Yl1lI95wG6wDpNUN4gekFjn0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=XJ6PDHPU; arc=none smtp.client-ip=209.85.210.196 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XJ6PDHPU" Received: by mail-pf1-f196.google.com with SMTP id d2e1a72fcca58-7baf61be569so3873797b3a.3 for ; Tue, 18 Nov 2025 04:37:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763469421; x=1764074221; darn=vger.kernel.org; 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=KRkWsGzjZIg7j77yjUEwdtDGoZTowRE1mWBAeLLFj3U=; b=XJ6PDHPU/43Hl58ZLURBIl0aD1bLDiWd/ZXkuC7Ivd8A5Xl6SCaLUOPPzeOFplUUmY 8bdgrxGb8WfYWTclxDAQadta7nXpRXIwXDQTojnC1jqxEMU68wqJQ263XQShenChUM2l 6cY5SqlwkYbQ2xeOB9OsVEK7X8hle3Dngo6TttlwgMW/uQp8iFcRoUXDOVfJMRP1iNgZ GgAATu4QyyiSv9E8Tkzh/Ppl+O17bRcDTfESNfST2L7t+gjZNYRcAnH5imdeQLjno5AH RDbezKUFs2Kw5vxcwS6UHhnxV6MZfGHt/YwH9RkE4CZqlBNBiYKkpESBmKuFcFEIq/Na AQmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763469421; x=1764074221; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=KRkWsGzjZIg7j77yjUEwdtDGoZTowRE1mWBAeLLFj3U=; b=hXk6K2EkPio4bY7k2LZaNh0NDFBFwkwRMTzR+YwlnTIZB7CGu6koTzPTPm4p/1DhOj GkXLZs813kiFxa8O+m4zfQZfqkFQnx7sVqNV6qBweKZRpi77APJg+K7bnLGJPckAfZu9 YYFq+UlNkqCNc4H/65ztbP2szLSMzMPhiQkQgFbWTKgLyGT9Mk9XakCdBrhjydY2R7Jm XZeJwWhd1zmWJotApSzaBkozIfLRNPirdtcRD7lOhTtS3weC6J0EMFAPGTzTXNxwriqS /GV8xprEWl/ugDJgFllOw5NtHHPM77Jp7L6TIMK16ZjQV4gXSoeMk/PJnhLUqCugajwu CN8w== X-Forwarded-Encrypted: i=1; AJvYcCUAZctqRmZtUqHxDYJtFZxtQV7psuHZ54XE31Io1nZqkYJXJHyCtpgnkeN7dA0WkaeTeRVAiPPZ5VSevYk=@vger.kernel.org X-Gm-Message-State: AOJu0YxrMCt1KMIb47M8c7GqJCl8YAtrKSef0SdmWkls0y5IVmw2CPcY LIPeCCdlzeNCLMe/5NdzMbTLgPxmVh4IIfF/WQM1oEZiZiW26X2zAXYp X-Gm-Gg: ASbGncsepPxYbEPAyVhOX1wwf7MeffI5Sr8dSligcz6I4THsazI14oNUuXvFinR+x6X E1Q4+YlysK9surtRID+O64///nUOVlPFFtk8lKi1ew3/0MFxFg64KqD7Gt8fld7/0Kdc2Xi9vnw NBtiGtWTClby9WTPItt6oj5Jt9Y0zsPsDFsZAOdErJGyKog/hcs077QCVjRxz3fraOIgsYBT6+8 CoQceNUm278qVIrB5ySGYZ86RBA+WpZ0owBlh8hvIYujJttzdqU3k1APvfHVf1yTnZZD5gvH0Kc ZcgE6dNMLNYcctSwlg9elMCKhdQdGeZcBlT0GtcrWm817eCGMvK0IoNO0ri5HJjJFhZvHJXFbqq xa/cTGW6lUHR3wblKWQk8hI3/YcU4CaQqONAqrVL0RUnQ3XgnNBl0rn3/ryqTzqSa1jpPRzX2/o khgIJa3nCJjbE= X-Google-Smtp-Source: AGHT+IHLeC9ZWRL2VLtRiE54fQ6H+bxg9/eru6ZBoKg3v7IDmaLDmUU9coK6XPoveKCEmhT4BZJJbA== X-Received: by 2002:aa7:888c:0:b0:77f:2dc4:4c16 with SMTP id d2e1a72fcca58-7ba3be8c664mr17780783b3a.21.1763469421399; Tue, 18 Nov 2025 04:37:01 -0800 (PST) Received: from 7950hx ([43.129.244.20]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7b92772e7f2sm16331496b3a.57.2025.11.18.04.36.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Nov 2025 04:37:01 -0800 (PST) From: Menglong Dong X-Google-Original-From: Menglong Dong To: ast@kernel.org, rostedt@goodmis.org Cc: daniel@iogearbox.net, john.fastabend@gmail.com, andrii@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com, song@kernel.org, yonghong.song@linux.dev, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org, mhiramat@kernel.org, mark.rutland@arm.com, mathieu.desnoyers@efficios.com, jiang.biao@linux.dev, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCH bpf-next v3 2/6] x86/ftrace: implement DYNAMIC_FTRACE_WITH_JMP Date: Tue, 18 Nov 2025 20:36:30 +0800 Message-ID: <20251118123639.688444-3-dongml2@chinatelecom.cn> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251118123639.688444-1-dongml2@chinatelecom.cn> References: <20251118123639.688444-1-dongml2@chinatelecom.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Implement the DYNAMIC_FTRACE_WITH_JMP for x86_64. In ftrace_call_replace, we will use JMP32_INSN_OPCODE instead of CALL_INSN_OPCODE if the address should use "jmp". Meanwhile, adjust the direct call in the ftrace_regs_caller. The RSB is balanced in the "jmp" mode. Take the function "foo" for example: original_caller: call foo -> foo: call fentry -> fentry: [do ftrace callbacks ] move tramp_addr to stack RET -> tramp_addr tramp_addr: [..] call foo_body -> foo_body: [..] RET -> back to tramp_addr [..] RET -> back to original_caller Signed-off-by: Menglong Dong --- arch/x86/Kconfig | 1 + arch/x86/kernel/ftrace.c | 7 ++++++- arch/x86/kernel/ftrace_64.S | 12 +++++++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index fa3b616af03a..462250a20311 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -230,6 +230,7 @@ config X86 select HAVE_DYNAMIC_FTRACE_WITH_ARGS if X86_64 select HAVE_FTRACE_REGS_HAVING_PT_REGS if X86_64 select HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS + select HAVE_DYNAMIC_FTRACE_WITH_JMP if X86_64 select HAVE_SAMPLE_FTRACE_DIRECT if X86_64 select HAVE_SAMPLE_FTRACE_DIRECT_MULTI if X86_64 select HAVE_EBPF_JIT diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index 4450acec9390..0543b57f54ee 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c @@ -74,7 +74,12 @@ static const char *ftrace_call_replace(unsigned long ip,= unsigned long addr) * No need to translate into a callthunk. The trampoline does * the depth accounting itself. */ - return text_gen_insn(CALL_INSN_OPCODE, (void *)ip, (void *)addr); + if (ftrace_is_jmp(addr)) { + addr =3D ftrace_jmp_get(addr); + return text_gen_insn(JMP32_INSN_OPCODE, (void *)ip, (void *)addr); + } else { + return text_gen_insn(CALL_INSN_OPCODE, (void *)ip, (void *)addr); + } } =20 static int ftrace_verify_code(unsigned long ip, const char *old_code) diff --git a/arch/x86/kernel/ftrace_64.S b/arch/x86/kernel/ftrace_64.S index 823dbdd0eb41..a132608265f6 100644 --- a/arch/x86/kernel/ftrace_64.S +++ b/arch/x86/kernel/ftrace_64.S @@ -285,8 +285,18 @@ SYM_INNER_LABEL(ftrace_regs_caller_end, SYM_L_GLOBAL) ANNOTATE_NOENDBR RET =20 +1: + testb $1, %al + jz 2f + andq $0xfffffffffffffffe, %rax + movq %rax, MCOUNT_REG_SIZE+8(%rsp) + restore_mcount_regs + /* Restore flags */ + popfq + RET + /* Swap the flags with orig_rax */ -1: movq MCOUNT_REG_SIZE(%rsp), %rdi +2: movq MCOUNT_REG_SIZE(%rsp), %rdi movq %rdi, MCOUNT_REG_SIZE-8(%rsp) movq %rax, MCOUNT_REG_SIZE(%rsp) =20 --=20 2.51.2