write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/block/blk-mq-virtio.c
..
..
@@ -1,14 +1,6 @@
1
+// SPDX-License-Identifier: GPL-2.0
1
2
 /*
2
3
  * Copyright (c) 2016 Christoph Hellwig.
3
- *
4
- * This program is free software; you can redistribute it and/or modify it
5
- * under the terms and conditions of the GNU General Public License,
6
- * version 2, as published by the Free Software Foundation.
7
- *
8
- * This program is distributed in the hope it will be useful, but WITHOUT
9
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
10
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
11
- * more details.
12
4
  */
13
5
 #include <linux/device.h>
14
6
 #include <linux/blk-mq.h>
..
..
@@ -19,17 +11,17 @@
19
11
 
20
12
 /**
21
13
  * blk_mq_virtio_map_queues - provide a default queue mapping for virtio device
22
- * @set:	tagset to provide the mapping for
23
- * @vdev:	virtio device associated with @set.
14
+ * @qmap:	CPU to hardware queue map.
15
+ * @vdev:	virtio device to provide a mapping for.
24
16
  * @first_vec:	first interrupt vectors to use for queues (usually 0)
25
17
  *
26
18
  * This function assumes the virtio device @vdev has at least as many available
27
- * interrupt vetors as @set has queues.  It will then queuery the vector
19
+ * interrupt vectors as @set has queues.  It will then query the vector
28
20
  * corresponding to each queue for it's affinity mask and built queue mapping
29
21
  * that maps a queue to the CPUs that have irq affinity for the corresponding
30
22
  * vector.
31
23
  */
32
-int blk_mq_virtio_map_queues(struct blk_mq_tag_set *set,
24
+int blk_mq_virtio_map_queues(struct blk_mq_queue_map *qmap,
33
25
 		struct virtio_device *vdev, int first_vec)
34
26
 {
35
27
 	const struct cpumask *mask;
..
..
@@ -38,18 +30,18 @@
38
30
 	if (!vdev->config->get_vq_affinity)
39
31
 		goto fallback;
40
32
 
41
-	for (queue = 0; queue < set->nr_hw_queues; queue++) {
33
+	for (queue = 0; queue < qmap->nr_queues; queue++) {
42
34
 		mask = vdev->config->get_vq_affinity(vdev, first_vec + queue);
43
35
 		if (!mask)
44
36
 			goto fallback;
45
37
 
46
38
 		for_each_cpu(cpu, mask)
47
-			set->mq_map[cpu] = queue;
39
+			qmap->mq_map[cpu] = qmap->queue_offset + queue;
48
40
 	}
49
41
 
50
42
 	return 0;
51
43
 fallback:
52
-	return blk_mq_map_queues(set);
44
+	return blk_mq_map_queues(qmap);
53
45
 }
54
46
 EXPORT_SYMBOL_GPL(blk_mq_virtio_map_queues);
55
47