From nobody Wed Oct 22 15:22:48 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 Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1519408465644922.8317532199383; Fri, 23 Feb 2018 09:54:25 -0800 (PST) Received: from localhost ([::1]:46420 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epHY3-0001md-Kj for importer@patchew.org; Fri, 23 Feb 2018 12:54:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46289) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epHXC-0001O8-7b for qemu-devel@nongnu.org; Fri, 23 Feb 2018 12:53:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1epHX8-0007Sq-99 for qemu-devel@nongnu.org; Fri, 23 Feb 2018 12:53:26 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:41472 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1epHX8-0007Rv-3D for qemu-devel@nongnu.org; Fri, 23 Feb 2018 12:53:22 -0500 Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w1NHmhHq015074 for ; Fri, 23 Feb 2018 12:53:21 -0500 Received: from e06smtp10.uk.ibm.com (e06smtp10.uk.ibm.com [195.75.94.106]) by mx0a-001b2d01.pphosted.com with ESMTP id 2gapm4twa6-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Fri, 23 Feb 2018 12:53:20 -0500 Received: from localhost by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 23 Feb 2018 17:43:06 -0000 Received: from b06cxnps4074.portsmouth.uk.ibm.com (9.149.109.196) by e06smtp10.uk.ibm.com (192.168.101.140) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 23 Feb 2018 17:43:02 -0000 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w1NHh21v25624618; Fri, 23 Feb 2018 17:43:02 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4F76E11C054; Fri, 23 Feb 2018 17:36:02 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1978E11C052; Fri, 23 Feb 2018 17:36:02 +0000 (GMT) Received: from p-imbrenda.boeblingen.de.ibm.com (unknown [9.152.224.168]) by d06av25.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Fri, 23 Feb 2018 17:36:02 +0000 (GMT) From: Claudio Imbrenda To: cohuck@redhat.com Date: Fri, 23 Feb 2018 18:42:58 +0100 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519407778-23095-1-git-send-email-imbrenda@linux.vnet.ibm.com> References: <1519407778-23095-1-git-send-email-imbrenda@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18022317-0040-0000-0000-000004160D3F X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18022317-0041-0000-0000-0000261927E2 Message-Id: <1519407778-23095-4-git-send-email-imbrenda@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-02-23_06:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1802230219 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [PATCH v4 3/3] 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: borntraeger@de.ibm.com, qemu-s390x@nongnu.org, qemu-devel@nongnu.org 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" 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 --- hw/s390x/event-facility.c | 56 ++++++++++++++++++++++++++++++-----= ---- include/hw/s390x/event-facility.h | 2 +- 2 files changed, 45 insertions(+), 13 deletions(-) diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c index e04ed9f..c3e39ee 100644 --- a/hw/s390x/event-facility.c +++ b/hw/s390x/event-facility.c @@ -30,7 +30,7 @@ struct SCLPEventFacility { SysBusDevice parent_obj; SCLPEventsBus sbus; /* guest's receive mask */ - sccb_mask_t receive_mask; + uint32_t receive_mask_pieces[2]; /* * when false, we keep the same broken, backwards compatible behaviour= as * before, allowing only masks of size exactly 4; when true, we implem= ent @@ -42,6 +42,18 @@ struct SCLPEventFacility { uint16_t mask_length; }; =20 +static inline sccb_mask_t make_receive_mask(SCLPEventFacility *ef) +{ + return ((sccb_mask_t)ef->receive_mask_pieces[0]) << 32 | + ef->receive_mask_pieces[1]; +} + +static inline void store_receive_mask(SCLPEventFacility *ef, sccb_mask_t v= al) +{ + ef->receive_mask_pieces[1] =3D val; + ef->receive_mask_pieces[0] =3D val >> 32; +} + /* return true if any child has event pending set */ static bool event_pending(SCLPEventFacility *ef) { @@ -54,7 +66,7 @@ static bool event_pending(SCLPEventFacility *ef) event =3D DO_UPCAST(SCLPEvent, qdev, qdev); event_class =3D SCLP_EVENT_GET_CLASS(event); if (event->event_pending && - event_class->get_send_mask() & ef->receive_mask) { + event_class->get_send_mask() & make_receive_mask(ef)) { return true; } } @@ -252,7 +264,7 @@ static void read_event_data(SCLPEventFacility *ef, SCCB= *sccb) goto out; } =20 - sclp_cp_receive_mask =3D ef->receive_mask; + sclp_cp_receive_mask =3D make_receive_mask(ef); =20 /* get active selection mask */ switch (sccb->h.function_code) { @@ -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); + store_receive_mask(ef, 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_pieces[1] !=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[1], SCLPEventFacility), + 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[0], SCLPEventFacility), VMSTATE_END_OF_LIST() }, .subsections =3D (const VMStateDescription * []) { + &vmstate_event_facility_mask64, &vmstate_event_facility_mask_length, NULL } @@ -447,7 +479,7 @@ static void reset_event_facility(DeviceState *dev) { SCLPEventFacility *sdev =3D EVENT_FACILITY(dev); =20 - sdev->receive_mask =3D 0; + store_receive_mask(sdev, 0); } =20 static void init_event_facility_class(ObjectClass *klass, void *data) diff --git a/include/hw/s390x/event-facility.h b/include/hw/s390x/event-fac= ility.h index 0e2b761..06ba4ea 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.7.4