ibmveth_set_channels() frees the TX long term buffer (LTB) of every
queue it removes and then wakes all TX queues. A sender that picked
its queue before the shrink, such as AF_PACKET with
PACKET_QDISC_BYPASS or pktgen, can call ibmveth_start_xmit() on a
removed queue after that, and memcpy() into a NULL LTB.

Read the LTB pointer once and drop the packet if it is NULL.

Stop TX with netif_tx_disable() instead of netif_tx_stop_all_queues(),
so a sender already in ibmveth_start_xmit() has left before
set_channels() allocates, maps or frees an LTB. On a grow, that
sender could otherwise see a new LTB before it is DMA mapped, or one
that the failure path frees again.

Fixes: 10c2aba89cc0 ("ibmveth: Ethtool set queue support")
Signed-off-by: Mingming Cao <[email protected]>
---
 drivers/net/ethernet/ibm/ibmveth.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/ibm/ibmveth.c 
b/drivers/net/ethernet/ibm/ibmveth.c
index 05d6b60cd187..faacff14841b 100644
--- a/drivers/net/ethernet/ibm/ibmveth.c
+++ b/drivers/net/ethernet/ibm/ibmveth.c
@@ -599,7 +599,7 @@ static void ibmveth_free_tx_ltb(struct ibmveth_adapter 
*adapter, int idx)
        if (!ptr)
                return;
 
-       adapter->tx_ltb_ptr[idx] = NULL;
+       WRITE_ONCE(adapter->tx_ltb_ptr[idx], NULL);
        dma_unmap_single(&adapter->vdev->dev, adapter->tx_ltb_dma[idx],
                         adapter->tx_ltb_size, DMA_TO_DEVICE);
        kfree(ptr);
@@ -1195,7 +1195,7 @@ static int ibmveth_set_channels(struct net_device *netdev,
        /* We have IBMVETH_MAX_QUEUES netdev_queue's allocated
         * but we may need to alloc/free the ltb's.
         */
-       netif_tx_stop_all_queues(netdev);
+       netif_tx_disable(netdev);
 
        /* Allocate any queue that we need */
        for (i = old; i < goal; i++) {
@@ -1304,6 +1304,16 @@ static netdev_tx_t ibmveth_start_xmit(struct sk_buff 
*skb,
        union ibmveth_buf_desc desc;
        int i, queue_num = skb_get_queue_mapping(skb);
        unsigned long mss = 0;
+       void *ltb;
+
+       /* A sender that picked its queue before ethtool -L shrank the TX
+        * queues can get here after that queue's LTB was freed.
+        */
+       ltb = READ_ONCE(adapter->tx_ltb_ptr[queue_num]);
+       if (unlikely(!ltb)) {
+               netdev->stats.tx_dropped++;
+               goto out;
+       }
 
        if (ibmveth_is_packet_unsupported(skb, netdev))
                goto out;
@@ -1359,13 +1369,13 @@ static netdev_tx_t ibmveth_start_xmit(struct sk_buff 
*skb,
                netdev->stats.tx_dropped++;
                goto out;
        }
-       memcpy(adapter->tx_ltb_ptr[queue_num], skb->data, skb_headlen(skb));
+       memcpy(ltb, skb->data, skb_headlen(skb));
        total_bytes = skb_headlen(skb);
        /* Copy frags into mapped buffers */
        for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                const skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
 
-               memcpy(adapter->tx_ltb_ptr[queue_num] + total_bytes,
+               memcpy(ltb + total_bytes,
                       skb_frag_address_safe(frag), skb_frag_size(frag));
                total_bytes += skb_frag_size(frag);
        }
-- 
2.50.1 (Apple Git-155)


Reply via email to