From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BF481C433EF for ; Fri, 22 Apr 2022 11:59:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238552AbiDVMCS (ORCPT ); Fri, 22 Apr 2022 08:02:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234318AbiDVMCR (ORCPT ); Fri, 22 Apr 2022 08:02:17 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 223C754FBA; Fri, 22 Apr 2022 04:59:24 -0700 (PDT) Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 23MBWRs0013667; Fri, 22 Apr 2022 11:59:24 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : date : mime-version : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding; s=pp1; bh=oRQ2yyCIoWurOpWsViYDnqraFSyFRqoSSlgzUnDAZaw=; b=mtygcidFYdE4tS2JPQvBTRhBge4GJmnM1BwGiUJsS/vWbTM+S94tTIbE+j4oRLZmBBA9 T3aDL/GoyMr9riev+r1WFOytYPlu/Yj25XR4fV0i+9i+e2EtkPW4Xw1t9vxBjf0OwlHZ llqxdna668D56bn1ZrQZfjNPRv7gfJDn2RF7CA59R61ReBJxmpWnkMt37/lsc6pMXz/H C0eU6nwM9Z+qxmnkX66UpTNfmRSOTtMluxUHDjCxAhOyG3N/cQRyAwgeJoP+d51NsNfA RTLnFYJsZBIIWI4QHP8etw+O0wAKMKgkCymRd1p45Osvq4/yxJGYPrciXufRuN1IH8Z1 lg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 3fkdg4xrjp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 22 Apr 2022 11:59:23 +0000 Received: from m0098404.ppops.net (m0098404.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 23MBxNFr026476; Fri, 22 Apr 2022 11:59:23 GMT Received: from ppma03fra.de.ibm.com (6b.4a.5195.ip4.static.sl-reverse.com [149.81.74.107]) by mx0a-001b2d01.pphosted.com with ESMTP id 3fkdg4xrj9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 22 Apr 2022 11:59:23 +0000 Received: from pps.filterd (ppma03fra.de.ibm.com [127.0.0.1]) by ppma03fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 23MBpQCo026443; Fri, 22 Apr 2022 11:59:20 GMT Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by ppma03fra.de.ibm.com with ESMTP id 3ffne97d4j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 22 Apr 2022 11:59:20 +0000 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 23MBxHeA37486902 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 22 Apr 2022 11:59:17 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 37733AE053; Fri, 22 Apr 2022 11:59:17 +0000 (GMT) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EDE50AE045; Fri, 22 Apr 2022 11:59:16 +0000 (GMT) Received: from [9.145.85.218] (unknown [9.145.85.218]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTP; Fri, 22 Apr 2022 11:59:16 +0000 (GMT) Message-ID: Date: Fri, 22 Apr 2022 13:59:16 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [kvm-unit-tests PATCH v4 1/4] lib: s390x: add support for SCLP console read Content-Language: en-US To: Nico Boehr , kvm@vger.kernel.org, linux-s390@vger.kernel.org Cc: imbrenda@linux.ibm.com, thuth@redhat.com References: <20220422105453.2153299-1-nrb@linux.ibm.com> <20220422105453.2153299-2-nrb@linux.ibm.com> From: Janosch Frank In-Reply-To: <20220422105453.2153299-2-nrb@linux.ibm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: aebTlQ7mBxYsUzzkFDDDaq8s0i2wGDJV X-Proofpoint-GUID: deAzCNwgI_LApBBkL_P2sKbvL6rIjjje X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.858,Hydra:6.0.486,FMLib:17.11.64.514 definitions=2022-04-22_03,2022-04-22_01,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 mlxscore=0 impostorscore=0 clxscore=1015 bulkscore=0 phishscore=0 lowpriorityscore=0 suspectscore=0 adultscore=0 spamscore=0 mlxlogscore=999 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2204220050 Precedence: bulk List-ID: X-Mailing-List: linux-s390@vger.kernel.org On 4/22/22 12:54, Nico Boehr wrote: > Add a basic implementation for reading from the SCLP ASCII console. The goal of > this is to support migration tests on s390x. To know when the migration has been > finished, we need to listen for a newline on our console. > > Hence, this implementation is focused on the SCLP ASCII console of QEMU and > currently won't work under e.g. LPAR. > > Signed-off-by: Nico Boehr > Reviewed-by: Thomas Huth > Reviewed-by: Claudio Imbrenda > --- Reviewed-by: Janosch Frank > lib/s390x/sclp-console.c | 79 +++++++++++++++++++++++++++++++++++++--- > lib/s390x/sclp.h | 8 ++++ > s390x/Makefile | 1 + > 3 files changed, 82 insertions(+), 6 deletions(-) > > diff --git a/lib/s390x/sclp-console.c b/lib/s390x/sclp-console.c > index fa36a6a42381..19c74e46d16f 100644 > --- a/lib/s390x/sclp-console.c > +++ b/lib/s390x/sclp-console.c > @@ -89,6 +89,10 @@ static char lm_buff[120]; > static unsigned char lm_buff_off; > static struct spinlock lm_buff_lock; > > +static char read_buf[4096]; > +static int read_index = sizeof(read_buf) - 1; > +static int read_buf_length = 0; > + > static void sclp_print_ascii(const char *str) > { > int len = strlen(str); > @@ -185,7 +189,7 @@ static void sclp_print_lm(const char *str) > * indicating which messages the control program (we) want(s) to > * send/receive. > */ > -static void sclp_set_write_mask(void) > +static void sclp_write_event_mask(int receive_mask, int send_mask) > { > WriteEventMask *sccb = (void *)_sccb; > > @@ -195,18 +199,27 @@ static void sclp_set_write_mask(void) > sccb->h.function_code = SCLP_FC_NORMAL_WRITE; > sccb->mask_length = sizeof(sccb_mask_t); > > - /* For now we don't process sclp input. */ > - sccb->cp_receive_mask = 0; > - /* We send ASCII and line mode. */ > - sccb->cp_send_mask = SCLP_EVENT_MASK_MSG_ASCII | SCLP_EVENT_MASK_MSG; > + sccb->cp_receive_mask = receive_mask; > + sccb->cp_send_mask = send_mask; > > sclp_service_call(SCLP_CMD_WRITE_EVENT_MASK, sccb); > assert(sccb->h.response_code == SCLP_RC_NORMAL_COMPLETION); > } > > +static void sclp_console_enable_read(void) > +{ > + sclp_write_event_mask(SCLP_EVENT_MASK_MSG_ASCII, SCLP_EVENT_MASK_MSG_ASCII | SCLP_EVENT_MASK_MSG); > +} > + > +static void sclp_console_disable_read(void) > +{ > + sclp_write_event_mask(0, SCLP_EVENT_MASK_MSG_ASCII | SCLP_EVENT_MASK_MSG); > +} > + > void sclp_console_setup(void) > { > - sclp_set_write_mask(); > + /* We send ASCII and line mode. */ > + sclp_write_event_mask(0, SCLP_EVENT_MASK_MSG_ASCII | SCLP_EVENT_MASK_MSG); > } > > void sclp_print(const char *str) > @@ -227,3 +240,57 @@ void sclp_print(const char *str) > sclp_print_ascii(str); > sclp_print_lm(str); > } > + > +static int console_refill_read_buffer(void) > +{ > + const int max_event_buffer_len = SCCB_SIZE - offsetof(ReadEventDataAsciiConsole, ebh); > + ReadEventDataAsciiConsole *sccb = (void *)_sccb; > + const int event_buffer_ascii_recv_header_len = sizeof(sccb->ebh) + sizeof(sccb->type); > + int ret = -1; > + > + sclp_console_enable_read(); > + > + sclp_mark_busy(); > + memset(sccb, 0, SCCB_SIZE); > + sccb->h.length = PAGE_SIZE; > + sccb->h.function_code = SCLP_UNCONDITIONAL_READ; > + sccb->h.control_mask[2] = SCLP_CM2_VARIABLE_LENGTH_RESPONSE; > + > + sclp_service_call(SCLP_CMD_READ_EVENT_DATA, sccb); > + > + if (sccb->h.response_code == SCLP_RC_NO_EVENT_BUFFERS_STORED || > + sccb->ebh.type != SCLP_EVENT_ASCII_CONSOLE_DATA || > + sccb->type != SCLP_EVENT_ASCII_TYPE_DATA_STREAM_FOLLOWS) { > + ret = -1; > + goto out; > + } > + > + assert(sccb->ebh.length <= max_event_buffer_len); > + assert(sccb->ebh.length > event_buffer_ascii_recv_header_len); > + > + read_buf_length = sccb->ebh.length - event_buffer_ascii_recv_header_len; > + > + assert(read_buf_length <= sizeof(read_buf)); > + memcpy(read_buf, sccb->data, read_buf_length); > + > + read_index = 0; > + ret = 0; > + > +out: > + sclp_console_disable_read(); > + > + return ret; > +} > + > +int __getchar(void) > +{ > + int ret; > + > + if (read_index >= read_buf_length) { > + ret = console_refill_read_buffer(); > + if (ret < 0) > + return ret; > + } > + > + return read_buf[read_index++]; > +} > diff --git a/lib/s390x/sclp.h b/lib/s390x/sclp.h > index fead007a6037..e48a5a3df20b 100644 > --- a/lib/s390x/sclp.h > +++ b/lib/s390x/sclp.h > @@ -313,6 +313,14 @@ typedef struct ReadEventData { > uint32_t mask; > } __attribute__((packed)) ReadEventData; > > +#define SCLP_EVENT_ASCII_TYPE_DATA_STREAM_FOLLOWS 0 > +typedef struct ReadEventDataAsciiConsole { > + SCCBHeader h; > + EventBufferHeader ebh; > + uint8_t type; > + char data[]; > +} __attribute__((packed)) ReadEventDataAsciiConsole; > + > extern char _sccb[]; > void sclp_setup_int(void); > void sclp_handle_ext(void); > diff --git a/s390x/Makefile b/s390x/Makefile > index c11f6efbd767..f38f442b9cb1 100644 > --- a/s390x/Makefile > +++ b/s390x/Makefile > @@ -75,6 +75,7 @@ cflatobjs += lib/alloc_phys.o > cflatobjs += lib/alloc_page.o > cflatobjs += lib/vmalloc.o > cflatobjs += lib/alloc_phys.o > +cflatobjs += lib/getchar.o > cflatobjs += lib/s390x/io.o > cflatobjs += lib/s390x/stack.o > cflatobjs += lib/s390x/sclp.o