From: David Marchand <david.marchand@redhat.com> To: hkalra@marvell.com, dev@dpdk.org Cc: dmitry.kozliuk@gmail.com, rasland@nvidia.com, thomas@monjalon.net Subject: [dpdk-dev] [PATCH v8 8/9] interrupts: rename device specific file descriptor Date: Mon, 25 Oct 2021 16:27:11 +0200 Message-ID: <20211025142712.1273-9-david.marchand@redhat.com> (raw) In-Reply-To: <20211025142712.1273-1-david.marchand@redhat.com> From: Harman Kalra <hkalra@marvell.com> VFIO/UIO are mutually exclusive, storing file descriptor in a single field is enough. Signed-off-by: Harman Kalra <hkalra@marvell.com> Signed-off-by: David Marchand <david.marchand@redhat.com> --- Changes since v5: - split from patch5, --- lib/eal/common/eal_common_interrupts.c | 6 +++--- lib/eal/common/eal_interrupts.h | 8 +------- lib/eal/include/rte_eal_trace.h | 8 ++++---- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/lib/eal/common/eal_common_interrupts.c b/lib/eal/common/eal_common_interrupts.c index 5886376d84..2146b933bb 100644 --- a/lib/eal/common/eal_common_interrupts.c +++ b/lib/eal/common/eal_common_interrupts.c @@ -72,7 +72,7 @@ struct rte_intr_handle *rte_intr_instance_dup(const struct rte_intr_handle *src) intr_handle = rte_intr_instance_alloc(src->alloc_flags); intr_handle->fd = src->fd; - intr_handle->vfio_dev_fd = src->vfio_dev_fd; + intr_handle->dev_fd = src->dev_fd; intr_handle->type = src->type; intr_handle->max_intr = src->max_intr; intr_handle->nb_efd = src->nb_efd; @@ -139,7 +139,7 @@ int rte_intr_dev_fd_set(struct rte_intr_handle *intr_handle, int fd) { CHECK_VALID_INTR_HANDLE(intr_handle); - intr_handle->vfio_dev_fd = fd; + intr_handle->dev_fd = fd; return 0; fail: @@ -150,7 +150,7 @@ int rte_intr_dev_fd_get(const struct rte_intr_handle *intr_handle) { CHECK_VALID_INTR_HANDLE(intr_handle); - return intr_handle->vfio_dev_fd; + return intr_handle->dev_fd; fail: return -1; } diff --git a/lib/eal/common/eal_interrupts.h b/lib/eal/common/eal_interrupts.h index beacc04b62..1a4e5573b2 100644 --- a/lib/eal/common/eal_interrupts.h +++ b/lib/eal/common/eal_interrupts.h @@ -9,13 +9,7 @@ struct rte_intr_handle { RTE_STD_C11 union { struct { - RTE_STD_C11 - union { - /** VFIO device file descriptor */ - int vfio_dev_fd; - /** UIO cfg file desc for uio_pci_generic */ - int uio_cfg_fd; - }; + int dev_fd; /**< VFIO/UIO cfg device file descriptor */ int fd; /**< interrupt event file descriptor */ }; void *windows_handle; /**< device driver handle */ diff --git a/lib/eal/include/rte_eal_trace.h b/lib/eal/include/rte_eal_trace.h index af7b2d0bf0..5ef4398230 100644 --- a/lib/eal/include/rte_eal_trace.h +++ b/lib/eal/include/rte_eal_trace.h @@ -151,7 +151,7 @@ RTE_TRACE_POINT( 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->dev_fd); rte_trace_point_emit_int(handle->fd); rte_trace_point_emit_int(handle->type); rte_trace_point_emit_u32(handle->max_intr); @@ -164,7 +164,7 @@ RTE_TRACE_POINT( 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->dev_fd); rte_trace_point_emit_int(handle->fd); rte_trace_point_emit_int(handle->type); rte_trace_point_emit_u32(handle->max_intr); @@ -176,7 +176,7 @@ 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->dev_fd); rte_trace_point_emit_int(handle->fd); rte_trace_point_emit_int(handle->type); rte_trace_point_emit_u32(handle->max_intr); @@ -186,7 +186,7 @@ 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->dev_fd); rte_trace_point_emit_int(handle->fd); rte_trace_point_emit_int(handle->type); rte_trace_point_emit_u32(handle->max_intr); -- 2.23.0
next prev parent reply other threads:[~2021-10-25 14:28 UTC|newest] Thread overview: 152+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-08-26 14:57 [dpdk-dev] [RFC 0/7] make rte_intr_handle internal Harman Kalra 2021-08-26 14:57 ` [dpdk-dev] [RFC 1/7] eal: interrupt handle API prototypes Harman Kalra 2021-08-31 15:52 ` Kinsella, Ray 2021-08-26 14:57 ` [dpdk-dev] [RFC 2/7] eal/interrupts: implement get set APIs Harman Kalra 2021-08-31 15:53 ` Kinsella, Ray 2021-08-26 14:57 ` [dpdk-dev] [RFC 3/7] eal/interrupts: avoid direct access to interrupt handle Harman Kalra 2021-08-26 14:57 ` [dpdk-dev] [RFC 4/7] test/interrupt: apply get set interrupt handle APIs Harman Kalra 2021-08-26 14:57 ` [dpdk-dev] [RFC 5/7] drivers: remove direct access to interrupt handle fields Harman Kalra 2021-08-26 14:57 ` [dpdk-dev] [RFC 6/7] eal/interrupts: make interrupt handle structure opaque Harman Kalra 2021-08-26 14:57 ` [dpdk-dev] [RFC 7/7] eal/alarm: introduce alarm fini routine Harman Kalra 2021-09-03 12:40 ` [dpdk-dev] [PATCH v1 0/7] make rte_intr_handle internal Harman Kalra 2021-09-03 12:40 ` [dpdk-dev] [PATCH v1 1/7] eal: interrupt handle API prototypes Harman Kalra 2021-09-03 12:40 ` [dpdk-dev] [PATCH v1 2/7] eal/interrupts: implement get set APIs Harman Kalra 2021-09-28 15:46 ` David Marchand 2021-10-04 8:51 ` [dpdk-dev] [EXT] " Harman Kalra 2021-10-04 9:57 ` David Marchand 2021-10-12 15:22 ` Thomas Monjalon 2021-10-13 17:54 ` Harman Kalra 2021-10-13 17:57 ` Harman Kalra 2021-10-13 18:52 ` Thomas Monjalon 2021-10-14 8:22 ` Thomas Monjalon 2021-10-14 9:31 ` Harman Kalra 2021-10-14 9:37 ` David Marchand 2021-10-14 9:41 ` Thomas Monjalon 2021-10-14 10:31 ` Harman Kalra 2021-10-14 10:35 ` Thomas Monjalon 2021-10-14 10:44 ` Harman Kalra 2021-10-14 12:04 ` Thomas Monjalon 2021-10-14 10:25 ` Dmitry Kozlyuk 2021-10-03 18:05 ` [dpdk-dev] " Dmitry Kozlyuk 2021-10-04 10:37 ` [dpdk-dev] [EXT] " Harman Kalra 2021-10-04 11:18 ` Dmitry Kozlyuk 2021-10-04 14:03 ` Harman Kalra 2021-09-03 12:40 ` [dpdk-dev] [PATCH v1 3/7] eal/interrupts: avoid direct access to interrupt handle Harman Kalra 2021-09-03 12:40 ` [dpdk-dev] [PATCH v1 4/7] test/interrupt: apply get set interrupt handle APIs Harman Kalra 2021-09-03 12:41 ` [dpdk-dev] [PATCH v1 5/7] drivers: remove direct access to interrupt handle fields Harman Kalra 2021-09-03 12:41 ` [dpdk-dev] [PATCH v1 6/7] eal/interrupts: make interrupt handle structure opaque Harman Kalra 2021-10-03 18:16 ` Dmitry Kozlyuk 2021-10-04 14:09 ` [dpdk-dev] [EXT] " Harman Kalra 2021-09-03 12:41 ` [dpdk-dev] [PATCH v1 7/7] eal/alarm: introduce alarm fini routine Harman Kalra 2021-09-15 14:13 ` [dpdk-dev] [PATCH v1 0/7] make rte_intr_handle internal Harman Kalra 2021-09-23 8:20 ` David Marchand 2021-10-05 12:14 ` [dpdk-dev] [PATCH v2 0/6] " Harman Kalra 2021-10-05 12:14 ` [dpdk-dev] [PATCH v2 1/6] eal/interrupts: implement get set APIs Harman Kalra 2021-10-14 0:58 ` Dmitry Kozlyuk 2021-10-14 17:15 ` [dpdk-dev] [EXT] " Harman Kalra 2021-10-14 17:53 ` Dmitry Kozlyuk 2021-10-15 7:53 ` Thomas Monjalon 2021-10-14 7:31 ` [dpdk-dev] " David Marchand 2021-10-05 12:14 ` [dpdk-dev] [PATCH v2 2/6] eal/interrupts: avoid direct access to interrupt handle Harman Kalra 2021-10-14 0:59 ` Dmitry Kozlyuk 2021-10-14 17:31 ` [dpdk-dev] [EXT] " Harman Kalra 2021-10-14 17:53 ` Dmitry Kozlyuk 2021-10-05 12:14 ` [dpdk-dev] [PATCH v2 3/6] test/interrupt: apply get set interrupt handle APIs Harman Kalra 2021-10-05 12:15 ` [dpdk-dev] [PATCH v2 4/6] drivers: remove direct access to interrupt handle Harman Kalra 2021-10-05 12:15 ` [dpdk-dev] [PATCH v2 5/6] eal/interrupts: make interrupt handle structure opaque Harman Kalra 2021-10-05 12:15 ` [dpdk-dev] [PATCH v2 6/6] eal/alarm: introduce alarm fini routine Harman Kalra 2021-10-05 16:07 ` [dpdk-dev] [RFC 0/7] make rte_intr_handle internal Stephen Hemminger 2021-10-07 10:57 ` [dpdk-dev] [EXT] " Harman Kalra 2021-10-18 19:37 ` [dpdk-dev] [PATCH v3 " Harman Kalra 2021-10-18 19:37 ` [dpdk-dev] [PATCH v3 1/7] malloc: introduce malloc is ready API Harman Kalra 2021-10-19 15:53 ` Thomas Monjalon 2021-10-18 19:37 ` [dpdk-dev] [PATCH v3 2/7] eal/interrupts: implement get set APIs Harman Kalra 2021-10-18 22:07 ` Dmitry Kozlyuk 2021-10-19 8:50 ` [dpdk-dev] [EXT] " Harman Kalra 2021-10-19 18:44 ` Harman Kalra 2021-10-18 22:56 ` [dpdk-dev] " Stephen Hemminger 2021-10-19 8:32 ` [dpdk-dev] [EXT] " Harman Kalra 2021-10-19 15:58 ` Thomas Monjalon 2021-10-20 15:30 ` Dmitry Kozlyuk 2021-10-21 9:16 ` Harman Kalra 2021-10-21 12:33 ` Dmitry Kozlyuk 2021-10-21 13:32 ` David Marchand 2021-10-21 16:05 ` Harman Kalra 2021-10-18 19:37 ` [dpdk-dev] [PATCH v3 3/7] eal/interrupts: avoid direct access to interrupt handle Harman Kalra 2021-10-18 19:37 ` [dpdk-dev] [PATCH v3 4/7] test/interrupt: apply get set interrupt handle APIs Harman Kalra 2021-10-18 19:37 ` [dpdk-dev] [PATCH v3 5/7] drivers: remove direct access to interrupt handle Harman Kalra 2021-10-18 19:37 ` [dpdk-dev] [PATCH v3 6/7] eal/interrupts: make interrupt handle structure opaque Harman Kalra 2021-10-18 19:37 ` [dpdk-dev] [PATCH v3 7/7] eal/alarm: introduce alarm fini routine Harman Kalra 2021-10-19 18:35 ` [dpdk-dev] [PATCH v4 0/7] make rte_intr_handle internal Harman Kalra 2021-10-19 18:35 ` [dpdk-dev] [PATCH v4 1/7] malloc: introduce malloc is ready API Harman Kalra 2021-10-19 22:01 ` Dmitry Kozlyuk 2021-10-19 22:04 ` Dmitry Kozlyuk 2021-10-20 9:01 ` [dpdk-dev] [EXT] " Harman Kalra 2021-10-19 18:35 ` [dpdk-dev] [PATCH v4 2/7] eal/interrupts: implement get set APIs Harman Kalra 2021-10-20 6:14 ` David Marchand 2021-10-20 14:29 ` Dmitry Kozlyuk 2021-10-20 16:15 ` Dmitry Kozlyuk 2021-10-19 18:35 ` [dpdk-dev] [PATCH v4 3/7] eal/interrupts: avoid direct access to interrupt handle Harman Kalra 2021-10-19 21:27 ` Dmitry Kozlyuk 2021-10-20 9:25 ` [dpdk-dev] [EXT] " Harman Kalra 2021-10-20 9:52 ` Dmitry Kozlyuk 2021-10-19 18:35 ` [dpdk-dev] [PATCH v4 4/7] test/interrupt: apply get set interrupt handle APIs Harman Kalra 2021-10-19 18:35 ` [dpdk-dev] [PATCH v4 5/7] drivers: remove direct access to interrupt handle Harman Kalra 2021-10-20 1:57 ` Hyong Youb Kim (hyonkim) 2021-10-19 18:35 ` [dpdk-dev] [PATCH v4 6/7] eal/interrupts: make interrupt handle structure opaque Harman Kalra 2021-10-19 18:35 ` [dpdk-dev] [PATCH v4 7/7] eal/alarm: introduce alarm fini routine Harman Kalra 2021-10-19 21:39 ` Dmitry Kozlyuk 2021-10-22 20:49 ` [dpdk-dev] [PATCH v5 0/6] make rte_intr_handle internal Harman Kalra 2021-10-22 20:49 ` [dpdk-dev] [PATCH v5 1/6] eal/interrupts: implement get set APIs Harman Kalra 2021-10-22 23:33 ` Dmitry Kozlyuk 2021-10-22 20:49 ` [dpdk-dev] [PATCH v5 2/6] eal/interrupts: avoid direct access to interrupt handle Harman Kalra 2021-10-22 23:33 ` Dmitry Kozlyuk 2021-10-22 20:49 ` [dpdk-dev] [PATCH v5 3/6] test/interrupt: apply get set interrupt handle APIs Harman Kalra 2021-10-22 20:49 ` [dpdk-dev] [PATCH v5 4/6] drivers: remove direct access to interrupt handle Harman Kalra 2021-10-22 20:49 ` [dpdk-dev] [PATCH v5 5/6] eal/interrupts: make interrupt handle structure opaque Harman Kalra 2021-10-22 23:33 ` Dmitry Kozlyuk 2021-10-22 20:49 ` [dpdk-dev] [PATCH v5 6/6] eal/alarm: introduce alarm fini routine Harman Kalra 2021-10-22 23:33 ` Dmitry Kozlyuk 2021-10-22 23:37 ` Dmitry Kozlyuk 2021-10-24 20:04 ` [dpdk-dev] [PATCH v6 0/9] make rte_intr_handle internal David Marchand 2021-10-24 20:04 ` [dpdk-dev] [PATCH v6 1/9] interrupts: add allocator and accessors David Marchand 2021-10-24 20:04 ` [dpdk-dev] [PATCH v6 2/9] interrupts: remove direct access to interrupt handle David Marchand 2021-10-25 6:57 ` David Marchand 2021-10-24 20:04 ` [dpdk-dev] [PATCH v6 3/9] test/interrupts: " David Marchand 2021-10-24 20:04 ` [dpdk-dev] [PATCH v6 4/9] alarm: " David Marchand 2021-10-25 10:49 ` Dmitry Kozlyuk 2021-10-25 11:09 ` David Marchand 2021-10-24 20:04 ` [dpdk-dev] [PATCH v6 5/9] lib: " David Marchand 2021-10-24 20:04 ` [dpdk-dev] [PATCH v6 6/9] drivers: " David Marchand 2021-10-24 20:04 ` [dpdk-dev] [PATCH v6 7/9] interrupts: make interrupt handle structure opaque David Marchand 2021-10-24 20:04 ` [dpdk-dev] [PATCH v6 8/9] interrupts: rename device specific file descriptor David Marchand 2021-10-24 20:04 ` [dpdk-dev] [PATCH v6 9/9] interrupts: extend event list David Marchand 2021-10-25 10:49 ` Dmitry Kozlyuk 2021-10-25 11:11 ` David Marchand 2021-10-25 13:04 ` [dpdk-dev] [PATCH v5 0/6] make rte_intr_handle internal Raslan Darawsheh 2021-10-25 13:09 ` David Marchand 2021-10-25 13:34 ` [dpdk-dev] [PATCH v7 0/9] " David Marchand 2021-10-25 13:34 ` [dpdk-dev] [PATCH v7 1/9] interrupts: add allocator and accessors David Marchand 2021-10-25 13:34 ` [dpdk-dev] [PATCH v7 2/9] interrupts: remove direct access to interrupt handle David Marchand 2021-10-25 13:34 ` [dpdk-dev] [PATCH v7 3/9] test/interrupts: " David Marchand 2021-10-25 13:34 ` [dpdk-dev] [PATCH v7 4/9] alarm: " David Marchand 2021-10-25 13:34 ` [dpdk-dev] [PATCH v7 5/9] lib: " David Marchand 2021-10-28 6:14 ` Jiang, YuX 2021-10-25 13:34 ` [dpdk-dev] [PATCH v7 6/9] drivers: " David Marchand 2021-10-25 13:34 ` [dpdk-dev] [PATCH v7 7/9] interrupts: make interrupt handle structure opaque David Marchand 2021-10-25 13:34 ` [dpdk-dev] [PATCH v7 8/9] interrupts: rename device specific file descriptor David Marchand 2021-10-25 13:34 ` [dpdk-dev] [PATCH v7 9/9] interrupts: extend event list David Marchand 2021-10-25 14:27 ` [dpdk-dev] [PATCH v8 0/9] make rte_intr_handle internal David Marchand 2021-10-25 14:27 ` [dpdk-dev] [PATCH v8 1/9] interrupts: add allocator and accessors David Marchand 2021-10-25 14:27 ` [dpdk-dev] [PATCH v8 2/9] interrupts: remove direct access to interrupt handle David Marchand 2021-10-25 14:27 ` [dpdk-dev] [PATCH v8 3/9] test/interrupts: " David Marchand 2021-10-25 14:27 ` [dpdk-dev] [PATCH v8 4/9] alarm: " David Marchand 2021-10-25 14:27 ` [dpdk-dev] [PATCH v8 5/9] lib: " David Marchand 2021-10-25 14:27 ` [dpdk-dev] [PATCH v8 6/9] drivers: " David Marchand 2021-10-25 14:27 ` [dpdk-dev] [PATCH v8 7/9] interrupts: make interrupt handle structure opaque David Marchand 2021-10-25 14:27 ` David Marchand [this message] 2021-10-25 14:27 ` [dpdk-dev] [PATCH v8 9/9] interrupts: extend event list David Marchand 2021-10-28 15:58 ` Ji, Kai 2021-10-28 17:16 ` David Marchand 2021-10-25 14:32 ` [dpdk-dev] [PATCH v8 0/9] make rte_intr_handle internal Raslan Darawsheh 2021-10-25 19:24 ` David Marchand
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20211025142712.1273-9-david.marchand@redhat.com \ --to=david.marchand@redhat.com \ --cc=dev@dpdk.org \ --cc=dmitry.kozliuk@gmail.com \ --cc=hkalra@marvell.com \ --cc=rasland@nvidia.com \ --cc=thomas@monjalon.net \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
DPDK patches and discussions This inbox may be cloned and mirrored by anyone: git clone --mirror http://inbox.dpdk.org/dev/0 dev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 dev dev/ http://inbox.dpdk.org/dev \ dev@dpdk.org public-inbox-index dev Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.dev AGPL code for this site: git clone https://public-inbox.org/public-inbox.git