STABLE12-linux-unmask-signals-in-rxk-listener-at-shutdown-20020124

since the rxk listener gets "kill"d at shutdown we need to unmask to wake
it up. this should probably be replaced but the logical way is evil,
involves simulating a packet to the listener so it wakes up and notices it's
time to die

(cherry picked from commit 5c2a4168a6e67733d4ec545936e13742c72ff9f8)

diff --git a/src/afs/LINUX/osi_misc.c b/src/afs/LINUX/osi_misc.c
index 039e18d4a44b3d14834a8b830a01caae90e77432..1609f37e74a3d7822308965f3b58b642e6b3d2fd 100644 (file)
--- a/src/afs/LINUX/osi_misc.c
+++ b/src/afs/LINUX/osi_misc.c
@@ -427,3 +427,23 @@ void check_bad_parent(struct dentry *dp)
  
   return;
 }
+
+struct task_struct *rxk_ListenerTask;
+
+void osi_linux_mask() {
+    spin_lock_irq(&current->sigmask_lock);
+    sigfillset(&current->blocked);
+    recalc_sigpending(current);
+    spin_unlock_irq(&current->sigmask_lock);
+}
+
+void osi_linux_unmask() {
+    spin_lock_irq(&rxk_ListenerTask->sigmask_lock);
+    sigemptyset(&rxk_ListenerTask->blocked);
+    recalc_sigpending(rxk_ListenerTask);
+    spin_unlock_irq(&rxk_ListenerTask->sigmask_lock);
+}
+
+void osi_linux_rxkreg() {
+    rxk_ListenerTask = current;
+}

diff --git a/src/afs/afs_call.c b/src/afs/afs_call.c
index 7a15ec0b4c972b1077da04fef4b48919545f68a0..924dec4661ef5e30c3e2f1c9753a343c23c6183f 100644 (file)
--- a/src/afs/afs_call.c
+++ b/src/afs/afs_call.c
@@ -191,6 +191,9 @@ long parm, parm2, parm3, parm4, parm5, parm6;
            afs_osi_Invisible();
            afs_RX_Running = 2;
            afs_osi_Wakeup(&afs_RX_Running);
+#ifndef UKERNEL
+           afs_osi_RxkRegister();
+#endif
            rxk_Listener();
        }
 #ifdef AFS_SGI_ENV
@@ -1257,6 +1260,9 @@ afs_shutdown()
        afs_osi_Sleep(&afs_termState);
 #if defined(RXK_LISTENER_ENV)
     afs_warn("RxListener... ");
+#ifndef UKERNEL
+    afs_osi_UnmaskRxkSignals();
+#endif
     /* cancel rx listener */
     osi_StopListener(); /* This closes rx_socket. */
     while (afs_termState == AFSOP_STOP_RXK_LISTENER) 

diff --git a/src/afs/afs_osi.c b/src/afs/afs_osi.c
index bd762eafbddab7d53f3b382550bc6096ddb41886..ac3f65d9225c8aa1e5e8cad12c428a0f8335b0d6 100644 (file)
--- a/src/afs/afs_osi.c
+++ b/src/afs/afs_osi.c
@@ -283,13 +283,24 @@ afs_gfs_FlushText(vp)
 /* mask signals in afsds */
 void afs_osi_MaskSignals(){
 #ifdef AFS_LINUX22_ENV
-    spin_lock_irq(&current->sigmask_lock);
-    sigfillset(&current->blocked);
-    recalc_sigpending(current);
-    spin_unlock_irq(&current->sigmask_lock);
+    osi_linux_mask();
 #endif
 }
     
+/* unmask signals in rxk listener */
+void afs_osi_UnmaskRxkSignals(){
+#ifdef AFS_LINUX22_ENV
+    osi_linux_unmask();
+#endif
+}
+    
+/* register rxk listener proc info */
+void afs_osi_RxkRegister(){
+#ifdef AFS_LINUX22_ENV
+    osi_linux_rxkreg();
+#endif
+}
+
 /* procedure for making our processes as invisible as we can */
 void afs_osi_Invisible() {
 #ifdef AFS_LINUX22_ENV