From nobody Mon Apr 13 13:32:48 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=quarantine dis=none) header.from=mihalicyn.com ARC-Seal: i=1; a=rsa-sha256; t=1772809726; cv=none; d=zohomail.com; s=zohoarc; b=ibg+m7OdB7mLY1202bDp7ulgySxAFRDPgovIDThiHtqMBOVWS6umrcd1UGQQj4wDhcK6rJkt0QL/H+PYYrSukayNIayy28/lLGLFblzPJM4dFuEUwz5qaXrpZYIT5ve/q/6dzf6bkIbCehw7i7ZEVPZ9wk3VSb88axHazsnyZas= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772809726; 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=ZTBRdCe4EKhZ7QFgzj0snqvNaQKXZdaqV+19ND1Hpu0=; b=OwybBFErhrtGl/hsPMH9rO97p7XFB0M8JXPkZFy7VGr0RLX3AyDVj1VqQdK0o8RAkE6VjPGp6/MDVSwKTHFKz8pHxmtbqY2yb9P+KSgV0nVyCk96607IvdHpWVpuVtGvk5V9EXB5E5fI0QX5cQCilMCk/fOJgdJXSbwQ/yALslU= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772809726776995.0306112633159; Fri, 6 Mar 2026 07:08:46 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vyWiX-0007Et-NL; Fri, 06 Mar 2026 10:03:53 -0500 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 1vyWiV-0006w8-1N for qemu-devel@nongnu.org; Fri, 06 Mar 2026 10:03:51 -0500 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vyWiT-0003Ja-2q for qemu-devel@nongnu.org; Fri, 06 Mar 2026 10:03:50 -0500 Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-b9431300833so105979466b.0 for ; Fri, 06 Mar 2026 07:03:48 -0800 (PST) Received: from alex-laptop.lan (p200300cf57228c00583f1937c9b9cecc.dip0.t-ipconnect.de. [2003:cf:5722:8c00:583f:1937:c9b9:cecc]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae36785sm4703623f8f.27.2026.03.06.07.03.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2026 07:03:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mihalicyn.com; s=mihalicyn; t=1772809427; x=1773414227; darn=nongnu.org; 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; bh=ZTBRdCe4EKhZ7QFgzj0snqvNaQKXZdaqV+19ND1Hpu0=; b=SM46xUtGsgh2mVP7iK1ZhTTYLCe26dwEfOWGNxIYzzz8cYfaFrrmgDZ/sFNiW7FbEs nFExOKNnD8Fw/LstbmNl5DFrlg56wFC+SZDWPfeEtbfojLo/IBzFHXHzdESbcmev+wrm /q0E9utZH+AX8fSJMnkQGKi528QeEdNCMjass= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772809427; x=1773414227; 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; bh=ZTBRdCe4EKhZ7QFgzj0snqvNaQKXZdaqV+19ND1Hpu0=; b=VONwvqzgSEW2z9XgjSSPuKBixnMP/Uycn/iZvmZgZofQwgQqQS4bpFDsik1SJYHu1h H99z7cJyYR2VdPWec7VbWGWhqf/aul8cpEAQMK4tdC0Jd1Kl5xubskC6H1two4nSRCOd 1B5msbTMIZ4GB5h6D6KCQ9bD/s3Ch464NaQ45TBWA8SszMy4997bGJlL8I3wi06tZ9SM f9dWFHH/1872vurORcDKdXxiY1pq6+W7i5MK06yCSMgqa7uIYtB9VlBGpR+nRpARGD9f wSsYFntv+L0wDniK0XXQNLGbZVSLtq2KXBTDRdiXav1Ro59wBa+jvgIEmXfTgJuUKbCb QmDg== X-Gm-Message-State: AOJu0YwyXmzDqNFOAwajgvJ833moWiMMsCGM607t0oSuIMrQuz+FVZta bxbciZOhpgjz60maxMMXiLhDftLF1RoLd30gAL2G+y+c1nQKiLc3dANNHnlwvjbD+P5kEGc4mYm 3EO56VCQ= X-Gm-Gg: ATEYQzzVC1TRlwRKM+T6T9S6A1OAeKRzDUm5c26a9pqgUflgz/K/ty/d/rCkEs8xZD6 pGu3rIxAqnFjJ1cuoy1eH44aJ+g4QjUeV8G9M88eZI1KLmyOZRA8ugsEEPCyxHzezcMf7tFpkPd rtlU5L9agXhi4QiyQNWuZQIXUpc4x1lQO7Hg5oLAUsXkFtJJ+2+jCEZNOt87miiJtBy5GKyZ3OC nEGlJ4oJZkpCaseERAw31dVnA97pmrlioZVJpuACX6EiWfVltfbDh3VMXZpCei0z3ir/JFeusk+ P+sBR54r4/ioXU/ChTTeSJTyoOC+Q3CPVedOd1ZQ+aV8bXYs2/GTDOK6GYeb8JERnAJCEcYn3Ms joqUXsr0P9TDy5l5S21q7Ev4wlZxfW6/fBmRipaHPAGrPvQXGK/71CrT5HaPiFIUH5QCw574hN1 mwWan8I3gzeWAkFO8+2UetEnXpLns9QcVSdB3l3UsZz8iWvBZwlZP/1UJObleRQ0fmonkx1m+Po i/poO39AUZTA2k10gG3SKg= X-Received: by 2002:a17:907:6092:b0:b90:ba11:1694 with SMTP id a640c23a62f3a-b942dfbd66fmr150488866b.50.1772809427194; Fri, 06 Mar 2026 07:03:47 -0800 (PST) From: Alexander Mikhalitsyn To: qemu-devel@nongnu.org Cc: Zhao Liu , Jesper Devantier , Alexander Mikhalitsyn , Klaus Jensen , =?UTF-8?q?St=C3=A9phane=20Graber?= , Paolo Bonzini , qemu-block@nongnu.org, Keith Busch , Peter Xu , Fabiano Rosas , Alexander Mikhalitsyn Subject: [PATCH v3 3/6] hw/nvme: add migration blockers for non-supported cases Date: Fri, 6 Mar 2026 16:03:39 +0100 Message-ID: <20260306150342.395923-4-alexander@mihalicyn.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260306150342.395923-1-alexander@mihalicyn.com> References: <20260306150342.395923-1-alexander@mihalicyn.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::636; envelope-from=alexander@mihalicyn.com; helo=mail-ej1-x636.google.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_DNSWL_NONE=-0.0001, SPF_HELO_NONE=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 @mihalicyn.com) X-ZM-MESSAGEID: 1772809729642154100 Content-Type: text/plain; charset="utf-8" From: Alexander Mikhalitsyn Let's block migration for cases we don't support: - SR-IOV - CMB - PMR - SPDM No functional changes here, because NVMe migration is not supported at all as of this commit. Signed-off-by: Alexander Mikhalitsyn --- hw/nvme/ctrl.c | 35 +++++++++++++++++++++++++++++++++++ hw/nvme/nvme.h | 3 +++ 2 files changed, 38 insertions(+) diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index cc4593cd427..4694bdb4d02 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -207,6 +207,7 @@ #include "hw/pci/msix.h" #include "hw/pci/pcie_sriov.h" #include "system/spdm-socket.h" +#include "migration/blocker.h" #include "migration/vmstate.h" =20 #include "nvme.h" @@ -8962,6 +8963,14 @@ static bool nvme_init_pci(NvmeCtrl *n, PCIDevice *pc= i_dev, Error **errp) pcie_endpoint_cap_init(pci_dev, 0x80); pcie_cap_flr_init(pci_dev); if (n->params.sriov_max_vfs) { + if (n->migration_blocker =3D=3D NULL) { + error_setg(&n->migration_blocker, + "Migration is disabled when SR-IOV capability is se= t"); + if (migrate_add_blocker(&n->migration_blocker, errp) < 0) { + return false; + } + } + pcie_ari_init(pci_dev, 0x100); } =20 @@ -9025,6 +9034,14 @@ static bool nvme_init_pci(NvmeCtrl *n, PCIDevice *pc= i_dev, Error **errp) if (pci_dev->spdm_port) { uint16_t doe_offset =3D PCI_CONFIG_SPACE_SIZE; =20 + if (n->migration_blocker =3D=3D NULL) { + error_setg(&n->migration_blocker, + "Migration is disabled when SPDM responder is used"= ); + if (migrate_add_blocker(&n->migration_blocker, errp) < 0) { + return false; + } + } + switch (pci_dev->spdm_trans) { case SPDM_SOCKET_TRANSPORT_TYPE_PCI_DOE: if (n->params.sriov_max_vfs) { @@ -9053,10 +9070,26 @@ static bool nvme_init_pci(NvmeCtrl *n, PCIDevice *p= ci_dev, Error **errp) } =20 if (n->params.cmb_size_mb) { + if (n->migration_blocker =3D=3D NULL) { + error_setg(&n->migration_blocker, + "Migration is disabled when CMB feature is used"); + if (migrate_add_blocker(&n->migration_blocker, errp) < 0) { + return false; + } + } + nvme_init_cmb(n, pci_dev); } =20 if (n->pmr.dev) { + if (n->migration_blocker =3D=3D NULL) { + error_setg(&n->migration_blocker, + "Migration is disabled when PMR feature is used"); + if (migrate_add_blocker(&n->migration_blocker, errp) < 0) { + return false; + } + } + if (!nvme_init_pmr(n, pci_dev, errp)) { return false; } @@ -9365,6 +9398,8 @@ static void nvme_exit(PCIDevice *pci_dev) } =20 memory_region_del_subregion(&n->bar0, &n->iomem); + + migrate_del_blocker(&n->migration_blocker); } =20 static const Property nvme_props[] =3D { diff --git a/hw/nvme/nvme.h b/hw/nvme/nvme.h index d66f7dc82d5..457b6637249 100644 --- a/hw/nvme/nvme.h +++ b/hw/nvme/nvme.h @@ -666,6 +666,9 @@ typedef struct NvmeCtrl { =20 /* Socket mapping to SPDM over NVMe Security In/Out commands */ int spdm_socket; + + /* Migration-related stuff */ + Error *migration_blocker; } NvmeCtrl; =20 typedef enum NvmeResetType { --=20 2.47.3