From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 7D8905A7C for ; Thu, 29 Jan 2015 06:24:22 +0100 (CET) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP; 28 Jan 2015 21:19:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.09,484,1418112000"; d="scan'208";a="644306846" Received: from pgsmsx105.gar.corp.intel.com ([10.221.44.96]) by orsmga001.jf.intel.com with ESMTP; 28 Jan 2015 21:24:20 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by PGSMSX105.gar.corp.intel.com (10.221.44.96) with Microsoft SMTP Server (TLS) id 14.3.195.1; Thu, 29 Jan 2015 13:24:18 +0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.231]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.168]) with mapi id 14.03.0195.001; Thu, 29 Jan 2015 13:24:17 +0800 From: "Zhou, Danny" To: "Qiu, Michael" , "dev@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH v1 4/5] eal: add per rx queue interrupt handling based on VFIO Thread-Index: AQHQOuApTtQdCcsW4E6KPhaGUw1Wq5zWkOWg Date: Thu, 29 Jan 2015 05:24:15 +0000 Message-ID: References: <1422438631-7853-1-git-send-email-danny.zhou@intel.com> <1422438631-7853-5-git-send-email-danny.zhou@intel.com> <533710CFB86FA344BFBF2D6802E60286CCFB9F@SHSMSX101.ccr.corp.intel.com> In-Reply-To: <533710CFB86FA344BFBF2D6802E60286CCFB9F@SHSMSX101.ccr.corp.intel.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH v1 4/5] eal: add per rx queue interrupt handling based on VFIO X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Jan 2015 05:24:23 -0000 > -----Original Message----- > From: Qiu, Michael > Sent: Thursday, January 29, 2015 1:07 PM > To: Zhou, Danny; dev@dpdk.org > Subject: Re: [dpdk-dev] [PATCH v1 4/5] eal: add per rx queue interrupt ha= ndling based on VFIO >=20 > On 1/28/2015 5:52 PM, Danny Zhou wrote: > > Signed-off-by: Danny Zhou > > Signed-off-by: Yong Liu > > --- >=20 > [...] >=20 > > +static void > > +eal_intr_process_rx_interrupts(uint8_t port_id, struct epoll_event *ev= ents, int nfds) > > +{ > > + int n, bytes_read; > > + union rte_intr_read_buffer buf; > > + struct rte_intr_handle intr_handle =3D rte_eth_devices[port_id].pci_d= ev->intr_handle; > > + > > + for (n =3D 0; n < nfds; n++) { > > + /* set the length to be read dor different handle type */ > > + switch (intr_handle.type) { > > + case RTE_INTR_HANDLE_UIO: > > + bytes_read =3D sizeof(buf.uio_intr_count); > > + break; > > + case RTE_INTR_HANDLE_ALARM: > > + bytes_read =3D sizeof(buf.timerfd_num); > > + break; > > +#ifdef VFIO_PRESENT > > + case RTE_INTR_HANDLE_VFIO_MSIX: > > + case RTE_INTR_HANDLE_VFIO_MSI: > > + case RTE_INTR_HANDLE_VFIO_LEGACY: > > + bytes_read =3D sizeof(buf.vfio_intr_count); > > + break; > > +#endif > > + default: > > + bytes_read =3D 1; > > + break; > > + } > > + > > + /** > > + * read out to clear the ready-to-be-read flag > > + * for epoll_wait. > > + */ > > + bytes_read =3D read(events[n].data.fd, &buf, bytes_read); > > + if (bytes_read < 0) > > + RTE_LOG(ERR, EAL, "Error reading from file " > > + "descriptor %d: %s\n", events[n].data.fd, > > + strerror(errno)); > > + else if (bytes_read =3D=3D 0) > > + RTE_LOG(ERR, EAL, "Read nothing from file " > > + "descriptor %d\n", events[n].data.fd); >=20 > Is there any issue while bytes_read is not equal to the count need to be > read? >=20 Not a problem as long as bytes_read > 0. > > + } > > +} > > + > > +static void > > +eal_intr_handle_rx_interrupts(uint8_t port_id, int pfd, unsigned total= fds) > > +{ > > + struct epoll_event events[totalfds]; > > + int nfds =3D 0; > > + > > +m_wait: > > + nfds =3D epoll_wait(pfd, events, totalfds, > > + EAL_INTR_EPOLL_WAIT_FOREVER); > > + /* epoll_wait fail */ > > + if (nfds < 0) { > > + RTE_LOG(ERR, EAL, > > + "epoll_wait returns with fail\n"); > > + return; > > + } > > + /* epoll_wait timeout, will never happens here */ > > + else if (nfds =3D=3D 0) > > + goto m_wait; > > + /* epoll_wait has at least one fd ready to read */ > > + eal_intr_process_rx_interrupts(port_id, events, nfds); > > +} > > + > > +int > > +rte_eal_wait_rx_intr(uint8_t port_id, uint8_t queue_id) > > +{ > > + struct rte_intr_handle intr_handle =3D rte_eth_devices[port_id].pci_d= ev->intr_handle; > > + struct epoll_event ev; > > + unsigned numfds =3D 0; > > + > > + /* create epoll fd */ > > + int pfd =3D epoll_create(1); > > + if (pfd < 0) { > > + RTE_LOG(ERR, EAL, "Cannot create epoll instance\n"); > > + return -1; > > + } > > + > > + rte_spinlock_lock(&intr_lock); > > + > > + ev.events =3D EPOLLIN | EPOLLPRI; > > + switch (intr_handle.type) { > > + case RTE_INTR_HANDLE_UIO: > > + ev.data.fd =3D intr_handle.fd; > > + break; > > +#ifdef VFIO_PRESENT > > + case RTE_INTR_HANDLE_VFIO_MSIX: > > + ev.data.fd =3D intr_handle.queue_fd[queue_id]; > > + break; > > + case RTE_INTR_HANDLE_VFIO_MSI: > > + ev.data.fd =3D intr_handle.queue_fd[queue_id]; > > + break; > > + case RTE_INTR_HANDLE_VFIO_LEGACY: > > + ev.data.fd =3D intr_handle.queue_fd[queue_id]; > > + break; >=20 > As those three branches are all the same, why not combine to one? >=20 > + case RTE_INTR_HANDLE_VFIO_MSIX: > + case RTE_INTR_HANDLE_VFIO_MSI: > + case RTE_INTR_HANDLE_VFIO_LEGACY: > + ev.data.fd =3D intr_handle.queue_fd[queue_id]; > + break; >=20 Accepted. >=20 > > +#endif > > + default: > > + break; > > + close(pfd); > > + return -1; >=20 > Here Steve has pointed out, but indentation should be a issue. >=20 To be fixed in V2. > > + } > > + > > + if (epoll_ctl(pfd, EPOLL_CTL_ADD, ev.data.fd, &ev) < 0) { > > + RTE_LOG(ERR, EAL, "Error adding fd %d epoll_ctl, %s\n", > > + intr_handle.queue_fd[queue_id], strerror(errno)); > > + } else > > + numfds++; > > + > > + rte_spinlock_unlock(&intr_lock); > > + /* serve the interrupt */ > > + eal_intr_handle_rx_interrupts(port_id, pfd, numfds); > > + > > + /** > > + * when we return, we need to rebuild the > > + * list of fds to monitor. > > + */ > > + close(pfd); > > + > > + return 0; > > +} > > diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c b/lib/librte_ea= l/linuxapp/eal/eal_pci_vfio.c > > index 20e0977..63d0ae8 100644 > > --- a/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c > > +++ b/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c > > @@ -283,7 +283,6 @@ pci_vfio_setup_interrupts(struct rte_pci_device *de= v, int vfio_dev_fd) > > > > dev->intr_handle.fd =3D fd; > > dev->intr_handle.vfio_dev_fd =3D vfio_dev_fd; > > - > > switch (i) { > > case VFIO_PCI_MSIX_IRQ_INDEX: > > internal_config.vfio_intr_mode =3D RTE_INTR_MODE_MSIX; > > @@ -302,6 +301,16 @@ pci_vfio_setup_interrupts(struct rte_pci_device *d= ev, int vfio_dev_fd) > > return -1; > > } > > > > + for (i =3D 0; i < VFIO_MAX_QUEUE_ID; i++) { > > + fd =3D eventfd(0, 0); > > + if (fd < 0) { > > + RTE_LOG(ERR, EAL, " cannot set up eventfd, " > > + "error %i (%s)\n", errno, strerror(errno)); > > + return -1; > > + } > > + dev->intr_handle.queue_fd[i] =3D fd; > > + } > > + > > return 0; > > } > > > > diff --git a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupt= s.h > b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h > > index 23eafd9..c6982cf 100644 > > --- a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h > > +++ b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_interrupts.h > > @@ -38,6 +38,8 @@ > > #ifndef _RTE_LINUXAPP_INTERRUPTS_H_ > > #define _RTE_LINUXAPP_INTERRUPTS_H_ > > > > +#define VFIO_MAX_QUEUE_ID 32 > > + > > enum rte_intr_handle_type { > > RTE_INTR_HANDLE_UNKNOWN =3D 0, > > RTE_INTR_HANDLE_UIO, /**< uio device handle */ > > @@ -52,6 +54,8 @@ enum rte_intr_handle_type { > > struct rte_intr_handle { > > int vfio_dev_fd; /**< VFIO device file descriptor */ > > int fd; /**< file descriptor */ > > + int max_intr; /**< max interrupt requested */ > > + int queue_fd[VFIO_MAX_QUEUE_ID]; /**< rx and tx queue interrupt file = descriptor */ > > enum rte_intr_handle_type type; /**< handle type */ > > }; > >