* [PULL 1/6] s390x/ipl: check kernel command line size
2021-10-15 9:16 [PULL 0/6] s390x patches and dtc update Thomas Huth
@ 2021-10-15 9:16 ` Thomas Huth
2021-10-15 9:16 ` [PULL 2/6] s390x: sigp: Force Set Architecture to return Invalid Parameter Thomas Huth
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Thomas Huth @ 2021-10-15 9:16 UTC (permalink / raw)
To: qemu-devel, Richard Henderson; +Cc: qemu-s390x, Cornelia Huck
From: Marc Hartmayer <mhartmay@linux.ibm.com>
Check if the provided kernel command line exceeds the maximum size of the s390x
Linux kernel command line size, which is 896 bytes.
Reported-by: Sven Schnelle <svens@linux.ibm.com>
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Message-Id: <20211006092631.20732-1-mhartmay@linux.ibm.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
[thuth: Adjusted format specifier for size_t]
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hw/s390x/ipl.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index 1821c6faee..7ddca0127f 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -38,6 +38,7 @@
#define KERN_IMAGE_START 0x010000UL
#define LINUX_MAGIC_ADDR 0x010008UL
#define KERN_PARM_AREA 0x010480UL
+#define KERN_PARM_AREA_SIZE 0x000380UL
#define INITRD_START 0x800000UL
#define INITRD_PARM_START 0x010408UL
#define PARMFILE_START 0x001000UL
@@ -190,10 +191,19 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp)
* loader) and it won't work. For this case we force it to 0x10000, too.
*/
if (pentry == KERN_IMAGE_START || pentry == 0x800) {
- char *parm_area = rom_ptr(KERN_PARM_AREA, strlen(ipl->cmdline) + 1);
+ size_t cmdline_size = strlen(ipl->cmdline) + 1;
+ char *parm_area = rom_ptr(KERN_PARM_AREA, cmdline_size);
+
ipl->start_addr = KERN_IMAGE_START;
/* Overwrite parameters in the kernel image, which are "rom" */
if (parm_area) {
+ if (cmdline_size > KERN_PARM_AREA_SIZE) {
+ error_setg(errp,
+ "kernel command line exceeds maximum size: %zu > %lu",
+ cmdline_size, KERN_PARM_AREA_SIZE);
+ return;
+ }
+
strcpy(parm_area, ipl->cmdline);
}
} else {
--
2.27.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PULL 2/6] s390x: sigp: Force Set Architecture to return Invalid Parameter
2021-10-15 9:16 [PULL 0/6] s390x patches and dtc update Thomas Huth
2021-10-15 9:16 ` [PULL 1/6] s390x/ipl: check kernel command line size Thomas Huth
@ 2021-10-15 9:16 ` Thomas Huth
2021-10-15 9:16 ` [PULL 3/6] vfio-ccw: step down as maintainer Thomas Huth
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Thomas Huth @ 2021-10-15 9:16 UTC (permalink / raw)
To: qemu-devel, Richard Henderson; +Cc: qemu-s390x, Cornelia Huck
From: Eric Farman <farman@linux.ibm.com>
According to the Principles of Operation, the SIGP Set Architecture
order will return Incorrect State if some CPUs are not stopped, but
only if the CZAM facility is not present. If it is, the order will
return Invalid Parameter because the architecture mode cannot be
changed.
Since CZAM always exists when S390_FEAT_ZARCH exists, which in turn
exists for every defined CPU model, we can simplify this code.
Fixes: 075e52b81664 ("s390x/cpumodel: we are always in zarchitecture mode")
Signed-off-by: Eric Farman <farman@linux.ibm.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Janosch Frank <frankja@linux.ibm.com>
Message-Id: <20211008203811.1980478-2-farman@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
target/s390x/sigp.c | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/target/s390x/sigp.c b/target/s390x/sigp.c
index d57427ced8..51c727834c 100644
--- a/target/s390x/sigp.c
+++ b/target/s390x/sigp.c
@@ -428,26 +428,10 @@ static int handle_sigp_single_dst(S390CPU *cpu, S390CPU *dst_cpu, uint8_t order,
static int sigp_set_architecture(S390CPU *cpu, uint32_t param,
uint64_t *status_reg)
{
- CPUState *cur_cs;
- S390CPU *cur_cpu;
- bool all_stopped = true;
-
- CPU_FOREACH(cur_cs) {
- cur_cpu = S390_CPU(cur_cs);
-
- if (cur_cpu == cpu) {
- continue;
- }
- if (s390_cpu_get_state(cur_cpu) != S390_CPU_STATE_STOPPED) {
- all_stopped = false;
- }
- }
-
*status_reg &= 0xffffffff00000000ULL;
/* Reject set arch order, with czam we're always in z/Arch mode. */
- *status_reg |= (all_stopped ? SIGP_STAT_INVALID_PARAMETER :
- SIGP_STAT_INCORRECT_STATE);
+ *status_reg |= SIGP_STAT_INVALID_PARAMETER;
return SIGP_CC_STATUS_STORED;
}
--
2.27.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PULL 3/6] vfio-ccw: step down as maintainer
2021-10-15 9:16 [PULL 0/6] s390x patches and dtc update Thomas Huth
2021-10-15 9:16 ` [PULL 1/6] s390x/ipl: check kernel command line size Thomas Huth
2021-10-15 9:16 ` [PULL 2/6] s390x: sigp: Force Set Architecture to return Invalid Parameter Thomas Huth
@ 2021-10-15 9:16 ` Thomas Huth
2021-10-15 9:16 ` [PULL 4/6] s390x/kvm: " Thomas Huth
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Thomas Huth @ 2021-10-15 9:16 UTC (permalink / raw)
To: qemu-devel, Richard Henderson; +Cc: qemu-s390x, Cornelia Huck
From: Cornelia Huck <cohuck@redhat.com>
I currently don't have time to act as vfio-ccw maintainer anymore,
so remove myself there.
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Message-Id: <20211012144040.360887-2-cohuck@redhat.com>
Acked-by: Matthew Rosato <mjrosato@linux.ibm.com>
Acked-by: Eric Farman <farman@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
MAINTAINERS | 2 --
1 file changed, 2 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 50435b8d2f..14d1312941 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1862,7 +1862,6 @@ F: docs/igd-assign.txt
F: docs/devel/vfio-migration.rst
vfio-ccw
-M: Cornelia Huck <cohuck@redhat.com>
M: Eric Farman <farman@linux.ibm.com>
M: Matthew Rosato <mjrosato@linux.ibm.com>
S: Supported
@@ -1870,7 +1869,6 @@ F: hw/vfio/ccw.c
F: hw/s390x/s390-ccw.c
F: include/hw/s390x/s390-ccw.h
F: include/hw/s390x/vfio-ccw.h
-T: git https://gitlab.com/cohuck/qemu.git s390-next
L: qemu-s390x@nongnu.org
vfio-ap
--
2.27.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PULL 4/6] s390x/kvm: step down as maintainer
2021-10-15 9:16 [PULL 0/6] s390x patches and dtc update Thomas Huth
` (2 preceding siblings ...)
2021-10-15 9:16 ` [PULL 3/6] vfio-ccw: step down as maintainer Thomas Huth
@ 2021-10-15 9:16 ` Thomas Huth
2021-10-15 9:16 ` [PULL 5/6] s390x virtio-ccw machine: " Thomas Huth
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Thomas Huth @ 2021-10-15 9:16 UTC (permalink / raw)
To: qemu-devel, Richard Henderson; +Cc: qemu-s390x, Cornelia Huck
From: Cornelia Huck <cohuck@redhat.com>
I'm no longer involved with KVM/s390 on the kernel side, and I don't
have enough resources to work on the s390 KVM cpus support, so I'll
step down.
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Acked-by: Halil Pasic <pasic@linux.ibm.com>
Message-Id: <20211012144040.360887-3-cohuck@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
MAINTAINERS | 2 --
1 file changed, 2 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 14d1312941..234fcaa233 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -393,7 +393,6 @@ F: target/ppc/kvm.c
S390 KVM CPUs
M: Halil Pasic <pasic@linux.ibm.com>
-M: Cornelia Huck <cohuck@redhat.com>
M: Christian Borntraeger <borntraeger@de.ibm.com>
S: Supported
F: target/s390x/kvm/
@@ -408,7 +407,6 @@ F: hw/intc/s390_flic.c
F: hw/intc/s390_flic_kvm.c
F: include/hw/s390x/s390_flic.h
F: gdb-xml/s390*.xml
-T: git https://gitlab.com/cohuck/qemu.git s390-next
T: git https://github.com/borntraeger/qemu.git s390-next
L: qemu-s390x@nongnu.org
--
2.27.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PULL 5/6] s390x virtio-ccw machine: step down as maintainer
2021-10-15 9:16 [PULL 0/6] s390x patches and dtc update Thomas Huth
` (3 preceding siblings ...)
2021-10-15 9:16 ` [PULL 4/6] s390x/kvm: " Thomas Huth
@ 2021-10-15 9:16 ` Thomas Huth
2021-10-15 9:16 ` [PULL 6/6] dtc: Update to version 1.6.1 Thomas Huth
2021-10-15 19:08 ` [PULL 0/6] s390x patches and dtc update Richard Henderson
6 siblings, 0 replies; 8+ messages in thread
From: Thomas Huth @ 2021-10-15 9:16 UTC (permalink / raw)
To: qemu-devel, Richard Henderson; +Cc: qemu-s390x, Cornelia Huck
From: Cornelia Huck <cohuck@redhat.com>
I currently don't have time to work on the s390x virtio-ccw machine
anymore, so let's step down. (I will, however, continue as a
maintainer for the virtio-ccw *transport*.)
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Acked-by: Halil Pasic <pasic@linux.ibm.com>
Message-Id: <20211012144040.360887-4-cohuck@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
MAINTAINERS | 2 --
1 file changed, 2 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 234fcaa233..c25793bc39 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1509,7 +1509,6 @@ F: tests/acceptance/machine_sparc_leon3.py
S390 Machines
-------------
S390 Virtio-ccw
-M: Cornelia Huck <cohuck@redhat.com>
M: Halil Pasic <pasic@linux.ibm.com>
M: Christian Borntraeger <borntraeger@de.ibm.com>
S: Supported
@@ -1521,7 +1520,6 @@ F: hw/watchdog/wdt_diag288.c
F: include/hw/watchdog/wdt_diag288.h
F: configs/devices/s390x-softmmu/default.mak
F: tests/acceptance/machine_s390_ccw_virtio.py
-T: git https://gitlab.com/cohuck/qemu.git s390-next
T: git https://github.com/borntraeger/qemu.git s390-next
L: qemu-s390x@nongnu.org
--
2.27.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PULL 6/6] dtc: Update to version 1.6.1
2021-10-15 9:16 [PULL 0/6] s390x patches and dtc update Thomas Huth
` (4 preceding siblings ...)
2021-10-15 9:16 ` [PULL 5/6] s390x virtio-ccw machine: " Thomas Huth
@ 2021-10-15 9:16 ` Thomas Huth
2021-10-15 19:08 ` [PULL 0/6] s390x patches and dtc update Richard Henderson
6 siblings, 0 replies; 8+ messages in thread
From: Thomas Huth @ 2021-10-15 9:16 UTC (permalink / raw)
To: qemu-devel, Richard Henderson; +Cc: qemu-s390x, Cornelia Huck
The dtc submodule is currently pointing to non-release commit. It's nicer
if submodules point to release versions instead and since dtc 1.6.1 is
available now, let's update to that version.
Message-Id: <20210827120901.150276-4-thuth@redhat.com>
Acked-by: Greg Kurz <groug@kaod.org>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
dtc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dtc b/dtc
index 85e5d83984..b6910bec11 160000
--- a/dtc
+++ b/dtc
@@ -1 +1 @@
-Subproject commit 85e5d839847af54efab170f2b1331b2a6421e647
+Subproject commit b6910bec11614980a21e46fbccc35934b671bd81
--
2.27.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PULL 0/6] s390x patches and dtc update
2021-10-15 9:16 [PULL 0/6] s390x patches and dtc update Thomas Huth
` (5 preceding siblings ...)
2021-10-15 9:16 ` [PULL 6/6] dtc: Update to version 1.6.1 Thomas Huth
@ 2021-10-15 19:08 ` Richard Henderson
6 siblings, 0 replies; 8+ messages in thread
From: Richard Henderson @ 2021-10-15 19:08 UTC (permalink / raw)
To: Thomas Huth, qemu-devel; +Cc: qemu-s390x, Cornelia Huck
On 10/15/21 2:16 AM, Thomas Huth wrote:
> Hi!
>
> The following changes since commit bfd9a76f9c143d450ab5545dedfa74364b39fc56:
>
> Merge remote-tracking branch 'remotes/stsquad/tags/pull-for-6.2-121021-2' into staging (2021-10-12 06:16:25 -0700)
>
> are available in the Git repository at:
>
> https://gitlab.com/thuth/qemu.git tags/pull-request-2021-10-15
>
> for you to fetch changes up to 962fde57b7d573281619cb2b7068d570470ef833:
>
> dtc: Update to version 1.6.1 (2021-10-14 08:08:11 +0200)
>
> ----------------------------------------------------------------
> * Check kernel command line size on s390x
> * Simplification of one of the SIGP instructions on s390x
> * Cornelia stepping down as maintainer in some subsystems
> * Update the dtc submodule to a proper release version
>
> ----------------------------------------------------------------
> Cornelia Huck (3):
> vfio-ccw: step down as maintainer
> s390x/kvm: step down as maintainer
> s390x virtio-ccw machine: step down as maintainer
>
> Eric Farman (1):
> s390x: sigp: Force Set Architecture to return Invalid Parameter
>
> Marc Hartmayer (1):
> s390x/ipl: check kernel command line size
>
> Thomas Huth (1):
> dtc: Update to version 1.6.1
>
> MAINTAINERS | 6 ------
> dtc | 2 +-
> hw/s390x/ipl.c | 12 +++++++++++-
> target/s390x/sigp.c | 18 +-----------------
> 4 files changed, 13 insertions(+), 25 deletions(-)
Applied, thanks.
r~
^ permalink raw reply [flat|nested] 8+ messages in thread