Unverified Commit 91b7ac39 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9648 backport two patches from 5.10 to fix some bugs for GuestOS 

Merge Pull Request from: @xiaoniuzi 
 
limits the number of hw queues used by virtio-scsi by nr_cpu_ids, and collection table support muti pages

https://gitee.com/src-openeuler/kernel/issues/I8F6P4
https://gitee.com/openeuler/kernel/issues/I7CX6S 
 
Link:https://gitee.com/openeuler/kernel/pulls/9648

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 4be8bc3f ac6ac4cd

drivers/irqchip/irq-gic-v3-its.c

+4 −0
Original line number Diff line number Diff line
@@ -2186,6 +2186,10 @@ static int its_alloc_tables(struct its_node *its) 
			indirect = its_parse_indirect_baser(its, baser, &order,

							    ITS_MAX_VPEID_BITS);

			break;

		case GITS_BASER_TYPE_COLLECTION:

			indirect = its_parse_indirect_baser(its, baser, &order,

					order_base_2(num_possible_cpus()));

			break;

		}



		err = its_setup_baser(its, baser, cache, shr, order, indirect);

drivers/scsi/virtio_scsi.c

+1 −0
Original line number Diff line number Diff line
@@ -858,6 +858,7 @@ static int virtscsi_probe(struct virtio_device *vdev) 


	/* We need to know how many queues before we allocate. */

	num_queues = virtscsi_config_get(vdev, num_queues) ? : 1;

	num_queues = min_t(unsigned int, nr_cpu_ids, num_queues);



	num_targets = virtscsi_config_get(vdev, max_target) + 1;