mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-03 15:55:19 +00:00
Code Issues Releases Wiki Activity

netdev-dpdk: Remove the tx queue spinlock.

Browse Source 
The previous commit makes OVS create one tx queue for each
cpu core, each pmd thread will use a separate tx queue.
Also, tx of non-pmd threads on dpdk interface is all through
'NON_PMD_THREAD_TX_QUEUE', protected by the 'nonpmd_mempool_mutex'.
Therefore, the spinlock is no longer needed.  And this commit
removes it from 'struct dpdk_tx_queue'.

Signed-off-by: Alex Wang <alexw@nicira.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
This commit is contained in:
Alex Wang
2014-09-05 10:56:18 -07:00
parent 94143fc41e
commit 95a596e3d9
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/netdev-dpdk.c
View File

@@ -158,7 +158,6 @@ struct dpdk_mp {
/* There should be one 'struct dpdk_tx_queue' created for /* There should be one 'struct dpdk_tx_queue' created for
* each cpu core. */ * each cpu core. */
struct dpdk_tx_queue { struct dpdk_tx_queue {
rte_spinlock_t tx_lock;
bool flush_tx; /* Set to true to flush queue everytime */ bool flush_tx; /* Set to true to flush queue everytime */
/* pkts are queued. */ /* pkts are queued. */
int count; int count;
@@ -477,7 +476,6 @@ netdev_dpdk_set_txq(struct netdev_dpdk *netdev, unsigned int n_txqs)
for (i = 0; i < n_txqs; i++) { for (i = 0; i < n_txqs; i++) {
int core_id = ovs_numa_get_numa_id(i); int core_id = ovs_numa_get_numa_id(i);
rte_spinlock_init(&netdev->tx_q[i].tx_lock);
/* If the corresponding core is not on the same numa node /* If the corresponding core is not on the same numa node
* as 'netdev', flags the 'flush_tx'. */ * as 'netdev', flags the 'flush_tx'. */
netdev->tx_q[i].flush_tx = netdev->socket_id == core_id; netdev->tx_q[i].flush_tx = netdev->socket_id == core_id;
@@ -723,9 +721,7 @@ dpdk_queue_flush(struct netdev_dpdk *dev, int qid)
if (txq->count == 0) { if (txq->count == 0) {
return; return;
} }
rte_spinlock_lock(&txq->tx_lock);
dpdk_queue_flush__(dev, qid); dpdk_queue_flush__(dev, qid);
rte_spinlock_unlock(&txq->tx_lock);
} }
static int static int
@@ -765,7 +761,6 @@ dpdk_queue_pkts(struct netdev_dpdk *dev, int qid,
int i = 0; int i = 0;
rte_spinlock_lock(&txq->tx_lock);
while (i < cnt) { while (i < cnt) {
int freeslots = MAX_TX_QUEUE_LEN - txq->count; int freeslots = MAX_TX_QUEUE_LEN - txq->count;
int tocopy = MIN(freeslots, cnt-i); int tocopy = MIN(freeslots, cnt-i);
@@ -784,7 +779,6 @@ dpdk_queue_pkts(struct netdev_dpdk *dev, int qid,
dpdk_queue_flush__(dev, qid); dpdk_queue_flush__(dev, qid);
} }
} }
rte_spinlock_unlock(&txq->tx_lock);
} }
/* Tx function. Transmit packets indefinitely */ /* Tx function. Transmit packets indefinitely */