From nobody Sat May 30 12:34:36 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (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 EDD142F8E82 for ; Sat, 9 May 2026 00:59:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778288348; cv=none; b=WUwTKs6E7VkmQMH9gGS4G5wImCLZZ2v+vvtSIfJvK3dnilflREhWzZg2LbhVE7pXinK7XfcL5kAUa+Cw4ecazUfz7HqoLmXCEF0KLGz8PtMh87S4Qt7Oxe4gTGQ3PNbqGg6XRlH39CES35Xk+V9YbeBQQy876wL9K7Osv16Z5n0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778288348; c=relaxed/simple; bh=94Llc3h4HowpH/cDqgQnvt6Iq5ZLOHjXJzJwNWicjqI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=uq0shJR6Nj0cALUocZVVL84H/86SIYvxdgFqukA+OBxNxBnWqAH0eogRuJu2iQdSXPNaWeKyWhSN2oklT2KlP8hA792+RDkoCSNlnNPq7Fm4D2+OFfP2MvBNlMBlO310bzQWNjM+F34+wrLds33+jVbWMRftcsxW3GBbDUz63xg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=GNAQHDZq; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=P5jeN9t8; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="GNAQHDZq"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="P5jeN9t8" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 648GWPUf2335649 for ; Sat, 9 May 2026 00:59:06 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=qcppdkim1; bh=HMc33G9s2MewPCe+opjc6b s9WwJMQweRb7Iko6/i9vU=; b=GNAQHDZqMxL0PlMpGfNtr4k4XHLSyo1Ydnsqqg N8y7odrO0/tB3aEu0fR/TrkVxRp9FYakCT9Tfvf3T3duBh25tQ6OTZvichvUtv8R hRtzbhUfyuAqUDJlwd17cBmpTL7xSjbnxf+3TVjbpG8pO3CZ/htQ9Jd8ur/gHCGo gbWcTSV/eZ22gMS0G6ALgAVI+CihMhUv+Zst9HvctRt6maINzWGTV6+2NHFQeHsV kOPlgZMUkFobFyihLDaV27njNmV+GpFwyoVuG/DjDhbzK4hEtHv/bsQR7qKsECj+ F/o9SDDufnAGd3sQ/iR/uJSUXgZriXW/dbSG1vAqQKy2mRNQ== Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e1keh9bpw-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sat, 09 May 2026 00:59:06 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2babc42244aso48993145ad.3 for ; Fri, 08 May 2026 17:59:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1778288345; x=1778893145; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=HMc33G9s2MewPCe+opjc6bs9WwJMQweRb7Iko6/i9vU=; b=P5jeN9t8ckDxmoloFKLSKMc1mef/Mi/4Aw2Olv3rsCtSAmfDx6dvOvWYR1IWQwrGaJ F+u443DVtp+7dQKovGdRwzruwC1ZRrhXBmmOiSdvcthREPyH1OLaKLFkThgCQng67Ogk 7TsL9DF9n7acDNuLWQCc9lwXkjQOQT/XQMyb4QEMS4LqCcNesYqU/4VmDuSmvmGCo1wl vc2tzTlZiEPKoBHZCayeXYyvqgS55nTVvFRyEs8A2NvbphDaMbgMsU2TAObtgcuJPcSX LF5oZpJPCdiR++4SdOR0XNcuTIoREsGxvvXjuMSPAqF1uYL+1P/T00+WQsPuEw1Nx+I9 Veqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778288345; x=1778893145; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=HMc33G9s2MewPCe+opjc6bs9WwJMQweRb7Iko6/i9vU=; b=YOwPqQ5pJisGcXKSv9wSaa++/RcAFBdg3JMYq/HB829Ks2A31zSCqXnRZiCP+SUbnD PeiHfnEuWCsFRx1FPoe+6lYaNkwGZXGaX3ubK9HWYYQljgwcrFCoPshGccDFzb96hjk+ iTCp0rVmTni0iyXLP/WuIEGRPJP76Bp8AnHfvgAS/J5yrJKc+t5BBL5ZDrUlRbjzp3eF /7z4yopsxSHGtDwKe3vT2gnrGGnOIB+juloj+xS0F4v53Q72mWIUyZc2irGJi9dXpxDz MI5Rv2B9zrh4mhINWA2aHhZ4irAfv2Y2PMz+QPQuLZO1cHEjs6x35Z73wtek9O1HjhXo HZeQ== X-Forwarded-Encrypted: i=1; AFNElJ/uTckPpFJmrHQGB0IfcJdELPL7KcQ9dFC0ezV3aHVYQQCltDAvikpgMMz8frODZthotmtDL62zp0vFt58=@vger.kernel.org X-Gm-Message-State: AOJu0YxRF/tku/AEnA6c80Dmtb8n3oxvgFn4uVj06Vsi0CWVeuljH93c 0IUWxqS+tfxFCKT6Kl6PMNr+/W9ovxhQP674z5BmBYC+7MqGsHyJ3wNlcX/27ymV2mTTAM7ysfq Q7X9a6C7fkpJayAzI2NLoeBKKlnjIWUBMfDl9j3UgbhRxt384tMDgrHex0KyNz+qWX28= X-Gm-Gg: Acq92OF6Gu5Wp1gsT8+/X3ciFIeocsfuF+cejyvYITuoLNxTVpl5951eC+HmQXblw2l Pn50kWY83vsHVH4/mAjsd1SxQ1w/sWfoJato6Q5IUqD8C3UnHMX/FF6sY+G/spJDtO3ghjZWIbY XkfddfgKuVcHu7QSvl5ObyJPYJfbWnHn/aPQ4n+TMf8PAt94BZJ/cVwLipSoK89cgvui5lWNGGs V2WKAkHvZ/n1rnaCfa1FOZHl8a5pKjHTYrIU7I5z37wurCNnjGoNdA6JXO7CuubloEckRlYyRFW UeFMff2izrUqc2dKmpo/lpRqNf6plKx9Kl/M3bjyEf2s64LT4Nx9imUg8TfhrZs8omeePsAlTUf zAVfZXDHwV7YhO4uP2sEc2103VwwGOXdWfm8a1fHvmtB3BgkaTXQv/FjGOhhJ7HDNCFCQ/3H+sP JvTJuW64nR3OuBJgJ5Wg4= X-Received: by 2002:a17:903:1cd:b0:2ba:36f4:5844 with SMTP id d9443c01a7336-2ba78f63de4mr154108435ad.7.1778288345266; Fri, 08 May 2026 17:59:05 -0700 (PDT) X-Received: by 2002:a17:903:1cd:b0:2ba:36f4:5844 with SMTP id d9443c01a7336-2ba78f63de4mr154108155ad.7.1778288344757; Fri, 08 May 2026 17:59:04 -0700 (PDT) Received: from jiegan-gv.ap.qualcomm.com (tpe-colo-wan-fw-bordernet.qualcomm.com. [103.229.16.4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2baf1c5466bsm35490215ad.0.2026.05.08.17.59.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2026 17:59:04 -0700 (PDT) From: Jie Gan Date: Sat, 09 May 2026 08:58:46 +0800 Subject: [PATCH v2] coresight: fix missing error code when trace ID is invalid Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260509-fix-trace-id-error-v2-1-c900bcbab3e9@oss.qualcomm.com> X-B4-Tracking: v=1; b=H4sIAMaG/mkC/32NQQ7CIBBFr9LM2mmAlKZx5T1MF8iAJbFFh0o0D XeX9gBuJnnz/7zZIDkOLsG52YBdDinEpYI6NWAns9wdBqoMSqheaDGgDx9c2dg9QMccGenmiTo avCIJ9fDJrrYO6XWsPIW0Rv4eP7Lct391WaJE7aU0utO9J3+JKbWvt3nYOM9tHTCWUn7PAUCou wAAAA== To: Suzuki K Poulose , Mike Leach , James Clark , Leo Yan , Alexander Shishkin , Tingwei Zhang Cc: coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Jie Gan X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1778288341; l=4159; i=jie.gan@oss.qualcomm.com; s=20250909; h=from:subject:message-id; bh=94Llc3h4HowpH/cDqgQnvt6Iq5ZLOHjXJzJwNWicjqI=; b=+NDtmE2sLVSHFHh/xjQJqTHZ2bHTFkooEPd4XUO5N7EXkVOmv837lLZj0wU1bKE/kdF9H8112 wwqfje3SqeqC+uC2PcwS0lu95ydQSEczdejK0A/n01Jr2EQXnLULcfe X-Developer-Key: i=jie.gan@oss.qualcomm.com; a=ed25519; pk=3LxxUZRPCNkvPDlWOvXfJNqNO4SfGdy3eghMb8puHuk= X-Authority-Analysis: v=2.4 cv=CJIamxrD c=1 sm=1 tr=0 ts=69fe86da cx=c_pps a=JL+w9abYAAE89/QcEU+0QA==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=VwQbUJbxAAAA:8 a=EUspDBNiAAAA:8 a=A6yeH-j-nhIuWHlR0BAA:9 a=QEXdDO2ut3YA:10 a=324X-CrmTo6CU4MGRt3R:22 X-Proofpoint-GUID: Q2R0m585kOyj67AAjL64p8ipipPzKjkk X-Proofpoint-ORIG-GUID: Q2R0m585kOyj67AAjL64p8ipipPzKjkk X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTA5MDAwNyBTYWx0ZWRfXwp7D0J5qT2XT MueEE55S8rz7KZOErcuqvirKhBLFRGx2ZuQBkrLwy5HTQxw7IWhYmlhZa+gt1BC4VK53zxlHZG2 PSDshoe3/YR1ghI3FTwkNszyYu069d2gy8W0XKzTBSca259PJli8idzMcVqIMF82E92JX5cUuot gmAA4UHA+GNvMKAOuaGi9oy8XozV3O30uZqLPLp/Pw+L1e6DT3aeX5xFpQCiJ1TcIHnn+7oqbMc DKBvWpRp9b5B/2g9rbCVp/OmQ9sy9Ar3EeIGVpn9IRo3nE6JQgkbkMW8OnviAA0EcV6GHEF5exb kwDU4SPuXxe6IdICfwdcPS9Z1vPc00EufBSI+lDV0C/CxJH5YF8JiqBIklHLye/nFAFdUuP/u5d Jx8evdN2ms3HCJZwOExJAg/MJFxPq1tO8JqfJxFhWiV2NHcUTZEG/p/3OaMGWBxRqcmLFuiLGNg 3Q1pLaKdbshvJmedmzA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-09_01,2026-05-08_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 bulkscore=0 adultscore=0 spamscore=0 impostorscore=0 phishscore=0 lowpriorityscore=0 malwarescore=0 priorityscore=1501 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605090007 When coresight_path_assign_trace_id() cannot assign a valid trace ID, coresight_enable_sysfs() takes the err_path goto with ret still 0, returning success to the caller despite no trace session being started. Fix this by changing coresight_path_assign_trace_id() to return int. Move the IS_VALID_CS_TRACE_ID() check inside the function so it returns -EINVAL on failure and 0 on success. Update coresight_enable_sysfs() to check the return value directly instead of inspecting path->trace_id after the call. The other caller in coresight-etm-perf.c discards the return value and continues to check path->trace_id via IS_VALID_CS_TRACE_ID() directly. This is unaffected: on failure path->trace_id is no longer written, so it remains 0, which IS_VALID_CS_TRACE_ID() rejects the same as before. Fixes: d87d76d823d1 ("Coresight: Allocate trace ID after building the path") Signed-off-by: Jie Gan Reviewed-by: James Clark --- Changes in v2: - Refactor the coresight_path_assign_trace_id function. - Link to v1: https://lore.kernel.org/r/20260508-fix-trace-id-error-v1-1-5f= 11a5456fdf@oss.qualcomm.com --- drivers/hwtracing/coresight/coresight-core.c | 14 ++++++++++---- drivers/hwtracing/coresight/coresight-priv.h | 2 +- drivers/hwtracing/coresight/coresight-sysfs.c | 4 ++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtraci= ng/coresight/coresight-core.c index 46f247f73cf6..cabdc0c72f38 100644 --- a/drivers/hwtracing/coresight/coresight-core.c +++ b/drivers/hwtracing/coresight/coresight-core.c @@ -739,12 +739,12 @@ static int coresight_get_trace_id(struct coresight_de= vice *csdev, * Call this after creating the path and before enabling it. This leaves * the trace ID set on the path, or it remains 0 if it couldn't be assigne= d. */ -void coresight_path_assign_trace_id(struct coresight_path *path, +int coresight_path_assign_trace_id(struct coresight_path *path, enum cs_mode mode) { struct coresight_device *sink =3D coresight_get_sink(path); struct coresight_node *nd; - int trace_id; + int trace_id, ret =3D -EINVAL; =20 list_for_each_entry(nd, &path->path_list, link) { /* Assign a trace ID to the path for the first device that wants to do i= t */ @@ -755,10 +755,16 @@ void coresight_path_assign_trace_id(struct coresight_= path *path, * Non 0 is either success or fail. */ if (trace_id !=3D 0) { - path->trace_id =3D trace_id; - return; + if (IS_VALID_CS_TRACE_ID(trace_id)) { + path->trace_id =3D trace_id; + ret =3D 0; + } + + return ret; } } + + return ret; } =20 /** diff --git a/drivers/hwtracing/coresight/coresight-priv.h b/drivers/hwtraci= ng/coresight/coresight-priv.h index 1ea882dffd70..34c7e792adbd 100644 --- a/drivers/hwtracing/coresight/coresight-priv.h +++ b/drivers/hwtracing/coresight/coresight-priv.h @@ -153,7 +153,7 @@ int coresight_make_links(struct coresight_device *orig, void coresight_remove_links(struct coresight_device *orig, struct coresight_connection *conn); u32 coresight_get_sink_id(struct coresight_device *csdev); -void coresight_path_assign_trace_id(struct coresight_path *path, +int coresight_path_assign_trace_id(struct coresight_path *path, enum cs_mode mode); =20 #if IS_ENABLED(CONFIG_CORESIGHT_SOURCE_ETM3X) diff --git a/drivers/hwtracing/coresight/coresight-sysfs.c b/drivers/hwtrac= ing/coresight/coresight-sysfs.c index d2a6ed8bcc74..b6a870399e83 100644 --- a/drivers/hwtracing/coresight/coresight-sysfs.c +++ b/drivers/hwtracing/coresight/coresight-sysfs.c @@ -211,8 +211,8 @@ int coresight_enable_sysfs(struct coresight_device *csd= ev) goto out; } =20 - coresight_path_assign_trace_id(path, CS_MODE_SYSFS); - if (!IS_VALID_CS_TRACE_ID(path->trace_id)) + ret =3D coresight_path_assign_trace_id(path, CS_MODE_SYSFS); + if (ret) goto err_path; =20 ret =3D coresight_enable_path(path, CS_MODE_SYSFS); --- base-commit: 17c7841d09ee7d33557fd075562d9289b6018c90 change-id: 20260508-fix-trace-id-error-dbfdd4d8f2d1 Best regards, --=20 Jie Gan