From nobody Sat Feb 7 10:14:57 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1659123298; cv=none; d=zohomail.com; s=zohoarc; b=iF0HNyOu3/qGp3c+e5hAQZnvbc5F+TPKGaWsGCzAr+D50RMAum43eHt6CU2yjg6IDGpyT5SJY1y3V4QhgXDiMGXnffHgrp1oVprROoc6CtmCRBx2mUDneQld5Q4SCyi8dmieaLyG/c8Q/JGLCy4GY+ioQXPDkqKUEbo0ebGoDhA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659123298; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Fu9zr5mnr8udxCuOOfpdjv/hPzGB+Yr/AKGJkFWfJXs=; b=G2oibFErB2o2nyplDTGbqgcO3KjPeWx9G/tNgGwi8bILwxe4iONcUNv5JNbRB9O5MKZIV3mrdZhcNCLnAH3pv5l4vneWzfFH5oQ5SikQ6Gj1CkW+AtxJfD5xe4SGFwCFDUO1JTBSfeKvcCXH8rCnGeUtpY+7eimKAc8Yc7KPDBA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1659123298829521.1629124761926; Fri, 29 Jul 2022 12:34:58 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-170--ZHnxa5CNpyvadWKQ3BnhQ-1; Fri, 29 Jul 2022 15:34:55 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D9D268032F0; Fri, 29 Jul 2022 19:34:53 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id C3B6940C128A; Fri, 29 Jul 2022 19:34:53 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 91E86194D6D2; Fri, 29 Jul 2022 19:34:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C8EEB194D6C7 for ; Fri, 29 Jul 2022 19:34:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B539A2166B2C; Fri, 29 Jul 2022 19:34:51 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast10.extmail.prod.ext.rdu2.redhat.com [10.11.55.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B03E02166B26 for ; Fri, 29 Jul 2022 19:34:51 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8E1EC1C06EE3 for ; Fri, 29 Jul 2022 19:34:51 +0000 (UTC) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2065.outbound.protection.outlook.com [40.107.21.65]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-35-qq9MhahdOxattcyzulZlTw-2; Fri, 29 Jul 2022 15:34:48 -0400 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) by AM6PR04MB5654.eurprd04.prod.outlook.com (2603:10a6:20b:a3::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.23; Fri, 29 Jul 2022 19:34:45 +0000 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::6de4:cdb8:bebb:ac0]) by AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::6de4:cdb8:bebb:ac0%6]) with mapi id 15.20.5458.025; Fri, 29 Jul 2022 19:34:45 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659123297; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Fu9zr5mnr8udxCuOOfpdjv/hPzGB+Yr/AKGJkFWfJXs=; b=BTCMQxn6CRVOWS4Iymdl/Tlwms99sfDOuToAvhOPIviXcp9OLDaTFZ1iA+gS9J1PVIzRG2 wx/WHnUR/UqCQEoj8kQ+MLOzIw5gSdimHGm2Lzh2kvbhCqQq/LNBk3uMHzcYOK03/5wLAH OWDxIEJlX9m/9VN6SPZVl8vRyXhjLmM= X-MC-Unique: -ZHnxa5CNpyvadWKQ3BnhQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: qq9MhahdOxattcyzulZlTw-2 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH V2 2/4] capabilities: Report number of host CPU physical address bits Date: Fri, 29 Jul 2022 13:34:34 -0600 Message-ID: <20220729193436.15575-3-jfehlig@suse.com> In-Reply-To: <20220729193436.15575-1-jfehlig@suse.com> References: <20220729193436.15575-1-jfehlig@suse.com> X-ClientProxiedBy: FR3P281CA0113.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a3::12) To AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0599addf-943a-4651-a94e-08da7199644a X-MS-TrafficTypeDiagnostic: AM6PR04MB5654:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: UzbqqHwAfve1tzmYvJKGTmUKtO244hbF2dBCZsn4cCDTtxkp3hfcRTCqkEmlRXUJMHQ1/Qw9MIKMgz5hWdPRLMdnhpuKmF4jFZLgfWsEEAmUzeCvn3w76SnxQSMgvAUDoGk4yB37qPfsa6tYSKNvgYyYDcO8oBpqLhsxYMM5I5Y8PlwMSDEvKj3K9Ids87Kc0x39QdvftufXYajdoja78k8IbaWs3GzcW0kTEqhYSOw8ob3kCllawRV8iAkkMtkri1r0GoEQutkKH90gGCqFK803hfukOfqPvV0a89suq7uhloNCQp5JUecbiqUFCGskB1gLs3ZW15n26i+d1MTHwSOIYLGTqNcql/xhEGWeODheDBBxnR286rCwafdq7k8kUXlVmxaWA/0hfErXpt5aojy60ozdptw8VjQ8JIE4AW5oDLcbtiMiFdJKSZNUfQI0/EWa23KIBVE3nrswbnuPr0YED9TyEKuet4dRDIU1uZaz29ulXgcIunoepD0boxrGEhmqTJg/CfcRDWXR9HNzZQ6HfM+3FPA5xlTzRs1mjd6bB4EAjvCxjk0dRcpXcFfD+owFglbKvDzcdio5RvI+LX8RdwJbnTBlv4w4wis9uOjmH9O8ZMSn5mZqmaOVK400jZiWdJCXTlJN3O04ZNebtiWDfpNdzDQsq9FzftLmTe70x8GbTah23sosvW4GP1rQ/Y4cC8GlTzClT5QgKHSL18WaTF/SzaQlclDS4Xq8DapEswG9DWg1+cePyMqZOzsV X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR04MB4899.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(136003)(396003)(346002)(39860400002)(376002)(366004)(86362001)(6916009)(66556008)(316002)(8676002)(66476007)(2906002)(8936002)(5660300002)(6666004)(6506007)(1076003)(478600001)(38100700002)(36756003)(6486002)(2616005)(186003)(6512007)(41300700001)(66946007)(26005); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?53QLoZnTvCeGETndeNVfpn7qpGqC8p37WKEh19XbwtyJ3EdLWZvN7IAjiYmI?= =?us-ascii?Q?e6jv7/nd94rg/HFgSATnhw/TrNxVyMj+RcQe5+6VZbSwjr0znryBw0Mhh/fc?= =?us-ascii?Q?m3beQMozK6pCwiq4D2Smam3eIJfKzHdPVvrEKMybgLiozf6LPH0pu78S6Chk?= =?us-ascii?Q?1F5I+W45KWQjv/0CMd9QtEK8ywM43AoW4z96gat70UpE3fJI9VqXPyzdbmYT?= =?us-ascii?Q?maHKq3Dqza2+H3sAW8vKPnc6BEhv1PsAknekm8tm3tl7QUhdF/02WOU1x+Ds?= =?us-ascii?Q?Pw511WR6alSWTi3P+QhD+4vSEQKSQ3g5nIdtr3VKfEye1UkIcSz50nMtwb7q?= =?us-ascii?Q?OcVK8szHbjqDJwGq6rNmQOYnLbgw5/FABZ85h7E85oQOOq8LyDN8PI1Z7x3K?= =?us-ascii?Q?fgfvXPtpg97FsxlDhjxxnRVks9VaI/BgReSEaVHG6YSEqrl9Jk8Tj2+l8GXl?= =?us-ascii?Q?+iUo16rekDWtnOtCOJfsz+yXpi793m7H923dgPmSHDsDc6tmEUmjItvDByj5?= =?us-ascii?Q?t45hMfValSdpUnJh2Io2tMu2XKhweFZCJ4y8RFjTKy1Y7jtE7noCmMnTYQBQ?= =?us-ascii?Q?KGmo7WBc0647JyPW/iPbWXESiFbs9ffx8+kxVMcYQmB3a3Em3HQT9JL8Sj5A?= =?us-ascii?Q?n1WJtad9jUcRGwcIxhQEV/hS+32a8kdG9Mie+PaROM6OhqNPRR4QcHaru6m4?= =?us-ascii?Q?gFxm7IWQ1hHTPpSkr317c4PQZpIyotE8PQ8pB3abqFm8S1WTZLD9kZqg43R4?= =?us-ascii?Q?I5u5D16cxGOrsZ4mVIFaSn5m/2gcS5rwMJUyB0vbIF1St23Cel4s6jvlUO2b?= =?us-ascii?Q?jopSJA32BMl3gRa8tcug8szkBN1BjHoxSam5CO0OUiz6lFsmUzyH+YhB8kNq?= =?us-ascii?Q?DuMYR5+CmwrOI2gmDPE7JRr8eK64PGZaLEO+HcfFH1imIJmkfwoE5ndWmo++?= =?us-ascii?Q?HvdjfSlzdzUglUJ5Maug1It+HPMS2f+wzsJx5PSDM01qFXPL1Vy21GsW5bSC?= =?us-ascii?Q?+2cbvyw1fkP4fyE+MQEgCGA7523Jx5iPyAVnvmXbDCSKz2YFuY/ExJoB9G0E?= =?us-ascii?Q?ezt4H1fYArrjEam5idux2OEszry2XiGjiyZnpINuF4QOv+f7DBFcI7mfpCyQ?= =?us-ascii?Q?zaefTB5/JGgyYeB8Bunwj4u7CccDpdQFfw3X4sL7MnzZcdJaEaFxnetptvHI?= =?us-ascii?Q?6LMdgbiRzWpOo4ujqfXFOBBPk0Dz0oOga5a/u3FpbCxxnRVWwmodHVvQ51CD?= =?us-ascii?Q?Q9wt+1rIvwW5dAjm0asQgdRUhDcP7Atuvjj22nYwdib5N1oC6+863PBtKYcc?= =?us-ascii?Q?xmJhUs8Fe3tggl0e012Ev/JU9lv4IbIkn1jBedABaBB6LmNm3LSatqbsVvpp?= =?us-ascii?Q?JhrqCVUPd4lZnr2Xune1qv+20by+01Dg8hIwkj7BfJX5EFWeVXnNsMNTdRdA?= =?us-ascii?Q?HJFOjSPt9GpJyZY9WmaDAUXiZDHM+s7DwKLVlZPiguwIyAL/ExHaJ2yt6zPF?= =?us-ascii?Q?H6C0qnJauc2QSkLzoEtQgIH6sH6UY2C6vOsY7H1h1XpPVG9NpnAdNjs8cX9C?= =?us-ascii?Q?PF6z8+y0Bd5wS86e+w0PBDFk89GK4iBAAWKy2Zha?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0599addf-943a-4651-a94e-08da7199644a X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB4899.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jul 2022 19:34:45.5864 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: /wgl9rI4s8xZJBbX1T9ZJqg/ocRo6vZwmbVJUbtigmrSvtzYrLGvC0GoYE/HOuWWMgwTi08Cku2TgK2xD+5hug== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB5654 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1659123299051100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jim Fehlig --- src/cpu/cpu_x86.c | 8 +++++++ src/util/virhostcpu.c | 55 +++++++++++++++++++++++++++++++++++++++++++ src/util/virhostcpu.h | 3 +++ 3 files changed, 66 insertions(+) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 4bb2ea4bae..9fcd6b8add 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -2738,6 +2738,7 @@ virCPUx86GetHost(virCPUDef *cpu, virDomainCapsCPUModels *models) { g_autoptr(virCPUData) cpuData =3D NULL; + unsigned int addrsz; int ret; =20 if (virCPUx86DriverInitialize() < 0) @@ -2784,6 +2785,13 @@ virCPUx86GetHost(virCPUDef *cpu, VIR_DEBUG("Host CPU does not support invariant TSC"); } =20 + if (virHostCPUGetPhysAddrSize(&addrsz) =3D=3D 0) { + virCPUMaxPhysAddrDef *addr =3D g_new0(virCPUMaxPhysAddrDef, 1); + + addr->bits =3D addrsz; + cpu->addr =3D addr; + } + return ret; } #endif diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 639dd9b51e..668e468f2a 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -570,6 +570,41 @@ virHostCPUParseFrequency(FILE *cpuinfo, } =20 =20 +static int +virHostCPUParsePhysAddrSize(FILE *cpuinfo, unsigned int *addrsz) +{ + char line[1024]; + + while (fgets(line, sizeof(line), cpuinfo) !=3D NULL) { + char *str; + char *endptr; + + if (!STRPREFIX(line, "address sizes")) + continue; + + str =3D line; + str +=3D strlen("address sizes"); + + /* Skip the colon. */ + if ((str =3D strstr(str, ":")) =3D=3D NULL) + goto error; + str++; + + /* Parse the number of physical address bits */ + if (virStrToLong_ui(str, &endptr, 10, addrsz) < 0) + goto error; + + return 0; + } + + error: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Missing or invalid CPU address size in %s"), + CPUINFO_PATH); + return -1; +} + + int virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, virArch arch, @@ -1616,6 +1651,20 @@ virHostCPUGetSignature(char **signature) return virHostCPUReadSignature(virArchFromHost(), cpuinfo, signature); } =20 +int +virHostCPUGetPhysAddrSize(unsigned int *size) +{ + g_autoptr(FILE) cpuinfo =3D NULL; + + if (!(cpuinfo =3D fopen(CPUINFO_PATH, "r"))) { + virReportSystemError(errno, _("Failed to open cpuinfo file '%s'"), + CPUINFO_PATH); + return -1; + } + + return virHostCPUParsePhysAddrSize(cpuinfo, size); +} + #else =20 int @@ -1625,6 +1674,12 @@ virHostCPUGetSignature(char **signature) return 0; } =20 +int +virHostCPUGetPhysAddrSize(unsigned int *size) +{ + return 0; +} + #endif /* __linux__ */ =20 int diff --git a/src/util/virhostcpu.h b/src/util/virhostcpu.h index b8ea7aafad..5232fee36d 100644 --- a/src/util/virhostcpu.h +++ b/src/util/virhostcpu.h @@ -58,6 +58,7 @@ int virHostCPUGetInfo(virArch hostarch, unsigned int *cores, unsigned int *threads); =20 + int virHostCPUGetKVMMaxVCPUs(void) G_NO_INLINE; =20 int virHostCPUStatsAssign(virNodeCPUStatsPtr param, @@ -86,6 +87,8 @@ virHostCPUTscInfo *virHostCPUGetTscInfo(void); =20 int virHostCPUGetSignature(char **signature); =20 +int virHostCPUGetPhysAddrSize(unsigned int *size); + int virHostCPUGetHaltPollTime(pid_t pid, unsigned long long *haltPollSuccess, unsigned long long *haltPollFail); --=20 2.36.1