qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Pierre Morel <pmorel@linux.ibm.com>
To: qemu-s390x@nongnu.org
Cc: qemu-devel@nongnu.org, borntraeger@de.ibm.com,
	pasic@linux.ibm.com, richard.henderson@linaro.org,
	david@redhat.com, thuth@redhat.com, cohuck@redhat.com,
	mst@redhat.com, pbonzini@redhat.com, kvm@vger.kernel.org,
	ehabkost@redhat.com, marcel.apfelbaum@gmail.com,
	eblake@redhat.com, armbru@redhat.com, seiden@linux.ibm.com,
	nrb@linux.ibm.com, nsg@linux.ibm.com, frankja@linux.ibm.com,
	berrange@redhat.com, clg@kaod.org
Subject: [PATCH v20 06/21] s390x/cpu topology: interception of PTF instruction
Date: Tue, 25 Apr 2023 18:14:41 +0200	[thread overview]
Message-ID: <20230425161456.21031-7-pmorel@linux.ibm.com> (raw)
In-Reply-To: <20230425161456.21031-1-pmorel@linux.ibm.com>

When the host supports the CPU topology facility, the PTF
instruction with function code 2 is interpreted by the SIE,
provided that the userland hypervisor activates the interpretation
by using the KVM_CAP_S390_CPU_TOPOLOGY KVM extension.

The PTF instructions with function code 0 and 1 are intercepted
and must be emulated by the userland hypervisor.

During RESET all CPU of the configuration are placed in
horizontal polarity.

Signed-off-by: Pierre Morel <pmorel@linux.ibm.com>
---
 include/hw/s390x/s390-virtio-ccw.h |  6 ++++
 hw/s390x/cpu-topology.c            | 51 ++++++++++++++++++++++++++++++
 target/s390x/kvm/kvm.c             | 11 +++++++
 3 files changed, 68 insertions(+)

diff --git a/include/hw/s390x/s390-virtio-ccw.h b/include/hw/s390x/s390-virtio-ccw.h
index 9bba21a916..c1d46e78af 100644
--- a/include/hw/s390x/s390-virtio-ccw.h
+++ b/include/hw/s390x/s390-virtio-ccw.h
@@ -30,6 +30,12 @@ struct S390CcwMachineState {
     uint8_t loadparm[8];
 };
 
+#define S390_PTF_REASON_NONE (0x00 << 8)
+#define S390_PTF_REASON_DONE (0x01 << 8)
+#define S390_PTF_REASON_BUSY (0x02 << 8)
+#define S390_TOPO_FC_MASK 0xffUL
+void s390_handle_ptf(S390CPU *cpu, uint8_t r1, uintptr_t ra);
+
 struct S390CcwMachineClass {
     /*< private >*/
     MachineClass parent_class;
diff --git a/hw/s390x/cpu-topology.c b/hw/s390x/cpu-topology.c
index c98439ff7a..3c7bbff4bc 100644
--- a/hw/s390x/cpu-topology.c
+++ b/hw/s390x/cpu-topology.c
@@ -96,6 +96,56 @@ static void s390_topology_init(MachineState *ms)
     QTAILQ_INSERT_HEAD(&s390_topology.list, entry, next);
 }
 
+/*
+ * s390_handle_ptf:
+ *
+ * @register 1: contains the function code
+ *
+ * Function codes 0 (horizontal) and 1 (vertical) define the CPU
+ * polarization requested by the guest.
+ *
+ * Function code 2 is handling topology changes and is interpreted
+ * by the SIE.
+ */
+void s390_handle_ptf(S390CPU *cpu, uint8_t r1, uintptr_t ra)
+{
+    CPUS390XState *env = &cpu->env;
+    uint64_t reg = env->regs[r1];
+    int fc = reg & S390_TOPO_FC_MASK;
+
+    if (!s390_has_feat(S390_FEAT_CONFIGURATION_TOPOLOGY)) {
+        s390_program_interrupt(env, PGM_OPERATION, ra);
+        return;
+    }
+
+    if (env->psw.mask & PSW_MASK_PSTATE) {
+        s390_program_interrupt(env, PGM_PRIVILEGED, ra);
+        return;
+    }
+
+    if (reg & ~S390_TOPO_FC_MASK) {
+        s390_program_interrupt(env, PGM_SPECIFICATION, ra);
+        return;
+    }
+
+    switch (fc) {
+    case S390_CPU_POLARIZATION_VERTICAL:
+    case S390_CPU_POLARIZATION_HORIZONTAL:
+        if (s390_topology.vertical_polarization == !!fc) {
+            env->regs[r1] |= S390_PTF_REASON_DONE;
+            setcc(cpu, 2);
+        } else {
+            s390_topology.vertical_polarization = !!fc;
+            s390_cpu_topology_set_changed(true);
+            setcc(cpu, 0);
+        }
+        break;
+    default:
+        /* Note that fc == 2 is interpreted by the SIE */
+        s390_program_interrupt(env, PGM_SPECIFICATION, ra);
+    }
+}
+
 /**
  * s390_topology_reset:
  *
@@ -105,6 +155,7 @@ static void s390_topology_init(MachineState *ms)
 void s390_topology_reset(void)
 {
     s390_cpu_topology_set_changed(false);
+    s390_topology.vertical_polarization = false;
 }
 
 /**
diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c
index bc953151ce..fb63be41b7 100644
--- a/target/s390x/kvm/kvm.c
+++ b/target/s390x/kvm/kvm.c
@@ -96,6 +96,7 @@
 
 #define PRIV_B9_EQBS                    0x9c
 #define PRIV_B9_CLP                     0xa0
+#define PRIV_B9_PTF                     0xa2
 #define PRIV_B9_PCISTG                  0xd0
 #define PRIV_B9_PCILG                   0xd2
 #define PRIV_B9_RPCIT                   0xd3
@@ -1464,6 +1465,13 @@ static int kvm_mpcifc_service_call(S390CPU *cpu, struct kvm_run *run)
     }
 }
 
+static void kvm_handle_ptf(S390CPU *cpu, struct kvm_run *run)
+{
+    uint8_t r1 = (run->s390_sieic.ipb >> 20) & 0x0f;
+
+    s390_handle_ptf(cpu, r1, RA_IGNORED);
+}
+
 static int handle_b9(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1)
 {
     int r = 0;
@@ -1481,6 +1489,9 @@ static int handle_b9(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1)
     case PRIV_B9_RPCIT:
         r = kvm_rpcit_service_call(cpu, run);
         break;
+    case PRIV_B9_PTF:
+        kvm_handle_ptf(cpu, run);
+        break;
     case PRIV_B9_EQBS:
         /* just inject exception */
         r = -1;
-- 
2.31.1



  parent reply	other threads:[~2023-04-25 16:19 UTC|newest]

Thread overview: 61+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-25 16:14 [PATCH v20 00/21] s390x: CPU Topology Pierre Morel
2023-04-25 16:14 ` [PATCH v20 01/21] s390x/cpu topology: add s390 specifics to CPU topology Pierre Morel
2023-04-27  8:04   ` Thomas Huth
2023-04-28 12:27     ` Pierre Morel
2023-05-03  9:36     ` Pierre Morel
2023-05-03  9:54       ` Thomas Huth
2023-05-03 11:17     ` Pierre Morel
2023-05-02 12:05   ` Cédric Le Goater
2023-05-02 13:48     ` Cédric Le Goater
2023-05-03  7:23       ` Pierre Morel
2023-04-25 16:14 ` [PATCH v20 02/21] s390x/cpu topology: add topology entries on CPU hotplug Pierre Morel
2023-04-27 13:38   ` Thomas Huth
2023-04-28 12:35     ` Pierre Morel
2023-05-03  9:12       ` Thomas Huth
2023-05-03 10:23         ` Cédric Le Goater
2023-06-21 13:48           ` Pierre Morel
2023-05-02 12:30   ` Cédric Le Goater
2023-05-03  7:21     ` Pierre Morel
2023-05-03 11:23       ` Cédric Le Goater
2023-04-25 16:14 ` [PATCH v20 03/21] target/s390x/cpu topology: handle STSI(15) and build the SYSIB Pierre Morel
2023-04-27 17:01   ` Thomas Huth
2023-04-28 12:42     ` Pierre Morel
2023-05-02 17:22   ` Nina Schoetterl-Glausch
2023-05-03  8:43     ` Pierre Morel
2023-05-03 13:01       ` Nina Schoetterl-Glausch
2023-04-25 16:14 ` [PATCH v20 04/21] s390x/sclp: reporting the maximum nested topology entries Pierre Morel
2023-04-25 16:14 ` [PATCH v20 05/21] s390x/cpu topology: resetting the Topology-Change-Report Pierre Morel
2023-04-25 16:14 ` Pierre Morel [this message]
2023-05-04 11:03   ` [PATCH v20 06/21] s390x/cpu topology: interception of PTF instruction Nina Schoetterl-Glausch
2023-05-05  9:34     ` Pierre Morel
2023-04-25 16:14 ` [PATCH v20 07/21] target/s390x/cpu topology: activate CPU topology Pierre Morel
2023-04-25 16:14 ` [PATCH v20 08/21] qapi/s390x/cpu topology: set-cpu-topology qmp command Pierre Morel
2023-05-08 19:42   ` Nina Schoetterl-Glausch
2023-05-09  8:50     ` Pierre Morel
2023-04-25 16:14 ` [PATCH v20 09/21] machine: adding s390 topology to query-cpu-fast Pierre Morel
2023-06-12  7:55   ` Cédric Le Goater
2023-06-21 12:50     ` Pierre Morel
2023-04-25 16:14 ` [PATCH v20 10/21] machine: adding s390 topology to info hotpluggable-cpus Pierre Morel
2023-05-08 19:49   ` Nina Schoetterl-Glausch
2023-05-09  8:40     ` Pierre Morel
2023-04-25 16:14 ` [PATCH v20 11/21] qapi/s390x/cpu topology: CPU_POLARIZATION_CHANGE qapi event Pierre Morel
2023-05-08 21:47   ` Nina Schoetterl-Glausch
2023-05-09 12:31     ` Pierre Morel
2023-04-25 16:14 ` [PATCH v20 12/21] qapi/s390x/cpu topology: query-cpu-polarization qmp command Pierre Morel
2023-05-10 12:04   ` Nina Schoetterl-Glausch
2023-05-12 11:56     ` Pierre Morel
2023-04-25 16:14 ` [PATCH v20 13/21] docs/s390x/cpu topology: document s390x cpu topology Pierre Morel
2023-04-25 16:14 ` [PATCH v20 14/21] tests/avocado: s390x cpu topology core Pierre Morel
2023-05-22 19:38   ` Nina Schoetterl-Glausch
2023-06-27 11:58     ` Pierre Morel
2023-04-25 16:14 ` [PATCH v20 15/21] tests/avocado: s390x cpu topology polarisation Pierre Morel
2023-05-22 19:45   ` Nina Schoetterl-Glausch
2023-06-27 13:01     ` Pierre Morel
2023-04-25 16:14 ` [PATCH v20 16/21] tests/avocado: s390x cpu topology entitlement tests Pierre Morel
2023-05-22 19:47   ` Nina Schoetterl-Glausch
2023-06-27 13:22     ` Pierre Morel
2023-04-25 16:14 ` [PATCH v20 17/21] tests/avocado: s390x cpu topology test dedicated CPU Pierre Morel
2023-04-25 16:14 ` [PATCH v20 18/21] tests/avocado: s390x cpu topology test socket full Pierre Morel
2023-04-25 16:14 ` [PATCH v20 19/21] tests/avocado: s390x cpu topology dedicated errors Pierre Morel
2023-04-25 16:14 ` [PATCH v20 20/21] tests/avocado: s390x cpu topology bad move Pierre Morel
2023-04-25 16:14 ` [PATCH v20 21/21] tests/avocado: s390x cpu topology query-cpu-polarization Pierre Morel

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=20230425161456.21031-7-pmorel@linux.ibm.com \
    --to=pmorel@linux.ibm.com \
    --cc=armbru@redhat.com \
    --cc=berrange@redhat.com \
    --cc=borntraeger@de.ibm.com \
    --cc=clg@kaod.org \
    --cc=cohuck@redhat.com \
    --cc=david@redhat.com \
    --cc=eblake@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=frankja@linux.ibm.com \
    --cc=kvm@vger.kernel.org \
    --cc=marcel.apfelbaum@gmail.com \
    --cc=mst@redhat.com \
    --cc=nrb@linux.ibm.com \
    --cc=nsg@linux.ibm.com \
    --cc=pasic@linux.ibm.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=seiden@linux.ibm.com \
    --cc=thuth@redhat.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).