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

net/cxgbe: rework ethdev device allocation

Browse Source 
Rework rte_eth_dev allocation for other ports under same PF.

Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>
Signed-off-by: Kumar Sanghvi <kumaras@chelsio.com>
This commit is contained in:
Rahul Lakkireddy 2018-02-28 23:34:46 +05:30 committed by Ferruh Yigit
parent b0c0efb4fd
commit 2195df6d11
2 changed files with 44 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/net/cxgbe/base/adapter.h
View File

@ -308,7 +308,7 @@ struct adapter {
struct rte_pci_device *pdev; /* associated rte pci device */
struct rte_eth_dev *eth_dev; /* first port's rte eth device */
struct adapter_params params; /* adapter parameters */
struct port_info port[MAX_NPORTS]; /* ports belonging to this adapter */
struct port_info *port[MAX_NPORTS];/* ports belonging to this adapter */
struct sge sge; /* associated SGE */
/* support for single-threading access to adapter mailbox registers */
@ -327,6 +327,18 @@ struct adapter {
int use_unpacked_mode; /* unpacked rx mode state */
};
/**
* adap2pinfo - return the port_info of a port
* @adap: the adapter
* @idx: the port index
*
* Return the port_info structure for the port of the given index.
*/
static inline struct port_info *adap2pinfo(const struct adapter *adap, int idx)
{
return adap->port[idx];
}
#define CXGBE_PCI_REG(reg) rte_read32(reg)
static inline uint64_t cxgbe_read_addr64(volatile void *addr)
@ -602,7 +614,7 @@ static inline int t4_os_find_pci_capability(struct adapter *adapter, int cap)
static inline void t4_os_set_hw_addr(struct adapter *adapter, int port_idx,
u8 hw_addr[])
{
struct port_info *pi = &adapter->port[port_idx];
struct port_info *pi = adap2pinfo(adapter, port_idx);
ether_addr_copy((struct ether_addr *)hw_addr,
&pi->eth_dev->data->mac_addrs[0]);
@ -687,18 +699,6 @@ static inline void t4_os_atomic_list_del(struct mbox_entry *entry,
t4_os_unlock(lock);
}
/**
* adap2pinfo - return the port_info of a port
* @adap: the adapter
* @idx: the port index
*
* Return the port_info structure for the port of the given index.
*/
static inline struct port_info *adap2pinfo(struct adapter *adap, int idx)
{
return &adap->port[idx];
}
void *t4_alloc_mem(size_t size);
void t4_free_mem(void *addr);
#define t4_os_alloc(_size) t4_alloc_mem((_size))

53
drivers/net/cxgbe/cxgbe_main.c
View File

@ -382,7 +382,7 @@ static void print_port_info(struct adapter *adap)
struct rte_pci_addr *loc = &adap->pdev->addr;
for_each_port(adap, i) {
const struct port_info *pi = &adap->port[i];
const struct port_info *pi = adap2pinfo(adap, i);
char *bufp = buf;
if (pi->link_cfg.supported & FW_PORT_CAP_SPEED_100M)
@ -860,7 +860,7 @@ void t4_os_portmod_changed(const struct adapter *adap, int port_id)
NULL, "LR", "SR", "ER", "passive DA", "active DA", "LRM"
};
const struct port_info *pi = &adap->port[port_id];
const struct port_info *pi = adap2pinfo(adap, port_id);
if (pi->mod_type == FW_PORT_MOD_TYPE_NONE)
dev_info(adap, "Port%d: port module unplugged\n", pi->port_id);
@ -1190,6 +1190,11 @@ void cxgbe_close(struct adapter *adapter)
t4_free_vi(adapter, adapter->mbox,
adapter->pf, 0, pi->viid);
rte_free(pi->eth_dev->data->mac_addrs);
/* Skip first port since it'll be freed by DPDK stack */
if (i) {
rte_free(pi->eth_dev->data->dev_private);
rte_eth_dev_release_port(pi->eth_dev);
}
}
adapter->flags &= ~FULL_INIT_DONE;
}
@ -1265,21 +1270,16 @@ int cxgbe_probe(struct adapter *adapter)
}
for_each_port(adapter, i) {
char name[RTE_ETH_NAME_MAX_LEN];
struct rte_eth_dev_data *data = NULL;
const unsigned int numa_node = rte_socket_id();
char name[RTE_ETH_NAME_MAX_LEN];
struct rte_eth_dev *eth_dev;
pi = &adapter->port[i];
pi->adapter = adapter;
pi->xact_addr_filt = -1;
pi->port_id = i;
snprintf(name, sizeof(name), "cxgbe%d",
adapter->eth_dev->data->port_id + i);
snprintf(name, sizeof(name), "%s_%d",
adapter->pdev->device.name, i);
if (i == 0) {
/* First port is already allocated by DPDK */
pi->eth_dev = adapter->eth_dev;
eth_dev = adapter->eth_dev;
goto allocate_mac;
}
@ -1289,21 +1289,25 @@ int cxgbe_probe(struct adapter *adapter)
*/
/* reserve an ethdev entry */
pi->eth_dev = rte_eth_dev_allocate(name);
if (!pi->eth_dev)
eth_dev = rte_eth_dev_allocate(name);
if (!eth_dev)
goto out_free;
data = rte_zmalloc_socket(name, sizeof(*data), 0, numa_node);
if (!data)
eth_dev->data->dev_private =
rte_zmalloc_socket(name, sizeof(struct port_info),
RTE_CACHE_LINE_SIZE, numa_node);
if (!eth_dev->data->dev_private)
goto out_free;
data->port_id = adapter->eth_dev->data->port_id + i;
pi->eth_dev->data = data;
allocate_mac:
pi = (struct port_info *)eth_dev->data->dev_private;
adapter->port[i] = pi;
pi->eth_dev = eth_dev;
pi->adapter = adapter;
pi->xact_addr_filt = -1;
pi->port_id = i;
pi->eth_dev->device = &adapter->pdev->device;
pi->eth_dev->data->dev_private = pi;
pi->eth_dev->dev_ops = adapter->eth_dev->dev_ops;
pi->eth_dev->tx_pkt_burst = adapter->eth_dev->tx_pkt_burst;
pi->eth_dev->rx_pkt_burst = adapter->eth_dev->rx_pkt_burst;
@ -1349,8 +1353,11 @@ int cxgbe_probe(struct adapter *adapter)
/* Skip first port since it'll be de-allocated by DPDK */
if (i == 0)
continue;
if (pi->eth_dev->data)
rte_free(pi->eth_dev->data);
if (pi->eth_dev) {
if (pi->eth_dev->data->dev_private)
rte_free(pi->eth_dev->data->dev_private);
rte_eth_dev_release_port(pi->eth_dev);
}
}
if (adapter->flags & FW_OK)