From nobody Thu Oct 30 22:46:57 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1752568299; cv=none; d=zohomail.com; s=zohoarc; b=MbEdGTVbsu+Nwjh8uhhUfmG8R9XJclVJml+dvWbM74Ev1y+0Hg89/cCvDI14humnv5jcENKvzgaDgsEBod7gOeE19Ap+N3wCVnLRA8TLT+/SVIs09KGTgadHNKpMQzaf+uIgPwCeiusQGxuDuoGRHedxLU/KnZzxoYPwwnWIkbY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752568299; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=wDovwYR+MAaNPWm/pgK0ijg6p2MZFtuj4DNgoEH65mE=; b=IRqWwZw9/xtuQ6gTvB9cd4Uxwt8880CMES2JgeMBJII5VauSxDT+OHHizbXDIi5Wv5inITcJUzSszu6Nlg7jJUrPhzTUI7nvI9e1o6UnmV+KZ0is0E6aZJR2BGKeQ6m9k79Cm6J5DbTcqwxBL4fXG6ja/lxZ7bk/Wq+BYVKNz4Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 175256829983157.921769520440535; Tue, 15 Jul 2025 01:31:39 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1043767.1413805 (Exim 4.92) (envelope-from ) id 1ubb4N-0005n3-2B; Tue, 15 Jul 2025 08:31:23 +0000 Received: by outflank-mailman (output) from mailman id 1043767.1413805; Tue, 15 Jul 2025 08:31:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ubb4M-0005mv-UX; Tue, 15 Jul 2025 08:31:22 +0000 Received: by outflank-mailman (input) for mailman id 1043767; Tue, 15 Jul 2025 08:31:21 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ubb4L-0005YW-Ph for xen-devel@lists.xenproject.org; Tue, 15 Jul 2025 08:31:21 +0000 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [2a00:1450:4864:20::32a]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 151da2a5-6156-11f0-b894-0df219b8e170; Tue, 15 Jul 2025 10:31:19 +0200 (CEST) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-456107181f8so887845e9.2 for ; Tue, 15 Jul 2025 01:31:19 -0700 (PDT) Received: from lab.home (dynamic-2a00-1028-83a4-4bca-c0bb-96ff-feed-9d50.ipv6.o2.cz. [2a00:1028:83a4:4bca:c0bb:96ff:feed:9d50]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4560f22cd14sm84787075e9.30.2025.07.15.01.31.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jul 2025 01:31:18 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 151da2a5-6156-11f0-b894-0df219b8e170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752568279; x=1753173079; darn=lists.xenproject.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=wDovwYR+MAaNPWm/pgK0ijg6p2MZFtuj4DNgoEH65mE=; b=B+Y6R5RR1nWo4ax20arH00kmjoo5ca7rERMbsFM3rh2xgSKLd/6mVLMkfKckjxL5w0 qUA/uwLqHaT7Qjt+pDczKu1O3GCMlb+4eeSP3OaNip2QxROqTXe2lHKhkAp8UzHN4XvC Vc/Abv7Db/hkWNO1umW7eRQ1wkt+M8CbeHzdb9+J+SfjgG+ifT84yndkwr6FE3xqsiQ5 9zNnvznc1yHKf5dfOUsHrUJqVbkoCK0sjnrZleMWlAIw9bjc1XBya97Qu1xl0N86bf0G ++gHqjDsvUjqDKYCQirPB7lnPlNjkzZ1zzxQRnEsrVSeeUSKTG9T5cyCX0ayzpiS5LhA U0zQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752568279; x=1753173079; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wDovwYR+MAaNPWm/pgK0ijg6p2MZFtuj4DNgoEH65mE=; b=Ts5rMR+/xDzTPd0jZP6bzN9L0icR1xnzOQGbwr4tAvtE7oGGcIp6q1lL8Q1atgONPk wixc0Ca1yazvxarUh/M3yROnZg21XlGF+GDIXyeO5KTw2/Ott2uKclrpXomD1TV5Fj64 z2Z+2OOhPRncfO+hKS8ANfLtZVogjFbxLkKp7BrW+HH0XVGRWErcIKnqTBjc+6L+TkrJ VvofO85I774DeE4SBLxxN+z0Sjht/zC2BareMwJ96mS5rGpUca80l+mAhP89I0vYKWjv bOVFmNeb/o2dioVo1nSSSKkexY0TXqVMxTo+WSyQkxh7Zjqr+FLjdcb4hhmwzk658AmB rZdA== X-Gm-Message-State: AOJu0Yy6VCf3KC2kx9scA/8SUMIStlfKEcQXNQdoaIazTOBhCTRJjnYY NDfHXOULRnhfN+Oq8dvDKsrvpArMx9iLbOQLZD2YTrHsctf0h2aev/mGfVnLfQ== X-Gm-Gg: ASbGncutEUXBIW5sPUgybOOnk+IhLVVYMgU78f9l2YR0yaLn1LgNP/ArQyKPa+tJClQ r1Z9WxTqEVlSeF4LXav4ohAqO/+lokc7tXbLzNLTc7F15DC0ZGzzmayjB/q6s3gr7xfFrPgmQDR fwZN8344odg1t7WhFcCiB250+HA6yhnVB60zdQJTFUw41txtqDTi25Uav3D4oMnm/H+/epz5msU trehhpxeXCfX8oT921rjTpwqe4RqfFqZUzThHO7dq4eEUxxO0rGZZheucVP5r6wKBHeuOeDVCEE eYeBlw1pWh8fY52p7HqJE8WQMjqpgbYGYxjwyjEGrcQjCwBrYPyN6smTot+HbDAmV8TL7abA33A CPIfKIKy1BPXLy/aqTQZvP7Z0SmtSlqR9qejTyAdQoj4c1gQSJ8h0NeoOWaP/wHIRTowZ+nkxGz 7aULKCW0nKg1IFznP7GGC3Lw== X-Google-Smtp-Source: AGHT+IH1cnclvUhwt+7YZWJYDVBaoczHDQRW8RHveecjHHf0ABBRw5EMJaNlrtnva/9pwpAIRJMBbw== X-Received: by 2002:a05:600c:1c03:b0:456:c48:4907 with SMTP id 5b1f17b1804b1-4562908e12bmr3155785e9.0.1752568278676; Tue, 15 Jul 2025 01:31:18 -0700 (PDT) From: "=?UTF-8?q?Petr=20Bene=C5=A1?=" X-Google-Original-From: =?UTF-8?q?Petr=20Bene=C5=A1?= To: xen-devel@lists.xenproject.org Cc: =?UTF-8?q?Petr=20Bene=C5=A1?= , Nick Rosbrook , George Dunlap , Anthony PERARD , Juergen Gross Subject: [PATCH v9 1/6] tools/xl: Add altp2m_count parameter Date: Tue, 15 Jul 2025 08:31:09 +0000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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: 1752568301953116600 From: Petr Bene=C5=A1 Introduce a new altp2m_count parameter to control the maximum number of alt= p2m views a domain can use. By default, if altp2m_count is unspecified and altp= 2m is enabled, the value is set to 10, reflecting the legacy behavior. This change is preparatory; it establishes the groundwork for the feature b= ut does not activate it. Signed-off-by: Petr Bene=C5=A1 --- tools/golang/xenlight/helpers.gen.go | 2 ++ tools/golang/xenlight/types.gen.go | 1 + tools/include/libxl.h | 7 +++++++ tools/libs/light/libxl_create.c | 10 ++++++++++ tools/libs/light/libxl_internal.h | 1 + tools/libs/light/libxl_types.idl | 1 + tools/xl/xl_parse.c | 9 +++++++++ 7 files changed, 31 insertions(+) diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/h= elpers.gen.go index 191be87297..515a6ef10a 100644 --- a/tools/golang/xenlight/helpers.gen.go +++ b/tools/golang/xenlight/helpers.gen.go @@ -1167,6 +1167,7 @@ if err :=3D x.ArchX86.MsrRelaxed.fromC(&xc.arch_x86.m= sr_relaxed);err !=3D nil { return fmt.Errorf("converting field ArchX86.MsrRelaxed: %v", err) } x.Altp2M =3D Altp2MMode(xc.altp2m) +x.Altp2MCount =3D uint32(xc.altp2m_count) x.VmtraceBufKb =3D int(xc.vmtrace_buf_kb) if err :=3D x.Vpmu.fromC(&xc.vpmu);err !=3D nil { return fmt.Errorf("converting field Vpmu: %v", err) @@ -1695,6 +1696,7 @@ if err :=3D x.ArchX86.MsrRelaxed.toC(&xc.arch_x86.msr= _relaxed); err !=3D nil { return fmt.Errorf("converting field ArchX86.MsrRelaxed: %v", err) } xc.altp2m =3D C.libxl_altp2m_mode(x.Altp2M) +xc.altp2m_count =3D C.uint32_t(x.Altp2MCount) xc.vmtrace_buf_kb =3D C.int(x.VmtraceBufKb) if err :=3D x.Vpmu.toC(&xc.vpmu); err !=3D nil { return fmt.Errorf("converting field Vpmu: %v", err) diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/typ= es.gen.go index 656933c6c9..1a4f076bd2 100644 --- a/tools/golang/xenlight/types.gen.go +++ b/tools/golang/xenlight/types.gen.go @@ -604,6 +604,7 @@ ArchX86 struct { MsrRelaxed Defbool } Altp2M Altp2MMode +Altp2MCount uint32 VmtraceBufKb int Vpmu Defbool TrapUnmappedAccesses Defbool diff --git a/tools/include/libxl.h b/tools/include/libxl.h index a8704e0268..d6b6e5d2dd 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -1257,6 +1257,13 @@ typedef struct libxl__ctx libxl_ctx; */ #define LIBXL_HAVE_ALTP2M 1 =20 +/* + * LIBXL_HAVE_ALTP2M_COUNT + * If this is defined, then libxl supports setting the maximum number of + * alternate p2m tables. + */ +#define LIBXL_HAVE_ALTP2M_COUNT 1 + /* * LIBXL_HAVE_REMUS * If this is defined, then libxl supports remus. diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_creat= e.c index 8a85fba1cf..4301f17f90 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -421,6 +421,16 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, return -ERROR_INVAL; } =20 + if (b_info->altp2m_count =3D=3D LIBXL_ALTP2M_COUNT_DEFAULT) { + if (b_info->type =3D=3D LIBXL_DOMAIN_TYPE_HVM && + (libxl_defbool_val(b_info->u.hvm.altp2m) || + b_info->altp2m !=3D LIBXL_ALTP2M_MODE_DISABLED)) + /* Reflect the default legacy count */ + b_info->altp2m_count =3D 10; + else + b_info->altp2m_count =3D 0; + } + /* Assume that providing a bootloader user implies enabling restrict. = */ libxl_defbool_setdefault(&b_info->bootloader_restrict, !!b_info->bootloader_user); diff --git a/tools/libs/light/libxl_internal.h b/tools/libs/light/libxl_int= ernal.h index 75bb0b94cf..2a5b233caa 100644 --- a/tools/libs/light/libxl_internal.h +++ b/tools/libs/light/libxl_internal.h @@ -111,6 +111,7 @@ #define LIBXL_MIN_DOM0_MEM (128*1024) #define LIBXL_INVALID_GFN (~(uint64_t)0) #define LIBXL_VGA_HOLE_SIZE 0x20 +#define LIBXL_ALTP2M_COUNT_DEFAULT (~(uint32_t)0) /* use 0 as the domid of the toolstack domain for now */ #define LIBXL_TOOLSTACK_DOMID 0 #define QEMU_SIGNATURE "DeviceModelRecord0002" diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_type= s.idl index a3a79d12b2..fe251649f3 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -731,6 +731,7 @@ libxl_domain_build_info =3D Struct("domain_build_info",[ # Alternate p2m is not bound to any architecture or guest type, as it = is # supported by x86 HVM and ARM support is planned. ("altp2m", libxl_altp2m_mode), + ("altp2m_count", uint32, {'init_val': 'LIBXL_ALTP2M_COUNT_DEFAULT'}), =20 # Size of preallocated vmtrace trace buffers (in KBYTES). # Use zero value to disable this feature. diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index 7e11c62ba0..28cdbf07c2 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -2099,6 +2099,15 @@ void parse_config_data(const char *config_source, } } =20 + if (!xlu_cfg_get_long(config, "altp2m_count", &l, 1)) { + if (l !=3D (uint16_t)l) { + fprintf(stderr, "ERROR: invalid value %ld for \"altp2m_count\"= \n", l); + exit (1); + } + + b_info->altp2m_count =3D l; + } + if (!xlu_cfg_get_long(config, "vmtrace_buf_kb", &l, 1) && l) { b_info->vmtrace_buf_kb =3D l; } --=20 2.34.1 From nobody Thu Oct 30 22:46:57 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1752568302; cv=none; d=zohomail.com; s=zohoarc; b=Bu26w8B2sffDE1PtRzu5BF07IHBpJ3XDay77Ou6vuc1cq/bupGz+SY5o/M4QBSoOfHSeK6wEtcBJcGMBdMUqQkZJC6tWGKq3YuCHC9r14LDpStQXyvTASvVD5+3ddioj5DIIq25ayMGFyjgt7ErARZK//JJYLv7P0VfaMGK0K+c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752568302; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=vr3HAWcy3iR7RnCWpXjXk9ptcqN2sMtjI1FfiwT4ilQ=; b=hgSJezTodqn/wspa/aTUe3PQQj2oh/NOAt1uCddBK3c1bI5nEAKv/DLQtwr6RW09RvKSR1XLZTFlti8qeUcuNGX423rpTrArKVZIMTNJkdh7bnVQUulNxEZx4uKovxdq9rvDY6PusFquZ43bsg8KaWQa43W8r1VA+EU/Y+FcBMw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1752568302758351.7037013221594; Tue, 15 Jul 2025 01:31:42 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1043768.1413815 (Exim 4.92) (envelope-from ) id 1ubb4O-00061k-AC; Tue, 15 Jul 2025 08:31:24 +0000 Received: by outflank-mailman (output) from mailman id 1043768.1413815; Tue, 15 Jul 2025 08:31:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ubb4O-00061d-7C; Tue, 15 Jul 2025 08:31:24 +0000 Received: by outflank-mailman (input) for mailman id 1043768; Tue, 15 Jul 2025 08:31:22 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ubb4M-0005YW-Q0 for xen-devel@lists.xenproject.org; Tue, 15 Jul 2025 08:31:22 +0000 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [2a00:1450:4864:20::32e]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 156ee5cb-6156-11f0-b894-0df219b8e170; Tue, 15 Jul 2025 10:31:20 +0200 (CEST) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-456065d60a8so1278725e9.3 for ; Tue, 15 Jul 2025 01:31:20 -0700 (PDT) Received: from lab.home (dynamic-2a00-1028-83a4-4bca-c0bb-96ff-feed-9d50.ipv6.o2.cz. [2a00:1028:83a4:4bca:c0bb:96ff:feed:9d50]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4560f22cd14sm84787075e9.30.2025.07.15.01.31.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jul 2025 01:31:19 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 156ee5cb-6156-11f0-b894-0df219b8e170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752568279; x=1753173079; darn=lists.xenproject.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=vr3HAWcy3iR7RnCWpXjXk9ptcqN2sMtjI1FfiwT4ilQ=; b=PayESNHn8Rt0p7oUNeauFW14sQeHqy8CQ+xwjkAdxDKvu5vpaoR/g/swue2csOAVny EoZJJbwlf1VeRgrFaepVaJvhqPPJAXQafUSgV74ZOWrtXwFdpaExrLB2c0yPuDFvt883 mytGQei9fZ4A4cz89ajhD2drTc9ANcI5ylJNvQXf58TMdmZfz+oSPf+kFNEfUZx7saJx c+0icVYpEOF/MAZ4+fSqK2rtmyWcQPLToJTIq/Eylo8cJzWbdJ0mf76bW2J769ywW6St ZVuWy2hI0IisNLFxKUvTdzXdpQOX5hU3bv1JHpjLp4UL7o77CS/bayY3oj70sfrrWl91 f9/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752568279; x=1753173079; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vr3HAWcy3iR7RnCWpXjXk9ptcqN2sMtjI1FfiwT4ilQ=; b=UWP9/uTylz7f98IpD8kZR2yNVMeO7AdTCGsSwg42z6mXzqvL6q7xUCcHHhZYmqyw5w aX1DNKbTYVYMIsIhzq4AcG/IYG+R6Uc6GL16BGSWqkrw8c4ER/x/kWG6ohyLPHZC7Lc0 SGhho1So62LEEzSWTeaNknPqMgH2h0xZqROSzZbv72vRvqn+Gk+qqQ8N88ZGQLqQRDqT jxr57ovYtqOXN014AEBbeDb6dZHEhzzCwOgC00bOpk6z6yhRctEKNKuzJM0E0c8yer7J g5jIXirVq53b5NR0iWyPNQh9dhQq+f6DIpuCcP7X+fKRXxDldybK80GkJwtRwVOo4F+1 AQEQ== X-Gm-Message-State: AOJu0Yy3pYUWrctWactTOLzUS+RtCjmMX3M9j7c/rL1k9YbbBtihL8Wb ZVmjP6lS1sZYcWDD0AGzzQ1MmNz+iaY0/kyVWqOywpf8X3bi69WYEND7sihSHA== X-Gm-Gg: ASbGnctF6qd+xdZeNOm/BMHPbOctyrGy+uQS+RXYpXWlyou8U20NgpP/tYqmGO8e1LZ +MYwMZFDWZxMQMadtwSjFeLfJNJ6ys1hx0CaNrnnrXQEjOS5CcoEkEW/s08k7ViZCoy/oX5jVLy szQnyLnIQfG2cAiEO+hoAAvLfbeg2+wjXvZxWuyIq7kmT4Z/vJckq63JxsYDlPVQhwkqxtN2/Xz q2sQUza5xBgaBY10LSVtYOdyCR1Nww5e2zlsfs9GZxcFDxHkfAEq82iOAYtlcOx+LfpygOMCKDp P0/NR3HBHUHSfXCIeAmo3TeStR2pxPkosumnnZTLuMR2N9V7gkx+qnaTBb4kHSr1UPOJgqMOwQP 7ut7ciHEi9VhCYGif2SlSB7Gd2sAOWmb2mLlUdyNm+y9vjgtZkLl0b0M0W7jns28OoAHP0vFwfW fQRchtmE7z5n05o9s1GOd/KA== X-Google-Smtp-Source: AGHT+IE0IoqeQjYrVTJ4W+niRnqgN0QrX7h/6rUzm9znrMqEEXFRnJufxXJ7QUFkTa3XXTSMC7T6Aw== X-Received: by 2002:a05:600c:3b89:b0:451:df07:f41e with SMTP id 5b1f17b1804b1-45629123a8dmr3514165e9.1.1752568279391; Tue, 15 Jul 2025 01:31:19 -0700 (PDT) From: "=?UTF-8?q?Petr=20Bene=C5=A1?=" X-Google-Original-From: =?UTF-8?q?Petr=20Bene=C5=A1?= To: xen-devel@lists.xenproject.org Cc: =?UTF-8?q?Petr=20Bene=C5=A1?= , Anthony PERARD Subject: [PATCH v9 2/6] docs/man: Add altp2m_count parameter to the xl.cfg manual Date: Tue, 15 Jul 2025 08:31:10 +0000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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: 1752568303774116600 From: Petr Bene=C5=A1 Update manual pages to include detailed information about the altp2m_count configuration parameter. Signed-off-by: Petr Bene=C5=A1 Acked-by: Anthony PERARD --- docs/man/xl.cfg.5.pod.in | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in index 1d122982c6..5362fb0e9a 100644 --- a/docs/man/xl.cfg.5.pod.in +++ b/docs/man/xl.cfg.5.pod.in @@ -2023,6 +2023,20 @@ a single guest HVM domain. B: While the option "altp2mhvm" is deprecated, legacy applications f= or x86 systems will continue to work using it. =20 +=3Ditem B + +Specifies the maximum number of alternate-p2m views available to the guest. +This setting is crucial in domain introspection scenarios that require +multiple physical-to-machine (p2m) memory mappings to be established +simultaneously. + +Enabling multiple p2m views may increase memory usage. It is advisable to +review and adjust the B setting as necessary to accommodate +the additional memory requirements. + +B: This option is ignored if B is disabled. The default value +is 10. + =3Ditem B =20 Enable or disables guest access to hardware virtualisation features, --=20 2.34.1 From nobody Thu Oct 30 22:46:57 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1752568302; cv=none; d=zohomail.com; s=zohoarc; b=U0KEO4mqpD4Jj5cBtUTP7u3t2DpzKUorqNinPR9Tme045wrlqd32R1wbFGp894sqOs0Qdhj8lVkhOu2iKK8lm8Est8UlcUvx3cMMvpjwxSdgsQCtqv7VDqOA+zNpOchkrb1thYDlnvjups/gEedyD3Y8rj/KIGr58xy6nrZZPZ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752568302; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=KGMPeQfE6BdXdbIBfumLa4Wdomd7Xq00xQ0dyh4Tdlg=; b=js9KIhW8lC+AgwKUSvNzT9iuOib+/0qUJ1owm4ya+Gm0CiE9CQOtDsG/8i6JcKUTLHQcbkP+A4BLpSnsTHrS40bvHQRZ9M090oE1l+NaEOTfXDUrq/jVpbLOoRGROl3tXuP8haEsFKINsTNKeQ6B3kGplgazGGBvcrp2QAMuZoo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1752568302236235.0702459674951; Tue, 15 Jul 2025 01:31:42 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1043770.1413830 (Exim 4.92) (envelope-from ) id 1ubb4P-0006Kj-TR; Tue, 15 Jul 2025 08:31:25 +0000 Received: by outflank-mailman (output) from mailman id 1043770.1413830; Tue, 15 Jul 2025 08:31:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ubb4P-0006K4-M3; Tue, 15 Jul 2025 08:31:25 +0000 Received: by outflank-mailman (input) for mailman id 1043770; Tue, 15 Jul 2025 08:31:24 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ubb4O-0005YW-4E for xen-devel@lists.xenproject.org; Tue, 15 Jul 2025 08:31:24 +0000 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [2a00:1450:4864:20::435]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 166daf35-6156-11f0-b894-0df219b8e170; Tue, 15 Jul 2025 10:31:22 +0200 (CEST) Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-3a4e62619afso539103f8f.1 for ; Tue, 15 Jul 2025 01:31:22 -0700 (PDT) Received: from lab.home (dynamic-2a00-1028-83a4-4bca-c0bb-96ff-feed-9d50.ipv6.o2.cz. [2a00:1028:83a4:4bca:c0bb:96ff:feed:9d50]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4560f22cd14sm84787075e9.30.2025.07.15.01.31.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jul 2025 01:31:20 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 166daf35-6156-11f0-b894-0df219b8e170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752568281; x=1753173081; darn=lists.xenproject.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=KGMPeQfE6BdXdbIBfumLa4Wdomd7Xq00xQ0dyh4Tdlg=; b=IrUJlUqfmp/o4c2G66EnKRvo6o7LQW8A8hlXb8j+5kIzIomGtnXXhAaED7bYyoSPr7 YvQNXCw/BF5uwjraZ5x8+bx7BwF8pwtz9Jq/A4H5nMoybCCZlzQTko/7HMts32PKZCvt VKlFVxfU3RjBIlvjtaUskDZi+9yxGHVxcyABahCAwmWPoMbEJi4uTmUOzFvrahc1OhPx 7ELla9zocZBaK5i1hKRfvQpiwFdYUnCcPoLxNxYawLIQCBhPcJS2T4re3d+JcKUBDimM t3+4azysFk576DFrzRpn8EthVvJanEC/UIZWrupfsdYgYgcrFrRDnIdB8RGdVG6j4hwe GG/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752568281; x=1753173081; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KGMPeQfE6BdXdbIBfumLa4Wdomd7Xq00xQ0dyh4Tdlg=; b=JGNr0k7qnHxf1kVX0vxn8DnTIoyXdihVtiUpW4uCxz4jHgY1IhixufxuR7PFApd+Dj Ymf6vJ8dz9XBzcMmLkinuO98XpusBmosU5P58Pjqgsc52i4IQBmMshxPTRvI7BdQ2O7j 8WUMxKYaKHc7mFQsAEZH0/7J2AXy2oB35gqSxVn9okvMpJQttrnMLBC9hwGnO3xU+a9v d4paOl7E5KJ/eph7sEP+olD0ZFN32askPqMDpK9BQry7V/wI7CxZYOP3EtzpyNm2+XMS WA3wRayIrgUc7wR1Yu7lpj5Zke0dKAwc0duABAmxAMmWtqxYb3U0Sezb4Nwo10WJxhoi Py2Q== X-Gm-Message-State: AOJu0YwcyDUVjoSKu5E0XEFTdU3+jTE/uQN233wKupNVI6NPZXNDOobs mGOFFds9bqpA+FNi/pmyvxYF3Yx73knWLb1IOfPz0uJ1CIJ/qH+8WpLSYDVqrQ== X-Gm-Gg: ASbGncvZU7a4dJXG4F7W04Cp5IPhMTsx4oJEPr+hqyb0ucrH1N9iT/0epGCKq8xoycl Qd9IG4lI2Ohc3+VI7NZ1+O/umMgJAWm4wkrYxjeDneugCp4bY9msSn+TKb+S9ech6Z4w3CFvrz1 eUW2h7kn1p8XkFELWYyH+SZDh7NgGqFCrFUcAiC0iTvAuDXfblljPkaGTTzGqjsGpYNsmI3SQ50 SN4jXU0cQ1bMwBQQNgLONeACmcEx5Sb4Kssxa/3uSg0483d6K2faQOpnMVHbcPSPuEJCYbhgMOI De7TG5qTofEtgxOGOyWtNMqJSaFYl74GgGmsRdmHoV5H0I73c82pnZNmpxdmptn2jNnTgZnh4ky 01iEpzs2zju20XKeD79dLBosrHwQ8yaruDobWiMWsI5I5X+9Q8FLieZJe1QXeFCZqYIQXlDEKYa qOW/8JQySyqBw1M6Zk2+rgXw== X-Google-Smtp-Source: AGHT+IHMZDAVHVqoZw8q9U5RgvwB4aHCWYB1q/aAD1bnF3Q98FO3gRsD4Oabc8H/578hC0yyCjH1VQ== X-Received: by 2002:a05:6000:2212:b0:3a5:8b43:2c19 with SMTP id ffacd0b85a97d-3b60b334ecemr278980f8f.4.1752568280712; Tue, 15 Jul 2025 01:31:20 -0700 (PDT) From: "=?UTF-8?q?Petr=20Bene=C5=A1?=" X-Google-Original-From: =?UTF-8?q?Petr=20Bene=C5=A1?= To: xen-devel@lists.xenproject.org Cc: =?UTF-8?q?Petr=20Bene=C5=A1?= , Stefano Stabellini , Julien Grall , Bertrand Marquis , Michal Orzel , Volodymyr Babchuk , Andrew Cooper , Anthony PERARD , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Tamas K Lengyel , Alexandru Isaila , Petre Pircalabu Subject: [PATCH v9 3/6] xen: Make the maximum number of altp2m views configurable for x86 Date: Tue, 15 Jul 2025 08:31:11 +0000 Message-Id: <09ec625693adc92beee5885f0ed7a72363ce9ede.1752568020.git.w1benny@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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: 1752568304151116600 From: Petr Bene=C5=A1 This commit introduces the ability to configure the maximum number of altp2m views for the domain during its creation. Previously, the limits were hardc= oded to a maximum of 10. This change allows for greater flexibility in environme= nts that require more or fewer altp2m views. The maximum configurable limit for nr_altp2m on x86 is now set to MAX_NR_ALTP2M (which currently holds the MAX_EPTP value - 512). This cap is linked to the architectural limit of the EPTP-switching VMFUNC, which suppo= rts up to 512 entries. Despite there being no inherent need for limiting nr_alt= p2m in scenarios not utilizing VMFUNC, decoupling these components would necess= itate substantial code changes. xen_domctl_createdomain::altp2m is extended for a new field `nr`, that will configure this limit for a domain. Additionally, previous altp2m.opts value has been reduced from uint32_t to uint16_t so that both of these fields occ= upy as little space as possible. Altp2m features are now guarded by #ifdef CONFIG_ALTP2M. Accesses to the altp2m_p2m array are modified to respect the new nr_altp2m value. Accesses to the altp2m_(visible_)eptp arrays are unmodified, since these arrays always have fixed size of MAX_EPTP. Additional sanitization is introduced in the x86/arch_sanitise_domain_config to fix the altp2m.nr value to 10 if it is previously set to 0. This behavior is only temporary and immediately removed in the upcoming commit (which will disallow creating a domain with enabled altp2m with zero nr_altp2m). The reason for this temporary workaround is to retain the legacy behavior until the feature is fully activated in libxl. Also, arm/arch_sanitise_domain_config is extended to not allow requesting non-zero altp2ms. Signed-off-by: Petr Bene=C5=A1 --- xen/arch/arm/domain.c | 2 +- xen/arch/x86/domain.c | 40 ++++++++++++--- xen/arch/x86/hvm/hvm.c | 20 +++++++- xen/arch/x86/hvm/monitor.c | 2 + xen/arch/x86/hvm/vmx/vmx.c | 12 ++++- xen/arch/x86/include/asm/altp2m.h | 28 +++++++++-- xen/arch/x86/include/asm/domain.h | 11 +++-- xen/arch/x86/include/asm/hvm/vcpu.h | 4 ++ xen/arch/x86/include/asm/p2m.h | 26 +++++++--- xen/arch/x86/mm/altp2m.c | 75 ++++++++++++++++------------- xen/arch/x86/mm/hap/hap.c | 12 +++-- xen/arch/x86/mm/mem_access.c | 34 ++++++++----- xen/arch/x86/mm/mem_sharing.c | 4 +- xen/arch/x86/mm/p2m-ept.c | 15 ++++-- xen/arch/x86/mm/p2m-pt.c | 2 + xen/arch/x86/mm/p2m.c | 17 +++++-- xen/common/domain.c | 3 ++ xen/include/public/domctl.h | 5 +- xen/include/xen/sched.h | 4 ++ 19 files changed, 232 insertions(+), 84 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 79a144e61b..9a4f72c62b 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -693,7 +693,7 @@ int arch_sanitise_domain_config(struct xen_domctl_creat= edomain *config) return -EINVAL; } =20 - if ( config->altp2m.opts ) + if ( config->altp2m.opts || config->altp2m.nr ) { dprintk(XENLOG_INFO, "Altp2m not supported\n"); return -EINVAL; diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 56c3816187..155ea1f79f 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -716,16 +716,42 @@ int arch_sanitise_domain_config(struct xen_domctl_cre= atedomain *config) return -EINVAL; } =20 - if ( altp2m_mode && nested_virt ) + if ( altp2m_mode ) { - dprintk(XENLOG_INFO, - "Nested virt and altp2m are not supported together\n"); - return -EINVAL; - } + if ( !hvm_altp2m_supported() ) + { + dprintk(XENLOG_INFO, "altp2m is not supported\n"); + return -EINVAL; + } + + if ( !hap ) + { + dprintk(XENLOG_INFO, "altp2m is only supported with HAP\n"); + return -EINVAL; + } + + if ( nested_virt ) + { + dprintk(XENLOG_INFO, + "Nested virt and altp2m are not supported together\n"); + return -EINVAL; + } + + if ( !config->altp2m.nr ) + { + /* Fix the value to the legacy default */ + config->altp2m.nr =3D 10; + } =20 - if ( altp2m_mode && !hap ) + if ( config->altp2m.nr > MAX_NR_ALTP2M ) + { + dprintk(XENLOG_INFO, "altp2m.nr must be <=3D %lu\n", MAX_NR_AL= TP2M); + return -EINVAL; + } + } + else if ( config->altp2m.nr ) { - dprintk(XENLOG_INFO, "altp2m is only supported with HAP\n"); + dprintk(XENLOG_INFO, "altp2m.nr must be zero when altp2m is off\n"= ); return -EINVAL; } =20 diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 56c7de3977..78d65abe1f 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1873,6 +1873,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned l= ong gla, P2M_ALLOC | (npfec.write_access ? P2M_UNSHAR= E : 0), &page_order); =20 +#ifdef CONFIG_ALTP2M if ( altp2m_active(currd) ) { p2m =3D p2m_get_altp2m(curr); @@ -1891,6 +1892,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned l= ong gla, } } else +#endif p2m =3D hostp2m; =20 /* Check access permissions first, then handle faults */ @@ -4608,6 +4610,7 @@ static int hvmop_get_param( static int do_altp2m_op( XEN_GUEST_HANDLE_PARAM(void) arg) { +#ifdef CONFIG_ALTP2M struct xen_hvm_altp2m_op a; struct domain *d =3D NULL; int rc =3D 0; @@ -4674,6 +4677,12 @@ static int do_altp2m_op( goto out; } =20 + if ( d->nr_altp2m =3D=3D 0 ) + { + rc =3D -EINVAL; + goto out; + } + if ( (rc =3D xsm_hvm_altp2mhvm_op(XSM_OTHER, d, mode, a.cmd)) ) goto out; =20 @@ -4944,6 +4953,9 @@ static int do_altp2m_op( rcu_unlock_domain(d); =20 return rc; +#else /* !CONFIG_ALTP2M */ + return -EOPNOTSUPP; +#endif /* CONFIG_ALTP2M */ } =20 DEFINE_XEN_GUEST_HANDLE(compat_hvm_altp2m_op_t); @@ -5235,8 +5247,12 @@ int hvm_debug_op(struct vcpu *v, int32_t op) =20 case XEN_DOMCTL_DEBUG_OP_SINGLE_STEP_OFF: v->arch.hvm.single_step =3D false; + +#ifdef CONFIG_ALTP2M v->arch.hvm.fast_single_step.enabled =3D false; v->arch.hvm.fast_single_step.p2midx =3D 0; +#endif + break; =20 default: /* Excluded above */ @@ -5261,17 +5277,19 @@ void hvm_toggle_singlestep(struct vcpu *v) =20 void hvm_fast_singlestep(struct vcpu *v, uint16_t p2midx) { +#ifdef CONFIG_ALTP2M ASSERT(atomic_read(&v->pause_count)); =20 if ( !hvm_is_singlestep_supported() ) return; =20 - if ( p2midx >=3D MAX_ALTP2M ) + if ( p2midx >=3D v->domain->nr_altp2m ) return; =20 v->arch.hvm.single_step =3D true; v->arch.hvm.fast_single_step.enabled =3D true; v->arch.hvm.fast_single_step.p2midx =3D p2midx; +#endif } =20 /* diff --git a/xen/arch/x86/hvm/monitor.c b/xen/arch/x86/hvm/monitor.c index 523586ca98..d22a2e4644 100644 --- a/xen/arch/x86/hvm/monitor.c +++ b/xen/arch/x86/hvm/monitor.c @@ -178,6 +178,7 @@ int hvm_monitor_debug(unsigned long rip, enum hvm_monit= or_debug_type type, break; =20 case HVM_MONITOR_SINGLESTEP_BREAKPOINT: +#ifdef CONFIG_ALTP2M if ( curr->arch.hvm.fast_single_step.enabled ) { p2m_altp2m_check(curr, curr->arch.hvm.fast_single_step.p2midx); @@ -186,6 +187,7 @@ int hvm_monitor_debug(unsigned long rip, enum hvm_monit= or_debug_type type, curr->arch.hvm.fast_single_step.p2midx =3D 0; return 0; } +#endif if ( !ad->monitor.singlestep_enabled ) return 0; req.reason =3D VM_EVENT_REASON_SINGLESTEP; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 218cb2c1af..4b8f0acbc1 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2416,6 +2416,8 @@ static void cf_check vmx_enable_msr_interception(stru= ct domain *d, uint32_t msr) vmx_set_msr_intercept(v, msr, VMX_MSR_W); } =20 +#ifdef CONFIG_ALTP2M + static void cf_check vmx_vcpu_update_eptp(struct vcpu *v) { struct domain *d =3D v->domain; @@ -2535,6 +2537,8 @@ static bool cf_check vmx_vcpu_emulate_ve(struct vcpu = *v) return rc; } =20 +#endif /* CONFIG_ALTP2M */ + static bool cf_check vmx_get_pending_event( struct vcpu *v, struct x86_event *info) { @@ -2863,10 +2867,12 @@ static struct hvm_function_table __initdata_cf_clob= ber vmx_function_table =3D { .update_vlapic_mode =3D vmx_vlapic_msr_changed, .nhvm_hap_walk_L1_p2m =3D nvmx_hap_walk_L1_p2m, .enable_msr_interception =3D vmx_enable_msr_interception, +#ifdef CONFIG_ALTP2M .altp2m_vcpu_update_p2m =3D vmx_vcpu_update_eptp, .altp2m_vcpu_update_vmfunc_ve =3D vmx_vcpu_update_vmfunc_ve, .altp2m_vcpu_emulate_ve =3D vmx_vcpu_emulate_ve, .altp2m_vcpu_emulate_vmfunc =3D vmx_vcpu_emulate_vmfunc, +#endif .vmtrace_control =3D vmtrace_control, .vmtrace_output_position =3D vmtrace_output_position, .vmtrace_set_option =3D vmtrace_set_option, @@ -4225,6 +4231,7 @@ void asmlinkage vmx_vmexit_handler(struct cpu_user_re= gs *regs) /* Now enable interrupts so it's safe to take locks. */ local_irq_enable(); =20 +#ifdef CONFIG_ALTP2M /* * If the guest has the ability to switch EPTP without an exit, * figure out whether it has done so and update the altp2m data. @@ -4256,6 +4263,7 @@ void asmlinkage vmx_vmexit_handler(struct cpu_user_re= gs *regs) =20 p2m_set_altp2m(v, idx); } +#endif /* CONFIG_ALTP2M */ =20 if ( unlikely(currd->arch.monitor.vmexit_enabled) ) { @@ -4963,11 +4971,12 @@ bool asmlinkage vmx_vmenter_helper(const struct cpu= _user_regs *regs) single =3D ept; } =20 +#ifdef CONFIG_ALTP2M if ( altp2m_active(currd) ) { unsigned int i; =20 - for ( i =3D 0; i < MAX_ALTP2M; ++i ) + for ( i =3D 0; i < currd->nr_altp2m; ++i ) { if ( currd->arch.altp2m_eptp[i] =3D=3D mfn_x(INVALID_MFN) ) continue; @@ -4981,6 +4990,7 @@ bool asmlinkage vmx_vmenter_helper(const struct cpu_u= ser_regs *regs) } } } +#endif =20 if ( inv ) __invept(inv =3D=3D 1 ? INVEPT_SINGLE_CONTEXT : INVEPT_ALL_CON= TEXT, diff --git a/xen/arch/x86/include/asm/altp2m.h b/xen/arch/x86/include/asm/a= ltp2m.h index c57a8c5588..8ecd74f363 100644 --- a/xen/arch/x86/include/asm/altp2m.h +++ b/xen/arch/x86/include/asm/altp2m.h @@ -13,12 +13,32 @@ #include /* for struct vcpu, struct domain */ #include /* for vcpu_altp2m */ =20 +static inline bool altp2m_is_eptp_valid(const struct domain *d, + unsigned int idx) +{ + /* There must be enough EPTP entries to cover all altp2m indices */ + BUILD_BUG_ON(MAX_EPTP < MAX_NR_ALTP2M); + + /* Domain should not have more altp2m entries than MAX_NR_ALTP2M */ + ASSERT(d->nr_altp2m <=3D MAX_NR_ALTP2M); + + /* EPTP index is used as altp2m index */ + return idx < d->nr_altp2m && + d->arch.altp2m_eptp[array_index_nospec(idx, MAX_EPTP)] !=3D + mfn_x(INVALID_MFN); +} + /* Alternate p2m HVM on/off per domain */ static inline bool altp2m_active(const struct domain *d) { return d->arch.altp2m_active; } =20 +static inline uint16_t altp2m_vcpu_idx(const struct vcpu *v) +{ + return vcpu_altp2m(v).p2midx; +} + /* Alternate p2m VCPU */ void altp2m_vcpu_initialise(struct vcpu *v); void altp2m_vcpu_destroy(struct vcpu *v); @@ -26,11 +46,13 @@ void altp2m_vcpu_destroy(struct vcpu *v); int altp2m_vcpu_enable_ve(struct vcpu *v, gfn_t gfn); void altp2m_vcpu_disable_ve(struct vcpu *v); =20 -static inline uint16_t altp2m_vcpu_idx(const struct vcpu *v) +#else + +static inline bool altp2m_is_eptp_valid(const struct domain *d, + unsigned int idx) { - return vcpu_altp2m(v).p2midx; + return false; } -#else =20 static inline bool altp2m_active(const struct domain *d) { diff --git a/xen/arch/x86/include/asm/domain.h b/xen/arch/x86/include/asm/d= omain.h index 8c0dea12a5..02a00e1c07 100644 --- a/xen/arch/x86/include/asm/domain.h +++ b/xen/arch/x86/include/asm/domain.h @@ -258,11 +258,12 @@ struct paging_vcpu { struct shadow_vcpu shadow; }; =20 -#define MAX_NESTEDP2M 10 +#define MAX_EPTP (PAGE_SIZE / sizeof(uint64_t)) +#define MAX_NR_ALTP2M MAX_EPTP +#define MAX_NESTEDP2M 10 =20 -#define MAX_ALTP2M 10 /* arbitrary */ #define INVALID_ALTP2M 0xffff -#define MAX_EPTP (PAGE_SIZE / sizeof(uint64_t)) + struct p2m_domain; struct time_scale { int shift; @@ -351,12 +352,14 @@ struct arch_domain struct p2m_domain *nested_p2m[MAX_NESTEDP2M]; mm_lock_t nested_p2m_lock; =20 +#ifdef CONFIG_ALTP2M /* altp2m: allow multiple copies of host p2m */ bool altp2m_active; - struct p2m_domain *altp2m_p2m[MAX_ALTP2M]; + struct p2m_domain **altp2m_p2m; mm_lock_t altp2m_list_lock; uint64_t *altp2m_eptp; uint64_t *altp2m_visible_eptp; +#endif #endif =20 /* NB. protected by d->event_lock and by irq_desc[irq].lock */ diff --git a/xen/arch/x86/include/asm/hvm/vcpu.h b/xen/arch/x86/include/asm= /hvm/vcpu.h index 196fed6d5d..924af890c5 100644 --- a/xen/arch/x86/include/asm/hvm/vcpu.h +++ b/xen/arch/x86/include/asm/hvm/vcpu.h @@ -133,10 +133,12 @@ struct hvm_vcpu { bool flag_dr_dirty; bool debug_state_latch; bool single_step; +#ifdef CONFIG_ALTP2M struct { bool enabled; uint16_t p2midx; } fast_single_step; +#endif =20 /* (MFN) hypervisor page table */ pagetable_t monitor_table; @@ -154,7 +156,9 @@ struct hvm_vcpu { =20 struct nestedvcpu nvcpu; =20 +#ifdef CONFIG_ALTP2M struct altp2mvcpu avcpu; +#endif =20 struct mtrr_state mtrr; u64 pat_cr; diff --git a/xen/arch/x86/include/asm/p2m.h b/xen/arch/x86/include/asm/p2m.h index 4358cc15a2..262ddf8819 100644 --- a/xen/arch/x86/include/asm/p2m.h +++ b/xen/arch/x86/include/asm/p2m.h @@ -893,6 +893,8 @@ void cf_check nestedp2m_write_p2m_entry_post( * Alternate p2m: shadow p2m tables used for alternate memory views */ =20 +#ifdef CONFIG_ALTP2M + /* get current alternate p2m table */ static inline struct p2m_domain *p2m_get_altp2m(struct vcpu *v) { @@ -901,7 +903,7 @@ static inline struct p2m_domain *p2m_get_altp2m(struct = vcpu *v) if ( index =3D=3D INVALID_ALTP2M ) return NULL; =20 - BUG_ON(index >=3D MAX_ALTP2M); + BUG_ON(index >=3D v->domain->nr_altp2m); =20 return v->domain->arch.altp2m_p2m[index]; } @@ -911,7 +913,7 @@ static inline bool p2m_set_altp2m(struct vcpu *v, unsig= ned int idx) { struct p2m_domain *orig; =20 - BUG_ON(idx >=3D MAX_ALTP2M); + BUG_ON(idx >=3D v->domain->nr_altp2m); =20 if ( idx =3D=3D vcpu_altp2m(v).p2midx ) return false; @@ -962,16 +964,24 @@ int p2m_altp2m_propagate_change(struct domain *d, gfn= _t gfn, /* Set a specific p2m view visibility */ int p2m_set_altp2m_view_visibility(struct domain *d, unsigned int altp2m_i= dx, uint8_t visible); -#else /* !CONFIG_HVM */ -struct p2m_domain *p2m_get_altp2m(struct vcpu *v); -#endif /* CONFIG_HVM */ =20 -#ifdef CONFIG_ALTP2M /* Check to see if vcpu should be switched to a different p2m. */ void p2m_altp2m_check(struct vcpu *v, uint16_t idx); -#else +#else /* !CONFIG_ALTP2M */ +static inline struct p2m_domain *p2m_get_altp2m(struct vcpu *v) +{ + return NULL; +} + +static inline bool p2m_set_altp2m(struct vcpu *v, unsigned int idx) +{ + return false; +} + static inline void p2m_altp2m_check(struct vcpu *v, uint16_t idx) {} -#endif +#endif /* CONFIG_ALTP2M */ + +#endif /* CONFIG_HVM */ =20 /* p2m access to IOMMU flags */ static inline unsigned int p2m_access_to_iommu_flags(p2m_access_t p2ma) diff --git a/xen/arch/x86/mm/altp2m.c b/xen/arch/x86/mm/altp2m.c index 6fe1e9ed6b..dc6f310379 100644 --- a/xen/arch/x86/mm/altp2m.c +++ b/xen/arch/x86/mm/altp2m.c @@ -9,12 +9,16 @@ #include #include #include +#include #include "mm-locks.h" #include "p2m.h" =20 void altp2m_vcpu_initialise(struct vcpu *v) { + if ( v->domain->nr_altp2m =3D=3D 0 ) + return; + if ( v !=3D current ) vcpu_pause(v); =20 @@ -32,6 +36,9 @@ altp2m_vcpu_destroy(struct vcpu *v) { struct p2m_domain *p2m; =20 + if ( v->domain->nr_altp2m =3D=3D 0 ) + return; + if ( v !=3D current ) vcpu_pause(v); =20 @@ -122,7 +129,12 @@ int p2m_init_altp2m(struct domain *d) struct p2m_domain *hostp2m =3D p2m_get_hostp2m(d); =20 mm_lock_init(&d->arch.altp2m_list_lock); - for ( i =3D 0; i < MAX_ALTP2M; i++ ) + d->arch.altp2m_p2m =3D xvzalloc_array(struct p2m_domain *, d->nr_altp2= m); + + if ( !d->arch.altp2m_p2m ) + return -ENOMEM; + + for ( i =3D 0; i < d->nr_altp2m; i++ ) { d->arch.altp2m_p2m[i] =3D p2m =3D p2m_init_one(d); if ( p2m =3D=3D NULL ) @@ -143,7 +155,10 @@ void p2m_teardown_altp2m(struct domain *d) unsigned int i; struct p2m_domain *p2m; =20 - for ( i =3D 0; i < MAX_ALTP2M; i++ ) + if ( !d->arch.altp2m_p2m ) + return; + + for ( i =3D 0; i < d->nr_altp2m; i++ ) { if ( !d->arch.altp2m_p2m[i] ) continue; @@ -151,6 +166,8 @@ void p2m_teardown_altp2m(struct domain *d) d->arch.altp2m_p2m[i] =3D NULL; p2m_free_one(p2m); } + + XVFREE(d->arch.altp2m_p2m); } =20 int altp2m_get_effective_entry(struct p2m_domain *ap2m, gfn_t gfn, mfn_t *= mfn, @@ -200,7 +217,7 @@ bool p2m_switch_vcpu_altp2m_by_id(struct vcpu *v, unsig= ned int idx) struct domain *d =3D v->domain; bool rc =3D false; =20 - if ( idx >=3D MAX_ALTP2M ) + if ( idx >=3D d->nr_altp2m ) return rc; =20 altp2m_list_lock(d); @@ -306,8 +323,8 @@ static void p2m_reset_altp2m(struct domain *d, unsigned= int idx, { struct p2m_domain *p2m; =20 - ASSERT(idx < MAX_ALTP2M); - p2m =3D array_access_nospec(d->arch.altp2m_p2m, idx); + ASSERT(idx < d->nr_altp2m); + p2m =3D d->arch.altp2m_p2m[array_index_nospec(idx, d->nr_altp2m)]; =20 p2m_lock(p2m); =20 @@ -332,7 +349,7 @@ void p2m_flush_altp2m(struct domain *d) =20 altp2m_list_lock(d); =20 - for ( i =3D 0; i < MAX_ALTP2M; i++ ) + for ( i =3D 0; i < d->nr_altp2m; i++ ) { p2m_reset_altp2m(d, i, ALTP2M_DEACTIVATE); d->arch.altp2m_eptp[i] =3D mfn_x(INVALID_MFN); @@ -348,9 +365,9 @@ static int p2m_activate_altp2m(struct domain *d, unsign= ed int idx, struct p2m_domain *hostp2m, *p2m; int rc; =20 - ASSERT(idx < MAX_ALTP2M); + ASSERT(idx < d->nr_altp2m); =20 - p2m =3D array_access_nospec(d->arch.altp2m_p2m, idx); + p2m =3D d->arch.altp2m_p2m[array_index_nospec(idx, d->nr_altp2m)]; hostp2m =3D p2m_get_hostp2m(d); =20 p2m_lock(p2m); @@ -388,7 +405,7 @@ int p2m_init_altp2m_by_id(struct domain *d, unsigned in= t idx) int rc =3D -EINVAL; struct p2m_domain *hostp2m =3D p2m_get_hostp2m(d); =20 - if ( idx >=3D min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) ) + if ( idx >=3D d->nr_altp2m ) return rc; =20 altp2m_list_lock(d); @@ -415,7 +432,7 @@ int p2m_init_next_altp2m(struct domain *d, uint16_t *id= x, =20 altp2m_list_lock(d); =20 - for ( i =3D 0; i < MAX_ALTP2M; i++ ) + for ( i =3D 0; i < d->nr_altp2m; i++ ) { if ( d->arch.altp2m_eptp[i] !=3D mfn_x(INVALID_MFN) ) continue; @@ -437,7 +454,7 @@ int p2m_destroy_altp2m_by_id(struct domain *d, unsigned= int idx) struct p2m_domain *p2m; int rc =3D -EBUSY; =20 - if ( !idx || idx >=3D min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) ) + if ( !idx || idx >=3D d->nr_altp2m ) return rc; =20 rc =3D domain_pause_except_self(d); @@ -450,7 +467,7 @@ int p2m_destroy_altp2m_by_id(struct domain *d, unsigned= int idx) if ( d->arch.altp2m_eptp[array_index_nospec(idx, MAX_EPTP)] !=3D mfn_x(INVALID_MFN) ) { - p2m =3D array_access_nospec(d->arch.altp2m_p2m, idx); + p2m =3D d->arch.altp2m_p2m[array_index_nospec(idx, d->nr_altp2m)]; =20 if ( !_atomic_read(p2m->active_vcpus) ) { @@ -475,7 +492,7 @@ int p2m_switch_domain_altp2m_by_id(struct domain *d, un= signed int idx) struct vcpu *v; int rc =3D -EINVAL; =20 - if ( idx >=3D MAX_ALTP2M ) + if ( idx >=3D d->nr_altp2m ) return rc; =20 rc =3D domain_pause_except_self(d); @@ -510,13 +527,11 @@ int p2m_change_altp2m_gfn(struct domain *d, unsigned = int idx, mfn_t mfn; int rc =3D -EINVAL; =20 - if ( idx >=3D min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || - d->arch.altp2m_eptp[array_index_nospec(idx, MAX_EPTP)] =3D=3D - mfn_x(INVALID_MFN) ) + if ( !altp2m_is_eptp_valid(d, idx) ) return rc; =20 hp2m =3D p2m_get_hostp2m(d); - ap2m =3D array_access_nospec(d->arch.altp2m_p2m, idx); + ap2m =3D d->arch.altp2m_p2m[array_index_nospec(idx, d->nr_altp2m)]; =20 p2m_lock(hp2m); p2m_lock(ap2m); @@ -572,7 +587,7 @@ int p2m_altp2m_propagate_change(struct domain *d, gfn_t= gfn, =20 altp2m_list_lock(d); =20 - for ( i =3D 0; i < MAX_ALTP2M; i++ ) + for ( i =3D 0; i < d->nr_altp2m; i++ ) { p2m_type_t t; p2m_access_t a; @@ -595,7 +610,7 @@ int p2m_altp2m_propagate_change(struct domain *d, gfn_t= gfn, else { /* At least 2 altp2m's impacted, so reset everything */ - for ( i =3D 0; i < MAX_ALTP2M; i++ ) + for ( i =3D 0; i < d->nr_altp2m; i++ ) { if ( i =3D=3D last_reset_idx || d->arch.altp2m_eptp[i] =3D=3D mfn_x(INVALID_MFN) ) @@ -659,12 +674,11 @@ int p2m_set_suppress_ve_multi(struct domain *d, =20 if ( sve->view > 0 ) { - if ( sve->view >=3D min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) = || - d->arch.altp2m_eptp[array_index_nospec(sve->view, MAX_EPTP)] = =3D=3D - mfn_x(INVALID_MFN) ) + if ( !altp2m_is_eptp_valid(d, sve->view) ) return -EINVAL; =20 - p2m =3D ap2m =3D array_access_nospec(d->arch.altp2m_p2m, sve->view= ); + p2m =3D ap2m =3D + d->arch.altp2m_p2m[array_index_nospec(sve->view, d->nr_altp2m)= ]; } =20 p2m_lock(host_p2m); @@ -727,12 +741,11 @@ int p2m_get_suppress_ve(struct domain *d, gfn_t gfn, = bool *suppress_ve, =20 if ( altp2m_idx > 0 ) { - if ( altp2m_idx >=3D min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP)= || - d->arch.altp2m_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)]= =3D=3D - mfn_x(INVALID_MFN) ) + if ( !altp2m_is_eptp_valid(d, altp2m_idx) ) return -EINVAL; =20 - p2m =3D ap2m =3D array_access_nospec(d->arch.altp2m_p2m, altp2m_id= x); + p2m =3D ap2m =3D + d->arch.altp2m_p2m[array_index_nospec(altp2m_idx, d->nr_altp2m= )]; } else p2m =3D host_p2m; @@ -761,13 +774,7 @@ int p2m_set_altp2m_view_visibility(struct domain *d, u= nsigned int altp2m_idx, =20 altp2m_list_lock(d); =20 - /* - * Eptp index is correlated with altp2m index and should not exceed - * min(MAX_ALTP2M, MAX_EPTP). - */ - if ( altp2m_idx >=3D min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP) || - d->arch.altp2m_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)] =3D= =3D - mfn_x(INVALID_MFN) ) + if ( !altp2m_is_eptp_valid(d, altp2m_idx) ) rc =3D -EINVAL; else if ( visible ) d->arch.altp2m_visible_eptp[array_index_nospec(altp2m_idx, MAX_EPT= P)] =3D diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index ec5043a8aa..4aec98109d 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -494,6 +494,7 @@ int hap_enable(struct domain *d, u32 mode) goto out; } =20 +#ifdef CONFIG_ALTP2M if ( hvm_altp2m_supported() ) { /* Init alternate p2m data */ @@ -515,7 +516,7 @@ int hap_enable(struct domain *d, u32 mode) d->arch.altp2m_visible_eptp[i] =3D mfn_x(INVALID_MFN); } =20 - for ( i =3D 0; i < MAX_ALTP2M; i++ ) + for ( i =3D 0; i < d->nr_altp2m; i++ ) { rv =3D p2m_alloc_table(d->arch.altp2m_p2m[i]); if ( rv !=3D 0 ) @@ -524,6 +525,7 @@ int hap_enable(struct domain *d, u32 mode) =20 d->arch.altp2m_active =3D false; } +#endif /* CONFIG_ALTP2M */ =20 /* Now let other users see the new mode */ d->arch.paging.mode =3D mode | PG_HAP_enable; @@ -537,9 +539,11 @@ void hap_final_teardown(struct domain *d) { unsigned int i; =20 +#ifdef CONFIG_ALTP2M if ( hvm_altp2m_supported() ) - for ( i =3D 0; i < MAX_ALTP2M; i++ ) + for ( i =3D 0; i < d->nr_altp2m; i++ ) p2m_teardown(d->arch.altp2m_p2m[i], true, NULL); +#endif =20 /* Destroy nestedp2m's first */ for (i =3D 0; i < MAX_NESTEDP2M; i++) { @@ -578,6 +582,7 @@ void hap_teardown(struct domain *d, bool *preempted) for_each_vcpu ( d, v ) hap_vcpu_teardown(v); =20 +#ifdef CONFIG_ALTP2M /* Leave the root pt in case we get further attempts to modify the p2m= . */ if ( hvm_altp2m_supported() ) { @@ -590,13 +595,14 @@ void hap_teardown(struct domain *d, bool *preempted) FREE_XENHEAP_PAGE(d->arch.altp2m_eptp); FREE_XENHEAP_PAGE(d->arch.altp2m_visible_eptp); =20 - for ( i =3D 0; i < MAX_ALTP2M; i++ ) + for ( i =3D 0; i < d->nr_altp2m; i++ ) { p2m_teardown(d->arch.altp2m_p2m[i], false, preempted); if ( preempted && *preempted ) return; } } +#endif =20 /* Destroy nestedp2m's after altp2m. */ for ( i =3D 0; i < MAX_NESTEDP2M; i++ ) diff --git a/xen/arch/x86/mm/mem_access.c b/xen/arch/x86/mm/mem_access.c index 21b5b7ecda..079c63cbf9 100644 --- a/xen/arch/x86/mm/mem_access.c +++ b/xen/arch/x86/mm/mem_access.c @@ -79,8 +79,11 @@ bool p2m_mem_access_emulate_check(struct vcpu *v, struct domain *d =3D v->domain; struct p2m_domain *p2m =3D NULL; =20 +#ifdef CONFIG_ALTP2M if ( altp2m_active(d) ) p2m =3D p2m_get_altp2m(v); +#endif + if ( !p2m ) p2m =3D p2m_get_hostp2m(d); =20 @@ -143,8 +146,11 @@ bool p2m_mem_access_check(paddr_t gpa, unsigned long g= la, vm_event_request_t *req; int rc; =20 +#ifdef CONFIG_ALTP2M if ( altp2m_active(d) ) p2m =3D p2m_get_altp2m(v); +#endif + if ( !p2m ) p2m =3D p2m_get_hostp2m(d); =20 @@ -347,16 +353,16 @@ long p2m_set_mem_access(struct domain *d, gfn_t gfn, = uint32_t nr, unsigned long gfn_l; long rc =3D 0; =20 +#ifdef CONFIG_ALTP2M /* altp2m view 0 is treated as the hostp2m */ if ( altp2m_idx ) { - if ( altp2m_idx >=3D min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP)= || - d->arch.altp2m_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)]= =3D=3D - mfn_x(INVALID_MFN) ) + if ( !altp2m_is_eptp_valid(d, altp2m_idx) ) return -EINVAL; =20 - ap2m =3D array_access_nospec(d->arch.altp2m_p2m, altp2m_idx); + ap2m =3D d->arch.altp2m_p2m[array_index_nospec(altp2m_idx, d->nr_a= ltp2m)]; } +#endif =20 if ( !xenmem_access_to_p2m_access(p2m, access, &a) ) return -EINVAL; @@ -403,16 +409,16 @@ long p2m_set_mem_access_multi(struct domain *d, struct p2m_domain *p2m =3D p2m_get_hostp2m(d), *ap2m =3D NULL; long rc =3D 0; =20 +#ifdef CONFIG_ALTP2M /* altp2m view 0 is treated as the hostp2m */ if ( altp2m_idx ) { - if ( altp2m_idx >=3D min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP)= || - d->arch.altp2m_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)]= =3D=3D - mfn_x(INVALID_MFN) ) + if ( !altp2m_is_eptp_valid(d, altp2m_idx) ) return -EINVAL; =20 - ap2m =3D array_access_nospec(d->arch.altp2m_p2m, altp2m_idx); + ap2m =3D d->arch.altp2m_p2m[array_index_nospec(altp2m_idx, d->nr_a= ltp2m)]; } +#endif =20 p2m_lock(p2m); if ( ap2m ) @@ -462,6 +468,7 @@ int p2m_get_mem_access(struct domain *d, gfn_t gfn, xen= mem_access_t *access, { struct p2m_domain *p2m =3D p2m_get_hostp2m(d); =20 +#ifdef CONFIG_ALTP2M if ( !altp2m_active(d) ) { if ( altp2m_idx ) @@ -469,13 +476,12 @@ int p2m_get_mem_access(struct domain *d, gfn_t gfn, x= enmem_access_t *access, } else if ( altp2m_idx ) /* altp2m view 0 is treated as the hostp2m */ { - if ( altp2m_idx >=3D min(ARRAY_SIZE(d->arch.altp2m_p2m), MAX_EPTP)= || - d->arch.altp2m_eptp[array_index_nospec(altp2m_idx, MAX_EPTP)]= =3D=3D - mfn_x(INVALID_MFN) ) + if ( !altp2m_is_eptp_valid(d, altp2m_idx) ) return -EINVAL; =20 - p2m =3D array_access_nospec(d->arch.altp2m_p2m, altp2m_idx); + p2m =3D d->arch.altp2m_p2m[array_index_nospec(altp2m_idx, d->nr_al= tp2m)]; } +#endif =20 return _p2m_get_mem_access(p2m, gfn, access); } @@ -486,10 +492,11 @@ void arch_p2m_set_access_required(struct domain *d, b= ool access_required) =20 p2m_get_hostp2m(d)->access_required =3D access_required; =20 +#ifdef CONFIG_ALTP2M if ( altp2m_active(d) ) { unsigned int i; - for ( i =3D 0; i < MAX_ALTP2M; i++ ) + for ( i =3D 0; i < d->nr_altp2m; i++ ) { struct p2m_domain *p2m =3D d->arch.altp2m_p2m[i]; =20 @@ -497,6 +504,7 @@ void arch_p2m_set_access_required(struct domain *d, boo= l access_required) p2m->access_required =3D access_required; } } +#endif } =20 bool p2m_mem_access_sanity_check(const struct domain *d) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index da28266ef0..4787b27964 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -901,6 +901,7 @@ static int nominate_page(struct domain *d, gfn_t gfn, if ( !page || is_special_page(page) ) goto out; =20 +#ifdef CONFIG_ALTP2M /* Check if there are mem_access/remapped altp2m entries for this page= */ if ( altp2m_active(d) ) { @@ -912,7 +913,7 @@ static int nominate_page(struct domain *d, gfn_t gfn, =20 altp2m_list_lock(d); =20 - for ( i =3D 0; i < MAX_ALTP2M; i++ ) + for ( i =3D 0; i < d->nr_altp2m; i++ ) { ap2m =3D d->arch.altp2m_p2m[i]; if ( !ap2m ) @@ -929,6 +930,7 @@ static int nominate_page(struct domain *d, gfn_t gfn, =20 altp2m_list_unlock(d); } +#endif /* CONFIG_ALTP2M */ =20 /* Try to convert the mfn to the sharable type */ ret =3D page_make_sharable(d, page, expected_refcnt, validate_only); diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 0cf6818c13..06d46731a1 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -771,8 +771,10 @@ bool ept_handle_misconfig(uint64_t gpa) bool spurious; int rc; =20 +#ifdef CONFIG_ALTP2M if ( altp2m_active(curr->domain) ) p2m =3D p2m_get_altp2m(curr); +#endif =20 p2m_lock(p2m); =20 @@ -994,12 +996,14 @@ out: if ( is_epte_present(&old_entry) ) ept_free_entry(p2m, &old_entry, target); =20 +#ifdef CONFIG_ALTP2M if ( hvm_altp2m_supported() && entry_written && p2m_is_hostp2m(p2m) ) { ret =3D p2m_altp2m_propagate_change(d, _gfn(gfn), mfn, order, p2mt= , p2ma); if ( !rc ) rc =3D ret; } +#endif =20 return rc; } @@ -1297,11 +1301,12 @@ static void ept_set_ad_sync(struct domain *d, bool = value) =20 hostp2m->ept.ad =3D value; =20 +#ifdef CONFIG_ALTP2M if ( unlikely(altp2m_active(d)) ) { unsigned int i; =20 - for ( i =3D 0; i < MAX_ALTP2M; i++ ) + for ( i =3D 0; i < d->nr_altp2m; i++ ) { struct p2m_domain *p2m; =20 @@ -1315,6 +1320,7 @@ static void ept_set_ad_sync(struct domain *d, bool va= lue) p2m_unlock(p2m); } } +#endif } =20 static void ept_enable_pml(struct p2m_domain *p2m) @@ -1506,9 +1512,11 @@ void __init setup_ept_dump(void) register_keyhandler('D', ept_dump_p2m_table, "dump VT-x EPT tables", 0= ); } =20 +#ifdef CONFIG_ALTP2M void p2m_init_altp2m_ept(struct domain *d, unsigned int i) { - struct p2m_domain *p2m =3D array_access_nospec(d->arch.altp2m_p2m, i); + struct p2m_domain *p2m =3D + d->arch.altp2m_p2m[array_index_nospec(i, d->nr_altp2m)]; struct p2m_domain *hostp2m =3D p2m_get_hostp2m(d); struct ept_data *ept; =20 @@ -1527,7 +1535,7 @@ unsigned int p2m_find_altp2m_by_eptp(struct domain *d= , uint64_t eptp) =20 altp2m_list_lock(d); =20 - for ( i =3D 0; i < MAX_ALTP2M; i++ ) + for ( i =3D 0; i < d->nr_altp2m; i++ ) { if ( d->arch.altp2m_eptp[i] =3D=3D mfn_x(INVALID_MFN) ) continue; @@ -1545,6 +1553,7 @@ unsigned int p2m_find_altp2m_by_eptp(struct domain *d= , uint64_t eptp) altp2m_list_unlock(d); return i; } +#endif /* CONFIG_ALTP2M */ =20 /* * Local variables: diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c index 666abd46be..5a6ce2f8bc 100644 --- a/xen/arch/x86/mm/p2m-pt.c +++ b/xen/arch/x86/mm/p2m-pt.c @@ -519,12 +519,14 @@ int p2m_pt_handle_deferred_changes(uint64_t gpa) struct p2m_domain *p2m =3D p2m_get_hostp2m(current->domain); int rc; =20 +#ifdef CONFIG_ALTP2M /* * Should altp2m ever be enabled for NPT / shadow use, this code * should be updated to make use of the active altp2m, like * ept_handle_misconfig(). */ ASSERT(!altp2m_active(current->domain)); +#endif =20 p2m_lock(p2m); rc =3D do_recalc(p2m, PFN_DOWN(gpa)); diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index b9a7c2dc53..e802f2e4e6 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -101,11 +101,12 @@ void p2m_change_entry_type_global(struct domain *d, =20 change_entry_type_global(hostp2m, ot, nt); =20 +#ifdef CONFIG_ALTP2M if ( unlikely(altp2m_active(d)) ) { unsigned int i; =20 - for ( i =3D 0; i < MAX_ALTP2M; i++ ) + for ( i =3D 0; i < d->nr_altp2m; i++ ) { if ( d->arch.altp2m_eptp[i] !=3D mfn_x(INVALID_MFN) ) { @@ -117,6 +118,7 @@ void p2m_change_entry_type_global(struct domain *d, } } } +#endif =20 p2m_unlock(hostp2m); } @@ -145,11 +147,12 @@ bool p2m_memory_type_changed(struct domain *d) =20 _memory_type_changed(hostp2m); =20 +#ifdef CONFIG_ALTP2M if ( unlikely(altp2m_active(d)) ) { unsigned int i; =20 - for ( i =3D 0; i < MAX_ALTP2M; i++ ) + for ( i =3D 0; i < d->nr_altp2m; i++ ) { if ( d->arch.altp2m_eptp[i] !=3D mfn_x(INVALID_MFN) ) { @@ -161,6 +164,7 @@ bool p2m_memory_type_changed(struct domain *d) } } } +#endif =20 p2m_unlock(hostp2m); =20 @@ -930,11 +934,12 @@ void p2m_change_type_range(struct domain *d, =20 change_type_range(hostp2m, start, end, ot, nt); =20 +#ifdef CONFIG_ALTP2M if ( unlikely(altp2m_active(d)) ) { unsigned int i; =20 - for ( i =3D 0; i < MAX_ALTP2M; i++ ) + for ( i =3D 0; i < d->nr_altp2m; i++ ) { if ( d->arch.altp2m_eptp[i] !=3D mfn_x(INVALID_MFN) ) { @@ -946,6 +951,8 @@ void p2m_change_type_range(struct domain *d, } } } +#endif + hostp2m->defer_nested_flush =3D false; if ( nestedhvm_enabled(d) ) p2m_flush_nestedp2m(d); @@ -1003,11 +1010,12 @@ int p2m_finish_type_change(struct domain *d, if ( rc < 0 ) goto out; =20 +#ifdef CONFIG_ALTP2M if ( unlikely(altp2m_active(d)) ) { unsigned int i; =20 - for ( i =3D 0; i < MAX_ALTP2M; i++ ) + for ( i =3D 0; i < d->nr_altp2m; i++ ) { if ( d->arch.altp2m_eptp[i] !=3D mfn_x(INVALID_MFN) ) { @@ -1022,6 +1030,7 @@ int p2m_finish_type_change(struct domain *d, } } } +#endif =20 out: p2m_unlock(hostp2m); diff --git a/xen/common/domain.c b/xen/common/domain.c index 303c338ef2..9baa7dd0de 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -811,6 +811,9 @@ struct domain *domain_create(domid_t domid, if ( config ) { d->options =3D config->flags; +#ifdef CONFIG_ALTP2M + d->nr_altp2m =3D config->altp2m.nr; +#endif d->vmtrace_size =3D config->vmtrace_size; } =20 diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index a69dd96084..573d34f239 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -116,7 +116,10 @@ struct xen_domctl_createdomain { /* Altp2m mode signaling uses bits [0, 1]. */ #define XEN_DOMCTL_ALTP2M_mode_mask (0x3U) #define XEN_DOMCTL_ALTP2M_mode(m) ((m) & XEN_DOMCTL_ALTP2M_mode_mask) - uint32_t opts; + uint16_t opts; + + /* Number of altp2ms to permit. */ + uint16_t nr; } altp2m; =20 /* Per-vCPU buffer size in bytes. 0 to disable. */ diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index fe53d4fab7..e46d10c0c3 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -619,6 +619,10 @@ struct domain unsigned int guest_request_sync : 1; } monitor; =20 +#ifdef CONFIG_ALTP2M + unsigned int nr_altp2m; /* Number of altp2m tables. */ +#endif + unsigned int vmtrace_size; /* Buffer size in bytes, or 0 to disable. */ =20 #ifdef CONFIG_ARGO --=20 2.34.1 From nobody Thu Oct 30 22:46:57 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1752568308; cv=none; d=zohomail.com; s=zohoarc; b=eoU8Bi6xC0DbFy9ZKVrKp7iJIXpKc84uuGdfKlFnn72uZTGANad1iipfXqhiOR/2mrIJky7qYrVE7LH0/I4FWUTk0rmrkmdrTpfoHfMJhn/BucQbsUAGHvf3yS1v7UB+2fz7O3Yqz5kCwFPTgQvp/nv6TqXxMgswt8VO842Yg8Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752568308; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Pb/Ky+NjHb2U/AUnw3rA7qjcFJaFaS7qOBSec9pqZjI=; b=I+jx68e7tM+BEby+uw+PZ3JkP4d34MLmFhPNIyySIt04z/oNtoKnvAk0T8+O6Vb/7QGq40LC9bfkE/eDnCvtu3kpwkc8NyHLYuBWiEZXoUJv+6INbNGhQshZBUCAT9oltcPfgZr8sm4WJbbeMe79cFFI8A5DFnhvoosWHmdhmRw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 175256830863712.727124749141694; Tue, 15 Jul 2025 01:31:48 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1043769.1413825 (Exim 4.92) (envelope-from ) id 1ubb4P-0006Hr-I6; Tue, 15 Jul 2025 08:31:25 +0000 Received: by outflank-mailman (output) from mailman id 1043769.1413825; Tue, 15 Jul 2025 08:31:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ubb4P-0006HY-Cp; Tue, 15 Jul 2025 08:31:25 +0000 Received: by outflank-mailman (input) for mailman id 1043769; Tue, 15 Jul 2025 08:31:23 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ubb4N-0005rV-JQ for xen-devel@lists.xenproject.org; Tue, 15 Jul 2025 08:31:23 +0000 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [2a00:1450:4864:20::42a]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 16c412bf-6156-11f0-a319-13f23c93f187; Tue, 15 Jul 2025 10:31:22 +0200 (CEST) Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-3a4f64cdc2dso749952f8f.1 for ; Tue, 15 Jul 2025 01:31:22 -0700 (PDT) Received: from lab.home (dynamic-2a00-1028-83a4-4bca-c0bb-96ff-feed-9d50.ipv6.o2.cz. [2a00:1028:83a4:4bca:c0bb:96ff:feed:9d50]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4560f22cd14sm84787075e9.30.2025.07.15.01.31.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jul 2025 01:31:21 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 16c412bf-6156-11f0-a319-13f23c93f187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752568282; x=1753173082; darn=lists.xenproject.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=Pb/Ky+NjHb2U/AUnw3rA7qjcFJaFaS7qOBSec9pqZjI=; b=bBTNDY132zWh1vy4NPCwkJUKF4JL40G0ImyvxStYSn6f0MwyyXZ+9taJdM2iqBgORH 19VCMWpzUugm5wbh2n5eDPzSnnMZL4Th5fq8xmkJY0FjCf/RKcKRjuQk3IKItbr9OAZc vZZ5udW5GM213KGlfFMlI0eVtKPZkNysMzOSQVNS9j/HH033ZAMd78OeqDHM9jyGxkoe qP08/Rx6PLpFhkdiF60lqGvWOW+t1ML8zJ4OB149AHpP9RrxDA1ZnrTQT6Oxeo2YldfV FhIzRCuQLogoZDFvFuzK+K3C614lkFR7hlsHcxMvdFRNqUWA3tZvLSlrV5soEfeQMPNZ Mr/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752568282; x=1753173082; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Pb/Ky+NjHb2U/AUnw3rA7qjcFJaFaS7qOBSec9pqZjI=; b=Yw+4Hv2jol+MymfU4cf1PAocuA1dEJDv3SG45p+N/zO1p5Kgpfq3AEnC3ju7ybZxpc A99cRJUkOntIedduvlEW1C7cQBkLY8M3AvIcKj/LVuW7XWIRq/olT/mssPrUwQB5E93B YQGfIgJmZzgfwRmjL5kvMQyuz4MACW7Gwmmvrrfd4Slp+PDs4zfB1GMMfuKkfUx8z7dD S3udiycGJ6uciSpZN1TqHVZbd/2rWzGqSHnn7TRFhgYtKd6rFZVBfPRUIZmHHghjprYU RFeLVAMtQuqkNXpjq9Hah4YnM40v3caQVktw6f8KEVrKSNTOL4O0YauQ26P0//Wj5KhX /LYQ== X-Gm-Message-State: AOJu0YzoQzcbzq8WhPPFtozODAM9xXYrj9gMC137spiKc6kf3uKWlfak 2u9/a980np6C5aDd7sydwF+HgpuV6Cxs5Y60CqCA2znJEbjHKtlcDxTxsOaygQ== X-Gm-Gg: ASbGncvMyc1+XeEPf2zrRYVxz1MrPf4cY0o9eSHFjikR/jxBpbbcTRDf+lw0YfVAzSz n2ijPrm5hlVd/6oTDg6RYumBXfrLiAgoLFqXep7hFWVoYnrCdjFB7LbFg8Lc5XGc6P/MPHgfzsU CdGoQYHXt92n09pga8FzezYm39NvH2EdzAoSK58cKSjH2Kv364PGoyoDQYfZwwPmUbJ7krBR/AX KXUMZiOlw5UNXHvr+Qoklbbdw2fGPyMiBdw0rnLtgv71wPtSn0FKTSGmt+9LhZo/5Mg8xZ7F1Mo p2LKspYdvVOBfPMJ+iLmGqn4/DLHYJ7/eAOO/KEKs46D/zG7+DOYEhN5jKP2R9ZvxDu1ezz9f9/ V/wOHTfMMghoyqhRrhsXcZbWVBG0/QrKOuoyWhU/t0GXlxv4aWU9iRX8a0DpzNgB/npV+zmPuZ3 uT9aKcOTQ2YTRtn9d3nOMNMw== X-Google-Smtp-Source: AGHT+IFZOsinfU0cIcmHi9pWiaPdGc5n59QUav1VxuvnfLAqQjttpbsSsMjdIz/TQ3GfmoAGRE1+Rg== X-Received: by 2002:a05:600c:c111:b0:456:2137:5662 with SMTP id 5b1f17b1804b1-456291b4cd8mr2340595e9.7.1752568281554; Tue, 15 Jul 2025 01:31:21 -0700 (PDT) From: "=?UTF-8?q?Petr=20Bene=C5=A1?=" X-Google-Original-From: =?UTF-8?q?Petr=20Bene=C5=A1?= To: xen-devel@lists.xenproject.org Cc: =?UTF-8?q?Petr=20Bene=C5=A1?= , Anthony PERARD , Juergen Gross Subject: [PATCH v9 4/6] tools/libxl: Activate the altp2m_count feature Date: Tue, 15 Jul 2025 08:31:12 +0000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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: 1752568309877116600 From: Petr Bene=C5=A1 This commit activates the previously introduced altp2m_count parameter, establishing the connection between libxl and Xen. Signed-off-by: Petr Bene=C5=A1 Acked-by: Anthony PERARD --- tools/libs/light/libxl_create.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_creat= e.c index 4301f17f90..a796178050 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -596,6 +596,10 @@ int libxl__domain_make(libxl__gc *gc, libxl_domain_con= fig *d_config, .max_grant_frames =3D b_info->max_grant_frames, .max_maptrack_frames =3D b_info->max_maptrack_frames, .grant_opts =3D XEN_DOMCTL_GRANT_version(b_info->max_grant_ver= sion), + .altp2m =3D { + .opts =3D 0, /* .opts will be set below */ + .nr =3D b_info->altp2m_count, + }, .vmtrace_size =3D ROUNDUP(b_info->vmtrace_buf_kb << 10, XC_PAG= E_SHIFT), .cpupool_id =3D info->poolid, }; --=20 2.34.1 From nobody Thu Oct 30 22:46:57 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1752568307; cv=none; d=zohomail.com; s=zohoarc; b=IOHt113xBbsQ9ebDYpFJDypG613Vif9cKOOpgDn83tactTKoHJPJRoy+MCaU3jsjXfmp6a2hBaE2T/wGLE/u9493HEn+DtiiR+BtLtlo8T+o3ycIrKPkO18Cf38l6EnSIXoGhW5rxWUN/j1boMCbGVoncBEBbOZvx8jCIRPVqRU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752568307; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=PYagUw7+nV4AIrSjbYjtskD6tyaobfXIr4xaV+yxYuw=; b=R58oPTj6O38QCL8XqEvuxsRoeJ1iql1qrTBvs+03n9d1bmxoKFU2hErLEotj31Izmc46h6mMxUKUVnsqJOyL7uLV92IMcLgbBgRlMD9XOb8EmEqMiLFGuB5PZr45WvyQDYBBzk7a60DAc4J36apfT01yoEn1Ji2SO7w5OQwJiZ0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1752568307141245.4535514987016; Tue, 15 Jul 2025 01:31:47 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1043772.1413842 (Exim 4.92) (envelope-from ) id 1ubb4Q-0006Yu-R4; Tue, 15 Jul 2025 08:31:26 +0000 Received: by outflank-mailman (output) from mailman id 1043772.1413842; Tue, 15 Jul 2025 08:31:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ubb4Q-0006Wg-FT; Tue, 15 Jul 2025 08:31:26 +0000 Received: by outflank-mailman (input) for mailman id 1043772; Tue, 15 Jul 2025 08:31:25 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ubb4P-0005YW-1d for xen-devel@lists.xenproject.org; Tue, 15 Jul 2025 08:31:25 +0000 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [2a00:1450:4864:20::42e]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 1748a187-6156-11f0-b894-0df219b8e170; Tue, 15 Jul 2025 10:31:23 +0200 (CEST) Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-3a4eed70f24so756724f8f.0 for ; Tue, 15 Jul 2025 01:31:23 -0700 (PDT) Received: from lab.home (dynamic-2a00-1028-83a4-4bca-c0bb-96ff-feed-9d50.ipv6.o2.cz. [2a00:1028:83a4:4bca:c0bb:96ff:feed:9d50]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4560f22cd14sm84787075e9.30.2025.07.15.01.31.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jul 2025 01:31:22 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 1748a187-6156-11f0-b894-0df219b8e170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752568283; x=1753173083; darn=lists.xenproject.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=PYagUw7+nV4AIrSjbYjtskD6tyaobfXIr4xaV+yxYuw=; b=UQgL+SvrJeR0wpvewHvyxRoYLRLf1UohVol47L4QPt23/JB25kGKrhWped1CqjvnEj NshpbgGENelyonjFtJXZNZNHiZjyvXogotEt3NsXIsOUwSVRWOd4SywFkdpzTSR1lvV2 M+o4NVNF6+s/YA8W5hEaBaFX/BVtlBOVJZd6Xjk3CHS3/lBL9PAEl7kOnFMgl/rcPv2x hsIJDHiNL/hVJcKpYwIVETg/47ZVdY87gFlUaOflfnCushpcyVcUM4THlNF7uNq2/tzY 2B+vJBG6jb/1qJgFFmpYKwH+Zsb0WY6bcPXe4ePquywJdOWDPsqwzXsoPdWLM8f2Cult rYRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752568283; x=1753173083; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PYagUw7+nV4AIrSjbYjtskD6tyaobfXIr4xaV+yxYuw=; b=CAGe1Z/SS4hdREFR6zJvb1oR5ykvCf6WtE4Q1v5I/Q78II5ogxi5m2KcQKJrl6kGhh l0pFxMsvft9fg0M7CGeefoGeAq1aVLLVAiAvYCjxTpYjR8UXBJSn5cOg7PggSWCNbNNu NmOzJF/1IJGKQmaIV4YT12LpRTGuK298wwd06k8uQDy5EdV5ponFQlXQPAFIQJNWR077 yd+uxWAmo0IRAKuIMv+MqtyWtr+HBteve+vCjnvwx03fMBjQ0Fz+7i7bhUSC4eoqFm8z tXTHPsJAoisECyWwsFd/6ArR2rQn8YNLgh22RilKlkt3zZ1IlS52XNt2m68NoDyG6X5O 945w== X-Gm-Message-State: AOJu0YzqXkH4ErVbhgIQLT0tByWYo5TCvlyJjp/S6vTS9MC4mLwtfCze /ztlL+gxNks1Dr/rMO2mJCQI9DxyIIeJdRz5e4dUXhvW8twcCb/+zstAnFbHeA== X-Gm-Gg: ASbGncunGMlEy4olgQq426oKlkCGW7Rye7hrue+PpYkuX4cNJDhMjRTlDWBEr5ZpqZm l5OtYe3tLN3Ocex1sYQs2RMtovm9dv1ZYt7wDrZl13o9WEiaY95iJtRgBA9yLgGpsVTYwGDv77M cofbsXA2NtnUcOi5NsDcT5I/hEzE8KjusF6IPgy4hO1iq2hDnKEyiDc0Zl9VnjwO9ufbds3kBJX fokb++hlNGz0p6wq4tFdNFg1IqjFq3FdFfy18Z9Ih9IaXCfEEf7n6i5NrNr9+HwMB/1fsDpOIfu 8MzzJ+HZ37bYZyCxlGCdFusc/qkMM/IKB+863ZFgDqVSrINO0LiGWGgwXs4Nid4gElvw5UZX9y9 mj+cDhDEmIodm4LejzcygjqvWg3sYyQaANVZd71RXEQws0KQ9I6wJ5pDDjX7Vgyd4GsuOKNEhbB ofdQfjiHKCy9818MqqYPn8GA== X-Google-Smtp-Source: AGHT+IFFoID+G2TNmh2plFf9xbnbaz+gXK1QEu42r2amU2GVns+zxWB7UweKbNCfXyzbaUsczLSOGw== X-Received: by 2002:a05:600c:198d:b0:456:12a9:e92 with SMTP id 5b1f17b1804b1-4562919403fmr3164815e9.5.1752568282407; Tue, 15 Jul 2025 01:31:22 -0700 (PDT) From: "=?UTF-8?q?Petr=20Bene=C5=A1?=" X-Google-Original-From: =?UTF-8?q?Petr=20Bene=C5=A1?= To: xen-devel@lists.xenproject.org Cc: =?UTF-8?q?Petr=20Bene=C5=A1?= , Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [PATCH v9 5/6] xen/x86: Disallow creating domains with altp2m enabled and altp2m.nr == 0 Date: Tue, 15 Jul 2025 08:31:13 +0000 Message-Id: <7bdb1c10d8faee3853e1f2a81fce1c7f20424e88.1752568020.git.w1benny@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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: 1752568307816116600 From: Petr Bene=C5=A1 Since libxl finally sends the altp2m.nr value, we can remove the previously introduced temporary workaround. Creating domain with enabled altp2m while setting altp2m.nr =3D=3D 0 doesn't make sense and it's probably not what user wants. Signed-off-by: Petr Bene=C5=A1 Acked-by: Jan Beulich --- xen/arch/x86/domain.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 155ea1f79f..872e97999c 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -739,8 +739,9 @@ int arch_sanitise_domain_config(struct xen_domctl_creat= edomain *config) =20 if ( !config->altp2m.nr ) { - /* Fix the value to the legacy default */ - config->altp2m.nr =3D 10; + dprintk(XENLOG_INFO, + "altp2m must be requested with altp2m.nr > 0\n"); + return -EINVAL; } =20 if ( config->altp2m.nr > MAX_NR_ALTP2M ) --=20 2.34.1 From nobody Thu Oct 30 22:46:57 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1752568302; cv=none; d=zohomail.com; s=zohoarc; b=TClTbgt3Ta2sxotYcC6deC93433LDtKCF/ZyOX7abQp7S7RSzHAJU2oW2NKi9JHtF7HKuvTAOl8CGXZYhmIOJKDMH+VcNzHGSPn6lTVr7/aQkbigrC12WS9KhkZlwjdH/QtlXc832yc/5ZF0JLmM/fzMkBAYxj8YnZEKIS4sd40= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752568302; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=m6MHrYUDy32kDYPpsu7hQKmN53Ci3Cb0G+3ghuqtWGg=; b=XoTL8CPXea6WIEyyRfLgyJbgAggunMkAMbo/mwdnV/sqpZv+EBXreMp/QYy5W6LaEsq0wgFO87rxQM+z1+odA8iB7APRhgiWjp9XE3cWaUg06JM3Xs6Ix0CAi6A7R4zoTGa0wBimY0du7EawLhD/MixeTmHyHxcz/pimxfmuCNo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 175256830294935.0702246209263; Tue, 15 Jul 2025 01:31:42 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1043771.1413836 (Exim 4.92) (envelope-from ) id 1ubb4Q-0006T7-CO; Tue, 15 Jul 2025 08:31:26 +0000 Received: by outflank-mailman (output) from mailman id 1043771.1413836; Tue, 15 Jul 2025 08:31:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ubb4Q-0006Q3-7L; Tue, 15 Jul 2025 08:31:26 +0000 Received: by outflank-mailman (input) for mailman id 1043771; Tue, 15 Jul 2025 08:31:25 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ubb4O-0005rV-Vi for xen-devel@lists.xenproject.org; Tue, 15 Jul 2025 08:31:24 +0000 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [2a00:1450:4864:20::429]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 17dc3b13-6156-11f0-a319-13f23c93f187; Tue, 15 Jul 2025 10:31:24 +0200 (CEST) Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3a577ab8c34so509198f8f.3 for ; Tue, 15 Jul 2025 01:31:24 -0700 (PDT) Received: from lab.home (dynamic-2a00-1028-83a4-4bca-c0bb-96ff-feed-9d50.ipv6.o2.cz. [2a00:1028:83a4:4bca:c0bb:96ff:feed:9d50]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4560f22cd14sm84787075e9.30.2025.07.15.01.31.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jul 2025 01:31:22 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 17dc3b13-6156-11f0-a319-13f23c93f187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752568284; x=1753173084; darn=lists.xenproject.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=m6MHrYUDy32kDYPpsu7hQKmN53Ci3Cb0G+3ghuqtWGg=; b=h91Cf89fZNyFUlE8TeV0KRogj6PD6pkKhP/QvjYa+q3VjHO7l/lTSlT7ORYRu0E3B5 XiouOuXOcDgg+YMT/JWKope1ftsvzndo1L/2P68RYHSFYVk2hHO8OJuPI4cGaixf2bN4 GE9fS0wtGjiQHl2vh0OKmO4yMBtZzabYA1E2v02qKsPqW8a+aPNM1ahbUyozA6nyICaR bTznsmpdD1btUiV2875P4z16GF5jwyeNHseHD9ED/KWzsF5KahgT2lUyQmX19vxjXkv7 MjXLdZPQR87GNf8rCzp0QmY70O/u8M9Ff5I3WHV3af6cJXyqh7mNW7xtkET3midxe5kd fX9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752568284; x=1753173084; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=m6MHrYUDy32kDYPpsu7hQKmN53Ci3Cb0G+3ghuqtWGg=; b=st/FZxppaVFe0Jh5+nifeDNQfUVJM5gQpnMhz6B15NwaIbi/st7ixShJtMLDGYqi6h F3nPCoVH8QJgs7+WsKGGDzrYZiZ3Yt1RYYUVTOFAhwZQ//BrSHZL1HgvSG/BcDMsfn01 H4NbgxxC1LPrhxtNGEo75uNuANbwBwNjzUZVnDG+0TvgP0gzLCcucjWn99JJdwb99wcT B79bd85s+jLx1waDuEsBycVqNZ0hxWvjvUhSciH+/iHnkfZbREG4cRugrwoIwylbmxgV 0+Gtk2Yp142gdegxeTAu7goq4dw4yb/vTDYPNNTO56cCUYszK81EhWQ22TrzYSP5h5S7 jNig== X-Gm-Message-State: AOJu0YyuB3l6lqPN49nr0pvB06YOre3cIqexQvCukHwsYjhmGbTLfinW Q3Rz5VVPU7fwUvEEwkF6+RVR5WRNu8ERkMKege5l9Nz+sfp7IOE0RZ/hwDc/2A== X-Gm-Gg: ASbGncvoMCGV4Eiso4XR63qQmYGZPx419z8UmJUWqQPhS6LxpgU49co6ll3BPKk8zGs HmldBh6mwKb/X7r0VbZzIuMx4VHjHkHwuNg0DUFs4RC0RoNV0hTDpSyXABGubjAX4hYRD5wl90C nXDX/3n5+YuBC6NPx6KUJ28AC73ey0vX9TfHQpaNRgXJ5KhUnVjaEQAp5gE61W0ze8Y5n0i2Xhv FUmYCAFdggQWrZUPaH4oEEX5LPJD3Ni7YQbetWTEEmKV2xHR31MPt/Pgw6xJwe6L54Slnc3ABHf qCf2IADp0A9l9ffgAHGrf9bRgG5p6SwUwgCEMlH/LACQc4POvSwIiw/Bewg0At4XWwiLxyi5pQY tXmJ5EvdIx7brfDVffBRSFpC/fPP05NGIMlXxbeC3MR7t4JtXb+VDaUhOkF32jO8BcyElWO2fHu 5HjO5PhVKXyYK8yUjkRi0WmA0we/5PzLR5 X-Google-Smtp-Source: AGHT+IEteSoPVb5FybQO9igZ7ANSC94IK0hejjShrbVVn36XYTsNXVszxOFP0JqXIGR9F+wqoi9H7Q== X-Received: by 2002:a5d:5846:0:b0:3a3:71fb:7903 with SMTP id ffacd0b85a97d-3b60b3a3960mr254171f8f.10.1752568283455; Tue, 15 Jul 2025 01:31:23 -0700 (PDT) From: "=?UTF-8?q?Petr=20Bene=C5=A1?=" X-Google-Original-From: =?UTF-8?q?Petr=20Bene=C5=A1?= To: xen-devel@lists.xenproject.org Cc: =?UTF-8?q?Petr=20Bene=C5=A1?= , Christian Lindig , David Scott , Anthony PERARD , Christian Lindig Subject: [PATCH v9 6/6] tools/ocaml: Add altp2m_count parameter Date: Tue, 15 Jul 2025 08:31:14 +0000 Message-Id: <13d5b5a152f03b5bb5ac0144079c04bdd6f3cbb4.1752568020.git.w1benny@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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: 1752568303757116600 From: Petr Bene=C5=A1 Allow developers using the OCaml bindings to set the altp2m_count parameter. Signed-off-by: Petr Bene=C5=A1 Acked-by: Christian Lindig --- tools/ocaml/libs/xc/xenctrl.ml | 1 + tools/ocaml/libs/xc/xenctrl.mli | 1 + tools/ocaml/libs/xc/xenctrl_stubs.c | 19 +++++++++++++++---- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml index 7e1aabad6c..97108b9d86 100644 --- a/tools/ocaml/libs/xc/xenctrl.ml +++ b/tools/ocaml/libs/xc/xenctrl.ml @@ -87,6 +87,7 @@ type domctl_create_config =3D max_maptrack_frames: int; max_grant_version: int; altp2m_opts: int32; + altp2m_count: int32; vmtrace_buf_kb: int32; cpupool_id: int32; arch: arch_domainconfig; diff --git a/tools/ocaml/libs/xc/xenctrl.mli b/tools/ocaml/libs/xc/xenctrl.= mli index f44dba61ae..9fccb2c2c2 100644 --- a/tools/ocaml/libs/xc/xenctrl.mli +++ b/tools/ocaml/libs/xc/xenctrl.mli @@ -79,6 +79,7 @@ type domctl_create_config =3D { max_maptrack_frames: int; max_grant_version: int; altp2m_opts: int32; + altp2m_count: int32; vmtrace_buf_kb: int32; cpupool_id: int32; arch: arch_domainconfig; diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenc= trl_stubs.c index b51fd66788..ac2a7537d6 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -205,13 +205,22 @@ CAMLprim value stub_xc_domain_create(value xch_val, v= alue wanted_domid, value co #define VAL_MAX_MAPTRACK_FRAMES Field(config, 7) #define VAL_MAX_GRANT_VERSION Field(config, 8) #define VAL_ALTP2M_OPTS Field(config, 9) -#define VAL_VMTRACE_BUF_KB Field(config, 10) -#define VAL_CPUPOOL_ID Field(config, 11) -#define VAL_ARCH Field(config, 12) +#define VAL_ALTP2M_COUNT Field(config, 10) +#define VAL_VMTRACE_BUF_KB Field(config, 11) +#define VAL_CPUPOOL_ID Field(config, 12) +#define VAL_ARCH Field(config, 13) =20 uint32_t domid =3D Int_val(wanted_domid); + uint32_t altp2m_opts =3D Int32_val(VAL_ALTP2M_OPTS); + uint32_t altp2m_nr =3D Int32_val(VAL_ALTP2M_COUNT); uint64_t vmtrace_size =3D Int32_val(VAL_VMTRACE_BUF_KB); =20 + if ( altp2m_opts !=3D (uint16_t)altp2m_opts ) + caml_invalid_argument("altp2m_opts"); + + if ( altp2m_nr !=3D (uint16_t)altp2m_nr ) + caml_invalid_argument("altp2m_count"); + vmtrace_size =3D ROUNDUP(vmtrace_size << 10, XC_PAGE_SHIFT); if ( vmtrace_size !=3D (uint32_t)vmtrace_size ) caml_invalid_argument("vmtrace_buf_kb"); @@ -226,7 +235,8 @@ CAMLprim value stub_xc_domain_create(value xch_val, val= ue wanted_domid, value co .grant_opts =3D XEN_DOMCTL_GRANT_version(Int_val(VAL_MAX_GRANT_VERSION)), .altp2m =3D { - .opts =3D Int32_val(VAL_ALTP2M_OPTS), + .opts =3D altp2m_opts, + .nr =3D altp2m_nr, }, .vmtrace_size =3D vmtrace_size, .cpupool_id =3D Int32_val(VAL_CPUPOOL_ID), @@ -286,6 +296,7 @@ CAMLprim value stub_xc_domain_create(value xch_val, val= ue wanted_domid, value co #undef VAL_ARCH #undef VAL_CPUPOOL_ID #undef VAL_VMTRACE_BUF_KB +#undef VAL_ALTP2M_COUNT #undef VAL_ALTP2M_OPTS #undef VAL_MAX_GRANT_VERSION #undef VAL_MAX_MAPTRACK_FRAMES --=20 2.34.1