From: Michael Mueller <mimu@linux.ibm.com>
To: Halil Pasic <pasic@linux.ibm.com>,
kvm@vger.kernel.org, linux-s390@vger.kernel.org,
Cornelia Huck <cohuck@redhat.com>,
Sebastian Ott <sebott@linux.ibm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: virtualization@lists.linux-foundation.org,
"Michael S. Tsirkin" <mst@redhat.com>,
Christoph Hellwig <hch@infradead.org>,
Thomas Huth <thuth@redhat.com>,
Christian Borntraeger <borntraeger@de.ibm.com>,
Viktor Mihajlovski <mihajlov@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Janosch Frank <frankja@linux.ibm.com>,
Claudio Imbrenda <imbrenda@linux.ibm.com>,
Farhan Ali <alifm@linux.ibm.com>,
Eric Farman <farman@linux.ibm.com>,
"Jason J. Herne" <jjherne@linux.ibm.com>
Subject: Re: [PATCH v5 8/8] virtio/s390: make airq summary indicators DMA
Date: Thu, 13 Jun 2019 10:35:17 +0200 [thread overview]
Message-ID: <0020cf49-1dce-d768-e497-1d4e7482fc5e@linux.ibm.com> (raw)
In-Reply-To: <20190612111236.99538-9-pasic@linux.ibm.com>
On 12.06.19 13:12, Halil Pasic wrote:
> Hypervisor needs to interact with the summary indicators, so these
The hypervisor...
> 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>
> ---
> drivers/s390/virtio/virtio_ccw.c | 32 ++++++++++++++++++++++++--------
> 1 file changed, 24 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c
> index 800252955a2f..1a55e5942d36 100644
> --- a/drivers/s390/virtio/virtio_ccw.c
> +++ b/drivers/s390/virtio/virtio_ccw.c
> @@ -140,11 +140,17 @@ static int virtio_ccw_use_airq = 1;
>
> struct airq_info {
> rwlock_t lock;
> - u8 summary_indicator;
> + u8 summary_indicator_idx;
> struct airq_struct airq;
> struct airq_iv *aiv;
> };
> 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_VDEV_RESET 0x33
> @@ -209,7 +215,7 @@ static void virtio_airq_handler(struct airq_struct *airq, bool floating)
> break;
> vring_interrupt(0, (void *)airq_iv_get_ptr(info->aiv, ai));
> }
> - info->summary_indicator = 0;
> + *(get_summary_indicator(info)) = 0;
> smp_wmb();
> /* Walk through indicators field, summary indicator not active. */
> for (ai = 0;;) {
> @@ -221,7 +227,7 @@ static void virtio_airq_handler(struct airq_struct *airq, bool floating)
> 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;
> int rc;
> @@ -237,7 +243,8 @@ static struct airq_info *new_airq_info(void)
> return NULL;
> }
> 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.isc = VIRTIO_AIRQ_ISC;
> 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++) {
> if (!airq_areas[i])
> - airq_areas[i] = new_airq_info();
> + airq_areas[i] = new_airq_info(i);
> info = airq_areas[i];
> if (!info)
> return 0;
> @@ -345,7 +352,7 @@ static void virtio_ccw_drop_indicator(struct virtio_ccw_device *vcdev,
> if (!thinint_area)
> return;
> thinint_area->summary_indicator =
> - (unsigned long) &airq_info->summary_indicator;
> + (unsigned long) get_summary_indicator(airq_info);
> thinint_area->isc = VIRTIO_AIRQ_ISC;
> ccw->cmd_code = CCW_CMD_SET_IND_ADAPTER;
> 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;
> thinint_area->summary_indicator =
> - (unsigned long) &info->summary_indicator;
> + (unsigned long) get_summary_indicator(info);
> thinint_area->isc = VIRTIO_AIRQ_ISC;
> ccw->cmd_code = CCW_CMD_SET_IND_ADAPTER;
> ccw->flags = CCW_FLAG_SLI;
> @@ -1493,8 +1500,17 @@ static void __init no_auto_parse(void)
>
> static int __init virtio_ccw_init(void)
> {
> + int rc;
> +
> /* parse no_auto string before we do anything further */
> 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);
>
Reviewed-by: Michael Mueller <mimu@linux.ibm.com>
Michael
next prev parent reply other threads:[~2019-06-13 16:29 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-12 11:12 [PATCH v5 0/8] s390: virtio: support protected virtualization Halil Pasic
2019-06-12 11:12 ` [PATCH v5 1/8] s390/mm: force swiotlb for " Halil Pasic
2019-06-13 8:09 ` Michael Mueller
2019-07-11 21:48 ` Thiago Jung Bauermann
2019-06-12 11:12 ` [PATCH v5 2/8] s390/cio: introduce DMA pools to cio Halil Pasic
2019-06-12 14:23 ` Cornelia Huck
2019-06-13 8:13 ` Michael Mueller
2019-06-12 11:12 ` [PATCH v5 3/8] s390/cio: add basic protected virtualization support Halil Pasic
2019-06-13 8:21 ` Michael Mueller
2019-06-12 11:12 ` [PATCH v5 4/8] s390/airq: use DMA memory for adapter interrupts Halil Pasic
2019-06-12 14:35 ` Cornelia Huck
2019-06-12 15:11 ` Halil Pasic
2019-06-13 8:25 ` Michael Mueller
2019-06-12 11:12 ` [PATCH v5 5/8] virtio/s390: use cacheline aligned airq bit vectors Halil Pasic
2019-06-13 8:27 ` Michael Mueller
2019-06-12 11:12 ` [PATCH v5 6/8] virtio/s390: add indirection to indicators access Halil Pasic
2019-06-13 8:29 ` Michael Mueller
2019-06-12 11:12 ` [PATCH v5 7/8] virtio/s390: use DMA memory for ccw I/O and classic notifiers Halil Pasic
2019-06-13 8:32 ` Michael Mueller
2019-06-12 11:12 ` [PATCH v5 8/8] virtio/s390: make airq summary indicators DMA Halil Pasic
2019-06-13 8:35 ` Michael Mueller [this message]
2019-06-13 9:11 ` [PATCH v5 0/8] s390: virtio: support protected virtualization Michael Mueller
2019-06-13 11:14 ` Halil Pasic
2019-06-13 11:17 ` Michael Mueller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0020cf49-1dce-d768-e497-1d4e7482fc5e@linux.ibm.com \
--to=mimu@linux.ibm.com \
--cc=alifm@linux.ibm.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=farman@linux.ibm.com \
--cc=frankja@linux.ibm.com \
--cc=gor@linux.ibm.com \
--cc=hch@infradead.org \
--cc=heiko.carstens@de.ibm.com \
--cc=imbrenda@linux.ibm.com \
--cc=jjherne@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=mihajlov@linux.ibm.com \
--cc=mst@redhat.com \
--cc=pasic@linux.ibm.com \
--cc=sebott@linux.ibm.com \
--cc=thuth@redhat.com \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).