From ddeaeeec193b66d6f97973a6402f88b5d481d14c Mon Sep 17 00:00:00 2001
From: Ben Walker <benjamin.walker@intel.com>
Date: Thu, 19 Apr 2018 15:34:07 -0700
Subject: [PATCH] nvme: Only check timeouts on requests from the same process

Change-Id: I80521c4c01daf033319f88cf273255387a7b5248
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/408403
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
---
 lib/nvme/nvme_pcie.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/nvme/nvme_pcie.c b/lib/nvme/nvme_pcie.c
index 00e4c1908..860bbe163 100644
--- a/lib/nvme/nvme_pcie.c
+++ b/lib/nvme/nvme_pcie.c
@@ -2017,9 +2017,14 @@ nvme_pcie_qpair_check_timeout(struct spdk_nvme_qpair *qpair)
 			continue;
 		}
 
-		if (nvme_qpair_is_admin_queue(qpair) &&
-		    tr->req->cmd.opc == SPDK_NVME_OPC_ASYNC_EVENT_REQUEST) {
-			continue;
+		if (nvme_qpair_is_admin_queue(qpair)) {
+			if (tr->req->pid != getpid()) {
+				continue;
+			}
+
+			if (tr->req->cmd.opc == SPDK_NVME_OPC_ASYNC_EVENT_REQUEST) {
+				continue;
+			}
 		}
 
 		if (tr->submit_tick + qpair->active_proc->timeout_ticks > t02) {