Re: [PATCH v8 14/16] s390/vfio-ap: handle host AP config change notification
Hi Tony,
I love your patch! Perhaps something to improve:
[auto build test WARNING on kvms390/next]
[also build test WARNING on linus/master v5.7]
[cannot apply to s390/features linux/master next-20200605]
[if your patch is applied to the wrong git tree, please drop us a note to help
improve the system. BTW, we also suggest to use '--base' option to specify the
base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url:
https://github.com/0day-ci/linux/commits/Tony-Krowiak/s390-vfio-ap-dynamic-configuration-support/20200606-054350
base: https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git next
config: s390-allyesconfig (attached as .config)
compiler: s390-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget
https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O
~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross
ARCH=s390
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot
All warnings (new ones prefixed by >>, old ones prefixed by <<):
drivers/s390/crypto/vfio_ap_ops.c:52:23: warning: no previous prototype for
'vfio_ap_get_mdev_queue' [-Wmissing-prototypes]
52 | struct vfio_ap_queue *vfio_ap_get_mdev_queue(struct ap_matrix_mdev
*matrix_mdev,
| ^~
drivers/s390/crypto/vfio_ap_ops.c:142:24: warning: no previous prototype for
'vfio_ap_irq_disable' [-Wmissing-prototypes]
142 | struct ap_queue_status vfio_ap_irq_disable(struct vfio_ap_queue *q)
|^~~
drivers/s390/crypto/vfio_ap_ops.c:1484:5: warning: no previous prototype for
'vfio_ap_mdev_reset_queue' [-Wmissing-prototypes]
1484 | int vfio_ap_mdev_reset_queue(unsigned int apid, unsigned int apqi,
| ^~~~
>> drivers/s390/crypto/vfio_ap_ops.c:1746:6: warning: no previous prototype for
>> 'vfio_ap_mdev_unassign_apids' [-Wmissing-prototypes]
1746 | bool vfio_ap_mdev_unassign_apids(struct ap_matrix_mdev *matrix_mdev,
| ^~~
>> drivers/s390/crypto/vfio_ap_ops.c:1779:6: warning: no previous prototype for
>> 'vfio_ap_mdev_unassign_apqis' [-Wmissing-prototypes]
1779 | bool vfio_ap_mdev_unassign_apqis(struct ap_matrix_mdev *matrix_mdev,
| ^~~
vim +/vfio_ap_mdev_unassign_apids +1746 drivers/s390/crypto/vfio_ap_ops.c
1733
1734 /**
1735 * vfio_ap_mdev_unassign_apids
1736 *
1737 * @matrix_mdev: The matrix mediated device
1738 *
1739 * @aqm: A bitmap with 256 bits. Each bit in the map represents an APID
from 0
1740 * to 255 (with the leftmost bit corresponding to APID 0).
1741 *
1742 * Unassigns each APID specified in @aqm that is assigned to the shadow
CRYCB
1743 * of @matrix_mdev. Returns true if at least one APID is unassigned;
otherwise,
1744 * returns false.
1745 */
> 1746 bool vfio_ap_mdev_unassign_apids(struct ap_matrix_mdev *matrix_mdev,
1747 unsigned long *apm_unassign)
1748 {
1749 unsigned long apid;
1750 bool unassigned = false;
1751
1752 /*
1753 * If the matrix mdev is not in use by a KVM guest, return
indicating
1754 * that no APIDs have been unassigned.
1755 */
1756 if (!vfio_ap_mdev_has_crycb(matrix_mdev))
1757 return false;
1758
1759 for_each_set_bit_inv(apid, apm_unassign, AP_DEVICES) {
1760 unassigned |=
vfio_ap_mdev_unassign_guest_apid(matrix_mdev,
1761 apid);
1762 }
1763
1764 return unassigned;
1765 }
1766
1767 /**
1768 * vfio_ap_mdev_unassign_apqis
1769 *
1770 * @matrix_mdev: The matrix mediated device
1771 *
1772 * @aqm: A bitmap with 256 bits. Each bit in the map represents an APQI
from 0
1773 * to 255 (with the leftmost bit corresponding to APQI 0).
1774 *
1775 * Unassigns each APQI specified in @aqm that is assigned to the shadow
CRYCB
1776 * of @matrix_mdev. Returns true if at least one APQI is unassigned;
otherwise,
1777 * returns false.
1778 */
> 1779 bool vfio_ap_mdev_unassign_apqis(struct ap_matrix_mdev *matrix_mdev,
1780 unsigned long *aqm_unassign)
1781 {
1782 unsigned long apqi;
1783 bool unassigned = false;
1784
1785 /*
1786 * If the matrix mdev is not in use by a KVM guest, return
indicating
1787 * that no APQIs have been unassigned.
1788 */
1789 if (!vfio_ap_mdev_has_crycb(matrix_mdev))
1790 return false;
1791
1792 for_each_set_bit_inv(apqi, aqm_unassign, AP_DOMAINS) {
1793
[PATCH v8 14/16] s390/vfio-ap: handle host AP config change notification
Implements the driver callback invoked by the AP bus when the host
AP configuration has changed. Since this callback is invoked prior to
unbinding a device from its device driver, the vfio_ap driver will
respond by unplugging the AP adapters, domains and control domains
removed from the host's AP configuration from the guests using them.
Signed-off-by: Tony Krowiak
---
drivers/s390/crypto/vfio_ap_drv.c | 5 +-
drivers/s390/crypto/vfio_ap_ops.c | 148 +++---
drivers/s390/crypto/vfio_ap_private.h | 7 +-
3 files changed, 146 insertions(+), 14 deletions(-)
diff --git a/drivers/s390/crypto/vfio_ap_drv.c
b/drivers/s390/crypto/vfio_ap_drv.c
index 86fc83701e05..f0f83c1b8983 100644
--- a/drivers/s390/crypto/vfio_ap_drv.c
+++ b/drivers/s390/crypto/vfio_ap_drv.c
@@ -113,9 +113,11 @@ static int vfio_ap_matrix_dev_create(void)
/* Fill in config info via PQAP(QCI), if available */
if (test_facility(12)) {
- ret = ap_qci(_dev->info);
+ ret = ap_qci(_dev->config_info);
if (ret)
goto matrix_alloc_err;
+ memcpy(_dev->config_info_prev, _dev->config_info,
+ sizeof(struct ap_config_info));
}
mutex_init(_dev->lock);
@@ -175,6 +177,7 @@ static int __init vfio_ap_init(void)
vfio_ap_drv.remove = vfio_ap_queue_dev_remove;
vfio_ap_drv.in_use = vfio_ap_mdev_resource_in_use;
vfio_ap_drv.ids = ap_queue_ids;
+ vfio_ap_drv.on_config_changed = vfio_ap_on_cfg_changed;
ret = ap_driver_register(_ap_drv, THIS_MODULE, VFIO_AP_DRV_NAME);
if (ret) {
diff --git a/drivers/s390/crypto/vfio_ap_ops.c
b/drivers/s390/crypto/vfio_ap_ops.c
index 3df050eae112..e3c4b2d73072 100644
--- a/drivers/s390/crypto/vfio_ap_ops.c
+++ b/drivers/s390/crypto/vfio_ap_ops.c
@@ -347,8 +347,9 @@ static int vfio_ap_mdev_create(struct kobject *kobj, struct
mdev_device *mdev)
}
matrix_mdev->mdev = mdev;
- vfio_ap_matrix_init(_dev->info, _mdev->matrix);
- vfio_ap_matrix_init(_dev->info, _mdev->shadow_apcb);
+ vfio_ap_matrix_init(_dev->config_info, _mdev->matrix);
+ vfio_ap_matrix_init(_dev->config_info,
+ _mdev->shadow_apcb);
hash_init(matrix_mdev->qtable);
mdev_set_drvdata(mdev, matrix_mdev);
matrix_mdev->pqap_hook.hook = handle_pqap;
@@ -527,8 +528,8 @@ static int vfio_ap_mdev_filter_matrix(struct ap_matrix_mdev
*matrix_mdev,
* If the APID is not assigned to the host AP configuration,
* we can not assign it to the guest's AP configuration
*/
- if (!test_bit_inv(apid,
- (unsigned long *)matrix_dev->info.apm)) {
+ if (!test_bit_inv(apid, (unsigned long *)
+ matrix_dev->config_info.apm)) {
clear_bit_inv(apid, shadow_apcb->apm);
continue;
}
@@ -541,7 +542,7 @@ static int vfio_ap_mdev_filter_matrix(struct ap_matrix_mdev
*matrix_mdev,
* guest's AP configuration
*/
if (!test_bit_inv(apqi, (unsigned long *)
- matrix_dev->info.aqm)) {
+ matrix_dev->config_info.aqm)) {
clear_bit_inv(apqi, shadow_apcb->aqm);
continue;
}
@@ -595,7 +596,7 @@ static bool vfio_ap_mdev_config_shadow_apcb(struct
ap_matrix_mdev *matrix_mdev)
int napm, naqm;
struct ap_matrix shadow_apcb;
- vfio_ap_matrix_init(_dev->info, _apcb);
+ vfio_ap_matrix_init(_dev->config_info, _apcb);
napm = bitmap_weight(matrix_mdev->matrix.apm, AP_DEVICES);
naqm = bitmap_weight(matrix_mdev->matrix.aqm, AP_DOMAINS);
/*
@@ -741,7 +742,7 @@ static bool vfio_ap_mdev_assign_apqis_4_apid(struct
ap_matrix_mdev *matrix_mdev,
for_each_set_bit_inv(apqi, matrix_mdev->matrix.aqm, AP_DOMAINS) {
if (!test_bit_inv(apqi,
- (unsigned long *) matrix_dev->info.aqm))
+ (unsigned long *)matrix_dev->config_info.aqm))
clear_bit_inv(apqi, aqm);
apqn = AP_MKQID(apid, apqi);
@@ -764,7 +765,7 @@ static bool vfio_ap_mdev_assign_guest_apid(struct
ap_matrix_mdev *matrix_mdev,
unsigned long apqi, apqn;
if (!vfio_ap_mdev_has_crycb(matrix_mdev) ||
- !test_bit_inv(apid, (unsigned long *)matrix_dev->info.apm))
+ !test_bit_inv(apid, (unsigned long *)matrix_dev->config_info.apm))
return false;
if (bitmap_empty(matrix_mdev->shadow_apcb.aqm, AP_DOMAINS))
@@ -931,8 +932,8 @@ static bool vfio_ap_mdev_assign_apids_4_apqi(struct
ap_matrix_mdev *matrix_mdev,
