From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from PA4PR04CU001.outbound.protection.outlook.com (mail-francecentralazon11023138.outbound.protection.outlook.com [40.107.162.138]) by lore.virtuozzo.com (Postfix) with ESMTPS id 93B11803F6 for ; Wed, 11 Nov 2026 11:19:27 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AFnyR4fv/eGdBRafBOax59pmeTE+W2OjWoRMKTuB7Sr/9EuZtGn4BfOEKQsyqFVfRtC5E6DTEz4UQRLwW580c4EcxUuByiL/NkJ8bhQ/p6Pjaq1WdV5mMTUv9x5SPYT0FMT3VfbTSxbtmTlZ1X/2EaU908RfDcqbkh4qFHVQOvRuI+Ey61ocZm1d9KKcUpnifupJFQbnNzwaToo1kLkeUfQBMNnwAmy0RVNtG+kzjeo5RydrR2FKehsEsZaVlINvhDC/9lfENbzuocqaBkRzOBgLgYv8+f6ADYNw3sh517gFE/yRirVm42OjKJ7+aFwzKRrX9/adaUDkpnCZkXB8oQ== 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=KdZ3bhUToNeLdwV70t0SiHjze+Z3TgBwaHRDUWDxn/0=; b=IW3wSrEDMZHUMzkzbRcE1gUVzY2qw7WmnBYYGYKnw+5B2wZzvzTlQWCPgUUEdZmNLjeQiIpZp1Q9tr4KYDbS8RtckFU2QJOpTkpd6m674m0d5dpGZWuopBqiKngktXqa1A3zhmbRuPITzjif9FxVpLY8oU7B1KGHo8tkxoT5oN3JFIGPSjKC65pg3MUG1peZYQBwWBqGETPWhJy+N8jsf5rCtKonkXJH1etL4v5KvQVSaMQh2hj+zEY+jQBMERHp0OrxkNscQFeRdNsH2KCPvRNxSAPPqkjk+PPKQbREWMDtFuc6ftlpCgwnKwbSIwf6PCREMQURNETBXzag2NGYaQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 2a00:1450:4864:20::432) 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=KdZ3bhUToNeLdwV70t0SiHjze+Z3TgBwaHRDUWDxn/0=; b=Yqyua/kK6KSzkxNgbAI+9Ik2fqLrLvria4w1qR2fBTyUmUxSMVW46fXA7DnV/Q3Br/5Potia/Q4hrGdDHBG8a7xhpeoswdCsQqt14004FlO8c5PVdiYkpTCqOHX6paFZJ9jYiJyBxfR1eqB3gSoY0DNax8xv+Dp+jK7ERCgJpVE= Received: from FR4P281CA0042.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:c7::12) by PAXPR08MB6608.eurprd08.prod.outlook.com (2603:10a6:102:150::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.592.13; Wed, 11 Nov 2026 11:19:23 +0000 Received: from MI3PEPF0000847D.eurprd02.prod.outlook.com (2603:10a6:d10:c7:cafe::85) by FR4P281CA0042.outlook.office365.com (2603:10a6:d10:c7::12) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.639.0 via Frontend Transport; Wed, 11 Nov 2026 11:19:23 +0000 Authentication-Results: spf=pass (sender IP is 2a00:1450:4864:20::432) 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::432 as permitted sender) receiver=protection.outlook.com; client-ip=2a00:1450:4864:20::432; helo=mail-wr1-x432.google.com; pr=C Received: from mail-wr1-x432.google.com (2a00:1450:4864:20::432) by MI3PEPF0000847D.mail.protection.outlook.com (2603:10a6:298:1::64) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.615.4 via Frontend Transport; Wed, 11 Nov 2026 11:19:21 +0000 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-49a92144733so57526f8f.0 for ; Wed, 11 Nov 2026 03:19:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvz.org; s=google; t=1794395961; x=1795000761; 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=KdZ3bhUToNeLdwV70t0SiHjze+Z3TgBwaHRDUWDxn/0=; b=dPl0jqzPA9VcSU9dBxSMgwNX2CNPjyEo9sjUBveBanI6ModC/36NX0i/sVbixkdYHx 3phm3CFx10gdpd7hOBe2OI9F1ZeKLA2SlzprWJhvpmGekWPjeHKP/VH1AFqJtDbowrVC 5VAmjLUmIblq3LjuJECvJ6rkGENYgo469GOtsrashUZajbyEwg/VYVplvK6JaduJZoQh Nmx0KarBWn/FLciCu/PxmyBND/lc9MGslLoUS7kcd9z5Jt9J54ANqQnQSxvor2CbDx3S cncLGE9t4+TNnECyKQRj+1Wp0nhnu0jgwbuidLP3POC6ie4hDE71YXfW9vuAnrWiFavF Iq1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794395961; x=1795000761; 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=KdZ3bhUToNeLdwV70t0SiHjze+Z3TgBwaHRDUWDxn/0=; b=NW1dIGdw1n/eFFjuqIGKX+Dol35tCx8ZS3aI28Bs5ExE9mGkkKK7u9qj9r3cGWDLz6 o7vt2xnlLC0HHC/5QcrxtUEQVj33v+jHrfRUlvIxvZ9/nV4btxp/G472YpOaaUzoiy2F k0thVJoyM9G6Saxdaho+saYTHQL8XUc6lXeda1EdVkBJAf3wqQc90j8Cq1xlWEorniO/ mkm8vF3aBx0DFPq84zAZ1bHhWSSzestFyF55wR8T/MSNFLyh8w77RJWdAD3kVrzMl68i jGp1gQ464AA742O+U89aJH0Di/s4L+/gpeN0kxY2h6KwT6EiqlM1mf9ip6QbU3N+BQaO DiDw== X-Gm-Message-State: APuU4Z/aNxqGFR+gDhkNtvm99BlHgKyCuX3yR4SqZmqH7sHZ27qCnd/u VkT8Uorkck2+iPw1+DkhAX9YvlDaHurL/IMOyMLWQxCfEiL4W8j227XUOUDGOJXCO1z8csZ+h+r zbAZwTwc= X-Gm-Gg: AYBFou0vnfJmGqROZxc8XfmZBCYuP38FBgDQceeRsKq0zA160PLmzpVX73wGxYdUQwx FXQH9g+fVRjlGgwWcH6G6qvHYaxoQ6fJrvNcZnpYA10GbsWF3FjcuO9Xu3DKJhbPTt4yTYJ4Pae JgI832KSyoStnZoTMa4WSJQyrvaQDop9LDqhKljB59MTGrAqBgYhVhvpknKOmu6xSvjj2esCIZF FfVzo2bBFtuUXctgmyF++hrtiBDDJuqSqVjhzRxfumAtmlQXOtB+oM+OUVFTNR64dzwmsxae13Z Y1nIvvvzClc7pyuTK8jWqVTUxFVkdwonuu1RqA2g9QS/pZBWbMsMvjDKx4Ri45NxTnyZyJFvIAa ek7BtoImy0mgo/F7s3XK1LldX6FzXHD6ohvqiaaAWSt2Hgr3kM7Qx1uC4I3TVYVwXBqWHS0P1Kr ywjaslvOkCY3Q5MU/et5hzlT2cBhEpHfym2JwCLVSd1oHf5yzdAAoUrEgEWJ0sOVwxKqqtsy0G2 0/0HPoNw5N7OrifMjgmtUJAYFWqUBntEN1LXppv36gxDu8rtMt1GBaZteB2JNnhNuuAS7UnxJYT 5ctsyHgl7Fz9eHrgDkCkB8j1g/yxR5GNwSMcfGZ5mSmH X-Received: by 2002:a05:600c:34c7:b0:4a1:992f:d0e7 with SMTP id 5b1f17b1804b1-4ba09391696mr35122405e9.16.1794395961089; Wed, 11 Nov 2026 03:19:21 -0800 (PST) Received: from athena.sw.ru ([2a06:5b06:b600:300:c3:490a:ca77:c5a4]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4ba01fe2c5asm204280525e9.5.2026.11.11.03.19.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2026 03:19:20 -0800 (PST) From: "Denis V. Lunev" To: svt-core@virtuozzo.com Cc: andrey.drobyshev@virtuozzo.com, "Denis V. Lunev" Subject: [PATCH hci-8.0/8.1 1/1] i386: keep only requested SVM leaf features in x-svm-features-compat #VSTOR-154398 Date: Wed, 11 Nov 2026 12:19:16 +0100 Message-ID: <20261111111917.4012602-2-den@openvz.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261111111917.4012602-1-den@openvz.org> References: <20261111111917.4012602-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: MI3PEPF0000847D:EE_|PAXPR08MB6608:EE_ X-MS-Office365-Filtering-Correlation-Id: a08b306f-c569-4c33-fd62-08df3fe5a28a 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|376014|48200799018|61400799027|43022699015|6059299003|9140799003|82310400026|10067099003|261009223027099003|5063699009|56012099006|261021123027099003|261026121527099003|261021121427099003|261022105027099003|261026140227099003|261102123227099003|261028144727099003|55112099003|22082099003|18002099003|16102099003; X-Microsoft-Antispam-Message-Info: DNUaZsTi8qXnSHo8afOYYAihOPCmvUV4zlNFAkTyg+alHTRCyHFYHO/RKoqsotBBZRAsl2Ron1VenDvKbjU3Um8Vf21jj8vEvUrYrtyKCfxoD/oBd92a5wdia4Z2Z/iogMynpwgY9asv5fxb/dODIk4hR3dMu1Ay9dV/UgbnTBOazCZ6R073QWC62aXeDNJsVTXUMQJ4PAlxEuO7yULHKduVantGMMM/iSEKIk5EXWK+XqC79Q5udXcUEv+CVnHFptPrrgveINEY4jB3rJztEt34tH90bluhOH08ZmANzA4+spmCe4iXZzy/ejJ+EEK6IPn9rREj0q4r/IwcpvinmZZnUrRKr30vtKqwSxFwqReNXUOV68p1HibYe4Oq29Ulh9QG/tF/VOVvRXjVj8YnyaapgdYanXDQJpDt7mxS87WFdl98l3cDZWXf4YapAJwkEsDjW76YvzeKk0u4HkIMVPeErCm431A3VmG0ryxjp+sCKit5oQ0myQG2qnj76ij/BvvV6ecVuKmDeBhz8UzO2HAUFa2tsey3WnvzBZfIbXrY1mDTLyXCWxmOZB7FCdzdb9JGhpMgb2ydrAbrX+c2SzRXoCwu2Stt++vG6mVHofQ1Aslx3grAYNN/ZUSnBDqOcQpJoiWQ/e+77fQDHdlSPyrwnws/nLsSU3RYVJMPXoCuBcslSBTHOT+5nAXe8lyKDLSOtMUWezcMdWpgPQQaxx0ZLZyBw37VHCR6r90tQzK/PxMu3v3g9UCPdxG9N/Jp+XtlupXfsPzShXCQT099Qe4vY4LJaGwu9ZjEIY2G74kO4x1dc+dMnKgfwOQPHy2Nk00zc2eLSFg4kHIvS0L1JzoooyR8DYJdUgLgXw0iUcS1es0+/f3J0GI4SD8U0Pgv38TTh1b292DVSsHSRiiyhFs7VsBiLbG3hjkvskVsImwOyi2+GU29o+EkiK6Mi7ro X-Forefront-Antispam-Report: CIP:2a00:1450:4864:20::432;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail-wr1-x432.google.com;PTR:mail-wr1-x432.google.com;CAT:NONE;SFS:(13230040)(376014)(48200799018)(61400799027)(43022699015)(6059299003)(9140799003)(82310400026)(10067099003)(261009223027099003)(5063699009)(56012099006)(261021123027099003)(261026121527099003)(261021121427099003)(261022105027099003)(261026140227099003)(261102123227099003)(261028144727099003)(55112099003)(22082099003)(18002099003)(16102099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tbW6AK9oA4Taq+QqPiTbeNHAX7DN3l36gwETYZugXpULrZbRf2WQfPStKMS14b5y6xYA5ITGi+UzYfUXg4cf7guYg6J0ht4SIe7C0IG2+FbZwf6dIAh/W35o5O3D9pbY3uXbFH00dfv/Blo9DR3kC/6mtizkPnthYHrYVTRTL7wfxElNO96pi9P26j3MYnMx57YVFXgeQGvr2RymMJOfX1VpUyMZF9l3i3nb8nuMElpotkrqZWDKk6JPjfJEVpHomXnUPDR1lIHNZuBVZ1/0/Su0g+uRa05CoMqGMc2DD3nnnZj6ZjKlnG23Zd9Zh8GAjn1rQ9jqy3WabFFT9EJjYIDwH/MRbw7b7Toc0zPYQBgDpQI7Uzu4OHz/1CKSRRUehAsk2wOi0IuSFaxRADCV13jcqGniaPOMavyaemgliNjlJ5fWTgPW+juwuvd1pilQ X-ExternalRecipientOutboundConnectors: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-Auto-Response-Suppress: DR, OOF, AutoReply X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2026 11:19:21.6533 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a08b306f-c569-4c33-fd62-08df3fe5a28a X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-AuthSource: MI3PEPF0000847D.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB6608 List-Id: From: Denis V. Lunev x-svm-features-compat keeps every FEAT_SVM bit when svm is off, including the defaults of the CPU model. QEMU 8.2 drops those through the dependency on svm, and libvirt checks the QOM features of the incoming guest against the definition sent by the source. Every AMD named-model guest of a vz9.0-9.2 machine type without svm (the KVM default for all named models) is refused when it comes from HCI 7.4: guest CPU doesn't match specification: extra features: npt,nrip-save so hci-upgrade from 7.4 cannot evacuate a single node. The compat is only needed for Vz7 host-model guests, which run with npt=on,nrip-save=on,svm=off given explicitly. Keep just the FEAT_SVM bits requested by the user, both against the dependency on svm and against the host, and let the model defaults and the bits -cpu host takes from the host go as they do on QEMU 8.2. The guest cannot see any of them without svm, so its CPUID does not change. Fixes: e51cdbf863df ("i386: keep SVM leaf features without svm on vz types up to vz9.2.0 #PSBM-144630") Signed-off-by: Denis V. Lunev --- target/i386/cpu.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index e22fafeaef0..6b68eebc35d 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -8998,15 +8998,15 @@ 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; + /* CPUID leaf 0x8000000a stays empty without svm anyway */ + if (cpu->svm_features_compat && kvm_enabled() && + d->to.index == FEAT_SVM) { + unavailable_features &= ~env->user_features[FEAT_SVM]; + } + /* Not an error unless the dependent feature was added explicitly. */ mark_unavailable_features(cpu, d->to.index, unavailable_features & env->user_features[d->to.index], @@ -9168,7 +9168,7 @@ static uint64_t x86_cpu_compat_kept_features(X86CPU *cpu, FeatureWord w) } if (cpu->svm_features_compat && !(env->features[FEAT_8000_0001_ECX] & CPUID_EXT3_SVM)) { - kept = ~0ULL; + kept |= env->user_features[FEAT_SVM]; } break; default: -- 2.53.0