From: Matthew Rosato <mjrosato@linux.ibm.com>
To: linux-s390@vger.kernel.org
Cc: alex.williamson@redhat.com, cohuck@redhat.com,
schnelle@linux.ibm.com, farman@linux.ibm.com,
pmorel@linux.ibm.com, borntraeger@linux.ibm.com,
hca@linux.ibm.com, gor@linux.ibm.com,
gerald.schaefer@linux.ibm.com, agordeev@linux.ibm.com,
svens@linux.ibm.com, frankja@linux.ibm.com, david@redhat.com,
imbrenda@linux.ibm.com, vneethv@linux.ibm.com,
oberpar@linux.ibm.com, freude@linux.ibm.com, thuth@redhat.com,
pasic@linux.ibm.com, pbonzini@redhat.com, corbet@lwn.net,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-doc@vger.kernel.org
Subject: [PATCH v5 06/21] s390/airq: allow for airq structure that uses an input vector
Date: Mon, 4 Apr 2022 13:43:34 -0400 [thread overview]
Message-ID: <20220404174349.58530-7-mjrosato@linux.ibm.com> (raw)
In-Reply-To: <20220404174349.58530-1-mjrosato@linux.ibm.com>
When doing device passthrough where interrupts are being forwarded from
host to guest, we wish to use a pinned section of guest memory as the
vector (the same memory used by the guest as the vector). To accomplish
this, add a new parameter for airq_iv_create which allows passing an
existing vector to be used instead of allocating a new one. The caller
is responsible for ensuring the vector is pinned in memory as well as for
unpinning the memory when the vector is no longer needed.
A subsequent patch will use this new parameter for zPCI interpretation.
Reviewed-by: Pierre Morel <pmorel@linux.ibm.com>
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
Acked-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com>
---
arch/s390/include/asm/airq.h | 4 +++-
arch/s390/pci/pci_irq.c | 8 ++++----
drivers/s390/cio/airq.c | 10 +++++++---
drivers/s390/virtio/virtio_ccw.c | 2 +-
4 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/arch/s390/include/asm/airq.h b/arch/s390/include/asm/airq.h
index 7918a7d09028..e82e5626e139 100644
--- a/arch/s390/include/asm/airq.h
+++ b/arch/s390/include/asm/airq.h
@@ -47,8 +47,10 @@ struct airq_iv {
#define AIRQ_IV_PTR 4 /* Allocate the ptr array */
#define AIRQ_IV_DATA 8 /* Allocate the data array */
#define AIRQ_IV_CACHELINE 16 /* Cacheline alignment for the vector */
+#define AIRQ_IV_GUESTVEC 32 /* Vector is a pinned guest page */
-struct airq_iv *airq_iv_create(unsigned long bits, unsigned long flags);
+struct airq_iv *airq_iv_create(unsigned long bits, unsigned long flags,
+ unsigned long *vec);
void airq_iv_release(struct airq_iv *iv);
unsigned long airq_iv_alloc(struct airq_iv *iv, unsigned long num);
void airq_iv_free(struct airq_iv *iv, unsigned long bit, unsigned long num);
diff --git a/arch/s390/pci/pci_irq.c b/arch/s390/pci/pci_irq.c
index b805c75252ed..87c7d121c255 100644
--- a/arch/s390/pci/pci_irq.c
+++ b/arch/s390/pci/pci_irq.c
@@ -296,7 +296,7 @@ int arch_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
zdev->aisb = bit;
/* Create adapter interrupt vector */
- zdev->aibv = airq_iv_create(msi_vecs, AIRQ_IV_DATA | AIRQ_IV_BITLOCK);
+ zdev->aibv = airq_iv_create(msi_vecs, AIRQ_IV_DATA | AIRQ_IV_BITLOCK, NULL);
if (!zdev->aibv)
return -ENOMEM;
@@ -419,7 +419,7 @@ static int __init zpci_directed_irq_init(void)
union zpci_sic_iib iib = {{0}};
unsigned int cpu;
- zpci_sbv = airq_iv_create(num_possible_cpus(), 0);
+ zpci_sbv = airq_iv_create(num_possible_cpus(), 0, NULL);
if (!zpci_sbv)
return -ENOMEM;
@@ -441,7 +441,7 @@ static int __init zpci_directed_irq_init(void)
zpci_ibv[cpu] = airq_iv_create(cache_line_size() * BITS_PER_BYTE,
AIRQ_IV_DATA |
AIRQ_IV_CACHELINE |
- (!cpu ? AIRQ_IV_ALLOC : 0));
+ (!cpu ? AIRQ_IV_ALLOC : 0), NULL);
if (!zpci_ibv[cpu])
return -ENOMEM;
}
@@ -458,7 +458,7 @@ static int __init zpci_floating_irq_init(void)
if (!zpci_ibv)
return -ENOMEM;
- zpci_sbv = airq_iv_create(ZPCI_NR_DEVICES, AIRQ_IV_ALLOC);
+ zpci_sbv = airq_iv_create(ZPCI_NR_DEVICES, AIRQ_IV_ALLOC, NULL);
if (!zpci_sbv)
goto out_free;
diff --git a/drivers/s390/cio/airq.c b/drivers/s390/cio/airq.c
index 230eb5b5b64e..34967e67249e 100644
--- a/drivers/s390/cio/airq.c
+++ b/drivers/s390/cio/airq.c
@@ -122,10 +122,12 @@ static inline unsigned long iv_size(unsigned long bits)
* airq_iv_create - create an interrupt vector
* @bits: number of bits in the interrupt vector
* @flags: allocation flags
+ * @vec: pointer to pinned guest memory if AIRQ_IV_GUESTVEC
*
* Returns a pointer to an interrupt vector structure
*/
-struct airq_iv *airq_iv_create(unsigned long bits, unsigned long flags)
+struct airq_iv *airq_iv_create(unsigned long bits, unsigned long flags,
+ unsigned long *vec)
{
struct airq_iv *iv;
unsigned long size;
@@ -146,6 +148,8 @@ struct airq_iv *airq_iv_create(unsigned long bits, unsigned long flags)
&iv->vector_dma);
if (!iv->vector)
goto out_free;
+ } else if (flags & AIRQ_IV_GUESTVEC) {
+ iv->vector = vec;
} else {
iv->vector = cio_dma_zalloc(size);
if (!iv->vector)
@@ -185,7 +189,7 @@ struct airq_iv *airq_iv_create(unsigned long bits, unsigned long flags)
kfree(iv->avail);
if (iv->flags & AIRQ_IV_CACHELINE && iv->vector)
dma_pool_free(airq_iv_cache, iv->vector, iv->vector_dma);
- else
+ else if (!(iv->flags & AIRQ_IV_GUESTVEC))
cio_dma_free(iv->vector, size);
kfree(iv);
out:
@@ -204,7 +208,7 @@ void airq_iv_release(struct airq_iv *iv)
kfree(iv->bitlock);
if (iv->flags & AIRQ_IV_CACHELINE)
dma_pool_free(airq_iv_cache, iv->vector, iv->vector_dma);
- else
+ else if (!(iv->flags & AIRQ_IV_GUESTVEC))
cio_dma_free(iv->vector, iv_size(iv->bits));
kfree(iv->avail);
kfree(iv);
diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c
index 52c376d15978..410498d693f8 100644
--- a/drivers/s390/virtio/virtio_ccw.c
+++ b/drivers/s390/virtio/virtio_ccw.c
@@ -241,7 +241,7 @@ static struct airq_info *new_airq_info(int index)
return NULL;
rwlock_init(&info->lock);
info->aiv = airq_iv_create(VIRTIO_IV_BITS, AIRQ_IV_ALLOC | AIRQ_IV_PTR
- | AIRQ_IV_CACHELINE);
+ | AIRQ_IV_CACHELINE, NULL);
if (!info->aiv) {
kfree(info);
return NULL;
--
2.27.0
next prev parent reply other threads:[~2022-04-04 21:59 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-04 17:43 [PATCH v5 00/21] KVM: s390: enable zPCI for interpretive execution Matthew Rosato
2022-04-04 17:43 ` [PATCH v5 01/21] s390/sclp: detect the zPCI load/store interpretation facility Matthew Rosato
2022-04-04 17:43 ` [PATCH v5 02/21] s390/sclp: detect the AISII facility Matthew Rosato
2022-04-04 17:43 ` [PATCH v5 03/21] s390/sclp: detect the AENI facility Matthew Rosato
2022-04-04 17:43 ` [PATCH v5 04/21] s390/sclp: detect the AISI facility Matthew Rosato
2022-04-04 17:43 ` [PATCH v5 05/21] s390/airq: pass more TPI info to airq handlers Matthew Rosato
2022-04-04 17:43 ` Matthew Rosato [this message]
2022-04-04 17:43 ` [PATCH v5 07/21] s390/pci: externalize the SIC operation controls and routine Matthew Rosato
2022-04-04 17:43 ` [PATCH v5 08/21] s390/pci: stash associated GISA designation Matthew Rosato
2022-04-05 8:03 ` Niklas Schnelle
2022-04-12 16:18 ` Christian Borntraeger
2022-04-19 7:54 ` Pierre Morel
2022-04-04 17:43 ` [PATCH v5 09/21] s390/pci: stash dtsm and maxstbl Matthew Rosato
2022-04-04 17:43 ` [PATCH v5 10/21] KVM: s390: pci: add basic kvm_zdev structure Matthew Rosato
2022-04-05 8:20 ` Niklas Schnelle
2022-04-05 13:51 ` Matthew Rosato
2022-04-12 16:20 ` Christian Borntraeger
2022-04-19 7:55 ` Pierre Morel
2022-04-04 17:43 ` [PATCH v5 11/21] KVM: s390: pci: do initial setup for AEN interpretation Matthew Rosato
2022-04-14 7:20 ` Christian Borntraeger
2022-04-14 13:00 ` Matthew Rosato
2022-04-19 8:16 ` Pierre Morel
2022-04-20 13:43 ` Matthew Rosato
2022-04-04 17:43 ` [PATCH v5 12/21] KVM: s390: pci: enable host forwarding of Adapter Event Notifications Matthew Rosato
2022-04-19 9:21 ` Pierre Morel
2022-04-04 17:43 ` [PATCH v5 13/21] KVM: s390: mechanism to enable guest zPCI Interpretation Matthew Rosato
2022-04-19 9:30 ` Pierre Morel
2022-04-04 17:43 ` [PATCH v5 14/21] KVM: s390: pci: provide routines for enabling/disabling interrupt forwarding Matthew Rosato
2022-04-05 13:39 ` Niklas Schnelle
2022-04-05 13:48 ` Matthew Rosato
2022-04-05 15:06 ` Pierre Morel
2022-04-08 12:48 ` Jason Gunthorpe
2022-04-11 12:19 ` Heiko Carstens
2022-04-04 17:43 ` [PATCH v5 15/21] KVM: s390: pci: add routines to start/stop interpretive execution Matthew Rosato
2022-04-08 12:47 ` Jason Gunthorpe
2022-04-12 13:14 ` Matthew Rosato
2022-04-12 13:29 ` Jason Gunthorpe
2022-04-04 17:43 ` [PATCH v5 16/21] KVM: vfio: add s390x hook to register KVM guest designation Matthew Rosato
2022-04-08 12:45 ` Jason Gunthorpe
2022-04-12 13:39 ` Matthew Rosato
2022-04-12 13:55 ` Jason Gunthorpe
2022-04-12 14:32 ` Matthew Rosato
2022-04-04 17:43 ` [PATCH v5 17/21] vfio-pci/zdev: add function handle to clp base capability Matthew Rosato
2022-04-19 9:40 ` Pierre Morel
2022-04-04 17:43 ` [PATCH v5 18/21] vfio-pci/zdev: different maxstbl for interpreted devices Matthew Rosato
2022-04-19 9:41 ` Pierre Morel
2022-04-04 17:43 ` [PATCH v5 19/21] KVM: s390: add KVM_S390_ZPCI_OP to manage guest zPCI devices Matthew Rosato
2022-04-19 10:07 ` Pierre Morel
2022-04-20 14:10 ` Matthew Rosato
2022-04-20 18:18 ` Pierre Morel
2022-04-04 17:43 ` [PATCH v5 20/21] KVM: s390: introduce CPU feature for zPCI Interpretation Matthew Rosato
2022-04-19 10:08 ` Pierre Morel
2022-04-04 17:43 ` [PATCH v5 21/21] MAINTAINERS: additional files related kvm s390 pci passthrough Matthew Rosato
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=20220404174349.58530-7-mjrosato@linux.ibm.com \
--to=mjrosato@linux.ibm.com \
--cc=agordeev@linux.ibm.com \
--cc=alex.williamson@redhat.com \
--cc=borntraeger@linux.ibm.com \
--cc=cohuck@redhat.com \
--cc=corbet@lwn.net \
--cc=david@redhat.com \
--cc=farman@linux.ibm.com \
--cc=frankja@linux.ibm.com \
--cc=freude@linux.ibm.com \
--cc=gerald.schaefer@linux.ibm.com \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=imbrenda@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=oberpar@linux.ibm.com \
--cc=pasic@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=pmorel@linux.ibm.com \
--cc=schnelle@linux.ibm.com \
--cc=svens@linux.ibm.com \
--cc=thuth@redhat.com \
--cc=vneethv@linux.ibm.com \
/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).