git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/ionic: use socket id passed in for Rx and Tx queues
[dpdk.git]
/
drivers
/
net
/
failsafe
/
failsafe_private.h
diff --git
a/drivers/net/failsafe/failsafe_private.h
b/drivers/net/failsafe/failsafe_private.h
index
886af86
..
cd39d10
100644
(file)
--- a/
drivers/net/failsafe/failsafe_private.h
+++ b/
drivers/net/failsafe/failsafe_private.h
@@
-3,16
+3,18
@@
* Copyright 2017 Mellanox Technologies, Ltd
*/
* Copyright 2017 Mellanox Technologies, Ltd
*/
-#ifndef _
RTE_
ETH_FAILSAFE_PRIVATE_H_
-#define _
RTE_
ETH_FAILSAFE_PRIVATE_H_
+#ifndef _ETH_FAILSAFE_PRIVATE_H_
+#define _ETH_FAILSAFE_PRIVATE_H_
+#include <stdint.h>
#include <sys/queue.h>
#include <pthread.h>
#include <rte_atomic.h>
#include <rte_dev.h>
#include <sys/queue.h>
#include <pthread.h>
#include <rte_atomic.h>
#include <rte_dev.h>
-#include <
rte_
ethdev_driver.h>
+#include <ethdev_driver.h>
#include <rte_devargs.h>
#include <rte_devargs.h>
+#include <rte_flow.h>
#include <rte_interrupts.h>
#define FAILSAFE_DRIVER_NAME "Fail-safe PMD"
#include <rte_interrupts.h>
#define FAILSAFE_DRIVER_NAME "Fail-safe PMD"
@@
-56,6
+58,14
@@
struct rx_proxy {
enum rxp_service_state sstate;
};
enum rxp_service_state sstate;
};
+#define FS_RX_PROXY_INIT (struct rx_proxy){ \
+ .efd = -1, \
+ .evec = NULL, \
+ .sid = 0, \
+ .scid = 0, \
+ .sstate = SS_NO_SERVICE, \
+}
+
struct rxq {
struct fs_priv *priv;
uint16_t qid;
struct rxq {
struct fs_priv *priv;
uint16_t qid;
@@
-81,7
+91,8
@@
struct rte_flow {
/* sub_flows */
struct rte_flow *flows[FAILSAFE_MAX_ETHPORTS];
/* flow description for synchronization */
/* sub_flows */
struct rte_flow *flows[FAILSAFE_MAX_ETHPORTS];
/* flow description for synchronization */
- struct rte_flow_desc *fd;
+ struct rte_flow_conv_rule rule;
+ uint8_t rule_data[];
};
enum dev_state {
};
enum dev_state {
@@
-97,13
+108,15
@@
struct fs_stats {
uint64_t timestamp;
};
uint64_t timestamp;
};
+/*
+ * Allocated in shared memory.
+ */
struct sub_device {
/* Exhaustive DPDK device description */
struct sub_device *next;
struct rte_devargs devargs;
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;
uint8_t sid;
/* Device state machine */
enum dev_state state;
@@
-114,7
+127,9
@@
struct sub_device {
/* Others are retrieved through a file descriptor */
char *fd_str;
/* fail-safe device backreference */
/* Others are retrieved through a file descriptor */
char *fd_str;
/* fail-safe device backreference */
- struct rte_eth_dev *fs_dev;
+ 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 */
/* flag calling for recollection */
volatile unsigned int remove:1;
/* flow isolation state */
@@
-125,14
+140,18
@@
struct sub_device {
unsigned int lsc_callback:1;
};
unsigned int lsc_callback:1;
};
+/*
+ * This is referenced by eth_dev->data->dev_private
+ * This is shared between processes.
+ */
struct fs_priv {
struct fs_priv {
- struct rte_eth_dev
*dev;
+ struct rte_eth_dev
_data *data; /* backreference to shared data. */
/*
* Set of sub_devices.
* subs[0] is the preferred device
/*
* Set of sub_devices.
* subs[0] is the preferred device
- * any other is just another s
lav
e
+ * any other is just another s
ub devic
e
*/
*/
- 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 */
uint8_t subs_head; /* if head == tail, no subs */
uint8_t subs_tail; /* first invalid */
uint8_t subs_tx; /* current emitting device */
@@
-141,10
+160,11
@@
struct fs_priv {
TAILQ_HEAD(sub_flows, rte_flow) flow_list;
/* current number of mac_addr slots allocated. */
uint32_t nb_mac_addr;
TAILQ_HEAD(sub_flows, rte_flow) flow_list;
/* current number of mac_addr slots allocated. */
uint32_t nb_mac_addr;
- struct ether_addr mac_addrs[FAILSAFE_MAX_ETHADDR];
+ struct
rte_
ether_addr mac_addrs[FAILSAFE_MAX_ETHADDR];
uint32_t mac_addr_pool[FAILSAFE_MAX_ETHADDR];
uint32_t mac_addr_pool[FAILSAFE_MAX_ETHADDR];
+ uint32_t nb_mcast_addr;
+ struct rte_ether_addr *mcast_addrs;
/* current capabilities */
/* current capabilities */
- struct rte_eth_dev_info infos;
struct rte_eth_dev_owner my_owner; /* Unique owner. */
struct rte_intr_handle intr_handle; /* Port interrupt handle. */
/*
struct rte_eth_dev_owner my_owner; /* Unique owner. */
struct rte_intr_handle intr_handle; /* Port interrupt handle. */
/*
@@
-188,7
+208,7
@@
int failsafe_hotplug_alarm_cancel(struct rte_eth_dev *dev);
/* RX / TX */
/* RX / TX */
-void set_burst_fn(struct rte_eth_dev *dev, int force_safe);
+void
failsafe_
set_burst_fn(struct rte_eth_dev *dev, int force_safe);
uint16_t failsafe_rx_burst(void *rxq,
struct rte_mbuf **rx_pkts, uint16_t nb_pkts);
uint16_t failsafe_rx_burst(void *rxq,
struct rte_mbuf **rx_pkts, uint16_t nb_pkts);
@@
-216,6
+236,7
@@
int failsafe_eal_uninit(struct rte_eth_dev *dev);
int failsafe_eth_dev_state_sync(struct rte_eth_dev *dev);
void failsafe_eth_dev_unregister_callbacks(struct sub_device *sdev);
int failsafe_eth_dev_state_sync(struct rte_eth_dev *dev);
void failsafe_eth_dev_unregister_callbacks(struct sub_device *sdev);
+int failsafe_eth_dev_close(struct rte_eth_dev *dev);
void failsafe_dev_remove(struct rte_eth_dev *dev);
void failsafe_stats_increment(struct rte_eth_stats *to,
struct rte_eth_stats *from);
void failsafe_dev_remove(struct rte_eth_dev *dev);
void failsafe_stats_increment(struct rte_eth_stats *to,
struct rte_eth_stats *from);
@@
-234,8
+255,8
@@
int failsafe_eth_new_event_callback(uint16_t port_id,
extern const char pmd_failsafe_driver_name[];
extern const struct eth_dev_ops failsafe_ops;
extern const struct rte_flow_ops fs_flow_ops;
extern const char pmd_failsafe_driver_name[];
extern const struct eth_dev_ops failsafe_ops;
extern const struct rte_flow_ops fs_flow_ops;
-extern uint64_t hotplug_poll;
-extern int mac_from_arg;
+extern uint64_t
failsafe_
hotplug_poll;
+extern int
failsafe_
mac_from_arg;
/* HELPERS */
/* HELPERS */
@@
-245,11
+266,12
@@
extern int mac_from_arg;
/* sdev: (struct sub_device *) */
#define ETH(sdev) \
/* 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) \
/* 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) \
/* sdev: (struct sub_device *) */
#define SUB_ID(sdev) \
@@
-315,18
+337,18
@@
extern int mac_from_arg;
*/
#define FS_ATOMIC_RX(s, i) \
rte_atomic64_read( \
*/
#define FS_ATOMIC_RX(s, i) \
rte_atomic64_read( \
- &((struct rxq *)
((s)->fs_dev->data->rx_queues[i]))->refcnt[(s)->sid]
\
- )
+ &((struct rxq *) \
+
(fs_dev(s)->data->rx_queues[i]))->refcnt[(s)->sid]
)
/**
* s: (struct sub_device *)
* i: uint16_t qid
*/
#define FS_ATOMIC_TX(s, i) \
rte_atomic64_read( \
/**
* s: (struct sub_device *)
* i: uint16_t qid
*/
#define FS_ATOMIC_TX(s, i) \
rte_atomic64_read( \
- &((struct txq *)
((s)->fs_dev->data->tx_queues[i]))->refcnt[(s)->sid]
\
- )
+ &((struct txq *) \
+
(fs_dev(s)->data->tx_queues[i]))->refcnt[(s)->sid]
)
-#ifdef RTE_EXEC_ENV_
BSDAPP
+#ifdef RTE_EXEC_ENV_
FREEBSD
#define FS_THREADID_TYPE void*
#define FS_THREADID_FMT "p"
#else
#define FS_THREADID_TYPE void*
#define FS_THREADID_FMT "p"
#else
@@
-370,6
+392,11
@@
fs_find_next(struct rte_eth_dev *dev,
return &subs[sid];
}
return &subs[sid];
}
+static inline struct rte_eth_dev *
+fs_dev(struct sub_device *sdev) {
+ return &rte_eth_devices[sdev->fs_port_id];
+}
+
/*
* Lock hot-plug mutex.
* is_alarm means that the caller is, for sure, the hot-plug alarm mechanism.
/*
* Lock hot-plug mutex.
* is_alarm means that the caller is, for sure, the hot-plug alarm mechanism.
@@
-394,9
+421,6
@@
fs_lock(struct rte_eth_dev *dev, unsigned int is_alarm)
return ret;
}
}
return ret;
}
}
- DEBUG("Hot-plug mutex was locked by thread %" FS_THREADID_FMT "%s",
- (FS_THREADID_TYPE)pthread_self(),
- PRIV(dev)->alarm_lock ? " by the hot-plug alarm" : "");
return ret;
}
return ret;
}
@@
-408,7
+432,6
@@
static inline void
fs_unlock(struct rte_eth_dev *dev, unsigned int is_alarm)
{
int ret;
fs_unlock(struct rte_eth_dev *dev, unsigned int is_alarm)
{
int ret;
- unsigned int prev_alarm_lock = PRIV(dev)->alarm_lock;
if (is_alarm) {
RTE_ASSERT(PRIV(dev)->alarm_lock == 1);
if (is_alarm) {
RTE_ASSERT(PRIV(dev)->alarm_lock == 1);
@@
-417,10
+440,6
@@
fs_unlock(struct rte_eth_dev *dev, unsigned int is_alarm)
ret = pthread_mutex_unlock(&PRIV(dev)->hotplug_mutex);
if (ret)
ERROR("Cannot unlock hot-plug mutex(%s)", strerror(ret));
ret = pthread_mutex_unlock(&PRIV(dev)->hotplug_mutex);
if (ret)
ERROR("Cannot unlock hot-plug mutex(%s)", strerror(ret));
- else
- DEBUG("Hot-plug mutex was unlocked by thread %" FS_THREADID_FMT "%s",
- (FS_THREADID_TYPE)pthread_self(),
- prev_alarm_lock ? " by the hot-plug alarm" : "");
}
/*
}
/*
@@
-468,7
+487,7
@@
fs_switch_dev(struct rte_eth_dev *dev,
} else {
return;
}
} else {
return;
}
- set_burst_fn(dev, 0);
+
failsafe_
set_burst_fn(dev, 0);
rte_wmb();
}
rte_wmb();
}
@@
-483,4
+502,4
@@
fs_err(struct sub_device *sdev, int err)
return rte_errno = 0;
return err;
}
return rte_errno = 0;
return err;
}
-#endif /* _
RTE_
ETH_FAILSAFE_PRIVATE_H_ */
+#endif /* _ETH_FAILSAFE_PRIVATE_H_ */