From: Rahul Singh <Rahul.Singh@arm.com>
To: Stefano Stabellini <sstabellini@kernel.org>
Cc: xen-devel <xen-devel@lists.xenproject.org>,
"Bertrand Marquis" <Bertrand.Marquis@arm.com>,
"Andre Przywara" <Andre.Przywara@arm.com>,
"Julien Grall" <julien@xen.org>,
"Volodymyr Babchuk" <Volodymyr_Babchuk@epam.com>,
"Andrew Cooper" <andrew.cooper3@citrix.com>,
"George Dunlap" <george.dunlap@citrix.com>,
"Ian Jackson" <iwj@xenproject.org>,
"Jan Beulich" <jbeulich@suse.com>, "Wei Liu" <wl@xen.org>,
"Roger Pau Monné" <roger.pau@citrix.com>
Subject: Re: [PATCH v2 05/17] xen/arm: Add PHYSDEVOP_pci_device_* support for ARM
Date: Thu, 23 Sep 2021 11:19:30 +0000 [thread overview]
Message-ID: <59B54064-1DE0-44ED-9B50-F1709B77E56B@arm.com> (raw)
In-Reply-To: <alpine.DEB.2.21.2109221527510.17979@sstabellini-ThinkPad-T480s>
Hi Stefano,
> On 22 Sep 2021, at 11:37 pm, Stefano Stabellini <sstabellini@kernel.org> wrote:
>
> On Wed, 22 Sep 2021, Rahul Singh wrote:
>> Hardware domain is in charge of doing the PCI enumeration and will
>> discover the PCI devices and then will communicate to XEN via hyper
>> call PHYSDEVOP_pci_device_add(..) to add the PCI devices in XEN.
>>
>> Also implement PHYSDEVOP_pci_device_remove(..) to remove the PCI device.
>>
>> As most of the code for PHYSDEVOP_pci_device_* is the same between x86
>> and ARM, move the code to a common file to avoid duplication.
>>
>> Signed-off-by: Rahul Singh <rahul.singh@arm.com>
>> ---
>> Change in v2:
>> - Add support for PHYSDEVOP_pci_device_remove()
>> - Move code to common code
>> ---
>> xen/arch/arm/physdev.c | 5 +-
>> xen/arch/x86/physdev.c | 50 +-------------------
>> xen/arch/x86/x86_64/physdev.c | 4 +-
>> xen/common/Makefile | 1 +
>> xen/common/physdev.c | 81 +++++++++++++++++++++++++++++++++
>> xen/include/asm-arm/hypercall.h | 2 -
>> xen/include/asm-arm/numa.h | 5 ++
>> xen/include/asm-x86/hypercall.h | 9 ++--
>> xen/include/xen/hypercall.h | 8 ++++
>> 9 files changed, 106 insertions(+), 59 deletions(-)
>> create mode 100644 xen/common/physdev.c
>>
>> diff --git a/xen/arch/arm/physdev.c b/xen/arch/arm/physdev.c
>> index e91355fe22..4e00b03aab 100644
>> --- a/xen/arch/arm/physdev.c
>> +++ b/xen/arch/arm/physdev.c
>> @@ -8,10 +8,9 @@
>> #include <xen/lib.h>
>> #include <xen/errno.h>
>> #include <xen/sched.h>
>> -#include <asm/hypercall.h>
>> +#include <xen/hypercall.h>
>>
>> -
>> -int do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
>> +long arch_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
>> {
>> gdprintk(XENLOG_DEBUG, "PHYSDEVOP cmd=%d: not implemented\n", cmd);
>> return -ENOSYS;
>> diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c
>> index 23465bcd00..c00cc99404 100644
>> --- a/xen/arch/x86/physdev.c
>> +++ b/xen/arch/x86/physdev.c
>> @@ -174,7 +174,7 @@ int physdev_unmap_pirq(domid_t domid, int pirq)
>> }
>> #endif /* COMPAT */
>>
>> -ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
>> +ret_t arch_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
>> {
>> int irq;
>> ret_t ret;
>> @@ -480,54 +480,6 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
>> break;
>> }
>>
>> - case PHYSDEVOP_pci_device_add: {
>> - struct physdev_pci_device_add add;
>> - struct pci_dev_info pdev_info;
>> - nodeid_t node;
>> -
>> - ret = -EFAULT;
>> - if ( copy_from_guest(&add, arg, 1) != 0 )
>> - break;
>> -
>> - pdev_info.is_extfn = !!(add.flags & XEN_PCI_DEV_EXTFN);
>> - if ( add.flags & XEN_PCI_DEV_VIRTFN )
>> - {
>> - pdev_info.is_virtfn = 1;
>> - pdev_info.physfn.bus = add.physfn.bus;
>> - pdev_info.physfn.devfn = add.physfn.devfn;
>> - }
>> - else
>> - pdev_info.is_virtfn = 0;
>> -
>> - if ( add.flags & XEN_PCI_DEV_PXM )
>> - {
>> - uint32_t pxm;
>> - size_t optarr_off = offsetof(struct physdev_pci_device_add, optarr) /
>> - sizeof(add.optarr[0]);
>> -
>> - if ( copy_from_guest_offset(&pxm, arg, optarr_off, 1) )
>> - break;
>> -
>> - node = pxm_to_node(pxm);
>> - }
>> - else
>> - node = NUMA_NO_NODE;
>> -
>> - ret = pci_add_device(add.seg, add.bus, add.devfn, &pdev_info, node);
>> - break;
>> - }
>> -
>> - case PHYSDEVOP_pci_device_remove: {
>> - struct physdev_pci_device dev;
>> -
>> - ret = -EFAULT;
>> - if ( copy_from_guest(&dev, arg, 1) != 0 )
>> - break;
>> -
>> - ret = pci_remove_device(dev.seg, dev.bus, dev.devfn);
>> - break;
>> - }
>> -
>> case PHYSDEVOP_prepare_msix:
>> case PHYSDEVOP_release_msix: {
>> struct physdev_pci_device dev;
>> diff --git a/xen/arch/x86/x86_64/physdev.c b/xen/arch/x86/x86_64/physdev.c
>> index 0a50cbd4d8..5f72652ff7 100644
>> --- a/xen/arch/x86/x86_64/physdev.c
>> +++ b/xen/arch/x86/x86_64/physdev.c
>> @@ -9,9 +9,10 @@ EMIT_FILE;
>> #include <compat/xen.h>
>> #include <compat/event_channel.h>
>> #include <compat/physdev.h>
>> -#include <asm/hypercall.h>
>> +#include <xen/hypercall.h>
>>
>> #define do_physdev_op compat_physdev_op
>> +#define arch_physdev_op arch_compat_physdev_op
>>
>> #define physdev_apic compat_physdev_apic
>> #define physdev_apic_t physdev_apic_compat_t
>> @@ -82,6 +83,7 @@ CHECK_physdev_pci_device
>> typedef int ret_t;
>>
>> #include "../physdev.c"
>> +#include "../../../common/physdev.c"
>>
>> /*
>> * Local variables:
>> diff --git a/xen/common/Makefile b/xen/common/Makefile
>> index 54de70d422..bcb1c8fb03 100644
>> --- a/xen/common/Makefile
>> +++ b/xen/common/Makefile
>> @@ -29,6 +29,7 @@ obj-y += notifier.o
>> obj-y += page_alloc.o
>> obj-$(CONFIG_HAS_PDX) += pdx.o
>> obj-$(CONFIG_PERF_COUNTERS) += perfc.o
>> +obj-y += physdev.o
>> obj-y += preempt.o
>> obj-y += random.o
>> obj-y += rangeset.o
>> diff --git a/xen/common/physdev.c b/xen/common/physdev.c
>> new file mode 100644
>> index 0000000000..8d44b20db8
>> --- /dev/null
>> +++ b/xen/common/physdev.c
>> @@ -0,0 +1,81 @@
>> +
>> +#include <xen/guest_access.h>
>> +#include <xen/hypercall.h>
>> +#include <xen/init.h>
>> +
>> +#ifndef COMPAT
>> +typedef long ret_t;
>> +#endif
>> +
>> +ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
>> +{
>> + ret_t ret;
>> +
>> + switch ( cmd )
>> + {
>> +#ifdef CONFIG_HAS_PCI
>> + case PHYSDEVOP_pci_device_add: {
>> + struct physdev_pci_device_add add;
>> + struct pci_dev_info pdev_info;
>> + nodeid_t node;
>> +
>> + ret = -EFAULT;
>> + if ( copy_from_guest(&add, arg, 1) != 0 )
>> + break;
>> +
>> + pdev_info.is_extfn = !!(add.flags & XEN_PCI_DEV_EXTFN);
>> + if ( add.flags & XEN_PCI_DEV_VIRTFN )
>> + {
>> + pdev_info.is_virtfn = 1;
>> + pdev_info.physfn.bus = add.physfn.bus;
>> + pdev_info.physfn.devfn = add.physfn.devfn;
>> + }
>> + else
>> + pdev_info.is_virtfn = 0;
>> +
>> + if ( add.flags & XEN_PCI_DEV_PXM )
>> + {
>> + uint32_t pxm;
>> + size_t optarr_off = offsetof(struct physdev_pci_device_add, optarr) /
>> + sizeof(add.optarr[0]);
>> +
>> + if ( copy_from_guest_offset(&pxm, arg, optarr_off, 1) )
>> + break;
>> +
>> + node = pxm_to_node(pxm);
>> + }
>> + else
>> + node = NUMA_NO_NODE;
>> +
>> + ret = pci_add_device(add.seg, add.bus, add.devfn, &pdev_info, node);
>> + break;
>> + }
>> +
>> + case PHYSDEVOP_pci_device_remove: {
>> + struct physdev_pci_device dev;
>> +
>> + ret = -EFAULT;
>> + if ( copy_from_guest(&dev, arg, 1) != 0 )
>> + break;
>> +
>> + ret = pci_remove_device(dev.seg, dev.bus, dev.devfn);
>> + break;
>> + }
>> +#endif
>> + default:
>> + ret = arch_physdev_op(cmd, arg);;
> ^ a typo?
Ack.
>
> The ARM and common parts are fine. I am not well-versed in the x86
> compat stuff; we need one of the x86 maintainers to review the x86
> changes.
Yes. I need one of the x86 maintainers to review the code.
Regards,
Rahul
next prev parent reply other threads:[~2021-09-23 11:20 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-22 11:34 [PATCH v2 00/17] PCI devices passthrough on Arm Rahul Singh
2021-09-22 11:34 ` [PATCH v2 01/17] xen/pci: Refactor MSI code that implements MSI functionality within XEN Rahul Singh
2021-09-22 11:34 ` [PATCH v2 02/17] xen/pci: solve compilation error on ARM with HAS_PCI enabled Rahul Singh
2021-09-22 22:04 ` Stefano Stabellini
2021-09-23 2:07 ` Julien Grall
2021-09-23 11:14 ` Rahul Singh
2021-09-22 11:34 ` [PATCH v2 03/17] xen/arm: solve compilation error on ARM with ACPI && HAS_PCI Rahul Singh
2021-09-22 22:08 ` Stefano Stabellini
2021-09-22 11:34 ` [PATCH v2 04/17] xen/arm: xc_domain_ioport_permission(..) not supported on ARM Rahul Singh
2021-09-22 22:13 ` Stefano Stabellini
2021-09-22 11:34 ` [PATCH v2 05/17] xen/arm: Add PHYSDEVOP_pci_device_* support for ARM Rahul Singh
2021-09-22 22:37 ` Stefano Stabellini
2021-09-23 11:19 ` Rahul Singh [this message]
2021-09-22 11:34 ` [PATCH v2 06/17] xen/device-tree: Add dt_property_read_variable_u32_array helper Rahul Singh
2021-09-22 23:06 ` Stefano Stabellini
2021-09-23 11:21 ` Rahul Singh
2021-09-22 11:34 ` [PATCH v2 07/17] xen/device-tree: Add dt_property_read_u32_array helper Rahul Singh
2021-09-22 23:44 ` Stefano Stabellini
2021-09-22 11:34 ` [PATCH v2 08/17] xen/device-tree: Add dt_get_pci_domain_nr helper Rahul Singh
2021-09-22 23:50 ` Stefano Stabellini
2021-09-23 11:52 ` Rahul Singh
2021-09-22 11:34 ` [PATCH v2 09/17] xen/arm: Add support for PCI init to initialize the PCI driver Rahul Singh
2021-09-23 0:03 ` Stefano Stabellini
2021-09-23 14:53 ` Rahul Singh
2021-09-22 11:34 ` [PATCH v2 10/17] xen/arm: Add cmdline boot option "pci-passthrough = <boolean>" Rahul Singh
2021-09-23 0:14 ` Stefano Stabellini
2021-09-23 15:03 ` Rahul Singh
2021-09-22 11:34 ` [PATCH v2 11/17] xen/arm: PCI host bridge discovery within XEN on ARM Rahul Singh
2021-09-23 2:09 ` Stefano Stabellini
2021-09-23 13:03 ` Oleksandr Andrushchenko
2021-09-23 15:36 ` Stefano Stabellini
2021-09-23 17:08 ` Rahul Singh
2021-09-23 19:12 ` Stefano Stabellini
2021-09-24 12:54 ` Rahul Singh
2021-09-24 21:42 ` Stefano Stabellini
2021-09-24 23:26 ` Stefano Stabellini
2021-09-27 16:20 ` Rahul Singh
2021-09-27 16:59 ` Julien Grall
2021-09-22 11:34 ` [PATCH v2 12/17] xen/arm: Add support for Xilinx ZynqMP PCI host controller Rahul Singh
2021-09-23 2:11 ` Stefano Stabellini
2021-09-23 15:08 ` Rahul Singh
2021-09-22 11:34 ` [PATCH v2 13/17] xen:arm: Implement pci access functions Rahul Singh
2021-09-23 2:23 ` Stefano Stabellini
2021-09-23 8:52 ` Julien Grall
2021-09-23 15:17 ` Rahul Singh
2021-09-23 9:02 ` Julien Grall
2021-09-23 15:19 ` Rahul Singh
2021-09-23 15:15 ` Rahul Singh
2021-09-22 11:35 ` [PATCH v2 14/17] xen/arm: Enable the existing x86 virtual PCI support for ARM Rahul Singh
2021-09-23 2:41 ` Stefano Stabellini
2021-09-23 15:34 ` Rahul Singh
2021-09-24 7:21 ` Oleksandr Andrushchenko
2021-09-24 7:37 ` Jan Beulich
2021-09-24 7:44 ` Jan Beulich
2021-09-28 16:32 ` Rahul Singh
2021-09-22 11:35 ` [PATCH v2 15/17] xen/arm: Transitional change to build HAS_VPCI on ARM Rahul Singh
2021-09-22 11:35 ` [PATCH v2 16/17] arm/libxl: Emulated PCI device tree node in libxl Rahul Singh
2021-09-23 20:41 ` Stefano Stabellini
2021-09-22 11:35 ` [PATCH v2 17/17] xen/arm: Add linux,pci-domain property for hwdom if not available Rahul Singh
2021-09-23 2:52 ` Stefano Stabellini
2021-09-23 15:21 ` 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=59B54064-1DE0-44ED-9B50-F1709B77E56B@arm.com \
--to=rahul.singh@arm.com \
--cc=Andre.Przywara@arm.com \
--cc=Bertrand.Marquis@arm.com \
--cc=Volodymyr_Babchuk@epam.com \
--cc=andrew.cooper3@citrix.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).