From nobody Fri Dec 19 15:50:31 2025 Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) (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 E75CA30DD11 for ; Fri, 5 Dec 2025 09:30:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764927022; cv=none; b=JoIqj/D5Clhz40uZUS3vBX3a9gUFvVHvUjttunuYhr0/zZLs600SOhjlx5mPvobkp8A5Vlc6zZ4BNoOR3F6Ic6V0zkguXY8E31I9tZExlH/ZHA4U6QHRtkD/uIz8P9OKm1zmTDKcnB26VGS214VGU6ycTXO8nkHlZAc0T4uClAA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764927022; c=relaxed/simple; bh=+WQjC0+RB1KLkzbox2DQePGoJ2XYaWmSvFcM3Ow2Wc8=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=N3mqw4ZdRDzAhvW5UJYum9124ViOpTaZdq5bvVjXvbEhZDLsR+Cb7PA+tixTOaavwiW4+agNvTaP8eATByKTaizFIRtvFKN4i25Msh/yGPdnya730q1rMPmBsupO7b0ZvqrN+RE1668/r42eRr9ruBmDCCz91LLXSulOPO4VaeE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b=WN9KxOug; arc=none smtp.client-ip=209.85.215.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bytedance.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b="WN9KxOug" Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-bcfd82f55ebso1335300a12.1 for ; Fri, 05 Dec 2025 01:30:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1764927010; x=1765531810; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=kfSfHhhRxhuHB1Gi2FXvT3kyeAYb2F2W42PBtzI8LGA=; b=WN9KxOugb8wW3WcWGtylDdevIXLOfzTbZ982QVEJLGCly3DH6kyQYXMH57LgndZd+w 4Zbg+PPfJPOIV9w0ySj/f/UNk4SJvYUJTPBmKBaPi2Fp2xuJ9SgnyV4GT6PeJS8WrwR8 Y1YU629YEH11aJMCpSg3wn+O2nDsheabeSLKCeAF+Rk3t4l7dh5pdtPzQUsw+cOyMwvN d4ojfE4gpJN1c1pSLgTryVjigUGK0VT/0ohLrYrIQYMPHr8D+mznRj4zRoZkjvdyNeeJ nsEO0OhzPVNK8O1x5P36BWhqLYWITT+zmPmGRGJ6PdRifYDsQKxfSOnFo6Sx+l7tpTH/ 25Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764927010; x=1765531810; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=kfSfHhhRxhuHB1Gi2FXvT3kyeAYb2F2W42PBtzI8LGA=; b=Vra0+yPxEzTk9hWp70RKbmFSikbpk2wGdb31D1h4LS/ITLJpcvseuFmMebG9ZvpQe6 sil/vdgEzL7t4WwChrym8TsBYmk8IbGwwlW9o/wwahjuqyHbaGh2davwo+lvRQyG23Fq 0xTKhSThZA7nGRMnD4IH9EPAhe1Cx/XqTbBAgi1oV4X/yMZVN6Go8pld2MBjHQicKzN+ 37AXGm30QJ6Uy576GjoQMgQ2mFqeQlTZAmJ3zXfZkD/iUFX9jeCN74ZZsa6h8TpZLKdY vxDD0/WakCOWhn3aAj2BaWvxav3Vk3LmiMC54akisxSF8yUqwhoYnM6tC3W5OTTyEZs2 F25w== X-Gm-Message-State: AOJu0YzEzj8UIS16nn5x9szwbC6gM4H0LwacqyUAmOKCCQXl5/GnMwoV 1GrI0S2KohXFcJsnWyxlM/vSjojm1QwoXg0NdjA0MSoeIfQ+pGoZZDAWAWcQBTD2a64= X-Gm-Gg: ASbGncsCHsZQvkOAX/yAQu+BPh7MqGt9acwOJ+UXB4Ec0JEBbNXQ1eMqaE/NIuQIUFC 21lm837qDp4J5Shgb7NS+d5NbALPAcKai9PrSf3cV0sWxELled/KahzOZTBH1Z/5j2IrJTm8DCC fakSLWg4gV9o1LFnah+JOmss7BhpiCE+XUY3WOd6uBDjgzBbKY9whL/t6b2f/MDl4+CgNlqYqFD gjAUiSRx+Ny0u9pKIBcHdq/PSs/fi9fZSvPikfBbSmdui7iSccWMwH+pjU02tyLr7XbgxR7XlWE DdBaFZ1jPFW3BmoAz7Ilj33o1X2cYvXzOZ9Bdd5YOK9pq78TYjJ5wYwS/gNf2TcGWk/LmofMHxK f5lpx37Z8fXaxQpo/uFV/ni73QB0O42zxo5UV/m00laOuzE7B0nHnTqOX1bfTsxiNdXsOOh55JA KmbNkg8urKR4kdr23Zw2EAwbmAabgqTQ== X-Google-Smtp-Source: AGHT+IFEFED5ms0xzbwmgo/bYPVrz1E2ohbcd/UJJoUGT5C4HOXec3jJihUgwnpZE5vhb3Phq3BGGQ== X-Received: by 2002:a17:90b:4b8e:b0:32e:3592:581a with SMTP id 98e67ed59e1d1-349438bdb29mr6465600a91.17.1764927010463; Fri, 05 Dec 2025 01:30:10 -0800 (PST) Received: from n37-012-226.byted.org ([115.190.40.13]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-bf6a14f3fa0sm4093051a12.22.2025.12.05.01.30.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Dec 2025 01:30:10 -0800 (PST) From: "qingwei.hu" To: naveen@kernel.org, davem@davemloft.net, mhiramat@kernel.org Cc: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, Qingwei Hu Subject: [PATCH] kprobes: Call check_ftrace_location() on CONFIG_KPROBES_ON_FTRACE Date: Fri, 5 Dec 2025 17:29:33 +0800 Message-Id: <20251205092933.3889547-1-qingwei.hu@bytedance.com> X-Mailer: git-send-email 2.39.5 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" From: Qingwei Hu There is a possible configuration dependency: KPROBES_ON_FTRACE [=3Dn] ^----- KPROBES [=3Dy] |--- HAVE_KPROBES_ON_FTRACE [=3Dn] |--- DYNAMIC_FTRACE_WITH_REGS [=3Dn] ^----- FTRACE [=3Dy] |--- DYNAMIC_FTRACE [=3Dy] |--- HAVE_DYNAMIC_FTRACE_WITH_REGS [=3Dn] With DYNAMIC_FTRACE=3Dy, ftrace_location() is meaningful and may return the same address as the probe target. However, when KPROBES_ON_FTRACE=3Dn, the current implementation returns -EINVAL after calling check_ftrace_location(), causing the validation to fail. Adjust the logic so that ftrace-based checks are performed only when CONFIG_KPROBES_ON_FTRACE is enabled, ensuring correct kprobe behavior even when KPROBES_ON_FTRACE=3Dn. Signed-off-by: Qingwei Hu --- kernel/kprobes.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/kernel/kprobes.c b/kernel/kprobes.c index ab8f9fc1f0d1..f4aa4ba1ca9c 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -1512,19 +1512,15 @@ static inline int warn_kprobe_rereg(struct kprobe *= p) return 0; } =20 -static int check_ftrace_location(struct kprobe *p) +#ifdef CONFIG_KPROBES_ON_FTRACE +static void check_ftrace_location(struct kprobe *p) { unsigned long addr =3D (unsigned long)p->addr; =20 - if (ftrace_location(addr) =3D=3D addr) { -#ifdef CONFIG_KPROBES_ON_FTRACE + if (ftrace_location(addr) =3D=3D addr) p->flags |=3D KPROBE_FLAG_FTRACE; -#else - return -EINVAL; -#endif - } - return 0; } +#endif =20 static bool is_cfi_preamble_symbol(unsigned long addr) { @@ -1540,11 +1536,9 @@ static bool is_cfi_preamble_symbol(unsigned long add= r) static int check_kprobe_address_safe(struct kprobe *p, struct module **probed_mod) { - int ret; - - ret =3D check_ftrace_location(p); - if (ret) - return ret; +#ifdef CONFIG_KPROBES_ON_FTRACE + check_ftrace_location(p); +#endif =20 guard(jump_label_lock)(); =20 --=20 2.39.5