From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 98B08A00C2;
Wed, 22 Apr 2020 21:07:37 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 3B3521D674;
Wed, 22 Apr 2020 21:05:35 +0200 (CEST)
Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com
[67.231.156.173]) by dpdk.org (Postfix) with ESMTP id 8CFF11D5CA
for <dev@dpdk.org>; Wed, 22 Apr 2020 21:05:15 +0200 (CEST)
Received: from pps.filterd (m0045851.ppops.net [127.0.0.1])
by mx0b-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id
03MJ1e6r005905; Wed, 22 Apr 2020 12:05:14 -0700
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;
h=from : to : cc :
subject : date : message-id : in-reply-to : references : mime-version :
content-transfer-encoding : content-type; s=pfpt0818;
bh=5kUu0QpqQRwrPvxHsqegS0xpA7Zzo4Xu8vp1c3eTruI=;
b=ORg5EZ+8aO5tET0sMgQiXcVVnk0h6Lln0xfzP/Co9bV+MVK6PBxIhN90X5nYdMGA3xr2
evdRIZMrmJ2NYC+6ZMmGtk/PAJLfBw592dzanSlhHL3NyezZ8x0ojJ54OfhPoqYeNpek
AvhiBnGmp+PjqV3TJAle4ozYTZct3pHvEGrzsSQbsy0i18yjI5CMZmV4KRVVrm8y0jxt
GENJJyLHRz+fywAQiukqZnviJ3+BvBPQzGEyu9g9GwNPq/twLUNC4w05UGZj2NRS4Xwu
f1Rw5/aBznVLpB3oRmnCRV+EtTnZRUxDifXGBTlesrxrlcWnP15X+N1jrgjnP3RGFQlG KA==
Received: from sc-exch03.marvell.com ([199.233.58.183])
by mx0b-0016f401.pphosted.com with ESMTP id 30jd013jm3-1
(version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);
Wed, 22 Apr 2020 12:05:14 -0700
Received: from DC5-EXCH02.marvell.com (10.69.176.39) by SC-EXCH03.marvell.com
(10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1497.2;
Wed, 22 Apr 2020 12:05:12 -0700
Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com
(10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.2;
Wed, 22 Apr 2020 12:05:11 -0700
Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com
(10.69.176.38) with Microsoft SMTP Server id 15.0.1497.2 via Frontend
Transport; Wed, 22 Apr 2020 12:05:11 -0700
Received: from jerin-lab.marvell.com (jerin-lab.marvell.com [10.28.34.14])
by maili.marvell.com (Postfix) with ESMTP id 3C18C3F703F;
Wed, 22 Apr 2020 12:05:08 -0700 (PDT)
From: <jerinj@marvell.com>
To: Jerin Jacob <jerinj@marvell.com>, Sunil Kumar Kori <skori@marvell.com>,
Bruce Richardson <bruce.richardson@intel.com>
CC: <dev@dpdk.org>, <thomas@monjalon.net>, <david.marchand@redhat.com>,
<mattias.ronnblom@ericsson.com>
Date: Thu, 23 Apr 2020 00:33:38 +0530
Message-ID: <20200422190349.3768487-22-jerinj@marvell.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20200422190349.3768487-1-jerinj@marvell.com>
References: <20200419100133.3232316-1-jerinj@marvell.com>
<20200422190349.3768487-1-jerinj@marvell.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.676
definitions=2020-04-22_06:2020-04-22,
2020-04-22 signatures=0
Subject: [dpdk-dev] [PATCH v7 21/32] eal/trace: add interrupt tracepoints
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
From: Jerin Jacob <jerinj@marvell.com>
Add the following interrupt related tracepoints.
- rte_trace_lib_eal_intr_callback_register()
- rte_trace_lib_eal_intr_callback_unregister()
- rte_trace_lib_eal_intr_enable()
- rte_trace_lib_eal_intr_disable()
Signed-off-by: Jerin Jacob <jerinj@marvell.com>
---
.../common/eal_common_trace_points.c | 14 ++++
lib/librte_eal/freebsd/eal_interrupts.c | 52 ++++++++----
lib/librte_eal/include/rte_eal_trace.h | 48 +++++++++++
lib/librte_eal/linux/eal_interrupts.c | 84 ++++++++++++-------
lib/librte_eal/rte_eal_version.map | 58 +++++++------
5 files changed, 181 insertions(+), 75 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_trace_points.c b/lib/librte_eal/common/eal_common_trace_points.c
index 785fb3ada..6b4e2746a 100644
--- a/lib/librte_eal/common/eal_common_trace_points.c
+++ b/lib/librte_eal/common/eal_common_trace_points.c
@@ -38,6 +38,11 @@ RTE_TRACE_POINT_DEFINE(rte_eal_trace_memzone_free);
RTE_TRACE_POINT_DEFINE(rte_eal_trace_thread_remote_launch);
RTE_TRACE_POINT_DEFINE(rte_eal_trace_thread_lcore_ready);
+RTE_TRACE_POINT_DEFINE(rte_eal_trace_intr_callback_register);
+RTE_TRACE_POINT_DEFINE(rte_eal_trace_intr_callback_unregister);
+RTE_TRACE_POINT_DEFINE(rte_eal_trace_intr_enable);
+RTE_TRACE_POINT_DEFINE(rte_eal_trace_intr_disable);
+
RTE_INIT(eal_trace_init)
{
RTE_TRACE_POINT_REGISTER(rte_eal_trace_generic_void,
@@ -98,4 +103,13 @@ RTE_INIT(eal_trace_init)
lib.eal.thread.remote.launch);
RTE_TRACE_POINT_REGISTER(rte_eal_trace_thread_lcore_ready,
lib.eal.thread.lcore.ready);
+
+ RTE_TRACE_POINT_REGISTER(rte_eal_trace_intr_callback_register,
+ lib.eal.intr.register);
+ RTE_TRACE_POINT_REGISTER(rte_eal_trace_intr_callback_unregister,
+ lib.eal.intr.unregister);
+ RTE_TRACE_POINT_REGISTER(rte_eal_trace_intr_enable,
+ lib.eal.intr.enable);
+ RTE_TRACE_POINT_REGISTER(rte_eal_trace_intr_disable,
+ lib.eal.intr.disable);
}
diff --git a/lib/librte_eal/freebsd/eal_interrupts.c b/lib/librte_eal/freebsd/eal_interrupts.c
index 7def3189b..d40e33c66 100644
--- a/lib/librte_eal/freebsd/eal_interrupts.c
+++ b/lib/librte_eal/freebsd/eal_interrupts.c
@@ -13,6 +13,7 @@
#include <rte_spinlock.h>
#include <rte_common.h>
#include <rte_interrupts.h>
+#include <rte_eal_trace.h>
#include "eal_private.h"
#include "eal_alarm_private.h"
@@ -182,6 +183,7 @@ rte_intr_callback_register(const struct rte_intr_handle *intr_handle,
goto fail;
}
}
+ rte_eal_trace_intr_callback_register(intr_handle, cb, cb_arg, ret);
rte_spinlock_unlock(&intr_lock);
return 0;
@@ -196,6 +198,7 @@ rte_intr_callback_register(const struct rte_intr_handle *intr_handle,
}
}
free(callback);
+ rte_eal_trace_intr_callback_register(intr_handle, cb, cb_arg, ret);
rte_spinlock_unlock(&intr_lock);
return ret;
}
@@ -335,6 +338,8 @@ rte_intr_callback_unregister(const struct rte_intr_handle *intr_handle,
}
}
out:
+ rte_eal_trace_intr_callback_unregister(intr_handle, cb_fn,
+ cb_arg, ret);
rte_spinlock_unlock(&intr_lock);
return ret;
@@ -343,55 +348,68 @@ rte_intr_callback_unregister(const struct rte_intr_handle *intr_handle,
int
rte_intr_enable(const struct rte_intr_handle *intr_handle)
{
- if (intr_handle && intr_handle->type == RTE_INTR_HANDLE_VDEV)
- return 0;
+ int rc = 0;
- if (!intr_handle || intr_handle->fd < 0 || intr_handle->uio_cfg_fd < 0)
- return -1;
+ if (intr_handle && intr_handle->type == RTE_INTR_HANDLE_VDEV) {
+ rc = 0; goto out;
+ }
+
+ if (!intr_handle || intr_handle->fd < 0 ||
+ intr_handle->uio_cfg_fd < 0) {
+ rc = -1; goto out;
+ }
switch (intr_handle->type) {
/* not used at this moment */
case RTE_INTR_HANDLE_ALARM:
- return -1;
+ rc = -1; break;
/* not used at this moment */
case RTE_INTR_HANDLE_DEV_EVENT:
- return -1;
+ rc = -1; break;
/* unknown handle type */
default:
RTE_LOG(ERR, EAL,
"Unknown handle type of fd %d\n",
intr_handle->fd);
- return -1;
+ rc = -1; break;
}
- return 0;
+out:
+ rte_eal_trace_intr_enable(intr_handle, rc);
+ return rc;
}
int
rte_intr_disable(const struct rte_intr_handle *intr_handle)
{
- if (intr_handle && intr_handle->type == RTE_INTR_HANDLE_VDEV)
- return 0;
+ int rc = 0;
- if (!intr_handle || intr_handle->fd < 0 || intr_handle->uio_cfg_fd < 0)
- return -1;
+ if (intr_handle && intr_handle->type == RTE_INTR_HANDLE_VDEV) {
+ rc = 0; goto out;
+ }
+
+ if (!intr_handle || intr_handle->fd < 0 ||
+ intr_handle->uio_cfg_fd < 0) {
+ rc = -1; goto out;
+ }
switch (intr_handle->type) {
/* not used at this moment */
case RTE_INTR_HANDLE_ALARM:
- return -1;
+ rc = -1; break;
/* not used at this moment */
case RTE_INTR_HANDLE_DEV_EVENT:
- return -1;
+ rc = -1; break;
/* unknown handle type */
default:
RTE_LOG(ERR, EAL,
"Unknown handle type of fd %d\n",
intr_handle->fd);
- return -1;
+ rc = -1; break;
}
-
- return 0;
+out:
+ rte_eal_trace_intr_disable(intr_handle, rc);
+ return rc;
}
int
diff --git a/lib/librte_eal/include/rte_eal_trace.h b/lib/librte_eal/include/rte_eal_trace.h
index 72d4ede08..10c47a8b3 100644
--- a/lib/librte_eal/include/rte_eal_trace.h
+++ b/lib/librte_eal/include/rte_eal_trace.h
@@ -16,6 +16,7 @@ extern "C" {
#endif
#include <rte_alarm.h>
+#include <rte_interrupts.h>
#include <rte_trace_point.h>
/* Generic */
@@ -222,6 +223,53 @@ RTE_TRACE_POINT(
rte_trace_point_emit_string(cpuset);
)
+/* Interrupt */
+RTE_TRACE_POINT(
+ rte_eal_trace_intr_callback_register,
+ RTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle,
+ rte_intr_callback_fn cb, void *cb_arg, int rc),
+ rte_trace_point_emit_int(rc);
+ rte_trace_point_emit_int(handle->vfio_dev_fd);
+ rte_trace_point_emit_int(handle->fd);
+ rte_trace_point_emit_int(handle->type);
+ rte_trace_point_emit_u32(handle->max_intr);
+ rte_trace_point_emit_u32(handle->nb_efd);
+ rte_trace_point_emit_ptr(cb);
+ rte_trace_point_emit_ptr(cb_arg);
+)
+RTE_TRACE_POINT(
+ rte_eal_trace_intr_callback_unregister,
+ RTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle,
+ rte_intr_callback_fn cb, void *cb_arg, int rc),
+ rte_trace_point_emit_int(rc);
+ rte_trace_point_emit_int(handle->vfio_dev_fd);
+ rte_trace_point_emit_int(handle->fd);
+ rte_trace_point_emit_int(handle->type);
+ rte_trace_point_emit_u32(handle->max_intr);
+ rte_trace_point_emit_u32(handle->nb_efd);
+ rte_trace_point_emit_ptr(cb);
+ rte_trace_point_emit_ptr(cb_arg);
+)
+RTE_TRACE_POINT(
+ rte_eal_trace_intr_enable,
+ RTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle, int rc),
+ rte_trace_point_emit_int(rc);
+ rte_trace_point_emit_int(handle->vfio_dev_fd);
+ rte_trace_point_emit_int(handle->fd);
+ rte_trace_point_emit_int(handle->type);
+ rte_trace_point_emit_u32(handle->max_intr);
+ rte_trace_point_emit_u32(handle->nb_efd);
+)
+RTE_TRACE_POINT(
+ rte_eal_trace_intr_disable,
+ RTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle, int rc),
+ rte_trace_point_emit_int(rc);
+ rte_trace_point_emit_int(handle->vfio_dev_fd);
+ rte_trace_point_emit_int(handle->fd);
+ rte_trace_point_emit_int(handle->type);
+ rte_trace_point_emit_u32(handle->max_intr);
+ rte_trace_point_emit_u32(handle->nb_efd);
+)
#ifdef __cplusplus
}
diff --git a/lib/librte_eal/linux/eal_interrupts.c b/lib/librte_eal/linux/eal_interrupts.c
index 3893e4065..2034c38a8 100644
--- a/lib/librte_eal/linux/eal_interrupts.c
+++ b/lib/librte_eal/linux/eal_interrupts.c
@@ -34,6 +34,7 @@
#include <rte_spinlock.h>
#include <rte_pause.h>
#include <rte_vfio.h>
+#include <rte_eal_trace.h>
#include "eal_private.h"
#include "eal_vfio.h"
@@ -539,8 +540,9 @@ rte_intr_callback_register(const struct rte_intr_handle *intr_handle,
*/
if (wake_thread)
if (write(intr_pipe.writefd, "1", 1) < 0)
- return -EPIPE;
+ ret = -EPIPE;
+ rte_eal_trace_intr_callback_register(intr_handle, cb, cb_arg, ret);
return ret;
}
@@ -656,63 +658,74 @@ rte_intr_callback_unregister(const struct rte_intr_handle *intr_handle,
ret = -EPIPE;
}
+ rte_eal_trace_intr_callback_unregister(intr_handle, cb_fn,
+ cb_arg, ret);
return ret;
}
int
rte_intr_enable(const struct rte_intr_handle *intr_handle)
{
- if (intr_handle && intr_handle->type == RTE_INTR_HANDLE_VDEV)
- return 0;
+ int rc = 0;
- if (!intr_handle || intr_handle->fd < 0 || intr_handle->uio_cfg_fd < 0)
- return -1;
+ if (intr_handle && intr_handle->type == RTE_INTR_HANDLE_VDEV) {
+ rc = 0; goto out;
+ }
+
+ if (!intr_handle || intr_handle->fd < 0 ||
+ intr_handle->uio_cfg_fd < 0) {
+ rc = -1; goto out;
+ }
switch (intr_handle->type){
/* write to the uio fd to enable the interrupt */
case RTE_INTR_HANDLE_UIO:
if (uio_intr_enable(intr_handle))
- return -1;
+ rc = -1;
break;
case RTE_INTR_HANDLE_UIO_INTX:
if (uio_intx_intr_enable(intr_handle))
- return -1;
+ rc = -1;
break;
/* not used at this moment */
case RTE_INTR_HANDLE_ALARM:
- return -1;
+ rc = -1;
+ break;
#ifdef VFIO_PRESENT
case RTE_INTR_HANDLE_VFIO_MSIX:
if (vfio_enable_msix(intr_handle))
- return -1;
+ rc = -1;
break;
case RTE_INTR_HANDLE_VFIO_MSI:
if (vfio_enable_msi(intr_handle))
- return -1;
+ rc = -1;
break;
case RTE_INTR_HANDLE_VFIO_LEGACY:
if (vfio_enable_intx(intr_handle))
- return -1;
+ rc = -1;
break;
#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
case RTE_INTR_HANDLE_VFIO_REQ:
if (vfio_enable_req(intr_handle))
- return -1;
+ rc = -1;
break;
#endif
#endif
/* not used at this moment */
case RTE_INTR_HANDLE_DEV_EVENT:
- return -1;
+ rc = -1;
+ break;
/* unknown handle type */
default:
RTE_LOG(ERR, EAL,
"Unknown handle type of fd %d\n",
intr_handle->fd);
- return -1;
+ rc = -1;
+ break;
}
-
- return 0;
+out:
+ rte_eal_trace_intr_enable(intr_handle, rc);
+ return rc;
}
/**
@@ -778,57 +791,66 @@ rte_intr_ack(const struct rte_intr_handle *intr_handle)
int
rte_intr_disable(const struct rte_intr_handle *intr_handle)
{
- if (intr_handle && intr_handle->type == RTE_INTR_HANDLE_VDEV)
- return 0;
+ int rc = 0;
- if (!intr_handle || intr_handle->fd < 0 || intr_handle->uio_cfg_fd < 0)
- return -1;
+ if (intr_handle && intr_handle->type == RTE_INTR_HANDLE_VDEV) {
+ rc = 0; goto out;
+ }
+
+ if (!intr_handle || intr_handle->fd < 0 ||
+ intr_handle->uio_cfg_fd < 0) {
+ rc = -1; goto out;
+ }
switch (intr_handle->type){
/* write to the uio fd to disable the interrupt */
case RTE_INTR_HANDLE_UIO:
if (uio_intr_disable(intr_handle))
- return -1;
+ rc = -1;
break;
case RTE_INTR_HANDLE_UIO_INTX:
if (uio_intx_intr_disable(intr_handle))
- return -1;
+ rc = -1;
break;
/* not used at this moment */
case RTE_INTR_HANDLE_ALARM:
- return -1;
+ rc = -1;
+ break;
#ifdef VFIO_PRESENT
case RTE_INTR_HANDLE_VFIO_MSIX:
if (vfio_disable_msix(intr_handle))
- return -1;
+ rc = -1;
break;
case RTE_INTR_HANDLE_VFIO_MSI:
if (vfio_disable_msi(intr_handle))
- return -1;
+ rc = -1;
break;
case RTE_INTR_HANDLE_VFIO_LEGACY:
if (vfio_disable_intx(intr_handle))
- return -1;
+ rc = -1;
break;
#ifdef HAVE_VFIO_DEV_REQ_INTERFACE
case RTE_INTR_HANDLE_VFIO_REQ:
if (vfio_disable_req(intr_handle))
- return -1;
+ rc = -1;
break;
#endif
#endif
/* not used at this moment */
case RTE_INTR_HANDLE_DEV_EVENT:
- return -1;
+ rc = -1;
+ break;
/* unknown handle type */
default:
RTE_LOG(ERR, EAL,
"Unknown handle type of fd %d\n",
intr_handle->fd);
- return -1;
+ rc = -1;
+ break;
}
-
- return 0;
+out:
+ rte_eal_trace_intr_disable(intr_handle, rc);
+ return rc;
}
static int
diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map
index 83fb686f4..fe0c5cd31 100644
--- a/lib/librte_eal/rte_eal_version.map
+++ b/lib/librte_eal/rte_eal_version.map
@@ -357,31 +357,35 @@ EXPERIMENTAL {
rte_trace_regexp;
rte_trace_save;
- __rte_trace_lib_eal_alarm_cancel;
- __rte_trace_lib_eal_alarm_set;
- __rte_trace_lib_eal_generic_double;
- __rte_trace_lib_eal_generic_float;
- __rte_trace_lib_eal_generic_func;
- __rte_trace_lib_eal_generic_i16;
- __rte_trace_lib_eal_generic_i32;
- __rte_trace_lib_eal_generic_i64;
- __rte_trace_lib_eal_generic_i8;
- __rte_trace_lib_eal_generic_int;
- __rte_trace_lib_eal_generic_long;
- __rte_trace_lib_eal_generic_ptr;
- __rte_trace_lib_eal_generic_str;
- __rte_trace_lib_eal_generic_u16;
- __rte_trace_lib_eal_generic_u32;
- __rte_trace_lib_eal_generic_u64;
- __rte_trace_lib_eal_generic_u8;
- __rte_trace_lib_eal_generic_void;
- __rte_trace_lib_eal_mem_free;
- __rte_trace_lib_eal_mem_malloc;
- __rte_trace_lib_eal_mem_realloc;
- __rte_trace_lib_eal_mem_zmalloc;
- __rte_trace_lib_eal_memzone_free;
- __rte_trace_lib_eal_memzone_lookup;
- __rte_trace_lib_eal_memzone_reserve;
- __rte_trace_lib_eal_thread_lcore_ready;
- __rte_trace_lib_eal_thread_remote_launch;
+ __rte_eal_trace_alarm_cancel;
+ __rte_eal_trace_alarm_set;
+ __rte_eal_trace_generic_double;
+ __rte_eal_trace_generic_float;
+ __rte_eal_trace_generic_func;
+ __rte_eal_trace_generic_i16;
+ __rte_eal_trace_generic_i32;
+ __rte_eal_trace_generic_i64;
+ __rte_eal_trace_generic_i8;
+ __rte_eal_trace_generic_int;
+ __rte_eal_trace_generic_long;
+ __rte_eal_trace_generic_ptr;
+ __rte_eal_trace_generic_str;
+ __rte_eal_trace_generic_u16;
+ __rte_eal_trace_generic_u32;
+ __rte_eal_trace_generic_u64;
+ __rte_eal_trace_generic_u8;
+ __rte_eal_trace_generic_void;
+ __rte_eal_trace_intr_callback_register;
+ __rte_eal_trace_intr_callback_unregister;
+ __rte_eal_trace_intr_enable;
+ __rte_eal_trace_intr_disable;
+ __rte_eal_trace_mem_free;
+ __rte_eal_trace_mem_malloc;
+ __rte_eal_trace_mem_realloc;
+ __rte_eal_trace_mem_zmalloc;
+ __rte_eal_trace_memzone_free;
+ __rte_eal_trace_memzone_lookup;
+ __rte_eal_trace_memzone_reserve;
+ __rte_eal_trace_thread_lcore_ready;
+ __rte_eal_trace_thread_remote_launch;
};
--
2.25.1