From nobody Wed Oct 29 20:34:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1525418856867838.8657643172502; Fri, 4 May 2018 00:27:36 -0700 (PDT) Received: from localhost ([::1]:60963 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEV7w-0005ZE-3B for importer@patchew.org; Fri, 04 May 2018 03:27:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33968) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEV5u-0004Ic-Tc for qemu-devel@nongnu.org; Fri, 04 May 2018 03:25:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fEV5s-00073T-S9 for qemu-devel@nongnu.org; Fri, 04 May 2018 03:25:30 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:37114 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fEV5s-00072r-ML; Fri, 04 May 2018 03:25:28 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2AE884077EF9; Fri, 4 May 2018 07:25:28 +0000 (UTC) Received: from localhost (dhcp-192-222.str.redhat.com [10.33.192.222]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CBA5283B82; Fri, 4 May 2018 07:25:25 +0000 (UTC) From: Cornelia Huck To: Peter Maydell Date: Fri, 4 May 2018 09:25:01 +0200 Message-Id: <20180504072514.8450-3-cohuck@redhat.com> In-Reply-To: <20180504072514.8450-1-cohuck@redhat.com> References: <20180504072514.8450-1-cohuck@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 04 May 2018 07:25:28 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 04 May 2018 07:25:28 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'cohuck@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 02/15] s390x/sclp: extend SCLP event masks to 64 bits X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , David Hildenbrand , Cornelia Huck , Alexander Graf , qemu-devel@nongnu.org, Christian Borntraeger , qemu-s390x@nongnu.org, Claudio Imbrenda , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Claudio Imbrenda Extend the SCLP event masks to 64 bits. Notice that using any of the new bits results in a state that cannot be migrated to an older version. Signed-off-by: Claudio Imbrenda Message-Id: <1520507069-22179-1-git-send-email-imbrenda@linux.vnet.ibm.com> Acked-by: Christian Borntraeger Signed-off-by: Cornelia Huck --- hw/s390x/event-facility.c | 50 ++++++++++++++++++++++++++++++++---= ---- include/hw/s390x/event-facility.h | 2 +- 2 files changed, 42 insertions(+), 10 deletions(-) diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c index 9c24bc6f7c..0dea6cccae 100644 --- a/hw/s390x/event-facility.c +++ b/hw/s390x/event-facility.c @@ -26,11 +26,23 @@ typedef struct SCLPEventsBus { BusState qbus; } SCLPEventsBus; =20 +/* we need to save 32 bit chunks for compatibility */ +#ifdef HOST_WORDS_BIGENDIAN +#define RECV_MASK_LOWER 1 +#define RECV_MASK_UPPER 0 +#else /* little endian host */ +#define RECV_MASK_LOWER 0 +#define RECV_MASK_UPPER 1 +#endif + struct SCLPEventFacility { SysBusDevice parent_obj; SCLPEventsBus sbus; /* guest's receive mask */ - sccb_mask_t receive_mask; + union { + uint32_t receive_mask_pieces[2]; + sccb_mask_t receive_mask; + }; /* * when false, we keep the same broken, backwards compatible behaviour= as * before, allowing only masks of size exactly 4; when true, we implem= ent @@ -262,7 +274,7 @@ static void read_event_data(SCLPEventFacility *ef, SCCB= *sccb) case SCLP_SELECTIVE_READ: copy_mask((uint8_t *)&sclp_active_selection_mask, (uint8_t *)&red-= >mask, sizeof(sclp_active_selection_mask), ef->mask_length); - sclp_active_selection_mask =3D be32_to_cpu(sclp_active_selection_m= ask); + sclp_active_selection_mask =3D be64_to_cpu(sclp_active_selection_m= ask); if (!sclp_cp_receive_mask || (sclp_active_selection_mask & ~sclp_cp_receive_mask)) { sccb->h.response_code =3D @@ -294,21 +306,22 @@ static void write_event_mask(SCLPEventFacility *ef, S= CCB *sccb) } =20 /* - * Note: We currently only support masks up to 4 byte length; - * the remainder is filled up with zeroes. Linux uses - * a 4 byte mask length. + * Note: We currently only support masks up to 8 byte length; + * the remainder is filled up with zeroes. Older Linux + * kernels use a 4 byte mask length, newer ones can use both + * 8 or 4 depending on what is available on the host. */ =20 /* keep track of the guest's capability masks */ copy_mask((uint8_t *)&tmp_mask, WEM_CP_RECEIVE_MASK(we_mask, mask_leng= th), sizeof(tmp_mask), mask_length); - ef->receive_mask =3D be32_to_cpu(tmp_mask); + ef->receive_mask =3D be64_to_cpu(tmp_mask); =20 /* return the SCLP's capability masks to the guest */ - tmp_mask =3D cpu_to_be32(get_host_receive_mask(ef)); + tmp_mask =3D cpu_to_be64(get_host_receive_mask(ef)); copy_mask(WEM_RECEIVE_MASK(we_mask, mask_length), (uint8_t *)&tmp_mask, mask_length, sizeof(tmp_mask)); - tmp_mask =3D cpu_to_be32(get_host_send_mask(ef)); + tmp_mask =3D cpu_to_be64(get_host_send_mask(ef)); copy_mask(WEM_SEND_MASK(we_mask, mask_length), (uint8_t *)&tmp_mask, mask_length, sizeof(tmp_mask)); =20 @@ -369,6 +382,13 @@ static void command_handler(SCLPEventFacility *ef, SCC= B *sccb, uint64_t code) } } =20 +static bool vmstate_event_facility_mask64_needed(void *opaque) +{ + SCLPEventFacility *ef =3D opaque; + + return (ef->receive_mask & 0xFFFFFFFF) !=3D 0; +} + static bool vmstate_event_facility_mask_length_needed(void *opaque) { SCLPEventFacility *ef =3D opaque; @@ -376,6 +396,17 @@ static bool vmstate_event_facility_mask_length_needed(= void *opaque) return ef->allow_all_mask_sizes; } =20 +static const VMStateDescription vmstate_event_facility_mask64 =3D { + .name =3D "vmstate-event-facility/mask64", + .version_id =3D 0, + .minimum_version_id =3D 0, + .needed =3D vmstate_event_facility_mask64_needed, + .fields =3D (VMStateField[]) { + VMSTATE_UINT32(receive_mask_pieces[RECV_MASK_LOWER], SCLPEventFaci= lity), + VMSTATE_END_OF_LIST() + } +}; + static const VMStateDescription vmstate_event_facility_mask_length =3D { .name =3D "vmstate-event-facility/mask_length", .version_id =3D 0, @@ -392,10 +423,11 @@ static const VMStateDescription vmstate_event_facilit= y =3D { .version_id =3D 0, .minimum_version_id =3D 0, .fields =3D (VMStateField[]) { - VMSTATE_UINT32(receive_mask, SCLPEventFacility), + VMSTATE_UINT32(receive_mask_pieces[RECV_MASK_UPPER], SCLPEventFaci= lity), VMSTATE_END_OF_LIST() }, .subsections =3D (const VMStateDescription * []) { + &vmstate_event_facility_mask64, &vmstate_event_facility_mask_length, NULL } diff --git a/include/hw/s390x/event-facility.h b/include/hw/s390x/event-fac= ility.h index 5698e5e96c..8b39a80bb9 100644 --- a/include/hw/s390x/event-facility.h +++ b/include/hw/s390x/event-facility.h @@ -73,7 +73,7 @@ typedef struct WriteEventMask { #define WEM_RECEIVE_MASK(wem, mask_len) ((wem)->masks + 2 * (mask_len)) #define WEM_SEND_MASK(wem, mask_len) ((wem)->masks + 3 * (mask_len)) =20 -typedef uint32_t sccb_mask_t; +typedef uint64_t sccb_mask_t; =20 typedef struct EventBufferHeader { uint16_t length; --=20 2.14.3