summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRaslan Darawsheh <rasland@mellanox.com>2019-03-18 16:05:27 +0000
committerFerruh Yigit <ferruh.yigit@intel.com>2019-03-29 17:25:32 +0100
commit2f4b99831c2528a9b3e0fbadda34f590313b330b (patch)
treebb1354ea26ef2207637c0dd7232bf4adc9c72cd7 /drivers
parentfa7bb47aceac5ed38cd89e2dd7f9bf514d09e57b (diff)
downloaddpdk-next-eventdev-2f4b99831c2528a9b3e0fbadda34f590313b330b.zip
dpdk-next-eventdev-2f4b99831c2528a9b3e0fbadda34f590313b330b.tar.gz
dpdk-next-eventdev-2f4b99831c2528a9b3e0fbadda34f590313b330b.tar.xz
net/failsafe: replace sub-device pointer with port id
In multiprocess context, the pointer to sub-device is shared between processes. Previously, it was a pointer to per process eth_dev so it's needed to replace this dependency. Signed-off-by: Thomas Monjalon <thomas@monjalon.net> Signed-off-by: Raslan Darawsheh <rasland@mellanox.com> Acked-by: Gaetan Rivet <gaetan.rivet@6wind.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/failsafe/failsafe.c6
-rw-r--r--drivers/net/failsafe/failsafe_eal.c2
-rw-r--r--drivers/net/failsafe/failsafe_ether.c1
-rw-r--r--drivers/net/failsafe/failsafe_private.h17
4 files changed, 19 insertions, 7 deletions
diff --git a/drivers/net/failsafe/failsafe.c b/drivers/net/failsafe/failsafe.c
index 68926ca..e53a89d 100644
--- a/drivers/net/failsafe/failsafe.c
+++ b/drivers/net/failsafe/failsafe.c
@@ -30,6 +30,8 @@ fs_sub_device_alloc(struct rte_eth_dev *dev,
uint8_t nb_subs;
int ret;
int i;
+ struct sub_device *sdev;
+ uint8_t sdev_iterator;
ret = failsafe_args_count_subdevice(dev, params);
if (ret)
@@ -51,6 +53,10 @@ fs_sub_device_alloc(struct rte_eth_dev *dev,
for (i = 1; i < nb_subs; i++)
PRIV(dev)->subs[i - 1].next = PRIV(dev)->subs + i;
PRIV(dev)->subs[i - 1].next = PRIV(dev)->subs;
+
+ FOREACH_SUBDEV(sdev, sdev_iterator, dev) {
+ sdev->sdev_port_id = RTE_MAX_ETHPORTS;
+ }
return 0;
}
diff --git a/drivers/net/failsafe/failsafe_eal.c b/drivers/net/failsafe/failsafe_eal.c
index 56d1669..74fd8e9 100644
--- a/drivers/net/failsafe/failsafe_eal.c
+++ b/drivers/net/failsafe/failsafe_eal.c
@@ -112,7 +112,7 @@ fs_bus_init(struct rte_eth_dev *dev)
continue;
}
}
- ETH(sdev) = &rte_eth_devices[pid];
+ sdev->sdev_port_id = pid;
SUB_ID(sdev) = i;
sdev->fs_port_id = dev->data->port_id;
sdev->dev = ETH(sdev)->device;
diff --git a/drivers/net/failsafe/failsafe_ether.c b/drivers/net/failsafe/failsafe_ether.c
index 7fa209a..7ac23d4 100644
--- a/drivers/net/failsafe/failsafe_ether.c
+++ b/drivers/net/failsafe/failsafe_ether.c
@@ -294,6 +294,7 @@ fs_dev_remove(struct sub_device *sdev)
case DEV_PARSED:
case DEV_UNDEFINED:
sdev->state = DEV_UNDEFINED;
+ sdev->sdev_port_id = RTE_MAX_ETHPORTS;
/* the end */
break;
}
diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe/failsafe_private.h
index 785a302..4f58a5c 100644
--- a/drivers/net/failsafe/failsafe_private.h
+++ b/drivers/net/failsafe/failsafe_private.h
@@ -100,13 +100,15 @@ struct fs_stats {
uint64_t timestamp;
};
+/*
+ * Allocated in shared memory.
+ */
struct sub_device {
/* Exhaustive DPDK device description */
struct sub_device *next;
struct rte_devargs devargs;
- struct rte_bus *bus;
- struct rte_device *dev;
- struct rte_eth_dev *edev;
+ struct rte_bus *bus; /* for primary process only. */
+ struct rte_device *dev; /* for primary process only. */
uint8_t sid;
/* Device state machine */
enum dev_state state;
@@ -118,6 +120,8 @@ struct sub_device {
char *fd_str;
/* fail-safe device backreference */
uint16_t fs_port_id; /* shared between processes */
+ /* sub device port id*/
+ uint16_t sdev_port_id; /* shared between processes */
/* flag calling for recollection */
volatile unsigned int remove:1;
/* flow isolation state */
@@ -139,7 +143,7 @@ struct fs_priv {
* subs[0] is the preferred device
* any other is just another slave
*/
- struct sub_device *subs;
+ struct sub_device *subs; /* shared between processes */
uint8_t subs_head; /* if head == tail, no subs */
uint8_t subs_tail; /* first invalid */
uint8_t subs_tx; /* current emitting device */
@@ -254,11 +258,12 @@ extern int failsafe_mac_from_arg;
/* sdev: (struct sub_device *) */
#define ETH(sdev) \
- ((sdev)->edev)
+ ((sdev)->sdev_port_id == RTE_MAX_ETHPORTS ? \
+ NULL : &rte_eth_devices[(sdev)->sdev_port_id])
/* sdev: (struct sub_device *) */
#define PORT_ID(sdev) \
- (ETH(sdev)->data->port_id)
+ ((sdev)->sdev_port_id)
/* sdev: (struct sub_device *) */
#define SUB_ID(sdev) \