linux-rdma.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jubin John <jubin.john@intel.com>
To: gregkh@linuxfoundation.org, devel@driverdev.osuosl.org
Cc: linux-rdma@vger.kernel.org, dledford@redhat.com
Subject: [PATCH 11/18] staging/rdma/hfi1: Destroy workqueues if hfi1_register_ib_device() call returns error
Date: Fri, 13 Nov 2015 19:37:09 -0800	[thread overview]
Message-ID: <1447472236-622-11-git-send-email-jubin.john@intel.com> (raw)
In-Reply-To: <1447472236-622-1-git-send-email-jubin.john@intel.com>

From: Harish Chegondi <harish.chegondi@intel.com>

Currently, if hfi1_register_ib_device() call is unsuccessful, workqueues
are not being destroyed before bailing out. This patch fixes this issue.

Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Harish Chegondi <harish.chegondi@intel.com>
Signed-off-by: Jubin John <jubin.john@intel.com>
---
 drivers/staging/rdma/hfi1/init.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/rdma/hfi1/init.c b/drivers/staging/rdma/hfi1/init.c
index 47a1202..54b2a4f 100644
--- a/drivers/staging/rdma/hfi1/init.c
+++ b/drivers/staging/rdma/hfi1/init.c
@@ -1308,6 +1308,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
 	int ret = 0, j, pidx, initfail;
 	struct hfi1_devdata *dd = NULL;
+	struct hfi1_pportdata *ppd;
 
 	/* First, lock the non-writable module parameters */
 	HFI1_CAP_LOCK();
@@ -1403,8 +1404,14 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 	if (initfail || ret) {
 		stop_timers(dd);
 		flush_workqueue(ib_wq);
-		for (pidx = 0; pidx < dd->num_pports; ++pidx)
+		for (pidx = 0; pidx < dd->num_pports; ++pidx) {
 			hfi1_quiet_serdes(dd->pport + pidx);
+			ppd = dd->pport + pidx;
+			if (ppd->hfi1_wq) {
+				destroy_workqueue(ppd->hfi1_wq);
+				ppd->hfi1_wq = NULL;
+			}
+		}
 		if (!j)
 			hfi1_device_remove(dd);
 		if (!ret)
-- 
1.7.0.7

  parent reply	other threads:[~2015-11-14  3:37 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-14  3:36 [PATCH 01/18] staging/rdma/hfi1: Support alternate firmware names Jubin John
2015-11-14  3:37 ` [PATCH 02/18] staging/rdma/hfi1: Decode CNP opcode Jubin John
     [not found]   ` <1447472236-622-2-git-send-email-jubin.john-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-11-20  1:09     ` Greg KH
2015-11-20 14:37       ` Marciniszyn, Mike
2015-11-14  3:37 ` [PATCH 03/18] staging/rdma/hfi1: Add aeth name syndrome decode Jubin John
     [not found]   ` <1447472236-622-3-git-send-email-jubin.john-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-11-20  1:09     ` Greg KH
     [not found]       ` <20151120010940.GC11695-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org>
2015-11-20 21:43         ` Marciniszyn, Mike
2015-11-14  3:37 ` [PATCH 04/18] staging/rdma/hfi1: Fix qp.h comments Jubin John
2015-11-14  3:37 ` [PATCH 05/18] staging/rdma/hfi1: Clean up comments Jubin John
     [not found]   ` <1447472236-622-5-git-send-email-jubin.john-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-11-20  1:10     ` Greg KH
     [not found]       ` <20151120011000.GD11695-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org>
2015-11-20 14:46         ` Marciniszyn, Mike
2015-11-14  3:37 ` [PATCH 06/18] staging/rdma/hfi: Add one-time LCB reset Jubin John
2015-11-20  1:10   ` Greg KH
2015-11-14  3:37 ` [PATCH 07/18] staging/rdma/hfi1: Extend quiet timeout Jubin John
     [not found]   ` <1447472236-622-7-git-send-email-jubin.john-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-11-20  1:10     ` Greg KH
     [not found]       ` <20151120011052.GG11695-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org>
2015-11-20 15:21         ` Marciniszyn, Mike
     [not found]           ` <32E1700B9017364D9B60AED9960492BC259BD7AF-RjuIdWtd+YbTXloPLtfHfbfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2015-11-20 22:04             ` Dan Carpenter
2015-11-14  3:37 ` [PATCH 08/18] staging/rdma/hfi1: Add a credit push on diagpkt allocate fail Jubin John
2015-11-14  3:37 ` [PATCH 09/18] staging/rdma/hfi1: Correctly limit VLs against SDMA engines Jubin John
     [not found]   ` <1447472236-622-9-git-send-email-jubin.john-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-11-20  1:10     ` Greg KH
     [not found]       ` <20151120011017.GE11695-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org>
2015-11-20 14:59         ` Marciniszyn, Mike
2015-11-14  3:37 ` [PATCH 10/18] staging/rdma/hfi1: Adds software counters for bitfields within various error status fields Jubin John
2015-11-14  3:37 ` Jubin John [this message]
2015-11-14  3:37 ` [PATCH 12/18] staging/rdma/hfi1: Unexpected link up pkey values are not an error Jubin John
2015-11-14  3:37 ` [PATCH 13/18] staging/rdma/hfi1: remove SPC freeze error messages Jubin John
2015-11-14  3:37 ` [PATCH 14/18] staging/rdma/hfi1: unknown frame messages are not errors Jubin John
2015-11-14  3:37 ` [PATCH 15/18] staging/rdma/hfi1: Consider VL15 MTU also when calculating the maximum VL MTU Jubin John
2015-11-14  3:37 ` [PATCH 16/18] staging/rdma/hfi1: Fix Xmit Wait calculation Jubin John
2015-11-14  3:37 ` [PATCH 17/18] staging/rdma/hfi1: Adding counter resolutions for DataPortCounters Jubin John
2015-11-14  3:37 ` [PATCH 18/18] staging/rdma/hfi1: Workaround CONFIG_SDMA_VERBOSITY timing issue Jubin John
     [not found]   ` <1447472236-622-18-git-send-email-jubin.john-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-11-20  1:11     ` Greg KH
2015-11-20 16:01       ` Marciniszyn, Mike
     [not found]         ` <32E1700B9017364D9B60AED9960492BC259BD8A2-RjuIdWtd+YbTXloPLtfHfbfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2015-11-20 17:57           ` Greg KH
     [not found] ` <1447472236-622-1-git-send-email-jubin.john-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-11-20  1:08   ` [PATCH 01/18] staging/rdma/hfi1: Support alternate firmware names Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1447472236-622-11-git-send-email-jubin.john@intel.com \
    --to=jubin.john@intel.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=dledford@redhat.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-rdma@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).