virtio_net: reduce raw_smp_processor_id() calling in virtnet_xdp_get_sq
authorLi RongQing <lirongqing@baidu.com>
Thu, 26 Aug 2021 08:21:35 +0000 (16:21 +0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 29 Aug 2021 09:53:45 +0000 (10:53 +0100)
smp_processor_id()/raw* will be called once each when not
more queues in virtnet_xdp_get_sq() which is called in
non-preemptible context, so it's safe to call the function
smp_processor_id() once.

Signed-off-by: Li RongQing <lirongqing@baidu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/virtio_net.c

index b4ae2ac8a249cf3defcfe6ebcfe5c1c1f2bcbb7e..271d38c1d9f80673cf90cf2077461042a5f74179 100644 (file)
@@ -528,19 +528,20 @@ static int __virtnet_xdp_xmit_one(struct virtnet_info *vi,
  * functions to perfectly solve these three problems at the same time.
  */
 #define virtnet_xdp_get_sq(vi) ({                                       \
+       int cpu = smp_processor_id();                                   \
        struct netdev_queue *txq;                                       \
        typeof(vi) v = (vi);                                            \
        unsigned int qp;                                                \
                                                                        \
        if (v->curr_queue_pairs > nr_cpu_ids) {                         \
                qp = v->curr_queue_pairs - v->xdp_queue_pairs;          \
-               qp += smp_processor_id();                               \
+               qp += cpu;                                              \
                txq = netdev_get_tx_queue(v->dev, qp);                  \
                __netif_tx_acquire(txq);                                \
        } else {                                                        \
-               qp = smp_processor_id() % v->curr_queue_pairs;          \
+               qp = cpu % v->curr_queue_pairs;                         \
                txq = netdev_get_tx_queue(v->dev, qp);                  \
-               __netif_tx_lock(txq, raw_smp_processor_id());           \
+               __netif_tx_lock(txq, cpu);                              \
        }                                                               \
        v->sq + qp;                                                     \
 })