mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 22:25:03 +00:00
36360658eb
Libudev relies on having a subsystem link for non-root devices. To
avoid libudev (and potentially other userspace tools) choking on the
matrix device let us introduce a matrix bus and with it the matrix
bus subsytem. Also make the matrix device reside within the matrix
bus.
Doing this we remove the forced link from the matrix device to the
vfio_ap driver and the device_type we do not need anymore.
Since the associated matrix driver is not the vfio_ap driver any more,
we have to change the search for the devices on the vfio_ap driver in
the function vfio_ap_verify_queue_reserved.
Fixes: 1fde573413 ("s390: vfio-ap: base implementation of VFIO AP device driver")
Cc: stable@vger.kernel.org
Reported-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Reported-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Pierre Morel <pmorel@linux.ibm.com>
Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Tony Krowiak <akrowiak@linux.ibm.com>
Acked-by: Halil Pasic <pasic@linux.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
89 lines
2.8 KiB
C
89 lines
2.8 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* Private data and functions for adjunct processor VFIO matrix driver.
|
|
*
|
|
* Author(s): Tony Krowiak <akrowiak@linux.ibm.com>
|
|
* Halil Pasic <pasic@linux.ibm.com>
|
|
*
|
|
* Copyright IBM Corp. 2018
|
|
*/
|
|
|
|
#ifndef _VFIO_AP_PRIVATE_H_
|
|
#define _VFIO_AP_PRIVATE_H_
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/device.h>
|
|
#include <linux/mdev.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/mutex.h>
|
|
|
|
#include "ap_bus.h"
|
|
|
|
#define VFIO_AP_MODULE_NAME "vfio_ap"
|
|
#define VFIO_AP_DRV_NAME "vfio_ap"
|
|
|
|
/**
|
|
* ap_matrix_dev - the AP matrix device structure
|
|
* @device: generic device structure associated with the AP matrix device
|
|
* @available_instances: number of mediated matrix devices that can be created
|
|
* @info: the struct containing the output from the PQAP(QCI) instruction
|
|
* mdev_list: the list of mediated matrix devices created
|
|
* lock: mutex for locking the AP matrix device. This lock will be
|
|
* taken every time we fiddle with state managed by the vfio_ap
|
|
* driver, be it using @mdev_list or writing the state of a
|
|
* single ap_matrix_mdev device. It's quite coarse but we don't
|
|
* expect much contention.
|
|
*/
|
|
struct ap_matrix_dev {
|
|
struct device device;
|
|
atomic_t available_instances;
|
|
struct ap_config_info info;
|
|
struct list_head mdev_list;
|
|
struct mutex lock;
|
|
struct ap_driver *vfio_ap_drv;
|
|
};
|
|
|
|
extern struct ap_matrix_dev *matrix_dev;
|
|
|
|
/**
|
|
* The AP matrix is comprised of three bit masks identifying the adapters,
|
|
* queues (domains) and control domains that belong to an AP matrix. The bits i
|
|
* each mask, from least significant to most significant bit, correspond to IDs
|
|
* 0 to 255. When a bit is set, the corresponding ID belongs to the matrix.
|
|
*
|
|
* @apm_max: max adapter number in @apm
|
|
* @apm identifies the AP adapters in the matrix
|
|
* @aqm_max: max domain number in @aqm
|
|
* @aqm identifies the AP queues (domains) in the matrix
|
|
* @adm_max: max domain number in @adm
|
|
* @adm identifies the AP control domains in the matrix
|
|
*/
|
|
struct ap_matrix {
|
|
unsigned long apm_max;
|
|
DECLARE_BITMAP(apm, 256);
|
|
unsigned long aqm_max;
|
|
DECLARE_BITMAP(aqm, 256);
|
|
unsigned long adm_max;
|
|
DECLARE_BITMAP(adm, 256);
|
|
};
|
|
|
|
/**
|
|
* struct ap_matrix_mdev - the mediated matrix device structure
|
|
* @list: allows the ap_matrix_mdev struct to be added to a list
|
|
* @matrix: the adapters, usage domains and control domains assigned to the
|
|
* mediated matrix device.
|
|
* @group_notifier: notifier block used for specifying callback function for
|
|
* handling the VFIO_GROUP_NOTIFY_SET_KVM event
|
|
* @kvm: the struct holding guest's state
|
|
*/
|
|
struct ap_matrix_mdev {
|
|
struct list_head node;
|
|
struct ap_matrix matrix;
|
|
struct notifier_block group_notifier;
|
|
struct kvm *kvm;
|
|
};
|
|
|
|
extern int vfio_ap_mdev_register(void);
|
|
extern void vfio_ap_mdev_unregister(void);
|
|
|
|
#endif /* _VFIO_AP_PRIVATE_H_ */
|