Interrupt mode PMD
PATCH v13 3/14 eal/linux: add API to set rx interrupt event monitor
In reply to Cunming LiangThe patch adds 'rte_intr_rx_ctl' to add or delete interrupt vector events monitor on specified epoll instance.
---
v13 changes
- version map cleanup for v2.1
v12 changes:
- fix awkward line split in using RTE_LOG
v10 changes:
- add RTE_INTR_HANDLE_UIO_INTX for uio_pci_generic
v8 changes
- fix EWOULDBLOCK and EINTR processing
- add event status check
v7 changes
- rename rte_intr_rx_set to rte_intr_rx_ctl.
- rte_intr_rx_ctl uses rte_epoll_ctl to register epoll event instance.
- the intr rx event instance includes a intr process callback.
v6 changes
- split rte_intr_wait_rx_pkt into two function, wait and set.
- rewrite rte_intr_rx_wait/rte_intr_rx_set to remove queue visibility on eal.
- rte_intr_rx_wait to support multiplexing.
- allow epfd as input to support flexible event fd combination.
lib/librte_eal/linuxapp/eal/eal_interrupts.c | 101 +++++++++++++++++++++ .../linuxapp/eal/include/exec-env/rte_interrupts.h | 20 ++++ lib/librte_eal/linuxapp/eal/rte_eal_version.map | 1 + 3 files changed, 122 insertions(+)
lib/librte_eal/linuxapp/eal/eal_interrupts.c +101 -0
@@ -897,6 +897,49 @@ rte_eal_intr_init(void)return -ret; } +static void +eal_intr_proc_rxtx_intr (int fd,const struct rte_intr_handle *intr_handle) +{ +union rte_intr_read_buffer buf; +int bytes_read =1 ; + +switch (intr_handle->type) { +case RTE_INTR_HANDLE_UIO : +case RTE_INTR_HANDLE_UIO_INTX : + bytes_read =sizeof (buf.uio_intr_count); +break ; +#ifdef VFIO_PRESENT +case RTE_INTR_HANDLE_VFIO_MSIX : +case RTE_INTR_HANDLE_VFIO_MSI : +case RTE_INTR_HANDLE_VFIO_LEGACY : + bytes_read =sizeof (buf.vfio_intr_count); +break ; +#endif +default : + bytes_read =1 ; +RTE_LOG (INFO ,EAL ,"unexpected intr type\n" ); +break ; + } + +/** +* read out to clear the ready-to-be-read flag +* for epoll_wait. +*/ +do { + bytes_read =read (fd, &buf, bytes_read); +if (bytes_read <0 ) { +if (errno ==EINTR || errno ==EWOULDBLOCK || + errno ==EAGAIN ) +continue ; +RTE_LOG (ERR ,EAL , +"Error reading from fd %d: %s\n" , + fd,strerror (errno)); + }else if (bytes_read ==0 ) +RTE_LOG (ERR ,EAL ,"Read nothing from fd %d\n" , fd); +return ; + }while (1 ); +} +static int eal_epoll_process_event (struct epoll_event *evs,unsigned int n,struct rte_epoll_event *events)
@@ -1033,3 +1076,61 @@ rte_epoll_ctl(int epfd, int op, int fd,return 0 ; } + +int +rte_intr_rx_ctl (struct rte_intr_handle *intr_handle,int epfd, +int op,unsigned int vec,void *data) +{ +struct rte_epoll_event *rev; +struct rte_epoll_data *epdata; +int epfd_op; +int rc =0 ; + +if (!intr_handle || intr_handle->nb_efd ==0 || + vec >= intr_handle->nb_efd) { +RTE_LOG (ERR ,EAL ,"Wrong intr vector number.\n" ); +return -EPERM ; + } + +switch (op) { +case RTE_INTR_EVENT_ADD : + epfd_op =EPOLL_CTL_ADD ; + rev = &intr_handle->elist[vec]; +if (rev->status !=RTE_EPOLL_INVALID ) { +RTE_LOG (INFO ,EAL ,"Event already been added.\n" ); +return -EEXIST ; + } + +/* attach to intr vector fd */ + epdata = &rev->epdata; + epdata->event =EPOLLIN |EPOLLPRI |EPOLLET ; + epdata->data = data; + epdata->cb_fun = (rte_intr_event_cb_t )eal_intr_proc_rxtx_intr; + epdata->cb_arg = (void *)intr_handle; + rc =rte_epoll_ctl (epfd, epfd_op, intr_handle->efds[vec], rev); +if (!rc) +RTE_LOG (DEBUG ,EAL , +"efd %d associated with vec %d added on epfd %d" +"\n" , rev->fd, vec, epfd); +else + rc = -EPERM ; +break ; +case RTE_INTR_EVENT_DEL : + epfd_op =EPOLL_CTL_DEL ; + rev = &intr_handle->elist[vec]; +if (rev->status ==RTE_EPOLL_INVALID ) { +RTE_LOG (INFO ,EAL ,"Event does not exist.\n" ); +return -EPERM ; + } + + rc =rte_epoll_ctl (rev->epfd, epfd_op, rev->fd, rev); +if (rc) + rc = -EPERM ; +break ; +default : +RTE_LOG (ERR ,EAL ,"event op type mismatch\n" ); + rc = -EPERM ; + } + +return rc; +}
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +20 -0
@@ -146,4 +146,24 @@ rte_epoll_ctl(int epfd, int op, int fd,int rte_intr_tls_epfd (void ); +/** +* @param intr_handle +* Pointer to the interrupt handle. +* @param epfd +* Epoll instance fd which the intr vector associated to. +* @param op +* The operation be performed for the vector. +* Operation type of {ADD, DEL}. +* @param vec +* RX intr vector number added to the epoll instance wait list. +* @param data +* User raw data. +* @return +* - On success, zero. +* - On failure, a negative value. +*/ +int +rte_intr_rx_ctl (struct rte_intr_handle *intr_handle, +int epfd,int op,unsigned int vec,void *data); +#endif /* _RTE_LINUXAPP_INTERRUPTS_H_ */
lib/librte_eal/linuxapp/eal/rte_eal_version.map +1 -0
@@ -104,6 +104,7 @@ DPDK_2.1 { rte_epoll_ctl; rte_epoll_wait; + rte_intr_rx_ctl; rte_intr_tls_epfd; local: *;
Signature · 1 line
1.8.1.4
PATCH v13 4/14 eal/linux: fix comments typo on vfio msi
In reply to Cunming Liang--- lib/librte_eal/linuxapp/eal/eal_interrupts.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
lib/librte_eal/linuxapp/eal/eal_interrupts.c +2 -2
@@ -219,7 +219,7 @@ vfio_disable_intx(struct rte_intr_handle *intr_handle) {return 0 ; } -/* enable MSI-X interrupts */ +/* enable MSI interrupts */ static int vfio_enable_msi (struct rte_intr_handle *intr_handle) {int len, ret;
@@ -265,7 +265,7 @@ vfio_enable_msi(struct rte_intr_handle *intr_handle) {return 0 ; } -/* disable MSI-X interrupts */ +/* disable MSI interrupts */ static int vfio_disable_msi (struct rte_intr_handle *intr_handle) {struct vfio_irq_set *irq_set;
Signature · 1 line
1.8.1.4
PATCH v13 5/14 eal/linux: add interrupt vectors handling on VFIO
In reply to Cunming LiangThis patch does below:
- Create VFIO eventfds for each interrupt vector (move to next)
- Assign per interrupt vector's eventfd to VFIO by ioctl
---
v8 changes
- move eventfd creation out of the setup_interrupts to a standalone function
v7 changes
- cleanup unnecessary code change
- split event and intr operation to other patches
lib/librte_eal/linuxapp/eal/eal_interrupts.c | 50 ++++++++-------------------- 1 file changed, 13 insertions(+), 37 deletions(-)
lib/librte_eal/linuxapp/eal/eal_interrupts.c +13 -37
@@ -128,6 +128,9 @@ static pthread_t intr_thread;#ifdef VFIO_PRESENT #define IRQ_SET_BUF_LEN (sizeof(struct vfio_irq_set) + sizeof(int)) +/* irq set buffer length for queue interrupts and LSC interrupt */ +#define MSIX_IRQ_SET_BUF_LEN (sizeof(struct vfio_irq_set) + \ + sizeof(int) * (RTE_MAX_RXTX_INTR_VEC_ID + 1))/* enable legacy (INTx) interrupts */ static int
@@ -245,23 +248,6 @@ vfio_enable_msi(struct rte_intr_handle *intr_handle) { intr_handle->fd);return -1 ; } - -/* manually trigger interrupt to enable it */ -memset (irq_set,0 , len); - len =sizeof (struct vfio_irq_set ); - irq_set->argsz = len; - irq_set->count =1 ; - irq_set->flags =VFIO_IRQ_SET_DATA_NONE |VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_PCI_MSI_IRQ_INDEX ; - irq_set->start =0 ; - - ret =ioctl (intr_handle->vfio_dev_fd,VFIO_DEVICE_SET_IRQS , irq_set); - -if (ret) { -RTE_LOG (ERR ,EAL ,"Error triggering MSI interrupts for fd %d\n" , - intr_handle->fd); -return -1 ; - }return 0 ; }
@@ -294,7 +280,7 @@ vfio_disable_msi(struct rte_intr_handle *intr_handle) {static int vfio_enable_msix (struct rte_intr_handle *intr_handle) {int len, ret; -char irq_set_buf[IRQ_SET_BUF_LEN ]; +char irq_set_buf[MSIX_IRQ_SET_BUF_LEN ];struct vfio_irq_set *irq_set;int *fd_ptr;
@@ -302,12 +288,18 @@ vfio_enable_msix(struct rte_intr_handle *intr_handle) { irq_set = (struct vfio_irq_set *) irq_set_buf; irq_set->argsz = len; - irq_set->count =1 ; +if (!intr_handle->max_intr) + intr_handle->max_intr =1 ; +else if (intr_handle->max_intr >RTE_MAX_RXTX_INTR_VEC_ID ) + intr_handle->max_intr =RTE_MAX_RXTX_INTR_VEC_ID +1 ; + + irq_set->count = intr_handle->max_intr; irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD |VFIO_IRQ_SET_ACTION_TRIGGER ; irq_set->index =VFIO_PCI_MSIX_IRQ_INDEX ; irq_set->start =0 ; fd_ptr = (int *) &irq_set->data; - *fd_ptr = intr_handle->fd; +memcpy (fd_ptr, intr_handle->efds,sizeof (intr_handle->efds)); + fd_ptr[intr_handle->max_intr -1 ] = intr_handle->fd; ret =ioctl (intr_handle->vfio_dev_fd,VFIO_DEVICE_SET_IRQS , irq_set);
@@ -317,22 +309,6 @@ vfio_enable_msix(struct rte_intr_handle *intr_handle) {return -1 ; } -/* manually trigger interrupt to enable it */ -memset (irq_set,0 , len); - len =sizeof (struct vfio_irq_set ); - irq_set->argsz = len; - irq_set->count =1 ; - irq_set->flags =VFIO_IRQ_SET_DATA_NONE |VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_PCI_MSIX_IRQ_INDEX ; - irq_set->start =0 ; - - ret =ioctl (intr_handle->vfio_dev_fd,VFIO_DEVICE_SET_IRQS , irq_set); - -if (ret) { -RTE_LOG (ERR ,EAL ,"Error triggering MSI-X interrupts for fd %d\n" , - intr_handle->fd); -return -1 ; - }return 0 ; }
@@ -340,7 +316,7 @@ vfio_enable_msix(struct rte_intr_handle *intr_handle) {static int vfio_disable_msix (struct rte_intr_handle *intr_handle) {struct vfio_irq_set *irq_set; -char irq_set_buf[IRQ_SET_BUF_LEN ]; +char irq_set_buf[MSIX_IRQ_SET_BUF_LEN ];int len, ret; len =sizeof (struct vfio_irq_set );
Signature · 1 line
1.8.1.4
PATCH v13 6/14 eal/linux: standalone intr event fd create support
In reply to Cunming LiangThe patch exposes intr event fd create and release for PMD.
The device driver can assign the number of event associated with interrupt vector. It also provides misc functions to check 1) allows other slowpath intr(e.g. lsc);
2) intr event on fastpath is enabled or not.
---
v13 changes
- version map cleanup for v2.1
v11 changes
- typo cleanup
lib/librte_eal/linuxapp/eal/eal_interrupts.c | 57 ++++++++++++++++++++++ .../linuxapp/eal/include/exec-env/rte_interrupts.h | 51 +++++++++++++++++++ lib/librte_eal/linuxapp/eal/rte_eal_version.map | 4 ++ 3 files changed, 112 insertions(+)
lib/librte_eal/linuxapp/eal/eal_interrupts.c +57 -0
@@ -44,6 +44,7 @@#include <sys/epoll.h> #include <sys/signalfd.h> #include <sys/ioctl.h> +#include <sys/eventfd.h> #include <rte_common.h> #include <rte_interrupts.h>
@@ -68,6 +69,7 @@#include "eal_vfio.h" #define EAL_INTR_EPOLL_WAIT_FOREVER (-1) +#define NB_OTHER_INTR 1 static RTE_DEFINE_PER_LCORE(int, _epfd) = -1; /**< epoll fd per thread */
@@ -1110,3 +1112,58 @@ rte_intr_rx_ctl(struct rte_intr_handle *intr_handle, int epfd,return rc; } + +int +rte_intr_efd_enable (struct rte_intr_handle *intr_handle,uint32_t nb_efd) +{ +uint32_t i; +int fd; +uint32_t n =RTE_MIN (nb_efd, (uint32_t )RTE_MAX_RXTX_INTR_VEC_ID ); + +if (intr_handle->type ==RTE_INTR_HANDLE_VFIO_MSIX ) { +for (i =0 ; i < n; i++) { + fd =eventfd (0 ,EFD_NONBLOCK |EFD_CLOEXEC ); +if (fd <0 ) { +RTE_LOG (ERR ,EAL , +"cannot setup eventfd," +"error %i (%s)\n" , + errno,strerror (errno)); +return -1 ; + } + intr_handle->efds[i] = fd; + } + intr_handle->nb_efd = n; + intr_handle->max_intr =NB_OTHER_INTR + n; + }else { + intr_handle->efds[0 ] = intr_handle->fd; + intr_handle->nb_efd =RTE_MIN (nb_efd,1U ); + intr_handle->max_intr =NB_OTHER_INTR ; + } + +return 0 ; +} + +void +rte_intr_efd_disable (struct rte_intr_handle *intr_handle) +{ +uint32_t i; +struct rte_epoll_event *rev; + +for (i =0 ; i < intr_handle->nb_efd; i++) { + rev = &intr_handle->elist[i]; +if (rev->status ==RTE_EPOLL_INVALID ) +continue ; +if (rte_epoll_ctl (rev->epfd,EPOLL_CTL_DEL , rev->fd, rev)) { +/* force free if the entry valid */ +eal_epoll_data_safe_free (rev); + rev->status =RTE_EPOLL_INVALID ; + } + } + +if (intr_handle->max_intr > intr_handle->nb_efd) { +for (i =0 ; i < intr_handle->nb_efd; i++) +close (intr_handle->efds[i]); + } + intr_handle->nb_efd =0 ; + intr_handle->max_intr =0 ; +}
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +51 -0
55 lines not on this page · raw message
lib/librte_eal/linuxapp/eal/rte_eal_version.map +4 -0
@@ -104,6 +104,10 @@ DPDK_2.1 { rte_epoll_ctl; rte_epoll_wait; + rte_intr_allow_others; + rte_intr_dp_is_en; + rte_intr_efd_enable; + rte_intr_efd_disable; rte_intr_rx_ctl; rte_intr_tls_epfd;
Signature · 1 line
1.8.1.4
Re: [PATCH v13 06/14] eal/linux: standalone intr event fd create support
2015-06-19 12:00, Cunming Liang:
Quoted 2 lines
+/**
+ * It enables the fastpath event fds if it's necessary.
What means fastpath here?
Quoted 2 lines
+ * It creates event fds when multi-vectors allowed,
+ * otherwise it multiplexes the single event fds.
Maybe a reference to allow multi-vectors is needed.
Quoted 12 lines
+ *
+ * @paramintr_handle
+ * Pointer to the interrupt handle.
+ * @paramnb_vec
+ * Number of interrupt vector trying to enable.
+ * @return
+ * - On success, zero.
+ * - On failure, a negative value.
+ */lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +2
-0+int +rte_intr_efd_enable (struct rte_intr_handle *intr_handle,uint32_t nb_efd);
Re: [PATCH v13 06/14] eal/linux: standalone intr event fd create support
Quoted 11 lines
-----Original Message-----
From: Thomas Monjalon [mailto:[email protected]]
Sent: Tuesday, July 14, 2015 1:02 AM
To: Liang, Cunming
Cc: [email protected]; [email protected]; [email protected]; Zhou, Danny; Wang, Liang-min; Richardson, Bruce; Liu, Yong; [email protected]
Subject: Re: [PATCH v13 06/14] eal/linux: standalone intr event fd create support
Quoted 5 lines
2015-06-19 12:00, Cunming Liang:
Quoted 2 lines
+/**
+ * It enables the fastpath event fds if it's necessary.What means fastpath here?
Here means RX/TX packet I/O interrupt, to distinguish link status interrupt which is processed in a standalone thread. Will reword the description.
Quoted 5 lines
Quoted 3 lines
+ * It creates event fds when multi-vectors allowed,
+ * otherwise it multiplexes the single event fds.Maybe a reference to allow multi-vectors is needed.
Will rework it, thanks.
Quoted 14 lines
Quoted 13 lines
+ *
+ * @paramintr_handle
+ * Pointer to the interrupt handle.
+ * @paramnb_vec
+ * Number of interrupt vector trying to enable.
+ * @return
+ * - On success, zero.
+ * - On failure, a negative value.
+ */lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +2
-0+int +rte_intr_efd_enable (struct rte_intr_handle *intr_handle,uint32_t nb_efd);
PATCH v13 7/14 eal/linux: fix lsc read error in uio_pci_generic
In reply to Cunming LiangThe new UIO generic handle type was introduced by patch.
http://dpdk.org/ml/archives/dev/2015-April/017008.html
When using uio_pci_generic and turning on lsc interrupt, it complains fd read error. The root cause is the 'count' size of read is not correct.
--- lib/librte_eal/linuxapp/eal/eal_interrupts.c | 1 + 1 file changed, 1 insertion(+)
lib/librte_eal/linuxapp/eal/eal_interrupts.c +1 -0
@@ -678,6 +678,7 @@ eal_intr_process_interrupts(struct epoll_event *events, int nfds)/* set the length to be read dor different handle type */ switch (src->intr_handle.type) {case RTE_INTR_HANDLE_UIO : +case RTE_INTR_HANDLE_UIO_INTX : bytes_read =sizeof (buf.uio_intr_count);break ;case RTE_INTR_HANDLE_ALARM :
Signature · 1 line
1.8.1.4
PATCH v13 8/14 eal/bsd: dummy for new intr definition
In reply to Cunming LiangTo make bsd compiling happy with new intr changes.
---
v13 changes
- version map cleanup for v2.1
v12 changes
- fix unused variables compiling warning
v8 changes
- add stub for new function
v7 changes
- remove stub 'linux only' function from source file
lib/librte_eal/bsdapp/eal/eal_interrupts.c | 30 +++++++++ .../bsdapp/eal/include/exec-env/rte_interrupts.h | 78 ++++++++++++++++++++++ lib/librte_eal/bsdapp/eal/rte_eal_version.map | 12 ++++ 3 files changed, 120 insertions(+)
lib/librte_eal/bsdapp/eal/eal_interrupts.c +30 -0
@@ -68,3 +68,33 @@ rte_eal_intr_init(void) {return 0 ; } + +int +rte_intr_rx_ctl (struct rte_intr_handle *intr_handle, +int epfd,int op,unsigned int vec,void *data) +{ +RTE_SET_USED (intr_handle); +RTE_SET_USED (epfd); +RTE_SET_USED (op); +RTE_SET_USED (vec); +RTE_SET_USED (data); + +return -ENOTSUP ; +} + +int +rte_intr_efd_enable (struct rte_intr_handle *intr_handle,uint32_t nb_efd) +{ +RTE_SET_USED (intr_handle); +RTE_SET_USED (nb_efd); + +return 0 ; +} + +void +rte_intr_efd_disable (struct rte_intr_handle *intr_handle) +{ +RTE_SET_USED (intr_handle); + +return ; +}
lib/librte_eal/bsdapp/eal/include/exec-env/rte_interrupts.h +78 -0
90 lines not on this page · raw message
lib/librte_eal/bsdapp/eal/rte_eal_version.map +12 -0
@@ -92,3 +92,15 @@ DPDK_2.0 { local: *; }; + +DPDK_2.1 { + global: + + rte_intr_allow_others; + rte_intr_dp_is_en; + rte_intr_efd_enable; + rte_intr_efd_disable; + rte_intr_rx_ctl; + + local: *; +} DPDK_2.0;
Signature · 1 line
1.8.1.4
Re: [PATCH v13 08/14] eal/bsd: dummy for new intr definition
2015-06-19 12:00, Cunming Liang:
Quoted 1 line
To make bsd compiling happy with new intr changes.
This patch doesn't make FreeBSD happy.
DPDK works on Linux and FreeBSD.
Why not adopt an API which could be implemented for FreeBSD, instead of being tightly linked to Linux epoll?
Re: [PATCH v13 08/14] eal/bsd: dummy for new intr definition
Quoted 11 lines
-----Original Message-----
From: Thomas Monjalon [mailto:[email protected]]
Sent: Tuesday, July 14, 2015 1:06 AM
To: Liang, Cunming
Cc: [email protected]; [email protected]; [email protected]; Zhou, Danny; Wang, Liang-min; Richardson, Bruce; Liu, Yong; [email protected]
Subject: Re: [PATCH v13 08/14] eal/bsd: dummy for new intr definition
Quoted 7 lines
2015-06-19 12:00, Cunming Liang:
Quoted 1 line
To make bsd compiling happy with new intr changes.
This patch doesn't make FreeBSD happy.
DPDK works on Linux and FreeBSD.
Why not adopt an API which could be implemented for FreeBSD, instead of being tightly linked to Linux epoll?
The *rte_epoll_* API is not provided as a EAL API, only exists in linuxapp for the low level needs of combing rx event with other user events. I haven't defined the abstract EAL API for both linux and freebsd yet.
The next step is 1) to have a bsdapp level API (base on kqueue), 2) trying to provide a common EAL API to cover both. It's planed in next release.
PATCH v13 9/14 eal/bsd: fix inappropriate linuxapp referred in bsd
In reply to Cunming Liang--- lib/librte_eal/bsdapp/eal/include/exec-env/rte_interrupts.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
lib/librte_eal/bsdapp/eal/include/exec-env/rte_interrupts.h +3 -3
@@ -35,8 +35,8 @@#error "don't include this file directly, please include generic <rte_interrupts.h>"#endif -#ifndef _RTE_LINUXAPP_INTERRUPTS_H_ -#define _RTE_LINUXAPP_INTERRUPTS_H_ +#ifndef _RTE_BSDAPP_INTERRUPTS_H_ +#define _RTE_BSDAPP_INTERRUPTS_H_#include <rte_common.h>
@@ -129,4 +129,4 @@ rte_intr_allow_others(struct rte_intr_handle *intr_handle) return 1; } -#endif /* _RTE_LINUXAPP_INTERRUPTS_H_ */ +#endif /* _RTE_BSDAPP_INTERRUPTS_H_ */
Signature · 1 line
1.8.1.4
PATCH v13 10/14 ethdev: add rx intr enable, disable and ctl functions
In reply to Cunming LiangThe patch adds two dev_ops functions to enable and disable rx queue interrupts.
In addtion, it adds rte_eth_dev_rx_intr_ctl/rx_intr_q to support per port or per queue rx intr event set.
---
v13 changes
- version map cleanup for v2.1
v9 changes
- remove unnecessary check after rte_eth_dev_is_valid_port. the same as http://www.dpdk.org/dev/patchwork/patch/4784
v8 changes
- add addtion check for EEXIT
v7 changes
- remove rx_intr_vec_get
- add rx_intr_ctl and rx_intr_ctl_q
v6 changes
- add rx_intr_vec_get to retrieve the vector num of the queue.
v5 changes
- Rebase the patchset onto the HEAD
v4 changes
- Export interrupt enable/disable functions for shared libraries
- Put new functions at the end of eth_dev_ops to avoid breaking ABI
v3 changes
- Add return value for interrupt enable/disable functions
lib/librte_ether/rte_ethdev.c | 107 +++++++++++++++++++++++++++++++++ lib/librte_ether/rte_ethdev.h | 104 ++++++++++++++++++++++++++++++++ lib/librte_ether/rte_ether_version.map | 4 ++ 3 files changed, 215 insertions(+)
lib/librte_ether/rte_ethdev.c +107 -0
@@ -3280,6 +3280,113 @@ _rte_eth_dev_callback_process(struct rte_eth_dev *dev, }rte_spinlock_unlock (&rte_eth_dev_cb_lock); } + +int +rte_eth_dev_rx_intr_ctl (uint8_t port_id,int epfd,int op,void *data) +{ +uint32_t vec; +struct rte_eth_dev *dev; +struct rte_intr_handle *intr_handle; +uint16_t qid; +int rc; + +if (!rte_eth_dev_is_valid_port (port_id)) { +PMD_DEBUG_TRACE ("Invalid port_id=%u\n" , port_id); +return -ENODEV ; + } + + dev = &rte_eth_devices[port_id]; + intr_handle = &dev->pci_dev->intr_handle; +if (!intr_handle->intr_vec) { +PMD_DEBUG_TRACE ("RX Intr vector unset\n" ); +return -EPERM ; + } + +for (qid =0 ; qid < dev->data->nb_rx_queues; qid++) { + vec = intr_handle->intr_vec[qid]; + rc =rte_intr_rx_ctl (intr_handle, epfd, op, vec, data); +if (rc && rc != -EEXIST ) { +PMD_DEBUG_TRACE ("p %u q %u rx ctl error" +" op %d epfd %d vec %u\n" , + port_id, qid, op, epfd, vec); + } + } + +return 0 ; +} + +int +rte_eth_dev_rx_intr_ctl_q (uint8_t port_id,uint16_t queue_id, +int epfd,int op,void *data) +{ +uint32_t vec; +struct rte_eth_dev *dev; +struct rte_intr_handle *intr_handle; +int rc; + +if (!rte_eth_dev_is_valid_port (port_id)) { +PMD_DEBUG_TRACE ("Invalid port_id=%u\n" , port_id); +return -ENODEV ; + } + + dev = &rte_eth_devices[port_id]; +if (queue_id >= dev->data->nb_rx_queues) { +PMD_DEBUG_TRACE ("Invalid RX queue_id=%u\n" , queue_id); +return -EINVAL ; + } + + intr_handle = &dev->pci_dev->intr_handle; +if (!intr_handle->intr_vec) { +PMD_DEBUG_TRACE ("RX Intr vector unset\n" ); +return -EPERM ; + } + + vec = intr_handle->intr_vec[queue_id]; + rc =rte_intr_rx_ctl (intr_handle, epfd, op, vec, data); +if (rc && rc != -EEXIST ) { +PMD_DEBUG_TRACE ("p %u q %u rx ctl error" +" op %d epfd %d vec %u\n" , + port_id, queue_id, op, epfd, vec); +return rc; + } + +return 0 ; +} + +int +rte_eth_dev_rx_intr_enable (uint8_t port_id, +uint16_t queue_id) +{ +struct rte_eth_dev *dev; + +if (!rte_eth_dev_is_valid_port (port_id)) { +PMD_DEBUG_TRACE ("Invalid port_id=%d\n" , port_id); +return -ENODEV ; + } + + dev = &rte_eth_devices[port_id]; + +FUNC_PTR_OR_ERR_RET (*dev->dev_ops->rx_queue_intr_enable, -ENOTSUP ); +return (*dev->dev_ops->rx_queue_intr_enable)(dev, queue_id); +} + +int +rte_eth_dev_rx_intr_disable (uint8_t port_id, +uint16_t queue_id) +{ +struct rte_eth_dev *dev; + +if (!rte_eth_dev_is_valid_port (port_id)) { +PMD_DEBUG_TRACE ("Invalid port_id=%d\n" , port_id); +return -ENODEV ; + } + + dev = &rte_eth_devices[port_id]; + +FUNC_PTR_OR_ERR_RET (*dev->dev_ops->rx_queue_intr_disable, -ENOTSUP ); +return (*dev->dev_ops->rx_queue_intr_disable)(dev, queue_id); +} +#ifdef RTE_NIC_BYPASS int rte_eth_dev_bypass_init (uint8_t port_id) {
lib/librte_ether/rte_ethdev.h +104 -0
128 lines not on this page · raw message
lib/librte_ether/rte_ether_version.map +4 -0
@@ -109,6 +109,10 @@ DPDK_2.0 { DPDK_2.1 { global: + rte_eth_dev_rx_intr_ctl; + rte_eth_dev_rx_intr_ctl_q; + rte_eth_dev_rx_intr_disable; + rte_eth_dev_rx_intr_enable; rte_eth_dev_set_mc_addr_list; local: *;
Signature · 1 line
1.8.1.4
PATCH v13 11/14 ixgbe: enable rx queue interrupts for both PF and VF
In reply to Cunming LiangThe patch does below things for ixgbe PF and VF:
- Setup NIC to generate MSI-X interrupts
- Set the IVAR register to map interrupt causes to vectors
- Implement interrupt enable/disable functions
---
v10 changes
- return an actual error code rather than -1
v9 changes
- move queue-vec mapping init from dev_configure to dev_start
v8 changes
- add vfio-msi/vfio-legacy and uio-legacy support
v7 changes
- add condition check when intr vector is not enabled
v6 changes
- fill queue-vector mapping table
v5 changes
- Rebase the patchset onto the HEAD
v3 changes
- Remove spinlok from PMD
v2 changes
- Consolidate review comments related to coding style
drivers/net/ixgbe/ixgbe_ethdev.c | 484 ++++++++++++++++++++++++++++++++++++++- drivers/net/ixgbe/ixgbe_ethdev.h | 4 + 2 files changed, 476 insertions(+), 12 deletions(-)
drivers/net/ixgbe/ixgbe_ethdev.c +472 -12
@@ -82,6 +82,9 @@*/ #define IXGBE_FC_LO 0x40 +/* Default minimum inter-interrupt interval for EITR configuration */ +#define IXGBE_MIN_INTER_INTERRUPT_INTERVAL_DEFAULT 0x79E +/* Timer value included in XOFF frames. */ #define IXGBE_FC_PAUSE 0x680
@@ -171,6 +174,7 @@ static int ixgbe_dev_rss_reta_query(struct rte_eth_dev *dev, uint16_t reta_size);static void ixgbe_dev_link_status_print (struct rte_eth_dev *dev);static int ixgbe_dev_lsc_interrupt_setup (struct rte_eth_dev *dev); +static int ixgbe_dev_rxq_interrupt_setup (struct rte_eth_dev *dev);static int ixgbe_dev_interrupt_get_status (struct rte_eth_dev *dev);static int ixgbe_dev_interrupt_action (struct rte_eth_dev *dev); static void ixgbe_dev_interrupt_handler(struct rte_intr_handle *handle,
@@ -183,11 +187,14 @@ static void ixgbe_dcb_init(struct ixgbe_hw *hw,struct ixgbe_dcb_config *dcb_conf/* For Virtual Function support */ static int eth_ixgbevf_dev_init (struct rte_eth_dev *eth_dev); +static int ixgbevf_dev_interrupt_get_status (struct rte_eth_dev *dev); +static int ixgbevf_dev_interrupt_action (struct rte_eth_dev *dev);static int ixgbevf_dev_configure (struct rte_eth_dev *dev);static int ixgbevf_dev_start (struct rte_eth_dev *dev);static void ixgbevf_dev_stop (struct rte_eth_dev *dev);static void ixgbevf_dev_close (struct rte_eth_dev *dev);static void ixgbevf_intr_disable (struct ixgbe_hw *hw); +static void ixgbevf_intr_enable (struct ixgbe_hw *hw);static void ixgbevf_dev_stats_get (struct rte_eth_dev *dev,struct rte_eth_stats *stats);static void ixgbevf_dev_stats_reset (struct rte_eth_dev *dev);
@@ -197,6 +204,15 @@ static void ixgbevf_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on);static void ixgbevf_vlan_offload_set (struct rte_eth_dev *dev,int mask);static void ixgbevf_set_vfta_all (struct rte_eth_dev *dev,bool on); +static void ixgbevf_dev_interrupt_handler (struct rte_intr_handle *handle, +void *param); +static int ixgbevf_dev_rx_queue_intr_enable (struct rte_eth_dev *dev, +uint16_t queue_id); +static int ixgbevf_dev_rx_queue_intr_disable (struct rte_eth_dev *dev, +uint16_t queue_id); +static void ixgbevf_set_ivar_map (struct ixgbe_hw *hw,int8_t direction, +uint8_t queue,uint8_t msix_vector); +static void ixgbevf_configure_msix (struct rte_eth_dev *dev);/* For Eth VMDQ APIs support */ static int ixgbe_uc_hash_table_set(struct rte_eth_dev *dev, struct
@@ -214,6 +230,14 @@ static int ixgbe_mirror_rule_set(struct rte_eth_dev *dev,static int ixgbe_mirror_rule_reset (struct rte_eth_dev *dev,uint8_t rule_id); +static int ixgbe_dev_rx_queue_intr_enable (struct rte_eth_dev *dev, +uint16_t queue_id); +static int ixgbe_dev_rx_queue_intr_disable (struct rte_eth_dev *dev, +uint16_t queue_id); +static void ixgbe_set_ivar_map (struct ixgbe_hw *hw,int8_t direction, +uint8_t queue,uint8_t msix_vector); +static void ixgbe_configure_msix (struct rte_eth_dev *dev); +static int ixgbe_set_queue_rate_limit (struct rte_eth_dev *dev,uint16_t queue_idx,uint16_t tx_rate); static int ixgbe_set_vf_rate_limit(struct rte_eth_dev *dev, uint16_t vf,
@@ -266,7 +290,7 @@ static int ixgbe_dev_set_mc_addr_list(struct rte_eth_dev *dev,*/ #define UPDATE_VF_STAT (reg, last, cur) \ { \ - u32 latest = IXGBE_READ_REG(hw, reg); \ + uint32_t latest = IXGBE_READ_REG(hw, reg); \ cur += latest - last; \ last = latest; \ }
@@ -347,6 +371,8 @@ static const struct eth_dev_ops ixgbe_eth_dev_ops = { .tx_queue_start = ixgbe_dev_tx_queue_start, .tx_queue_stop = ixgbe_dev_tx_queue_stop, .rx_queue_setup = ixgbe_dev_rx_queue_setup, + .rx_queue_intr_enable = ixgbe_dev_rx_queue_intr_enable, + .rx_queue_intr_disable = ixgbe_dev_rx_queue_intr_disable, .rx_queue_release = ixgbe_dev_rx_queue_release, .rx_queue_count = ixgbe_dev_rx_queue_count, .rx_descriptor_done = ixgbe_dev_rx_descriptor_done,
@@ -407,8 +433,11 @@ static const struct eth_dev_ops ixgbevf_eth_dev_ops = { .vlan_offload_set = ixgbevf_vlan_offload_set, .rx_queue_setup = ixgbe_dev_rx_queue_setup, .rx_queue_release = ixgbe_dev_rx_queue_release, + .rx_descriptor_done = ixgbe_dev_rx_descriptor_done, .tx_queue_setup = ixgbe_dev_tx_queue_setup, .tx_queue_release = ixgbe_dev_tx_queue_release, + .rx_queue_intr_enable = ixgbevf_dev_rx_queue_intr_enable, + .rx_queue_intr_disable = ixgbevf_dev_rx_queue_intr_disable, .mac_addr_add = ixgbevf_add_mac_addr, .mac_addr_remove = ixgbevf_remove_mac_addr, .set_mc_addr_list = ixgbe_dev_set_mc_addr_list,
@@ -905,12 +934,6 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev) eth_dev->data->port_id, pci_dev->id.vendor_id, pci_dev->id.device_id); -rte_intr_callback_register (&(pci_dev->intr_handle), - ixgbe_dev_interrupt_handler, (void *)eth_dev); - -/* enable uio intr after callback register */ -rte_intr_enable (&(pci_dev->intr_handle)); -/* enable support intr */ ixgbe_enable_intr (eth_dev);
@@ -1463,6 +1486,8 @@ ixgbe_dev_start(struct rte_eth_dev *dev)IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private);struct ixgbe_vf_info *vfinfo = *IXGBE_DEV_PRIVATE_TO_P_VFDATA (dev->data->dev_private); +struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle; +uint32_t intr_vector =0 ;int err, link_up =0 , negotiate =0 ;uint32_t speed =0 ;int mask =0 ;
@@ -1495,6 +1520,28 @@ ixgbe_dev_start(struct rte_eth_dev *dev)/* configure PF module if SRIOV enabled */ ixgbe_pf_host_configure (dev); +/* check and configure queue intr-vector mapping */ +if (dev->data->dev_conf.intr_conf.rxq !=0 ) + intr_vector = dev->data->nb_rx_queues; + +if (rte_intr_efd_enable (intr_handle, intr_vector)) +return -1 ; + +if (rte_intr_dp_is_en (intr_handle) && !intr_handle->intr_vec) { + intr_handle->intr_vec = +rte_zmalloc ("intr_vec" , + dev->data->nb_rx_queues *sizeof (int ), +0 ); +if (intr_handle->intr_vec ==NULL ) { +PMD_INIT_LOG (ERR ,"Failed to allocate %d rx_queues" +"intr_vec\n" , dev->data->nb_rx_queues); +return -ENOMEM ; + } + } + +/* confiugre msix for sleep until rx interrupt */ +ixgbe_configure_msix (dev); +/* initialize transmission unit */ ixgbe_dev_tx_init (dev);
@@ -1567,8 +1614,23 @@ ixgbe_dev_start(struct rte_eth_dev *dev) skip_link_setup:/* check if lsc interrupt is enabled */ -if (dev->data->dev_conf.intr_conf.lsc !=0 ) -ixgbe_dev_lsc_interrupt_setup (dev); +if (dev->data->dev_conf.intr_conf.lsc !=0 ) { +if (rte_intr_allow_others (intr_handle)) { +rte_intr_callback_register (intr_handle, + ixgbe_dev_interrupt_handler, + (void *)dev); +ixgbe_dev_lsc_interrupt_setup (dev); + }else +PMD_INIT_LOG (INFO ,"lsc won't enable because of" +" no intr multiplex\n" ); + } + +/* check if rxq interrupt is enabled */ +if (dev->data->dev_conf.intr_conf.rxq !=0 ) +ixgbe_dev_rxq_interrupt_setup (dev); + +/* enable uio/vfio intr/eventfd mapping */ +rte_intr_enable (intr_handle);/* resume enabled intr since hw reset */ ixgbe_enable_intr (dev);
@@ -1625,6 +1687,7 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)struct ixgbe_filter_info *filter_info =IXGBE_DEV_PRIVATE_TO_FILTER_INFO (dev->data->dev_private);struct ixgbe_5tuple_filter *p_5tuple, *p_5tuple_next; +struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle;int vf;PMD_INIT_FUNC_TRACE ();
@@ -1632,6 +1695,9 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)/* disable interrupts */ ixgbe_disable_intr (hw); +/* disable intr eventfd mapping */ +rte_intr_disable (intr_handle); +/* reset the NIC */ ixgbe_pf_reset_hw (hw); hw->adapter_stopped = FALSE;
@@ -1667,6 +1733,12 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)memset (filter_info->fivetuple_mask,0 ,sizeof (uint32_t ) *IXGBE_5TUPLE_ARRAY_SIZE ); +/* Clean datapath event and queue/vec mapping */ +rte_intr_efd_disable (intr_handle); +if (intr_handle->intr_vec !=NULL ) { +rte_free (intr_handle->intr_vec); + intr_handle->intr_vec =NULL ; + } }/*
@@ -2258,6 +2330,28 @@ ixgbe_dev_lsc_interrupt_setup(struct rte_eth_dev *dev)return 0 ; } +/** +* It clears the interrupt causes and enables the interrupt. +* It will be called once only during nic initialized. +* +* @param dev +* Pointer to struct rte_eth_dev. +* +* @return +* - On success, zero. +* - On failure, a negative value. +*/ +static int +ixgbe_dev_rxq_interrupt_setup (struct rte_eth_dev *dev) +{ +struct ixgbe_interrupt *intr = +IXGBE_DEV_PRIVATE_TO_INTR (dev->data->dev_private); + + intr->mask |=IXGBE_EICR_RTX_QUEUE ; + +return 0 ; +} +/* * It reads ICR and sets flag (IXGBE_EICR_LSC) for the link_update. *
@@ -2284,10 +2378,10 @@ ixgbe_dev_interrupt_get_status(struct rte_eth_dev *dev)PMD_DRV_LOG (INFO ,"eicr %x" , eicr); intr->flags =0 ; -if (eicr &IXGBE_EICR_LSC ) { -/* set flag for async link update */ + +/* set flag for async link update */ +if (eicr &IXGBE_EICR_LSC ) intr->flags |=IXGBE_FLAG_NEED_LINK_UPDATE ; - }if (eicr &IXGBE_EICR_MAILBOX ) intr->flags |=IXGBE_FLAG_MAILBOX ;
@@ -2295,6 +2389,30 @@ ixgbe_dev_interrupt_get_status(struct rte_eth_dev *dev)return 0 ; } +static int +ixgbevf_dev_interrupt_get_status (struct rte_eth_dev *dev) +{ +uint32_t eicr; +struct ixgbe_hw *hw =IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); +struct ixgbe_interrupt *intr = +IXGBE_DEV_PRIVATE_TO_INTR (dev->data->dev_private); + +/* clear all cause mask */ +ixgbevf_intr_disable (hw); + +/* read-on-clear nic registers here */ + eicr =IXGBE_READ_REG (hw,IXGBE_VTEICR ); +PMD_DRV_LOG (INFO ,"eicr %x" , eicr); + + intr->flags =0 ; + +/* set flag for async link update */ +if (eicr &IXGBE_EICR_LSC ) + intr->flags |=IXGBE_FLAG_NEED_LINK_UPDATE ; + +return 0 ; +} +/** * It gets and then prints the link status. *
@@ -2390,6 +2508,18 @@ ixgbe_dev_interrupt_action(struct rte_eth_dev *dev)return 0 ; } +static int +ixgbevf_dev_interrupt_action (struct rte_eth_dev *dev) +{ +struct ixgbe_hw *hw = +IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); + +PMD_DRV_LOG (DEBUG ,"enable intr immediately" ); +ixgbevf_intr_enable (hw); +rte_intr_enable (&(dev->pci_dev->intr_handle)); +return 0 ; +} +/** * Interrupt handler which shall be registered for alarm callback for delayed * handling specific interrupt to wait for the stable nic state. As the
@@ -2451,6 +2581,15 @@ ixgbe_dev_interrupt_handler(__rte_unused struct rte_intr_handle *handle,ixgbe_dev_interrupt_action (dev); } +static void +ixgbevf_dev_interrupt_handler(__rte_unused struct rte_intr_handle *handle, +void *param) +{ +struct rte_eth_dev *dev = (struct rte_eth_dev *)param; +ixgbevf_dev_interrupt_get_status (dev); +ixgbevf_dev_interrupt_action (dev); +} +static int ixgbe_dev_led_on (struct rte_eth_dev *dev) {
@@ -2949,6 +3088,19 @@ ixgbevf_intr_disable(struct ixgbe_hw *hw)IXGBE_WRITE_FLUSH (hw); } +static void +ixgbevf_intr_enable (struct ixgbe_hw *hw) +{ +PMD_INIT_FUNC_TRACE (); + +/* VF enable interrupt autoclean */ +IXGBE_WRITE_REG (hw,IXGBE_VTEIAM ,IXGBE_VF_IRQ_ENABLE_MASK ); +IXGBE_WRITE_REG (hw,IXGBE_VTEIAC ,IXGBE_VF_IRQ_ENABLE_MASK ); +IXGBE_WRITE_REG (hw,IXGBE_VTEIMS ,IXGBE_VF_IRQ_ENABLE_MASK ); + +IXGBE_WRITE_FLUSH (hw); +} +static int ixgbevf_dev_configure (struct rte_eth_dev *dev) {
@@ -2981,6 +3133,9 @@ ixgbevf_dev_start(struct rte_eth_dev *dev) {struct ixgbe_hw *hw =IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); +uint32_t intr_vector =0 ; +struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle; +int err, mask =0 ;PMD_INIT_FUNC_TRACE ();
@@ -3011,6 +3166,41 @@ ixgbevf_dev_start(struct rte_eth_dev *dev)ixgbevf_dev_rxtx_start (dev); +/* check and configure queue intr-vector mapping */ +if (dev->data->dev_conf.intr_conf.rxq !=0 ) + intr_vector = dev->data->nb_rx_queues; + +if (rte_intr_efd_enable (intr_handle, intr_vector)) +return -1 ; + +if (rte_intr_dp_is_en (intr_handle) && !intr_handle->intr_vec) { + intr_handle->intr_vec = +rte_zmalloc ("intr_vec" , + dev->data->nb_rx_queues *sizeof (int ),0 ); +if (intr_handle->intr_vec ==NULL ) { +PMD_INIT_LOG (ERR ,"Failed to allocate %d rx_queues" +" intr_vec\n" , dev->data->nb_rx_queues); +return -ENOMEM ; + } + } + +ixgbevf_configure_msix (dev); + +if (dev->data->dev_conf.intr_conf.lsc !=0 ) { +if (rte_intr_allow_others (intr_handle)) +rte_intr_callback_register (intr_handle, + ixgbevf_dev_interrupt_handler, + (void *)dev); +else +PMD_INIT_LOG (INFO ,"lsc won't enable because of" +" no intr multiplex\n" ); + } + +rte_intr_enable (intr_handle); + +/* Re-enable interrupt for VF */ +ixgbevf_intr_enable (hw); +return 0 ; }
@@ -3018,6 +3208,7 @@ static void ixgbevf_dev_stop(struct rte_eth_dev *dev) {struct ixgbe_hw *hw =IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); +struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle;PMD_INIT_FUNC_TRACE ();
@@ -3034,12 +3225,23 @@ ixgbevf_dev_stop(struct rte_eth_dev *dev) dev->data->scattered_rx =0 ;ixgbe_dev_clear_queues (dev); + +/* disable intr eventfd mapping */ +rte_intr_disable (intr_handle); + +/* Clean datapath event and queue/vec mapping */ +rte_intr_efd_disable (intr_handle); +if (intr_handle->intr_vec !=NULL ) { +rte_free (intr_handle->intr_vec); + intr_handle->intr_vec =NULL ; + } }static void ixgbevf_dev_close (struct rte_eth_dev *dev) {struct ixgbe_hw *hw =IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); +struct rte_pci_device *pci_dev;PMD_INIT_FUNC_TRACE ();
@@ -3049,6 +3251,12 @@ ixgbevf_dev_close(struct rte_eth_dev *dev)/* reprogram the RAR[0] in case user changed it. */ ixgbe_set_rar (hw,0 , hw->mac.addr,0 ,IXGBE_RAH_AV ); + + pci_dev = dev->pci_dev; +if (pci_dev->intr_handle.intr_vec) { +rte_free (pci_dev->intr_handle.intr_vec); + pci_dev->intr_handle.intr_vec =NULL ; + } }static void ixgbevf_set_vfta_all (struct rte_eth_dev *dev,bool on)
@@ -3548,6 +3756,258 @@ ixgbe_mirror_rule_reset(struct rte_eth_dev *dev, uint8_t rule_id)return 0 ; } + +static int +ixgbevf_dev_rx_queue_intr_enable (struct rte_eth_dev *dev,uint16_t queue_id) +{ +uint32_t mask; +struct ixgbe_hw *hw = +IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); + + mask =IXGBE_READ_REG (hw,IXGBE_VTEIMS ); + mask |= (1 << queue_id); +IXGBE_WRITE_REG (hw,IXGBE_VTEIMS , mask); + +rte_intr_enable (&(dev->pci_dev->intr_handle)); + +return 0 ; +} + +static int +ixgbevf_dev_rx_queue_intr_disable (struct rte_eth_dev *dev,uint16_t queue_id) +{ +uint32_t mask; +struct ixgbe_hw *hw = +IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); + + mask =IXGBE_READ_REG (hw,IXGBE_VTEIMS ); + mask &= ~(1 << queue_id); +IXGBE_WRITE_REG (hw,IXGBE_VTEIMS , mask); + +return 0 ; +} + +static int +ixgbe_dev_rx_queue_intr_enable (struct rte_eth_dev *dev,uint16_t queue_id) +{ +uint32_t mask; +struct ixgbe_hw *hw = +IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); +struct ixgbe_interrupt *intr = +IXGBE_DEV_PRIVATE_TO_INTR (dev->data->dev_private); + +if (queue_id <16 ) { +ixgbe_disable_intr (hw); + intr->mask |= (1 << queue_id); +ixgbe_enable_intr (dev); + }else if (queue_id <32 ) { + mask =IXGBE_READ_REG (hw,IXGBE_EIMS_EX (0 )); + mask &= (1 << queue_id); +IXGBE_WRITE_REG (hw,IXGBE_EIMS_EX (0 ), mask); + }else if (queue_id <64 ) { + mask =IXGBE_READ_REG (hw,IXGBE_EIMS_EX (1 )); + mask &= (1 << (queue_id -32 )); +IXGBE_WRITE_REG (hw,IXGBE_EIMS_EX (1 ), mask); + } +rte_intr_enable (&(dev->pci_dev->intr_handle)); + +return 0 ; +} + +static int +ixgbe_dev_rx_queue_intr_disable (struct rte_eth_dev *dev,uint16_t queue_id) +{ +uint32_t mask; +struct ixgbe_hw *hw = +IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); +struct ixgbe_interrupt *intr = +IXGBE_DEV_PRIVATE_TO_INTR (dev->data->dev_private); + +if (queue_id <16 ) { +ixgbe_disable_intr (hw); + intr->mask &= ~(1 << queue_id); +ixgbe_enable_intr (dev); + }else if (queue_id <32 ) { + mask =IXGBE_READ_REG (hw,IXGBE_EIMS_EX (0 )); + mask &= ~(1 << queue_id); +IXGBE_WRITE_REG (hw,IXGBE_EIMS_EX (0 ), mask); + }else if (queue_id <64 ) { + mask =IXGBE_READ_REG (hw,IXGBE_EIMS_EX (1 )); + mask &= ~(1 << (queue_id -32 )); +IXGBE_WRITE_REG (hw,IXGBE_EIMS_EX (1 ), mask); + } + +return 0 ; +} + +static void +ixgbevf_set_ivar_map (struct ixgbe_hw *hw,int8_t direction, +uint8_t queue,uint8_t msix_vector) +{ +uint32_t tmp, idx; +if (direction ==-1 ) { +/* other causes */ + msix_vector |=IXGBE_IVAR_ALLOC_VAL ; + tmp =IXGBE_READ_REG (hw,IXGBE_VTIVAR_MISC ); + tmp &= ~0xFF ; + tmp |= msix_vector; +IXGBE_WRITE_REG (hw,IXGBE_VTIVAR_MISC , tmp); + }else { +/* rx or tx cause */ + msix_vector |=IXGBE_IVAR_ALLOC_VAL ; + idx = ((16 * (queue &1 )) + (8 * direction)); + tmp =IXGBE_READ_REG (hw,IXGBE_VTIVAR (queue >>1 )); + tmp &= ~(0xFF << idx); + tmp |= (msix_vector << idx); +IXGBE_WRITE_REG (hw,IXGBE_VTIVAR (queue >>1 ), tmp); + } +} + +/** +* set the IVAR registers, mapping interrupt causes to vectors +* @param hw +* pointer to ixgbe_hw struct +* @direction +* 0 for Rx, 1 for Tx, -1 for other causes +* @queue +* queue to map the corresponding interrupt to +* @msix_vector +* the vector to map to the corresponding queue +*/ +static void +ixgbe_set_ivar_map (struct ixgbe_hw *hw,int8_t direction, +uint8_t queue,uint8_t msix_vector) +{ +uint32_t tmp, idx; + + msix_vector |=IXGBE_IVAR_ALLOC_VAL ; +if (hw->mac.type == ixgbe_mac_82598EB) { +if (direction ==-1 ) + direction =0 ; + idx = (((direction *64 ) + queue) >>2 ) &0x1F ; + tmp =IXGBE_READ_REG (hw,IXGBE_IVAR (idx)); + tmp &= ~(0xFF << (8 * (queue &0x3 ))); + tmp |= (msix_vector << (8 * (queue &0x3 ))); +IXGBE_WRITE_REG (hw,IXGBE_IVAR (idx), tmp); + }else if ((hw->mac.type == ixgbe_mac_82599EB) || + (hw->mac.type == ixgbe_mac_X540)) { +if (direction ==-1 ) { +/* other causes */ + idx = ((queue &1 ) *8 ); + tmp =IXGBE_READ_REG (hw,IXGBE_IVAR_MISC ); + tmp &= ~(0xFF << idx); + tmp |= (msix_vector << idx); +IXGBE_WRITE_REG (hw,IXGBE_IVAR_MISC , tmp); + }else { +/* rx or tx causes */ + idx = ((16 * (queue &1 )) + (8 * direction)); + tmp =IXGBE_READ_REG (hw,IXGBE_IVAR (queue >>1 )); + tmp &= ~(0xFF << idx); + tmp |= (msix_vector << idx); +IXGBE_WRITE_REG (hw,IXGBE_IVAR (queue >>1 ), tmp); + } + } +} + +static void +ixgbevf_configure_msix (struct rte_eth_dev *dev) +{ +struct ixgbe_hw *hw = +IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); +struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle; +uint32_t q_idx; +uint32_t vector_idx =0 ; + +/* won't configure msix register if no mapping is done +* between intr vector and event fd */ +if (!rte_intr_dp_is_en (intr_handle)) +return ; + +/* Configure all RX queues of VF */ +for (q_idx =0 ; q_idx < dev->data->nb_rx_queues; q_idx++) { +/* Force all queue use vector 0, +* as IXGBE_VF_MAXMSIVECOTR = 1 */ +ixgbevf_set_ivar_map (hw,0 , q_idx, vector_idx); + intr_handle->intr_vec[q_idx] = vector_idx; + } + +/* Configure VF Rx queue ivar */ +ixgbevf_set_ivar_map (hw,-1 ,1 , vector_idx); +} + +/** +* Sets up the hardware to properly generate MSI-X interrupts +* @hw +* board private structure +*/ +static void +ixgbe_configure_msix (struct rte_eth_dev *dev) +{ +struct ixgbe_hw *hw = +IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); +struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle; +uint32_t queue_id, vec =0 ; +uint32_t mask; +uint32_t gpie; + +/* won't configure msix register if no mapping is done +* between intr vector and event fd */ +if (!rte_intr_dp_is_en (intr_handle)) +return ; + +/* setup GPIE for MSI-x mode */ + gpie =IXGBE_READ_REG (hw,IXGBE_GPIE ); + gpie |=IXGBE_GPIE_MSIX_MODE |IXGBE_GPIE_PBA_SUPPORT | +IXGBE_GPIE_OCD |IXGBE_GPIE_EIAME ; +/* +* auto clearing and auto setting corresponding bits in EIMS +* when MSI-X interrupt is triggered +*/ +if (hw->mac.type == ixgbe_mac_82598EB) +IXGBE_WRITE_REG (hw,IXGBE_EIAM ,IXGBE_EICS_RTX_QUEUE ); +else { +IXGBE_WRITE_REG (hw,IXGBE_EIAM_EX (0 ),0xFFFFFFFF ); +IXGBE_WRITE_REG (hw,IXGBE_EIAM_EX (1 ),0xFFFFFFFF ); + } +IXGBE_WRITE_REG (hw,IXGBE_GPIE , gpie); + +/* +* Populate the IVAR table and set the ITR values to the +* corresponding register. +*/ +for (queue_id =0 ; queue_id < dev->data->nb_rx_queues; + queue_id++) { +/* by default, 1:1 mapping */ +ixgbe_set_ivar_map (hw,0 , queue_id, vec); + intr_handle->intr_vec[queue_id] = vec; +if (vec < intr_handle->nb_efd -1 ) + vec++; + } + +switch (hw->mac.type) { +case ixgbe_mac_82598EB: +ixgbe_set_ivar_map (hw,-1 ,IXGBE_IVAR_OTHER_CAUSES_INDEX , + intr_handle->max_intr -1 ); +break ; +case ixgbe_mac_82599EB: +case ixgbe_mac_X540: +ixgbe_set_ivar_map (hw,-1 ,1 , intr_handle->max_intr -1 ); +break ; +default : +break ; + } +IXGBE_WRITE_REG (hw,IXGBE_EITR (queue_id), +IXGBE_MIN_INTER_INTERRUPT_INTERVAL_DEFAULT &0xFFF ); + +/* set up to autoclear timer, and the vectors */ + mask =IXGBE_EIMS_ENABLE_MASK ; + mask &= ~(IXGBE_EIMS_OTHER | +IXGBE_EIMS_MAILBOX | +IXGBE_EIMS_LSC ); + +IXGBE_WRITE_REG (hw,IXGBE_EIAC , mask); +} +static int ixgbe_set_queue_rate_limit (struct rte_eth_dev *dev,uint16_t queue_idx,uint16_t tx_rate) {
drivers/net/ixgbe/ixgbe_ethdev.h +4 -0
@@ -117,6 +117,9 @@ ETH_RSS_IPV6_TCP_EX | \ ETH_RSS_IPV6_UDP_EX) +#define IXGBE_VF_IRQ_ENABLE_MASK 3/* vf irq enable mask */ +#define IXGBE_VF_MAXMSIVECTOR 1 +/* * Information about the fdir mode. */
@@ -328,6 +331,7 @@ uint32_t ixgbe_dev_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id);int ixgbe_dev_rx_descriptor_done (void *rx_queue,uint16_t offset); +int ixgbevf_dev_rx_descriptor_done (void *rx_queue,uint16_t offset);int ixgbe_dev_rx_init (struct rte_eth_dev *dev);
Signature · 1 line
1.8.1.4
PATCH v13 12/14 igb: enable rx queue interrupts for PF
In reply to Cunming LiangThe patch does below for igb PF:
- Setup NIC to generate MSI-X interrupts
- Set the IVAR register to map interrupt causes to vectors
- Implement interrupt enable/disable functions
---
v9 changes
- move queue-vec mapping init from dev_configure to dev_start
- fix link interrupt not working issue in vfio-msix
v8 changes
- add vfio-msi/vfio-legacy and uio-legacy support
v7 changes
- add condition check when intr vector is not enabled
v6 changes
- fill queue-vector mapping table
v5 changes
- Rebase the patchset onto the HEAD
v3 changes
- Remove unnecessary variables in e1000_mac_info
- Remove spinlok from PMD
v2 changes
- Consolidate review comments related to coding style
drivers/net/e1000/igb_ethdev.c | 285 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 251 insertions(+), 34 deletions(-)
drivers/net/e1000/igb_ethdev.c +251 -34
@@ -96,6 +96,7 @@ static int eth_igb_flow_ctrl_get(struct rte_eth_dev *dev,static int eth_igb_flow_ctrl_set (struct rte_eth_dev *dev,struct rte_eth_fc_conf *fc_conf);static int eth_igb_lsc_interrupt_setup (struct rte_eth_dev *dev); +static int eth_igb_rxq_interrupt_setup (struct rte_eth_dev *dev);static int eth_igb_interrupt_get_status (struct rte_eth_dev *dev);static int eth_igb_interrupt_action (struct rte_eth_dev *dev); static void eth_igb_interrupt_handler(struct rte_intr_handle *handle,
@@ -193,10 +194,18 @@ static int eth_igb_filter_ctrl(struct rte_eth_dev *dev,enum rte_filter_type filter_type, enum rte_filter_op filter_op, void *arg); -static int eth_igb_set_mc_addr_list (struct rte_eth_dev *dev,struct ether_addr *mc_addr_set,uint32_t nb_mc_addr); +static int eth_igb_rx_queue_intr_enable (struct rte_eth_dev *dev, +uint16_t queue_id); +static int eth_igb_rx_queue_intr_disable (struct rte_eth_dev *dev, +uint16_t queue_id); +static void eth_igb_assign_msix_vector (struct e1000_hw *hw,int8_t direction, +uint8_t queue,uint8_t msix_vector); +static void eth_igb_configure_msix_intr (struct rte_eth_dev *dev); +static void eth_igb_write_ivar (struct e1000_hw *hw,uint8_t msix_vector, +uint8_t index,uint8_t offset);/* * Define VF Stats MACRO for Non "cleared on read" register
@@ -257,6 +266,8 @@ static const struct eth_dev_ops eth_igb_ops = { .vlan_tpid_set = eth_igb_vlan_tpid_set, .vlan_offload_set = eth_igb_vlan_offload_set, .rx_queue_setup = eth_igb_rx_queue_setup, + .rx_queue_intr_enable = eth_igb_rx_queue_intr_enable, + .rx_queue_intr_disable = eth_igb_rx_queue_intr_disable, .rx_queue_release = eth_igb_rx_queue_release, .rx_queue_count = eth_igb_rx_queue_count, .rx_descriptor_done = eth_igb_rx_descriptor_done,
@@ -590,12 +601,6 @@ eth_igb_dev_init(struct rte_eth_dev *eth_dev) eth_dev->data->port_id, pci_dev->id.vendor_id, pci_dev->id.device_id); -rte_intr_callback_register (&(pci_dev->intr_handle), - eth_igb_interrupt_handler, (void *)eth_dev); - -/* enable uio intr after callback register */ -rte_intr_enable (&(pci_dev->intr_handle)); -/* enable support intr */ igb_intr_enable (eth_dev);
@@ -758,7 +763,9 @@ eth_igb_start(struct rte_eth_dev *dev) {struct e1000_hw *hw =E1000_DEV_PRIVATE_TO_HW (dev->data->dev_private); -int ret, i, mask; +struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle; +uint32_t intr_vector =0 ; +int ret, mask;uint32_t ctrl_ext;PMD_INIT_FUNC_TRACE ();
@@ -798,6 +805,27 @@ eth_igb_start(struct rte_eth_dev *dev)/* configure PF module if SRIOV enabled */ igb_pf_host_configure (dev); +/* check and configure queue intr-vector mapping */ +if (dev->data->dev_conf.intr_conf.rxq !=0 ) + intr_vector = dev->data->nb_rx_queues; + +if (rte_intr_efd_enable (intr_handle, intr_vector)) +return -1 ; + +if (rte_intr_dp_is_en (intr_handle)) { + intr_handle->intr_vec = +rte_zmalloc ("intr_vec" , + dev->data->nb_rx_queues *sizeof (int ),0 ); +if (intr_handle->intr_vec ==NULL ) { +PMD_INIT_LOG (ERR ,"Failed to allocate %d rx_queues" +" intr_vec\n" , dev->data->nb_rx_queues); +return -ENOMEM ; + } + } + +/* confiugre msix for rx interrupt */ +eth_igb_configure_msix_intr (dev); +/* Configure for OS presence */ igb_init_manageability (hw);
@@ -825,33 +853,9 @@ eth_igb_start(struct rte_eth_dev *dev)igb_vmdq_vlan_hw_filter_enable (dev); } -/* -* Configure the Interrupt Moderation register (EITR) with the maximum -* possible value (0xFFFF) to minimize "System Partial Write" issued by -* spurious [DMA] memory updates of RX and TX ring descriptors. -* -* With a EITR granularity of 2 microseconds in the 82576, only 7/8 -* spurious memory updates per second should be expected. -* ((65535 * 2) / 1000.1000 ~= 0.131 second). -* -* Because interrupts are not used at all, the MSI-X is not activated -* and interrupt moderation is controlled by EITR[0]. -* -* Note that having [almost] disabled memory updates of RX and TX ring -* descriptors through the Interrupt Moderation mechanism, memory -* updates of ring descriptors are now moderated by the configurable -* value of Write-Back Threshold registers. -*/ if ((hw->mac.type == e1000_82576) || (hw->mac.type == e1000_82580) || (hw->mac.type == e1000_i350) || (hw->mac.type == e1000_i210) || (hw->mac.type == e1000_i211)) { -uint32_t ivar; - -/* Enable all RX & TX queues in the IVAR registers */ - ivar = (uint32_t ) ((E1000_IVAR_VALID <<16 ) |E1000_IVAR_VALID ); -for (i =0 ; i <8 ; i++) -E1000_WRITE_REG_ARRAY (hw,E1000_IVAR0 , i, ivar); -/* Configure EITR with the maximum possible value (0xFFFF) */ E1000_WRITE_REG (hw,E1000_EITR (0 ),0xFFFF ); }
@@ -902,8 +906,23 @@ eth_igb_start(struct rte_eth_dev *dev)e1000_setup_link (hw);/* check if lsc interrupt feature is enabled */ -if (dev->data->dev_conf.intr_conf.lsc !=0 ) - ret =eth_igb_lsc_interrupt_setup (dev); +if (dev->data->dev_conf.intr_conf.lsc !=0 ) { +if (rte_intr_allow_others (intr_handle)) { +rte_intr_callback_register (intr_handle, + eth_igb_interrupt_handler, + (void *)dev); +eth_igb_lsc_interrupt_setup (dev); + }else +PMD_INIT_LOG (INFO ,"lsc won't enable because of" +" no intr multiplex\n" ); + } + +/* check if rxq interrupt is enabled */ +if (dev->data->dev_conf.intr_conf.rxq !=0 ) +eth_igb_rxq_interrupt_setup (dev); + +/* enable uio/vfio intr/eventfd mapping */ +rte_intr_enable (intr_handle);/* resume enabled intr since hw reset */ igb_intr_enable (dev);
@@ -936,8 +955,13 @@ eth_igb_stop(struct rte_eth_dev *dev)struct e1000_flex_filter *p_flex;struct e1000_5tuple_filter *p_5tuple, *p_5tuple_next;struct e1000_2tuple_filter *p_2tuple, *p_2tuple_next; +struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle;igb_intr_disable (hw); + +/* disable intr eventfd mapping */ +rte_intr_disable (intr_handle); +igb_pf_reset_hw (hw);E1000_WRITE_REG (hw,E1000_WUC ,0 );
@@ -986,6 +1010,13 @@ eth_igb_stop(struct rte_eth_dev *dev)rte_free (p_2tuple); } filter_info->twotuple_mask =0 ; + +/* Clean datapath event and queue/vec mapping */ +rte_intr_efd_disable (intr_handle); +if (intr_handle->intr_vec !=NULL ) { +rte_free (intr_handle->intr_vec); + intr_handle->intr_vec =NULL ; + } } static void
@@ -993,6 +1024,7 @@ eth_igb_close(struct rte_eth_dev *dev) {struct e1000_hw *hw =E1000_DEV_PRIVATE_TO_HW (dev->data->dev_private);struct rte_eth_link link; +struct rte_pci_device *pci_dev;eth_igb_stop (dev);e1000_phy_hw_reset (hw);
@@ -1010,6 +1042,12 @@ eth_igb_close(struct rte_eth_dev *dev)igb_dev_clear_queues (dev); + pci_dev = dev->pci_dev; +if (pci_dev->intr_handle.intr_vec) { +rte_free (pci_dev->intr_handle.intr_vec); + pci_dev->intr_handle.intr_vec =NULL ; + } +memset (&link,0 ,sizeof (link));rte_igb_dev_atomic_write_link_status (dev, &link); }
@@ -1834,6 +1872,34 @@ eth_igb_lsc_interrupt_setup(struct rte_eth_dev *dev) }/* +* It clears the interrupt causes and enables the interrupt. +* It will be called once only during nic initialized. +* +* @param dev +* Pointer to struct rte_eth_dev. +* +* @return +* - On success, zero. +* - On failure, a negative value. +*/ +static int eth_igb_rxq_interrupt_setup (struct rte_eth_dev *dev) +{ +uint32_t mask, regval; +struct e1000_hw *hw = +E1000_DEV_PRIVATE_TO_HW (dev->data->dev_private); +struct rte_eth_dev_info dev_info; + +memset (&dev_info,0 ,sizeof (dev_info)); +eth_igb_infos_get (dev, &dev_info); + + mask =0xFFFFFFFF >> (32 - dev_info.max_rx_queues); + regval =E1000_READ_REG (hw,E1000_EIMS ); +E1000_WRITE_REG (hw,E1000_EIMS , regval | mask); + +return 0 ; +} + +/* * It reads ICR and gets interrupt causes, check it and set a bit flag * to update link status. *
@@ -3670,5 +3736,156 @@ static struct rte_driver pmd_igbvf_drv = { .init = rte_igbvf_pmd_init, }; +static int +eth_igb_rx_queue_intr_disable (struct rte_eth_dev *dev,uint16_t queue_id) +{ +struct e1000_hw *hw = +E1000_DEV_PRIVATE_TO_HW (dev->data->dev_private); +uint32_t mask =1 << queue_id; + +E1000_WRITE_REG (hw,E1000_EIMC , mask); +E1000_WRITE_FLUSH (hw); + +return 0 ; +} + +static int +eth_igb_rx_queue_intr_enable (struct rte_eth_dev *dev,uint16_t queue_id) +{ +struct e1000_hw *hw = +E1000_DEV_PRIVATE_TO_HW (dev->data->dev_private); +uint32_t mask =1 << queue_id; +uint32_t regval; + + regval =E1000_READ_REG (hw,E1000_EIMS ); +E1000_WRITE_REG (hw,E1000_EIMS , regval | mask); +E1000_WRITE_FLUSH (hw); + +rte_intr_enable (&(dev->pci_dev->intr_handle)); + +return 0 ; +} + +static void +eth_igb_write_ivar (struct e1000_hw *hw,uint8_t msix_vector, +uint8_t index,uint8_t offset) +{ +uint32_t val =E1000_READ_REG_ARRAY (hw,E1000_IVAR0 , index); + +/* clear bits */ + val &= ~((uint32_t )0xFF << offset); + +/* write vector and valid bit */ + val |= (msix_vector |E1000_IVAR_VALID ) << offset; + +E1000_WRITE_REG_ARRAY (hw,E1000_IVAR0 , index, val); +} + +static void +eth_igb_assign_msix_vector (struct e1000_hw *hw,int8_t direction, +uint8_t queue,uint8_t msix_vector) +{ +uint32_t tmp =0 ; +if (hw->mac.type == e1000_82575) { +if (direction ==0 ) + tmp =E1000_EICR_RX_QUEUE0 << queue; +else if (direction ==1 ) + tmp =E1000_EICR_TX_QUEUE0 << queue; +E1000_WRITE_REG (hw,E1000_MSIXBM (msix_vector), tmp); + }else if (hw->mac.type == e1000_82576) { +if ((direction ==0 ) || (direction ==1 )) +eth_igb_write_ivar (hw, msix_vector, queue &0x7 , + ((queue &0x8 ) <<1 ) +8 * direction); + }else if ((hw->mac.type == e1000_82580) || + (hw->mac.type == e1000_i350) || + (hw->mac.type == e1000_i354) || + (hw->mac.type == e1000_i210) || + (hw->mac.type == e1000_i211)) { +if ((direction ==0 ) || (direction ==1 )) +eth_igb_write_ivar (hw, msix_vector, + queue >>1 , + ((queue &0x1 ) <<4 ) +8 * direction); + } +} + +/* +* Sets up the hardware to generate MSI-X interrupts properly +* @hw +* board private structure +*/ +static void +eth_igb_configure_msix_intr (struct rte_eth_dev *dev) +{ +int queue_id; +uint32_t tmpval, regval, intr_mask; +struct e1000_hw *hw = +E1000_DEV_PRIVATE_TO_HW (dev->data->dev_private); +struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle; +uint32_t vec =0 ; + +/* won't configure msix register if no mapping is done +* between intr vector and event fd */ +if (!rte_intr_dp_is_en (intr_handle)) +return ; + +/* set interrupt vector for other causes */ +if (hw->mac.type == e1000_82575) { + tmpval =E1000_READ_REG (hw,E1000_CTRL_EXT ); +/* enable MSI-X PBA support */ + tmpval |=E1000_CTRL_EXT_PBA_CLR ; + +/* Auto-Mask interrupts upon ICR read */ + tmpval |=E1000_CTRL_EXT_EIAME ; + tmpval |=E1000_CTRL_EXT_IRCA ; + +E1000_WRITE_REG (hw,E1000_CTRL_EXT , tmpval); + +/* enable msix_other interrupt */ +E1000_WRITE_REG_ARRAY (hw,E1000_MSIXBM (0 ),0 ,E1000_EIMS_OTHER ); + regval =E1000_READ_REG (hw,E1000_EIAC ); +E1000_WRITE_REG (hw,E1000_EIAC , regval |E1000_EIMS_OTHER ); + regval =E1000_READ_REG (hw,E1000_EIAM ); +E1000_WRITE_REG (hw,E1000_EIMS , regval |E1000_EIMS_OTHER ); + }else if ((hw->mac.type == e1000_82576) || + (hw->mac.type == e1000_82580) || + (hw->mac.type == e1000_i350) || + (hw->mac.type == e1000_i354) || + (hw->mac.type == e1000_i210) || + (hw->mac.type == e1000_i211)) { +/* turn on MSI-X capability first */ +E1000_WRITE_REG (hw,E1000_GPIE ,E1000_GPIE_MSIX_MODE | +E1000_GPIE_PBA |E1000_GPIE_EIAME | +E1000_GPIE_NSICR ); + + intr_mask = (1 << intr_handle->max_intr) -1 ; + regval =E1000_READ_REG (hw,E1000_EIAC ); +E1000_WRITE_REG (hw,E1000_EIAC , regval | intr_mask); + +/* enable msix_other interrupt */ + regval =E1000_READ_REG (hw,E1000_EIMS ); +E1000_WRITE_REG (hw,E1000_EIMS , regval | intr_mask); + tmpval = (dev->data->nb_rx_queues |E1000_IVAR_VALID ) <<8 ; +E1000_WRITE_REG (hw,E1000_IVAR_MISC , tmpval); + } + +/* +* use EIAM to auto-mask when MSI-X interrupt +* is asserted, this saves a register write for every interrupt +*/ + intr_mask = (1 << intr_handle->nb_efd) -1 ; + regval =E1000_READ_REG (hw,E1000_EIAM ); +E1000_WRITE_REG (hw,E1000_EIAM , regval | intr_mask); + +for (queue_id =0 ; queue_id < dev->data->nb_rx_queues; queue_id++) { +eth_igb_assign_msix_vector (hw,0 , queue_id, vec); + intr_handle->intr_vec[queue_id] = vec; +if (vec < intr_handle->nb_efd -1 ) + vec++; + } + +E1000_WRITE_FLUSH (hw); +} + +PMD_REGISTER_DRIVER (pmd_igb_drv);PMD_REGISTER_DRIVER (pmd_igbvf_drv);
Signature · 1 line
1.8.1.4
PATCH v13 13/14 l3fwd-power: enable one-shot rx interrupt and polling/interrupt mode switch
In reply to Cunming LiangDemonstrate how to handle per rx queue interrupt in a NAPI-like implementation in usersapce. PDK polling thread mainly works in polling mode and switch to interrupt mode only if there is no any packet received in recent polls.
Usersapce interrupt notification generally takes a lot more cycles than kernel, so one-shot interrupt is used here to guarantee minimum overhead and DPDK polling thread returns to polling mode immediately once it receives an interrupt notificaiton for incoming packet.
---
v7 changes
- using new APIs
- demo multiple port/queue pair wait on the same epoll instance
v6 changes
- Split event fd add and wait
v5 changes
- Change invoked function name and parameter to accomodate EAL change
v3 changes
- Add spinlock to ensure thread safe when accessing interrupt mask register
v2 changes
- Remove unused function which is for debug purpose
examples/l3fwd-power/main.c | 203 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 163 insertions(+), 40 deletions(-)
examples/l3fwd-power/main.c +163 -40
@@ -74,12 +74,14 @@#include <rte_string_fns.h> #include <rte_timer.h> #include <rte_power.h> +#include <rte_eal.h> +#include <rte_spinlock.h> #define RTE_LOGTYPE_L3FWD_POWER RTE_LOGTYPE_USER1#define MAX_PKT_BURST 32 -#define MIN_ZERO_POLL_COUNT 5 +#define MIN_ZERO_POLL_COUNT 10/* around 100ms at 2 Ghz */ #define TIMER_RESOLUTION_CYCLES 200000000ULL
@@ -153,6 +155,9 @@ static uint16_t nb_txd = RTE_TEST_TX_DESC_DEFAULT;/* ethernet addresses of ports */ static struct ether_addr ports_eth_addr[RTE_MAX_ETHPORTS ]; +/* ethernet addresses of ports */ +static rte_spinlock_t locks[RTE_MAX_ETHPORTS ]; +/* mask of enabled ports */ static uint32_t enabled_port_mask =0 ;/* Ports set in promiscuous mode off by default. */
@@ -185,6 +190,9 @@ struct lcore_rx_queue {#define MAX_TX_QUEUE_PER_PORT RTE_MAX_ETHPORTS#define MAX_RX_QUEUE_PER_PORT 128 +#define MAX_RX_QUEUE_INTERRUPT_PER_PORT 16 + +#define MAX_LCORE_PARAMS 1024struct lcore_params {uint8_t port_id;
@@ -211,7 +219,7 @@ static uint16_t nb_lcore_params = sizeof(lcore_params_array_default) /static struct rte_eth_conf port_conf = { .rxmode = { - .mq_mode =ETH_MQ_RX_RSS , + .mq_mode =ETH_MQ_RX_RSS , .max_rx_pkt_len =ETHER_MAX_LEN , .split_hdr_size =0 , .header_split =0 ,/**< Header Split disabled */
@@ -223,11 +231,15 @@ static struct rte_eth_conf port_conf = { .rx_adv_conf = { .rss_conf = { .rss_key = NULL, - .rss_hf = ETH_RSS_IP, + .rss_hf = ETH_RSS_UDP, }, }, .txmode = { - .mq_mode = ETH_DCB_NONE, + .mq_mode = ETH_MQ_TX_NONE, + }, + .intr_conf = { + .lsc = 1, + .rxq = 1, /**< rxq interrupt feature enabled */ }, };
@@ -399,19 +411,22 @@ power_timer_cb(__attribute__((unused)) struct rte_timer *tim,/* accumulate total execution time in us when callback is invoked */ sleep_time_ratio = (float )(stats[lcore_id].sleep_time) / (float )SCALING_PERIOD ; -/** * check whether need to scale down frequency a step if it sleep a lot. */ -if (sleep_time_ratio >=SCALING_DOWN_TIME_RATIO_THRESHOLD ) -rte_power_freq_down (lcore_id); +if (sleep_time_ratio >=SCALING_DOWN_TIME_RATIO_THRESHOLD ) { +if (rte_power_freq_down) +rte_power_freq_down (lcore_id); + }else if ( (unsigned )(stats[lcore_id].nb_rx_processed / - stats[lcore_id].nb_iteration_looped) <MAX_PKT_BURST ) + stats[lcore_id].nb_iteration_looped) <MAX_PKT_BURST ) {/** * scale down a step if average packet per iteration less * than expectation. */ -rte_power_freq_down (lcore_id); +if (rte_power_freq_down) +rte_power_freq_down (lcore_id); + }/** * initialize another timer according to current frequency to ensure
@@ -704,22 +719,20 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, } -#define SLEEP_GEAR1_THRESHOLD 100 -#define SLEEP_GEAR2_THRESHOLD 1000 +#define MINIMUM_SLEEP_TIME 1 +#define SUSPEND_THRESHOLD 300static inline uint32_t power_idle_heuristic (uint32_t zero_rx_packet_count) { -/* If zero count is less than 100, use it as the sleep time in us */ -if (zero_rx_packet_count <SLEEP_GEAR1_THRESHOLD ) -return zero_rx_packet_count; -/* If zero count is less than 1000, sleep time should be 100 us */ -else if ((zero_rx_packet_count >=SLEEP_GEAR1_THRESHOLD ) && - (zero_rx_packet_count <SLEEP_GEAR2_THRESHOLD )) -return SLEEP_GEAR1_THRESHOLD ; -/* If zero count is greater than 1000, sleep time should be 1000 us */ -else if (zero_rx_packet_count >=SLEEP_GEAR2_THRESHOLD ) -return SLEEP_GEAR2_THRESHOLD ; +/* If zero count is less than 100, sleep 1us */ +if (zero_rx_packet_count <SUSPEND_THRESHOLD ) +return MINIMUM_SLEEP_TIME ; +/* If zero count is less than 1000, sleep 100 us which is the +minimum latency switching from C3/C6 to C0 +*/ +else +return SUSPEND_THRESHOLD ;return 0 ; }
@@ -759,6 +772,84 @@ power_freq_scaleup_heuristic(unsigned lcore_id,return FREQ_CURRENT ; } +/** +* force polling thread sleep until one-shot rx interrupt triggers +* @param port_id +* Port id. +* @param queue_id +* Rx queue id. +* @return +* 0 on success +*/ +static int +sleep_until_rx_interrupt (int num) +{ +struct rte_epoll_event event[num]; +int n, i; +uint8_t port_id, queue_id; +void *data; + +RTE_LOG (INFO ,L3FWD_POWER , +"lcore %u sleeps until interrupt triggers\n" , +rte_lcore_id ()); + + n =rte_epoll_wait (RTE_EPOLL_PER_THREAD , event, num,-1 ); +for (i =0 ; i < n; i++) { + data = event[i].epdata.data; + port_id = ((uintptr_t )data) >>CHAR_BIT ; + queue_id = ((uintptr_t )data) & +RTE_LEN2MASK (CHAR_BIT , uint8_t); +RTE_LOG (INFO ,L3FWD_POWER , +"lcore %u is waked up from rx interrupt on" +" port %d queue %d\n" , +rte_lcore_id (), port_id, queue_id); + } + +return 0 ; +} + +static int turn_on_intr (struct lcore_conf *qconf) +{ +int i; +struct lcore_rx_queue *rx_queue; +uint8_t port_id, queue_id; + +for (i =0 ; i < qconf->n_rx_queue; ++i) { + rx_queue = &(qconf->rx_queue_list[i]); + port_id = rx_queue->port_id; + queue_id = rx_queue->queue_id; + +rte_spinlock_lock (&(locks[port_id])); +rte_eth_dev_rx_intr_enable (port_id, queue_id); +rte_spinlock_unlock (&(locks[port_id])); + } +} + +static int event_register (struct lcore_conf *qconf) +{ +struct lcore_rx_queue *rx_queue; +uint8_t portid, queueid; +uint32_t data; +int ret; +int i; + +for (i =0 ; i < qconf->n_rx_queue; ++i) { + rx_queue = &(qconf->rx_queue_list[i]); + portid = rx_queue->port_id; + queueid = rx_queue->queue_id; + data = portid <<CHAR_BIT | queueid; + + ret =rte_eth_dev_rx_intr_ctl_q (portid, queueid, +RTE_EPOLL_PER_THREAD , +RTE_INTR_EVENT_ADD , + (void *)((uintptr_t )data)); +if (ret) +return ret; + } + +return 0 ; +} +/* main processing loop */ static int main_loop (__attribute__((unused))void *dummy)
@@ -772,9 +863,9 @@ main_loop(__attribute__((unused)) void *dummy)struct lcore_conf *qconf;struct lcore_rx_queue *rx_queue;enum freq_scale_hint_t lcore_scaleup_hint; -uint32_t lcore_rx_idle_count =0 ;uint32_t lcore_idle_hint =0 ; +int intr_en =0 ;const uint64_t drain_tsc = (rte_get_tsc_hz () +US_PER_S -1 ) /US_PER_S *BURST_TX_DRAIN_US ;
@@ -791,13 +882,18 @@ main_loop(__attribute__((unused)) void *dummy)RTE_LOG (INFO ,L3FWD_POWER ,"entering main loop on lcore %u\n" , lcore_id);for (i =0 ; i < qconf->n_rx_queue; i++) { - portid = qconf->rx_queue_list[i].port_id; queueid = qconf->rx_queue_list[i].queue_id;RTE_LOG (INFO ,L3FWD_POWER ," -- lcoreid=%u portid=%hhu " "rxqueueid=%hhu\n" , lcore_id, portid, queueid); } +/* add into event wait list */ +if (port_conf.intr_conf.rxq &&event_register (qconf) ==0 ) + intr_en =1 ; +else +RTE_LOG (INFO ,L3FWD_POWER ,"RX interrupt won't enable.\n" ); +while (1 ) { stats[lcore_id].nb_iteration_looped++;
@@ -832,6 +928,7 @@ main_loop(__attribute__((unused)) void *dummy) prev_tsc_power = cur_tsc_power; } +start_rx:/* * Read packet from RX queues */
@@ -845,6 +942,7 @@ main_loop(__attribute__((unused)) void *dummy) nb_rx =rte_eth_rx_burst (portid, queueid, pkts_burst,MAX_PKT_BURST ); + stats[lcore_id].nb_rx_processed += nb_rx;if (unlikely (nb_rx ==0 )) {/**
@@ -907,10 +1005,13 @@ main_loop(__attribute__((unused)) void *dummy) rx_queue->freq_up_hint; } -if (lcore_scaleup_hint ==FREQ_HIGHEST ) -rte_power_freq_max (lcore_id); -else if (lcore_scaleup_hint ==FREQ_HIGHER ) -rte_power_freq_up (lcore_id); +if (lcore_scaleup_hint ==FREQ_HIGHEST ) { +if (rte_power_freq_max) +rte_power_freq_max (lcore_id); + }else if (lcore_scaleup_hint ==FREQ_HIGHER ) { +if (rte_power_freq_up) +rte_power_freq_up (lcore_id); + } }else {/** * All Rx queues empty in recent consecutive polls,
@@ -925,16 +1026,23 @@ main_loop(__attribute__((unused)) void *dummy) lcore_idle_hint = rx_queue->idle_hint; } -if ( lcore_idle_hint <SLEEP_GEAR1_THRESHOLD ) +if (lcore_idle_hint <SUSPEND_THRESHOLD )/** * execute "pause" instruction to avoid context -* switch for short sleep. +* switch which generally take hundred of +* microseconds for short sleep. */ rte_delay_us (lcore_idle_hint); -else -/* long sleep force runing thread to suspend */ -usleep (lcore_idle_hint); - +else { +/* suspend untill rx interrupt trigges */ +if (intr_en) { +turn_on_intr (qconf); +sleep_until_rx_interrupt ( + qconf->n_rx_queue); + } +/* start receiving packets immediately */ + goto start_rx; + } stats[lcore_id].sleep_time += lcore_idle_hint; } }
@@ -1267,7 +1375,7 @@ setup_hash(int socketid)char s[64 ];/* create ipv4 hash */ -snprintf (s,sizeof (s),"ipv4_l3fwd_hash_%d" , socketid); +rte_snprintf (s,sizeof (s),"ipv4_l3fwd_hash_%d" , socketid); ipv4_l3fwd_hash_params.name = s; ipv4_l3fwd_hash_params.socket_id = socketid; ipv4_l3fwd_lookup_struct[socketid] =
@@ -1277,7 +1385,7 @@ setup_hash(int socketid) "socket %d\n", socketid);/* create ipv6 hash */ -snprintf (s,sizeof (s),"ipv6_l3fwd_hash_%d" , socketid); +rte_snprintf (s,sizeof (s),"ipv6_l3fwd_hash_%d" , socketid); ipv6_l3fwd_hash_params.name = s; ipv6_l3fwd_hash_params.socket_id = socketid; ipv6_l3fwd_lookup_struct[socketid] =
@@ -1471,6 +1579,7 @@ main(int argc, char **argv)unsigned lcore_id;uint64_t hz;uint32_t n_tx_queue, nb_lcores; +uint32_t dev_rxq_num, dev_txq_num;uint8_t portid, nb_rx_queue, queue, socketid;/* catch SIGINT and restore cpufreq governor to ondemand */
@@ -1520,10 +1629,19 @@ main(int argc, char **argv)printf ("Initializing port %d ... " , portid );fflush (stdout); +rte_eth_dev_info_get (portid, &dev_info); + dev_rxq_num = dev_info.max_rx_queues; + dev_txq_num = dev_info.max_tx_queues; + nb_rx_queue =get_port_n_rx_queues (portid); +if (nb_rx_queue > dev_rxq_num) +rte_exit (EXIT_FAILURE , +"Cannot configure not existed rxq: " +"port=%d\n" , portid); + n_tx_queue = nb_lcores; -if (n_tx_queue >MAX_TX_QUEUE_PER_PORT ) - n_tx_queue =MAX_TX_QUEUE_PER_PORT ; +if (n_tx_queue > dev_txq_num) + n_tx_queue = dev_txq_num;printf ("Creating queues: nb_rxq=%d nb_txq=%u... " , nb_rx_queue, (unsigned )n_tx_queue ); ret = rte_eth_dev_configure(portid, nb_rx_queue,
@@ -1547,6 +1665,9 @@ main(int argc, char **argv)if (rte_lcore_is_enabled (lcore_id) ==0 )continue ; +if (queueid >= dev_txq_num) +continue ; +if (numa_on) socketid = \ (uint8_t )rte_lcore_to_socket_id (lcore_id);
@@ -1581,8 +1702,9 @@ main(int argc, char **argv)/* init power management library */ ret =rte_power_init (lcore_id);if (ret) -rte_exit (EXIT_FAILURE ,"Power management library " -"initialization failed on core%u\n" , lcore_id); +rte_log (RTE_LOG_ERR ,RTE_LOGTYPE_POWER , +"Power management library initialization " +"failed on core%u" , lcore_id);/* init timer structures for each enabled lcore */ rte_timer_init (&power_timers[lcore_id]);
@@ -1630,7 +1752,6 @@ main(int argc, char **argv)if (ret <0 )rte_exit (EXIT_FAILURE ,"rte_eth_dev_start: err=%d, " "port=%d\n" , ret, portid); -/* * If enabled, put device in promiscuous mode. * This allows IO forwarding mode to forward packets
@@ -1639,6 +1760,8 @@ main(int argc, char **argv)*/ if (promiscuous_on)rte_eth_promiscuous_enable (portid); +/* initialize spinlock for each port */ +rte_spinlock_init (&(locks[portid])); }check_all_ports_link_status ((uint8_t )nb_ports, enabled_port_mask);
Signature · 1 line
1.8.1.4
Re: [PATCH v13 13/14] l3fwd-power: enable one-shot rx interrupt and polling/interrupt mode switch
2015-06-19 12:00, Cunming Liang:
Quoted 8 lines
Demonstrate how to handle per rx queue interrupt in a NAPI-like implementation in usersapce. PDK polling thread mainly works in polling mode and switch to interrupt mode only if there is no any packet received in recent polls.
Usersapce interrupt notification generally takes a lot more cycles than kernel, so one-shot interrupt is used here to guarantee minimum overhead and DPDK polling thread returns to polling mode immediately once it receives an interrupt notificaiton for incoming packet.
Besides typos, it should be noted that it works only with igb and ixgbe.
Re: [PATCH v13 13/14] l3fwd-power: enable one-shot rx interrupt and polling/interrupt mode switch
Quoted 22 lines
-----Original Message-----
From: Thomas Monjalon [mailto:[email protected]]
Sent: Tuesday, July 14, 2015 1:13 AM
To: Liang, Cunming
Cc: [email protected]; [email protected]; [email protected]; Zhou, Danny; Wang, Liang-min; Richardson, Bruce; Liu, Yong; [email protected]
Subject: Re: [PATCH v13 13/14] l3fwd-power: enable one-shot rx interrupt and polling/interrupt mode switch2015-06-19 12:00, Cunming Liang:
Quoted 8 lines
Demonstrate how to handle per rx queue interrupt in a NAPI-like implementation in usersapce. PDK polling thread mainly works in polling mode and switch to interrupt mode only if there is no any packet received in recent polls.
Usersapce interrupt notification generally takes a lot more cycles than kernel, so one-shot interrupt is used here to guarantee minimum overhead and DPDK polling thread returns to polling mode immediately once it receives an interrupt notificaiton for incoming packet.
Quoted 1 line
Besides typos, it should be noted that it works only with igb and ixgbe.
Will reword the commit comments, thanks for the notice.
PATCH v13 14/14 abi: fix v2.1 abi broken issue
In reply to Cunming LiangRTE_NEXT_ABI will be removed from v2.2. It's only used to avoid ABI(unannounced) broken in v2.1. The usrs should make sure understand the impact before turning on the feature. There are two abi changes required in this interrupt patch set.
They're 1) struct rte_intr_handle; 2) struct rte_intr_conf.
---
v13 changes
- Use common RTE_NEXT_ABI to replace RTE_EAL_RX_INTR
v9
- Acked-by: vincent jardin <[email protected]>
drivers/net/e1000/igb_ethdev.c | 28 ++++++++- drivers/net/ixgbe/ixgbe_ethdev.c | 41 ++++++++++++- examples/l3fwd-power/main.c | 3 +- .../bsdapp/eal/include/exec-env/rte_interrupts.h | 7 +++ lib/librte_eal/linuxapp/eal/eal_interrupts.c | 12 ++++ .../linuxapp/eal/include/exec-env/rte_interrupts.h | 68 +++++++++++++++++++++- lib/librte_ether/rte_ethdev.c | 2 + lib/librte_ether/rte_ethdev.h | 32 +++++++++- 8 files changed, 182 insertions(+), 11 deletions(-)
drivers/net/e1000/igb_ethdev.c +27 -1
@@ -96,7 +96,9 @@ static int eth_igb_flow_ctrl_get(struct rte_eth_dev *dev,static int eth_igb_flow_ctrl_set (struct rte_eth_dev *dev,struct rte_eth_fc_conf *fc_conf);static int eth_igb_lsc_interrupt_setup (struct rte_eth_dev *dev); +#ifdef RTE_NEXT_ABI static int eth_igb_rxq_interrupt_setup (struct rte_eth_dev *dev); +#endif static int eth_igb_interrupt_get_status (struct rte_eth_dev *dev);static int eth_igb_interrupt_action (struct rte_eth_dev *dev); static void eth_igb_interrupt_handler(struct rte_intr_handle *handle,
@@ -201,11 +203,15 @@ static int eth_igb_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id);static int eth_igb_rx_queue_intr_disable (struct rte_eth_dev *dev,uint16_t queue_id); +#ifdef RTE_NEXT_ABI static void eth_igb_assign_msix_vector (struct e1000_hw *hw,int8_t direction,uint8_t queue,uint8_t msix_vector); +#endif static void eth_igb_configure_msix_intr (struct rte_eth_dev *dev); +#ifdef RTE_NEXT_ABI static void eth_igb_write_ivar (struct e1000_hw *hw,uint8_t msix_vector,uint8_t index,uint8_t offset); +#endif /* * Define VF Stats MACRO for Non "cleared on read" register
@@ -764,7 +770,9 @@ eth_igb_start(struct rte_eth_dev *dev)struct e1000_hw *hw =E1000_DEV_PRIVATE_TO_HW (dev->data->dev_private);struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle; +#ifdef RTE_NEXT_ABI uint32_t intr_vector =0 ; +#endif int ret, mask;uint32_t ctrl_ext;
@@ -805,6 +813,7 @@ eth_igb_start(struct rte_eth_dev *dev)/* configure PF module if SRIOV enabled */ igb_pf_host_configure (dev); +#ifdef RTE_NEXT_ABI /* check and configure queue intr-vector mapping */ if (dev->data->dev_conf.intr_conf.rxq !=0 ) intr_vector = dev->data->nb_rx_queues;
@@ -822,6 +831,7 @@ eth_igb_start(struct rte_eth_dev *dev) return -ENOMEM; } } +#endif /* confiugre msix for rx interrupt */ eth_igb_configure_msix_intr (dev);
@@ -917,9 +927,11 @@ eth_igb_start(struct rte_eth_dev *dev) " no intr multiplex\n"); } +#ifdef RTE_NEXT_ABI /* check if rxq interrupt is enabled */ if (dev->data->dev_conf.intr_conf.rxq !=0 )eth_igb_rxq_interrupt_setup (dev); +#endif /* enable uio/vfio intr/eventfd mapping */ rte_intr_enable (intr_handle);
@@ -1011,12 +1023,14 @@ eth_igb_stop(struct rte_eth_dev *dev) } filter_info->twotuple_mask =0 ; +#ifdef RTE_NEXT_ABI /* Clean datapath event and queue/vec mapping */ rte_intr_efd_disable (intr_handle);if (intr_handle->intr_vec !=NULL ) {rte_free (intr_handle->intr_vec); intr_handle->intr_vec =NULL ; } +#endif } static void
@@ -1024,7 +1038,9 @@ eth_igb_close(struct rte_eth_dev *dev) {struct e1000_hw *hw =E1000_DEV_PRIVATE_TO_HW (dev->data->dev_private);struct rte_eth_link link; +#ifdef RTE_NEXT_ABI struct rte_pci_device *pci_dev; +#endif eth_igb_stop (dev);e1000_phy_hw_reset (hw);
@@ -1042,11 +1058,13 @@ eth_igb_close(struct rte_eth_dev *dev)igb_dev_clear_queues (dev); +#ifdef RTE_NEXT_ABI pci_dev = dev->pci_dev;if (pci_dev->intr_handle.intr_vec) {rte_free (pci_dev->intr_handle.intr_vec); pci_dev->intr_handle.intr_vec =NULL ; } +#endif memset (&link,0 ,sizeof (link));rte_igb_dev_atomic_write_link_status (dev, &link);
@@ -1871,6 +1889,7 @@ eth_igb_lsc_interrupt_setup(struct rte_eth_dev *dev)return 0 ; } +#ifdef RTE_NEXT_ABI /* * It clears the interrupt causes and enables the interrupt. * It will be called once only during nic initialized.
@@ -1898,6 +1917,7 @@ static int eth_igb_rxq_interrupt_setup(struct rte_eth_dev *dev) return 0; } +#endif /* * It reads ICR and gets interrupt causes, check it and set a bit flag
@@ -3766,6 +3786,7 @@ eth_igb_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id)return 0 ; } +#ifdef RTE_NEXT_ABI static void eth_igb_write_ivar (struct e1000_hw *hw,uint8_t msix_vector,uint8_t index,uint8_t offset)
@@ -3807,6 +3828,7 @@ eth_igb_assign_msix_vector(struct e1000_hw *hw, int8_t direction, ((queue & 0x1) << 4) + 8 * direction); } } +#endif /* * Sets up the hardware to generate MSI-X interrupts properly
@@ -3816,18 +3838,21 @@ eth_igb_assign_msix_vector(struct e1000_hw *hw, int8_t direction,static void eth_igb_configure_msix_intr (struct rte_eth_dev *dev) { +#ifdef RTE_NEXT_ABI int queue_id;uint32_t tmpval, regval, intr_mask;struct e1000_hw *hw =E1000_DEV_PRIVATE_TO_HW (dev->data->dev_private); -struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle;uint32_t vec =0 ; +#endif +struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle;/* won't configure msix register if no mapping is done * between intr vector and event fd */ if (!rte_intr_dp_is_en (intr_handle))return ; +#ifdef RTE_NEXT_ABI /* set interrupt vector for other causes */ if (hw->mac.type == e1000_82575) { tmpval =E1000_READ_REG (hw,E1000_CTRL_EXT );
@@ -3884,6 +3909,7 @@ eth_igb_configure_msix_intr(struct rte_eth_dev *dev) }E1000_WRITE_FLUSH (hw); +#endif }
drivers/net/ixgbe/ixgbe_ethdev.c +38 -3
220 lines not on this page · raw message
examples/l3fwd-power/main.c +1 -2
@@ -239,7 +239,6 @@ static struct rte_eth_conf port_conf = { }, .intr_conf = { .lsc = 1, - .rxq = 1, /**< rxq interrupt feature enabled */ }, };
@@ -889,7 +888,7 @@ main_loop(__attribute__((unused)) void *dummy) }/* add into event wait list */ -if (port_conf.intr_conf.rxq &&event_register (qconf) ==0 ) +if (event_register (qconf) ==0 ) intr_en =1 ;else RTE_LOG (INFO ,L3FWD_POWER ,"RX interrupt won't enable.\n" );
lib/librte_eal/bsdapp/eal/include/exec-env/rte_interrupts.h +7 -0
@@ -51,9 +51,16 @@ enum rte_intr_handle_type {struct rte_intr_handle {int fd;/**< file descriptor */ enum rte_intr_handle_type type;/**< handle type */ +#ifdef RTE_NEXT_ABI +/** +* RTE_NEXT_ABI will be removed from v2.2. +* It's only used to avoid ABI(unannounced) broken in v2.1. +* Make sure being aware of the impact before turning on the feature. +*/ int max_intr;/**< max interrupt requested */ uint32_t nb_efd;/**< number of available efds */ int *intr_vec;/**< intr vector number array */ +#endif };/**
lib/librte_eal/linuxapp/eal/eal_interrupts.c +12 -0
@@ -290,18 +290,26 @@ vfio_enable_msix(struct rte_intr_handle *intr_handle) { irq_set = (struct vfio_irq_set *) irq_set_buf; irq_set->argsz = len; +#ifdef RTE_NEXT_ABI if (!intr_handle->max_intr) intr_handle->max_intr =1 ;else if (intr_handle->max_intr >RTE_MAX_RXTX_INTR_VEC_ID ) intr_handle->max_intr =RTE_MAX_RXTX_INTR_VEC_ID +1 ; irq_set->count = intr_handle->max_intr; +#else + irq_set->count =1 ; +#endif irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD |VFIO_IRQ_SET_ACTION_TRIGGER ; irq_set->index =VFIO_PCI_MSIX_IRQ_INDEX ; irq_set->start =0 ; fd_ptr = (int *) &irq_set->data; +#ifdef RTE_NEXT_ABI memcpy (fd_ptr, intr_handle->efds,sizeof (intr_handle->efds)); fd_ptr[intr_handle->max_intr -1 ] = intr_handle->fd; +#else + fd_ptr[0 ] = intr_handle->fd; +#endif ret =ioctl (intr_handle->vfio_dev_fd,VFIO_DEVICE_SET_IRQS , irq_set);
@@ -876,6 +884,7 @@ rte_eal_intr_init(void)return -ret; } +#ifdef RTE_NEXT_ABI static void eal_intr_proc_rxtx_intr (int fd,const struct rte_intr_handle *intr_handle) {
@@ -918,6 +927,7 @@ eal_intr_proc_rxtx_intr(int fd, const struct rte_intr_handle *intr_handle) return; }while (1 ); } +#endif static int eal_epoll_process_event(struct epoll_event *evs, unsigned int n,
@@ -1056,6 +1066,7 @@ rte_epoll_ctl(int epfd, int op, int fd,return 0 ; } +#ifdef RTE_NEXT_ABI int rte_intr_rx_ctl (struct rte_intr_handle *intr_handle,int epfd,int op,unsigned int vec,void *data)
@@ -1168,3 +1179,4 @@ rte_intr_efd_disable(struct rte_intr_handle *intr_handle) intr_handle->nb_efd =0 ; intr_handle->max_intr = 0; } +#endif
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +65 -3
129 lines not on this page · raw message
lib/librte_ether/rte_ethdev.c +2 -0
@@ -3281,6 +3281,7 @@ _rte_eth_dev_callback_process(struct rte_eth_dev *dev,rte_spinlock_unlock (&rte_eth_dev_cb_lock); } +#ifdef RTE_NEXT_ABI int rte_eth_dev_rx_intr_ctl (uint8_t port_id,int epfd,int op,void *data) {
@@ -3352,6 +3353,7 @@ rte_eth_dev_rx_intr_ctl_q(uint8_t port_id, uint16_t queue_id,return 0 ; } +#endif int rte_eth_dev_rx_intr_enable(uint8_t port_id,
lib/librte_ether/rte_ethdev.h +30 -2
@@ -830,8 +830,10 @@ struct rte_eth_fdir {struct rte_intr_conf {/** enable/disable lsc interrupt. 0 (default) - disable, 1 enable */ uint16_t lsc; +#ifdef RTE_NEXT_ABI /** enable/disable rxq interrupt. 0 (default) - disable, 1 enable */ uint16_t rxq; +#endif };/**
@@ -2948,8 +2950,20 @@ int rte_eth_dev_rx_intr_disable(uint8_t port_id,* - On success, zero. * - On failure, a negative value. */ -int +#ifdef RTE_NEXT_ABI +extern int rte_eth_dev_rx_intr_ctl (uint8_t port_id,int epfd,int op,void *data); +#else +static inline int +rte_eth_dev_rx_intr_ctl (uint8_t port_id,int epfd,int op,void *data) +{ +RTE_SET_USED (port_id); +RTE_SET_USED (epfd); +RTE_SET_USED (op); +RTE_SET_USED (data); +return -1 ; +} +#endif /** * RX Interrupt control per queue.
@@ -2972,9 +2986,23 @@ rte_eth_dev_rx_intr_ctl(uint8_t port_id, int epfd, int op, void *data);* - On success, zero. * - On failure, a negative value. */ -int +#ifdef RTE_NEXT_ABI +extern int rte_eth_dev_rx_intr_ctl_q (uint8_t port_id,uint16_t queue_id,int epfd,int op,void *data); +#else +static inline int +rte_eth_dev_rx_intr_ctl_q (uint8_t port_id,uint16_t queue_id, +int epfd,int op,void *data) +{ +RTE_SET_USED (port_id); +RTE_SET_USED (queue_id); +RTE_SET_USED (epfd); +RTE_SET_USED (op); +RTE_SET_USED (data); +return -1 ; +} +#endif /** * Turn on the LED on the Ethernet device.
Signature · 1 line
1.8.1.4
Quoted 4 lines · Cunming Liang
v13 changes
- version map cleanup for v2.1
- replaceRTE_EAL_RX_INTRbyRTE_NEXT_ABIfor ABI compatibility
Please, this patchset ends with a patch that deals with ABI compatibility while it should do so on a per-patch basis.
Besides, some patches are introducing stuff that is reworked in other patches without a clear reason.
Can you rework this to ease review and ensure patch atomicity ?
Thanks.
Signature · 1 line
David Marchand
Quoted 16 lines
-----Original Message-----
From: David Marchand [mailto:[email protected]]
Sent: Thursday, July 09, 2015 9:59 PM
To: Liang, Cunming
Cc: [email protected]; Stephen Hemminger; Thomas Monjalon; Zhou, Danny; Wang, Liang-min; Richardson, Bruce; Liu, Yong; Neil Horman
Subject: Re: [PATCH v13 00/14] Interrupt mode PMDOn Fri, Jun 19, 2015 at 6:00 AM, Cunming Liang <[email protected]> wrote:
v13 changes
- version map cleanup for v2.1
- replaceRTE_EAL_RX_INTRbyRTE_NEXT_ABIfor ABI compatibilityPlease, this patchset ends with a patch that deals with ABI compatibility while it should do so on a per-patch basis. Besides, some patches are introducing stuff that is reworked in other patches without a clear reason.
Quoted 6 lines
Can you rework this to ease review and ensure patch atomicity ?
Thanks.
--
David Marchand
Will split it, thanks.
v14 cover Interrupt mode PMD
In reply to Cunming Liangv14 changes
- per-patch basis ABI compatibility rework
- remove unnecessary 'local: *' from version map
- minor comments rework
v13 changes
- version map cleanup for v2.1
- replace RTE_EAL_RX_INTR by RTE_NEXT_ABI for ABI compatibility
Patch series v12
v12 changes
- bsd cleanup for unused variable warning
- fix awkward line split in debug message
v11 changes
- typo cleanup and check kernel style
v10 changes
- code rework to return actual error code
- bug fix for lsc when using uio_pci_generic
v9 changes
- code rework to fix open comment
- bug fix for igb lsc when both lsc and rxq are enabled in vfio-msix
- new patch to turn off the feature by default so as to avoid v2.1 abi broken
v8 changes
- remove condition check for only vfio-msix
- add multiplex intr support when only one intr vector allowed
- lsc and rxq interrupt runtime enable decision
- add safe event delete while the event wakeup execution happens
v7 changes
- decouple epoll event and intr operation
- add condition check in the case intr vector is disabled
- renaming some APIs
v6 changes
- split rte_intr_wait_rx_pkt into two APIs 'wait' and 'set'.
- rewrite rte_intr_rx_wait/rte_intr_rx_set.
- using vector number instead of queue_id as interrupt API params.
- patch reorder and split.
v5 changes
- Rebase the patchset onto the HEAD
- Isolate ethdev from EAL for new-added wait-for-rx interrupt function
- Export wait-for-rx interrupt function for shared libraries
- Split-off a new patch file for changed struct rte_intr_handle that other patches depend on, to avoid breaking git bisect
- Change sample applicaiton to accomodate EAL function spec change accordingly
v4 changes
- Export interrupt enable/disable functions for shared libraries
- Adjust position of new-added structure fields and functions to avoid breaking ABI
v3 changes
- Add return value for interrupt enable/disable functions
- Move spinlok from PMD to L3fwd-power
- Remove unnecessary variables in e1000_mac_info
- Fix miscelleous review comments
v2 changes
- Fix compilation issue in Makefile for missed header file.
- Consolidate internal and community review comments of v1 patch set.
The patch series introduce low-latency one-shot rx interrupt into DPDK with polling and interrupt mode switch control example.
DPDK userspace interrupt notification and handling mechanism is based on UIO with below limitation:
1) It is designed to handle LSC interrupt only with inefficient suspended pthread wakeup procedure (e.g. UIO wakes up LSC interrupt handling thread which then wakes up DPDK polling thread). In this way, it introduces non-deterministic wakeup latency for DPDK polling thread as well as packet latency if it is used to handle Rx interrupt.
2) UIO only supports a single interrupt vector which has to been shared by LSC interrupt and interrupts assigned to dedicated rx queues.
This patchset includes below features:
1) Enable one-shot rx queue interrupt in ixgbe PMD(PF & VF) and igb PMD(PF only) .
2) Build on top of the VFIO mechanism instead of UIO, so it could support up to 64 interrupt vectors for rx queue interrupts.
3) Have 1 DPDK polling thread handle per Rx queue interrupt with a dedicated VFIO eventfd, which eliminates non-deterministic pthread wakeup latency in user space.
4) Demonstrate interrupts control APIs and userspace NAIP-like polling/interrupt switch algorithms in L3fwd-power example.
Known limitations:
1) It does not work for UIO due to a single interrupt eventfd shared by LSC and rx queue interrupt handlers causes a mess. [FIXED]
2) LSC interrupt is not supported by VF driver, so it is by default disabled in L3fwd-power now. Feel free to turn in on if you want to support both LSC and rx queue interrupts on a PF.
Cunming Liang (13):
eal/linux: add interrupt vectors support in intr_handle eal/linux: add rte_epoll_wait/ctl support
eal/linux: add API to set rx interrupt event monitor eal/linux: fix comments typo on vfio msi
eal/linux: map eventfd to VFIO MSI-X intr vector eal/linux: standalone intr event fd create support eal/linux: fix lsc read error in uio_pci_generic
eal/bsd: dummy for new intr definition
eal/bsd: fix inappropriate linuxapp referred in bsd
ethdev: add rx intr enable, disable and ctl functions
ixgbe: enable rx queue interrupts for both PF and VF
igb: enable rx queue interrupts for PF
l3fwd-power: enable one-shot rx interrupt and polling/interrupt mode
switch
drivers/net/e1000/igb_ethdev.c | 311 ++++++++++-- drivers/net/ixgbe/ixgbe_ethdev.c | 527 ++++++++++++++++++++- drivers/net/ixgbe/ixgbe_ethdev.h | 4 + examples/l3fwd-power/main.c | 202 ++++++-- lib/librte_eal/bsdapp/eal/eal_interrupts.c | 28 ++ .../bsdapp/eal/include/exec-env/rte_interrupts.h | 91 +++- lib/librte_eal/bsdapp/eal/rte_eal_version.map | 5 + lib/librte_eal/linuxapp/eal/eal_interrupts.c | 362 ++++++++++++-- .../linuxapp/eal/include/exec-env/rte_interrupts.h | 218 +++++++++ lib/librte_eal/linuxapp/eal/rte_eal_version.map | 8 + lib/librte_ether/rte_ethdev.c | 109 +++++ lib/librte_ether/rte_ethdev.h | 154 ++++++ lib/librte_ether/rte_ether_version.map | 4 + 13 files changed, 1895 insertions(+), 128 deletions(-)
Signature · 1 line
1.8.1.4
PATCH v14 1/13 eal/linux: add interrupt vectors support in intr_handle
The patch adds interrupt vectors support in rte_intr_handle.
'vec_en' is set when interrupt vectors are detected and associated event fds are set. Those event fds are stored in efds[].
'intr_vec' is reserved for device driver to initialize the vector mapping table.
---
v14 changes
- per-patch basis ABI compatibility rework
v7 changes:
- add eptrs[], it's used to store the register rte_epoll_event instances.
- add vec_en, to log the vector capability status.
v6 changes:
- add mapping table between irq vector number and queue id.
v5 changes:
- Create this new patch file for changed struct rte_intr_handle that other patches depend on, to avoid breaking git bisect.
.../linuxapp/eal/include/exec-env/rte_interrupts.h | 13 +++++++++++++ 1 file changed, 13 insertions(+)
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +13 -0
@@ -38,6 +38,8 @@#ifndef _RTE_LINUXAPP_INTERRUPTS_H_#define _RTE_LINUXAPP_INTERRUPTS_H_ +#define RTE_MAX_RXTX_INTR_VEC_ID 32 +enum rte_intr_handle_type {RTE_INTR_HANDLE_UNKNOWN =0 , RTE_INTR_HANDLE_UIO, /**< uio device handle */
@@ -58,6 +60,17 @@ struct rte_intr_handle { };int fd;/**< interrupt event file descriptor */ enum rte_intr_handle_type type;/**< handle type */ +#ifdef RTE_NEXT_ABI +/** +* RTE_NEXT_ABI will be removed from v2.2. +* It's only used to avoid ABI(unannounced) broken in v2.1. +* Make sure being aware of the impact before turning on the feature. +*/ +uint32_t max_intr;/**< max interrupt requested */ +uint32_t nb_efd;/**< number of available efd(event fd) */ +int efds[RTE_MAX_RXTX_INTR_VEC_ID ];/**< intr vectors/efds mapping */ +int *intr_vec;/**< intr vector number array */ +#endif };#endif /* _RTE_LINUXAPP_INTERRUPTS_H_ */
Signature · 1 line
1.8.1.4
Re: [PATCH v14 01/13] eal/linux: add interrupt vectors support in intr_handle
2015-07-17 14:16, Cunming Liang:
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h struct rte_intr_handle { · line 68
Quoted 6 lines
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +6
-0+#ifdef RTE_NEXT_ABI +/** +* RTE_NEXT_ABI will be removed from v2.2. +* It's only used to avoid ABI(unannounced) broken in v2.1. +* Make sure being aware of the impact before turning on the feature. +*/
We are not going to put this comment each time NEXT_ABI is used with ifdef.
Re: [PATCH v14 01/13] eal/linux: add interrupt vectors support in intr_handle
Quoted 8 lines · Thomas Monjalon
2015-07-17 14:16, Cunming Liang:
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h struct rte_intr_handle { · line 68
Quoted 6 lines
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +6
-0+#ifdef RTE_NEXT_ABI +/** +* RTE_NEXT_ABI will be removed from v2.2. +* It's only used to avoid ABI(unannounced) broken in v2.1. +* Make sure being aware of the impact before turning on the feature. +*/ We are not going to put this comment each time
NEXT_ABIis used with ifdef.
Ok, will remove the comment.
PATCH v14 2/13 eal/linux: add rte_epoll_wait/ctl support
In reply to Cunming LiangThe patch adds 'rte_epoll_wait' and 'rte_epoll_ctl' for async event wakeup.
It defines 'struct rte_epoll_event' as the event param.
When the event fds add to a specified epoll instance, 'eptrs' will hold the rte_epoll_event object pointer. The 'op' uses the same enum as epoll_wait/ctl does.
The epoll event support to carry a raw user data and to register a callback which is executed during wakeup.
---
v14 changes
- per-patch basis ABI compatibility rework
- remove unnecessary 'local: *' from version map
v13 changes
- version map cleanup for v2.1
v11 changes
- cleanup spelling error
v9 changes
- rework on coding style
v8 changes
- support delete event in safety during the wakeup execution
- add EINTR process during epoll_wait
v7 changes
- split v6[4/8] into two patches, one for epoll event(this one) another for rx intr(next patch)
- introduce rte_epoll_event definition
- rte_epoll_wait/ctl for more generic RTE epoll API
v6 changes
- split rte_intr_wait_rx_pkt into two function, wait and set.
- rewrite rte_intr_rx_wait/rte_intr_rx_set to remove queue visibility on eal.
- rte_intr_rx_wait to support multiplexing.
- allow epfd as input to support flexible event fd combination.
lib/librte_eal/linuxapp/eal/eal_interrupts.c | 139 +++++++++++++++++++++ .../linuxapp/eal/include/exec-env/rte_interrupts.h | 80 ++++++++++++ lib/librte_eal/linuxapp/eal/rte_eal_version.map | 3 + 3 files changed, 222 insertions(+)
lib/librte_eal/linuxapp/eal/eal_interrupts.c +139 -0
@@ -69,6 +69,8 @@#define EAL_INTR_EPOLL_WAIT_FOREVER (-1) +static RTE_DEFINE_PER_LCORE(int, _epfd) = -1; /**< epoll fd per thread */ +/** * union for pipe fds. */
@@ -894,3 +896,140 @@ rte_eal_intr_init(void)return -ret; } + +static int +eal_epoll_process_event (struct epoll_event *evs,unsigned int n, +struct rte_epoll_event *events) +{ +unsigned int i, count =0 ; +struct rte_epoll_event *rev; + +for (i =0 ; i < n; i++) { + rev = evs[i].data.ptr; +if (!rev || !rte_atomic32_cmpset (&rev->status,RTE_EPOLL_VALID , +RTE_EPOLL_EXEC )) +continue ; + + events[count].status =RTE_EPOLL_VALID ; + events[count].fd = rev->fd; + events[count].epfd = rev->epfd; + events[count].epdata.event = rev->epdata.event; + events[count].epdata.data = rev->epdata.data; +if (rev->epdata.cb_fun) + rev->epdata.cb_fun (rev->fd, + rev->epdata.cb_arg); + +rte_compiler_barrier (); + rev->status =RTE_EPOLL_VALID ; + count++; + } +return count; +} + +static inline int +eal_init_tls_epfd (void ) +{ +int pfd =epoll_create (255 ); + +if (pfd <0 ) { +RTE_LOG (ERR ,EAL , +"Cannot create epoll instance\n" ); +return -1 ; + } +return pfd; +} + +int +rte_intr_tls_epfd (void ) +{ +if (RTE_PER_LCORE (_epfd) ==-1 ) +RTE_PER_LCORE (_epfd) =eal_init_tls_epfd (); + +return RTE_PER_LCORE (_epfd); +} + +int +rte_epoll_wait (int epfd,struct rte_epoll_event *events, +int maxevents,int timeout) +{ +struct epoll_event evs[maxevents]; +int rc; + +if (!events) { +RTE_LOG (ERR ,EAL ,"rte_epoll_event can't be NULL\n" ); +return -1 ; + } + +/* using per thread epoll fd */ +if (epfd ==RTE_EPOLL_PER_THREAD ) + epfd =rte_intr_tls_epfd (); + +while (1 ) { + rc =epoll_wait (epfd, evs, maxevents, timeout); +if (likely (rc >0 )) { +/* epoll_wait has at least one fd ready to read */ + rc =eal_epoll_process_event (evs, rc, events); +break ; + }else if (rc <0 ) { +if (errno ==EINTR ) +continue ; +/* epoll_wait fail */ +RTE_LOG (ERR ,EAL ,"epoll_wait returns with fail %s\n" , +strerror (errno)); + rc =-1 ; +break ; + } + } + +return rc; +} + +static inline void +eal_epoll_data_safe_free (struct rte_epoll_event *ev) +{ +while (!rte_atomic32_cmpset (&ev->status,RTE_EPOLL_VALID , +RTE_EPOLL_INVALID )) +while (ev->status !=RTE_EPOLL_VALID ) +rte_pause (); +memset (&ev->epdata,0 ,sizeof (ev->epdata)); + ev->fd =-1 ; + ev->epfd =-1 ; +} + +int +rte_epoll_ctl (int epfd,int op,int fd, +struct rte_epoll_event *event) +{ +struct epoll_event ev; + +if (!event) { +RTE_LOG (ERR ,EAL ,"rte_epoll_event can't be NULL\n" ); +return -1 ; + } + +/* using per thread epoll fd */ +if (epfd ==RTE_EPOLL_PER_THREAD ) + epfd =rte_intr_tls_epfd (); + +if (op ==EPOLL_CTL_ADD ) { + event->status =RTE_EPOLL_VALID ; + event->fd = fd;/* ignore fd in event */ + event->epfd = epfd; + ev.data.ptr = (void *)event; + } + + ev.events = event->epdata.event; +if (epoll_ctl (epfd, op, fd, &ev) <0 ) { +RTE_LOG (ERR ,EAL ,"Error op %d fd %d epoll_ctl, %s\n" , + op, fd,strerror (errno)); +if (op ==EPOLL_CTL_ADD ) +/* rollback status when CTL_ADD fail */ + event->status =RTE_EPOLL_INVALID ; +return -1 ; + } + +if (op ==EPOLL_CTL_DEL && event->status !=RTE_EPOLL_INVALID ) +eal_epoll_data_safe_free (event); + +return 0 ; +}
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +80 -0
94 lines not on this page · raw message
lib/librte_eal/linuxapp/eal/rte_eal_version.map +3 -0
@@ -115,5 +115,8 @@ DPDK_2.0 { DPDK_2.1 { global: + rte_epoll_ctl; + rte_epoll_wait; + rte_intr_tls_epfd; rte_memzone_free; } DPDK_2.0;
Signature · 1 line
1.8.1.4
PATCH v14 3/13 eal/linux: add API to set rx interrupt event monitor
In reply to Cunming LiangThe patch adds 'rte_intr_rx_ctl' to add or delete interrupt vector events monitor on specified epoll instance.
---
v14 changes
- per-patch basis ABI compatibility rework
- remove unnecessary 'local: *' from version map
v13 changes
- version map cleanup for v2.1
v12 changes:
- fix awkward line split in using RTE_LOG
v10 changes:
- add RTE_INTR_HANDLE_UIO_INTX for uio_pci_generic
v8 changes
- fix EWOULDBLOCK and EINTR processing
- add event status check
v7 changes
- rename rte_intr_rx_set to rte_intr_rx_ctl.
- rte_intr_rx_ctl uses rte_epoll_ctl to register epoll event instance.
- the intr rx event instance includes a intr process callback.
v6 changes
- split rte_intr_wait_rx_pkt into two function, wait and set.
- rewrite rte_intr_rx_wait/rte_intr_rx_set to remove queue visibility on eal.
- rte_intr_rx_wait to support multiplexing.
- allow epfd as input to support flexible event fd combination.
lib/librte_eal/linuxapp/eal/eal_interrupts.c | 105 +++++++++++++++++++++ .../linuxapp/eal/include/exec-env/rte_interrupts.h | 38 ++++++++ lib/librte_eal/linuxapp/eal/rte_eal_version.map | 1 + 3 files changed, 144 insertions(+)
lib/librte_eal/linuxapp/eal/eal_interrupts.c +105 -0
@@ -897,6 +897,51 @@ rte_eal_intr_init(void)return -ret; } +#ifdef RTE_NEXT_ABI +static void +eal_intr_proc_rxtx_intr (int fd,const struct rte_intr_handle *intr_handle) +{ +union rte_intr_read_buffer buf; +int bytes_read =1 ; + +switch (intr_handle->type) { +case RTE_INTR_HANDLE_UIO : +case RTE_INTR_HANDLE_UIO_INTX : + bytes_read =sizeof (buf.uio_intr_count); +break ; +#ifdef VFIO_PRESENT +case RTE_INTR_HANDLE_VFIO_MSIX : +case RTE_INTR_HANDLE_VFIO_MSI : +case RTE_INTR_HANDLE_VFIO_LEGACY : + bytes_read =sizeof (buf.vfio_intr_count); +break ; +#endif +default : + bytes_read =1 ; +RTE_LOG (INFO ,EAL ,"unexpected intr type\n" ); +break ; + } + +/** +* read out to clear the ready-to-be-read flag +* for epoll_wait. +*/ +do { + bytes_read =read (fd, &buf, bytes_read); +if (bytes_read <0 ) { +if (errno ==EINTR || errno ==EWOULDBLOCK || + errno ==EAGAIN ) +continue ; +RTE_LOG (ERR ,EAL , +"Error reading from fd %d: %s\n" , + fd,strerror (errno)); + }else if (bytes_read ==0 ) +RTE_LOG (ERR ,EAL ,"Read nothing from fd %d\n" , fd); +return ; + }while (1 ); +} +#endif +static int eal_epoll_process_event (struct epoll_event *evs,unsigned int n,struct rte_epoll_event *events)
@@ -1033,3 +1078,63 @@ rte_epoll_ctl(int epfd, int op, int fd,return 0 ; } + +#ifdef RTE_NEXT_ABI +int +rte_intr_rx_ctl (struct rte_intr_handle *intr_handle,int epfd, +int op,unsigned int vec,void *data) +{ +struct rte_epoll_event *rev; +struct rte_epoll_data *epdata; +int epfd_op; +int rc =0 ; + +if (!intr_handle || intr_handle->nb_efd ==0 || + vec >= intr_handle->nb_efd) { +RTE_LOG (ERR ,EAL ,"Wrong intr vector number.\n" ); +return -EPERM ; + } + +switch (op) { +case RTE_INTR_EVENT_ADD : + epfd_op =EPOLL_CTL_ADD ; + rev = &intr_handle->elist[vec]; +if (rev->status !=RTE_EPOLL_INVALID ) { +RTE_LOG (INFO ,EAL ,"Event already been added.\n" ); +return -EEXIST ; + } + +/* attach to intr vector fd */ + epdata = &rev->epdata; + epdata->event =EPOLLIN |EPOLLPRI |EPOLLET ; + epdata->data = data; + epdata->cb_fun = (rte_intr_event_cb_t )eal_intr_proc_rxtx_intr; + epdata->cb_arg = (void *)intr_handle; + rc =rte_epoll_ctl (epfd, epfd_op, intr_handle->efds[vec], rev); +if (!rc) +RTE_LOG (DEBUG ,EAL , +"efd %d associated with vec %d added on epfd %d" +"\n" , rev->fd, vec, epfd); +else + rc = -EPERM ; +break ; +case RTE_INTR_EVENT_DEL : + epfd_op =EPOLL_CTL_DEL ; + rev = &intr_handle->elist[vec]; +if (rev->status ==RTE_EPOLL_INVALID ) { +RTE_LOG (INFO ,EAL ,"Event does not exist.\n" ); +return -EPERM ; + } + + rc =rte_epoll_ctl (rev->epfd, epfd_op, rev->fd, rev); +if (rc) + rc = -EPERM ; +break ; +default : +RTE_LOG (ERR ,EAL ,"event op type mismatch\n" ); + rc = -EPERM ; + } + +return rc; +} +#endif
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +38 -0
@@ -38,6 +38,10 @@#ifndef _RTE_LINUXAPP_INTERRUPTS_H_#define _RTE_LINUXAPP_INTERRUPTS_H_ +#ifndef RTE_NEXT_ABI +#include <rte_common.h> +#endif +#define RTE_MAX_RXTX_INTR_VEC_ID 32 enum rte_intr_handle_type {
@@ -153,4 +157,38 @@ rte_epoll_ctl(int epfd, int op, int fd,int rte_intr_tls_epfd (void ); +/** +* @param intr_handle +* Pointer to the interrupt handle. +* @param epfd +* Epoll instance fd which the intr vector associated to. +* @param op +* The operation be performed for the vector. +* Operation type of {ADD, DEL}. +* @param vec +* RX intr vector number added to the epoll instance wait list. +* @param data +* User raw data. +* @return +* - On success, zero. +* - On failure, a negative value. +*/ +#ifdef RTE_NEXT_ABI +extern int +rte_intr_rx_ctl (struct rte_intr_handle *intr_handle, +int epfd,int op,unsigned int vec,void *data); +#else +static inline int +rte_intr_rx_ctl (struct rte_intr_handle *intr_handle, +int epfd,int op,unsigned int vec,void *data) +{ +RTE_SET_USED (intr_handle); +RTE_SET_USED (epfd); +RTE_SET_USED (op); +RTE_SET_USED (vec); +RTE_SET_USED (data); +return -ENOTSUP ; +} +#endif +#endif /* _RTE_LINUXAPP_INTERRUPTS_H_ */
lib/librte_eal/linuxapp/eal/rte_eal_version.map +1 -0
@@ -117,6 +117,7 @@ DPDK_2.1 { rte_epoll_ctl; rte_epoll_wait; + rte_intr_rx_ctl; rte_intr_tls_epfd; rte_memzone_free; } DPDK_2.0;
Signature · 1 line
1.8.1.4
PATCH v14 4/13 eal/linux: fix comments typo on vfio msi
In reply to Cunming Liang--- lib/librte_eal/linuxapp/eal/eal_interrupts.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
lib/librte_eal/linuxapp/eal/eal_interrupts.c +2 -2
@@ -219,7 +219,7 @@ vfio_disable_intx(struct rte_intr_handle *intr_handle) {return 0 ; } -/* enable MSI-X interrupts */ +/* enable MSI interrupts */ static int vfio_enable_msi (struct rte_intr_handle *intr_handle) {int len, ret;
@@ -265,7 +265,7 @@ vfio_enable_msi(struct rte_intr_handle *intr_handle) {return 0 ; } -/* disable MSI-X interrupts */ +/* disable MSI interrupts */ static int vfio_disable_msi (struct rte_intr_handle *intr_handle) {struct vfio_irq_set *irq_set;
Signature · 1 line
1.8.1.4
PATCH v14 5/13 eal/linux: map eventfd to VFIO MSI-X intr vector
In reply to Cunming LiangThe patch assigns event fds to each vfio msix interrupt vector by ioctl.
---
v14 changes
- per-patch basis ABI compatibility rework
- reword commit comments
v8 changes
- move eventfd creation out of the setup_interrupts to a standalone function
v7 changes
- cleanup unnecessary code change
- split event and intr operation to other patches
lib/librte_eal/linuxapp/eal/eal_interrupts.c | 56 ++++++++++------------------ 1 file changed, 20 insertions(+), 36 deletions(-)
lib/librte_eal/linuxapp/eal/eal_interrupts.c +20 -36
@@ -128,6 +128,9 @@ static pthread_t intr_thread;#ifdef VFIO_PRESENT #define IRQ_SET_BUF_LEN (sizeof(struct vfio_irq_set) + sizeof(int)) +/* irq set buffer length for queue interrupts and LSC interrupt */ +#define MSIX_IRQ_SET_BUF_LEN (sizeof(struct vfio_irq_set) + \ + sizeof(int) * (RTE_MAX_RXTX_INTR_VEC_ID + 1))/* enable legacy (INTx) interrupts */ static int
@@ -245,23 +248,6 @@ vfio_enable_msi(struct rte_intr_handle *intr_handle) { intr_handle->fd);return -1 ; } - -/* manually trigger interrupt to enable it */ -memset (irq_set,0 , len); - len =sizeof (struct vfio_irq_set ); - irq_set->argsz = len; - irq_set->count =1 ; - irq_set->flags =VFIO_IRQ_SET_DATA_NONE |VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_PCI_MSI_IRQ_INDEX ; - irq_set->start =0 ; - - ret =ioctl (intr_handle->vfio_dev_fd,VFIO_DEVICE_SET_IRQS , irq_set); - -if (ret) { -RTE_LOG (ERR ,EAL ,"Error triggering MSI interrupts for fd %d\n" , - intr_handle->fd); -return -1 ; - }return 0 ; }
@@ -294,7 +280,7 @@ vfio_disable_msi(struct rte_intr_handle *intr_handle) {static int vfio_enable_msix (struct rte_intr_handle *intr_handle) {int len, ret; -char irq_set_buf[IRQ_SET_BUF_LEN ]; +char irq_set_buf[MSIX_IRQ_SET_BUF_LEN ];struct vfio_irq_set *irq_set;int *fd_ptr;
@@ -302,12 +288,26 @@ vfio_enable_msix(struct rte_intr_handle *intr_handle) { irq_set = (struct vfio_irq_set *) irq_set_buf; irq_set->argsz = len; +#ifdef RTE_NEXT_ABI +if (!intr_handle->max_intr) + intr_handle->max_intr =1 ; +else if (intr_handle->max_intr >RTE_MAX_RXTX_INTR_VEC_ID ) + intr_handle->max_intr =RTE_MAX_RXTX_INTR_VEC_ID +1 ; + + irq_set->count = intr_handle->max_intr; +#else irq_set->count =1 ; +#endif irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD |VFIO_IRQ_SET_ACTION_TRIGGER ; irq_set->index =VFIO_PCI_MSIX_IRQ_INDEX ; irq_set->start =0 ; fd_ptr = (int *) &irq_set->data; - *fd_ptr = intr_handle->fd; +#ifdef RTE_NEXT_ABI +memcpy (fd_ptr, intr_handle->efds,sizeof (intr_handle->efds)); + fd_ptr[intr_handle->max_intr -1 ] = intr_handle->fd; +#else + fd_ptr[0 ] = intr_handle->fd; +#endif ret =ioctl (intr_handle->vfio_dev_fd,VFIO_DEVICE_SET_IRQS , irq_set);
@@ -317,22 +317,6 @@ vfio_enable_msix(struct rte_intr_handle *intr_handle) {return -1 ; } -/* manually trigger interrupt to enable it */ -memset (irq_set,0 , len); - len =sizeof (struct vfio_irq_set ); - irq_set->argsz = len; - irq_set->count =1 ; - irq_set->flags =VFIO_IRQ_SET_DATA_NONE |VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_PCI_MSIX_IRQ_INDEX ; - irq_set->start =0 ; - - ret =ioctl (intr_handle->vfio_dev_fd,VFIO_DEVICE_SET_IRQS , irq_set); - -if (ret) { -RTE_LOG (ERR ,EAL ,"Error triggering MSI-X interrupts for fd %d\n" , - intr_handle->fd); -return -1 ; - }return 0 ; }
@@ -340,7 +324,7 @@ vfio_enable_msix(struct rte_intr_handle *intr_handle) {static int vfio_disable_msix (struct rte_intr_handle *intr_handle) {struct vfio_irq_set *irq_set; -char irq_set_buf[IRQ_SET_BUF_LEN ]; +char irq_set_buf[MSIX_IRQ_SET_BUF_LEN ];int len, ret; len =sizeof (struct vfio_irq_set );
Signature · 1 line
1.8.1.4
PATCH v14 6/13 eal/linux: standalone intr event fd create support
In reply to Cunming LiangThe patch exposes intr event fd create and release for PMD.
The device driver can assign the number of event associated with interrupt vector. It also provides misc functions to check 1) allows other slowpath intr(e.g. lsc);
2) intr event on fastpath is enabled or not.
---
v14 changes
- per-patch basis ABI compatibility rework
- minor changes on API decription comments
v13 changes
- version map cleanup for v2.1
v11 changes
- typo cleanup
lib/librte_eal/linuxapp/eal/eal_interrupts.c | 57 ++++++++++++++ .../linuxapp/eal/include/exec-env/rte_interrupts.h | 87 ++++++++++++++++++++++ lib/librte_eal/linuxapp/eal/rte_eal_version.map | 4 + 3 files changed, 148 insertions(+)
lib/librte_eal/linuxapp/eal/eal_interrupts.c +57 -0
@@ -44,6 +44,7 @@#include <sys/epoll.h> #include <sys/signalfd.h> #include <sys/ioctl.h> +#include <sys/eventfd.h> #include <rte_common.h> #include <rte_interrupts.h>
@@ -68,6 +69,7 @@#include "eal_vfio.h" #define EAL_INTR_EPOLL_WAIT_FOREVER (-1) +#define NB_OTHER_INTR 1 static RTE_DEFINE_PER_LCORE(int, _epfd) = -1; /**< epoll fd per thread */
@@ -1121,4 +1123,59 @@ rte_intr_rx_ctl(struct rte_intr_handle *intr_handle, int epfd,return rc; } + +int +rte_intr_efd_enable (struct rte_intr_handle *intr_handle,uint32_t nb_efd) +{ +uint32_t i; +int fd; +uint32_t n =RTE_MIN (nb_efd, (uint32_t )RTE_MAX_RXTX_INTR_VEC_ID ); + +if (intr_handle->type ==RTE_INTR_HANDLE_VFIO_MSIX ) { +for (i =0 ; i < n; i++) { + fd =eventfd (0 ,EFD_NONBLOCK |EFD_CLOEXEC ); +if (fd <0 ) { +RTE_LOG (ERR ,EAL , +"cannot setup eventfd," +"error %i (%s)\n" , + errno,strerror (errno)); +return -1 ; + } + intr_handle->efds[i] = fd; + } + intr_handle->nb_efd = n; + intr_handle->max_intr =NB_OTHER_INTR + n; + }else { + intr_handle->efds[0 ] = intr_handle->fd; + intr_handle->nb_efd =RTE_MIN (nb_efd,1U ); + intr_handle->max_intr =NB_OTHER_INTR ; + } + +return 0 ; +} + +void +rte_intr_efd_disable (struct rte_intr_handle *intr_handle) +{ +uint32_t i; +struct rte_epoll_event *rev; + +for (i =0 ; i < intr_handle->nb_efd; i++) { + rev = &intr_handle->elist[i]; +if (rev->status ==RTE_EPOLL_INVALID ) +continue ; +if (rte_epoll_ctl (rev->epfd,EPOLL_CTL_DEL , rev->fd, rev)) { +/* force free if the entry valid */ +eal_epoll_data_safe_free (rev); + rev->status =RTE_EPOLL_INVALID ; + } + } + +if (intr_handle->max_intr > intr_handle->nb_efd) { +for (i =0 ; i < intr_handle->nb_efd; i++) +close (intr_handle->efds[i]); + } + intr_handle->nb_efd =0 ; + intr_handle->max_intr =0 ; +}#endif
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +87 -0
91 lines not on this page · raw message
lib/librte_eal/linuxapp/eal/rte_eal_version.map +4 -0
@@ -117,6 +117,10 @@ DPDK_2.1 { rte_epoll_ctl; rte_epoll_wait; + rte_intr_allow_others; + rte_intr_dp_is_en; + rte_intr_efd_enable; + rte_intr_efd_disable; rte_intr_rx_ctl; rte_intr_tls_epfd; rte_memzone_free;
Signature · 1 line
1.8.1.4
Re: [PATCH v14 06/13] eal/linux: standalone intr event fd create support
2015-07-17 14:16, Cunming Liang:
Quoted 12 lines
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +12
-0+#ifdef RTE_NEXT_ABI +extern int +rte_intr_efd_enable (struct rte_intr_handle *intr_handle,uint32_t nb_efd); +#else +static inline int +rte_intr_efd_enable (struct rte_intr_handle *intr_handle,uint32_t nb_efd) +{ +RTE_SET_USED (intr_handle); +RTE_SET_USED (nb_efd); +return 0 ; +} +#endif
[...]
Quoted 10 lines
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +10
-0+#ifdef RTE_NEXT_ABI +extern void +rte_intr_efd_disable (struct rte_intr_handle *intr_handle); +#else +static inline void +rte_intr_efd_disable (struct rte_intr_handle *intr_handle) +{ +RTE_SET_USED (intr_handle); +} +#endif
[...]
Quoted 14 lines
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +14
-0+#ifdef RTE_NEXT_ABI +static inline int +rte_intr_dp_is_en (struct rte_intr_handle *intr_handle) +{ +return !(!intr_handle->nb_efd); +} +#else +static inline int +rte_intr_dp_is_en (struct rte_intr_handle *intr_handle) +{ +RTE_SET_USED (intr_handle); +return 0 ; +} +#endif
[...]
Quoted 4 lines
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +4
-0+#ifdef RTE_NEXT_ABI +static inline int +rte_intr_allow_others (struct rte_intr_handle *intr_handle) +{
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h rte_intr_rx_ctl(struct rte_intr_handle *intr_handle, · line 279
Quoted 10 lines
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +10
-0+ return !!(intr_handle->max_intr - intr_handle->nb_efd); +} +#else +static inline int +rte_intr_allow_others (struct rte_intr_handle *intr_handle) +{ +RTE_SET_USED (intr_handle); +return 1 ; +} +#endif
Why these #else cases?
lib/librte_eal/linuxapp/eal/rte_eal_version.map DPDK_2.1 { · line 123
Quoted 10 lines
lib/librte_eal/linuxapp/eal/rte_eal_version.map +4
-0@@ -117,6 +117,10 @@ DPDK_2.1 { rte_epoll_ctl; rte_epoll_wait; + rte_intr_allow_others; + rte_intr_dp_is_en; + rte_intr_efd_enable; + rte_intr_efd_disable;
If RTE_NEXT_ABI is disabled, these symbols do not exist. An alternate .map would be needed.
Re: [PATCH v14 06/13] eal/linux: standalone intr event fd create support
2015-07-20 01:35, Thomas Monjalon:
Quoted 40 lines
2015-07-17 14:16, Cunming Liang:
Quoted 12 lines
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +12
-0+#ifdef RTE_NEXT_ABI +extern int +rte_intr_efd_enable (struct rte_intr_handle *intr_handle,uint32_t nb_efd); +#else +static inline int +rte_intr_efd_enable (struct rte_intr_handle *intr_handle,uint32_t nb_efd) +{ +RTE_SET_USED (intr_handle); +RTE_SET_USED (nb_efd); +return 0 ; +} +#endif [...]
Quoted 10 lines
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +10
-0+#ifdef RTE_NEXT_ABI +extern void +rte_intr_efd_disable (struct rte_intr_handle *intr_handle); +#else +static inline void +rte_intr_efd_disable (struct rte_intr_handle *intr_handle) +{ +RTE_SET_USED (intr_handle); +} +#endif [...]
Quoted 14 lines
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +14
-0+#ifdef RTE_NEXT_ABI +static inline int +rte_intr_dp_is_en (struct rte_intr_handle *intr_handle) +{ +return !(!intr_handle->nb_efd); +} +#else +static inline int +rte_intr_dp_is_en (struct rte_intr_handle *intr_handle) +{ +RTE_SET_USED (intr_handle); +return 0 ; +} +#endif [...]
Quoted 16 lines
Quoted 4 lines
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +4
-0+#ifdef RTE_NEXT_ABI +static inline int +rte_intr_allow_others (struct rte_intr_handle *intr_handle) +{lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h rte_intr_rx_ctl(struct rte_intr_handle *intr_handle, · line 279
Quoted 10 lines
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +10
-0+ return !!(intr_handle->max_intr - intr_handle->nb_efd); +} +#else +static inline int +rte_intr_allow_others (struct rte_intr_handle *intr_handle) +{ +RTE_SET_USED (intr_handle); +return 1 ; +} +#endif Why these #else cases?
Why not totally removing these ifdef in the header and use them in .c?
Quoted 13 lines
lib/librte_eal/linuxapp/eal/rte_eal_version.map DPDK_2.1 { · line 123
Quoted 10 lines
lib/librte_eal/linuxapp/eal/rte_eal_version.map +4
-0@@ -117,6 +117,10 @@ DPDK_2.1 { rte_epoll_ctl; rte_epoll_wait; + rte_intr_allow_others; + rte_intr_dp_is_en; + rte_intr_efd_enable; + rte_intr_efd_disable;If
RTE_NEXT_ABIis disabled, these symbols do not exist. An alternate .map would be needed.
Re: [PATCH v14 06/13] eal/linux: standalone intr event fd create support
Quoted 56 lines · Thomas Monjalon
2015-07-20 01:35, Thomas Monjalon:
Quoted 40 lines
2015-07-17 14:16, Cunming Liang:
Quoted 12 lines
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +12
-0+#ifdef RTE_NEXT_ABI +extern int +rte_intr_efd_enable (struct rte_intr_handle *intr_handle,uint32_t nb_efd); +#else +static inline int +rte_intr_efd_enable (struct rte_intr_handle *intr_handle,uint32_t nb_efd) +{ +RTE_SET_USED (intr_handle); +RTE_SET_USED (nb_efd); +return 0 ; +} +#endif [...]
Quoted 10 lines
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +10
-0+#ifdef RTE_NEXT_ABI +extern void +rte_intr_efd_disable (struct rte_intr_handle *intr_handle); +#else +static inline void +rte_intr_efd_disable (struct rte_intr_handle *intr_handle) +{ +RTE_SET_USED (intr_handle); +} +#endif [...]
Quoted 14 lines
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +14
-0+#ifdef RTE_NEXT_ABI +static inline int +rte_intr_dp_is_en (struct rte_intr_handle *intr_handle) +{ +return !(!intr_handle->nb_efd); +} +#else +static inline int +rte_intr_dp_is_en (struct rte_intr_handle *intr_handle) +{ +RTE_SET_USED (intr_handle); +return 0 ; +} +#endif [...]
Quoted 15 lines
Quoted 4 lines
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +4
-0+#ifdef RTE_NEXT_ABI +static inline int +rte_intr_allow_others (struct rte_intr_handle *intr_handle) +{lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h rte_intr_rx_ctl(struct rte_intr_handle *intr_handle, · line 279
Quoted 10 lines
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +10
-0+ return !!(intr_handle->max_intr - intr_handle->nb_efd); +} +#else +static inline int +rte_intr_allow_others (struct rte_intr_handle *intr_handle) +{ +RTE_SET_USED (intr_handle); +return 1 ; +} +#endif Why these #else cases?
Quoted 1 line
Why not totally removing these ifdef in the header and use them in .c?
That's a good idea, will take it. Thanks.
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
lib/librte_eal/linuxapp/eal/rte_eal_version.map +0
-0@@ -117,6 +117,10 @@ DPDK_2.1 {
Quoted 8 lines
Quoted 8 lines
lib/librte_eal/linuxapp/eal/rte_eal_version.map DPDK_2.1 { · line 123
Quoted 6 lines
lib/librte_eal/linuxapp/eal/rte_eal_version.map +4
-0rte_epoll_ctl; rte_epoll_wait; + rte_intr_allow_others; + rte_intr_dp_is_en; + rte_intr_efd_enable; + rte_intr_efd_disable;If
RTE_NEXT_ABIis disabled, these symbols do not exist. An alternate .map would be needed.
You're right, will take your suggestion above.
PATCH v14 7/13 eal/linux: fix lsc read error in uio_pci_generic
In reply to Cunming LiangThe intr handle type(RTE_INTR_HANDLE_UIO_INTX) was introduced by UIO pci generic. When turning on the lsc interrupt, it complains fd read error.
The patch uses the correct read size in the case of RTE_INTR_HANDLE_UIO_INTX.
--- lib/librte_eal/linuxapp/eal/eal_interrupts.c | 1 + 1 file changed, 1 insertion(+)
lib/librte_eal/linuxapp/eal/eal_interrupts.c +1 -0
@@ -686,6 +686,7 @@ eal_intr_process_interrupts(struct epoll_event *events, int nfds)/* set the length to be read dor different handle type */ switch (src->intr_handle.type) {case RTE_INTR_HANDLE_UIO : +case RTE_INTR_HANDLE_UIO_INTX : bytes_read =sizeof (buf.uio_intr_count);break ;case RTE_INTR_HANDLE_ALARM :
Signature · 1 line
1.8.1.4
PATCH v14 8/13 eal/bsd: dummy for new intr definition
In reply to Cunming LiangTo make bsd compiling happy with new intr changes.
---
v14 changes
- per-patch basis ABI compatibility rework
v13 changes
- version map cleanup for v2.1
v12 changes
- fix unused variables compiling warning
v8 changes
- add stub for new function
v7 changes
- remove stub 'linux only' function from source file
lib/librte_eal/bsdapp/eal/eal_interrupts.c | 28 +++++++ .../bsdapp/eal/include/exec-env/rte_interrupts.h | 85 ++++++++++++++++++++++ lib/librte_eal/bsdapp/eal/rte_eal_version.map | 5 ++ 3 files changed, 118 insertions(+)
lib/librte_eal/bsdapp/eal/eal_interrupts.c +28 -0
@@ -68,3 +68,31 @@ rte_eal_intr_init(void) {return 0 ; } + +int +rte_intr_rx_ctl (struct rte_intr_handle *intr_handle, +int epfd,int op,unsigned int vec,void *data) +{ +RTE_SET_USED (intr_handle); +RTE_SET_USED (epfd); +RTE_SET_USED (op); +RTE_SET_USED (vec); +RTE_SET_USED (data); + +return -ENOTSUP ; +} + +int +rte_intr_efd_enable (struct rte_intr_handle *intr_handle,uint32_t nb_efd) +{ +RTE_SET_USED (intr_handle); +RTE_SET_USED (nb_efd); + +return 0 ; +} + +void +rte_intr_efd_disable (struct rte_intr_handle *intr_handle) +{ +RTE_SET_USED (intr_handle); +}
lib/librte_eal/bsdapp/eal/include/exec-env/rte_interrupts.h +85 -0
97 lines not on this page · raw message
lib/librte_eal/bsdapp/eal/rte_eal_version.map +5 -0
@@ -116,4 +116,9 @@ DPDK_2.1 { global: rte_memzone_free; + rte_intr_allow_others; + rte_intr_dp_is_en; + rte_intr_efd_enable; + rte_intr_efd_disable; + rte_intr_rx_ctl; } DPDK_2.0;
Signature · 1 line
1.8.1.4
PATCH v14 9/13 eal/bsd: fix inappropriate linuxapp referred in bsd
In reply to Cunming Liang--- lib/librte_eal/bsdapp/eal/include/exec-env/rte_interrupts.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
lib/librte_eal/bsdapp/eal/include/exec-env/rte_interrupts.h +3 -3
@@ -35,8 +35,8 @@#error "don't include this file directly, please include generic <rte_interrupts.h>"#endif -#ifndef _RTE_LINUXAPP_INTERRUPTS_H_ -#define _RTE_LINUXAPP_INTERRUPTS_H_ +#ifndef _RTE_BSDAPP_INTERRUPTS_H_ +#define _RTE_BSDAPP_INTERRUPTS_H_#include <rte_common.h>
@@ -137,4 +137,4 @@ rte_intr_allow_others(struct rte_intr_handle *intr_handle) return 1; } -#endif /* _RTE_LINUXAPP_INTERRUPTS_H_ */ +#endif /* _RTE_BSDAPP_INTERRUPTS_H_ */
Signature · 1 line
1.8.1.4
PATCH v14 10/13 ethdev: add rx intr enable, disable and ctl functions
In reply to Cunming LiangThe patch adds two dev_ops functions to enable and disable rx queue interrupts.
In addtion, it adds rte_eth_dev_rx_intr_ctl/rx_intr_q to support per port or per queue rx intr event set.
---
v14 changes
- per-patch basis ABI compatibility rework
- remove unnecessary 'local: *' from version map
v13 changes
- version map cleanup for v2.1
v9 changes
- remove unnecessary check after rte_eth_dev_is_valid_port. the same as http://www.dpdk.org/dev/patchwork/patch/4784
v8 changes
- add addtion check for EEXIT
v7 changes
- remove rx_intr_vec_get
- add rx_intr_ctl and rx_intr_ctl_q
v6 changes
- add rx_intr_vec_get to retrieve the vector num of the queue.
v5 changes
- Rebase the patchset onto the HEAD
v4 changes
- Export interrupt enable/disable functions for shared libraries
- Put new functions at the end of eth_dev_ops to avoid breaking ABI
v3 changes
- Add return value for interrupt enable/disable functions
lib/librte_ether/rte_ethdev.c | 109 +++++++++++++++++++++++ lib/librte_ether/rte_ethdev.h | 154 +++++++++++++++++++++++++++++++++ lib/librte_ether/rte_ether_version.map | 4 + 3 files changed, 267 insertions(+)
lib/librte_ether/rte_ethdev.c +109 -0
@@ -3006,6 +3006,115 @@ _rte_eth_dev_callback_process(struct rte_eth_dev *dev, }rte_spinlock_unlock (&rte_eth_dev_cb_lock); } + +#ifdef RTE_NEXT_ABI +int +rte_eth_dev_rx_intr_ctl (uint8_t port_id,int epfd,int op,void *data) +{ +uint32_t vec; +struct rte_eth_dev *dev; +struct rte_intr_handle *intr_handle; +uint16_t qid; +int rc; + +if (!rte_eth_dev_is_valid_port (port_id)) { +PMD_DEBUG_TRACE ("Invalid port_id=%u\n" , port_id); +return -ENODEV ; + } + + dev = &rte_eth_devices[port_id]; + intr_handle = &dev->pci_dev->intr_handle; +if (!intr_handle->intr_vec) { +PMD_DEBUG_TRACE ("RX Intr vector unset\n" ); +return -EPERM ; + } + +for (qid =0 ; qid < dev->data->nb_rx_queues; qid++) { + vec = intr_handle->intr_vec[qid]; + rc =rte_intr_rx_ctl (intr_handle, epfd, op, vec, data); +if (rc && rc != -EEXIST ) { +PMD_DEBUG_TRACE ("p %u q %u rx ctl error" +" op %d epfd %d vec %u\n" , + port_id, qid, op, epfd, vec); + } + } + +return 0 ; +} + +int +rte_eth_dev_rx_intr_ctl_q (uint8_t port_id,uint16_t queue_id, +int epfd,int op,void *data) +{ +uint32_t vec; +struct rte_eth_dev *dev; +struct rte_intr_handle *intr_handle; +int rc; + +if (!rte_eth_dev_is_valid_port (port_id)) { +PMD_DEBUG_TRACE ("Invalid port_id=%u\n" , port_id); +return -ENODEV ; + } + + dev = &rte_eth_devices[port_id]; +if (queue_id >= dev->data->nb_rx_queues) { +PMD_DEBUG_TRACE ("Invalid RX queue_id=%u\n" , queue_id); +return -EINVAL ; + } + + intr_handle = &dev->pci_dev->intr_handle; +if (!intr_handle->intr_vec) { +PMD_DEBUG_TRACE ("RX Intr vector unset\n" ); +return -EPERM ; + } + + vec = intr_handle->intr_vec[queue_id]; + rc =rte_intr_rx_ctl (intr_handle, epfd, op, vec, data); +if (rc && rc != -EEXIST ) { +PMD_DEBUG_TRACE ("p %u q %u rx ctl error" +" op %d epfd %d vec %u\n" , + port_id, queue_id, op, epfd, vec); +return rc; + } + +return 0 ; +} + +int +rte_eth_dev_rx_intr_enable (uint8_t port_id, +uint16_t queue_id) +{ +struct rte_eth_dev *dev; + +if (!rte_eth_dev_is_valid_port (port_id)) { +PMD_DEBUG_TRACE ("Invalid port_id=%d\n" , port_id); +return -ENODEV ; + } + + dev = &rte_eth_devices[port_id]; + +FUNC_PTR_OR_ERR_RET (*dev->dev_ops->rx_queue_intr_enable, -ENOTSUP ); +return (*dev->dev_ops->rx_queue_intr_enable)(dev, queue_id); +} + +int +rte_eth_dev_rx_intr_disable (uint8_t port_id, +uint16_t queue_id) +{ +struct rte_eth_dev *dev; + +if (!rte_eth_dev_is_valid_port (port_id)) { +PMD_DEBUG_TRACE ("Invalid port_id=%d\n" , port_id); +return -ENODEV ; + } + + dev = &rte_eth_devices[port_id]; + +FUNC_PTR_OR_ERR_RET (*dev->dev_ops->rx_queue_intr_disable, -ENOTSUP ); +return (*dev->dev_ops->rx_queue_intr_disable)(dev, queue_id); +} +#endif +#ifdef RTE_NIC_BYPASS int rte_eth_dev_bypass_init (uint8_t port_id) {
lib/librte_ether/rte_ethdev.h +154 -0
178 lines not on this page · raw message
lib/librte_ether/rte_ether_version.map +4 -0
@@ -109,6 +109,10 @@ DPDK_2.0 { DPDK_2.1 { global: + rte_eth_dev_rx_intr_ctl; + rte_eth_dev_rx_intr_ctl_q; + rte_eth_dev_rx_intr_disable; + rte_eth_dev_rx_intr_enable; rte_eth_dev_set_mc_addr_list; rte_eth_timesync_disable; rte_eth_timesync_enable;
Signature · 1 line
1.8.1.4
Re: [PATCH v14 10/13] ethdev: add rx intr enable, disable and ctl functions
Quoted 10 lines
lib/librte_ether/rte_ethdev.h +1
-0+/** * Turn on the LED on the Ethernet device. * This function turns on the LED on the Ethernet device. * lib/librte_ether/rte_ether_version.map +0
-0
lib/librte_ether/rte_ether_version.map DPDK_2.0 { · line 118
Quoted 10 lines
lib/librte_ether/rte_ether_version.map +4
-0@@ -109,6 +109,10 @@ DPDK_2.0 { DPDK_2.1 { global: + rte_eth_dev_rx_intr_ctl; + rte_eth_dev_rx_intr_ctl_q; + rte_eth_dev_rx_intr_disable; + rte_eth_dev_rx_intr_enable; rte_eth_dev_set_mc_addr_list; rte_eth_timesync_disable; rte_eth_timesync_enable;
This needs rebase to current master, minor conflict here
Re: [PATCH v14 10/13] ethdev: add rx intr enable, disable and ctl functions
Quoted 12 lines · Stephen Hemminger
Quoted 12 lines
lib/librte_ether/rte_ethdev.h +1
-0+/** * Turn on the LED on the Ethernet device. * This function turns on the LED on the Ethernet device. * lib/librte_ether/rte_ether_version.map +0
-0@@ -109,6 +109,10 @@ DPDK_2.0 { DPDK_2.1 { global:
Quoted 8 lines
lib/librte_ether/rte_ether_version.map DPDK_2.0 { · line 118
Quoted 7 lines
lib/librte_ether/rte_ether_version.map +4
-0+ rte_eth_dev_rx_intr_ctl; + rte_eth_dev_rx_intr_ctl_q; + rte_eth_dev_rx_intr_disable; + rte_eth_dev_rx_intr_enable; rte_eth_dev_set_mc_addr_list; rte_eth_timesync_disable; rte_eth_timesync_enable;This needs rebase to current master, minor conflict here
Didn't occur the conflict during my rebase. But anyway, will rebase again on the next rework. Thanks.
PATCH v14 11/13 ixgbe: enable rx queue interrupts for both PF and VF
In reply to Cunming LiangThe patch does below things for ixgbe PF and VF:
- Setup NIC to generate MSI-X interrupts
- Set the IVAR register to map interrupt causes to vectors
- Implement interrupt enable/disable functions
---
v14 changes
- per-patch basis ABI compatibility rework
v10 changes
- return an actual error code rather than -1
v9 changes
- move queue-vec mapping init from dev_configure to dev_start
v8 changes
- add vfio-msi/vfio-legacy and uio-legacy support
v7 changes
- add condition check when intr vector is not enabled
v6 changes
- fill queue-vector mapping table
v5 changes
- Rebase the patchset onto the HEAD
v3 changes
- Remove spinlok from PMD
v2 changes
- Consolidate review comments related to coding style
drivers/net/ixgbe/ixgbe_ethdev.c | 527 ++++++++++++++++++++++++++++++++++++++- drivers/net/ixgbe/ixgbe_ethdev.h | 4 + 2 files changed, 518 insertions(+), 13 deletions(-)
drivers/net/ixgbe/ixgbe_ethdev.c +514 -13
@@ -82,6 +82,9 @@*/ #define IXGBE_FC_LO 0x40 +/* Default minimum inter-interrupt interval for EITR configuration */ +#define IXGBE_MIN_INTER_INTERRUPT_INTERVAL_DEFAULT 0x79E +/* Timer value included in XOFF frames. */ #define IXGBE_FC_PAUSE 0x680
@@ -179,6 +182,9 @@ static int ixgbe_dev_rss_reta_query(struct rte_eth_dev *dev, uint16_t reta_size);static void ixgbe_dev_link_status_print (struct rte_eth_dev *dev);static int ixgbe_dev_lsc_interrupt_setup (struct rte_eth_dev *dev); +#ifdef RTE_NEXT_ABI +static int ixgbe_dev_rxq_interrupt_setup (struct rte_eth_dev *dev); +#endif static int ixgbe_dev_interrupt_get_status (struct rte_eth_dev *dev);static int ixgbe_dev_interrupt_action (struct rte_eth_dev *dev); static void ixgbe_dev_interrupt_handler(struct rte_intr_handle *handle,
@@ -191,11 +197,14 @@ static void ixgbe_dcb_init(struct ixgbe_hw *hw,struct ixgbe_dcb_config *dcb_conf/* For Virtual Function support */ static int eth_ixgbevf_dev_init (struct rte_eth_dev *eth_dev); +static int ixgbevf_dev_interrupt_get_status (struct rte_eth_dev *dev); +static int ixgbevf_dev_interrupt_action (struct rte_eth_dev *dev);static int ixgbevf_dev_configure (struct rte_eth_dev *dev);static int ixgbevf_dev_start (struct rte_eth_dev *dev);static void ixgbevf_dev_stop (struct rte_eth_dev *dev);static void ixgbevf_dev_close (struct rte_eth_dev *dev);static void ixgbevf_intr_disable (struct ixgbe_hw *hw); +static void ixgbevf_intr_enable (struct ixgbe_hw *hw);static void ixgbevf_dev_stats_get (struct rte_eth_dev *dev,struct rte_eth_stats *stats);static void ixgbevf_dev_stats_reset (struct rte_eth_dev *dev);
@@ -205,6 +214,17 @@ static void ixgbevf_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on);static void ixgbevf_vlan_offload_set (struct rte_eth_dev *dev,int mask);static void ixgbevf_set_vfta_all (struct rte_eth_dev *dev,bool on); +static void ixgbevf_dev_interrupt_handler (struct rte_intr_handle *handle, +void *param); +#ifdef RTE_NEXT_ABI +static int ixgbevf_dev_rx_queue_intr_enable (struct rte_eth_dev *dev, +uint16_t queue_id); +static int ixgbevf_dev_rx_queue_intr_disable (struct rte_eth_dev *dev, +uint16_t queue_id); +static void ixgbevf_set_ivar_map (struct ixgbe_hw *hw,int8_t direction, +uint8_t queue,uint8_t msix_vector); +#endif +static void ixgbevf_configure_msix (struct rte_eth_dev *dev);/* For Eth VMDQ APIs support */ static int ixgbe_uc_hash_table_set(struct rte_eth_dev *dev, struct
@@ -221,6 +241,15 @@ static int ixgbe_mirror_rule_set(struct rte_eth_dev *dev, uint8_t rule_id, uint8_t on);static int ixgbe_mirror_rule_reset (struct rte_eth_dev *dev,uint8_t rule_id); +#ifdef RTE_NEXT_ABI +static int ixgbe_dev_rx_queue_intr_enable (struct rte_eth_dev *dev, +uint16_t queue_id); +static int ixgbe_dev_rx_queue_intr_disable (struct rte_eth_dev *dev, +uint16_t queue_id); +static void ixgbe_set_ivar_map (struct ixgbe_hw *hw,int8_t direction, +uint8_t queue,uint8_t msix_vector); +#endif +static void ixgbe_configure_msix (struct rte_eth_dev *dev);static int ixgbe_set_queue_rate_limit (struct rte_eth_dev *dev,uint16_t queue_idx,uint16_t tx_rate);
@@ -282,7 +311,7 @@ static int ixgbe_timesync_read_tx_timestamp(struct rte_eth_dev *dev,*/ #define UPDATE_VF_STAT (reg, last, cur) \ { \ - u32 latest = IXGBE_READ_REG(hw, reg); \ + uint32_t latest = IXGBE_READ_REG(hw, reg); \ cur += latest - last; \ last = latest; \ }
@@ -363,6 +392,10 @@ static const struct eth_dev_ops ixgbe_eth_dev_ops = { .tx_queue_start = ixgbe_dev_tx_queue_start, .tx_queue_stop = ixgbe_dev_tx_queue_stop, .rx_queue_setup = ixgbe_dev_rx_queue_setup, +#ifdef RTE_NEXT_ABI + .rx_queue_intr_enable = ixgbe_dev_rx_queue_intr_enable, + .rx_queue_intr_disable = ixgbe_dev_rx_queue_intr_disable, +#endif .rx_queue_release = ixgbe_dev_rx_queue_release, .rx_queue_count = ixgbe_dev_rx_queue_count, .rx_descriptor_done = ixgbe_dev_rx_descriptor_done,
@@ -427,8 +460,13 @@ static const struct eth_dev_ops ixgbevf_eth_dev_ops = { .vlan_offload_set = ixgbevf_vlan_offload_set, .rx_queue_setup = ixgbe_dev_rx_queue_setup, .rx_queue_release = ixgbe_dev_rx_queue_release, + .rx_descriptor_done = ixgbe_dev_rx_descriptor_done, .tx_queue_setup = ixgbe_dev_tx_queue_setup, .tx_queue_release = ixgbe_dev_tx_queue_release, +#ifdef RTE_NEXT_ABI + .rx_queue_intr_enable = ixgbevf_dev_rx_queue_intr_enable, + .rx_queue_intr_disable = ixgbevf_dev_rx_queue_intr_disable, +#endif .mac_addr_add = ixgbevf_add_mac_addr, .mac_addr_remove = ixgbevf_remove_mac_addr, .set_mc_addr_list = ixgbe_dev_set_mc_addr_list,
@@ -928,12 +966,6 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev) eth_dev->data->port_id, pci_dev->id.vendor_id, pci_dev->id.device_id); -rte_intr_callback_register (&(pci_dev->intr_handle), - ixgbe_dev_interrupt_handler, (void *)eth_dev); - -/* enable uio intr after callback register */ -rte_intr_enable (&(pci_dev->intr_handle)); -/* enable support intr */ ixgbe_enable_intr (eth_dev);
@@ -1489,6 +1521,10 @@ ixgbe_dev_start(struct rte_eth_dev *dev)IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private);struct ixgbe_vf_info *vfinfo = *IXGBE_DEV_PRIVATE_TO_P_VFDATA (dev->data->dev_private); +struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle; +#ifdef RTE_NEXT_ABI +uint32_t intr_vector =0 ; +#endif int err, link_up =0 , negotiate =0 ;uint32_t speed =0 ;int mask =0 ;
@@ -1521,6 +1557,30 @@ ixgbe_dev_start(struct rte_eth_dev *dev)/* configure PF module if SRIOV enabled */ ixgbe_pf_host_configure (dev); +#ifdef RTE_NEXT_ABI +/* check and configure queue intr-vector mapping */ +if (dev->data->dev_conf.intr_conf.rxq !=0 ) + intr_vector = dev->data->nb_rx_queues; + +if (rte_intr_efd_enable (intr_handle, intr_vector)) +return -1 ; + +if (rte_intr_dp_is_en (intr_handle) && !intr_handle->intr_vec) { + intr_handle->intr_vec = +rte_zmalloc ("intr_vec" , + dev->data->nb_rx_queues *sizeof (int ), +0 ); +if (intr_handle->intr_vec ==NULL ) { +PMD_INIT_LOG (ERR ,"Failed to allocate %d rx_queues" +" intr_vec\n" , dev->data->nb_rx_queues); +return -ENOMEM ; + } + } +#endif + +/* confiugre msix for sleep until rx interrupt */ +ixgbe_configure_msix (dev); +/* initialize transmission unit */ ixgbe_dev_tx_init (dev);
@@ -1598,8 +1658,25 @@ ixgbe_dev_start(struct rte_eth_dev *dev) skip_link_setup:/* check if lsc interrupt is enabled */ -if (dev->data->dev_conf.intr_conf.lsc !=0 ) -ixgbe_dev_lsc_interrupt_setup (dev); +if (dev->data->dev_conf.intr_conf.lsc !=0 ) { +if (rte_intr_allow_others (intr_handle)) { +rte_intr_callback_register (intr_handle, + ixgbe_dev_interrupt_handler, + (void *)dev); +ixgbe_dev_lsc_interrupt_setup (dev); + }else +PMD_INIT_LOG (INFO ,"lsc won't enable because of" +" no intr multiplex\n" ); + } + +#ifdef RTE_NEXT_ABI +/* check if rxq interrupt is enabled */ +if (dev->data->dev_conf.intr_conf.rxq !=0 ) +ixgbe_dev_rxq_interrupt_setup (dev); +#endif + +/* enable uio/vfio intr/eventfd mapping */ +rte_intr_enable (intr_handle);/* resume enabled intr since hw reset */ ixgbe_enable_intr (dev);
@@ -1656,6 +1733,7 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)struct ixgbe_filter_info *filter_info =IXGBE_DEV_PRIVATE_TO_FILTER_INFO (dev->data->dev_private);struct ixgbe_5tuple_filter *p_5tuple, *p_5tuple_next; +struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle;int vf;PMD_INIT_FUNC_TRACE ();
@@ -1663,6 +1741,9 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)/* disable interrupts */ ixgbe_disable_intr (hw); +/* disable intr eventfd mapping */ +rte_intr_disable (intr_handle); +/* reset the NIC */ ixgbe_pf_reset_hw (hw); hw->adapter_stopped = FALSE;
@@ -1703,6 +1784,14 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)memset (filter_info->fivetuple_mask,0 ,sizeof (uint32_t ) *IXGBE_5TUPLE_ARRAY_SIZE ); +#ifdef RTE_NEXT_ABI +/* Clean datapath event and queue/vec mapping */ +rte_intr_efd_disable (intr_handle); +if (intr_handle->intr_vec !=NULL ) { +rte_free (intr_handle->intr_vec); + intr_handle->intr_vec =NULL ; + } +#endif }/*
@@ -2298,6 +2387,30 @@ ixgbe_dev_lsc_interrupt_setup(struct rte_eth_dev *dev)return 0 ; } +/** +* It clears the interrupt causes and enables the interrupt. +* It will be called once only during nic initialized. +* +* @param dev +* Pointer to struct rte_eth_dev. +* +* @return +* - On success, zero. +* - On failure, a negative value. +*/ +#ifdef RTE_NEXT_ABI +static int +ixgbe_dev_rxq_interrupt_setup (struct rte_eth_dev *dev) +{ +struct ixgbe_interrupt *intr = +IXGBE_DEV_PRIVATE_TO_INTR (dev->data->dev_private); + + intr->mask |=IXGBE_EICR_RTX_QUEUE ; + +return 0 ; +} +#endif +/* * It reads ICR and sets flag (IXGBE_EICR_LSC) for the link_update. *
@@ -2324,10 +2437,10 @@ ixgbe_dev_interrupt_get_status(struct rte_eth_dev *dev)PMD_DRV_LOG (INFO ,"eicr %x" , eicr); intr->flags =0 ; -if (eicr &IXGBE_EICR_LSC ) { -/* set flag for async link update */ + +/* set flag for async link update */ +if (eicr &IXGBE_EICR_LSC ) intr->flags |=IXGBE_FLAG_NEED_LINK_UPDATE ; - }if (eicr &IXGBE_EICR_MAILBOX ) intr->flags |=IXGBE_FLAG_MAILBOX ;
@@ -2335,6 +2448,30 @@ ixgbe_dev_interrupt_get_status(struct rte_eth_dev *dev)return 0 ; } +static int +ixgbevf_dev_interrupt_get_status (struct rte_eth_dev *dev) +{ +uint32_t eicr; +struct ixgbe_hw *hw =IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); +struct ixgbe_interrupt *intr = +IXGBE_DEV_PRIVATE_TO_INTR (dev->data->dev_private); + +/* clear all cause mask */ +ixgbevf_intr_disable (hw); + +/* read-on-clear nic registers here */ + eicr =IXGBE_READ_REG (hw,IXGBE_VTEICR ); +PMD_DRV_LOG (INFO ,"eicr %x" , eicr); + + intr->flags =0 ; + +/* set flag for async link update */ +if (eicr &IXGBE_EICR_LSC ) + intr->flags |=IXGBE_FLAG_NEED_LINK_UPDATE ; + +return 0 ; +} +/** * It gets and then prints the link status. *
@@ -2430,6 +2567,18 @@ ixgbe_dev_interrupt_action(struct rte_eth_dev *dev)return 0 ; } +static int +ixgbevf_dev_interrupt_action (struct rte_eth_dev *dev) +{ +struct ixgbe_hw *hw = +IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); + +PMD_DRV_LOG (DEBUG ,"enable intr immediately" ); +ixgbevf_intr_enable (hw); +rte_intr_enable (&dev->pci_dev->intr_handle); +return 0 ; +} +/** * Interrupt handler which shall be registered for alarm callback for delayed * handling specific interrupt to wait for the stable nic state. As the
@@ -2484,13 +2633,24 @@ ixgbe_dev_interrupt_delayed_handler(void *param)*/ static void ixgbe_dev_interrupt_handler(__rte_unused struct rte_intr_handle *handle, -void *param) +void *param) {struct rte_eth_dev *dev = (struct rte_eth_dev *)param; +ixgbe_dev_interrupt_get_status (dev);ixgbe_dev_interrupt_action (dev); } +static void +ixgbevf_dev_interrupt_handler(__rte_unused struct rte_intr_handle *handle, +void *param) +{ +struct rte_eth_dev *dev = (struct rte_eth_dev *)param; + +ixgbevf_dev_interrupt_get_status (dev); +ixgbevf_dev_interrupt_action (dev); +} +static int ixgbe_dev_led_on (struct rte_eth_dev *dev) {
@@ -2988,6 +3148,19 @@ ixgbevf_intr_disable(struct ixgbe_hw *hw)IXGBE_WRITE_FLUSH (hw); } +static void +ixgbevf_intr_enable (struct ixgbe_hw *hw) +{ +PMD_INIT_FUNC_TRACE (); + +/* VF enable interrupt autoclean */ +IXGBE_WRITE_REG (hw,IXGBE_VTEIAM ,IXGBE_VF_IRQ_ENABLE_MASK ); +IXGBE_WRITE_REG (hw,IXGBE_VTEIAC ,IXGBE_VF_IRQ_ENABLE_MASK ); +IXGBE_WRITE_REG (hw,IXGBE_VTEIMS ,IXGBE_VF_IRQ_ENABLE_MASK ); + +IXGBE_WRITE_FLUSH (hw); +} +static int ixgbevf_dev_configure (struct rte_eth_dev *dev) {
@@ -3029,6 +3202,11 @@ ixgbevf_dev_start(struct rte_eth_dev *dev) {struct ixgbe_hw *hw =IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); +#ifdef RTE_NEXT_ABI +uint32_t intr_vector =0 ; +#endif +struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle; +int err, mask =0 ;PMD_INIT_FUNC_TRACE ();
@@ -3059,6 +3237,42 @@ ixgbevf_dev_start(struct rte_eth_dev *dev)ixgbevf_dev_rxtx_start (dev); +#ifdef RTE_NEXT_ABI +/* check and configure queue intr-vector mapping */ +if (dev->data->dev_conf.intr_conf.rxq !=0 ) + intr_vector = dev->data->nb_rx_queues; + +if (rte_intr_efd_enable (intr_handle, intr_vector)) +return -1 ; + +if (rte_intr_dp_is_en (intr_handle) && !intr_handle->intr_vec) { + intr_handle->intr_vec = +rte_zmalloc ("intr_vec" , + dev->data->nb_rx_queues *sizeof (int ),0 ); +if (intr_handle->intr_vec ==NULL ) { +PMD_INIT_LOG (ERR ,"Failed to allocate %d rx_queues" +" intr_vec\n" , dev->data->nb_rx_queues); +return -ENOMEM ; + } + } +#endif +ixgbevf_configure_msix (dev); + +if (dev->data->dev_conf.intr_conf.lsc !=0 ) { +if (rte_intr_allow_others (intr_handle)) +rte_intr_callback_register (intr_handle, + ixgbevf_dev_interrupt_handler, + (void *)dev); +else +PMD_INIT_LOG (INFO ,"lsc won't enable because of" +" no intr multiplex\n" ); + } + +rte_intr_enable (intr_handle); + +/* Re-enable interrupt for VF */ +ixgbevf_intr_enable (hw); +return 0 ; }
@@ -3066,6 +3280,7 @@ static void ixgbevf_dev_stop(struct rte_eth_dev *dev) {struct ixgbe_hw *hw =IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); +struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle;PMD_INIT_FUNC_TRACE ();
@@ -3082,12 +3297,27 @@ ixgbevf_dev_stop(struct rte_eth_dev *dev) dev->data->scattered_rx =0 ;ixgbe_dev_clear_queues (dev); + +/* disable intr eventfd mapping */ +rte_intr_disable (intr_handle); + +#ifdef RTE_NEXT_ABI +/* Clean datapath event and queue/vec mapping */ +rte_intr_efd_disable (intr_handle); +if (intr_handle->intr_vec !=NULL ) { +rte_free (intr_handle->intr_vec); + intr_handle->intr_vec =NULL ; + } +#endif }static void ixgbevf_dev_close (struct rte_eth_dev *dev) {struct ixgbe_hw *hw =IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); +#ifdef RTE_NEXT_ABI +struct rte_pci_device *pci_dev; +#endif PMD_INIT_FUNC_TRACE ();
@@ -3097,6 +3327,14 @@ ixgbevf_dev_close(struct rte_eth_dev *dev)/* reprogram the RAR[0] in case user changed it. */ ixgbe_set_rar (hw,0 , hw->mac.addr,0 ,IXGBE_RAH_AV ); + +#ifdef RTE_NEXT_ABI + pci_dev = dev->pci_dev; +if (pci_dev->intr_handle.intr_vec) { +rte_free (pci_dev->intr_handle.intr_vec); + pci_dev->intr_handle.intr_vec =NULL ; + } +#endif }static void ixgbevf_set_vfta_all (struct rte_eth_dev *dev,bool on)
@@ -3614,6 +3852,269 @@ ixgbe_mirror_rule_reset(struct rte_eth_dev *dev, uint8_t rule_id)return 0 ; } +#ifdef RTE_NEXT_ABI +static int +ixgbevf_dev_rx_queue_intr_enable (struct rte_eth_dev *dev,uint16_t queue_id) +{ +uint32_t mask; +struct ixgbe_hw *hw = +IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); + + mask =IXGBE_READ_REG (hw,IXGBE_VTEIMS ); + mask |= (1 << queue_id); +IXGBE_WRITE_REG (hw,IXGBE_VTEIMS , mask); + +rte_intr_enable (&dev->pci_dev->intr_handle); + +return 0 ; +} + +static int +ixgbevf_dev_rx_queue_intr_disable (struct rte_eth_dev *dev,uint16_t queue_id) +{ +uint32_t mask; +struct ixgbe_hw *hw = +IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); + + mask =IXGBE_READ_REG (hw,IXGBE_VTEIMS ); + mask &= ~(1 << queue_id); +IXGBE_WRITE_REG (hw,IXGBE_VTEIMS , mask); + +return 0 ; +} + +static int +ixgbe_dev_rx_queue_intr_enable (struct rte_eth_dev *dev,uint16_t queue_id) +{ +uint32_t mask; +struct ixgbe_hw *hw = +IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); +struct ixgbe_interrupt *intr = +IXGBE_DEV_PRIVATE_TO_INTR (dev->data->dev_private); + +if (queue_id <16 ) { +ixgbe_disable_intr (hw); + intr->mask |= (1 << queue_id); +ixgbe_enable_intr (dev); + }else if (queue_id <32 ) { + mask =IXGBE_READ_REG (hw,IXGBE_EIMS_EX (0 )); + mask &= (1 << queue_id); +IXGBE_WRITE_REG (hw,IXGBE_EIMS_EX (0 ), mask); + }else if (queue_id <64 ) { + mask =IXGBE_READ_REG (hw,IXGBE_EIMS_EX (1 )); + mask &= (1 << (queue_id -32 )); +IXGBE_WRITE_REG (hw,IXGBE_EIMS_EX (1 ), mask); + } +rte_intr_enable (&dev->pci_dev->intr_handle); + +return 0 ; +} + +static int +ixgbe_dev_rx_queue_intr_disable (struct rte_eth_dev *dev,uint16_t queue_id) +{ +uint32_t mask; +struct ixgbe_hw *hw = +IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); +struct ixgbe_interrupt *intr = +IXGBE_DEV_PRIVATE_TO_INTR (dev->data->dev_private); + +if (queue_id <16 ) { +ixgbe_disable_intr (hw); + intr->mask &= ~(1 << queue_id); +ixgbe_enable_intr (dev); + }else if (queue_id <32 ) { + mask =IXGBE_READ_REG (hw,IXGBE_EIMS_EX (0 )); + mask &= ~(1 << queue_id); +IXGBE_WRITE_REG (hw,IXGBE_EIMS_EX (0 ), mask); + }else if (queue_id <64 ) { + mask =IXGBE_READ_REG (hw,IXGBE_EIMS_EX (1 )); + mask &= ~(1 << (queue_id -32 )); +IXGBE_WRITE_REG (hw,IXGBE_EIMS_EX (1 ), mask); + } + +return 0 ; +} + +static void +ixgbevf_set_ivar_map (struct ixgbe_hw *hw,int8_t direction, +uint8_t queue,uint8_t msix_vector) +{ +uint32_t tmp, idx; + +if (direction ==-1 ) { +/* other causes */ + msix_vector |=IXGBE_IVAR_ALLOC_VAL ; + tmp =IXGBE_READ_REG (hw,IXGBE_VTIVAR_MISC ); + tmp &= ~0xFF ; + tmp |= msix_vector; +IXGBE_WRITE_REG (hw,IXGBE_VTIVAR_MISC , tmp); + }else { +/* rx or tx cause */ + msix_vector |=IXGBE_IVAR_ALLOC_VAL ; + idx = ((16 * (queue &1 )) + (8 * direction)); + tmp =IXGBE_READ_REG (hw,IXGBE_VTIVAR (queue >>1 )); + tmp &= ~(0xFF << idx); + tmp |= (msix_vector << idx); +IXGBE_WRITE_REG (hw,IXGBE_VTIVAR (queue >>1 ), tmp); + } +} + +/** +* set the IVAR registers, mapping interrupt causes to vectors +* @param hw +* pointer to ixgbe_hw struct +* @direction +* 0 for Rx, 1 for Tx, -1 for other causes +* @queue +* queue to map the corresponding interrupt to +* @msix_vector +* the vector to map to the corresponding queue +*/ +static void +ixgbe_set_ivar_map (struct ixgbe_hw *hw,int8_t direction, +uint8_t queue,uint8_t msix_vector) +{ +uint32_t tmp, idx; + + msix_vector |=IXGBE_IVAR_ALLOC_VAL ; +if (hw->mac.type == ixgbe_mac_82598EB) { +if (direction ==-1 ) + direction =0 ; + idx = (((direction *64 ) + queue) >>2 ) &0x1F ; + tmp =IXGBE_READ_REG (hw,IXGBE_IVAR (idx)); + tmp &= ~(0xFF << (8 * (queue &0x3 ))); + tmp |= (msix_vector << (8 * (queue &0x3 ))); +IXGBE_WRITE_REG (hw,IXGBE_IVAR (idx), tmp); + }else if ((hw->mac.type == ixgbe_mac_82599EB) || + (hw->mac.type == ixgbe_mac_X540)) { +if (direction ==-1 ) { +/* other causes */ + idx = ((queue &1 ) *8 ); + tmp =IXGBE_READ_REG (hw,IXGBE_IVAR_MISC ); + tmp &= ~(0xFF << idx); + tmp |= (msix_vector << idx); +IXGBE_WRITE_REG (hw,IXGBE_IVAR_MISC , tmp); + }else { +/* rx or tx causes */ + idx = ((16 * (queue &1 )) + (8 * direction)); + tmp =IXGBE_READ_REG (hw,IXGBE_IVAR (queue >>1 )); + tmp &= ~(0xFF << idx); + tmp |= (msix_vector << idx); +IXGBE_WRITE_REG (hw,IXGBE_IVAR (queue >>1 ), tmp); + } + } +} +#endif + +static void +ixgbevf_configure_msix (struct rte_eth_dev *dev) +{ +struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle; +#ifdef RTE_NEXT_ABI +struct ixgbe_hw *hw = +IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); +uint32_t q_idx; +uint32_t vector_idx =0 ; +#endif + +/* won't configure msix register if no mapping is done +* between intr vector and event fd. +*/ +if (!rte_intr_dp_is_en (intr_handle)) +return ; + +#ifdef RTE_NEXT_ABI +/* Configure all RX queues of VF */ +for (q_idx =0 ; q_idx < dev->data->nb_rx_queues; q_idx++) { +/* Force all queue use vector 0, +* as IXGBE_VF_MAXMSIVECOTR = 1 +*/ +ixgbevf_set_ivar_map (hw,0 , q_idx, vector_idx); + intr_handle->intr_vec[q_idx] = vector_idx; + } + +/* Configure VF Rx queue ivar */ +ixgbevf_set_ivar_map (hw,-1 ,1 , vector_idx); +#endif +} + +/** +* Sets up the hardware to properly generate MSI-X interrupts +* @hw +* board private structure +*/ +static void +ixgbe_configure_msix (struct rte_eth_dev *dev) +{ +struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle; +#ifdef RTE_NEXT_ABI +struct ixgbe_hw *hw = +IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); +uint32_t queue_id, vec =0 ; +uint32_t mask; +uint32_t gpie; +#endif + +/* won't configure msix register if no mapping is done +* between intr vector and event fd +*/ +if (!rte_intr_dp_is_en (intr_handle)) +return ; + +#ifdef RTE_NEXT_ABI +/* setup GPIE for MSI-x mode */ + gpie =IXGBE_READ_REG (hw,IXGBE_GPIE ); + gpie |=IXGBE_GPIE_MSIX_MODE |IXGBE_GPIE_PBA_SUPPORT | +IXGBE_GPIE_OCD |IXGBE_GPIE_EIAME ; +/* auto clearing and auto setting corresponding bits in EIMS +* when MSI-X interrupt is triggered +*/ +if (hw->mac.type == ixgbe_mac_82598EB) { +IXGBE_WRITE_REG (hw,IXGBE_EIAM ,IXGBE_EICS_RTX_QUEUE ); + }else { +IXGBE_WRITE_REG (hw,IXGBE_EIAM_EX (0 ),0xFFFFFFFF ); +IXGBE_WRITE_REG (hw,IXGBE_EIAM_EX (1 ),0xFFFFFFFF ); + } +IXGBE_WRITE_REG (hw,IXGBE_GPIE , gpie); + +/* Populate the IVAR table and set the ITR values to the +* corresponding register. +*/ +for (queue_id =0 ; queue_id < dev->data->nb_rx_queues; + queue_id++) { +/* by default, 1:1 mapping */ +ixgbe_set_ivar_map (hw,0 , queue_id, vec); + intr_handle->intr_vec[queue_id] = vec; +if (vec < intr_handle->nb_efd -1 ) + vec++; + } + +switch (hw->mac.type) { +case ixgbe_mac_82598EB: +ixgbe_set_ivar_map (hw,-1 ,IXGBE_IVAR_OTHER_CAUSES_INDEX , + intr_handle->max_intr -1 ); +break ; +case ixgbe_mac_82599EB: +case ixgbe_mac_X540: +ixgbe_set_ivar_map (hw,-1 ,1 , intr_handle->max_intr -1 ); +break ; +default : +break ; + } +IXGBE_WRITE_REG (hw,IXGBE_EITR (queue_id), +IXGBE_MIN_INTER_INTERRUPT_INTERVAL_DEFAULT &0xFFF ); + +/* set up to autoclear timer, and the vectors */ + mask =IXGBE_EIMS_ENABLE_MASK ; + mask &= ~(IXGBE_EIMS_OTHER | +IXGBE_EIMS_MAILBOX | +IXGBE_EIMS_LSC ); + +IXGBE_WRITE_REG (hw,IXGBE_EIAC , mask); +#endif +} +static int ixgbe_set_queue_rate_limit (struct rte_eth_dev *dev,uint16_t queue_idx,uint16_t tx_rate) {
drivers/net/ixgbe/ixgbe_ethdev.h +4 -0
@@ -117,6 +117,9 @@ ETH_RSS_IPV6_TCP_EX | \ ETH_RSS_IPV6_UDP_EX) +#define IXGBE_VF_IRQ_ENABLE_MASK 3/* vf irq enable mask */ +#define IXGBE_VF_MAXMSIVECTOR 1 +/* * Information about the fdir mode. */
@@ -330,6 +333,7 @@ uint32_t ixgbe_dev_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id);int ixgbe_dev_rx_descriptor_done (void *rx_queue,uint16_t offset); +int ixgbevf_dev_rx_descriptor_done (void *rx_queue,uint16_t offset);int ixgbe_dev_rx_init (struct rte_eth_dev *dev);
Signature · 1 line
1.8.1.4
PATCH v14 12/13 igb: enable rx queue interrupts for PF
In reply to Cunming LiangThe patch does below for igb PF:
- Setup NIC to generate MSI-X interrupts
- Set the IVAR register to map interrupt causes to vectors
- Implement interrupt enable/disable functions
---
v14 changes
- per-patch basis ABI compatibility rework
v9 changes
- move queue-vec mapping init from dev_configure to dev_start
- fix link interrupt not working issue in vfio-msix
v8 changes
- add vfio-msi/vfio-legacy and uio-legacy support
v7 changes
- add condition check when intr vector is not enabled
v6 changes
- fill queue-vector mapping table
v5 changes
- Rebase the patchset onto the HEAD
v3 changes
- Remove unnecessary variables in e1000_mac_info
- Remove spinlok from PMD
v2 changes
- Consolidate review comments related to coding style
drivers/net/e1000/igb_ethdev.c | 311 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 277 insertions(+), 34 deletions(-)
drivers/net/e1000/igb_ethdev.c +277 -34
@@ -104,6 +104,9 @@ static int eth_igb_flow_ctrl_get(struct rte_eth_dev *dev,static int eth_igb_flow_ctrl_set (struct rte_eth_dev *dev,struct rte_eth_fc_conf *fc_conf);static int eth_igb_lsc_interrupt_setup (struct rte_eth_dev *dev); +#ifdef RTE_NEXT_ABI +static int eth_igb_rxq_interrupt_setup (struct rte_eth_dev *dev); +#endif static int eth_igb_interrupt_get_status (struct rte_eth_dev *dev);static int eth_igb_interrupt_action (struct rte_eth_dev *dev); static void eth_igb_interrupt_handler(struct rte_intr_handle *handle,
@@ -201,7 +204,6 @@ static int eth_igb_filter_ctrl(struct rte_eth_dev *dev,enum rte_filter_type filter_type, enum rte_filter_op filter_op, void *arg); -static int eth_igb_set_mc_addr_list (struct rte_eth_dev *dev,struct ether_addr *mc_addr_set,uint32_t nb_mc_addr);
@@ -212,6 +214,17 @@ static int igb_timesync_read_rx_timestamp(struct rte_eth_dev *dev, uint32_t flags);static int igb_timesync_read_tx_timestamp (struct rte_eth_dev *dev,struct timespec *timestamp); +#ifdef RTE_NEXT_ABI +static int eth_igb_rx_queue_intr_enable (struct rte_eth_dev *dev, +uint16_t queue_id); +static int eth_igb_rx_queue_intr_disable (struct rte_eth_dev *dev, +uint16_t queue_id); +static void eth_igb_assign_msix_vector (struct e1000_hw *hw,int8_t direction, +uint8_t queue,uint8_t msix_vector); +static void eth_igb_write_ivar (struct e1000_hw *hw,uint8_t msix_vector, +uint8_t index,uint8_t offset); +#endif +static void eth_igb_configure_msix_intr (struct rte_eth_dev *dev);/* * Define VF Stats MACRO for Non "cleared on read" register
@@ -272,6 +285,10 @@ static const struct eth_dev_ops eth_igb_ops = { .vlan_tpid_set = eth_igb_vlan_tpid_set, .vlan_offload_set = eth_igb_vlan_offload_set, .rx_queue_setup = eth_igb_rx_queue_setup, +#ifdef RTE_NEXT_ABI + .rx_queue_intr_enable = eth_igb_rx_queue_intr_enable, + .rx_queue_intr_disable = eth_igb_rx_queue_intr_disable, +#endif .rx_queue_release = eth_igb_rx_queue_release, .rx_queue_count = eth_igb_rx_queue_count, .rx_descriptor_done = eth_igb_rx_descriptor_done,
@@ -609,12 +626,6 @@ eth_igb_dev_init(struct rte_eth_dev *eth_dev) eth_dev->data->port_id, pci_dev->id.vendor_id, pci_dev->id.device_id); -rte_intr_callback_register (&(pci_dev->intr_handle), - eth_igb_interrupt_handler, (void *)eth_dev); - -/* enable uio intr after callback register */ -rte_intr_enable (&(pci_dev->intr_handle)); -/* enable support intr */ igb_intr_enable (eth_dev);
@@ -777,7 +788,11 @@ eth_igb_start(struct rte_eth_dev *dev) {struct e1000_hw *hw =E1000_DEV_PRIVATE_TO_HW (dev->data->dev_private); -int ret, i, mask; +struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle; +#ifdef RTE_NEXT_ABI +uint32_t intr_vector =0 ; +#endif +int ret, mask;uint32_t ctrl_ext;PMD_INIT_FUNC_TRACE ();
@@ -817,6 +832,29 @@ eth_igb_start(struct rte_eth_dev *dev)/* configure PF module if SRIOV enabled */ igb_pf_host_configure (dev); +#ifdef RTE_NEXT_ABI +/* check and configure queue intr-vector mapping */ +if (dev->data->dev_conf.intr_conf.rxq !=0 ) + intr_vector = dev->data->nb_rx_queues; + +if (rte_intr_efd_enable (intr_handle, intr_vector)) +return -1 ; + +if (rte_intr_dp_is_en (intr_handle)) { + intr_handle->intr_vec = +rte_zmalloc ("intr_vec" , + dev->data->nb_rx_queues *sizeof (int ),0 ); +if (intr_handle->intr_vec ==NULL ) { +PMD_INIT_LOG (ERR ,"Failed to allocate %d rx_queues" +" intr_vec\n" , dev->data->nb_rx_queues); +return -ENOMEM ; + } + } +#endif + +/* confiugre msix for rx interrupt */ +eth_igb_configure_msix_intr (dev); +/* Configure for OS presence */ igb_init_manageability (hw);
@@ -844,33 +882,9 @@ eth_igb_start(struct rte_eth_dev *dev)igb_vmdq_vlan_hw_filter_enable (dev); } -/* -* Configure the Interrupt Moderation register (EITR) with the maximum -* possible value (0xFFFF) to minimize "System Partial Write" issued by -* spurious [DMA] memory updates of RX and TX ring descriptors. -* -* With a EITR granularity of 2 microseconds in the 82576, only 7/8 -* spurious memory updates per second should be expected. -* ((65535 * 2) / 1000.1000 ~= 0.131 second). -* -* Because interrupts are not used at all, the MSI-X is not activated -* and interrupt moderation is controlled by EITR[0]. -* -* Note that having [almost] disabled memory updates of RX and TX ring -* descriptors through the Interrupt Moderation mechanism, memory -* updates of ring descriptors are now moderated by the configurable -* value of Write-Back Threshold registers. -*/ if ((hw->mac.type == e1000_82576) || (hw->mac.type == e1000_82580) || (hw->mac.type == e1000_i350) || (hw->mac.type == e1000_i210) || (hw->mac.type == e1000_i211)) { -uint32_t ivar; - -/* Enable all RX & TX queues in the IVAR registers */ - ivar = (uint32_t ) ((E1000_IVAR_VALID <<16 ) |E1000_IVAR_VALID ); -for (i =0 ; i <8 ; i++) -E1000_WRITE_REG_ARRAY (hw,E1000_IVAR0 , i, ivar); -/* Configure EITR with the maximum possible value (0xFFFF) */ E1000_WRITE_REG (hw,E1000_EITR (0 ),0xFFFF ); }
@@ -921,8 +935,25 @@ eth_igb_start(struct rte_eth_dev *dev)e1000_setup_link (hw);/* check if lsc interrupt feature is enabled */ -if (dev->data->dev_conf.intr_conf.lsc !=0 ) - ret =eth_igb_lsc_interrupt_setup (dev); +if (dev->data->dev_conf.intr_conf.lsc !=0 ) { +if (rte_intr_allow_others (intr_handle)) { +rte_intr_callback_register (intr_handle, + eth_igb_interrupt_handler, + (void *)dev); +eth_igb_lsc_interrupt_setup (dev); + }else +PMD_INIT_LOG (INFO ,"lsc won't enable because of" +" no intr multiplex\n" ); + } + +#ifdef RTE_NEXT_ABI +/* check if rxq interrupt is enabled */ +if (dev->data->dev_conf.intr_conf.rxq !=0 ) +eth_igb_rxq_interrupt_setup (dev); +#endif + +/* enable uio/vfio intr/eventfd mapping */ +rte_intr_enable (intr_handle);/* resume enabled intr since hw reset */ igb_intr_enable (dev);
@@ -955,8 +986,13 @@ eth_igb_stop(struct rte_eth_dev *dev)struct e1000_flex_filter *p_flex;struct e1000_5tuple_filter *p_5tuple, *p_5tuple_next;struct e1000_2tuple_filter *p_2tuple, *p_2tuple_next; +struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle;igb_intr_disable (hw); + +/* disable intr eventfd mapping */ +rte_intr_disable (intr_handle); +igb_pf_reset_hw (hw);E1000_WRITE_REG (hw,E1000_WUC ,0 );
@@ -1005,6 +1041,15 @@ eth_igb_stop(struct rte_eth_dev *dev)rte_free (p_2tuple); } filter_info->twotuple_mask =0 ; + +#ifdef RTE_NEXT_ABI +/* Clean datapath event and queue/vec mapping */ +rte_intr_efd_disable (intr_handle); +if (intr_handle->intr_vec !=NULL ) { +rte_free (intr_handle->intr_vec); + intr_handle->intr_vec =NULL ; + } +#endif } static void
@@ -1012,6 +1057,9 @@ eth_igb_close(struct rte_eth_dev *dev) {struct e1000_hw *hw =E1000_DEV_PRIVATE_TO_HW (dev->data->dev_private);struct rte_eth_link link; +#ifdef RTE_NEXT_ABI +struct rte_pci_device *pci_dev; +#endif eth_igb_stop (dev);e1000_phy_hw_reset (hw);
@@ -1029,6 +1077,14 @@ eth_igb_close(struct rte_eth_dev *dev)igb_dev_clear_queues (dev); +#ifdef RTE_NEXT_ABI + pci_dev = dev->pci_dev; +if (pci_dev->intr_handle.intr_vec) { +rte_free (pci_dev->intr_handle.intr_vec); + pci_dev->intr_handle.intr_vec =NULL ; + } +#endif +memset (&link,0 ,sizeof (link));rte_igb_dev_atomic_write_link_status (dev, &link); }
@@ -1853,6 +1909,35 @@ eth_igb_lsc_interrupt_setup(struct rte_eth_dev *dev)return 0 ; } +#ifdef RTE_NEXT_ABI +/* It clears the interrupt causes and enables the interrupt. +* It will be called once only during nic initialized. +* +* @param dev +* Pointer to struct rte_eth_dev. +* +* @return +* - On success, zero. +* - On failure, a negative value. +*/ +static int eth_igb_rxq_interrupt_setup (struct rte_eth_dev *dev) +{ +uint32_t mask, regval; +struct e1000_hw *hw = +E1000_DEV_PRIVATE_TO_HW (dev->data->dev_private); +struct rte_eth_dev_info dev_info; + +memset (&dev_info,0 ,sizeof (dev_info)); +eth_igb_infos_get (dev, &dev_info); + + mask =0xFFFFFFFF >> (32 - dev_info.max_rx_queues); + regval =E1000_READ_REG (hw,E1000_EIMS ); +E1000_WRITE_REG (hw,E1000_EIMS , regval | mask); + +return 0 ; +} +#endif +/* * It reads ICR and gets interrupt causes, check it and set a bit flag * to update link status.
@@ -3788,5 +3873,163 @@ static struct rte_driver pmd_igbvf_drv = { .init = rte_igbvf_pmd_init, }; +#ifdef RTE_NEXT_ABI +static int +eth_igb_rx_queue_intr_disable (struct rte_eth_dev *dev,uint16_t queue_id) +{ +struct e1000_hw *hw = +E1000_DEV_PRIVATE_TO_HW (dev->data->dev_private); +uint32_t mask =1 << queue_id; + +E1000_WRITE_REG (hw,E1000_EIMC , mask); +E1000_WRITE_FLUSH (hw); + +return 0 ; +} + +static int +eth_igb_rx_queue_intr_enable (struct rte_eth_dev *dev,uint16_t queue_id) +{ +struct e1000_hw *hw = +E1000_DEV_PRIVATE_TO_HW (dev->data->dev_private); +uint32_t mask =1 << queue_id; +uint32_t regval; + + regval =E1000_READ_REG (hw,E1000_EIMS ); +E1000_WRITE_REG (hw,E1000_EIMS , regval | mask); +E1000_WRITE_FLUSH (hw); + +rte_intr_enable (&dev->pci_dev->intr_handle); + +return 0 ; +} + +static void +eth_igb_write_ivar (struct e1000_hw *hw,uint8_t msix_vector, +uint8_t index,uint8_t offset) +{ +uint32_t val =E1000_READ_REG_ARRAY (hw,E1000_IVAR0 , index); + +/* clear bits */ + val &= ~((uint32_t )0xFF << offset); + +/* write vector and valid bit */ + val |= (msix_vector |E1000_IVAR_VALID ) << offset; + +E1000_WRITE_REG_ARRAY (hw,E1000_IVAR0 , index, val); +} + +static void +eth_igb_assign_msix_vector (struct e1000_hw *hw,int8_t direction, +uint8_t queue,uint8_t msix_vector) +{ +uint32_t tmp =0 ; + +if (hw->mac.type == e1000_82575) { +if (direction ==0 ) + tmp =E1000_EICR_RX_QUEUE0 << queue; +else if (direction ==1 ) + tmp =E1000_EICR_TX_QUEUE0 << queue; +E1000_WRITE_REG (hw,E1000_MSIXBM (msix_vector), tmp); + }else if (hw->mac.type == e1000_82576) { +if ((direction ==0 ) || (direction ==1 )) +eth_igb_write_ivar (hw, msix_vector, queue &0x7 , + ((queue &0x8 ) <<1 ) + +8 * direction); + }else if ((hw->mac.type == e1000_82580) || + (hw->mac.type == e1000_i350) || + (hw->mac.type == e1000_i354) || + (hw->mac.type == e1000_i210) || + (hw->mac.type == e1000_i211)) { +if ((direction ==0 ) || (direction ==1 )) +eth_igb_write_ivar (hw, msix_vector, + queue >>1 , + ((queue &0x1 ) <<4 ) + +8 * direction); + } +} +#endif + +/* Sets up the hardware to generate MSI-X interrupts properly +* @hw +* board private structure +*/ +static void +eth_igb_configure_msix_intr (struct rte_eth_dev *dev) +{ +#ifdef RTE_NEXT_ABI +int queue_id; +uint32_t tmpval, regval, intr_mask; +struct e1000_hw *hw = +E1000_DEV_PRIVATE_TO_HW (dev->data->dev_private); +uint32_t vec =0 ; +#endif +struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle; + +/* won't configure msix register if no mapping is done +* between intr vector and event fd +*/ +if (!rte_intr_dp_is_en (intr_handle)) +return ; + +#ifdef RTE_NEXT_ABI +/* set interrupt vector for other causes */ +if (hw->mac.type == e1000_82575) { + tmpval =E1000_READ_REG (hw,E1000_CTRL_EXT ); +/* enable MSI-X PBA support */ + tmpval |=E1000_CTRL_EXT_PBA_CLR ; + +/* Auto-Mask interrupts upon ICR read */ + tmpval |=E1000_CTRL_EXT_EIAME ; + tmpval |=E1000_CTRL_EXT_IRCA ; + +E1000_WRITE_REG (hw,E1000_CTRL_EXT , tmpval); + +/* enable msix_other interrupt */ +E1000_WRITE_REG_ARRAY (hw,E1000_MSIXBM (0 ),0 ,E1000_EIMS_OTHER ); + regval =E1000_READ_REG (hw,E1000_EIAC ); +E1000_WRITE_REG (hw,E1000_EIAC , regval |E1000_EIMS_OTHER ); + regval =E1000_READ_REG (hw,E1000_EIAM ); +E1000_WRITE_REG (hw,E1000_EIMS , regval |E1000_EIMS_OTHER ); + }else if ((hw->mac.type == e1000_82576) || + (hw->mac.type == e1000_82580) || + (hw->mac.type == e1000_i350) || + (hw->mac.type == e1000_i354) || + (hw->mac.type == e1000_i210) || + (hw->mac.type == e1000_i211)) { +/* turn on MSI-X capability first */ +E1000_WRITE_REG (hw,E1000_GPIE ,E1000_GPIE_MSIX_MODE | +E1000_GPIE_PBA |E1000_GPIE_EIAME | +E1000_GPIE_NSICR ); + + intr_mask = (1 << intr_handle->max_intr) -1 ; + regval =E1000_READ_REG (hw,E1000_EIAC ); +E1000_WRITE_REG (hw,E1000_EIAC , regval | intr_mask); + +/* enable msix_other interrupt */ + regval =E1000_READ_REG (hw,E1000_EIMS ); +E1000_WRITE_REG (hw,E1000_EIMS , regval | intr_mask); + tmpval = (dev->data->nb_rx_queues |E1000_IVAR_VALID ) <<8 ; +E1000_WRITE_REG (hw,E1000_IVAR_MISC , tmpval); + } + +/* use EIAM to auto-mask when MSI-X interrupt +* is asserted, this saves a register write for every interrupt +*/ + intr_mask = (1 << intr_handle->nb_efd) -1 ; + regval =E1000_READ_REG (hw,E1000_EIAM ); +E1000_WRITE_REG (hw,E1000_EIAM , regval | intr_mask); + +for (queue_id =0 ; queue_id < dev->data->nb_rx_queues; queue_id++) { +eth_igb_assign_msix_vector (hw,0 , queue_id, vec); + intr_handle->intr_vec[queue_id] = vec; +if (vec < intr_handle->nb_efd -1 ) + vec++; + } + +E1000_WRITE_FLUSH (hw); +#endif +} +PMD_REGISTER_DRIVER (pmd_igb_drv);PMD_REGISTER_DRIVER (pmd_igbvf_drv);
Signature · 1 line
1.8.1.4
PATCH v14 13/13 l3fwd-power: enable one-shot rx interrupt and polling/interrupt mode switch
In reply to Cunming LiangThe patch demonstrates how to handle per rx queue interrupt in a NAPI-like implementation in userspace. The working thread mainly runs in polling mode and switch to interrupt mode only if there is no packet received in recent polls. The working thread returns to polling mode immediately once it receives an interrupt notification caused by the incoming packets.
The sample keeps running in polling mode if the binding PMD hasn't supported the rx interrupt yet. Now only ixgbe(pf/vf) and igb support it.
---
v14 changes
- per-patch basis ABI compatibility rework
- reword commit comments
v7 changes
- using new APIs
- demo multiple port/queue pair wait on the same epoll instance
v6 changes
- Split event fd add and wait
v5 changes
- Change invoked function name and parameter to accomodate EAL change
v3 changes
- Add spinlock to ensure thread safe when accessing interrupt mask register
v2 changes
- Remove unused function which is for debug purpose
examples/l3fwd-power/main.c | 202 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 162 insertions(+), 40 deletions(-)
examples/l3fwd-power/main.c +162 -40
@@ -74,12 +74,14 @@#include <rte_string_fns.h> #include <rte_timer.h> #include <rte_power.h> +#include <rte_eal.h> +#include <rte_spinlock.h> #define RTE_LOGTYPE_L3FWD_POWER RTE_LOGTYPE_USER1#define MAX_PKT_BURST 32 -#define MIN_ZERO_POLL_COUNT 5 +#define MIN_ZERO_POLL_COUNT 10/* around 100ms at 2 Ghz */ #define TIMER_RESOLUTION_CYCLES 200000000ULL
@@ -153,6 +155,9 @@ static uint16_t nb_txd = RTE_TEST_TX_DESC_DEFAULT;/* ethernet addresses of ports */ static struct ether_addr ports_eth_addr[RTE_MAX_ETHPORTS ]; +/* ethernet addresses of ports */ +static rte_spinlock_t locks[RTE_MAX_ETHPORTS ]; +/* mask of enabled ports */ static uint32_t enabled_port_mask =0 ;/* Ports set in promiscuous mode off by default. */
@@ -185,6 +190,9 @@ struct lcore_rx_queue {#define MAX_TX_QUEUE_PER_PORT RTE_MAX_ETHPORTS#define MAX_RX_QUEUE_PER_PORT 128 +#define MAX_RX_QUEUE_INTERRUPT_PER_PORT 16 + +#define MAX_LCORE_PARAMS 1024struct lcore_params {uint8_t port_id;
@@ -211,7 +219,7 @@ static uint16_t nb_lcore_params = sizeof(lcore_params_array_default) /static struct rte_eth_conf port_conf = { .rxmode = { - .mq_mode =ETH_MQ_RX_RSS , + .mq_mode =ETH_MQ_RX_RSS , .max_rx_pkt_len =ETHER_MAX_LEN , .split_hdr_size =0 , .header_split =0 ,/**< Header Split disabled */
@@ -223,11 +231,14 @@ static struct rte_eth_conf port_conf = { .rx_adv_conf = { .rss_conf = { .rss_key = NULL, - .rss_hf = ETH_RSS_IP, + .rss_hf = ETH_RSS_UDP, }, }, .txmode = { - .mq_mode = ETH_DCB_NONE, + .mq_mode = ETH_MQ_TX_NONE, + }, + .intr_conf = { + .lsc = 1, }, };
@@ -399,19 +410,22 @@ power_timer_cb(__attribute__((unused)) struct rte_timer *tim,/* accumulate total execution time in us when callback is invoked */ sleep_time_ratio = (float )(stats[lcore_id].sleep_time) / (float )SCALING_PERIOD ; -/** * check whether need to scale down frequency a step if it sleep a lot. */ -if (sleep_time_ratio >=SCALING_DOWN_TIME_RATIO_THRESHOLD ) -rte_power_freq_down (lcore_id); +if (sleep_time_ratio >=SCALING_DOWN_TIME_RATIO_THRESHOLD ) { +if (rte_power_freq_down) +rte_power_freq_down (lcore_id); + }else if ( (unsigned )(stats[lcore_id].nb_rx_processed / - stats[lcore_id].nb_iteration_looped) <MAX_PKT_BURST ) + stats[lcore_id].nb_iteration_looped) <MAX_PKT_BURST ) {/** * scale down a step if average packet per iteration less * than expectation. */ -rte_power_freq_down (lcore_id); +if (rte_power_freq_down) +rte_power_freq_down (lcore_id); + }/** * initialize another timer according to current frequency to ensure
@@ -712,22 +726,20 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, } -#define SLEEP_GEAR1_THRESHOLD 100 -#define SLEEP_GEAR2_THRESHOLD 1000 +#define MINIMUM_SLEEP_TIME 1 +#define SUSPEND_THRESHOLD 300static inline uint32_t power_idle_heuristic (uint32_t zero_rx_packet_count) { -/* If zero count is less than 100, use it as the sleep time in us */ -if (zero_rx_packet_count <SLEEP_GEAR1_THRESHOLD ) -return zero_rx_packet_count; -/* If zero count is less than 1000, sleep time should be 100 us */ -else if ((zero_rx_packet_count >=SLEEP_GEAR1_THRESHOLD ) && - (zero_rx_packet_count <SLEEP_GEAR2_THRESHOLD )) -return SLEEP_GEAR1_THRESHOLD ; -/* If zero count is greater than 1000, sleep time should be 1000 us */ -else if (zero_rx_packet_count >=SLEEP_GEAR2_THRESHOLD ) -return SLEEP_GEAR2_THRESHOLD ; +/* If zero count is less than 100, sleep 1us */ +if (zero_rx_packet_count <SUSPEND_THRESHOLD ) +return MINIMUM_SLEEP_TIME ; +/* If zero count is less than 1000, sleep 100 us which is the +minimum latency switching from C3/C6 to C0 +*/ +else +return SUSPEND_THRESHOLD ;return 0 ; }
@@ -767,6 +779,84 @@ power_freq_scaleup_heuristic(unsigned lcore_id,return FREQ_CURRENT ; } +/** +* force polling thread sleep until one-shot rx interrupt triggers +* @param port_id +* Port id. +* @param queue_id +* Rx queue id. +* @return +* 0 on success +*/ +static int +sleep_until_rx_interrupt (int num) +{ +struct rte_epoll_event event[num]; +int n, i; +uint8_t port_id, queue_id; +void *data; + +RTE_LOG (INFO ,L3FWD_POWER , +"lcore %u sleeps until interrupt triggers\n" , +rte_lcore_id ()); + + n =rte_epoll_wait (RTE_EPOLL_PER_THREAD , event, num,-1 ); +for (i =0 ; i < n; i++) { + data = event[i].epdata.data; + port_id = ((uintptr_t )data) >>CHAR_BIT ; + queue_id = ((uintptr_t )data) & +RTE_LEN2MASK (CHAR_BIT , uint8_t); +RTE_LOG (INFO ,L3FWD_POWER , +"lcore %u is waked up from rx interrupt on" +" port %d queue %d\n" , +rte_lcore_id (), port_id, queue_id); + } + +return 0 ; +} + +static int turn_on_intr (struct lcore_conf *qconf) +{ +int i; +struct lcore_rx_queue *rx_queue; +uint8_t port_id, queue_id; + +for (i =0 ; i < qconf->n_rx_queue; ++i) { + rx_queue = &(qconf->rx_queue_list[i]); + port_id = rx_queue->port_id; + queue_id = rx_queue->queue_id; + +rte_spinlock_lock (&(locks[port_id])); +rte_eth_dev_rx_intr_enable (port_id, queue_id); +rte_spinlock_unlock (&(locks[port_id])); + } +} + +static int event_register (struct lcore_conf *qconf) +{ +struct lcore_rx_queue *rx_queue; +uint8_t portid, queueid; +uint32_t data; +int ret; +int i; + +for (i =0 ; i < qconf->n_rx_queue; ++i) { + rx_queue = &(qconf->rx_queue_list[i]); + portid = rx_queue->port_id; + queueid = rx_queue->queue_id; + data = portid <<CHAR_BIT | queueid; + + ret =rte_eth_dev_rx_intr_ctl_q (portid, queueid, +RTE_EPOLL_PER_THREAD , +RTE_INTR_EVENT_ADD , + (void *)((uintptr_t )data)); +if (ret) +return ret; + } + +return 0 ; +} +/* main processing loop */ static int main_loop (__attribute__((unused))void *dummy)
@@ -780,9 +870,9 @@ main_loop(__attribute__((unused)) void *dummy)struct lcore_conf *qconf;struct lcore_rx_queue *rx_queue;enum freq_scale_hint_t lcore_scaleup_hint; -uint32_t lcore_rx_idle_count =0 ;uint32_t lcore_idle_hint =0 ; +int intr_en =0 ;const uint64_t drain_tsc = (rte_get_tsc_hz () +US_PER_S -1 ) /US_PER_S *BURST_TX_DRAIN_US ;
@@ -799,13 +889,18 @@ main_loop(__attribute__((unused)) void *dummy)RTE_LOG (INFO ,L3FWD_POWER ,"entering main loop on lcore %u\n" , lcore_id);for (i =0 ; i < qconf->n_rx_queue; i++) { - portid = qconf->rx_queue_list[i].port_id; queueid = qconf->rx_queue_list[i].queue_id;RTE_LOG (INFO ,L3FWD_POWER ," -- lcoreid=%u portid=%hhu " "rxqueueid=%hhu\n" , lcore_id, portid, queueid); } +/* add into event wait list */ +if (event_register (qconf) ==0 ) + intr_en =1 ; +else +RTE_LOG (INFO ,L3FWD_POWER ,"RX interrupt won't enable.\n" ); +while (1 ) { stats[lcore_id].nb_iteration_looped++;
@@ -840,6 +935,7 @@ main_loop(__attribute__((unused)) void *dummy) prev_tsc_power = cur_tsc_power; } +start_rx:/* * Read packet from RX queues */
@@ -853,6 +949,7 @@ main_loop(__attribute__((unused)) void *dummy) nb_rx =rte_eth_rx_burst (portid, queueid, pkts_burst,MAX_PKT_BURST ); + stats[lcore_id].nb_rx_processed += nb_rx;if (unlikely (nb_rx ==0 )) {/**
@@ -915,10 +1012,13 @@ main_loop(__attribute__((unused)) void *dummy) rx_queue->freq_up_hint; } -if (lcore_scaleup_hint ==FREQ_HIGHEST ) -rte_power_freq_max (lcore_id); -else if (lcore_scaleup_hint ==FREQ_HIGHER ) -rte_power_freq_up (lcore_id); +if (lcore_scaleup_hint ==FREQ_HIGHEST ) { +if (rte_power_freq_max) +rte_power_freq_max (lcore_id); + }else if (lcore_scaleup_hint ==FREQ_HIGHER ) { +if (rte_power_freq_up) +rte_power_freq_up (lcore_id); + } }else {/** * All Rx queues empty in recent consecutive polls,
@@ -933,16 +1033,23 @@ main_loop(__attribute__((unused)) void *dummy) lcore_idle_hint = rx_queue->idle_hint; } -if ( lcore_idle_hint <SLEEP_GEAR1_THRESHOLD ) +if (lcore_idle_hint <SUSPEND_THRESHOLD )/** * execute "pause" instruction to avoid context -* switch for short sleep. +* switch which generally take hundred of +* microseconds for short sleep. */ rte_delay_us (lcore_idle_hint); -else -/* long sleep force runing thread to suspend */ -usleep (lcore_idle_hint); - +else { +/* suspend until rx interrupt trigges */ +if (intr_en) { +turn_on_intr (qconf); +sleep_until_rx_interrupt ( + qconf->n_rx_queue); + } +/* start receiving packets immediately */ + goto start_rx; + } stats[lcore_id].sleep_time += lcore_idle_hint; } }
@@ -1273,7 +1380,7 @@ setup_hash(int socketid)char s[64 ];/* create ipv4 hash */ -snprintf (s,sizeof (s),"ipv4_l3fwd_hash_%d" , socketid); +rte_snprintf (s,sizeof (s),"ipv4_l3fwd_hash_%d" , socketid); ipv4_l3fwd_hash_params.name = s; ipv4_l3fwd_hash_params.socket_id = socketid; ipv4_l3fwd_lookup_struct[socketid] =
@@ -1283,7 +1390,7 @@ setup_hash(int socketid) "socket %d\n", socketid);/* create ipv6 hash */ -snprintf (s,sizeof (s),"ipv6_l3fwd_hash_%d" , socketid); +rte_snprintf (s,sizeof (s),"ipv6_l3fwd_hash_%d" , socketid); ipv6_l3fwd_hash_params.name = s; ipv6_l3fwd_hash_params.socket_id = socketid; ipv6_l3fwd_lookup_struct[socketid] =
@@ -1477,6 +1584,7 @@ main(int argc, char **argv)unsigned lcore_id;uint64_t hz;uint32_t n_tx_queue, nb_lcores; +uint32_t dev_rxq_num, dev_txq_num;uint8_t portid, nb_rx_queue, queue, socketid;/* catch SIGINT and restore cpufreq governor to ondemand */
@@ -1526,10 +1634,19 @@ main(int argc, char **argv)printf ("Initializing port %d ... " , portid );fflush (stdout); +rte_eth_dev_info_get (portid, &dev_info); + dev_rxq_num = dev_info.max_rx_queues; + dev_txq_num = dev_info.max_tx_queues; + nb_rx_queue =get_port_n_rx_queues (portid); +if (nb_rx_queue > dev_rxq_num) +rte_exit (EXIT_FAILURE , +"Cannot configure not existed rxq: " +"port=%d\n" , portid); + n_tx_queue = nb_lcores; -if (n_tx_queue >MAX_TX_QUEUE_PER_PORT ) - n_tx_queue =MAX_TX_QUEUE_PER_PORT ; +if (n_tx_queue > dev_txq_num) + n_tx_queue = dev_txq_num;printf ("Creating queues: nb_rxq=%d nb_txq=%u... " , nb_rx_queue, (unsigned )n_tx_queue ); ret = rte_eth_dev_configure(portid, nb_rx_queue,
@@ -1553,6 +1670,9 @@ main(int argc, char **argv)if (rte_lcore_is_enabled (lcore_id) ==0 )continue ; +if (queueid >= dev_txq_num) +continue ; +if (numa_on) socketid = \ (uint8_t )rte_lcore_to_socket_id (lcore_id);
@@ -1587,8 +1707,9 @@ main(int argc, char **argv)/* init power management library */ ret =rte_power_init (lcore_id);if (ret) -rte_exit (EXIT_FAILURE ,"Power management library " -"initialization failed on core%u\n" , lcore_id); +rte_log (RTE_LOG_ERR ,RTE_LOGTYPE_POWER , +"Power management library initialization " +"failed on core%u" , lcore_id);/* init timer structures for each enabled lcore */ rte_timer_init (&power_timers[lcore_id]);
@@ -1636,7 +1757,6 @@ main(int argc, char **argv)if (ret <0 )rte_exit (EXIT_FAILURE ,"rte_eth_dev_start: err=%d, " "port=%d\n" , ret, portid); -/* * If enabled, put device in promiscuous mode. * This allows IO forwarding mode to forward packets
@@ -1645,6 +1765,8 @@ main(int argc, char **argv)*/ if (promiscuous_on)rte_eth_promiscuous_enable (portid); +/* initialize spinlock for each port */ +rte_spinlock_init (&(locks[portid])); }check_all_ports_link_status ((uint8_t )nb_ports, enabled_port_mask);
Signature · 1 line
1.8.1.4
v15 cover Interrupt mode PMD
In reply to Cunming Liangv15 changes
- remove unnecessary RTE_NEXT_ABI comment
- remove ifdef RTE_NEXT_ABI from header file
v14 changes
- per-patch basis ABI compatibility rework
- remove unnecessary 'local: *' from version map
- minor comments rework
v13 changes
- version map cleanup for v2.1
- replace RTE_EAL_RX_INTR by RTE_NEXT_ABI for ABI compatibility
Patch series v12
v12 changes
- bsd cleanup for unused variable warning
- fix awkward line split in debug message
v11 changes
- typo cleanup and check kernel style
v10 changes
- code rework to return actual error code
- bug fix for lsc when using uio_pci_generic
v9 changes
- code rework to fix open comment
- bug fix for igb lsc when both lsc and rxq are enabled in vfio-msix
- new patch to turn off the feature by default so as to avoid v2.1 abi broken
v8 changes
- remove condition check for only vfio-msix
- add multiplex intr support when only one intr vector allowed
- lsc and rxq interrupt runtime enable decision
- add safe event delete while the event wakeup execution happens
v7 changes
- decouple epoll event and intr operation
- add condition check in the case intr vector is disabled
- renaming some APIs
v6 changes
- split rte_intr_wait_rx_pkt into two APIs 'wait' and 'set'.
- rewrite rte_intr_rx_wait/rte_intr_rx_set.
- using vector number instead of queue_id as interrupt API params.
- patch reorder and split.
v5 changes
- Rebase the patchset onto the HEAD
- Isolate ethdev from EAL for new-added wait-for-rx interrupt function
- Export wait-for-rx interrupt function for shared libraries
- Split-off a new patch file for changed struct rte_intr_handle that other patches depend on, to avoid breaking git bisect
- Change sample applicaiton to accomodate EAL function spec change accordingly
v4 changes
- Export interrupt enable/disable functions for shared libraries
- Adjust position of new-added structure fields and functions to avoid breaking ABI
v3 changes
- Add return value for interrupt enable/disable functions
- Move spinlok from PMD to L3fwd-power
- Remove unnecessary variables in e1000_mac_info
- Fix miscelleous review comments
v2 changes
- Fix compilation issue in Makefile for missed header file.
- Consolidate internal and community review comments of v1 patch set.
The patch series introduce low-latency one-shot rx interrupt into DPDK with polling and interrupt mode switch control example.
DPDK userspace interrupt notification and handling mechanism is based on UIO with below limitation:
1) It is designed to handle LSC interrupt only with inefficient suspended pthread wakeup procedure (e.g. UIO wakes up LSC interrupt handling thread which then wakes up DPDK polling thread). In this way, it introduces non-deterministic wakeup latency for DPDK polling thread as well as packet latency if it is used to handle Rx interrupt.
2) UIO only supports a single interrupt vector which has to been shared by LSC interrupt and interrupts assigned to dedicated rx queues.
This patchset includes below features:
1) Enable one-shot rx queue interrupt in ixgbe PMD(PF & VF) and igb PMD(PF only) .
2) Build on top of the VFIO mechanism instead of UIO, so it could support up to 64 interrupt vectors for rx queue interrupts.
3) Have 1 DPDK polling thread handle per Rx queue interrupt with a dedicated VFIO eventfd, which eliminates non-deterministic pthread wakeup latency in user space.
4) Demonstrate interrupts control APIs and userspace NAIP-like polling/interrupt switch algorithms in L3fwd-power example.
Known limitations:
1) It does not work for UIO due to a single interrupt eventfd shared by LSC and rx queue interrupt handlers causes a mess. [FIXED]
2) LSC interrupt is not supported by VF driver, so it is by default disabled in L3fwd-power now. Feel free to turn in on if you want to support both LSC and rx queue interrupts on a PF.
Cunming Liang (13):
eal/linux: add interrupt vectors support in intr_handle eal/linux: add rte_epoll_wait/ctl support
eal/linux: add API to set rx interrupt event monitor eal/linux: fix comments typo on vfio msi
eal/linux: map eventfd to VFIO MSI-X intr vector eal/linux: standalone intr event fd create support eal/linux: fix lsc read error in uio_pci_generic
eal/bsd: dummy for new intr definition
eal/bsd: fix inappropriate linuxapp referred in bsd
ethdev: add rx intr enable, disable and ctl functions
ixgbe: enable rx queue interrupts for both PF and VF
igb: enable rx queue interrupts for PF
l3fwd-power: enable one-shot rx interrupt and polling/interrupt mode
switch
drivers/net/e1000/igb_ethdev.c | 311 ++++++++++-- drivers/net/ixgbe/ixgbe_ethdev.c | 527 ++++++++++++++++++++- drivers/net/ixgbe/ixgbe_ethdev.h | 4 + examples/l3fwd-power/main.c | 205 ++++++-- lib/librte_eal/bsdapp/eal/eal_interrupts.c | 42 ++ .../bsdapp/eal/include/exec-env/rte_interrupts.h | 74 ++- lib/librte_eal/bsdapp/eal/rte_eal_version.map | 5 + lib/librte_eal/linuxapp/eal/eal_interrupts.c | 414 ++++++++++++++-- .../linuxapp/eal/include/exec-env/rte_interrupts.h | 153 ++++++ lib/librte_eal/linuxapp/eal/rte_eal_version.map | 8 + lib/librte_ether/rte_ethdev.c | 147 ++++++ lib/librte_ether/rte_ethdev.h | 104 ++++ lib/librte_ether/rte_ether_version.map | 4 + 13 files changed, 1870 insertions(+), 128 deletions(-)
Signature · 1 line
1.8.1.4
PATCH v15 1/13 eal/linux: add interrupt vectors support in intr_handle
The patch adds interrupt vectors support in rte_intr_handle.
'vec_en' is set when interrupt vectors are detected and associated event fds are set. Those event fds are stored in efds[].
'intr_vec' is reserved for device driver to initialize the vector mapping table.
---
v15 changes
- remove unnecessary RTE_NEXT_ABI comment
v14 changes
- per-patch basis ABI compatibility rework
v7 changes:
- add eptrs[], it's used to store the register rte_epoll_event instances.
- add vec_en, to log the vector capability status.
v6 changes:
- add mapping table between irq vector number and queue id.
v5 changes:
- Create this new patch file for changed struct rte_intr_handle that other patches depend on, to avoid breaking git bisect.
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h | 8 ++++++++ 1 file changed, 8 insertions(+)
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +8 -0
@@ -38,6 +38,8 @@#ifndef _RTE_LINUXAPP_INTERRUPTS_H_#define _RTE_LINUXAPP_INTERRUPTS_H_ +#define RTE_MAX_RXTX_INTR_VEC_ID 32 +enum rte_intr_handle_type {RTE_INTR_HANDLE_UNKNOWN =0 , RTE_INTR_HANDLE_UIO, /**< uio device handle */
@@ -58,6 +60,12 @@ struct rte_intr_handle { };int fd;/**< interrupt event file descriptor */ enum rte_intr_handle_type type;/**< handle type */ +#ifdef RTE_NEXT_ABI +uint32_t max_intr;/**< max interrupt requested */ +uint32_t nb_efd;/**< number of available efd(event fd) */ +int efds[RTE_MAX_RXTX_INTR_VEC_ID ];/**< intr vectors/efds mapping */ +int *intr_vec;/**< intr vector number array */ +#endif };#endif /* _RTE_LINUXAPP_INTERRUPTS_H_ */
Signature · 1 line
1.8.1.4
PATCH v15 2/13 eal/linux: add rte_epoll_wait/ctl support
In reply to Cunming LiangThe patch adds 'rte_epoll_wait' and 'rte_epoll_ctl' for async event wakeup.
It defines 'struct rte_epoll_event' as the event param.
When the event fds add to a specified epoll instance, 'eptrs' will hold the rte_epoll_event object pointer. The 'op' uses the same enum as epoll_wait/ctl does.
The epoll event support to carry a raw user data and to register a callback which is executed during wakeup.
---
v14 changes
- per-patch basis ABI compatibility rework
- remove unnecessary 'local: *' from version map
v13 changes
- version map cleanup for v2.1
v11 changes
- cleanup spelling error
v9 changes
- rework on coding style
v8 changes
- support delete event in safety during the wakeup execution
- add EINTR process during epoll_wait
v7 changes
- split v6[4/8] into two patches, one for epoll event(this one) another for rx intr(next patch)
- introduce rte_epoll_event definition
- rte_epoll_wait/ctl for more generic RTE epoll API
v6 changes
- split rte_intr_wait_rx_pkt into two function, wait and set.
- rewrite rte_intr_rx_wait/rte_intr_rx_set to remove queue visibility on eal.
- rte_intr_rx_wait to support multiplexing.
- allow epfd as input to support flexible event fd combination.
lib/librte_eal/linuxapp/eal/eal_interrupts.c | 139 +++++++++++++++++++++ .../linuxapp/eal/include/exec-env/rte_interrupts.h | 80 ++++++++++++ lib/librte_eal/linuxapp/eal/rte_eal_version.map | 3 + 3 files changed, 222 insertions(+)
lib/librte_eal/linuxapp/eal/eal_interrupts.c +139 -0
@@ -69,6 +69,8 @@#define EAL_INTR_EPOLL_WAIT_FOREVER (-1) +static RTE_DEFINE_PER_LCORE(int, _epfd) = -1; /**< epoll fd per thread */ +/** * union for pipe fds. */
@@ -896,3 +898,140 @@ rte_eal_intr_init(void)return -ret; } + +static int +eal_epoll_process_event (struct epoll_event *evs,unsigned int n, +struct rte_epoll_event *events) +{ +unsigned int i, count =0 ; +struct rte_epoll_event *rev; + +for (i =0 ; i < n; i++) { + rev = evs[i].data.ptr; +if (!rev || !rte_atomic32_cmpset (&rev->status,RTE_EPOLL_VALID , +RTE_EPOLL_EXEC )) +continue ; + + events[count].status =RTE_EPOLL_VALID ; + events[count].fd = rev->fd; + events[count].epfd = rev->epfd; + events[count].epdata.event = rev->epdata.event; + events[count].epdata.data = rev->epdata.data; +if (rev->epdata.cb_fun) + rev->epdata.cb_fun (rev->fd, + rev->epdata.cb_arg); + +rte_compiler_barrier (); + rev->status =RTE_EPOLL_VALID ; + count++; + } +return count; +} + +static inline int +eal_init_tls_epfd (void ) +{ +int pfd =epoll_create (255 ); + +if (pfd <0 ) { +RTE_LOG (ERR ,EAL , +"Cannot create epoll instance\n" ); +return -1 ; + } +return pfd; +} + +int +rte_intr_tls_epfd (void ) +{ +if (RTE_PER_LCORE (_epfd) ==-1 ) +RTE_PER_LCORE (_epfd) =eal_init_tls_epfd (); + +return RTE_PER_LCORE (_epfd); +} + +int +rte_epoll_wait (int epfd,struct rte_epoll_event *events, +int maxevents,int timeout) +{ +struct epoll_event evs[maxevents]; +int rc; + +if (!events) { +RTE_LOG (ERR ,EAL ,"rte_epoll_event can't be NULL\n" ); +return -1 ; + } + +/* using per thread epoll fd */ +if (epfd ==RTE_EPOLL_PER_THREAD ) + epfd =rte_intr_tls_epfd (); + +while (1 ) { + rc =epoll_wait (epfd, evs, maxevents, timeout); +if (likely (rc >0 )) { +/* epoll_wait has at least one fd ready to read */ + rc =eal_epoll_process_event (evs, rc, events); +break ; + }else if (rc <0 ) { +if (errno ==EINTR ) +continue ; +/* epoll_wait fail */ +RTE_LOG (ERR ,EAL ,"epoll_wait returns with fail %s\n" , +strerror (errno)); + rc =-1 ; +break ; + } + } + +return rc; +} + +static inline void +eal_epoll_data_safe_free (struct rte_epoll_event *ev) +{ +while (!rte_atomic32_cmpset (&ev->status,RTE_EPOLL_VALID , +RTE_EPOLL_INVALID )) +while (ev->status !=RTE_EPOLL_VALID ) +rte_pause (); +memset (&ev->epdata,0 ,sizeof (ev->epdata)); + ev->fd =-1 ; + ev->epfd =-1 ; +} + +int +rte_epoll_ctl (int epfd,int op,int fd, +struct rte_epoll_event *event) +{ +struct epoll_event ev; + +if (!event) { +RTE_LOG (ERR ,EAL ,"rte_epoll_event can't be NULL\n" ); +return -1 ; + } + +/* using per thread epoll fd */ +if (epfd ==RTE_EPOLL_PER_THREAD ) + epfd =rte_intr_tls_epfd (); + +if (op ==EPOLL_CTL_ADD ) { + event->status =RTE_EPOLL_VALID ; + event->fd = fd;/* ignore fd in event */ + event->epfd = epfd; + ev.data.ptr = (void *)event; + } + + ev.events = event->epdata.event; +if (epoll_ctl (epfd, op, fd, &ev) <0 ) { +RTE_LOG (ERR ,EAL ,"Error op %d fd %d epoll_ctl, %s\n" , + op, fd,strerror (errno)); +if (op ==EPOLL_CTL_ADD ) +/* rollback status when CTL_ADD fail */ + event->status =RTE_EPOLL_INVALID ; +return -1 ; + } + +if (op ==EPOLL_CTL_DEL && event->status !=RTE_EPOLL_INVALID ) +eal_epoll_data_safe_free (event); + +return 0 ; +}
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +80 -0
94 lines not on this page · raw message
lib/librte_eal/linuxapp/eal/rte_eal_version.map +3 -0
@@ -116,6 +116,9 @@ DPDK_2.1 { global: rte_eal_pci_detach; + rte_epoll_ctl; + rte_epoll_wait; + rte_intr_tls_epfd; rte_memzone_free; } DPDK_2.0;
Signature · 1 line
1.8.1.4
PATCH v15 3/13 eal/linux: add API to set rx interrupt event monitor
In reply to Cunming LiangThe patch adds 'rte_intr_rx_ctl' to add or delete interrupt vector events monitor on specified epoll instance.
---
v15 changes
- remove ifdef RTE_NEXT_ABI from header file
v14 changes
- per-patch basis ABI compatibility rework
- remove unnecessary 'local: *' from version map
v13 changes
- version map cleanup for v2.1
v12 changes:
- fix awkward line split in using RTE_LOG
v10 changes:
- add RTE_INTR_HANDLE_UIO_INTX for uio_pci_generic
v8 changes
- fix EWOULDBLOCK and EINTR processing
- add event status check
v7 changes
- rename rte_intr_rx_set to rte_intr_rx_ctl.
- rte_intr_rx_ctl uses rte_epoll_ctl to register epoll event instance.
- the intr rx event instance includes a intr process callback.
v6 changes
- split rte_intr_wait_rx_pkt into two function, wait and set.
- rewrite rte_intr_rx_wait/rte_intr_rx_set to remove queue visibility on eal.
- rte_intr_rx_wait to support multiplexing.
- allow epfd as input to support flexible event fd combination.
lib/librte_eal/linuxapp/eal/eal_interrupts.c | 117 +++++++++++++++++++++ .../linuxapp/eal/include/exec-env/rte_interrupts.h | 20 ++++ lib/librte_eal/linuxapp/eal/rte_eal_version.map | 1 + 3 files changed, 138 insertions(+)
lib/librte_eal/linuxapp/eal/eal_interrupts.c +117 -0
@@ -899,6 +899,51 @@ rte_eal_intr_init(void)return -ret; } +#ifdef RTE_NEXT_ABI +static void +eal_intr_proc_rxtx_intr (int fd,const struct rte_intr_handle *intr_handle) +{ +union rte_intr_read_buffer buf; +int bytes_read =1 ; + +switch (intr_handle->type) { +case RTE_INTR_HANDLE_UIO : +case RTE_INTR_HANDLE_UIO_INTX : + bytes_read =sizeof (buf.uio_intr_count); +break ; +#ifdef VFIO_PRESENT +case RTE_INTR_HANDLE_VFIO_MSIX : +case RTE_INTR_HANDLE_VFIO_MSI : +case RTE_INTR_HANDLE_VFIO_LEGACY : + bytes_read =sizeof (buf.vfio_intr_count); +break ; +#endif +default : + bytes_read =1 ; +RTE_LOG (INFO ,EAL ,"unexpected intr type\n" ); +break ; + } + +/** +* read out to clear the ready-to-be-read flag +* for epoll_wait. +*/ +do { + bytes_read =read (fd, &buf, bytes_read); +if (bytes_read <0 ) { +if (errno ==EINTR || errno ==EWOULDBLOCK || + errno ==EAGAIN ) +continue ; +RTE_LOG (ERR ,EAL , +"Error reading from fd %d: %s\n" , + fd,strerror (errno)); + }else if (bytes_read ==0 ) +RTE_LOG (ERR ,EAL ,"Read nothing from fd %d\n" , fd); +return ; + }while (1 ); +} +#endif +static int eal_epoll_process_event (struct epoll_event *evs,unsigned int n,struct rte_epoll_event *events)
@@ -1035,3 +1080,75 @@ rte_epoll_ctl(int epfd, int op, int fd,return 0 ; } + +#ifdef RTE_NEXT_ABI +int +rte_intr_rx_ctl (struct rte_intr_handle *intr_handle,int epfd, +int op,unsigned int vec,void *data) +{ +struct rte_epoll_event *rev; +struct rte_epoll_data *epdata; +int epfd_op; +int rc =0 ; + +if (!intr_handle || intr_handle->nb_efd ==0 || + vec >= intr_handle->nb_efd) { +RTE_LOG (ERR ,EAL ,"Wrong intr vector number.\n" ); +return -EPERM ; + } + +switch (op) { +case RTE_INTR_EVENT_ADD : + epfd_op =EPOLL_CTL_ADD ; + rev = &intr_handle->elist[vec]; +if (rev->status !=RTE_EPOLL_INVALID ) { +RTE_LOG (INFO ,EAL ,"Event already been added.\n" ); +return -EEXIST ; + } + +/* attach to intr vector fd */ + epdata = &rev->epdata; + epdata->event =EPOLLIN |EPOLLPRI |EPOLLET ; + epdata->data = data; + epdata->cb_fun = (rte_intr_event_cb_t )eal_intr_proc_rxtx_intr; + epdata->cb_arg = (void *)intr_handle; + rc =rte_epoll_ctl (epfd, epfd_op, intr_handle->efds[vec], rev); +if (!rc) +RTE_LOG (DEBUG ,EAL , +"efd %d associated with vec %d added on epfd %d" +"\n" , rev->fd, vec, epfd); +else + rc = -EPERM ; +break ; +case RTE_INTR_EVENT_DEL : + epfd_op =EPOLL_CTL_DEL ; + rev = &intr_handle->elist[vec]; +if (rev->status ==RTE_EPOLL_INVALID ) { +RTE_LOG (INFO ,EAL ,"Event does not exist.\n" ); +return -EPERM ; + } + + rc =rte_epoll_ctl (rev->epfd, epfd_op, rev->fd, rev); +if (rc) + rc = -EPERM ; +break ; +default : +RTE_LOG (ERR ,EAL ,"event op type mismatch\n" ); + rc = -EPERM ; + } + +return rc; +} +#else +int +rte_intr_rx_ctl (struct rte_intr_handle *intr_handle, +int epfd,int op,unsigned int vec,void *data) +{ +RTE_SET_USED (intr_handle); +RTE_SET_USED (epfd); +RTE_SET_USED (op); +RTE_SET_USED (vec); +RTE_SET_USED (data); +return -ENOTSUP ; +} +#endif
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +20 -0
@@ -148,4 +148,24 @@ rte_epoll_ctl(int epfd, int op, int fd,int rte_intr_tls_epfd (void ); +/** +* @param intr_handle +* Pointer to the interrupt handle. +* @param epfd +* Epoll instance fd which the intr vector associated to. +* @param op +* The operation be performed for the vector. +* Operation type of {ADD, DEL}. +* @param vec +* RX intr vector number added to the epoll instance wait list. +* @param data +* User raw data. +* @return +* - On success, zero. +* - On failure, a negative value. +*/ +int +rte_intr_rx_ctl (struct rte_intr_handle *intr_handle, +int epfd,int op,unsigned int vec,void *data); +#endif /* _RTE_LINUXAPP_INTERRUPTS_H_ */
lib/librte_eal/linuxapp/eal/rte_eal_version.map +1 -0
@@ -118,6 +118,7 @@ DPDK_2.1 { rte_eal_pci_detach; rte_epoll_ctl; rte_epoll_wait; + rte_intr_rx_ctl; rte_intr_tls_epfd; rte_memzone_free;
Signature · 1 line
1.8.1.4
PATCH v15 4/13 eal/linux: fix comments typo on vfio msi
In reply to Cunming Liang--- lib/librte_eal/linuxapp/eal/eal_interrupts.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
lib/librte_eal/linuxapp/eal/eal_interrupts.c +2 -2
@@ -219,7 +219,7 @@ vfio_disable_intx(struct rte_intr_handle *intr_handle) {return 0 ; } -/* enable MSI-X interrupts */ +/* enable MSI interrupts */ static int vfio_enable_msi (struct rte_intr_handle *intr_handle) {int len, ret;
@@ -265,7 +265,7 @@ vfio_enable_msi(struct rte_intr_handle *intr_handle) {return 0 ; } -/* disable MSI-X interrupts */ +/* disable MSI interrupts */ static int vfio_disable_msi (struct rte_intr_handle *intr_handle) {struct vfio_irq_set *irq_set;
Signature · 1 line
1.8.1.4
PATCH v15 5/13 eal/linux: map eventfd to VFIO MSI-X intr vector
In reply to Cunming LiangThe patch maps each of the eventfd to the interrupt vector of VFIO MSI-X.
---
v14 changes
- per-patch basis ABI compatibility rework
- reword commit comments
v8 changes
- move eventfd creation out of the setup_interrupts to a standalone function
v7 changes
- cleanup unnecessary code change
- split event and intr operation to other patches
lib/librte_eal/linuxapp/eal/eal_interrupts.c | 56 ++++++++++------------------ 1 file changed, 20 insertions(+), 36 deletions(-)
lib/librte_eal/linuxapp/eal/eal_interrupts.c +20 -36
@@ -128,6 +128,9 @@ static pthread_t intr_thread;#ifdef VFIO_PRESENT #define IRQ_SET_BUF_LEN (sizeof(struct vfio_irq_set) + sizeof(int)) +/* irq set buffer length for queue interrupts and LSC interrupt */ +#define MSIX_IRQ_SET_BUF_LEN (sizeof(struct vfio_irq_set) + \ + sizeof(int) * (RTE_MAX_RXTX_INTR_VEC_ID + 1))/* enable legacy (INTx) interrupts */ static int
@@ -245,23 +248,6 @@ vfio_enable_msi(struct rte_intr_handle *intr_handle) { intr_handle->fd);return -1 ; } - -/* manually trigger interrupt to enable it */ -memset (irq_set,0 , len); - len =sizeof (struct vfio_irq_set ); - irq_set->argsz = len; - irq_set->count =1 ; - irq_set->flags =VFIO_IRQ_SET_DATA_NONE |VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_PCI_MSI_IRQ_INDEX ; - irq_set->start =0 ; - - ret =ioctl (intr_handle->vfio_dev_fd,VFIO_DEVICE_SET_IRQS , irq_set); - -if (ret) { -RTE_LOG (ERR ,EAL ,"Error triggering MSI interrupts for fd %d\n" , - intr_handle->fd); -return -1 ; - }return 0 ; }
@@ -294,7 +280,7 @@ vfio_disable_msi(struct rte_intr_handle *intr_handle) {static int vfio_enable_msix (struct rte_intr_handle *intr_handle) {int len, ret; -char irq_set_buf[IRQ_SET_BUF_LEN ]; +char irq_set_buf[MSIX_IRQ_SET_BUF_LEN ];struct vfio_irq_set *irq_set;int *fd_ptr;
@@ -302,12 +288,26 @@ vfio_enable_msix(struct rte_intr_handle *intr_handle) { irq_set = (struct vfio_irq_set *) irq_set_buf; irq_set->argsz = len; +#ifdef RTE_NEXT_ABI +if (!intr_handle->max_intr) + intr_handle->max_intr =1 ; +else if (intr_handle->max_intr >RTE_MAX_RXTX_INTR_VEC_ID ) + intr_handle->max_intr =RTE_MAX_RXTX_INTR_VEC_ID +1 ; + + irq_set->count = intr_handle->max_intr; +#else irq_set->count =1 ; +#endif irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD |VFIO_IRQ_SET_ACTION_TRIGGER ; irq_set->index =VFIO_PCI_MSIX_IRQ_INDEX ; irq_set->start =0 ; fd_ptr = (int *) &irq_set->data; - *fd_ptr = intr_handle->fd; +#ifdef RTE_NEXT_ABI +memcpy (fd_ptr, intr_handle->efds,sizeof (intr_handle->efds)); + fd_ptr[intr_handle->max_intr -1 ] = intr_handle->fd; +#else + fd_ptr[0 ] = intr_handle->fd; +#endif ret =ioctl (intr_handle->vfio_dev_fd,VFIO_DEVICE_SET_IRQS , irq_set);
@@ -317,22 +317,6 @@ vfio_enable_msix(struct rte_intr_handle *intr_handle) {return -1 ; } -/* manually trigger interrupt to enable it */ -memset (irq_set,0 , len); - len =sizeof (struct vfio_irq_set ); - irq_set->argsz = len; - irq_set->count =1 ; - irq_set->flags =VFIO_IRQ_SET_DATA_NONE |VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_PCI_MSIX_IRQ_INDEX ; - irq_set->start =0 ; - - ret =ioctl (intr_handle->vfio_dev_fd,VFIO_DEVICE_SET_IRQS , irq_set); - -if (ret) { -RTE_LOG (ERR ,EAL ,"Error triggering MSI-X interrupts for fd %d\n" , - intr_handle->fd); -return -1 ; - }return 0 ; }
@@ -340,7 +324,7 @@ vfio_enable_msix(struct rte_intr_handle *intr_handle) {static int vfio_disable_msix (struct rte_intr_handle *intr_handle) {struct vfio_irq_set *irq_set; -char irq_set_buf[IRQ_SET_BUF_LEN ]; +char irq_set_buf[MSIX_IRQ_SET_BUF_LEN ];int len, ret; len =sizeof (struct vfio_irq_set );
Signature · 1 line
1.8.1.4
PATCH v15 6/13 eal/linux: standalone intr event fd create support
In reply to Cunming LiangThe patch exposes intr event fd create and release for PMD.
The device driver can assign the number of event associated with interrupt vector. It also provides misc functions to check 1) allows other slowpath intr(e.g. lsc);
2) intr event on fastpath is enabled or not.
---
v15 changes
- remove ifdef RTE_NEXT_ABI from header file
v14 changes
- per-patch basis ABI compatibility rework
- minor changes on API decription comments
v13 changes
- version map cleanup for v2.1
v11 changes
- typo cleanup
lib/librte_eal/linuxapp/eal/eal_interrupts.c | 97 ++++++++++++++++++++++ .../linuxapp/eal/include/exec-env/rte_interrupts.h | 45 ++++++++++ lib/librte_eal/linuxapp/eal/rte_eal_version.map | 4 + 3 files changed, 146 insertions(+)
lib/librte_eal/linuxapp/eal/eal_interrupts.c +97 -0
@@ -44,6 +44,7 @@#include <sys/epoll.h> #include <sys/signalfd.h> #include <sys/ioctl.h> +#include <sys/eventfd.h> #include <rte_common.h> #include <rte_interrupts.h>
@@ -68,6 +69,7 @@#include "eal_vfio.h" #define EAL_INTR_EPOLL_WAIT_FOREVER (-1) +#define NB_OTHER_INTR 1 static RTE_DEFINE_PER_LCORE(int, _epfd) = -1; /**< epoll fd per thread */
@@ -1123,6 +1125,73 @@ rte_intr_rx_ctl(struct rte_intr_handle *intr_handle, int epfd,return rc; } + +int +rte_intr_efd_enable (struct rte_intr_handle *intr_handle,uint32_t nb_efd) +{ +uint32_t i; +int fd; +uint32_t n =RTE_MIN (nb_efd, (uint32_t )RTE_MAX_RXTX_INTR_VEC_ID ); + +if (intr_handle->type ==RTE_INTR_HANDLE_VFIO_MSIX ) { +for (i =0 ; i < n; i++) { + fd =eventfd (0 ,EFD_NONBLOCK |EFD_CLOEXEC ); +if (fd <0 ) { +RTE_LOG (ERR ,EAL , +"can't setup eventfd, error %i (%s)\n" , + errno,strerror (errno)); +return -1 ; + } + intr_handle->efds[i] = fd; + } + intr_handle->nb_efd = n; + intr_handle->max_intr =NB_OTHER_INTR + n; + }else { + intr_handle->efds[0 ] = intr_handle->fd; + intr_handle->nb_efd =RTE_MIN (nb_efd,1U ); + intr_handle->max_intr =NB_OTHER_INTR ; + } + +return 0 ; +} + +void +rte_intr_efd_disable (struct rte_intr_handle *intr_handle) +{ +uint32_t i; +struct rte_epoll_event *rev; + +for (i =0 ; i < intr_handle->nb_efd; i++) { + rev = &intr_handle->elist[i]; +if (rev->status ==RTE_EPOLL_INVALID ) +continue ; +if (rte_epoll_ctl (rev->epfd,EPOLL_CTL_DEL , rev->fd, rev)) { +/* force free if the entry valid */ +eal_epoll_data_safe_free (rev); + rev->status =RTE_EPOLL_INVALID ; + } + } + +if (intr_handle->max_intr > intr_handle->nb_efd) { +for (i =0 ; i < intr_handle->nb_efd; i++) +close (intr_handle->efds[i]); + } + intr_handle->nb_efd =0 ; + intr_handle->max_intr =0 ; +} + +int +rte_intr_dp_is_en (struct rte_intr_handle *intr_handle) +{ +return !(!intr_handle->nb_efd); +} + +int +rte_intr_allow_others (struct rte_intr_handle *intr_handle) +{ +return !!(intr_handle->max_intr - intr_handle->nb_efd); +} +#else int rte_intr_rx_ctl(struct rte_intr_handle *intr_handle,
@@ -1135,4 +1204,32 @@ rte_intr_rx_ctl(struct rte_intr_handle *intr_handle,RTE_SET_USED (data); return -ENOTSUP; } + +int +rte_intr_efd_enable (struct rte_intr_handle *intr_handle,uint32_t nb_efd) +{ +RTE_SET_USED (intr_handle); +RTE_SET_USED (nb_efd); +return 0 ; +} + +void +rte_intr_efd_disable (struct rte_intr_handle *intr_handle) +{ +RTE_SET_USED (intr_handle); +} + +int +rte_intr_dp_is_en (struct rte_intr_handle *intr_handle) +{ +RTE_SET_USED (intr_handle); +return 0 ; +} + +int +rte_intr_allow_others (struct rte_intr_handle *intr_handle) +{ +RTE_SET_USED (intr_handle); +return 1 ; +}#endif
lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h +45 -0
49 lines not on this page · raw message
lib/librte_eal/linuxapp/eal/rte_eal_version.map +4 -0
@@ -118,6 +118,10 @@ DPDK_2.1 { rte_eal_pci_detach; rte_epoll_ctl; rte_epoll_wait; + rte_intr_allow_others; + rte_intr_dp_is_en; + rte_intr_efd_enable; + rte_intr_efd_disable; rte_intr_rx_ctl; rte_intr_tls_epfd; rte_memzone_free;
Signature · 1 line
1.8.1.4
PATCH v15 7/13 eal/linux: fix lsc read error in uio_pci_generic
In reply to Cunming LiangThe intr handle type(RTE_INTR_HANDLE_UIO_INTX) was introduced by UIO pci generic. When turning on the lsc interrupt, it complains fd read error.
The patch uses the correct read size in the case of RTE_INTR_HANDLE_UIO_INTX.
--- lib/librte_eal/linuxapp/eal/eal_interrupts.c | 1 + 1 file changed, 1 insertion(+)
lib/librte_eal/linuxapp/eal/eal_interrupts.c +1 -0
@@ -686,6 +686,7 @@ eal_intr_process_interrupts(struct epoll_event *events, int nfds)/* set the length to be read dor different handle type */ switch (src->intr_handle.type) {case RTE_INTR_HANDLE_UIO : +case RTE_INTR_HANDLE_UIO_INTX : bytes_read =sizeof (buf.uio_intr_count);break ;case RTE_INTR_HANDLE_ALARM :
Signature · 1 line
1.8.1.4
PATCH v15 8/13 eal/bsd: dummy for new intr definition
In reply to Cunming LiangTo make bsd compiling happy with new intr changes.
---
v15 changes
- remove ifdef RTE_NEXT_ABI from header file
v14 changes
- per-patch basis ABI compatibility rework
v13 changes
- version map cleanup for v2.1
v12 changes
- fix unused variables compiling warning
v8 changes
- add stub for new function
v7 changes
- remove stub 'linux only' function from source file
lib/librte_eal/bsdapp/eal/eal_interrupts.c | 42 +++++++++++++ .../bsdapp/eal/include/exec-env/rte_interrupts.h | 68 ++++++++++++++++++++++ lib/librte_eal/bsdapp/eal/rte_eal_version.map | 5 ++ 3 files changed, 115 insertions(+)
lib/librte_eal/bsdapp/eal/eal_interrupts.c +42 -0
@@ -68,3 +68,45 @@ rte_eal_intr_init(void) {return 0 ; } + +int +rte_intr_rx_ctl (struct rte_intr_handle *intr_handle, +int epfd,int op,unsigned int vec,void *data) +{ +RTE_SET_USED (intr_handle); +RTE_SET_USED (epfd); +RTE_SET_USED (op); +RTE_SET_USED (vec); +RTE_SET_USED (data); + +return -ENOTSUP ; +} + +int +rte_intr_efd_enable (struct rte_intr_handle *intr_handle,uint32_t nb_efd) +{ +RTE_SET_USED (intr_handle); +RTE_SET_USED (nb_efd); + +return 0 ; +} + +void +rte_intr_efd_disable (struct rte_intr_handle *intr_handle) +{ +RTE_SET_USED (intr_handle); +} + +int +rte_intr_dp_is_en (struct rte_intr_handle *intr_handle) +{ +RTE_SET_USED (intr_handle); +return 0 ; +} + +int +rte_intr_allow_others (struct rte_intr_handle *intr_handle) +{ +RTE_SET_USED (intr_handle); +return 1 ; +}
lib/librte_eal/bsdapp/eal/include/exec-env/rte_interrupts.h +68 -0
74 lines not on this page · raw message
lib/librte_eal/bsdapp/eal/rte_eal_version.map +5 -0
@@ -116,6 +116,11 @@ DPDK_2.1 { global: rte_eal_pci_detach; + rte_intr_allow_others; + rte_intr_dp_is_en; + rte_intr_efd_enable; + rte_intr_efd_disable; + rte_intr_rx_ctl; rte_memzone_free; } DPDK_2.0;
Signature · 1 line
1.8.1.4
Re: [PATCH v15 08/13] eal/bsd: dummy for new intr definition
2015-07-20 11:02, Cunming Liang:
Quoted 3 lines
To make bsd compiling happy with new intr changes.
Signed-off-by Cunming Liang <[email protected]>
The dummy BSD functions must be added along the Linux ones to avoid breaking BSD build in the middle of the series.
PATCH v15 9/13 eal/bsd: fix inappropriate linuxapp referred in bsd
In reply to Cunming Liang--- lib/librte_eal/bsdapp/eal/include/exec-env/rte_interrupts.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
lib/librte_eal/bsdapp/eal/include/exec-env/rte_interrupts.h +3 -3
@@ -35,8 +35,8 @@#error "don't include this file directly, please include generic <rte_interrupts.h>"#endif -#ifndef _RTE_LINUXAPP_INTERRUPTS_H_ -#define _RTE_LINUXAPP_INTERRUPTS_H_ +#ifndef _RTE_BSDAPP_INTERRUPTS_H_ +#define _RTE_BSDAPP_INTERRUPTS_H_enum rte_intr_handle_type { RTE_INTR_HANDLE_UNKNOWN = 0,
@@ -120,4 +120,4 @@ int rte_intr_dp_is_en(struct rte_intr_handle *intr_handle);*/ int rte_intr_allow_others (struct rte_intr_handle *intr_handle); -#endif /* _RTE_LINUXAPP_INTERRUPTS_H_ */ +#endif /* _RTE_BSDAPP_INTERRUPTS_H_ */
Signature · 1 line
1.8.1.4
PATCH v15 10/13 ethdev: add rx intr enable, disable and ctl functions
In reply to Cunming LiangThe patch adds two dev_ops functions to enable and disable rx queue interrupts.
In addtion, it adds rte_eth_dev_rx_intr_ctl/rx_intr_q to support per port or per queue rx intr event set.
---
v15 changes
- remove ifdef RTE_NEXT_ABI from header file
v14 changes
- per-patch basis ABI compatibility rework
- remove unnecessary 'local: *' from version map
v13 changes
- version map cleanup for v2.1
v9 changes
- remove unnecessary check after rte_eth_dev_is_valid_port. the same as http://www.dpdk.org/dev/patchwork/patch/4784
v8 changes
- add addtion check for EEXIT
v7 changes
- remove rx_intr_vec_get
- add rx_intr_ctl and rx_intr_ctl_q
v6 changes
- add rx_intr_vec_get to retrieve the vector num of the queue.
v5 changes
- Rebase the patchset onto the HEAD
v4 changes
- Export interrupt enable/disable functions for shared libraries
- Put new functions at the end of eth_dev_ops to avoid breaking ABI
v3 changes
- Add return value for interrupt enable/disable functions
lib/librte_ether/rte_ethdev.c | 147 +++++++++++++++++++++++++++++++++ lib/librte_ether/rte_ethdev.h | 104 +++++++++++++++++++++++ lib/librte_ether/rte_ether_version.map | 4 + 3 files changed, 255 insertions(+)
lib/librte_ether/rte_ethdev.c +147 -0
@@ -3031,6 +3031,153 @@ _rte_eth_dev_callback_process(struct rte_eth_dev *dev, }rte_spinlock_unlock (&rte_eth_dev_cb_lock); } + +#ifdef RTE_NEXT_ABI +int +rte_eth_dev_rx_intr_ctl (uint8_t port_id,int epfd,int op,void *data) +{ +uint32_t vec; +struct rte_eth_dev *dev; +struct rte_intr_handle *intr_handle; +uint16_t qid; +int rc; + +if (!rte_eth_dev_is_valid_port (port_id)) { +PMD_DEBUG_TRACE ("Invalid port_id=%u\n" , port_id); +return -ENODEV ; + } + + dev = &rte_eth_devices[port_id]; + intr_handle = &dev->pci_dev->intr_handle; +if (!intr_handle->intr_vec) { +PMD_DEBUG_TRACE ("RX Intr vector unset\n" ); +return -EPERM ; + } + +for (qid =0 ; qid < dev->data->nb_rx_queues; qid++) { + vec = intr_handle->intr_vec[qid]; + rc =rte_intr_rx_ctl (intr_handle, epfd, op, vec, data); +if (rc && rc != -EEXIST ) { +PMD_DEBUG_TRACE ("p %u q %u rx ctl error" +" op %d epfd %d vec %u\n" , + port_id, qid, op, epfd, vec); + } + } + +return 0 ; +} + +int +rte_eth_dev_rx_intr_ctl_q (uint8_t port_id,uint16_t queue_id, +int epfd,int op,void *data) +{ +uint32_t vec; +struct rte_eth_dev *dev; +struct rte_intr_handle *intr_handle; +int rc; + +if (!rte_eth_dev_is_valid_port (port_id)) { +PMD_DEBUG_TRACE ("Invalid port_id=%u\n" , port_id); +return -ENODEV ; + } + + dev = &rte_eth_devices[port_id]; +if (queue_id >= dev->data->nb_rx_queues) { +PMD_DEBUG_TRACE ("Invalid RX queue_id=%u\n" , queue_id); +return -EINVAL ; + } + + intr_handle = &dev->pci_dev->intr_handle; +if (!intr_handle->intr_vec) { +PMD_DEBUG_TRACE ("RX Intr vector unset\n" ); +return -EPERM ; + } + + vec = intr_handle->intr_vec[queue_id]; + rc =rte_intr_rx_ctl (intr_handle, epfd, op, vec, data); +if (rc && rc != -EEXIST ) { +PMD_DEBUG_TRACE ("p %u q %u rx ctl error" +" op %d epfd %d vec %u\n" , + port_id, queue_id, op, epfd, vec); +return rc; + } + +return 0 ; +} + +int +rte_eth_dev_rx_intr_enable (uint8_t port_id, +uint16_t queue_id) +{ +struct rte_eth_dev *dev; + +if (!rte_eth_dev_is_valid_port (port_id)) { +PMD_DEBUG_TRACE ("Invalid port_id=%d\n" , port_id); +return -ENODEV ; + } + + dev = &rte_eth_devices[port_id]; + +FUNC_PTR_OR_ERR_RET (*dev->dev_ops->rx_queue_intr_enable, -ENOTSUP ); +return (*dev->dev_ops->rx_queue_intr_enable)(dev, queue_id); +} + +int +rte_eth_dev_rx_intr_disable (uint8_t port_id, +uint16_t queue_id) +{ +struct rte_eth_dev *dev; + +if (!rte_eth_dev_is_valid_port (port_id)) { +PMD_DEBUG_TRACE ("Invalid port_id=%d\n" , port_id); +return -ENODEV ; + } + + dev = &rte_eth_devices[port_id]; + +FUNC_PTR_OR_ERR_RET (*dev->dev_ops->rx_queue_intr_disable, -ENOTSUP ); +return (*dev->dev_ops->rx_queue_intr_disable)(dev, queue_id); +} +#else +int +rte_eth_dev_rx_intr_enable (uint8_t port_id,uint16_t queue_id) +{ +RTE_SET_USED (port_id); +RTE_SET_USED (queue_id); +return -ENOTSUP ; +} + +int +rte_eth_dev_rx_intr_disable (uint8_t port_id,uint16_t queue_id) +{ +RTE_SET_USED (port_id); +RTE_SET_USED (queue_id); +return -ENOTSUP ; +} + +int +rte_eth_dev_rx_intr_ctl (uint8_t port_id,int epfd,int op,void *data) +{ +RTE_SET_USED (port_id); +RTE_SET_USED (epfd); +RTE_SET_USED (op); +RTE_SET_USED (data); +return -1 ; +} + +int +rte_eth_dev_rx_intr_ctl_q (uint8_t port_id,uint16_t queue_id, +int epfd,int op,void *data) +{ +RTE_SET_USED (port_id); +RTE_SET_USED (queue_id); +RTE_SET_USED (epfd); +RTE_SET_USED (op); +RTE_SET_USED (data); +return -1 ; +} +#endif +#ifdef RTE_NIC_BYPASS int rte_eth_dev_bypass_init (uint8_t port_id) {
lib/librte_ether/rte_ethdev.h +104 -0
128 lines not on this page · raw message
lib/librte_ether/rte_ether_version.map +4 -0
@@ -115,6 +115,10 @@ DPDK_2.1 { rte_eth_dev_get_reg_info; rte_eth_dev_get_reg_length; rte_eth_dev_is_valid_port; + rte_eth_dev_rx_intr_ctl; + rte_eth_dev_rx_intr_ctl_q; + rte_eth_dev_rx_intr_disable; + rte_eth_dev_rx_intr_enable; rte_eth_dev_set_eeprom; rte_eth_dev_set_mc_addr_list; rte_eth_timesync_disable;
Signature · 1 line
1.8.1.4
PATCH v15 11/13 ixgbe: enable rx queue interrupts for both PF and VF
In reply to Cunming LiangThe patch does below things for ixgbe PF and VF:
- Setup NIC to generate MSI-X interrupts
- Set the IVAR register to map interrupt causes to vectors
- Implement interrupt enable/disable functions
---
v14 changes
- per-patch basis ABI compatibility rework
v10 changes
- return an actual error code rather than -1
v9 changes
- move queue-vec mapping init from dev_configure to dev_start
v8 changes
- add vfio-msi/vfio-legacy and uio-legacy support
v7 changes
- add condition check when intr vector is not enabled
v6 changes
- fill queue-vector mapping table
v5 changes
- Rebase the patchset onto the HEAD
v3 changes
- Remove spinlok from PMD
v2 changes
- Consolidate review comments related to coding style
drivers/net/ixgbe/ixgbe_ethdev.c | 527 ++++++++++++++++++++++++++++++++++++++- drivers/net/ixgbe/ixgbe_ethdev.h | 4 + 2 files changed, 518 insertions(+), 13 deletions(-)
drivers/net/ixgbe/ixgbe_ethdev.c +514 -13
@@ -85,6 +85,9 @@*/ #define IXGBE_FC_LO 0x40 +/* Default minimum inter-interrupt interval for EITR configuration */ +#define IXGBE_MIN_INTER_INTERRUPT_INTERVAL_DEFAULT 0x79E +/* Timer value included in XOFF frames. */ #define IXGBE_FC_PAUSE 0x680
@@ -187,6 +190,9 @@ static int ixgbe_dev_rss_reta_query(struct rte_eth_dev *dev, uint16_t reta_size);static void ixgbe_dev_link_status_print (struct rte_eth_dev *dev);static int ixgbe_dev_lsc_interrupt_setup (struct rte_eth_dev *dev); +#ifdef RTE_NEXT_ABI +static int ixgbe_dev_rxq_interrupt_setup (struct rte_eth_dev *dev); +#endif static int ixgbe_dev_interrupt_get_status (struct rte_eth_dev *dev);static int ixgbe_dev_interrupt_action (struct rte_eth_dev *dev); static void ixgbe_dev_interrupt_handler(struct rte_intr_handle *handle,
@@ -202,11 +208,14 @@ static void ixgbe_dcb_init(struct ixgbe_hw *hw,struct ixgbe_dcb_config *dcb_conf/* For Virtual Function support */ static int eth_ixgbevf_dev_init (struct rte_eth_dev *eth_dev);static int eth_ixgbevf_dev_uninit (struct rte_eth_dev *eth_dev); +static int ixgbevf_dev_interrupt_get_status (struct rte_eth_dev *dev); +static int ixgbevf_dev_interrupt_action (struct rte_eth_dev *dev);static int ixgbevf_dev_configure (struct rte_eth_dev *dev);static int ixgbevf_dev_start (struct rte_eth_dev *dev);static void ixgbevf_dev_stop (struct rte_eth_dev *dev);static void ixgbevf_dev_close (struct rte_eth_dev *dev);static void ixgbevf_intr_disable (struct ixgbe_hw *hw); +static void ixgbevf_intr_enable (struct ixgbe_hw *hw);static void ixgbevf_dev_stats_get (struct rte_eth_dev *dev,struct rte_eth_stats *stats);static void ixgbevf_dev_stats_reset (struct rte_eth_dev *dev);
@@ -216,6 +225,17 @@ static void ixgbevf_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on);static void ixgbevf_vlan_offload_set (struct rte_eth_dev *dev,int mask);static void ixgbevf_set_vfta_all (struct rte_eth_dev *dev,bool on); +static void ixgbevf_dev_interrupt_handler (struct rte_intr_handle *handle, +void *param); +#ifdef RTE_NEXT_ABI +static int ixgbevf_dev_rx_queue_intr_enable (struct rte_eth_dev *dev, +uint16_t queue_id); +static int ixgbevf_dev_rx_queue_intr_disable (struct rte_eth_dev *dev, +uint16_t queue_id); +static void ixgbevf_set_ivar_map (struct ixgbe_hw *hw,int8_t direction, +uint8_t queue,uint8_t msix_vector); +#endif +static void ixgbevf_configure_msix (struct rte_eth_dev *dev);/* For Eth VMDQ APIs support */ static int ixgbe_uc_hash_table_set(struct rte_eth_dev *dev, struct
@@ -232,6 +252,15 @@ static int ixgbe_mirror_rule_set(struct rte_eth_dev *dev, uint8_t rule_id, uint8_t on);static int ixgbe_mirror_rule_reset (struct rte_eth_dev *dev,uint8_t rule_id); +#ifdef RTE_NEXT_ABI +static int ixgbe_dev_rx_queue_intr_enable (struct rte_eth_dev *dev, +uint16_t queue_id); +static int ixgbe_dev_rx_queue_intr_disable (struct rte_eth_dev *dev, +uint16_t queue_id); +static void ixgbe_set_ivar_map (struct ixgbe_hw *hw,int8_t direction, +uint8_t queue,uint8_t msix_vector); +#endif +static void ixgbe_configure_msix (struct rte_eth_dev *dev);static int ixgbe_set_queue_rate_limit (struct rte_eth_dev *dev,uint16_t queue_idx,uint16_t tx_rate);
@@ -308,7 +337,7 @@ static int ixgbe_timesync_read_tx_timestamp(struct rte_eth_dev *dev,*/ #define UPDATE_VF_STAT (reg, last, cur) \ { \ - u32 latest = IXGBE_READ_REG(hw, reg); \ + uint32_t latest = IXGBE_READ_REG(hw, reg); \ cur += latest - last; \ last = latest; \ }
@@ -391,6 +420,10 @@ static const struct eth_dev_ops ixgbe_eth_dev_ops = { .tx_queue_start = ixgbe_dev_tx_queue_start, .tx_queue_stop = ixgbe_dev_tx_queue_stop, .rx_queue_setup = ixgbe_dev_rx_queue_setup, +#ifdef RTE_NEXT_ABI + .rx_queue_intr_enable = ixgbe_dev_rx_queue_intr_enable, + .rx_queue_intr_disable = ixgbe_dev_rx_queue_intr_disable, +#endif .rx_queue_release = ixgbe_dev_rx_queue_release, .rx_queue_count = ixgbe_dev_rx_queue_count, .rx_descriptor_done = ixgbe_dev_rx_descriptor_done,
@@ -461,8 +494,13 @@ static const struct eth_dev_ops ixgbevf_eth_dev_ops = { .vlan_offload_set = ixgbevf_vlan_offload_set, .rx_queue_setup = ixgbe_dev_rx_queue_setup, .rx_queue_release = ixgbe_dev_rx_queue_release, + .rx_descriptor_done = ixgbe_dev_rx_descriptor_done, .tx_queue_setup = ixgbe_dev_tx_queue_setup, .tx_queue_release = ixgbe_dev_tx_queue_release, +#ifdef RTE_NEXT_ABI + .rx_queue_intr_enable = ixgbevf_dev_rx_queue_intr_enable, + .rx_queue_intr_disable = ixgbevf_dev_rx_queue_intr_disable, +#endif .mac_addr_add = ixgbevf_add_mac_addr, .mac_addr_remove = ixgbevf_remove_mac_addr, .set_mc_addr_list = ixgbe_dev_set_mc_addr_list,
@@ -1000,12 +1038,6 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev) eth_dev->data->port_id, pci_dev->id.vendor_id, pci_dev->id.device_id); -rte_intr_callback_register (&(pci_dev->intr_handle), - ixgbe_dev_interrupt_handler, (void *)eth_dev); - -/* enable uio intr after callback register */ -rte_intr_enable (&(pci_dev->intr_handle)); -/* enable support intr */ ixgbe_enable_intr (eth_dev);
@@ -1647,6 +1679,10 @@ ixgbe_dev_start(struct rte_eth_dev *dev)IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private);struct ixgbe_vf_info *vfinfo = *IXGBE_DEV_PRIVATE_TO_P_VFDATA (dev->data->dev_private); +struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle; +#ifdef RTE_NEXT_ABI +uint32_t intr_vector =0 ; +#endif int err, link_up =0 , negotiate =0 ;uint32_t speed =0 ;int mask =0 ;
@@ -1679,6 +1715,30 @@ ixgbe_dev_start(struct rte_eth_dev *dev)/* configure PF module if SRIOV enabled */ ixgbe_pf_host_configure (dev); +#ifdef RTE_NEXT_ABI +/* check and configure queue intr-vector mapping */ +if (dev->data->dev_conf.intr_conf.rxq !=0 ) + intr_vector = dev->data->nb_rx_queues; + +if (rte_intr_efd_enable (intr_handle, intr_vector)) +return -1 ; + +if (rte_intr_dp_is_en (intr_handle) && !intr_handle->intr_vec) { + intr_handle->intr_vec = +rte_zmalloc ("intr_vec" , + dev->data->nb_rx_queues *sizeof (int ), +0 ); +if (intr_handle->intr_vec ==NULL ) { +PMD_INIT_LOG (ERR ,"Failed to allocate %d rx_queues" +" intr_vec\n" , dev->data->nb_rx_queues); +return -ENOMEM ; + } + } +#endif + +/* confiugre msix for sleep until rx interrupt */ +ixgbe_configure_msix (dev); +/* initialize transmission unit */ ixgbe_dev_tx_init (dev);
@@ -1756,8 +1816,25 @@ ixgbe_dev_start(struct rte_eth_dev *dev) skip_link_setup:/* check if lsc interrupt is enabled */ -if (dev->data->dev_conf.intr_conf.lsc !=0 ) -ixgbe_dev_lsc_interrupt_setup (dev); +if (dev->data->dev_conf.intr_conf.lsc !=0 ) { +if (rte_intr_allow_others (intr_handle)) { +rte_intr_callback_register (intr_handle, + ixgbe_dev_interrupt_handler, + (void *)dev); +ixgbe_dev_lsc_interrupt_setup (dev); + }else +PMD_INIT_LOG (INFO ,"lsc won't enable because of" +" no intr multiplex\n" ); + } + +#ifdef RTE_NEXT_ABI +/* check if rxq interrupt is enabled */ +if (dev->data->dev_conf.intr_conf.rxq !=0 ) +ixgbe_dev_rxq_interrupt_setup (dev); +#endif + +/* enable uio/vfio intr/eventfd mapping */ +rte_intr_enable (intr_handle);/* resume enabled intr since hw reset */ ixgbe_enable_intr (dev);
@@ -1814,6 +1891,7 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)struct ixgbe_filter_info *filter_info =IXGBE_DEV_PRIVATE_TO_FILTER_INFO (dev->data->dev_private);struct ixgbe_5tuple_filter *p_5tuple, *p_5tuple_next; +struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle;int vf;PMD_INIT_FUNC_TRACE ();
@@ -1821,6 +1899,9 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)/* disable interrupts */ ixgbe_disable_intr (hw); +/* disable intr eventfd mapping */ +rte_intr_disable (intr_handle); +/* reset the NIC */ ixgbe_pf_reset_hw (hw); hw->adapter_stopped =0 ;
@@ -1861,6 +1942,14 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)memset (filter_info->fivetuple_mask,0 ,sizeof (uint32_t ) *IXGBE_5TUPLE_ARRAY_SIZE ); +#ifdef RTE_NEXT_ABI +/* Clean datapath event and queue/vec mapping */ +rte_intr_efd_disable (intr_handle); +if (intr_handle->intr_vec !=NULL ) { +rte_free (intr_handle->intr_vec); + intr_handle->intr_vec =NULL ; + } +#endif }/*
@@ -2535,6 +2624,30 @@ ixgbe_dev_lsc_interrupt_setup(struct rte_eth_dev *dev)return 0 ; } +/** +* It clears the interrupt causes and enables the interrupt. +* It will be called once only during nic initialized. +* +* @param dev +* Pointer to struct rte_eth_dev. +* +* @return +* - On success, zero. +* - On failure, a negative value. +*/ +#ifdef RTE_NEXT_ABI +static int +ixgbe_dev_rxq_interrupt_setup (struct rte_eth_dev *dev) +{ +struct ixgbe_interrupt *intr = +IXGBE_DEV_PRIVATE_TO_INTR (dev->data->dev_private); + + intr->mask |=IXGBE_EICR_RTX_QUEUE ; + +return 0 ; +} +#endif +/* * It reads ICR and sets flag (IXGBE_EICR_LSC) for the link_update. *
@@ -2561,10 +2674,10 @@ ixgbe_dev_interrupt_get_status(struct rte_eth_dev *dev)PMD_DRV_LOG (INFO ,"eicr %x" , eicr); intr->flags =0 ; -if (eicr &IXGBE_EICR_LSC ) { -/* set flag for async link update */ + +/* set flag for async link update */ +if (eicr &IXGBE_EICR_LSC ) intr->flags |=IXGBE_FLAG_NEED_LINK_UPDATE ; - }if (eicr &IXGBE_EICR_MAILBOX ) intr->flags |=IXGBE_FLAG_MAILBOX ;
@@ -2572,6 +2685,30 @@ ixgbe_dev_interrupt_get_status(struct rte_eth_dev *dev)return 0 ; } +static int +ixgbevf_dev_interrupt_get_status (struct rte_eth_dev *dev) +{ +uint32_t eicr; +struct ixgbe_hw *hw =IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); +struct ixgbe_interrupt *intr = +IXGBE_DEV_PRIVATE_TO_INTR (dev->data->dev_private); + +/* clear all cause mask */ +ixgbevf_intr_disable (hw); + +/* read-on-clear nic registers here */ + eicr =IXGBE_READ_REG (hw,IXGBE_VTEICR ); +PMD_DRV_LOG (INFO ,"eicr %x" , eicr); + + intr->flags =0 ; + +/* set flag for async link update */ +if (eicr &IXGBE_EICR_LSC ) + intr->flags |=IXGBE_FLAG_NEED_LINK_UPDATE ; + +return 0 ; +} +/** * It gets and then prints the link status. *
@@ -2667,6 +2804,18 @@ ixgbe_dev_interrupt_action(struct rte_eth_dev *dev)return 0 ; } +static int +ixgbevf_dev_interrupt_action (struct rte_eth_dev *dev) +{ +struct ixgbe_hw *hw = +IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); + +PMD_DRV_LOG (DEBUG ,"enable intr immediately" ); +ixgbevf_intr_enable (hw); +rte_intr_enable (&dev->pci_dev->intr_handle); +return 0 ; +} +/** * Interrupt handler which shall be registered for alarm callback for delayed * handling specific interrupt to wait for the stable nic state. As the
@@ -2721,13 +2870,24 @@ ixgbe_dev_interrupt_delayed_handler(void *param)*/ static void ixgbe_dev_interrupt_handler(__rte_unused struct rte_intr_handle *handle, -void *param) +void *param) {struct rte_eth_dev *dev = (struct rte_eth_dev *)param; +ixgbe_dev_interrupt_get_status (dev);ixgbe_dev_interrupt_action (dev); } +static void +ixgbevf_dev_interrupt_handler(__rte_unused struct rte_intr_handle *handle, +void *param) +{ +struct rte_eth_dev *dev = (struct rte_eth_dev *)param; + +ixgbevf_dev_interrupt_get_status (dev); +ixgbevf_dev_interrupt_action (dev); +} +static int ixgbe_dev_led_on (struct rte_eth_dev *dev) {
@@ -3233,6 +3393,19 @@ ixgbevf_intr_disable(struct ixgbe_hw *hw)IXGBE_WRITE_FLUSH (hw); } +static void +ixgbevf_intr_enable (struct ixgbe_hw *hw) +{ +PMD_INIT_FUNC_TRACE (); + +/* VF enable interrupt autoclean */ +IXGBE_WRITE_REG (hw,IXGBE_VTEIAM ,IXGBE_VF_IRQ_ENABLE_MASK ); +IXGBE_WRITE_REG (hw,IXGBE_VTEIAC ,IXGBE_VF_IRQ_ENABLE_MASK ); +IXGBE_WRITE_REG (hw,IXGBE_VTEIMS ,IXGBE_VF_IRQ_ENABLE_MASK ); + +IXGBE_WRITE_FLUSH (hw); +} +static int ixgbevf_dev_configure (struct rte_eth_dev *dev) {
@@ -3274,6 +3447,11 @@ ixgbevf_dev_start(struct rte_eth_dev *dev) {struct ixgbe_hw *hw =IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); +#ifdef RTE_NEXT_ABI +uint32_t intr_vector =0 ; +#endif +struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle; +int err, mask =0 ;PMD_INIT_FUNC_TRACE ();
@@ -3304,6 +3482,42 @@ ixgbevf_dev_start(struct rte_eth_dev *dev)ixgbevf_dev_rxtx_start (dev); +#ifdef RTE_NEXT_ABI +/* check and configure queue intr-vector mapping */ +if (dev->data->dev_conf.intr_conf.rxq !=0 ) + intr_vector = dev->data->nb_rx_queues; + +if (rte_intr_efd_enable (intr_handle, intr_vector)) +return -1 ; + +if (rte_intr_dp_is_en (intr_handle) && !intr_handle->intr_vec) { + intr_handle->intr_vec = +rte_zmalloc ("intr_vec" , + dev->data->nb_rx_queues *sizeof (int ),0 ); +if (intr_handle->intr_vec ==NULL ) { +PMD_INIT_LOG (ERR ,"Failed to allocate %d rx_queues" +" intr_vec\n" , dev->data->nb_rx_queues); +return -ENOMEM ; + } + } +#endif +ixgbevf_configure_msix (dev); + +if (dev->data->dev_conf.intr_conf.lsc !=0 ) { +if (rte_intr_allow_others (intr_handle)) +rte_intr_callback_register (intr_handle, + ixgbevf_dev_interrupt_handler, + (void *)dev); +else +PMD_INIT_LOG (INFO ,"lsc won't enable because of" +" no intr multiplex\n" ); + } + +rte_intr_enable (intr_handle); + +/* Re-enable interrupt for VF */ +ixgbevf_intr_enable (hw); +return 0 ; }
@@ -3311,6 +3525,7 @@ static void ixgbevf_dev_stop(struct rte_eth_dev *dev) {struct ixgbe_hw *hw =IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); +struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle;PMD_INIT_FUNC_TRACE ();
@@ -3327,12 +3542,27 @@ ixgbevf_dev_stop(struct rte_eth_dev *dev) dev->data->scattered_rx =0 ;ixgbe_dev_clear_queues (dev); + +/* disable intr eventfd mapping */ +rte_intr_disable (intr_handle); + +#ifdef RTE_NEXT_ABI +/* Clean datapath event and queue/vec mapping */ +rte_intr_efd_disable (intr_handle); +if (intr_handle->intr_vec !=NULL ) { +rte_free (intr_handle->intr_vec); + intr_handle->intr_vec =NULL ; + } +#endif }static void ixgbevf_dev_close (struct rte_eth_dev *dev) {struct ixgbe_hw *hw =IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); +#ifdef RTE_NEXT_ABI +struct rte_pci_device *pci_dev; +#endif PMD_INIT_FUNC_TRACE ();
@@ -3344,6 +3574,14 @@ ixgbevf_dev_close(struct rte_eth_dev *dev)/* reprogram the RAR[0] in case user changed it. */ ixgbe_set_rar (hw,0 , hw->mac.addr,0 ,IXGBE_RAH_AV ); + +#ifdef RTE_NEXT_ABI + pci_dev = dev->pci_dev; +if (pci_dev->intr_handle.intr_vec) { +rte_free (pci_dev->intr_handle.intr_vec); + pci_dev->intr_handle.intr_vec =NULL ; + } +#endif }static void ixgbevf_set_vfta_all (struct rte_eth_dev *dev,bool on)
@@ -3861,6 +4099,269 @@ ixgbe_mirror_rule_reset(struct rte_eth_dev *dev, uint8_t rule_id)return 0 ; } +#ifdef RTE_NEXT_ABI +static int +ixgbevf_dev_rx_queue_intr_enable (struct rte_eth_dev *dev,uint16_t queue_id) +{ +uint32_t mask; +struct ixgbe_hw *hw = +IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); + + mask =IXGBE_READ_REG (hw,IXGBE_VTEIMS ); + mask |= (1 << queue_id); +IXGBE_WRITE_REG (hw,IXGBE_VTEIMS , mask); + +rte_intr_enable (&dev->pci_dev->intr_handle); + +return 0 ; +} + +static int +ixgbevf_dev_rx_queue_intr_disable (struct rte_eth_dev *dev,uint16_t queue_id) +{ +uint32_t mask; +struct ixgbe_hw *hw = +IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); + + mask =IXGBE_READ_REG (hw,IXGBE_VTEIMS ); + mask &= ~(1 << queue_id); +IXGBE_WRITE_REG (hw,IXGBE_VTEIMS , mask); + +return 0 ; +} + +static int +ixgbe_dev_rx_queue_intr_enable (struct rte_eth_dev *dev,uint16_t queue_id) +{ +uint32_t mask; +struct ixgbe_hw *hw = +IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); +struct ixgbe_interrupt *intr = +IXGBE_DEV_PRIVATE_TO_INTR (dev->data->dev_private); + +if (queue_id <16 ) { +ixgbe_disable_intr (hw); + intr->mask |= (1 << queue_id); +ixgbe_enable_intr (dev); + }else if (queue_id <32 ) { + mask =IXGBE_READ_REG (hw,IXGBE_EIMS_EX (0 )); + mask &= (1 << queue_id); +IXGBE_WRITE_REG (hw,IXGBE_EIMS_EX (0 ), mask); + }else if (queue_id <64 ) { + mask =IXGBE_READ_REG (hw,IXGBE_EIMS_EX (1 )); + mask &= (1 << (queue_id -32 )); +IXGBE_WRITE_REG (hw,IXGBE_EIMS_EX (1 ), mask); + } +rte_intr_enable (&dev->pci_dev->intr_handle); + +return 0 ; +} + +static int +ixgbe_dev_rx_queue_intr_disable (struct rte_eth_dev *dev,uint16_t queue_id) +{ +uint32_t mask; +struct ixgbe_hw *hw = +IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); +struct ixgbe_interrupt *intr = +IXGBE_DEV_PRIVATE_TO_INTR (dev->data->dev_private); + +if (queue_id <16 ) { +ixgbe_disable_intr (hw); + intr->mask &= ~(1 << queue_id); +ixgbe_enable_intr (dev); + }else if (queue_id <32 ) { + mask =IXGBE_READ_REG (hw,IXGBE_EIMS_EX (0 )); + mask &= ~(1 << queue_id); +IXGBE_WRITE_REG (hw,IXGBE_EIMS_EX (0 ), mask); + }else if (queue_id <64 ) { + mask =IXGBE_READ_REG (hw,IXGBE_EIMS_EX (1 )); + mask &= ~(1 << (queue_id -32 )); +IXGBE_WRITE_REG (hw,IXGBE_EIMS_EX (1 ), mask); + } + +return 0 ; +} + +static void +ixgbevf_set_ivar_map (struct ixgbe_hw *hw,int8_t direction, +uint8_t queue,uint8_t msix_vector) +{ +uint32_t tmp, idx; + +if (direction ==-1 ) { +/* other causes */ + msix_vector |=IXGBE_IVAR_ALLOC_VAL ; + tmp =IXGBE_READ_REG (hw,IXGBE_VTIVAR_MISC ); + tmp &= ~0xFF ; + tmp |= msix_vector; +IXGBE_WRITE_REG (hw,IXGBE_VTIVAR_MISC , tmp); + }else { +/* rx or tx cause */ + msix_vector |=IXGBE_IVAR_ALLOC_VAL ; + idx = ((16 * (queue &1 )) + (8 * direction)); + tmp =IXGBE_READ_REG (hw,IXGBE_VTIVAR (queue >>1 )); + tmp &= ~(0xFF << idx); + tmp |= (msix_vector << idx); +IXGBE_WRITE_REG (hw,IXGBE_VTIVAR (queue >>1 ), tmp); + } +} + +/** +* set the IVAR registers, mapping interrupt causes to vectors +* @param hw +* pointer to ixgbe_hw struct +* @direction +* 0 for Rx, 1 for Tx, -1 for other causes +* @queue +* queue to map the corresponding interrupt to +* @msix_vector +* the vector to map to the corresponding queue +*/ +static void +ixgbe_set_ivar_map (struct ixgbe_hw *hw,int8_t direction, +uint8_t queue,uint8_t msix_vector) +{ +uint32_t tmp, idx; + + msix_vector |=IXGBE_IVAR_ALLOC_VAL ; +if (hw->mac.type == ixgbe_mac_82598EB) { +if (direction ==-1 ) + direction =0 ; + idx = (((direction *64 ) + queue) >>2 ) &0x1F ; + tmp =IXGBE_READ_REG (hw,IXGBE_IVAR (idx)); + tmp &= ~(0xFF << (8 * (queue &0x3 ))); + tmp |= (msix_vector << (8 * (queue &0x3 ))); +IXGBE_WRITE_REG (hw,IXGBE_IVAR (idx), tmp); + }else if ((hw->mac.type == ixgbe_mac_82599EB) || + (hw->mac.type == ixgbe_mac_X540)) { +if (direction ==-1 ) { +/* other causes */ + idx = ((queue &1 ) *8 ); + tmp =IXGBE_READ_REG (hw,IXGBE_IVAR_MISC ); + tmp &= ~(0xFF << idx); + tmp |= (msix_vector << idx); +IXGBE_WRITE_REG (hw,IXGBE_IVAR_MISC , tmp); + }else { +/* rx or tx causes */ + idx = ((16 * (queue &1 )) + (8 * direction)); + tmp =IXGBE_READ_REG (hw,IXGBE_IVAR (queue >>1 )); + tmp &= ~(0xFF << idx); + tmp |= (msix_vector << idx); +IXGBE_WRITE_REG (hw,IXGBE_IVAR (queue >>1 ), tmp); + } + } +} +#endif + +static void +ixgbevf_configure_msix (struct rte_eth_dev *dev) +{ +struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle; +#ifdef RTE_NEXT_ABI +struct ixgbe_hw *hw = +IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); +uint32_t q_idx; +uint32_t vector_idx =0 ; +#endif + +/* won't configure msix register if no mapping is done +* between intr vector and event fd. +*/ +if (!rte_intr_dp_is_en (intr_handle)) +return ; + +#ifdef RTE_NEXT_ABI +/* Configure all RX queues of VF */ +for (q_idx =0 ; q_idx < dev->data->nb_rx_queues; q_idx++) { +/* Force all queue use vector 0, +* as IXGBE_VF_MAXMSIVECOTR = 1 +*/ +ixgbevf_set_ivar_map (hw,0 , q_idx, vector_idx); + intr_handle->intr_vec[q_idx] = vector_idx; + } + +/* Configure VF Rx queue ivar */ +ixgbevf_set_ivar_map (hw,-1 ,1 , vector_idx); +#endif +} + +/** +* Sets up the hardware to properly generate MSI-X interrupts +* @hw +* board private structure +*/ +static void +ixgbe_configure_msix (struct rte_eth_dev *dev) +{ +struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle; +#ifdef RTE_NEXT_ABI +struct ixgbe_hw *hw = +IXGBE_DEV_PRIVATE_TO_HW (dev->data->dev_private); +uint32_t queue_id, vec =0 ; +uint32_t mask; +uint32_t gpie; +#endif + +/* won't configure msix register if no mapping is done +* between intr vector and event fd +*/ +if (!rte_intr_dp_is_en (intr_handle)) +return ; + +#ifdef RTE_NEXT_ABI +/* setup GPIE for MSI-x mode */ + gpie =IXGBE_READ_REG (hw,IXGBE_GPIE ); + gpie |=IXGBE_GPIE_MSIX_MODE |IXGBE_GPIE_PBA_SUPPORT | +IXGBE_GPIE_OCD |IXGBE_GPIE_EIAME ; +/* auto clearing and auto setting corresponding bits in EIMS +* when MSI-X interrupt is triggered +*/ +if (hw->mac.type == ixgbe_mac_82598EB) { +IXGBE_WRITE_REG (hw,IXGBE_EIAM ,IXGBE_EICS_RTX_QUEUE ); + }else { +IXGBE_WRITE_REG (hw,IXGBE_EIAM_EX (0 ),0xFFFFFFFF ); +IXGBE_WRITE_REG (hw,IXGBE_EIAM_EX (1 ),0xFFFFFFFF ); + } +IXGBE_WRITE_REG (hw,IXGBE_GPIE , gpie); + +/* Populate the IVAR table and set the ITR values to the +* corresponding register. +*/ +for (queue_id =0 ; queue_id < dev->data->nb_rx_queues; + queue_id++) { +/* by default, 1:1 mapping */ +ixgbe_set_ivar_map (hw,0 , queue_id, vec); + intr_handle->intr_vec[queue_id] = vec; +if (vec < intr_handle->nb_efd -1 ) + vec++; + } + +switch (hw->mac.type) { +case ixgbe_mac_82598EB: +ixgbe_set_ivar_map (hw,-1 ,IXGBE_IVAR_OTHER_CAUSES_INDEX , + intr_handle->max_intr -1 ); +break ; +case ixgbe_mac_82599EB: +case ixgbe_mac_X540: +ixgbe_set_ivar_map (hw,-1 ,1 , intr_handle->max_intr -1 ); +break ; +default : +break ; + } +IXGBE_WRITE_REG (hw,IXGBE_EITR (queue_id), +IXGBE_MIN_INTER_INTERRUPT_INTERVAL_DEFAULT &0xFFF ); + +/* set up to autoclear timer, and the vectors */ + mask =IXGBE_EIMS_ENABLE_MASK ; + mask &= ~(IXGBE_EIMS_OTHER | +IXGBE_EIMS_MAILBOX | +IXGBE_EIMS_LSC ); + +IXGBE_WRITE_REG (hw,IXGBE_EIAC , mask); +#endif +} +static int ixgbe_set_queue_rate_limit (struct rte_eth_dev *dev,uint16_t queue_idx,uint16_t tx_rate) {
drivers/net/ixgbe/ixgbe_ethdev.h +4 -0
@@ -117,6 +117,9 @@ ETH_RSS_IPV6_TCP_EX | \ ETH_RSS_IPV6_UDP_EX) +#define IXGBE_VF_IRQ_ENABLE_MASK 3/* vf irq enable mask */ +#define IXGBE_VF_MAXMSIVECTOR 1 +/* * Information about the fdir mode. */
@@ -332,6 +335,7 @@ uint32_t ixgbe_dev_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id);int ixgbe_dev_rx_descriptor_done (void *rx_queue,uint16_t offset); +int ixgbevf_dev_rx_descriptor_done (void *rx_queue,uint16_t offset);int ixgbe_dev_rx_init (struct rte_eth_dev *dev);
Signature · 1 line
1.8.1.4
PATCH v15 12/13 igb: enable rx queue interrupts for PF
In reply to Cunming LiangThe patch does below for igb PF:
- Setup NIC to generate MSI-X interrupts
- Set the IVAR register to map interrupt causes to vectors
- Implement interrupt enable/disable functions
---
v14 changes
- per-patch basis ABI compatibility rework
v9 changes
- move queue-vec mapping init from dev_configure to dev_start
- fix link interrupt not working issue in vfio-msix
v8 changes
- add vfio-msi/vfio-legacy and uio-legacy support
v7 changes
- add condition check when intr vector is not enabled
v6 changes
- fill queue-vector mapping table
v5 changes
- Rebase the patchset onto the HEAD
v3 changes
- Remove unnecessary variables in e1000_mac_info
- Remove spinlok from PMD
v2 changes
- Consolidate review comments related to coding style
drivers/net/e1000/igb_ethdev.c | 311 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 277 insertions(+), 34 deletions(-)
drivers/net/e1000/igb_ethdev.c +277 -34
@@ -105,6 +105,9 @@ static int eth_igb_flow_ctrl_get(struct rte_eth_dev *dev,static int eth_igb_flow_ctrl_set (struct rte_eth_dev *dev,struct rte_eth_fc_conf *fc_conf);static int eth_igb_lsc_interrupt_setup (struct rte_eth_dev *dev); +#ifdef RTE_NEXT_ABI +static int eth_igb_rxq_interrupt_setup (struct rte_eth_dev *dev); +#endif static int eth_igb_interrupt_get_status (struct rte_eth_dev *dev);static int eth_igb_interrupt_action (struct rte_eth_dev *dev); static void eth_igb_interrupt_handler(struct rte_intr_handle *handle,
@@ -218,7 +221,6 @@ static int eth_igb_get_eeprom(struct rte_eth_dev *dev, struct rte_dev_eeprom_info *eeprom);static int eth_igb_set_eeprom (struct rte_eth_dev *dev,struct rte_dev_eeprom_info *eeprom); -static int eth_igb_set_mc_addr_list (struct rte_eth_dev *dev,struct ether_addr *mc_addr_set,uint32_t nb_mc_addr);
@@ -229,6 +231,17 @@ static int igb_timesync_read_rx_timestamp(struct rte_eth_dev *dev, uint32_t flags);static int igb_timesync_read_tx_timestamp (struct rte_eth_dev *dev,struct timespec *timestamp); +#ifdef RTE_NEXT_ABI +static int eth_igb_rx_queue_intr_enable (struct rte_eth_dev *dev, +uint16_t queue_id); +static int eth_igb_rx_queue_intr_disable (struct rte_eth_dev *dev, +uint16_t queue_id); +static void eth_igb_assign_msix_vector (struct e1000_hw *hw,int8_t direction, +uint8_t queue,uint8_t msix_vector); +static void eth_igb_write_ivar (struct e1000_hw *hw,uint8_t msix_vector, +uint8_t index,uint8_t offset); +#endif +static void eth_igb_configure_msix_intr (struct rte_eth_dev *dev);/* * Define VF Stats MACRO for Non "cleared on read" register
@@ -289,6 +302,10 @@ static const struct eth_dev_ops eth_igb_ops = { .vlan_tpid_set = eth_igb_vlan_tpid_set, .vlan_offload_set = eth_igb_vlan_offload_set, .rx_queue_setup = eth_igb_rx_queue_setup, +#ifdef RTE_NEXT_ABI + .rx_queue_intr_enable = eth_igb_rx_queue_intr_enable, + .rx_queue_intr_disable = eth_igb_rx_queue_intr_disable, +#endif .rx_queue_release = eth_igb_rx_queue_release, .rx_queue_count = eth_igb_rx_queue_count, .rx_descriptor_done = eth_igb_rx_descriptor_done,
@@ -639,12 +656,6 @@ eth_igb_dev_init(struct rte_eth_dev *eth_dev) eth_dev->data->port_id, pci_dev->id.vendor_id, pci_dev->id.device_id); -rte_intr_callback_register (&(pci_dev->intr_handle), - eth_igb_interrupt_handler, (void *)eth_dev); - -/* enable uio intr after callback register */ -rte_intr_enable (&(pci_dev->intr_handle)); -/* enable support intr */ igb_intr_enable (eth_dev);
@@ -879,7 +890,11 @@ eth_igb_start(struct rte_eth_dev *dev)E1000_DEV_PRIVATE_TO_HW (dev->data->dev_private);struct e1000_adapter *adapter =E1000_DEV_PRIVATE (dev->data->dev_private); -int ret, i, mask; +struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle; +int ret, mask; +#ifdef RTE_NEXT_ABI +uint32_t intr_vector =0 ; +#endif uint32_t ctrl_ext;PMD_INIT_FUNC_TRACE ();
@@ -920,6 +935,29 @@ eth_igb_start(struct rte_eth_dev *dev)/* configure PF module if SRIOV enabled */ igb_pf_host_configure (dev); +#ifdef RTE_NEXT_ABI +/* check and configure queue intr-vector mapping */ +if (dev->data->dev_conf.intr_conf.rxq !=0 ) + intr_vector = dev->data->nb_rx_queues; + +if (rte_intr_efd_enable (intr_handle, intr_vector)) +return -1 ; + +if (rte_intr_dp_is_en (intr_handle)) { + intr_handle->intr_vec = +rte_zmalloc ("intr_vec" , + dev->data->nb_rx_queues *sizeof (int ),0 ); +if (intr_handle->intr_vec ==NULL ) { +PMD_INIT_LOG (ERR ,"Failed to allocate %d rx_queues" +" intr_vec\n" , dev->data->nb_rx_queues); +return -ENOMEM ; + } + } +#endif + +/* confiugre msix for rx interrupt */ +eth_igb_configure_msix_intr (dev); +/* Configure for OS presence */ igb_init_manageability (hw);
@@ -947,33 +985,9 @@ eth_igb_start(struct rte_eth_dev *dev)igb_vmdq_vlan_hw_filter_enable (dev); } -/* -* Configure the Interrupt Moderation register (EITR) with the maximum -* possible value (0xFFFF) to minimize "System Partial Write" issued by -* spurious [DMA] memory updates of RX and TX ring descriptors. -* -* With a EITR granularity of 2 microseconds in the 82576, only 7/8 -* spurious memory updates per second should be expected. -* ((65535 * 2) / 1000.1000 ~= 0.131 second). -* -* Because interrupts are not used at all, the MSI-X is not activated -* and interrupt moderation is controlled by EITR[0]. -* -* Note that having [almost] disabled memory updates of RX and TX ring -* descriptors through the Interrupt Moderation mechanism, memory -* updates of ring descriptors are now moderated by the configurable -* value of Write-Back Threshold registers. -*/ if ((hw->mac.type == e1000_82576) || (hw->mac.type == e1000_82580) || (hw->mac.type == e1000_i350) || (hw->mac.type == e1000_i210) || (hw->mac.type == e1000_i211)) { -uint32_t ivar; - -/* Enable all RX & TX queues in the IVAR registers */ - ivar = (uint32_t ) ((E1000_IVAR_VALID <<16 ) |E1000_IVAR_VALID ); -for (i =0 ; i <8 ; i++) -E1000_WRITE_REG_ARRAY (hw,E1000_IVAR0 , i, ivar); -/* Configure EITR with the maximum possible value (0xFFFF) */ E1000_WRITE_REG (hw,E1000_EITR (0 ),0xFFFF ); }
@@ -1024,8 +1038,25 @@ eth_igb_start(struct rte_eth_dev *dev)e1000_setup_link (hw);/* check if lsc interrupt feature is enabled */ -if (dev->data->dev_conf.intr_conf.lsc !=0 ) - ret =eth_igb_lsc_interrupt_setup (dev); +if (dev->data->dev_conf.intr_conf.lsc !=0 ) { +if (rte_intr_allow_others (intr_handle)) { +rte_intr_callback_register (intr_handle, + eth_igb_interrupt_handler, + (void *)dev); +eth_igb_lsc_interrupt_setup (dev); + }else +PMD_INIT_LOG (INFO ,"lsc won't enable because of" +" no intr multiplex\n" ); + } + +#ifdef RTE_NEXT_ABI +/* check if rxq interrupt is enabled */ +if (dev->data->dev_conf.intr_conf.rxq !=0 ) +eth_igb_rxq_interrupt_setup (dev); +#endif + +/* enable uio/vfio intr/eventfd mapping */ +rte_intr_enable (intr_handle);/* resume enabled intr since hw reset */ igb_intr_enable (dev);
@@ -1058,8 +1089,13 @@ eth_igb_stop(struct rte_eth_dev *dev)struct e1000_flex_filter *p_flex;struct e1000_5tuple_filter *p_5tuple, *p_5tuple_next;struct e1000_2tuple_filter *p_2tuple, *p_2tuple_next; +struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle;igb_intr_disable (hw); + +/* disable intr eventfd mapping */ +rte_intr_disable (intr_handle); +igb_pf_reset_hw (hw);E1000_WRITE_REG (hw,E1000_WUC ,0 );
@@ -1108,6 +1144,15 @@ eth_igb_stop(struct rte_eth_dev *dev)rte_free (p_2tuple); } filter_info->twotuple_mask =0 ; + +#ifdef RTE_NEXT_ABI +/* Clean datapath event and queue/vec mapping */ +rte_intr_efd_disable (intr_handle); +if (intr_handle->intr_vec !=NULL ) { +rte_free (intr_handle->intr_vec); + intr_handle->intr_vec =NULL ; + } +#endif } static void
@@ -1117,6 +1162,9 @@ eth_igb_close(struct rte_eth_dev *dev)struct e1000_adapter *adapter =E1000_DEV_PRIVATE (dev->data->dev_private);struct rte_eth_link link; +#ifdef RTE_NEXT_ABI +struct rte_pci_device *pci_dev; +#endif eth_igb_stop (dev); adapter->stopped =1 ;
@@ -1136,6 +1184,14 @@ eth_igb_close(struct rte_eth_dev *dev)igb_dev_free_queues (dev); +#ifdef RTE_NEXT_ABI + pci_dev = dev->pci_dev; +if (pci_dev->intr_handle.intr_vec) { +rte_free (pci_dev->intr_handle.intr_vec); + pci_dev->intr_handle.intr_vec =NULL ; + } +#endif +memset (&link,0 ,sizeof (link));rte_igb_dev_atomic_write_link_status (dev, &link); }
@@ -1960,6 +2016,35 @@ eth_igb_lsc_interrupt_setup(struct rte_eth_dev *dev)return 0 ; } +#ifdef RTE_NEXT_ABI +/* It clears the interrupt causes and enables the interrupt. +* It will be called once only during nic initialized. +* +* @param dev +* Pointer to struct rte_eth_dev. +* +* @return +* - On success, zero. +* - On failure, a negative value. +*/ +static int eth_igb_rxq_interrupt_setup (struct rte_eth_dev *dev) +{ +uint32_t mask, regval; +struct e1000_hw *hw = +E1000_DEV_PRIVATE_TO_HW (dev->data->dev_private); +struct rte_eth_dev_info dev_info; + +memset (&dev_info,0 ,sizeof (dev_info)); +eth_igb_infos_get (dev, &dev_info); + + mask =0xFFFFFFFF >> (32 - dev_info.max_rx_queues); + regval =E1000_READ_REG (hw,E1000_EIMS ); +E1000_WRITE_REG (hw,E1000_EIMS , regval | mask); + +return 0 ; +} +#endif +/* * It reads ICR and gets interrupt causes, check it and set a bit flag * to update link status.
@@ -4051,5 +4136,163 @@ static struct rte_driver pmd_igbvf_drv = { .init = rte_igbvf_pmd_init, }; +#ifdef RTE_NEXT_ABI +static int +eth_igb_rx_queue_intr_disable (struct rte_eth_dev *dev,uint16_t queue_id) +{ +struct e1000_hw *hw = +E1000_DEV_PRIVATE_TO_HW (dev->data->dev_private); +uint32_t mask =1 << queue_id; + +E1000_WRITE_REG (hw,E1000_EIMC , mask); +E1000_WRITE_FLUSH (hw); + +return 0 ; +} + +static int +eth_igb_rx_queue_intr_enable (struct rte_eth_dev *dev,uint16_t queue_id) +{ +struct e1000_hw *hw = +E1000_DEV_PRIVATE_TO_HW (dev->data->dev_private); +uint32_t mask =1 << queue_id; +uint32_t regval; + + regval =E1000_READ_REG (hw,E1000_EIMS ); +E1000_WRITE_REG (hw,E1000_EIMS , regval | mask); +E1000_WRITE_FLUSH (hw); + +rte_intr_enable (&dev->pci_dev->intr_handle); + +return 0 ; +} + +static void +eth_igb_write_ivar (struct e1000_hw *hw,uint8_t msix_vector, +uint8_t index,uint8_t offset) +{ +uint32_t val =E1000_READ_REG_ARRAY (hw,E1000_IVAR0 , index); + +/* clear bits */ + val &= ~((uint32_t )0xFF << offset); + +/* write vector and valid bit */ + val |= (msix_vector |E1000_IVAR_VALID ) << offset; + +E1000_WRITE_REG_ARRAY (hw,E1000_IVAR0 , index, val); +} + +static void +eth_igb_assign_msix_vector (struct e1000_hw *hw,int8_t direction, +uint8_t queue,uint8_t msix_vector) +{ +uint32_t tmp =0 ; + +if (hw->mac.type == e1000_82575) { +if (direction ==0 ) + tmp =E1000_EICR_RX_QUEUE0 << queue; +else if (direction ==1 ) + tmp =E1000_EICR_TX_QUEUE0 << queue; +E1000_WRITE_REG (hw,E1000_MSIXBM (msix_vector), tmp); + }else if (hw->mac.type == e1000_82576) { +if ((direction ==0 ) || (direction ==1 )) +eth_igb_write_ivar (hw, msix_vector, queue &0x7 , + ((queue &0x8 ) <<1 ) + +8 * direction); + }else if ((hw->mac.type == e1000_82580) || + (hw->mac.type == e1000_i350) || + (hw->mac.type == e1000_i354) || + (hw->mac.type == e1000_i210) || + (hw->mac.type == e1000_i211)) { +if ((direction ==0 ) || (direction ==1 )) +eth_igb_write_ivar (hw, msix_vector, + queue >>1 , + ((queue &0x1 ) <<4 ) + +8 * direction); + } +} +#endif + +/* Sets up the hardware to generate MSI-X interrupts properly +* @hw +* board private structure +*/ +static void +eth_igb_configure_msix_intr (struct rte_eth_dev *dev) +{ +#ifdef RTE_NEXT_ABI +int queue_id; +uint32_t tmpval, regval, intr_mask; +struct e1000_hw *hw = +E1000_DEV_PRIVATE_TO_HW (dev->data->dev_private); +uint32_t vec =0 ; +#endif +struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle; + +/* won't configure msix register if no mapping is done +* between intr vector and event fd +*/ +if (!rte_intr_dp_is_en (intr_handle)) +return ; + +#ifdef RTE_NEXT_ABI +/* set interrupt vector for other causes */ +if (hw->mac.type == e1000_82575) { + tmpval =E1000_READ_REG (hw,E1000_CTRL_EXT ); +/* enable MSI-X PBA support */ + tmpval |=E1000_CTRL_EXT_PBA_CLR ; + +/* Auto-Mask interrupts upon ICR read */ + tmpval |=E1000_CTRL_EXT_EIAME ; + tmpval |=E1000_CTRL_EXT_IRCA ; + +E1000_WRITE_REG (hw,E1000_CTRL_EXT , tmpval); + +/* enable msix_other interrupt */ +E1000_WRITE_REG_ARRAY (hw,E1000_MSIXBM (0 ),0 ,E1000_EIMS_OTHER ); + regval =E1000_READ_REG (hw,E1000_EIAC ); +E1000_WRITE_REG (hw,E1000_EIAC , regval |E1000_EIMS_OTHER ); + regval =E1000_READ_REG (hw,E1000_EIAM ); +E1000_WRITE_REG (hw,E1000_EIMS , regval |E1000_EIMS_OTHER ); + }else if ((hw->mac.type == e1000_82576) || + (hw->mac.type == e1000_82580) || + (hw->mac.type == e1000_i350) || + (hw->mac.type == e1000_i354) || + (hw->mac.type == e1000_i210) || + (hw->mac.type == e1000_i211)) { +/* turn on MSI-X capability first */ +E1000_WRITE_REG (hw,E1000_GPIE ,E1000_GPIE_MSIX_MODE | +E1000_GPIE_PBA |E1000_GPIE_EIAME | +E1000_GPIE_NSICR ); + + intr_mask = (1 << intr_handle->max_intr) -1 ; + regval =E1000_READ_REG (hw,E1000_EIAC ); +E1000_WRITE_REG (hw,E1000_EIAC , regval | intr_mask); + +/* enable msix_other interrupt */ + regval =E1000_READ_REG (hw,E1000_EIMS ); +E1000_WRITE_REG (hw,E1000_EIMS , regval | intr_mask); + tmpval = (dev->data->nb_rx_queues |E1000_IVAR_VALID ) <<8 ; +E1000_WRITE_REG (hw,E1000_IVAR_MISC , tmpval); + } + +/* use EIAM to auto-mask when MSI-X interrupt +* is asserted, this saves a register write for every interrupt +*/ + intr_mask = (1 << intr_handle->nb_efd) -1 ; + regval =E1000_READ_REG (hw,E1000_EIAM ); +E1000_WRITE_REG (hw,E1000_EIAM , regval | intr_mask); + +for (queue_id =0 ; queue_id < dev->data->nb_rx_queues; queue_id++) { +eth_igb_assign_msix_vector (hw,0 , queue_id, vec); + intr_handle->intr_vec[queue_id] = vec; +if (vec < intr_handle->nb_efd -1 ) + vec++; + } + +E1000_WRITE_FLUSH (hw); +#endif +} +PMD_REGISTER_DRIVER (pmd_igb_drv);PMD_REGISTER_DRIVER (pmd_igbvf_drv);
Signature · 1 line
1.8.1.4
PATCH v15 13/13 l3fwd-power: enable one-shot rx interrupt and polling/interrupt mode switch
In reply to Cunming LiangThe patch demonstrates how to handle per rx queue interrupt in a NAPI-like implementation in userspace. The working thread mainly runs in polling mode and switch to interrupt mode only if there is no packet received in recent polls. The working thread returns to polling mode immediately once it receives an interrupt notification caused by the incoming packets.
The sample keeps running in polling mode if the binding PMD hasn't supported the rx interrupt yet. Now only ixgbe(pf/vf) and igb support it.
---
v14 changes
- per-patch basis ABI compatibility rework
- reword commit comments
v7 changes
- using new APIs
- demo multiple port/queue pair wait on the same epoll instance
v6 changes
- Split event fd add and wait
v5 changes
- Change invoked function name and parameter to accomodate EAL change
v3 changes
- Add spinlock to ensure thread safe when accessing interrupt mask register
v2 changes
- Remove unused function which is for debug purpose
examples/l3fwd-power/main.c | 205 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 165 insertions(+), 40 deletions(-)
examples/l3fwd-power/main.c +165 -40
@@ -74,12 +74,14 @@#include <rte_string_fns.h> #include <rte_timer.h> #include <rte_power.h> +#include <rte_eal.h> +#include <rte_spinlock.h> #define RTE_LOGTYPE_L3FWD_POWER RTE_LOGTYPE_USER1#define MAX_PKT_BURST 32 -#define MIN_ZERO_POLL_COUNT 5 +#define MIN_ZERO_POLL_COUNT 10/* around 100ms at 2 Ghz */ #define TIMER_RESOLUTION_CYCLES 200000000ULL
@@ -153,6 +155,9 @@ static uint16_t nb_txd = RTE_TEST_TX_DESC_DEFAULT;/* ethernet addresses of ports */ static struct ether_addr ports_eth_addr[RTE_MAX_ETHPORTS ]; +/* ethernet addresses of ports */ +static rte_spinlock_t locks[RTE_MAX_ETHPORTS ]; +/* mask of enabled ports */ static uint32_t enabled_port_mask =0 ;/* Ports set in promiscuous mode off by default. */
@@ -185,6 +190,9 @@ struct lcore_rx_queue {#define MAX_TX_QUEUE_PER_PORT RTE_MAX_ETHPORTS#define MAX_RX_QUEUE_PER_PORT 128 +#define MAX_RX_QUEUE_INTERRUPT_PER_PORT 16 + +#define MAX_LCORE_PARAMS 1024struct lcore_params {uint8_t port_id;
@@ -211,7 +219,7 @@ static uint16_t nb_lcore_params = sizeof(lcore_params_array_default) /static struct rte_eth_conf port_conf = { .rxmode = { - .mq_mode =ETH_MQ_RX_RSS , + .mq_mode =ETH_MQ_RX_RSS , .max_rx_pkt_len =ETHER_MAX_LEN , .split_hdr_size =0 , .header_split =0 ,/**< Header Split disabled */
@@ -223,11 +231,17 @@ static struct rte_eth_conf port_conf = { .rx_adv_conf = { .rss_conf = { .rss_key = NULL, - .rss_hf = ETH_RSS_IP, + .rss_hf = ETH_RSS_UDP, }, }, .txmode = { - .mq_mode = ETH_DCB_NONE, + .mq_mode = ETH_MQ_TX_NONE, + }, + .intr_conf = { + .lsc = 1, +#ifdef RTE_NEXT_ABI + .rxq = 1, +#endif }, };
@@ -399,19 +413,22 @@ power_timer_cb(__attribute__((unused)) struct rte_timer *tim,/* accumulate total execution time in us when callback is invoked */ sleep_time_ratio = (float )(stats[lcore_id].sleep_time) / (float )SCALING_PERIOD ; -/** * check whether need to scale down frequency a step if it sleep a lot. */ -if (sleep_time_ratio >=SCALING_DOWN_TIME_RATIO_THRESHOLD ) -rte_power_freq_down (lcore_id); +if (sleep_time_ratio >=SCALING_DOWN_TIME_RATIO_THRESHOLD ) { +if (rte_power_freq_down) +rte_power_freq_down (lcore_id); + }else if ( (unsigned )(stats[lcore_id].nb_rx_processed / - stats[lcore_id].nb_iteration_looped) <MAX_PKT_BURST ) + stats[lcore_id].nb_iteration_looped) <MAX_PKT_BURST ) {/** * scale down a step if average packet per iteration less * than expectation. */ -rte_power_freq_down (lcore_id); +if (rte_power_freq_down) +rte_power_freq_down (lcore_id); + }/** * initialize another timer according to current frequency to ensure
@@ -712,22 +729,20 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, } -#define SLEEP_GEAR1_THRESHOLD 100 -#define SLEEP_GEAR2_THRESHOLD 1000 +#define MINIMUM_SLEEP_TIME 1 +#define SUSPEND_THRESHOLD 300static inline uint32_t power_idle_heuristic (uint32_t zero_rx_packet_count) { -/* If zero count is less than 100, use it as the sleep time in us */ -if (zero_rx_packet_count <SLEEP_GEAR1_THRESHOLD ) -return zero_rx_packet_count; -/* If zero count is less than 1000, sleep time should be 100 us */ -else if ((zero_rx_packet_count >=SLEEP_GEAR1_THRESHOLD ) && - (zero_rx_packet_count <SLEEP_GEAR2_THRESHOLD )) -return SLEEP_GEAR1_THRESHOLD ; -/* If zero count is greater than 1000, sleep time should be 1000 us */ -else if (zero_rx_packet_count >=SLEEP_GEAR2_THRESHOLD ) -return SLEEP_GEAR2_THRESHOLD ; +/* If zero count is less than 100, sleep 1us */ +if (zero_rx_packet_count <SUSPEND_THRESHOLD ) +return MINIMUM_SLEEP_TIME ; +/* If zero count is less than 1000, sleep 100 us which is the +minimum latency switching from C3/C6 to C0 +*/ +else +return SUSPEND_THRESHOLD ;return 0 ; }
@@ -767,6 +782,84 @@ power_freq_scaleup_heuristic(unsigned lcore_id,return FREQ_CURRENT ; } +/** +* force polling thread sleep until one-shot rx interrupt triggers +* @param port_id +* Port id. +* @param queue_id +* Rx queue id. +* @return +* 0 on success +*/ +static int +sleep_until_rx_interrupt (int num) +{ +struct rte_epoll_event event[num]; +int n, i; +uint8_t port_id, queue_id; +void *data; + +RTE_LOG (INFO ,L3FWD_POWER , +"lcore %u sleeps until interrupt triggers\n" , +rte_lcore_id ()); + + n =rte_epoll_wait (RTE_EPOLL_PER_THREAD , event, num,-1 ); +for (i =0 ; i < n; i++) { + data = event[i].epdata.data; + port_id = ((uintptr_t )data) >>CHAR_BIT ; + queue_id = ((uintptr_t )data) & +RTE_LEN2MASK (CHAR_BIT , uint8_t); +RTE_LOG (INFO ,L3FWD_POWER , +"lcore %u is waked up from rx interrupt on" +" port %d queue %d\n" , +rte_lcore_id (), port_id, queue_id); + } + +return 0 ; +} + +static int turn_on_intr (struct lcore_conf *qconf) +{ +int i; +struct lcore_rx_queue *rx_queue; +uint8_t port_id, queue_id; + +for (i =0 ; i < qconf->n_rx_queue; ++i) { + rx_queue = &(qconf->rx_queue_list[i]); + port_id = rx_queue->port_id; + queue_id = rx_queue->queue_id; + +rte_spinlock_lock (&(locks[port_id])); +rte_eth_dev_rx_intr_enable (port_id, queue_id); +rte_spinlock_unlock (&(locks[port_id])); + } +} + +static int event_register (struct lcore_conf *qconf) +{ +struct lcore_rx_queue *rx_queue; +uint8_t portid, queueid; +uint32_t data; +int ret; +int i; + +for (i =0 ; i < qconf->n_rx_queue; ++i) { + rx_queue = &(qconf->rx_queue_list[i]); + portid = rx_queue->port_id; + queueid = rx_queue->queue_id; + data = portid <<CHAR_BIT | queueid; + + ret =rte_eth_dev_rx_intr_ctl_q (portid, queueid, +RTE_EPOLL_PER_THREAD , +RTE_INTR_EVENT_ADD , + (void *)((uintptr_t )data)); +if (ret) +return ret; + } + +return 0 ; +} +/* main processing loop */ static int main_loop (__attribute__((unused))void *dummy)
@@ -780,9 +873,9 @@ main_loop(__attribute__((unused)) void *dummy)struct lcore_conf *qconf;struct lcore_rx_queue *rx_queue;enum freq_scale_hint_t lcore_scaleup_hint; -uint32_t lcore_rx_idle_count =0 ;uint32_t lcore_idle_hint =0 ; +int intr_en =0 ;const uint64_t drain_tsc = (rte_get_tsc_hz () +US_PER_S -1 ) /US_PER_S *BURST_TX_DRAIN_US ;
@@ -799,13 +892,18 @@ main_loop(__attribute__((unused)) void *dummy)RTE_LOG (INFO ,L3FWD_POWER ,"entering main loop on lcore %u\n" , lcore_id);for (i =0 ; i < qconf->n_rx_queue; i++) { - portid = qconf->rx_queue_list[i].port_id; queueid = qconf->rx_queue_list[i].queue_id;RTE_LOG (INFO ,L3FWD_POWER ," -- lcoreid=%u portid=%hhu " "rxqueueid=%hhu\n" , lcore_id, portid, queueid); } +/* add into event wait list */ +if (event_register (qconf) ==0 ) + intr_en =1 ; +else +RTE_LOG (INFO ,L3FWD_POWER ,"RX interrupt won't enable.\n" ); +while (1 ) { stats[lcore_id].nb_iteration_looped++;
@@ -840,6 +938,7 @@ main_loop(__attribute__((unused)) void *dummy) prev_tsc_power = cur_tsc_power; } +start_rx:/* * Read packet from RX queues */
@@ -853,6 +952,7 @@ main_loop(__attribute__((unused)) void *dummy) nb_rx =rte_eth_rx_burst (portid, queueid, pkts_burst,MAX_PKT_BURST ); + stats[lcore_id].nb_rx_processed += nb_rx;if (unlikely (nb_rx ==0 )) {/**
@@ -915,10 +1015,13 @@ main_loop(__attribute__((unused)) void *dummy) rx_queue->freq_up_hint; } -if (lcore_scaleup_hint ==FREQ_HIGHEST ) -rte_power_freq_max (lcore_id); -else if (lcore_scaleup_hint ==FREQ_HIGHER ) -rte_power_freq_up (lcore_id); +if (lcore_scaleup_hint ==FREQ_HIGHEST ) { +if (rte_power_freq_max) +rte_power_freq_max (lcore_id); + }else if (lcore_scaleup_hint ==FREQ_HIGHER ) { +if (rte_power_freq_up) +rte_power_freq_up (lcore_id); + } }else {/** * All Rx queues empty in recent consecutive polls,
@@ -933,16 +1036,23 @@ main_loop(__attribute__((unused)) void *dummy) lcore_idle_hint = rx_queue->idle_hint; } -if ( lcore_idle_hint <SLEEP_GEAR1_THRESHOLD ) +if (lcore_idle_hint <SUSPEND_THRESHOLD )/** * execute "pause" instruction to avoid context -* switch for short sleep. +* switch which generally take hundred of +* microseconds for short sleep. */ rte_delay_us (lcore_idle_hint); -else -/* long sleep force runing thread to suspend */ -usleep (lcore_idle_hint); - +else { +/* suspend until rx interrupt trigges */ +if (intr_en) { +turn_on_intr (qconf); +sleep_until_rx_interrupt ( + qconf->n_rx_queue); + } +/* start receiving packets immediately */ + goto start_rx; + } stats[lcore_id].sleep_time += lcore_idle_hint; } }
@@ -1273,7 +1383,7 @@ setup_hash(int socketid)char s[64 ];/* create ipv4 hash */ -snprintf (s,sizeof (s),"ipv4_l3fwd_hash_%d" , socketid); +rte_snprintf (s,sizeof (s),"ipv4_l3fwd_hash_%d" , socketid); ipv4_l3fwd_hash_params.name = s; ipv4_l3fwd_hash_params.socket_id = socketid; ipv4_l3fwd_lookup_struct[socketid] =
@@ -1283,7 +1393,7 @@ setup_hash(int socketid) "socket %d\n", socketid);/* create ipv6 hash */ -snprintf (s,sizeof (s),"ipv6_l3fwd_hash_%d" , socketid); +rte_snprintf (s,sizeof (s),"ipv6_l3fwd_hash_%d" , socketid); ipv6_l3fwd_hash_params.name = s; ipv6_l3fwd_hash_params.socket_id = socketid; ipv6_l3fwd_lookup_struct[socketid] =
@@ -1477,6 +1587,7 @@ main(int argc, char **argv)unsigned lcore_id;uint64_t hz;uint32_t n_tx_queue, nb_lcores; +uint32_t dev_rxq_num, dev_txq_num;uint8_t portid, nb_rx_queue, queue, socketid;/* catch SIGINT and restore cpufreq governor to ondemand */
@@ -1526,10 +1637,19 @@ main(int argc, char **argv)printf ("Initializing port %d ... " , portid );fflush (stdout); +rte_eth_dev_info_get (portid, &dev_info); + dev_rxq_num = dev_info.max_rx_queues; + dev_txq_num = dev_info.max_tx_queues; + nb_rx_queue =get_port_n_rx_queues (portid); +if (nb_rx_queue > dev_rxq_num) +rte_exit (EXIT_FAILURE , +"Cannot configure not existed rxq: " +"port=%d\n" , portid); + n_tx_queue = nb_lcores; -if (n_tx_queue >MAX_TX_QUEUE_PER_PORT ) - n_tx_queue =MAX_TX_QUEUE_PER_PORT ; +if (n_tx_queue > dev_txq_num) + n_tx_queue = dev_txq_num;printf ("Creating queues: nb_rxq=%d nb_txq=%u... " , nb_rx_queue, (unsigned )n_tx_queue ); ret = rte_eth_dev_configure(portid, nb_rx_queue,
@@ -1553,6 +1673,9 @@ main(int argc, char **argv)if (rte_lcore_is_enabled (lcore_id) ==0 )continue ; +if (queueid >= dev_txq_num) +continue ; +if (numa_on) socketid = \ (uint8_t )rte_lcore_to_socket_id (lcore_id);
@@ -1587,8 +1710,9 @@ main(int argc, char **argv)/* init power management library */ ret =rte_power_init (lcore_id);if (ret) -rte_exit (EXIT_FAILURE ,"Power management library " -"initialization failed on core%u\n" , lcore_id); +rte_log (RTE_LOG_ERR ,RTE_LOGTYPE_POWER , +"Power management library initialization " +"failed on core%u" , lcore_id);/* init timer structures for each enabled lcore */ rte_timer_init (&power_timers[lcore_id]);
@@ -1636,7 +1760,6 @@ main(int argc, char **argv)if (ret <0 )rte_exit (EXIT_FAILURE ,"rte_eth_dev_start: err=%d, " "port=%d\n" , ret, portid); -/* * If enabled, put device in promiscuous mode. * This allows IO forwarding mode to forward packets
@@ -1645,6 +1768,8 @@ main(int argc, char **argv)*/ if (promiscuous_on)rte_eth_promiscuous_enable (portid); +/* initialize spinlock for each port */ +rte_spinlock_init (&(locks[portid])); }check_all_ports_link_status ((uint8_t )nb_ports, enabled_port_mask);
Signature · 1 line
1.8.1.4
Re: [PATCH v15 13/13] l3fwd-power: enable one-shot rx interrupt and polling/interrupt mode switch
2015-07-20 11:02, Cunming Liang:
Quoted 6 lines
examples/l3fwd-power/main.c +6
-0+static int turn_on_intr (struct lcore_conf *qconf) +{ +int i; +struct lcore_rx_queue *rx_queue; +uint8_t port_id, queue_id; +
examples/l3fwd-power/main.c power_freq_scaleup_heuristic(unsigned lcore_id, · line 836
Quoted 10 lines
examples/l3fwd-power/main.c +10
-0+for (i =0 ; i < qconf->n_rx_queue; ++i) { + rx_queue = &(qconf->rx_queue_list[i]); + port_id = rx_queue->port_id; + queue_id = rx_queue->queue_id; + +rte_spinlock_lock (&(locks[port_id])); +rte_eth_dev_rx_intr_enable (port_id, queue_id); +rte_spinlock_unlock (&(locks[port_id])); + } +}
examples/l3fwd-power/main.c:836:1: error: control reaches end of non-void
function [-Werror,-Wreturn-type]
Hi Thomas and all,
This patch set postponed from v2.0, and widely reviewed during this release cycle.
The packet I/O interrupt framework is the prerequisite of all PMDs to support packet I/O intr.
There's no significant change since the last three version(v13~v15), the changes are about ABI and version map fixing. It missed the rc1 in the last minutes, I'm now asking for the exception to make it go into v2.1 rc2 if nobody will reject it. Again, thanks for all the comments by Stephen, David, Neil and Thomas.
Thanks,
Steve
Quoted 148 lines
-----Original Message-----
From: Liang, Cunming
Sent: Monday, July 20, 2015 11:02 AM
To: [email protected]; [email protected]
Cc: [email protected]; [email protected]; Zhou, Danny; Liu, Yong; [email protected]; Liang, Cunming
Subject: [PATCH v15 00/13] Interrupt mode PMDv15 changes
- remove unnecessaryRTE_NEXT_ABIcomment
- remove ifdefRTE_NEXT_ABIfrom header filev14 changes
- per-patch basis ABI compatibility rework
- remove unnecessary 'local: *' from version map
- minor comments reworkv13 changes
- version map cleanup for v2.1
- replaceRTE_EAL_RX_INTRbyRTE_NEXT_ABIfor ABI compatibilityPatch series v12
Acked-by Danny Zhou <[email protected]>v12 changes
- bsd cleanup for unused variable warning
- fix awkward line split in debug messagev11 changes
- typo cleanup and check kernel stylev10 changes
- code rework to return actual error code
- bug fix for lsc when usinguio_pci_genericv9 changes
- code rework to fix open comment
- bug fix for igb lsc when both lsc and rxq are enabled in vfio-msix
- new patch to turn off the feature by default so as to avoid v2.1 abi brokenv8 changes
- remove condition check for only vfio-msix
- add multiplex intr support when only one intr vector allowed
- lsc and rxq interrupt runtime enable decision
- add safe event delete while the event wakeup execution happensv7 changes
- decouple epoll event and intr operation
- add condition check in the case intr vector is disabled
- renaming some APIsv6 changes
- splitrte_intr_wait_rx_pktinto two APIs 'wait' and 'set'.
- rewrite rte_intr_rx_wait/rte_intr_rx_set.
- using vector number instead ofqueue_idas interrupt API params.
- patch reorder and split.v5 changes
- Rebase the patchset onto the HEAD
- Isolate ethdev from EAL for new-added wait-for-rx interrupt function
- Export wait-for-rx interrupt function for shared libraries
- Split-off a new patch file for changed structrte_intr_handlethat other patches depend on, to avoid breaking git bisect
- Change sample applicaiton to accomodate EAL function spec change accordinglyv4 changes
- Export interrupt enable/disable functions for shared libraries
- Adjust position of new-added structure fields and functions to avoid breaking ABIv3 changes
- Add return value for interrupt enable/disable functions
- Move spinlok from PMD to L3fwd-power
- Remove unnecessary variables ine1000_mac_info
- Fix miscelleous review commentsv2 changes
- Fix compilation issue inMakefilefor missed header file.
- Consolidate internal and community review comments of v1 patch set.The patch series introduce low-latency one-shot rx interrupt into DPDK with polling and interrupt mode switch control example.
DPDK userspace interrupt notification and handling mechanism is based on UIO with below limitation:
1) It is designed to handle LSC interrupt only with inefficient suspended pthread wakeup procedure (e.g. UIO wakes up LSC interrupt handling thread which then wakes up DPDK polling thread). In this way, it introduces non-deterministic wakeup latency for DPDK polling thread as well as packet latency if it is used to handle Rx interrupt.
2) UIO only supports a single interrupt vector which has to been shared by LSC interrupt and interrupts assigned to dedicated rx queues.This patchset includes below features:
1) Enable one-shot rx queue interrupt in ixgbePMD(PF & VF)and igb PMD(PF only)
.
2) Build on top of the VFIO mechanism instead of UIO, so it could support up to 64 interrupt vectors for rx queue interrupts.
3) Have 1 DPDK polling thread handle per Rx queue interrupt with a dedicated VFIO eventfd, which eliminates non-deterministic pthread wakeup latency in user space.
4) Demonstrate interrupts control APIs and userspace NAIP-like polling/interrupt switch algorithms in L3fwd-power example.Known limitations:
1) It does not work for UIO due to a single interrupt eventfd shared by LSC and rx queue interrupt handlers causes a mess. [FIXED]
2) LSC interrupt is not supported by VF driver, so it is by default disabled in L3fwd-power now. Feel free to turn in on if you want to support both LSC and rx queue interrupts on a PF.Cunming Liang (13):
eal/linux: add interrupt vectors support inintr_handleeal/linux: add rte_epoll_wait/ctl support
eal/linux: add API to set rx interrupt event monitor eal/linux: fix comments typo on vfio msi
eal/linux: map eventfd to VFIO MSI-X intr vector eal/linux: standalone intr event fd create support eal/linux: fix lsc read error inuio_pci_generic
eal/bsd: dummy for new intr definition
eal/bsd: fix inappropriate linuxapp referred in bsd
ethdev: add rx intr enable, disable and ctl functions
ixgbe: enable rx queue interrupts for both PF and VF
igb: enable rx queue interrupts for PF
l3fwd-power: enable one-shot rx interrupt and polling/interrupt mode
switchdrivers/net/e1000/igb_ethdev.c | 311 ++++++++++-- drivers/net/ixgbe/ixgbe_ethdev.c | 527 ++++++++++++++++++++- drivers/net/ixgbe/ixgbe_ethdev.h | 4 + examples/l3fwd-power/main.c | 205 ++++++-- lib/librte_eal/bsdapp/eal/eal_interrupts.c | 42 ++ .../bsdapp/eal/include/exec-env/rte_interrupts.h | 74 ++- lib/librte_eal/bsdapp/eal/rte_eal_version.map | 5 + lib/librte_eal/linuxapp/eal/eal_interrupts.c | 414 ++++++++++++++-- .../linuxapp/eal/include/exec-env/rte_interrupts.h | 153 ++++++ lib/librte_eal/linuxapp/eal/rte_eal_version.map | 8 + lib/librte_ether/rte_ethdev.c | 147 ++++++ lib/librte_ether/rte_ethdev.h | 104 ++++ lib/librte_ether/rte_ether_version.map | 4 + 13 files changed, 1870 insertions(+), 128 deletions(-)--
1.8.1.4
2015-07-23 14:18, Liang, Cunming:
Quoted 7 lines
Hi Thomas and all,
This patch set postponed from v2.0, and widely reviewed during this release cycle.
The packet I/O interrupt framework is the prerequisite of all PMDs to support packet I/O intr.
There's no significant change since the last three version(v13~v15), the changes are about ABI and version map fixing. It missed the rc1 in the last minutes, I'm now asking for the exception to make it go into v2.1 rc2 if nobody will reject it. Again, thanks for all the comments by Stephen, David, Neil and Thomas.
As nobody rejects it, it has been applied with minor fixes (see thread comments). BSD support is missing in this version.
v7 cover Interrupt mode PMD
In reply to a message not in the archivev7 changes
- decouple epoll event and intr operation
- add condition check in the case intr vector is disabled
- renaming some APIs
v6 changes
- split rte_intr_wait_rx_pkt into two APIs 'wait' and 'set'.
- rewrite rte_intr_rx_wait/rte_intr_rx_set.
- using vector number instead of queue_id as interrupt API params.
- patch reorder and split.
v5 changes
- Rebase the patchset onto the HEAD
- Isolate ethdev from EAL for new-added wait-for-rx interrupt function
- Export wait-for-rx interrupt function for shared libraries
- Split-off a new patch file for changed struct rte_intr_handle that other patches depend on, to avoid breaking git bisect
- Change sample applicaiton to accomodate EAL function spec change accordingly
v4 changes
- Export interrupt enable/disable functions for shared libraries
- Adjust position of new-added structure fields and functions to avoid breaking ABI
v3 changes
- Add return value for interrupt enable/disable functions
- Move spinlok from PMD to L3fwd-power
- Remove unnecessary variables in e1000_mac_info
- Fix miscelleous review comments
v2 changes
- Fix compilation issue in Makefile for missed header file.
- Consolidate internal and community review comments of v1 patch set.
The patch series introduce low-latency one-shot rx interrupt into DPDK with polling and interrupt mode switch control example.
DPDK userspace interrupt notification and handling mechanism is based on UIO with below limitation:
1) It is designed to handle LSC interrupt only with inefficient suspended pthread wakeup procedure (e.g. UIO wakes up LSC interrupt handling thread which then wakes up DPDK polling thread). In this way, it introduces non-deterministic wakeup latency for DPDK polling thread as well as packet latency if it is used to handle Rx interrupt.
2) UIO only supports a single interrupt vector which has to been shared by LSC interrupt and interrupts assigned to dedicated rx queues.
This patchset includes below features:
1) Enable one-shot rx queue interrupt in ixgbe PMD(PF & VF) and igb PMD(PF only).
2) Build on top of the VFIO mechanism instead of UIO, so it could support up to 64 interrupt vectors for rx queue interrupts.
3) Have 1 DPDK polling thread handle per Rx queue interrupt with a dedicated VFIO eventfd, which eliminates non-deterministic pthread wakeup latency in user space.
4) Demonstrate interrupts control APIs and userspace NAIP-like polling/interrupt switch algorithms in L3fwd-power example.
Known limitations:
1) It does not work for UIO due to a single interrupt eventfd shared by LSC and rx queue interrupt handlers causes a mess.
2) LSC interrupt is not supported by VF driver, so it is by default disabled in L3fwd-power now. Feel free to turn in on if you want to support both LSC and rx queue interrupts on a PF.
Cunming Liang (10):
eal/linux: add interrupt vectors support in intr_handle eal/linux: add rte_epoll_wait/ctl support
eal/linux: add API to set rx interrupt event monitor eal/bsd: dummy for new intr definition
eal/linux: fix comments typo on vfio msi
eal/linux: add interrupt vectors handling on VFIO
ethdev: add rx intr enable, disable and ctl functions
ixgbe: enable rx queue interrupts for both PF and VF
igb: enable rx queue interrupts for PF
l3fwd-power: enable one-shot rx interrupt and polling/interrupt mode
switch
examples/l3fwd-power/main.c | 206 ++++++++-- .../bsdapp/eal/include/exec-env/rte_interrupts.h | 6 + lib/librte_eal/linuxapp/eal/eal_interrupts.c | 232 +++++++++-- lib/librte_eal/linuxapp/eal/eal_pci_vfio.c | 12 + .../linuxapp/eal/include/exec-env/rte_interrupts.h | 97 +++++ lib/librte_eal/linuxapp/eal/rte_eal_version.map | 4 + lib/librte_ether/rte_ethdev.c | 132 +++++++ lib/librte_ether/rte_ethdev.h | 104 +++++ lib/librte_ether/rte_ether_version.map | 4 + lib/librte_pmd_e1000/e1000_ethdev.h | 3 + lib/librte_pmd_e1000/igb_ethdev.c | 256 +++++++++++-- lib/librte_pmd_ixgbe/ixgbe_ethdev.c | 425 ++++++++++++++++++++- lib/librte_pmd_ixgbe/ixgbe_ethdev.h | 7 + 13 files changed, 1394 insertions(+), 94 deletions(-)
Signature · 1 line
1.8.1.4