From: Wei Liu <wei.liu2@citrix.com>
To: xen-devel@lists.xen.org
Cc: Wei Liu <wei.liu2@citrix.com>,
ian.campbell@citrix.com, jbeulich@suse.com,
david.vrabel@citrix.com
Subject: [PATCH 05/16] Add evtchn_level in struct domain
Date: Thu, 31 Jan 2013 14:42:53 +0000 [thread overview]
Message-ID: <1359643384-29392-6-git-send-email-wei.liu2@citrix.com> (raw)
In-Reply-To: <1359643384-29392-1-git-send-email-wei.liu2@citrix.com>
This field is manipulated by hypervisor only, so if anything goes wrong it is
a bug.
The default event channel is 2, which has two level lookup structure: a
selector in struct vcpu and a shared bitmap in shared info.
The up coming 3-level event channel utilizes three level lookup structure: a
top level selector and second level selector for every vcpu, and shared
bitmap.
When constructing a domain, it starts with 2-level event channel, which is
guaranteed to be supported by the hypervisor. If a domain wants to use N
(N>=3) level event channel, it must explicitly issue a hypercall to setup
N-level event channel.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
xen/common/event_channel.c | 1 +
xen/include/xen/event.h | 16 +++++++++++++++-
xen/include/xen/sched.h | 1 +
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c
index 9231eb0..b96d5b1 100644
--- a/xen/common/event_channel.c
+++ b/xen/common/event_channel.c
@@ -1173,6 +1173,7 @@ void notify_via_xen_event_channel(struct domain *ld, int lport)
int evtchn_init(struct domain *d)
{
spin_lock_init(&d->event_lock);
+ d->evtchn_level = EVTCHN_DEFAULT_LEVEL;
if ( get_free_port(d) != 0 )
return -EINVAL;
evtchn_from_port(d, 0)->state = ECS_RESERVED;
diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h
index 1c13bd0..c17b891 100644
--- a/xen/include/xen/event.h
+++ b/xen/include/xen/event.h
@@ -20,7 +20,21 @@
#else
#define BITS_PER_EVTCHN_WORD(d) (has_32bit_shinfo(d) ? 32 : BITS_PER_LONG)
#endif
-#define MAX_EVTCHNS(d) (BITS_PER_EVTCHN_WORD(d) * BITS_PER_EVTCHN_WORD(d))
+#define EVTCHN_2_LEVEL 2
+#define EVTCHN_3_LEVEL 3
+#define EVTCHN_DEFAULT_LEVEL EVTCHN_2_LEVEL
+#define MAX_EVTCHNS_L2(d) (BITS_PER_EVTCHN_WORD(d) * BITS_PER_EVTCHN_WORD(d))
+#define MAX_EVTCHNS_L3(d) (MAX_EVTCHNS_L2(d) * BITS_PER_EVTCHN_WORD(d))
+#define MAX_EVTCHNS(d) ({ int __v = 0; \
+ switch ( d->evtchn_level ) { \
+ case EVTCHN_2_LEVEL: \
+ __v = MAX_EVTCHNS_L2(d); break; \
+ case EVTCHN_3_LEVEL: \
+ __v = MAX_EVTCHNS_L3(d); break; \
+ default: \
+ BUG(); \
+ }; \
+ __v;})
struct evtchn
{
diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
index 64a0ba4..21f7b68 100644
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -217,6 +217,7 @@ struct domain
/* Event channel information. */
struct evtchn *evtchn[NR_EVTCHN_BUCKETS];
spinlock_t event_lock;
+ unsigned int evtchn_level;
struct grant_table *grant_table;
--
1.7.10.4
next prev parent reply other threads:[~2013-01-31 14:42 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-31 14:42 [PATCH 00/16] Implement 3-level event channel in Xen Wei Liu
2013-01-31 14:42 ` [PATCH 01/16] Remove trailing whitespaces in sched.h Wei Liu
2013-01-31 14:42 ` [PATCH 02/16] Remove trailing whitespaces in event.h Wei Liu
2013-01-31 14:42 ` [PATCH 03/16] Remove trailing whitespaces in xen.h Wei Liu
2013-01-31 14:42 ` [PATCH 04/16] Move event channel macros / struct definition to proper place Wei Liu
2013-02-04 9:00 ` Jan Beulich
2013-02-04 10:25 ` Wei Liu
2013-01-31 14:42 ` Wei Liu [this message]
2013-01-31 14:42 ` [PATCH 06/16] Dynamically allocate d->evtchn Wei Liu
2013-01-31 14:42 ` [PATCH 07/16] Bump EVTCHNS_PER_BUCKET to 512 Wei Liu
2013-01-31 14:42 ` [PATCH 08/16] Add evtchn_is_{pending, masked} and evtchn_clear_pending Wei Liu
2013-01-31 14:42 ` [PATCH 09/16] Introduce some macros for event channels Wei Liu
2013-01-31 14:42 ` [PATCH 10/16] Update Xen public header Wei Liu
2013-01-31 14:42 ` [PATCH 11/16] Define N-level event channel registration interface Wei Liu
2013-01-31 14:43 ` [PATCH 12/16] Add control structures for 3-level event channel Wei Liu
2013-01-31 14:43 ` [PATCH 13/16] Make NR_EVTCHN_BUCKETS 3-level ready Wei Liu
2013-01-31 14:43 ` [PATCH 14/16] Genneralized event channel operations Wei Liu
2013-01-31 14:43 ` [PATCH 15/16] Infrastructure for manipulating 3-level event channel pages Wei Liu
2013-02-04 9:23 ` Jan Beulich
2013-02-04 11:20 ` Ian Campbell
2013-02-04 11:29 ` Jan Beulich
2013-02-04 13:45 ` Wei Liu
2013-02-04 13:47 ` Ian Campbell
2013-02-04 13:51 ` Wei Liu
2013-02-04 13:54 ` Ian Campbell
2013-02-04 13:59 ` Wei Liu
2013-02-04 14:22 ` Ian Campbell
2013-02-04 14:24 ` Wei Liu
2013-02-04 14:06 ` Jan Beulich
2013-02-04 14:36 ` Wei Liu
2013-02-04 11:37 ` Wei Liu
2013-01-31 14:43 ` [PATCH 16/16] Implement 3-level event channel routines Wei Liu
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=1359643384-29392-6-git-send-email-wei.liu2@citrix.com \
--to=wei.liu2@citrix.com \
--cc=david.vrabel@citrix.com \
--cc=ian.campbell@citrix.com \
--cc=jbeulich@suse.com \
--cc=xen-devel@lists.xen.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).