Conditional unmask

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>

diff --git a/include/evtchn_interface.h b/include/evtchn_interface.h
index 310850bab2582584179d71a02d2008ae7509fd00..068a69734fe985a782b2626a6094cc565bb9b6e2 100644 (file)
--- a/include/evtchn_interface.h
+++ b/include/evtchn_interface.h
@@ -128,18 +128,27 @@ typedef NTSTATUS
     IN  UCHAR                   Number
     );
 
     IN  UCHAR                   Number
     );
 

+typedef VOID
+(*XENBUS_EVTCHN_UNMASK_V4)(
+    IN  PINTERFACE              Interface,
+    IN  PXENBUS_EVTCHN_CHANNEL  Channel,
+    IN  BOOLEAN                 InCallback
+    );
+

 /*! \typedef XENBUS_EVTCHN_UNMASK
     \brief Unmask an event channel
 
     \param Interface The interface header
     \param Channel The channel handle
     \param InCallback Set to TRUE if this method is invoked in context of the channel callback
 /*! \typedef XENBUS_EVTCHN_UNMASK
     \brief Unmask an event channel
 
     \param Interface The interface header
     \param Channel The channel handle
     \param InCallback Set to TRUE if this method is invoked in context of the channel callback

+    \param Force Set to TRUE if the unmask must succeed, otherwise set to FALSE and the function will return FALSE if the unmask did not complete.

 */
 */

-typedef VOID
+typedef BOOLEAN

 (*XENBUS_EVTCHN_UNMASK)(
     IN  PINTERFACE              Interface,
     IN  PXENBUS_EVTCHN_CHANNEL  Channel,
 (*XENBUS_EVTCHN_UNMASK)(
     IN  PINTERFACE              Interface,
     IN  PXENBUS_EVTCHN_CHANNEL  Channel,

-    IN  BOOLEAN                 InCallback
+    IN  BOOLEAN                 InCallback,
+    IN  BOOLEAN                 Force

     );
 
 typedef VOID
     );
 
 typedef VOID


@@ -250,7 +259,7 @@ struct _XENBUS_EVTCHN_INTERFACE_V4 {
     XENBUS_EVTCHN_RELEASE   EvtchnRelease;
     XENBUS_EVTCHN_OPEN      EvtchnOpen;
     XENBUS_EVTCHN_BIND      EvtchnBind;
     XENBUS_EVTCHN_RELEASE   EvtchnRelease;
     XENBUS_EVTCHN_OPEN      EvtchnOpen;
     XENBUS_EVTCHN_BIND      EvtchnBind;

-    XENBUS_EVTCHN_UNMASK    EvtchnUnmask;
+    XENBUS_EVTCHN_UNMASK_V4 EvtchnUnmaskVersion4;

     XENBUS_EVTCHN_SEND_V1   EvtchnSendVersion1;
     XENBUS_EVTCHN_TRIGGER   EvtchnTrigger;
     XENBUS_EVTCHN_GET_PORT  EvtchnGetPort;
     XENBUS_EVTCHN_SEND_V1   EvtchnSendVersion1;
     XENBUS_EVTCHN_TRIGGER   EvtchnTrigger;
     XENBUS_EVTCHN_GET_PORT  EvtchnGetPort;


@@ -267,7 +276,7 @@ struct _XENBUS_EVTCHN_INTERFACE_V5 {
     XENBUS_EVTCHN_RELEASE   EvtchnRelease;
     XENBUS_EVTCHN_OPEN      EvtchnOpen;
     XENBUS_EVTCHN_BIND      EvtchnBind;
     XENBUS_EVTCHN_RELEASE   EvtchnRelease;
     XENBUS_EVTCHN_OPEN      EvtchnOpen;
     XENBUS_EVTCHN_BIND      EvtchnBind;

-    XENBUS_EVTCHN_UNMASK    EvtchnUnmask;
+    XENBUS_EVTCHN_UNMASK_V4 EvtchnUnmaskVersion4;

     XENBUS_EVTCHN_SEND_V1   EvtchnSendVersion1;
     XENBUS_EVTCHN_TRIGGER   EvtchnTrigger;
     XENBUS_EVTCHN_WAIT_V5   EvtchnWaitVersion5;
     XENBUS_EVTCHN_SEND_V1   EvtchnSendVersion1;
     XENBUS_EVTCHN_TRIGGER   EvtchnTrigger;
     XENBUS_EVTCHN_WAIT_V5   EvtchnWaitVersion5;


@@ -285,7 +294,7 @@ struct _XENBUS_EVTCHN_INTERFACE_V6 {
     XENBUS_EVTCHN_RELEASE   EvtchnRelease;
     XENBUS_EVTCHN_OPEN      EvtchnOpen;
     XENBUS_EVTCHN_BIND      EvtchnBind;
     XENBUS_EVTCHN_RELEASE   EvtchnRelease;
     XENBUS_EVTCHN_OPEN      EvtchnOpen;
     XENBUS_EVTCHN_BIND      EvtchnBind;

-    XENBUS_EVTCHN_UNMASK    EvtchnUnmask;
+    XENBUS_EVTCHN_UNMASK_V4 EvtchnUnmaskVersion4;

     XENBUS_EVTCHN_SEND      EvtchnSend;
     XENBUS_EVTCHN_TRIGGER   EvtchnTrigger;
     XENBUS_EVTCHN_WAIT_V5   EvtchnWaitVersion5;
     XENBUS_EVTCHN_SEND      EvtchnSend;
     XENBUS_EVTCHN_TRIGGER   EvtchnTrigger;
     XENBUS_EVTCHN_WAIT_V5   EvtchnWaitVersion5;


@@ -298,6 +307,25 @@ struct _XENBUS_EVTCHN_INTERFACE_V6 {
     \ingroup interfaces
 */
 struct _XENBUS_EVTCHN_INTERFACE_V7 {
     \ingroup interfaces
 */
 struct _XENBUS_EVTCHN_INTERFACE_V7 {

+    INTERFACE               Interface;
+    XENBUS_EVTCHN_ACQUIRE   EvtchnAcquire;
+    XENBUS_EVTCHN_RELEASE   EvtchnRelease;
+    XENBUS_EVTCHN_OPEN      EvtchnOpen;
+    XENBUS_EVTCHN_BIND      EvtchnBind;
+    XENBUS_EVTCHN_UNMASK_V4 EvtchnUnmaskVersion4;
+    XENBUS_EVTCHN_SEND      EvtchnSend;
+    XENBUS_EVTCHN_TRIGGER   EvtchnTrigger;
+    XENBUS_EVTCHN_GET_COUNT EvtchnGetCount;
+    XENBUS_EVTCHN_WAIT      EvtchnWait;
+    XENBUS_EVTCHN_GET_PORT  EvtchnGetPort;
+    XENBUS_EVTCHN_CLOSE     EvtchnClose;
+};
+
+/*! \struct _XENBUS_EVTCHN_INTERFACE_V8
+    \brief EVTCHN interface version 8
+    \ingroup interfaces
+*/
+struct _XENBUS_EVTCHN_INTERFACE_V8 {

     INTERFACE               Interface;
     XENBUS_EVTCHN_ACQUIRE   EvtchnAcquire;
     XENBUS_EVTCHN_RELEASE   EvtchnRelease;
     INTERFACE               Interface;
     XENBUS_EVTCHN_ACQUIRE   EvtchnAcquire;
     XENBUS_EVTCHN_RELEASE   EvtchnRelease;


@@ -312,7 +340,7 @@ struct _XENBUS_EVTCHN_INTERFACE_V7 {
     XENBUS_EVTCHN_CLOSE     EvtchnClose;
 };
 
     XENBUS_EVTCHN_CLOSE     EvtchnClose;
 };
 

-typedef struct _XENBUS_EVTCHN_INTERFACE_V7 XENBUS_EVTCHN_INTERFACE, *PXENBUS_EVTCHN_INTERFACE;
+typedef struct _XENBUS_EVTCHN_INTERFACE_V8 XENBUS_EVTCHN_INTERFACE, *PXENBUS_EVTCHN_INTERFACE;

 
 /*! \def XENBUS_EVTCHN
     \brief Macro at assist in method invocation
 
 /*! \def XENBUS_EVTCHN
     \brief Macro at assist in method invocation


@@ -323,7 +351,7 @@ typedef struct _XENBUS_EVTCHN_INTERFACE_V7 XENBUS_EVTCHN_INTERFACE, *PXENBUS_EVT
 #endif  // _WINDLL
 
 #define XENBUS_EVTCHN_INTERFACE_VERSION_MIN 4
 #endif  // _WINDLL
 
 #define XENBUS_EVTCHN_INTERFACE_VERSION_MIN 4

-#define XENBUS_EVTCHN_INTERFACE_VERSION_MAX 7
+#define XENBUS_EVTCHN_INTERFACE_VERSION_MAX 8

 
 #endif  // _XENBUS_EVTCHN_INTERFACE_H
 
 
 #endif  // _XENBUS_EVTCHN_INTERFACE_H
 

diff --git a/src/xenvif/controller.c b/src/xenvif/controller.c
index 629b6b7989fa27a8a025a7514ff88fd9c26dea25..004bccb0a910e9a489cd634192ee76045a62784c 100644 (file)
--- a/src/xenvif/controller.c
+++ b/src/xenvif/controller.c
@@ -502,10 +502,11 @@ ControllerConnect(
     if (Controller->Channel == NULL)
         goto fail9;
 
     if (Controller->Channel == NULL)
         goto fail9;
 

-    XENBUS_EVTCHN(Unmask,
-                  &Controller->EvtchnInterface,
-                  Controller->Channel,
-                  FALSE);
+    (VOID) XENBUS_EVTCHN(Unmask,
+                         &Controller->EvtchnInterface,
+                         Controller->Channel,
+                         FALSE,
+                         TRUE);

 
     status = XENBUS_DEBUG(Register,
                           &Controller->DebugInterface,
 
     status = XENBUS_DEBUG(Register,
                           &Controller->DebugInterface,

diff --git a/src/xenvif/poller.c b/src/xenvif/poller.c
index b57a6a4773c543f37e04e0b1855a13eebaf9675c..b41032ea787d6286c49b067d771a16ffb753c312 100644 (file)
--- a/src/xenvif/poller.c
+++ b/src/xenvif/poller.c
@@ -330,10 +330,11 @@ PollerChannelConnect(
                          ProcNumber.Group,
                          ProcNumber.Number);
 
                          ProcNumber.Group,
                          ProcNumber.Number);
 

-    XENBUS_EVTCHN(Unmask,
-                  &Poller->EvtchnInterface,
-                  Channel->Channel,
-                  FALSE);
+    (VOID) XENBUS_EVTCHN(Unmask,
+                         &Poller->EvtchnInterface,
+                         Channel->Channel,
+                         FALSE,
+                         TRUE);

 
 done:
     return STATUS_SUCCESS;
 
 done:
     return STATUS_SUCCESS;


@@ -391,6 +392,7 @@ PollerChannelUnmask(
 {
     PXENVIF_POLLER_INSTANCE     Instance;
     PXENVIF_POLLER              Poller;
 {
     PXENVIF_POLLER_INSTANCE     Instance;
     PXENVIF_POLLER              Poller;

+    BOOLEAN                     Pending;

 
     Instance = Channel->Instance;
     Poller = Instance->Poller;
 
     Instance = Channel->Instance;
     Poller = Instance->Poller;


@@ -398,11 +400,16 @@ PollerChannelUnmask(
     if (Channel->Channel == NULL)
         return;
 
     if (Channel->Channel == NULL)
         return;
 

-    if (!PollerChannelTestPending(Channel))
-        XENBUS_EVTCHN(Unmask,
-                      &Poller->EvtchnInterface,
-                      Channel->Channel,
-                      FALSE);
+    if (PollerChannelTestPending(Channel))
+        return;
+
+    Pending = XENBUS_EVTCHN(Unmask,
+                            &Poller->EvtchnInterface,
+                            Channel->Channel,
+                            FALSE,
+                            FALSE);
+    if (Pending)
+        PollerChannelSetPending(Channel);

 }
 
 static VOID
 }
 
 static VOID