From mboxrd@z Thu Jan 1 00:00:00 1970 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 AB40F3128A2 for ; Mon, 11 May 2026 08:19:59 +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=1778487604; cv=none; b=UWlrPvuyEUh5HdDj1nhWZGjb6A9Hpko7oamSWCggAQM1Tv6H2NpPtl05ZqJDsaI6gwuWmtKQ7dbKnKBC1Upolw3nF7mLGAGgoU8MiFeWZnKqeQ++kQ8qdgyMukFpTwIpUpbbonWjSQiOX0FA4vwyyB9CrfcDqerxwJQYviT5AoQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778487604; c=relaxed/simple; bh=TdfugnA+rbqkN17WH1VYj9UOOdLtc9lj83M/M7TY3ZI=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=mEQi3VVV8t8t8xIFCD8yZm7Rjn7VXtoI3n8TMaGUub1smiiTdBqjj2Qn4oDCVeTlVrZjxNc44Fm4BKyr3CYlJt951hv6ILmvpZUr3YY6aIcCMTNFZFt1MygTrk4BH44gYHHQEcNWk0iL7fMSREXG0othx9wRGf0MU4gLRewkeqg= 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=LuxdsXgd; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=KkXRIo0y; 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="LuxdsXgd"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="KkXRIo0y" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64B4G2MH017299 for ; Mon, 11 May 2026 08:19:55 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= ex44qEyr1kPvsvTryMSWOrqALilXfojvWkgwTiJsRgQ=; b=LuxdsXgdgLT+ZUNS EY76ORA4HxVgswueRvoTLhMrTog1/sRbGK8GqH6EIXh69sQi3NoOXciujAVXQOLd sirKLPwELDiG/5KYQEj2s9N1x8P/tBq7fYgsiuU9tDZRFAKt4op8rZwETQeQxlGl FGR+GwYFop7BuMwy/pDOGctHaRdRkbDC/hiS1nRlUtVIeUS0czZfHbkwyn/Sgfzj C9Vgub5JzUlHdeg3kB6ttpPkeKqZjij1h3CStxT3KGimEP7Rfz+DW4XUaYmXFW1m 5tLfLx3T6CO+5ecwQUPJ7/miv+ygbZW+J3tTXWYqeDXuUbrl2cEz9rGw73C/cg2d n7ZRiQ== Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e37xfrspn-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 11 May 2026 08:19:54 +0000 (GMT) Received: by mail-pg1-f200.google.com with SMTP id 41be03b00d2f7-c709551ec08so4976611a12.3 for ; Mon, 11 May 2026 01:19:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1778487594; x=1779092394; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=ex44qEyr1kPvsvTryMSWOrqALilXfojvWkgwTiJsRgQ=; b=KkXRIo0yz7tRHobatZlZi7ht02fM/DDCx/64JIYyb++7zxda/mQMzoX3cWB8cJLPuJ g5/91IQ+B0iuar95W4h//ukDIX+yEZAtjEsZKRfaA06FGni7BajYPt858pdKLJbNIS2j BGRj/AlUQH85XVPPAiN9zG9MLUe1+ovq6Z+UiZ1Fh/AG5zA8/qiEtERWXhzYwZqDIXDJ 2FDho5ORO8VD0bRIcwiJLErj2PvpwI25UjTXwAvDeV66085USeJ8LH8yNOPj4NLsY8fj FivJX4ffNyOAXCmubblnhw4lmaUzldJymcRWkK4ldi/ZgKK4ZGUs5H/VWJKJ9QpQKblq a2ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778487594; x=1779092394; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ex44qEyr1kPvsvTryMSWOrqALilXfojvWkgwTiJsRgQ=; b=S08+hDXiFYpJKv1SIYg6AoPykKiWZyWD9hcwm9VzI6tcxYYtRaUG3mD4ar7VCYHhls ukafi+co7MKJPst0lg3Q6+MwxyXvwItuuNsk9IedH/PXWbnouDcYxn/EjXGuqbA1aFXA c2U6CCqOkGGySZY9t5EGrNI4VaDeG6mhJTYFKFHL+AEbjNuTZDC96awRxy8oyKpx6SK2 aIpHctvJiC4ouaqo/u4KlVhXR14n7ootBlNFzbLO5oVOLO1jx6YFRIhul2HyKhdRfozV cDp5LplwDhamGgBIImUk9Esrdpli35XGqIrAs7UI1++BthifVWreOdJbS8Fea134ZFs8 BNyQ== X-Forwarded-Encrypted: i=1; AFNElJ/y1yWH91hYb+7Orb/TLrnFAThq1SeOOxEMvRLLqHy+oXF1Iq0NIZxvNh0ClckgjweZz7SkWBSd38li/Lo=@vger.kernel.org X-Gm-Message-State: AOJu0Yxk9Ay9OnNLfTWkCGf41x/KjoZpM/wwWDYzmWY3s/lpAVy5XE2u s3fUSHhC/n5H73TVfh6tsDsMtk2JzOEI/Uu3A2v9WDI2PtYfb5OfcxcUo/RZQHDVl6CsXMT+r4M UtRhrpW0ZorHAasXE3OjHmu8Roztbukb39vg6eGEOd5L1CCZMaMrg6eL08lhArQ3/CqU= X-Gm-Gg: Acq92OFG92T2UnGnzs/IpiWl38xBILvEvas69NjIEPFbPRVkmyu2O8tTXZuAOBcYLol knaDyTn2yO9Xf5j5kqkYlTj9EAltMYzlJkboKOhsvTHmEBkewGpuviBLpRFNRYy3Xnfa9mWeIOo GZWGQ33dXfLAN2r1ePTPakK8oElEpWtgv06jB2hwO/i6Lo/ZWoUYeerVjS58RVTaod1r8zwTiWC 4CFB70wdbX2qjMyMungZ6Te/w1XQsj1JXLrdG8679Q4Bah0V/6fDkJca494KK5He1UuWIcYlFYr Uk5KyJrBdDLNzC9gM1vS4Dp7l1FqdB0QQghpzqNmxaV2XpH07I+3x9lX8yK11EDMfFixQKlTAzO ihZjEHPF/59frI/8PLoheOHnspJ5R2fjFX7AD0LzbXB51XZy6+nVALWpjVGeBhoA/pZCgM9b8tC fjEYvQILkyJA== X-Received: by 2002:a05:6a00:f0f:b0:836:3faa:967b with SMTP id d2e1a72fcca58-83a5e45615amr22805986b3a.47.1778487593671; Mon, 11 May 2026 01:19:53 -0700 (PDT) X-Received: by 2002:a05:6a00:f0f:b0:836:3faa:967b with SMTP id d2e1a72fcca58-83a5e45615amr22805959b3a.47.1778487593137; Mon, 11 May 2026 01:19:53 -0700 (PDT) Received: from [10.133.33.31] (tpe-colo-wan-fw-bordernet.qualcomm.com. [103.229.16.4]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-839683a6252sm19651595b3a.59.2026.05.11.01.19.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 11 May 2026 01:19:52 -0700 (PDT) Message-ID: Date: Mon, 11 May 2026 16:19:48 +0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2] coresight: fix missing error code when trace ID is invalid To: James Clark Cc: coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Suzuki K Poulose , Mike Leach , Leo Yan , Alexander Shishkin , Tingwei Zhang References: <20260509-fix-trace-id-error-v2-1-c900bcbab3e9@oss.qualcomm.com> <90d86e62-1116-4daa-b557-fc86c40a0e69@linaro.org> Content-Language: en-US From: Jie Gan In-Reply-To: <90d86e62-1116-4daa-b557-fc86c40a0e69@linaro.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Authority-Analysis: v=2.4 cv=TqXWQjXh c=1 sm=1 tr=0 ts=6a01912a cx=c_pps a=oF/VQ+ItUULfLr/lQ2/icg==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=VwQbUJbxAAAA:8 a=EUspDBNiAAAA:8 a=KKAkSRfTAAAA:8 a=wMiEN_vx28wPb7PzzUIA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=3WC7DwWrALyhR5TkjVHa:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: xT1gJan0LOD4O7EPFDsyBWMzQ-vISRFj X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTExMDA5MCBTYWx0ZWRfX430KznvjbMgW zVVHsBK1kKKb7XgjTglKqpiWIP41mXKaLWjb5ZJI5uGcVFdVHLUfwoh6Po8vits0A5QSAlni2Sm 3QIKY1uUvq0bS6WJ77vg4aTNOBJ1HfURF1xawtn4FM1n9hm92/UL2ubVjV68gB0HLtyFcQfuiV1 igsy7i0Xac1cq/ABZDeyfLWTgHc174Z9oDkmpbJaI1Diap9QF6/G6OCejsgzaHs/vmdNJPDIC+i aC6qZTJoOiHVepK/KPyOeNZg/FSsfL7epiipcXURg1NOmCm0Bio8SYOvC0ofKEKWQL1yb3OFspM 5ki4MU1ezaiZ12WN5PL149QobTBFf0mn9Zmt/DTCXbXzwERX2E3CrWrTADqBeYiP1BmxBrzZyO8 zqfYO72MSlJTywJUJ/CIgtj2HkruG3a5CDB+w5O6mXmaKFMIlAxAtr+0LchSHOq8pbSZmyauOhh Rs80B7nkLl6Buo6mJ5Q== X-Proofpoint-ORIG-GUID: xT1gJan0LOD4O7EPFDsyBWMzQ-vISRFj 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_02,2026-05-08_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 adultscore=0 phishscore=0 lowpriorityscore=0 spamscore=0 clxscore=1015 impostorscore=0 priorityscore=1501 suspectscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605110090 On 5/11/2026 4:16 PM, James Clark wrote: > > > On 09/05/2026 1:58 am, Jie Gan wrote: >> 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 >> --- >> 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-5f11a5456fdf@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/ >> hwtracing/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_device *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 >> assigned. >>    */ >> -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 = coresight_get_sink(path); >>       struct coresight_node *nd; >> -    int trace_id; >> +    int trace_id, ret = -EINVAL; >>       list_for_each_entry(nd, &path->path_list, link) { >>           /* Assign a trace ID to the path for the first device that >> wants to do it */ >> @@ -755,10 +755,16 @@ void coresight_path_assign_trace_id(struct >> coresight_path *path, >>            * Non 0 is either success or fail. >>            */ >>           if (trace_id != 0) { >> -            path->trace_id = trace_id; >> -            return; >> +            if (IS_VALID_CS_TRACE_ID(trace_id)) { >> +                path->trace_id = trace_id; >> +                ret = 0; > > Reviewed-by: James Clark > > Minor nit, but just "return 0" here is a bit simpler. > Will remove the ret, and directly return the value for clearly expression. Thanks, Jie >> +            } >> + >> +            return ret; > > And then "return -EINVAL" for these ones. > >>           } >>       } >> + >> +    return ret; >   } >>   /** >> diff --git a/drivers/hwtracing/coresight/coresight-priv.h b/drivers/ >> hwtracing/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); >>   #if IS_ENABLED(CONFIG_CORESIGHT_SOURCE_ETM3X) >> diff --git a/drivers/hwtracing/coresight/coresight-sysfs.c b/drivers/ >> hwtracing/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 >> *csdev) >>           goto out; >>       } >> -    coresight_path_assign_trace_id(path, CS_MODE_SYSFS); >> -    if (!IS_VALID_CS_TRACE_ID(path->trace_id)) >> +    ret = coresight_path_assign_trace_id(path, CS_MODE_SYSFS); >> +    if (ret) >>           goto err_path; >>       ret = coresight_enable_path(path, CS_MODE_SYSFS); >> >> --- >> base-commit: 17c7841d09ee7d33557fd075562d9289b6018c90 >> change-id: 20260508-fix-trace-id-error-dbfdd4d8f2d1 >> >> Best regards, >