d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/failsafe: replace sub-device pointer with port id

Browse Source 
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>
This commit is contained in:
Raslan Darawsheh 2019-03-18 16:05:27 +00:00 committed by Ferruh Yigit
parent fa7bb47ace
commit 2f4b99831c
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/failsafe/failsafe.c
View File

@ -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;
}

2
drivers/net/failsafe/failsafe_eal.c
View File

@ -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;

1
drivers/net/failsafe/failsafe_ether.c
View File

@ -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;
}

17
drivers/net/failsafe/failsafe_private.h
View File

@ -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) \