[dpdk-dev] [PATCH v2] net/i40e: enable VF Tx offload
Enable VF Tx offload including outer ip checksum,
TSO and tunnel TSO.
Signed-off-by: Beilei Xing
---
v2 changes:
- Reword commit log.
drivers/net/i40e/i40e_ethdev_vf.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/net/i40e/i40e_ethdev_vf.c
b/drivers/net/i40e/i40e_ethdev_vf.c
index 4927b14..a59e240 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -2227,7 +2227,13 @@ i40evf_dev_info_get(struct rte_eth_dev *dev, struct
rte_eth_dev_info *dev_info)
DEV_TX_OFFLOAD_IPV4_CKSUM |
DEV_TX_OFFLOAD_UDP_CKSUM |
DEV_TX_OFFLOAD_TCP_CKSUM |
- DEV_TX_OFFLOAD_SCTP_CKSUM;
+ DEV_TX_OFFLOAD_SCTP_CKSUM |
+ DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM |
+ DEV_TX_OFFLOAD_TCP_TSO |
+ DEV_TX_OFFLOAD_VXLAN_TNL_TSO |
+ DEV_TX_OFFLOAD_GRE_TNL_TSO |
+ DEV_TX_OFFLOAD_IPIP_TNL_TSO |
+ DEV_TX_OFFLOAD_GENEVE_TNL_TSO;
dev_info->default_rxconf = (struct rte_eth_rxconf) {
.rx_thresh = {
--
2.5.5
Re: [dpdk-dev] [PATCH v2] net/i40e: enable VF Tx offload
> -Original Message-
> From: Xing, Beilei
> Sent: Wednesday, December 27, 2017 4:27 PM
> To: Zhang, Qi Z
> Cc: dev@dpdk.org
> Subject: [PATCH v2] net/i40e: enable VF Tx offload
>
> Enable VF Tx offload including outer ip checksum, TSO and tunnel TSO.
>
> Signed-off-by: Beilei Xing
> ---
> v2 changes:
> - Reword commit log.
>
> drivers/net/i40e/i40e_ethdev_vf.c | 8 +++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/i40e/i40e_ethdev_vf.c
> b/drivers/net/i40e/i40e_ethdev_vf.c
> index 4927b14..a59e240 100644
> --- a/drivers/net/i40e/i40e_ethdev_vf.c
> +++ b/drivers/net/i40e/i40e_ethdev_vf.c
> @@ -2227,7 +2227,13 @@ i40evf_dev_info_get(struct rte_eth_dev *dev,
> struct rte_eth_dev_info *dev_info)
> DEV_TX_OFFLOAD_IPV4_CKSUM |
> DEV_TX_OFFLOAD_UDP_CKSUM |
> DEV_TX_OFFLOAD_TCP_CKSUM |
> - DEV_TX_OFFLOAD_SCTP_CKSUM;
> + DEV_TX_OFFLOAD_SCTP_CKSUM |
> + DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM |
> + DEV_TX_OFFLOAD_TCP_TSO |
> + DEV_TX_OFFLOAD_VXLAN_TNL_TSO |
> + DEV_TX_OFFLOAD_GRE_TNL_TSO |
> + DEV_TX_OFFLOAD_IPIP_TNL_TSO |
> + DEV_TX_OFFLOAD_GENEVE_TNL_TSO;
>
> dev_info->default_rxconf = (struct rte_eth_rxconf) {
> .rx_thresh = {
> --
> 2.5.5
Acked-by: Qi Zhang
[dpdk-dev] [PATCH v2] examples/flow_filtering: add Tx queues setup process
From: zhao wei
This example do not has the process of set up tx queues, but
some NIC start up process will be blocked if this is no tx queue
and only rx queues. So add tx queues setup process in main code.
Signed-off-by: Wei Zhao
---
v2:
-add support the new tx offloads.
---
examples/flow_filtering/main.c | 26 ++
1 file changed, 26 insertions(+)
diff --git a/examples/flow_filtering/main.c b/examples/flow_filtering/main.c
index 7d739b4..4a07b63 100644
--- a/examples/flow_filtering/main.c
+++ b/examples/flow_filtering/main.c
@@ -149,7 +149,18 @@ init_port(void)
/**< CRC stripped by hardware */
.hw_strip_crc = 1,
},
+ .txmode = {
+ .offloads =
+ DEV_TX_OFFLOAD_VLAN_INSERT |
+ DEV_TX_OFFLOAD_IPV4_CKSUM |
+ DEV_TX_OFFLOAD_UDP_CKSUM |
+ DEV_TX_OFFLOAD_TCP_CKSUM |
+ DEV_TX_OFFLOAD_SCTP_CKSUM |
+ DEV_TX_OFFLOAD_TCP_TSO,
+ },
};
+ struct rte_eth_txconf txq_conf;
+ struct rte_eth_dev_info dev_info;
printf(":: initializing port: %d\n", port_id);
ret = rte_eth_dev_configure(port_id,
@@ -173,6 +184,21 @@ init_port(void)
}
}
+ rte_eth_dev_info_get(port_id, &dev_info);
+ txq_conf = dev_info.default_txconf;
+ txq_conf.offloads = port_conf.txmode.offloads;
+
+ for (i = 0; i < nr_queues; i++) {
+ ret = rte_eth_tx_queue_setup(port_id, i, 512,
+ rte_eth_dev_socket_id(port_id),
+ &txq_conf);
+ if (ret < 0) {
+ rte_exit(EXIT_FAILURE,
+ ":: Tx queue setup failed: err=%d, port=%u\n",
+ ret, port_id);
+ }
+ }
+
rte_eth_promiscuous_enable(port_id);
ret = rte_eth_dev_start(port_id);
if (ret < 0) {
--
2.9.3
[dpdk-dev] [PATCH v2] examples/flow_filtering: add Tx queues setup process
This example do not has the process of set up tx queues, but
some NIC start up process will be blocked if this is no tx queue
and only rx queues. So add tx queues setup process in main code.
Signed-off-by: Wei Zhao
---
v2:
-add support the new tx offloads.
---
examples/flow_filtering/main.c | 26 ++
1 file changed, 26 insertions(+)
diff --git a/examples/flow_filtering/main.c b/examples/flow_filtering/main.c
index 7d739b4..4a07b63 100644
--- a/examples/flow_filtering/main.c
+++ b/examples/flow_filtering/main.c
@@ -149,7 +149,18 @@ init_port(void)
/**< CRC stripped by hardware */
.hw_strip_crc = 1,
},
+ .txmode = {
+ .offloads =
+ DEV_TX_OFFLOAD_VLAN_INSERT |
+ DEV_TX_OFFLOAD_IPV4_CKSUM |
+ DEV_TX_OFFLOAD_UDP_CKSUM |
+ DEV_TX_OFFLOAD_TCP_CKSUM |
+ DEV_TX_OFFLOAD_SCTP_CKSUM |
+ DEV_TX_OFFLOAD_TCP_TSO,
+ },
};
+ struct rte_eth_txconf txq_conf;
+ struct rte_eth_dev_info dev_info;
printf(":: initializing port: %d\n", port_id);
ret = rte_eth_dev_configure(port_id,
@@ -173,6 +184,21 @@ init_port(void)
}
}
+ rte_eth_dev_info_get(port_id, &dev_info);
+ txq_conf = dev_info.default_txconf;
+ txq_conf.offloads = port_conf.txmode.offloads;
+
+ for (i = 0; i < nr_queues; i++) {
+ ret = rte_eth_tx_queue_setup(port_id, i, 512,
+ rte_eth_dev_socket_id(port_id),
+ &txq_conf);
+ if (ret < 0) {
+ rte_exit(EXIT_FAILURE,
+ ":: Tx queue setup failed: err=%d, port=%u\n",
+ ret, port_id);
+ }
+ }
+
rte_eth_promiscuous_enable(port_id);
ret = rte_eth_dev_start(port_id);
if (ret < 0) {
--
2.9.3
Re: [dpdk-dev] [PATCH] examples/flow_filtering: add Tx queues setup process
Hi, Ori Kam
Thank you for your suggestion.
I have commit a v2 to DPDK.org.
https://dpdk.org/dev/patchwork/patch/32768/
> -Original Message-
> From: Ori Kam [mailto:or...@mellanox.com]
> Sent: Tuesday, December 26, 2017 10:09 PM
> To: Zhao1, Wei
> Cc: Lu, Wenzhuo ; dev@dpdk.org
> Subject: RE: [PATCH] examples/flow_filtering: add Tx queues setup process
>
> Hi Wei,
>
> Your patch looks good, but there is an ack patch that deals with offloads.
> http://dpdk.org/ml/archives/dev/2017-December/083639.html
>
> Please update your patch to support the new tx offloads.
>
> Regards,
> Ori
>
>
> > -Original Message-
> > From: Zhao1, Wei [mailto:wei.zh...@intel.com]
> > Sent: Tuesday, December 26, 2017 12:03 PM
> > To: Ori Kam
> > Cc: Lu, Wenzhuo ; dev@dpdk.org
> > Subject: RE: [PATCH] examples/flow_filtering: add Tx queues setup
> > process
> >
> > Add maintainer or...@mellanox.com into cc list.
> >
> >
> > > -Original Message-
> > > From: Zhao1, Wei
> > > Sent: Tuesday, December 26, 2017 5:21 PM
> > > To: dev@dpdk.org
> > > Cc: Lu, Wenzhuo ; Zhao1, Wei
> > >
> > > Subject: [PATCH] examples/flow_filtering: add Tx queues setup
> > > process
> > >
> > > This example do not has the process of set up tx queues, but some
> > > NIC start up process will be blocked if this is no tx queue and only
> > > rx queues. So add tx queues setup process in main code.
> > >
> > > Signed-off-by: Wei Zhao
> > > ---
> > > examples/flow_filtering/main.c | 11 +++
> > > 1 file changed, 11 insertions(+)
> > >
> > > diff --git a/examples/flow_filtering/main.c
> > > b/examples/flow_filtering/main.c index 7d739b4..b5c7677 100644
> > > --- a/examples/flow_filtering/main.c
> > > +++ b/examples/flow_filtering/main.c
> > > @@ -173,6 +173,17 @@ init_port(void)
> > > }
> > > }
> > >
> > > + for (i = 0; i < nr_queues; i++) {
> > > + ret = rte_eth_tx_queue_setup(port_id, i, 512,
> > > + rte_eth_dev_socket_id(port_id),
> > > + NULL);
> > > + if (ret < 0) {
> > > + rte_exit(EXIT_FAILURE,
> > > + ":: Tx queue setup failed: err=%d,
> > > port=%u\n",
> > > + ret, port_id);
> > > + }
> > > + }
> > > +
> > > rte_eth_promiscuous_enable(port_id);
> > > ret = rte_eth_dev_start(port_id);
> > > if (ret < 0) {
> > > --
> > > 2.9.3
Re: [dpdk-dev] [RFC 0/5] Port Representor for control and monitoring of VF devices
On 22/12/2017 22:33, Alex Rosenbaum wrote: On Fri, Dec 22, 2017 at 4:31 PM, Mohammad Abdul Awal wrote: On 21/12/2017 14:51, Alex Rosenbaum wrote: As described in the links Alejandro referenced earlier, each of the switch ports should be a real PMD, and switch operations should be applied on these PMD ports. This includes the steering redirection of traffic between switch ports [1], port ACL's to block/allow traffic, VST/VGT modes and anti spoofing, link trust mode [3] for promiscuous configuration, mirroring of switch port traffic, and Tx and Rx of switch port traffic to/from VF's port. I agree that we need a switch_domain parameter. At the moment we do not have APIs implemented for all the switch operations you have mentioned above. So, we are planning separate RFC with switch _domain and related APIs. Sure, we can extend these switch ops in a separate step. More over, building this as real PMD ports of a switch device removes the need to add a new broker framework all together. Each vendor just needs to map additional PMD ports during the probing stage. That is very much possible as well. If we agree to probe all the ports during the initialization phase, we can have all the representors ready without any interaction from application and broker. On the other hand, we may require a broker structure to enable hotplug support. hotplug should be supported for any PMD ports, and any BDF type. I don't understand why do you need the broker framework in order to support hotplug? By hotplug I did not mean HW hotplug, rather I meant the software hotplug of port representor so that an application can add/delete representor at run time. Regards, Awal. Alex
[dpdk-dev] [PATCH] net/virtio: fix wrong use_msix value for legacy device
If virtio fails to detect modern device, use_misx should be reset
to VIRTIO_MSIX_NONE, otherwise this wrong value will be used after
legacy device detection succeeds to be done.
Fixes: fe19d49cb525 ("net/virtio: fix Rx interrupt with VFIO")
Cc: sta...@dpdk.org
Signed-off-by: Zhiyong Yang
---
drivers/net/virtio/virtio_pci.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c
index 9574498fb..5582238fd 100644
--- a/drivers/net/virtio/virtio_pci.c
+++ b/drivers/net/virtio/virtio_pci.c
@@ -695,6 +695,7 @@ vtpci_init(struct rte_pci_device *dev, struct virtio_hw *hw)
return 0;
}
+ hw->use_msix = VIRTIO_MSIX_NONE;
PMD_INIT_LOG(INFO, "trying with legacy virtio pci.");
if (rte_pci_ioport_map(dev, 0, VTPCI_IO(hw)) < 0) {
if (dev->kdrv == RTE_KDRV_UNKNOWN &&
--
2.13.3
Re: [dpdk-dev] [PATCH v2] examples/flow_filtering: add Tx queues setup process
> -Original Message-
> From: Wei Zhao [mailto:wei.zh...@intel.com]
> Sent: Wednesday, December 27, 2017 10:32 AM
> To: dev@dpdk.org
> Cc: Ori Kam ; Wei Zhao
> Subject: [PATCH v2] examples/flow_filtering: add Tx queues setup process
>
> This example do not has the process of set up tx queues, but some NIC start
> up process will be blocked if this is no tx queue and only rx queues. So add
> tx
> queues setup process in main code.
>
> Signed-off-by: Wei Zhao
>
> ---
>
> v2:
> -add support the new tx offloads.
> ---
> examples/flow_filtering/main.c | 26 ++
> 1 file changed, 26 insertions(+)
>
> diff --git a/examples/flow_filtering/main.c b/examples/flow_filtering/main.c
> index 7d739b4..4a07b63 100644
> --- a/examples/flow_filtering/main.c
> +++ b/examples/flow_filtering/main.c
> @@ -149,7 +149,18 @@ init_port(void)
> /**< CRC stripped by hardware */
> .hw_strip_crc = 1,
> },
> + .txmode = {
> + .offloads =
> + DEV_TX_OFFLOAD_VLAN_INSERT |
> + DEV_TX_OFFLOAD_IPV4_CKSUM |
> + DEV_TX_OFFLOAD_UDP_CKSUM |
> + DEV_TX_OFFLOAD_TCP_CKSUM |
> + DEV_TX_OFFLOAD_SCTP_CKSUM |
> + DEV_TX_OFFLOAD_TCP_TSO,
> + },
> };
> + struct rte_eth_txconf txq_conf;
> + struct rte_eth_dev_info dev_info;
>
> printf(":: initializing port: %d\n", port_id);
> ret = rte_eth_dev_configure(port_id,
> @@ -173,6 +184,21 @@ init_port(void)
> }
> }
>
> + rte_eth_dev_info_get(port_id, &dev_info);
> + txq_conf = dev_info.default_txconf;
> + txq_conf.offloads = port_conf.txmode.offloads;
> +
> + for (i = 0; i < nr_queues; i++) {
> + ret = rte_eth_tx_queue_setup(port_id, i, 512,
> + rte_eth_dev_socket_id(port_id),
> + &txq_conf);
> + if (ret < 0) {
> + rte_exit(EXIT_FAILURE,
> + ":: Tx queue setup failed: err=%d,
> port=%u\n",
> + ret, port_id);
> + }
> + }
> +
> rte_eth_promiscuous_enable(port_id);
> ret = rte_eth_dev_start(port_id);
> if (ret < 0) {
> --
> 2.9.3
Acked-by: Ori Kam
[dpdk-dev] [PATCH] lib/librte_vhost: move fdset_del out of conn_mutex
From: wang zhike
This patch fixes below race condition:
1. one thread calls: rte_vhost_driver_unregister->lock conn_mutex
->fdset_del->loop to check fd.busy.
2. another thread calls fdset_event_dispatch, and the busy flag is
changed AFTER handling on the fd, i.e, rcb(). However, the rcb,
such as vhost_user_read_cb() would try to retrieve the conn_mutex.
So issue is that the 1st thread will loop check the flag while holding
the mutex, while the 2nd thread would be blocked by mutex and can not
change the flag. Then dead lock is observed.
Signed-off-by: zhike wang
---
lib/librte_vhost/socket.c | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c
index 422da00..4aa2384 100644
--- a/lib/librte_vhost/socket.c
+++ b/lib/librte_vhost/socket.c
@@ -749,6 +749,9 @@ struct vhost_user_reconnect_list {
struct vhost_user_socket *vsocket = vhost_user.vsockets[i];
if (!strcmp(vsocket->path, path)) {
+ int del_fds[MAX_FDS];
+ int num_of_fds = 0, i;
+
if (vsocket->is_server) {
fdset_del(&vhost_user.fdset,
vsocket->socket_fd);
close(vsocket->socket_fd);
@@ -763,7 +766,7 @@ struct vhost_user_reconnect_list {
conn = next) {
next = TAILQ_NEXT(conn, next);
- fdset_del(&vhost_user.fdset, conn->connfd);
+ del_fds[num_of_fds++] = conn->connfd;
RTE_LOG(INFO, VHOST_CONFIG,
"free connfd = %d for device '%s'\n",
conn->connfd, path);
@@ -778,6 +781,10 @@ struct vhost_user_reconnect_list {
free(vsocket->path);
free(vsocket);
+ for(i=0;i
Re: [dpdk-dev] [PATCH] net/virtio: remove unnecessary macro definitions
On Tue, Dec 26, 2017 at 05:25:00PM +0800, Zhiyong Yang wrote: > DPDK has already the definition of Ethernet numeric link speeds in Mbps in > the file Rte_ethdev.h, it is unnecessary to rededine virtio specific link > speeds macros again. > > Signed-off-by: Zhiyong Yang Applied to dpdk-next-virtio. Thanks. --yliu
Re: [dpdk-dev] [PATCH] lib/librte_vhost: remove redundant logic judgement
On Mon, Dec 25, 2017 at 05:16:17PM +0800, Zhiyong Yang wrote: > At the beginning of vring_translate, the code > if(!(dev->features & (1ULL << VIRTIO_F_IOMMU_PLATFORM))) already judges > if IOMMU_PLATFORM is supported. The function vhost_iova_to_vva always > repeats the logic, __vhost_iova_to_vva can be used directly to avoid it > here. > > Signed-off-by: Zhiyong Yang > --- > lib/librte_vhost/vhost.c | 7 --- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c > index 4f8b73a09..bb615fd2a 100644 > --- a/lib/librte_vhost/vhost.c > +++ b/lib/librte_vhost/vhost.c > @@ -157,7 +157,7 @@ vring_translate(struct virtio_net *dev, struct > vhost_virtqueue *vq) > goto out; > > size = sizeof(struct vring_desc) * vq->size; > - vq->desc = (struct vring_desc *)(uintptr_t)vhost_iova_to_vva(dev, vq, > + vq->desc = (struct vring_desc *)(uintptr_t)__vhost_iova_to_vva(dev, vq, > vq->ring_addrs.desc_user_addr, > size, VHOST_ACCESS_RW); I don't see strong reason to bother doing the change. It's not in the datapath after all. I'd like to keep the code as it is, to keep it simpler: user just has to call vhost_iova_to_vva() and let it to handle the details. --yliu > if (!vq->desc) > @@ -165,7 +165,8 @@ vring_translate(struct virtio_net *dev, struct > vhost_virtqueue *vq) > > size = sizeof(struct vring_avail); > size += sizeof(uint16_t) * vq->size; > - vq->avail = (struct vring_avail *)(uintptr_t)vhost_iova_to_vva(dev, vq, > + vq->avail = (struct vring_avail *)(uintptr_t)__vhost_iova_to_vva(dev, > + vq, > vq->ring_addrs.avail_user_addr, > size, VHOST_ACCESS_RW); > if (!vq->avail) > @@ -173,7 +174,7 @@ vring_translate(struct virtio_net *dev, struct > vhost_virtqueue *vq) > > size = sizeof(struct vring_used); > size += sizeof(struct vring_used_elem) * vq->size; > - vq->used = (struct vring_used *)(uintptr_t)vhost_iova_to_vva(dev, vq, > + vq->used = (struct vring_used *)(uintptr_t)__vhost_iova_to_vva(dev, vq, > vq->ring_addrs.used_user_addr, > size, VHOST_ACCESS_RW); > if (!vq->used) > -- > 2.13.3
Re: [dpdk-dev] [PATCH] vhost: support UDP Fragmentation Offload
On Tue, Nov 21, 2017 at 02:56:52PM +0800, Jiayu Hu wrote:
> In virtio, UDP Fragmentation Offload (UFO) includes two parts: host UFO
> and guest UFO. Guest UFO means the frontend can receive large UDP packets,
> and host UFO means the backend can receive large UDP packets. This patch
> supports host UFO and guest UFO for vhost-user.
>
> Signed-off-by: Jiayu Hu
> ---
> lib/librte_mbuf/rte_mbuf.h| 7 +++
> lib/librte_vhost/vhost.h | 2 ++
> lib/librte_vhost/virtio_net.c | 10 ++
> 3 files changed, 19 insertions(+)
>
> diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
> index ce8a05d..3d8cfc9 100644
> --- a/lib/librte_mbuf/rte_mbuf.h
> +++ b/lib/librte_mbuf/rte_mbuf.h
> @@ -209,6 +209,13 @@ extern "C" {
> /* add new TX flags here */
>
> /**
> + * UDP Fragmentation Offload flag. This flag is used for enabling UDP
> + * fragmentation in SW or in HW. When use UFO, mbuf->tso_segsz is used
> + * to store the MSS of UDP fragments.
> + */
> +#define PKT_TX_UDP_SEG (1ULL << 42)
This patch added a new mbuf flag, Olivier, do you have objections?
--yliu
Re: [dpdk-dev] [PATCH] net/virtio: fix incorrect cast of void *
On Thu, Dec 14, 2017 at 03:49:32PM +0100, Maxime Coquelin wrote:
>
>
> On 12/14/2017 03:33 PM, Olivier Matz wrote:
> >From: Didier Pallard
> >
> >The rx_queues and tx_queues fields of the data structure points to a struct
> >virtnet_rx or virtnet_tx. Casting it to a virtqueue is an error.
> >
> >It does not trigger any bug because pointer is not dereferenced inside the
> >function, but it can become a bug if this code is copy/pasted and vq is
> >dereferenced.
> >
> >Fixes: 01ad44fd374f ("net/virtio: split Rx/Tx queue")
> >Cc: sta...@dpdk.org
> >
> >Signed-off-by: Didier Pallard
> >Signed-off-by: Olivier Matz
> >---
> > drivers/net/virtio/virtio_ethdev.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> >diff --git a/drivers/net/virtio/virtio_ethdev.c
> >b/drivers/net/virtio/virtio_ethdev.c
> >index c0ba83b06..b398f9960 100644
> >--- a/drivers/net/virtio/virtio_ethdev.c
> >+++ b/drivers/net/virtio/virtio_ethdev.c
> >@@ -893,7 +893,7 @@ static int virtio_dev_xstats_get_names(struct
> >rte_eth_dev *dev,
> > /* Note: limit checked in rte_eth_xstats_names() */
> > for (i = 0; i < dev->data->nb_rx_queues; i++) {
> >-struct virtqueue *rxvq = dev->data->rx_queues[i];
> >+struct virtnet_rx *rxvq = dev->data->rx_queues[i];
> > if (rxvq == NULL)
> > continue;
> > for (t = 0; t < VIRTIO_NB_RXQ_XSTATS; t++) {
> >@@ -906,7 +906,7 @@ static int virtio_dev_xstats_get_names(struct
> >rte_eth_dev *dev,
> > }
> > for (i = 0; i < dev->data->nb_tx_queues; i++) {
> >-struct virtqueue *txvq = dev->data->tx_queues[i];
> >+struct virtnet_tx *txvq = dev->data->tx_queues[i];
> > if (txvq == NULL)
> > continue;
> > for (t = 0; t < VIRTIO_NB_TXQ_XSTATS; t++) {
> >
>
> Reviewed-by: Maxime Coquelin
Applied to dpdk-next-virtio.
Thanks.
--yliu
Re: [dpdk-dev] [PATCH] vhost: support Generic Segmentation Offload
On Mon, Dec 25, 2017 at 01:53:29AM +, Yao, Lei A wrote:
>
>
> > -Original Message-
> > From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Jiayu Hu
> > Sent: Tuesday, November 28, 2017 1:29 PM
> > To: dev@dpdk.org
> > Cc: y...@fridaylinux.org; Tan, Jianfeng ; Hu, Jiayu
> >
> > Subject: [dpdk-dev] [PATCH] vhost: support Generic Segmentation Offload
> >
> > In virtio, Generic Segmentation Offload (GSO) is the feature for the
> > backend, which means the backend can receive packets with any GSO
> > type.
> >
> > Virtio-net enables the GSO feature by default, and vhost-net supports it.
> > To make live migration from vhost-net to vhost-user possible, this patch
> > enables GSO for vhost-user.
> >
> > Signed-off-by: Jiayu Hu
> Tested-by: Lei Yao
Applied to dpdk-next-virtio.
Thanks.
--yliu
> This patch has been tested on my server, after add csum=on, gso=on to qemu
> cmdline,
> Following offload are active in vm:
> udp-fragmentation-offload: on
> tx-tcp-segmentation: on
> tx-tcp-ecn-segmentation: on
> tx-tcp6-segmentation: on
>
> > ---
> > lib/librte_vhost/vhost.h | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
> > index 1cc81c1..04f54cb 100644
> > --- a/lib/librte_vhost/vhost.h
> > +++ b/lib/librte_vhost/vhost.h
> > @@ -204,6 +204,7 @@ struct vhost_msg {
> > (1ULL << VIRTIO_F_VERSION_1) | \
> > (1ULL << VHOST_F_LOG_ALL) | \
> > (1ULL <<
> > VHOST_USER_F_PROTOCOL_FEATURES) | \
> > + (1ULL << VIRTIO_NET_F_GSO) | \
> > (1ULL << VIRTIO_NET_F_HOST_TSO4) | \
> > (1ULL << VIRTIO_NET_F_HOST_TSO6) | \
> > (1ULL << VIRTIO_NET_F_CSUM)| \
> > --
> > 2.7.4
Re: [dpdk-dev] [PATCH v2 0/4] various fixes and cleanups for virtio PMD
On Mon, Dec 11, 2017 at 01:13:28PM +0800, Tiwei Bie wrote: > v2: > - refine indent for patch 2 > - fix a typo in commit log for patch 4 > - drop the blank lines squeezing patch Series applied to dpdk-next-virtio. Thanks. --yliu > > Tiwei Bie (4): > net/virtio: fix vector Rx break caused by rxq flushing > net/virtio: fix typo in LRO support > net/virtio: remove a redundant macro definition for ctrl vq > net/virtio: remove redundant macro definitions for vector Rx > > drivers/net/virtio/virtio_ethdev.c | 4 ++-- > drivers/net/virtio/virtio_rxtx_simple_neon.c | 2 -- > drivers/net/virtio/virtio_rxtx_simple_sse.c | 2 -- > drivers/net/virtio/virtqueue.c | 31 > +--- > drivers/net/virtio/virtqueue.h | 4 +--- > 5 files changed, 27 insertions(+), 16 deletions(-) > > -- > 2.13.3
Re: [dpdk-dev] [RFC 0/5] Port Representor for control and monitoring of VF devices
On Wed, Dec 27, 2017 at 11:40 AM, Mohammad Abdul Awal wrote: > On 22/12/2017 22:33, Alex Rosenbaum wrote: >> On Fri, Dec 22, 2017 at 4:31 PM, Mohammad Abdul Awal >>> On 21/12/2017 14:51, Alex Rosenbaum wrote: > By hotplug I did not mean HW hotplug, rather I meant the software hotplug of > port representor so that an application can add/delete representor at run > time. What is the expect results if application adds/deletes a representor at run time? I would expect the VF hotplug to be depended on the PF configuration. So that new/removed VF's would trigger a representor state or existance. Alex
[dpdk-dev] [PATCH] tap: remove unused KERNEL_VERSION definitions
The TAP device does not use these definitions in current version.
And kernel version is not the correct way to detect features.
Signed-off-by: Stephen Hemminger
---
drivers/net/tap/rte_eth_tap.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index 6b27679a8ea3..11e8c9fd39d8 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -78,9 +78,6 @@
#define ETH_TAP_MAC_ARG "mac"
#define ETH_TAP_MAC_FIXED "fixed"
-#define FLOWER_KERNEL_VERSION KERNEL_VERSION(4, 2, 0)
-#define FLOWER_VLAN_KERNEL_VERSION KERNEL_VERSION(4, 9, 0)
-
static struct rte_vdev_driver pmd_tap_drv;
static const char *valid_arguments[] = {
--
2.11.0
[dpdk-dev] [PATCH] pci: don't use kernel version to determine MSIX defines
In real life, kernel version is only weakly corolated with presence or absence of defines in header files. Instead, check directly if the needed value is defined. Signed-off-by: Stephen Hemminger --- drivers/bus/pci/linux/pci_init.h | 20 +--- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/bus/pci/linux/pci_init.h b/drivers/bus/pci/linux/pci_init.h index f342c47deef6..1ddfc6bc7692 100644 --- a/drivers/bus/pci/linux/pci_init.h +++ b/drivers/bus/pci/linux/pci_init.h @@ -34,8 +34,6 @@ #ifndef EAL_PCI_INIT_H_ #define EAL_PCI_INIT_H_ -#include - #include /** IO resource type: */ @@ -76,14 +74,22 @@ int pci_uio_ioport_unmap(struct rte_pci_ioport *p); #ifdef VFIO_PRESENT -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) -#define RTE_PCI_MSIX_TABLE_BIR0x7 -#define RTE_PCI_MSIX_TABLE_OFFSET 0xfff8 -#define RTE_PCI_MSIX_FLAGS_QSIZE 0x07ff -#else +#ifdef PCI_MSIX_TABLE_BIR #define RTE_PCI_MSIX_TABLE_BIRPCI_MSIX_TABLE_BIR +#else +#define RTE_PCI_MSIX_TABLE_BIR0x7 +#endif + +#ifdef PCI_MSIX_TABLE_OFFSET #define RTE_PCI_MSIX_TABLE_OFFSET PCI_MSIX_TABLE_OFFSET +#else +#define RTE_PCI_MSIX_TABLE_OFFSET 0xfff8 +#endif + +#ifdef PCI_MSIX_FLAGS_QSIZE #define RTE_PCI_MSIX_FLAGS_QSIZE PCI_MSIX_FLAGS_QSIZE +#else +#define RTE_PCI_MSIX_FLAGS_QSIZE 0x07ff #endif /* access config space */ -- 2.11.0
[dpdk-dev] [PATCH v2] tap: remove unused KERNEL_VERSION definitions
The TAP device does not use these definitions in current version.
And kernel version is not the correct way to detect features.
Signed-off-by: Stephen Hemminger
---
drivers/net/tap/rte_eth_tap.c | 4
1 file changed, 4 deletions(-)
diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index 6b27679a8ea3..340ebe59b6ad 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -60,7 +60,6 @@
#include
#include
#include
-#include
#include
#include
@@ -78,9 +77,6 @@
#define ETH_TAP_MAC_ARG "mac"
#define ETH_TAP_MAC_FIXED "fixed"
-#define FLOWER_KERNEL_VERSION KERNEL_VERSION(4, 2, 0)
-#define FLOWER_VLAN_KERNEL_VERSION KERNEL_VERSION(4, 9, 0)
-
static struct rte_vdev_driver pmd_tap_drv;
static const char *valid_arguments[] = {
--
2.11.0
[dpdk-dev] [PATCH v2] lib/librte_vhost: move fdset_del out of conn_mutex
From: wang zhike
v2:
* Move fdset_del before conn destroy.
* Fix coding style.
This patch fixes below race condition:
1. one thread calls: rte_vhost_driver_unregister->lock conn_mutex
->fdset_del->loop to check fd.busy.
2. another thread calls fdset_event_dispatch, and the busy flag is
changed AFTER handling on the fd, i.e, rcb(). However, the rcb,
such as vhost_user_read_cb() would try to retrieve the conn_mutex.
So issue is that the 1st thread will loop check the flag while holding
the mutex, while the 2nd thread would be blocked by mutex and can not
change the flag. Then dead lock is observed.
Signed-off-by: zhike wang
---
lib/librte_vhost/socket.c | 18 +-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c
index 422da00..017f824 100644
--- a/lib/librte_vhost/socket.c
+++ b/lib/librte_vhost/socket.c
@@ -749,6 +749,9 @@ struct vhost_user_reconnect_list {
struct vhost_user_socket *vsocket = vhost_user.vsockets[i];
if (!strcmp(vsocket->path, path)) {
+ int del_fds[MAX_FDS];
+ int num_of_fds = 0, i;
+
if (vsocket->is_server) {
fdset_del(&vhost_user.fdset,
vsocket->socket_fd);
close(vsocket->socket_fd);
@@ -757,13 +760,26 @@ struct vhost_user_reconnect_list {
vhost_user_remove_reconnect(vsocket);
}
+ /* fdset_del() must be called without conn_mutex. */
+ pthread_mutex_lock(&vsocket->conn_mutex);
+ for (conn = TAILQ_FIRST(&vsocket->conn_list);
+conn != NULL;
+conn = next) {
+ next = TAILQ_NEXT(conn, next);
+
+ del_fds[num_of_fds++] = conn->connfd;
+ }
+ pthread_mutex_unlock(&vsocket->conn_mutex);
+
+ for (i = 0; i < num_of_fds; i++)
+ fdset_del(&vhost_user.fdset, del_fds[i]);
+
pthread_mutex_lock(&vsocket->conn_mutex);
for (conn = TAILQ_FIRST(&vsocket->conn_list);
conn != NULL;
conn = next) {
next = TAILQ_NEXT(conn, next);
- fdset_del(&vhost_user.fdset, conn->connfd);
RTE_LOG(INFO, VHOST_CONFIG,
"free connfd = %d for device '%s'\n",
conn->connfd, path);
--
1.8.3.1
Re: [dpdk-dev] [PATCH v2] examples/flow_filtering: add Tx queues setup process
Thabk you.
> -Original Message-
> From: Ori Kam [mailto:or...@mellanox.com]
> Sent: Wednesday, December 27, 2017 7:53 PM
> To: Zhao1, Wei ; dev@dpdk.org
> Subject: RE: [PATCH v2] examples/flow_filtering: add Tx queues setup
> process
>
>
>
> > -Original Message-
> > From: Wei Zhao [mailto:wei.zh...@intel.com]
> > Sent: Wednesday, December 27, 2017 10:32 AM
> > To: dev@dpdk.org
> > Cc: Ori Kam ; Wei Zhao
> > Subject: [PATCH v2] examples/flow_filtering: add Tx queues setup
> > process
> >
> > This example do not has the process of set up tx queues, but some NIC
> > start up process will be blocked if this is no tx queue and only rx
> > queues. So add tx queues setup process in main code.
> >
> > Signed-off-by: Wei Zhao
> >
> > ---
> >
> > v2:
> > -add support the new tx offloads.
> > ---
> > examples/flow_filtering/main.c | 26 ++
> > 1 file changed, 26 insertions(+)
> >
> > diff --git a/examples/flow_filtering/main.c
> > b/examples/flow_filtering/main.c index 7d739b4..4a07b63 100644
> > --- a/examples/flow_filtering/main.c
> > +++ b/examples/flow_filtering/main.c
> > @@ -149,7 +149,18 @@ init_port(void)
> > /**< CRC stripped by hardware */
> > .hw_strip_crc = 1,
> > },
> > + .txmode = {
> > + .offloads =
> > + DEV_TX_OFFLOAD_VLAN_INSERT |
> > + DEV_TX_OFFLOAD_IPV4_CKSUM |
> > + DEV_TX_OFFLOAD_UDP_CKSUM |
> > + DEV_TX_OFFLOAD_TCP_CKSUM |
> > + DEV_TX_OFFLOAD_SCTP_CKSUM |
> > + DEV_TX_OFFLOAD_TCP_TSO,
> > + },
> > };
> > + struct rte_eth_txconf txq_conf;
> > + struct rte_eth_dev_info dev_info;
> >
> > printf(":: initializing port: %d\n", port_id);
> > ret = rte_eth_dev_configure(port_id, @@ -173,6 +184,21 @@
> > init_port(void)
> > }
> > }
> >
> > + rte_eth_dev_info_get(port_id, &dev_info);
> > + txq_conf = dev_info.default_txconf;
> > + txq_conf.offloads = port_conf.txmode.offloads;
> > +
> > + for (i = 0; i < nr_queues; i++) {
> > + ret = rte_eth_tx_queue_setup(port_id, i, 512,
> > + rte_eth_dev_socket_id(port_id),
> > + &txq_conf);
> > + if (ret < 0) {
> > + rte_exit(EXIT_FAILURE,
> > + ":: Tx queue setup failed: err=%d,
> > port=%u\n",
> > + ret, port_id);
> > + }
> > + }
> > +
> > rte_eth_promiscuous_enable(port_id);
> > ret = rte_eth_dev_start(port_id);
> > if (ret < 0) {
> > --
> > 2.9.3
>
> Acked-by: Ori Kam
[dpdk-dev] [PATCH] net/bonding: set slave MAC addresses correctly
From: Chas Williams
Use rte_eth_dev_default_mac_addr_set() to change a slave MAC address.
mac_address_set() only updates the software copy and does nothing to
update the hardware.
Signed-off-by: Chas Williams
---
drivers/net/bonding/rte_eth_bond_api.c | 2 +-
drivers/net/bonding/rte_eth_bond_pmd.c | 10 ++
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/net/bonding/rte_eth_bond_api.c
b/drivers/net/bonding/rte_eth_bond_api.c
index 703bb39..532683b 100644
--- a/drivers/net/bonding/rte_eth_bond_api.c
+++ b/drivers/net/bonding/rte_eth_bond_api.c
@@ -453,7 +453,7 @@ __eth_bond_slave_remove_lock_free(uint16_t bonded_port_id,
&rte_eth_devices[bonded_port_id].data->port_id);
/* Restore original MAC address of slave device */
- mac_address_set(&rte_eth_devices[slave_port_id],
+ rte_eth_dev_default_mac_addr_set(slave_port_id,
&(internals->slaves[slave_idx].persisted_mac_addr));
slave_eth_dev = &rte_eth_devices[slave_port_id];
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c
b/drivers/net/bonding/rte_eth_bond_pmd.c
index d1d3663..02688f7 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -1511,7 +1511,8 @@ mac_address_slaves_update(struct rte_eth_dev
*bonded_eth_dev)
case BONDING_MODE_BALANCE:
case BONDING_MODE_BROADCAST:
for (i = 0; i < internals->slave_count; i++) {
- if
(mac_address_set(&rte_eth_devices[internals->slaves[i].port_id],
+ if (rte_eth_dev_default_mac_addr_set(
+ internals->slaves[i].port_id,
bonded_eth_dev->data->mac_addrs)) {
RTE_BOND_LOG(ERR, "Failed to update port Id %d
MAC address",
internals->slaves[i].port_id);
@@ -1529,15 +1530,16 @@ mac_address_slaves_update(struct rte_eth_dev
*bonded_eth_dev)
for (i = 0; i < internals->slave_count; i++) {
if (internals->slaves[i].port_id ==
internals->current_primary_port) {
- if
(mac_address_set(&rte_eth_devices[internals->primary_port],
+ if (rte_eth_dev_default_mac_addr_set(
+ internals->primary_port,
bonded_eth_dev->data->mac_addrs)) {
RTE_BOND_LOG(ERR, "Failed to update
port Id %d MAC address",
internals->current_primary_port);
return -1;
}
} else {
- if (mac_address_set(
-
&rte_eth_devices[internals->slaves[i].port_id],
+ if (rte_eth_dev_default_mac_addr_set(
+ internals->slaves[i].port_id,
&internals->slaves[i].persisted_mac_addr)) {
RTE_BOND_LOG(ERR, "Failed to update
port Id %d MAC address",
internals->slaves[i].port_id);
--
2.9.5
[dpdk-dev] [PATCH] net/ixgbe: fix mailbox interrupt handler
Maibox interrupt handler only take about a PF reset notification, for
other message ixgbe_read_mbx should not be called since it get chance
to break the foreground VF to PF communication.
This can be simply repeated by
testpmd>rx_vlan rm all 0
Fixes: 77234603fba0 ("net/ixgbe: support VF mailbox interrupt for link up/down")
Cc: sta...@dpdk.org
Signed-off-by: Qi Zhang
---
drivers/net/ixgbe/ixgbe_ethdev.c | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index ff19a56..02121f4 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -8165,13 +8165,17 @@ static void ixgbevf_mbx_process(struct rte_eth_dev *dev)
struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
u32 in_msg = 0;
- if (ixgbe_read_mbx(hw, &in_msg, 1, 0))
- return;
+ /* peek the message first */
+ in_msg = IXGBE_READ_REG(hw, IXGBE_VFMBMEM);
/* PF reset VF event */
- if (in_msg == IXGBE_PF_CONTROL_MSG)
+ if (in_msg == IXGBE_PF_CONTROL_MSG) {
+ /* dummy mbx read to ack pf */
+ if (ixgbe_read_mbx(hw, &in_msg, 1, 0))
+ return;
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_RESET,
NULL, NULL);
+ }
}
static int
--
2.7.4
[dpdk-dev] [PATCH 2/2] net/e1000: fix mailbox interrupt handler
Mailbox interrupt handler only take care of the PF reset notification,
for other message mbx->ops.read should not be called since it get chance
to break the foreground VF to PF communication.
Fixes: 316f4f1adc2e ("net/igb: support VF mailbox interrupt for link up/down")
Cc: sta...@dpdk.org
Signed-off-by: Qi Zhang
---
drivers/net/e1000/igb_ethdev.c | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
index fdc139f..0d8bc49 100644
--- a/drivers/net/e1000/igb_ethdev.c
+++ b/drivers/net/e1000/igb_ethdev.c
@@ -2970,13 +2970,17 @@ void igbvf_mbx_process(struct rte_eth_dev *dev)
struct e1000_mbx_info *mbx = &hw->mbx;
u32 in_msg = 0;
- if (mbx->ops.read(hw, &in_msg, 1, 0))
- return;
+ /* peek the message first */
+ in_msg = E1000_READ_REG(hw, E1000_VMBMEM(0));
/* PF reset VF event */
- if (in_msg == E1000_PF_CONTROL_MSG)
+ if (in_msg == E1000_PF_CONTROL_MSG) {
+ /* dummy mbx read to ack pf */
+ if (mbx->ops.read(hw, &in_msg, 1, 0))
+ return;
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_RESET,
NULL, NULL);
+ }
}
static int
--
2.7.4
[dpdk-dev] [PATCH 1/2] net/ixgbe: fix mailbox interrupt handler
Mailbox interrupt handler only take care of PF reset notification, for
other message ixgbe_read_mbx should not be called since it get chance
to break the foreground VF to PF communication.
This can be simply repeated by
testpmd>rx_vlan rm all 0
Fixes: 77234603fba0 ("net/ixgbe: support VF mailbox interrupt for link up/down")
Cc: sta...@dpdk.org
Signed-off-by: Qi Zhang
---
drivers/net/ixgbe/ixgbe_ethdev.c | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index ff19a56..02121f4 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -8165,13 +8165,17 @@ static void ixgbevf_mbx_process(struct rte_eth_dev *dev)
struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
u32 in_msg = 0;
- if (ixgbe_read_mbx(hw, &in_msg, 1, 0))
- return;
+ /* peek the message first */
+ in_msg = IXGBE_READ_REG(hw, IXGBE_VFMBMEM);
/* PF reset VF event */
- if (in_msg == IXGBE_PF_CONTROL_MSG)
+ if (in_msg == IXGBE_PF_CONTROL_MSG) {
+ /* dummy mbx read to ack pf */
+ if (ixgbe_read_mbx(hw, &in_msg, 1, 0))
+ return;
_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_RESET,
NULL, NULL);
+ }
}
static int
--
2.7.4
Re: [dpdk-dev] [PATCH 1/2] net/ixgbe: fix mailbox interrupt handler
According to step 7 & 8 in Table 7-74 PF-to-VF Messaging Flow in 82599
datasheet,
The calling of ixgbe_read_mbx( ) can be replaced by following lines to avoid
touching ->mbx.v2p_mailbox,
IXGBE_WRITE_REG(hw, IXGBE_VFMAILBOX, IXGBE_VFMAILBOX_ACK);
> -Original Message-
> From: Zhang, Qi Z
> Sent: Thursday, December 28, 2017 4:22 AM
> To: Lu, Wenzhuo
> Cc: dev@dpdk.org; Dai, Wei ; Wang, Liang-min
> ; Zhang, Qi Z ;
> sta...@dpdk.org
> Subject: [PATCH 1/2] net/ixgbe: fix mailbox interrupt handler
>
> Mailbox interrupt handler only take care of PF reset notification, for other
> message ixgbe_read_mbx should not be called since it get chance to break
> the foreground VF to PF communication.
> This can be simply repeated by
> testpmd>rx_vlan rm all 0
>
> Fixes: 77234603fba0 ("net/ixgbe: support VF mailbox interrupt for link
> up/down")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Qi Zhang
> ---
> drivers/net/ixgbe/ixgbe_ethdev.c | 10 +++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c
> b/drivers/net/ixgbe/ixgbe_ethdev.c
> index ff19a56..02121f4 100644
> --- a/drivers/net/ixgbe/ixgbe_ethdev.c
> +++ b/drivers/net/ixgbe/ixgbe_ethdev.c
> @@ -8165,13 +8165,17 @@ static void ixgbevf_mbx_process(struct
> rte_eth_dev *dev)
> struct ixgbe_hw *hw =
> IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
> u32 in_msg = 0;
>
> - if (ixgbe_read_mbx(hw, &in_msg, 1, 0))
> - return;
> + /* peek the message first */
> + in_msg = IXGBE_READ_REG(hw, IXGBE_VFMBMEM);
>
> /* PF reset VF event */
> - if (in_msg == IXGBE_PF_CONTROL_MSG)
> + if (in_msg == IXGBE_PF_CONTROL_MSG) {
> + /* dummy mbx read to ack pf */
> + if (ixgbe_read_mbx(hw, &in_msg, 1, 0))
> + return;
> _rte_eth_dev_callback_process(dev,
> RTE_ETH_EVENT_INTR_RESET,
> NULL, NULL);
> + }
> }
>
> static int
> --
> 2.7.4
[dpdk-dev] [PATCH] bus/pci: fix wrong intr_handle.type with uio_pci_generic
In the function rte_pci_ioport_map, if uio_pci_generic is used on X86
platform, pci_ioport_map() is invoked, the operation
ev->intr_handle.type = RTE_INTR_HANDLE_UNKNOWN; is execused directly,
it causes the wrong assignment for uio_pci_generic, the patch fixes it.
Fixes: 756ce64b1ecd ("eal: introduce PCI ioport API")
Cc: sta...@dpdk.org
Signed-off-by: Zhiyong Yang
---
drivers/bus/pci/linux/pci.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c
index 5da6728fb..8ff7dbfd7 100644
--- a/drivers/bus/pci/linux/pci.c
+++ b/drivers/bus/pci/linux/pci.c
@@ -723,7 +723,9 @@ pci_ioport_map(struct rte_pci_device *dev, int bar
__rte_unused,
if (!found)
return -1;
- dev->intr_handle.type = RTE_INTR_HANDLE_UNKNOWN;
+ if (dev->kdrv == RTE_KDRV_NONE)
+ dev->intr_handle.type = RTE_INTR_HANDLE_UNKNOWN;
+
p->base = start;
RTE_LOG(DEBUG, EAL, "PCI Port IO found start=0x%x\n", start);
--
2.13.3
Re: [dpdk-dev] [PATCH] net/virtio: fix wrong use_msix value for legacy device
Self Nack.
Another patch has been sent out to fix testpmd startup failure issue using
uio_pci_generic on virtio legacy device.
http://www.dpdk.org/dev/patchwork/patch/32779/
> -Original Message-
> From: Yang, Zhiyong
> Sent: Wednesday, December 27, 2017 6:09 PM
> To: dev@dpdk.org
> Cc: y...@fridaylinux.org; maxime.coque...@redhat.com; sta...@dpdk.org; Yang,
> Zhiyong
> Subject: [PATCH] net/virtio: fix wrong use_msix value for legacy device
>
> If virtio fails to detect modern device, use_misx should be reset to
> VIRTIO_MSIX_NONE, otherwise this wrong value will be used after legacy device
> detection succeeds to be done.
>
> Fixes: fe19d49cb525 ("net/virtio: fix Rx interrupt with VFIO")
> Cc: sta...@dpdk.org
> Signed-off-by: Zhiyong Yang
> ---
> drivers/net/virtio/virtio_pci.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/net/virtio/virtio_pci.c
> b/drivers/net/virtio/virtio_pci.c index
> 9574498fb..5582238fd 100644
> --- a/drivers/net/virtio/virtio_pci.c
> +++ b/drivers/net/virtio/virtio_pci.c
> @@ -695,6 +695,7 @@ vtpci_init(struct rte_pci_device *dev, struct virtio_hw
> *hw)
> return 0;
> }
>
> + hw->use_msix = VIRTIO_MSIX_NONE;
> PMD_INIT_LOG(INFO, "trying with legacy virtio pci.");
> if (rte_pci_ioport_map(dev, 0, VTPCI_IO(hw)) < 0) {
> if (dev->kdrv == RTE_KDRV_UNKNOWN &&
> --
> 2.13.3
