From nobody Sun May 19 05:22:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) client-ip=209.85.221.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1636210220; cv=none; d=zohomail.com; s=zohoarc; b=TTzzm4ZwxDqpCZ12pFQKt+DYVRLk3cQuJ8DNhzGcj8XXPq4WHvU0krl3DZn0/lSc/5C3lE28g2RWFk8XdjRIn9sL/GEtNOSHyFtttNRweJTJqUozBCAKS2cGCxEfaGfWW+7mrnGYasidtIClYnf4Xdf3dNQ2wHUJMVp66UqpFu4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636210220; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Sender:Subject:To; bh=Kn+y1hq+hUjbJEQcDRwwymFls4YQ8OTVmun+DYza6+o=; b=WMPAGjkCy4osDx1/GpamnGDyj7qYwfVEG+E1x5/U+MXipUkjSHgqgexpDKlcFK7RVGir6puBLNEAJWuiJlnZWP6WK6yM0goagYqwPeZ9TSUGJaJZwcTdMwddiC30ItHhi0xuVxw3+a59jHF63V/MbaiQRnzdV8TmzYJSCff3PlU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 1636210220334636.2970154499881; Sat, 6 Nov 2021 07:50:20 -0700 (PDT) Received: by mail-wr1-f45.google.com with SMTP id d3so18405206wrh.8 for ; Sat, 06 Nov 2021 07:50:19 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id v3sm11162727wrg.23.2021.11.06.07.50.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Nov 2021 07:50:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Kn+y1hq+hUjbJEQcDRwwymFls4YQ8OTVmun+DYza6+o=; b=H6dFdrhXK6PG0BEwof8S2b6mvEAF6MpcBzvD4unCV3Z5KuxPgn9TyytF/kxKJ+0w6S m083RgFeMgHNi8mFkOkVWMYGwNUIM2ZiuIzaYONRqmmfTKOYSRlQ5tTU2KS/3orzDO88 fm9KQeBtV1IXf5Ba+l4iRWrMxo4pClAQS4BiweYWwowupka1uKnRZ+IwmcpdbF3Erhnr cer+E0l9NIrxsSI5w1N2Od/AWvcFNbnTv4JFLG1TsE3EMcRgSHg2db7AF/uffIAXg7Si 2Hl3zE6BduBZkqw5M0qKYNu52H/oFoHJptvMVrGrcT11UBOVIu2fkOoP1ZCppuvXwLZK V47Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=Kn+y1hq+hUjbJEQcDRwwymFls4YQ8OTVmun+DYza6+o=; b=2mqaHMsbwifzZbePRr3nj1rsdI9DHsJbQgV7Ge/mwTX8kNgpLgnNsOKAeMNoaSmmT/ Am/ygS0+yjC793ngrnlxz2dNLoaR3vLh3Jql//dU8sX+eNuMuG0+vs9SPfQni+8/ichc EPXElny0G5/OB5mZZwyiwyJPh1e3mCzIB+FMgsJd196V3o9euaOP9cp60wYvh4QqPCGx 3IfgbFcbzTZZdw1GY3oiVQOENqC405gmH79VXXtd3oL9mqytCsogQASiAppeZQTuMz8l IKQwl9lAzyBUh/dNAdRvpT8DwNIpABSsL3fPuCJ3sGUoUSgKiCx0aSf+kwe8cCeI9lvD 3tFw== X-Gm-Message-State: AOAM533Rm+48sImLM0RyOLlSq7IYlauzJd9tPKUGCPL5tNATqf1aJi+h PKvDodC+bH5D59hHCC1evsDD3JibGj4= X-Google-Smtp-Source: ABdhPJyKKS2D4ZW4Q6lEvN3LhO7Dym03izg0sX+dFA09lhdSly7LonpjURZdrbYIFi+7ySxTzPWAIw== X-Received: by 2002:adf:f08d:: with SMTP id n13mr64147609wro.395.1636210218636; Sat, 06 Nov 2021 07:50:18 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Ani Sinha , Igor Mammedov , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-6.2 v2] hw/mem/pc-dimm: Restrict NUMA-specific code to NUMA machines Date: Sat, 6 Nov 2021 15:50:16 +0100 Message-Id: <20211106145016.611332-1-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1636210222770100001 When trying to use the pc-dimm device on a non-NUMA machine, we get: $ qemu-system-arm -M none -cpu max -S \ -object memory-backend-file,id=3Dmem1,size=3D1M,mem-path=3D/tmp/1m \ -device pc-dimm,id=3Ddimm1,memdev=3Dmem1 Segmentation fault (core dumped) (gdb) bt #0 pc_dimm_realize (dev=3D0x555556da3e90, errp=3D0x7fffffffcd10) at hw/m= em/pc-dimm.c:184 #1 0x0000555555fe1f8f in device_set_realized (obj=3D0x555556da3e90, valu= e=3Dtrue, errp=3D0x7fffffffce18) at hw/core/qdev.c:531 #2 0x0000555555feb4a9 in property_set_bool (obj=3D0x555556da3e90, v=3D0x= 555556e54420, name=3D0x5555563c3c41 "realized", opaque=3D0x555556a704f0, er= rp=3D0x7fffffffce18) at qom/object.c:2257 To avoid that crash, restrict the pc-dimm NUMA check to machines supporting NUMA, and do not allow the use of 'node' property on non-NUMA machines. Suggested-by: Igor Mammedov Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v2: Follow Igor suggestion Supersedes: <20210524171352.3796151-1-f4bug@amsat.org> --- hw/mem/pc-dimm.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index a3a2560301c..48b913aba67 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -181,7 +181,21 @@ static void pc_dimm_realize(DeviceState *dev, Error **= errp) PCDIMMDevice *dimm =3D PC_DIMM(dev); PCDIMMDeviceClass *ddc =3D PC_DIMM_GET_CLASS(dimm); MachineState *ms =3D MACHINE(qdev_get_machine()); - int nb_numa_nodes =3D ms->numa_state->num_nodes; + + if (ms->numa_state) { + int nb_numa_nodes =3D ms->numa_state->num_nodes; + + if (((nb_numa_nodes > 0) && (dimm->node >=3D nb_numa_nodes)) || + (!nb_numa_nodes && dimm->node)) { + error_setg(errp, "'DIMM property " PC_DIMM_NODE_PROP " has val= ue %" + PRIu32 "' which exceeds the number of numa nodes: %= d", + dimm->node, nb_numa_nodes ? nb_numa_nodes : 1); + return; + } + } else if (dimm->node > 0) { + error_setg(errp, "machine doesn't support NUMA"); + return; + } =20 if (!dimm->hostmem) { error_setg(errp, "'" PC_DIMM_MEMDEV_PROP "' property is not set"); @@ -191,13 +205,6 @@ static void pc_dimm_realize(DeviceState *dev, Error **= errp) object_get_canonical_path_component(OBJECT(dimm->hostme= m))); return; } - if (((nb_numa_nodes > 0) && (dimm->node >=3D nb_numa_nodes)) || - (!nb_numa_nodes && dimm->node)) { - error_setg(errp, "'DIMM property " PC_DIMM_NODE_PROP " has value %" - PRIu32 "' which exceeds the number of numa nodes: %d", - dimm->node, nb_numa_nodes ? nb_numa_nodes : 1); - return; - } =20 if (ddc->realize) { ddc->realize(dimm, errp); --=20 2.31.1