Skip to content

Commit

Permalink
liquidio: Removed duplicate Tx queue status check
Browse files Browse the repository at this point in the history
Napi is checking Tx queue status and waking the Tx queue if required.
Same operation is being done while freeing every Tx buffer.
So removed the duplicate operation of checking Tx queue status from the Tx
buffer free functions.

Signed-off-by: Intiyaz Basha <intiyaz.basha@cavium.com>
Signed-off-by: Felix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Intiyaz Basha authored and David S. Miller committed Mar 27, 2018
1 parent e32ac25 commit 4171ec0
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 57 deletions.
28 changes: 0 additions & 28 deletions drivers/net/ethernet/cavium/liquidio/lio_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1634,28 +1634,6 @@ static int octeon_pci_os_setup(struct octeon_device *oct)
return 0;
}

/**
* \brief Check Tx queue state for a given network buffer
* @param lio per-network private data
* @param skb network buffer
*/
static inline int check_txq_state(struct lio *lio, struct sk_buff *skb)
{
int q, iq;

q = skb->queue_mapping;
iq = lio->linfo.txpciq[(q % lio->oct_dev->num_iqs)].s.q_no;

if (octnet_iq_is_full(lio->oct_dev, iq))
return 0;

if (__netif_subqueue_stopped(lio->netdev, q)) {
INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, iq, tx_restart, 1);
netif_wake_subqueue(lio->netdev, q);
}
return 1;
}

/**
* \brief Unmap and free network buffer
* @param buf buffer
Expand All @@ -1673,8 +1651,6 @@ static void free_netbuf(void *buf)
dma_unmap_single(&lio->oct_dev->pci_dev->dev, finfo->dptr, skb->len,
DMA_TO_DEVICE);

check_txq_state(lio, skb);

tx_buffer_free(skb);
}

Expand Down Expand Up @@ -1715,8 +1691,6 @@ static void free_netsgbuf(void *buf)
list_add_tail(&g->list, &lio->glist[iq]);
spin_unlock(&lio->glist_lock[iq]);

check_txq_state(lio, skb); /* mq support: sub-queue state check */

tx_buffer_free(skb);
}

Expand Down Expand Up @@ -1762,8 +1736,6 @@ static void free_netsgbuf_with_resp(void *buf)
spin_unlock(&lio->glist_lock[iq]);

/* Don't free the skb yet */

check_txq_state(lio, skb);
}

/**
Expand Down
29 changes: 0 additions & 29 deletions drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -953,29 +953,6 @@ static int octeon_pci_os_setup(struct octeon_device *oct)
return 0;
}

/**
* \brief Check Tx queue state for a given network buffer
* @param lio per-network private data
* @param skb network buffer
*/
static int check_txq_state(struct lio *lio, struct sk_buff *skb)
{
int q, iq;

q = skb->queue_mapping;
iq = lio->linfo.txpciq[q % lio->oct_dev->num_iqs].s.q_no;

if (octnet_iq_is_full(lio->oct_dev, iq))
return 0;

if (__netif_subqueue_stopped(lio->netdev, q)) {
INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, iq, tx_restart, 1);
netif_wake_subqueue(lio->netdev, q);
}

return 1;
}

/**
* \brief Unmap and free network buffer
* @param buf buffer
Expand All @@ -993,8 +970,6 @@ static void free_netbuf(void *buf)
dma_unmap_single(&lio->oct_dev->pci_dev->dev, finfo->dptr, skb->len,
DMA_TO_DEVICE);

check_txq_state(lio, skb);

tx_buffer_free(skb);
}

Expand Down Expand Up @@ -1036,8 +1011,6 @@ static void free_netsgbuf(void *buf)
list_add_tail(&g->list, &lio->glist[iq]);
spin_unlock(&lio->glist_lock[iq]);

check_txq_state(lio, skb); /* mq support: sub-queue state check */

tx_buffer_free(skb);
}

Expand Down Expand Up @@ -1083,8 +1056,6 @@ static void free_netsgbuf_with_resp(void *buf)
spin_unlock(&lio->glist_lock[iq]);

/* Don't free the skb yet */

check_txq_state(lio, skb);
}

/**
Expand Down

0 comments on commit 4171ec0

Please sign in to comment.