From patchwork Wed Nov 2 20:17:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Madalin Bucur X-Patchwork-Id: 690586 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3t8KTS6d7lz9t1H for ; Thu, 3 Nov 2016 07:29:48 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3t8KTS5qRTzDvtt for ; Thu, 3 Nov 2016 07:29:48 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0088.outbound.protection.outlook.com [104.47.38.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3t8KCw3bzVzDvQB for ; Thu, 3 Nov 2016 07:18:04 +1100 (AEDT) Received: from DM2PR03CA0034.namprd03.prod.outlook.com (10.141.96.33) by SN1PR0301MB1632.namprd03.prod.outlook.com (10.162.130.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.693.12; Wed, 2 Nov 2016 20:17:59 +0000 Received: from BL2FFO11OLC006.protection.gbl (2a01:111:f400:7c09::152) by DM2PR03CA0034.outlook.office365.com (2a01:111:e400:2428::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.693.12 via Frontend Transport; Wed, 2 Nov 2016 20:17:59 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; transmode.se; dkim=none (message not signed) header.d=none; transmode.se; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11OLC006.mail.protection.outlook.com (10.173.160.95) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.693.6 via Frontend Transport; Wed, 2 Nov 2016 20:17:58 +0000 Received: from fsr-fed2164-101.ea.freescale.net (fsr-fed2164-101.ea.freescale.net [10.171.73.197]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id uA2KHZDl017745; Wed, 2 Nov 2016 13:17:55 -0700 From: Madalin Bucur To: Subject: [PATCH net-next v6 07/10] dpaa_eth: add trace points Date: Wed, 2 Nov 2016 22:17:31 +0200 Message-ID: <1478117854-8952-8-git-send-email-madalin.bucur@nxp.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1478117854-8952-1-git-send-email-madalin.bucur@nxp.com> References: <1478117854-8952-1-git-send-email-madalin.bucur@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131225914784601183; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(979002)(6009001)(7916002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(48376002)(36756003)(586003)(6666003)(305945005)(81166006)(81156014)(97736004)(53806999)(50226002)(8936002)(2906002)(105606002)(189998001)(229853001)(8676002)(106466001)(69596002)(19580395003)(7846002)(3450700001)(19580405001)(626004)(356003)(4326007)(110136003)(5660300001)(77096005)(85426001)(5003940100001)(2351001)(47776003)(43066003)(6916009)(2950100002)(87936001)(33646002)(86362001)(76176999)(104016004)(50986999)(68736007)(11100500001)(50466002)(2004002)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0301MB1632; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC006; 1:rM9Vy9qJxaPp82fgXrTthsA7XXIaEtyvefszTrlg/vE840FFOXlmOll/DqHWlnzLj8g+WmCiL7R0ogsUTEYkb0bGbyZQLt+gbABXq0X2nVaxCaWWnuzMA9rqbzu58HHOxAZ5stYDi+nJBJzhuQ6ytI3uViJAJfzjmMpzK7+k9Fxbta25ASsgo//ZNylY7pHx0yKiNut43qMnRUAhfLdImfGxX6n3cRBnHCR4ToG0XsqquY4cFhLLeESVPEvi8folTX89f16uhAhquZzs5ADHkexT7eZevoxvwH2zkXlv3pFATiTDGejgMleZWTD/u2i2J9RLPyfkFRLElNbo5QoBhAEKED2FSKpVmzIJkp4LuGxfSajm3hd2Q3s3MIwUn36UNiiMR59LPzN3Ccti5be3T7YggKbaOPAMwD5ugt2d2jp+BjC3jqEe82yQLX3/AG6dCAPgRbuLZ6EZZ3s4etCPGdNvB99xWxlKClJKTIA9OuSdR8tQh4QZu2GuO+EOMpmf4vyW1eAb+Op/6zAGBzFbOm0A1MoNpMUncaAm5w3xQa2nmfuLVSiwT+oIW14R4ITFf/A1E/2/eJlZpDXtIrHiJQ66nyWLGI2lHRxsq63HwuC7Z/FucOqyueFZdlof2RqZ MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 9a80a122-e471-49e8-d45f-08d4035d5686 X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1632; 2:M0CJ8arBpyvgMRBH2osQsj6OISqT0nn4jenn4w7l9Sxab5mvQZqSOVhzPmzdNhMOwvlNBZYQGdrLm1tNSHO17tuJJd3DZCRiSDPm7mQullVJnheNgQhMX5mGpdw07jemYvyHssZdToohsq5BTlQ5bHZ7DGMKC65aUjxl6kypIFrqDkwn3a95vKh1fTlJA9H6GFtNer1EmefSfBClTMeMYw==; 3:XNeVwYhlUgKm+/Mx9nfjwjM6PzPXERuDIA9QO4OWc3wSYuYxzd5w0RfiGmfHT0wvyMiQ5mJZIpFWIfCvaks/e15VDCvlmfr27rZhwhCJQmxvCjG8mgVWFlPD3D0Zr6nM3XB0e4/wLieT5qyinDX15PTzLKvN9dXJrb+vWGRVy2WKNCKaiRbSCl5tX33isOz/gG9U2y+EfqgFnTJ2TV2e1x7NOtwZbPIUqpIXYIAyOrhFOVWbbBZ80Hn90s7u6fMj X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR0301MB1632; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1632; 25:TxUSzSCrjR7qnC7pSW2ic/+EXYcii5rH58ZU1R754zamsNeRwuLGuAsb/fa2x2PcZ5vVcNLIFcIpfWdl1nIqo/GZbDb7KLf8M+MO/9FGX+KV8IijxSvrSVSPfcm3EWCuFSxyqXiSo2GJCzmoVh1kUgz72AdIIhY2eJ9FkpudR/H764sWDud2R/hXGiNr1vCEfCwYjRJKE3mXZPwLf2xcwsrkUT5STP6cEB4/1/N3kT/wqnHsiowgNqylG2MCliChgl71BRq1M6wrBukd7bItWlMuRpHbqcrSwmL03J5x1PYHPicW2zKCcIQFYUdYZ2ws4UHzeL45B4zwt0ZlS2xlmbQxq1oveohk1dQnB7YdtW2lKcPaRzLdT8f883HzT6uE1d1Dc8k1F9i7HLo20VpCQ06O1ZYmDMsGSPVNBZeOjuED9aW3+8PLqOJfq6i9ixEfekXWWhAWu/uYeslBYW/caylX1+xjSZl+gy2AaKTbGJgc5jyd84hIt+puFhU4a7h0amzsec5ZEtk31EB+vmoXQ2Ajk4g+/n4VwMOOjvbC2kIiFJhkoCtqpi9yhVzX+wrimt1nYk+8c867ym9lpcSH2elk0siKcH01X+RndLFZyf/UTT7Qq24/CkhLuilWvTWELjWaAa+hIeT/GAILRW3RQ9jnnGhcmVFrDlXjl/g6SkbxHNQX/l5DXzhMqrBBLZjjhuV/UuCNHgk6WXUI2K6LvnJZJU9OFB4wsRqDvVnQg/3lPg/gvy3m8Cp2POmqMEGFCau+es+5nHoKvma/el7u5Lwzl43VeYdzLTJrq2QUJ9euI1zw1tOV3YQXXQ6EjK+5 X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1632; 31:6LpxkDNr0DissovCwLFqgDWyt2qelwuHnZa3jtJSLf3UwYKndrxLswZ3bIOyuchpawKsB5/apionyuD1Xsfz1j3ZZ3LF9v5iuZBzjdMAZi16tK/018hnbTH9lkkN6euUsQDhRIu1pQw1oydLxEXPcXxWwOvRmgKrVdEpdp+E7sfSirD2FNbuNyeF6mipYih72IzhexS2q5zJUecswggyTv2y+/Pr/LwwaEgIaEaNzj9Lv3ErZepl6D5/OfWZs0nFIQm+b9Wa1AW+iC5DZh1GEJaJOl6XtSmmcolymMP5rh0=; 4:N5gbGORhNk7cbunj+ouJra3ryi0VCfoqkDAFrzv59gpP3WCIke+8YIL56+Hl8J56y4gSK/x/FGlAdH6/1xZzBGQZ3IVjlUlq8O1cyfcSL/5oJFlTwAEY2z5tjOhYJH3Qs2WwduPZB02/ZN3U0XAfnQQVQYTHqQCr4M41yK2MCb7brYXFQAaHqdBNmdKfMz6dPeNe2ohs/ecqBPaA1fllAR+nu1pV3RPMUYFHn7ty8IkoJG1GdPOtOP7H/vjdBXy8ovtA8AynzPJJfjvoTTyqAtZrvA3wHlJWoqCl0dWjkfqEvl1ioQwADgLn+ngFFUzaZW7D/9osOQBQVfBEp0AWYd7tLYfH0SxFAahJ7I0hTOT9eZtZYAy4KJ4Sh4kkR/3RsHMiwdZ6PNhCBp6vclWIlprCEmLjTB8iEdo3ehs6HqD3OVXn0CFn2c3XqcXhgYkSVaC/7lkO6N4kFN4BERPEpqyQPzsdAPTkLO7LfAV9QGKPGtDdLDO/MdXc2KwqSvJ/obq28m78djYDwaUQNKZhZpy5qmn8hszK8kb73wP1gdI0PShgfI70VCE/OUU1+9iePslJBO9JTk5W2IuIBhtVFA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(8121501046)(5005006)(13024025)(13023025)(13018025)(13015025)(13017025)(10201501046)(3002001)(6055026); SRVR:SN1PR0301MB1632; BCL:0; PCL:0; RULEID:(400006); SRVR:SN1PR0301MB1632; X-Forefront-PRVS: 0114FF88F6 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR0301MB1632; 23:7Ea8KtflItpA5XuDAiIWcC7D5YnHMcON3AfI1XT?= =?us-ascii?Q?1ubdf7ovZOoDM3vNoj//gGfW4we1fYzA38GbICB57DxYZ/QHr4ao/DAi7CW/?= =?us-ascii?Q?I14jsbh+IhG2paR8iMMFVLtBBUDbyy6A/Xc6HbASZl+hg1D4wlsxvTboiWbp?= =?us-ascii?Q?2DTIRiAOYm70nNPp8ZGchQSY8OWof79tOX+EbW1/izLe3NBLcaOFOFemVCR1?= =?us-ascii?Q?BuQqCksxw/YFkhX4N1lqLwykPMg1K8ebwmQjFMc6FER6Wz3GbN3Qf5FIK0mt?= =?us-ascii?Q?DPnLSwA5fxXCJPmw80ZaaoTpJzpkf9rWKYGXNpDK8W1GoyrUylu/ziU9BOLC?= =?us-ascii?Q?wGgvPLbhRpBdgJAokcu54e3cLcWYRhvekpcYw98YczFTmG7LMOswvDXC3RP/?= =?us-ascii?Q?2I0fcPwICpoBm0B8DP3XRyRg+PDiWxUaYE6DiCxg3rpNnWvXgKfy/pfM5aUi?= =?us-ascii?Q?Oly7GLkjqYb6CpZwOAA52xDEmOlB9ZAnERZKptuik6gbY2D5PJ5vbVdWsKNF?= =?us-ascii?Q?+Lfx1poZECJeW3Ks1lser1+AskKm8Kun5MGHK3P/+hS9rtqn3uC/Mjfyb8hW?= =?us-ascii?Q?sKFU9g5pxYvd4r1vnx+KTzLBKZNyJuB4HJfQAQkRupWSRLpDXqvoYDTVxHfN?= =?us-ascii?Q?JOG0aNBVBmSUe15zy6cxJM3Jxw0FFmmkEPx2c+SQh3jjMrhHw5mc8Kum5VhD?= =?us-ascii?Q?huTumgYPXSFZVGLp8GQbYJVGn8r4WwNr0a/xSpOZWwMjv/s2WYcEIlJVl9hw?= =?us-ascii?Q?D/tkxlCxH5BrjdxNgL2xXLzPWkqYL7bhyrTgBcna4JJrjlPka80XPGRaJPuw?= =?us-ascii?Q?Fp9BPmFtLX32e4lqAdBVG3mrlI9xjYGoCqqoC371MhL6XXqKoyimoroGoZKN?= =?us-ascii?Q?FuTsMuKhTEHKgLMMBbhv0KpvOuiqMMcWvkv6UFwhd9km4eNej7LqtHJKWeKJ?= =?us-ascii?Q?nyQQ56u5weXbFjoG2nYLvd3c/bs5hbR10YaUkWMNvQLwSAkil/tExkySKutU?= =?us-ascii?Q?hAH/f4N+6Vd6VSSPQOx6SjSSq3+VLXmONCpq/3wxW4FWHZq2ifHQNAJgIcec?= =?us-ascii?Q?q6vdy+OkJlf1/jvbIduDC5jLN7OqjxqLhYU2mU5RxUaQMA1uca+xIYz4VeoH?= =?us-ascii?Q?ZeyegxZnDrA7Xpdk3W2Qra95752O4KMecDMHZ5tdWo5nBSHh22DXNkNtQ0B5?= =?us-ascii?Q?FNMsUNe/gqUN1x4wm6FprRrE9WPEH47KOltb9Ezc48LwjJjON2dJpmMtdm+2?= =?us-ascii?Q?utlduT2jFvkh6X6u5Qze+LjP8y4/MPNkAsJjb4jf5oVu02U8OpSw65IvBqWF?= =?us-ascii?Q?ijJM3fJVY/gyEwVzjFRovb07nFQAnq/gQpYvO4nQtok5QFONGNd1z2o0ZUrv?= =?us-ascii?Q?JL9310A=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1632; 6:qj6QlOuvRrtOckG8v6e5EP285g4fLX/5gA+NdFyIuI7IBJPt72E5IBMC9HRSuN+LpUYOhWHliG4hovlRNM0U2lFG6++vNvlLWInVl+9nFNmulayiUsoTa6b5zIHtyDmoRP7V8PG9k1Is2eKVn//QDO9hL33gkCrbyNc1oTShnAgZCVPAv8JLpZaPAYLmVX17wLJYRtKeHp2SBTcnDxh3jCHpReX8M4HRqoC0Q//LX5sEmbvi+kg/m0ncazzp/GFSsl+G/EwAefS1LSqFrH+sM/j25YkudCtJZ7DDK2AEqf31Rxi4bteOfF7f6P3excWx; 5:W/kb6xChvrXzZvRQ6sPGKeFJzjr82y61ikRZM3/E9/XGI+ag1UNASMYU07X4GpRbf5DI5bKEtiPhrwluV6a/2MaQR41juJdQcE8BQIbn2XmTCcTJIVejgHUkzCzEAEQESvzXK8Q//BRn92eu4xrfoZaJZpC1G1difV1rRA7J5TBhdp3frLWuWtcAWq7odmSS; 24:71MrLPKT2ZnJXYCbdwh0+5l8uba2NZkCzUQYQO7y0cZ4whStVppd1vRDKLlcEL0OnVA8xa2dZSk/e5aLNvAUMQYZ25rMbpzO9DIR3xIl8ig= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1632; 7:vvi8s6mk1HJXkwoSJCEOPYMc8TWnOrTMhEXqSDYwTJfJ5UmYhADOaxoqFbkqnh/GZwskT2ndYtC55Re844gRX80WG3cq35IeREfVDiyd/0yk9O0Ut16W5dAQLipnVtFMN/OSd6c0UimVoyjugDZkbIRDa7S7tdPuRWs33nSzVX6qOpeQh1yLI+X2SnZPHcB9mKKoIqw0f9Ac7D6+dCEN6zUXPqnLRP2OIcuQ7ESqUHCKaLKbJMeKFlLFe3e+ekmlxhe3pGDxjlIQJjECT8xPSGFwsmcWV1zeZXgRauzve0yveeu/+dFsBMcZRWgO6DPenr1bSjd532mO0a55k+t2jbt9V9iLTvfWlF66WJygHtk= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2016 20:17:58.2261 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR0301MB1632 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: madalin.bucur@nxp.com Cc: pebolle@tiscali.nl, joakim.tjernlund@transmode.se, linux-kernel@vger.kernel.org, ppc@mindchasers.com, oss@buserror.net, joe@perches.com, linuxppc-dev@lists.ozlabs.org, davem@davemloft.net Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Add trace points on the hot processing path. Signed-off-by: Ruxandra Ioana Radulescu --- drivers/net/ethernet/freescale/dpaa/Makefile | 1 + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 15 +++ drivers/net/ethernet/freescale/dpaa/dpaa_eth.h | 1 + .../net/ethernet/freescale/dpaa/dpaa_eth_trace.h | 141 +++++++++++++++++++++ 4 files changed, 158 insertions(+) create mode 100644 drivers/net/ethernet/freescale/dpaa/dpaa_eth_trace.h diff --git a/drivers/net/ethernet/freescale/dpaa/Makefile b/drivers/net/ethernet/freescale/dpaa/Makefile index bfb03d4..7db50bc 100644 --- a/drivers/net/ethernet/freescale/dpaa/Makefile +++ b/drivers/net/ethernet/freescale/dpaa/Makefile @@ -9,3 +9,4 @@ ccflags-y += -I$(FMAN) obj-$(CONFIG_FSL_DPAA_ETH) += fsl_dpa.o fsl_dpa-objs += dpaa_eth.o dpaa_ethtool.o dpaa_eth_sysfs.o +CFLAGS_dpaa_eth.o := -I$(src) diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c index 045b23b..9d240b7 100644 --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c @@ -59,6 +59,12 @@ #include "mac.h" #include "dpaa_eth.h" +/* CREATE_TRACE_POINTS only needs to be defined once. Other dpaa files + * using trace events only need to #include + */ +#define CREATE_TRACE_POINTS +#include "dpaa_eth_trace.h" + static int debug = -1; module_param(debug, int, S_IRUGO); MODULE_PARM_DESC(debug, "Module/Driver verbosity level (0=none,...,16=all)"); @@ -1918,6 +1924,9 @@ static inline int dpaa_xmit(struct dpaa_priv *priv, if (fd->bpid == FSL_DPAA_BPID_INV) fd->cmd |= qman_fq_fqid(priv->conf_fqs[queue]); + /* Trace this Tx fd */ + trace_dpaa_tx_fd(priv->net_dev, egress_fq, fd); + for (i = 0; i < DPAA_ENQUEUE_RETRIES; i++) { err = qman_enqueue(egress_fq, fd); if (err != -EBUSY) @@ -2152,6 +2161,9 @@ static enum qman_cb_dqrr_result rx_default_dqrr(struct qman_portal *portal, if (!dpaa_bp) return qman_cb_dqrr_consume; + /* Trace the Rx fd */ + trace_dpaa_rx_fd(net_dev, fq, &dq->fd); + percpu_priv = this_cpu_ptr(priv->percpu_priv); percpu_stats = &percpu_priv->stats; @@ -2248,6 +2260,9 @@ static enum qman_cb_dqrr_result conf_dflt_dqrr(struct qman_portal *portal, net_dev = ((struct dpaa_fq *)fq)->net_dev; priv = netdev_priv(net_dev); + /* Trace the fd */ + trace_dpaa_tx_conf_fd(net_dev, fq, &dq->fd); + percpu_priv = this_cpu_ptr(priv->percpu_priv); if (dpaa_eth_napi_schedule(percpu_priv, portal)) diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.h b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.h index 44323e2..1f9aebf 100644 --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.h +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.h @@ -37,6 +37,7 @@ #include "fman.h" #include "mac.h" +#include "dpaa_eth_trace.h" #define DPAA_ETH_TXQ_NUM NR_CPUS diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth_trace.h b/drivers/net/ethernet/freescale/dpaa/dpaa_eth_trace.h new file mode 100644 index 0000000..409c1dc --- /dev/null +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth_trace.h @@ -0,0 +1,141 @@ +/* Copyright 2013-2015 Freescale Semiconductor Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Freescale Semiconductor nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * + * ALTERNATIVELY, this software may be distributed under the terms of the + * GNU General Public License ("GPL") as published by the Free Software + * Foundation, either version 2 of that License or (at your option) any + * later version. + * + * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#undef TRACE_SYSTEM +#define TRACE_SYSTEM dpaa_eth + +#if !defined(_DPAA_ETH_TRACE_H) || defined(TRACE_HEADER_MULTI_READ) +#define _DPAA_ETH_TRACE_H + +#include +#include +#include "dpaa_eth.h" +#include + +#define fd_format_name(format) { qm_fd_##format, #format } +#define fd_format_list \ + fd_format_name(contig), \ + fd_format_name(sg) + +/* This is used to declare a class of events. + * individual events of this type will be defined below. + */ + +/* Store details about a frame descriptor and the FQ on which it was + * transmitted/received. + */ +DECLARE_EVENT_CLASS(dpaa_eth_fd, + /* Trace function prototype */ + TP_PROTO(struct net_device *netdev, + struct qman_fq *fq, + const struct qm_fd *fd), + + /* Repeat argument list here */ + TP_ARGS(netdev, fq, fd), + + /* A structure containing the relevant information we want to record. + * Declare name and type for each normal element, name, type and size + * for arrays. Use __string for variable length strings. + */ + TP_STRUCT__entry( + __field(u32, fqid) + __field(u64, fd_addr) + __field(u8, fd_format) + __field(u16, fd_offset) + __field(u32, fd_length) + __field(u32, fd_status) + __string(name, netdev->name) + ), + + /* The function that assigns values to the above declared fields */ + TP_fast_assign( + __entry->fqid = fq->fqid; + __entry->fd_addr = qm_fd_addr_get64(fd); + __entry->fd_format = qm_fd_get_format(fd); + __entry->fd_offset = qm_fd_get_offset(fd); + __entry->fd_length = qm_fd_get_length(fd); + __entry->fd_status = fd->status; + __assign_str(name, netdev->name); + ), + + /* This is what gets printed when the trace event is triggered */ + TP_printk("[%s] fqid=%d, fd: addr=0x%llx, format=%s, off=%u, len=%u, status=0x%08x", + __get_str(name), __entry->fqid, __entry->fd_addr, + __print_symbolic(__entry->fd_format, fd_format_list), + __entry->fd_offset, __entry->fd_length, __entry->fd_status) +); + +/* Now declare events of the above type. Format is: + * DEFINE_EVENT(class, name, proto, args), with proto and args same as for class + */ + +/* Tx (egress) fd */ +DEFINE_EVENT(dpaa_eth_fd, dpaa_tx_fd, + + TP_PROTO(struct net_device *netdev, + struct qman_fq *fq, + const struct qm_fd *fd), + + TP_ARGS(netdev, fq, fd) +); + +/* Rx fd */ +DEFINE_EVENT(dpaa_eth_fd, dpaa_rx_fd, + + TP_PROTO(struct net_device *netdev, + struct qman_fq *fq, + const struct qm_fd *fd), + + TP_ARGS(netdev, fq, fd) +); + +/* Tx confirmation fd */ +DEFINE_EVENT(dpaa_eth_fd, dpaa_tx_conf_fd, + + TP_PROTO(struct net_device *netdev, + struct qman_fq *fq, + const struct qm_fd *fd), + + TP_ARGS(netdev, fq, fd) +); + +/* If only one event of a certain type needs to be declared, use TRACE_EVENT(). + * The syntax is the same as for DECLARE_EVENT_CLASS(). + */ + +#endif /* _DPAA_ETH_TRACE_H */ + +/* This must be outside ifdef _DPAA_ETH_TRACE_H */ +#undef TRACE_INCLUDE_PATH +#define TRACE_INCLUDE_PATH . +#undef TRACE_INCLUDE_FILE +#define TRACE_INCLUDE_FILE dpaa_eth_trace +#include