From nobody Sat May 30 13:23:02 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 CCBBD234964 for ; Tue, 12 May 2026 01:56:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778550989; cv=none; b=d2iOltZdcvZB3AyAlbgOtqTOIdFxER4HpjyiXT6xhclW9YqnpQktM+mirbGfuZd96rt+yRg0gz94/QG2KCoS7Ezeni+HyehD0JlOFk8IPXV6Ateo85O7rRbqosQBhxM8AfQv3D70symPda1sZT+Sf2JubWvKhDH+ItPUjRPgj1E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778550989; c=relaxed/simple; bh=nJVF0sX7RLGyJiFu2EGqmdVuEIL7zbKJqEChpGUS7pY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=gglBstTx53x6Qpsk7odegtxmvH07EqpV4PBrRSWiqwhY439cjHmGZ9TKvMippEDRoVmvgwQBIwfnX358G6yyHi+SjWnHoYfsqJQKBKZ9AsWcyia6TViV/xfocjlJBreasSQj0nrlzpAcdiwm4hHaFAaxxlQofrimTqHRQP0I1kU= 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=Qxkfj3YX; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=jm+o8mbB; arc=none smtp.client-ip=205.220.180.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="Qxkfj3YX"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="jm+o8mbB" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64BK6dhI2186197 for ; Tue, 12 May 2026 01:56:26 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=FLFEbWglY2WDrr12wcGTwf FaQNrhQJ4BOMYAFEd6ezM=; b=Qxkfj3YXbGIOp5rd0rjzeADqKiOiAVIrgDtOTN ICU/CsSyZYjBbZA8YmGt01yh8oCMsT3XyRNIDQiGJQa8qYuiOqn0nW/U+pTKJ0v9 xkfAV2FXr3Ju/ZE40bFIe/TvZShz74UyJOPScnB7NnU3j4gCPPkkquNdJLFa7lbG 5w8RE4GyYhYOzUDYWzaVmbXjLyz5+P3sLAT2+uGAo8MH/KQcbgC8GojC4mOTfvMT L+Qmqs6G+yTcM3Y0eRtzn8XRgyarJ9XbcgD+fr2vkPPk0amx+abWaip0Ce447uI8 wVpvPItgskd60/488gtJRCgDj8iskUcKQTXLmLMpU7uyqkWg== Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e3nv28yvc-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 12 May 2026 01:56:26 +0000 (GMT) Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-8354503d9acso6017657b3a.1 for ; Mon, 11 May 2026 18:56:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1778550986; x=1779155786; 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=FLFEbWglY2WDrr12wcGTwfFaQNrhQJ4BOMYAFEd6ezM=; b=jm+o8mbBY7N0sVxqD/NBt9OpNb2e3lx/YJPmRAL0YhGUo1UY6LZKttdrxywziaCaPL N+MBzj9NhFp4oKS/tjh+1b8Pr2k5DDR3dZ4p1d5dPC36FUDM3HnGrKRoz/UVNLVOX5F8 AVhE//G9JYExILs3D3zNk4O9gDBaWyYAroiUkdum7WS5ByxrtIpOxeGhNGlnd9fyJTWT rjl3lmqhG0zw/QT4T576LelRMrDWwKOXPGavIt9zcWvgNamA9uQbB1tzDqPaL81Gte2C sbxHUoBybmoLKa8IcjUGDi2JfN7H7HaBs9F8z5MY02RknCYC/4u/2mDwSJcnpIvUkR33 AZyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778550986; x=1779155786; 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=FLFEbWglY2WDrr12wcGTwfFaQNrhQJ4BOMYAFEd6ezM=; b=V4QEnWKJ+4uVCJEZPhECyb4pOLkdz2MF9xCKFxWPwqb9C7FpHVsuhnf+0KbcWIbUVO IokrkP18RezixnKUxG2B/pXdLbzuJ9/vCkd/dNltb/aPAcVyNPGdTyZRi6AdGn0wXV/2 PA7+Pl8Rx7NrKQPD3+fTmRmbG05/Nrdl6O+gmBeFkqJZHqiOCURcLVNUdqR1qLny0We8 B5m2EVF2/cvVjhPJzSD62/FCwhT/BPFw1hjnXY6koiJ3Mrmhi4D1ZfjZbI62xRRHNqZL CbTy2WYyAot87Hz/Zv0fkOGcN58iImIv8H8Kr8Hw/e4Nf7FE1VBgA1aq6pp0vuRstQ1R +Oeg== X-Forwarded-Encrypted: i=1; AFNElJ+xNiu5bH/xzBNfBIhBwygSgDsNlXhfPlisQiV4k+HkN6r+dcVBiDSNdl+C7NN5tBvdyJe+ZJjP4t1PsmQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yw6Dlr4OJ9bg3s6DFWQQU6h2nrguZ0MgEqnR1FK03VJw4C9ARhV KZS4qi93npMQhspHEzFZGTiRG5k2C6ibwro7su2LZy5rmao/Toyl7h7maJUqv/ODeGKKSYlsksv E5DYxM7lF5ebQ6j+CpluyXJOE8Z0MK52XPC6ZbeVOZ412WojNoxlSub/0QLlwphoFR5E= X-Gm-Gg: Acq92OEdKcEuz3C2dn+I23sSo5n0mR3w+S72KVEae5ahg66Jy4oX7uza4Nijcu8hwVn G8T7qN+3d1g0mHrXZyq1JQeAUxNCD5xL457kW0AWO0RtxY9DkT21DAf7cshgU1b/ugE+EtbJfAM vg7My3OSIgC+XYuwzXILE4lps1W1Pkq9Ohi2lVFbeFTshivAe1JuXeFg3wOOffFwyW9I7a3zFqo WfdgJBqGpLuxos9l9OEWNSX7I17i23rKXEcFWr7cN7Fqq4mLasb/43wv1UAa5pbGlNQijjWJUbU upRqNKrQlkXz5TRnkLPg/qUa0NSFnDKwraZQGwz/gn8aB5ncTbc2PZVTzlCIC2ncO1M084YrwKs BfLeloATc8EYNNimQudZcIouHpbme+1j61DguX2e0sTy8g7H561bddJQDGc6qDoFDjs/aMjKF/t kyfa9wic/K X-Received: by 2002:a05:6a00:398b:b0:82f:5051:f024 with SMTP id d2e1a72fcca58-83eebc3cbb2mr912669b3a.27.1778550985533; Mon, 11 May 2026 18:56:25 -0700 (PDT) X-Received: by 2002:a05:6a00:398b:b0:82f:5051:f024 with SMTP id d2e1a72fcca58-83eebc3cbb2mr912641b3a.27.1778550985013; Mon, 11 May 2026 18:56:25 -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 d2e1a72fcca58-839679c8c00sm20323843b3a.32.2026.05.11.18.56.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 May 2026 18:56:24 -0700 (PDT) From: Jie Gan Date: Tue, 12 May 2026 09:56:07 +0800 Subject: [PATCH v4] 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: <20260512-fix-trace-id-error-v4-1-eb3de789767a@oss.qualcomm.com> X-B4-Tracking: v=1; b=H4sIALeIAmoC/33OyQ6CMBAG4FchPVvSlYAn38N46DKVJmK1xUZDe HcLJw7opck/yzedUILoIaFjNaEI2Scf7iWIQ4VMr+5XwN6WjBhhDZGkxc6/8RiVWRoYYgwRW+2 sFbZ1zFJUFh8RytSKni8l9z6NIX7WG5ku1b9cpphi6ShVUsjGWXcKKdXPl7qZMAx1edCiZraVu l2JFcl0hGijlebQ/ZD4RqJ0V+JFUkaYlssGnNv70zzPX2aS64xPAQAA 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, Richard Cheng , Jie Gan X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1778550981; l=5569; i=jie.gan@oss.qualcomm.com; s=20250909; h=from:subject:message-id; bh=nJVF0sX7RLGyJiFu2EGqmdVuEIL7zbKJqEChpGUS7pY=; b=cFbznhJvdLrM2IyGL+sRewCTVZmmi2W+JBFVCqGGqYO7NKpKbxyc0/owl1dbiZpguE2vEDIes e9LOqvOMbBWBPaA98i8Wsp1uFVr4ALjqeY5HSGcWfo2b589P5CG/miR X-Developer-Key: i=jie.gan@oss.qualcomm.com; a=ed25519; pk=3LxxUZRPCNkvPDlWOvXfJNqNO4SfGdy3eghMb8puHuk= X-Proofpoint-ORIG-GUID: tWKQA6ZrCeKPX9qRG7zj9oQMpDnXzbdv X-Authority-Analysis: v=2.4 cv=CeM4Irrl c=1 sm=1 tr=0 ts=6a0288ca cx=c_pps a=rEQLjTOiSrHUhVqRoksmgQ==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=VwQbUJbxAAAA:8 a=EUspDBNiAAAA:8 a=KKAkSRfTAAAA:8 a=Ikd4Dj_1AAAA:8 a=rHRpchrnBNVC9zy6ZvAA:9 a=QEXdDO2ut3YA:10 a=2VI0MkxyNR6bbpdq8BZq:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTEyMDAxNiBTYWx0ZWRfXyhd7G69Biq8+ FonSNayxSPpp6XEWczfyTosho7PhArGwi+f5LzE3dV/XDyC+sC0Bw59wIhpoQrgzFrBDtPDfySs ugIjMj7SQX172151RlWBVhEENVCH886+cXoZUEhxJEoT1R1aBfg+kqIcGmyHOwc/S4HaXOSi9qg t5r+D/0sA0YEXiSTiz8hXYGmeSmqFJ5caP/ojiZvveFNBtGCED4OcYOKK+ylnv9GxIklQHjE4zi HQ2+aA66L98kiLVzCcbwPEdjWW7k/+KOHQN/8xcaJ7fDuk6YT4xa+20AgjAi7sQK0EfeeH2dFgO F0hHteZon/rh1muy6HiDtvhiAVCpAiERrqanu8UBySLi6c0tYUjUKwwCnj1uFg2VgRndLh86XsH wY9Z8WKppP9aJXiqHPRvDgB3Wt6MmimV3sGQUtMJ9RRYV94JGJv5hkyrazQUor+Ie6EsUulPvwe HBO0avrku0VmvmFbnAg== X-Proofpoint-GUID: tWKQA6ZrCeKPX9qRG7zj9oQMpDnXzbdv 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-11_05,2026-05-08_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 priorityscore=1501 phishscore=0 suspectscore=0 malwarescore=0 clxscore=1015 lowpriorityscore=0 spamscore=0 adultscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605050000 definitions=main-2605120016 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. Change coresight_path_assign_trace_id() to return int, moving the IS_VALID_CS_TRACE_ID() check inside it so it returns -EINVAL on failure and 0 on success. Update both callers to propagate this return value directly instead of inspecting path->trace_id after the call. Fixes: d87d76d823d1 ("Coresight: Allocate trace ID after building the path") Reviewed-by: James Clark Reviewed-by: Richard Cheng Signed-off-by: Jie Gan Reviewed-by: Leo Yan --- Changes in v4: - Refactor the coresight_path_assign_trace_id according to Leo's suggestion. - Link to v3: https://lore.kernel.org/r/20260511-fix-trace-id-error-v3-1-ac= 4c8356efff@oss.qualcomm.com Changes in v3: - directly return the value for clear expression. - Link to v2: https://lore.kernel.org/r/20260509-fix-trace-id-error-v2-1-c9= 00bcbab3e9@oss.qualcomm.com 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 | 23 +++++++++++++-------= --- drivers/hwtracing/coresight/coresight-etm-perf.c | 5 +++-- drivers/hwtracing/coresight/coresight-priv.h | 2 +- drivers/hwtracing/coresight/coresight-sysfs.c | 4 ++-- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtraci= ng/coresight/coresight-core.c index 46f247f73cf6..2105bb813940 100644 --- a/drivers/hwtracing/coresight/coresight-core.c +++ b/drivers/hwtracing/coresight/coresight-core.c @@ -739,8 +739,8 @@ static int coresight_get_trace_id(struct coresight_devi= ce *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, - enum cs_mode mode) +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; @@ -750,15 +750,18 @@ void coresight_path_assign_trace_id(struct coresight_= path *path, /* Assign a trace ID to the path for the first device that wants to do i= t */ trace_id =3D coresight_get_trace_id(nd->csdev, mode, sink); =20 - /* - * 0 in this context is that it didn't want to assign so keep searching. - * Non 0 is either success or fail. - */ - if (trace_id !=3D 0) { - path->trace_id =3D trace_id; - return; - } + /* 0 means the device has no ID assignment, so keep searching */ + if (trace_id =3D=3D 0) + continue; + + if (!IS_VALID_CS_TRACE_ID(trace_id)) + return -EINVAL; + + path->trace_id =3D trace_id; + return 0; } + + return -EINVAL; } =20 /** diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwt= racing/coresight/coresight-etm-perf.c index f85dedf89a3f..89ba7c9a6613 100644 --- a/drivers/hwtracing/coresight/coresight-etm-perf.c +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c @@ -324,6 +324,7 @@ static void *etm_setup_aux(struct perf_event *event, vo= id **pages, struct coresight_device *sink =3D NULL; struct coresight_device *user_sink =3D NULL, *last_sink =3D NULL; struct etm_event_data *event_data =3D NULL; + int ret; =20 event_data =3D alloc_event_data(cpu); if (!event_data) @@ -420,8 +421,8 @@ static void *etm_setup_aux(struct perf_event *event, vo= id **pages, } =20 /* ensure we can allocate a trace ID for this CPU */ - coresight_path_assign_trace_id(path, CS_MODE_PERF); - if (!IS_VALID_CS_TRACE_ID(path->trace_id)) { + ret =3D coresight_path_assign_trace_id(path, CS_MODE_PERF); + if (ret) { cpumask_clear_cpu(cpu, mask); coresight_release_path(path); continue; 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