From: Julien Grall <julien.grall@linaro.org>
To: xen-devel@lists.xenproject.org
Cc: stefano.stabellini@citrix.com,
Julien Grall <julien.grall@linaro.org>,
tim@xen.org, ian.campbell@citrix.com
Subject: [RFC 06/19] xen/arm: Implement hypercall PHYSDEVOP_map_pirq
Date: Mon, 16 Jun 2014 17:17:53 +0100 [thread overview]
Message-ID: <1402935486-29136-7-git-send-email-julien.grall@linaro.org> (raw)
In-Reply-To: <1402935486-29136-1-git-send-email-julien.grall@linaro.org>
The physdev sub-hypercall PHYSDEVOP_map_pirq allow the toolstack to route
a physical IRQ to the guest (via the config options "irqs" for xl).
For now, we allow only SPIs to be mapped to the guest.
The type MAP_PIRQ_TYPE_GSI is used for this purpose.
The virtual IRQ number is equal to the physical one. This will avoid adding
logic in Xen to allocate the vIRQ number. The drawbacks is we allocated
unconditionally the same amount of SPIs as the host. This value will never
be more than 1024 with GICv2.
Signed-off-by: Julien Grall <julien.grall@linaro.org>
---
I'm wondering if we should introduce an alias of MAP_PIRQ_TYPE_GSI
for ARM. It's will be less confuse for the user.
---
xen/arch/arm/physdev.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++--
xen/arch/arm/vgic.c | 5 +---
2 files changed, 76 insertions(+), 6 deletions(-)
diff --git a/xen/arch/arm/physdev.c b/xen/arch/arm/physdev.c
index 61b4a18..d17589c 100644
--- a/xen/arch/arm/physdev.c
+++ b/xen/arch/arm/physdev.c
@@ -8,13 +8,86 @@
#include <xen/types.h>
#include <xen/lib.h>
#include <xen/errno.h>
+#include <xen/iocap.h>
+#include <xen/guest_access.h>
+#include <xsm/xsm.h>
+#include <asm/current.h>
#include <asm/hypercall.h>
+#include <public/physdev.h>
+
+static int physdev_map_pirq(domid_t domid, int type, int index, int *pirq_p)
+{
+ struct domain *d;
+ int ret;
+ int irq = index;
+
+ d = rcu_lock_domain_by_any_id(domid);
+ if ( d == NULL )
+ return -ESRCH;
+
+ ret = xsm_map_domain_pirq(XSM_TARGET, d);
+ if ( ret )
+ goto free_domain;
+
+ /* For now we only suport GSI */
+ if ( type != MAP_PIRQ_TYPE_GSI )
+ {
+ ret = -EINVAL;
+ dprintk(XENLOG_G_ERR, "dom%u: wrong map_pirq type 0x%x\n",
+ d->domain_id, type);
+ goto free_domain;
+ }
+
+ if ( !is_routable_irq(irq) )
+ {
+ ret = -EINVAL;
+ dprintk(XENLOG_G_ERR, "IRQ%u is not routable to a guest\n", irq);
+ goto free_domain;
+ }
+
+ ret = -EPERM;
+ if ( !irq_access_permitted(current->domain, irq) )
+ goto free_domain;
+
+ ret = route_irq_to_guest(d, irq, "routed IRQ");
+
+ /* GSIs are mapped 1:1 to the guest */
+ if ( !ret )
+ *pirq_p = irq;
+
+free_domain:
+ rcu_unlock_domain(d);
+
+ return ret;
+}
int do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
{
- printk("%s %d cmd=%d: not implemented yet\n", __func__, __LINE__, cmd);
- return -ENOSYS;
+ int ret;
+
+ switch ( cmd )
+ {
+ case PHYSDEVOP_map_pirq:
+ {
+ physdev_map_pirq_t map;
+
+ ret = -EFAULT;
+ if ( copy_from_guest(&map, arg, 1) != 0 )
+ break;
+
+ ret = physdev_map_pirq(map.domid, map.type, map.index, &map.pirq);
+
+ if ( __copy_to_guest(arg, &map, 1) )
+ ret = -EFAULT;
+ }
+ break;
+ default:
+ ret = -ENOSYS;
+ break;
+ }
+
+ return ret;
}
/*
diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c
index e451324..c18b2ca 100644
--- a/xen/arch/arm/vgic.c
+++ b/xen/arch/arm/vgic.c
@@ -82,10 +82,7 @@ int domain_vgic_init(struct domain *d)
/* Currently nr_lines in vgic and gic doesn't have the same meanings
* Here nr_lines = number of SPIs
*/
- if ( is_hardware_domain(d) )
- d->arch.vgic.nr_lines = gic_number_lines() - 32;
- else
- d->arch.vgic.nr_lines = 0; /* We don't need SPIs for the guest */
+ d->arch.vgic.nr_lines = gic_number_lines() - 32;
d->arch.vgic.shared_irqs =
xzalloc_array(struct vgic_irq_rank, DOMAIN_NR_RANKS(d));
--
1.7.10.4
next prev parent reply other threads:[~2014-06-16 16:18 UTC|newest]
Thread overview: 122+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-16 16:17 [RFC 00/19] xe/arm: Add support for non-pci passthrough Julien Grall
2014-06-16 16:17 ` [RFC 01/19] xen/arm: guest_physmap_remove_page: Print a warning if we fail to unmap the page Julien Grall
2014-06-18 15:03 ` Stefano Stabellini
2014-07-03 10:52 ` Ian Campbell
2014-07-03 11:17 ` Julien Grall
2014-06-16 16:17 ` [RFC 02/19] xen: guestcopy: Provide an helper to copy string from guest Julien Grall
2014-06-17 8:01 ` Jan Beulich
2014-06-17 9:09 ` Julien Grall
2014-06-17 9:17 ` Jan Beulich
2014-06-17 9:23 ` Julien Grall
2014-06-17 22:43 ` Daniel De Graaf
2014-06-18 11:59 ` Jan Beulich
2014-06-18 12:22 ` Julien Grall
2014-06-18 12:49 ` Jan Beulich
2014-06-18 12:53 ` Julien Grall
2014-06-18 13:01 ` Jan Beulich
2014-06-24 14:58 ` Julien Grall
2014-06-16 16:17 ` [RFC 03/19] xen/arm: follow-up to allow DOM0 manage IRQ and MMIO Julien Grall
2014-06-18 20:21 ` Stefano Stabellini
2014-06-18 20:32 ` Julien Grall
2014-07-03 11:02 ` Ian Campbell
2014-07-03 11:23 ` Julien Grall
2014-07-03 12:12 ` Ian Campbell
2014-06-16 16:17 ` [RFC 04/19] xen/arm: route_irq_to_guest: Check validity of the IRQ Julien Grall
2014-06-18 18:52 ` Stefano Stabellini
2014-06-18 19:03 ` Julien Grall
2014-07-03 11:04 ` Ian Campbell
2014-07-03 11:47 ` Julien Grall
2014-06-16 16:17 ` [RFC 05/19] xen/arm: Release IRQ routed to a domain when it's destroying Julien Grall
2014-06-18 18:08 ` Stefano Stabellini
2014-06-18 18:26 ` Julien Grall
2014-06-18 18:48 ` Stefano Stabellini
2014-06-18 18:54 ` Julien Grall
2014-06-18 19:06 ` Stefano Stabellini
2014-06-18 19:09 ` Julien Grall
2014-06-16 16:17 ` Julien Grall [this message]
2014-06-18 19:24 ` [RFC 06/19] xen/arm: Implement hypercall PHYSDEVOP_map_pirq Stefano Stabellini
2014-06-19 11:39 ` Julien Grall
2014-06-19 12:29 ` Stefano Stabellini
2014-07-03 11:27 ` Ian Campbell
2014-07-03 12:02 ` Julien Grall
2014-07-03 12:53 ` Ian Campbell
2014-07-15 13:01 ` Julien Grall
2014-07-15 13:03 ` Ian Campbell
2014-08-18 19:20 ` Andrii Tseglytskyi
2014-08-18 21:55 ` Julien Grall
2014-08-19 9:11 ` Andrii Tseglytskyi
2014-08-19 14:24 ` Julien Grall
2014-06-16 16:17 ` [RFC 07/19] xen/dts: Use unsigned int for MMIO and IRQ index Julien Grall
2014-06-18 18:54 ` Stefano Stabellini
2014-06-19 11:42 ` Julien Grall
2014-06-16 16:17 ` [RFC 08/19] xen/dts: Provide an helper to get a DT node from a path provided by a guest Julien Grall
2014-07-03 11:30 ` Ian Campbell
2014-07-03 11:49 ` Julien Grall
2014-07-03 12:13 ` Ian Campbell
2014-07-03 12:22 ` Julien Grall
2014-06-16 16:17 ` [RFC 09/19] xen/dts: Add hypercalls to retrieve device node information Julien Grall
2014-06-18 19:38 ` Stefano Stabellini
2014-06-19 11:58 ` Julien Grall
2014-06-19 12:21 ` Stefano Stabellini
2014-06-19 12:25 ` Julien Grall
2014-07-03 11:40 ` Ian Campbell
2014-06-24 8:46 ` Christoffer Dall
2014-07-03 11:34 ` Ian Campbell
2014-07-03 11:33 ` Ian Campbell
2014-07-03 11:51 ` Julien Grall
2014-07-03 12:13 ` Ian Campbell
2014-06-16 16:17 ` [RFC 10/19] xen/passthrough: Introduce iommu_buildup Julien Grall
2014-07-03 11:45 ` Ian Campbell
2014-07-03 11:55 ` Julien Grall
2014-06-16 16:17 ` [RFC 11/19] xen/passthrough: Call arch_iommu_domain_destroy before calling iommu_teardown Julien Grall
2014-06-17 8:07 ` Jan Beulich
2014-06-17 9:18 ` Julien Grall
2014-06-17 9:29 ` Jan Beulich
2014-06-17 12:38 ` Julien Grall
2014-06-17 13:04 ` Jan Beulich
2014-06-18 12:24 ` Julien Grall
2014-06-18 12:50 ` Jan Beulich
2014-06-16 16:17 ` [RFC 12/19] xen/passthrough: iommu_deassign_device_dt: By default reassign device to nobody Julien Grall
2014-06-18 19:28 ` Stefano Stabellini
2014-07-03 11:48 ` Ian Campbell
2014-07-03 12:07 ` Julien Grall
2014-07-03 12:53 ` Ian Campbell
2014-07-03 13:01 ` Julien Grall
2014-07-03 13:42 ` Ian Campbell
2014-07-03 13:51 ` Julien Grall
2014-07-03 14:04 ` Ian Campbell
2014-07-03 14:09 ` Julien Grall
2014-06-16 16:18 ` [RFC 13/19] xen/iommu: arm: Wire iommu DOMCTL for ARM Julien Grall
2014-06-17 8:24 ` Jan Beulich
2014-06-17 13:05 ` Julien Grall
2014-06-16 16:18 ` [RFC 14/19] xen/passthrough: dt: Add new domctl XEN_DOMCTL_assign_dt_device Julien Grall
2014-06-17 8:34 ` Jan Beulich
2014-06-17 13:23 ` Julien Grall
2014-06-17 13:30 ` Jan Beulich
2014-06-17 13:48 ` Julien Grall
2014-06-17 13:55 ` Jan Beulich
2014-07-03 11:54 ` Ian Campbell
2014-06-16 16:18 ` [RFC 15/19] xen/arm: Reserve region in guest memory for device passthrough Julien Grall
2014-06-18 15:12 ` Stefano Stabellini
2014-06-18 15:23 ` Julien Grall
2014-06-18 15:26 ` Ian Campbell
2014-06-18 17:48 ` Stefano Stabellini
2014-06-18 17:54 ` Julien Grall
2014-06-18 18:14 ` Stefano Stabellini
2014-06-18 18:33 ` Julien Grall
2014-06-18 18:55 ` Stefano Stabellini
2014-07-03 11:56 ` Ian Campbell
2014-06-16 16:18 ` [RFC 16/19] libxl/arm: Introduce DT_IRQ_TYPE_* Julien Grall
2014-07-03 11:56 ` Ian Campbell
2014-06-16 16:18 ` [RFC 17/19] libxl/arm: Rename set_interrupt_ppi to set_interrupt and handle SPIs Julien Grall
2014-07-03 11:58 ` Ian Campbell
2014-07-03 12:04 ` Julien Grall
2014-07-03 14:04 ` Ian Campbell
2014-06-16 16:18 ` [RFC 18/19] libxl: Add support for non-PCI passthrough Julien Grall
2014-06-16 17:19 ` Wei Liu
2014-06-18 12:26 ` Julien Grall
2014-06-16 16:18 ` [RFC 19/19] xl: Add new option dtdev Julien Grall
2014-06-16 17:19 ` Wei Liu
2014-06-18 13:40 ` Julien Grall
2014-06-18 13:43 ` Wei Liu
2014-06-18 13:46 ` Julien Grall
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=1402935486-29136-7-git-send-email-julien.grall@linaro.org \
--to=julien.grall@linaro.org \
--cc=ian.campbell@citrix.com \
--cc=stefano.stabellini@citrix.com \
--cc=tim@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).