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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 19B18C6FD1C for ; Tue, 14 Mar 2023 07:07:17 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pbyk6-0005gM-54; Tue, 14 Mar 2023 03:06:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pbyk4-0005ft-Fd; Tue, 14 Mar 2023 03:06:40 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5] helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pbyk2-00067r-Ih; Tue, 14 Mar 2023 03:06:40 -0400 Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32E6i0SN005803; Tue, 14 Mar 2023 07:06:19 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=eK1iCJ15MViavthorNonw1EECvc/dA4YHpmkuz5xXeg=; b=kL44ZlZ3hLojCqr/Wot9ajqsA2WxjfVh90HQiWqUJtbcD7z56+/UHA6CXrfEaXibs27N 7YRFdcVSBcnYEZLNzAO9NV0OHlYGsimcibo8cW3WLRuc1yL80wrgj64wbVZkkjrploj/ 1FMX2XRSqt7DNG3dkLSG5Aoimcbdcnxi4Fzgh92Pd3iKzu+oCq6E+Vy5wGvOTg80r52i vblshVTv+slMSOkv4UQfder3Z2QYUTOf3HFo3gyG/UDoFhh+JwGs6OE+t4321RIFfYe/ tMqp+pNUKpl5h4IeLgPOBF+tsqUZzS7xQvCxXPnVtFRLwBE2jPHp853lXJLnJI1Cl6V3 mQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3pakwn8frr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 14 Mar 2023 07:06:19 +0000 Received: from m0098416.ppops.net (m0098416.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 32E75fVJ028983; Tue, 14 Mar 2023 07:06:19 GMT Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3pakwn8frb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 14 Mar 2023 07:06:18 +0000 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 32DG4VKa001449; Tue, 14 Mar 2023 07:06:16 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma03ams.nl.ibm.com (PPS) with ESMTPS id 3p8h96mc0v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 14 Mar 2023 07:06:16 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 32E76D4P44892504 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 14 Mar 2023 07:06:13 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1FEC820040; Tue, 14 Mar 2023 07:06:13 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7F0A120043; Tue, 14 Mar 2023 07:06:12 +0000 (GMT) Received: from [9.171.64.3] (unknown [9.171.64.3]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 14 Mar 2023 07:06:12 +0000 (GMT) Message-ID: <681f4bef-6beb-2e17-fe78-693506d97c66@linux.ibm.com> Date: Tue, 14 Mar 2023 08:06:12 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Subject: Re: [PATCH] s390x/gdb: Split s390-virt.xml To: Ilya Leoshkevich , Laurent Vivier , Halil Pasic , Thomas Huth , =?UTF-8?Q?Alex_Benn=c3=a9e?= , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Richard Henderson , David Hildenbrand Cc: qemu-devel@nongnu.org, qemu-s390x@nongnu.org References: <20230313211614.98739-1-iii@linux.ibm.com> Content-Language: en-US From: Christian Borntraeger In-Reply-To: <20230313211614.98739-1-iii@linux.ibm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: he9m4EzdMOjseDrVSIUJM-GRFi6L1B02 X-Proofpoint-ORIG-GUID: ZL8wpk1LRxKikmwFpcl_AAk4Bxuu-TsF X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-13_13,2023-03-14_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 clxscore=1011 phishscore=0 impostorscore=0 mlxlogscore=999 spamscore=0 lowpriorityscore=0 mlxscore=0 bulkscore=0 adultscore=0 priorityscore=1501 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2303140057 Received-SPF: pass client-ip=148.163.158.5; envelope-from=borntraeger@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Am 13.03.23 um 22:16 schrieb Ilya Leoshkevich: > TCG emulates ckc, cputm, last_break and prefix, and it's quite useful > to have them during debugging. KVM provides those as well so I dont get what you are trying to do here. (I would understand moving out the pfault things into a KVM section) > > So move them into the new s390-virt-tcg.xml file. > > pp, pfault_token, pfault_select and pfault_compare are not emulated, > so keep them in s390-virt.xml. > > Signed-off-by: Ilya Leoshkevich > --- > configs/targets/s390x-linux-user.mak | 2 +- > configs/targets/s390x-softmmu.mak | 2 +- > gdb-xml/s390-virt-tcg.xml | 14 +++++ > gdb-xml/s390-virt.xml | 4 -- > target/s390x/gdbstub.c | 82 ++++++++++++++++++---------- > 5 files changed, 69 insertions(+), 35 deletions(-) > create mode 100644 gdb-xml/s390-virt-tcg.xml > > diff --git a/configs/targets/s390x-linux-user.mak b/configs/targets/s390x-linux-user.mak > index e2978248ede..fb3e2b73be7 100644 > --- a/configs/targets/s390x-linux-user.mak > +++ b/configs/targets/s390x-linux-user.mak > @@ -2,4 +2,4 @@ TARGET_ARCH=s390x > TARGET_SYSTBL_ABI=common,64 > TARGET_SYSTBL=syscall.tbl > TARGET_BIG_ENDIAN=y > -TARGET_XML_FILES= gdb-xml/s390x-core64.xml gdb-xml/s390-acr.xml gdb-xml/s390-fpr.xml gdb-xml/s390-vx.xml gdb-xml/s390-cr.xml gdb-xml/s390-virt.xml gdb-xml/s390-gs.xml > +TARGET_XML_FILES= gdb-xml/s390x-core64.xml gdb-xml/s390-acr.xml gdb-xml/s390-fpr.xml gdb-xml/s390-vx.xml gdb-xml/s390-cr.xml gdb-xml/s390-virt.xml gdb-xml/s390-virt-tcg.xml gdb-xml/s390-gs.xml > diff --git a/configs/targets/s390x-softmmu.mak b/configs/targets/s390x-softmmu.mak > index 258b4cf3582..554330d7c85 100644 > --- a/configs/targets/s390x-softmmu.mak > +++ b/configs/targets/s390x-softmmu.mak > @@ -1,4 +1,4 @@ > TARGET_ARCH=s390x > TARGET_BIG_ENDIAN=y > TARGET_SUPPORTS_MTTCG=y > -TARGET_XML_FILES= gdb-xml/s390x-core64.xml gdb-xml/s390-acr.xml gdb-xml/s390-fpr.xml gdb-xml/s390-vx.xml gdb-xml/s390-cr.xml gdb-xml/s390-virt.xml gdb-xml/s390-gs.xml > +TARGET_XML_FILES= gdb-xml/s390x-core64.xml gdb-xml/s390-acr.xml gdb-xml/s390-fpr.xml gdb-xml/s390-vx.xml gdb-xml/s390-cr.xml gdb-xml/s390-virt.xml gdb-xml/s390-virt-tcg.xml gdb-xml/s390-gs.xml > diff --git a/gdb-xml/s390-virt-tcg.xml b/gdb-xml/s390-virt-tcg.xml > new file mode 100644 > index 00000000000..0f77c9b48c6 > --- /dev/null > +++ b/gdb-xml/s390-virt-tcg.xml > @@ -0,0 +1,14 @@ > + > + > + > + > + > + > + > + > + > + > diff --git a/gdb-xml/s390-virt.xml b/gdb-xml/s390-virt.xml > index e2e9a7ad3cc..a79c0307682 100644 > --- a/gdb-xml/s390-virt.xml > +++ b/gdb-xml/s390-virt.xml > @@ -7,10 +7,6 @@ > > > > - > - > - > - > > > > diff --git a/target/s390x/gdbstub.c b/target/s390x/gdbstub.c > index a5d69d0e0bc..111b695dc85 100644 > --- a/target/s390x/gdbstub.c > +++ b/target/s390x/gdbstub.c > @@ -200,61 +200,81 @@ static int cpu_write_c_reg(CPUS390XState *env, uint8_t *mem_buf, int n) > } > } > > -/* the values represent the positions in s390-virt.xml */ > -#define S390_VIRT_CKC_REGNUM 0 > -#define S390_VIRT_CPUTM_REGNUM 1 > -#define S390_VIRT_BEA_REGNUM 2 > -#define S390_VIRT_PREFIX_REGNUM 3 > -#define S390_VIRT_PP_REGNUM 4 > -#define S390_VIRT_PFT_REGNUM 5 > -#define S390_VIRT_PFS_REGNUM 6 > -#define S390_VIRT_PFC_REGNUM 7 > -/* total number of registers in s390-virt.xml */ > -#define S390_NUM_VIRT_REGS 8 > +/* the values represent the positions in s390-virt-tcg.xml */ > +#define S390_VIRT_TCG_CKC_REGNUM 0 > +#define S390_VIRT_TCG_CPUTM_REGNUM 1 > +#define S390_VIRT_TCG_BEA_REGNUM 2 > +#define S390_VIRT_TCG_PREFIX_REGNUM 3 > +/* total number of registers in s390-virt-tcg.xml */ > +#define S390_NUM_VIRT_TCG_REGS 4 > > -static int cpu_read_virt_reg(CPUS390XState *env, GByteArray *mem_buf, int n) > +static int cpu_read_virt_tcg_reg(CPUS390XState *env, GByteArray *mem_buf, int n) > { > switch (n) { > - case S390_VIRT_CKC_REGNUM: > + case S390_VIRT_TCG_CKC_REGNUM: > return gdb_get_regl(mem_buf, env->ckc); > - case S390_VIRT_CPUTM_REGNUM: > + case S390_VIRT_TCG_CPUTM_REGNUM: > return gdb_get_regl(mem_buf, env->cputm); > - case S390_VIRT_BEA_REGNUM: > + case S390_VIRT_TCG_BEA_REGNUM: > return gdb_get_regl(mem_buf, env->gbea); > - case S390_VIRT_PREFIX_REGNUM: > + case S390_VIRT_TCG_PREFIX_REGNUM: > return gdb_get_regl(mem_buf, env->psa); > - case S390_VIRT_PP_REGNUM: > - return gdb_get_regl(mem_buf, env->pp); > - case S390_VIRT_PFT_REGNUM: > - return gdb_get_regl(mem_buf, env->pfault_token); > - case S390_VIRT_PFS_REGNUM: > - return gdb_get_regl(mem_buf, env->pfault_select); > - case S390_VIRT_PFC_REGNUM: > - return gdb_get_regl(mem_buf, env->pfault_compare); > default: > return 0; > } > } > > -static int cpu_write_virt_reg(CPUS390XState *env, uint8_t *mem_buf, int n) > +static int cpu_write_virt_tcg_reg(CPUS390XState *env, uint8_t *mem_buf, int n) > { > switch (n) { > - case S390_VIRT_CKC_REGNUM: > + case S390_VIRT_TCG_CKC_REGNUM: > env->ckc = ldtul_p(mem_buf); > cpu_synchronize_post_init(env_cpu(env)); > return 8; > - case S390_VIRT_CPUTM_REGNUM: > + case S390_VIRT_TCG_CPUTM_REGNUM: > env->cputm = ldtul_p(mem_buf); > cpu_synchronize_post_init(env_cpu(env)); > return 8; > - case S390_VIRT_BEA_REGNUM: > + case S390_VIRT_TCG_BEA_REGNUM: > env->gbea = ldtul_p(mem_buf); > cpu_synchronize_post_init(env_cpu(env)); > return 8; > - case S390_VIRT_PREFIX_REGNUM: > + case S390_VIRT_TCG_PREFIX_REGNUM: > env->psa = ldtul_p(mem_buf); > cpu_synchronize_post_init(env_cpu(env)); > return 8; > + default: > + return 0; > + } > +} > + > +/* the values represent the positions in s390-virt.xml */ > +#define S390_VIRT_PP_REGNUM 0 > +#define S390_VIRT_PFT_REGNUM 1 > +#define S390_VIRT_PFS_REGNUM 2 > +#define S390_VIRT_PFC_REGNUM 3 > +/* total number of registers in s390-virt.xml */ > +#define S390_NUM_VIRT_REGS 4 > + > +static int cpu_read_virt_reg(CPUS390XState *env, GByteArray *mem_buf, int n) > +{ > + switch (n) { > + case S390_VIRT_PP_REGNUM: > + return gdb_get_regl(mem_buf, env->pp); > + case S390_VIRT_PFT_REGNUM: > + return gdb_get_regl(mem_buf, env->pfault_token); > + case S390_VIRT_PFS_REGNUM: > + return gdb_get_regl(mem_buf, env->pfault_select); > + case S390_VIRT_PFC_REGNUM: > + return gdb_get_regl(mem_buf, env->pfault_compare); > + default: > + return 0; > + } > +} > + > +static int cpu_write_virt_reg(CPUS390XState *env, uint8_t *mem_buf, int n) > +{ > + switch (n) { > case S390_VIRT_PP_REGNUM: > env->pp = ldtul_p(mem_buf); > cpu_synchronize_post_init(env_cpu(env)); > @@ -320,6 +340,10 @@ void s390_cpu_gdb_init(CPUState *cs) > cpu_write_c_reg, > S390_NUM_C_REGS, "s390-cr.xml", 0); > > + gdb_register_coprocessor(cs, cpu_read_virt_tcg_reg, > + cpu_write_virt_tcg_reg, > + S390_NUM_VIRT_TCG_REGS, "s390-virt-tcg.xml", 0); > + > if (kvm_enabled()) { > gdb_register_coprocessor(cs, cpu_read_virt_reg, > cpu_write_virt_reg,