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,
"Andrew Cooper" <andrew.cooper3@citrix.com>,
"George Dunlap" <george.dunlap@citrix.com>,
"Ian Jackson" <iwj@xenproject.org>,
"Jan Beulich" <jbeulich@suse.com>,
"Julien Grall" <julien@xen.org>,
"Stefano Stabellini" <sstabellini@kernel.org>,
"Wei Liu" <wl@xen.org>,
"Volodymyr Babchuk" <Volodymyr_Babchuk@epam.com>,
"Roger Pau Monné" <roger.pau@citrix.com>
Subject: [PATCH v5 03/11] xen/arm: Add cmdline boot option "pci-passthrough = <boolean>"
Date: Wed, 6 Oct 2021 18:40:29 +0100 [thread overview]
Message-ID: <e7d91ded71816d07f559b98027e5be1ff172dcab.1633540842.git.rahul.singh@arm.com> (raw)
In-Reply-To: <cover.1633540842.git.rahul.singh@arm.com>
Add cmdline boot option "pci-passthrough = = <boolean>" to enable or
disable the PCI passthrough support on ARM.
Signed-off-by: Rahul Singh <rahul.singh@arm.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
---
Change in v5: none
Change in v4:
- Fixe minor comments
- Added Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
- Added Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Change in v3:
- Remove "define pci_passthrough_enabled (false)"
- Fixed coding style and minor comment
Change in v2:
- Add option in xen-command-line.pandoc
- Change pci option to pci-passthrough
- modify option from custom_param to boolean param
---
---
docs/misc/xen-command-line.pandoc | 7 +++++++
xen/arch/arm/pci/pci.c | 12 ++++++++++++
xen/drivers/pci/physdev.c | 6 ++++++
xen/include/asm-arm/pci.h | 11 +++++++++++
xen/include/asm-x86/pci.h | 6 ++++++
5 files changed, 42 insertions(+)
diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc
index 5cae4adc58..b1f7978aa4 100644
--- a/docs/misc/xen-command-line.pandoc
+++ b/docs/misc/xen-command-line.pandoc
@@ -1819,6 +1819,13 @@ All numbers specified must be hexadecimal ones.
This option can be specified more than once (up to 8 times at present).
+### pci-passthrough (arm)
+> `= <boolean>`
+
+> Default: `false`
+
+Flag to enable or disable support for PCI passthrough
+
### pcid (x86)
> `= <boolean> | xpti=<bool>`
diff --git a/xen/arch/arm/pci/pci.c b/xen/arch/arm/pci/pci.c
index e359bab9ea..73540045d1 100644
--- a/xen/arch/arm/pci/pci.c
+++ b/xen/arch/arm/pci/pci.c
@@ -16,6 +16,7 @@
#include <xen/device_tree.h>
#include <xen/errno.h>
#include <xen/init.h>
+#include <xen/param.h>
#include <xen/pci.h>
/*
@@ -62,8 +63,19 @@ static int __init acpi_pci_init(void)
}
#endif
+/* By default pci passthrough is disabled. */
+bool __read_mostly pci_passthrough_enabled;
+boolean_param("pci-passthrough", pci_passthrough_enabled);
+
static int __init pci_init(void)
{
+ /*
+ * Enable PCI passthrough when has been enabled explicitly
+ * (pci-passthrough=on).
+ */
+ if ( !pci_passthrough_enabled )
+ return 0;
+
pci_segments_init();
if ( acpi_disabled )
diff --git a/xen/drivers/pci/physdev.c b/xen/drivers/pci/physdev.c
index 4f3e1a96c0..42db3e6d13 100644
--- a/xen/drivers/pci/physdev.c
+++ b/xen/drivers/pci/physdev.c
@@ -18,6 +18,9 @@ ret_t pci_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
struct pci_dev_info pdev_info;
nodeid_t node = NUMA_NO_NODE;
+ if ( !is_pci_passthrough_enabled() )
+ return -EOPNOTSUPP;
+
ret = -EFAULT;
if ( copy_from_guest(&add, arg, 1) != 0 )
break;
@@ -53,6 +56,9 @@ ret_t pci_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
case PHYSDEVOP_pci_device_remove: {
struct physdev_pci_device dev;
+ if ( !is_pci_passthrough_enabled() )
+ return -EOPNOTSUPP;
+
ret = -EFAULT;
if ( copy_from_guest(&dev, arg, 1) != 0 )
break;
diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h
index 7dd9eb3dba..0cf849e26f 100644
--- a/xen/include/asm-arm/pci.h
+++ b/xen/include/asm-arm/pci.h
@@ -19,14 +19,25 @@
#define pci_to_dev(pcidev) (&(pcidev)->arch.dev)
+extern bool_t pci_passthrough_enabled;
+
/* Arch pci dev struct */
struct arch_pci_dev {
struct device dev;
};
+static always_inline bool is_pci_passthrough_enabled(void)
+{
+ return pci_passthrough_enabled;
+}
#else /*!CONFIG_HAS_PCI*/
struct arch_pci_dev { };
+static always_inline bool is_pci_passthrough_enabled(void)
+{
+ return false;
+}
+
#endif /*!CONFIG_HAS_PCI*/
#endif /* __ARM_PCI_H__ */
diff --git a/xen/include/asm-x86/pci.h b/xen/include/asm-x86/pci.h
index cc05045e9c..e076951032 100644
--- a/xen/include/asm-x86/pci.h
+++ b/xen/include/asm-x86/pci.h
@@ -32,4 +32,10 @@ bool_t pci_ro_mmcfg_decode(unsigned long mfn, unsigned int *seg,
extern int pci_mmcfg_config_num;
extern struct acpi_mcfg_allocation *pci_mmcfg_config;
+/* Unlike ARM, PCI passthrough is always enabled for x86. */
+static always_inline bool is_pci_passthrough_enabled(void)
+{
+ return true;
+}
+
#endif /* __X86_PCI_H__ */
--
2.25.1
next prev parent reply other threads:[~2021-10-06 17:41 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 ` Rahul Singh [this message]
2021-10-07 8:27 ` [PATCH v5 03/11] xen/arm: Add cmdline boot option "pci-passthrough = <boolean>" 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 ` [PATCH v5 07/11] xen/domctl: Introduce XEN_DOMCTL_CDF_vpci flag Rahul Singh
2021-10-07 13:08 ` 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=e7d91ded71816d07f559b98027e5be1ff172dcab.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=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).