iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virtio/s390: make airq summary indicators DMA

Browse Source 
The hypervisor needs to interact with the summary indicators, so these
need to be DMA memory as well (at least for protected virtualization
guests).

Signed-off-by: Halil Pasic <pasic@linux.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Michael Mueller <mimu@linux.ibm.com>
Tested-by: Michael Mueller <mimu@linux.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
This commit is contained in:
Halil Pasic 2019-03-26 19:03:47 +01:00 committed by Heiko Carstens
parent 48720ba568
commit 39c7dcb158
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/s390/virtio/virtio_ccw.c
View File

@ -140,11 +140,17 @@ static int virtio_ccw_use_airq = 1;
struct airq_info { struct airq_info {
rwlock_t lock; rwlock_t lock;
u8 summary_indicator; u8 summary_indicator_idx;
struct airq_struct airq; struct airq_struct airq;
struct airq_iv *aiv; struct airq_iv *aiv;
}; };
static struct airq_info *airq_areas[MAX_AIRQ_AREAS]; static struct airq_info *airq_areas[MAX_AIRQ_AREAS];
static u8 *summary_indicators;
static inline u8 *get_summary_indicator(struct airq_info *info)
{
return summary_indicators + info->summary_indicator_idx;
}
#define CCW_CMD_SET_VQ 0x13 #define CCW_CMD_SET_VQ 0x13
#define CCW_CMD_VDEV_RESET 0x33 #define CCW_CMD_VDEV_RESET 0x33
@ -209,7 +215,7 @@ static void virtio_airq_handler(struct airq_struct *airq, bool floating)
break; break;
vring_interrupt(0, (void *)airq_iv_get_ptr(info->aiv, ai)); vring_interrupt(0, (void *)airq_iv_get_ptr(info->aiv, ai));
} }
info->summary_indicator = 0; *(get_summary_indicator(info)) = 0;
smp_wmb(); smp_wmb();
/* Walk through indicators field, summary indicator not active. */ /* Walk through indicators field, summary indicator not active. */
for (ai = 0;;) { for (ai = 0;;) {
@ -221,7 +227,7 @@ static void virtio_airq_handler(struct airq_struct *airq, bool floating)
read_unlock(&info->lock); read_unlock(&info->lock);
} }
static struct airq_info *new_airq_info(void) static struct airq_info *new_airq_info(int index)
{ {
struct airq_info *info; struct airq_info *info;
int rc; int rc;
@ -237,7 +243,8 @@ static struct airq_info *new_airq_info(void)
return NULL; return NULL;
} }
info->airq.handler = virtio_airq_handler; info->airq.handler = virtio_airq_handler;
info->airq.lsi_ptr = &info->summary_indicator; info->summary_indicator_idx = index;
info->airq.lsi_ptr = get_summary_indicator(info);
info->airq.lsi_mask = 0xff; info->airq.lsi_mask = 0xff;
info->airq.isc = VIRTIO_AIRQ_ISC; info->airq.isc = VIRTIO_AIRQ_ISC;
rc = register_adapter_interrupt(&info->airq); rc = register_adapter_interrupt(&info->airq);
@ -259,7 +266,7 @@ static unsigned long get_airq_indicator(struct virtqueue *vqs[], int nvqs,
for (i = 0; i < MAX_AIRQ_AREAS && !indicator_addr; i++) { for (i = 0; i < MAX_AIRQ_AREAS && !indicator_addr; i++) {
if (!airq_areas[i]) if (!airq_areas[i])
airq_areas[i] = new_airq_info(); airq_areas[i] = new_airq_info(i);
info = airq_areas[i]; info = airq_areas[i];
if (!info) if (!info)
return 0; return 0;
@ -345,7 +352,7 @@ static void virtio_ccw_drop_indicator(struct virtio_ccw_device *vcdev,
if (!thinint_area) if (!thinint_area)
return; return;
thinint_area->summary_indicator = thinint_area->summary_indicator =
(unsigned long) &airq_info->summary_indicator; (unsigned long) get_summary_indicator(airq_info);
thinint_area->isc = VIRTIO_AIRQ_ISC; thinint_area->isc = VIRTIO_AIRQ_ISC;
ccw->cmd_code = CCW_CMD_SET_IND_ADAPTER; ccw->cmd_code = CCW_CMD_SET_IND_ADAPTER;
ccw->count = sizeof(*thinint_area); ccw->count = sizeof(*thinint_area);
@ -613,7 +620,7 @@ static int virtio_ccw_register_adapter_ind(struct virtio_ccw_device *vcdev,
} }
info = vcdev->airq_info; info = vcdev->airq_info;
thinint_area->summary_indicator = thinint_area->summary_indicator =
(unsigned long) &info->summary_indicator; (unsigned long) get_summary_indicator(info);
thinint_area->isc = VIRTIO_AIRQ_ISC; thinint_area->isc = VIRTIO_AIRQ_ISC;
ccw->cmd_code = CCW_CMD_SET_IND_ADAPTER; ccw->cmd_code = CCW_CMD_SET_IND_ADAPTER;
ccw->flags = CCW_FLAG_SLI; ccw->flags = CCW_FLAG_SLI;
@ -1493,8 +1500,17 @@ static void __init no_auto_parse(void)
static int __init virtio_ccw_init(void) static int __init virtio_ccw_init(void)
{ {
int rc;
/* parse no_auto string before we do anything further */ /* parse no_auto string before we do anything further */
no_auto_parse(); no_auto_parse();
return ccw_driver_register(&virtio_ccw_driver);
summary_indicators = cio_dma_zalloc(MAX_AIRQ_AREAS);
if (!summary_indicators)
return -ENOMEM;
rc = ccw_driver_register(&virtio_ccw_driver);
if (rc)
cio_dma_free(summary_indicators, MAX_AIRQ_AREAS);
return rc;
} }
device_initcall(virtio_ccw_init); device_initcall(virtio_ccw_init);