From: Christian Borntraeger <borntraeger@linux.ibm.com>
To: Matthew Rosato <mjrosato@linux.ibm.com>, 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, hca@linux.ibm.com, gor@linux.ibm.com,
gerald.schaefer@linux.ibm.com, agordeev@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,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 14/32] KVM: s390: pci: do initial setup for AEN interpretation
Date: Thu, 9 Dec 2021 20:54:35 +0100 [thread overview]
Message-ID: <596857e3-ab13-7513-eeda-ed407fe22732@linux.ibm.com> (raw)
In-Reply-To: <20211207205743.150299-15-mjrosato@linux.ibm.com>
Am 07.12.21 um 21:57 schrieb Matthew Rosato:
> Initial setup for Adapter Event Notification Interpretation for zPCI
> passthrough devices. Specifically, allocate a structure for forwarding of
> adapter events and pass the address of this structure to firmware.
>
> Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com>
> ---
> arch/s390/include/asm/pci_insn.h | 12 ++++
> arch/s390/kvm/interrupt.c | 17 +++++
> arch/s390/kvm/kvm-s390.c | 3 +
> arch/s390/kvm/pci.c | 113 +++++++++++++++++++++++++++++++
> arch/s390/kvm/pci.h | 42 ++++++++++++
> 5 files changed, 187 insertions(+)
> create mode 100644 arch/s390/kvm/pci.h
>
> diff --git a/arch/s390/include/asm/pci_insn.h b/arch/s390/include/asm/pci_insn.h
> index 5331082fa516..e5f57cfe1d45 100644
> --- a/arch/s390/include/asm/pci_insn.h
> +++ b/arch/s390/include/asm/pci_insn.h
> @@ -101,6 +101,7 @@ struct zpci_fib {
> /* Set Interruption Controls Operation Controls */
> #define SIC_IRQ_MODE_ALL 0
> #define SIC_IRQ_MODE_SINGLE 1
> +#define SIC_SET_AENI_CONTROLS 2
> #define SIC_IRQ_MODE_DIRECT 4
> #define SIC_IRQ_MODE_D_ALL 16
> #define SIC_IRQ_MODE_D_SINGLE 17
> @@ -127,9 +128,20 @@ struct zpci_cdiib {
> u64 : 64;
> } __packed __aligned(8);
>
> +/* adapter interruption parameters block */
> +struct zpci_aipb {
> + u64 faisb;
> + u64 gait;
> + u16 : 13;
> + u16 afi : 3;
> + u32 : 32;
> + u16 faal;
> +} __packed __aligned(8);
> +
> union zpci_sic_iib {
> struct zpci_diib diib;
> struct zpci_cdiib cdiib;
> + struct zpci_aipb aipb;
> };
>
> DECLARE_STATIC_KEY_FALSE(have_mio);
> diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
> index f9b872e358c6..4efe0e95a40f 100644
> --- a/arch/s390/kvm/interrupt.c
> +++ b/arch/s390/kvm/interrupt.c
> @@ -32,6 +32,7 @@
> #include "kvm-s390.h"
> #include "gaccess.h"
> #include "trace-s390.h"
> +#include "pci.h"
>
> #define PFAULT_INIT 0x0600
> #define PFAULT_DONE 0x0680
> @@ -3276,8 +3277,16 @@ static struct airq_struct gib_alert_irq = {
>
> void kvm_s390_gib_destroy(void)
> {
> + struct zpci_aift *aift;
> +
> if (!gib)
> return;
> + aift = kvm_s390_pci_get_aift();
> + if (aift) {
> + mutex_lock(&aift->lock)
aift is a static variable and later patches seem to access that directly without the wrapper.
Can we get rid of kvm_s390_pci_get_aift?
;
> + kvm_s390_pci_aen_exit();
> + mutex_unlock(&aift->lock);
> + }
> chsc_sgib(0);
> unregister_adapter_interrupt(&gib_alert_irq);
> free_page((unsigned long)gib);
> @@ -3315,6 +3324,14 @@ int kvm_s390_gib_init(u8 nisc)
> goto out_unreg_gal;
> }
>
> + if (IS_ENABLED(CONFIG_PCI) && sclp.has_aeni) {
> + if (kvm_s390_pci_aen_init(nisc)) {
> + pr_err("Initializing AEN for PCI failed\n");
> + rc = -EIO;
> + goto out_unreg_gal;
> + }
> + }
> +
> KVM_EVENT(3, "gib 0x%pK (nisc=%d) initialized", gib, gib->nisc);
> goto out;
>
> diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
> index 14a18ba5ff2c..9cd3c8eb59e8 100644
> --- a/arch/s390/kvm/kvm-s390.c
> +++ b/arch/s390/kvm/kvm-s390.c
> @@ -48,6 +48,7 @@
> #include <asm/fpu/api.h>
> #include "kvm-s390.h"
> #include "gaccess.h"
> +#include "pci.h"
>
> #define CREATE_TRACE_POINTS
> #include "trace.h"
> @@ -503,6 +504,8 @@ int kvm_arch_init(void *opaque)
> goto out;
> }
>
> + kvm_s390_pci_init();
> +
> rc = kvm_s390_gib_init(GAL_ISC);
> if (rc)
> goto out;
> diff --git a/arch/s390/kvm/pci.c b/arch/s390/kvm/pci.c
> index ecfc458a5b39..f0e5386ff943 100644
> --- a/arch/s390/kvm/pci.c
> +++ b/arch/s390/kvm/pci.c
> @@ -10,6 +10,113 @@
> #include <linux/kvm_host.h>
> #include <linux/pci.h>
> #include <asm/kvm_pci.h>
> +#include "pci.h"
> +
> +static struct zpci_aift aift;
see below.
> +
> +static inline int __set_irq_noiib(u16 ctl, u8 isc)
> +{
> + union zpci_sic_iib iib = {{0}};
> +
> + return zpci_set_irq_ctrl(ctl, isc, &iib);
> +}
> +
> +struct zpci_aift *kvm_s390_pci_get_aift(void)
> +{
> + return &aift;
> +}
> +
> +/* Caller must hold the aift lock before calling this function */
> +void kvm_s390_pci_aen_exit(void)
> +{
> + struct zpci_gaite *gait;
> + unsigned long flags;
> + struct airq_iv *sbv;
> + struct kvm_zdev **gait_kzdev;
> + int size;
> +
> + /* Clear the GAIT and forwarding summary vector */
> + __set_irq_noiib(SIC_SET_AENI_CONTROLS, 0);
> +
> + spin_lock_irqsave(&aift.gait_lock, flags);
> + gait = aift.gait;
> + sbv = aift.sbv;
> + gait_kzdev = aift.kzdev;
> + aift.gait = 0;
> + aift.sbv = 0;
> + aift.kzdev = 0;
> + spin_unlock_irqrestore(&aift.gait_lock, flags);
> +
> + if (sbv)
> + airq_iv_release(sbv);
> + size = get_order(PAGE_ALIGN(ZPCI_NR_DEVICES *
> + sizeof(struct zpci_gaite)));
> + free_pages((unsigned long)gait, size);
> + kfree(gait_kzdev);
> +}
> +
> +int kvm_s390_pci_aen_init(u8 nisc)
> +{
> + union zpci_sic_iib iib = {{0}};
> + struct page *page;
> + int rc = 0, size;
> +
> + /* If already enabled for AEN, bail out now */
> + if (aift.gait || aift.sbv)
> + return -EPERM;
> +
> + mutex_lock(&aift.lock);
> + aift.kzdev = kcalloc(ZPCI_NR_DEVICES, sizeof(struct kvm_zdev),
> + GFP_KERNEL);
> + if (!aift.kzdev) {
> + rc = -ENOMEM;
> + goto unlock;
> + }
> + aift.sbv = airq_iv_create(ZPCI_NR_DEVICES, AIRQ_IV_ALLOC, 0);
> + if (!aift.sbv) {
> + rc = -ENOMEM;
> + goto free_zdev;
> + }
> + size = get_order(PAGE_ALIGN(ZPCI_NR_DEVICES *
> + sizeof(struct zpci_gaite)));
> + page = alloc_pages(GFP_KERNEL | __GFP_ZERO, size);
> + if (!page) {
> + rc = -ENOMEM;
> + goto free_sbv;
> + }
> + aift.gait = (struct zpci_gaite *)page_to_phys(page);
> +
> + iib.aipb.faisb = (u64)aift.sbv->vector;
> + iib.aipb.gait = (u64)aift.gait;
> + iib.aipb.afi = nisc;
> + iib.aipb.faal = ZPCI_NR_DEVICES;
> +
> + /* Setup Adapter Event Notification Interpretation */
> + if (zpci_set_irq_ctrl(SIC_SET_AENI_CONTROLS, 0, &iib)) {
> + rc = -EIO;
> + goto free_gait;
> + }
> +
> + /* Enable floating IRQs */
> + if (__set_irq_noiib(SIC_IRQ_MODE_SINGLE, nisc)) {
> + rc = -EIO;
> + kvm_s390_pci_aen_exit();
> + }
> +
> + goto unlock;
> +
> +free_gait:
> + size = get_order(PAGE_ALIGN(ZPCI_NR_DEVICES *
> + sizeof(struct zpci_gaite)));
> + free_pages((unsigned long)aift.gait, size);
> +free_sbv:
> + airq_iv_release(aift.sbv);
> +free_zdev:
> + kfree(aift.kzdev);
> +unlock:
> + mutex_unlock(&aift.lock);
> + return rc;
> +}
>
> int kvm_s390_pci_dev_open(struct zpci_dev *zdev)
> {
> @@ -55,3 +162,9 @@ int kvm_s390_pci_attach_kvm(struct zpci_dev *zdev, struct kvm *kvm)
> return 0;
> }
> EXPORT_SYMBOL_GPL(kvm_s390_pci_attach_kvm);
> +
> +void kvm_s390_pci_init(void)
> +{
> + spin_lock_init(&aift.gait_lock);
> + mutex_init(&aift.lock);
> +}
Can we maybe use designated initializer for the static definition of aift, e.g. something
like
static struct zpci_aift aift = {
.gait_lock = __SPIN_LOCK_UNLOCKED(aift.gait_lock),
.lock = __MUTEX_INITIALIZER(aift.lock),
}
and get rid of the init function?
> diff --git a/arch/s390/kvm/pci.h b/arch/s390/kvm/pci.h
> new file mode 100644
> index 000000000000..74b06d39be3b
> --- /dev/null
> +++ b/arch/s390/kvm/pci.h
> @@ -0,0 +1,42 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +/*
> + * s390 kvm PCI passthrough support
> + *
> + * Copyright IBM Corp. 2021
> + *
> + * Author(s): Matthew Rosato <mjrosato@linux.ibm.com>
> + */
> +
> +#ifndef __KVM_S390_PCI_H
> +#define __KVM_S390_PCI_H
> +
> +#include <linux/pci.h>
> +#include <linux/mutex.h>
> +#include <asm/airq.h>
> +#include <asm/kvm_pci.h>
> +
> +struct zpci_gaite {
> + unsigned int gisa;
since we use u8 below, what about u32
> + u8 gisc;
> + u8 count;
> + u8 reserved;
> + u8 aisbo;
> + unsigned long aisb;
and u64 ?
> +};
> +
> +struct zpci_aift {
> + struct zpci_gaite *gait;
> + struct airq_iv *sbv;
> + struct kvm_zdev **kzdev;
> + spinlock_t gait_lock; /* Protects the gait, used during AEN forward */
> + struct mutex lock; /* Protects the other structures in aift */
> +};
> +
> +struct zpci_aift *kvm_s390_pci_get_aift(void);
> +
> +int kvm_s390_pci_aen_init(u8 nisc);
> +void kvm_s390_pci_aen_exit(void);
> +
> +void kvm_s390_pci_init(void);
> +
> +#endif /* __KVM_S390_PCI_H */
>
next prev parent reply other threads:[~2021-12-09 19:54 UTC|newest]
Thread overview: 119+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-07 20:57 [PATCH 00/32] KVM: s390: enable zPCI for interpretive execution Matthew Rosato
2021-12-07 20:57 ` [PATCH 01/32] s390/sclp: detect the zPCI interpretation facility Matthew Rosato
2021-12-08 11:12 ` Christian Borntraeger
2021-12-08 14:33 ` Eric Farman
2021-12-08 13:06 ` Claudio Imbrenda
2021-12-07 20:57 ` [PATCH 02/32] s390/sclp: detect the AISII facility Matthew Rosato
2021-12-08 11:13 ` Christian Borntraeger
2021-12-08 13:07 ` Claudio Imbrenda
2021-12-07 20:57 ` [PATCH 03/32] s390/sclp: detect the AENI facility Matthew Rosato
2021-12-08 11:17 ` Christian Borntraeger
2021-12-08 13:08 ` Claudio Imbrenda
2021-12-07 20:57 ` [PATCH 04/32] s390/sclp: detect the AISI facility Matthew Rosato
2021-12-08 11:18 ` Christian Borntraeger
2021-12-08 13:09 ` Claudio Imbrenda
2021-12-07 20:57 ` [PATCH 05/32] s390/airq: pass more TPI info to airq handlers Matthew Rosato
2021-12-08 11:25 ` Christian Borntraeger
2021-12-08 13:14 ` Claudio Imbrenda
2021-12-13 14:35 ` Pierre Morel
2021-12-07 20:57 ` [PATCH 06/32] s390/airq: allow for airq structure that uses an input vector Matthew Rosato
2021-12-08 10:04 ` Thomas Huth
2021-12-08 12:59 ` Christian Borntraeger
2021-12-07 20:57 ` [PATCH 07/32] s390/pci: externalize the SIC operation controls and routine Matthew Rosato
2021-12-08 13:09 ` Christian Borntraeger
2021-12-08 13:53 ` Niklas Schnelle
2021-12-08 15:33 ` Matthew Rosato
2021-12-08 15:59 ` Niklas Schnelle
2021-12-08 16:20 ` Matthew Rosato
2021-12-08 16:41 ` Niklas Schnelle
2021-12-08 18:18 ` Niklas Schnelle
2021-12-07 20:57 ` [PATCH 08/32] s390/pci: stash associated GISA designation Matthew Rosato
2021-12-09 15:07 ` Christian Borntraeger
2021-12-10 19:01 ` Eric Farman
2021-12-13 14:59 ` Pierre Morel
2021-12-07 20:57 ` [PATCH 09/32] s390/pci: export some routines related to RPCIT processing Matthew Rosato
2021-12-09 15:20 ` Christian Borntraeger
2021-12-07 20:57 ` [PATCH 10/32] s390/pci: stash dtsm and maxstbl Matthew Rosato
2021-12-08 16:18 ` Niklas Schnelle
2021-12-09 9:13 ` Pierre Morel
2021-12-09 15:25 ` Christian Borntraeger
2021-12-07 20:57 ` [PATCH 11/32] s390/pci: add helper function to find device by handle Matthew Rosato
2021-12-09 15:28 ` Christian Borntraeger
2021-12-10 19:04 ` Eric Farman
2021-12-07 20:57 ` [PATCH 12/32] s390/pci: get SHM information from list pci Matthew Rosato
2021-12-08 12:21 ` Niklas Schnelle
2021-12-09 18:25 ` Matthew Rosato
2021-12-09 15:47 ` Christian Borntraeger
2021-12-10 8:45 ` Niklas Schnelle
2021-12-07 20:57 ` [PATCH 13/32] KVM: s390: pci: add basic kvm_zdev structure Matthew Rosato
2021-12-09 15:54 ` Christian Borntraeger
2021-12-10 19:04 ` Eric Farman
2021-12-13 15:19 ` Pierre Morel
2021-12-14 9:15 ` Pierre Morel
2021-12-17 20:26 ` Matthew Rosato
2021-12-20 17:26 ` Pierre Morel
2021-12-07 20:57 ` [PATCH 14/32] KVM: s390: pci: do initial setup for AEN interpretation Matthew Rosato
2021-12-08 7:53 ` kernel test robot
2021-12-09 19:54 ` Christian Borntraeger [this message]
2021-12-09 20:20 ` Matthew Rosato
2021-12-09 20:23 ` Christian Borntraeger
2021-12-10 8:36 ` Niklas Schnelle
2021-12-10 9:54 ` Pierre Morel
2021-12-10 10:55 ` Pierre Morel
2021-12-07 20:57 ` [PATCH 15/32] KVM: s390: pci: enable host forwarding of Adapter Event Notifications Matthew Rosato
2021-12-10 21:51 ` Eric Farman
2021-12-17 16:56 ` Christian Borntraeger
2021-12-17 17:42 ` Matthew Rosato
2021-12-07 20:57 ` [PATCH 16/32] KVM: s390: expose the guest zPCI interpretation facility Matthew Rosato
2021-12-17 15:05 ` Christian Borntraeger
2021-12-17 15:19 ` Matthew Rosato
2021-12-17 16:58 ` Christian Borntraeger
2021-12-17 17:13 ` Matthew Rosato
2021-12-07 20:57 ` [PATCH 17/32] KVM: s390: expose the guest Adapter Interruption Source ID facility Matthew Rosato
2021-12-17 15:06 ` Christian Borntraeger
2021-12-07 20:57 ` [PATCH 18/32] KVM: s390: expose guest Adapter Event Notification Interpretation facility Matthew Rosato
2021-12-07 20:57 ` [PATCH 19/32] KVM: s390: mechanism to enable guest zPCI Interpretation Matthew Rosato
2021-12-10 13:27 ` Christian Borntraeger
2021-12-10 14:21 ` Matthew Rosato
2021-12-07 20:57 ` [PATCH 20/32] KVM: s390: pci: provide routines for enabling/disabling interpretation Matthew Rosato
2021-12-08 9:44 ` Niklas Schnelle
2021-12-08 15:04 ` Matthew Rosato
2021-12-14 9:16 ` Pierre Morel
2021-12-07 20:57 ` [PATCH 21/32] KVM: s390: pci: provide routines for enabling/disabling interrupt forwarding Matthew Rosato
2021-12-08 10:58 ` kernel test robot
2021-12-14 9:26 ` Pierre Morel
2021-12-07 20:57 ` [PATCH 22/32] KVM: s390: pci: provide routines for enabling/disabling IOAT assist Matthew Rosato
2021-12-14 17:46 ` Pierre Morel
2021-12-14 18:13 ` Matthew Rosato
2021-12-07 20:57 ` [PATCH 23/32] KVM: s390: pci: handle refresh of PCI translations Matthew Rosato
2021-12-08 8:04 ` kernel test robot
2021-12-08 10:30 ` Niklas Schnelle
2021-12-08 18:04 ` Matthew Rosato
2021-12-14 16:59 ` Pierre Morel
2021-12-14 17:54 ` Matthew Rosato
2021-12-16 14:39 ` Niklas Schnelle
2021-12-16 14:51 ` Matthew Rosato
2021-12-17 9:41 ` Niklas Schnelle
2021-12-07 20:57 ` [PATCH 24/32] KVM: s390: intercept the rpcit instruction Matthew Rosato
2021-12-14 17:04 ` Pierre Morel
2021-12-14 18:00 ` Matthew Rosato
2021-12-07 20:57 ` [PATCH 25/32] vfio/pci: re-introduce CONFIG_VFIO_PCI_ZDEV Matthew Rosato
2021-12-17 16:49 ` Christian Borntraeger
2021-12-17 17:54 ` Matthew Rosato
2021-12-07 20:57 ` [PATCH 26/32] vfio-pci/zdev: wire up group notifier Matthew Rosato
2021-12-21 18:47 ` Alex Williamson
2021-12-07 20:57 ` [PATCH 27/32] vfio-pci/zdev: wire up zPCI interpretive execution support Matthew Rosato
2021-12-14 16:30 ` Pierre Morel
2021-12-21 18:48 ` Alex Williamson
2021-12-07 20:57 ` [PATCH 28/32] vfio-pci/zdev: wire up zPCI adapter interrupt forwarding support Matthew Rosato
2021-12-14 9:48 ` Pierre Morel
2021-12-07 20:57 ` [PATCH 29/32] vfio-pci/zdev: wire up zPCI IOAT assist support Matthew Rosato
2021-12-14 9:46 ` Pierre Morel
2021-12-07 20:57 ` [PATCH 30/32] vfio-pci/zdev: add DTSM to clp group capability Matthew Rosato
2021-12-14 9:58 ` Pierre Morel
2021-12-14 14:59 ` Matthew Rosato
2021-12-07 20:57 ` [PATCH 31/32] KVM: s390: introduce CPU feature for zPCI Interpretation Matthew Rosato
2021-12-07 20:57 ` [PATCH 32/32] MAINTAINERS: additional files related kvm s390 pci passthrough Matthew Rosato
2021-12-17 14:55 ` Christian Borntraeger
2021-12-21 19:11 ` Alex Williamson
2021-12-07 21:16 ` [PATCH 00/32] KVM: s390: enable zPCI for interpretive execution 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=596857e3-ab13-7513-eeda-ed407fe22732@linux.ibm.com \
--to=borntraeger@linux.ibm.com \
--cc=agordeev@linux.ibm.com \
--cc=alex.williamson@redhat.com \
--cc=cohuck@redhat.com \
--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-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=mjrosato@linux.ibm.com \
--cc=oberpar@linux.ibm.com \
--cc=pasic@linux.ibm.com \
--cc=pmorel@linux.ibm.com \
--cc=schnelle@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).