diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2015-05-13 14:48:35 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-06-08 13:30:31 -0500 |
| commit | 131fe4ebed0dfd679c30c7f13a218628f1b97d1f (patch) | |
| tree | 8a162cd11213aaf36b080a90b652c784f3f4f0b9 /src/usr/mbox | |
| parent | 3e271df498c46f0e532052662fe02715d0898bf4 (diff) | |
| download | talos-hostboot-131fe4ebed0dfd679c30c7f13a218628f1b97d1f.tar.gz talos-hostboot-131fe4ebed0dfd679c30c7f13a218628f1b97d1f.zip | |
Avoid deadlock in cross-node IPC messaging
Move poll for empty queue out of kernel space to allow for
the primary thread to see new interrupts and clear out
incoming messages. This will prevent 2 nodes from deadlocking
one another while they wait for each other to handle the last
message that was sent to them.
Change-Id: Icbe4e0f621661a37c704b4ac4cdf111664b2039d
CQ: SW298667
Backport: release-fips820
Backport: release-fips830
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/17788
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/mbox')
| -rw-r--r-- | src/usr/mbox/mailboxsp.C | 24 | ||||
| -rw-r--r-- | src/usr/mbox/test/mboxsptest.H | 6 |
2 files changed, 21 insertions, 9 deletions
diff --git a/src/usr/mbox/mailboxsp.C b/src/usr/mbox/mailboxsp.C index ff3241d7d..3f01cfd65 100644 --- a/src/usr/mbox/mailboxsp.C +++ b/src/usr/mbox/mailboxsp.C @@ -44,6 +44,8 @@ #include <arch/ppc.H> #include <errl/errlmanager.H> #include <sys/misc.h> +#include <errl/errludprintk.H> +#include <errno.h> // Local functions namespace MBOX @@ -1893,7 +1895,8 @@ errlHndl_t MBOX::send(queue_id_t i_q_id, msg_t * i_msg,int i_node) // node means Hb instance number in this context INTR::PIR_t my_pir (KernelIpc::ipc_data_area.pir); - if(my_pir.nodeId == i_node) + if( (my_pir.nodeId == i_node) + && (MBOX::HB_TEST_MSGQ != i_q_id) ) //use IPC for tests { // Message is to this node - don't use IPC path // MBOX sp can look up msgQ @@ -1904,8 +1907,8 @@ errlHndl_t MBOX::send(queue_id_t i_q_id, msg_t * i_msg,int i_node) int rc = msg_send(reinterpret_cast<msg_q_t>(q_handle), i_msg); TRACFCOMP(g_trac_mboxmsg,INFO_MRK - "MBOXSP IPC SENT. This PIR 0x%x", - KernelIpc::ipc_data_area.pir); + "MBOXSP IPC SENT. This PIR 0x%x, rc=%d", + KernelIpc::ipc_data_area.pir, rc); if(rc) @@ -1915,22 +1918,27 @@ errlHndl_t MBOX::send(queue_id_t i_q_id, msg_t * i_msg,int i_node) * @moduleid MBOX::MOD_MBOX_SEND * @reasoncode MBOX::RC_INVALID_QUEUE * @userdata1 returncode from msg_send() + * @userdata2 q_handle * - * @devdesc Invalid message or message queue + * @devdesc Error sending IPC message + * @custdesc A problem occurred during the IPL + * of the system * */ err = new ERRORLOG::ErrlEntry ( ERRORLOG::ERRL_SEV_CRITICAL_SYS_TERM, // severity - MBOX::MOD_MBOX_SEND, // moduleid - MBOX::RC_INVALID_QUEUE, // reason Code - rc, // msg_send errno - q_handle, // msg queue id + MBOX::MOD_MBOX_SEND, // moduleid + MBOX::RC_INVALID_QUEUE, // reason Code + rc, // rc from msg_send + q_handle, // msg queue id true //Add HB Software Callout ); // This Trace has the msg err->collectTrace(MBOXMSG_TRACE_NAME); + + ERRORLOG::ErrlUserDetailsPrintk().addToLog(err); } } } diff --git a/src/usr/mbox/test/mboxsptest.H b/src/usr/mbox/test/mboxsptest.H index 765031f5c..e0058d8e6 100644 --- a/src/usr/mbox/test/mboxsptest.H +++ b/src/usr/mbox/test/mboxsptest.H @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -334,6 +336,7 @@ class MboxSPTest : public CxxTest::TestSuite */ void testIPC(void) { + TRACFCOMP(g_trac_mbox,"testIPC>"); errlHndl_t err = NULL; msg_t * msg = msg_allocate(); msg_t * tmsg = msg_allocate(); @@ -384,6 +387,7 @@ class MboxSPTest : public CxxTest::TestSuite msg_q_destroy(msgQ); msg_free(rmsg); msg_free(tmsg); + TRACFCOMP(g_trac_mbox,"<testIPC"); } }; |
