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 X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D066EC433E0 for ; Wed, 27 May 2020 08:40:12 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A445920723 for ; Wed, 27 May 2020 08:40:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A445920723 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51006 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jdrbf-0001A3-QG for qemu-devel@archiver.kernel.org; Wed, 27 May 2020 04:40:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59636) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jdrb3-0000gN-Nt; Wed, 27 May 2020 04:39:33 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:10770) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jdrb2-0005kg-Jk; Wed, 27 May 2020 04:39:33 -0400 Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 04R8Ymb8187680; Wed, 27 May 2020 04:39:30 -0400 Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 316ywnksym-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 27 May 2020 04:39:29 -0400 Received: from m0098404.ppops.net (m0098404.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 04R8YtPN188381; Wed, 27 May 2020 04:39:21 -0400 Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0a-001b2d01.pphosted.com with ESMTP id 316ywnkqx4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 27 May 2020 04:39:21 -0400 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 04R8VUHv020387; Wed, 27 May 2020 08:35:50 GMT Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by ppma03ams.nl.ibm.com with ESMTP id 316uf87gfv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 27 May 2020 08:35:50 +0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 04R8Zmj637945532 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 27 May 2020 08:35:48 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 413BE52050; Wed, 27 May 2020 08:35:48 +0000 (GMT) Received: from localhost.localdomain (unknown [9.145.52.97]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id E18FE5204F; Wed, 27 May 2020 08:35:47 +0000 (GMT) Subject: Re: [PATCH v3 3/9] pc-bios: s390x: Move sleep and yield to helper.h To: Christian Borntraeger , qemu-devel@nongnu.org References: <20200527074920.43669-1-frankja@linux.ibm.com> <20200527074920.43669-4-frankja@linux.ibm.com> From: Janosch Frank Autocrypt: addr=frankja@linux.ibm.com; prefer-encrypt=mutual; keydata= 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 Message-ID: Date: Wed, 27 May 2020 10:35:47 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="oGAVTnBSXnHKoZzVYD4eYvvd4eOeZaNuj" X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.216, 18.0.687 definitions=2020-05-27_02:2020-05-26, 2020-05-27 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 mlxlogscore=999 phishscore=0 malwarescore=0 impostorscore=0 spamscore=0 bulkscore=0 lowpriorityscore=0 mlxscore=0 adultscore=0 clxscore=1015 priorityscore=1501 cotscore=-2147483648 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2004280000 definitions=main-2005270062 Received-SPF: pass client-ip=148.163.156.1; envelope-from=frankja@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/27 03:49:33 X-ACL-Warn: Detected OS = Linux 3.x [generic] [fuzzy] X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, KHOP_DYNAMIC=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-s390x@nongnu.org, cohuck@redhat.com, thuth@redhat.com, david@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --oGAVTnBSXnHKoZzVYD4eYvvd4eOeZaNuj Content-Type: multipart/mixed; boundary="rDktYUQPeKK30ACCAb74euY4VQkDzMFO7" --rDktYUQPeKK30ACCAb74euY4VQkDzMFO7 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 5/27/20 10:34 AM, Christian Borntraeger wrote: >=20 >=20 > On 27.05.20 09:49, Janosch Frank wrote: >> They are definitely helper functions. >> >> Signed-off-by: Janosch Frank >> --- >> pc-bios/s390-ccw/helper.h | 17 +++++++++++++++++ >> pc-bios/s390-ccw/s390-ccw.h | 16 ---------------- >> pc-bios/s390-ccw/virtio-net.c | 1 + >> pc-bios/s390-ccw/virtio-scsi.c | 1 + >> 4 files changed, 19 insertions(+), 16 deletions(-) >> >> diff --git a/pc-bios/s390-ccw/helper.h b/pc-bios/s390-ccw/helper.h >> index 78d5bc7442..d1b8b14d30 100644 >> --- a/pc-bios/s390-ccw/helper.h >> +++ b/pc-bios/s390-ccw/helper.h >> @@ -14,6 +14,7 @@ >> #define S390_CCW_HELPER_H >> =20 >> #include "s390-ccw.h" >> +#include "time.h" >> =20 >> /* Avoids compiler warnings when casting a pointer to a u32 */ >> static inline uint32_t ptr2u32(void *ptr) >> @@ -28,4 +29,20 @@ static inline void *u32toptr(uint32_t n) >> return (void *)(uint64_t)n; >> } >> =20 >> +static inline void yield(void) >> +{ >> + asm volatile ("diag 0,0,0x44" >> + : : >> + : "memory", "cc"); >> +} >> + >> +static inline void sleep(unsigned int seconds) >> +{ >> + ulong target =3D get_time_seconds() + seconds; >> + >> + while (get_time_seconds() < target) { >> + yield(); >> + } >=20 > This actually asks for a future cleanup patch to replace the busy wait = with a sleeping wait. Yes, already on my list, same as Pierre's busy wait in the kvm unit tests= =2E One impossible thing at a time. >=20 > Anyway, >=20 > Reviewed-by: Christian Borntraeger Thanks! >=20 >> +} >> + >> #endif >> diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h= >> index 9514b76596..c5820e43ae 100644 >> --- a/pc-bios/s390-ccw/s390-ccw.h >> +++ b/pc-bios/s390-ccw/s390-ccw.h >> @@ -142,24 +142,8 @@ static inline void debug_print_addr(const char *d= esc, void *p) >> #define KVM_S390_VIRTIO_SET_STATUS 2 >> #define KVM_S390_VIRTIO_CCW_NOTIFY 3 >> =20 >> -static inline void yield(void) >> -{ >> - asm volatile ("diag 0,0,0x44" >> - : : >> - : "memory", "cc"); >> -} >> - >> #define MAX_SECTOR_SIZE 4096 >> =20 >> -static inline void sleep(unsigned int seconds) >> -{ >> - ulong target =3D get_second() + seconds; >> - >> - while (get_second() < target) { >> - yield(); >> - } >> -} >> - >> static inline void IPL_assert(bool term, const char *message) >> { >> if (!term) { >> diff --git a/pc-bios/s390-ccw/virtio-net.c b/pc-bios/s390-ccw/virtio-n= et.c >> index 4de03728bb..f018d58994 100644 >> --- a/pc-bios/s390-ccw/virtio-net.c >> +++ b/pc-bios/s390-ccw/virtio-net.c >> @@ -20,6 +20,7 @@ >> #include "s390-ccw.h" >> #include "virtio.h" >> #include "time.h" >> +#include "helper.h" >> =20 >> #ifndef DEBUG_VIRTIO_NET >> #define DEBUG_VIRTIO_NET 0 >> diff --git a/pc-bios/s390-ccw/virtio-scsi.c b/pc-bios/s390-ccw/virtio-= scsi.c >> index 0620651da8..907f8a08bd 100644 >> --- a/pc-bios/s390-ccw/virtio-scsi.c >> +++ b/pc-bios/s390-ccw/virtio-scsi.c >> @@ -15,6 +15,7 @@ >> #include "scsi.h" >> #include "virtio-scsi.h" >> #include "time.h" >> +#include "helper.h" >> =20 >> static ScsiDevice default_scsi_device; >> static VirtioScsiCmdReq req; >> --rDktYUQPeKK30ACCAb74euY4VQkDzMFO7-- --oGAVTnBSXnHKoZzVYD4eYvvd4eOeZaNuj Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEwGNS88vfc9+v45Yq41TmuOI4ufgFAl7OJmMACgkQ41TmuOI4 ufglZA/+KS4KYDgtwafUbb3UMiP3tMW+ZLhQ3pPAKsAlLlQEiR+yLup2BgJbjLqC 1r6GyPxW1QAkFM59F41Q4kFbGn5bXiDcz2+jAm6BqcP9FthDdGoILMewNACN3CLI XEEqlPApXsw8V4mOnrzAdbuVPNT2ELi6+5jCIJ2iJYK8c6kFBQqXB2Rjb+DhO7WG +yuOJw0SpHxbyAU5lbjm2eXkh5NeJ6pLVIozyeJAsaQwpVnCvIGLBtGI+n9QZgrD y0Pec5BkOafVppIAdIWqZD/Fx2glLycaJkobHVD6Kn/IlMXxH2bhQfUaS3cJPQQs DtMlwxy3t3qnHJRIMAKrc8/KBkK6ipaMKcV8tFXayzVzS3dYpAbdwVoytOZEYv/1 C4JPwq9nj7geiWOxdHSitJYzIUag5RBYT4H+3ilU7ycghpVlu4MdV8RVD3pxqENp E92QqsAhMNIkXaQvBoZY23iRf3e8HoIhd+IIvpJaJWW0NTRoESz3nXmjlR5Re8hT e2f+pS34ZJ/eInr6REhIOlp7D24O7jihYKBFJu3Z9oEyAJlmxEfVWNulXyyWnBQh V5QHT/lvZTs0xykHb0NQVvwBrVTBzvUZw84x9ejPtBuqGo8lmdU4bvqxXwNc+XAb 2xb+E8Ca2DpbXI10Tc3I1vGdU7e5DDs+ZxrUlR8LWH32vIoN7zs= =pBCC -----END PGP SIGNATURE----- --oGAVTnBSXnHKoZzVYD4eYvvd4eOeZaNuj--