net/mlx: prefix private structure
PATCH 1/1 net/mlx: prefix private structure
The private structure stored in rte_eth_dev->data->dev_private was named "struct priv".
In order to ease code browsing, the structure is renamed "struct mlx[45]_priv".
--- drivers/net/mlx4/mlx4.c | 10 ++--- drivers/net/mlx4/mlx4.h | 20 +++++----- drivers/net/mlx4/mlx4_ethdev.c | 40 +++++++++---------- drivers/net/mlx4/mlx4_flow.c | 28 +++++++------- drivers/net/mlx4/mlx4_flow.h | 6 +-- drivers/net/mlx4/mlx4_intr.c | 20 +++++----- drivers/net/mlx4/mlx4_mr.c | 30 +++++++-------- drivers/net/mlx4/mlx4_rxq.c | 20 +++++----- drivers/net/mlx4/mlx4_rxtx.h | 18 ++++----- drivers/net/mlx4/mlx4_txq.c | 6 +-- drivers/net/mlx5/mlx5.c | 14 +++---- drivers/net/mlx5/mlx5.h | 6 +-- drivers/net/mlx5/mlx5_ethdev.c | 30 +++++++-------- drivers/net/mlx5/mlx5_flow.c | 42 ++++++++++---------- drivers/net/mlx5/mlx5_flow_dv.c | 16 ++++---- drivers/net/mlx5/mlx5_flow_tcf.c | 8 ++-- drivers/net/mlx5/mlx5_flow_verbs.c | 8 ++-- drivers/net/mlx5/mlx5_mac.c | 4 +- drivers/net/mlx5/mlx5_mr.c | 30 +++++++-------- drivers/net/mlx5/mlx5_nl.c | 12 +++--- drivers/net/mlx5/mlx5_rss.c | 10 ++--- drivers/net/mlx5/mlx5_rxmode.c | 8 ++-- drivers/net/mlx5/mlx5_rxq.c | 62 +++++++++++++++--------------- drivers/net/mlx5/mlx5_rxtx.c | 2 +- drivers/net/mlx5/mlx5_rxtx.h | 6 +-- drivers/net/mlx5/mlx5_rxtx_vec.c | 4 +- drivers/net/mlx5/mlx5_socket.c | 8 ++-- drivers/net/mlx5/mlx5_stats.c | 16 ++++---- drivers/net/mlx5/mlx5_trigger.c | 16 ++++---- drivers/net/mlx5/mlx5_txq.c | 26 ++++++------- drivers/net/mlx5/mlx5_vlan.c | 6 +-- 31 files changed, 266 insertions(+), 266 deletions(-)
drivers/net/mlx4/mlx4.c +5 -5
@@ -81,7 +81,7 @@ static void mlx4_dev_stop(struct rte_eth_dev *dev);static int mlx4_dev_configure (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx4_priv *priv = dev->data->dev_private;struct rte_flow_error error;int ret;
@@ -117,7 +117,7 @@ mlx4_dev_configure(struct rte_eth_dev *dev)static int mlx4_dev_start (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx4_priv *priv = dev->data->dev_private;struct rte_flow_error error;int ret;
@@ -169,7 +169,7 @@ mlx4_dev_start(struct rte_eth_dev *dev)static void mlx4_dev_stop (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx4_priv *priv = dev->data->dev_private;if (!priv->started)return ;
@@ -194,7 +194,7 @@ mlx4_dev_stop(struct rte_eth_dev *dev)static void mlx4_dev_close (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx4_priv *priv = dev->data->dev_private;unsigned int i; DEBUG("%p: closing device \"%s\"",
@@ -600,7 +600,7 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)struct ibv_context *ctx =NULL ;struct ibv_port_attr port_attr;struct ibv_pd *pd =NULL ; -struct priv *priv =NULL ; +struct mlx4_priv *priv =NULL ;struct rte_eth_dev *eth_dev =NULL ;struct ether_addr mac;
drivers/net/mlx4/mlx4.h +10 -10
@@ -72,12 +72,12 @@ struct rxq;struct txq ;struct rte_flow ; -LIST_HEAD (mlx4_dev_list, priv); +LIST_HEAD (mlx4_dev_list, mlx4_priv);LIST_HEAD (mlx4_mr_list, mlx4_mr);/** Private data structure. */ -struct priv { -LIST_ENTRY (priv) mem_event_cb;/* Called by memory event callback. */ +struct mlx4_priv { +LIST_ENTRY (mlx4_priv) mem_event_cb;/* Called by memory event callback. */ struct rte_eth_dev *dev;/**< Ethernet device. */ struct ibv_context *ctx;/**< Verbs context. */ struct ibv_device_attr device_attr;/**< Device properties. */
@@ -114,9 +114,9 @@ struct priv {/* mlx4_ethdev.c */ -int mlx4_get_ifname (const struct priv *priv,char (*ifname)[IF_NAMESIZE ]); -int mlx4_get_mac (struct priv *priv,uint8_t (*mac)[ETHER_ADDR_LEN ]); -int mlx4_mtu_get (struct priv *priv,uint16_t *mtu); +int mlx4_get_ifname (const struct mlx4_priv *priv,char (*ifname)[IF_NAMESIZE ]); +int mlx4_get_mac (struct mlx4_priv *priv,uint8_t (*mac)[ETHER_ADDR_LEN ]); +int mlx4_mtu_get (struct mlx4_priv *priv,uint16_t *mtu);int mlx4_mtu_set (struct rte_eth_dev *dev,uint16_t mtu);int mlx4_dev_set_link_down (struct rte_eth_dev *dev);int mlx4_dev_set_link_up (struct rte_eth_dev *dev);
@@ -144,10 +144,10 @@ int mlx4_is_removed(struct rte_eth_dev *dev);/* mlx4_intr.c */ -int mlx4_intr_uninstall (struct priv *priv); -int mlx4_intr_install (struct priv *priv); -int mlx4_rxq_intr_enable (struct priv *priv); -void mlx4_rxq_intr_disable (struct priv *priv); +int mlx4_intr_uninstall (struct mlx4_priv *priv); +int mlx4_intr_install (struct mlx4_priv *priv); +int mlx4_rxq_intr_enable (struct mlx4_priv *priv); +void mlx4_rxq_intr_disable (struct mlx4_priv *priv);int mlx4_rx_intr_disable (struct rte_eth_dev *dev,uint16_t idx);int mlx4_rx_intr_enable (struct rte_eth_dev *dev,uint16_t idx);
drivers/net/mlx4/mlx4_ethdev.c +20 -20
@@ -59,7 +59,7 @@* 0 on success, negative errno value otherwise and rte_errno is set. */ int -mlx4_get_ifname (const struct priv *priv,char (*ifname)[IF_NAMESIZE ]) +mlx4_get_ifname (const struct mlx4_priv *priv,char (*ifname)[IF_NAMESIZE ]) {DIR *dir;struct dirent *dent;
@@ -146,7 +146,7 @@ mlx4_get_ifname(const struct priv *priv, char (*ifname)[IF_NAMESIZE])* 0 on success, negative errno value otherwise and rte_errno is set. */ static int -mlx4_ifreq (const struct priv *priv,int req,struct ifreq *ifr) +mlx4_ifreq (const struct mlx4_priv *priv,int req,struct ifreq *ifr) {int sock =socket (PF_INET ,SOCK_DGRAM ,IPPROTO_IP );int ret;
@@ -176,7 +176,7 @@ mlx4_ifreq(const struct priv *priv, int req, struct ifreq *ifr)* 0 on success, negative errno value otherwise and rte_errno is set. */ int -mlx4_get_mac (struct priv *priv,uint8_t (*mac)[ETHER_ADDR_LEN ]) +mlx4_get_mac (struct mlx4_priv *priv,uint8_t (*mac)[ETHER_ADDR_LEN ]) {struct ifreq request;int ret =mlx4_ifreq (priv,SIOCGIFHWADDR , &request);
@@ -199,7 +199,7 @@ mlx4_get_mac(struct priv *priv, uint8_t (*mac)[ETHER_ADDR_LEN])* 0 on success, negative errno value otherwise and rte_errno is set. */ int -mlx4_mtu_get (struct priv *priv,uint16_t *mtu) +mlx4_mtu_get (struct mlx4_priv *priv,uint16_t *mtu) {struct ifreq request;int ret =mlx4_ifreq (priv,SIOCGIFMTU , &request);
@@ -224,7 +224,7 @@ mlx4_mtu_get(struct priv *priv, uint16_t *mtu)int mlx4_mtu_set (struct rte_eth_dev *dev,uint16_t mtu) { -struct priv *priv = dev->data->dev_private; +struct mlx4_priv *priv = dev->data->dev_private;struct ifreq request = { .ifr_mtu = mtu, };int ret =mlx4_ifreq (priv,SIOCSIFMTU , &request);
@@ -248,7 +248,7 @@ mlx4_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)* 0 on success, negative errno value otherwise and rte_errno is set. */ static int -mlx4_set_flags (struct priv *priv,unsigned int keep,unsigned int flags) +mlx4_set_flags (struct mlx4_priv *priv,unsigned int keep,unsigned int flags) {struct ifreq request;int ret =mlx4_ifreq (priv,SIOCGIFFLAGS , &request);
@@ -272,7 +272,7 @@ mlx4_set_flags(struct priv *priv, unsigned int keep, unsigned int flags)* 0 on success, negative errno value otherwise and rte_errno is set. */ static int -mlx4_dev_set_link (struct priv *priv,int up) +mlx4_dev_set_link (struct mlx4_priv *priv,int up) {int err;
@@ -300,7 +300,7 @@ mlx4_dev_set_link(struct priv *priv, int up)int mlx4_dev_set_link_down (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx4_priv *priv = dev->data->dev_private;return mlx4_dev_set_link (priv,0 ); }
@@ -317,7 +317,7 @@ mlx4_dev_set_link_down(struct rte_eth_dev *dev)int mlx4_dev_set_link_up (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx4_priv *priv = dev->data->dev_private;return mlx4_dev_set_link (priv,1 ); }
@@ -345,7 +345,7 @@ enum rxmode_toggle {static void mlx4_rxmode_toggle (struct rte_eth_dev *dev,enum rxmode_toggle toggle) { -struct priv *priv = dev->data->dev_private; +struct mlx4_priv *priv = dev->data->dev_private;const char *mode;struct rte_flow_error error;
@@ -430,7 +430,7 @@ mlx4_allmulticast_disable(struct rte_eth_dev *dev)void mlx4_mac_addr_remove (struct rte_eth_dev *dev,uint32_t index) { -struct priv *priv = dev->data->dev_private; +struct mlx4_priv *priv = dev->data->dev_private;struct rte_flow_error error;if (index >=RTE_DIM (priv->mac)) {
@@ -466,7 +466,7 @@ int mlx4_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac_addr, uint32_t index, uint32_t vmdq) { - struct priv *priv = dev->data->dev_private; + struct mlx4_priv *priv = dev->data->dev_private;struct rte_flow_error error;int ret;
@@ -503,7 +503,7 @@ mlx4_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac_addr,int mlx4_vlan_filter_set (struct rte_eth_dev *dev,uint16_t vlan_id,int on) { -struct priv *priv = dev->data->dev_private; +struct mlx4_priv *priv = dev->data->dev_private;struct rte_flow_error error;unsigned int vidx = vlan_id /64 ;unsigned int vbit = vlan_id %64 ;
@@ -557,7 +557,7 @@ mlx4_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr)void mlx4_dev_infos_get (struct rte_eth_dev *dev,struct rte_eth_dev_info *info) { -struct priv *priv = dev->data->dev_private; +struct mlx4_priv *priv = dev->data->dev_private;unsigned int max;char ifname[IF_NAMESIZE ];
@@ -607,7 +607,7 @@ mlx4_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)*/ int mlx4_fw_version_get (struct rte_eth_dev *dev,char *fw_ver,size_t fw_size) { -struct priv *priv = dev->data->dev_private; +struct mlx4_priv *priv = dev->data->dev_private;struct ibv_device_attr *attr = &priv->device_attr;size_t size =strnlen (attr->fw_ver,sizeof (attr->fw_ver)) +1 ;
@@ -714,7 +714,7 @@ mlx4_stats_reset(struct rte_eth_dev *dev)int mlx4_link_update (struct rte_eth_dev *dev,int wait_to_complete) { -const struct priv *priv = dev->data->dev_private; +const struct mlx4_priv *priv = dev->data->dev_private;struct ethtool_cmd edata = { .cmd =ETHTOOL_GSET , };
@@ -767,7 +767,7 @@ mlx4_link_update(struct rte_eth_dev *dev, int wait_to_complete)int mlx4_flow_ctrl_get (struct rte_eth_dev *dev,struct rte_eth_fc_conf *fc_conf) { -struct priv *priv = dev->data->dev_private; +struct mlx4_priv *priv = dev->data->dev_private;struct ifreq ifr;struct ethtool_pauseparam ethpause = { .cmd =ETHTOOL_GPAUSEPARAM ,
@@ -811,7 +811,7 @@ mlx4_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)int mlx4_flow_ctrl_set (struct rte_eth_dev *dev,struct rte_eth_fc_conf *fc_conf) { -struct priv *priv = dev->data->dev_private; +struct mlx4_priv *priv = dev->data->dev_private;struct ifreq ifr;struct ethtool_pauseparam ethpause = { .cmd =ETHTOOL_SPAUSEPARAM ,
@@ -879,7 +879,7 @@ mlx4_dev_supported_ptypes_get(struct rte_eth_dev *dev)RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN , RTE_PTYPE_UNKNOWN }; -struct priv *priv = dev->data->dev_private; +struct mlx4_priv *priv = dev->data->dev_private;if (dev->rx_pkt_burst == mlx4_rx_burst) {if (priv->hw_csum_l2tun)
@@ -903,7 +903,7 @@ int mlx4_is_removed(struct rte_eth_dev *dev) {struct ibv_device_attr device_attr; -struct priv *priv = dev->data->dev_private; +struct mlx4_priv *priv = dev->data->dev_private;if (mlx4_glue->query_device (priv->ctx, &device_attr) ==EIO )return 1 ;
drivers/net/mlx4/mlx4_flow.c +14 -14
@@ -71,7 +71,7 @@ struct mlx4_flow_proc_item {struct mlx4_drop {struct ibv_qp *qp;/**< QP target. */ struct ibv_cq *cq;/**< CQ associated with above QP. */ -struct priv *priv;/**< Back pointer to private data. */ +struct mlx4_priv *priv;/**< Back pointer to private data. */ uint32_t refcnt;/**< Reference count. */ };
@@ -95,7 +95,7 @@ struct mlx4_drop {* rte_errno is set. */ uint64_t -mlx4_conv_rss_types (struct priv *priv,uint64_t types,int verbs_to_dpdk) +mlx4_conv_rss_types (struct mlx4_priv *priv,uint64_t types,int verbs_to_dpdk) {enum {INNER ,
@@ -662,7 +662,7 @@ static const struct mlx4_flow_proc_item mlx4_flow_proc_item_list[] = {* 0 on success, a negative errno value otherwise and rte_errno is set. */ static int -mlx4_flow_prepare(struct priv *priv, +mlx4_flow_prepare(struct mlx4_priv *priv, const struct rte_flow_attr *attr, const struct rte_flow_item pattern[], const struct rte_flow_action actions[],
@@ -933,7 +933,7 @@ mlx4_flow_validate(struct rte_eth_dev *dev,const struct rte_flow_action actions[], struct rte_flow_error *error) { - struct priv *priv = dev->data->dev_private; + struct mlx4_priv *priv = dev->data->dev_private;return mlx4_flow_prepare (priv, attr, pattern, actions, error,NULL ); }
@@ -949,7 +949,7 @@ mlx4_flow_validate(struct rte_eth_dev *dev,* is set. */ static struct mlx4_drop * -mlx4_drop_get (struct priv *priv) +mlx4_drop_get (struct mlx4_priv *priv) {struct mlx4_drop *drop = priv->drop;
@@ -1025,7 +1025,7 @@ mlx4_drop_put(struct mlx4_drop *drop)* 0 on success, a negative errno value otherwise and rte_errno is set. */ static int -mlx4_flow_toggle (struct priv *priv, +mlx4_flow_toggle (struct mlx4_priv *priv,struct rte_flow *flow,int enable,struct rte_flow_error *error)
@@ -1141,7 +1141,7 @@ mlx4_flow_create(struct rte_eth_dev *dev,const struct rte_flow_action actions[], struct rte_flow_error *error) { - struct priv *priv = dev->data->dev_private; + struct mlx4_priv *priv = dev->data->dev_private;struct rte_flow *flow;int err;
@@ -1182,7 +1182,7 @@ mlx4_flow_isolate(struct rte_eth_dev *dev,int enable, struct rte_flow_error *error) { - struct priv *priv = dev->data->dev_private; + struct mlx4_priv *priv = dev->data->dev_private;if (!!enable == !!priv->isolated)return 0 ;
@@ -1205,7 +1205,7 @@ mlx4_flow_destroy(struct rte_eth_dev *dev,struct rte_flow *flow, struct rte_flow_error *error) { - struct priv *priv = dev->data->dev_private; + struct mlx4_priv *priv = dev->data->dev_private;int err =mlx4_flow_toggle (priv, flow,0 , error);if (err)
@@ -1229,7 +1229,7 @@ static int mlx4_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *error) { - struct priv *priv = dev->data->dev_private; + struct mlx4_priv *priv = dev->data->dev_private;struct rte_flow *flow =LIST_FIRST (&priv->flows);while (flow) {
@@ -1254,7 +1254,7 @@ mlx4_flow_flush(struct rte_eth_dev *dev,* Next configured VLAN ID or a high value (>= 4096) if there is none. */ static uint16_t -mlx4_flow_internal_next_vlan (struct priv *priv,uint16_t vlan) +mlx4_flow_internal_next_vlan (struct mlx4_priv *priv,uint16_t vlan) {while (vlan <4096 ) { if (priv->dev->data->vlan_filter_conf.ids[vlan / 64] &
@@ -1294,7 +1294,7 @@ mlx4_flow_internal_next_vlan(struct priv *priv, uint16_t vlan)* 0 on success, a negative errno value otherwise and rte_errno is set. */ static int -mlx4_flow_internal (struct priv *priv,struct rte_flow_error *error) +mlx4_flow_internal (struct mlx4_priv *priv,struct rte_flow_error *error) {struct rte_flow_attr attr = { .priority =MLX4_FLOW_PRIORITY_LAST ,
@@ -1526,7 +1526,7 @@ mlx4_flow_internal(struct priv *priv, struct rte_flow_error *error)* 0 on success, a negative errno value otherwise and rte_errno is set. */ int -mlx4_flow_sync (struct priv *priv,struct rte_flow_error *error) +mlx4_flow_sync (struct mlx4_priv *priv,struct rte_flow_error *error) {struct rte_flow *flow;int ret;
@@ -1568,7 +1568,7 @@ mlx4_flow_sync(struct priv *priv, struct rte_flow_error *error)* Pointer to private structure. */ void -mlx4_flow_clean (struct priv *priv) +mlx4_flow_clean (struct mlx4_priv *priv) {struct rte_flow *flow;
drivers/net/mlx4/mlx4_flow.h +3 -3
@@ -48,10 +48,10 @@ struct rte_flow {/* mlx4_flow.c */ -uint64_t mlx4_conv_rss_types (struct priv *priv,uint64_t types, +uint64_t mlx4_conv_rss_types (struct mlx4_priv *priv,uint64_t types,int verbs_to_dpdk); -int mlx4_flow_sync (struct priv *priv,struct rte_flow_error *error); -void mlx4_flow_clean (struct priv *priv); +int mlx4_flow_sync (struct mlx4_priv *priv,struct rte_flow_error *error); +void mlx4_flow_clean (struct mlx4_priv *priv); int mlx4_filter_ctrl(struct rte_eth_dev *dev, enum rte_filter_type filter_type, enum rte_filter_op filter_op,
drivers/net/mlx4/mlx4_intr.c +10 -10
@@ -33,7 +33,7 @@#include "mlx4_rxtx.h" #include "mlx4_utils.h" -static int mlx4_link_status_check (struct priv *priv); +static int mlx4_link_status_check (struct mlx4_priv *priv);/** * Clean up Rx interrupts handler.
@@ -42,7 +42,7 @@ static int mlx4_link_status_check(struct priv *priv);* Pointer to private structure. */ static void -mlx4_rx_intr_vec_disable (struct priv *priv) +mlx4_rx_intr_vec_disable (struct mlx4_priv *priv) {struct rte_intr_handle *intr_handle = &priv->intr_handle;
@@ -62,7 +62,7 @@ mlx4_rx_intr_vec_disable(struct priv *priv)* 0 on success, negative errno value otherwise and rte_errno is set. */ static int -mlx4_rx_intr_vec_enable (struct priv *priv) +mlx4_rx_intr_vec_enable (struct mlx4_priv *priv) {unsigned int i;unsigned int rxqs_n = priv->dev->data->nb_rx_queues;
@@ -117,7 +117,7 @@ mlx4_rx_intr_vec_enable(struct priv *priv)* Pointer to private structure. */ static void -mlx4_link_status_alarm (struct priv *priv) +mlx4_link_status_alarm (struct mlx4_priv *priv) {const struct rte_intr_conf *const intr_conf = &priv->dev->data->dev_conf.intr_conf;
@@ -143,7 +143,7 @@ mlx4_link_status_alarm(struct priv *priv)* otherwise and rte_errno is set. */ static int -mlx4_link_status_check (struct priv *priv) +mlx4_link_status_check (struct mlx4_priv *priv) {struct rte_eth_link *link = &priv->dev->data->dev_link;int ret =mlx4_link_update (priv->dev,0 );
@@ -175,7 +175,7 @@ mlx4_link_status_check(struct priv *priv)* Pointer to private structure. */ static void -mlx4_interrupt_handler (struct priv *priv) +mlx4_interrupt_handler (struct mlx4_priv *priv) {enum {LSC ,RMV , };static const enum rte_eth_event_type type[] = {
@@ -251,7 +251,7 @@ mlx4_arm_cq(struct rxq *rxq, int solicited)* 0 on success, negative errno value otherwise and rte_errno is set. */ int -mlx4_intr_uninstall (struct priv *priv) +mlx4_intr_uninstall (struct mlx4_priv *priv) {int err = rte_errno;/* Make sure rte_errno remains unchanged. */
@@ -279,7 +279,7 @@ mlx4_intr_uninstall(struct priv *priv)* 0 on success, negative errno value otherwise and rte_errno is set. */ int -mlx4_intr_install (struct priv *priv) +mlx4_intr_install (struct mlx4_priv *priv) {const struct rte_intr_conf *const intr_conf = &priv->dev->data->dev_conf.intr_conf;
@@ -378,7 +378,7 @@ mlx4_rx_intr_enable(struct rte_eth_dev *dev, uint16_t idx)* 0 on success, negative errno value otherwise and rte_errno is set. */ int -mlx4_rxq_intr_enable (struct priv *priv) +mlx4_rxq_intr_enable (struct mlx4_priv *priv) {const struct rte_intr_conf *const intr_conf = &priv->dev->data->dev_conf.intr_conf;
@@ -397,7 +397,7 @@ mlx4_rxq_intr_enable(struct priv *priv)* Pointer to private structure. */ void -mlx4_rxq_intr_disable (struct priv *priv) +mlx4_rxq_intr_disable (struct mlx4_priv *priv) {int err = rte_errno;/* Make sure rte_errno remains unchanged. */
drivers/net/mlx4/mlx4_mr.c +15 -15
@@ -348,7 +348,7 @@ mr_find_next_chunk(struct mlx4_mr *mr, struct mlx4_mr_cache *entry,static int mr_insert_dev_cache (struct rte_eth_dev *dev,struct mlx4_mr *mr) { -struct priv *priv = dev->data->dev_private; +struct mlx4_priv *priv = dev->data->dev_private;unsigned int n; DEBUG("port %u inserting MR(%p) to global cache",
@@ -389,7 +389,7 @@ static struct mlx4_mr * mr_lookup_dev_list(struct rte_eth_dev *dev, struct mlx4_mr_cache *entry, uintptr_t addr) { - struct priv *priv = dev->data->dev_private; + struct mlx4_priv *priv = dev->data->dev_private;struct mlx4_mr *mr;/* Iterate all the existing MRs. */
@@ -430,7 +430,7 @@ static uint32_t mr_lookup_dev(struct rte_eth_dev *dev, struct mlx4_mr_cache *entry, uintptr_t addr) { - struct priv *priv = dev->data->dev_private; + struct mlx4_priv *priv = dev->data->dev_private;uint16_t idx;uint32_t lkey =UINT32_MAX ;struct mlx4_mr *mr;
@@ -485,7 +485,7 @@ mr_free(struct mlx4_mr *mr)static void mlx4_mr_garbage_collect (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx4_priv *priv = dev->data->dev_private;struct mlx4_mr *mr_next;struct mlx4_mr_list free_list =LIST_HEAD_INITIALIZER (free_list);
@@ -543,7 +543,7 @@ static uint32_t mlx4_mr_create(struct rte_eth_dev *dev, struct mlx4_mr_cache *entry, uintptr_t addr) { - struct priv *priv = dev->data->dev_private; + struct mlx4_priv *priv = dev->data->dev_private;struct rte_mem_config *mcfg =rte_eal_get_configuration ()->mem_config;const struct rte_memseg_list *msl;const struct rte_memseg *ms;
@@ -769,7 +769,7 @@ mlx4_mr_create(struct rte_eth_dev *dev, struct mlx4_mr_cache *entry,static void mr_rebuild_dev_cache (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx4_priv *priv = dev->data->dev_private;struct mlx4_mr *mr;DEBUG ("port %u rebuild dev cache[]" , dev->data->port_id);
@@ -801,7 +801,7 @@ mr_rebuild_dev_cache(struct rte_eth_dev *dev)static void mlx4_mr_mem_event_free_cb (struct rte_eth_dev *dev,const void *addr,size_t len) { -struct priv *priv = dev->data->dev_private; +struct mlx4_priv *priv = dev->data->dev_private;const struct rte_memseg_list *msl;struct mlx4_mr *mr;int ms_n;
@@ -889,7 +889,7 @@ void mlx4_mr_mem_event_cb(enum rte_mem_event event_type, const void *addr, size_t len, void *arg __rte_unused) { - struct priv *priv; + struct mlx4_priv *priv;switch (event_type) {case RTE_MEM_EVENT_FREE :
@@ -926,7 +926,7 @@ static uint32_t mlx4_mr_lookup_dev(struct rte_eth_dev *dev, struct mlx4_mr_ctrl *mr_ctrl, struct mlx4_mr_cache *entry, uintptr_t addr) { - struct priv *priv = dev->data->dev_private; + struct mlx4_priv *priv = dev->data->dev_private;struct mlx4_mr_btree *bt = &mr_ctrl->cache_bh;uint16_t idx;uint32_t lkey;
@@ -1024,7 +1024,7 @@ uint32_t mlx4_rx_addr2mr_bh(struct rxq *rxq, uintptr_t addr) {struct mlx4_mr_ctrl *mr_ctrl = &rxq->mr_ctrl; -struct priv *priv = rxq->priv; +struct mlx4_priv *priv = rxq->priv;DEBUG ("Rx queue %u: miss on top-half, mru=%u, head=%u, addr=%p" , rxq->stats.idx, mr_ctrl->mru, mr_ctrl->head, (void *)addr);
@@ -1046,7 +1046,7 @@ static uint32_t mlx4_tx_addr2mr_bh(struct txq *txq, uintptr_t addr) {struct mlx4_mr_ctrl *mr_ctrl = &txq->mr_ctrl; -struct priv *priv = txq->priv; +struct mlx4_priv *priv = txq->priv;DEBUG ("Tx queue %u: miss on top-half, mru=%u, head=%u, addr=%p" , txq->stats.idx, mr_ctrl->mru, mr_ctrl->head, (void *)addr);
@@ -1122,7 +1122,7 @@ mlx4_mr_update_ext_mp_cb(struct rte_mempool *mp, void *opaque, {struct mr_update_mp_data *data = opaque;struct rte_eth_dev *dev = data->dev; -struct priv *priv = dev->data->dev_private; +struct mlx4_priv *priv = dev->data->dev_private;struct mlx4_mr_ctrl *mr_ctrl = data->mr_ctrl;struct mlx4_mr *mr =NULL ;uintptr_t addr = (uintptr_t )memhdr->addr;
@@ -1223,7 +1223,7 @@ uint32_t mlx4_tx_update_ext_mp(struct txq *txq, uintptr_t addr, struct rte_mempool *mp) { struct mlx4_mr_ctrl *mr_ctrl = &txq->mr_ctrl; -struct priv *priv = txq->priv; +struct mlx4_priv *priv = txq->priv;mlx4_mr_update_ext_mp (priv->dev, mr_ctrl, mp);return mlx4_tx_addr2mr_bh (txq, addr);
@@ -1289,7 +1289,7 @@ mlx4_mr_update_mp(struct rte_eth_dev *dev, struct mlx4_mr_ctrl *mr_ctrl,void mlx4_mr_dump_dev (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx4_priv *priv = dev->data->dev_private;struct mlx4_mr *mr;int mr_n =0 ;int chunk_n =0 ;
@@ -1332,7 +1332,7 @@ mlx4_mr_dump_dev(struct rte_eth_dev *dev)void mlx4_mr_release (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx4_priv *priv = dev->data->dev_private;struct mlx4_mr *mr_next =LIST_FIRST (&priv->mr.mr_list);/* Remove from memory callback device list. */
drivers/net/mlx4/mlx4_rxq.c +10 -10
@@ -87,7 +87,7 @@ mlx4_rss_hash_key_default[MLX4_RSS_HASH_KEY_SIZE] = {* Pointer to RSS context on success, NULL otherwise and rte_errno is set. */ struct mlx4_rss * -mlx4_rss_get (struct priv *priv,uint64_t fields, +mlx4_rss_get (struct mlx4_priv *priv,uint64_t fields,const uint8_t key[MLX4_RSS_HASH_KEY_SIZE ],uint16_t queues,const uint16_t queue_id[]) {
@@ -175,7 +175,7 @@ mlx4_rss_attach(struct mlx4_rss *rss) }struct ibv_wq *ind_tbl[rss->queues]; -struct priv *priv = rss->priv; +struct mlx4_priv *priv = rss->priv;const char *msg;unsigned int i =0 ;int ret;
@@ -290,7 +290,7 @@ mlx4_rss_attach(struct mlx4_rss *rss)void mlx4_rss_detach (struct mlx4_rss *rss) { -struct priv *priv = rss->priv; +struct mlx4_priv *priv = rss->priv;unsigned int i;assert (rss->refcnt);
@@ -327,7 +327,7 @@ mlx4_rss_detach(struct mlx4_rss *rss)* 0 on success, a negative errno value otherwise and rte_errno is set. */ int -mlx4_rss_init (struct priv *priv) +mlx4_rss_init (struct mlx4_priv *priv) {struct rte_eth_dev *dev = priv->dev;uint8_t log2_range =rte_log2_u32 (dev->data->nb_rx_queues);
@@ -451,7 +451,7 @@ mlx4_rss_init(struct priv *priv)* Pointer to private structure. */ void -mlx4_rss_deinit (struct priv *priv) +mlx4_rss_deinit (struct mlx4_priv *priv) {unsigned int i;
@@ -493,7 +493,7 @@ mlx4_rxq_attach(struct rxq *rxq)return 0 ; } -struct priv *priv = rxq->priv; +struct mlx4_priv *priv = rxq->priv;struct rte_eth_dev *dev = priv->dev;const uint32_t elts_n =1 << rxq->elts_n;const uint32_t sges_n =1 << rxq->sges_n;
@@ -675,7 +675,7 @@ mlx4_rxq_detach(struct rxq *rxq)* Supported Tx offloads. */ uint64_t -mlx4_get_rx_queue_offloads (struct priv *priv) +mlx4_get_rx_queue_offloads (struct mlx4_priv *priv) {uint64_t offloads =DEV_RX_OFFLOAD_SCATTER | DEV_RX_OFFLOAD_KEEP_CRC |
@@ -696,7 +696,7 @@ mlx4_get_rx_queue_offloads(struct priv *priv)* Supported Rx offloads. */ uint64_t -mlx4_get_rx_port_offloads (struct priv *priv) +mlx4_get_rx_port_offloads (struct mlx4_priv *priv) {uint64_t offloads =DEV_RX_OFFLOAD_VLAN_FILTER ;
@@ -728,7 +728,7 @@ mlx4_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, unsigned int socket, const struct rte_eth_rxconf *conf, struct rte_mempool *mp) { - struct priv *priv = dev->data->dev_private; + struct mlx4_priv *priv = dev->data->dev_private;uint32_t mb_len =rte_pktmbuf_data_room_size (mp);struct rte_mbuf *(*elts)[rte_align32pow2 (desc)];struct rxq *rxq;
@@ -911,7 +911,7 @@ void mlx4_rx_queue_release(void *dpdk_rxq) {struct rxq *rxq = (struct rxq *)dpdk_rxq; -struct priv *priv; +struct mlx4_priv *priv;unsigned int i;if (rxq ==NULL )
drivers/net/mlx4/mlx4_rxtx.h +9 -9
@@ -38,7 +38,7 @@ struct mlx4_rxq_stats {/** Rx queue descriptor. */ struct rxq { -struct priv *priv;/**< Back pointer to private data. */ +struct mlx4_priv *priv;/**< Back pointer to private data. */ struct rte_mempool *mp;/**< Memory pool for allocations. */ struct ibv_cq *cq;/**< Completion queue. */ struct ibv_wq *wq;/**< Work queue. */
@@ -65,7 +65,7 @@ struct rxq {/** Shared flow target for Rx queues. */ struct mlx4_rss {LIST_ENTRY (mlx4_rss) next;/**< Next entry in list. */ -struct priv *priv;/**< Back pointer to private data. */ +struct mlx4_priv *priv;/**< Back pointer to private data. */ uint32_t refcnt;/**< Reference count for this object. */ uint32_t usecnt;/**< Number of users relying on @p qp and @p ind. */ struct ibv_qp *qp;/**< Queue pair. */
@@ -111,7 +111,7 @@ struct txq { uint32_t lb:1; /**< Whether packets should be looped back by eSwitch. */uint8_t *bounce_buf;/**< Memory used for storing the first DWORD of data TXBBs. */ -struct priv *priv;/**< Back pointer to private data. */ +struct mlx4_priv *priv;/**< Back pointer to private data. */ unsigned int socket;/**< CPU socket ID for allocations. */ struct ibv_cq *cq;/**< Completion queue. */ struct ibv_qp *qp;/**< Queue pair. */
@@ -121,9 +121,9 @@ struct txq {/* mlx4_rxq.c */ uint8_t mlx4_rss_hash_key_default[MLX4_RSS_HASH_KEY_SIZE ]; -int mlx4_rss_init (struct priv *priv); -void mlx4_rss_deinit (struct priv *priv); -struct mlx4_rss *mlx4_rss_get (struct priv *priv,uint64_t fields, +int mlx4_rss_init (struct mlx4_priv *priv); +void mlx4_rss_deinit (struct mlx4_priv *priv); +struct mlx4_rss *mlx4_rss_get (struct mlx4_priv *priv,uint64_t fields,const uint8_t key[MLX4_RSS_HASH_KEY_SIZE ],uint16_t queues,const uint16_t queue_id[]);void mlx4_rss_put (struct mlx4_rss *rss);
@@ -131,8 +131,8 @@ int mlx4_rss_attach(struct mlx4_rss *rss);void mlx4_rss_detach (struct mlx4_rss *rss);int mlx4_rxq_attach (struct rxq *rxq);void mlx4_rxq_detach (struct rxq *rxq); -uint64_t mlx4_get_rx_port_offloads (struct priv *priv); -uint64_t mlx4_get_rx_queue_offloads (struct priv *priv); +uint64_t mlx4_get_rx_port_offloads (struct mlx4_priv *priv); +uint64_t mlx4_get_rx_queue_offloads (struct mlx4_priv *priv); int mlx4_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, unsigned int socket, const struct rte_eth_rxconf *conf,
@@ -152,7 +152,7 @@ uint16_t mlx4_rx_burst_removed(void *dpdk_rxq, struct rte_mbuf **pkts,/* mlx4_txq.c */ -uint64_t mlx4_get_tx_port_offloads (struct priv *priv); +uint64_t mlx4_get_tx_port_offloads (struct mlx4_priv *priv);int mlx4_tx_queue_setup (struct rte_eth_dev *dev,uint16_t idx,uint16_t desc,unsigned int socket,const struct rte_eth_txconf *conf);
drivers/net/mlx4/mlx4_txq.c +3 -3
@@ -107,7 +107,7 @@ mlx4_txq_fill_dv_obj_info(struct txq *txq, struct mlx4dv_obj *mlxdv)* Supported Tx offloads. */ uint64_t -mlx4_get_tx_port_offloads (struct priv *priv) +mlx4_get_tx_port_offloads (struct mlx4_priv *priv) {uint64_t offloads =DEV_TX_OFFLOAD_MULTI_SEGS ;
@@ -148,7 +148,7 @@ int mlx4_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, unsigned int socket, const struct rte_eth_txconf *conf) { - struct priv *priv = dev->data->dev_private; + struct mlx4_priv *priv = dev->data->dev_private;struct mlx4dv_obj mlxdv;struct mlx4dv_qp dv_qp;struct mlx4dv_cq dv_cq;
@@ -351,7 +351,7 @@ void mlx4_tx_queue_release(void *dpdk_txq) {struct txq *txq = (struct txq *)dpdk_txq; -struct priv *priv; +struct mlx4_priv *priv;unsigned int i;if (txq ==NULL )
drivers/net/mlx5/mlx5.c +7 -7
@@ -200,7 +200,7 @@ mlx5_getenv_int(const char *name)static void *mlx5_alloc_verbs_buf (size_t size,void *data) { -struct priv *priv = data; +struct mlx5_priv *priv = data;void *ret;size_t alignment =sysconf (_SC_PAGESIZE);unsigned int socket =SOCKET_ID_ANY ;
@@ -248,7 +248,7 @@ mlx5_free_verbs_buf(void *ptr, void *data __rte_unused)static void mlx5_dev_close (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;unsigned int i;int ret;
@@ -335,7 +335,7 @@ mlx5_dev_close(struct rte_eth_dev *dev) i =RTE_MIN (mlx5_dev_to_port_id (dev->device, port_id, i), i);while (i--) { -struct priv *opriv = +struct mlx5_priv *opriv = rte_eth_devices[port_id[i]].data->dev_private; if (!opriv ||
@@ -634,7 +634,7 @@ find_lower_va_bound(const struct rte_memseg_list *msl,static int mlx5_uar_init_primary (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;void *addr = (void *)0 ;if (uar_base) {/* UAR address space mapped. */
@@ -680,7 +680,7 @@ mlx5_uar_init_primary(struct rte_eth_dev *dev)static int mlx5_uar_init_secondary (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;void *addr;assert (priv->uar_base);
@@ -743,7 +743,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,struct ibv_pd *pd =NULL ;struct mlx5dv_context dv_attr = { .comp_mask =0 };struct rte_eth_dev *eth_dev =NULL ; -struct priv *priv =NULL ; +struct mlx5_priv *priv =NULL ;int err =0 ;unsigned int hw_padding =0 ;unsigned int mps;
@@ -1011,7 +1011,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev, i =RTE_MIN (mlx5_dev_to_port_id (dpdk_dev, port_id, i), i);while (i--) { -const struct priv *opriv = +const struct mlx5_priv *opriv = rte_eth_devices[port_id[i]].data->dev_private; if (!opriv ||
drivers/net/mlx5/mlx5.h +3 -3
@@ -64,7 +64,7 @@ struct mlx5_switch_info {uint64_t switch_id;/**< Switch identifier. */ }; -LIST_HEAD (mlx5_dev_list, priv); +LIST_HEAD (mlx5_dev_list, mlx5_priv);/* Shared memory between primary and secondary processes. */ struct mlx5_shared_data {
@@ -186,8 +186,8 @@ struct mlx5_drop {struct mlx5_flow_tcf_context ; -struct priv { -LIST_ENTRY (priv) mem_event_cb;/* Called by memory event callback. */ +struct mlx5_priv { +LIST_ENTRY (mlx5_priv) mem_event_cb;/* Called by memory event callback. */ struct rte_eth_dev_data *dev_data;/* Pointer to device data. */ struct ibv_context *ctx;/* Verbs context. */ struct ibv_device_attr_ex device_attr;/* Device properties. */
drivers/net/mlx5/mlx5_ethdev.c +15 -15
@@ -131,7 +131,7 @@ static int mlx5_get_master_ifname(const struct rte_eth_dev *dev, char (*ifname)[IF_NAMESIZE]) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;DIR *dir;struct dirent *dent;unsigned int dev_type =0 ;
@@ -219,7 +219,7 @@ mlx5_get_master_ifname(const struct rte_eth_dev *dev,int mlx5_get_ifname (const struct rte_eth_dev *dev,char (*ifname)[IF_NAMESIZE ]) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;unsigned int ifindex = priv->nl_socket_rdma >=0 ?mlx5_nl_ifindex (priv->nl_socket_rdma, priv->ibdev_name) :0 ;
@@ -377,7 +377,7 @@ mlx5_set_flags(struct rte_eth_dev *dev, unsigned int keep, unsigned int flags)int mlx5_dev_configure (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;unsigned int rxqs_n = dev->data->nb_rx_queues;unsigned int txqs_n = dev->data->nb_tx_queues;unsigned int i;
@@ -460,7 +460,7 @@ mlx5_dev_configure(struct rte_eth_dev *dev)static void mlx5_set_default_params (struct rte_eth_dev *dev,struct rte_eth_dev_info *info) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;/* Minimum CPU utilization. */ info->default_rxportconf.ring_size =256 ;
@@ -499,7 +499,7 @@ mlx5_set_default_params(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)void mlx5_dev_infos_get (struct rte_eth_dev *dev,struct rte_eth_dev_info *info) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_dev_config *config = &priv->config;unsigned int max;char ifname[IF_NAMESIZE ];
@@ -540,7 +540,7 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info) i =RTE_MIN (mlx5_dev_to_port_id (dev->device, port_id, i), i);while (i--) { -struct priv *opriv = +struct mlx5_priv *opriv = rte_eth_devices[port_id[i]].data->dev_private; if (!opriv ||
@@ -572,7 +572,7 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)*/ int mlx5_fw_version_get (struct rte_eth_dev *dev,char *fw_ver,size_t fw_size) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct ibv_device_attr *attr = &priv->device_attr.orig_attr;size_t size =strnlen (attr->fw_ver,sizeof (attr->fw_ver)) +1 ;
@@ -635,7 +635,7 @@ static int mlx5_link_update_unlocked_gset(struct rte_eth_dev *dev, struct rte_eth_link *link) { - struct priv *priv = dev->data->dev_private; + struct mlx5_priv *priv = dev->data->dev_private;struct ethtool_cmd edata = { .cmd =ETHTOOL_GSET /* Deprecated since Linux v4.5. */ };
@@ -711,7 +711,7 @@ mlx5_link_update_unlocked_gs(struct rte_eth_dev *dev, struct rte_eth_link *link) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct ethtool_link_settings gcmd = { .cmd =ETHTOOL_GLINKSETTINGS };struct ifreq ifr;struct rte_eth_link dev_link;
@@ -866,7 +866,7 @@ mlx5_link_update(struct rte_eth_dev *dev, int wait_to_complete)int mlx5_dev_set_mtu (struct rte_eth_dev *dev,uint16_t mtu) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;uint16_t kern_mtu =0 ;int ret;
@@ -1041,7 +1041,7 @@ mlx5_ibv_device_to_pci_addr(const struct ibv_device *device,static uint32_t mlx5_dev_status_handler (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct ibv_async_event event;uint32_t ret =0 ;
@@ -1113,7 +1113,7 @@ mlx5_dev_handler_socket(void *cb_arg)void mlx5_dev_interrupt_handler_uninstall (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;if (dev->data->dev_conf.intr_conf.lsc || dev->data->dev_conf.intr_conf.rmv)
@@ -1137,7 +1137,7 @@ mlx5_dev_interrupt_handler_uninstall(struct rte_eth_dev *dev)void mlx5_dev_interrupt_handler_install (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;int ret;int flags;
@@ -1213,7 +1213,7 @@ mlx5_set_link_up(struct rte_eth_dev *dev)eth_tx_burst_t mlx5_select_tx_function (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;eth_tx_burst_t tx_pkt_burst = mlx5_tx_burst;struct mlx5_dev_config *config = &priv->config;uint64_t tx_offloads = dev->data->dev_conf.txmode.offloads;
@@ -1297,7 +1297,7 @@ int mlx5_is_removed(struct rte_eth_dev *dev) {struct ibv_device_attr device_attr; -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;if (mlx5_glue->query_device (priv->ctx, &device_attr) ==EIO )return 1 ;
drivers/net/mlx5/mlx5_flow.c +21 -21
168 lines not on this page · raw message
drivers/net/mlx5/mlx5_flow_dv.c +8 -8
@@ -587,7 +587,7 @@ static int flow_dv_validate_action_count(struct rte_eth_dev *dev, struct rte_flow_error *error) { - struct priv *priv = dev->data->dev_private; + struct mlx5_priv *priv = dev->data->dev_private;if (!priv->config.devx) goto notsup_err;
@@ -808,7 +808,7 @@ flow_dv_encap_decap_resource_registerstruct mlx5_flow *dev_flow, struct rte_flow_error *error) { - struct priv *priv = dev->data->dev_private; + struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_flow_dv_encap_decap_resource *cache_resource;/* Lookup a matching resource from cache. */
@@ -1440,7 +1440,7 @@ flow_dv_modify_hdr_resource_registerstruct mlx5_flow *dev_flow, struct rte_flow_error *error) { - struct priv *priv = dev->data->dev_private; + struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_flow_dv_modify_hdr_resource *cache_resource;/* Lookup a matching resource from cache. */
@@ -1505,7 +1505,7 @@ flow_dv_modify_hdr_resource_registerstatic struct mlx5_flow_counter *flow_dv_counter_new (struct rte_eth_dev *dev,uint32_t shared,uint32_t id) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_flow_counter *cnt =NULL ;struct mlx5_devx_counter_set *dcs =NULL ;int ret;
@@ -1589,7 +1589,7 @@ flow_dv_validate_attributes(struct rte_eth_dev *dev,const struct rte_flow_attr *attributes, struct rte_flow_error *error) { - struct priv *priv = dev->data->dev_private; + struct mlx5_priv *priv = dev->data->dev_private;uint32_t priority_max = priv->config.flow_prio -1 ;if (attributes->group)
@@ -2748,7 +2748,7 @@ flow_dv_matcher_register(struct rte_eth_dev *dev,struct mlx5_flow *dev_flow, struct rte_flow_error *error) { - struct priv *priv = dev->data->dev_private; + struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_flow_dv_matcher *cache_matcher; struct mlx5dv_flow_matcher_attr dv_attr = { .type = IBV_FLOW_ATTR_NORMAL,
@@ -2831,7 +2831,7 @@ flow_dv_translate(struct rte_eth_dev *dev,const struct rte_flow_action actions[], struct rte_flow_error *error) { - struct priv *priv = dev->data->dev_private; + struct mlx5_priv *priv = dev->data->dev_private;struct rte_flow *flow = dev_flow->flow;uint64_t item_flags =0 ;uint64_t last_item =0 ;
@@ -3480,7 +3480,7 @@ static int flow_dv_query_count(struct rte_eth_dev *dev, struct rte_flow *flow, void *data, struct rte_flow_error *error) { - struct priv *priv = dev->data->dev_private; + struct mlx5_priv *priv = dev->data->dev_private;struct rte_flow_query_count *qc = data;uint64_t pkts =0 ;uint64_t bytes =0 ;
drivers/net/mlx5/mlx5_flow_tcf.c +4 -4
@@ -2426,7 +2426,7 @@ flow_tcf_validate(struct rte_eth_dev *dev,*/ if ((action_flags &MLX5_FLOW_ACTION_OF_PUSH_VLAN ) && (action_flags &MLX5_FLOW_ACTION_PORT_ID ) && - ((struct priv *)port_id_dev->data->dev_private)->representor) + ((struct mlx5_priv *)port_id_dev->data->dev_private)->representor)return rte_flow_error_set (error,ENOTSUP ,RTE_FLOW_ERROR_TYPE_ACTION , actions, "vlan push can only be applied"
@@ -5566,7 +5566,7 @@ flow_tcf_check_inhw(struct mlx5_flow_tcf_context *tcf,static void flow_tcf_remove (struct rte_eth_dev *dev,struct rte_flow *flow) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_flow_tcf_context *ctx = priv->tcf_context;struct mlx5_flow *dev_flow;struct nlmsghdr *nlh;
@@ -5655,7 +5655,7 @@ static int flow_tcf_apply(struct rte_eth_dev *dev, struct rte_flow *flow, struct rte_flow_error *error) { - struct priv *priv = dev->data->dev_private; + struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_flow_tcf_context *ctx = priv->tcf_context;struct mlx5_flow *dev_flow;struct nlmsghdr *nlh;
@@ -6139,7 +6139,7 @@ flow_tcf_query_count(struct rte_eth_dev *dev, {struct flow_tcf_stats_basic sb_data;struct rte_flow_query_count *qc = data; -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_flow_tcf_context *ctx = priv->tcf_context;struct mnl_socket *nl = ctx->nl;struct mlx5_flow *dev_flow;
drivers/net/mlx5/mlx5_flow_verbs.c +4 -4
@@ -55,7 +55,7 @@ flow_verbs_counter_create(struct rte_eth_dev *dev, struct mlx5_flow_counter *counter) {#if defined(HAVE_IBV_DEVICE_COUNTERS_SET_V42 ) -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct ibv_counter_set_init_attr init = { .counter_set_id = counter->id};
@@ -66,7 +66,7 @@ flow_verbs_counter_create(struct rte_eth_dev *dev, }return 0 ;#elif defined(HAVE_IBV_DEVICE_COUNTERS_SET_V45) -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct ibv_counters_init_attr init = {0 };struct ibv_counter_attach_attr attach;int ret;
@@ -117,7 +117,7 @@ flow_verbs_counter_create(struct rte_eth_dev *dev,static struct mlx5_flow_counter *flow_verbs_counter_new (struct rte_eth_dev *dev,uint32_t shared,uint32_t id) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_flow_counter *cnt;int ret;
@@ -1398,7 +1398,7 @@ flow_verbs_translate(struct rte_eth_dev *dev,uint64_t action_flags =0 ;uint64_t priority = attr->priority;uint32_t subpriority =0 ; -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;if (priority ==MLX5_FLOW_PRIO_RSVD ) priority = priv->config.flow_prio -1 ;
drivers/net/mlx5/mlx5_mac.c +2 -2
@@ -67,7 +67,7 @@ mlx5_get_mac(struct rte_eth_dev *dev, uint8_t (*mac)[ETHER_ADDR_LEN])static void mlx5_internal_mac_addr_remove (struct rte_eth_dev *dev,uint32_t index) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;const int vf = priv->config.vf;assert (index <MLX5_MAX_MAC_ADDRESSES );
@@ -96,7 +96,7 @@ static int mlx5_internal_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac, uint32_t index) { - struct priv *priv = dev->data->dev_private; + struct mlx5_priv *priv = dev->data->dev_private;const int vf = priv->config.vf;unsigned int i;
drivers/net/mlx5/mlx5_mr.c +15 -15
@@ -336,7 +336,7 @@ mr_find_next_chunk(struct mlx5_mr *mr, struct mlx5_mr_cache *entry,static int mr_insert_dev_cache (struct rte_eth_dev *dev,struct mlx5_mr *mr) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;unsigned int n; DRV_LOG(DEBUG, "port %u inserting MR(%p) to global cache",
@@ -377,7 +377,7 @@ static struct mlx5_mr * mr_lookup_dev_list(struct rte_eth_dev *dev, struct mlx5_mr_cache *entry, uintptr_t addr) { - struct priv *priv = dev->data->dev_private; + struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_mr *mr;/* Iterate all the existing MRs. */
@@ -418,7 +418,7 @@ static uint32_t mr_lookup_dev(struct rte_eth_dev *dev, struct mlx5_mr_cache *entry, uintptr_t addr) { - struct priv *priv = dev->data->dev_private; + struct mlx5_priv *priv = dev->data->dev_private;uint16_t idx;uint32_t lkey =UINT32_MAX ;struct mlx5_mr *mr;
@@ -473,7 +473,7 @@ mr_free(struct mlx5_mr *mr)static void mlx5_mr_garbage_collect (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_mr *mr_next;struct mlx5_mr_list free_list =LIST_HEAD_INITIALIZER (free_list);
@@ -533,7 +533,7 @@ static uint32_t mlx5_mr_create(struct rte_eth_dev *dev, struct mlx5_mr_cache *entry, uintptr_t addr) { - struct priv *priv = dev->data->dev_private; + struct mlx5_priv *priv = dev->data->dev_private;struct rte_mem_config *mcfg =rte_eal_get_configuration ()->mem_config;const struct rte_memseg_list *msl;const struct rte_memseg *ms;
@@ -769,7 +769,7 @@ mlx5_mr_create(struct rte_eth_dev *dev, struct mlx5_mr_cache *entry,static void mr_rebuild_dev_cache (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_mr *mr;DRV_LOG (DEBUG ,"port %u rebuild dev cache[]" , dev->data->port_id);
@@ -803,7 +803,7 @@ mr_rebuild_dev_cache(struct rte_eth_dev *dev)static void mlx5_mr_mem_event_free_cb (struct rte_eth_dev *dev,const void *addr,size_t len) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;const struct rte_memseg_list *msl;struct mlx5_mr *mr;int ms_n;
@@ -888,7 +888,7 @@ void mlx5_mr_mem_event_cb(enum rte_mem_event event_type, const void *addr, size_t len, void *arg __rte_unused) { - struct priv *priv; + struct mlx5_priv *priv;struct mlx5_dev_list *dev_list = &mlx5_shared_data->mem_event_cb_list;switch (event_type) {
@@ -926,7 +926,7 @@ static uint32_t mlx5_mr_lookup_dev(struct rte_eth_dev *dev, struct mlx5_mr_ctrl *mr_ctrl, struct mlx5_mr_cache *entry, uintptr_t addr) { - struct priv *priv = dev->data->dev_private; + struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_mr_btree *bt = &mr_ctrl->cache_bh;uint16_t idx;uint32_t lkey;
@@ -1026,7 +1026,7 @@ mlx5_rx_addr2mr_bh(struct mlx5_rxq_data *rxq, uintptr_t addr)struct mlx5_rxq_ctrl *rxq_ctrl = container_of(rxq, struct mlx5_rxq_ctrl, rxq);struct mlx5_mr_ctrl *mr_ctrl = &rxq->mr_ctrl; -struct priv *priv = rxq_ctrl->priv; +struct mlx5_priv *priv = rxq_ctrl->priv; DRV_LOG(DEBUG, "Rx queue %u: miss on top-half, mru=%u, head=%u, addr=%p",
@@ -1051,7 +1051,7 @@ mlx5_tx_addr2mr_bh(struct mlx5_txq_data *txq, uintptr_t addr)struct mlx5_txq_ctrl *txq_ctrl = container_of(txq, struct mlx5_txq_ctrl, txq);struct mlx5_mr_ctrl *mr_ctrl = &txq->mr_ctrl; -struct priv *priv = txq_ctrl->priv; +struct mlx5_priv *priv = txq_ctrl->priv; DRV_LOG(DEBUG, "Tx queue %u: miss on top-half, mru=%u, head=%u, addr=%p",
@@ -1128,7 +1128,7 @@ mlx5_mr_update_ext_mp_cb(struct rte_mempool *mp, void *opaque, {struct mr_update_mp_data *data = opaque;struct rte_eth_dev *dev = data->dev; -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_mr_ctrl *mr_ctrl = data->mr_ctrl;struct mlx5_mr *mr =NULL ;uintptr_t addr = (uintptr_t )memhdr->addr;
@@ -1235,7 +1235,7 @@ mlx5_tx_update_ext_mp(struct mlx5_txq_data *txq, uintptr_t addr,struct mlx5_txq_ctrl *txq_ctrl = container_of(txq, struct mlx5_txq_ctrl, txq);struct mlx5_mr_ctrl *mr_ctrl = &txq->mr_ctrl; -struct priv *priv = txq_ctrl->priv; +struct mlx5_priv *priv = txq_ctrl->priv;mlx5_mr_update_ext_mp (ETH_DEV (priv), mr_ctrl, mp);return mlx5_tx_addr2mr_bh (txq, addr);
@@ -1301,7 +1301,7 @@ void mlx5_mr_dump_dev(struct rte_eth_dev *dev __rte_unused) {#ifndef NDEBUG -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_mr *mr;int mr_n =0 ;int chunk_n =0 ;
@@ -1343,7 +1343,7 @@ mlx5_mr_dump_dev(struct rte_eth_dev *dev __rte_unused)void mlx5_mr_release (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_mr *mr_next =LIST_FIRST (&priv->mr.mr_list);/* Remove from memory callback device list. */
drivers/net/mlx5/mlx5_nl.c +6 -6
@@ -361,7 +361,7 @@ static int mlx5_nl_mac_addr_list(struct rte_eth_dev *dev, struct ether_addr (*mac)[], int *mac_n) { - struct priv *priv = dev->data->dev_private; + struct mlx5_priv *priv = dev->data->dev_private;unsigned int iface_idx =mlx5_ifindex (dev); struct { struct nlmsghdr hdr;
@@ -420,7 +420,7 @@ static int mlx5_nl_mac_addr_modify(struct rte_eth_dev *dev, struct ether_addr *mac, int add) { - struct priv *priv = dev->data->dev_private; + struct mlx5_priv *priv = dev->data->dev_private;unsigned int iface_idx =mlx5_ifindex (dev); struct { struct nlmsghdr hdr;
@@ -492,7 +492,7 @@ int mlx5_nl_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac, uint32_t index) { - struct priv *priv = dev->data->dev_private; + struct mlx5_priv *priv = dev->data->dev_private;int ret; ret =mlx5_nl_mac_addr_modify (dev, mac,1 );
@@ -520,7 +520,7 @@ int mlx5_nl_mac_addr_remove(struct rte_eth_dev *dev, struct ether_addr *mac, uint32_t index) { - struct priv *priv = dev->data->dev_private; + struct mlx5_priv *priv = dev->data->dev_private;BITFIELD_RESET (priv->mac_own, index);return mlx5_nl_mac_addr_modify (dev, mac,0 );
@@ -572,7 +572,7 @@ mlx5_nl_mac_addr_sync(struct rte_eth_dev *dev)void mlx5_nl_mac_addr_flush (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;int i;for (i =MLX5_MAX_MAC_ADDRESSES -1 ; i >=0 ; --i) {
@@ -599,7 +599,7 @@ mlx5_nl_mac_addr_flush(struct rte_eth_dev *dev)static int mlx5_nl_device_flags (struct rte_eth_dev *dev,uint32_t flags,int enable) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;unsigned int iface_idx =mlx5_ifindex (dev);struct {struct nlmsghdr hdr;
drivers/net/mlx5/mlx5_rss.c +5 -5
@@ -41,7 +41,7 @@ int mlx5_rss_hash_update(struct rte_eth_dev *dev, struct rte_eth_rss_conf *rss_conf) { - struct priv *priv = dev->data->dev_private; + struct mlx5_priv *priv = dev->data->dev_private;unsigned int i;unsigned int idx;
@@ -95,7 +95,7 @@ int mlx5_rss_hash_conf_get(struct rte_eth_dev *dev, struct rte_eth_rss_conf *rss_conf) { - struct priv *priv = dev->data->dev_private; + struct mlx5_priv *priv = dev->data->dev_private;if (!rss_conf) { rte_errno =EINVAL ;
@@ -125,7 +125,7 @@ mlx5_rss_hash_conf_get(struct rte_eth_dev *dev,int mlx5_rss_reta_index_resize (struct rte_eth_dev *dev,unsigned int reta_size) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;void *mem;unsigned int old_size = priv->reta_idx_n;
@@ -165,7 +165,7 @@ mlx5_dev_rss_reta_query(struct rte_eth_dev *dev, struct rte_eth_rss_reta_entry64 *reta_conf, uint16_t reta_size) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;unsigned int idx;unsigned int i;
@@ -201,7 +201,7 @@ mlx5_dev_rss_reta_update(struct rte_eth_dev *dev, uint16_t reta_size) {int ret; -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;unsigned int idx;unsigned int i;unsigned int pos;
drivers/net/mlx5/mlx5_rxmode.c +4 -4
@@ -32,7 +32,7 @@void mlx5_promiscuous_enable (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;int ret; dev->data->promiscuous =1 ;
@@ -60,7 +60,7 @@ mlx5_promiscuous_enable(struct rte_eth_dev *dev)void mlx5_promiscuous_disable (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;int ret; dev->data->promiscuous =0 ;
@@ -81,7 +81,7 @@ mlx5_promiscuous_disable(struct rte_eth_dev *dev)void mlx5_allmulticast_enable (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;int ret; dev->data->all_multicast =1 ;
@@ -109,7 +109,7 @@ mlx5_allmulticast_enable(struct rte_eth_dev *dev)void mlx5_allmulticast_disable (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;int ret; dev->data->all_multicast =0 ;
drivers/net/mlx5/mlx5_rxq.c +31 -31
248 lines not on this page · raw message
drivers/net/mlx5/mlx5_rxtx.c +1 -1
@@ -509,7 +509,7 @@ mlx5_rx_descriptor_status(void *rx_queue, uint16_t offset)uint32_t mlx5_rx_queue_count (struct rte_eth_dev *dev,uint16_t rx_queue_id) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_rxq_data *rxq;if (dev->rx_pkt_burst != mlx5_rx_burst) {
drivers/net/mlx5/mlx5_rxtx.h +3 -3
@@ -58,7 +58,7 @@ struct mlx5_txq_stats {uint64_t oerrors;/**< Total number of failed transmitted packets. */ }; -struct priv ; +struct mlx5_priv ;/* Compressed CQE context. */ struct rxq_zip {
@@ -143,7 +143,7 @@ struct mlx5_rxq_ctrl {LIST_ENTRY (mlx5_rxq_ctrl) next;/* Pointer to the next element. */ rte_atomic32_t refcnt;/* Reference counter. */ struct mlx5_rxq_ibv *ibv;/* Verbs elements. */ -struct priv *priv;/* Back pointer to private data. */ +struct mlx5_priv *priv;/* Back pointer to private data. */ struct mlx5_rxq_data rxq;/* Data path structure. */ unsigned int socket;/* CPU socket ID for allocations. */ unsigned int irq:1; /* Whether IRQ is enabled. */
@@ -228,7 +228,7 @@ struct mlx5_txq_ctrl {unsigned int max_inline_data;/* Max inline data. */ unsigned int max_tso_header;/* Max TSO header size. */ struct mlx5_txq_ibv *ibv;/* Verbs queue object. */ -struct priv *priv;/* Back pointer to private data. */ +struct mlx5_priv *priv;/* Back pointer to private data. */ struct mlx5_txq_data txq;/* Data path structure. */ off_t uar_mmap_offset;/* UAR mmap offset for non-primary process. */ volatile void *bf_reg_orig;/* Blueflame register from verbs. */
drivers/net/mlx5/mlx5_rxtx_vec.c +2 -2
@@ -273,7 +273,7 @@ mlx5_check_raw_vec_tx_support(struct rte_eth_dev *dev)int __attribute__((cold))mlx5_check_vec_tx_support (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;uint64_t offloads = dev->data->dev_conf.txmode.offloads; if (!priv->config.tx_vec_en ||
@@ -318,7 +318,7 @@ mlx5_rxq_check_vec_support(struct mlx5_rxq_data *rxq)int __attribute__((cold))mlx5_check_vec_rx_support (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;uint16_t i;if (!priv->config.rx_vec_en)
drivers/net/mlx5/mlx5_socket.c +4 -4
@@ -26,7 +26,7 @@int mlx5_socket_init (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct sockaddr_un sun = { .sun_family =AF_UNIX , };
@@ -98,7 +98,7 @@ mlx5_socket_init(struct rte_eth_dev *dev)void mlx5_socket_uninit (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;MKSTR (path,"/var/tmp/%s_%d" ,MLX5_DRIVER_NAME , priv->primary_socket);claim_zero (close (priv->primary_socket));
@@ -115,7 +115,7 @@ mlx5_socket_uninit(struct rte_eth_dev *dev)void mlx5_socket_handle (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;int conn_sock;int ret =0 ;struct cmsghdr *cmsg =NULL ;
@@ -208,7 +208,7 @@ mlx5_socket_handle(struct rte_eth_dev *dev)int mlx5_socket_connect (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct sockaddr_un sun = { .sun_family =AF_UNIX , };
drivers/net/mlx5/mlx5_stats.c +8 -8
@@ -137,7 +137,7 @@ static const struct mlx5_counter_ctrl mlx5_counters_init[] = {static const unsigned int xstats_n =RTE_DIM (mlx5_counters_init);static inline void -mlx5_read_ib_stat (struct priv *priv,const char *ctr_name,uint64_t *stat) +mlx5_read_ib_stat (struct mlx5_priv *priv,const char *ctr_name,uint64_t *stat) {FILE *file; MKSTR(path, "%s/ports/1/hw_counters/%s",
@@ -169,7 +169,7 @@ mlx5_read_ib_stat(struct priv *priv, const char *ctr_name, uint64_t *stat)static int mlx5_read_dev_counters (struct rte_eth_dev *dev,uint64_t *stats) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_xstats_ctrl *xstats_ctrl = &priv->xstats_ctrl;unsigned int i;struct ifreq ifr;
@@ -236,7 +236,7 @@ mlx5_ethtool_get_stats_n(struct rte_eth_dev *dev) {void mlx5_stats_init (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_xstats_ctrl *xstats_ctrl = &priv->xstats_ctrl;struct mlx5_stats_ctrl *stats_ctrl = &priv->stats_ctrl;unsigned int i;
@@ -329,7 +329,7 @@ int mlx5_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats, unsigned int n) { - struct priv *priv = dev->data->dev_private; + struct mlx5_priv *priv = dev->data->dev_private;unsigned int i;uint64_t counters[n];struct mlx5_xstats_ctrl *xstats_ctrl = &priv->xstats_ctrl;
@@ -370,7 +370,7 @@ mlx5_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats,int mlx5_stats_get (struct rte_eth_dev *dev,struct rte_eth_stats *stats) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct rte_eth_stats tmp;unsigned int i;unsigned int idx;
@@ -435,7 +435,7 @@ mlx5_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)void mlx5_stats_reset (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_stats_ctrl *stats_ctrl = &priv->stats_ctrl;unsigned int i;unsigned int idx;
@@ -469,7 +469,7 @@ mlx5_stats_reset(struct rte_eth_dev *dev)void mlx5_xstats_reset (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_xstats_ctrl *xstats_ctrl = &priv->xstats_ctrl;int stats_n;unsigned int i;
@@ -513,7 +513,7 @@ mlx5_xstats_get_names(struct rte_eth_dev *dev __rte_unused, struct rte_eth_xstat_name *xstats_names, unsigned int n) {unsigned int i; -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_xstats_ctrl *xstats_ctrl = &priv->xstats_ctrl;unsigned int mlx5_xstats_n = xstats_ctrl->mlx5_stats_n;
drivers/net/mlx5/mlx5_trigger.c +8 -8
@@ -23,7 +23,7 @@static void mlx5_txq_stop (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;unsigned int i;for (i =0 ; i != priv->txqs_n; ++i)
@@ -42,7 +42,7 @@ mlx5_txq_stop(struct rte_eth_dev *dev)static int mlx5_txq_start (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;unsigned int i;int ret;
@@ -83,7 +83,7 @@ mlx5_txq_start(struct rte_eth_dev *dev)static void mlx5_rxq_stop (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;unsigned int i;for (i =0 ; i != priv->rxqs_n; ++i)
@@ -102,7 +102,7 @@ mlx5_rxq_stop(struct rte_eth_dev *dev)static int mlx5_rxq_start (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;unsigned int i;int ret =0 ;
@@ -157,7 +157,7 @@ mlx5_rxq_start(struct rte_eth_dev *dev)int mlx5_dev_start (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;int ret;DRV_LOG (DEBUG ,"port %u starting device" , dev->data->port_id);
@@ -221,7 +221,7 @@ mlx5_dev_start(struct rte_eth_dev *dev)void mlx5_dev_stop (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private; dev->data->dev_started =0 ;/* Prevent crashes when queues are still in use. */
@@ -252,7 +252,7 @@ mlx5_dev_stop(struct rte_eth_dev *dev)int mlx5_traffic_enable (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct rte_flow_item_eth bcast = { .dst.addr_bytes ="\xff\xff\xff\xff\xff\xff" , };
@@ -379,7 +379,7 @@ mlx5_traffic_enable(struct rte_eth_dev *dev)void mlx5_traffic_disable (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;mlx5_flow_list_flush (dev, &priv->ctrl_flows); }
drivers/net/mlx5/mlx5_txq.c +13 -13
@@ -102,7 +102,7 @@ txq_free_elts(struct mlx5_txq_ctrl *txq_ctrl)uint64_t mlx5_get_tx_port_offloads (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;uint64_t offloads = (DEV_TX_OFFLOAD_MULTI_SEGS |DEV_TX_OFFLOAD_VLAN_INSERT );struct mlx5_dev_config *config = &priv->config;
@@ -155,7 +155,7 @@ int mlx5_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, unsigned int socket, const struct rte_eth_txconf *conf) { - struct priv *priv = dev->data->dev_private; + struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_txq_data *txq = (*priv->txqs)[idx];struct mlx5_txq_ctrl *txq_ctrl = container_of(txq, struct mlx5_txq_ctrl, txq);
@@ -213,7 +213,7 @@ mlx5_tx_queue_release(void *dpdk_txq) {struct mlx5_txq_data *txq = (struct mlx5_txq_data *)dpdk_txq;struct mlx5_txq_ctrl *txq_ctrl; -struct priv *priv; +struct mlx5_priv *priv;unsigned int i;if (txq ==NULL )
@@ -246,7 +246,7 @@ mlx5_tx_queue_release(void *dpdk_txq)int mlx5_tx_uar_remap (struct rte_eth_dev *dev,int fd) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;unsigned int i, j;uintptr_t pages[priv->txqs_n];unsigned int pages_n =0 ;
@@ -354,7 +354,7 @@ is_empw_burst_func(eth_tx_burst_t tx_pkt_burst)struct mlx5_txq_ibv *mlx5_txq_ibv_new (struct rte_eth_dev *dev,uint16_t idx) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_txq_data *txq_data = (*priv->txqs)[idx];struct mlx5_txq_ctrl *txq_ctrl = container_of(txq_data, struct mlx5_txq_ctrl, txq);
@@ -562,7 +562,7 @@ mlx5_txq_ibv_new(struct rte_eth_dev *dev, uint16_t idx)struct mlx5_txq_ibv *mlx5_txq_ibv_get (struct rte_eth_dev *dev,uint16_t idx) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_txq_ctrl *txq_ctrl;if (idx >= priv->txqs_n)
@@ -623,7 +623,7 @@ mlx5_txq_ibv_releasable(struct mlx5_txq_ibv *txq_ibv)int mlx5_txq_ibv_verify (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;int ret =0 ;struct mlx5_txq_ibv *txq_ibv;
@@ -644,7 +644,7 @@ mlx5_txq_ibv_verify(struct rte_eth_dev *dev)static void txq_set_params (struct mlx5_txq_ctrl *txq_ctrl) { -struct priv *priv = txq_ctrl->priv; +struct mlx5_priv *priv = txq_ctrl->priv;struct mlx5_dev_config *config = &priv->config; const unsigned int max_tso_inline = ((MLX5_MAX_TSO_HEADER + (RTE_CACHE_LINE_SIZE - 1)) /
@@ -754,7 +754,7 @@ struct mlx5_txq_ctrl * mlx5_txq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, unsigned int socket, const struct rte_eth_txconf *conf) { - struct priv *priv = dev->data->dev_private; + struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_txq_ctrl *tmpl; tmpl = rte_calloc_socket("TXQ", 1,
@@ -809,7 +809,7 @@ mlx5_txq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,struct mlx5_txq_ctrl *mlx5_txq_get (struct rte_eth_dev *dev,uint16_t idx) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_txq_ctrl *ctrl =NULL ;if ((*priv->txqs)[idx]) {
@@ -835,7 +835,7 @@ mlx5_txq_get(struct rte_eth_dev *dev, uint16_t idx)int mlx5_txq_release (struct rte_eth_dev *dev,uint16_t idx) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_txq_ctrl *txq;size_t page_size =sysconf (_SC_PAGESIZE);
@@ -872,7 +872,7 @@ mlx5_txq_release(struct rte_eth_dev *dev, uint16_t idx)int mlx5_txq_releasable (struct rte_eth_dev *dev,uint16_t idx) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_txq_ctrl *txq;if (!(*priv->txqs)[idx])
@@ -893,7 +893,7 @@ mlx5_txq_releasable(struct rte_eth_dev *dev, uint16_t idx)int mlx5_txq_verify (struct rte_eth_dev *dev) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_txq_ctrl *txq;int ret =0 ;
drivers/net/mlx5/mlx5_vlan.c +3 -3
@@ -48,7 +48,7 @@int mlx5_vlan_filter_set (struct rte_eth_dev *dev,uint16_t vlan_id,int on) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;unsigned int i; DRV_LOG(DEBUG, "port %u %s VLAN filter ID %" PRIu16,
@@ -102,7 +102,7 @@ mlx5_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)void mlx5_vlan_strip_queue_set (struct rte_eth_dev *dev,uint16_t queue,int on) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;struct mlx5_rxq_data *rxq = (*priv->rxqs)[queue];struct mlx5_rxq_ctrl *rxq_ctrl = container_of(rxq, struct mlx5_rxq_ctrl, rxq);
@@ -160,7 +160,7 @@ mlx5_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on)int mlx5_vlan_offload_set (struct rte_eth_dev *dev,int mask) { -struct priv *priv = dev->data->dev_private; +struct mlx5_priv *priv = dev->data->dev_private;unsigned int i;if (mask Ð_VLAN_STRIP_MASK ) {
Signature · 1 line
2.20.1
Quoted 9 lines · Thomas Monjalon
The private structure stored in
rte_eth_dev->data->dev_privatewas named "struct priv".
In order to ease code browsing, the structure is renamed "struct mlx[45]_priv".Signed-off-by Thomas Monjalon <[email protected]>---
Please add "Cc: [email protected]" when merging it.
We can minimize conflict and manual labor,
when automatically applying bug fixes to stable releases.
Thanks
Shahaf Shuler
AppliedThursday, February 21, 2019 3:02 PM, Yongseok Koh:
Quoted 10 lines
Subject: Re: [PATCH] net/mlx: prefix private structure
Quoted 1 line
On Feb 21, 2019, at 1:29 AM, Thomas Monjalon <[email protected]>
Quoted 6 lines · wrote:
The private structure stored in
rte_eth_dev->data->dev_privatewas named "struct priv".
In order to ease code browsing, the structure is renamed "struct mlx[45]_priv".
Quoted 4 lines
Quoted 2 lines
Signed-off-by Thomas Monjalon <[email protected]>---
Please add "Cc: [email protected]" when merging it.
Added.
Quoted 5 lines
We can minimize conflict and manual labor, when automatically applying bug fixes to stable releases.
Acked-by Yongseok Koh <[email protected]>
There were few checkpatch error for line which exceeded the 80 char boundaries. I have fixed those, please have a look on final patch.
Applied to next-net-mlx, thanks.
Quoted 2 lines
Thanks