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/nfp: use macro for PCI log format
[dpdk.git]
/
app
/
test-pmd
/
testpmd.h
diff --git
a/app/test-pmd/testpmd.h
b/app/test-pmd/testpmd.h
index
ab93062
..
857a11f
100644
(file)
--- a/
app/test-pmd/testpmd.h
+++ b/
app/test-pmd/testpmd.h
@@
-58,8
+58,6
@@
typedef uint16_t portid_t;
typedef uint16_t queueid_t;
typedef uint16_t streamid_t;
typedef uint16_t queueid_t;
typedef uint16_t streamid_t;
-#define MAX_QUEUE_ID ((1 << (sizeof(queueid_t) * 8)) - 1)
-
#if defined RTE_LIBRTE_PMD_SOFTNIC
#define SOFTNIC 1
#else
#if defined RTE_LIBRTE_PMD_SOFTNIC
#define SOFTNIC 1
#else
@@
-179,22
+177,22
@@
struct rte_port {
uint8_t need_reconfig_queues; /**< need reconfiguring queues or not */
uint8_t rss_flag; /**< enable rss or not */
uint8_t dcb_flag; /**< enable dcb */
uint8_t need_reconfig_queues; /**< need reconfiguring queues or not */
uint8_t rss_flag; /**< enable rss or not */
uint8_t dcb_flag; /**< enable dcb */
- uint16_t nb_rx_desc[
MAX_QUEUE_ID
+1]; /**< per queue rx desc number */
- uint16_t nb_tx_desc[
MAX_QUEUE_ID
+1]; /**< per queue tx desc number */
- struct rte_eth_rxconf rx_conf[
MAX_QUEUE_ID
+1]; /**< per queue rx configuration */
- struct rte_eth_txconf tx_conf[
MAX_QUEUE_ID
+1]; /**< per queue tx configuration */
+ uint16_t nb_rx_desc[
RTE_MAX_QUEUES_PER_PORT
+1]; /**< per queue rx desc number */
+ uint16_t nb_tx_desc[
RTE_MAX_QUEUES_PER_PORT
+1]; /**< per queue tx desc number */
+ struct rte_eth_rxconf rx_conf[
RTE_MAX_QUEUES_PER_PORT
+1]; /**< per queue rx configuration */
+ struct rte_eth_txconf tx_conf[
RTE_MAX_QUEUES_PER_PORT
+1]; /**< per queue tx configuration */
struct rte_ether_addr *mc_addr_pool; /**< pool of multicast addrs */
uint32_t mc_addr_nb; /**< nb. of addr. in mc_addr_pool */
uint8_t slave_flag; /**< bonding slave port */
struct port_flow *flow_list; /**< Associated flows. */
struct rte_ether_addr *mc_addr_pool; /**< pool of multicast addrs */
uint32_t mc_addr_nb; /**< nb. of addr. in mc_addr_pool */
uint8_t slave_flag; /**< bonding slave port */
struct port_flow *flow_list; /**< Associated flows. */
- const struct rte_eth_rxtx_callback *rx_dump_cb[
MAX_QUEUE_ID
+1];
- const struct rte_eth_rxtx_callback *tx_dump_cb[
MAX_QUEUE_ID
+1];
+ const struct rte_eth_rxtx_callback *rx_dump_cb[
RTE_MAX_QUEUES_PER_PORT
+1];
+ const struct rte_eth_rxtx_callback *tx_dump_cb[
RTE_MAX_QUEUES_PER_PORT
+1];
#ifdef SOFTNIC
struct softnic_port softport; /**< softnic params */
#endif
/**< metadata value to insert in Tx packets. */
#ifdef SOFTNIC
struct softnic_port softport; /**< softnic params */
#endif
/**< metadata value to insert in Tx packets. */
-
rte_be32_t
tx_metadata;
- const struct rte_eth_rxtx_callback *tx_set_md_cb[
MAX_QUEUE_ID
+1];
+
uint32_t
tx_metadata;
+ const struct rte_eth_rxtx_callback *tx_set_md_cb[
RTE_MAX_QUEUES_PER_PORT
+1];
};
/**
};
/**
@@
-265,6
+263,8
@@
extern struct fwd_engine ieee1588_fwd_engine;
extern struct fwd_engine * fwd_engines[]; /**< NULL terminated array. */
extern cmdline_parse_inst_t cmd_set_raw;
extern struct fwd_engine * fwd_engines[]; /**< NULL terminated array. */
extern cmdline_parse_inst_t cmd_set_raw;
+extern cmdline_parse_inst_t cmd_show_set_raw;
+extern cmdline_parse_inst_t cmd_show_set_raw_all;
extern uint16_t mempool_flags;
extern uint16_t mempool_flags;
@@
-332,6
+332,7
@@
extern uint32_t event_print_mask;
extern bool setup_on_probe_event; /**< disabled by port setup-on iterator */
extern uint8_t hot_plug; /**< enable by "--hot-plug" parameter */
extern int do_mlockall; /**< set by "--mlockall" or "--no-mlockall" parameter */
extern bool setup_on_probe_event; /**< disabled by port setup-on iterator */
extern uint8_t hot_plug; /**< enable by "--hot-plug" parameter */
extern int do_mlockall; /**< set by "--mlockall" or "--no-mlockall" parameter */
+extern uint8_t clear_ptypes; /**< disabled by set ptype cmd */
#ifdef RTE_LIBRTE_IXGBE_BYPASS
extern uint32_t bypass_timeout; /**< Store the NIC bypass watchdog timeout */
#ifdef RTE_LIBRTE_IXGBE_BYPASS
extern uint32_t bypass_timeout; /**< Store the NIC bypass watchdog timeout */
@@
-383,6
+384,7
@@
extern struct rte_eth_txmode tx_mode;
extern uint64_t rss_hf;
extern uint64_t rss_hf;
+extern queueid_t nb_hairpinq;
extern queueid_t nb_rxq;
extern queueid_t nb_txq;
extern queueid_t nb_rxq;
extern queueid_t nb_txq;
@@
-507,7
+509,8
@@
struct vxlan_encap_conf {
uint8_t eth_src[RTE_ETHER_ADDR_LEN];
uint8_t eth_dst[RTE_ETHER_ADDR_LEN];
};
uint8_t eth_src[RTE_ETHER_ADDR_LEN];
uint8_t eth_dst[RTE_ETHER_ADDR_LEN];
};
-struct vxlan_encap_conf vxlan_encap_conf;
+
+extern struct vxlan_encap_conf vxlan_encap_conf;
/* NVGRE encap/decap parameters. */
struct nvgre_encap_conf {
/* NVGRE encap/decap parameters. */
struct nvgre_encap_conf {
@@
-522,7
+525,8
@@
struct nvgre_encap_conf {
uint8_t eth_src[RTE_ETHER_ADDR_LEN];
uint8_t eth_dst[RTE_ETHER_ADDR_LEN];
};
uint8_t eth_src[RTE_ETHER_ADDR_LEN];
uint8_t eth_dst[RTE_ETHER_ADDR_LEN];
};
-struct nvgre_encap_conf nvgre_encap_conf;
+
+extern struct nvgre_encap_conf nvgre_encap_conf;
/* L2 encap parameters. */
struct l2_encap_conf {
/* L2 encap parameters. */
struct l2_encap_conf {
@@
-532,13
+536,13
@@
struct l2_encap_conf {
uint8_t eth_src[RTE_ETHER_ADDR_LEN];
uint8_t eth_dst[RTE_ETHER_ADDR_LEN];
};
uint8_t eth_src[RTE_ETHER_ADDR_LEN];
uint8_t eth_dst[RTE_ETHER_ADDR_LEN];
};
-struct l2_encap_conf l2_encap_conf;
+
extern
struct l2_encap_conf l2_encap_conf;
/* L2 decap parameters. */
struct l2_decap_conf {
uint32_t select_vlan:1;
};
/* L2 decap parameters. */
struct l2_decap_conf {
uint32_t select_vlan:1;
};
-struct l2_decap_conf l2_decap_conf;
+
extern
struct l2_decap_conf l2_decap_conf;
/* MPLSoGRE encap parameters. */
struct mplsogre_encap_conf {
/* MPLSoGRE encap parameters. */
struct mplsogre_encap_conf {
@@
-553,14
+557,14
@@
struct mplsogre_encap_conf {
uint8_t eth_src[RTE_ETHER_ADDR_LEN];
uint8_t eth_dst[RTE_ETHER_ADDR_LEN];
};
uint8_t eth_src[RTE_ETHER_ADDR_LEN];
uint8_t eth_dst[RTE_ETHER_ADDR_LEN];
};
-struct mplsogre_encap_conf mplsogre_encap_conf;
+
extern
struct mplsogre_encap_conf mplsogre_encap_conf;
/* MPLSoGRE decap parameters. */
struct mplsogre_decap_conf {
uint32_t select_ipv4:1;
uint32_t select_vlan:1;
};
/* MPLSoGRE decap parameters. */
struct mplsogre_decap_conf {
uint32_t select_ipv4:1;
uint32_t select_vlan:1;
};
-struct mplsogre_decap_conf mplsogre_decap_conf;
+
extern
struct mplsogre_decap_conf mplsogre_decap_conf;
/* MPLSoUDP encap parameters. */
struct mplsoudp_encap_conf {
/* MPLSoUDP encap parameters. */
struct mplsoudp_encap_conf {
@@
-577,14
+581,14
@@
struct mplsoudp_encap_conf {
uint8_t eth_src[RTE_ETHER_ADDR_LEN];
uint8_t eth_dst[RTE_ETHER_ADDR_LEN];
};
uint8_t eth_src[RTE_ETHER_ADDR_LEN];
uint8_t eth_dst[RTE_ETHER_ADDR_LEN];
};
-struct mplsoudp_encap_conf mplsoudp_encap_conf;
+
extern
struct mplsoudp_encap_conf mplsoudp_encap_conf;
/* MPLSoUDP decap parameters. */
struct mplsoudp_decap_conf {
uint32_t select_ipv4:1;
uint32_t select_vlan:1;
};
/* MPLSoUDP decap parameters. */
struct mplsoudp_decap_conf {
uint32_t select_ipv4:1;
uint32_t select_vlan:1;
};
-struct mplsoudp_decap_conf mplsoudp_decap_conf;
+
extern
struct mplsoudp_decap_conf mplsoudp_decap_conf;
static inline unsigned int
lcore_num(void)
static inline unsigned int
lcore_num(void)
@@
-752,6
+756,7
@@
void rx_vlan_strip_set_on_queue(portid_t port_id, uint16_t queue_id, int on);
void rx_vlan_filter_set(portid_t port_id, int on);
void rx_vlan_all_filter_set(portid_t port_id, int on);
void rx_vlan_filter_set(portid_t port_id, int on);
void rx_vlan_all_filter_set(portid_t port_id, int on);
+void rx_vlan_qinq_strip_set(portid_t port_id, int on);
int rx_vft_set(portid_t port_id, uint16_t vlan_id, int on);
void vlan_extend_set(portid_t port_id, int on);
void vlan_tpid_set(portid_t port_id, enum rte_vlan_type vlan_type,
int rx_vft_set(portid_t port_id, uint16_t vlan_id, int on);
void vlan_extend_set(portid_t port_id, int on);
void vlan_tpid_set(portid_t port_id, enum rte_vlan_type vlan_type,
@@
-825,7
+830,14
@@
void setup_gso(const char *mode, portid_t port_id);
int eth_dev_info_get_print_err(uint16_t port_id,
struct rte_eth_dev_info *dev_info);
void eth_set_promisc_mode(uint16_t port_id, int enable);
int eth_dev_info_get_print_err(uint16_t port_id,
struct rte_eth_dev_info *dev_info);
void eth_set_promisc_mode(uint16_t port_id, int enable);
+void eth_set_allmulticast_mode(uint16_t port, int enable);
+int eth_link_get_nowait_print_err(uint16_t port_id, struct rte_eth_link *link);
+int eth_macaddr_get_print_err(uint16_t port_id,
+ struct rte_ether_addr *mac_addr);
+/* Functions to display the set of MAC addresses added to a port*/
+void show_macs(portid_t port_id);
+void show_mcast_macs(portid_t port_id);
/* Functions to manage the set of filtered Multicast MAC addresses */
void mcast_addr_add(portid_t port_id, struct rte_ether_addr *mc_addr);
/* Functions to manage the set of filtered Multicast MAC addresses */
void mcast_addr_add(portid_t port_id, struct rte_ether_addr *mc_addr);
@@
-850,6
+862,8
@@
queueid_t get_allowed_max_nb_rxq(portid_t *pid);
int check_nb_rxq(queueid_t rxq);
queueid_t get_allowed_max_nb_txq(portid_t *pid);
int check_nb_txq(queueid_t txq);
int check_nb_rxq(queueid_t rxq);
queueid_t get_allowed_max_nb_txq(portid_t *pid);
int check_nb_txq(queueid_t txq);
+queueid_t get_allowed_max_nb_hairpinq(portid_t *pid);
+int check_nb_hairpinq(queueid_t hairpinq);
uint16_t dump_rx_pkts(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[],
uint16_t nb_pkts, __rte_unused uint16_t max_pkts,
uint16_t dump_rx_pkts(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[],
uint16_t nb_pkts, __rte_unused uint16_t max_pkts,