Page MenuHomeFreeBSD
Files F153263060

D30743.id93064.diff
No OneTemporary
Actions

D30743.id93064.diff
View Options

Index: sys/x86/xen/xen_intr.c
===================================================================
--- sys/x86/xen/xen_intr.c
+++ sys/x86/xen/xen_intr.c
@@ -113,10 +113,6 @@
DPCPU_DECLARE(struct vcpu_info *, vcpu_info);
-#define XEN_INVALID_EVTCHN 0 /* Invalid event channel */
-
-#define is_valid_evtchn(x) ((x) != XEN_INVALID_EVTCHN)
-
struct xenisrc {
struct intsrc xi_intsrc;
enum evtchn_type xi_type;
@@ -213,7 +209,7 @@
* event channel globally, use evtchn_mask().
*/
static inline void
-evtchn_cpu_mask_port(u_int cpu, evtchn_port_t port)
+xen_intr_cpu_mask_port(u_int cpu, evtchn_port_t port)
{
struct xen_intr_pcpu_data *pcpu;
@@ -235,7 +231,7 @@
* also be globally enabled. See evtchn_unmask().
*/
static inline void
-evtchn_cpu_unmask_port(u_int cpu, evtchn_port_t port)
+xen_intr_cpu_unmask_port(u_int cpu, evtchn_port_t port)
{
struct xen_intr_pcpu_data *pcpu;
@@ -312,7 +308,7 @@
KASSERT(mtx_owned(&xen_intr_isrc_lock), ("Evtchn alloc lock not held"));
- if (xen_intr_auto_vector_count > NR_EVENT_CHANNELS) {
+ if (xen_intr_auto_vector_count >= NR_EVENT_CHANNELS) {
if (!warned) {
warned = 1;
printf("%s: Event channels exhausted.\n", __func__);
@@ -355,10 +351,10 @@
evtchn_clear_port(isrc->xi_port);
/* Rebind port to CPU 0. */
- evtchn_cpu_mask_port(isrc->xi_cpu, isrc->xi_port);
- evtchn_cpu_unmask_port(0, isrc->xi_port);
+ xen_intr_cpu_mask_port(isrc->xi_cpu, isrc->xi_port);
+ xen_intr_cpu_unmask_port(0, isrc->xi_port);
- if (isrc->xi_close != 0 && is_valid_evtchn(isrc->xi_port)) {
+ if (isrc->xi_close != 0 && isrc->xi_port < NR_EVENT_CHANNELS) {
struct evtchn_close close = { .port = isrc->xi_port };
if (HYPERVISOR_event_channel_op(EVTCHNOP_close, &close))
panic("EVTCHNOP_close failed");
@@ -367,7 +363,7 @@
xen_intr_port_to_isrc[isrc->xi_port] = NULL;
isrc->xi_cpu = 0;
isrc->xi_type = EVTCHN_TYPE_UNBOUND;
- isrc->xi_port = 0;
+ isrc->xi_port = ~0;
isrc->xi_cookie = NULL;
mtx_unlock(&xen_intr_isrc_lock);
return (0);
@@ -419,7 +415,7 @@
}
}
isrc->xi_port = local_port;
- xen_intr_port_to_isrc[local_port] = isrc;
+ xen_intr_port_to_isrc[isrc->xi_port] = isrc;
refcount_init(&isrc->xi_refcount, 1);
mtx_unlock(&xen_intr_isrc_lock);
@@ -683,7 +679,7 @@
isrc->xi_port = bind_ipi.port;
isrc->xi_cpu = 0;
- xen_intr_port_to_isrc[bind_ipi.port] = isrc;
+ xen_intr_port_to_isrc[isrc->xi_port] = isrc;
error = xen_intr_assign_cpu(&isrc->xi_intsrc,
cpu_apic_ids[cpu]);
@@ -713,7 +709,7 @@
isrc->xi_port = bind_virq.port;
isrc->xi_cpu = 0;
- xen_intr_port_to_isrc[bind_virq.port] = isrc;
+ xen_intr_port_to_isrc[isrc->xi_port] = isrc;
#ifdef SMP
error = xen_intr_assign_cpu(&isrc->xi_intsrc,
@@ -763,7 +759,7 @@
vector = first_evtchn_irq + isrc_idx;
isrc = (struct xenisrc *)intr_lookup_source(vector);
if (isrc != NULL) {
- isrc->xi_port = 0;
+ isrc->xi_port = ~0;
switch (isrc->xi_type) {
case EVTCHN_TYPE_IPI:
xen_rebind_ipi(isrc);
@@ -867,7 +863,7 @@
mtx_lock(&xen_intr_isrc_lock);
isrc = (struct xenisrc *)base_isrc;
- if (!is_valid_evtchn(isrc->xi_port)) {
+ if (isrc->xi_port >= NR_EVENT_CHANNELS) {
mtx_unlock(&xen_intr_isrc_lock);
return (EINVAL);
}
@@ -884,9 +880,9 @@
* the Hypervisor at evtchn_bind_virq time, so
* all we need to do is update the per-CPU masks.
*/
- evtchn_cpu_mask_port(isrc->xi_cpu, isrc->xi_port);
+ xen_intr_cpu_mask_port(isrc->xi_cpu, isrc->xi_port);
isrc->xi_cpu = to_cpu;
- evtchn_cpu_unmask_port(isrc->xi_cpu, isrc->xi_port);
+ xen_intr_cpu_unmask_port(isrc->xi_cpu, isrc->xi_port);
goto out;
}
@@ -897,9 +893,9 @@
if (isrc->xi_cpu != to_cpu) {
if (error == 0) {
/* Commit to new binding by removing the old one. */
- evtchn_cpu_mask_port(isrc->xi_cpu, isrc->xi_port);
+ xen_intr_cpu_mask_port(isrc->xi_cpu, isrc->xi_port);
isrc->xi_cpu = to_cpu;
- evtchn_cpu_unmask_port(isrc->xi_cpu, isrc->xi_port);
+ xen_intr_cpu_unmask_port(isrc->xi_cpu, isrc->xi_port);
}
}
@@ -1286,7 +1282,8 @@
xen_intr_get_evtchn_from_port(evtchn_port_t port, xen_intr_handle_t *handlep)
{
- if (!is_valid_evtchn(port) || port >= NR_EVENT_CHANNELS)
+ /* event channel 0 is reserved, >= NR_EVENT_CHANNELS is invalid */
+ if (port == 0 || port >= NR_EVENT_CHANNELS)
return (EINVAL);
if (handlep == NULL) {

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 21, 3:20 AM (15 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31884380
Default Alt Text
D30743.id93064.diff (4 KB)

Event Timeline