From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazon11021099.outbound.protection.outlook.com [52.101.65.99]) by lore.virtuozzo.com (Postfix) with ESMTPS id C989680FCC for ; Thu, 29 Oct 2026 11:34:47 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hRwIr+NMTwSUO61cP1GOdNS1CUHNiDgPFpS2zwPN11a2EYH+u8Vq1SliA/UaUuUtXphmRiNnAoD+tud81fnlhao/WWMykXKppkh44EyrtJ86fMbnw37j+/LWzYs1Tb2lZIb4efXdnoPCmyo2+wSMR6l3+9VH7HEDs69U7Ye2r80BeSmG/6U6FAbFrQPFyojE9GboaZK86fukqCaKgZlF/QUayOMN/C1ug3VhSiI2UghzmCnMkgZGlnQ8GT05vxvbXFh4HQpNhOG5eTn+NemMHNVOgjVugbyId4f8QPiRDPfW2bUkyPynuZNw7JLHNP9G1/pS5dwnUJsNSg+FatuXTw== 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=FxYUZi35IYXqakEaJt1uIdLs+aKRMHbpMM6p4bKQQTA=; b=AtQNvDPcl3LB0ioXDE/TW7rDXLjONV/jd/fLxQ+KhIl8Xakt/wxDVhHGkQC8gc5En9Yw8mSP1KWfMM49fnT2jTC0vCfCyr/10BQGRZE4RRh2fy7Re/SPaUkmYOmi3DltImgWsUCk3ZFFB8scOfJjGjxN5XXDTpPL6qE8AgT7YKu13uGe2Kr316SPVN9azEbCECMohhWc9u7Uv/z+dHn1fK0UlOkxbyaq1UYbmp4eWFCQnucqI5OoGrHu/DkqFQQqmhUJHjd/B1Znrn86J2Pm4UUnt+Gwi+EoxAOlcrBgILnlGjRpOobWu4EclYvEZgkmd/azRNgMvJ0skVrOV/oC8w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 2a00:1450:4864:20::32d) 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=FxYUZi35IYXqakEaJt1uIdLs+aKRMHbpMM6p4bKQQTA=; b=HJaLg4dLDu0EmK8IWjMOWJ8gCNWfl+7N3Vw6OsT2rPBAXXNMCBY5JQu+Jxz34LJc/X0hUdP3Zv/ulx2iH3zs9IyqUn05uGDzDq2K6vqrdP5MH+sYcvdmJPqxyrFa9d3S66CjHQPVKnhI74k1KUCy6A8eGn2jR/QJzABqYoGHzuU= Received: from GVZP280CA0090.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:275::12) by MI9PR08MB051927.eurprd08.prod.outlook.com (2603:10a6:290:84::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.546.22; Thu, 29 Oct 2026 11:34:45 +0000 Received: from WA1PEPF000099CD.eurprd04.prod.outlook.com (2603:10a6:150:275:cafe::2b) by GVZP280CA0090.outlook.office365.com (2603:10a6:150:275::12) 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:45 +0000 Authentication-Results: mx.microsoft.com 1; spf=pass (sender IP is 2a00:1450:4864:20::32d) 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::32d as permitted sender) receiver=protection.outlook.com; client-ip=2a00:1450:4864:20::32d; helo=mail-wm1-x32d.google.com; pr=C Received: from mail-wm1-x32d.google.com (2a00:1450:4864:20::32d) by WA1PEPF000099CD.mail.protection.outlook.com (2603:10a6:1d8::165) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.569.4 via Frontend Transport; Thu, 29 Oct 2026 11:34:44 +0000 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4a214af2076so16725965e9.0 for ; Thu, 29 Oct 2026 04:34:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvz.org; s=google; t=1793273684; x=1793878484; 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=FxYUZi35IYXqakEaJt1uIdLs+aKRMHbpMM6p4bKQQTA=; b=RW7K4uQWPREeQ+omkoEmTLYBmR79o/KGHQqab2/yl3YqroiB/n6EozX4ydOLa5IYM+ o7BwFfCs0D35OvWL5gaHrh0dXlyOE65ZxrjmLeRzuBEc1kjwnatG2y5j2r7ICgESYspB JIcOys6noDftI27PFHSDU39R42wlQFyUwJU8rGuf6Ow8wx1u6PmbI9S4hMb3zV83O4iP EQIq5ruGCnFiYBazRKefpXbHsNNOZuQalUAlCCMbGxJuxunX/PrN7PLjiDUuSfmNtvkc b5mg/xj6KchqrKhfDB9/6VEt1/Xew6LIJFcTrcGlXTJYZYf+JMXOG9ojmmHlxZTaFbbA FaMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793273684; x=1793878484; 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=FxYUZi35IYXqakEaJt1uIdLs+aKRMHbpMM6p4bKQQTA=; b=XjxjO1U18CRxWMc3eeYt1wrZlRG8XCVJdDe0kUSjlRbobqeMnptr4qCgoahAgFMPLl wcnNSa6mMjfb9dgtL0zn+tX6DvB+tsDBlgPUQR7cjv9Jof8/7tXLPAbM8uT4x7Yt9nbi FHv3UFt0CGtxkBDOZGCi9/ewgY6d1Q7CBWle8PMiNqQaqWrv6bIUqmABxgJhK9j5OgUN VnnU9iCeky+xRMhWmu7yx4hZ3ro9ymwQB9hgOnnLTH71EQmB/yOkZQxniI9T3W2jfVnb ta/WGpPQdIq7illOnBCyFju3oM/6BHkpXXbWy60aSb0PZyyaw/KLFJJHXpzU/CLnKuxB NYbw== X-Forwarded-Encrypted: i=1; AKwUvByRLQlT+VkrDz5eLMSQD9jz8owR2Zj30m0YSbKS8jo62B6Z1Bn4DQZXnA21TQwKDdDmbp1Ktq/jZw==@virtuozzo.com X-Gm-Message-State: AFq9FYJyMjv/F0t5nyXPUjxCtnibxFcTPaw5zji/2JTzFnxoktmF2NdZ r/L1DKEo+jicYtbIbMJSqEYhdyF9OyvmE88Ebi0PHKlT/JymcLvBTf1YLSpKHLBqCZKd6A== X-Gm-Gg: AYBFou16JmAQa+QnBEalPG9fr+pN63fli+Y2wFmLVyratOoM1cVoqJ8CmcpBVR9y77x Ze5qQ1SMnzVNZJyL8ct8hniwUN2JdppdV0ZtEtH7WIOzNvJG8PSDQlhFgB1yH4r2jS2+mVUftjS 18aG5D0MC7wBHJsEXWVQkWZQzsr7QhHgOzna+upXvQ7qXxLJbF3BIfc56lCEqKA09vUtDYJs5al QcSZRP15yZILObM9qTzhcZgX7Y8PGiM3nf3dp7IoC+5we4s0boky0hv4REhLkTUbjIXD7IpfxnV Bi9bgxDl8ICJAKnb+PnaqClo6xG9f+plDRqf5yRuBL5YCdpVOzcKrOW//0I876UkOEcKdhYYGgt Ax2Z3ytjeppzLc8+tT/YqCPpqqzEKd0RxbdOy6qaLLHC+hO7I+wKKHsS2EmWZmof1D60LtnZvS+ DN9YEy4NHTSiStu16TwAxej+bbkHTHa7qwOQu53BOAGOWmn7a+drM9Oqi/lR1Vmum4Gi/Je9gH/ nhra+UFqs+xKktli0fwZaQkjvnhyM1DtSa6tNmZAMj/fWU9QJcPzh0Aey0eo+Avq0UQbQTTCZuI MNOLXZ5WS1KnLD4yJDLQ/U3N2I9OWrpb3BpIE6zitReh/Vg= X-Received: by 2002:a05:600c:524c:b0:4a2:86b7:b76e with SMTP id 5b1f17b1804b1-4a9661ab517mr110797215e9.13.1793273684102; Thu, 29 Oct 2026 04:34:44 -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.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2026 04:34:43 -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 4/6] i386: keep bus-lock-detect for AMD guests on vz machine types up to vz9.2.0 #VSTOR-152291 Date: Thu, 29 Oct 2026 12:34:34 +0100 Message-ID: <20261029113436.93521-5-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: WA1PEPF000099CD:EE_|MI9PR08MB051927:EE_ X-MS-Office365-Filtering-Correlation-Id: 33e199f2-1c64-446e-dace-08df35b0a177 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|43022699015|6059299003|61400799027|376014|9140799003|82310400026|48200799018|10067099003|261028144727099003|261026140227099003|261021121427099003|261022105027099003|261009221727099003|261009223027099003|261009220027099003|261009221227099003|261009223327099003|56012099006|5063699009|5023799004|22082099003|16102099003|18002099003|55112099003; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?k57GM0TFEup4mtArLmCl09yP0jp1VsZAvszKweuUKorwVCImDXg+FREtiRaI?= =?us-ascii?Q?nOPNNjpcVvI921fuwPiRj4TFr8sO89wtxf1oAQMJJpAzgBW93OBM2pDtQDvj?= =?us-ascii?Q?y9k6yGqjArvmBr/4MKXTxSM1vWIR1/EtdTHtJseRvcVIyReJrLBwGB2vleOW?= =?us-ascii?Q?JXLm71WRR8aDXEdTGYYHPumcRUbOtZhmFTmtaocZ7iIbhJHMtuVauxrdXBm1?= =?us-ascii?Q?goebM9VjMg1HV8XxxtBs3hNNXLtGzfW4+TejiVZfK/115MU3GVPTsH19XbR6?= =?us-ascii?Q?3z6+ArBCYeLXcc7jOB4CR0XWygu1kSVj7zhbs7L4xN7hGOmuoOo+NdRf5v3s?= =?us-ascii?Q?hNYYEjvJ04f587VinOYIWfppsWvY2NTf/66IHLFc/+RauU1l3QjBBCWvwBmk?= =?us-ascii?Q?sOBzPcLkubThDvL20pLDjoZxCgD7pVhOdKzqjN9cxy4IeohJYGmSxOzxWl/U?= =?us-ascii?Q?Gwd/u/+o3WQWTbECbHgocJknbSo77QXviktAH9iUxV/EmdbGIj1ngUdIDWv7?= =?us-ascii?Q?egoNRVmBJuooGix/H/tZqibJ7CDju6jRhfzMz9LBgdGsQ2/sycF+B7xM9hig?= =?us-ascii?Q?u+R/DkRLWVFdsquyFuzX24YhkR+qNm1DD5fxCUrxonXY0KYueSOGcLYto/FL?= =?us-ascii?Q?/ofzN/+OMPKVLB6ETMQsa9aYYwWo+VzJ1N6csf372pEvik0hhPwgN1zjLPWN?= =?us-ascii?Q?NHD5j6bO/rEoPlaXJq+B4bB6OiMRBoC/7GZrfvwau5MHTL59wp/YFXtcNojI?= =?us-ascii?Q?u0eHMFbFiWWF6RNe12FY5cwkABNDZTNN5eGwRYcRfNAMQuUvVr+jDvBkmMa5?= =?us-ascii?Q?xgjiVnzM0sh/2BRdz27kBeQwfR5jSI2uHI9dJWF7hTon1c0Mxdl7CIGAQtYR?= =?us-ascii?Q?aHjEvIWeLLQTJFcS3WviI8BLsS1BKIoHka5H/6Ia4XeDR7zyUd2AQnYvGhRc?= =?us-ascii?Q?hb6AO6VzBdoj4n4B/w4+E1usA/YgucQ/nAT3wgwBzdzvf5TKUqNzTwOeYJgN?= =?us-ascii?Q?kX1JD2vy/m7rI5igAh71vIFhzQ=3D=3D?= X-Forefront-Antispam-Report: CIP:2a00:1450:4864:20::32d;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail-wm1-x32d.google.com;PTR:mail-wm1-x32d.google.com;CAT:NONE;SFS:(13230040)(43022699015)(6059299003)(61400799027)(376014)(9140799003)(82310400026)(48200799018)(10067099003)(261028144727099003)(261026140227099003)(261021121427099003)(261022105027099003)(261009221727099003)(261009223027099003)(261009220027099003)(261009221227099003)(261009223327099003)(56012099006)(5063699009)(5023799004)(22082099003)(16102099003)(18002099003)(55112099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +8DXA4d1GoSfueRk2nTLjgD5deKUgaEMUEbFuHT14BJsIVfgPe+aSQmYn5VYgFv5ICmnYJ7EfxiZO8I20vuJcGiBacRDIMuGcROes9vf8AYD3dyMo2zK5AfiCexbv5YbE47iZLeDc+IDsNXphBqk16LRsPZirlZBQhNq9YGlEgqd57lrwwmkG1I+0fj/fFdfNsDqY9+YBoe6b6iF2F3BiPstUb9Fq/bM0mYMr0ybWxx0UKsmdnbL6Ir/WXcC3QjFpEzG/+qz55sWavpVkPHan3wOEwWa/SBLXhCgzqgHYBgKkOjrmYkZzBungfMZwfcYE4ACsyVBGILusAV6v+ufgCmQTNkUvERhuwiYOUTGgf7vJkmC9d/6rVll50pDGIWSrcIc3uVR5cdF76U/MGkxZO6bhtapBIc1q2LoDrYaAXmSk6rAUrDK+TWghdumTyt3 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:44.8309 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 33e199f2-1c64-446e-dace-08df35b0a177 X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-AuthSource: WA1PEPF000099CD.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-Transport-CrossTenantHeadersStamped: MI9PR08MB051927 List-Id: From: Denis V. Lunev Since kernel commit 54950bfe2b69 KVM on AMD no longer offers bus-lock-detect. A Zen 5 guest started under an older kernel has it in its CPUID, and QEMU filters it on the new host, so migration, restore and snapshot revert fail (VSTOR-152291). Add x-bus-lock-detect-compat and turn it on in pc_vz_9_2_compat: an AMD guest keeps a requested bus-lock-detect. The guest loses nothing it had: bus lock detection did not work under KVM on AMD before kernel commit 62ad461079e7, DR6 bit 11 stays fixed, and a Linux 6.13 or newer guest only logs one "unchecked MSR access" warning when it brings a vCPU online. Signed-off-by: Denis V. Lunev --- hw/i386/pc.c | 1 + target/i386/cpu.c | 7 +++++++ target/i386/cpu.h | 1 + 3 files changed, 9 insertions(+) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 95ff2e7860e..91198e8996c 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -551,6 +551,7 @@ const size_t pc_vz_compat_len = G_N_ELEMENTS(pc_vz_compat); GlobalProperty pc_vz_9_2_compat[] = { { TYPE_X86_CPU, "x-tsx-compat", "on" }, { TYPE_X86_CPU, "x-spec-ctrl-compat", "on" }, + { TYPE_X86_CPU, "x-bus-lock-detect-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 872c00fc983..84abaf1ae31 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -9116,6 +9116,11 @@ static uint64_t x86_cpu_compat_kept_features(X86CPU *cpu, FeatureWord w) kept = CPUID_7_0_EBX_HLE | CPUID_7_0_EBX_RTM; } break; + case FEAT_7_0_ECX: + if (cpu->bus_lock_detect_compat && IS_AMD_CPU(env)) { + kept = CPUID_7_0_ECX_BUS_LOCK_DETECT; + } + break; case FEAT_7_0_EDX: if (cpu->spec_ctrl_compat && IS_AMD_CPU(env)) { uint32_t ebx = kvm_arch_get_supported_cpuid(kvm_state, 0x80000008, @@ -10095,6 +10100,8 @@ static const Property x86_cpu_properties[] = { pdcm_on_even_without_pmu, false), DEFINE_PROP_BOOL("x-tsx-compat", X86CPU, tsx_compat, false), DEFINE_PROP_BOOL("x-spec-ctrl-compat", X86CPU, spec_ctrl_compat, false), + DEFINE_PROP_BOOL("x-bus-lock-detect-compat", X86CPU, + bus_lock_detect_compat, false), }; #ifndef CONFIG_USER_ONLY diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 740fb3aedc5..b5e2d88d5d5 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2338,6 +2338,7 @@ struct ArchCPU { */ bool tsx_compat; bool spec_ctrl_compat; + bool bus_lock_detect_compat; /* Number of physical address bits supported */ uint32_t phys_bits; -- 2.53.0