From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from DUZPR83CU001.outbound.protection.outlook.com (mail-northeuropeazon11022112.outbound.protection.outlook.com [52.101.66.112]) by lore.virtuozzo.com (Postfix) with ESMTPS id CEF6B80E7E for ; Thu, 29 Oct 2026 12:25:46 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=aV/PNriAIPjkcCxxFqbSTlNgbU3qbmK4iE6aM5ErsRs0QAhyov178FmjPZaVRnrECIuCO4L7GyFvuFGp9tjRgLP3JmzrDpghByqhrXfo5rU4QUEd8zhmW25v5Z4KZ6haU9+Iy42Uphe11z3KRS6ulloj6Sho0Yf2I2hSLcEkWtaeXZrtIWB27MB0fQl7OjHbeZhiOX6ZxfZ1kAa/I9G6E+Su2rQEpJVxVcG34rEF29DGW+suuUM6WaxydtkI5f5W5M3XlS2I7ftiy+sn4UCzdStXxtBfLtJqTs9SasUOrqV0e/h/rOTRv8OxXSlRg0P2+OBBQjmq48y+BFsHhs2OKQ== 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=F7LPQ2KevCqyOETr1wsDDPEaVO53MScHQlNnFjn3wCM=; b=V8K2xEtldiqrOfEgak5tHM4usvTRnagE7UONkN68xQdgHUgFi4oFgB4SSiH6NQhoqMlvazb2fZeFpDKTmuZFwcjd2Z2z0qTDlLYCr2ppzfVmL8Z5Ckf5MAv//sZmxvgzcInGHnalfpm7vD01WrADCAezpB+y8pFq5I1AntnKrk3qHRJFSfUMc8XKtuSF70qO9jq+sHR/9ElwakHKbcoIEgQXjEcvBJo6FoEjbmv9yb5zwZpCxlQaDFJG7FEVtM7fV2jn6p2RER3r/8n8iLmXz3dVwtivWymW2zSr6iGd7BS/XVeFhVJgorIWYwxP5V9xouedPksFVel8faMxvQD8MQ== 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=F7LPQ2KevCqyOETr1wsDDPEaVO53MScHQlNnFjn3wCM=; b=KFrgG65w5Ul2d6canoHXCFYYskSXISS2KSOlhSla/NWhH82c1+uWXqKyiW0P7Fqj+OKhBuIaHka4iVJCC8ao43d3ycF0VUykBK8DuYDA4KHeHLjWThSAx9i/yYFeDdZLC8SfzFjbpPYR7afTLc/JSYJznxO0Hn/8K3Z8HKNwCzY= Received: from PR1P264CA0102.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:2cf::14) by GV1PR08MB8619.eurprd08.prod.outlook.com (2603:10a6:150:83::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.569.9; Thu, 29 Oct 2026 12:25:37 +0000 Received: from MI3PEPF00008556.eurprd05.prod.outlook.com (2603:10a6:102:2cf:cafe::9f) by PR1P264CA0102.outlook.office365.com (2603:10a6:102:2cf::14) 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 12:25:37 +0000 Authentication-Results: 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 MI3PEPF00008556.mail.protection.outlook.com (2603:10a6:298:1::8a) 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 12:25:35 +0000 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4a210470b49so16848325e9.2 for ; Thu, 29 Oct 2026 05:25:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvz.org; s=google; t=1793276735; x=1793881535; 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=F7LPQ2KevCqyOETr1wsDDPEaVO53MScHQlNnFjn3wCM=; b=i6Yfoc2kaMp+KEKpCBiOxg6dwUTPxpNTj3/bdaBgvOWAEjibXAjYD4Urqu9F2BBoqC pCjta+pqLsRGMHLRuLNDQA6xTKsLjMciwIkQxIWKfh6GKl1ltmUDlgBrqjXT4xlx/T20 NztSAqViq1LuTowrZJhMAVw9ao14As+YQ83qiLxeasWaAC4PSHp2EAsq963pqDzLnetn TFZ1XTZBXp1HhRAZuTpv8zX97kYVtXtSXDwVUxfbNq5guqNmvFGdJYJa6RFx49rZt8fJ Q0vHv8kEzxAzVdrtUZpbih++xeltPtE0W7sLLr7PEd+LyNo7YQ36LFbYs+FrXI5Jawu2 f7tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793276735; x=1793881535; 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=F7LPQ2KevCqyOETr1wsDDPEaVO53MScHQlNnFjn3wCM=; b=RYqRtJPY/t74uTtP+BJwWPRxi45JoMqIkDVAs2++0CWLsnKmr7cJpAkQJIzp4keORh r+IoQbG737tv3pzo9g+SePilxExpacTte139pjc/dbVmBf/r5aT9v3ur9KHggAtm5Vgc XnPuxexZWFzV3jd44FCN8JRbPfpeBjL5W5G1ri3lBl0JHvoNY1cQaslQuyMOPU2U7aOo GHRSO3qxUnAwG48RrZsH3LEAzpu4XRRlVirgIMxlyiW6ZqKgnaSTRPfKhEFmvlyZ372J PbTgYuddK6Bmh+stBMk4QH4Q+VcJxb4ztxFcyahZYR/epXofxJ8n2aS6+2SGIdHefc3N YNoA== X-Gm-Message-State: AFq9FYJIpm7DiUDpZjU2DNU8JxfwQO/yKd8Rq1iMHypifjZGx3jc4Hc8 K6fxGNHFGhnt+uZbpBwKMyZenLbBZyxDDiqmtAU1n9qvlWUyjgie64F2pbIcn/lFeJD5OQ== X-Gm-Gg: AYBFou3kBa/MgswkAbaazkLpHJQ1du+8AEFbz12/LVn79Oob2FQkgZrm4WVpJlN8ZGL RPLOZku67+8dIbDsJqfexPU678lYMUSKejIbYn9VIuY0UunhaEA48yZXLKaaHoJoYzTSNGr6myG 04YA1ApV9d/aVlLk5oVcF10Q7D1PY238+5nVyZ30Uyu+c4hxfVi8jI62KCAMcqy5XjiuhSx+69d k24vxhhXWaEvWcHvzmRxpRTUfCXsAk9Ce05nMIh7Vz0aofAvGk28u+WHinVflK7+uCAPR95cAm7 eaTT55LpYkioKG3rZ2zX3ZzW5Racp840JdJfBGpCJki8W1l1Oo1g10sSkH6800pAwscM25jZM4n 8LeGJU7yDUY8KHBhrzwy+rjx/B3H30ahd+E5cUL9gzZjXwNlycZSb4p5oHpaKdIqOoRySkpRvFP lK4In8dr6RB2C0q0BcyGocu+SMLSiW7It5wK6G1nKw0VIrNLlOXWlPe0PpG2GTmfWzp5s6mOnxj YXEyjKtEiNdcOBYVEwU8PjbzLOj+2SkYsI6iYtT/jm86uhg3d3vu9HMxNRsOE4kADg/HkwMQDrC yK5lec3Ln647q58HlxqelQ5ASg== X-Received: by 2002:a05:600c:b99:b0:4a1:a45a:88f with SMTP id 5b1f17b1804b1-4a966c4113amr113287695e9.20.1793276734816; Thu, 29 Oct 2026 05:25:34 -0700 (PDT) Received: from athena.sw.ru ([2a06:5b06:b600:300:f4be:f111:4ee0:40d3]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4aa80285b88sm62423205e9.14.2026.10.29.05.25.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2026 05:25:34 -0700 (PDT) From: "Denis V. Lunev" To: andrey.zhadchenko@virtuozzo.com Cc: svt-core@virtuozzo.com, den@openvz.org Subject: [PATCH v3 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 13:25:25 +0100 Message-ID: <20261029122527.365104-5-den@openvz.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261029122527.365104-1-den@openvz.org> References: <20261029122527.365104-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: MI3PEPF00008556:EE_|GV1PR08MB8619:EE_ X-MS-Office365-Filtering-Correlation-Id: 75412690-632d-49f8-f85b-08df35b7bbe3 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|6059299003|376014|48200799018|61400799027|9140799003|43022699015|82310400026|5023799004|56012099006|5063699009|261009220027099003|261009221727099003|261009223327099003|261009221227099003|261009223027099003|261026140227099003|261028144727099003|10067099003|261022105027099003|261021121427099003|55112099003|16102099003|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?T9mJJRj8+GZhs55xuTYb4vN9nc/iCwA5SBOzT3HfXjTHNs/SM4UDKB77/gWv?= =?us-ascii?Q?+MuwrSAIjwrIl/9+IuDZInIlz/QYS8PuXSgPZCUUk/i7DKuGHsVX4UziFuaX?= =?us-ascii?Q?ECQZ4/42N76bwvoIHMDvU/CbyBVNaH/jG9I9Rp3XfvUCqO6SFA4GBNfcbZwf?= =?us-ascii?Q?vhJMrDK7ZLOQnVr3JAkVHAKrVty45xlvgKCNz4AEjbJH2++rS0U+A6ISnEeT?= =?us-ascii?Q?1AaHiBfSLqFdEJq68ANlwIV5tyCNFYr7E+xshFby68H7UrhnuSblvoyg9Yk5?= =?us-ascii?Q?BmzkyUSIKg6Gl3ceWOgGaON5bI97bYtZWfUh7t66g0AiywSYDIE1KrjHRnkC?= =?us-ascii?Q?SMnbftJZtCRfZbVDfJ2epWHtiBZvpiDoPC/r3nG0PipmNJw0cTyIEmDTHzgV?= =?us-ascii?Q?wxMXL08gQ5qxHl8OMSGbxNiHcuQDk0rCMtrZ/jfk+2i3Kz7OGCL0RNL5H6lN?= =?us-ascii?Q?ZDUe7xh98a3z9UM9kNZ/+1j/OusifoLncSwaPq88aSuvebg/qD7WaYMOUPO6?= =?us-ascii?Q?aXcd7loEC8+D7Vcy5l7il7h8rAbomhG/1ZGKcPHSzEo8r72ZVmpHwf9jstyf?= =?us-ascii?Q?bd/YRoLmOZndsAhozVByc6Pp6xsvgxPikr+BoUkyF3CeiXz1k1NoHPOihkfP?= =?us-ascii?Q?7SOUaxF98EWczjbwyOsdypLbDH4IqDx3OZUqoTIYykTBCxI4M8xML10aVAQl?= =?us-ascii?Q?qYkmBE7FOrPLIuMMWg2NJoXs57hEdIeb/E4v8v/6vVr3+4tRRp+JANG20h1A?= =?us-ascii?Q?xFnsJ400rQ3CdgdxPLcIxA/UrGe4YSYTEmWGrO3yw0v82Qz7fz0Jf2TWhyJD?= =?us-ascii?Q?9BLeDdOsOEbSKf5N1g6ScgIbM2M0cDRpOjKm9hYNBxdPmySOQ7aE8cc6go2Q?= =?us-ascii?Q?PvCKJex0Q0xEs141/FjSc/v3nJVwKLyoWcKskZILJLJ8Oqh2BNAZnUnPboFS?= =?us-ascii?Q?+gLj12hPYfTLS/j8bNnKjcX7MXvB290N1vhQOw6ytmeaKN+V1IKCTm4sIHuJ?= =?us-ascii?Q?/+LI0JduqOCZwYKGpLpytyekeQ=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)(6059299003)(376014)(48200799018)(61400799027)(9140799003)(43022699015)(82310400026)(5023799004)(56012099006)(5063699009)(261009220027099003)(261009221727099003)(261009223327099003)(261009221227099003)(261009223027099003)(261026140227099003)(261028144727099003)(10067099003)(261022105027099003)(261021121427099003)(55112099003)(16102099003)(22082099003)(18002099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: eARptt4M89ILonPvP9e8xuZXYoO90sSa8eGv0M9ZZFM7jSUuK+FhCOl3lsp/vlsjKCnxhUxxvZnygvK85uxAKYjOyVvOrDhOFwcPU/8FrljZiCFaG0cIx5kcn0N24cnHr+5exmGNSHvH9UJPFyLvnt2AIqfDQTGKmYRpLoXeqPWVrytWS9qEOGUMBc1IIXIg9Hi3qN4SD3+LDA77tYeJddP7RQgf/Sy5pV72UtpPxtcsBMXxWuCtbPV+dk/oRgNZfIoiyp6GO0BzFf4/tfsPkqr3KAEAZI//UU/qJstYBgYabNVLyjVGL8M8vAY0ztWyCHdDxLIxZuNLTxF7xcd2j0fsPD6upMBv7EV8pBVCy5obOzHtiwEi3/azE/PIP7kvrPnCaTEZaStHy2fp0f28hRM9oMT/mPFYQp7uGSBsN8ItW+lalXKJBGZnKchitycf 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 12:25:35.6735 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 75412690-632d-49f8-f85b-08df35b7bbe3 X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-AuthSource: MI3PEPF00008556.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR08MB8619 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 Acked-by: Andrey Drobyshev --- 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 27fefaeaf71..a3c5c9ce1a8 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)) { uint64_t msrs = env->features[FEAT_8000_0008_EBX] & @@ -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