From nobody Mon Feb 9 10:27:22 2026 Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) (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 86B89307492 for ; Fri, 14 Nov 2025 09:25:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.193 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763112311; cv=none; b=SJ8/5o+HPt9Frxjd8qlRIgq4TIBpqbm9rMPrEzUlhHuV5eWj6VWhGrvfpCMsadTGPXCZe6++cy7+p6KFjZwmrw1DYzdwrAomhUsaOp8DEg19iM+W8wWxNtmCdelT7dKOrBwDIWnzacxg6a+W0NTZvRHEXSDDXK3HogOjA9Y8GkA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763112311; c=relaxed/simple; bh=gokrqToajl3qLeodPuzcgSTB9cabw/WpaV1bSGQlVLA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=id/elyztWrbU9k+uBm8eX7011Lk4iSyjlZQGgHxThwisYrXsCPUTQEkx8igAonQevR6BsLzCaNqHMzGa67WsMOi4hyTHlT34/7OBydd4d5BCn8VD+59xeKujgqmh/KPrxLpvyP8jenqsi2hDxZUQw5QlBPCZHqTJG3iAvQGsb8Q= 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=PjmZXHsv; arc=none smtp.client-ip=209.85.214.193 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="PjmZXHsv" Received: by mail-pl1-f193.google.com with SMTP id d9443c01a7336-29555415c5fso20484405ad.1 for ; Fri, 14 Nov 2025 01:25:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763112309; x=1763717109; 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=c2wIn/kARIOhJ0xgPL8i1YkD6/QkhYtCyZijlaHlovw=; b=PjmZXHsvrHkZX1BfPdMHG1LHO+98ercxeRnouDfeem7fxEpj+PUhudvllYXeEuQ4/U FuT6ehPHuJspLMumi9AINBr1vPA2JVl8S2YQLy4FKYSZ6aSZF48ZLZofhFbvOxWJ/02/ +LF+cz/cia+PdpH0TvPIjwx1CV4uiTfIsCQFIq2IyxzpsujoFwm6UWx/v2m/bqbzoJFD ef8XIhouSlk/N3xz6iEFvQuI/U3MjK0ieSITtEbufSq0P8QmdA9sZXuT4iTfOrlzLUnf IRfnShm2o5/zgstgFCRkgWEoI2RGObF7GMJB/d10XZX/TZdxprnqQrmgqzF73LpIXbOr +ldw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763112309; x=1763717109; 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=c2wIn/kARIOhJ0xgPL8i1YkD6/QkhYtCyZijlaHlovw=; b=qHeyH9Yz4FHfo/VufKTOP+WL48/Jm4d6ZztYRJNwWy1Yj5Z0Xj6EhvBYEw6QXBBtp/ seJJVDnP8YiZWGieXjsdG5X+xC44ykOf2bT1vOmPwJMflXlz9BewG90/3iXyocLwqlZy cVM+mILVClMc7/aWv0BAQ+CK9yHMU4KDH6BsOzYEAOJVHq+uKKI8Udg6sDABjQ3g4pIX Ulyquocir/GfJ45xTeU8jvzFT4j3ZQyjOvE46c+D0z0kfPli/kocjONN70okAddE7fya 933dFldllzc5HAqzgwBbBYsbPJdB30G38ZU7l8rxBVZlyEkGRjfCPP2+cytsO5WwmDPJ Afgw== X-Forwarded-Encrypted: i=1; AJvYcCX8jNkD0MsItkHstlS1wlG8r10ITKyphM84WU/K2EHt3mVm5mp2tQCt+23n18joWYUX8OOR3IfpZAku6hU=@vger.kernel.org X-Gm-Message-State: AOJu0Yy8mgY0nqj3FXMXk/JQtZGna6edgYyVkyLj60p5AbTf199fwoIR LzmksgRa4R7ygSE+jEIcnnHkmA08d0C+Fr64pDhB+JkNEz5gR9v5bP31 X-Gm-Gg: ASbGncvtgwX+b1vh1w3puVkd0X5ziuTyEpbMQOlrqG6217gy7CJO+sXkUPRkN7GSQPJ Ywo2OJCOgdqbL/nsmxv4cFbW4mg6gcbPOhvNNenW429+EURvvv1I8CxjzKPfowy2689sIA9Tc91 dzKKQ8qp8mmOK8nqV6KYSauNQbdghM0sZsgMYrJDdseuGGlRQz1y96ldz9R+lbrWTA3Goc+LRaV 1ksQK2QO5hyi/AscX+ckd6zRcGJ8kG2D3p4BudSlSlwBp4nQhqUyJaBlH4yJXBTRFXo7jxxuMms fZh1jrL5YBeFIwazSL//0PUODnB5rJAA5ebboiqDUsqnfX9aRY6sTbpnKVom/LE6B7rwm9DZexZ ZaT8DLtbQnOt2w6kmRT63iUo9Ht0KznhjhZdXCbm36udQpir6Uj+/2+VfqBrwjINIbRuutTdYyW Rk X-Google-Smtp-Source: AGHT+IG5VnwBl+1lxPrp6qdos/kEJNYbsFAuD4akbBy67+ZoqlT1tPAQmEIH9GoRP72WFoHDwsjAMw== X-Received: by 2002:a17:902:f60e:b0:290:c0ed:de42 with SMTP id d9443c01a7336-2986a7417b8mr26050145ad.36.1763112308699; Fri, 14 Nov 2025 01:25:08 -0800 (PST) Received: from 7950hx ([43.129.244.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2985c2346dasm50451525ad.7.2025.11.14.01.25.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Nov 2025 01:25:08 -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, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCH RFC bpf-next 2/7] x86/ftrace: implement DYNAMIC_FTRACE_WITH_JMP Date: Fri, 14 Nov 2025 17:24:45 +0800 Message-ID: <20251114092450.172024-3-dongml2@chinatelecom.cn> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251114092450.172024-1-dongml2@chinatelecom.cn> References: <20251114092450.172024-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. 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 367da3638167..068242e9c857 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