Skip to content

Commit 774d101

Browse files
Tony KrowiakAlexander Gordeev
authored andcommitted
s390/vfio-ap: let on_scan_complete() callback filter matrix and update guest's APCB
When adapters and/or domains are added to the host's AP configuration, this may result in multiple queue devices getting created and probed by the vfio_ap device driver. For each queue device probed, the matrix of adapters and domains assigned to a matrix mdev will be filtered to update the guest's APCB. If any adapters or domains get added to or removed from the APCB, the guest's AP configuration will be dynamically updated (i.e., hot plug/unplug). To dynamically update the guest's configuration, its VCPUs must be taken out of SIE for the period of time it takes to make the update. This is disruptive to the guest's operation and if there are many queues probed due to a change in the host's AP configuration, this could be troublesome. The problem is exacerbated by the fact that the 'on_scan_complete' callback also filters the mdev's matrix and updates the guest's AP configuration. In order to reduce the potential amount of disruption to the guest that may result from a change to the host's AP configuration, let's bypass the filtering of the matrix and updating of the guest's AP configuration in the probe callback - if due to a host config change - and defer it until the 'on_scan_complete' callback is invoked after the AP bus finishes its device scan operation. This way the filtering and updating will be performed only once regardless of the number of queues added. Signed-off-by: Tony Krowiak <akrowiak@linux.ibm.com> Reviewed-by: Halil Pasic <pasic@linux.ibm.com> Fixes: 48cae94 ("s390/vfio-ap: refresh guest's APCB by filtering AP resources assigned to mdev") Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20240115185441.31526-4-akrowiak@linux.ibm.com Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
1 parent 16fb78c commit 774d101

1 file changed

Lines changed: 13 additions & 0 deletions

File tree

drivers/s390/crypto/vfio_ap_ops.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2101,9 +2101,22 @@ int vfio_ap_mdev_probe_queue(struct ap_device *apdev)
21012101
if (matrix_mdev) {
21022102
vfio_ap_mdev_link_queue(matrix_mdev, q);
21032103

2104+
/*
2105+
* If we're in the process of handling the adding of adapters or
2106+
* domains to the host's AP configuration, then let the
2107+
* vfio_ap device driver's on_scan_complete callback filter the
2108+
* matrix and update the guest's AP configuration after all of
2109+
* the new queue devices are probed.
2110+
*/
2111+
if (!bitmap_empty(matrix_mdev->apm_add, AP_DEVICES) ||
2112+
!bitmap_empty(matrix_mdev->aqm_add, AP_DOMAINS))
2113+
goto done;
2114+
21042115
if (vfio_ap_mdev_filter_matrix(matrix_mdev))
21052116
vfio_ap_mdev_update_guest_apcb(matrix_mdev);
21062117
}
2118+
2119+
done:
21072120
dev_set_drvdata(&apdev->device, q);
21082121
release_update_locks_for_mdev(matrix_mdev);
21092122

0 commit comments

Comments
 (0)