|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH 14/16] Genneralized event channel operations
Use pointer in struct domain to reference evtchn_pending and evtchn_mask
bitmaps.
When building a domain, the default operation set is 2-level operation
set.
Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
xen/arch/arm/domain.c | 1 +
xen/arch/x86/domain.c | 1 +
xen/common/event_channel.c | 65 ++++++++++++++++++++++++++++++++++++--------
xen/include/xen/event.h | 3 ++
4 files changed, 59 insertions(+), 11 deletions(-)
diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c
index 59d8d73..bc477f6 100644
--- a/xen/arch/arm/domain.c
+++ b/xen/arch/arm/domain.c
@@ -417,6 +417,7 @@ int arch_domain_create(struct domain *d, unsigned int
domcr_flags)
goto fail;
clear_page(d->shared_info);
+ evtchn_set_default_bitmap(d);
share_xen_page_with_guest(
virt_to_page(d->shared_info), d, XENSHARE_writable);
diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index a58cc1a..a669dc0 100644
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -580,6 +580,7 @@ int arch_domain_create(struct domain *d, unsigned int
domcr_flags)
goto fail;
clear_page(d->shared_info);
+ evtchn_set_default_bitmap(d);
share_xen_page_with_guest(
virt_to_page(d->shared_info), d, XENSHARE_writable);
diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c
index 37fecee..1ce97b0 100644
--- a/xen/common/event_channel.c
+++ b/xen/common/event_channel.c
@@ -51,6 +51,9 @@
#define consumer_is_xen(e) (!!(e)->xen_consumer)
+static void evtchn_set_pending(struct vcpu *v, int port);
+static void evtchn_clear_pending(struct domain *d, int port);
+
/*
* The function alloc_unbound_xen_event_channel() allows an arbitrary
* notifier function to be specified. However, very few unique functions
@@ -94,9 +97,6 @@ static uint8_t
get_xen_consumer(xen_event_channel_notification_t fn)
/* Get the notification function for a given Xen-bound event channel. */
#define xen_notification_fn(e) (xen_consumers[(e)->xen_consumer-1])
-static void evtchn_set_pending(struct vcpu *v, int port);
-static void evtchn_clear_pending(struct domain *d, int port);
-
static int virq_is_global(uint32_t virq)
{
int rc;
@@ -159,15 +159,18 @@ static int get_free_port(struct domain *d)
int evtchn_is_pending(struct domain *d, int port)
{
- return test_bit(port, &shared_info(d, evtchn_pending));
+ unsigned int page_no = EVTCHN_PAGE_NO(port);
+ unsigned int offset = EVTCHN_OFFSET_IN_PAGE(port);
+ return test_bit(offset, d->evtchn_pending[page_no]);
}
int evtchn_is_masked(struct domain *d, int port)
{
- return test_bit(port, &shared_info(d, evtchn_mask));
+ unsigned int page_no = EVTCHN_PAGE_NO(port);
+ unsigned int offset = EVTCHN_OFFSET_IN_PAGE(port);
+ return test_bit(offset, d->evtchn_mask[page_no]);
}
-
static long evtchn_alloc_unbound(evtchn_alloc_unbound_t *alloc)
{
struct evtchn *chn;
@@ -623,7 +626,7 @@ out:
return ret;
}
-static void evtchn_set_pending(struct vcpu *v, int port)
+static void evtchn_set_pending_l2(struct vcpu *v, int port)
{
struct domain *d = v->domain;
int vcpuid;
@@ -664,9 +667,25 @@ static void evtchn_set_pending(struct vcpu *v, int port)
}
}
+static void evtchn_set_pending(struct vcpu *v, int port)
+{
+ struct domain *d = v->domain;
+
+ switch ( d->evtchn_level )
+ {
+ case EVTCHN_2_LEVEL:
+ evtchn_set_pending_l2(v, port);
+ break;
+ default:
+ BUG();
+ }
+}
+
static void evtchn_clear_pending(struct domain *d, int port)
{
- clear_bit(port, &shared_info(d, evtchn_pending));
+ unsigned int page_no = EVTCHN_PAGE_NO(port);
+ unsigned int offset = EVTCHN_OFFSET_IN_PAGE(port);
+ clear_bit(offset, d->evtchn_pending[page_no]);
}
int guest_enabled_event(struct vcpu *v, uint32_t virq)
@@ -932,10 +951,12 @@ long evtchn_bind_vcpu(unsigned int port, unsigned int
vcpu_id)
}
-int evtchn_unmask(unsigned int port)
+static int evtchn_unmask_l2(unsigned int port)
{
struct domain *d = current->domain;
struct vcpu *v;
+ unsigned int page_no = EVTCHN_PAGE_NO(port);
+ unsigned int offset = EVTCHN_OFFSET_IN_PAGE(port);
ASSERT(spin_is_locked(&d->event_lock));
@@ -948,8 +969,8 @@ int evtchn_unmask(unsigned int port)
* These operations must happen in strict order. Based on
* include/xen/event.h:evtchn_set_pending().
*/
- if ( test_and_clear_bit(port, &shared_info(d, evtchn_mask)) &&
- test_bit (port, &shared_info(d, evtchn_pending)) &&
+ if ( test_and_clear_bit(offset, d->evtchn_mask[page_no]) &&
+ test_bit (offset, d->evtchn_pending[page_no]) &&
!test_and_set_bit (port / BITS_PER_EVTCHN_WORD(d),
&vcpu_info(v, evtchn_pending_sel)) )
{
@@ -959,6 +980,23 @@ int evtchn_unmask(unsigned int port)
return 0;
}
+int evtchn_unmask(unsigned int port)
+{
+ struct domain *d = current->domain;
+ int rc = 0;
+
+ switch ( d->evtchn_level )
+ {
+ case EVTCHN_2_LEVEL:
+ rc = evtchn_unmask_l2(port);
+ break;
+ default:
+ BUG();
+ }
+
+ return rc;
+}
+
static long evtchn_reset(evtchn_reset_t *r)
{
@@ -1185,6 +1223,11 @@ void notify_via_xen_event_channel(struct domain *ld, int
lport)
spin_unlock(&ld->event_lock);
}
+void evtchn_set_default_bitmap(struct domain *d)
+{
+ d->evtchn_pending[0] = (unsigned long *)shared_info(d, evtchn_pending);
+ d->evtchn_mask[0] = (unsigned long *)shared_info(d, evtchn_mask);
+}
int evtchn_init(struct domain *d)
{
diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h
index cacd89d..34a82d0 100644
--- a/xen/include/xen/event.h
+++ b/xen/include/xen/event.h
@@ -145,6 +145,9 @@ int guest_enabled_event(struct vcpu *v, uint32_t virq);
/* Notify remote end of a Xen-attached event channel.*/
void notify_via_xen_event_channel(struct domain *ld, int lport);
+/* This is called after domain's shared info page is setup */
+void evtchn_set_default_bitmap(struct domain *d);
+
/* Internal event channel object accessors */
#define bucket_from_port(d,p) \
((d)->evtchn[(p)/EVTCHNS_PER_BUCKET])
--
1.7.10.4
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |