X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fsfc%2Fsfc_tx.c;h=94baf4530a8825182730ffd31881e502801fc971;hb=dda791c2b6b28bece51928aa688f12e9f7b0e394;hp=cce8239542a0abc3e2dbf6d6920269d2ac07e1c8;hpb=7928b0fdf8f790b6178ad91cf41ee2f9df10e707;p=dpdk.git

diff --git a/drivers/net/sfc/sfc_tx.c b/drivers/net/sfc/sfc_tx.c
index cce8239542..94baf4530a 100644
--- a/drivers/net/sfc/sfc_tx.c
+++ b/drivers/net/sfc/sfc_tx.c
@@ -40,15 +40,15 @@ sfc_tx_get_dev_offload_caps(struct sfc_adapter *sa)
 	const efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic);
 	uint64_t caps = 0;
 
-	if ((sa->dp_tx->features & SFC_DP_TX_FEAT_VLAN_INSERT) &&
+	if ((sa->priv.dp_tx->features & SFC_DP_TX_FEAT_VLAN_INSERT) &&
 	    encp->enc_hw_tx_insert_vlan_enabled)
 		caps |= DEV_TX_OFFLOAD_VLAN_INSERT;
 
-	if (sa->dp_tx->features & SFC_DP_TX_FEAT_MULTI_SEG)
+	if (sa->priv.dp_tx->features & SFC_DP_TX_FEAT_MULTI_SEG)
 		caps |= DEV_TX_OFFLOAD_MULTI_SEGS;
 
-	if ((~sa->dp_tx->features & SFC_DP_TX_FEAT_MULTI_POOL) &&
-	    (~sa->dp_tx->features & SFC_DP_TX_FEAT_REFCNT))
+	if ((~sa->priv.dp_tx->features & SFC_DP_TX_FEAT_MULTI_POOL) &&
+	    (~sa->priv.dp_tx->features & SFC_DP_TX_FEAT_REFCNT))
 		caps |= DEV_TX_OFFLOAD_MBUF_FAST_FREE;
 
 	return caps;
@@ -110,10 +110,10 @@ sfc_tx_qcheck_conf(struct sfc_adapter *sa, unsigned int txq_max_fill_level,
 }
 
 void
-sfc_tx_qflush_done(struct sfc_txq *txq)
+sfc_tx_qflush_done(struct sfc_txq_info *txq_info)
 {
-	txq->state |= SFC_TXQ_FLUSHED;
-	txq->state &= ~SFC_TXQ_FLUSHING;
+	txq_info->state |= SFC_TXQ_FLUSHED;
+	txq_info->state &= ~SFC_TXQ_FLUSHING;
 }
 
 int
@@ -134,8 +134,8 @@ sfc_tx_qinit(struct sfc_adapter *sa, unsigned int sw_index,
 
 	sfc_log_init(sa, "TxQ = %u", sw_index);
 
-	rc = sa->dp_tx->qsize_up_rings(nb_tx_desc, &txq_entries, &evq_entries,
-				       &txq_max_fill_level);
+	rc = sa->priv.dp_tx->qsize_up_rings(nb_tx_desc, &txq_entries,
+					    &evq_entries, &txq_max_fill_level);
 	if (rc != 0)
 		goto fail_size_up_rings;
 	SFC_ASSERT(txq_entries >= EFX_TXQ_MINNDESCS);
@@ -159,19 +159,13 @@ sfc_tx_qinit(struct sfc_adapter *sa, unsigned int sw_index,
 	if (rc != 0)
 		goto fail_ev_qinit;
 
-	rc = ENOMEM;
-	txq = rte_zmalloc_socket("sfc-txq", sizeof(*txq), 0, socket_id);
-	if (txq == NULL)
-		goto fail_txq_alloc;
-
-	txq_info->txq = txq;
-
+	txq = &sa->txq_ctrl[sw_index];
 	txq->hw_index = sw_index;
 	txq->evq = evq;
-	txq->free_thresh =
+	txq_info->free_thresh =
 		(tx_conf->tx_free_thresh) ? tx_conf->tx_free_thresh :
 		SFC_TX_DEFAULT_FREE_THRESH;
-	txq->offloads = offloads;
+	txq_info->offloads = offloads;
 
 	rc = sfc_dma_alloc(sa, "txq", sw_index, EFX_TXQ_SIZE(txq_info->entries),
 			   socket_id, &txq->mem);
@@ -180,7 +174,7 @@ sfc_tx_qinit(struct sfc_adapter *sa, unsigned int sw_index,
 
 	memset(&info, 0, sizeof(info));
 	info.max_fill_level = txq_max_fill_level;
-	info.free_thresh = txq->free_thresh;
+	info.free_thresh = txq_info->free_thresh;
 	info.offloads = offloads;
 	info.txq_entries = txq_info->entries;
 	info.dma_desc_size_max = encp->enc_tx_dma_desc_size_max;
@@ -193,15 +187,15 @@ sfc_tx_qinit(struct sfc_adapter *sa, unsigned int sw_index,
 	info.tso_tcp_header_offset_limit =
 		encp->enc_tx_tso_tcp_header_offset_limit;
 
-	rc = sa->dp_tx->qcreate(sa->eth_dev->data->port_id, sw_index,
-				&RTE_ETH_DEV_TO_PCI(sa->eth_dev)->addr,
-				socket_id, &info, &txq->dp);
+	rc = sa->priv.dp_tx->qcreate(sa->eth_dev->data->port_id, sw_index,
+				     &RTE_ETH_DEV_TO_PCI(sa->eth_dev)->addr,
+				     socket_id, &info, &txq_info->dp);
 	if (rc != 0)
 		goto fail_dp_tx_qinit;
 
-	evq->dp_txq = txq->dp;
+	evq->dp_txq = txq_info->dp;
 
-	txq->state = SFC_TXQ_INITIALIZED;
+	txq_info->state = SFC_TXQ_INITIALIZED;
 
 	txq_info->deferred_start = (tx_conf->tx_deferred_start != 0);
 
@@ -211,10 +205,6 @@ fail_dp_tx_qinit:
 	sfc_dma_free(sa, &txq->mem);
 
 fail_dma_alloc:
-	txq_info->txq = NULL;
-	rte_free(txq);
-
-fail_txq_alloc:
 	sfc_ev_qfini(evq);
 
 fail_ev_qinit:
@@ -239,22 +229,20 @@ sfc_tx_qfini(struct sfc_adapter *sa, unsigned int sw_index)
 
 	txq_info = &sa->txq_info[sw_index];
 
-	txq = txq_info->txq;
-	SFC_ASSERT(txq != NULL);
-	SFC_ASSERT(txq->state == SFC_TXQ_INITIALIZED);
+	SFC_ASSERT(txq_info->state == SFC_TXQ_INITIALIZED);
 
-	sa->dp_tx->qdestroy(txq->dp);
-	txq->dp = NULL;
+	sa->priv.dp_tx->qdestroy(txq_info->dp);
+	txq_info->dp = NULL;
 
-	txq_info->txq = NULL;
+	txq_info->state &= ~SFC_TXQ_INITIALIZED;
 	txq_info->entries = 0;
 
+	txq = &sa->txq_ctrl[sw_index];
+
 	sfc_dma_free(sa, &txq->mem);
 
 	sfc_ev_qfini(txq->evq);
 	txq->evq = NULL;
-
-	rte_free(txq);
 }
 
 static int
@@ -314,7 +302,7 @@ sfc_tx_fini_queues(struct sfc_adapter *sa, unsigned int nb_tx_queues)
 
 	sw_index = sa->txq_count;
 	while (--sw_index >= (int)nb_tx_queues) {
-		if (sa->txq_info[sw_index].txq != NULL)
+		if (sa->txq_info[sw_index].state & SFC_TXQ_INITIALIZED)
 			sfc_tx_qfini(sa, sw_index);
 	}
 
@@ -355,8 +343,18 @@ sfc_tx_configure(struct sfc_adapter *sa)
 						 sa->socket_id);
 		if (sa->txq_info == NULL)
 			goto fail_txqs_alloc;
+
+		/*
+		 * Allocate primary process only TxQ control from heap
+		 * since it should not be shared.
+		 */
+		rc = ENOMEM;
+		sa->txq_ctrl = calloc(nb_tx_queues, sizeof(sa->txq_ctrl[0]));
+		if (sa->txq_ctrl == NULL)
+			goto fail_txqs_ctrl_alloc;
 	} else {
 		struct sfc_txq_info *new_txq_info;
+		struct sfc_txq *new_txq_ctrl;
 
 		if (nb_tx_queues < sa->txq_count)
 			sfc_tx_fini_queues(sa, nb_tx_queues);
@@ -367,11 +365,21 @@ sfc_tx_configure(struct sfc_adapter *sa)
 		if (new_txq_info == NULL && nb_tx_queues > 0)
 			goto fail_txqs_realloc;
 
+		new_txq_ctrl = realloc(sa->txq_ctrl,
+				       nb_tx_queues * sizeof(sa->txq_ctrl[0]));
+		if (new_txq_ctrl == NULL && nb_tx_queues > 0)
+			goto fail_txqs_ctrl_realloc;
+
 		sa->txq_info = new_txq_info;
-		if (nb_tx_queues > sa->txq_count)
+		sa->txq_ctrl = new_txq_ctrl;
+		if (nb_tx_queues > sa->txq_count) {
 			memset(&sa->txq_info[sa->txq_count], 0,
 			       (nb_tx_queues - sa->txq_count) *
 			       sizeof(sa->txq_info[0]));
+			memset(&sa->txq_ctrl[sa->txq_count], 0,
+			       (nb_tx_queues - sa->txq_count) *
+			       sizeof(sa->txq_ctrl[0]));
+		}
 	}
 
 	while (sa->txq_count < nb_tx_queues) {
@@ -386,7 +394,9 @@ done:
 	return 0;
 
 fail_tx_qinit_info:
+fail_txqs_ctrl_realloc:
 fail_txqs_realloc:
+fail_txqs_ctrl_alloc:
 fail_txqs_alloc:
 	sfc_tx_close(sa);
 
@@ -401,6 +411,9 @@ sfc_tx_close(struct sfc_adapter *sa)
 {
 	sfc_tx_fini_queues(sa, 0);
 
+	free(sa->txq_ctrl);
+	sa->txq_ctrl = NULL;
+
 	rte_free(sa->txq_info);
 	sa->txq_info = NULL;
 }
@@ -423,32 +436,30 @@ sfc_tx_qstart(struct sfc_adapter *sa, unsigned int sw_index)
 	SFC_ASSERT(sw_index < sa->txq_count);
 	txq_info = &sa->txq_info[sw_index];
 
-	txq = txq_info->txq;
-
-	SFC_ASSERT(txq != NULL);
-	SFC_ASSERT(txq->state == SFC_TXQ_INITIALIZED);
+	SFC_ASSERT(txq_info->state == SFC_TXQ_INITIALIZED);
 
+	txq = &sa->txq_ctrl[sw_index];
 	evq = txq->evq;
 
 	rc = sfc_ev_qstart(evq, sfc_evq_index_by_txq_sw_index(sa, sw_index));
 	if (rc != 0)
 		goto fail_ev_qstart;
 
-	if (txq->offloads & DEV_TX_OFFLOAD_IPV4_CKSUM)
+	if (txq_info->offloads & DEV_TX_OFFLOAD_IPV4_CKSUM)
 		flags |= EFX_TXQ_CKSUM_IPV4;
 
-	if (txq->offloads & DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM)
+	if (txq_info->offloads & DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM)
 		flags |= EFX_TXQ_CKSUM_INNER_IPV4;
 
-	if ((txq->offloads & DEV_TX_OFFLOAD_TCP_CKSUM) ||
-	    (txq->offloads & DEV_TX_OFFLOAD_UDP_CKSUM)) {
+	if ((txq_info->offloads & DEV_TX_OFFLOAD_TCP_CKSUM) ||
+	    (txq_info->offloads & DEV_TX_OFFLOAD_UDP_CKSUM)) {
 		flags |= EFX_TXQ_CKSUM_TCPUDP;
 
 		if (offloads_supported & DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM)
 			flags |= EFX_TXQ_CKSUM_INNER_TCPUDP;
 	}
 
-	if (txq->offloads & DEV_TX_OFFLOAD_TCP_TSO)
+	if (txq_info->offloads & DEV_TX_OFFLOAD_TCP_TSO)
 		flags |= EFX_TXQ_FATSOV2;
 
 	rc = efx_tx_qcreate(sa->nic, txq->hw_index, 0, &txq->mem,
@@ -464,9 +475,9 @@ sfc_tx_qstart(struct sfc_adapter *sa, unsigned int sw_index)
 
 	efx_tx_qenable(txq->common);
 
-	txq->state |= SFC_TXQ_STARTED;
+	txq_info->state |= SFC_TXQ_STARTED;
 
-	rc = sa->dp_tx->qstart(txq->dp, evq->read_ptr, desc_index);
+	rc = sa->priv.dp_tx->qstart(txq_info->dp, evq->read_ptr, desc_index);
 	if (rc != 0)
 		goto fail_dp_qstart;
 
@@ -479,7 +490,7 @@ sfc_tx_qstart(struct sfc_adapter *sa, unsigned int sw_index)
 	return 0;
 
 fail_dp_qstart:
-	txq->state = SFC_TXQ_INITIALIZED;
+	txq_info->state = SFC_TXQ_INITIALIZED;
 	efx_tx_qdestroy(txq->common);
 
 fail_tx_qcreate:
@@ -504,26 +515,25 @@ sfc_tx_qstop(struct sfc_adapter *sa, unsigned int sw_index)
 	SFC_ASSERT(sw_index < sa->txq_count);
 	txq_info = &sa->txq_info[sw_index];
 
-	txq = txq_info->txq;
-
-	if (txq == NULL || txq->state == SFC_TXQ_INITIALIZED)
+	if (txq_info->state == SFC_TXQ_INITIALIZED)
 		return;
 
-	SFC_ASSERT(txq->state & SFC_TXQ_STARTED);
+	SFC_ASSERT(txq_info->state & SFC_TXQ_STARTED);
 
-	sa->dp_tx->qstop(txq->dp, &txq->evq->read_ptr);
+	txq = &sa->txq_ctrl[sw_index];
+	sa->priv.dp_tx->qstop(txq_info->dp, &txq->evq->read_ptr);
 
 	/*
 	 * Retry TX queue flushing in case of flush failed or
 	 * timeout; in the worst case it can delay for 6 seconds
 	 */
 	for (retry_count = 0;
-	     ((txq->state & SFC_TXQ_FLUSHED) == 0) &&
+	     ((txq_info->state & SFC_TXQ_FLUSHED) == 0) &&
 	     (retry_count < SFC_TX_QFLUSH_ATTEMPTS);
 	     ++retry_count) {
 		rc = efx_tx_qflush(txq->common);
 		if (rc != 0) {
-			txq->state |= (rc == EALREADY) ?
+			txq_info->state |= (rc == EALREADY) ?
 				SFC_TXQ_FLUSHED : SFC_TXQ_FLUSH_FAILED;
 			break;
 		}
@@ -538,19 +548,19 @@ sfc_tx_qstop(struct sfc_adapter *sa, unsigned int sw_index)
 		do {
 			rte_delay_ms(SFC_TX_QFLUSH_POLL_WAIT_MS);
 			sfc_ev_qpoll(txq->evq);
-		} while ((txq->state & SFC_TXQ_FLUSHING) &&
+		} while ((txq_info->state & SFC_TXQ_FLUSHING) &&
 			 wait_count++ < SFC_TX_QFLUSH_POLL_ATTEMPTS);
 
-		if (txq->state & SFC_TXQ_FLUSHING)
+		if (txq_info->state & SFC_TXQ_FLUSHING)
 			sfc_err(sa, "TxQ %u flush timed out", sw_index);
 
-		if (txq->state & SFC_TXQ_FLUSHED)
+		if (txq_info->state & SFC_TXQ_FLUSHED)
 			sfc_notice(sa, "TxQ %u flushed", sw_index);
 	}
 
-	sa->dp_tx->qreap(txq->dp);
+	sa->priv.dp_tx->qreap(txq_info->dp);
 
-	txq->state = SFC_TXQ_INITIALIZED;
+	txq_info->state = SFC_TXQ_INITIALIZED;
 
 	efx_tx_qdestroy(txq->common);
 
@@ -583,7 +593,7 @@ sfc_tx_start(struct sfc_adapter *sa)
 		goto fail_efx_tx_init;
 
 	for (sw_index = 0; sw_index < sa->txq_count; ++sw_index) {
-		if (sa->txq_info[sw_index].txq != NULL &&
+		if (sa->txq_info[sw_index].state == SFC_TXQ_INITIALIZED &&
 		    (!(sa->txq_info[sw_index].deferred_start) ||
 		     sa->txq_info[sw_index].deferred_started)) {
 			rc = sfc_tx_qstart(sa, sw_index);
@@ -614,7 +624,7 @@ sfc_tx_stop(struct sfc_adapter *sa)
 
 	sw_index = sa->txq_count;
 	while (sw_index-- > 0) {
-		if (sa->txq_info[sw_index].txq != NULL)
+		if (sa->txq_info[sw_index].state & SFC_TXQ_STARTED)
 			sfc_tx_qstop(sa, sw_index);
 	}
 
@@ -712,6 +722,7 @@ sfc_efx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 	for (pkts_sent = 0, pktp = &tx_pkts[0];
 	     (pkts_sent < nb_pkts) && (fill_level <= soft_max_fill);
 	     pkts_sent++, pktp++) {
+		uint16_t		hw_vlan_tci_prev = txq->hw_vlan_tci;
 		struct rte_mbuf		*m_seg = *pktp;
 		size_t			pkt_len = m_seg->pkt_len;
 		unsigned int		pkt_descs = 0;
@@ -750,6 +761,7 @@ sfc_efx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 				 * mbuf shouldn't be orphaned
 				 */
 				pend -= pkt_descs;
+				txq->hw_vlan_tci = hw_vlan_tci_prev;
 
 				rte_pktmbuf_free(*pktp);
 
@@ -819,10 +831,12 @@ sfc_efx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 				fill_level = added - txq->completed;
 				if (fill_level > hard_max_fill) {
 					pend -= pkt_descs;
+					txq->hw_vlan_tci = hw_vlan_tci_prev;
 					break;
 				}
 			} else {
 				pend -= pkt_descs;
+				txq->hw_vlan_tci = hw_vlan_tci_prev;
 				break;
 			}
 		}
@@ -850,13 +864,43 @@ done:
 	return pkts_sent;
 }
 
+const struct sfc_dp_tx *
+sfc_dp_tx_by_dp_txq(const struct sfc_dp_txq *dp_txq)
+{
+	const struct sfc_dp_queue *dpq = &dp_txq->dpq;
+	struct rte_eth_dev *eth_dev;
+	struct sfc_adapter_priv *sap;
+
+	SFC_ASSERT(rte_eth_dev_is_valid_port(dpq->port_id));
+	eth_dev = &rte_eth_devices[dpq->port_id];
+
+	sap = sfc_adapter_priv_by_eth_dev(eth_dev);
+
+	return sap->dp_tx;
+}
+
+struct sfc_txq_info *
+sfc_txq_info_by_dp_txq(const struct sfc_dp_txq *dp_txq)
+{
+	const struct sfc_dp_queue *dpq = &dp_txq->dpq;
+	struct rte_eth_dev *eth_dev;
+	struct sfc_adapter *sa;
+
+	SFC_ASSERT(rte_eth_dev_is_valid_port(dpq->port_id));
+	eth_dev = &rte_eth_devices[dpq->port_id];
+
+	sa = eth_dev->data->dev_private;
+
+	SFC_ASSERT(dpq->queue_id < sa->txq_count);
+	return &sa->txq_info[dpq->queue_id];
+}
+
 struct sfc_txq *
 sfc_txq_by_dp_txq(const struct sfc_dp_txq *dp_txq)
 {
 	const struct sfc_dp_queue *dpq = &dp_txq->dpq;
 	struct rte_eth_dev *eth_dev;
 	struct sfc_adapter *sa;
-	struct sfc_txq *txq;
 
 	SFC_ASSERT(rte_eth_dev_is_valid_port(dpq->port_id));
 	eth_dev = &rte_eth_devices[dpq->port_id];
@@ -864,10 +908,7 @@ sfc_txq_by_dp_txq(const struct sfc_dp_txq *dp_txq)
 	sa = eth_dev->data->dev_private;
 
 	SFC_ASSERT(dpq->queue_id < sa->txq_count);
-	txq = sa->txq_info[dpq->queue_id].txq;
-
-	SFC_ASSERT(txq != NULL);
-	return txq;
+	return &sa->txq_ctrl[dpq->queue_id];
 }
 
 static sfc_dp_tx_qsize_up_rings_t sfc_efx_tx_qsize_up_rings;