net/cxgbe: fix secondary process initialization
Attach to rte_eth_dev devices allocated by Primary process for
Ports other than Port-0 in the secondary process.
Save the Primary rte_eth_dev device eth_dev_data as part of txq
structure needed for tx path.
Fixes: 8318984927
("cxgbe: add pmd skeleton")
Cc: stable@dpdk.org
Signed-off-by: Kumar Sanghvi <kumaras@chelsio.com>
Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>
This commit is contained in:
parent
2195df6d11
commit
da5cf85e2d
@ -24,6 +24,7 @@ Basic stats = Y
|
|||||||
Stats per queue = Y
|
Stats per queue = Y
|
||||||
EEPROM dump = Y
|
EEPROM dump = Y
|
||||||
Registers dump = Y
|
Registers dump = Y
|
||||||
|
Multiprocess aware = Y
|
||||||
BSD nic_uio = Y
|
BSD nic_uio = Y
|
||||||
Linux UIO = Y
|
Linux UIO = Y
|
||||||
Linux VFIO = Y
|
Linux VFIO = Y
|
||||||
|
@ -267,6 +267,7 @@ struct sge_eth_tx_stats { /* Ethernet tx queue statistics */
|
|||||||
struct sge_eth_txq { /* state for an SGE Ethernet Tx queue */
|
struct sge_eth_txq { /* state for an SGE Ethernet Tx queue */
|
||||||
struct sge_txq q;
|
struct sge_txq q;
|
||||||
struct rte_eth_dev *eth_dev; /* port that this queue belongs to */
|
struct rte_eth_dev *eth_dev; /* port that this queue belongs to */
|
||||||
|
struct rte_eth_dev_data *data;
|
||||||
struct sge_eth_tx_stats stats; /* queue statistics */
|
struct sge_eth_tx_stats stats; /* queue statistics */
|
||||||
rte_spinlock_t txq_lock;
|
rte_spinlock_t txq_lock;
|
||||||
|
|
||||||
|
@ -1004,15 +1004,34 @@ static int eth_cxgbe_dev_init(struct rte_eth_dev *eth_dev)
|
|||||||
eth_dev->dev_ops = &cxgbe_eth_dev_ops;
|
eth_dev->dev_ops = &cxgbe_eth_dev_ops;
|
||||||
eth_dev->rx_pkt_burst = &cxgbe_recv_pkts;
|
eth_dev->rx_pkt_burst = &cxgbe_recv_pkts;
|
||||||
eth_dev->tx_pkt_burst = &cxgbe_xmit_pkts;
|
eth_dev->tx_pkt_burst = &cxgbe_xmit_pkts;
|
||||||
|
|
||||||
/* for secondary processes, we don't initialise any further as primary
|
|
||||||
* has already done this work.
|
|
||||||
*/
|
|
||||||
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
|
pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
|
||||||
|
|
||||||
|
/* for secondary processes, we attach to ethdevs allocated by primary
|
||||||
|
* and do minimal initialization.
|
||||||
|
*/
|
||||||
|
if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
|
||||||
|
int i;
|
||||||
|
|
||||||
|
for (i = 1; i < MAX_NPORTS; i++) {
|
||||||
|
struct rte_eth_dev *rest_eth_dev;
|
||||||
|
char namei[RTE_ETH_NAME_MAX_LEN];
|
||||||
|
|
||||||
|
snprintf(namei, sizeof(namei), "%s_%d",
|
||||||
|
pci_dev->device.name, i);
|
||||||
|
rest_eth_dev = rte_eth_dev_attach_secondary(namei);
|
||||||
|
if (rest_eth_dev) {
|
||||||
|
rest_eth_dev->device = &pci_dev->device;
|
||||||
|
rest_eth_dev->dev_ops =
|
||||||
|
eth_dev->dev_ops;
|
||||||
|
rest_eth_dev->rx_pkt_burst =
|
||||||
|
eth_dev->rx_pkt_burst;
|
||||||
|
rest_eth_dev->tx_pkt_burst =
|
||||||
|
eth_dev->tx_pkt_burst;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
snprintf(name, sizeof(name), "cxgbeadapter%d", eth_dev->data->port_id);
|
snprintf(name, sizeof(name), "cxgbeadapter%d", eth_dev->data->port_id);
|
||||||
adapter = rte_zmalloc(name, sizeof(*adapter), 0);
|
adapter = rte_zmalloc(name, sizeof(*adapter), 0);
|
||||||
if (!adapter)
|
if (!adapter)
|
||||||
|
@ -1095,7 +1095,7 @@ int t4_eth_xmit(struct sge_eth_txq *txq, struct rte_mbuf *mbuf,
|
|||||||
u32 wr_mid;
|
u32 wr_mid;
|
||||||
u64 cntrl, *end;
|
u64 cntrl, *end;
|
||||||
bool v6;
|
bool v6;
|
||||||
u32 max_pkt_len = txq->eth_dev->data->dev_conf.rxmode.max_rx_pkt_len;
|
u32 max_pkt_len = txq->data->dev_conf.rxmode.max_rx_pkt_len;
|
||||||
|
|
||||||
/* Reject xmit if queue is stopped */
|
/* Reject xmit if queue is stopped */
|
||||||
if (unlikely(txq->flags & EQ_STOPPED))
|
if (unlikely(txq->flags & EQ_STOPPED))
|
||||||
@ -1115,7 +1115,7 @@ int t4_eth_xmit(struct sge_eth_txq *txq, struct rte_mbuf *mbuf,
|
|||||||
(unlikely(m->pkt_len > max_pkt_len)))
|
(unlikely(m->pkt_len > max_pkt_len)))
|
||||||
goto out_free;
|
goto out_free;
|
||||||
|
|
||||||
pi = (struct port_info *)txq->eth_dev->data->dev_private;
|
pi = (struct port_info *)txq->data->dev_private;
|
||||||
adap = pi->adapter;
|
adap = pi->adapter;
|
||||||
|
|
||||||
cntrl = F_TXPKT_L4CSUM_DIS | F_TXPKT_IPCSUM_DIS;
|
cntrl = F_TXPKT_L4CSUM_DIS | F_TXPKT_IPCSUM_DIS;
|
||||||
@ -1997,6 +1997,7 @@ int t4_sge_alloc_eth_txq(struct adapter *adap, struct sge_eth_txq *txq,
|
|||||||
txq->stats.mapping_err = 0;
|
txq->stats.mapping_err = 0;
|
||||||
txq->flags |= EQ_STOPPED;
|
txq->flags |= EQ_STOPPED;
|
||||||
txq->eth_dev = eth_dev;
|
txq->eth_dev = eth_dev;
|
||||||
|
txq->data = eth_dev->data;
|
||||||
t4_os_lock_init(&txq->txq_lock);
|
t4_os_lock_init(&txq->txq_lock);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user