From nobody Thu Dec 18 23:40:12 2025 Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) (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 DEE7C4A3C for ; Wed, 17 Dec 2025 03:00:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765940462; cv=none; b=Xbw601x1z71dsqDn6BPM4zyn+ibHiB1ecf10PMgwRwQzCI477EsLedcnXMlZYGuhPeqfa+Cm0sFgGkY+d2jkJcTYzh/f4VU2S0c3ZV5CYyrNileS6VUZQf5M8tn+H8BwURcnte0rl/LNi0XKbOuOpPMMPPzqqHTgsiADBweCV6s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765940462; c=relaxed/simple; bh=LQCLlIDX7gKgIRHQ9Bd8E3tOEJizTVL/xMqpt0SQz6k=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=elT3aibylAHr9jVg20pDPyYcEkb99mb6al1oPITB1PdJMzt+3Evls96YoBBdaqvX3MJ2FAiSnLG39ZJw8/5egAK+1IXfw6CKl4s0YY94Bpvp0XRW+1hWzMkZdmxmkLw/ZRjaXC1/s7upRNoUbl4ViBGVvzTStQilsk994t6v9z0= 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=iIgxFl2B; arc=none smtp.client-ip=209.85.214.194 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="iIgxFl2B" Received: by mail-pl1-f194.google.com with SMTP id d9443c01a7336-2a07f8dd9cdso39195015ad.1 for ; Tue, 16 Dec 2025 19:00:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1765940459; x=1766545259; 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=PjrKAQg/cSPHOSdJybxQoiovFeAReXkBtMU8WASN/p4=; b=iIgxFl2BHNW5DxQzPLtIluc7JrVamqoNodHEgkDLVDSAly3nt1YgPTZOefzA/qBcx0 77N2fAJDc6OnnaNn8DHlT8AA4G9QFMsyKBNpwqAX9c9g5CCuan1/SEiOVMRQ6/Wgilg1 0EU+ACURvIG+o8UToZwaWiTuxfzfvFKsOQyTAs1j7RGxofoH9MwllzuouRSybMRw0c6K 5NyRzilRLqOOUHIYcPqvX8794iNBjFh+aLlDoCvulsLjjoQ1WTwcPY/W+wtQiY3nILLA 5zBtaoibwHHVS/ihzFhE3j7erDoFr1PGvLV2m+PKuOdvyKTcKvem7GAVMXdbbzm6fIah /ryw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765940459; x=1766545259; 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=PjrKAQg/cSPHOSdJybxQoiovFeAReXkBtMU8WASN/p4=; b=nZwzCxYfPuqwwZZdznSp8Q8kYIyxFPDN71jCo/EEzIMy/LZBAmaI0jAHuHawKcraru dTaS1r/QgPf8n0P/3n8+d6vhzJ1vOz1brkD9Kn8457ACFuK9fUFsNBcJGxKuxkEATV5c JfTek3E6liS/fMQI8S82Wj4MOFwhNzMRJ6oiYzkrtziBdUyrZQzqnFe0dOZz9s4hliU3 cMAtumukfdhYYQ4lFlrnaCIxfONrRzLSp+1Sra9YxOV8naiMFfvIioUTNbiyVna/bAxl YYFCDI+7KnCv/Xm4oS4Ejt24Ip8dDDwxFhES3XXSCl7pngqcQsffaBS0mP0/aRrZIjbk ZojA== X-Forwarded-Encrypted: i=1; AJvYcCXCzBPJZDb8eGVWUVtRl4G+QIRHnDAJWevc5IoJtEY2pbtEe+JUEiJlC+8Hp6Qpu/6lF9xLzFRObYYoSQQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwJF/V7KP9FhrlU7eNOcyernlrqp488kjEe8zpG9GoYmVe3hdP9 sZsw/4Qf/hCf1z1RWOsYWwdPh6VuDrUKBj1BjjOd/kjrWygeHcOvtIfw X-Gm-Gg: AY/fxX4EhF+limhhMQp+D80gU3AunRxj4oVdsPOiK3UOkQ3vyhTdq+E5XmIOU5/ZQt0 QM9V3PO5tgyrFiFnMGfHeAF68vXUkoqhM3uKWaBwqp9LxdBVs/RotzPiXFm1M03vH35wPns/8vy e6d7C1s8qX9GKU2dtcEbMr+PQcCFHXZPe4qBLhAxsMyExMtojvzkl4dC+Bbx4W1LdgQnP8NlnxZ aiBxp6n/wLOq5NOB/1AWcKtK9FDsWQDHC1NrBdR21AJ7hbhXLeTX4AJhpS4E7U6PLD9bldBJjn7 3cPsV50jZf7suofW5KnyXUd6OCEicTxtxtt54JE/rdhBaGfcnwgrt+QmLR0qTRITg9zQk2lVMuf 7u+6PfMt925/QS8aorpgfcCUUhn887OdDcEWNUyHXFjJCxmJsKG9n5Rz9dObtbglBWN9YPwqKRJ 5GtgTIQJw= X-Google-Smtp-Source: AGHT+IGNH/jTXYKDAC+YI9WtXJ1/2cSW4Ne6lXIfZQEX4fuLtdmIptnZ2Lxq4k9U6S8/gglzLHB5YA== X-Received: by 2002:a17:903:11c8:b0:2a1:388d:8ef3 with SMTP id d9443c01a7336-2a1388d8feemr52712705ad.18.1765940459031; Tue, 16 Dec 2025 19:00:59 -0800 (PST) Received: from 7940hx ([43.129.244.20]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7fcbb11ed19sm943972b3a.37.2025.12.16.19.00.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Dec 2025 19:00:58 -0800 (PST) From: Menglong Dong X-Google-Original-From: Menglong Dong To: rostedt@goodmis.org Cc: mhiramat@kernel.org, mark.rutland@arm.com, mathieu.desnoyers@efficios.com, menglong8.dong@gmail.com, ast@kernel.org, jiang.biao@linux.dev, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCH v2] ftrace: fix address for jmp mode in t_show Date: Wed, 17 Dec 2025 11:00:53 +0800 Message-ID: <20251217030053.80343-1-dongml2@chinatelecom.cn> X-Mailer: git-send-email 2.52.0 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" The address from ftrace_find_rec_direct() is printed directly in t_show(). This can mislead symbol offsets if it has the "jmp" bit in the last bit. Fix this by printing the address that returned by ftrace_jmp_get(). Fixes: 25e4e3565d45 ("ftrace: Introduce FTRACE_OPS_FL_JMP") Signed-off-by: Menglong Dong --- v2: - make the code a little more cleaner --- kernel/trace/ftrace.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index bbb37c0f8c6c..b6c5b0e899e0 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -4492,8 +4492,11 @@ static int t_show(struct seq_file *m, void *v) unsigned long direct; =20 direct =3D ftrace_find_rec_direct(rec->ip); - if (direct) - seq_printf(m, "\n\tdirect-->%pS", (void *)direct); + if (direct) { + seq_printf(m, "\n\tdirect%s-->%pS", + ftrace_is_jmp(direct) ? "(jmp)" : "", + (void *)ftrace_jmp_get(direct)); + } } } =20 --=20 2.52.0