From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazon11021087.outbound.protection.outlook.com [52.101.65.87]) by lore.virtuozzo.com (Postfix) with ESMTPS id 7AA128017D for ; Thu, 29 Oct 2026 11:34:49 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hShae8Yq1Vbx02tMzdGfx8JG/NPSiXh/+fgeAy3evHliEyRYTXNMLoFRvudOCBpYSqGw7lfSFn//NQpvhw6BXWr6MApcOqKdPn6U+5qIl3JKage4PUqJ2Kkr5rusf5VhY5M66dDb74JKRosp5sa1qU/qMBE+b4S306Si6aqah+cul3o5IEo/lPS8WRGDH0+4iFkh7FALIpCD2hmqPYgHo0xgy4F7g0PCQ7o7j3xWsmWTlZYPgHLxNQBsdh4+8T7m3i3uj72p8YQffcKotWENI7QHJyRu2YbEjRhuccSr0Ca2WAlfmsXzYNMNEHV0uAYFWkVqZP6Q1Ca8j6EG8VBszg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=gcou21LcCF0pif3w0WCrdqxdstW3Ge1lnMCzT3irZME=; b=jn2fwYdfyTEDF0wx8FVOl3HPZVdtqLjZor9jVisPNCNvmdBF7STFo66cXYRTGUXNVk5YDCLKDpec8biwFU/ot4f7nUUJWjEJWIRvSDhC1PuO/YVYi7/w7gikJZrHyMDj0HvpiRMOEw/iHbIUVDWLdkFRS66NVopJPPoaGZRJXvFdjuB6MVWWJn6R6ZpMfQ486D+CBpJQXFRdbSRJlwZv5W5BGJVBXlO8M0tyiJ/8Hb10dXjU3ljiu7dBqy5eja5D6M2l/DNM4lCZ746g9J7JcTj2/3x7NycekPIFucylG/uiuHBCFD1QYRpYqjEpWq/tqocQFo5jATgw15SBTWyzrQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 2a00:1450:4864:20::430) smtp.rcpttodomain=virtuozzo.com smtp.mailfrom=openvz.org; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=openvz.org; dkim=pass (signature was verified) header.d=openvz.org; arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.onmicrosoft.com; s=selector2-virtuozzo-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gcou21LcCF0pif3w0WCrdqxdstW3Ge1lnMCzT3irZME=; b=ESxwOdnKHSXVqI5dZfFaDdrLEHdCv9+/ph1DvuMeacDveVvM3kWi6GxHKuohy1lVTTbaAI4eXtSJ3vAnbBPj68Hz49UKkt1YguMPHOXHMCY6nPXKjap1jMoFZHCoDvb+JL9bcnH1cvi9lxURJtcLzGZlrGgx5am1uIhK42FUhN8= Received: from DUZPR01CA0236.eurprd01.prod.exchangelabs.com (2603:10a6:10:4b5::15) by DBBPR08MB6043.eurprd08.prod.outlook.com (2603:10a6:10:20b::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.569.8; Thu, 29 Oct 2026 11:34:46 +0000 Received: from DB1PEPF000509F1.eurprd03.prod.outlook.com (2603:10a6:10:4b5:cafe::25) by DUZPR01CA0236.outlook.office365.com (2603:10a6:10:4b5::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.546.22 via Frontend Transport; Thu, 29 Oct 2026 11:34:46 +0000 Authentication-Results: mx.microsoft.com 1; spf=pass (sender IP is 2a00:1450:4864:20::430) smtp.mailfrom=openvz.org; dkim=pass (signature was verified) header.d=openvz.org;dmarc=pass action=none header.from=openvz.org; Received-SPF: Pass (protection.outlook.com: domain of openvz.org designates 2a00:1450:4864:20::430 as permitted sender) receiver=protection.outlook.com; client-ip=2a00:1450:4864:20::430; helo=mail-wr1-x430.google.com; pr=C Received: from mail-wr1-x430.google.com (2a00:1450:4864:20::430) by DB1PEPF000509F1.mail.protection.outlook.com (2603:10a6:18:3::62b) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.546.15 via Frontend Transport; Thu, 29 Oct 2026 11:34:46 +0000 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-48c4d870d54so1305867f8f.2 for ; Thu, 29 Oct 2026 04:34:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvz.org; s=google; t=1793273686; x=1793878486; darn=virtuozzo.com; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=gcou21LcCF0pif3w0WCrdqxdstW3Ge1lnMCzT3irZME=; b=LPITOSSLQ3L6E9r1PjKPG2i05/avul7vDOhmUr2woutIh7SJuZik5RjjSyMET26T5q rLXOqJl6WOyy/iKcz/iUti7tH1nHgitTILSIdfCt4uEtnPa8doyDTdbIA1i5i6Q3SvY4 /U2h2IKy0pDHcgoef7tvFQsKOuRiDzMymIngFfyl8zj+CF1tSwUF8pQCYWF22+JiHBc9 TUOPoIDLx+LkTj2Yq+HWYbWw5cp3aBQmB+u/ZQtrXHEfkm/zGc9ZeLpYFxNtf+YRSmCf a5LImmpabeBQpxB5KQxMlysUTLaYlu8ZjfNtqIOswuwqOsufQ04ZzDBxHZkzHp7342am SrWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793273686; x=1793878486; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=gcou21LcCF0pif3w0WCrdqxdstW3Ge1lnMCzT3irZME=; b=vwUhCAgQQT7ZTsiWCE1p6Of316sqRbfBkaedPzQx4g5nHgu3YS05Vfl1nghVwipDWy Hyj6keJa+MwvmMuMBCIfHNW+EM1cYmUK7heIApy64TUWEGYqv2TWs/YTPSr7hh0R5zWx 6uoM8H3Kgbv08AkAbyQMIZBY7qyVz4hr1s0C4U7Hp4VWLNgiX7kEsPw65HZU5AcuXLff +EkOwqnuVoNl1DKQZ90/ov3+jS6ZiCdo4rqo1IKsd2aiEsH9XGSRiEFn+T1LnaPa9wQk l/wEuXDsgZiK+PeZl7xRyOz76n1LJ4c0XcOGeTi6M8l8IIBlJmC7deMXXAVNWUVNWj3y BPow== X-Forwarded-Encrypted: i=1; AKwUvBw5+dw2DYdRTvpvG7l/AFQ83D1etvgrMmXSJeA/rSzs+x6NqZDNq46/yzOzrymYjqtqP3tIufqYVQ==@virtuozzo.com X-Gm-Message-State: AFq9FYJUvb0Ma45J98zx+stFzpbqmPvjf1sLBaUiGfs4MheLAy0Asb3r K8sBJYwuELhVc8IoOEf7EUvuX+bNY3IFJwPs4gpSag626EFh8WudRepp1Ame0z8teEcFDQ== X-Gm-Gg: AYBFou1nPFwjUhiZYH+IO73mP1d9CbSsT/V5sT0TZxhXX4F+VVXJyNQY0Vk1QEWrcM1 XLQJs06YL/WA81h1fwnvdliorpyrPQ1BBiC2YJjM6wYki05Ie0x8y7wh7746m1/f6dlIxgFEQ9S zm9RNp9gNDIVPCfDBt3rjef3M12hhRFDwOdOUsObQlaPxNJWIp1eSltXu8EOL8jE+UfmwgBBNE1 jfJmZpMdbmJapmSQeogCanMR/o3PBqe/bu+VhOkVleTfDDX7t2Xk8MblQVJ9wS/ApWtG6pxcHy0 U7JyMeSZiZjo+WCuwykEx+FfTZUJ/blVjgXf2Oz83tjTEZRD4hyf6978JjCl19ZybdfRJf6pXuL vn1dGAkLUbveAc6DwgecUKlfISc1GpDY1KMvvjXb6EPOPTl7xRN9Df/GydQ7Qj1FBmKbY/IIH/n EHneiGHQKpzYZWWktM8tbHqEANpYZiepF+eB/XbE+H9+DeAfJkznzMHG3qlduURefw4bLYenuJX A+pA9mvJMnJb7U2kAryw6xS+poT5TJHJLo6uSI0iH3EGF3RhD9YOlPCO9pqrqxScpQISl6xtgRC rncu20mHQtRX6CKdCBuTJbxt3Q== X-Received: by 2002:a05:6000:1623:b0:48e:3767:d885 with SMTP id ffacd0b85a97d-48e5d5b712emr9229371f8f.53.1793273686018; Thu, 29 Oct 2026 04:34:46 -0700 (PDT) Received: from athena.sw.ru ([2a06:5b06:b600:300:f4be:f111:4ee0:40d3]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48e3ebcb958sm33967211f8f.21.2026.10.29.04.34.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2026 04:34:45 -0700 (PDT) From: "Denis V. Lunev" To: andrey.zhadchenko@virtuozzo.com Cc: khorenko@virtuozzo.com, svt-core@virtuozzo.com, den@openvz.org Subject: [PATCH v2 hci-8.0/hci-8.1 6/6] i386: keep SVM leaf features without svm on vz types up to vz9.2.0 #PSBM-144630 Date: Thu, 29 Oct 2026 12:34:36 +0100 Message-ID: <20261029113436.93521-7-den@openvz.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261029113436.93521-1-den@openvz.org> References: <20261029113436.93521-1-den@openvz.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-EOPTenantAttributedMessage: 0bc7f26d-0264-416e-a6fc-8352af79c58f:0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB1PEPF000509F1:EE_|DBBPR08MB6043:EE_ X-MS-Office365-Filtering-Correlation-Id: 6d153aa3-720c-421b-5658-08df35b0a28c X-LD-Processed: 0bc7f26d-0264-416e-a6fc-8352af79c58f,ExtAddr X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 0 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|61400799027|43022699015|376014|48200799018|6059299003|9140799003|82310400026|261028144727099003|5063699009|56012099006|261009223027099003|261009221727099003|261009221227099003|261009223327099003|261021123027099003|261026140227099003|261026121527099003|261021121427099003|261022105027099003|10067099003|261009220027099003|55112099003|22082099003|18002099003|16102099003; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?2nY4MqvFPf3Hh5UnsfpC78qdxJBzBQFysUkuUkAN6tz6hw8lJIHIvX0mCCpC?= =?us-ascii?Q?noPyvma2zhs5lfDkT+nNdINCYMzoSd8BAjUUv6UU4paBHEP7kSoMx78BcHv2?= =?us-ascii?Q?UONEW9/q7HYxs9Qrl2qstiBw27fXChQA7C3cWtLU7AN6RZXTdJ54QLOjUCw1?= =?us-ascii?Q?AJBxzdfcfoHVK2gbvBfEjYF+ltDvNkWuMwDQLPj3J2WQ+OpQOgE6UdCFsc9k?= =?us-ascii?Q?yfUNB3KMNyhmwVLZw6AXR2eQD4M+DGZWez00Q6jSO7rSS+COkWUx+VDDhl8K?= =?us-ascii?Q?qMJuBC/GoKX/RVLZ0V/fyLhjAx1xkTtT6ug1WDqNWdVcfCXxd+saaNdjpmmM?= =?us-ascii?Q?D4LPbn7xnLVqumHGb4lFkWBA9NHEqatk0gL/yMyoNu/BK+/OuT6YrqwJKXqY?= =?us-ascii?Q?x5h7/X6ytWXYwIRErv8nBjNn6EE/aoAAmB8z/Nrtx1EvjzHhwSgLDAWKEDnD?= =?us-ascii?Q?xaxPBVBnPu/FidXYJhrndotqbU635pvvebTFcB2D/9tuXvMGVPd+02eB+xiv?= =?us-ascii?Q?i1TQNPG6uTl8N1QzY2nKxSrMlpL/IKqdKczfFBFKR20yVYZV+RNYeJXS7+bg?= =?us-ascii?Q?TzRJiqeVoAzQ7EibIXH0ZPviaTwlsdqB8wgo690zvmjxInJyRwsynQ5I3esk?= =?us-ascii?Q?hgvTm6B5ulR7yCS02GeRFtspAo0qmKD1zBnXbQyp6VhIxYEBTwWs/0ZIGOuO?= =?us-ascii?Q?gJNVHroA4wh75P8haLZ4RwHO+/dMudE6qMOJ3VGRkSH8NWUOCC3GlED/siMe?= =?us-ascii?Q?FcBXoTm1YQZn08/cJGqiD70OEVM70LWZ/qtsUuT/QyUfn96HkV4i5WAx0IdE?= =?us-ascii?Q?8D/S0zsOvn8PShPBptXqLrFbRRCViQj1JmZ4okIYHvqIXwm02GY/9KAyo317?= =?us-ascii?Q?+pc/xnE3/fSBRRSsu124afWhVeqgOd9gCHLOAXoisW5pKsGwWDnVEkRR25WT?= =?us-ascii?Q?8HBWprVbbXJ+JKytk4IpfJMosDbUpUkY1DCtd6zzNcY=3D?= X-Forefront-Antispam-Report: CIP:2a00:1450:4864:20::430;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail-wr1-x430.google.com;PTR:mail-wr1-x430.google.com;CAT:NONE;SFS:(13230040)(61400799027)(43022699015)(376014)(48200799018)(6059299003)(9140799003)(82310400026)(261028144727099003)(5063699009)(56012099006)(261009223027099003)(261009221727099003)(261009221227099003)(261009223327099003)(261021123027099003)(261026140227099003)(261026121527099003)(261021121427099003)(261022105027099003)(10067099003)(261009220027099003)(55112099003)(22082099003)(18002099003)(16102099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Z4nGoIB/Yoprtb0/7xQ+59MrK0HzMZE4HXGqn1bZ+qt3fhrH7YeVKWNx/eeqJjo4ld3DltBabTkpdQgzIXaCi08xnwc+Q61tY4wkdM8lU4lkYCFCsnf/EQXqdvZygVqK/4/LjatvcmatGnW5ySgzxv/W5BKaLZHIZHb5y3eq+00+3cLa6TkJSCxtz075AG76RlgXQzfj/5AAMlbOtEcpxwYMwGq8M5gc6LuuGXUu26F2w/s8C3CSvLNvZIPkeMNJeSDjB3HG72EAKh9wmrXUb9KAeO0CHN8qGKaQuAgrMXwVkE1ZvgfQc4EckCpUw4XiRnYP2fSp+CpRMtE4BquX8J3ikoBTpllm+6AEz3KaaubB+ax2aPXuw88B6+8xN+EltZ0hIwsyU7BJ69pqwTaH3JoXRSmc3uo+Tmdip+ZThhh+q8AV43QKjP6kRLWkqiv0 X-ExternalRecipientOutboundConnectors: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-Auto-Response-Suppress: DR, OOF, AutoReply X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2026 11:34:46.6903 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6d153aa3-720c-421b-5658-08df35b0a28c X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-AuthSource: DB1PEPF000509F1.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB6043 List-Id: From: Denis V. Lunev Since commit 730319aef0f ("i386: Mask SVM features if nested SVM is disabled", QEMU 5.1) the features of CPUID leaf 0x8000000a are dropped when svm is off. QEMU 2.12 on Vz7 kept them, and a Vz7 host-model guest runs with svm=off,npt=on,nrip-save=on. Moving it to a newer QEMU fails in libvirt (PSBM-144630): guest CPU doesn't match specification: missing features: npt,nrip-save Add x-svm-features-compat and turn it on in pc_vz_9_2_compat: under KVM requested SVM leaf features stay when svm is off, both against the dependency on svm and against the host. The guest sees the CPUID it saw on QEMU 2.12: cpu_x86_cpuid() reports leaf 0x8000000a only with svm, and the kept features raise the automatic xlevel to 0x8000000a as they did there. TCG keeps dropping the features, since it cannot provide them. Signed-off-by: Denis V. Lunev --- hw/i386/pc.c | 1 + target/i386/cpu.c | 13 +++++++++++++ target/i386/cpu.h | 1 + 3 files changed, 15 insertions(+) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 5b2b2de4064..9b6b51bd5f7 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -553,6 +553,7 @@ GlobalProperty pc_vz_9_2_compat[] = { { TYPE_X86_CPU, "x-spec-ctrl-compat", "on" }, { TYPE_X86_CPU, "x-bus-lock-detect-compat", "on" }, { TYPE_X86_CPU, "x-v-vmsave-vmload-compat", "on" }, + { TYPE_X86_CPU, "x-svm-features-compat", "on" }, }; const size_t pc_vz_9_2_compat_len = G_N_ELEMENTS(pc_vz_9_2_compat); diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 52d7ffcb9ac..3b541ecc65e 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -8996,6 +8996,13 @@ void x86_cpu_expand_features(X86CPU *cpu, Error **errp) for (i = 0; i < ARRAY_SIZE(feature_dependencies); i++) { FeatureDep *d = &feature_dependencies[i]; + + /* CPUID leaf 0x8000000a stays empty without svm anyway */ + if (cpu->svm_features_compat && kvm_enabled() && + d->to.index == FEAT_SVM) { + continue; + } + if (!(env->features[d->from.index] & d->from.mask)) { uint64_t unavailable_features = env->features[d->to.index] & d->to.mask; @@ -9138,6 +9145,10 @@ static uint64_t x86_cpu_compat_kept_features(X86CPU *cpu, FeatureWord w) if (cpu->v_vmsave_vmload_compat && IS_AMD_CPU(env)) { kept = CPUID_SVM_V_VMSAVE_VMLOAD; } + if (cpu->svm_features_compat && + !(env->features[FEAT_8000_0001_ECX] & CPUID_EXT3_SVM)) { + kept = ~0ULL; + } break; default: break; @@ -10109,6 +10120,8 @@ static const Property x86_cpu_properties[] = { bus_lock_detect_compat, false), DEFINE_PROP_BOOL("x-v-vmsave-vmload-compat", X86CPU, v_vmsave_vmload_compat, false), + DEFINE_PROP_BOOL("x-svm-features-compat", X86CPU, + svm_features_compat, false), }; #ifndef CONFIG_USER_ONLY diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 4f8bcbe600a..97e38013e46 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2340,6 +2340,7 @@ struct ArchCPU { bool spec_ctrl_compat; bool bus_lock_detect_compat; bool v_vmsave_vmload_compat; + bool svm_features_compat; /* Number of physical address bits supported */ uint32_t phys_bits; -- 2.53.0