From nobody Tue Nov 4 05:26:35 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505928411893913.3369070582942; Wed, 20 Sep 2017 10:26:51 -0700 (PDT) Received: from localhost ([::1]:49922 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duilv-0007AT-6B for importer@patchew.org; Wed, 20 Sep 2017 13:26:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51613) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duiit-000554-0j for qemu-devel@nongnu.org; Wed, 20 Sep 2017 13:23:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duiiq-0005yl-8X for qemu-devel@nongnu.org; Wed, 20 Sep 2017 13:23:43 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:39046 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 1duiiq-0005wt-3g for qemu-devel@nongnu.org; Wed, 20 Sep 2017 13:23:40 -0400 Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v8KHLtcj116757 for ; Wed, 20 Sep 2017 13:23:37 -0400 Received: from e06smtp12.uk.ibm.com (e06smtp12.uk.ibm.com [195.75.94.108]) by mx0b-001b2d01.pphosted.com with ESMTP id 2d3t8uhqfs-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 20 Sep 2017 13:23:37 -0400 Received: from localhost by e06smtp12.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 20 Sep 2017 18:23:35 +0100 Received: from b06cxnps3074.portsmouth.uk.ibm.com (9.149.109.194) by e06smtp12.uk.ibm.com (192.168.101.142) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 20 Sep 2017 18:23:33 +0100 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v8KHNXSw17367130; Wed, 20 Sep 2017 17:23:33 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 150D94C046; Wed, 20 Sep 2017 18:19:57 +0100 (BST) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CBF2B4C044; Wed, 20 Sep 2017 18:19:56 +0100 (BST) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Wed, 20 Sep 2017 18:19:56 +0100 (BST) From: Halil Pasic To: Cornelia Huck , Christian Borntraeger Date: Wed, 20 Sep 2017 19:23:13 +0200 X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170920172314.102710-1-pasic@linux.vnet.ibm.com> References: <20170920172314.102710-1-pasic@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 17092017-0008-0000-0000-00000498BF36 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17092017-0009-0000-0000-00001E29F6F8 Message-Id: <20170920172314.102710-2-pasic@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-09-20_04:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000 definitions=main-1709200234 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 1/2] s390x/3270: IDA support for 3270 via CcwDataStream 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: Halil Pasic , qemu-devel@nongnu.org, Alexander Graf , "Jason J . Herne" , Dong Jia Shi , 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" Let us convert the 3270 code so it uses the recently introduced CcwDataStream abstraction instead of blindly assuming direct data access. This patch does not change behavior beyond introducing IDA support: for direct data access CCWs everything stays as-is. (If there are bugs, they are also preserved). Signed-off-by: Halil Pasic Acked-by: Christian Borntraeger Reviewed-by: Dong Jia Shi --- hw/char/terminal3270.c | 18 +++++++++++------- hw/s390x/3270-ccw.c | 4 ++-- include/hw/s390x/3270-ccw.h | 5 ++--- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/hw/char/terminal3270.c b/hw/char/terminal3270.c index 28f599111d..c976a63cc2 100644 --- a/hw/char/terminal3270.c +++ b/hw/char/terminal3270.c @@ -182,14 +182,18 @@ static void terminal_init(EmulatedCcw3270Device *dev,= Error **errp) terminal_read, chr_event, NULL, t, NULL, true= ); } =20 -static int read_payload_3270(EmulatedCcw3270Device *dev, uint32_t cda, - uint16_t count) +static inline CcwDataStream *get_cds(Terminal3270 *t) +{ + return &(CCW_DEVICE(&t->cdev)->sch->cds); +} + +static int read_payload_3270(EmulatedCcw3270Device *dev) { Terminal3270 *t =3D TERMINAL_3270(dev); int len; =20 - len =3D MIN(count, t->in_len); - cpu_physical_memory_write(cda, t->inv, len); + len =3D MIN(ccw_dstream_avail(get_cds(t)), t->in_len); + ccw_dstream_write_buf(get_cds(t), t->inv, len); t->in_len -=3D len; =20 return len; @@ -222,11 +226,11 @@ static int insert_IAC_escape_char(uint8_t *outv, int = out_len) * Write 3270 outbound to socket. * Return the count of 3270 data field if succeeded, zero if failed. */ -static int write_payload_3270(EmulatedCcw3270Device *dev, uint8_t cmd, - uint32_t cda, uint16_t count) +static int write_payload_3270(EmulatedCcw3270Device *dev, uint8_t cmd) { Terminal3270 *t =3D TERMINAL_3270(dev); int retval =3D 0; + int count =3D ccw_dstream_avail(get_cds(t)); =20 assert(count <=3D (OUTPUT_BUFFER_SIZE - 3) / 2); =20 @@ -244,7 +248,7 @@ static int write_payload_3270(EmulatedCcw3270Device *de= v, uint8_t cmd, return count; } t->outv[0] =3D cmd; - cpu_physical_memory_read(cda, &t->outv[1], count); + ccw_dstream_read_buf(get_cds(t), &t->outv[1], count); t->out_len =3D count + 1; =20 t->out_len =3D insert_IAC_escape_char(t->outv, t->out_len); diff --git a/hw/s390x/3270-ccw.c b/hw/s390x/3270-ccw.c index 1554aa2484..eaca28e224 100644 --- a/hw/s390x/3270-ccw.c +++ b/hw/s390x/3270-ccw.c @@ -28,7 +28,7 @@ static int handle_payload_3270_read(EmulatedCcw3270Device= *dev, CCW1 *ccw) return -EFAULT; } =20 - len =3D ck->read_payload_3270(dev, ccw->cda, ccw->count); + len =3D ck->read_payload_3270(dev); ccw_dev->sch->curr_status.scsw.count =3D ccw->count - len; =20 return 0; @@ -45,7 +45,7 @@ static int handle_payload_3270_write(EmulatedCcw3270Devic= e *dev, CCW1 *ccw) return -EFAULT; } =20 - len =3D ck->write_payload_3270(dev, ccw->cmd_code, ccw->cda, ccw->coun= t); + len =3D ck->write_payload_3270(dev, ccw->cmd_code); =20 if (len <=3D 0) { return -EIO; diff --git a/include/hw/s390x/3270-ccw.h b/include/hw/s390x/3270-ccw.h index 46bee2533c..9d1d18e2bd 100644 --- a/include/hw/s390x/3270-ccw.h +++ b/include/hw/s390x/3270-ccw.h @@ -45,9 +45,8 @@ typedef struct EmulatedCcw3270Class { CCWDeviceClass parent_class; =20 void (*init)(EmulatedCcw3270Device *, Error **); - int (*read_payload_3270)(EmulatedCcw3270Device *, uint32_t, uint16_t); - int (*write_payload_3270)(EmulatedCcw3270Device *, uint8_t, uint32_t, - uint16_t); + int (*read_payload_3270)(EmulatedCcw3270Device *); + int (*write_payload_3270)(EmulatedCcw3270Device *, uint8_t); } EmulatedCcw3270Class; =20 #endif --=20 2.13.5 From nobody Tue Nov 4 05:26:35 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505928325923852.787151564185; Wed, 20 Sep 2017 10:25:25 -0700 (PDT) Received: from localhost ([::1]:49913 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duikX-00062d-4U for importer@patchew.org; Wed, 20 Sep 2017 13:25:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51664) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duiiw-00057S-7v for qemu-devel@nongnu.org; Wed, 20 Sep 2017 13:23:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duiit-000624-Gp for qemu-devel@nongnu.org; Wed, 20 Sep 2017 13:23:46 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:38070) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duiit-00060s-7d for qemu-devel@nongnu.org; Wed, 20 Sep 2017 13:23:43 -0400 Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v8KHLteK093667 for ; Wed, 20 Sep 2017 13:23:41 -0400 Received: from e06smtp10.uk.ibm.com (e06smtp10.uk.ibm.com [195.75.94.106]) by mx0a-001b2d01.pphosted.com with ESMTP id 2d3ueqmxu8-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 20 Sep 2017 13:23:40 -0400 Received: from localhost by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 20 Sep 2017 18:23:38 +0100 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; Wed, 20 Sep 2017 18:23:35 +0100 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v8KHNYpP21299338; Wed, 20 Sep 2017 17:23:34 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5C3434C046; Wed, 20 Sep 2017 18:19:58 +0100 (BST) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1F28E4C040; Wed, 20 Sep 2017 18:19:58 +0100 (BST) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Wed, 20 Sep 2017 18:19:58 +0100 (BST) From: Halil Pasic To: Cornelia Huck , Christian Borntraeger Date: Wed, 20 Sep 2017 19:23:14 +0200 X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170920172314.102710-1-pasic@linux.vnet.ibm.com> References: <20170920172314.102710-1-pasic@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 17092017-0040-0000-0000-000003DBC014 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17092017-0041-0000-0000-000025DCF6CF Message-Id: <20170920172314.102710-3-pasic@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-09-20_04:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000 definitions=main-1709200234 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PATCH 2/2] s390x/3270: handle writes of arbitrary length 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: Halil Pasic , qemu-devel@nongnu.org, Alexander Graf , "Jason J . Herne" , Dong Jia Shi , 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" The problem is, that the current implementation places unrealistic and arbitrary constraints on the length of writes to the device (that is the outbound requests), by asserting ccw.count being such that that even the worst case escaped payload will fit an more or less arbitrary sized buffer. Actually on protocol level there is nothing to justify such a limitation. Another strange thing is the return value which more or less reflects the size (written) after escaping instead of before escaping. This is strange, because this return value is used to calculate SCSW.count. Let us teach 3270 how to deal with arbitrary long writes. Signed-off-by: Halil Pasic Acked-by: Christian Borntraeger Reviewed-by: Dong Jia Shi Reported-by: Jason J . Herne Tested-by: Jason J . Herne --- hw/char/terminal3270.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/hw/char/terminal3270.c b/hw/char/terminal3270.c index c976a63cc2..a109ce5987 100644 --- a/hw/char/terminal3270.c +++ b/hw/char/terminal3270.c @@ -30,7 +30,6 @@ typedef struct Terminal3270 { uint8_t inv[INPUT_BUFFER_SIZE]; uint8_t outv[OUTPUT_BUFFER_SIZE]; int in_len; - int out_len; bool handshake_done; guint timer_tag; } Terminal3270; @@ -145,7 +144,6 @@ static void chr_event(void *opaque, int event) =20 /* Ensure the initial status correct, always reset them. */ t->in_len =3D 0; - t->out_len =3D 0; t->handshake_done =3D false; if (t->timer_tag) { g_source_remove(t->timer_tag); @@ -231,8 +229,9 @@ static int write_payload_3270(EmulatedCcw3270Device *de= v, uint8_t cmd) Terminal3270 *t =3D TERMINAL_3270(dev); int retval =3D 0; int count =3D ccw_dstream_avail(get_cds(t)); - - assert(count <=3D (OUTPUT_BUFFER_SIZE - 3) / 2); + int bound =3D (OUTPUT_BUFFER_SIZE - 3) / 2; + int len =3D MIN(count, bound); + int out_len =3D 0; =20 if (!t->handshake_done) { if (!(t->outv[0] =3D=3D IAC && t->outv[1] !=3D IAC)) { @@ -247,16 +246,23 @@ static int write_payload_3270(EmulatedCcw3270Device *= dev, uint8_t cmd) /* We just say we consumed all data if there's no backend. */ return count; } - t->outv[0] =3D cmd; - ccw_dstream_read_buf(get_cds(t), &t->outv[1], count); - t->out_len =3D count + 1; =20 - t->out_len =3D insert_IAC_escape_char(t->outv, t->out_len); - t->outv[t->out_len++] =3D IAC; - t->outv[t->out_len++] =3D IAC_EOR; + t->outv[out_len++] =3D cmd; + do { + ccw_dstream_read_buf(get_cds(t), &t->outv[out_len], len); + count =3D ccw_dstream_avail(get_cds(t)); + out_len +=3D len; =20 - retval =3D qemu_chr_fe_write_all(&t->chr, t->outv, t->out_len); - return (retval <=3D 0) ? 0 : (retval - 3); + out_len =3D insert_IAC_escape_char(t->outv, out_len); + if (!count) { + t->outv[out_len++] =3D IAC; + t->outv[out_len++] =3D IAC_EOR; + } + retval =3D qemu_chr_fe_write_all(&t->chr, t->outv, out_len); + len =3D MIN(count, bound); + out_len =3D 0; + } while (len && retval >=3D 0); + return (retval <=3D 0) ? 0 : get_cds(t)->count; } =20 static Property terminal_properties[] =3D { --=20 2.13.5