From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tomas Henzl Subject: Re: [PATCH 1 08/25] hpsa: fix hpsa_adjust_hpsa_scsi_table Date: Thu, 29 Oct 2015 15:23:16 +0100 Message-ID: <56322BD4.5040101@redhat.com> References: <20151028215206.5323.84194.stgit@brunhilda> <20151028220518.5323.5177.stgit@brunhilda> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Return-path: Received: from mx1.redhat.com ([209.132.183.28]:45131 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752376AbbJ2OXU (ORCPT ); Thu, 29 Oct 2015 10:23:20 -0400 In-Reply-To: <20151028220518.5323.5177.stgit@brunhilda> Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: Don Brace , scott.teel@pmcs.com, Kevin.Barnett@pmcs.com, scott.benesh@pmcs.com, james.bottomley@parallels.com, hch@infradead.org, Justin.Lindley@pmcs.com, elliott@hpe.com Cc: linux-scsi@vger.kernel.org On 28.10.2015 23:05, Don Brace wrote: > Fix a NULL pointer issue in the driver when devices are removed > during a reset. > > Signed-off-by: Don Brace > --- > drivers/block/cciss.h | 1 + > drivers/scsi/hpsa.c | 16 ++++++++++++++++ > drivers/scsi/hpsa.h | 1 + > 3 files changed, 18 insertions(+) > > diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h > index 7fda30e..f8b8c6b 100644 > --- a/drivers/block/cciss.h > +++ b/drivers/block/cciss.h > @@ -155,6 +155,7 @@ struct ctlr_info > size_t reply_pool_size; > unsigned char reply_pool_wraparound; > u32 *blockFetchTable; > + u8 reset_in_progress; > }; > > /* Defining the diffent access_methods > diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c > index ced0d4c..08a761c 100644 > --- a/drivers/scsi/hpsa.c > +++ b/drivers/scsi/hpsa.c > @@ -1670,6 +1670,15 @@ static void adjust_hpsa_scsi_table(struct ctlr_info *h, int hostno, > int nadded, nremoved; > struct Scsi_Host *sh = NULL; > > + /* > + * A reset can cause a device status to change > + * re-schedule the scan to see what happened. > + */ > + if (h->reset_in_progress) { > + h->drv_req_rescan = 1; > + return; > + } > + If another process start the reset at this point will you get the the same Null pointer issue as before? Isn't some kind of exclusive access protection needed ? -tm > added = kzalloc(sizeof(*added) * HPSA_MAX_DEVICES, GFP_KERNEL); > removed = kzalloc(sizeof(*removed) * HPSA_MAX_DEVICES, GFP_KERNEL); > > @@ -1780,6 +1789,10 @@ static void adjust_hpsa_scsi_table(struct ctlr_info *h, int hostno, > goto free_and_out; > > sh = h->scsi_host; > + if (sh == NULL) { > + dev_warn(&h->pdev->dev, "%s: scsi_host is null\n", __func__); > + return; > + } > /* Notify scsi mid layer of any removed devices */ > for (i = 0; i < nremoved; i++) { > if (removed[i] == NULL) > @@ -5243,12 +5256,15 @@ static int hpsa_eh_device_reset_handler(struct scsi_cmnd *scsicmd) > > hpsa_show_dev_msg(KERN_WARNING, h, dev, "resetting"); > > + h->reset_in_progress = 1; > + > /* send a reset to the SCSI LUN which the command was sent to */ > rc = hpsa_do_reset(h, dev, dev->scsi3addr, HPSA_RESET_TYPE_LUN, > DEFAULT_REPLY_QUEUE); > snprintf(msg, sizeof(msg), "reset %s", > rc == 0 ? "completed successfully" : "failed"); > hpsa_show_dev_msg(KERN_WARNING, h, dev, msg); > + h->reset_in_progress = 0; > return rc == 0 ? SUCCESS : FAILED; > } > > diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h > index b173c0e..dc113c1a 100644 > --- a/drivers/scsi/hpsa.h > +++ b/drivers/scsi/hpsa.h > @@ -271,6 +271,7 @@ struct ctlr_info { > wait_queue_head_t abort_cmd_wait_queue; > wait_queue_head_t event_sync_wait_queue; > struct mutex reset_mutex; > + u8 reset_in_progress; > }; > > struct offline_device_entry { > > -- > To unsubscribe from this list: send the line "unsubscribe linux-scsi" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html