[dpdk-dev] [PATCH v2 1/7] vhost: Enable VIRTIO_NET_F_MTU feature
This patch enables the new VIRTIO_NET_F_MTU feature,
which makes possible for the host to advise the guest
with its maximum supported MTU.
MTU value is set via QEMU parameters, either via Libvirt XML, or
directly in virtio-net device command line arguments.
Signed-off-by: Maxime Coquelin
---
lib/librte_vhost/vhost.c | 3 ++-
lib/librte_vhost/vhost.h | 6 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
index e415093..3974087 100644
--- a/lib/librte_vhost/vhost.c
+++ b/lib/librte_vhost/vhost.c
@@ -66,7 +66,8 @@
(1ULL << VIRTIO_NET_F_GUEST_CSUM) | \
(1ULL << VIRTIO_NET_F_GUEST_TSO4) | \
(1ULL << VIRTIO_NET_F_GUEST_TSO6) | \
- (1ULL << VIRTIO_RING_F_INDIRECT_DESC))
+ (1ULL << VIRTIO_RING_F_INDIRECT_DESC) | \
+ (1ULL << VIRTIO_NET_F_MTU))
uint64_t VHOST_FEATURES = VHOST_SUPPORTED_FEATURES;
diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
index 22564f1..6a57bb3 100644
--- a/lib/librte_vhost/vhost.h
+++ b/lib/librte_vhost/vhost.h
@@ -110,11 +110,15 @@ struct vhost_virtqueue {
uint16_tshadow_used_idx;
} __rte_cache_aligned;
-/* Old kernels have no such macro defined */
+/* Old kernels have no such macros defined */
#ifndef VIRTIO_NET_F_GUEST_ANNOUNCE
#define VIRTIO_NET_F_GUEST_ANNOUNCE 21
#endif
+#ifndef VIRTIO_NET_F_MTU
+ #define VIRTIO_NET_F_MTU 3
+#endif
+
/*
* Make an extra wrapper for VIRTIO_NET_F_MQ and
--
2.9.3
[dpdk-dev] [PATCH v2 2/7] vhost: vhost-user: Add MTU protocol feature support
This patch implements the vhost-user MTU protocol feature support.
When VIRTIO_NET_F_MTU is negotiated, QEMU notifies the vhost-user
backend with the configured MTU if dedicated protocol feature is
supported.
The value can be used by the application to ensure consistency with
value set by the user.
Signed-off-by: Maxime Coquelin
---
lib/librte_vhost/vhost.h | 1 +
lib/librte_vhost/vhost_user.c | 24
lib/librte_vhost/vhost_user.h | 5 -
3 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
index 6a57bb3..549296f 100644
--- a/lib/librte_vhost/vhost.h
+++ b/lib/librte_vhost/vhost.h
@@ -170,6 +170,7 @@ struct virtio_net {
uint64_tlog_base;
uint64_tlog_addr;
struct ether_addr mac;
+ uint16_tmtu;
uint32_tnr_guest_pages;
uint32_tmax_guest_pages;
diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index cb2156a..69877a4 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -51,6 +51,9 @@
#include "vhost.h"
#include "vhost_user.h"
+#define VIRTIO_MIN_MTU 68
+#define VIRTIO_MAX_MTU 65535
+
static const char *vhost_message_str[VHOST_USER_MAX] = {
[VHOST_USER_NONE] = "VHOST_USER_NONE",
[VHOST_USER_GET_FEATURES] = "VHOST_USER_GET_FEATURES",
@@ -72,6 +75,7 @@ static const char *vhost_message_str[VHOST_USER_MAX] = {
[VHOST_USER_GET_QUEUE_NUM] = "VHOST_USER_GET_QUEUE_NUM",
[VHOST_USER_SET_VRING_ENABLE] = "VHOST_USER_SET_VRING_ENABLE",
[VHOST_USER_SEND_RARP] = "VHOST_USER_SEND_RARP",
+ [VHOST_USER_NET_SET_MTU] = "VHOST_USER_NET_SET_MTU",
};
static uint64_t
@@ -865,6 +869,22 @@ vhost_user_send_rarp(struct virtio_net *dev, struct
VhostUserMsg *msg)
return 0;
}
+static int
+vhost_user_net_set_mtu(struct virtio_net *dev, struct VhostUserMsg *msg)
+{
+ if (msg->payload.u64 < VIRTIO_MIN_MTU ||
+ msg->payload.u64 > VIRTIO_MAX_MTU) {
+ RTE_LOG(ERR, VHOST_CONFIG, "Invalid MTU size (%lu)\n",
+ msg->payload.u64);
+
+ return -1;
+ }
+
+ dev->mtu = (uint16_t)msg->payload.u64;
+
+ return 0;
+}
+
/* return bytes# of read on success or negative val on failure. */
static int
read_vhost_message(int sockfd, struct VhostUserMsg *msg)
@@ -1027,6 +1047,10 @@ vhost_user_msg_handler(int vid, int fd)
vhost_user_send_rarp(dev, &msg);
break;
+ case VHOST_USER_NET_SET_MTU:
+ ret = vhost_user_net_set_mtu(dev, &msg);
+ break;
+
default:
ret = -1;
break;
diff --git a/lib/librte_vhost/vhost_user.h b/lib/librte_vhost/vhost_user.h
index 179e441..838dec8 100644
--- a/lib/librte_vhost/vhost_user.h
+++ b/lib/librte_vhost/vhost_user.h
@@ -47,11 +47,13 @@
#define VHOST_USER_PROTOCOL_F_LOG_SHMFD1
#define VHOST_USER_PROTOCOL_F_RARP 2
#define VHOST_USER_PROTOCOL_F_REPLY_ACK3
+#define VHOST_USER_PROTOCOL_F_NET_MTU 4
#define VHOST_USER_PROTOCOL_FEATURES ((1ULL << VHOST_USER_PROTOCOL_F_MQ) | \
(1ULL <<
VHOST_USER_PROTOCOL_F_LOG_SHMFD) |\
(1ULL << VHOST_USER_PROTOCOL_F_RARP) |
\
-(1ULL <<
VHOST_USER_PROTOCOL_F_REPLY_ACK))
+(1ULL <<
VHOST_USER_PROTOCOL_F_REPLY_ACK) | \
+(1ULL <<
VHOST_USER_PROTOCOL_F_NET_MTU))
typedef enum VhostUserRequest {
VHOST_USER_NONE = 0,
@@ -74,6 +76,7 @@ typedef enum VhostUserRequest {
VHOST_USER_GET_QUEUE_NUM = 17,
VHOST_USER_SET_VRING_ENABLE = 18,
VHOST_USER_SEND_RARP = 19,
+ VHOST_USER_NET_SET_MTU = 20,
VHOST_USER_MAX
} VhostUserRequest;
--
2.9.3
[dpdk-dev] [PATCH v2 0/7] virtio/vhost: Add MTU feature support
This series adds support to new Virtio's MTU feature[1]. The MTU value is set via QEMU parameters. If the feature is negotiated (i.e supported by both host andcguest, and valid MTU value is set in QEMU via its host_mtu parameter), QEMU shares the configured MTU value throught dedicated Vhost protocol feature. On vhost side, the value is stored in the virtio_net structure, and made available to the application thanks to new vhost lib's rte_vhost_mtu_get() function. To be able to set eth_dev's MTU value at the right time, i.e. to call rte_vhost_mtu_get() just after Virtio features have been negotiated and before the device is really started, a new vhost flag has been introduced (VIRTIO_DEV_READY), because the VIRTIO_DEV_RUNNING flag is set too late (after .new_device() ops is called). Regarding valid MTU values, the maximum MTU value accepted on vhost side is 65535 bytes, as defined in Virtio Spec and supported in Virtio-net Kernel driver. But in Virtio PMD, current maximum frame size is 9728 bytes (~9700 bytes MTU). So maximum MTU size accepted in Virtio PMD is the minimum between ~9700 bytes and host's MTU. Finally, this series also adds MTU value printing in testpmd's "show port info" command when non-zero. This series target v17.05 release. Cheers, Maxime [1]: https://lists.oasis-open.org/archives/virtio-dev/201609/msg00128.html Changes since v1: - * Rebased on top of v17.02 * Virtio PMD: ensure MTU value is valid before ack'ing the feature (Aaron) * Vhost lib/PMD: Remove MTU setting API/op (Yuanhan) Maxime Coquelin (7): vhost: Enable VIRTIO_NET_F_MTU feature vhost: vhost-user: Add MTU protocol feature support vhost: Add new ready status flag vhost: Add API to get MTU value net/vhost: Fill rte_eth_dev's MTU property net/virtio: Add MTU feature support app/testpmd: print MTU value in show port info app/test-pmd/config.c | 5 + doc/guides/nics/features/virtio.ini | 1 + drivers/net/vhost/rte_eth_vhost.c | 2 ++ drivers/net/virtio/virtio_ethdev.c | 45 +++-- drivers/net/virtio/virtio_ethdev.h | 3 ++- drivers/net/virtio/virtio_pci.h | 3 +++ lib/librte_vhost/rte_virtio_net.h | 15 + lib/librte_vhost/vhost.c| 22 +- lib/librte_vhost/vhost.h| 9 +++- lib/librte_vhost/vhost_user.c | 44 ++-- lib/librte_vhost/vhost_user.h | 5 - 11 files changed, 141 insertions(+), 13 deletions(-) -- 2.9.3
[dpdk-dev] [PATCH v2 4/7] vhost: Add API to get MTU value
This patch implements the function for the application to
get the MTU value.
rte_vhost_mtu_get() fills the mtu parameter with the MTU value
set in QEMU if VIRTIO_NET_F_MTU has been negotiated and returns 0,
-ENOTSUP otherwise.
The function returns -EAGAIN if Virtio feature negotiation
didn't happened yet.
Signed-off-by: Maxime Coquelin
---
lib/librte_vhost/rte_virtio_net.h | 15 +++
lib/librte_vhost/vhost.c | 19 +++
2 files changed, 34 insertions(+)
diff --git a/lib/librte_vhost/rte_virtio_net.h
b/lib/librte_vhost/rte_virtio_net.h
index 926039c..ff02e9b 100644
--- a/lib/librte_vhost/rte_virtio_net.h
+++ b/lib/librte_vhost/rte_virtio_net.h
@@ -100,6 +100,21 @@ int rte_vhost_driver_callback_register(struct
virtio_net_device_ops const * cons
int rte_vhost_driver_session_start(void);
/**
+ * Get the MTU value of the device if set in QEMU.
+ *
+ * @param vid
+ * virtio-net device ID
+ * @param mtu
+ * The variable to store the MTU value
+ *
+ * @return
+ * 0: success
+ * -EAGAIN: device not yet started
+ * -ENOTSUP: device does not support MTU feature
+ */
+int rte_vhost_mtu_get(int vid, uint16_t *mtu);
+
+/**
* Get the numa node from which the virtio net device's memory
* is allocated.
*
diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
index 3974087..bbf7f7e 100644
--- a/lib/librte_vhost/vhost.c
+++ b/lib/librte_vhost/vhost.c
@@ -313,6 +313,25 @@ vhost_enable_dequeue_zero_copy(int vid)
}
int
+rte_vhost_mtu_get(int vid, uint16_t *mtu)
+{
+ struct virtio_net *dev = get_device(vid);
+
+ if (!dev)
+ return -ENODEV;
+
+ if (!(dev->flags & VIRTIO_DEV_READY))
+ return -EAGAIN;
+
+ if (!(dev->features & VIRTIO_NET_F_MTU))
+ return -ENOTSUP;
+
+ *mtu = dev->mtu;
+
+ return 0;
+}
+
+int
rte_vhost_get_numa_node(int vid)
{
#ifdef RTE_LIBRTE_VHOST_NUMA
--
2.9.3
[dpdk-dev] [PATCH v2 3/7] vhost: Add new ready status flag
This patch adds a new status flag indicating the Virtio device
is ready to operate.
This is required to be able to call rte_vhost_mtu_get() in the
.new_device() callback, as rte_vhost_mtu_get needs that the
negotiation is done, but it is too early to rely on running status
flag, which is set just after .new_device() returns.
Signed-off-by: Maxime Coquelin
---
lib/librte_vhost/vhost.h | 2 ++
lib/librte_vhost/vhost_user.c | 20 +---
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
index 549296f..e8b7e44 100644
--- a/lib/librte_vhost/vhost.h
+++ b/lib/librte_vhost/vhost.h
@@ -46,6 +46,8 @@
/* Used to indicate that the device is running on a data core */
#define VIRTIO_DEV_RUNNING 1
+/* Used to indicate that the device is ready to operate */
+#define VIRTIO_DEV_READY 2
/* Backend value set by guest. */
#define VIRTIO_DEV_STOPPED -1
diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 69877a4..4726aaf 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -691,14 +691,18 @@ vhost_user_set_vring_kick(struct virtio_net *dev, struct
VhostUserMsg *pmsg)
close(vq->kickfd);
vq->kickfd = file.fd;
- if (virtio_is_ready(dev) && !(dev->flags & VIRTIO_DEV_RUNNING)) {
- if (dev->dequeue_zero_copy) {
- RTE_LOG(INFO, VHOST_CONFIG,
- "dequeue zero copy is enabled\n");
- }
+ if (virtio_is_ready(dev)) {
+ dev->flags |= VIRTIO_DEV_READY;
+
+ if (!(dev->flags & VIRTIO_DEV_RUNNING)) {
+ if (dev->dequeue_zero_copy) {
+ RTE_LOG(INFO, VHOST_CONFIG,
+ "dequeue zero copy is
enabled\n");
+ }
- if (notify_ops->new_device(dev->vid) == 0)
- dev->flags |= VIRTIO_DEV_RUNNING;
+ if (notify_ops->new_device(dev->vid) == 0)
+ dev->flags |= VIRTIO_DEV_RUNNING;
+ }
}
}
@@ -733,6 +737,8 @@ vhost_user_get_vring_base(struct virtio_net *dev,
notify_ops->destroy_device(dev->vid);
}
+ dev->flags &= ~VIRTIO_DEV_READY;
+
/* Here we are safe to get the last used index */
state->num = vq->last_used_idx;
--
2.9.3
[dpdk-dev] [PATCH v2 5/7] net/vhost: Fill rte_eth_dev's MTU property
This patch adds a call to rte_vhost_mtu_get() at device creation time to fill device's MTU property when available. This makes the MTU value defined in QEMU cmdline accessible to the application by calling rte_eth_dev_get_mtu(). Signed-off-by: Maxime Coquelin --- drivers/net/vhost/rte_eth_vhost.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index e98cffd..344c328 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -575,6 +575,8 @@ new_device(int vid) for (i = 0; i < rte_vhost_get_queue_num(vid) * VIRTIO_QNUM; i++) rte_vhost_enable_guest_notification(vid, i, 0); + rte_vhost_mtu_get(vid, ð_dev->data->mtu); + eth_dev->data->dev_link.link_status = ETH_LINK_UP; rte_atomic32_set(&internal->dev_attached, 1); -- 2.9.3
[dpdk-dev] [PATCH v2 7/7] app/testpmd: print MTU value in show port info
This patch adds MTU display to "show port info" command.
Signed-off-by: Maxime Coquelin
---
app/test-pmd/config.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 80491fc..73d9603 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -449,6 +449,7 @@ port_infos_display(portid_t port_id)
struct rte_mempool * mp;
static const char *info_border = "*";
portid_t pid;
+ uint16_t mtu;
if (port_id_is_invalid(port_id, ENABLED_WARN)) {
printf("Valid port range is [0");
@@ -480,6 +481,10 @@ port_infos_display(portid_t port_id)
printf("Link speed: %u Mbps\n", (unsigned) link.link_speed);
printf("Link duplex: %s\n", (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
("full-duplex") : ("half-duplex"));
+
+ if (!rte_eth_dev_get_mtu(port_id, &mtu))
+ printf("MTU: %u\n", mtu);
+
printf("Promiscuous mode: %s\n",
rte_eth_promiscuous_get(port_id) ? "enabled" : "disabled");
printf("Allmulticast mode: %s\n",
--
2.9.3
[dpdk-dev] [PATCH v2 6/7] net/virtio: Add MTU feature support
This patch implements support for the Virtio MTU feature.
When negotiated, the host shares its maximum supported MTU,
which is used as initial MTU and as maximum MTU the application
can set.
Signed-off-by: Maxime Coquelin
---
doc/guides/nics/features/virtio.ini | 1 +
drivers/net/virtio/virtio_ethdev.c | 45 +++--
drivers/net/virtio/virtio_ethdev.h | 3 ++-
drivers/net/virtio/virtio_pci.h | 3 +++
4 files changed, 49 insertions(+), 3 deletions(-)
diff --git a/doc/guides/nics/features/virtio.ini
b/doc/guides/nics/features/virtio.ini
index 84d2012..8e3aca1 100644
--- a/doc/guides/nics/features/virtio.ini
+++ b/doc/guides/nics/features/virtio.ini
@@ -25,3 +25,4 @@ ARMv8= Y
x86-32 = Y
x86-64 = Y
Usage doc= Y
+MTU update = Y
diff --git a/drivers/net/virtio/virtio_ethdev.c
b/drivers/net/virtio/virtio_ethdev.c
index 4dc03b9..fd1213c 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -721,10 +721,13 @@ virtio_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
uint32_t ether_hdr_len = ETHER_HDR_LEN + VLAN_TAG_LEN +
hw->vtnet_hdr_size;
uint32_t frame_size = mtu + ether_hdr_len;
+ uint32_t max_frame_size = hw->max_mtu + ether_hdr_len;
- if (mtu < ETHER_MIN_MTU || frame_size > VIRTIO_MAX_RX_PKTLEN) {
+ max_frame_size = RTE_MIN(max_frame_size, VIRTIO_MAX_RX_PKTLEN);
+
+ if (mtu < ETHER_MIN_MTU || frame_size > max_frame_size) {
PMD_INIT_LOG(ERR, "MTU should be between %d and %d",
- ETHER_MIN_MTU, VIRTIO_MAX_RX_PKTLEN - ether_hdr_len);
+ ETHER_MIN_MTU, max_frame_size - ether_hdr_len);
return -EINVAL;
}
return 0;
@@ -1158,6 +1161,18 @@ virtio_negotiate_features(struct virtio_hw *hw, uint64_t
req_features)
PMD_INIT_LOG(DEBUG, "host_features before negotiate = %" PRIx64,
host_features);
+ /* If supported, ensure MTU value is valid before acknowledging it. */
+ if (host_features & req_features & (1ULL << VIRTIO_NET_F_MTU)) {
+ struct virtio_net_config config;
+
+ vtpci_read_dev_config(hw,
+ offsetof(struct virtio_net_config, mtu),
+ &config.mtu, sizeof(config.mtu));
+
+ if (config.mtu < ETHER_MIN_MTU)
+ req_features &= ~(1ULL << VIRTIO_NET_F_MTU);
+ }
+
/*
* Negotiate features: Subset of device feature bits are written back
* guest feature bits.
@@ -1392,6 +1407,32 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t
req_features)
hw->max_queue_pairs = config->max_virtqueue_pairs;
+ if (vtpci_with_feature(hw, VIRTIO_NET_F_MTU)) {
+ vtpci_read_dev_config(hw,
+ offsetof(struct virtio_net_config, mtu),
+ &config->mtu,
+ sizeof(config->mtu));
+
+ /*
+* MTU value has already been checked at negotiation
+* time, but check again in case it has changed since
+* then, which should not happen.
+*/
+ if (config->mtu < ETHER_MIN_MTU) {
+ PMD_INIT_LOG(ERR, "invalid max MTU value (%u)",
+ config->mtu);
+ return -1;
+ }
+
+ hw->max_mtu = config->mtu;
+ /* Set initial MTU to maximum one supported by vhost */
+ eth_dev->data->mtu = config->mtu;
+
+ } else {
+ hw->max_mtu = VIRTIO_MAX_RX_PKTLEN - ETHER_HDR_LEN -
+ VLAN_TAG_LEN - hw->vtnet_hdr_size;
+ }
+
PMD_INIT_LOG(DEBUG, "config->max_virtqueue_pairs=%d",
config->max_virtqueue_pairs);
PMD_INIT_LOG(DEBUG, "config->status=%d", config->status);
diff --git a/drivers/net/virtio/virtio_ethdev.h
b/drivers/net/virtio/virtio_ethdev.h
index 777a14b..aa78adc 100644
--- a/drivers/net/virtio/virtio_ethdev.h
+++ b/drivers/net/virtio/virtio_ethdev.h
@@ -51,7 +51,7 @@
#define VIRTIO_MAX_TX_QUEUES 128U
#define VIRTIO_MAX_MAC_ADDRS 64
#define VIRTIO_MIN_RX_BUFSIZE 64
-#define VIRTIO_MAX_RX_PKTLEN 9728
+#define VIRTIO_MAX_RX_PKTLEN 9728U
/* Features desired/implemented by this driver. */
#define VIRTIO_PMD_DEFAULT_GUEST_FEATURES \
@@ -66,6 +66,7 @@
1u << VIRTIO_NET_F_HOST_TSO4 | \
1u << VIRTIO_NET_F_HOST_TSO6 | \
1u << VIRTIO_NET_F_MRG_RXBUF | \
+1u << VIRTIO_NET_F_MTU | \
1u << VIRTIO_RING_F_INDIRECT_DESC |\
Re: [dpdk-dev] [PATCH] net/mlx5: fix extended statistics counters identification
On Sun, Mar 05, 2017 at 02:02:48PM +0200, Shahaf Shuler wrote:
> Checking whether the counter is IB counter was performed with the
> wrong index.
>
> Fixes: a4e3056b7018 ("net/mlx5: add out of buffer counter to extended
> statistic")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Shahaf Shuler
Acked-by: Adrien Mazarguil
--
Adrien Mazarguil
6WIND
Re: [dpdk-dev] [RFC PATCH] net/virtio: Align Virtio-net header on cache line in receive path
On Wed, Mar 01, 2017 at 08:36:24AM +0100, Maxime Coquelin wrote: > > > On 02/23/2017 06:49 AM, Yuanhan Liu wrote: > >On Wed, Feb 22, 2017 at 10:36:36AM +0100, Maxime Coquelin wrote: > >> > >> > >>On 02/22/2017 02:37 AM, Yuanhan Liu wrote: > >>>On Tue, Feb 21, 2017 at 06:32:43PM +0100, Maxime Coquelin wrote: > This patch aligns the Virtio-net header on a cache-line boundary to > optimize cache utilization, as it puts the Virtio-net header (which > is always accessed) on the same cache line as the packet header. > > For example with an application that forwards packets at L2 level, > a single cache-line will be accessed with this patch, instead of > two before. > >>> > >>>I'm assuming you were testing pkt size <= (64 - hdr_size)? > >> > >>No, I tested with 64 bytes packets only. > > > >Oh, my bad, I overlooked it. While you were saying "a single cache > >line", I was thinking putting the virtio net hdr and the "whole" > >packet data in single cache line, which is not possible for pkt > >size 64B. > > > >>I run some more tests this morning with different packet sizes, > >>and also with changing the mbuf size on guest side to have multi- > >>buffers packets: > >> > >>+---+++-+ > >>| Txpkt | Rxmbuf | v17.02 | v17.02 + vnet hdr align | > >>+---+++-+ > >>|64 | 2048 | 11.05 | 11.78 | > >>| 128 | 2048 | 10.66 | 11.48 | > >>| 256 | 2048 | 10.47 | 11.21 | > >>| 512 | 2048 | 10.22 | 10.88 | > >>| 1024 | 2048 | 7.65 |7.84 | > >>| 1500 | 2048 | 6.25 |6.45 | > >>| 2000 | 2048 | 5.31 |5.43 | > >>| 2048 | 2048 | 5.32 |4.25 | > >>| 1500 |512 | 3.89 |3.98 | > >>| 2048 |512 | 1.96 |2.02 | > >>+---+++-+ > > > >Could you share more info, say is it a PVP test? Is mergeable on? > >What's the fwd mode? > > No, this is not PVP benchmark, I have neither another server nor a packet > generator connected to my Haswell machine back-to-back. > > This is simple micro-benchmark, vhost PMD in txonly, Virtio PMD in > rxonly. In this configuration, mergeable is ON and no offload disabled > in QEMU cmdline. Okay, I see. So the boost, as you have stated, comes from saving two cache line access to one. Before that, vhost write 2 cache lines, while the virtio pmd reads 2 cache lines: one for reading the header, another one for reading the ether header, for updating xstats (there is no ether access in the fwd mode you tested). > That's why I would be interested in more testing on recent hardware > with PVP benchmark. Is it something that could be run in Intel lab? I think Yao Lei could help on that? But as stated, I think it may break the performance for bit packets. And I also won't expect big boost even for 64B in PVP test, judging that it's only 6% boost in micro bechmarking. --yliu > > I did some more trials, and I think that most of the gain seen in this > microbenchmark could happen in fact on vhost side. > Indeed, I monitored the number of packets dequeued at each .rx_pkt_burst() > call, and I can see there are packets in the vq only once every 20 > calls. On Vhost side, monitoring shows that it always succeeds to write > its burts, i.e. the vq is never full. > > In case of multi-buffers packets, next segments will be aligned on > a cache-line boundary, instead of cache-line boundary minus size of > vnet header before. > >>> > >>>The another thing is, this patch always makes the pkt data cache > >>>unaligned for the first packet, which makes Zhihong's optimization > >>>on memcpy (for big packet) useless. > >>> > >>> commit f5472703c0bdfc29c46fc4b2ca445bce3dc08c9f > >>> Author: Zhihong Wang > >>> Date: Tue Dec 6 20:31:06 2016 -0500 > >> > >>I did run some loopback test with large packet also, an I see a small gain > >>with my patch (fwd io on both ends): > >> > >>+---+++-+ > >>| Txpkt | Rxmbuf | v17.02 | v17.02 + vnet hdr align | > >>+---+++-+ > >>| 1500 | 2048 | 4.05 |4.14 | > >>+---+++-+ > > > >Wierd, that basically means Zhihong's patch doesn't work? Could you add > >one more colum here: what's the data when roll back to the point without > >Zhihong's commit? > > I add this to my ToDo list, don't expect results before next week. > > >>> > >>> Signed-off-by: Zhihong Wang > >>> Reviewed-by: Yuanhan Liu > >>> Tested-by: Lei Yao > >> > >>Does this need to be cache-line aligned? > > > >Nope, the alignment size is different with different platforms. AVX512 > >needs a 64B alignment, while AVX2 needs 32B alignment. > > > >>I als
Re: [dpdk-dev] [PATCH v3 1/1] net/mlx5: add hardware TSO support
On 3/2/2017 9:01 AM, Shahaf Shuler wrote: > Implement support for hardware TSO. > > Signed-off-by: Shahaf Shuler > --- > on v3: > * fix alignment issues > * for warn log > on v2: > * Instead of exposing capability, TSO checks on data path. > * PMD specific parameter to enable TSO. > * different implementaion for the data path. >Performance impact ~0.1-0.2Mpps Hi Shahaf, I think it is good idea to update release notes to announce mlx5 TSO support, what do you think? And if you will send a new version of the patch, can you please put "TSO" flag in the same order with default.ini Thanks, ferruh
Re: [dpdk-dev] [PATCH v2 1/2] net/mlx4: split the definitions to the header file
On 2/23/2017 10:44 AM, Vasily Philipov wrote: > Hi Ferruh, > >> -Original Message- >> From: Ferruh Yigit [mailto:ferruh.yi...@intel.com] >> Sent: Wednesday, February 22, 2017 21:05 >> To: Vasily Philipov ; dev@dpdk.org >> Cc: Adrien Mazarguil ; Nélio Laranjeiro >> >> Subject: Re: [dpdk-dev] [PATCH v2 1/2] net/mlx4: split the definitions to the >> header file >> >> On 2/22/2017 1:42 PM, Vasily Philipov wrote: >>> Make some structs/defines visible from different source files by >>> placing them into mlx4.h header. >>> >>> Signed-off-by: Vasily Philipov >>> --- >>> drivers/net/mlx4/mlx4.c | 183 >>> ++ >>> drivers/net/mlx4/mlx4.h | 187 >>> +++- >>> 2 files changed, 189 insertions(+), 181 deletions(-) >>> >>> diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index >>> 79efaaa..82ccac8 100644 >>> --- a/drivers/net/mlx4/mlx4.c >>> +++ b/drivers/net/mlx4/mlx4.c >>> @@ -1,8 +1,8 @@ >>> /*- >>> * BSD LICENSE >>> * >>> - * Copyright 2012-2015 6WIND S.A. >>> - * Copyright 2012 Mellanox. >>> + * Copyright 2012-2017 6WIND S.A. >>> + * Copyright 2012-2017 Mellanox. >> >> Can someone knowledgeable about Copyright help please? >> >> What is the year field in Copyright line for? >> And above change updates Copyright from 2012 to 2012-2017, is this correct? >> > > The year line was changes in order to show when the file was changed the last > time... I see, but I don't know if the year field is for last updated date marker, specially when there are multiple copyright holders. Overall I don't know why second date is required at all, assuming first date shows the start date of the work and sets the copyright coverage date. A comment from who knows more about these issues is welcome. Thanks, ferruh
Re: [dpdk-dev] [PATCH v3 1/1] net/mlx5: add hardware TSO support
On 3/6/2017 8:50 AM, Ferruh Yigit wrote: > On 3/2/2017 9:01 AM, Shahaf Shuler wrote: >> Implement support for hardware TSO. >> >> Signed-off-by: Shahaf Shuler >> --- >> on v3: >> * fix alignment issues >> * for warn log >> on v2: >> * Instead of exposing capability, TSO checks on data path. >> * PMD specific parameter to enable TSO. >> * different implementaion for the data path. >>Performance impact ~0.1-0.2Mpps > > Hi Shahaf, > > I think it is good idea to update release notes to announce mlx5 TSO > support, what do you think? Since [1] depends on this patch, I will get both, but can you please send a separate patch for release notes? [1] http://dpdk.org/dev/patchwork/patch/21065/ > > And if you will send a new version of the patch, can you please put > "TSO" flag in the same order with default.ini I will update this. > > Thanks, > ferruh >
Re: [dpdk-dev] [PATCH v3 1/1] net/mlx5: add hardware TSO support
On 3/2/2017 9:15 AM, Nélio Laranjeiro wrote: > On Thu, Mar 02, 2017 at 11:01:31AM +0200, Shahaf Shuler wrote: >> Implement support for hardware TSO. >> >> Signed-off-by: Shahaf Shuler > Acked-by: Nelio Laranjeiro Applied to dpdk-next-net/master, thanks.
Re: [dpdk-dev] [PATCH v2 1/2] net/mlx5: add hardware checksum offload for tunnel packets
On 3/2/2017 9:17 AM, Nélio Laranjeiro wrote: > On Thu, Mar 02, 2017 at 11:05:44AM +0200, Shahaf Shuler wrote: >> Prior to this commit Tx checksum offload was supported only for the >> inner headers. >> This commit adds support for the hardware to compute the checksum for the >> outer headers as well. >> >> The support is for tunneling protocols GRE and VXLAN. >> >> Signed-off-by: Shahaf Shuler > Acked-by: Nelio Laranjeiro Applied to dpdk-next-net/master, thanks.
Re: [dpdk-dev] [PATCH] mem: balanced allocation of hugepages
Hi all.
So, what about this change?
Best regards, Ilya Maximets.
On 16.02.2017 16:01, Ilya Maximets wrote:
> Currently EAL allocates hugepages one by one not paying
> attention from which NUMA node allocation was done.
>
> Such behaviour leads to allocation failure if number of
> available hugepages for application limited by cgroups
> or hugetlbfs and memory requested not only from the first
> socket.
>
> Example:
> # 90 x 1GB hugepages availavle in a system
>
> cgcreate -g hugetlb:/test
> # Limit to 32GB of hugepages
> cgset -r hugetlb.1GB.limit_in_bytes=34359738368 test
> # Request 4GB from each of 2 sockets
> cgexec -g hugetlb:test testpmd --socket-mem=4096,4096 ...
>
> EAL: SIGBUS: Cannot mmap more hugepages of size 1024 MB
> EAL: 32 not 90 hugepages of size 1024 MB allocated
> EAL: Not enough memory available on socket 1!
>Requested: 4096MB, available: 0MB
> PANIC in rte_eal_init():
> Cannot init memory
>
> This happens beacause all allocated pages are
> on socket 0.
>
> Fix this issue by setting mempolicy MPOL_PREFERRED for each
> hugepage to one of requested nodes in a round-robin fashion.
> In this case all allocated pages will be fairly distributed
> between all requested nodes.
>
> New config option RTE_LIBRTE_EAL_NUMA_AWARE_HUGEPAGES
> introduced and disabled by default because of external
> dependency from libnuma.
>
> Cc:
> Fixes: 77988fc08dc5 ("mem: fix allocating all free hugepages")
>
> Signed-off-by: Ilya Maximets
> ---
> config/common_base | 1 +
> lib/librte_eal/Makefile | 4 ++
> lib/librte_eal/linuxapp/eal/eal_memory.c | 66
>
> mk/rte.app.mk| 3 ++
> 4 files changed, 74 insertions(+)
>
Re: [dpdk-dev] [dpdk-stable] [PATCH] net/mlx5: fix extended statistics counters identification
On 3/6/2017 8:43 AM, Adrien Mazarguil wrote:
> On Sun, Mar 05, 2017 at 02:02:48PM +0200, Shahaf Shuler wrote:
>> Checking whether the counter is IB counter was performed with the
>> wrong index.
>>
>> Fixes: a4e3056b7018 ("net/mlx5: add out of buffer counter to extended
>> statistic")
>> Cc: sta...@dpdk.org
>>
>> Signed-off-by: Shahaf Shuler
>
> Acked-by: Adrien Mazarguil
Applied to dpdk-next-net/master, thanks.
[dpdk-dev] [PATCH 01/38] eal: add name field to generic device
This adds a name field to the generic struct rte_device. The EAL is
checking for the name being populated when registering a device but
doesn't enforce global unique names as this is left to the bus
implementations.
Signed-off-by: Jan Blunck
---
lib/librte_eal/bsdapp/eal/eal_pci.c | 3 +++
lib/librte_eal/common/eal_common_dev.c | 3 +++
lib/librte_eal/common/eal_common_vdev.c | 2 ++
lib/librte_eal/common/include/rte_dev.h | 1 +
lib/librte_eal/common/include/rte_pci.h | 1 +
lib/librte_eal/linuxapp/eal/eal_pci.c | 3 +++
6 files changed, 13 insertions(+)
diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c
b/lib/librte_eal/bsdapp/eal/eal_pci.c
index 3a5c315..58cdb54 100644
--- a/lib/librte_eal/bsdapp/eal/eal_pci.c
+++ b/lib/librte_eal/bsdapp/eal/eal_pci.c
@@ -280,6 +280,9 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf)
/* FreeBSD has no NUMA support (yet) */
dev->device.numa_node = 0;
+ rte_eal_pci_device_name(&dev->addr, dev->name, sizeof(dev->name));
+ dev->device.name = dev->name;
+
/* FreeBSD has only one pass through driver */
dev->kdrv = RTE_KDRV_NIC_UIO;
diff --git a/lib/librte_eal/common/eal_common_dev.c
b/lib/librte_eal/common/eal_common_dev.c
index 4bde430..12a2286 100644
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -68,6 +68,9 @@ rte_eal_driver_unregister(struct rte_driver *driver)
void rte_eal_device_insert(struct rte_device *dev)
{
+ RTE_VERIFY(dev->name);
+ RTE_VERIFY(dev->name[0] != '\0');
+
TAILQ_INSERT_TAIL(&dev_device_list, dev, next);
}
diff --git a/lib/librte_eal/common/eal_common_vdev.c
b/lib/librte_eal/common/eal_common_vdev.c
index 22fe2ca..c922297 100644
--- a/lib/librte_eal/common/eal_common_vdev.c
+++ b/lib/librte_eal/common/eal_common_vdev.c
@@ -180,6 +180,7 @@ rte_eal_vdev_init(const char *name, const char *args)
dev->device.devargs = devargs;
dev->device.numa_node = SOCKET_ID_ANY;
+ dev->device.name = devargs->virt.drv_name;
ret = vdev_probe_all_drivers(dev);
if (ret) {
@@ -271,6 +272,7 @@ vdev_scan(void)
dev->device.devargs = devargs;
dev->device.numa_node = SOCKET_ID_ANY;
+ dev->device.name = devargs->virt.drv_name;
rte_eal_device_insert(&dev->device);
TAILQ_INSERT_TAIL(&vdev_device_list, dev, next);
diff --git a/lib/librte_eal/common/include/rte_dev.h
b/lib/librte_eal/common/include/rte_dev.h
index 4251099..67c2b0c 100644
--- a/lib/librte_eal/common/include/rte_dev.h
+++ b/lib/librte_eal/common/include/rte_dev.h
@@ -122,6 +122,7 @@ struct rte_driver;
*/
struct rte_device {
TAILQ_ENTRY(rte_device) next; /**< Next device */
+ const char *name; /**< Device name */
const struct rte_driver *driver;/**< Associated driver */
int numa_node;/**< NUMA node connection */
struct rte_devargs *devargs; /**< Device user arguments */
diff --git a/lib/librte_eal/common/include/rte_pci.h
b/lib/librte_eal/common/include/rte_pci.h
index 8557e47..a036fe9 100644
--- a/lib/librte_eal/common/include/rte_pci.h
+++ b/lib/librte_eal/common/include/rte_pci.h
@@ -158,6 +158,7 @@ struct rte_pci_device {
struct rte_pci_driver *driver; /**< Associated driver */
uint16_t max_vfs; /**< sriov enable if not zero */
enum rte_kernel_driver kdrv;/**< Kernel driver passthrough
*/
+ char name[PCI_PRI_STR_SIZE+1]; /**< PCI location (ASCII) */
};
/**
diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c
b/lib/librte_eal/linuxapp/eal/eal_pci.c
index e2fc219..8b131f8 100644
--- a/lib/librte_eal/linuxapp/eal/eal_pci.c
+++ b/lib/librte_eal/linuxapp/eal/eal_pci.c
@@ -316,6 +316,9 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr
*addr)
dev->device.numa_node = tmp;
}
+ rte_eal_pci_device_name(addr, dev->name, sizeof(dev->name));
+ dev->device.name = dev->name;
+
/* parse resources */
snprintf(filename, sizeof(filename), "%s/resource", dirname);
if (pci_parse_sysfs_resource(filename, dev) < 0) {
--
2.7.4
[dpdk-dev] [PATCH 00/38] Remove struct eth_driver
This series is removing the PCI specific struct eth_driver from rte_ether. The PCI drivers are changed to use the newly introduced header-only helpers instead. Although the virtual drivers did not make use of the ethdev's driver field they are converted to use the VDEV specific allocation helpers. The motivation for this change is to properly embed a reference to the generic rte_device in the ethdev. The series is based on: * http://dpdk.org/dev/patchwork/patch/20416/ * http://dpdk.org/dev/patchwork/patch/20417/ * my "Rework vdev probing to use rte_bus infrastructure" series * http://dpdk.org/dev/patchwork/patch/21058/ If requested I can push a tree with all dependent patches. Jan Blunck (38): eal: add name field to generic device eal: parse "driver" device argument before probing drivers net/nfp: use library function for DMA zone reserve net/vmxnet3: use library function for DMA zone reserve ether: add allocation helper for virtual drivers net/tap: use ethdev allocation helper for virtual devices net/vhost: use ethdev allocation helper for virtual devices net/virtio: use ethdev allocation helper for virtual devices net/af_packet: use ethdev allocation helper for virtual devices app/test: don't short-circuit null device creation net/null: internalize eth_dev_null_create() net/null: use ethdev allocation helper for virtual devices net/bonding: make bonding API call through EAL on create/free net/bonding: use ethdev allocation helper for virtual devices ethdev: add PCI driver helpers net/virtio: Don't use eth_driver net/bnx2x: Don't use eth_driver net/bnxt: Don't use eth_driver net/cxgbe: Don't use eth_driver net/em: Don't use eth_driver net/igb: Don't use eth_driver net/ena: Don't use eth_driver net/enic: Don't use eth_driver net/fm10k: Don't use eth_driver net/i40e: Don't use eth_driver net/i40evf: Don't use eth_driver net/ixgbe: Don't use eth_driver net/mlx: Don't reference eth_driver net/nfp: Don't use eth_driver net/qede: Don't use eth_driver net/sfc: Don't use eth_driver net/szedata2: Don't use eth_driver net/thunderx: Don't use eth_driver net/vmxnet3: Don't use eth_driver ethdev: remove unused ethdev PCI probe/remove ethdev: remove unused ethdev driver ethdev: remove PCI specific helper from generic ethdev header ethdev: don't include PCI header drivers/net/af_packet/rte_eth_af_packet.c | 42 +++ drivers/net/bnx2x/bnx2x_ethdev.c | 64 ++ drivers/net/bnxt/bnxt_ethdev.c| 36 -- drivers/net/bonding/rte_eth_bond_api.c| 171 -- drivers/net/bonding/rte_eth_bond_args.c | 2 +- drivers/net/bonding/rte_eth_bond_pmd.c| 160 +++-- drivers/net/cxgbe/cxgbe_ethdev.c | 29 +++-- drivers/net/cxgbe/cxgbe_main.c| 2 +- drivers/net/cxgbe/sge.c | 6 +- drivers/net/e1000/em_ethdev.c | 30 +++-- drivers/net/e1000/igb_ethdev.c| 60 ++ drivers/net/ena/ena_ethdev.c | 29 +++-- drivers/net/enic/enic_ethdev.c| 29 +++-- drivers/net/fm10k/fm10k_ethdev.c | 30 +++-- drivers/net/i40e/i40e_ethdev.c| 36 +++--- drivers/net/i40e/i40e_ethdev_vf.c | 31 +++-- drivers/net/i40e/i40e_fdir.c | 2 +- drivers/net/ixgbe/ixgbe_ethdev.c | 66 +++ drivers/net/mlx4/mlx4.c | 17 ++- drivers/net/mlx5/mlx5.c | 19 ++- drivers/net/nfp/nfp_net.c | 59 - drivers/net/null/Makefile | 7 +- drivers/net/null/rte_eth_null.c | 55 +++-- drivers/net/null/rte_eth_null.h | 40 --- drivers/net/null/rte_pmd_null_version.map | 7 -- drivers/net/qede/qede_ethdev.c| 60 ++ drivers/net/qede/qede_ethdev.h| 1 + drivers/net/ring/rte_eth_ring.c | 1 - drivers/net/sfc/sfc_ethdev.c | 34 -- drivers/net/szedata2/rte_eth_szedata2.c | 29 +++-- drivers/net/tap/rte_eth_tap.c | 37 ++ drivers/net/thunderx/nicvf_ethdev.c | 29 +++-- drivers/net/vhost/rte_eth_vhost.c | 54 - drivers/net/virtio/virtio_ethdev.c| 34 -- drivers/net/virtio/virtio_user_ethdev.c | 20 +--- drivers/net/vmxnet3/vmxnet3_ethdev.c | 30 +++-- drivers/net/vmxnet3/vmxnet3_rxtx.c| 30 + lib/librte_eal/bsdapp/eal/eal_pci.c | 3 + lib/librte_eal/common/eal_common_dev.c| 3 + lib/librte_eal/common/eal_common_vdev.c | 50 +++- lib/librte_eal/common/include/rte_dev.h | 1 + lib/librte_eal/common/include/rte_pci.h | 1 + lib/librte_eal/linuxapp/eal/eal_pci.c | 3 + lib/librte_ether/Makefile | 2 + lib/librte_ether/rte_ethdev.c | 117 -- lib/librte_ether/rte_ethdev.h | 105 +--- lib/librte_ether/rte_ethdev_pci.h
[dpdk-dev] [PATCH 03/38] net/nfp: use library function for DMA zone reserve
This driver can use the library function rte_eth_dma_zone_reserve()
instead of duplicating the code.
Signed-off-by: Jan Blunck
---
drivers/net/nfp/nfp_net.c | 30 ++
1 file changed, 6 insertions(+), 24 deletions(-)
diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
index d79f262..b9dfe80 100644
--- a/drivers/net/nfp/nfp_net.c
+++ b/drivers/net/nfp/nfp_net.c
@@ -205,26 +205,6 @@ nn_cfg_writeq(struct nfp_net_hw *hw, int off, uint64_t val)
nn_writeq(rte_cpu_to_le_64(val), hw->ctrl_bar + off);
}
-/* Creating memzone for hardware rings. */
-static const struct rte_memzone *
-ring_dma_zone_reserve(struct rte_eth_dev *dev, const char *ring_name,
- uint16_t queue_id, uint32_t ring_size, int socket_id)
-{
- char z_name[RTE_MEMZONE_NAMESIZE];
- const struct rte_memzone *mz;
-
- snprintf(z_name, sizeof(z_name), "%s_%s_%d_%d",
-dev->driver->pci_drv.driver.name,
-ring_name, dev->data->port_id, queue_id);
-
- mz = rte_memzone_lookup(z_name);
- if (mz)
- return mz;
-
- return rte_memzone_reserve_aligned(z_name, ring_size, socket_id, 0,
- NFP_MEMZONE_ALIGN);
-}
-
/*
* Atomically reads link status information from global structure rte_eth_dev.
*
@@ -1461,9 +1441,10 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev,
* handle the maximum ring size is allocated in order to allow for
* resizing in later calls to the queue setup function.
*/
- tz = ring_dma_zone_reserve(dev, "rx_ring", queue_idx,
+ tz = rte_eth_dma_zone_reserve(dev, "rx_ring", queue_idx,
sizeof(struct nfp_net_rx_desc) *
- NFP_NET_MAX_RX_DESC, socket_id);
+ NFP_NET_MAX_RX_DESC, NFP_MEMZONE_ALIGN,
+ socket_id);
if (tz == NULL) {
RTE_LOG(ERR, PMD, "Error allocatig rx dma\n");
@@ -1603,9 +1584,10 @@ nfp_net_tx_queue_setup(struct rte_eth_dev *dev, uint16_t
queue_idx,
* handle the maximum ring size is allocated in order to allow for
* resizing in later calls to the queue setup function.
*/
- tz = ring_dma_zone_reserve(dev, "tx_ring", queue_idx,
+ tz = rte_eth_dma_zone_reserve(dev, "tx_ring", queue_idx,
sizeof(struct nfp_net_tx_desc) *
- NFP_NET_MAX_TX_DESC, socket_id);
+ NFP_NET_MAX_TX_DESC, NFP_MEMZONE_ALIGN,
+ socket_id);
if (tz == NULL) {
RTE_LOG(ERR, PMD, "Error allocating tx dma\n");
nfp_net_tx_queue_release(txq);
--
2.7.4
[dpdk-dev] [PATCH 02/38] eal: parse "driver" device argument before probing drivers
In some cases the virtual device name should be totally different than
the driver being used for the device. Therefore lets parse the devargs for
the "driver" argument before probing drivers in vdev_probe_all_drivers().
Signed-off-by: Jan Blunck
---
lib/librte_eal/common/eal_common_vdev.c | 48 +
1 file changed, 43 insertions(+), 5 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_vdev.c
b/lib/librte_eal/common/eal_common_vdev.c
index c922297..4b5c0eb 100644
--- a/lib/librte_eal/common/eal_common_vdev.c
+++ b/lib/librte_eal/common/eal_common_vdev.c
@@ -72,12 +72,48 @@ rte_eal_vdrv_unregister(struct rte_vdev_driver *driver)
TAILQ_REMOVE(&vdev_driver_list, driver, next);
}
+/*
+ * Parse "driver" devargs without adding a dependency on rte_kvargs.h
+ */
+static char *parse_driver_arg(const char *args)
+{
+ char *str, *c;
+
+ if (!args || args[0] == '\0')
+ return NULL;
+
+ c = str = strdup(args);
+
+ do {
+ if (strncmp(c, "driver=", 7) == 0) {
+ c += 7;
+ break;
+ }
+
+ c = strchr(c, ',');
+ if (c)
+ c++;
+ } while (c);
+
+ if (!c)
+ free(str);
+
+ return c;
+}
+
static int
vdev_probe_all_drivers(struct rte_vdev_device *dev)
{
- const char *name = rte_vdev_device_name(dev);
+ const char *name;
+ char *drv_name;
struct rte_vdev_driver *driver;
- int ret;
+ int ret = 1;
+
+ drv_name = parse_driver_arg(rte_vdev_device_args(dev));
+ name = drv_name ? drv_name : rte_vdev_device_name(dev);
+
+ RTE_LOG(DEBUG, EAL, "Search driver %s to probe device %s\n", name,
+ rte_vdev_device_name(dev));
TAILQ_FOREACH(driver, &vdev_driver_list, next) {
/*
@@ -92,7 +128,7 @@ vdev_probe_all_drivers(struct rte_vdev_device *dev)
ret = driver->probe(dev);
if (ret)
dev->device.driver = NULL;
- return ret;
+ goto out;
}
}
@@ -105,11 +141,13 @@ vdev_probe_all_drivers(struct rte_vdev_device *dev)
ret = driver->probe(dev);
if (ret)
dev->device.driver = NULL;
- return ret;
+ break;
}
}
- return 1;
+out:
+ free(drv_name);
+ return ret;
}
static struct rte_vdev_device *
--
2.7.4
[dpdk-dev] [PATCH 05/38] ether: add allocation helper for virtual drivers
This helper should be used by ethdev drivers supporting virtual devices
to help allocating a new ethdev and properly filling the default fields.
Signed-off-by: Jan Blunck
---
lib/librte_ether/Makefile | 1 +
lib/librte_ether/rte_ethdev_vdev.h | 85 ++
2 files changed, 86 insertions(+)
create mode 100644 lib/librte_ether/rte_ethdev_vdev.h
diff --git a/lib/librte_ether/Makefile b/lib/librte_ether/Makefile
index 1d095a9..31e6ba7 100644
--- a/lib/librte_ether/Makefile
+++ b/lib/librte_ether/Makefile
@@ -50,6 +50,7 @@ SRCS-y += rte_flow.c
# Export include files
#
SYMLINK-y-include += rte_ethdev.h
+SYMLINK-y-include += rte_ethdev_vdev.h
SYMLINK-y-include += rte_eth_ctrl.h
SYMLINK-y-include += rte_dev_info.h
SYMLINK-y-include += rte_flow.h
diff --git a/lib/librte_ether/rte_ethdev_vdev.h
b/lib/librte_ether/rte_ethdev_vdev.h
new file mode 100644
index 000..0b47535
--- /dev/null
+++ b/lib/librte_ether/rte_ethdev_vdev.h
@@ -0,0 +1,85 @@
+/*-
+ * BSD LICENSE
+ *
+ * Copyright(c) 2017 Brocade Communications Systems, Inc.
+ * Author: Jan Blunck
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of the copyright holder nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _RTE_ETHDEV_VDEV_H_
+#define _RTE_ETHDEV_VDEV_H_
+
+#include
+#include
+#include
+
+/**
+ * @internal
+ * Allocates a new ethdev slot for an ethernet device and returns the pointer
+ * to that slot for the driver to use.
+ *
+ * @param dev
+ * Pointer to virtual device
+ *
+ * @param private_data_size
+ * Size of private data structure
+ *
+ * @return
+ * A pointer to a rte_eth_dev or NULL if allocation failed.
+ */
+static inline struct rte_eth_dev *
+rte_eth_vdev_allocate(struct rte_vdev_device *dev, size_t private_data_size)
+{
+ struct rte_eth_dev *eth_dev;
+ const char *name = rte_vdev_device_name(dev);
+
+ eth_dev = rte_eth_dev_allocate(name);
+ if (!eth_dev)
+ return NULL;
+
+ if (private_data_size) {
+ eth_dev->data->dev_private = rte_zmalloc_socket(name,
+ private_data_size, RTE_CACHE_LINE_SIZE,
+ dev->device.numa_node);
+ if (!eth_dev->data->dev_private) {
+ rte_eth_dev_release_port(eth_dev);
+ return NULL;
+ }
+ }
+
+ eth_dev->device = &dev->device;
+ eth_dev->driver = NULL;
+ eth_dev->intr_handle = NULL;
+
+ eth_dev->data->kdrv = RTE_KDRV_NONE;
+ eth_dev->data->numa_node = dev->device.numa_node;
+ eth_dev->data->drv_name = dev->device.driver->name;
+ return eth_dev;
+}
+
+#endif /* _RTE_ETHDEV_VDEV_H_ */
--
2.7.4
[dpdk-dev] [PATCH 04/38] net/vmxnet3: use library function for DMA zone reserve
This driver can use the library function rte_eth_dma_zone_reserve()
instead of duplicating the code.
Signed-off-by: Jan Blunck
---
drivers/net/vmxnet3/vmxnet3_rxtx.c | 30 --
1 file changed, 4 insertions(+), 26 deletions(-)
diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c
b/drivers/net/vmxnet3/vmxnet3_rxtx.c
index b246884..5e1b68a 100644
--- a/drivers/net/vmxnet3/vmxnet3_rxtx.c
+++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c
@@ -872,30 +872,6 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf
**rx_pkts, uint16_t nb_pkts)
return nb_rx;
}
-/*
- * Create memzone for device rings. malloc can't be used as the physical
address is
- * needed. If the memzone is already created, then this function returns a ptr
- * to the old one.
- */
-static const struct rte_memzone *
-ring_dma_zone_reserve(struct rte_eth_dev *dev, const char *ring_name,
- uint16_t queue_id, uint32_t ring_size, int socket_id)
-{
- char z_name[RTE_MEMZONE_NAMESIZE];
- const struct rte_memzone *mz;
-
- snprintf(z_name, sizeof(z_name), "%s_%s_%d_%d",
-dev->driver->pci_drv.driver.name, ring_name,
-dev->data->port_id, queue_id);
-
- mz = rte_memzone_lookup(z_name);
- if (mz)
- return mz;
-
- return rte_memzone_reserve_aligned(z_name, ring_size,
- socket_id, 0, VMXNET3_RING_BA_ALIGN);
-}
-
int
vmxnet3_dev_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
@@ -963,7 +939,8 @@ vmxnet3_dev_tx_queue_setup(struct rte_eth_dev *dev,
size += sizeof(struct Vmxnet3_TxCompDesc) * comp_ring->size;
size += sizeof(struct Vmxnet3_TxDataDesc) * data_ring->size;
- mz = ring_dma_zone_reserve(dev, "txdesc", queue_idx, size, socket_id);
+ mz = rte_eth_dma_zone_reserve(dev, "txdesc", queue_idx, size,
+ VMXNET3_RING_BA_ALIGN, socket_id);
if (mz == NULL) {
PMD_INIT_LOG(ERR, "ERROR: Creating queue descriptors zone");
return -ENOMEM;
@@ -1065,7 +1042,8 @@ vmxnet3_dev_rx_queue_setup(struct rte_eth_dev *dev,
size = sizeof(struct Vmxnet3_RxDesc) * (ring0->size + ring1->size);
size += sizeof(struct Vmxnet3_RxCompDesc) * comp_ring->size;
- mz = ring_dma_zone_reserve(dev, "rxdesc", queue_idx, size, socket_id);
+ mz = rte_eth_dma_zone_reserve(dev, "rxdesc", queue_idx, size,
+ VMXNET3_RING_BA_ALIGN, socket_id);
if (mz == NULL) {
PMD_INIT_LOG(ERR, "ERROR: Creating queue descriptors zone");
return -ENOMEM;
--
2.7.4
[dpdk-dev] [PATCH 06/38] net/tap: use ethdev allocation helper for virtual devices
Signed-off-by: Jan Blunck
---
drivers/net/tap/rte_eth_tap.c | 37 +++--
1 file changed, 11 insertions(+), 26 deletions(-)
diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index 941150f..f6f025f 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -33,6 +33,7 @@
#include
#include
+#include
#include
#include
#include
@@ -641,12 +642,12 @@ static const struct eth_dev_ops ops = {
};
static int
-eth_dev_tap_create(const char *name, char *tap_name)
+eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name)
{
int numa_node = rte_socket_id();
- struct rte_eth_dev *dev = NULL;
- struct pmd_internals *pmd = NULL;
- struct rte_eth_dev_data *data = NULL;
+ struct rte_eth_dev *dev;
+ struct pmd_internals *pmd;
+ struct rte_eth_dev_data *data;
int i;
RTE_LOG(DEBUG, PMD, " TAP device on numa %u\n", rte_socket_id());
@@ -657,30 +658,19 @@ eth_dev_tap_create(const char *name, char *tap_name)
goto error_exit;
}
- pmd = rte_zmalloc_socket(tap_name, sizeof(*pmd), 0, numa_node);
- if (!pmd) {
- RTE_LOG(ERR, PMD, "TAP Unable to allocate internal struct\n");
- goto error_exit;
- }
-
- dev = rte_eth_dev_allocate(tap_name);
+ dev = rte_eth_vdev_allocate(vdev, sizeof(*pmd));
if (!dev) {
RTE_LOG(ERR, PMD, "TAP Unable to allocate device struct\n");
goto error_exit;
}
+ pmd = dev->data->dev_private;
snprintf(pmd->name, sizeof(pmd->name), "%s", tap_name);
-
pmd->nb_queues = RTE_PMD_TAP_MAX_QUEUES;
/* Setup some default values */
- data->dev_private = pmd;
- data->port_id = dev->data->port_id;
+ rte_memcpy(data, dev->data, sizeof(*data));
data->dev_flags = RTE_ETH_DEV_DETACHABLE;
- data->kdrv = RTE_KDRV_NONE;
- data->drv_name = pmd_tap_drv.driver.name;
- data->numa_node = numa_node;
-
data->dev_link = pmd_link;
data->mac_addrs = &pmd->eth_addr;
data->nb_rx_queues = pmd->nb_queues;
@@ -688,10 +678,8 @@ eth_dev_tap_create(const char *name, char *tap_name)
dev->data = data;
dev->dev_ops = &ops;
- dev->driver = NULL;
dev->rx_pkt_burst = pmd_rx_burst;
dev->tx_pkt_burst = pmd_tx_burst;
- snprintf(dev->data->name, sizeof(dev->data->name), "%s", name);
/* Presetup the fds to -1 as being not valid */
for (i = 0; i < RTE_PMD_TAP_MAX_QUEUES; i++) {
@@ -702,13 +690,10 @@ eth_dev_tap_create(const char *name, char *tap_name)
return 0;
error_exit:
- RTE_LOG(DEBUG, PMD, "TAP Unable to initialize %s\n", name);
+ RTE_LOG(DEBUG, PMD, "TAP Unable to initialize %s\n",
+ rte_vdev_device_name(vdev));
rte_free(data);
- rte_free(pmd);
-
- rte_eth_dev_release_port(dev);
-
return -EINVAL;
}
@@ -785,7 +770,7 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev)
RTE_LOG(NOTICE, PMD, "Initializing pmd_tap for %s as %s\n",
name, tap_name);
- ret = eth_dev_tap_create(name, tap_name);
+ ret = eth_dev_tap_create(dev, tap_name);
leave:
if (ret == -1) {
--
2.7.4
[dpdk-dev] [PATCH 07/38] net/vhost: use ethdev allocation helper for virtual devices
Signed-off-by: Jan Blunck
---
drivers/net/vhost/rte_eth_vhost.c | 54 +++
1 file changed, 26 insertions(+), 28 deletions(-)
diff --git a/drivers/net/vhost/rte_eth_vhost.c
b/drivers/net/vhost/rte_eth_vhost.c
index d0d0474..e2dae6f 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -39,6 +39,7 @@
#include
#include
+#include
#include
#include
#include
@@ -1012,9 +1013,10 @@ static const struct eth_dev_ops ops = {
static struct rte_vdev_driver pmd_vhost_drv;
static int
-eth_dev_vhost_create(const char *name, char *iface_name, int16_t queues,
-const unsigned numa_node, uint64_t flags)
+eth_dev_vhost_create(struct rte_vdev_device *dev, char *iface_name,
+ int16_t queues, const unsigned int numa_node, uint64_t flags)
{
+ const char *name = rte_vdev_device_name(dev);
struct rte_eth_dev_data *data = NULL;
struct pmd_internal *internal = NULL;
struct rte_eth_dev *eth_dev = NULL;
@@ -1025,23 +1027,19 @@ eth_dev_vhost_create(const char *name, char
*iface_name, int16_t queues,
RTE_LOG(INFO, PMD, "Creating VHOST-USER backend on numa socket %u\n",
numa_node);
- /* now do all data allocation - for eth_dev structure, dummy pci driver
-* and internal (private) data
+ /* now do all data allocation - for eth_dev structure and internal
+* (private) data
*/
data = rte_zmalloc_socket(name, sizeof(*data), 0, numa_node);
if (data == NULL)
goto error;
- internal = rte_zmalloc_socket(name, sizeof(*internal), 0, numa_node);
- if (internal == NULL)
- goto error;
-
list = rte_zmalloc_socket(name, sizeof(*list), 0, numa_node);
if (list == NULL)
goto error;
/* reserve an ethdev entry */
- eth_dev = rte_eth_dev_allocate(name);
+ eth_dev = rte_eth_vdev_allocate(dev, sizeof(*internal));
if (eth_dev == NULL)
goto error;
@@ -1058,10 +1056,10 @@ eth_dev_vhost_create(const char *name, char
*iface_name, int16_t queues,
/* now put it all together
* - store queue data in internal,
-* - store numa_node info in ethdev data
* - point eth_dev_data to internals
* - and point eth_dev structure to new eth_dev_data structure
*/
+ internal = eth_dev->data->dev_private;
internal->dev_name = strdup(name);
if (internal->dev_name == NULL)
goto error;
@@ -1077,26 +1075,21 @@ eth_dev_vhost_create(const char *name, char
*iface_name, int16_t queues,
rte_spinlock_init(&vring_state->lock);
vring_states[eth_dev->data->port_id] = vring_state;
- data->dev_private = internal;
- data->port_id = eth_dev->data->port_id;
- memmove(data->name, eth_dev->data->name, sizeof(data->name));
+ /* We'll replace the 'data' originally allocated by eth_dev. So the
+* vhost PMD resources won't be shared between multi processes.
+*/
+ rte_memcpy(data, eth_dev->data, sizeof(*data));
+ eth_dev->data = data;
+
data->nb_rx_queues = queues;
data->nb_tx_queues = queues;
internal->max_queues = queues;
data->dev_link = pmd_link;
data->mac_addrs = eth_addr;
-
- /* We'll replace the 'data' originally allocated by eth_dev. So the
-* vhost PMD resources won't be shared between multi processes.
-*/
- eth_dev->data = data;
- eth_dev->dev_ops = &ops;
- eth_dev->driver = NULL;
data->dev_flags =
RTE_ETH_DEV_DETACHABLE | RTE_ETH_DEV_INTR_LSC;
- data->kdrv = RTE_KDRV_NONE;
- data->drv_name = pmd_vhost_drv.driver.name;
- data->numa_node = numa_node;
+
+ eth_dev->dev_ops = &ops;
/* finally assign rx and tx ops */
eth_dev->rx_pkt_burst = eth_vhost_rx;
@@ -1114,8 +1107,10 @@ eth_dev_vhost_create(const char *name, char *iface_name,
int16_t queues,
return data->port_id;
error:
- if (internal)
+ if (internal) {
+ free(internal->iface_name);
free(internal->dev_name);
+ }
rte_free(vring_state);
rte_free(eth_addr);
if (eth_dev)
@@ -1158,7 +1153,6 @@ open_int(const char *key __rte_unused, const char *value,
void *extra_args)
static int
rte_pmd_vhost_probe(struct rte_vdev_device *dev)
{
- const char *name;
struct rte_kvargs *kvlist = NULL;
int ret = 0;
char *iface_name;
@@ -1167,8 +1161,8 @@ rte_pmd_vhost_probe(struct rte_vdev_device *dev)
int client_mode = 0;
int dequeue_zero_copy = 0;
- name = rte_vdev_device_name(dev);
- RTE_LOG(INFO, PMD, "Initializing pmd_vhost for %s\n", name);
+ RTE_LOG(INFO, PMD, "Initializing pmd_vhost for %s\n",
+ rte_vdev_device_name(dev));
kvlist = rte_kvargs_p
[dpdk-dev] [PATCH 08/38] net/virtio: use ethdev allocation helper for virtual devices
Signed-off-by: Jan Blunck
---
drivers/net/virtio/virtio_user_ethdev.c | 20 +---
1 file changed, 5 insertions(+), 15 deletions(-)
diff --git a/drivers/net/virtio/virtio_user_ethdev.c
b/drivers/net/virtio/virtio_user_ethdev.c
index 42ad8a2..15e3a93 100644
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -37,6 +37,7 @@
#include
#include
+#include
#include
#include "virtio_ethdev.h"
@@ -277,27 +278,21 @@ get_integer_arg(const char *key __rte_unused,
static struct rte_vdev_driver virtio_user_driver;
static struct rte_eth_dev *
-virtio_user_eth_dev_alloc(const char *name)
+virtio_user_eth_dev_alloc(struct rte_vdev_device *vdev)
{
struct rte_eth_dev *eth_dev;
struct rte_eth_dev_data *data;
struct virtio_hw *hw;
struct virtio_user_dev *dev;
- eth_dev = rte_eth_dev_allocate(name);
+ eth_dev = rte_eth_vdev_allocate(vdev, sizeof(*hw));
if (!eth_dev) {
PMD_INIT_LOG(ERR, "cannot alloc rte_eth_dev");
return NULL;
}
data = eth_dev->data;
-
- hw = rte_zmalloc(NULL, sizeof(*hw), 0);
- if (!hw) {
- PMD_INIT_LOG(ERR, "malloc virtio_hw failed");
- rte_eth_dev_release_port(eth_dev);
- return NULL;
- }
+ hw = eth_dev->data->dev_private;
dev = rte_zmalloc(NULL, sizeof(*dev), 0);
if (!dev) {
@@ -313,12 +308,7 @@ virtio_user_eth_dev_alloc(const char *name)
hw->modern = 0;
hw->use_simple_rxtx = 0;
hw->virtio_user_dev = dev;
- data->dev_private = hw;
- data->drv_name = virtio_user_driver.driver.name;
- data->numa_node = SOCKET_ID_ANY;
- data->kdrv = RTE_KDRV_NONE;
data->dev_flags = RTE_ETH_DEV_DETACHABLE;
- eth_dev->driver = NULL;
return eth_dev;
}
@@ -412,7 +402,7 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)
goto end;
}
- eth_dev = virtio_user_eth_dev_alloc(rte_vdev_device_name(dev));
+ eth_dev = virtio_user_eth_dev_alloc(dev);
if (!eth_dev) {
PMD_INIT_LOG(ERR, "virtio_user fails to alloc device");
goto end;
--
2.7.4
[dpdk-dev] [PATCH 09/38] net/af_packet: use ethdev allocation helper for virtual devices
Signed-off-by: Jan Blunck
---
drivers/net/af_packet/rte_eth_af_packet.c | 42 ++-
1 file changed, 19 insertions(+), 23 deletions(-)
diff --git a/drivers/net/af_packet/rte_eth_af_packet.c
b/drivers/net/af_packet/rte_eth_af_packet.c
index 77536e8..6f6ba0c 100644
--- a/drivers/net/af_packet/rte_eth_af_packet.c
+++ b/drivers/net/af_packet/rte_eth_af_packet.c
@@ -38,6 +38,7 @@
#include
#include
+#include
#include
#include
#include
@@ -539,18 +540,19 @@ open_packet_iface(const char *key __rte_unused,
static struct rte_vdev_driver pmd_af_packet_drv;
static int
-rte_pmd_init_internals(const char *name,
+rte_pmd_init_internals(struct rte_vdev_device *dev,
const int sockfd,
const unsigned nb_queues,
unsigned int blocksize,
unsigned int blockcnt,
unsigned int framesize,
unsigned int framecnt,
- const unsigned numa_node,
struct pmd_internals **internals,
struct rte_eth_dev **eth_dev,
struct rte_kvargs *kvlist)
{
+ const char *name = rte_vdev_device_name(dev);
+ const unsigned int numa_node = dev->device.numa_node;
struct rte_eth_dev_data *data = NULL;
struct rte_kvargs_pair *pair = NULL;
struct ifreq ifr;
@@ -768,7 +770,7 @@ rte_pmd_init_internals(const char *name,
}
/* reserve an ethdev entry */
- *eth_dev = rte_eth_dev_allocate(name);
+ *eth_dev = rte_eth_vdev_allocate(dev, 0);
if (*eth_dev == NULL)
goto error;
@@ -782,22 +784,16 @@ rte_pmd_init_internals(const char *name,
(*internals)->nb_queues = nb_queues;
+ rte_memcpy(data, (*eth_dev)->data, sizeof(*data));
data->dev_private = *internals;
- data->port_id = (*eth_dev)->data->port_id;
data->nb_rx_queues = (uint16_t)nb_queues;
data->nb_tx_queues = (uint16_t)nb_queues;
data->dev_link = pmd_link;
data->mac_addrs = &(*internals)->eth_addr;
- strncpy(data->name,
- (*eth_dev)->data->name, strlen((*eth_dev)->data->name));
(*eth_dev)->data = data;
(*eth_dev)->dev_ops = &ops;
- (*eth_dev)->driver = NULL;
(*eth_dev)->data->dev_flags = RTE_ETH_DEV_DETACHABLE;
- (*eth_dev)->data->drv_name = pmd_af_packet_drv.driver.name;
- (*eth_dev)->data->kdrv = RTE_KDRV_NONE;
- (*eth_dev)->data->numa_node = numa_node;
return 0;
@@ -822,11 +818,11 @@ rte_pmd_init_internals(const char *name,
}
static int
-rte_eth_from_packet(const char *name,
+rte_eth_from_packet(struct rte_vdev_device *dev,
int const *sockfd,
-const unsigned numa_node,
struct rte_kvargs *kvlist)
{
+ const char *name = rte_vdev_device_name(dev);
struct pmd_internals *internals = NULL;
struct rte_eth_dev *eth_dev = NULL;
struct rte_kvargs_pair *pair = NULL;
@@ -909,11 +905,11 @@ rte_eth_from_packet(const char *name,
RTE_LOG(INFO, PMD, "%s:\tframe size %d\n", name, framesize);
RTE_LOG(INFO, PMD, "%s:\tframe count %d\n", name, framecount);
- if (rte_pmd_init_internals(name, *sockfd, qpairs,
- blocksize, blockcount,
- framesize, framecount,
- numa_node, &internals, ð_dev,
- kvlist) < 0)
+ if (rte_pmd_init_internals(dev, *sockfd, qpairs,
+ blocksize, blockcount,
+ framesize, framecount,
+ &internals, ð_dev,
+ kvlist) < 0)
return -1;
eth_dev->rx_pkt_burst = eth_af_packet_rx;
@@ -925,15 +921,12 @@ rte_eth_from_packet(const char *name,
static int
rte_pmd_af_packet_probe(struct rte_vdev_device *dev)
{
- const char *name = rte_vdev_device_name(dev);
- unsigned numa_node;
int ret = 0;
struct rte_kvargs *kvlist;
int sockfd = -1;
- RTE_LOG(INFO, PMD, "Initializing pmd_af_packet for %s\n", name);
-
- numa_node = rte_socket_id();
+ RTE_LOG(INFO, PMD, "Initializing pmd_af_packet for %s\n",
+ rte_vdev_device_name(dev));
kvlist = rte_kvargs_parse(rte_vdev_device_args(dev), valid_arguments);
if (kvlist == NULL) {
@@ -953,7 +946,10 @@ rte_pmd_af_packet_probe(struct rte_vdev_device *dev)
goto exit;
}
- ret = rte_eth_from_packet(name, &sockfd, numa_node, kvlist);
+ if (dev->device.numa_node == SOCKET_ID_ANY)
+ dev->device.numa_node = rte_socket_id();
+
+ ret = rte_eth_from_packet(dev, &sockfd, kvlist);
close(sockfd); /* no longer needed */
exit:
--
2.7.4
[dpdk-dev] [PATCH 10/38] app/test: don't short-circuit null device creation
A virtual device should get initialized through the rte_eal_vdev_init()
function to properly initialize the driver.
Signed-off-by: Jan Blunck
---
drivers/net/null/rte_eth_null.c | 1 +
test/test/test_link_bonding_rssconf.c | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c
index f4242b0..b856073 100644
--- a/drivers/net/null/rte_eth_null.c
+++ b/drivers/net/null/rte_eth_null.c
@@ -50,6 +50,7 @@ static unsigned default_packet_copy;
static const char *valid_arguments[] = {
ETH_NULL_PACKET_SIZE_ARG,
ETH_NULL_PACKET_COPY_ARG,
+ "driver",
NULL
};
diff --git a/test/test/test_link_bonding_rssconf.c
b/test/test/test_link_bonding_rssconf.c
index 34f1c16..1023f7f 100644
--- a/test/test/test_link_bonding_rssconf.c
+++ b/test/test/test_link_bonding_rssconf.c
@@ -552,7 +552,8 @@ test_setup(void)
port_id = rte_eth_dev_count();
snprintf(name, sizeof(name), SLAVE_DEV_NAME_FMT, port_id);
- retval = eth_dev_null_create(name, 0, 64, 0);
+ retval = rte_eal_vdev_init(name,
+ "driver=net_null,size=64,copy=0");
TEST_ASSERT_SUCCESS(retval, "Failed to create null device
'%s'\n",
name);
--
2.7.4
[dpdk-dev] [PATCH 11/38] net/null: internalize eth_dev_null_create()
There is no need to export this API. Remaining users should use the
rte_eal_vdev_init() function instead.
Signed-off-by: Jan Blunck
---
drivers/net/null/Makefile | 7 +-
drivers/net/null/rte_eth_null.c | 4 +---
drivers/net/null/rte_eth_null.h | 40 ---
drivers/net/null/rte_pmd_null_version.map | 7 --
test/test/test_link_bonding_rssconf.c | 1 -
5 files changed, 2 insertions(+), 57 deletions(-)
delete mode 100644 drivers/net/null/rte_eth_null.h
diff --git a/drivers/net/null/Makefile b/drivers/net/null/Makefile
index 0c909c6..80abb52 100644
--- a/drivers/net/null/Makefile
+++ b/drivers/net/null/Makefile
@@ -41,18 +41,13 @@ CFLAGS += $(WERROR_FLAGS)
EXPORT_MAP := rte_pmd_null_version.map
-LIBABIVER := 1
+LIBABIVER := 2
#
# all source are stored in SRCS-y
#
SRCS-$(CONFIG_RTE_LIBRTE_PMD_NULL) += rte_eth_null.c
-#
-# Export include files
-#
-SYMLINK-y-include += rte_eth_null.h
-
# this lib depends upon:
DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_NULL) += lib/librte_eal
DEPDIRS-$(CONFIG_RTE_LIBRTE_PMD_NULL) += lib/librte_mbuf
diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c
index b856073..14f35d7 100644
--- a/drivers/net/null/rte_eth_null.c
+++ b/drivers/net/null/rte_eth_null.c
@@ -39,8 +39,6 @@
#include
#include
-#include "rte_eth_null.h"
-
#define ETH_NULL_PACKET_SIZE_ARG "size"
#define ETH_NULL_PACKET_COPY_ARG "copy"
@@ -480,7 +478,7 @@ static const struct eth_dev_ops ops = {
static struct rte_vdev_driver pmd_null_drv;
-int
+static int
eth_dev_null_create(const char *name,
const unsigned numa_node,
unsigned packet_size,
diff --git a/drivers/net/null/rte_eth_null.h b/drivers/net/null/rte_eth_null.h
deleted file mode 100644
index abada8c..000
--- a/drivers/net/null/rte_eth_null.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015 Intel Corporation. All rights reserved.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Intel Corporation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef RTE_ETH_NULL_H_
-#define RTE_ETH_NULL_H_
-
-int eth_dev_null_create(const char *name, const unsigned numa_node,
- unsigned packet_size, unsigned packet_copy);
-
-#endif /* RTE_ETH_NULL_H_ */
diff --git a/drivers/net/null/rte_pmd_null_version.map
b/drivers/net/null/rte_pmd_null_version.map
index 84b1d0f..ef35398 100644
--- a/drivers/net/null/rte_pmd_null_version.map
+++ b/drivers/net/null/rte_pmd_null_version.map
@@ -2,10 +2,3 @@ DPDK_2.0 {
local: *;
};
-
-DPDK_2.2 {
- global:
-
- eth_dev_null_create;
-
-} DPDK_2.0;
diff --git a/test/test/test_link_bonding_rssconf.c
b/test/test/test_link_bonding_rssconf.c
index 1023f7f..8bd69ad 100644
--- a/test/test/test_link_bonding_rssconf.c
+++ b/test/test/test_link_bonding_rssconf.c
@@ -52,7 +52,6 @@
#include
#include
#include
-#include
#include "test.h"
--
2.7.4
[dpdk-dev] [PATCH 12/38] net/null: use ethdev allocation helper for virtual devices
Signed-off-by: Jan Blunck
---
drivers/net/null/rte_eth_null.c | 50 ++---
1 file changed, 17 insertions(+), 33 deletions(-)
diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c
index 14f35d7..226c2e4 100644
--- a/drivers/net/null/rte_eth_null.c
+++ b/drivers/net/null/rte_eth_null.c
@@ -33,6 +33,7 @@
#include
#include
+#include
#include
#include
#include
@@ -479,8 +480,7 @@ static const struct eth_dev_ops ops = {
static struct rte_vdev_driver pmd_null_drv;
static int
-eth_dev_null_create(const char *name,
- const unsigned numa_node,
+eth_dev_null_create(struct rte_vdev_device *dev,
unsigned packet_size,
unsigned packet_copy)
{
@@ -497,27 +497,25 @@ eth_dev_null_create(const char *name,
0xBE, 0xAC, 0x01, 0xFA
};
- if (name == NULL)
- return -EINVAL;
+ if (dev->device.numa_node == SOCKET_ID_ANY)
+ dev->device.numa_node = rte_socket_id();
RTE_LOG(INFO, PMD, "Creating null ethdev on numa socket %u\n",
- numa_node);
+ dev->device.numa_node);
/* now do all data allocation - for eth_dev structure, dummy pci driver
* and internal (private) data
*/
- data = rte_zmalloc_socket(name, sizeof(*data), 0, numa_node);
- if (data == NULL)
- goto error;
-
- internals = rte_zmalloc_socket(name, sizeof(*internals), 0, numa_node);
- if (internals == NULL)
- goto error;
+ data = rte_zmalloc_socket(rte_vdev_device_name(dev), sizeof(*data), 0,
+ dev->device.numa_node);
+ if (!data)
+ return -ENOMEM;
- /* reserve an ethdev entry */
- eth_dev = rte_eth_dev_allocate(name);
- if (eth_dev == NULL)
- goto error;
+ eth_dev = rte_eth_vdev_allocate(dev, sizeof(*internals));
+ if (!eth_dev) {
+ rte_free(data);
+ return -ENOMEM;
+ }
/* now put it all together
* - store queue data in internals,
@@ -528,6 +526,7 @@ eth_dev_null_create(const char *name,
/* NOTE: we'll replace the data element, of originally allocated eth_dev
* so the nulls are local per-process */
+ internals = eth_dev->data->dev_private;
internals->packet_size = packet_size;
internals->packet_copy = packet_copy;
internals->port_id = eth_dev->data->port_id;
@@ -537,22 +536,16 @@ eth_dev_null_create(const char *name,
rte_memcpy(internals->rss_key, default_rss_key, 40);
- data->dev_private = internals;
- data->port_id = eth_dev->data->port_id;
+ rte_memcpy(data, eth_dev->data, sizeof(*data));
data->nb_rx_queues = (uint16_t)nb_rx_queues;
data->nb_tx_queues = (uint16_t)nb_tx_queues;
data->dev_link = pmd_link;
data->mac_addrs = ð_addr;
- strncpy(data->name, eth_dev->data->name, strlen(eth_dev->data->name));
eth_dev->data = data;
eth_dev->dev_ops = &ops;
- eth_dev->driver = NULL;
data->dev_flags = RTE_ETH_DEV_DETACHABLE;
- data->kdrv = RTE_KDRV_NONE;
- data->drv_name = pmd_null_drv.driver.name;
- data->numa_node = numa_node;
/* finally assign rx and tx ops */
if (packet_copy) {
@@ -564,12 +557,6 @@ eth_dev_null_create(const char *name,
}
return 0;
-
-error:
- rte_free(data);
- rte_free(internals);
-
- return -1;
}
static inline int
@@ -610,7 +597,6 @@ static int
rte_pmd_null_probe(struct rte_vdev_device *dev)
{
const char *name, *params;
- unsigned numa_node;
unsigned packet_size = default_packet_size;
unsigned packet_copy = default_packet_copy;
struct rte_kvargs *kvlist = NULL;
@@ -623,8 +609,6 @@ rte_pmd_null_probe(struct rte_vdev_device *dev)
params = rte_vdev_device_args(dev);
RTE_LOG(INFO, PMD, "Initializing pmd_null for %s\n", name);
- numa_node = rte_socket_id();
-
if (params != NULL) {
kvlist = rte_kvargs_parse(params, valid_arguments);
if (kvlist == NULL)
@@ -653,7 +637,7 @@ rte_pmd_null_probe(struct rte_vdev_device *dev)
"packet copy is %s\n", packet_size,
packet_copy ? "enabled" : "disabled");
- ret = eth_dev_null_create(name, numa_node, packet_size, packet_copy);
+ ret = eth_dev_null_create(dev, packet_size, packet_copy);
free_kvlist:
if (kvlist)
--
2.7.4
[dpdk-dev] [PATCH 13/38] net/bonding: make bonding API call through EAL on create/free
To properly embed the generic rte_device into the rte_eth_dev this reworks
the bonding API to call through rte_eal_vdev_init().
Signed-off-by: Jan Blunck
---
drivers/net/bonding/rte_eth_bond_api.c | 171 +--
drivers/net/bonding/rte_eth_bond_args.c | 2 +-
drivers/net/bonding/rte_eth_bond_pmd.c | 174 ++--
3 files changed, 194 insertions(+), 153 deletions(-)
diff --git a/drivers/net/bonding/rte_eth_bond_api.c
b/drivers/net/bonding/rte_eth_bond_api.c
index f552d96..80c7091 100644
--- a/drivers/net/bonding/rte_eth_bond_api.c
+++ b/drivers/net/bonding/rte_eth_bond_api.c
@@ -38,13 +38,12 @@
#include
#include
#include
+#include
#include "rte_eth_bond.h"
#include "rte_eth_bond_private.h"
#include "rte_eth_bond_8023ad_private.h"
-#define DEFAULT_POLLING_INTERVAL_10_MS (10)
-
int
check_for_bonded_ethdev(const struct rte_eth_dev *eth_dev)
{
@@ -163,163 +162,45 @@ number_of_sockets(void)
int
rte_eth_bond_create(const char *name, uint8_t mode, uint8_t socket_id)
{
- struct bond_dev_private *internals = NULL;
- struct rte_eth_dev *eth_dev = NULL;
- uint32_t vlan_filter_bmp_size;
-
- /* now do all data allocation - for eth_dev structure, dummy pci driver
-* and internal (private) data
-*/
+ struct bond_dev_private *internals;
+ char devargs[52];
+ uint8_t port_id;
+ int ret;
if (name == NULL) {
RTE_BOND_LOG(ERR, "Invalid name specified");
- goto err;
- }
-
- if (socket_id >= number_of_sockets()) {
- RTE_BOND_LOG(ERR,
- "Invalid socket id specified to create bonded
device on.");
- goto err;
+ return -EINVAL;
}
- internals = rte_zmalloc_socket(name, sizeof(*internals), 0, socket_id);
- if (internals == NULL) {
- RTE_BOND_LOG(ERR, "Unable to malloc internals on socket");
- goto err;
- }
+ ret = snprintf(devargs, sizeof(devargs),
+ "driver=net_bonding,mode=%d,socket_id=%d", mode, socket_id);
+ if (ret < 0 || ret >= (int)sizeof(devargs))
+ return -ENOMEM;
- /* reserve an ethdev entry */
- eth_dev = rte_eth_dev_allocate(name);
- if (eth_dev == NULL) {
- RTE_BOND_LOG(ERR, "Unable to allocate rte_eth_dev");
- goto err;
- }
+ ret = rte_eal_vdev_init(name, devargs);
+ if (ret)
+ return -ENOMEM;
- eth_dev->data->dev_private = internals;
- eth_dev->data->nb_rx_queues = (uint16_t)1;
- eth_dev->data->nb_tx_queues = (uint16_t)1;
-
- eth_dev->data->mac_addrs = rte_zmalloc_socket(name, ETHER_ADDR_LEN, 0,
- socket_id);
- if (eth_dev->data->mac_addrs == NULL) {
- RTE_BOND_LOG(ERR, "Unable to malloc mac_addrs");
- goto err;
- }
-
- eth_dev->dev_ops = &default_dev_ops;
- eth_dev->data->dev_flags = RTE_ETH_DEV_INTR_LSC |
- RTE_ETH_DEV_DETACHABLE;
- eth_dev->driver = NULL;
- eth_dev->data->kdrv = RTE_KDRV_NONE;
- eth_dev->data->drv_name = pmd_bond_drv.driver.name;
- eth_dev->data->numa_node = socket_id;
-
- rte_spinlock_init(&internals->lock);
-
- internals->port_id = eth_dev->data->port_id;
- internals->mode = BONDING_MODE_INVALID;
- internals->current_primary_port = RTE_MAX_ETHPORTS + 1;
- internals->balance_xmit_policy = BALANCE_XMIT_POLICY_LAYER2;
- internals->xmit_hash = xmit_l2_hash;
- internals->user_defined_mac = 0;
- internals->link_props_set = 0;
-
- internals->link_status_polling_enabled = 0;
-
- internals->link_status_polling_interval_ms =
DEFAULT_POLLING_INTERVAL_10_MS;
- internals->link_down_delay_ms = 0;
- internals->link_up_delay_ms = 0;
-
- internals->slave_count = 0;
- internals->active_slave_count = 0;
- internals->rx_offload_capa = 0;
- internals->tx_offload_capa = 0;
- internals->candidate_max_rx_pktlen = 0;
- internals->max_rx_pktlen = 0;
-
- /* Initially allow to choose any offload type */
- internals->flow_type_rss_offloads = ETH_RSS_PROTO_MASK;
-
- memset(internals->active_slaves, 0, sizeof(internals->active_slaves));
- memset(internals->slaves, 0, sizeof(internals->slaves));
-
- /* Set mode 4 default configuration */
- bond_mode_8023ad_setup(eth_dev, NULL);
- if (bond_ethdev_mode_set(eth_dev, mode)) {
- RTE_BOND_LOG(ERR, "Failed to set bonded device %d mode too %d",
-eth_dev->data->port_id, mode);
- goto err;
- }
+ ret = rte_eth_dev_get_port_by_name(name, &port_id);
+ RTE_ASSERT(!ret);
- vlan_filter_bmp_size =
- rte_bitmap_get_memory_footprint(ETHER_MAX_VLAN_ID + 1);
- internals->vlan_fi
[dpdk-dev] [PATCH 14/38] net/bonding: use ethdev allocation helper for virtual devices
Signed-off-by: Jan Blunck
---
drivers/net/bonding/rte_eth_bond_pmd.c | 20 +++-
1 file changed, 3 insertions(+), 17 deletions(-)
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c
b/drivers/net/bonding/rte_eth_bond_pmd.c
index c0d08a8..3c80ff5 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -36,6 +36,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -2243,31 +2244,20 @@ bond_alloc(struct rte_vdev_device *dev, uint8_t mode)
* and internal (private) data
*/
- if (name == NULL) {
- RTE_BOND_LOG(ERR, "Invalid name specified");
- goto err;
- }
-
if (socket_id >= number_of_sockets()) {
RTE_BOND_LOG(ERR,
"Invalid socket id specified to create bonded
device on.");
goto err;
}
- internals = rte_zmalloc_socket(name, sizeof(*internals), 0, socket_id);
- if (internals == NULL) {
- RTE_BOND_LOG(ERR, "Unable to malloc internals on socket");
- goto err;
- }
-
/* reserve an ethdev entry */
- eth_dev = rte_eth_dev_allocate(name);
+ eth_dev = rte_eth_vdev_allocate(dev, sizeof(*internals));
if (eth_dev == NULL) {
RTE_BOND_LOG(ERR, "Unable to allocate rte_eth_dev");
goto err;
}
- eth_dev->data->dev_private = internals;
+ internals = eth_dev->data->dev_private;
eth_dev->data->nb_rx_queues = (uint16_t)1;
eth_dev->data->nb_tx_queues = (uint16_t)1;
@@ -2281,10 +2271,6 @@ bond_alloc(struct rte_vdev_device *dev, uint8_t mode)
eth_dev->dev_ops = &default_dev_ops;
eth_dev->data->dev_flags = RTE_ETH_DEV_INTR_LSC |
RTE_ETH_DEV_DETACHABLE;
- eth_dev->driver = NULL;
- eth_dev->data->kdrv = RTE_KDRV_NONE;
- eth_dev->data->drv_name = pmd_bond_drv.driver.name;
- eth_dev->data->numa_node = socket_id;
rte_spinlock_init(&internals->lock);
--
2.7.4
[dpdk-dev] [PATCH 15/38] ethdev: add PCI driver helpers
This adds the following helper intended to be used by rte_pci_driver
implementations working with ethdev:
- rte_eth_dev_pci_allocate
- rte_eth_dev_pci_release
- rte_eth_dev_pci_generic_probe
- rte_eth_dev_pci_generic_remove
Signed-off-by: Jan Blunck
---
lib/librte_ether/Makefile | 1 +
lib/librte_ether/rte_ethdev_pci.h | 151 ++
2 files changed, 152 insertions(+)
create mode 100644 lib/librte_ether/rte_ethdev_pci.h
diff --git a/lib/librte_ether/Makefile b/lib/librte_ether/Makefile
index 31e6ba7..a6fff5e 100644
--- a/lib/librte_ether/Makefile
+++ b/lib/librte_ether/Makefile
@@ -50,6 +50,7 @@ SRCS-y += rte_flow.c
# Export include files
#
SYMLINK-y-include += rte_ethdev.h
+SYMLINK-y-include += rte_ethdev_pci.h
SYMLINK-y-include += rte_ethdev_vdev.h
SYMLINK-y-include += rte_eth_ctrl.h
SYMLINK-y-include += rte_dev_info.h
diff --git a/lib/librte_ether/rte_ethdev_pci.h
b/lib/librte_ether/rte_ethdev_pci.h
new file mode 100644
index 000..4b728db
--- /dev/null
+++ b/lib/librte_ether/rte_ethdev_pci.h
@@ -0,0 +1,151 @@
+/*-
+ * BSD LICENSE
+ *
+ * Copyright(c) 2017 Brocade Communications Systems, Inc.
+ * Author: Jan Blunck
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of the copyright holder nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _RTE_ETHDEV_PCI_H_
+#define _RTE_ETHDEV_PCI_H_
+
+#include
+#include
+#include
+
+/**
+ * @internal
+ * Allocates a new ethdev slot for an ethernet device and returns the pointer
+ * to that slot for the driver to use.
+ *
+ * @param dev
+ * Pointer to the PCI device
+ *
+ * @param private_data_size
+ * Size of private data structure
+ *
+ * @return
+ * A pointer to a rte_eth_dev or NULL if allocation failed.
+ */
+static inline struct rte_eth_dev *
+rte_eth_dev_pci_allocate(struct rte_pci_device *dev, size_t private_data_size)
+{
+ struct rte_eth_dev *eth_dev;
+ const char *name;
+
+ if (!dev)
+ return NULL;
+
+ name = dev->device.name;
+
+ if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+ eth_dev = rte_eth_dev_allocate(name);
+ if (!eth_dev)
+ return NULL;
+
+ if (private_data_size) {
+ eth_dev->data->dev_private = rte_zmalloc_socket(name,
+ private_data_size, RTE_CACHE_LINE_SIZE,
+ dev->device.numa_node);
+ if (!eth_dev->data->dev_private) {
+ rte_eth_dev_release_port(eth_dev);
+ return NULL;
+ }
+ }
+ } else {
+ eth_dev = rte_eth_dev_attach_secondary(name);
+ if (!eth_dev)
+ return NULL;
+ }
+
+ eth_dev->device = &dev->device;
+ eth_dev->driver = NULL;
+ eth_dev->intr_handle = &dev->intr_handle;
+ rte_eth_copy_pci_info(eth_dev, dev);
+ return eth_dev;
+}
+
+static inline void
+rte_eth_dev_pci_release(struct rte_eth_dev *eth_dev)
+{
+ /* free ether device */
+ rte_eth_dev_release_port(eth_dev);
+
+ if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+ rte_free(eth_dev->data->dev_private);
+
+ eth_dev->data->dev_private = NULL;
+
+ eth_dev->device = NULL;
+ eth_dev->driver = NULL;
+ eth_dev->intr_handle = NULL;
+}
+
+typedef int (*eth_dev_pci_callback_t)(struct rte_eth_dev *eth_dev);
[dpdk-dev] [PATCH 17/38] net/bnx2x: Don't use eth_driver
Signed-off-by: Jan Blunck
---
drivers/net/bnx2x/bnx2x_ethdev.c | 64 +++-
1 file changed, 44 insertions(+), 20 deletions(-)
diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c
index a0b0dfa..e295951 100644
--- a/drivers/net/bnx2x/bnx2x_ethdev.c
+++ b/drivers/net/bnx2x/bnx2x_ethdev.c
@@ -12,6 +12,7 @@
#include "bnx2x_rxtx.h"
#include
+#include
/*
* The set of PCI devices this driver supports
@@ -626,34 +627,57 @@ eth_bnx2xvf_dev_init(struct rte_eth_dev *eth_dev)
return bnx2x_common_dev_init(eth_dev, 1);
}
-static struct eth_driver rte_bnx2x_pmd = {
- .pci_drv = {
- .id_table = pci_id_bnx2x_map,
- .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
- .probe = rte_eth_dev_pci_probe,
- .remove = rte_eth_dev_pci_remove,
- },
- .eth_dev_init = eth_bnx2x_dev_init,
- .dev_private_size = sizeof(struct bnx2x_softc),
+static struct rte_pci_driver rte_bnx2x_pmd;
+static struct rte_pci_driver rte_bnx2xvf_pmd;
+
+static int eth_bnx2x_pci_probe(struct rte_pci_driver *pci_drv,
+ struct rte_pci_device *pci_dev)
+{
+ struct rte_eth_dev *eth_dev;
+ int ret;
+
+ eth_dev = rte_eth_dev_pci_allocate(pci_dev, sizeof(struct bnx2x_softc));
+ if (!eth_dev)
+ return -ENOMEM;
+
+ if (pci_drv == &rte_bnx2x_pmd)
+ ret = eth_bnx2x_dev_init(eth_dev);
+ else if (pci_drv == &rte_bnx2xvf_pmd)
+ ret = eth_bnx2xvf_dev_init(eth_dev);
+ else
+ ret = -EINVAL;
+
+ if (ret)
+ rte_eth_dev_pci_release(eth_dev);
+
+ return ret;
+}
+
+static int eth_bnx2x_pci_remove(struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_remove(pci_dev, NULL);
+}
+
+static struct rte_pci_driver rte_bnx2x_pmd = {
+ .id_table = pci_id_bnx2x_map,
+ .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
+ .probe = eth_bnx2x_pci_probe,
+ .remove = eth_bnx2x_pci_remove,
};
/*
* virtual function driver struct
*/
-static struct eth_driver rte_bnx2xvf_pmd = {
- .pci_drv = {
- .id_table = pci_id_bnx2xvf_map,
- .drv_flags = RTE_PCI_DRV_NEED_MAPPING,
- .probe = rte_eth_dev_pci_probe,
- .remove = rte_eth_dev_pci_remove,
- },
- .eth_dev_init = eth_bnx2xvf_dev_init,
- .dev_private_size = sizeof(struct bnx2x_softc),
+static struct rte_pci_driver rte_bnx2xvf_pmd = {
+ .id_table = pci_id_bnx2xvf_map,
+ .drv_flags = RTE_PCI_DRV_NEED_MAPPING,
+ .probe = eth_bnx2x_pci_probe,
+ .remove = eth_bnx2x_pci_remove,
};
-RTE_PMD_REGISTER_PCI(net_bnx2x, rte_bnx2x_pmd.pci_drv);
+RTE_PMD_REGISTER_PCI(net_bnx2x, rte_bnx2x_pmd);
RTE_PMD_REGISTER_PCI_TABLE(net_bnx2x, pci_id_bnx2x_map);
RTE_PMD_REGISTER_KMOD_DEP(net_bnx2x, "* igb_uio | uio_pci_generic | vfio");
-RTE_PMD_REGISTER_PCI(net_bnx2xvf, rte_bnx2xvf_pmd.pci_drv);
+RTE_PMD_REGISTER_PCI(net_bnx2xvf, rte_bnx2xvf_pmd);
RTE_PMD_REGISTER_PCI_TABLE(net_bnx2xvf, pci_id_bnx2xvf_map);
RTE_PMD_REGISTER_KMOD_DEP(net_bnx2xvf, "* igb_uio | vfio");
--
2.7.4
[dpdk-dev] [PATCH 16/38] net/virtio: Don't use eth_driver
Signed-off-by: Jan Blunck
---
drivers/net/virtio/virtio_ethdev.c | 34 +-
1 file changed, 21 insertions(+), 13 deletions(-)
diff --git a/drivers/net/virtio/virtio_ethdev.c
b/drivers/net/virtio/virtio_ethdev.c
index 4dc03b9..a600ca5 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -38,6 +38,7 @@
#include
#include
+#include
#include
#include
#include
@@ -1572,19 +1573,26 @@ eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev)
return 0;
}
-static struct eth_driver rte_virtio_pmd = {
- .pci_drv = {
- .driver = {
- .name = "net_virtio",
- },
- .id_table = pci_id_virtio_map,
- .drv_flags = 0,
- .probe = rte_eth_dev_pci_probe,
- .remove = rte_eth_dev_pci_remove,
+static int eth_virtio_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+ struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_probe(pci_dev, sizeof(struct virtio_hw),
+ eth_virtio_dev_init);
+}
+
+static int eth_virtio_pci_remove(struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_remove(pci_dev, eth_virtio_dev_uninit);
+}
+
+static struct rte_pci_driver rte_virtio_pmd = {
+ .driver = {
+ .name = "net_virtio",
},
- .eth_dev_init = eth_virtio_dev_init,
- .eth_dev_uninit = eth_virtio_dev_uninit,
- .dev_private_size = sizeof(struct virtio_hw),
+ .id_table = pci_id_virtio_map,
+ .drv_flags = 0,
+ .probe = eth_virtio_pci_probe,
+ .remove = eth_virtio_pci_remove,
};
RTE_INIT(rte_virtio_pmd_init);
@@ -1596,7 +1604,7 @@ rte_virtio_pmd_init(void)
return;
}
- rte_eal_pci_register(&rte_virtio_pmd.pci_drv);
+ rte_eal_pci_register(&rte_virtio_pmd);
}
/*
--
2.7.4
[dpdk-dev] [PATCH 19/38] net/cxgbe: Don't use eth_driver
Signed-off-by: Jan Blunck
---
drivers/net/cxgbe/cxgbe_ethdev.c | 29 +++--
drivers/net/cxgbe/sge.c | 6 +++---
2 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/drivers/net/cxgbe/cxgbe_ethdev.c b/drivers/net/cxgbe/cxgbe_ethdev.c
index 4d543a7..34fed84 100644
--- a/drivers/net/cxgbe/cxgbe_ethdev.c
+++ b/drivers/net/cxgbe/cxgbe_ethdev.c
@@ -57,6 +57,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1039,17 +1040,25 @@ static int eth_cxgbe_dev_init(struct rte_eth_dev
*eth_dev)
return err;
}
-static struct eth_driver rte_cxgbe_pmd = {
- .pci_drv = {
- .id_table = cxgb4_pci_tbl,
- .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
- .probe = rte_eth_dev_pci_probe,
- .remove = rte_eth_dev_pci_remove,
- },
- .eth_dev_init = eth_cxgbe_dev_init,
- .dev_private_size = sizeof(struct port_info),
+static int eth_cxgbe_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+ struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_probe(pci_dev,
+ sizeof(struct port_info), eth_cxgbe_dev_init);
+}
+
+static int eth_cxgbe_pci_remove(struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_remove(pci_dev, NULL);
+}
+
+static struct rte_pci_driver rte_cxgbe_pmd = {
+ .id_table = cxgb4_pci_tbl,
+ .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
+ .probe = eth_cxgbe_pci_probe,
+ .remove = eth_cxgbe_pci_remove,
};
-RTE_PMD_REGISTER_PCI(net_cxgbe, rte_cxgbe_pmd.pci_drv);
+RTE_PMD_REGISTER_PCI(net_cxgbe, rte_cxgbe_pmd);
RTE_PMD_REGISTER_PCI_TABLE(net_cxgbe, cxgb4_pci_tbl);
RTE_PMD_REGISTER_KMOD_DEP(net_cxgbe, "* igb_uio | uio_pci_generic | vfio");
diff --git a/drivers/net/cxgbe/sge.c b/drivers/net/cxgbe/sge.c
index 37b6090..2f9e12c 100644
--- a/drivers/net/cxgbe/sge.c
+++ b/drivers/net/cxgbe/sge.c
@@ -1641,7 +1641,7 @@ int t4_sge_alloc_rxq(struct adapter *adap, struct
sge_rspq *iq, bool fwevtq,
iq->size = cxgbe_roundup(iq->size, 16);
snprintf(z_name, sizeof(z_name), "%s_%s_%d_%d",
-eth_dev->driver->pci_drv.driver.name,
+eth_dev->data->drv_name,
fwevtq ? "fwq_ring" : "rx_ring",
eth_dev->data->port_id, queue_id);
snprintf(z_name_sw, sizeof(z_name_sw), "%s_sw_ring", z_name);
@@ -1694,7 +1694,7 @@ int t4_sge_alloc_rxq(struct adapter *adap, struct
sge_rspq *iq, bool fwevtq,
fl->size = cxgbe_roundup(fl->size, 8);
snprintf(z_name, sizeof(z_name), "%s_%s_%d_%d",
-eth_dev->driver->pci_drv.driver.name,
+eth_dev->data->drv_name,
fwevtq ? "fwq_ring" : "fl_ring",
eth_dev->data->port_id, queue_id);
snprintf(z_name_sw, sizeof(z_name_sw), "%s_sw_ring", z_name);
@@ -1890,7 +1890,7 @@ int t4_sge_alloc_eth_txq(struct adapter *adap, struct
sge_eth_txq *txq,
nentries = txq->q.size + s->stat_len / sizeof(struct tx_desc);
snprintf(z_name, sizeof(z_name), "%s_%s_%d_%d",
-eth_dev->driver->pci_drv.driver.name, "tx_ring",
+eth_dev->data->drv_name, "tx_ring",
eth_dev->data->port_id, queue_id);
snprintf(z_name_sw, sizeof(z_name_sw), "%s_sw_ring", z_name);
--
2.7.4
[dpdk-dev] [PATCH 18/38] net/bnxt: Don't use eth_driver
Signed-off-by: Jan Blunck
---
drivers/net/bnxt/bnxt_ethdev.c | 36 +++-
1 file changed, 23 insertions(+), 13 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 6167443..5dc3ff0 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -36,6 +36,7 @@
#include
#include
+#include
#include
#include
@@ -1075,6 +1076,8 @@ static int bnxt_init_board(struct rte_eth_dev *eth_dev)
return rc;
}
+static int bnxt_dev_uninit(struct rte_eth_dev *eth_dev);
+
static int
bnxt_dev_init(struct rte_eth_dev *eth_dev)
{
@@ -1167,7 +1170,7 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)
return 0;
error_free:
- eth_dev->driver->eth_dev_uninit(eth_dev);
+ bnxt_dev_uninit(eth_dev);
error:
return rc;
}
@@ -1196,19 +1199,26 @@ bnxt_dev_uninit(struct rte_eth_dev *eth_dev) {
return rc;
}
-static struct eth_driver bnxt_rte_pmd = {
- .pci_drv = {
- .id_table = bnxt_pci_id_map,
- .drv_flags = RTE_PCI_DRV_NEED_MAPPING |
- RTE_PCI_DRV_INTR_LSC,
- .probe = rte_eth_dev_pci_probe,
- .remove = rte_eth_dev_pci_remove
- },
- .eth_dev_init = bnxt_dev_init,
- .eth_dev_uninit = bnxt_dev_uninit,
- .dev_private_size = sizeof(struct bnxt),
+static int bnxt_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+ struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_probe(pci_dev, sizeof(struct bnxt),
+ bnxt_dev_init);
+}
+
+static int bnxt_pci_remove(struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_remove(pci_dev, bnxt_dev_uninit);
+}
+
+static struct rte_pci_driver bnxt_rte_pmd = {
+ .id_table = bnxt_pci_id_map,
+ .drv_flags = RTE_PCI_DRV_NEED_MAPPING |
+ RTE_PCI_DRV_INTR_LSC,
+ .probe = bnxt_pci_probe,
+ .remove = bnxt_pci_remove,
};
-RTE_PMD_REGISTER_PCI(net_bnxt, bnxt_rte_pmd.pci_drv);
+RTE_PMD_REGISTER_PCI(net_bnxt, bnxt_rte_pmd);
RTE_PMD_REGISTER_PCI_TABLE(net_bnxt, bnxt_pci_id_map);
RTE_PMD_REGISTER_KMOD_DEP(net_bnxt, "* igb_uio | uio_pci_generic | vfio");
--
2.7.4
[dpdk-dev] [PATCH 20/38] net/em: Don't use eth_driver
Signed-off-by: Jan Blunck
---
drivers/net/e1000/em_ethdev.c | 30 +++---
1 file changed, 19 insertions(+), 11 deletions(-)
diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c
index 4066ef9..39a62a3 100644
--- a/drivers/net/e1000/em_ethdev.c
+++ b/drivers/net/e1000/em_ethdev.c
@@ -45,6 +45,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -416,16 +417,23 @@ eth_em_dev_uninit(struct rte_eth_dev *eth_dev)
return 0;
}
-static struct eth_driver rte_em_pmd = {
- .pci_drv = {
- .id_table = pci_id_em_map,
- .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
- .probe = rte_eth_dev_pci_probe,
- .remove = rte_eth_dev_pci_remove,
- },
- .eth_dev_init = eth_em_dev_init,
- .eth_dev_uninit = eth_em_dev_uninit,
- .dev_private_size = sizeof(struct e1000_adapter),
+static int eth_em_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+ struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_probe(pci_dev,
+ sizeof(struct e1000_adapter), eth_em_dev_init);
+}
+
+static int eth_em_pci_remove(struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_remove(pci_dev, eth_em_dev_uninit);
+}
+
+static struct rte_pci_driver rte_em_pmd = {
+ .id_table = pci_id_em_map,
+ .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
+ .probe = eth_em_pci_probe,
+ .remove = eth_em_pci_remove,
};
static int
@@ -1847,6 +1855,6 @@ eth_em_set_mc_addr_list(struct rte_eth_dev *dev,
return 0;
}
-RTE_PMD_REGISTER_PCI(net_e1000_em, rte_em_pmd.pci_drv);
+RTE_PMD_REGISTER_PCI(net_e1000_em, rte_em_pmd);
RTE_PMD_REGISTER_PCI_TABLE(net_e1000_em, pci_id_em_map);
RTE_PMD_REGISTER_KMOD_DEP(net_e1000_em, "* igb_uio | uio_pci_generic | vfio");
--
2.7.4
[dpdk-dev] [PATCH 22/38] net/ena: Don't use eth_driver
Signed-off-by: Jan Blunck
---
drivers/net/ena/ena_ethdev.c | 29 +++--
1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
index b5e6db6..41573ae 100644
--- a/drivers/net/ena/ena_ethdev.c
+++ b/drivers/net/ena/ena_ethdev.c
@@ -33,6 +33,7 @@
#include
#include
+#include
#include
#include
#include
@@ -1776,17 +1777,25 @@ static uint16_t eth_ena_xmit_pkts(void *tx_queue,
struct rte_mbuf **tx_pkts,
return sent_idx;
}
-static struct eth_driver rte_ena_pmd = {
- .pci_drv = {
- .id_table = pci_id_ena_map,
- .drv_flags = RTE_PCI_DRV_NEED_MAPPING,
- .probe = rte_eth_dev_pci_probe,
- .remove = rte_eth_dev_pci_remove,
- },
- .eth_dev_init = eth_ena_dev_init,
- .dev_private_size = sizeof(struct ena_adapter),
+static int eth_ena_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+ struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_probe(pci_dev,
+ sizeof(struct ena_adapter), eth_ena_dev_init);
+}
+
+static int eth_ena_pci_remove(struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_remove(pci_dev, NULL);
+}
+
+static struct rte_pci_driver rte_ena_pmd = {
+ .id_table = pci_id_ena_map,
+ .drv_flags = RTE_PCI_DRV_NEED_MAPPING,
+ .probe = eth_ena_pci_probe,
+ .remove = eth_ena_pci_remove,
};
-RTE_PMD_REGISTER_PCI(net_ena, rte_ena_pmd.pci_drv);
+RTE_PMD_REGISTER_PCI(net_ena, rte_ena_pmd);
RTE_PMD_REGISTER_PCI_TABLE(net_ena, pci_id_ena_map);
RTE_PMD_REGISTER_KMOD_DEP(net_ena, "* igb_uio | uio_pci_generic | vfio");
--
2.7.4
[dpdk-dev] [PATCH 24/38] net/fm10k: Don't use eth_driver
Signed-off-by: Jan Blunck
---
drivers/net/fm10k/fm10k_ethdev.c | 30 +++---
1 file changed, 19 insertions(+), 11 deletions(-)
diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c
index c4fe746..5bb0426 100644
--- a/drivers/net/fm10k/fm10k_ethdev.c
+++ b/drivers/net/fm10k/fm10k_ethdev.c
@@ -32,6 +32,7 @@
*/
#include
+#include
#include
#include
#include
@@ -3067,6 +3068,18 @@ eth_fm10k_dev_uninit(struct rte_eth_dev *dev)
return 0;
}
+static int eth_fm10k_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+ struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_probe(pci_dev,
+ sizeof(struct fm10k_adapter), eth_fm10k_dev_init);
+}
+
+static int eth_fm10k_pci_remove(struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_remove(pci_dev, eth_fm10k_dev_uninit);
+}
+
/*
* The set of PCI devices this driver supports. This driver will enable both PF
* and SRIOV-VF devices.
@@ -3078,18 +3091,13 @@ static const struct rte_pci_id pci_id_fm10k_map[] = {
{ .vendor_id = 0, /* sentinel */ },
};
-static struct eth_driver rte_pmd_fm10k = {
- .pci_drv = {
- .id_table = pci_id_fm10k_map,
- .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
- .probe = rte_eth_dev_pci_probe,
- .remove = rte_eth_dev_pci_remove,
- },
- .eth_dev_init = eth_fm10k_dev_init,
- .eth_dev_uninit = eth_fm10k_dev_uninit,
- .dev_private_size = sizeof(struct fm10k_adapter),
+static struct rte_pci_driver rte_pmd_fm10k = {
+ .id_table = pci_id_fm10k_map,
+ .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
+ .probe = eth_fm10k_pci_probe,
+ .remove = eth_fm10k_pci_remove,
};
-RTE_PMD_REGISTER_PCI(net_fm10k, rte_pmd_fm10k.pci_drv);
+RTE_PMD_REGISTER_PCI(net_fm10k, rte_pmd_fm10k);
RTE_PMD_REGISTER_PCI_TABLE(net_fm10k, pci_id_fm10k_map);
RTE_PMD_REGISTER_KMOD_DEP(net_fm10k, "* igb_uio | uio_pci_generic | vfio");
--
2.7.4
[dpdk-dev] [PATCH 21/38] net/igb: Don't use eth_driver
Signed-off-by: Jan Blunck
---
drivers/net/e1000/igb_ethdev.c | 60 ++
1 file changed, 38 insertions(+), 22 deletions(-)
diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
index a112b38..1a162cc 100644
--- a/drivers/net/e1000/igb_ethdev.c
+++ b/drivers/net/e1000/igb_ethdev.c
@@ -45,6 +45,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1087,31 +1088,46 @@ eth_igbvf_dev_uninit(struct rte_eth_dev *eth_dev)
return 0;
}
-static struct eth_driver rte_igb_pmd = {
- .pci_drv = {
- .id_table = pci_id_igb_map,
- .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
- .probe = rte_eth_dev_pci_probe,
- .remove = rte_eth_dev_pci_remove,
- },
- .eth_dev_init = eth_igb_dev_init,
- .eth_dev_uninit = eth_igb_dev_uninit,
- .dev_private_size = sizeof(struct e1000_adapter),
+static int eth_igb_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+ struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_probe(pci_dev,
+ sizeof(struct e1000_adapter), eth_igb_dev_init);
+}
+
+static int eth_igb_pci_remove(struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_remove(pci_dev, eth_igb_dev_uninit);
+}
+
+static struct rte_pci_driver rte_igb_pmd = {
+ .id_table = pci_id_igb_map,
+ .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
+ .probe = eth_igb_pci_probe,
+ .remove = eth_igb_pci_remove,
};
+
+static int eth_igbvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+ struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_probe(pci_dev,
+ sizeof(struct e1000_adapter), eth_igbvf_dev_init);
+}
+
+static int eth_igbvf_pci_remove(struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_remove(pci_dev, eth_igbvf_dev_uninit);
+}
+
/*
* virtual function driver struct
*/
-static struct eth_driver rte_igbvf_pmd = {
- .pci_drv = {
- .id_table = pci_id_igbvf_map,
- .drv_flags = RTE_PCI_DRV_NEED_MAPPING,
- .probe = rte_eth_dev_pci_probe,
- .remove = rte_eth_dev_pci_remove,
- },
- .eth_dev_init = eth_igbvf_dev_init,
- .eth_dev_uninit = eth_igbvf_dev_uninit,
- .dev_private_size = sizeof(struct e1000_adapter),
+static struct rte_pci_driver rte_igbvf_pmd = {
+ .id_table = pci_id_igbvf_map,
+ .drv_flags = RTE_PCI_DRV_NEED_MAPPING,
+ .probe = eth_igbvf_pci_probe,
+ .remove = eth_igbvf_pci_remove,
};
static void
@@ -5309,9 +5325,9 @@ eth_igb_configure_msix_intr(struct rte_eth_dev *dev)
E1000_WRITE_FLUSH(hw);
}
-RTE_PMD_REGISTER_PCI(net_e1000_igb, rte_igb_pmd.pci_drv);
+RTE_PMD_REGISTER_PCI(net_e1000_igb, rte_igb_pmd);
RTE_PMD_REGISTER_PCI_TABLE(net_e1000_igb, pci_id_igb_map);
RTE_PMD_REGISTER_KMOD_DEP(net_e1000_igb, "* igb_uio | uio_pci_generic | vfio");
-RTE_PMD_REGISTER_PCI(net_e1000_igb_vf, rte_igbvf_pmd.pci_drv);
+RTE_PMD_REGISTER_PCI(net_e1000_igb_vf, rte_igbvf_pmd);
RTE_PMD_REGISTER_PCI_TABLE(net_e1000_igb_vf, pci_id_igbvf_map);
RTE_PMD_REGISTER_KMOD_DEP(net_e1000_igb_vf, "* igb_uio | vfio");
--
2.7.4
[dpdk-dev] [PATCH 23/38] net/enic: Don't use eth_driver
Signed-off-by: Jan Blunck
---
drivers/net/enic/enic_ethdev.c | 29 +++--
1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c
index bffa870..57f71c7 100644
--- a/drivers/net/enic/enic_ethdev.c
+++ b/drivers/net/enic/enic_ethdev.c
@@ -38,6 +38,7 @@
#include
#include
#include
+#include
#include
#include "vnic_intr.h"
@@ -634,17 +635,25 @@ static int eth_enicpmd_dev_init(struct rte_eth_dev
*eth_dev)
return enic_probe(enic);
}
-static struct eth_driver rte_enic_pmd = {
- .pci_drv = {
- .id_table = pci_id_enic_map,
- .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
- .probe = rte_eth_dev_pci_probe,
- .remove = rte_eth_dev_pci_remove,
- },
- .eth_dev_init = eth_enicpmd_dev_init,
- .dev_private_size = sizeof(struct enic),
+static int eth_enic_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+ struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_probe(pci_dev, sizeof(struct enic),
+ eth_enicpmd_dev_init);
+}
+
+static int eth_enic_pci_remove(struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_remove(pci_dev, NULL);
+}
+
+static struct rte_pci_driver rte_enic_pmd = {
+ .id_table = pci_id_enic_map,
+ .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
+ .probe = eth_enic_pci_probe,
+ .remove = eth_enic_pci_remove,
};
-RTE_PMD_REGISTER_PCI(net_enic, rte_enic_pmd.pci_drv);
+RTE_PMD_REGISTER_PCI(net_enic, rte_enic_pmd);
RTE_PMD_REGISTER_PCI_TABLE(net_enic, pci_id_enic_map);
RTE_PMD_REGISTER_KMOD_DEP(net_enic, "* igb_uio | uio_pci_generic | vfio");
--
2.7.4
[dpdk-dev] [PATCH 26/38] net/i40evf: Don't use eth_driver
Signed-off-by: Jan Blunck
---
drivers/net/i40e/i40e_ethdev_vf.c | 31 ---
1 file changed, 20 insertions(+), 11 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev_vf.c
b/drivers/net/i40e/i40e_ethdev_vf.c
index 55fd344..2a10ad5 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -55,6 +55,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1542,22 +1543,30 @@ i40evf_dev_uninit(struct rte_eth_dev *eth_dev)
return 0;
}
+
+static int eth_i40evf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+ struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_probe(pci_dev,
+ sizeof(struct i40e_adapter), i40evf_dev_init);
+}
+
+static int eth_i40evf_pci_remove(struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_remove(pci_dev, i40evf_dev_uninit);
+}
+
/*
* virtual function driver struct
*/
-static struct eth_driver rte_i40evf_pmd = {
- .pci_drv = {
- .id_table = pci_id_i40evf_map,
- .drv_flags = RTE_PCI_DRV_NEED_MAPPING,
- .probe = rte_eth_dev_pci_probe,
- .remove = rte_eth_dev_pci_remove,
- },
- .eth_dev_init = i40evf_dev_init,
- .eth_dev_uninit = i40evf_dev_uninit,
- .dev_private_size = sizeof(struct i40e_adapter),
+static struct rte_pci_driver rte_i40evf_pmd = {
+ .id_table = pci_id_i40evf_map,
+ .drv_flags = RTE_PCI_DRV_NEED_MAPPING,
+ .probe = eth_i40evf_pci_probe,
+ .remove = eth_i40evf_pci_remove,
};
-RTE_PMD_REGISTER_PCI(net_i40e_vf, rte_i40evf_pmd.pci_drv);
+RTE_PMD_REGISTER_PCI(net_i40e_vf, rte_i40evf_pmd);
RTE_PMD_REGISTER_PCI_TABLE(net_i40e_vf, pci_id_i40evf_map);
RTE_PMD_REGISTER_KMOD_DEP(net_i40e_vf, "* igb_uio | vfio");
--
2.7.4
[dpdk-dev] [PATCH 28/38] net/mlx: Don't reference eth_driver
The eth_driver concept is unused in the mlx drivers so don't reference it.
Signed-off-by: Jan Blunck
---
drivers/net/mlx4/mlx4.c | 17 +++--
drivers/net/mlx5/mlx5.c | 19 ---
2 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c
index 79efaaa..31ee7e4 100644
--- a/drivers/net/mlx4/mlx4.c
+++ b/drivers/net/mlx4/mlx4.c
@@ -5510,7 +5510,7 @@ priv_dev_interrupt_handler_install(struct priv *priv,
struct rte_eth_dev *dev)
}
}
-static struct eth_driver mlx4_driver;
+static struct rte_pci_driver mlx4_driver;
/**
* DPDK callback to register a PCI device.
@@ -5889,16 +5889,13 @@ static const struct rte_pci_id mlx4_pci_id_map[] = {
}
};
-static struct eth_driver mlx4_driver = {
- .pci_drv = {
- .driver = {
- .name = MLX4_DRIVER_NAME
- },
- .id_table = mlx4_pci_id_map,
- .probe = mlx4_pci_probe,
- .drv_flags = RTE_PCI_DRV_INTR_LSC,
+static struct rte_pci_driver mlx4_driver = {
+ .driver = {
+ .name = MLX4_DRIVER_NAME
},
- .dev_private_size = sizeof(struct priv)
+ .id_table = mlx4_pci_id_map,
+ .probe = mlx4_pci_probe,
+ .drv_flags = RTE_PCI_DRV_INTR_LSC,
};
/**
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index d4bd469..74a45f6 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -343,7 +343,7 @@ mlx5_args(struct priv *priv, struct rte_devargs *devargs)
return 0;
}
-static struct eth_driver mlx5_driver;
+static struct rte_pci_driver mlx5_driver;
/**
* DPDK callback to register a PCI device.
@@ -373,7 +373,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct
rte_pci_device *pci_dev)
int i;
(void)pci_drv;
- assert(pci_drv == &mlx5_driver.pci_drv);
+ assert(pci_drv == &mlx5_driver);
/* Get mlx5_dev[] index. */
idx = mlx5_dev_idx(&pci_dev->addr);
if (idx == -1) {
@@ -761,16 +761,13 @@ static const struct rte_pci_id mlx5_pci_id_map[] = {
}
};
-static struct eth_driver mlx5_driver = {
- .pci_drv = {
- .driver = {
- .name = MLX5_DRIVER_NAME
- },
- .id_table = mlx5_pci_id_map,
- .probe = mlx5_pci_probe,
- .drv_flags = RTE_PCI_DRV_INTR_LSC,
+static struct rte_pci_driver mlx5_driver = {
+ .driver = {
+ .name = MLX5_DRIVER_NAME
},
- .dev_private_size = sizeof(struct priv)
+ .id_table = mlx5_pci_id_map,
+ .probe = mlx5_pci_probe,
+ .drv_flags = RTE_PCI_DRV_INTR_LSC,
};
/**
--
2.7.4
[dpdk-dev] [PATCH 27/38] net/ixgbe: Don't use eth_driver
Signed-off-by: Jan Blunck
---
drivers/net/ixgbe/ixgbe_ethdev.c | 66
1 file changed, 40 insertions(+), 26 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 7169007..de5e3c2 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -56,6 +56,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -254,7 +255,7 @@ static void ixgbe_set_default_mac_addr(struct rte_eth_dev
*dev,
struct ether_addr *mac_addr);
static void ixgbe_dcb_init(struct ixgbe_hw *hw, struct ixgbe_dcb_config
*dcb_config);
static bool is_device_supported(struct rte_eth_dev *dev,
- struct eth_driver *drv);
+ struct rte_pci_driver *drv);
/* For Virtual Function support */
static int eth_ixgbevf_dev_init(struct rte_eth_dev *eth_dev);
@@ -1767,31 +1768,45 @@ eth_ixgbevf_dev_uninit(struct rte_eth_dev *eth_dev)
return 0;
}
-static struct eth_driver rte_ixgbe_pmd = {
- .pci_drv = {
- .id_table = pci_id_ixgbe_map,
- .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
- .probe = rte_eth_dev_pci_probe,
- .remove = rte_eth_dev_pci_remove,
- },
- .eth_dev_init = eth_ixgbe_dev_init,
- .eth_dev_uninit = eth_ixgbe_dev_uninit,
- .dev_private_size = sizeof(struct ixgbe_adapter),
+static int eth_ixgbe_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+ struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_probe(pci_dev,
+ sizeof(struct ixgbe_adapter), eth_ixgbe_dev_init);
+}
+
+static int eth_ixgbe_pci_remove(struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_remove(pci_dev, eth_ixgbe_dev_uninit);
+}
+
+static struct rte_pci_driver rte_ixgbe_pmd = {
+ .id_table = pci_id_ixgbe_map,
+ .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
+ .probe = eth_ixgbe_pci_probe,
+ .remove = eth_ixgbe_pci_remove,
};
+static int eth_ixgbevf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+ struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_probe(pci_dev,
+ sizeof(struct ixgbe_adapter), eth_ixgbevf_dev_init);
+}
+
+static int eth_ixgbevf_pci_remove(struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_remove(pci_dev, eth_ixgbevf_dev_uninit);
+}
+
/*
* virtual function driver struct
*/
-static struct eth_driver rte_ixgbevf_pmd = {
- .pci_drv = {
- .id_table = pci_id_ixgbevf_map,
- .drv_flags = RTE_PCI_DRV_NEED_MAPPING,
- .probe = rte_eth_dev_pci_probe,
- .remove = rte_eth_dev_pci_remove,
- },
- .eth_dev_init = eth_ixgbevf_dev_init,
- .eth_dev_uninit = eth_ixgbevf_dev_uninit,
- .dev_private_size = sizeof(struct ixgbe_adapter),
+static struct rte_pci_driver rte_ixgbevf_pmd = {
+ .id_table = pci_id_ixgbevf_map,
+ .drv_flags = RTE_PCI_DRV_NEED_MAPPING,
+ .probe = eth_ixgbevf_pci_probe,
+ .remove = eth_ixgbevf_pci_remove,
};
static int
@@ -4382,10 +4397,9 @@ ixgbe_set_default_mac_addr(struct rte_eth_dev *dev,
struct ether_addr *addr)
}
static bool
-is_device_supported(struct rte_eth_dev *dev, struct eth_driver *drv)
+is_device_supported(struct rte_eth_dev *dev, struct rte_pci_driver *drv)
{
- if (strcmp(dev->driver->pci_drv.driver.name,
- drv->pci_drv.driver.name))
+ if (strcmp(dev->data->drv_name, drv->driver.name))
return false;
return true;
@@ -8682,9 +8696,9 @@ ixgbe_clear_all_l2_tn_filter(struct rte_eth_dev *dev)
return 0;
}
-RTE_PMD_REGISTER_PCI(net_ixgbe, rte_ixgbe_pmd.pci_drv);
+RTE_PMD_REGISTER_PCI(net_ixgbe, rte_ixgbe_pmd);
RTE_PMD_REGISTER_PCI_TABLE(net_ixgbe, pci_id_ixgbe_map);
RTE_PMD_REGISTER_KMOD_DEP(net_ixgbe, "* igb_uio | uio_pci_generic | vfio");
-RTE_PMD_REGISTER_PCI(net_ixgbe_vf, rte_ixgbevf_pmd.pci_drv);
+RTE_PMD_REGISTER_PCI(net_ixgbe_vf, rte_ixgbevf_pmd);
RTE_PMD_REGISTER_PCI_TABLE(net_ixgbe_vf, pci_id_ixgbevf_map);
RTE_PMD_REGISTER_KMOD_DEP(net_ixgbe_vf, "* igb_uio | vfio");
--
2.7.4
[dpdk-dev] [PATCH 25/38] net/i40e: Don't use eth_driver
Signed-off-by: Jan Blunck
---
drivers/net/i40e/i40e_ethdev.c | 36 ++--
drivers/net/i40e/i40e_fdir.c | 2 +-
2 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 303027b..8d4e509 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -44,6 +44,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -627,16 +628,23 @@ static const struct rte_i40e_xstats_name_off
rte_i40e_txq_prio_strings[] = {
#define I40E_NB_TXQ_PRIO_XSTATS (sizeof(rte_i40e_txq_prio_strings) / \
sizeof(rte_i40e_txq_prio_strings[0]))
-static struct eth_driver rte_i40e_pmd = {
- .pci_drv = {
- .id_table = pci_id_i40e_map,
- .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
- .probe = rte_eth_dev_pci_probe,
- .remove = rte_eth_dev_pci_remove,
- },
- .eth_dev_init = eth_i40e_dev_init,
- .eth_dev_uninit = eth_i40e_dev_uninit,
- .dev_private_size = sizeof(struct i40e_adapter),
+static int eth_i40e_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+ struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_probe(pci_dev,
+ sizeof(struct i40e_adapter), eth_i40e_dev_init);
+}
+
+static int eth_i40e_pci_remove(struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_remove(pci_dev, eth_i40e_dev_uninit);
+}
+
+static struct rte_pci_driver rte_i40e_pmd = {
+ .id_table = pci_id_i40e_map,
+ .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
+ .probe = eth_i40e_pci_probe,
+ .remove = eth_i40e_pci_remove,
};
static inline int
@@ -667,7 +675,7 @@ rte_i40e_dev_atomic_write_link_status(struct rte_eth_dev
*dev,
return 0;
}
-RTE_PMD_REGISTER_PCI(net_i40e, rte_i40e_pmd.pci_drv);
+RTE_PMD_REGISTER_PCI(net_i40e, rte_i40e_pmd);
RTE_PMD_REGISTER_PCI_TABLE(net_i40e, pci_id_i40e_map);
RTE_PMD_REGISTER_KMOD_DEP(net_i40e, "* igb_uio | uio_pci_generic | vfio");
@@ -10282,10 +10290,10 @@ i40e_filter_restore(struct i40e_pf *pf)
}
static bool
-is_device_supported(struct rte_eth_dev *dev, struct eth_driver *drv)
+is_device_supported(struct rte_eth_dev *dev, struct rte_pci_driver *drv)
{
- if (strcmp(dev->driver->pci_drv.driver.name,
- drv->pci_drv.driver.name))
+ if (strcmp(dev->data->drv_name,
+ drv->driver.name))
return false;
return true;
diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c
index 0700253..35751d8 100644
--- a/drivers/net/i40e/i40e_fdir.c
+++ b/drivers/net/i40e/i40e_fdir.c
@@ -257,7 +257,7 @@ i40e_fdir_setup(struct i40e_pf *pf)
/* reserve memory for the fdir programming packet */
snprintf(z_name, sizeof(z_name), "%s_%s_%d",
- eth_dev->driver->pci_drv.driver.name,
+ eth_dev->data->drv_name,
I40E_FDIR_MZ_NAME,
eth_dev->data->port_id);
mz = i40e_memzone_reserve(z_name, I40E_FDIR_PKT_LEN, SOCKET_ID_ANY);
--
2.7.4
[dpdk-dev] [PATCH 29/38] net/nfp: Don't use eth_driver
Signed-off-by: Jan Blunck
---
drivers/net/nfp/nfp_net.c | 29 +++--
1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
index b9dfe80..4cc003e 100644
--- a/drivers/net/nfp/nfp_net.c
+++ b/drivers/net/nfp/nfp_net.c
@@ -46,6 +46,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -2579,18 +2580,26 @@ static const struct rte_pci_id pci_id_nfp_net_map[] = {
},
};
-static struct eth_driver rte_nfp_net_pmd = {
- .pci_drv = {
- .id_table = pci_id_nfp_net_map,
- .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
- .probe = rte_eth_dev_pci_probe,
- .remove = rte_eth_dev_pci_remove,
- },
- .eth_dev_init = nfp_net_init,
- .dev_private_size = sizeof(struct nfp_net_adapter),
+static int eth_nfp_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+ struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_probe(pci_dev,
+ sizeof(struct nfp_net_adapter), nfp_net_init);
+}
+
+static int eth_nfp_pci_remove(struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_remove(pci_dev, NULL);
+}
+
+static struct rte_pci_driver rte_nfp_net_pmd = {
+ .id_table = pci_id_nfp_net_map,
+ .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
+ .probe = eth_nfp_pci_probe,
+ .remove = eth_nfp_pci_remove,
};
-RTE_PMD_REGISTER_PCI(net_nfp, rte_nfp_net_pmd.pci_drv);
+RTE_PMD_REGISTER_PCI(net_nfp, rte_nfp_net_pmd);
RTE_PMD_REGISTER_PCI_TABLE(net_nfp, pci_id_nfp_net_map);
RTE_PMD_REGISTER_KMOD_DEP(net_nfp, "* igb_uio | uio_pci_generic | vfio");
--
2.7.4
[dpdk-dev] [PATCH 30/38] net/qede: Don't use eth_driver
Signed-off-by: Jan Blunck
---
drivers/net/qede/qede_ethdev.c | 60 +-
drivers/net/qede/qede_ethdev.h | 1 +
2 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c
index 0494dbd..8dfddf0 100644
--- a/drivers/net/qede/qede_ethdev.c
+++ b/drivers/net/qede/qede_ethdev.c
@@ -2337,35 +2337,47 @@ static const struct rte_pci_id pci_id_qede_map[] = {
{.vendor_id = 0,}
};
-static struct eth_driver rte_qedevf_pmd = {
- .pci_drv = {
- .id_table = pci_id_qedevf_map,
- .drv_flags =
- RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
- .probe = rte_eth_dev_pci_probe,
- .remove = rte_eth_dev_pci_remove,
- },
- .eth_dev_init = qedevf_eth_dev_init,
- .eth_dev_uninit = qedevf_eth_dev_uninit,
- .dev_private_size = sizeof(struct qede_dev),
+static int qedevf_eth_dev_pci_probe(struct rte_pci_driver *pci_drv
__rte_unused,
+ struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_probe(pci_dev,
+ sizeof(struct qede_dev), qedevf_eth_dev_init);
+}
+
+static int qedevf_eth_dev_pci_remove(struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_remove(pci_dev, qedevf_eth_dev_uninit);
+}
+
+static struct rte_pci_driver rte_qedevf_pmd = {
+ .id_table = pci_id_qedevf_map,
+ .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
+ .probe = qedevf_eth_dev_pci_probe,
+ .remove = qedevf_eth_dev_pci_remove,
};
-static struct eth_driver rte_qede_pmd = {
- .pci_drv = {
- .id_table = pci_id_qede_map,
- .drv_flags =
- RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
- .probe = rte_eth_dev_pci_probe,
- .remove = rte_eth_dev_pci_remove,
- },
- .eth_dev_init = qede_eth_dev_init,
- .eth_dev_uninit = qede_eth_dev_uninit,
- .dev_private_size = sizeof(struct qede_dev),
+static int qede_eth_dev_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+ struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_probe(pci_dev,
+ sizeof(struct qede_dev), qede_eth_dev_init);
+}
+
+static int qede_eth_dev_pci_remove(struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_remove(pci_dev, qede_eth_dev_uninit);
+}
+
+static struct rte_pci_driver rte_qede_pmd = {
+ .id_table = pci_id_qede_map,
+ .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
+ .probe = qede_eth_dev_pci_probe,
+ .remove = qede_eth_dev_pci_remove,
};
-RTE_PMD_REGISTER_PCI(net_qede, rte_qede_pmd.pci_drv);
+RTE_PMD_REGISTER_PCI(net_qede, rte_qede_pmd);
RTE_PMD_REGISTER_PCI_TABLE(net_qede, pci_id_qede_map);
RTE_PMD_REGISTER_KMOD_DEP(net_qede, "* igb_uio | uio_pci_generic | vfio");
-RTE_PMD_REGISTER_PCI(net_qede_vf, rte_qedevf_pmd.pci_drv);
+RTE_PMD_REGISTER_PCI(net_qede_vf, rte_qedevf_pmd);
RTE_PMD_REGISTER_PCI_TABLE(net_qede_vf, pci_id_qedevf_map);
RTE_PMD_REGISTER_KMOD_DEP(net_qede_vf, "* igb_uio | vfio");
diff --git a/drivers/net/qede/qede_ethdev.h b/drivers/net/qede/qede_ethdev.h
index be54f31..0fde8ec 100644
--- a/drivers/net/qede/qede_ethdev.h
+++ b/drivers/net/qede/qede_ethdev.h
@@ -14,6 +14,7 @@
#include
#include
+#include
#include
#include
--
2.7.4
[dpdk-dev] [PATCH 33/38] net/thunderx: Don't use eth_driver
Signed-off-by: Jan Blunck
---
drivers/net/thunderx/nicvf_ethdev.c | 29 +++--
1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/drivers/net/thunderx/nicvf_ethdev.c
b/drivers/net/thunderx/nicvf_ethdev.c
index 1060319..fa17f10 100644
--- a/drivers/net/thunderx/nicvf_ethdev.c
+++ b/drivers/net/thunderx/nicvf_ethdev.c
@@ -54,6 +54,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -2111,17 +2112,25 @@ static const struct rte_pci_id pci_id_nicvf_map[] = {
},
};
-static struct eth_driver rte_nicvf_pmd = {
- .pci_drv = {
- .id_table = pci_id_nicvf_map,
- .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
- .probe = rte_eth_dev_pci_probe,
- .remove = rte_eth_dev_pci_remove,
- },
- .eth_dev_init = nicvf_eth_dev_init,
- .dev_private_size = sizeof(struct nicvf),
+static int nicvf_eth_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+ struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_probe(pci_dev, sizeof(struct nicvf),
+ nicvf_eth_dev_init);
+}
+
+static int nicvf_eth_pci_remove(struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_remove(pci_dev, NULL);
+}
+
+static struct rte_pci_driver rte_nicvf_pmd = {
+ .id_table = pci_id_nicvf_map,
+ .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
+ .probe = nicvf_eth_pci_probe,
+ .remove = nicvf_eth_pci_remove,
};
-RTE_PMD_REGISTER_PCI(net_thunderx, rte_nicvf_pmd.pci_drv);
+RTE_PMD_REGISTER_PCI(net_thunderx, rte_nicvf_pmd);
RTE_PMD_REGISTER_PCI_TABLE(net_thunderx, pci_id_nicvf_map);
RTE_PMD_REGISTER_KMOD_DEP(net_thunderx, "* igb_uio | uio_pci_generic | vfio");
--
2.7.4
[dpdk-dev] [PATCH 32/38] net/szedata2: Don't use eth_driver
Signed-off-by: Jan Blunck
---
drivers/net/szedata2/rte_eth_szedata2.c | 29 +++--
1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/drivers/net/szedata2/rte_eth_szedata2.c
b/drivers/net/szedata2/rte_eth_szedata2.c
index fe7a6b3..54212b7 100644
--- a/drivers/net/szedata2/rte_eth_szedata2.c
+++ b/drivers/net/szedata2/rte_eth_szedata2.c
@@ -45,6 +45,7 @@
#include
#include
+#include
#include
#include
#include
@@ -1587,18 +1588,26 @@ static const struct rte_pci_id
rte_szedata2_pci_id_table[] = {
}
};
-static struct eth_driver szedata2_eth_driver = {
- .pci_drv = {
- .id_table = rte_szedata2_pci_id_table,
- .probe = rte_eth_dev_pci_probe,
- .remove = rte_eth_dev_pci_remove,
- },
- .eth_dev_init = rte_szedata2_eth_dev_init,
- .eth_dev_uninit = rte_szedata2_eth_dev_uninit,
- .dev_private_size = sizeof(struct pmd_internals),
+static int szedata2_eth_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+ struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_probe(pci_dev,
+ sizeof(struct pmd_internals), rte_szedata2_eth_dev_init);
+}
+
+static int szedata2_eth_pci_remove(struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_remove(pci_dev,
+ rte_szedata2_eth_dev_uninit);
+}
+
+static struct rte_pci_driver szedata2_eth_driver = {
+ .id_table = rte_szedata2_pci_id_table,
+ .probe = szedata2_eth_pci_probe,
+ .remove = szedata2_eth_pci_remove,
};
-RTE_PMD_REGISTER_PCI(RTE_SZEDATA2_DRIVER_NAME, szedata2_eth_driver.pci_drv);
+RTE_PMD_REGISTER_PCI(RTE_SZEDATA2_DRIVER_NAME, szedata2_eth_driver);
RTE_PMD_REGISTER_PCI_TABLE(RTE_SZEDATA2_DRIVER_NAME,
rte_szedata2_pci_id_table);
RTE_PMD_REGISTER_KMOD_DEP(RTE_SZEDATA2_DRIVER_NAME,
"* combo6core & combov3 & szedata2 & szedata2_cv3");
--
2.7.4
[dpdk-dev] [PATCH 31/38] net/sfc: Don't use eth_driver
Signed-off-by: Jan Blunck
---
drivers/net/sfc/sfc_ethdev.c | 34 +-
1 file changed, 21 insertions(+), 13 deletions(-)
diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c
index 71587fb..ef8970d 100644
--- a/drivers/net/sfc/sfc_ethdev.c
+++ b/drivers/net/sfc/sfc_ethdev.c
@@ -29,6 +29,7 @@
#include
#include
+#include
#include
#include "efx.h"
@@ -1340,21 +1341,28 @@ static const struct rte_pci_id pci_id_sfc_efx_map[] = {
{ .vendor_id = 0 /* sentinel */ }
};
-static struct eth_driver sfc_efx_pmd = {
- .pci_drv = {
- .id_table = pci_id_sfc_efx_map,
- .drv_flags =
- RTE_PCI_DRV_INTR_LSC |
- RTE_PCI_DRV_NEED_MAPPING,
- .probe = rte_eth_dev_pci_probe,
- .remove = rte_eth_dev_pci_remove,
- },
- .eth_dev_init = sfc_eth_dev_init,
- .eth_dev_uninit = sfc_eth_dev_uninit,
- .dev_private_size = sizeof(struct sfc_adapter),
+static int sfc_eth_dev_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+ struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_probe(pci_dev,
+ sizeof(struct sfc_adapter), sfc_eth_dev_init);
+}
+
+static int sfc_eth_dev_pci_remove(struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_remove(pci_dev, sfc_eth_dev_uninit);
+}
+
+static struct rte_pci_driver sfc_efx_pmd = {
+ .id_table = pci_id_sfc_efx_map,
+ .drv_flags =
+ RTE_PCI_DRV_INTR_LSC |
+ RTE_PCI_DRV_NEED_MAPPING,
+ .probe = sfc_eth_dev_pci_probe,
+ .remove = sfc_eth_dev_pci_remove,
};
-RTE_PMD_REGISTER_PCI(net_sfc_efx, sfc_efx_pmd.pci_drv);
+RTE_PMD_REGISTER_PCI(net_sfc_efx, sfc_efx_pmd);
RTE_PMD_REGISTER_PCI_TABLE(net_sfc_efx, pci_id_sfc_efx_map);
RTE_PMD_REGISTER_KMOD_DEP(net_sfc_efx, "* igb_uio | uio_pci_generic | vfio");
RTE_PMD_REGISTER_PARAM_STRING(net_sfc_efx,
--
2.7.4
[dpdk-dev] [PATCH 34/38] net/vmxnet3: Don't use eth_driver
Signed-off-by: Jan Blunck
---
drivers/net/vmxnet3/vmxnet3_ethdev.c | 30 +++---
1 file changed, 19 insertions(+), 11 deletions(-)
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c
b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index b7b5377..9e6fffa 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -56,6 +56,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -338,16 +339,23 @@ eth_vmxnet3_dev_uninit(struct rte_eth_dev *eth_dev)
return 0;
}
-static struct eth_driver rte_vmxnet3_pmd = {
- .pci_drv = {
- .id_table = pci_id_vmxnet3_map,
- .drv_flags = RTE_PCI_DRV_NEED_MAPPING,
- .probe = rte_eth_dev_pci_probe,
- .remove = rte_eth_dev_pci_remove,
- },
- .eth_dev_init = eth_vmxnet3_dev_init,
- .eth_dev_uninit = eth_vmxnet3_dev_uninit,
- .dev_private_size = sizeof(struct vmxnet3_hw),
+static int eth_vmxnet3_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+ struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_probe(pci_dev,
+ sizeof(struct vmxnet3_hw), eth_vmxnet3_dev_init);
+}
+
+static int eth_vmxnet3_pci_remove(struct rte_pci_device *pci_dev)
+{
+ return rte_eth_dev_pci_generic_remove(pci_dev, eth_vmxnet3_dev_uninit);
+}
+
+static struct rte_pci_driver rte_vmxnet3_pmd = {
+ .id_table = pci_id_vmxnet3_map,
+ .drv_flags = RTE_PCI_DRV_NEED_MAPPING,
+ .probe = eth_vmxnet3_pci_probe,
+ .remove = eth_vmxnet3_pci_remove,
};
static int
@@ -970,6 +978,6 @@ vmxnet3_process_events(struct vmxnet3_hw *hw)
}
#endif
-RTE_PMD_REGISTER_PCI(net_vmxnet3, rte_vmxnet3_pmd.pci_drv);
+RTE_PMD_REGISTER_PCI(net_vmxnet3, rte_vmxnet3_pmd);
RTE_PMD_REGISTER_PCI_TABLE(net_vmxnet3, pci_id_vmxnet3_map);
RTE_PMD_REGISTER_KMOD_DEP(net_vmxnet3, "* igb_uio | uio_pci_generic | vfio");
--
2.7.4
[dpdk-dev] [PATCH 35/38] ethdev: remove unused ethdev PCI probe/remove
This removes the now unused rte_eth_dev_pci_probe() and
rte_eth_dev_pci_remove() functions.
Signed-off-by: Jan Blunck
---
lib/librte_ether/rte_ethdev.c | 97 --
lib/librte_ether/rte_ethdev.h | 15 --
lib/librte_ether/rte_ethdev_pci.h | 10
lib/librte_ether/rte_ether_version.map | 3 --
4 files changed, 10 insertions(+), 115 deletions(-)
diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index 86ee5bb..4669f80 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -277,103 +277,6 @@ rte_eth_dev_release_port(struct rte_eth_dev *eth_dev)
}
int
-rte_eth_dev_pci_probe(struct rte_pci_driver *pci_drv,
- struct rte_pci_device *pci_dev)
-{
- struct eth_driver*eth_drv;
- struct rte_eth_dev *eth_dev;
- char ethdev_name[RTE_ETH_NAME_MAX_LEN];
-
- int diag;
-
- eth_drv = (struct eth_driver *)pci_drv;
-
- rte_eal_pci_device_name(&pci_dev->addr, ethdev_name,
- sizeof(ethdev_name));
-
- if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
- eth_dev = rte_eth_dev_allocate(ethdev_name);
- if (eth_dev == NULL)
- return -ENOMEM;
-
- eth_dev->data->dev_private = rte_zmalloc("ethdev private
structure",
- eth_drv->dev_private_size,
- RTE_CACHE_LINE_SIZE);
- if (eth_dev->data->dev_private == NULL)
- rte_panic("Cannot allocate memzone for private port
data\n");
- } else {
- eth_dev = rte_eth_dev_attach_secondary(ethdev_name);
- if (eth_dev == NULL) {
- /*
-* if we failed to attach a device, it means the
-* device is skipped in primary process, due to
-* some errors. If so, we return a positive value,
-* to let EAL skip it for the secondary process
-* as well.
-*/
- return 1;
- }
- }
- eth_dev->device = &pci_dev->device;
- eth_dev->intr_handle = &pci_dev->intr_handle;
- eth_dev->driver = eth_drv;
-
- /* Invoke PMD device initialization function */
- diag = (*eth_drv->eth_dev_init)(eth_dev);
- if (diag == 0)
- return 0;
-
- RTE_PMD_DEBUG_TRACE("driver %s: eth_dev_init(vendor_id=0x%x
device_id=0x%x) failed\n",
- pci_drv->driver.name,
- (unsigned) pci_dev->id.vendor_id,
- (unsigned) pci_dev->id.device_id);
- if (rte_eal_process_type() == RTE_PROC_PRIMARY)
- rte_free(eth_dev->data->dev_private);
- rte_eth_dev_release_port(eth_dev);
- return diag;
-}
-
-int
-rte_eth_dev_pci_remove(struct rte_pci_device *pci_dev)
-{
- const struct eth_driver *eth_drv;
- struct rte_eth_dev *eth_dev;
- char ethdev_name[RTE_ETH_NAME_MAX_LEN];
- int ret;
-
- if (pci_dev == NULL)
- return -EINVAL;
-
- rte_eal_pci_device_name(&pci_dev->addr, ethdev_name,
- sizeof(ethdev_name));
-
- eth_dev = rte_eth_dev_allocated(ethdev_name);
- if (eth_dev == NULL)
- return -ENODEV;
-
- eth_drv = (const struct eth_driver *)pci_dev->driver;
-
- /* Invoke PMD device uninit function */
- if (*eth_drv->eth_dev_uninit) {
- ret = (*eth_drv->eth_dev_uninit)(eth_dev);
- if (ret)
- return ret;
- }
-
- /* free ether device */
- rte_eth_dev_release_port(eth_dev);
-
- if (rte_eal_process_type() == RTE_PROC_PRIMARY)
- rte_free(eth_dev->data->dev_private);
-
- eth_dev->device = NULL;
- eth_dev->driver = NULL;
- eth_dev->data = NULL;
-
- return 0;
-}
-
-int
rte_eth_dev_is_valid_port(uint8_t port_id)
{
if (port_id >= RTE_MAX_ETHPORTS ||
diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index 9d5848b..1bfb8e7 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -4419,21 +4419,6 @@ rte_eth_dev_get_port_by_name(const char *name, uint8_t
*port_id);
int
rte_eth_dev_get_name_by_port(uint8_t port_id, char *name);
-/**
- * @internal
- * Wrapper for use by pci drivers as a .probe function to attach to a ethdev
- * interface.
- */
-int rte_eth_dev_pci_probe(struct rte_pci_driver *pci_drv,
- struct rte_pci_device *pci_dev);
-
-/**
- * @internal
- * Wrapper for use by pci drivers as a .remove function to detach a ethdev
- * interface.
- */
-int rte_eth_dev_pci_remove(struct rte_pci_device *pci_dev);
-
#ifdef __cplusplus
}
#endif
diff --git a/lib/librte_ether/rte_ethdev_pci.h
b/lib/librte_ether/rte_ethdev_pci.h
index 4b728db..fe
[dpdk-dev] [PATCH 38/38] ethdev: don't include PCI header
Since the PCI functionality has been moved to the PCI specific ethdev
header we don't need to include rte_pci.h from here anymore.
Signed-off-by: Jan Blunck
---
lib/librte_ether/rte_ethdev.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index 7259cb8..a646ac8 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -179,7 +179,6 @@ extern "C" {
#include
#include
-#include
#include
#include
#include
@@ -901,6 +900,8 @@ struct rte_eth_conf {
#define DEV_TX_OFFLOAD_GENEVE_TNL_TSO 0x1000/**< Used for tunneling
packet. */
#define DEV_TX_OFFLOAD_MACSEC_INSERT0x2000
+struct rte_pci_device;
+
/**
* Ethernet device information
*/
--
2.7.4
[dpdk-dev] [PATCH 36/38] ethdev: remove unused ethdev driver
This removes the now unused struct eth_driver.
Signed-off-by: Jan Blunck
---
drivers/net/cxgbe/cxgbe_main.c | 1 -
drivers/net/ring/rte_eth_ring.c| 1 -
lib/librte_ether/rte_ethdev.h | 73 --
lib/librte_ether/rte_ethdev_pci.h | 2 --
lib/librte_ether/rte_ethdev_vdev.h | 1 -
5 files changed, 78 deletions(-)
diff --git a/drivers/net/cxgbe/cxgbe_main.c b/drivers/net/cxgbe/cxgbe_main.c
index 541fc40..f895b18 100644
--- a/drivers/net/cxgbe/cxgbe_main.c
+++ b/drivers/net/cxgbe/cxgbe_main.c
@@ -1165,7 +1165,6 @@ int cxgbe_probe(struct adapter *adapter)
allocate_mac:
pi->eth_dev->device = &adapter->pdev->device;
pi->eth_dev->data->dev_private = pi;
- pi->eth_dev->driver = adapter->eth_dev->driver;
pi->eth_dev->dev_ops = adapter->eth_dev->dev_ops;
pi->eth_dev->tx_pkt_burst = adapter->eth_dev->tx_pkt_burst;
pi->eth_dev->rx_pkt_burst = adapter->eth_dev->rx_pkt_burst;
diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index 62606e7..d6fc97a 100644
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -338,7 +338,6 @@ do_eth_dev_ring_create(const char *name,
data->mac_addrs = &internals->address;
eth_dev->data = data;
- eth_dev->driver = NULL;
eth_dev->dev_ops = &ops;
data->dev_flags = RTE_ETH_DEV_DETACHABLE;
data->kdrv = RTE_KDRV_NONE;
diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index 1bfb8e7..87c33bb 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -1628,7 +1628,6 @@ struct rte_eth_dev {
eth_tx_burst_t tx_pkt_burst; /**< Pointer to PMD transmit function. */
eth_tx_prep_t tx_pkt_prepare; /**< Pointer to PMD transmit prepare
function. */
struct rte_eth_dev_data *data; /**< Pointer to device data */
- const struct eth_driver *driver;/**< Driver for this device */
const struct eth_dev_ops *dev_ops; /**< Functions exported by PMD */
struct rte_device *device; /**< Backing device */
struct rte_intr_handle *intr_handle; /**< Device interrupt handle */
@@ -1812,78 +1811,6 @@ int rte_eth_dev_attach(const char *devargs, uint8_t
*port_id);
*/
int rte_eth_dev_detach(uint8_t port_id, char *devname);
-struct eth_driver;
-/**
- * @internal
- * Initialization function of an Ethernet driver invoked for each matching
- * Ethernet PCI device detected during the PCI probing phase.
- *
- * @param eth_dev
- * The *eth_dev* pointer is the address of the *rte_eth_dev* structure
- * associated with the matching device and which have been [automatically]
- * allocated in the *rte_eth_devices* array.
- * The *eth_dev* structure is supplied to the driver initialization function
- * with the following fields already initialized:
- *
- * - *pci_dev*: Holds the pointers to the *rte_pci_device* structure which
- * contains the generic PCI information of the matching device.
- *
- * - *driver*: Holds the pointer to the *eth_driver* structure.
- *
- * - *dev_private*: Holds a pointer to the device private data structure.
- *
- * - *mtu*: Contains the default Ethernet maximum frame length (1500).
- *
- * - *port_id*: Contains the port index of the device (actually the index
- * of the *eth_dev* structure in the *rte_eth_devices* array).
- *
- * @return
- * - 0: Success, the device is properly initialized by the driver.
- *In particular, the driver MUST have set up the *dev_ops* pointer
- *of the *eth_dev* structure.
- * - <0: Error code of the device initialization failure.
- */
-typedef int (*eth_dev_init_t)(struct rte_eth_dev *eth_dev);
-
-/**
- * @internal
- * Finalization function of an Ethernet driver invoked for each matching
- * Ethernet PCI device detected during the PCI closing phase.
- *
- * @param eth_dev
- * The *eth_dev* pointer is the address of the *rte_eth_dev* structure
- * associated with the matching device and which have been [automatically]
- * allocated in the *rte_eth_devices* array.
- * @return
- * - 0: Success, the device is properly finalized by the driver.
- *In particular, the driver MUST free the *dev_ops* pointer
- *of the *eth_dev* structure.
- * - <0: Error code of the device initialization failure.
- */
-typedef int (*eth_dev_uninit_t)(struct rte_eth_dev *eth_dev);
-
-/**
- * @internal
- * The structure associated with a PMD Ethernet driver.
- *
- * Each Ethernet driver acts as a PCI driver and is represented by a generic
- * *eth_driver* structure that holds:
- *
- * - An *rte_pci_driver* structure (which must be the first field).
- *
- * - The *eth_dev_init* function invoked for each matching PCI device.
- *
- * - The *eth_dev_uninit* function invoked for each matching PCI device.
- *
- * - The size of the private data to allocate for each matching device.
- */
-struct e
[dpdk-dev] [PATCH 37/38] ethdev: remove PCI specific helper from generic ethdev header
This moves the rte_eth_copy_pci_info() into the PCI specific ethdev
header. As a side effect this also removes it from the list of symbols
exported by the rte_ethdev library.
Signed-off-by: Jan Blunck
---
drivers/net/cxgbe/cxgbe_main.c | 1 +
lib/librte_ether/rte_ethdev.c | 20
lib/librte_ether/rte_ethdev.h | 14 --
lib/librte_ether/rte_ethdev_pci.h | 32
lib/librte_ether/rte_ether_version.map | 1 -
5 files changed, 33 insertions(+), 35 deletions(-)
diff --git a/drivers/net/cxgbe/cxgbe_main.c b/drivers/net/cxgbe/cxgbe_main.c
index f895b18..1f230cd 100644
--- a/drivers/net/cxgbe/cxgbe_main.c
+++ b/drivers/net/cxgbe/cxgbe_main.c
@@ -57,6 +57,7 @@
#include
#include
#include
+#include
#include
#include
#include
diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index 4669f80..80c2769 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -3103,26 +3103,6 @@ rte_eth_dev_get_dcb_info(uint8_t port_id,
return (*dev->dev_ops->get_dcb_info)(dev, dcb_info);
}
-void
-rte_eth_copy_pci_info(struct rte_eth_dev *eth_dev, struct rte_pci_device
*pci_dev)
-{
- if ((eth_dev == NULL) || (pci_dev == NULL)) {
- RTE_PMD_DEBUG_TRACE("NULL pointer eth_dev=%p pci_dev=%p\n",
- eth_dev, pci_dev);
- return;
- }
-
- eth_dev->intr_handle = &pci_dev->intr_handle;
-
- eth_dev->data->dev_flags = 0;
- if (pci_dev->driver->drv_flags & RTE_PCI_DRV_INTR_LSC)
- eth_dev->data->dev_flags |= RTE_ETH_DEV_INTR_LSC;
-
- eth_dev->data->kdrv = pci_dev->kdrv;
- eth_dev->data->numa_node = pci_dev->device.numa_node;
- eth_dev->data->drv_name = pci_dev->driver->driver.name;
-}
-
int
rte_eth_dev_l2_tunnel_eth_type_conf(uint8_t port_id,
struct rte_eth_l2_tunnel_conf *l2_tunnel)
diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index 87c33bb..7259cb8 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -4233,20 +4233,6 @@ int rte_eth_timesync_read_time(uint8_t port_id, struct
timespec *time);
int rte_eth_timesync_write_time(uint8_t port_id, const struct timespec *time);
/**
- * Copy pci device info to the Ethernet device data.
- *
- * @param eth_dev
- * The *eth_dev* pointer is the address of the *rte_eth_dev* structure.
- * @param pci_dev
- * The *pci_dev* pointer is the address of the *rte_pci_device* structure.
- *
- * @return
- * - 0 on success, negative on error
- */
-void rte_eth_copy_pci_info(struct rte_eth_dev *eth_dev,
- struct rte_pci_device *pci_dev);
-
-/**
* Create memzone for HW rings.
* malloc can't be used as the physical address is needed.
* If the memzone is already created, then this function returns a ptr
diff --git a/lib/librte_ether/rte_ethdev_pci.h
b/lib/librte_ether/rte_ethdev_pci.h
index f85d26f..2953579 100644
--- a/lib/librte_ether/rte_ethdev_pci.h
+++ b/lib/librte_ether/rte_ethdev_pci.h
@@ -39,6 +39,38 @@
#include
/**
+ * Copy pci device info to the Ethernet device data.
+ *
+ * @param eth_dev
+ * The *eth_dev* pointer is the address of the *rte_eth_dev* structure.
+ * @param pci_dev
+ * The *pci_dev* pointer is the address of the *rte_pci_device* structure.
+ *
+ * @return
+ * - 0 on success, negative on error
+ */
+static inline void
+rte_eth_copy_pci_info(struct rte_eth_dev *eth_dev,
+ struct rte_pci_device *pci_dev)
+{
+ if ((eth_dev == NULL) || (pci_dev == NULL)) {
+ RTE_PMD_DEBUG_TRACE("NULL pointer eth_dev=%p pci_dev=%p\n",
+ eth_dev, pci_dev);
+ return;
+ }
+
+ eth_dev->intr_handle = &pci_dev->intr_handle;
+
+ eth_dev->data->dev_flags = 0;
+ if (pci_dev->driver->drv_flags & RTE_PCI_DRV_INTR_LSC)
+ eth_dev->data->dev_flags |= RTE_ETH_DEV_INTR_LSC;
+
+ eth_dev->data->kdrv = pci_dev->kdrv;
+ eth_dev->data->numa_node = pci_dev->device.numa_node;
+ eth_dev->data->drv_name = pci_dev->driver->driver.name;
+}
+
+/**
* @internal
* Allocates a new ethdev slot for an ethernet device and returns the pointer
* to that slot for the driver to use.
diff --git a/lib/librte_ether/rte_ether_version.map
b/lib/librte_ether/rte_ether_version.map
index e2b6d0e..a025119 100644
--- a/lib/librte_ether/rte_ether_version.map
+++ b/lib/librte_ether/rte_ether_version.map
@@ -7,7 +7,6 @@ DPDK_2.2 {
rte_eth_allmulticast_disable;
rte_eth_allmulticast_enable;
rte_eth_allmulticast_get;
- rte_eth_copy_pci_info;
rte_eth_dev_allocate;
rte_eth_dev_allocated;
rte_eth_dev_attach;
--
2.7.4
Re: [dpdk-dev] [PATCH 1/6] net/sfc: add VFs to the table of PCI IDs for supported NICs
On 3/2/2017 3:46 PM, Andrew Rybchenko wrote:
> From: Ivan Malov
>
> Signed-off-by: Ivan Malov
> Signed-off-by: Andrew Rybchenko
> Reviewed-by: Andrew Lee
> ---
> drivers/net/sfc/sfc_ethdev.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c
> index 71587fb..be19453 100644
> --- a/drivers/net/sfc/sfc_ethdev.c
> +++ b/drivers/net/sfc/sfc_ethdev.c
> @@ -1335,8 +1335,11 @@ sfc_eth_dev_uninit(struct rte_eth_dev *dev)
>
> static const struct rte_pci_id pci_id_sfc_efx_map[] = {
> { RTE_PCI_DEVICE(EFX_PCI_VENID_SFC, EFX_PCI_DEVID_FARMINGDALE) },
> + { RTE_PCI_DEVICE(EFX_PCI_VENID_SFC, EFX_PCI_DEVID_FARMINGDALE_VF) },
Since driver now support VF devices, it is possible to set "SR-IOV"
feature enabled in sfc_efx.ini.
> { RTE_PCI_DEVICE(EFX_PCI_VENID_SFC, EFX_PCI_DEVID_GREENPORT) },
> + { RTE_PCI_DEVICE(EFX_PCI_VENID_SFC, EFX_PCI_DEVID_GREENPORT_VF) },
> { RTE_PCI_DEVICE(EFX_PCI_VENID_SFC, EFX_PCI_DEVID_MEDFORD) },
> + { RTE_PCI_DEVICE(EFX_PCI_VENID_SFC, EFX_PCI_DEVID_MEDFORD_VF) },
> { .vendor_id = 0 /* sentinel */ }
> };
>
>
Re: [dpdk-dev] [PATCH 1/4] ethdev: add retrieving xstats by group and xstats by name
Hi, 2017-03-03 13:54, Kuba Kozak: > From: Jacek Piasecki > > This patch extends library for retriving xstats by specified groups and > single xstat by given name. > > Signed-off-by: Jacek Piasecki > Signed-off-by: Kuba Kozak As you probably know, it is difficult to have a good review (or a simple review at all). The most difficult part in such a change is not writing the code, it is explaining your idea and getting people to agree. Please show you have thought about the API, seen an issue or a lack, and propose an idea with a clear target. In short, we are missing a "why" and "how". You must also explain what is a group, better than a list of #define.
Re: [dpdk-dev] [PATCH 5/6] net/sfc: port must not fail to start if Rx mode is rejected
On 3/2/2017 3:46 PM, Andrew Rybchenko wrote: > From: Ivan Malov Hi Ivan, Can you please update patch title to indicate what has been done, starting with a verb. It is harder to understand patch content from statements. Thanks, ferruh > > If Rx mode is unacceptable, in particular, when promiscuous > or all-multicast filters are not allowed while running over > PCI function which is not a member of appropriate privilege > groups, the driver has to cope with the failures gracefully > > Signed-off-by: Ivan Malov > Signed-off-by: Andrew Rybchenko > Reviewed-by: Andrew Lee <...>
Re: [dpdk-dev] [PATCH v3 1/2] ethdev: add capability control API
Hi Cristian,
2017-03-04 01:10, Cristian Dumitrescu:
> struct rte_flow_ops *eth_flow_ops;
> int rte = rte_eth_dev_filter_ctrl(eth_port_id,
> RTE_ETH_FILTER_GENERIC, RTE_ETH_FILTER_GET, ð_flow_ops);
>
> Unfortunately, the rte_flow opportunistically uses the
> rte_eth_dev_filter_ctrl()
> API function, which is applicable just to RX-side filters as opposed to
> introducing a mechanism that could be used by any capability in a generic way.
>
> This is the gap that addressed by the current patch. This mechanism is
> intended
> to be used to introduce new capabilities into ethdev in a modular plugin-like
> approach, such as hierarchical scheduler. Over time, if agreed, it can also be
> used for exposing the existing Ethernet device capabilities in a modular way,
> such as: xstats, filters, multicast, mirroring, tunnels, time stamping,
> eeprom,
> bypass, etc.
>
> Changes in v3:
> -Followed up on suggestion from Jerin: renamed capability from Hierarchical
> Scheduler (sched) to Traffic Manager (tm)
>
> Changes in v2:
> -Followed up on suggestion from Jerin and Hemant: renamed capability_control()
> to capability_ops_get()
> -Added ACK from Keith, Jerin and Hemant
It is difficult to follow previous discussions as you do not
keep threading with --in-reply-to.
> Signed-off-by: Cristian Dumitrescu
> Acked-by: Keith Wiles
> Acked-by: Jerin Jacob
> Acked-by: Hemant Agrawal
[...]
> +enum rte_eth_capability {
> + RTE_ETH_CAPABILITY_FLOW = 0, /**< Flow */
> + RTE_ETH_CAPABILITY_TM, /**< Traffic Manager */
> + RTE_ETH_CAPABILITY_MAX
> +};
[...]
> /**
> + * Take capability operations on an Ethernet device.
> + *
> + * @param port_id
> + * The port identifier of the Ethernet device.
> + * @param cap
> + * The capability of the Ethernet device
> + * @param arg
> + * A pointer to arguments defined specifically for the operation.
> + * @return
> + * - (0) if successful.
> + * - (-ENOTSUP) if hardware doesn't support.
> + * - (-ENODEV) if *port_id* invalid.
> + */
> +int rte_eth_dev_capability_ops_get(uint8_t port_id,
> + enum rte_eth_capability cap, void *arg);
What is the benefit of getting different kind of capabilities with
the same function?
enum + void* = ioctl
A self-explanatory API should have a dedicated function for each kind
of features with different argument types.
Re: [dpdk-dev] [PATCH v3 01/17] eventdev: fix API docs and test for timeout ticks
On Fri, Feb 17, 2017 at 02:53:56PM +, Harry van Haaren wrote:
> This commit improves the documentation of the api return
> values for rte_event_dequeue_timeout_ticks(), and allows
> -ENOTSUP to be returned by devices which do not support
> timeouts.
>
> The unit test is modified to accept -ENOTSUP as a pass,
> as the device doesn't implement the timeout_ticks function.
>
> Fixes: 4c9a26e419a7 ("app/test: unit test case for eventdev APIs")
>
> Signed-off-by: Harry van Haaren
> ---
> app/test/test_eventdev.c | 4 +++-
> lib/librte_eventdev/rte_eventdev.h | 6 --
> 2 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/app/test/test_eventdev.c b/app/test/test_eventdev.c
> index 042a446..756bc32 100644
> --- a/app/test/test_eventdev.c
> +++ b/app/test/test_eventdev.c
> @@ -519,7 +519,9 @@ test_eventdev_timeout_ticks(void)
> uint64_t timeout_ticks;
>
> ret = rte_event_dequeue_timeout_ticks(TEST_DEV_ID, 100, &timeout_ticks);
> - TEST_ASSERT_SUCCESS(ret, "Fail to get timeout_ticks");
> + /* -ENOTSUP is a valid return if timeout is not supported by device */
> + if (ret != -ENOTSUP)
> + TEST_ASSERT_SUCCESS(ret, "Fail to get timeout_ticks");
Header file change looks good. IMO, In the test case, We can introduce
TEST_UNSUPPORTED in addition to TEST_SUCCESS and TEST_FAILED to reflect
the actual status. I guess it will useful for future tests as well.
If you agree with that then you can post the header file change as separate
patch. For header file change,
Acked-by: Jerin Jacob
>
> return TEST_SUCCESS;
> }
> diff --git a/lib/librte_eventdev/rte_eventdev.h
> b/lib/librte_eventdev/rte_eventdev.h
> index b619160..b0c7f9c 100644
> --- a/lib/librte_eventdev/rte_eventdev.h
> +++ b/lib/librte_eventdev/rte_eventdev.h
> @@ -1158,7 +1158,9 @@ rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,
> *
> * @return
> * - 0 on success.
> - * - <0 on failure.
> + * - -ENOTSUP if the device doesn't support timeouts.
> + * - -EINVAL if *dev_id* is invalid or *timeout_ticks* is a null pointer.
> + * - other values < 0 on failure.
> *
> * @see rte_event_dequeue_burst(), RTE_EVENT_DEV_CFG_PER_DEQUEUE_TIMEOUT
> * @see rte_event_dev_configure()
> @@ -1166,7 +1168,7 @@ rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,
> */
> int
> rte_event_dequeue_timeout_ticks(uint8_t dev_id, uint64_t ns,
> - uint64_t *timeout_ticks);
> + uint64_t *timeout_ticks);
>
> /**
> * Dequeue a burst of events objects or an event object from the event port
> --
> 2.7.4
>
Re: [dpdk-dev] [PATCH v3 2/2] ethdev: add hierarchical scheduler API
2017-03-04 01:10, Cristian Dumitrescu: > This patch introduces the generic ethdev API for the traffic manager > capability, which includes: hierarchical scheduling, traffic shaping, > congestion management, packet marking. We already have some API for QoS. Why integrating them in ethdev? ethdev is an interface for networking drivers. I think the QoS has nothing to do with drivers. If there are some operations to offload in drivers, please identify them and let's add the operations to ethdev. > Main features: > - Exposed as ethdev plugin capability (similar to rte_flow approach) I do not know what you call an ethdev plugin. rte_flow is a part of the driver interface.
Re: [dpdk-dev] [PATCH 0/6] get status of Rx and Tx descriptors
2017-03-02 14:40, Olivier Matz: > On Wed, 1 Mar 2017 21:02:16 +0300, Andrew Rybchenko > wrote: > > On 03/01/2017 08:19 PM, Olivier Matz wrote: > > > This patchset introduces a new ethdev API: > > > - rte_eth_rx_descriptor_status() > > > - rte_eth_tx_descriptor_status() > > > > May be corresponding features should be added to the NICs documentation? > > Yes, good idea. > > I propose to use these straightforward names: "Rx Descriptor Status" > and "Tx Descriptor Status". Yes
Re: [dpdk-dev] [PATCH 0/6] get status of Rx and Tx descriptors
2017-03-02 14:43, Olivier Matz: > Hi Stephen, > > On Wed, 1 Mar 2017 10:07:06 -0800, Stephen Hemminger > wrote: > > On Wed, 1 Mar 2017 18:19:06 +0100 > > Olivier Matz wrote: > > > > > This patchset introduces a new ethdev API: > > > - rte_eth_rx_descriptor_status() > > > - rte_eth_tx_descriptor_status() [...] > > Could you update examples to use this? > > I can update examples/l3fwd-power, but it will break the > support for drivers that do not implement the new API. Maybe we could > do this in a second time, after all drivers are converted? Yes, good idea
[dpdk-dev] [PATCH v4 01/10] eal: probe legacy PCI devices before other bus devices
Make sure that the PCI devices are probed before the virtual devices after
the legacy virtual device probing has been moved to a bus.
Signed-off-by: Jan Blunck
Tested-by: Ferruh Yigit
Acked-by: Shreyansh Jain
---
lib/librte_eal/bsdapp/eal/eal.c | 8
lib/librte_eal/linuxapp/eal/eal.c | 8
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index ee7c9de..a584447 100644
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -613,14 +613,14 @@ rte_eal_init(int argc, char **argv)
rte_eal_mp_remote_launch(sync_func, NULL, SKIP_MASTER);
rte_eal_mp_wait_lcore();
- /* Probe all the buses and devices/drivers on them */
- if (rte_bus_probe())
- rte_panic("Cannot probe devices\n");
-
/* Probe & Initialize PCI devices */
if (rte_eal_pci_probe())
rte_panic("Cannot probe PCI\n");
+ /* Probe all the buses and devices/drivers on them */
+ if (rte_bus_probe())
+ rte_panic("Cannot probe devices\n");
+
if (rte_eal_dev_init() < 0)
rte_panic("Cannot init pmd devices\n");
diff --git a/lib/librte_eal/linuxapp/eal/eal.c
b/lib/librte_eal/linuxapp/eal/eal.c
index bf6b818..f77ff5c 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -884,14 +884,14 @@ rte_eal_init(int argc, char **argv)
rte_eal_mp_remote_launch(sync_func, NULL, SKIP_MASTER);
rte_eal_mp_wait_lcore();
- /* Probe all the buses and devices/drivers on them */
- if (rte_bus_probe())
- rte_panic("Cannot probe devices\n");
-
/* Probe & Initialize PCI devices */
if (rte_eal_pci_probe())
rte_panic("Cannot probe PCI\n");
+ /* Probe all the buses and devices/drivers on them */
+ if (rte_bus_probe())
+ rte_panic("Cannot probe devices\n");
+
if (rte_eal_dev_init() < 0)
rte_panic("Cannot init pmd devices\n");
--
2.7.4
[dpdk-dev] [PATCH v4 00/10] Rework vdev probing to use rte_bus infrastructure
With the rte_bus infrastructure present in 17.02 it is possible to refactor the virtual device probing into a bus. This series also introduces the rte_vdev_device to better keep track of devices. This patchset depends on: http://dpdk.org/dev/patchwork/patch/20416/ http://dpdk.org/dev/patchwork/patch/20417/ Changes since version 3: * revert implicit registration changes Changes since version 2: * implicit bus registration through rte_eal_vdrv_register() * explicit delay probing of virtual bus in rte_bus_probe() * addition of rte_vdev_device_args() helper * make virtual driver probe and remove take rte_vdev_device Changes since version 1: * addition of rte_vdev_device_name() helper * removed rte_eal_dev_init() from *.map files * use SOCKET_ID_ANY Jan Blunck (10): eal: probe legacy PCI devices before other bus devices eal: probe new virtual bus after other bus devices eal: move virtual device probing into a bus eal: remove unused rte_eal_dev_init() eal: Refactor vdev driver probe/remove eal: add struct rte_vdev_device eal: add virtual device name helper function eal: add virtual device arguments helper function eal: make virtual bus use rte_vdev_device eal: make virtual driver probe and remove take rte_vdev_device drivers/crypto/null/null_crypto_pmd.c | 18 +- drivers/net/af_packet/rte_eth_af_packet.c | 11 +- drivers/net/bonding/rte_eth_bond_pmd.c | 13 +- drivers/net/mpipe/mpipe_tilegx.c| 10 +- drivers/net/null/rte_eth_null.c | 13 +- drivers/net/pcap/rte_eth_pcap.c | 12 +- drivers/net/ring/rte_eth_ring.c | 9 +- drivers/net/tap/rte_eth_tap.c | 10 +- drivers/net/vhost/rte_eth_vhost.c | 10 +- drivers/net/virtio/virtio_user_ethdev.c | 18 +- drivers/net/xenvirt/rte_eth_xenvirt.c | 9 +- lib/librte_eal/bsdapp/eal/eal.c | 9 +- lib/librte_eal/bsdapp/eal/rte_eal_version.map | 1 - lib/librte_eal/common/eal_common_bus.c | 16 +- lib/librte_eal/common/eal_common_dev.c | 28 --- lib/librte_eal/common/eal_common_vdev.c | 245 +--- lib/librte_eal/common/include/rte_dev.h | 5 - lib/librte_eal/common/include/rte_vdev.h| 26 ++- lib/librte_eal/linuxapp/eal/eal.c | 9 +- lib/librte_eal/linuxapp/eal/rte_eal_version.map | 1 - 20 files changed, 341 insertions(+), 132 deletions(-) -- 2.7.4
[dpdk-dev] [PATCH v4 03/10] eal: move virtual device probing into a bus
This is a refactoring of the virtual device probing which moves into into
a proper bus structure.
Signed-off-by: Jan Blunck
Tested-by: Ferruh Yigit
Acked-by: Shreyansh Jain
---
lib/librte_eal/common/eal_common_dev.c | 22 -
lib/librte_eal/common/eal_common_vdev.c | 44 +
2 files changed, 44 insertions(+), 22 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_dev.c
b/lib/librte_eal/common/eal_common_dev.c
index 4f3b493..1ce90f6 100644
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -79,28 +79,6 @@ void rte_eal_device_remove(struct rte_device *dev)
int
rte_eal_dev_init(void)
{
- struct rte_devargs *devargs;
-
- /*
-* Note that the dev_driver_list is populated here
-* from calls made to rte_eal_driver_register from constructor functions
-* embedded into PMD modules via the RTE_PMD_REGISTER_VDEV macro
-*/
-
- /* call the init function for each virtual device */
- TAILQ_FOREACH(devargs, &devargs_list, next) {
-
- if (devargs->type != RTE_DEVTYPE_VIRTUAL)
- continue;
-
- if (rte_eal_vdev_init(devargs->virt.drv_name,
- devargs->args)) {
- RTE_LOG(ERR, EAL, "failed to initialize %s device\n",
- devargs->virt.drv_name);
- return -1;
- }
- }
-
return 0;
}
diff --git a/lib/librte_eal/common/eal_common_vdev.c
b/lib/librte_eal/common/eal_common_vdev.c
index 7d6e54f..b1f490c 100644
--- a/lib/librte_eal/common/eal_common_vdev.c
+++ b/lib/librte_eal/common/eal_common_vdev.c
@@ -37,8 +37,10 @@
#include
#include
+#include
#include
#include
+#include
struct vdev_driver_list vdev_driver_list =
TAILQ_HEAD_INITIALIZER(vdev_driver_list);
@@ -122,3 +124,45 @@ rte_eal_vdev_uninit(const char *name)
RTE_LOG(ERR, EAL, "no driver found for %s\n", name);
return -EINVAL;
}
+
+static int
+vdev_scan(void)
+{
+ /* for virtual devices we don't need to scan anything */
+ return 0;
+}
+
+static int
+vdev_probe(void)
+{
+ struct rte_devargs *devargs;
+
+ /*
+* Note that the dev_driver_list is populated here
+* from calls made to rte_eal_driver_register from constructor functions
+* embedded into PMD modules via the RTE_PMD_REGISTER_VDEV macro
+*/
+
+ /* call the init function for each virtual device */
+ TAILQ_FOREACH(devargs, &devargs_list, next) {
+
+ if (devargs->type != RTE_DEVTYPE_VIRTUAL)
+ continue;
+
+ if (rte_eal_vdev_init(devargs->virt.drv_name,
+ devargs->args)) {
+ RTE_LOG(ERR, EAL, "failed to initialize %s device\n",
+ devargs->virt.drv_name);
+ return -1;
+ }
+ }
+
+ return 0;
+}
+
+static struct rte_bus rte_vdev_bus = {
+ .scan = vdev_scan,
+ .probe = vdev_probe,
+};
+
+RTE_REGISTER_BUS(virtual, rte_vdev_bus);
--
2.7.4
[dpdk-dev] [PATCH v4 02/10] eal: probe new virtual bus after other bus devices
Also see commit f4ce209a8ce5 ("eal: postpone vdev initialization").
Signed-off-by: Jan Blunck
---
lib/librte_eal/common/eal_common_bus.c | 16 +++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/lib/librte_eal/common/eal_common_bus.c
b/lib/librte_eal/common/eal_common_bus.c
index 4638e78..8f9baf8 100644
--- a/lib/librte_eal/common/eal_common_bus.c
+++ b/lib/librte_eal/common/eal_common_bus.c
@@ -86,9 +86,14 @@ int
rte_bus_probe(void)
{
int ret;
- struct rte_bus *bus;
+ struct rte_bus *bus, *vbus = NULL;
TAILQ_FOREACH(bus, &rte_bus_list, next) {
+ if (!strcmp(bus->name, "virtual")) {
+ vbus = bus;
+ continue;
+ }
+
ret = bus->probe();
if (ret) {
RTE_LOG(ERR, EAL, "Bus (%s) probe failed.\n",
@@ -97,6 +102,15 @@ rte_bus_probe(void)
}
}
+ if (vbus) {
+ ret = vbus->probe();
+ if (ret) {
+ RTE_LOG(ERR, EAL, "Bus (%s) probe failed.\n",
+ vbus->name);
+ return ret;
+ }
+ }
+
return 0;
}
--
2.7.4
[dpdk-dev] [PATCH v4 05/10] eal: Refactor vdev driver probe/remove
This is a preparation for the introduction of the struct rte_vdev_device.
Signed-off-by: Jan Blunck
Tested-by: Ferruh Yigit
Acked-by: Shreyansh Jain
---
lib/librte_eal/common/eal_common_vdev.c | 44 -
1 file changed, 33 insertions(+), 11 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_vdev.c
b/lib/librte_eal/common/eal_common_vdev.c
index b1f490c..07974c5 100644
--- a/lib/librte_eal/common/eal_common_vdev.c
+++ b/lib/librte_eal/common/eal_common_vdev.c
@@ -61,14 +61,11 @@ rte_eal_vdrv_unregister(struct rte_vdev_driver *driver)
TAILQ_REMOVE(&vdev_driver_list, driver, next);
}
-int
-rte_eal_vdev_init(const char *name, const char *args)
+static int
+vdev_probe_all_drivers(const char *name, const char *args)
{
struct rte_vdev_driver *driver;
- if (name == NULL)
- return -EINVAL;
-
TAILQ_FOREACH(driver, &vdev_driver_list, next) {
/*
* search a driver prefix in virtual device name.
@@ -89,18 +86,29 @@ rte_eal_vdev_init(const char *name, const char *args)
return driver->probe(name, args);
}
- RTE_LOG(ERR, EAL, "no driver found for %s\n", name);
- return -EINVAL;
+ return 1;
}
int
-rte_eal_vdev_uninit(const char *name)
+rte_eal_vdev_init(const char *name, const char *args)
{
- struct rte_vdev_driver *driver;
+ int ret;
if (name == NULL)
return -EINVAL;
+ ret = vdev_probe_all_drivers(name, args);
+ if (ret > 0)
+ RTE_LOG(ERR, EAL, "no driver found for %s\n", name);
+
+ return ret;
+}
+
+static int
+vdev_remove_driver(const char *name)
+{
+ struct rte_vdev_driver *driver;
+
TAILQ_FOREACH(driver, &vdev_driver_list, next) {
/*
* search a driver prefix in virtual device name.
@@ -121,8 +129,22 @@ rte_eal_vdev_uninit(const char *name)
return driver->remove(name);
}
- RTE_LOG(ERR, EAL, "no driver found for %s\n", name);
- return -EINVAL;
+ return 1;
+}
+
+int
+rte_eal_vdev_uninit(const char *name)
+{
+ int ret;
+
+ if (name == NULL)
+ return -EINVAL;
+
+ ret = vdev_remove_driver(name);
+ if (ret > 0)
+ RTE_LOG(ERR, EAL, "no driver found for %s\n", name);
+
+ return ret;
}
static int
--
2.7.4
[dpdk-dev] [PATCH v4 04/10] eal: remove unused rte_eal_dev_init()
Signed-off-by: Jan Blunck
Tested-by: Ferruh Yigit
Acked-by: Shreyansh Jain
---
lib/librte_eal/bsdapp/eal/eal.c | 3 ---
lib/librte_eal/bsdapp/eal/rte_eal_version.map | 1 -
lib/librte_eal/common/eal_common_dev.c | 6 --
lib/librte_eal/common/include/rte_dev.h | 5 -
lib/librte_eal/linuxapp/eal/eal.c | 3 ---
lib/librte_eal/linuxapp/eal/rte_eal_version.map | 1 -
6 files changed, 19 deletions(-)
diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index a584447..3d29fcb 100644
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -621,9 +621,6 @@ rte_eal_init(int argc, char **argv)
if (rte_bus_probe())
rte_panic("Cannot probe devices\n");
- if (rte_eal_dev_init() < 0)
- rte_panic("Cannot init pmd devices\n");
-
rte_eal_mcfg_complete();
return fctret;
diff --git a/lib/librte_eal/bsdapp/eal/rte_eal_version.map
b/lib/librte_eal/bsdapp/eal/rte_eal_version.map
index 67f2ffb..b1996e0 100644
--- a/lib/librte_eal/bsdapp/eal/rte_eal_version.map
+++ b/lib/librte_eal/bsdapp/eal/rte_eal_version.map
@@ -22,7 +22,6 @@ DPDK_2.0 {
rte_dump_tailq;
rte_eal_alarm_cancel;
rte_eal_alarm_set;
- rte_eal_dev_init;
rte_eal_devargs_add;
rte_eal_devargs_dump;
rte_eal_devargs_type_count;
diff --git a/lib/librte_eal/common/eal_common_dev.c
b/lib/librte_eal/common/eal_common_dev.c
index 1ce90f6..4bde430 100644
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -76,12 +76,6 @@ void rte_eal_device_remove(struct rte_device *dev)
TAILQ_REMOVE(&dev_device_list, dev, next);
}
-int
-rte_eal_dev_init(void)
-{
- return 0;
-}
-
int rte_eal_dev_attach(const char *name, const char *devargs)
{
struct rte_pci_addr addr;
diff --git a/lib/librte_eal/common/include/rte_dev.h
b/lib/librte_eal/common/include/rte_dev.h
index b17791f..4251099 100644
--- a/lib/librte_eal/common/include/rte_dev.h
+++ b/lib/librte_eal/common/include/rte_dev.h
@@ -171,11 +171,6 @@ void rte_eal_driver_register(struct rte_driver *driver);
void rte_eal_driver_unregister(struct rte_driver *driver);
/**
- * Initalize all the registered drivers in this process
- */
-int rte_eal_dev_init(void);
-
-/**
* Initialize a driver specified by name.
*
* @param name
diff --git a/lib/librte_eal/linuxapp/eal/eal.c
b/lib/librte_eal/linuxapp/eal/eal.c
index f77ff5c..88479de 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -892,9 +892,6 @@ rte_eal_init(int argc, char **argv)
if (rte_bus_probe())
rte_panic("Cannot probe devices\n");
- if (rte_eal_dev_init() < 0)
- rte_panic("Cannot init pmd devices\n");
-
rte_eal_mcfg_complete();
return fctret;
diff --git a/lib/librte_eal/linuxapp/eal/rte_eal_version.map
b/lib/librte_eal/linuxapp/eal/rte_eal_version.map
index 9c134b4..2ada2f0 100644
--- a/lib/librte_eal/linuxapp/eal/rte_eal_version.map
+++ b/lib/librte_eal/linuxapp/eal/rte_eal_version.map
@@ -22,7 +22,6 @@ DPDK_2.0 {
rte_dump_tailq;
rte_eal_alarm_cancel;
rte_eal_alarm_set;
- rte_eal_dev_init;
rte_eal_devargs_add;
rte_eal_devargs_dump;
rte_eal_devargs_type_count;
--
2.7.4
[dpdk-dev] [PATCH v4 06/10] eal: add struct rte_vdev_device
This adds the rte_vdev_device structure which embeds a generic rte_device.
Signed-off-by: Jan Blunck
Tested-by: Ferruh Yigit
Acked-by: Shreyansh Jain
---
lib/librte_eal/common/eal_common_vdev.c | 5 +
lib/librte_eal/common/include/rte_vdev.h | 5 +
2 files changed, 10 insertions(+)
diff --git a/lib/librte_eal/common/eal_common_vdev.c
b/lib/librte_eal/common/eal_common_vdev.c
index 07974c5..f884c7b 100644
--- a/lib/librte_eal/common/eal_common_vdev.c
+++ b/lib/librte_eal/common/eal_common_vdev.c
@@ -42,6 +42,11 @@
#include
#include
+/** Double linked list of virtual device drivers. */
+TAILQ_HEAD(vdev_device_list, rte_vdev_device);
+
+static struct vdev_device_list vdev_device_list =
+ TAILQ_HEAD_INITIALIZER(vdev_device_list);
struct vdev_driver_list vdev_driver_list =
TAILQ_HEAD_INITIALIZER(vdev_driver_list);
diff --git a/lib/librte_eal/common/include/rte_vdev.h
b/lib/librte_eal/common/include/rte_vdev.h
index 784e837..8f98372 100644
--- a/lib/librte_eal/common/include/rte_vdev.h
+++ b/lib/librte_eal/common/include/rte_vdev.h
@@ -40,6 +40,11 @@ extern "C" {
#include
#include
+struct rte_vdev_device {
+ TAILQ_ENTRY(rte_vdev_device) next; /**< Next attached vdev */
+ struct rte_device device; /**< Inherit core device */
+};
+
/** Double linked list of virtual device drivers. */
TAILQ_HEAD(vdev_driver_list, rte_vdev_driver);
--
2.7.4
[dpdk-dev] [PATCH v4 07/10] eal: add virtual device name helper function
This adds the rte_vdev_device_name() helper function to retrieve the
rte_vdev_device name which makes moving the name of the low-level
device into struct rte_device easier in the future.
Signed-off-by: Jan Blunck
Acked-by: Shreyansh Jain
---
lib/librte_eal/common/include/rte_vdev.h | 9 +
1 file changed, 9 insertions(+)
diff --git a/lib/librte_eal/common/include/rte_vdev.h
b/lib/librte_eal/common/include/rte_vdev.h
index 8f98372..abdefab 100644
--- a/lib/librte_eal/common/include/rte_vdev.h
+++ b/lib/librte_eal/common/include/rte_vdev.h
@@ -39,12 +39,21 @@ extern "C" {
#include
#include
+#include
struct rte_vdev_device {
TAILQ_ENTRY(rte_vdev_device) next; /**< Next attached vdev */
struct rte_device device; /**< Inherit core device */
};
+static inline const char *
+rte_vdev_device_name(const struct rte_vdev_device *dev)
+{
+ if (dev && dev->device.devargs)
+ return dev->device.devargs->virt.drv_name;
+ return NULL;
+}
+
/** Double linked list of virtual device drivers. */
TAILQ_HEAD(vdev_driver_list, rte_vdev_driver);
--
2.7.4
[dpdk-dev] [PATCH v4 08/10] eal: add virtual device arguments helper function
This adds the rte_vdev_device_args() helper function to prepare for
changing the virtual drivers probe() functions take a rte_vdev_device
pointer instead of the name+args strings.
Signed-off-by: Jan Blunck
---
lib/librte_eal/common/include/rte_vdev.h | 8
1 file changed, 8 insertions(+)
diff --git a/lib/librte_eal/common/include/rte_vdev.h
b/lib/librte_eal/common/include/rte_vdev.h
index abdefab..81f6beb 100644
--- a/lib/librte_eal/common/include/rte_vdev.h
+++ b/lib/librte_eal/common/include/rte_vdev.h
@@ -54,6 +54,14 @@ rte_vdev_device_name(const struct rte_vdev_device *dev)
return NULL;
}
+static inline const char *
+rte_vdev_device_args(const struct rte_vdev_device *dev)
+{
+ if (dev && dev->device.devargs)
+ return dev->device.devargs->args;
+ return "";
+}
+
/** Double linked list of virtual device drivers. */
TAILQ_HEAD(vdev_driver_list, rte_vdev_driver);
--
2.7.4
[dpdk-dev] [PATCH v4 10/10] eal: make virtual driver probe and remove take rte_vdev_device
This is a preparation to embed the generic rte_device into the rte_eth_dev
also for virtual devices.
Signed-off-by: Jan Blunck
---
drivers/crypto/null/null_crypto_pmd.c | 18 --
drivers/net/af_packet/rte_eth_af_packet.c | 11 ++-
drivers/net/bonding/rte_eth_bond_pmd.c| 13 +
drivers/net/mpipe/mpipe_tilegx.c | 10 ++
drivers/net/null/rte_eth_null.c | 13 -
drivers/net/pcap/rte_eth_pcap.c | 12 +++-
drivers/net/ring/rte_eth_ring.c | 9 +++--
drivers/net/tap/rte_eth_tap.c | 10 +++---
drivers/net/vhost/rte_eth_vhost.c | 10 +++---
drivers/net/virtio/virtio_user_ethdev.c | 18 +++---
drivers/net/xenvirt/rte_eth_xenvirt.c | 9 +
lib/librte_eal/common/eal_common_vdev.c | 7 +++
lib/librte_eal/common/include/rte_vdev.h | 4 ++--
13 files changed, 86 insertions(+), 58 deletions(-)
diff --git a/drivers/crypto/null/null_crypto_pmd.c
b/drivers/crypto/null/null_crypto_pmd.c
index ed5a9fc..51d6de0 100644
--- a/drivers/crypto/null/null_crypto_pmd.c
+++ b/drivers/crypto/null/null_crypto_pmd.c
@@ -218,8 +218,7 @@ cryptodev_null_create(struct rte_crypto_vdev_init_params
*init_params)
/** Initialise null crypto device */
static int
-cryptodev_null_probe(const char *name,
- const char *input_args)
+cryptodev_null_probe(struct rte_vdev_device *dev)
{
struct rte_crypto_vdev_init_params init_params = {
RTE_CRYPTODEV_VDEV_DEFAULT_MAX_NB_QUEUE_PAIRS,
@@ -228,10 +227,11 @@ cryptodev_null_probe(const char *name,
{0}
};
- rte_cryptodev_parse_vdev_init_params(&init_params, input_args);
+ rte_cryptodev_parse_vdev_init_params(&init_params,
+ rte_vdev_device_args(dev));
- RTE_LOG(INFO, PMD, "Initialising %s on NUMA node %d\n", name,
- init_params.socket_id);
+ RTE_LOG(INFO, PMD, "Initialising %s on NUMA node %d\n",
+ rte_vdev_device_name(dev), init_params.socket_id);
if (init_params.name[0] != '\0')
RTE_LOG(INFO, PMD, " User defined name = %s\n",
init_params.name);
@@ -256,9 +256,15 @@ cryptodev_null_remove(const char *name)
return 0;
}
+static int
+cryptodev_null_remove_dev(struct rte_vdev_device *dev)
+{
+ return cryptodev_null_remove(rte_vdev_device_name(dev));
+}
+
static struct rte_vdev_driver cryptodev_null_pmd_drv = {
.probe = cryptodev_null_probe,
- .remove = cryptodev_null_remove
+ .remove = cryptodev_null_remove_dev,
};
RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_NULL_PMD, cryptodev_null_pmd_drv);
diff --git a/drivers/net/af_packet/rte_eth_af_packet.c
b/drivers/net/af_packet/rte_eth_af_packet.c
index 2f87553..77536e8 100644
--- a/drivers/net/af_packet/rte_eth_af_packet.c
+++ b/drivers/net/af_packet/rte_eth_af_packet.c
@@ -923,8 +923,9 @@ rte_eth_from_packet(const char *name,
}
static int
-rte_pmd_af_packet_probe(const char *name, const char *params)
+rte_pmd_af_packet_probe(struct rte_vdev_device *dev)
{
+ const char *name = rte_vdev_device_name(dev);
unsigned numa_node;
int ret = 0;
struct rte_kvargs *kvlist;
@@ -934,7 +935,7 @@ rte_pmd_af_packet_probe(const char *name, const char
*params)
numa_node = rte_socket_id();
- kvlist = rte_kvargs_parse(params, valid_arguments);
+ kvlist = rte_kvargs_parse(rte_vdev_device_args(dev), valid_arguments);
if (kvlist == NULL) {
ret = -1;
goto exit;
@@ -961,7 +962,7 @@ rte_pmd_af_packet_probe(const char *name, const char
*params)
}
static int
-rte_pmd_af_packet_remove(const char *name)
+rte_pmd_af_packet_remove(struct rte_vdev_device *dev)
{
struct rte_eth_dev *eth_dev = NULL;
struct pmd_internals *internals;
@@ -970,11 +971,11 @@ rte_pmd_af_packet_remove(const char *name)
RTE_LOG(INFO, PMD, "Closing AF_PACKET ethdev on numa socket %u\n",
rte_socket_id());
- if (name == NULL)
+ if (dev == NULL)
return -1;
/* find the ethdev entry */
- eth_dev = rte_eth_dev_allocated(name);
+ eth_dev = rte_eth_dev_allocated(rte_vdev_device_name(dev));
if (eth_dev == NULL)
return -1;
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c
b/drivers/net/bonding/rte_eth_bond_pmd.c
index f3ac9e2..6c03920 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -2230,16 +2230,19 @@ const struct eth_dev_ops default_dev_ops = {
};
static int
-bond_probe(const char *name, const char *params)
+bond_probe(struct rte_vdev_device *dev)
{
+ const char *name;
struct bond_dev_private *internals;
struct rte_kvargs *kvlist;
uint8_t bonding_mode, socket_id;
int arg_count, port_id;
+ name = rte_vdev_d
[dpdk-dev] [PATCH v4 09/10] eal: make virtual bus use rte_vdev_device
This allows the virtual bus to be rescanned and probed by tracking the
creation of rte_vdev_device.
Signed-off-by: Jan Blunck
Tested-by: Ferruh Yigit
Acked-by: Shreyansh Jain
---
lib/librte_eal/common/eal_common_vdev.c | 195 +---
1 file changed, 155 insertions(+), 40 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_vdev.c
b/lib/librte_eal/common/eal_common_vdev.c
index f884c7b..d7a586b 100644
--- a/lib/librte_eal/common/eal_common_vdev.c
+++ b/lib/librte_eal/common/eal_common_vdev.c
@@ -41,6 +41,7 @@
#include
#include
#include
+#include
/** Double linked list of virtual device drivers. */
TAILQ_HEAD(vdev_device_list, rte_vdev_device);
@@ -67,9 +68,12 @@ rte_eal_vdrv_unregister(struct rte_vdev_driver *driver)
}
static int
-vdev_probe_all_drivers(const char *name, const char *args)
+vdev_probe_all_drivers(struct rte_vdev_device *dev)
{
+ const char *name = rte_vdev_device_name(dev);
+ const char *args = rte_vdev_device_args(dev);
struct rte_vdev_driver *driver;
+ int ret;
TAILQ_FOREACH(driver, &vdev_driver_list, next) {
/*
@@ -79,90 +83,202 @@ vdev_probe_all_drivers(const char *name, const char *args)
* So use strncmp to compare.
*/
if (!strncmp(driver->driver.name, name,
- strlen(driver->driver.name)))
- return driver->probe(name, args);
+ strlen(driver->driver.name))) {
+ dev->device.driver = &driver->driver;
+ ret = driver->probe(name, args);
+ if (ret)
+ dev->device.driver = NULL;
+ return ret;
+ }
}
/* Give new names precedence over aliases. */
TAILQ_FOREACH(driver, &vdev_driver_list, next) {
if (driver->driver.alias &&
!strncmp(driver->driver.alias, name,
- strlen(driver->driver.alias)))
- return driver->probe(name, args);
+ strlen(driver->driver.alias))) {
+ dev->device.driver = &driver->driver;
+ ret = driver->probe(name, args);
+ if (ret)
+ dev->device.driver = NULL;
+ return ret;
+ }
}
return 1;
}
+static struct rte_vdev_device *
+find_vdev(const char *name)
+{
+ struct rte_vdev_device *dev;
+
+ if (!name)
+ return NULL;
+
+ TAILQ_FOREACH(dev, &vdev_device_list, next) {
+ const char *devname = rte_vdev_device_name(dev);
+ if (!strncmp(devname, name, strlen(name)))
+ return dev;
+ }
+
+ return NULL;
+}
+
+static struct rte_devargs *
+alloc_devargs(const char *name, const char *args)
+{
+ struct rte_devargs *devargs;
+ int ret;
+
+ devargs = calloc(1, sizeof(*devargs));
+ if (!devargs)
+ return NULL;
+
+ devargs->type = RTE_DEVTYPE_VIRTUAL;
+ if (args)
+ devargs->args = strdup(args);
+
+ ret = snprintf(devargs->virt.drv_name,
+ sizeof(devargs->virt.drv_name), "%s", name);
+ if (ret < 0 || ret >= (int)sizeof(devargs->virt.drv_name)) {
+ free(devargs->args);
+ free(devargs);
+ return NULL;
+ }
+
+ return devargs;
+}
+
int
rte_eal_vdev_init(const char *name, const char *args)
{
+ struct rte_vdev_device *dev;
+ struct rte_devargs *devargs;
int ret;
if (name == NULL)
return -EINVAL;
- ret = vdev_probe_all_drivers(name, args);
- if (ret > 0)
- RTE_LOG(ERR, EAL, "no driver found for %s\n", name);
+ dev = find_vdev(name);
+ if (dev)
+ return -EEXIST;
+
+ devargs = alloc_devargs(name, args);
+ if (!devargs)
+ return -ENOMEM;
+
+ dev = calloc(1, sizeof(*dev));
+ if (!dev) {
+ ret = -ENOMEM;
+ goto fail;
+ }
+
+ dev->device.devargs = devargs;
+ dev->device.numa_node = SOCKET_ID_ANY;
+
+ ret = vdev_probe_all_drivers(dev);
+ if (ret) {
+ if (ret > 0)
+ RTE_LOG(ERR, EAL, "no driver found for %s\n", name);
+ goto fail;
+ }
+
+ TAILQ_INSERT_TAIL(&devargs_list, devargs, next);
+
+ rte_eal_device_insert(&dev->device);
+ TAILQ_INSERT_TAIL(&vdev_device_list, dev, next);
+ return 0;
+fail:
+ free(devargs->args);
+ free(devargs);
+ free(dev);
return ret;
}
static int
-vdev_remove_driver(const char *name)
+vdev_remove_driver(struct rte_vdev_device *dev)
{
- struct rte_vdev_driver *driver;
+ const char *name =
Re: [dpdk-dev] [PATCH 0/6] get status of Rx and Tx descriptors
2017-03-04 21:45, Olivier Matz: > "Venkatesan, Venky" wrote: > > From: Olivier Matz > > > On Fri, 3 Mar 2017 16:18:52 +, "Venkatesan, Venky" wrote: > > > > From: Olivier Matz > > > > > On Thu, 2 Mar 2017 15:32:15 +, Bruce Richardson wrote: > > > > > > On Wed, Mar 01, 2017 at 06:19:06PM +0100, Olivier Matz wrote: > > > > > > > The usage of these functions can be: > > > > > > > - on Rx, anticipate that the cpu is not fast enough to process > > > > > > > all incoming packets, and take dispositions to solve the > > > > > > > problem (add more cpus, drop specific packets, ...) > > > > > > > - on Tx, detect that the link is overloaded, and take dispositions > > > > > > > to solve the problem (notify flow control, drop specific > > > > > > > packets) > > > > > > > [...] > > > > > > Are these really needed for real applications? I suspect our > > > > > > trivial l3fwd power example can be made to work ok without them. OK, please remove the use of such old API in the example. [...] > So, the penalty, in the worst case (burst of 32, 100c/pkt) is ~6%. > Given the information it provides, it is acceptable to me. Any penalty is acceptable, given it is not mandatory to call these functions. > Note we are talking here about an optional API, that would only impact > people that use it. Yes, it just brings more information and can be used for some debug measures. [...] > Also, changing the Rx burst function is much more likely to be refused > than adding an optional API. Yes, changing Rx/Tx API is not really an option and does not bring so much benefits. [...] > > > > So, NAK. My suggestion would be to go back to the older API. > > > > > > I don't understand the reason of your nack. > > > The old API is there (for Rx it works the same), and it is illustrated in > > > an > > > example. Since your arguments also applies to the old API, so why are you > > > saying we should keep the older API? > > > > > > > I am not a fan of the old API either. In hindsight, it was a mistake > > (which we didn't catch in time). As Bruce suggested, the example > > should be reworked to work without the API, and deprecate it. Agreed to deprecate the old API. However, there is no relation with this new optional API. > Before deprecating an API, I think we should check if people are using > it and if it can really be replaced. I think there are many things that > could be deprecated before this one. Yes we can discuss a lot of things but let's focus on this one :) > > > For Tx, I want to know if I have enough room to send my packets before > > > doing it. There is no API yet to do that. > > > > Yes. This could be a lightweight API if it returned a count > > (txq->nb_tx_free) instead of actually touching the ring, which is what I > > have a problem with. If the implementation changes to that, that may be > > okay to do. The Tx API has more merit than the Rx API, but not coded around > > an offset. > > Returning txq->nb_tx_free does not work because it is a software view, > which becomes wrong as soon as the hardware has send the packets. > Example: > 1. Send many packets at very high rate, the tx ring becomes full > 2. wait that packets are transmitted > 3. read nb_tx_free, it returns 0, which is not what I want > > So in my case there is a also a need for a Tx descriptor status API. > > Thomas, you are the maintainer of ethdev API, do you have an opinion? You show some benefits and it does not hurt any existing API. So we cannot reject such a feature, even if its best use is for debug or specific applications. I think the concern here was the fear of seeing this called in some benchmark applications. You just have to highlight in the API doc that there are some performance penalties.
Re: [dpdk-dev] [PATCH v3 1/1] net/mlx5: add hardware TSO support
Monday, March 6, 2017 11:31 AM, Ferruh Yigit: > On 3/6/2017 8:50 AM, Ferruh Yigit wrote: > > On 3/2/2017 9:01 AM, Shahaf Shuler wrote: > >> Implement support for hardware TSO. > >> > >> Signed-off-by: Shahaf Shuler > >> --- > >> on v3: > >> * fix alignment issues > >> * for warn log > >> on v2: > >> * Instead of exposing capability, TSO checks on data path. > >> * PMD specific parameter to enable TSO. > >> * different implementaion for the data path. > >>Performance impact ~0.1-0.2Mpps > > > > Hi Shahaf, > > > > I think it is good idea to update release notes to announce mlx5 TSO > > support, what do you think? > > Since [1] depends on this patch, I will get both, but can you please send a > separate patch for release notes? Yes. I will work on one. > > [1] > http://dpdk.org/dev/patchwork/patch/21065/ > > > > > And if you will send a new version of the patch, can you please put > > "TSO" flag in the same order with default.ini > > I will update this. > > > > > Thanks, > > ferruh > >
[dpdk-dev] [PATCH] doc: announce TSO support on mlx5 driver
Signed-off-by: Shahaf Shuler --- doc/guides/rel_notes/release_17_05.rst | 4 1 file changed, 4 insertions(+) diff --git a/doc/guides/rel_notes/release_17_05.rst b/doc/guides/rel_notes/release_17_05.rst index 05fe784..8c381a8 100644 --- a/doc/guides/rel_notes/release_17_05.rst +++ b/doc/guides/rel_notes/release_17_05.rst @@ -53,6 +53,10 @@ New Features * Complete HW initialization even if SFP is not present. * Add VF xcast promiscuous mode. +* **Added TSO support for tunneled and non-tunneled packets on mlx5 driver.** + + Added support for Hardware TSO for tunneled and non-tunneled packets. + Tunneling protocols supported are GRE and VXLAN. Resolved Issues --- -- 1.8.3.1
[dpdk-dev] [PATCH 1/2] net/sfc/base: separate limitations on Tx DMA descriptors
Siena has limitation on maximum byte count and 4k boundary crosssing
(which is stricter than maximum byte count).
EF10 has limitation on maximum byte count only.
Fixes: f7dc06bf35f2 ("net/sfc/base: import 5xxx/6xxx family support")
Fixes: e7cd430c864f ("net/sfc/base: import SFN7xxx family support")
Fixes: 94190e3543bf ("net/sfc/base: import SFN8xxx family support")
Signed-off-by: Andrew Rybchenko
---
drivers/net/sfc/base/ef10_tx.c | 9 +
drivers/net/sfc/base/efx.h | 7 +++
drivers/net/sfc/base/efx_tx.c | 16
drivers/net/sfc/base/hunt_nic.c| 4
drivers/net/sfc/base/medford_nic.c | 4
drivers/net/sfc/base/siena_nic.c | 4
6 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/drivers/net/sfc/base/ef10_tx.c b/drivers/net/sfc/base/ef10_tx.c
index aa19cce..0f48a6c 100644
--- a/drivers/net/sfc/base/ef10_tx.c
+++ b/drivers/net/sfc/base/ef10_tx.c
@@ -435,8 +435,9 @@ ef10_tx_qpost(
size_t offset;
efx_qword_t qword;
- /* Fragments must not span 4k boundaries. */
- EFSYS_ASSERT(P2ROUNDUP(addr + 1, 4096) >= (addr + size));
+ /* No limitations on boundary crossing */
+ EFSYS_ASSERT(size <=
+ etp->et_enp->en_nic_cfg.enc_tx_dma_desc_size_max);
id = added++ & etp->et_mask;
offset = id * sizeof (efx_qword_t);
@@ -551,8 +552,8 @@ ef10_tx_qdesc_dma_create(
__inboolean_t eop,
__out efx_desc_t *edp)
{
- /* Fragments must not span 4k boundaries. */
- EFSYS_ASSERT(P2ROUNDUP(addr + 1, 4096) >= addr + size);
+ /* No limitations on boundary crossing */
+ EFSYS_ASSERT(size <= etp->et_enp->en_nic_cfg.enc_tx_dma_desc_size_max);
EFSYS_PROBE4(tx_desc_dma_create, unsigned int, etp->et_index,
efsys_dma_addr_t, addr,
diff --git a/drivers/net/sfc/base/efx.h b/drivers/net/sfc/base/efx.h
index 0815d7a..ac702f3 100644
--- a/drivers/net/sfc/base/efx.h
+++ b/drivers/net/sfc/base/efx.h
@@ -1154,6 +1154,13 @@ typedef struct efx_nic_cfg_s {
uint32_tenc_rx_batch_max;
/* Number of rx descriptors the hardware requires for a push. */
uint32_tenc_rx_push_align;
+ /* Maximum amount of data in DMA descriptor */
+ uint32_tenc_tx_dma_desc_size_max;
+ /*
+* Boundary which DMA descriptor data must not cross or 0 if no
+* limitation.
+*/
+ uint32_tenc_tx_dma_desc_boundary;
/*
* Maximum number of bytes into the packet the TCP header can start for
* the hardware to apply TSO packet edits.
diff --git a/drivers/net/sfc/base/efx_tx.c b/drivers/net/sfc/base/efx_tx.c
index 0d47390..ceb2920 100644
--- a/drivers/net/sfc/base/efx_tx.c
+++ b/drivers/net/sfc/base/efx_tx.c
@@ -745,8 +745,12 @@ siena_tx_qpost(
size_t size = ebp->eb_size;
efsys_dma_addr_t end = start + size;
- /* Fragments must not span 4k boundaries. */
- EFSYS_ASSERT(P2ROUNDUP(start + 1, 4096) >= end);
+ /*
+* Fragments must not span 4k boundaries.
+* Here it is a stricter requirement than the maximum length.
+*/
+ EFSYS_ASSERT(P2ROUNDUP(start + 1,
+ etp->et_enp->en_nic_cfg.enc_tx_dma_desc_boundary) >= end);
EFX_TX_DESC(etp, start, size, ebp->eb_eop, added);
}
@@ -1005,8 +1009,12 @@ siena_tx_qdesc_dma_create(
__inboolean_t eop,
__out efx_desc_t *edp)
{
- /* Fragments must not span 4k boundaries. */
- EFSYS_ASSERT(P2ROUNDUP(addr + 1, 4096) >= addr + size);
+ /*
+* Fragments must not span 4k boundaries.
+* Here it is a stricter requirement than the maximum length.
+*/
+ EFSYS_ASSERT(P2ROUNDUP(addr + 1,
+ etp->et_enp->en_nic_cfg.enc_tx_dma_desc_boundary) >= addr + size);
EFSYS_PROBE4(tx_desc_dma_create, unsigned int, etp->et_index,
efsys_dma_addr_t, addr,
diff --git a/drivers/net/sfc/base/hunt_nic.c b/drivers/net/sfc/base/hunt_nic.c
index c2c4d74..addbf1c 100644
--- a/drivers/net/sfc/base/hunt_nic.c
+++ b/drivers/net/sfc/base/hunt_nic.c
@@ -301,6 +301,10 @@ hunt_board_cfg(
/* Alignment for WPTR updates */
encp->enc_rx_push_align = EF10_RX_WPTR_ALIGN;
+ encp->enc_tx_dma_desc_size_max = EFX_MASK32(ESF_DZ_RX_KER_BYTE_CNT);
+ /* No boundary crossing limits */
+ encp->enc_tx_dma_desc_boundary = 0;
+
/*
* Set resource limits for MC_CMD_ALLOC_VIS. Note that we cannot use
* MC_CMD_GET_RESOURCE_LIMITS here as that reports the available
diff --git a/drivers/net/sfc/base/medford_nic.c
b/drivers/net/sfc/base/medford_nic.c
index 6ad68c6..07afac1 100644
--- a/drivers/net/sfc/base/medford_nic.c
+++ b/drivers/net/sfc/b
[dpdk-dev] [PATCH 2/2] net/sfc: remove Tx DMA descriptor boundary crossing limit
EF10 supported by the PMD has no limitations on address boundary
crossing by Tx DMA descriptors.
Fixes: 428c7ddd2f16 ("net/sfc: send bursts of packets")
Fixes: fec33d5bb3eb ("net/sfc: support firmware-assisted TSO")
Signed-off-by: Andrew Rybchenko
---
drivers/net/sfc/sfc_tso.c | 11 ---
drivers/net/sfc/sfc_tx.c | 24 +---
drivers/net/sfc/sfc_tx.h | 7 +--
3 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/drivers/net/sfc/sfc_tso.c b/drivers/net/sfc/sfc_tso.c
index 68d84c9..d3398b1 100644
--- a/drivers/net/sfc/sfc_tso.c
+++ b/drivers/net/sfc/sfc_tso.c
@@ -50,7 +50,7 @@ sfc_tso_alloc_tsoh_objs(struct sfc_tx_sw_desc *sw_ring,
for (i = 0; i < txq_entries; ++i) {
sw_ring[i].tsoh = rte_malloc_socket("sfc-txq-tsoh-obj",
SFC_TSOH_STD_LEN,
- SFC_TX_SEG_BOUNDARY,
+ RTE_CACHE_LINE_SIZE,
socket_id);
if (sw_ring[i].tsoh == NULL)
goto fail_alloc_tsoh_objs;
@@ -116,7 +116,6 @@ sfc_tso_do(struct sfc_txq *txq, unsigned int idx, struct
rte_mbuf **in_seg,
uint8_t *tsoh;
const struct tcp_hdr *th;
efsys_dma_addr_t header_paddr;
- efsys_dma_addr_t paddr_next_frag;
uint16_t packet_id;
uint32_t sent_seq;
struct rte_mbuf *m = *in_seg;
@@ -140,17 +139,15 @@ sfc_tso_do(struct sfc_txq *txq, unsigned int idx, struct
rte_mbuf **in_seg,
return EMSGSIZE;
header_paddr = rte_pktmbuf_mtophys(m);
- paddr_next_frag = P2ROUNDUP(header_paddr + 1, SFC_TX_SEG_BOUNDARY);
/*
* Sometimes headers may be split across multiple mbufs. In such cases
* we need to glue those pieces and store them in some temporary place.
* Also, packet headers must be contiguous in memory, so that
-* they can be referred to with a single DMA descriptor. Hence, handle
-* the case where the original header crosses a 4K memory boundary
+* they can be referred to with a single DMA descriptor. EF10 has no
+* limitations on address boundaries crossing by DMA descriptor data.
*/
- if ((m->data_len < header_len) ||
- ((paddr_next_frag - header_paddr) < header_len)) {
+ if (m->data_len < header_len) {
sfc_tso_prepare_header(txq, in_seg, in_off, idx, header_len);
tsoh = txq->sw_ring[idx & txq->ptr_mask].tsoh;
diff --git a/drivers/net/sfc/sfc_tx.c b/drivers/net/sfc/sfc_tx.c
index 5a6282c..5bb31ad 100644
--- a/drivers/net/sfc/sfc_tx.c
+++ b/drivers/net/sfc/sfc_tx.c
@@ -137,6 +137,7 @@ sfc_tx_qinit(struct sfc_adapter *sa, unsigned int sw_index,
uint16_t nb_tx_desc, unsigned int socket_id,
const struct rte_eth_txconf *tx_conf)
{
+ const efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic);
struct sfc_txq_info *txq_info;
struct sfc_evq *evq;
struct sfc_txq *txq;
@@ -195,6 +196,7 @@ sfc_tx_qinit(struct sfc_adapter *sa, unsigned int sw_index,
txq->ptr_mask = txq_info->entries - 1;
txq->free_thresh = (tx_conf->tx_free_thresh) ? tx_conf->tx_free_thresh :
SFC_TX_DEFAULT_FREE_THRESH;
+ txq->dma_desc_size_max = encp->enc_tx_dma_desc_size_max;
txq->hw_index = sw_index;
txq->flags = tx_conf->txq_flags;
txq->evq = evq;
@@ -302,10 +304,21 @@ sfc_tx_check_mode(struct sfc_adapter *sa, const struct
rte_eth_txmode *txmode)
int
sfc_tx_init(struct sfc_adapter *sa)
{
+ const efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic);
const struct rte_eth_conf *dev_conf = &sa->eth_dev->data->dev_conf;
unsigned int sw_index;
int rc = 0;
+ /*
+* The datapath implementation assumes absence of boundary
+* limits on Tx DMA descriptors. Addition of these checks on
+* datapath would simply make the datapath slower.
+*/
+ if (encp->enc_tx_dma_desc_boundary != 0) {
+ rc = ENOTSUP;
+ goto fail_tx_dma_desc_boundary;
+ }
+
rc = sfc_tx_check_mode(sa, &dev_conf->txmode);
if (rc != 0)
goto fail_check_mode;
@@ -334,6 +347,7 @@ sfc_tx_init(struct sfc_adapter *sa)
sa->txq_count = 0;
fail_check_mode:
+fail_tx_dma_desc_boundary:
sfc_log_init(sa, "failed (rc = %d)", rc);
return rc;
}
@@ -704,9 +718,13 @@ sfc_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
uint16_t nb_pkts)
efsys_dma_addr_tfrag_addr = next_frag;
size_t frag_len;
- next_frag = RTE_ALIGN(frag_addr + 1,
- SFC_TX_SEG_BOUNDARY);
-
Re: [dpdk-dev] [PATCH] eventdev: Fix links_map initialization
On Wed, Mar 01, 2017 at 10:47:36PM -0600, Gage Eads wrote:
> This patch initializes the links_map array entries to
> EVENT_QUEUE_SERVICE_PRIORITY_INVALID, as expected by
> rte_event_port_links_get().
>
> Signed-off-by: Gage Eads
> ---
> lib/librte_eventdev/rte_eventdev.c | 17 -
> 1 file changed, 12 insertions(+), 5 deletions(-)
>
> diff --git a/lib/librte_eventdev/rte_eventdev.c
> b/lib/librte_eventdev/rte_eventdev.c
> index 68bfc3b..b8cd92b 100644
> --- a/lib/librte_eventdev/rte_eventdev.c
> +++ b/lib/librte_eventdev/rte_eventdev.c
> @@ -190,6 +190,8 @@ rte_event_dev_queue_config(struct rte_eventdev *dev,
> uint8_t nb_queues)
> return 0;
> }
>
> +#define EVENT_QUEUE_SERVICE_PRIORITY_INVALID (0xdead)
> +
> static inline int
> rte_event_dev_port_config(struct rte_eventdev *dev, uint8_t nb_ports)
> {
> @@ -251,6 +253,9 @@ rte_event_dev_port_config(struct rte_eventdev *dev,
> uint8_t nb_ports)
> "nb_ports %u", nb_ports);
> return -(ENOMEM);
> }
> + for (i = 0; i < nb_ports * RTE_EVENT_MAX_QUEUES_PER_DEV; i++)
> + dev->data->links_map[i] =
> + EVENT_QUEUE_SERVICE_PRIORITY_INVALID;
> } else if (dev->data->ports != NULL && nb_ports != 0) {/* re-config */
> RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->port_release, -ENOTSUP);
>
> @@ -305,6 +310,10 @@ rte_event_dev_port_config(struct rte_eventdev *dev,
> uint8_t nb_ports)
>
> if (nb_ports > old_nb_ports) {
> uint8_t new_ps = nb_ports - old_nb_ports;
> + unsigned int old_links_map_end =
> + old_nb_ports * RTE_EVENT_MAX_QUEUES_PER_DEV;
> + unsigned int links_map_end =
> + nb_ports * RTE_EVENT_MAX_QUEUES_PER_DEV;
>
> memset(ports + old_nb_ports, 0,
> sizeof(ports[0]) * new_ps);
> @@ -312,9 +321,9 @@ rte_event_dev_port_config(struct rte_eventdev *dev,
> uint8_t nb_ports)
> sizeof(ports_dequeue_depth[0]) * new_ps);
> memset(ports_enqueue_depth + old_nb_ports, 0,
> sizeof(ports_enqueue_depth[0]) * new_ps);
> - memset(links_map +
> - (old_nb_ports * RTE_EVENT_MAX_QUEUES_PER_DEV),
> - 0, sizeof(ports_enqueue_depth[0]) * new_ps);
> + for (i = old_links_map_end; i < links_map_end; i++)
> + links_map[i] =
> + EVENT_QUEUE_SERVICE_PRIORITY_INVALID;
rte_event_port_setup() has rte_event_port_unlink() at the end of the
function. On rte_event_port_unlink, we are doing the same
operation(writing EVENT_QUEUE_SERVICE_PRIORITY_INVALID) and
rte_event_port_links_get() should be called after rte_event_dev_start(),
If so, Do you still think this duplicates writes are required? or Do you
have any other call sequence in mind?
Description from header file-
The functions exported by the application Event API to setup a device
designated by its device identifier must be invoked in the following order:
- rte_event_dev_configure()
- rte_event_queue_setup()
- rte_event_port_setup()
- rte_event_port_link()
- rte_event_dev_start()
Then, the application can invoke, in any order, the functions
exported by the Event API to schedule events, dequeue events, enqueue events,
change event queue(s) to event port [un]link establishment and so on.
Application may use rte_event_[queue/port]_default_conf_get() to get the
default configuration to set up an event queue or event port by
overriding few default values.
If the application wants to change the configuration (i.e. call
rte_event_dev_configure(), rte_event_queue_setup(), or
rte_event_port_setup()), it must call rte_event_dev_stop() first to stop the
device and then do the reconfiguration before calling rte_event_dev_start()
again. The schedule, enqueue and dequeue functions should not be invoked
when the device is stopped.
-
> }
>
> dev->data->ports = ports;
> @@ -815,8 +824,6 @@ rte_event_port_link(uint8_t dev_id, uint8_t port_id,
> return diag;
> }
>
> -#define EVENT_QUEUE_SERVICE_PRIORITY_INVALID (0xdead)
> -
> int
> rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,
> uint8_t queues[], uint16_t nb_unlinks)
> --
> 2.7.4
>
Re: [dpdk-dev] [PATCH v3] eventdev: amend timeout criteria comment for burst dequeue
On Fri, Feb 10, 2017 at 09:56:50PM +0530, Nipun Gupta wrote:
> Signed-off-by: Nipun Gupta
> Acked-by: Harry van Haaren
Applied to dpdk-next-eventdev/master. Thanks.
> ---
> Changes for v2:
> - Fix errors reported by check-git-log.sh
> Changes for v3:
> - Corrected comment's language
>
> lib/librte_eventdev/rte_eventdev.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/librte_eventdev/rte_eventdev.h
> b/lib/librte_eventdev/rte_eventdev.h
> index c2f9310..29f0f46 100644
> --- a/lib/librte_eventdev/rte_eventdev.h
> +++ b/lib/librte_eventdev/rte_eventdev.h
> @@ -1216,7 +1216,7 @@ struct rte_eventdev {
> * - 0 no-wait, returns immediately if there is no event.
> * - >0 wait for the event, if the device is configured with
> * RTE_EVENT_DEV_CFG_PER_DEQUEUE_TIMEOUT then this function will wait until
> - * the event available or *timeout_ticks* time.
> + * at least one event is available or *timeout_ticks* time.
> * if the device is not configured with
> RTE_EVENT_DEV_CFG_PER_DEQUEUE_TIMEOUT
> * then this function will wait until the event available or
> * *dequeue_timeout_ns* ns which was previously supplied to
> --
> 1.9.1
>
Re: [dpdk-dev] [PATCH v2] app/crypto-perf: fix for segfault when bad optype is used with gcm alghorithms
Hi Daniel,
> -Original Message-
> From: Mrzyglod, DanielX T
> Sent: Thursday, February 16, 2017 11:27 AM
> To: Mrozowicz, SlawomirX; Doherty, Declan; De Lara Guarch, Pablo
> Cc: dev@dpdk.org; Mrzyglod, DanielX T
> Subject: [PATCH v2] app/crypto-perf: fix for segfault when bad optype is
> used with gcm alghorithms
Typo in the title. Also, title is too long. Maybe something like "avoid wrong
optype for AEAD algorithms" is better.
>
> When somebody use bad --optype with aead alghorithms
> segmentation fault could happen.
>
> Fixes: f8be1786b1b8 ("app/crypto-perf: introduce performance test
> application")
>
> Signed-off-by: Daniel Mrzyglod
...
> ---
> app/test-crypto-perf/cperf_options_parsing.c | 9 +
> app/test-crypto-perf/main.c | 6 --
> doc/guides/tools/cryptoperf.rst | 2 ++
> 3 files changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/app/test-crypto-perf/cperf_options_parsing.c b/app/test-crypto-
> perf/cperf_options_parsing.c
> index c1d5ffc..215a07b 100644
> --- a/app/test-crypto-perf/cperf_options_parsing.c
> +++ b/app/test-crypto-perf/cperf_options_parsing.c
> @@ -829,6 +829,15 @@ cperf_options_check(struct cperf_options
> *options)
> }
> }
>
> + if (options->cipher_algo == RTE_CRYPTO_CIPHER_AES_GCM ||
> + options->auth_algo ==
> RTE_CRYPTO_AUTH_AES_GCM ||
> + options->auth_algo ==
> RTE_CRYPTO_AUTH_AES_GMAC) {
I would expend this to AES_CCM as well, as it is another AEAD algorithm.
> + if (options->op_type != CPERF_AEAD) {
> + RTE_LOG(ERR, USER1, "Use --optype aead\n");
> + return -EINVAL;
> + }
> + }
> +
> return 0;
> }
>
...
> diff --git a/doc/guides/tools/cryptoperf.rst
> b/doc/guides/tools/cryptoperf.rst
> index 1fc40c4..9cb3338 100644
> --- a/doc/guides/tools/cryptoperf.rst
> +++ b/doc/guides/tools/cryptoperf.rst
> @@ -180,6 +180,8 @@ The following are the appication command-line
> options:
> auth-then-cipher
> aead
>
> +For GCM algorithms you should use aead flag.
Include CCM here too.
> +
> * ``--sessionless``
>
> Enable session-less crypto operations mode.
> --
> 2.7.4
Re: [dpdk-dev] [v4 0/3] Merge l3fwd-acl and l3fwd
> -Original Message- > From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Ravi Kerur > Sent: Sunday, March 5, 2017 7:47 PM > To: dev@dpdk.org > Cc: Ananyev, Konstantin ; Richardson, Bruce > ; Ravi Kerur > Subject: [dpdk-dev] [v4 0/3] Merge l3fwd-acl and l3fwd > > This patchset merges l3fwd-acl and l3fwd code into common directory. > Adds file read options to build LPM and EM tables. Hi Ravi, Thanks to this. It seems like a good change. There are probably too many L2/L3 variants and some of them should be merged. Note, you will also have to merge the sample app guides in some sensible way: http://dpdk.org/doc/guides/sample_app_ug/l3_forward.html http://dpdk.org/doc/guides/sample_app_ug/l3_forward_access_ctrl.html John
Re: [dpdk-dev] [v4 3/3] EM config file read option.
> -Original Message- > From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Ravi Kerur > Sent: Sunday, March 5, 2017 7:47 PM > To: dev@dpdk.org > Cc: Ananyev, Konstantin ; Richardson, Bruce > ; Ravi Kerur > Subject: [dpdk-dev] [v4 3/3] EM config file read option. > > v4: > > No changes. > > v3: > > Fix additional checkpatch coding style issues. > > v2: > > Fix checkpatch warnings. > > v1: > > Remove static array configuration of Dest IP,Src IP, Dest > port, Src port, Proto and IF_OUT for EM and EM6 config. > > Add reading configuration from a file. > > Format of configuration file is as follows > #EM route entries, > #Dest-IP Src-IP Dest-port Src-port Proto IF_OUT > E101.0.0.0 100.10.0.0 101 11 0x06 0 > E201.0.0.0 200.20.0.0 102 12 0x06 1 > E111.0.0.0 211.30.0.0 101 11 0x06 2 > ... > > #EM6 route entries > #Dest-IP Src-IP Dest-port Src-port Proto IF_OUT > Efe80::::021e:67ff:fe00: > fe80::::021b:21ff:fe91:3805 101 11 0x06 0 > Efe90::::021e:67ff:fe00: > fe90::::021b:21ff:fe91:3805 102 12 0x06 1 > ... Hi Ravi, Just a note on the structure of the commit message for this and the other patches. The first thing to do if you are new to contributing to DPDK is to have a read through the guidelines on "Contributing Code to DPDK": http://dpdk.org/doc/guides/contributing/patches.html In particular the subject line should contain the component that is being modified. Something like: examples/l3fwd: add config file support for exact match Do a git log examples/l3fwd to see some other examples and have a look at the following "Commit Messages: Subject Line" section of the above guidelines http://dpdk.org/doc/guides/contributing/patches.html#commit-messages-subject-line The body of the message should contain a short description of what you are changing, at a high level, and why you are changing it. See also: http://dpdk.org/doc/guides/contributing/patches.html#commit-messages-body The version information in your commit message is good but that should be included after the --- line so that it is part of the patch but not part of the commit message. John.
Re: [dpdk-dev] [PATCH] eventdev: remove default queue overriding
On Wed, Mar 01, 2017 at 12:49:02PM +, Harry van Haaren wrote: > PMDs that only do a specific type of scheduling cannot provide > CFG_ALL_TYPES, so the Eventdev infrastructure should not demand > that every PMD supports CFG_ALL_TYPES. Sure. Then I think then we can enumerate CFG_ALL_TYPES as capability. Meaning, New flag in event_dev_cap to denote PMD can support all the sched type per queue. My reasoning for the capability flag is because, The application flow will be depended on the logic of creating the queue with different flags. Thoughts ? I thought, In SW implementation, We can create 3 virtual queues per queue. Based on en-queue's shed_type, implementation can choose the correct underneath virtual queue. I guess, it has performance issues, if so, Maybe capability is the way forward. Setting to CFG_ALL_TYPES will be useful for flow based event pipeling as I mentioned earlier in other email. > By not overriding the default configuration of the queue as > suggested by the PMD, the eventdev_common unit tests can pass > on all PMDs, regardless of thier capabilities. Make sense. We can remove the default as CFG_ALL_TYPES. > > RTE_EVENT_QUEUE_CFG_DEFAULT is no longer used by the eventdev layer > it can be removed now. Applications should use CFG_ALL_TYPES > if they require enqueue of all types a queue. > > Signed-off-by: Harry van Haaren > --- > lib/librte_eventdev/rte_eventdev.c | 1 - > lib/librte_eventdev/rte_eventdev.h | 6 -- > 2 files changed, 7 deletions(-) > > diff --git a/lib/librte_eventdev/rte_eventdev.c > b/lib/librte_eventdev/rte_eventdev.c > index 68bfc3b..c32a776 100644 > --- a/lib/librte_eventdev/rte_eventdev.c > +++ b/lib/librte_eventdev/rte_eventdev.c > @@ -593,7 +593,6 @@ rte_event_queue_setup(uint8_t dev_id, uint8_t queue_id, > RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->queue_def_conf, > -ENOTSUP); > (*dev->dev_ops->queue_def_conf)(dev, queue_id, &def_conf); > - def_conf.event_queue_cfg = RTE_EVENT_QUEUE_CFG_DEFAULT; > queue_conf = &def_conf; > } > > diff --git a/lib/librte_eventdev/rte_eventdev.h > b/lib/librte_eventdev/rte_eventdev.h > index 7073987..d836f61 100644 > --- a/lib/librte_eventdev/rte_eventdev.h > +++ b/lib/librte_eventdev/rte_eventdev.h > @@ -471,12 +471,6 @@ rte_event_dev_configure(uint8_t dev_id, > /* Event queue specific APIs */ > > /* Event queue configuration bitmap flags */ > -#define RTE_EVENT_QUEUE_CFG_DEFAULT(0) > -/**< Default value of *event_queue_cfg* when rte_event_queue_setup() invoked > - * with queue_conf == NULL > - * > - * @see rte_event_queue_setup() > - */ > #define RTE_EVENT_QUEUE_CFG_TYPE_MASK (3ULL << 0) > /**< Mask for event queue schedule type configuration request */ > #define RTE_EVENT_QUEUE_CFG_ALL_TYPES (0ULL << 0) > -- > 2.7.4 >
[dpdk-dev] [PATCH v2] net/tap: fix dev name look-up
Store the device name in dev->data->name, to have symmetrical behavior
between rte_pmd_tap_probe(name) and rte_pmd_tap_remove(name).
The netdevice name (linux interface name) is stored in the name field of
struct pmd_internals.
There's no need to allocate an rte_eth_dev_data, as it is done in
rte_eth_dev_allocate()/rte_eth_dev_data_alloc().
Signed-off-by: Pascal Mazon
---
drivers/net/tap/rte_eth_tap.c | 15 ++-
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index 47a706070652..839c4187a47f 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -651,23 +651,22 @@ eth_dev_tap_create(const char *name, char *tap_name)
RTE_LOG(DEBUG, PMD, " TAP device on numa %u\n", rte_socket_id());
- data = rte_zmalloc_socket(tap_name, sizeof(*data), 0, numa_node);
- if (!data) {
- RTE_LOG(ERR, PMD, "TAP Failed to allocate data\n");
- goto error_exit;
- }
-
pmd = rte_zmalloc_socket(tap_name, sizeof(*pmd), 0, numa_node);
if (!pmd) {
RTE_LOG(ERR, PMD, "TAP Unable to allocate internal struct\n");
goto error_exit;
}
- dev = rte_eth_dev_allocate(tap_name);
+ dev = rte_eth_dev_allocate(name);
if (!dev) {
RTE_LOG(ERR, PMD, "TAP Unable to allocate device struct\n");
goto error_exit;
}
+ data = dev->data;
+ if (!dev->data) {
+ RTE_LOG(ERR, PMD, "TAP Failed to allocate data\n");
+ goto error_exit;
+ }
snprintf(pmd->name, sizeof(pmd->name), "%s", tap_name);
@@ -686,12 +685,10 @@ eth_dev_tap_create(const char *name, char *tap_name)
data->nb_rx_queues = pmd->nb_queues;
data->nb_tx_queues = pmd->nb_queues;
- dev->data = data;
dev->dev_ops = &ops;
dev->driver = NULL;
dev->rx_pkt_burst = pmd_rx_burst;
dev->tx_pkt_burst = pmd_tx_burst;
- snprintf(dev->data->name, sizeof(dev->data->name), "%s", name);
/* Presetup the fds to -1 as being not valid */
for (i = 0; i < RTE_PMD_TAP_MAX_QUEUES; i++) {
--
2.8.0.rc0
Re: [dpdk-dev] [PATCH 00/12] introduce fail-safe PMD
On Fri, Mar 03, 2017 at 04:14:20PM +, Bruce Richardson wrote: On Fri, Mar 03, 2017 at 04:40:22PM +0100, Gaetan Rivet wrote: This PMD intercepts and manages Ethernet device removal events issued by slave PMDs and re-initializes them transparently when brought back so that existing applications do not need to be modified to benefit from true hot-plugging support. The stacked PMD approach shares many similarities with the bonding PMD but with a different purpose. While bonding provides the ability to group several links into a single logical device for enhanced throughput and supports fail-over at link level, this one manages the sudden disappearance of the underlying device; it guarantees applications face a valid device in working order at all times. Each fail-safe instance is configured to run atop one or several devices, with one defined as the preferred device. Hot-plug events are handled on all of them, and Tx is always directed to the preferred device if present or to the next available failover device (Rx is always performed on all devices for simplicity). Moreover, the configured slaves (preferred or failover) do not need to be present at initialization time and may appear later. Slaves configuration is continuously synchronized with that of the virtual device, which exposes their common set of capabilities to the application. Failure to apply the current configuration state to a slave for any reason simply reschedules its initialization. This series depends on the series [PATCH 0/4] clarify eth_dev state management [PATCH 0/5] add device removal event Hi, Hi Bruce, this looks an interesting PMD, and I like the wrapper approach. However, why duplicate the functionality of the bonding device in another device driver? Is it not possible to have this driver wrap individual devices and then have the bonding driver use those wrapped devices to present an omni-present device? It seems strange to have support for grouping devices together in two different drivers - one should leverage the other. Yes there appears to be a certain amount of overlap between these two PMDs from the above description. Actually we've considered modifying bonding at first but found it to be fundamentally incompatible: - By design, with bonding, applications are aware of slave PMDs and can use them directly (even if they shouldn't, depending on the aggregation mode). If they were supported, hot-plug events would have to be managed by the application as well. - With fail-safe, slaves are provided as PMD parameters and are fully owned by the parent instance, which takes care of their entire initialization and provides transparent support for hot-plug events. Their purposes also differ: - Bonding implements various modes of operation for link aggregation (round robin, active backup, LACP...) in the same fashion as the Linux bond driver. - Fail-safe handles hot-plug events so applications do not have to. To answer your second question, both are stackable: the fail-safe design aims at being the most transparent possible, meaning that it should make no difference to applications using it, whether within a bond or not. Alternatively, should this be merged into the bonding driver or replace it? Applications (or users) that need their combined functionality benefit from greater flexibility this way, so I think having them both in the tree makes sense. Regards, /Bruce Regards -- Gaëtan Rivet 6WIND
Re: [dpdk-dev] [v4 2/3] LPM config file read option.
> -Original Message-
> From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Ravi Kerur
> Sent: Sunday, March 5, 2017 7:47 PM
> To: dev@dpdk.org
> Cc: Ananyev, Konstantin ; Richardson, Bruce
> ; Ravi Kerur
> Subject: [dpdk-dev] [v4 2/3] LPM config file read option.
>
> ...
> +
> +#define IPV6_ADDR_LEN 16
> +#define IPV6_ADDR_U16 (IPV6_ADDR_LEN / sizeof(uint16_t))
> +#define IPV6_ADDR_U32 (IPV6_ADDR_LEN / sizeof(uint32_t))
> +
> +#define GET_CB_FIELD(in, fd, base, lim, dlm) do {\
> + unsigned long val; \
> + char *end; \
> + errno = 0; \
> + val = strtoul((in), &end, (base)); \
> + if (errno != 0 || end[0] != (dlm) || val > (lim)) \
> + return -EINVAL; \
> + (fd) = (typeof(fd))val; \
> + (in) = end + 1; \
> +} while (0)
Hi,
It is probably worth putting a comment before this macro to
explain what it does. Also, it isn't clear, to me, what CB
stands for. Also, having a return in the middle of the macro
might be problematic if it is used in a function with a
different, or not, return value.
John
Re: [dpdk-dev] [PATCH 2/6] net/tap: add speed capabilities
On Fri, 3 Mar 2017 15:27:12 +
"Wiles, Keith" wrote:
>
> > On Mar 3, 2017, at 3:46 AM, Pascal Mazon
> > wrote:
> >
> > Tap PMD is flexible, it supports any speed.
> >
> > Signed-off-by: Pascal Mazon
> > ---
> > doc/guides/nics/features/tap.ini | 1 +
> > drivers/net/tap/rte_eth_tap.c| 35
> > +++ 2 files changed, 36
> > insertions(+)
> >
> > diff --git a/doc/guides/nics/features/tap.ini
> > b/doc/guides/nics/features/tap.ini index d9b47a003654..dad5a0561087
> > 100644 --- a/doc/guides/nics/features/tap.ini
> > +++ b/doc/guides/nics/features/tap.ini
> > @@ -9,6 +9,7 @@ Jumbo frame = Y
> > Promiscuous mode = Y
> > Allmulticast mode= Y
> > Basic stats = Y
> > +Speed capabilities = Y
> > Unicast MAC filter = Y
> > Other kdrv = Y
> > ARMv7= Y
> > diff --git a/drivers/net/tap/rte_eth_tap.c
> > b/drivers/net/tap/rte_eth_tap.c index 994c8be701c8..6670dfbb35ce
> > 100644 --- a/drivers/net/tap/rte_eth_tap.c
> > +++ b/drivers/net/tap/rte_eth_tap.c
> > @@ -351,6 +351,40 @@ tap_dev_configure(struct rte_eth_dev *dev
> > __rte_unused) return 0;
> > }
> >
> > +static uint32_t
> > +tap_dev_speed_capa(void)
> > +{
> > + uint32_t speed = pmd_link.link_speed;
> > + uint32_t capa = 0;
> > +
> > + if (speed >= ETH_SPEED_NUM_10M)
> > + capa |= ETH_LINK_SPEED_10M;
> > + if (speed >= ETH_SPEED_NUM_100M)
> > + capa |= ETH_LINK_SPEED_100M;
> > + if (speed >= ETH_SPEED_NUM_1G)
> > + capa |= ETH_LINK_SPEED_1G;
> > + if (speed >= ETH_SPEED_NUM_5G)
> > + capa |= ETH_LINK_SPEED_2_5G;
> > + if (speed >= ETH_SPEED_NUM_5G)
> > + capa |= ETH_LINK_SPEED_5G;
> > + if (speed >= ETH_SPEED_NUM_10G)
> > + capa |= ETH_LINK_SPEED_10G;
> > + if (speed >= ETH_SPEED_NUM_20G)
> > + capa |= ETH_LINK_SPEED_20G;
> > + if (speed >= ETH_SPEED_NUM_25G)
> > + capa |= ETH_LINK_SPEED_25G;
> > + if (speed >= ETH_SPEED_NUM_40G)
> > + capa |= ETH_LINK_SPEED_40G;
> > + if (speed >= ETH_SPEED_NUM_50G)
> > + capa |= ETH_LINK_SPEED_50G;
> > + if (speed >= ETH_SPEED_NUM_56G)
> > + capa |= ETH_LINK_SPEED_56G;
> > + if (speed >= ETH_SPEED_NUM_100G)
> > + capa |= ETH_LINK_SPEED_100G;
>
> In the real world the NIC may only support 50G an not say 10M, so in
> that case this code would be wrong as it would set all of the speeds
> up to 50G. I do not think the code should be changed, but I add a
> comment to tell the developer the issue here. I do not want someone
> copying the code and thinking is i correct for a real device.
>
That's true for actual hardware. But tap is completely virtual, so
actually it could support any speed (it is limited by userland-kernel
communication speed).
What speed would you rather have the tap PMD report as capable of?
Best regards,
Pascal
> > +
> > + return capa;
> > +}
> > +
> > static void
> > tap_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info
> > *dev_info) {
> > @@ -363,6 +397,7 @@ tap_dev_info(struct rte_eth_dev *dev, struct
> > rte_eth_dev_info *dev_info) dev_info->max_tx_queues =
> > internals->nb_queues; dev_info->min_rx_bufsize = 0;
> > dev_info->pci_dev = NULL;
> > + dev_info->speed_capa = tap_dev_speed_capa();
> > }
> >
> > static void
> > --
> > 2.8.0.rc0
> >
>
> Regards,
> Keith
>
[dpdk-dev] [PATCH] Fix doc: dpdk_nic_bind.py renamed to dpdk-devbind.py
From: Julien Castets --- doc/guides/linux_gsg/build_dpdk.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guides/linux_gsg/build_dpdk.rst b/doc/guides/linux_gsg/build_dpdk.rst index eadade276..9d245737d 100644 --- a/doc/guides/linux_gsg/build_dpdk.rst +++ b/doc/guides/linux_gsg/build_dpdk.rst @@ -208,7 +208,7 @@ Any network ports under Linux* control will be ignored by the DPDK poll-mode dri To bind ports to the ``uio_pci_generic``, ``igb_uio`` or ``vfio-pci`` module for DPDK use, and then subsequently return ports to Linux* control, -a utility script called dpdk_nic _bind.py is provided in the usertools subdirectory. +a utility script called dpdk-devbind.py is provided in the usertools subdirectory. This utility can be used to provide a view of the current state of the network ports on the system, and to bind and unbind those ports from the different kernel modules, including the uio and vfio modules. The following are some examples of how the script can be used. -- 2.11.0
Re: [dpdk-dev] [PATCH 4/6] net/tap: add MTU management
On Fri, 3 Mar 2017 15:23:28 +
"Wiles, Keith" wrote:
>
> > On Mar 3, 2017, at 3:46 AM, Pascal Mazon
> > wrote:
> >
> > The MTU is assigned to the tap netdevice according to the argument,
> > but packet transmission and reception just write/read on an fd with
> > the default limit being the socket buffer size.
> >
> > Signed-off-by: Pascal Mazon
> > ---
> > doc/guides/nics/features/tap.ini | 1 +
> > drivers/net/tap/rte_eth_tap.c| 37
> > + 2 files changed, 38
> > insertions(+)
> >
> > diff --git a/doc/guides/nics/features/tap.ini
> > b/doc/guides/nics/features/tap.ini index 6878a9b8fd17..6aa11874e2bc
> > 100644 --- a/doc/guides/nics/features/tap.ini
> > +++ b/doc/guides/nics/features/tap.ini
> > @@ -9,6 +9,7 @@ Jumbo frame = Y
> > Promiscuous mode = Y
> > Allmulticast mode= Y
> > Basic stats = Y
> > +MTU update = Y
> > Multicast MAC filter = Y
> > Speed capabilities = Y
> > Unicast MAC filter = Y
> > diff --git a/drivers/net/tap/rte_eth_tap.c
> > b/drivers/net/tap/rte_eth_tap.c index 131c09fbc1a5..64b84cd76321
> > 100644 --- a/drivers/net/tap/rte_eth_tap.c
> > +++ b/drivers/net/tap/rte_eth_tap.c
> > @@ -724,6 +724,42 @@ tap_set_mc_addr_list(struct rte_eth_dev *dev
> > __rte_unused, return 0;
> > }
> >
> > +static int
> > +tap_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
> > +{
> > + struct pmd_internals *pmd = dev->data->dev_private;
> > + struct ifreq ifr;
> > + int err, s;
> > +
> > + s = socket(AF_INET, SOCK_DGRAM, 0);
> > + if (s < 0) {
> > + RTE_LOG(ERR, PMD,
> > + "Unable to get a socket for %s to set
> > flags: %s\n",
> > + pmd->name, strerror(errno));
> > + return -1;
> > + }
> > + memset(&ifr, 0, sizeof(ifr));
> > + strncpy(ifr.ifr_name, pmd->name, IFNAMSIZ);
>
> This needs to be converted to a snprintf() to avoid overflow.
>
Ok, I'll do that in version 2.
Regards,
Pascal
> > + err = ioctl(s, SIOCGIFMTU, &ifr);
> > + if (err < 0) {
> > + RTE_LOG(WARNING, PMD, "Unable to get %s device
> > MTU: %s\n",
> > + pmd->name, strerror(errno));
> > + close(s);
> > + return -1;
> > + }
> > + ifr.ifr_mtu = mtu;
> > + err = ioctl(s, SIOCSIFMTU, &ifr);
> > + if (err < 0) {
> > + RTE_LOG(WARNING, PMD, "Unable to set %s mtu %d:
> > %s\n",
> > + pmd->name, mtu, strerror(errno));
> > + close(s);
> > + return -1;
> > + }
> > + close(s);
> > + dev->data->mtu = mtu;
> > + return 0;
> > +}
> > +
> > static const struct eth_dev_ops ops = {
> > .dev_start = tap_dev_start,
> > .dev_stop = tap_dev_stop,
> > @@ -745,6 +781,7 @@ static const struct eth_dev_ops ops = {
> > .mac_addr_add = tap_mac_add,
> > .mac_addr_set = tap_mac_set,
> > .set_mc_addr_list = tap_set_mc_addr_list,
> > + .mtu_set= tap_mtu_set,
> > .stats_get = tap_stats_get,
> > .stats_reset= tap_stats_reset,
> > };
> > --
> > 2.8.0.rc0
> >
>
> Regards,
> Keith
>
Re: [dpdk-dev] [PATCH 1/6] net/sfc: add VFs to the table of PCI IDs for supported NICs
On 03/06/2017 01:10 PM, Ferruh Yigit wrote:
On 3/2/2017 3:46 PM, Andrew Rybchenko wrote:
From: Ivan Malov
Signed-off-by: Ivan Malov
Signed-off-by: Andrew Rybchenko
Reviewed-by: Andrew Lee
---
drivers/net/sfc/sfc_ethdev.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c
index 71587fb..be19453 100644
--- a/drivers/net/sfc/sfc_ethdev.c
+++ b/drivers/net/sfc/sfc_ethdev.c
@@ -1335,8 +1335,11 @@ sfc_eth_dev_uninit(struct rte_eth_dev *dev)
static const struct rte_pci_id pci_id_sfc_efx_map[] = {
{ RTE_PCI_DEVICE(EFX_PCI_VENID_SFC, EFX_PCI_DEVID_FARMINGDALE) },
+ { RTE_PCI_DEVICE(EFX_PCI_VENID_SFC, EFX_PCI_DEVID_FARMINGDALE_VF) },
Since driver now support VF devices, it is possible to set "SR-IOV"
feature enabled in sfc_efx.ini.
Thanks a lot. We will add the feature.
{ RTE_PCI_DEVICE(EFX_PCI_VENID_SFC, EFX_PCI_DEVID_GREENPORT) },
+ { RTE_PCI_DEVICE(EFX_PCI_VENID_SFC, EFX_PCI_DEVID_GREENPORT_VF) },
{ RTE_PCI_DEVICE(EFX_PCI_VENID_SFC, EFX_PCI_DEVID_MEDFORD) },
+ { RTE_PCI_DEVICE(EFX_PCI_VENID_SFC, EFX_PCI_DEVID_MEDFORD_VF) },
{ .vendor_id = 0 /* sentinel */ }
};
Re: [dpdk-dev] [PATCH] app/crypto-perf: fix uninitialized values for null operations
> -Original Message-
> From: Kulasek, TomaszX
> Sent: Friday, February 24, 2017 3:26 PM
> To: dev@dpdk.org
> Cc: De Lara Guarch, Pablo
> Subject: [PATCH] app/crypto-perf: fix uninitialized values for null operations
>
> Some values are uninitialized for "cipher null" and "auth null"
> operations. It may cause unpredictable results for some crypto pmd
> drivers, or even segmentation fault.
>
> This patch sets values for null operations to zero.
>
> Fixes: f8be1786b1b8 ("app/crypto-perf: introduce performance test
> application")
> Signed-off-by: Tomasz Kulasek
Acked-by: Pablo de Lara
Re: [dpdk-dev] [PATCH 5/6] net/tap: add packet type management
On Fri, 3 Mar 2017 15:31:14 +
"Wiles, Keith" wrote:
>
> > On Mar 3, 2017, at 3:46 AM, Pascal Mazon
> > wrote:
> >
> > Advertize RTE_PTYPE_UNKNOWN since tap does not report any packet
> > type.
> >
> > Signed-off-by: Pascal Mazon
> > ---
> > doc/guides/nics/features/tap.ini | 1 +
> > drivers/net/tap/rte_eth_tap.c| 15 +++
> > 2 files changed, 16 insertions(+)
> >
> > diff --git a/doc/guides/nics/features/tap.ini
> > b/doc/guides/nics/features/tap.ini index 6aa11874e2bc..7f3f4d661dd7
> > 100644 --- a/doc/guides/nics/features/tap.ini
> > +++ b/doc/guides/nics/features/tap.ini
> > @@ -13,6 +13,7 @@ MTU update = Y
> > Multicast MAC filter = Y
> > Speed capabilities = Y
> > Unicast MAC filter = Y
> > +Packet type parsing = Y
> > Other kdrv = Y
> > ARMv7= Y
> > ARMv8= Y
> > diff --git a/drivers/net/tap/rte_eth_tap.c
> > b/drivers/net/tap/rte_eth_tap.c index 64b84cd76321..e4af36a6d142
> > 100644 --- a/drivers/net/tap/rte_eth_tap.c
> > +++ b/drivers/net/tap/rte_eth_tap.c
> > @@ -36,6 +36,7 @@
> > #include
> > #include
> > #include
> > +#include
> >
> > #include
> > #include
> > @@ -216,6 +217,8 @@ pmd_rx_burst(void *queue, struct rte_mbuf
> > **bufs, uint16_t nb_pkts) mbuf->data_len = len;
> > mbuf->pkt_len = len;
> > mbuf->port = rxq->in_port;
> > + mbuf->packet_type = rte_net_get_ptype(mbuf, NULL,
> > +
> > RTE_PTYPE_ALL_MASK);
> >
> > /* account for the receive frame */
> > bufs[num_rx++] = mbuf;
> > @@ -760,6 +763,17 @@ tap_mtu_set(struct rte_eth_dev *dev, uint16_t
> > mtu) return 0;
> > }
> >
> > +static const uint32_t*
> > +tap_dev_supported_ptypes_get(struct rte_eth_dev *dev __rte_unused)
> > +{
> > + static const uint32_t ptypes[] = {
> > + RTE_PTYPE_UNKNOWN,
> > +
> > + };
> > +
> > + return ptypes;
> > +}
>
> Can we just add the code to grab the ptype value instead of just
> saying not supported.
>
> The original code would just return an error from ethdev correct,
> what was wrong with that one. I would like to see the tap PMD just
> return the ptype would that not be more useful?
>
tap PMD depends on the rte_net_get_ptype(), which code may change in the
future to support more packet types. Those changes would then need to be
reflected on the tap PMD, to be consistent.
I reported only RTE_PTYPE_UNKNOWN to avoid keeping a tight sync with the
rte_net library. As we're allowed to be more precise in the packet types
we actually set, compared to those we declare as supported, I thought it
best.
Would you indeed rather we copied all currently supported packet types
from rte_net to tap_dev_supported_ptypes_get()?
Regards,
Pascal
> > +
> > static const struct eth_dev_ops ops = {
> > .dev_start = tap_dev_start,
> > .dev_stop = tap_dev_stop,
> > @@ -784,6 +798,7 @@ static const struct eth_dev_ops ops = {
> > .mtu_set= tap_mtu_set,
> > .stats_get = tap_stats_get,
> > .stats_reset= tap_stats_reset,
> > + .dev_supported_ptypes_get = tap_dev_supported_ptypes_get,
> > };
> >
> > static int
> > --
> > 2.8.0.rc0
> >
>
> Regards,
> Keith
>
Re: [dpdk-dev] [v4 2/3] LPM config file read option.
> -Original Message-
> From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Mcnamara, John
> Sent: Monday, March 6, 2017 1:57 PM
> To: Ravi Kerur ; dev@dpdk.org
> Cc: Ananyev, Konstantin ; Richardson, Bruce
>
> Subject: Re: [dpdk-dev] [v4 2/3] LPM config file read option.
>
>
>
> > -Original Message-
> > From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Ravi Kerur
> > Sent: Sunday, March 5, 2017 7:47 PM
> > To: dev@dpdk.org
> > Cc: Ananyev, Konstantin ; Richardson,
> > Bruce ; Ravi Kerur
> > Subject: [dpdk-dev] [v4 2/3] LPM config file read option.
> >
> > ...
> > +
> > +#defineIPV6_ADDR_LEN 16
> > +#defineIPV6_ADDR_U16 (IPV6_ADDR_LEN / sizeof(uint16_t))
> > +#defineIPV6_ADDR_U32 (IPV6_ADDR_LEN / sizeof(uint32_t))
> > +
> > +#define GET_CB_FIELD(in, fd, base, lim, dlm) do {\
> > + unsigned long val; \
> > + char *end; \
> > + errno = 0; \
> > + val = strtoul((in), &end, (base)); \
> > + if (errno != 0 || end[0] != (dlm) || val > (lim)) \
> > + return -EINVAL; \
> > + (fd) = (typeof(fd))val; \
> > + (in) = end + 1; \
> > +} while (0)
>
> Hi,
>
> It is probably worth putting a comment before this macro to explain what
> it does. Also, it isn't clear, to me, what CB stands for. Also, having a
> return in the middle of the macro might be problematic if it is used in a
> function with a different, or not, return value.
>
Nevermind. I see that this macro was already there and you just moved it.
So, it is not your problem. :-)
John
Re: [dpdk-dev] [RFC PATCH] net/virtio: Align Virtio-net header on cache line in receive path
On 03/06/2017 09:46 AM, Yuanhan Liu wrote: On Wed, Mar 01, 2017 at 08:36:24AM +0100, Maxime Coquelin wrote: On 02/23/2017 06:49 AM, Yuanhan Liu wrote: On Wed, Feb 22, 2017 at 10:36:36AM +0100, Maxime Coquelin wrote: On 02/22/2017 02:37 AM, Yuanhan Liu wrote: On Tue, Feb 21, 2017 at 06:32:43PM +0100, Maxime Coquelin wrote: This patch aligns the Virtio-net header on a cache-line boundary to optimize cache utilization, as it puts the Virtio-net header (which is always accessed) on the same cache line as the packet header. For example with an application that forwards packets at L2 level, a single cache-line will be accessed with this patch, instead of two before. I'm assuming you were testing pkt size <= (64 - hdr_size)? No, I tested with 64 bytes packets only. Oh, my bad, I overlooked it. While you were saying "a single cache line", I was thinking putting the virtio net hdr and the "whole" packet data in single cache line, which is not possible for pkt size 64B. I run some more tests this morning with different packet sizes, and also with changing the mbuf size on guest side to have multi- buffers packets: +---+++-+ | Txpkt | Rxmbuf | v17.02 | v17.02 + vnet hdr align | +---+++-+ |64 | 2048 | 11.05 | 11.78 | | 128 | 2048 | 10.66 | 11.48 | | 256 | 2048 | 10.47 | 11.21 | | 512 | 2048 | 10.22 | 10.88 | | 1024 | 2048 | 7.65 |7.84 | | 1500 | 2048 | 6.25 |6.45 | | 2000 | 2048 | 5.31 |5.43 | | 2048 | 2048 | 5.32 |4.25 | | 1500 |512 | 3.89 |3.98 | | 2048 |512 | 1.96 |2.02 | +---+++-+ Could you share more info, say is it a PVP test? Is mergeable on? What's the fwd mode? No, this is not PVP benchmark, I have neither another server nor a packet generator connected to my Haswell machine back-to-back. This is simple micro-benchmark, vhost PMD in txonly, Virtio PMD in rxonly. In this configuration, mergeable is ON and no offload disabled in QEMU cmdline. Okay, I see. So the boost, as you have stated, comes from saving two cache line access to one. Before that, vhost write 2 cache lines, while the virtio pmd reads 2 cache lines: one for reading the header, another one for reading the ether header, for updating xstats (there is no ether access in the fwd mode you tested). That's why I would be interested in more testing on recent hardware with PVP benchmark. Is it something that could be run in Intel lab? I think Yao Lei could help on that? But as stated, I think it may break the performance for bit packets. And I also won't expect big boost even for 64B in PVP test, judging that it's only 6% boost in micro bechmarking. That would be great. Note that on SandyBridge, on which I see a drop in perf with microbenchmark, I get a 4% gain on PVP benchmark. So on recent hardware that show a gain on microbenchmark, I'm curious of the gain with PVP bench. Cheers, Maxime
Re: [dpdk-dev] [PATCH] net/tap: fix dev name look-up
> On Mar 5, 2017, at 3:35 PM, Yigit, Ferruh wrote:
>
> On 3/3/2017 8:54 AM, Pascal Mazon wrote:
>> The call to rte_eth_dev_allocate(tap_name) sets dev->data->name to
>> tap_name (e.g. "dtap0").
>>
>> A look-up using tap_name is expected to return this device, not a
>> look-up using name (e.g. "net_tap0").
>
> This will break rte_pmd_tap_remove(), because it gets device name
> (net_tap0) as parameter.
>
> And logically this is wrong too, current eth_dev->data->name is to keep
> device name, all other PMDs use this way, not for Linux interface name.
>
> Current tap PMD, first gives "dtap0" to rte_eth_dev_allocate() as
> argument, which sets device name to this value. Later with snprintf()
> overwrites the device name with correct value, I think better thing to
> do is give correct argument to rte_eth_dev_allocate() and remove snprintf()
All of these different names for the device is driving me crazy :-)
As long as the name of the device as seen from the ifconfig command or host
facing name is dtapX then I am ok. We need to clean this up somehow as it is
very confusing.
>
>>
>> Signed-off-by: Pascal Mazon
>> ---
>> drivers/net/tap/rte_eth_tap.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
>> index 47a706070652..14c345f07afa 100644
>> --- a/drivers/net/tap/rte_eth_tap.c
>> +++ b/drivers/net/tap/rte_eth_tap.c
>> @@ -691,7 +691,7 @@ eth_dev_tap_create(const char *name, char *tap_name)
>> dev->driver = NULL;
>> dev->rx_pkt_burst = pmd_rx_burst;
>> dev->tx_pkt_burst = pmd_tx_burst;
>> -snprintf(dev->data->name, sizeof(dev->data->name), "%s", name);
>> +snprintf(dev->data->name, sizeof(dev->data->name), "%s", tap_name);
>>
>> /* Presetup the fds to -1 as being not valid */
>> for (i = 0; i < RTE_PMD_TAP_MAX_QUEUES; i++) {
>>
>
Regards,
Keith
Re: [dpdk-dev] [PATCH 1/4] net/tap: move private elements to external header
On Fri, 3 Mar 2017 15:38:11 +
"Wiles, Keith" wrote:
>
> > On Mar 3, 2017, at 4:45 AM, Pascal Mazon
> > wrote:
> >
> > In the next patch, access to struct pmd_internals will be necessary
> > in tap_flow.c to store the flows.
> >
> > Signed-off-by: Pascal Mazon
> > Acked-by: Olga Shern
> > ---
> > drivers/net/tap/Makefile | 1 +
> > drivers/net/tap/rte_eth_tap.c | 34 ++--
> > drivers/net/tap/tap.h | 73
> > +++ 3 files changed, 76
> > insertions(+), 32 deletions(-) create mode 100644
> > drivers/net/tap/tap.h
> >
> > diff --git a/drivers/net/tap/Makefile b/drivers/net/tap/Makefile
> > index e18f30c56f52..bdbe69e62a4e 100644
> > --- a/drivers/net/tap/Makefile
> > +++ b/drivers/net/tap/Makefile
> > @@ -40,6 +40,7 @@ EXPORT_MAP := rte_pmd_tap_version.map
> > LIBABIVER := 1
> >
> > CFLAGS += -O3
> > +CFLAGS += -I$(SRCDIR)
> > CFLAGS += $(WERROR_FLAGS)
> >
> > #
> > diff --git a/drivers/net/tap/rte_eth_tap.c
> > b/drivers/net/tap/rte_eth_tap.c index 3fd057225ab3..fa57d645f3b1
> > 100644 --- a/drivers/net/tap/rte_eth_tap.c
> > +++ b/drivers/net/tap/rte_eth_tap.c
> > @@ -51,6 +51,8 @@
> > #include
> > #include
> >
> > +#include
> > +
> > /* Linux based path to the TUN device */
> > #define TUN_TAP_DEV_PATH"/dev/net/tun"
> > #define DEFAULT_TAP_NAME"dtap"
> > @@ -83,38 +85,6 @@ static struct rte_eth_link pmd_link = {
> > .link_autoneg = ETH_LINK_SPEED_AUTONEG
> > };
> >
> > -struct pkt_stats {
> > - uint64_t opackets; /* Number of output
> > packets */
> > - uint64_t ipackets; /* Number of input
> > packets */
> > - uint64_t obytes;/* Number of bytes on
> > output */
> > - uint64_t ibytes;/* Number of bytes on
> > input */
> > - uint64_t errs; /* Number of error
> > packets */ -};
> > -
> > -struct rx_queue {
> > - struct rte_mempool *mp; /* Mempool for RX
> > packets */
> > - uint16_t in_port; /* Port ID */
> > - int fd;
> > -
> > - struct pkt_stats stats; /* Stats for this
> > RX queue */ -};
> > -
> > -struct tx_queue {
> > - int fd;
> > - struct pkt_stats stats; /* Stats for this
> > TX queue */ -};
> > -
> > -struct pmd_internals {
> > - char name[RTE_ETH_NAME_MAX_LEN];/* Internal Tap
> > device name */
> > - uint16_t nb_queues; /* Number of queues
> > supported */
> > - struct ether_addr eth_addr; /* Mac address of the
> > device port */ -
> > - int if_index; /* IF_INDEX for the
> > port */ -
> > - struct rx_queue rxq[RTE_PMD_TAP_MAX_QUEUES];/*
> > List of RX queues */
> > - struct tx_queue txq[RTE_PMD_TAP_MAX_QUEUES];/*
> > List of TX queues */ -};
> > -
> > /* Tun/Tap allocation routine
> > *
> > * name is the number of the interface to use, unless NULL to take
> > the host diff --git a/drivers/net/tap/tap.h b/drivers/net/tap/tap.h
> > new file mode 100644
> > index ..88f62b895feb
> > --- /dev/null
> > +++ b/drivers/net/tap/tap.h
> > @@ -0,0 +1,73 @@
> > +/*-
> > + * BSD LICENSE
> > + *
> > + * Copyright 2017 6WIND S.A.
> > + * Copyright 2017 Mellanox.
> > + *
> > + * Redistribution and use in source and binary forms, with or
> > without
> > + * modification, are permitted provided that the following
> > conditions
> > + * are met:
> > + *
> > + * * Redistributions of source code must retain the above
> > copyright
> > + * notice, this list of conditions and the following
> > disclaimer.
> > + * * Redistributions in binary form must reproduce the above
> > copyright
> > + * notice, this list of conditions and the following
> > disclaimer in
> > + * the documentation and/or other materials provided with the
> > + * distribution.
> > + * * Neither the name of 6WIND S.A. nor the names of its
> > + * contributors may be used to endorse or promote products
> > derived
> > + * from this software without specific prior written
> > permission.
> > + *
> > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> > CONTRIBUTORS
> > + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
> > NOT
> > + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
> > FITNESS FOR
> > + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
> > COPYRIGHT
> > + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
> > INCIDENTAL,
> > + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
> > NOT
> > + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
> > OF USE,
> > + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
> > AND ON ANY
> > + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
> > OR TORT
> > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
> > THE USE
> > + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
> > DAMAGE.
>
Re: [dpdk-dev] [PATCH 06/12] net/failsafe: add fail-safe PMD
On Fri, Mar 03, 2017 at 09:38:11AM -0800, Stephen Hemminger wrote:
On Fri, 3 Mar 2017 16:40:28 +0100
Gaetan Rivet wrote:
+
+static struct rte_eth_dev *
+pci_addr_to_eth_dev(struct rte_pci_addr *addr)
+{
+ uint8_t pid;
+
+ if (addr == NULL)
+ return NULL;
+ for (pid = 0; pid < RTE_MAX_ETHPORTS; pid++) {
+ struct rte_pci_addr *addr2;
+ struct rte_eth_dev *edev;
+
+ edev = &rte_eth_devices[pid];
+ if (edev->device == NULL ||
+ edev->device->devargs == NULL)
+ continue;
+ addr2 = &edev->device->devargs->pci.addr;
+ if (rte_eal_compare_pci_addr(addr, addr2) == 0)
+ return edev;
+ }
+ return NULL;
+}
+
+static int
+pci_scan_one(struct sub_device *sdev)
+{
+ struct rte_devargs *da;
+ char dirname[PATH_MAX];
+
+ da = &sdev->devargs;
+ snprintf(dirname, sizeof(dirname),
+ "%s/" PCI_PRI_FMT,
+ pci_get_sysfs_path(),
+ da->pci.addr.domain,
+ da->pci.addr.bus,
+ da->pci.addr.devid,
+ da->pci.addr.function);
+ errno = 0;
+ if (rte_eal_pci_parse_sysfs_entry(&sdev->pci_device,
+ dirname, &da->pci.addr) < 0) {
+ if (errno == ENOENT) {
+ DEBUG("Could not scan requested device " PCI_PRI_FMT,
+ da->pci.addr.domain,
+ da->pci.addr.bus,
+ da->pci.addr.devid,
+ da->pci.addr.function);
+ } else {
+ ERROR("Error while scanning sysfs entry %s",
+ dirname);
+ return -1;
+ }
+ } else {
+ sdev->state = DEV_SCANNED;
+ }
+ return 0;
+}
This needs to be generic and in EAL.
A bigger problem is that it PCI specific and therefore won't work in
environments
where devices are attached to different busses (SOC and Hyper-V).
Please rework to play well with bus model.
Yes I agree, I planned to do so in any case for a V2.
I saw a few commits from Jan Blunck about a vdev bus[0].
Do you have other series regarding busses in mind that I should rebase
upon for a better support?
[0]: http://dpdk.org/ml/archives/dev/2017-March/059423.html
--
Gaëtan Rivet
6WIND
