From: Michael Mueller <mimu@linux.ibm.com>
To: KVM Mailing List <kvm@vger.kernel.org>
Cc: Linux-S390 Mailing List <linux-s390@vger.kernel.org>,
linux-kernel@vger.kernel.org,
kvm390-list@tuxmaker.boeblingen.de.ibm.com,
Martin Schwidefsky <schwidefsky@de.ibm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
Christian Borntraeger <borntraeger@de.ibm.com>,
Janosch Frank <frankja@linux.ibm.com>,
David Hildenbrand <david@redhat.com>,
Cornelia Huck <cohuck@redhat.com>,
Halil Pasic <pasic@linux.ibm.com>,
Pierre Morel <pmorel@linux.ibm.com>,
Michael Mueller <mimu@linux.ibm.com>
Subject: [PATCH v5 10/15] KVM: s390: add functions to (un)register GISC with GISA
Date: Wed, 19 Dec 2018 20:17:51 +0100 [thread overview]
Message-ID: <20181219191756.57973-11-mimu@linux.ibm.com> (raw)
In-Reply-To: <20181219191756.57973-1-mimu@linux.ibm.com>
Add the IAM (Interruption Alert Mask) to the architecture specific
kvm struct. This mask in the GISA is used to define for which ISC
a GIB alert can be issued.
The functions kvm_s390_gisc_register() and kvm_s390_gisc_unregister()
are used to (un)register a GISC (guest ISC) with a virtual machine and
its GISA.
Upon successful completion, kvm_s390_gisc_register() returns the
ISC to be used for GIB alert interruptions. A negative return code
indicates an error during registration.
Theses functions will be used by other adapter types like AP and PCI to
request pass-through interruption support.
Signed-off-by: Michael Mueller <mimu@linux.ibm.com>
---
arch/s390/include/asm/kvm_host.h | 9 ++++++
arch/s390/kvm/interrupt.c | 66 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 75 insertions(+)
diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
index 0deba3ae8bc7..2c1259da3636 100644
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@ -782,6 +782,9 @@ struct kvm_s390_gisa {
u8 reserved03[11];
u32 airq_count;
} g1;
+ struct {
+ u64 word[4];
+ } u64;
};
};
@@ -849,6 +852,9 @@ struct kvm_arch{
DECLARE_BITMAP(cpu_feat, KVM_S390_VM_CPU_FEAT_NR_BITS);
struct kvm_s390_gisa *gisa;
int gib_in_use;
+ u8 iam;
+ u32 iam_ref_count[MAX_ISC + 1];
+ spinlock_t iam_ref_lock;
};
#define KVM_HVA_ERR_BAD (-1UL)
@@ -882,6 +888,9 @@ void kvm_arch_crypto_set_masks(struct kvm *kvm, unsigned long *apm,
extern int sie64a(struct kvm_s390_sie_block *, u64 *);
extern char sie_exit;
+extern int kvm_s390_gisc_register(struct kvm *kvm, u32 gisc);
+extern int kvm_s390_gisc_unregister(struct kvm *kvm, u32 gisc);
+
static inline void kvm_arch_hardware_disable(void) {}
static inline void kvm_arch_check_processor_compat(void *rtn) {}
static inline void kvm_arch_sync_events(struct kvm *kvm) {}
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
index 5a54360cecfe..1cc3ad2e6c7e 100644
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@ -229,6 +229,25 @@ static inline u8 int_word_to_isc(u32 int_word)
*/
#define IPM_BIT_OFFSET (offsetof(struct kvm_s390_gisa, ipm) * BITS_PER_BYTE)
+static inline int set_iam(struct kvm_s390_gisa *gisa, u8 iam)
+{
+ u64 word0, _word0;
+
+ do {
+ word0 = READ_ONCE(gisa->u64.word[0]);
+ /* If the GISA is in the alert list, do nothing. */
+ if ((u64)gisa != word0 >> 32)
+ return -EBUSY;
+ /*
+ * Try to set the IAM or loop, if the IPM has changed
+ * or the GISA has been inserted into the alert list.
+ */
+ _word0 = (word0 & ~0xffUL) | iam;
+ } while (cmpxchg(&gisa->u64.word[0], word0, _word0) != _word0);
+
+ return 0;
+}
+
static inline void set_ipm_gisc(struct kvm_s390_gisa *gisa, u32 gisc)
{
set_bit_inv(IPM_BIT_OFFSET + gisc, (unsigned long *) gisa);
@@ -2917,6 +2936,8 @@ void kvm_s390_gisa_init(struct kvm *kvm)
if (!css_general_characteristics.aiv)
return;
kvm->arch.gisa = &kvm->arch.sie_page2->gisa;
+ kvm->arch.iam = 0;
+ spin_lock_init(&kvm->arch.iam_ref_lock);
nullify_gisa(kvm->arch.gisa);
kvm->arch.gib_in_use = !!gib;
VM_EVENT(kvm, 3, "gisa 0x%pK initialized", kvm->arch.gisa);
@@ -2929,6 +2950,51 @@ void kvm_s390_gisa_destroy(struct kvm *kvm)
kvm->arch.gisa = NULL;
}
+int kvm_s390_gisc_register(struct kvm *kvm, u32 gisc)
+{
+ if (!kvm->arch.gib_in_use)
+ return -ENODEV;
+ if (gisc > MAX_ISC)
+ return -ERANGE;
+
+ spin_lock(&kvm->arch.iam_ref_lock);
+ if (kvm->arch.iam_ref_count[gisc] == 0)
+ kvm->arch.iam |= 0x80 >> gisc;
+ kvm->arch.iam_ref_count[gisc]++;
+ if (kvm->arch.iam_ref_count[gisc] == 1)
+ set_iam(kvm->arch.gisa, kvm->arch.iam);
+ spin_unlock(&kvm->arch.iam_ref_lock);
+
+ return gib->nisc;
+}
+EXPORT_SYMBOL_GPL(kvm_s390_gisc_register);
+
+int kvm_s390_gisc_unregister(struct kvm *kvm, u32 gisc)
+{
+ int rc = 0;
+
+ if (!kvm->arch.gib_in_use)
+ return -ENODEV;
+ if (gisc > MAX_ISC)
+ return -ERANGE;
+
+ spin_lock(&kvm->arch.iam_ref_lock);
+ if (kvm->arch.iam_ref_count[gisc] == 0) {
+ rc = -EINVAL;
+ goto out;
+ }
+ kvm->arch.iam_ref_count[gisc]--;
+ if (kvm->arch.iam_ref_count[gisc] == 0) {
+ kvm->arch.iam &= ~(0x80 >> gisc);
+ set_iam(kvm->arch.gisa, kvm->arch.iam);
+ }
+out:
+ spin_unlock(&kvm->arch.iam_ref_lock);
+
+ return rc;
+}
+EXPORT_SYMBOL_GPL(kvm_s390_gisc_unregister);
+
void kvm_s390_gib_destroy(void)
{
if (!gib)
--
2.13.4
next prev parent reply other threads:[~2018-12-19 19:17 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-19 19:17 [PATCH v5 00/15] KVM: s390: make use of the GIB Michael Mueller
2018-12-19 19:17 ` [PATCH v5 01/15] KVM: s390: unregister debug feature on failing arch init Michael Mueller
2018-12-19 20:10 ` Cornelia Huck
2018-12-20 7:49 ` Michael Mueller
2018-12-20 7:55 ` Christian Borntraeger
2018-12-19 19:17 ` [PATCH v5 02/15] KVM: s390: coding style issue kvm_s390_gisa_init/clear() Michael Mueller
2018-12-19 20:13 ` Cornelia Huck
2019-01-02 16:50 ` Pierre Morel
2019-01-07 16:16 ` Michael Mueller
2018-12-19 19:17 ` [PATCH v5 03/15] KVM: s390: factor out nullify_gisa() Michael Mueller
2018-12-19 19:17 ` [PATCH v5 04/15] KVM: s390: use pending_irqs_no_gisa() where appropriate Michael Mueller
2018-12-19 20:16 ` Cornelia Huck
2019-01-02 16:52 ` Pierre Morel
2018-12-19 19:17 ` [PATCH v5 05/15] KVM: s390: unify pending_irqs() and pending_irqs_no_gisa() Michael Mueller
2018-12-20 10:09 ` Michael Mueller
2018-12-20 11:06 ` Cornelia Huck
2018-12-20 11:49 ` Michael Mueller
2018-12-20 12:15 ` Halil Pasic
2018-12-20 12:21 ` Cornelia Huck
2018-12-20 12:33 ` Michael Mueller
2018-12-20 15:43 ` pierre morel
2018-12-20 16:40 ` Michael Mueller
2018-12-19 19:17 ` [PATCH v5 06/15] KVM: s390: remove prefix kvm_s390_gisa_ from static inline functions Michael Mueller
2018-12-20 12:24 ` Cornelia Huck
2018-12-20 14:37 ` Michael Mueller
2018-12-19 19:17 ` [PATCH v5 07/15] s390/cio: add function chsc_sgib() Michael Mueller
2018-12-19 19:17 ` [PATCH v5 08/15] KVM: s390: add the GIB and its related life-cyle functions Michael Mueller
2018-12-20 12:28 ` Cornelia Huck
2019-01-03 9:49 ` Pierre Morel
2019-01-07 16:25 ` Michael Mueller
2018-12-19 19:17 ` [PATCH v5 09/15] KVM: s390: add kvm reference to struct sie_page2 Michael Mueller
2018-12-19 19:17 ` Michael Mueller [this message]
2018-12-20 14:32 ` [PATCH v5 10/15] KVM: s390: add functions to (un)register GISC with GISA Michael Mueller
2019-01-02 17:29 ` Pierre Morel
2019-01-02 18:26 ` Pierre Morel
2019-01-04 13:19 ` Cornelia Huck
2019-01-07 17:38 ` Michael Mueller
2019-01-08 10:34 ` Cornelia Huck
2019-01-08 13:07 ` Michael Mueller
2019-01-08 13:35 ` Cornelia Huck
2019-01-08 13:36 ` Halil Pasic
2019-01-08 13:41 ` Cornelia Huck
2019-01-08 14:23 ` Halil Pasic
2018-12-19 19:17 ` [PATCH v5 11/15] KVM: s390: restore IAM in get_ipm() when IPM is clean Michael Mueller
2019-01-03 15:06 ` Pierre Morel
2019-01-07 18:17 ` Michael Mueller
2019-01-06 23:32 ` Halil Pasic
2019-01-08 8:06 ` Michael Mueller
2018-12-19 19:17 ` [PATCH v5 12/15] KVM: s390: do not restore IAM immediately before SIE entry Michael Mueller
2019-01-03 15:00 ` Pierre Morel
2019-01-07 17:53 ` Michael Mueller
2018-12-19 19:17 ` [PATCH v5 13/15] KVM: s390: add function process_gib_alert_list() Michael Mueller
2019-01-03 14:43 ` Pierre Morel
2019-01-07 19:18 ` Michael Mueller
2019-01-08 14:27 ` Halil Pasic
2019-01-09 11:39 ` Pierre Morel
2019-01-07 19:19 ` Michael Mueller
2019-01-08 6:37 ` Heiko Carstens
2019-01-08 12:59 ` Halil Pasic
2019-01-08 15:21 ` Michael Mueller
2019-01-08 18:34 ` Halil Pasic
2019-01-09 12:14 ` Pierre Morel
2019-01-09 13:10 ` Halil Pasic
2019-01-09 14:49 ` Pierre Morel
2019-01-09 16:18 ` Halil Pasic
2018-12-19 19:17 ` [PATCH v5 14/15] KVM: s390: add and wire function gib_alert_irq_handler() Michael Mueller
2019-01-03 15:16 ` Pierre Morel
2019-01-08 10:06 ` Michael Mueller
2019-01-09 12:35 ` Pierre Morel
2018-12-19 19:17 ` [PATCH v5 15/15] KVM: s390: start using the GIB Michael Mueller
2019-01-02 17:45 ` Pierre Morel
2019-01-08 9:03 ` 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=20181219191756.57973-11-mimu@linux.ibm.com \
--to=mimu@linux.ibm.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=heiko.carstens@de.ibm.com \
--cc=kvm390-list@tuxmaker.boeblingen.de.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=pasic@linux.ibm.com \
--cc=pmorel@linux.ibm.com \
--cc=schwidefsky@de.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