From nobody Mon Nov 25 05:45:06 2024 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 C9DCE1E2305; Wed, 30 Oct 2024 09:33:51 +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=1730280834; cv=none; b=crbVmHkNGruxCmM9zk+jVDiMXqFPBV/Cf29n5xceNco6lEmbdDFT6Rv3xpT3hFF32U0/cOXN5BGt9Am5iamwZeGVqLNkCtaOGsK9MuYkWq8k74wSrBnBlBUQQp3rTlSWQad8u0HVb7Y+tprWDZ/rs9OKiC5v2i4C5L3x1Td9bjE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730280834; c=relaxed/simple; bh=B6IpqJvfVL8OB45/DjslPxnM8ZdvRzLkX8HpH6B1anc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=WZhMj9iQfWmwBQ48paeMTW0Ohs88RVBZ5tn2xfS6Xmu1AkIPI16+N7AYgE3pYgeVw02LFqhNHJSqwP11Oilhawe6maTwRz9bci6SDk1m3I+P4gFlZMXKw37bmS4/FePt2t1qH/PsfR/IUfvnlNjugEIDcIBwsQOQjRJZbS+IAzg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=cJCrpEr6; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="cJCrpEr6" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49TMEipO012047; Wed, 30 Oct 2024 09:33:32 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to; s=qcppdkim1; bh=zwFjTXatyoz2N+JBo08SDGwP Uny10g/Cm4mHNW7dR5c=; b=cJCrpEr6KYR1FZ4NS8mK5+qQZWJ8JkwJAiFU4c+Q JytpcWBwSqH4d8Pj8tf4u7dSKPpHLlxL9hBUnaXAn7nsn1QQRJv9lnDLAQYH/ng6 c42HfzQbjCKFtRM8hVv96Sx8wfq1YXZor8Xl/2nzxwZPqEr0mt9rtM0/VsUCx04o kED6saRUpelaqNpVfzTfKp7a/1ZSGUBC6aQ8qJZO9uatVOrZapB3KycycSm6lA50 xw8fCQGFjHTVRM3X5Ox15UtmIZiZe9eBKab0evi24JlsH33RcU1V2sCRlrRXtUPL fJcs75KbG+w0xsDUPWFrkNVo8Z6uJnp/q/uzygISfdk6Gg== Received: from nalasppmta02.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 42gp4e3nw1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 30 Oct 2024 09:33:31 +0000 (GMT) Received: from nalasex01c.na.qualcomm.com (nalasex01c.na.qualcomm.com [10.47.97.35]) by NALASPPMTA02.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 49U9XU6J012924 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 30 Oct 2024 09:33:30 GMT Received: from taozha2-gv.qualcomm.com (10.80.80.8) by nalasex01c.na.qualcomm.com (10.47.97.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Wed, 30 Oct 2024 02:33:27 -0700 From: Tao Zhang To: Suzuki K Poulose , Mike Leach , James Clark , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Mathieu Poirier , Leo Yan , Alexander Shishkin CC: Tao Zhang , , , , , Subject: [PATCH v5 3/4] coresight: Add support for trace filtering by source Date: Wed, 30 Oct 2024 17:32:54 +0800 Message-ID: <20241030093255.26915-4-quic_taozha@quicinc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20241030093255.26915-1-quic_taozha@quicinc.com> References: <20241030093255.26915-1-quic_taozha@quicinc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01c.na.qualcomm.com (10.47.97.35) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: nrocwDgEDHtdM-DMx8-5y5q0QAgOhgcT X-Proofpoint-GUID: nrocwDgEDHtdM-DMx8-5y5q0QAgOhgcT X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.60.29 definitions=2024-09-06_09,2024-09-06_01,2024-09-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 priorityscore=1501 mlxlogscore=999 clxscore=1015 spamscore=0 lowpriorityscore=0 malwarescore=0 bulkscore=0 adultscore=0 phishscore=0 mlxscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2409260000 definitions=main-2410300074 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Some replicators have hard coded filtering of "trace" data, based on the source device. This is different from the trace filtering based on TraceID, available in the standard programmable replicators. e.g., Qualcomm replicators have filtering based on custom trace protocol format and is not programmable. The source device could be connected to the replicator via intermediate components (e.g., a funnel). Thus we need platform information from the firmware tables to decide the source device corresponding to a given output port from the replicator. Given this affects "trace path building" and traversing the path back from the sink to source, add the concept of "filtering by source" to the generic coresight connection. The specified source will be marked like below in the Devicetree. test-replicator { ... ... ... ... out-ports { ... ... ... ... port@0 { reg =3D <0>; xyz: endpoint { remote-endpoint =3D <&zyx>; filter-source =3D <&source_1>; <-- To specify the source to }; be filtered out here. }; port@1 { reg =3D <1>; abc: endpoint { remote-endpoint =3D <&cba>; filter-source =3D <&source_2>; <-- To specify the source to }; be filtered out here. }; }; }; Signed-off-by: Tao Zhang --- drivers/hwtracing/coresight/coresight-core.c | 113 +++++++++++++++--- .../hwtracing/coresight/coresight-platform.c | 18 +++ include/linux/coresight.h | 5 + 3 files changed, 117 insertions(+), 19 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtraci= ng/coresight/coresight-core.c index ea38ecf26fcb..0a9380350fb5 100644 --- a/drivers/hwtracing/coresight/coresight-core.c +++ b/drivers/hwtracing/coresight/coresight-core.c @@ -75,22 +75,54 @@ struct coresight_device *coresight_get_percpu_sink(int = cpu) } EXPORT_SYMBOL_GPL(coresight_get_percpu_sink); =20 +static struct coresight_device *coresight_get_source(struct list_head *pat= h) +{ + struct coresight_device *csdev; + + if (!path) + return NULL; + + csdev =3D list_first_entry(path, struct coresight_node, link)->csdev; + if (!coresight_is_device_source(csdev)) + return NULL; + + return csdev; +} + +/** + * coresight_blocks_source - checks whether the connection matches the sou= rce + * of path if connection is bound to specific source. + * @src: The source device of the trace path + * @conn: The connection of one outport + * + * Return false if the connection doesn't have a source binded or source o= f the + * path matches the source binds to connection. + */ +static bool coresight_blocks_source(struct coresight_device *src, + struct coresight_connection *conn) +{ + return conn->filter_src_fwnode && (conn->filter_src_dev !=3D src); +} + static struct coresight_connection * -coresight_find_out_connection(struct coresight_device *src_dev, - struct coresight_device *dest_dev) +coresight_find_out_connection(struct coresight_device *csdev, + struct coresight_device *out_dev, + struct coresight_device *trace_src) { int i; struct coresight_connection *conn; =20 - for (i =3D 0; i < src_dev->pdata->nr_outconns; i++) { - conn =3D src_dev->pdata->out_conns[i]; - if (conn->dest_dev =3D=3D dest_dev) + for (i =3D 0; i < csdev->pdata->nr_outconns; i++) { + conn =3D csdev->pdata->out_conns[i]; + if (coresight_blocks_source(trace_src, conn)) + continue; + if (conn->dest_dev =3D=3D out_dev) return conn; } =20 - dev_err(&src_dev->dev, - "couldn't find output connection, src_dev: %s, dest_dev: %s\n", - dev_name(&src_dev->dev), dev_name(&dest_dev->dev)); + dev_err(&csdev->dev, + "couldn't find output connection, csdev: %s, out_dev: %s\n", + dev_name(&csdev->dev), dev_name(&out_dev->dev)); =20 return ERR_PTR(-ENODEV); } @@ -251,7 +283,8 @@ static void coresight_disable_sink(struct coresight_dev= ice *csdev) =20 static int coresight_enable_link(struct coresight_device *csdev, struct coresight_device *parent, - struct coresight_device *child) + struct coresight_device *child, + struct coresight_device *source) { int link_subtype; struct coresight_connection *inconn, *outconn; @@ -259,8 +292,8 @@ static int coresight_enable_link(struct coresight_devic= e *csdev, if (!parent || !child) return -EINVAL; =20 - inconn =3D coresight_find_out_connection(parent, csdev); - outconn =3D coresight_find_out_connection(csdev, child); + inconn =3D coresight_find_out_connection(parent, csdev, source); + outconn =3D coresight_find_out_connection(csdev, child, source); link_subtype =3D csdev->subtype.link_subtype; =20 if (link_subtype =3D=3D CORESIGHT_DEV_SUBTYPE_LINK_MERG && IS_ERR(inconn)) @@ -273,15 +306,16 @@ static int coresight_enable_link(struct coresight_dev= ice *csdev, =20 static void coresight_disable_link(struct coresight_device *csdev, struct coresight_device *parent, - struct coresight_device *child) + struct coresight_device *child, + struct coresight_device *source) { struct coresight_connection *inconn, *outconn; =20 if (!parent || !child) return; =20 - inconn =3D coresight_find_out_connection(parent, csdev); - outconn =3D coresight_find_out_connection(csdev, child); + inconn =3D coresight_find_out_connection(parent, csdev, source); + outconn =3D coresight_find_out_connection(csdev, child, source); =20 link_ops(csdev)->disable(csdev, inconn, outconn); } @@ -375,7 +409,8 @@ static void coresight_disable_path_from(struct list_hea= d *path, case CORESIGHT_DEV_TYPE_LINK: parent =3D list_prev_entry(nd, link)->csdev; child =3D list_next_entry(nd, link)->csdev; - coresight_disable_link(csdev, parent, child); + coresight_disable_link(csdev, parent, child, + coresight_get_source(path)); break; default: break; @@ -418,7 +453,9 @@ int coresight_enable_path(struct list_head *path, enum = cs_mode mode, u32 type; struct coresight_node *nd; struct coresight_device *csdev, *parent, *child; + struct coresight_device *source; =20 + source =3D coresight_get_source(path); list_for_each_entry_reverse(nd, path, link) { csdev =3D nd->csdev; type =3D csdev->type; @@ -456,7 +493,7 @@ int coresight_enable_path(struct list_head *path, enum = cs_mode mode, case CORESIGHT_DEV_TYPE_LINK: parent =3D list_prev_entry(nd, link)->csdev; child =3D list_next_entry(nd, link)->csdev; - ret =3D coresight_enable_link(csdev, parent, child); + ret =3D coresight_enable_link(csdev, parent, child, source); if (ret) goto err; break; @@ -619,6 +656,7 @@ static void coresight_drop_device(struct coresight_devi= ce *csdev) /** * _coresight_build_path - recursively build a path from a @csdev to a sin= k. * @csdev: The device to start from. + * @source: The trace source device of the path. * @sink: The final sink we want in this path. * @path: The list to add devices to. * @@ -628,6 +666,7 @@ static void coresight_drop_device(struct coresight_devi= ce *csdev) * the source is the first device and the sink the last one. */ static int _coresight_build_path(struct coresight_device *csdev, + struct coresight_device *source, struct coresight_device *sink, struct list_head *path) { @@ -641,7 +680,7 @@ static int _coresight_build_path(struct coresight_devic= e *csdev, =20 if (coresight_is_percpu_source(csdev) && coresight_is_percpu_sink(sink) && sink =3D=3D per_cpu(csdev_sink, source_ops(csdev)->cpu_id(csdev))) { - if (_coresight_build_path(sink, sink, path) =3D=3D 0) { + if (_coresight_build_path(sink, source, sink, path) =3D=3D 0) { found =3D true; goto out; } @@ -652,8 +691,12 @@ static int _coresight_build_path(struct coresight_devi= ce *csdev, struct coresight_device *child_dev; =20 child_dev =3D csdev->pdata->out_conns[i]->dest_dev; + + if (coresight_blocks_source(source, csdev->pdata->out_conns[i])) + continue; + if (child_dev && - _coresight_build_path(child_dev, sink, path) =3D=3D 0) { + _coresight_build_path(child_dev, source, sink, path) =3D=3D 0) { found =3D true; break; } @@ -698,7 +741,7 @@ struct list_head *coresight_build_path(struct coresight= _device *source, =20 INIT_LIST_HEAD(path); =20 - rc =3D _coresight_build_path(source, sink, path); + rc =3D _coresight_build_path(source, source, sink, path); if (rc) { kfree(path); return ERR_PTR(rc); @@ -927,6 +970,16 @@ static int coresight_orphan_match(struct device *dev, = void *data) for (i =3D 0; i < src_csdev->pdata->nr_outconns; i++) { conn =3D src_csdev->pdata->out_conns[i]; =20 + /* Fix filter source device before skip the port */ + if (conn->filter_src_fwnode && !conn->filter_src_dev) { + if (dst_csdev && + (conn->filter_src_fwnode =3D=3D dst_csdev->dev.fwnode) && + !WARN_ON_ONCE(!coresight_is_device_source(dst_csdev))) + conn->filter_src_dev =3D dst_csdev; + else + still_orphan =3D true; + } + /* Skip the port if it's already connected. */ if (conn->dest_dev) continue; @@ -977,18 +1030,40 @@ static int coresight_fixup_orphan_conns(struct cores= ight_device *csdev) csdev, coresight_orphan_match); } =20 +static int coresight_clear_filter_source(struct device *dev, void *data) +{ + int i; + struct coresight_device *source =3D data; + struct coresight_device *csdev =3D to_coresight_device(dev); + + for (i =3D 0; i < csdev->pdata->nr_outconns; ++i) { + if (csdev->pdata->out_conns[i]->filter_src_dev =3D=3D source) + csdev->pdata->out_conns[i]->filter_src_dev =3D NULL; + } + return 0; +} + /* coresight_remove_conns - Remove other device's references to this devic= e */ static void coresight_remove_conns(struct coresight_device *csdev) { int i, j; struct coresight_connection *conn; =20 + if (coresight_is_device_source(csdev)) + bus_for_each_dev(&coresight_bustype, NULL, csdev, + coresight_clear_filter_source); + /* * Remove the input connection references from the destination device * for each output connection. */ for (i =3D 0; i < csdev->pdata->nr_outconns; i++) { conn =3D csdev->pdata->out_conns[i]; + if (conn->filter_src_fwnode) { + conn->filter_src_dev =3D NULL; + fwnode_handle_put(conn->filter_src_fwnode); + } + if (!conn->dest_dev) continue; =20 diff --git a/drivers/hwtracing/coresight/coresight-platform.c b/drivers/hwt= racing/coresight/coresight-platform.c index 64e171eaad82..d5532caa9e92 100644 --- a/drivers/hwtracing/coresight/coresight-platform.c +++ b/drivers/hwtracing/coresight/coresight-platform.c @@ -243,6 +243,24 @@ static int of_coresight_parse_endpoint(struct device *= dev, conn.dest_fwnode =3D fwnode_handle_get(rdev_fwnode); conn.dest_port =3D rendpoint.port; =20 + /* + * Get the firmware node of the filter source through the + * reference. This could be used to filter the source in + * building path. + */ + conn.filter_src_fwnode =3D + fwnode_find_reference(&ep->fwnode, "filter-source", 0); + if (IS_ERR(conn.filter_src_fwnode)) { + conn.filter_src_fwnode =3D NULL; + } else { + conn.filter_src_dev =3D + coresight_find_csdev_by_fwnode(conn.filter_src_fwnode); + if (conn.filter_src_dev && + !coresight_is_device_source(conn.filter_src_dev)) + dev_warn(&conn.filter_src_dev->dev, + "Filter source is not a source device\n"); + } + new_conn =3D coresight_add_out_conn(dev, pdata, &conn); if (IS_ERR_VALUE(new_conn)) { fwnode_handle_put(conn.dest_fwnode); diff --git a/include/linux/coresight.h b/include/linux/coresight.h index 9311df8538fc..f372c01ae2fc 100644 --- a/include/linux/coresight.h +++ b/include/linux/coresight.h @@ -172,6 +172,9 @@ struct coresight_desc { * @dest_dev: a @coresight_device representation of the component connected to @src_port. NULL until the device is created * @link: Representation of the connection as a sysfs link. + * @filter_src_fwnode: filter source component's fwnode handle. + * @filter_src_dev: a @coresight_device representation of the component th= at + needs to be filtered. * * The full connection structure looks like this, where in_conns store * references to same connection as the source device's out_conns. @@ -200,6 +203,8 @@ struct coresight_connection { struct coresight_device *dest_dev; struct coresight_sysfs_link *link; struct coresight_device *src_dev; + struct fwnode_handle *filter_src_fwnode; + struct coresight_device *filter_src_dev; atomic_t src_refcnt; atomic_t dest_refcnt; }; --=20 2.17.1