From: Rahul Singh <rahul.singh@arm.com>
To: xen-devel@lists.xenproject.org
Cc: bertrand.marquis@arm.com, rahul.singh@arm.com,
Andre.Przywara@arm.com,
"Christian Lindig" <christian.lindig@citrix.com>,
"David Scott" <dave@recoil.org>,
"Ian Jackson" <iwj@xenproject.org>, "Wei Liu" <wl@xen.org>,
"Andrew Cooper" <andrew.cooper3@citrix.com>,
"George Dunlap" <george.dunlap@citrix.com>,
"Jan Beulich" <jbeulich@suse.com>,
"Julien Grall" <julien@xen.org>,
"Stefano Stabellini" <sstabellini@kernel.org>,
"Volodymyr Babchuk" <Volodymyr_Babchuk@epam.com>,
"Roger Pau Monné" <roger.pau@citrix.com>
Subject: [PATCH v5 07/11] xen/domctl: Introduce XEN_DOMCTL_CDF_vpci flag
Date: Wed, 6 Oct 2021 18:40:33 +0100 [thread overview]
Message-ID: <20d5b9d6a0d01a7b90711d28cbefb5701a88b438.1633540842.git.rahul.singh@arm.com> (raw)
In-Reply-To: <cover.1633540842.git.rahul.singh@arm.com>
Introduce XEN_DOMCTL_CDF_vpci flag to enable VPCI support in XEN.
Reject the use of this new flag for x86 as VPCI is not supported for
DOMU guests for x86.
Signed-off-by: Rahul Singh <rahul.singh@arm.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Acked-by: Christian Lindig <christian.lindig@citrix.com>
---
Change in v5:
- Added Acked-by: Christian Lindig <christian.lindig@citrix.com>
- Added Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Change in v4: Added in this version
---
---
tools/ocaml/libs/xc/xenctrl.ml | 1 +
tools/ocaml/libs/xc/xenctrl.mli | 1 +
xen/arch/arm/domain.c | 4 ++--
xen/arch/x86/domain.c | 6 ++++++
xen/common/domain.c | 2 +-
xen/include/public/domctl.h | 4 +++-
6 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml
index a5588c643f..7ed1c00e47 100644
--- a/tools/ocaml/libs/xc/xenctrl.ml
+++ b/tools/ocaml/libs/xc/xenctrl.ml
@@ -69,6 +69,7 @@ type domain_create_flag =
| CDF_XS_DOMAIN
| CDF_IOMMU
| CDF_NESTED_VIRT
+ | CDF_VPCI
type domain_create_iommu_opts =
| IOMMU_NO_SHAREPT
diff --git a/tools/ocaml/libs/xc/xenctrl.mli b/tools/ocaml/libs/xc/xenctrl.mli
index 6e94940a8a..391d4abdf8 100644
--- a/tools/ocaml/libs/xc/xenctrl.mli
+++ b/tools/ocaml/libs/xc/xenctrl.mli
@@ -62,6 +62,7 @@ type domain_create_flag =
| CDF_XS_DOMAIN
| CDF_IOMMU
| CDF_NESTED_VIRT
+ | CDF_VPCI
type domain_create_iommu_opts =
| IOMMU_NO_SHAREPT
diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c
index 19c756ac3d..36138c1b2e 100644
--- a/xen/arch/arm/domain.c
+++ b/xen/arch/arm/domain.c
@@ -622,8 +622,8 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config)
{
unsigned int max_vcpus;
- /* HVM and HAP must be set. IOMMU may or may not be */
- if ( (config->flags & ~XEN_DOMCTL_CDF_iommu) !=
+ /* HVM and HAP must be set. IOMMU and VPCI may or may not be */
+ if ( (config->flags & ~XEN_DOMCTL_CDF_iommu & ~XEN_DOMCTL_CDF_vpci) !=
(XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap) )
{
dprintk(XENLOG_INFO, "Unsupported configuration %#x\n",
diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index ef1812dc14..79c2aa4636 100644
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -662,6 +662,12 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config)
return -EINVAL;
}
+ if ( config->flags & XEN_DOMCTL_CDF_vpci )
+ {
+ dprintk(XENLOG_INFO, "vPCI cannot be enabled yet\n");
+ return -EINVAL;
+ }
+
if ( config->vmtrace_size )
{
unsigned int size = config->vmtrace_size;
diff --git a/xen/common/domain.c b/xen/common/domain.c
index 6ee5d033b0..40d67ec342 100644
--- a/xen/common/domain.c
+++ b/xen/common/domain.c
@@ -483,7 +483,7 @@ static int sanitise_domain_config(struct xen_domctl_createdomain *config)
~(XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap |
XEN_DOMCTL_CDF_s3_integrity | XEN_DOMCTL_CDF_oos_off |
XEN_DOMCTL_CDF_xs_domain | XEN_DOMCTL_CDF_iommu |
- XEN_DOMCTL_CDF_nested_virt) )
+ XEN_DOMCTL_CDF_nested_virt | XEN_DOMCTL_CDF_vpci) )
{
dprintk(XENLOG_INFO, "Unknown CDF flags %#x\n", config->flags);
return -EINVAL;
diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h
index 96696e3842..4245da3f45 100644
--- a/xen/include/public/domctl.h
+++ b/xen/include/public/domctl.h
@@ -70,9 +70,11 @@ struct xen_domctl_createdomain {
#define XEN_DOMCTL_CDF_iommu (1U<<_XEN_DOMCTL_CDF_iommu)
#define _XEN_DOMCTL_CDF_nested_virt 6
#define XEN_DOMCTL_CDF_nested_virt (1U << _XEN_DOMCTL_CDF_nested_virt)
+#define _XEN_DOMCTL_CDF_vpci 7
+#define XEN_DOMCTL_CDF_vpci (1U << _XEN_DOMCTL_CDF_vpci)
/* Max XEN_DOMCTL_CDF_* constant. Used for ABI checking. */
-#define XEN_DOMCTL_CDF_MAX XEN_DOMCTL_CDF_nested_virt
+#define XEN_DOMCTL_CDF_MAX XEN_DOMCTL_CDF_vpci
uint32_t flags;
--
2.25.1
next prev parent reply other threads:[~2021-10-06 17:42 UTC|newest]
Thread overview: 190+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-06 17:40 [PATCH v5 00/11] PCI devices passthrough on Arm Rahul Singh
2021-10-06 17:40 ` [PATCH v5 01/11] xen/arm: xc_domain_ioport_permission(..) not supported on ARM Rahul Singh
2021-10-11 11:47 ` Roger Pau Monné
2021-10-11 12:11 ` Bertrand Marquis
2021-10-11 13:20 ` Roger Pau Monné
2021-10-11 13:40 ` Bertrand Marquis
2021-10-11 13:57 ` Roger Pau Monné
2021-10-11 14:16 ` Bertrand Marquis
2021-10-11 16:32 ` Roger Pau Monné
2021-10-11 17:11 ` Bertrand Marquis
2021-10-12 8:29 ` Jan Beulich
2021-10-12 8:41 ` Bertrand Marquis
2021-10-12 9:32 ` Jan Beulich
2021-10-12 9:38 ` Oleksandr Andrushchenko
2021-10-12 10:01 ` Jan Beulich
2021-10-12 10:06 ` Oleksandr Andrushchenko
2021-10-12 10:20 ` Jan Beulich
2021-10-12 10:41 ` Bertrand Marquis
2021-10-12 10:44 ` Jan Beulich
2021-10-12 14:53 ` Ian Jackson
2021-10-12 16:15 ` Bertrand Marquis
2021-10-12 16:29 ` Ian Jackson
2021-10-12 20:42 ` Stefano Stabellini
2021-10-13 8:07 ` Roger Pau Monné
2021-10-13 11:52 ` Ian Jackson
2021-10-13 8:02 ` Roger Pau Monné
2021-10-13 12:02 ` Ian Jackson
2021-10-12 9:40 ` Bertrand Marquis
2021-10-12 10:03 ` Jan Beulich
2021-10-11 14:16 ` Oleksandr Andrushchenko
2021-10-06 17:40 ` [PATCH v5 02/11] xen/arm: Add PHYSDEVOP_pci_device_(*add/remove) support for ARM Rahul Singh
2021-10-07 0:05 ` Stefano Stabellini
2021-10-07 12:58 ` Jan Beulich
2021-10-21 9:28 ` xen/arm: Missing appropriate locking for the IOMMU (WAS Re: [PATCH v5 02/11] xen/arm: Add PHYSDEVOP_pci_device_(*add/remove) support for ARM) Julien Grall
2021-10-21 13:15 ` Bertrand Marquis
2021-10-21 13:47 ` Julien Grall
2021-10-21 13:52 ` Bertrand Marquis
2021-10-06 17:40 ` [PATCH v5 03/11] xen/arm: Add cmdline boot option "pci-passthrough = <boolean>" Rahul Singh
2021-10-07 8:27 ` Jan Beulich
2021-10-07 8:32 ` Rahul Singh
2021-10-07 12:59 ` Jan Beulich
2021-10-06 17:40 ` [PATCH v5 04/11] xen/arm: PCI host bridge discovery within XEN on ARM Rahul Singh
2021-10-06 17:40 ` [PATCH v5 05/11] xen/arm: Add support for Xilinx ZynqMP PCI host controller Rahul Singh
2021-10-06 17:40 ` [PATCH v5 06/11] xen/arm: Implement pci access functions Rahul Singh
2021-10-06 17:40 ` Rahul Singh [this message]
2021-10-07 13:08 ` [PATCH v5 07/11] xen/domctl: Introduce XEN_DOMCTL_CDF_vpci flag Jan Beulich
2021-10-08 18:06 ` Andrew Cooper
2021-10-08 21:12 ` Julien Grall
2021-10-08 21:46 ` Stefano Stabellini
2021-10-11 9:24 ` Julien Grall
2021-10-11 11:29 ` Michal Orzel
2021-10-11 11:35 ` Jan Beulich
2021-10-11 13:17 ` Roger Pau Monné
2021-10-11 9:48 ` Ian Jackson
2021-10-11 9:27 ` Roger Pau Monné
2021-10-11 12:06 ` Michal Orzel
2021-10-12 10:38 ` Michal Orzel
2021-10-13 8:30 ` Roger Pau Monné
2021-10-13 9:36 ` Bertrand Marquis
2021-10-13 10:56 ` Roger Pau Monné
2021-10-13 12:11 ` Bertrand Marquis
2021-10-13 12:57 ` Jan Beulich
2021-10-13 20:41 ` Stefano Stabellini
2021-10-14 6:23 ` Jan Beulich
2021-10-14 7:53 ` Bertrand Marquis
2021-10-13 14:28 ` Roger Pau Monné
2021-10-13 20:53 ` Stefano Stabellini
2021-10-13 23:21 ` Stefano Stabellini
2021-10-12 21:48 ` Stefano Stabellini
2021-10-13 6:18 ` Jan Beulich
2021-10-13 7:11 ` Michal Orzel
2021-10-06 17:40 ` [PATCH v5 08/11] xen/arm: Enable the existing x86 virtual PCI support for ARM Rahul Singh
2021-10-07 13:43 ` Jan Beulich
2021-10-11 12:41 ` Bertrand Marquis
2021-10-11 13:09 ` Jan Beulich
2021-10-11 13:34 ` Bertrand Marquis
2021-10-11 14:10 ` Jan Beulich
2021-10-11 14:52 ` Bertrand Marquis
2021-10-11 18:18 ` Stefano Stabellini
2021-10-12 8:04 ` Jan Beulich
2021-10-12 21:37 ` Stefano Stabellini
2021-10-13 6:10 ` Jan Beulich
2021-10-13 10:02 ` Bertrand Marquis
2021-10-13 12:21 ` Jan Beulich
2021-10-12 15:04 ` Julien Grall
2021-10-12 16:12 ` Bertrand Marquis
2021-10-12 16:20 ` Julien Grall
2021-10-12 17:50 ` Bertrand Marquis
2021-10-11 10:51 ` Roger Pau Monné
2021-10-11 16:12 ` Bertrand Marquis
2021-10-11 16:20 ` Oleksandr Andrushchenko
2021-10-11 16:43 ` Roger Pau Monné
2021-10-11 17:15 ` Bertrand Marquis
2021-10-11 18:30 ` Oleksandr Andrushchenko
2021-10-11 19:27 ` Stefano Stabellini
2021-10-12 5:34 ` Oleksandr Andrushchenko
2021-10-12 7:44 ` Bertrand Marquis
2021-10-12 14:32 ` Julien Grall
2021-10-12 14:34 ` Bertrand Marquis
2021-10-13 8:45 ` Roger Pau Monné
2021-10-13 9:48 ` Bertrand Marquis
2021-10-13 10:33 ` Roger Pau Monné
2021-10-13 13:00 ` Jan Beulich
2021-10-13 14:51 ` Oleksandr Andrushchenko
2021-10-13 15:15 ` Jan Beulich
2021-10-13 19:27 ` Stefano Stabellini
2021-10-14 6:33 ` Jan Beulich
2021-10-14 7:53 ` Bertrand Marquis
2021-10-14 9:03 ` Bertrand Marquis
2021-10-14 9:24 ` Jan Beulich
2021-10-06 17:40 ` [PATCH v5 09/11] xen/arm: Transitional change to build HAS_VPCI on ARM Rahul Singh
2021-10-11 11:43 ` Roger Pau Monné
2021-10-11 12:15 ` Bertrand Marquis
2021-10-12 1:32 ` Stefano Stabellini
2021-10-06 17:40 ` [PATCH v5 10/11] arm/libxl: Emulated PCI device tree node in libxl Rahul Singh
2021-10-06 18:01 ` Julien Grall
2021-10-07 0:26 ` Stefano Stabellini
2021-10-07 15:31 ` Rahul Singh
2021-10-07 10:53 ` Ian Jackson
2021-10-07 15:29 ` Rahul Singh
2021-10-07 16:11 ` Ian Jackson
2021-10-11 13:46 ` Roger Pau Monné
2021-10-14 17:16 ` Bertrand Marquis
2021-10-14 14:49 ` [PATCH v6 0/3] PCI devices passthrough on Arm Bertrand Marquis
2021-10-14 14:49 ` [PATCH v6 1/3] xen/vpci: Move ecam access functions to common code Bertrand Marquis
2021-10-14 16:06 ` Jan Beulich
2021-10-14 17:09 ` Bertrand Marquis
2021-10-15 6:29 ` Jan Beulich
2021-10-15 7:37 ` Bertrand Marquis
2021-10-15 8:13 ` Jan Beulich
2021-10-15 8:20 ` Bertrand Marquis
2021-10-15 8:24 ` Jan Beulich
2021-10-15 9:49 ` Roger Pau Monné
2021-10-14 23:47 ` Stefano Stabellini
2021-10-15 7:44 ` Roger Pau Monné
2021-10-15 7:53 ` Bertrand Marquis
2021-10-15 9:53 ` Roger Pau Monné
2021-10-15 10:12 ` Bertrand Marquis
2021-10-15 10:14 ` Jan Beulich
2021-10-14 14:49 ` [PATCH v6 2/3] xen/arm: Enable the existing x86 virtual PCI support for ARM Bertrand Marquis
2021-10-14 23:49 ` Stefano Stabellini
2021-10-15 6:40 ` Jan Beulich
2021-10-15 9:59 ` Ian Jackson
2021-10-15 10:10 ` Bertrand Marquis
2021-10-15 8:00 ` Jan Beulich
2021-10-15 10:09 ` Bertrand Marquis
2021-10-15 10:14 ` Ian Jackson
2021-10-15 10:18 ` Jan Beulich
2021-10-15 11:35 ` Roger Pau Monné
2021-10-15 12:13 ` Bertrand Marquis
2021-10-15 12:18 ` Jan Beulich
2021-10-15 12:28 ` Bertrand Marquis
2021-10-15 13:00 ` Jan Beulich
2021-10-15 13:10 ` Bertrand Marquis
2021-10-15 10:38 ` Jan Beulich
2021-10-15 8:32 ` Roger Pau Monné
2021-10-15 8:42 ` Michal Orzel
2021-10-15 9:52 ` Bertrand Marquis
2021-10-15 10:13 ` Luca Fancellu
2021-10-15 10:17 ` Bertrand Marquis
2021-10-15 10:19 ` Roger Pau Monné
2021-10-15 10:31 ` Bertrand Marquis
2021-10-15 10:24 ` Jan Beulich
2021-10-15 10:33 ` Bertrand Marquis
2021-10-15 10:41 ` Jan Beulich
2021-10-15 10:48 ` Bertrand Marquis
2021-10-15 10:51 ` Jan Beulich
2021-10-15 11:08 ` Bertrand Marquis
2021-10-15 13:47 ` Roger Pau Monné
2021-10-15 14:00 ` Luca Fancellu
2021-10-15 14:32 ` Roger Pau Monné
2021-10-14 14:49 ` [PATCH v6 3/3] arm/libxl: Emulated PCI device tree node in libxl Bertrand Marquis
2021-10-14 17:54 ` [PATCH v6 3/3] arm/libxl: Emulated PCI device tree node in libxl [and 1 more messages] Ian Jackson
2021-10-14 23:50 ` Stefano Stabellini
2021-10-15 7:28 ` Julien Grall
2021-10-15 7:41 ` Michal Orzel
2021-10-15 9:01 ` Julien Grall
2021-10-15 10:02 ` Ian Jackson
2021-10-15 10:58 ` Michal Orzel
2021-10-15 11:04 ` Michal Orzel
2021-10-15 11:46 ` Ian Jackson
2021-10-15 11:53 ` Michal Orzel
2021-10-15 12:10 ` Julien Grall
2021-10-15 12:14 ` Ian Jackson
2021-10-15 12:13 ` Ian Jackson
2021-10-12 15:03 ` [PATCH v5 10/11] arm/libxl: Emulated PCI device tree node in libxl Ian Jackson
2021-10-06 17:40 ` [PATCH v5 11/11] xen/arm: Add linux,pci-domain property for hwdom if not available Rahul Singh
2021-10-13 20:54 ` Stefano Stabellini
2021-10-07 19:54 ` [PATCH v5 00/11] PCI devices passthrough on Arm Stefano Stabellini
2021-10-07 21:29 ` Rahul Singh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20d5b9d6a0d01a7b90711d28cbefb5701a88b438.1633540842.git.rahul.singh@arm.com \
--to=rahul.singh@arm.com \
--cc=Andre.Przywara@arm.com \
--cc=Volodymyr_Babchuk@epam.com \
--cc=andrew.cooper3@citrix.com \
--cc=bertrand.marquis@arm.com \
--cc=christian.lindig@citrix.com \
--cc=dave@recoil.org \
--cc=george.dunlap@citrix.com \
--cc=iwj@xenproject.org \
--cc=jbeulich@suse.com \
--cc=julien@xen.org \
--cc=roger.pau@citrix.com \
--cc=sstabellini@kernel.org \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).