From nobody Sun Apr 5 16:31:06 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=unpredictable.fr ARC-Seal: i=1; a=rsa-sha256; t=1774365361; cv=none; d=zohomail.com; s=zohoarc; b=hLyBRS/mqoP4R43AftZS7ltmTzb3G/harv6dMontWxqh3e3OERIQEO9tckk42niNmzAudG/HVOq6dOyNqqsodZMGVQzXVRdXsNt4uCykggKwNHmEdBrP93Eawm1mXLXIRlUcOaU4fR9fn6lMEPqh9T5TpEM5JlgHxKZeptTFhqY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774365361; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=eaxFbDbhOhjNq2FXCuR8YCCB4ResW+p9AOTyVZ7pRBM=; b=mrl4EF83gDtreGKICFQ5zxiMrqeRxxGoEGlVjZfpkHbQAI+x7homvbTLohHhs3km1QIoU9h3M1ewizFq683duCRCBDH0mr6SxiiR/kwdD0KtjEKJv8TTuXVSan4BXbCzobgCTccZparaJB9OvpwZN6sGOaVKsH1OUhRFP+GCMis= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1774365361410869.5260466352111; Tue, 24 Mar 2026 08:16:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w53U4-00078V-T2; Tue, 24 Mar 2026 11:15:56 -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 1w53Sz-0005vI-6C for qemu-devel@nongnu.org; Tue, 24 Mar 2026 11:14:56 -0400 Received: from p-east2-cluster2-host1-snip4-8.eps.apple.com ([57.103.78.11] helo=outbound.st.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w53St-0005uX-Uv for qemu-devel@nongnu.org; Tue, 24 Mar 2026 11:14:46 -0400 Received: from outbound.st.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-1a-60-percent-7 (Postfix) with ESMTPS id 6D409183533B; Tue, 24 Mar 2026 15:14:38 +0000 (UTC) Received: from localhost.localdomain (unknown [17.42.251.67]) by p00-icloudmta-asmtp-us-east-1a-60-percent-7 (Postfix) with ESMTPSA id 855C418014A9; Tue, 24 Mar 2026 15:13:56 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1774365281; x=1776957281; bh=eaxFbDbhOhjNq2FXCuR8YCCB4ResW+p9AOTyVZ7pRBM=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=TZLuxECwUf65dPtY/UeVvllu3dtO6qrTrkXk7jLTXD6jgzVJgHXWBPTS64dqZq1of/0wUjThr/tziRS5Y41233xjDGUTboBdip18yKr5xyYD0uXMXRKklIk0xNS20XSFWQ4gAakNhujppSwjbDOxuLACioI8CMPOFLGancA3sgmwhvTaN/CRt/wsWRSYPrOlqXZQsUDjJ8V6LBfFp8xVtEdG42wD7XK5bMuB2DBl3FqChOUQghz3WW3Co81cV1p6DnP+zMpRDPFLMHQsdSe7pqJrpKRdy3YCLe+9F8vCCr/mNDPd9ywUokTg3ZFRnI69zgtD8LwDkmYunhbts1He+g== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Roman Bolshakov , Mohamed Mediouni , Wei Liu , Phil Dennis-Jordan , Pedro Barbuda Subject: [PATCH v3 11/12] whpx: i386: fetch segments on-demand Date: Tue, 24 Mar 2026 16:13:22 +0100 Message-ID: <20260324151323.74473-12-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260324151323.74473-1-mohamed@unpredictable.fr> References: <20260324151323.74473-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Info-Out: v=2.4 cv=cqWWUl4i c=1 sm=1 tr=0 ts=69c2aa5f cx=c_apl:c_pps:t_out a=YrL12D//S6tul8v/L+6tKg==:117 a=YrL12D//S6tul8v/L+6tKg==:17 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=dLhstIsYVbaQZ-P_MTUA:9 X-Proofpoint-GUID: j9m_XXPfehx_MaDjj0qXH28n0o0_zWQ_ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzI0MDExOSBTYWx0ZWRfX7JJnZCx+eXMu GLHM7KPCjgQk+76KwLp37gpkDjwzdlZYlz2JGqT4L+qwCUwef4TV/3kT9aLmG6b8OlB84PFeIyG AJnTNwit9EXS6vpe6L5qy3EBg4GLqlxXkSf6giPKoOQ8Wt48Ysq3gYSPp6/GdvR2jO3UMABSjmX uHrn8DPjfHL6pkn8mmfcav5nNFZI14QSgoO4uCsFdMIuvEcw0NDpaBJU0dRSUUMD2CXOuJGvptY 1Np6GjNS3eBcmeu9J2NKbba664w2WVw8vO/8yqcg2tTVSsZPXgB4ZglPI5usK/ZQ0sydhnd5rC+ hFpC4sHXKswX87WogTr6WFSss5zRC4AjB8uBr2gTdqqNcvZKzpbGW1AhBDXsZE= X-Proofpoint-ORIG-GUID: j9m_XXPfehx_MaDjj0qXH28n0o0_zWQ_ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-24_03,2026-03-23_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 lowpriorityscore=0 mlxlogscore=883 malwarescore=0 adultscore=0 clxscore=1030 mlxscore=0 suspectscore=0 spamscore=0 phishscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2603240119 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=57.103.78.11; envelope-from=mohamed@unpredictable.fr; helo=outbound.st.icloud.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @unpredictable.fr) X-ZM-MESSAGEID: 1774365364439154100 Content-Type: text/plain; charset="utf-8" Instead of save/restore, fetch segments dynamically. Rely on the fetched state instead of loading from memory. Or, if available, on the VM exit context. Signed-off-by: Mohamed Mediouni --- target/i386/whpx/whpx-all.c | 71 +++++++++++++++++++++++++++++++------ 1 file changed, 60 insertions(+), 11 deletions(-) diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c index 71b33a632a..6f23278642 100644 --- a/target/i386/whpx/whpx-all.c +++ b/target/i386/whpx/whpx-all.c @@ -868,21 +868,70 @@ static int whpx_handle_portio(CPUState *cpu, return 0; } =20 +static void whpx_segment_to_x86_descriptor(CPUState *cpu, WHV_X64_SEGMENT_= REGISTER* reg, + struct x86_segment_descriptor *desc) +{ + uint32_t limit; + desc->g =3D reg->Granularity; + + /* + * Hyper-V can return reg->Granularity =3D=3D 0 + * with a higher limit than 0xfffff. + * + * Detect that case and set desc->g + * with shifting the limit properly. + */ + if (!desc->g && reg->Limit <=3D 0xfffff) { + limit =3D reg->Limit; + } else { + limit =3D (reg->Limit >> 12); + desc->g =3D 1; + } + + x86_set_segment_limit(desc, limit); + x86_set_segment_base(desc, reg->Base); + + desc->type =3D reg->SegmentType; + desc->s =3D reg->NonSystemSegment; + desc->dpl =3D reg->DescriptorPrivilegeLevel; + desc->p =3D reg->Present; + desc->avl =3D reg->Available; + desc->l =3D reg->Long; + desc->db =3D reg->Default; +} + +static void whpx_read_segment_descriptor(CPUState *cpu, WHV_X64_SEGMENT_RE= GISTER* reg, + X86Seg seg) +{ + AccelCPUState *vcpu =3D cpu->accel; + WHV_REGISTER_NAME reg_name =3D WHvX64RegisterEs + seg; + WHV_REGISTER_VALUE val; + + if (seg =3D=3D R_CS) { + *reg =3D vcpu->exit_ctx.VpContext.Cs; + return; + } + if (vcpu->exit_ctx.ExitReason =3D=3D WHvRunVpExitReasonX64IoPortAccess= ) { + if (seg =3D=3D R_DS) { + *reg =3D vcpu->exit_ctx.IoPortAccess.Ds; + return; + } else if (seg =3D=3D R_ES) { + *reg =3D vcpu->exit_ctx.IoPortAccess.Es; + return; + } + } + + whpx_get_reg(cpu, reg_name, &val); + *reg =3D val.Segment; +} + static void read_segment_descriptor(CPUState *cpu, struct x86_segment_descriptor *desc, enum X86Seg seg_idx) { - bool ret; - X86CPU *x86_cpu =3D X86_CPU(cpu); - CPUX86State *env =3D &x86_cpu->env; - SegmentCache *seg =3D &env->segs[seg_idx]; - x86_segment_selector sel =3D { .sel =3D seg->selector & 0xFFFF }; - - ret =3D x86_read_segment_descriptor(cpu, desc, sel); - if (ret =3D=3D false) { - error_report("failed to read segment descriptor"); - abort(); - } + WHV_X64_SEGMENT_REGISTER reg; + whpx_read_segment_descriptor(cpu, ®, seg_idx); + whpx_segment_to_x86_descriptor(cpu, ®, desc); } =20 static bool is_protected_mode(CPUState *cpu) --=20 2.50.1 (Apple Git-155)