From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a05:7300:232a:b0:178:84eb:402c with SMTP id r42csp3668479dye; Wed, 2 Jul 2025 01:47:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXU/HRHjjHq54BFEd/dsWfMcIW0qOYyUYUJc1Ml268A+fPm2+j8wDUmffnp6NzTTFmb2OEGeCLljfs/1A==@linaro.org X-Google-Smtp-Source: AGHT+IG5jlLawG4k1q1bdGIwsDchpa5gWW3Q/RcSnSMUGeI8cbivd3vi06SQwiHdgy59LWta8IsC X-Received: by 2002:a05:6214:f2b:b0:6fd:75e1:16b9 with SMTP id 6a1803df08f44-702b1a6db0amr27414216d6.18.1751446027302; Wed, 02 Jul 2025 01:47:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1751446027; cv=none; d=google.com; s=arc-20240605; b=ErUyh7yrZ9/20bkVEOLSgJCOCs598/OSb6cfmSIEoBj+rFCgi96sxkYucqlWevDAjs HEQcXaw8rWVQ5aAQy7Q2od+7jkdsE7j1K7cUfV8bcCh6F50+TuupWNgKWGlg+wC2j8aL GkAbUhmrSiQtZc9Ccr7XiqT8mnu0GqzzuCDb4yg1POONVKh0vizZ4HhYcUc5tlxK7fkA f2aOX/DaQXiotUjbO+MIeNOndGQNthEEhvYoiAnlb85zH1+TcSQeLOvYpUfS6dpPWFIS PbR6HALNiUZrqOwjwKJej+3HczegNzgkoP4UQQxpTKMCh1XvhbGjQFISZerIVj1hBJB4 mWXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:message-id:date:user-agent :references:organization:in-reply-to:subject:cc:to:from :dkim-signature; bh=8bmrix3SRkejtxkZeSUfVdsas9XCclL2BdcDpYVHi4M=; fh=bjxS5XoCoqiIFhmMCIs3RZOf29FzNoskHckUbJiTg1g=; b=TAp+Z1X+mPja7vK0nnyzpylzX88NI1CL2q3fe0mmLOCLmedpB2LCEUi8GL3OBtOUZk ViBD1/AjnbitDed3HKMNJggRXtWFXqY+Z3E7KedLmkaBvRZEUm3iGqky3Y3ErdM5cIOK xnAgZvi6YV8qouVOClwm5ISlUrpcTQTdjt2B3I1KQsF7Zds5GvJeBrbkPVF91nUqSOAz ksiIQS07MLCDdNY3oCu6hRBcUsc3OXDQvzjb63qv/r6k3aaLvq43gK3ZaF09BpUL9y8r 0BOFrDLDySecu6F/3f58BR5O+bJWbJ2I+c3aC4lLVjytwHoz2Mxd0NXPpPwLEyXdKIMp JUFQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=OQz0J7JW; spf=pass (google.com: domain of cohuck@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=cohuck@redhat.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com. [170.10.129.124]) by mx.google.com with ESMTPS id af79cd13be357-7d443239c7dsi1209607385a.303.2025.07.02.01.47.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 01:47:07 -0700 (PDT) Received-SPF: pass (google.com: domain of cohuck@redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=OQz0J7JW; spf=pass (google.com: domain of cohuck@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=cohuck@redhat.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751446026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8bmrix3SRkejtxkZeSUfVdsas9XCclL2BdcDpYVHi4M=; b=OQz0J7JWCEo4PJv4wgxjpJhgybcr+c9D6QMq1TCWghxmUzYHEUGU0kJ+wkgwzGWF8DAdyz BjIq3lTl0ThE5HGCyreHWxiwnbtLHwoqbnJSTuc4fxsyOjE/FnO8H1Gl3UH0mt+gHeOGYE 7e3L0nHdczLoRYEuxhzdfKk/1yJTKdM= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-609-OiDTYf4FNIeL_xP4JTgzeQ-1; Wed, 02 Jul 2025 04:47:02 -0400 X-MC-Unique: OiDTYf4FNIeL_xP4JTgzeQ-1 X-Mimecast-MFC-AGG-ID: OiDTYf4FNIeL_xP4JTgzeQ_1751446020 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 208461955EDB; Wed, 2 Jul 2025 08:46:59 +0000 (UTC) Received: from localhost (dhcp-192-236.str.redhat.com [10.33.192.236]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6A5AA19560B3; Wed, 2 Jul 2025 08:46:56 +0000 (UTC) From: Cornelia Huck To: Jinqian Yang , eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, kvmarm@lists.linux.dev, peter.maydell@linaro.org, richard.henderson@linaro.org, alex.bennee@linaro.org, maz@kernel.org, oliver.upton@linux.dev, sebott@redhat.com, shameerali.kolothum.thodi@huawei.com, armbru@redhat.com, berrange@redhat.com, abologna@redhat.com, jdenemar@redhat.com, Zhou Wang , liuyonglong Cc: agraf@csgraf.de, shahuang@redhat.com, mark.rutland@arm.com, philmd@linaro.org, pbonzini@redhat.com Subject: Re: [PATCH v3 07/10] arm/kvm: write back modified ID regs to KVM In-Reply-To: Organization: "Red Hat GmbH, Sitz: Werner-von-Siemens-Ring 12, D-85630 Grasbrunn, Handelsregister: Amtsgericht =?utf-8?Q?M=C3=BCnchen=2C?= HRB 153243, =?utf-8?Q?Gesch=C3=A4ftsf=C3=BChrer=3A?= Ryan Barnhart, Charles Cachera, Avril Crosse O'Flaherty" References: <20250414163849.321857-1-cohuck@redhat.com> <20250414163849.321857-8-cohuck@redhat.com> User-Agent: Notmuch/0.38.3 (https://notmuchmail.org) Date: Wed, 02 Jul 2025 10:46:53 +0200 Message-ID: <878ql7q8si.fsf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-TUID: bwjoQgtQW/yo On Wed, Jul 02 2025, Jinqian Yang wrote: > On 2025/4/15 0:38, Cornelia Huck wrote: >> From: Eric Auger >> >> We want to give a chance to override the value of host ID regs. >> In a previous patch we made sure all their values could be fetched >> through kvm_get_one_reg() calls before their modification. After >> their potential modification we need to make sure we write back >> the values through kvm_set_one_reg() calls. >> >> Make sure the cpreg_list is modified with updated values and >> transfer those values back to kvm. >> >> Signed-off-by: Eric Auger >> Signed-off-by: Cornelia Huck >> --- >> target/arm/kvm.c | 44 ++++++++++++++++++++++++++++++++++++++++- >> target/arm/trace-events | 1 + >> 2 files changed, 44 insertions(+), 1 deletion(-) >> >> diff --git a/target/arm/kvm.c b/target/arm/kvm.c >> index b07d5f16db50..9e4cca1705c8 100644 >> --- a/target/arm/kvm.c >> +++ b/target/arm/kvm.c >> @@ -1083,6 +1083,39 @@ void kvm_arm_cpu_post_load(ARMCPU *cpu) >> } >> } >>=20=20=20 >> +static void kvm_arm_writable_idregs_to_cpreg_list(ARMCPU *cpu) >> +{ >> + if (!cpu->writable_map) { >> + return; >> + } >> + for (int i =3D 0; i < NR_ID_REGS; i++) { >> + uint64_t writable_mask =3D cpu->writable_map->regs[i]; >> + uint64_t *cpreg; >> + >> + if (writable_mask) { >> + uint64_t previous, new; >> + int idx =3D kvm_idx_to_idregs_idx(i); >> + ARM64SysReg *sysregdesc; >> + uint32_t sysreg; >> + >> + if (idx =3D=3D -1) { >> + /* sysreg writable, but we don't know it */ >> + continue; >> + } >> + sysregdesc =3D &arm64_id_regs[idx]; >> + sysreg =3D sysregdesc->sysreg; >> + cpreg =3D kvm_arm_get_cpreg_ptr(cpu, idregs_sysreg_to_kvm_r= eg(sysreg)); >> + previous =3D *cpreg; >> + new =3D cpu->isar.idregs[idx]; >> + if (previous !=3D new) { >> + *cpreg =3D new; >> + trace_kvm_arm_writable_idregs_to_cpreg_list(sysregdesc-= >name, >> + previous, n= ew); >> + } >> + } >> + } >> +} >> + >> void kvm_arm_reset_vcpu(ARMCPU *cpu) >> { >> int ret; >> @@ -2050,7 +2083,16 @@ int kvm_arch_init_vcpu(CPUState *cs) >> } >> cpu->mp_affinity =3D mpidr & ARM64_AFFINITY_MASK; >>=20=20=20 >> - return kvm_arm_init_cpreg_list(cpu); >> + ret =3D kvm_arm_init_cpreg_list(cpu); >> + if (ret) { >> + return ret; >> + } >> + /* overwrite writable ID regs with their updated property values */ >> + kvm_arm_writable_idregs_to_cpreg_list(cpu); >> + >> + write_list_to_kvmstate(cpu, 3); >> + >> + return 0; >> } > > Hi, > > When I was testing this series, I found a problem. On the host,=20 > SYSREG_ID_AA64MMFR3_EL1_TCRX=3D0x1, > I configured it to 0x0 in=C2=A0qemu, and qemu cannot start. > The ID_AA64MMFR3_EL1 TCRX field controls whether the TCR2_EL1 and=20 > TCR2_EL2 registers are used. > In the kernel, when TCRX is 0, TCR2_EL1 is invisible to the guest, and=20 > when it is 1, it is visible. When we > configure this field segment to 0, the configuration is not yet written=20 > to KVM, but the cpreg list is initialized, > adding TCR2_EL1 to the cpreg list. Therefore, after writing the=20 > QEMU-configured registers to KVM, the > cpreg list needs to be updated again. > > @@ -2227,7 +2229,7 @@ int kvm_arch_init_vcpu(CPUState *cs) > > =C2=A0 =C2=A0 =C2=A0write_list_to_kvmstate(cpu, 3); > > -=C2=A0 =C2=A0 return 0; > +=C2=A0 =C2=A0 return kvm_arm_init_cpreg_list(cpu); > =C2=A0} > > The above modification can solve the problem, but it may not be the best= =20 > way. Thanks for testing. Indeed, if we write something that changes the visibility of registers, we need to do an update. Probably needs some thinking (e.g. what happens if a register disappears, but the user set some fields?)