virtio: Make vp_set_vq_affinity() take a mask.

Make vp_set_vq_affinity() take a cpumask instead of taking a single CPU.

If there are fewer queues than cores, queue affinity should be able to
map to multiple cores.

Link: https://patchwork.ozlabs.org/patch/948149/
Suggested-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: Caleb Raitto <caraitto@google.com>
Acked-by: Gonglei <arei.gonglei@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/crypto/virtio/virtio_crypto_core.c b/drivers/crypto/virtio/virtio_crypto_core.c
index 83326986c113db43edb947d236d7fc8e1dfc55be..7c719855369989d4a90b4a1288d858c2db1b353a 100644 (file)
--- a/drivers/crypto/virtio/virtio_crypto_core.c
+++ b/drivers/crypto/virtio/virtio_crypto_core.c
@@ -146,7 +146,7 @@ static void virtcrypto_clean_affinity(struct virtio_crypto *vi, long hcpu)
 
        if (vi->affinity_hint_set) {
                for (i = 0; i < vi->max_data_queues; i++)
-                       virtqueue_set_affinity(vi->data_vq[i].vq, -1);
+                       virtqueue_set_affinity(vi->data_vq[i].vq, NULL);
 
                vi->affinity_hint_set = false;
        }
@@ -173,7 +173,7 @@ static void virtcrypto_set_affinity(struct virtio_crypto *vcrypto)
         *
         */
        for_each_online_cpu(cpu) {
-               virtqueue_set_affinity(vcrypto->data_vq[i].vq, cpu);
+               virtqueue_set_affinity(vcrypto->data_vq[i].vq, cpumask_of(cpu));
                if (++i >= vcrypto->max_data_queues)
                        break;
        }

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 39a7f44525873ef2bb67ef15aefa98bac6d56133..43fabc0eb4d258dab0b4e28c61d00c9a21764b97 100644 (file)
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1878,8 +1878,8 @@ static void virtnet_clean_affinity(struct virtnet_info *vi, long hcpu)
 
        if (vi->affinity_hint_set) {
                for (i = 0; i < vi->max_queue_pairs; i++) {
-                       virtqueue_set_affinity(vi->rq[i].vq, -1);
-                       virtqueue_set_affinity(vi->sq[i].vq, -1);
+                       virtqueue_set_affinity(vi->rq[i].vq, NULL);
+                       virtqueue_set_affinity(vi->sq[i].vq, NULL);
                }
 
                vi->affinity_hint_set = false;
@@ -1905,8 +1905,8 @@ static void virtnet_set_affinity(struct virtnet_info *vi)
        for_each_online_cpu(cpu) {
                const unsigned long *mask = cpumask_bits(cpumask_of(cpu));
 
-               virtqueue_set_affinity(vi->rq[i].vq, cpu);
-               virtqueue_set_affinity(vi->sq[i].vq, cpu);
+               virtqueue_set_affinity(vi->rq[i].vq, cpumask_of(cpu));
+               virtqueue_set_affinity(vi->sq[i].vq, cpumask_of(cpu));
                __netif_set_xps_queue(vi->dev, mask, i, false);
                i++;
        }

diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c
index 705aebd74e560cd8d125cee28537e9734dabe518..465a6f5142cc56500ddbc84bf9c6f37fce058bee 100644 (file)
--- a/drivers/virtio/virtio_pci_common.c
+++ b/drivers/virtio/virtio_pci_common.c
@@ -421,7 +421,7 @@ const char *vp_bus_name(struct virtio_device *vdev)
  * - OR over all affinities for shared MSI
  * - ignore the affinity request if we're using INTX
  */
-int vp_set_vq_affinity(struct virtqueue *vq, int cpu)
+int vp_set_vq_affinity(struct virtqueue *vq, const struct cpumask *cpu_mask)
 {
        struct virtio_device *vdev = vq->vdev;
        struct virtio_pci_device *vp_dev = to_vp_device(vdev);
@@ -435,11 +435,10 @@ int vp_set_vq_affinity(struct virtqueue *vq, int cpu)
        if (vp_dev->msix_enabled) {
                mask = vp_dev->msix_affinity_masks[info->msix_vector];
                irq = pci_irq_vector(vp_dev->pci_dev, info->msix_vector);
-               if (cpu == -1)
+               if (!cpu_mask)
                        irq_set_affinity_hint(irq, NULL);
                else {
-                       cpumask_clear(mask);
-                       cpumask_set_cpu(cpu, mask);
+                       cpumask_copy(mask, cpu_mask);
                        irq_set_affinity_hint(irq, mask);
                }
        }

diff --git a/drivers/virtio/virtio_pci_common.h b/drivers/virtio/virtio_pci_common.h
index 135ee3cf7175881a8259a192ba102978196687c7..02271002c2f379077da1f3448096bd22057e0577 100644 (file)
--- a/drivers/virtio/virtio_pci_common.h
+++ b/drivers/virtio/virtio_pci_common.h
@@ -141,7 +141,7 @@ const char *vp_bus_name(struct virtio_device *vdev);
  * - OR over all affinities for shared MSI
  * - ignore the affinity request if we're using INTX
  */
-int vp_set_vq_affinity(struct virtqueue *vq, int cpu);
+int vp_set_vq_affinity(struct virtqueue *vq, const struct cpumask *cpu_mask);
 
 const struct cpumask *vp_get_vq_affinity(struct virtio_device *vdev, int index);
 

diff --git a/include/linux/virtio_config.h b/include/linux/virtio_config.h
index 5559a2d31c46af9c936f5103f752c35509d0c44b..32baf8e26735d5fd9c693105b681c557cab049e2 100644 (file)
--- a/include/linux/virtio_config.h
+++ b/include/linux/virtio_config.h
@@ -79,7 +79,8 @@ struct virtio_config_ops {
        u64 (*get_features)(struct virtio_device *vdev);
        int (*finalize_features)(struct virtio_device *vdev);
        const char *(*bus_name)(struct virtio_device *vdev);
-       int (*set_vq_affinity)(struct virtqueue *vq, int cpu);
+       int (*set_vq_affinity)(struct virtqueue *vq,
+                              const struct cpumask *cpu_mask);
        const struct cpumask *(*get_vq_affinity)(struct virtio_device *vdev,
                        int index);
 };
@@ -236,11 +237,11 @@ const char *virtio_bus_name(struct virtio_device *vdev)
  *
  */
 static inline
-int virtqueue_set_affinity(struct virtqueue *vq, int cpu)
+int virtqueue_set_affinity(struct virtqueue *vq, const struct cpumask *cpu_mask)
 {
        struct virtio_device *vdev = vq->vdev;
        if (vdev->config->set_vq_affinity)
-               return vdev->config->set_vq_affinity(vq, cpu);
+               return vdev->config->set_vq_affinity(vq, cpu_mask);
        return 0;
 }