From patchwork Fri Aug 28 23:58:28 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: babu moger X-Patchwork-Id: 44672 Received: from hormel.redhat.com (hormel1.redhat.com [209.132.177.33]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n7SNwsJp015049 for ; Fri, 28 Aug 2009 23:58:54 GMT Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110]) by hormel.redhat.com (Postfix) with ESMTP id A472561AB81; Fri, 28 Aug 2009 19:58:53 -0400 (EDT) Received: from int-mx04.intmail.prod.int.phx2.redhat.com (nat-pool.util.phx.redhat.com [10.8.5.200]) by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id n7SNwpR4009711 for ; Fri, 28 Aug 2009 19:58:51 -0400 Received: from mx1.redhat.com (ext-mx10.extmail.prod.ext.phx2.redhat.com [10.5.110.14]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7SNwpDV008098 for ; Fri, 28 Aug 2009 19:58:51 -0400 Received: from exprod7og104.obsmtp.com (exprod7og104.obsmtp.com [64.18.2.161]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7SNwccV013424 for ; Fri, 28 Aug 2009 19:58:39 -0400 Received: from source ([147.145.40.20]) by exprod7ob104.postini.com ([64.18.6.12]) with SMTP ID DSNKSphvKn096wV9ui3YWTJBBa843vUZqWVs@postini.com; Fri, 28 Aug 2009 16:58:39 PDT Received: from milmhbs0.lsil.com (mhbs.lsil.com [147.145.1.30]) by mail0.lsil.com (8.12.11/8.12.11) with ESMTP id n7SNwWPW027855; Fri, 28 Aug 2009 16:58:33 -0700 (PDT) Received: from coshub01.lsi.com (coshub01.co.lsil.com [172.21.36.64]) by milmhbs0.lsil.com (8.12.11/8.12.11) with ESMTP id n7SNwY1q023482; Fri, 28 Aug 2009 16:58:34 -0700 Received: from cosmail01.lsi.com ([172.21.36.24]) by coshub01.lsi.com ([172.21.36.64]) with mapi; Fri, 28 Aug 2009 17:58:32 -0600 From: "Moger, Babu" To: "sekharan@linux.vnet.ibm.com" Date: Fri, 28 Aug 2009 17:58:28 -0600 Thread-Topic: [PATCH 1/3][RESUBMIT] scsi_dh_rdac: changes to collect the debug information during rdac_activate Thread-Index: AcooCPbsHMWnKQGDRmm6CISNiTYQLgAMPCnw Message-ID: References: <1251482228.20333.9.camel@chandra-ubuntu> In-Reply-To: <1251482228.20333.9.camel@chandra-ubuntu> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-Scanned-By: MIMEDefang 2.67 on 10.5.110.14 X-Scanned-By: MIMEDefang 2.39 X-RedHat-Spam-Score: -4 (RCVD_IN_DNSWL_MED) X-MIME-Autoconverted: from quoted-printable to 8bit by listman.util.phx.redhat.com id n7SNwpR4009711 X-loop: dm-devel@redhat.com Cc: "Dachepalli, Sudhir" , "'device mapper development'" , "Chauhan, Vijay" , "Stankey, Robert" , "'linux-scsi@vger.kernel.org'" Subject: [dm-devel] RE: [PATCH 1/3][RESUBMIT] scsi_dh_rdac: changes to collect the debug information during rdac_activate X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.5 Precedence: junk Reply-To: device-mapper development List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com Hi Chandra, Thanks for your comments. Yes, I thought about using get_lun to get the array name also. But that needed some more changes. Reason is when get_lun is called we might not have controller structure allocated. So, I need to use a temporary variable to get the array name and copy it back when controller structure is allocated. Please look at the attached patch.. This is still a draft. Feel free to comment.. I changed the get_lun function name to get_lun_info as we are getting all the lun related information. Thanks Babu Moger > -----Original Message----- > From: Chandra Seetharaman [mailto:sekharan@us.ibm.com] > Sent: Friday, August 28, 2009 12:57 PM > To: Moger, Babu > Cc: 'linux-scsi@vger.kernel.org'; 'device mapper development'; Chauhan, > Vijay; Stankey, Robert; Dachepalli, Sudhir > Subject: Re: [PATCH 1/3][RESUBMIT] scsi_dh_rdac: changes to collect the > debug information during rdac_activate > > Hi Babu, > > Sorry about this comment after few iterations. I just realized it. > > We already do a C8 inquiry (get_lun()), why can't we just piggy back on > that to fill the array name also. You can change the name of the > function to be get_lun_and_array_name() or some such. > > chandra > On Fri, 2009-08-28 at 08:22 -0600, Moger, Babu wrote: > > Adding the code to read the debug information during activate. This > patch collects the information about storage and controllers during > rdac_activate. > > > > Signed-off-by: Babu Moger > > Reviewed-by: Vijay Chauhan > > Reviewed-by: Bob Stankey > > > > --- > > --- linux-2.6.31-rc5/drivers/scsi/device_handler/scsi_dh_rdac.c.orig > 2009-08-27 18:17:23.000000000 -0500 > > +++ linux-2.6.31-rc5/drivers/scsi/device_handler/scsi_dh_rdac.c 2009- > 08-27 18:27:23.000000000 -0500 > > @@ -112,6 +112,7 @@ struct c9_inquiry { > > > > #define SUBSYS_ID_LEN 16 > > #define SLOT_ID_LEN 2 > > +#define ARRAY_LABEL_LEN 31 > > > > struct c4_inquiry { > > u8 peripheral_info; > > @@ -135,6 +136,8 @@ struct rdac_controller { > > struct rdac_pg_legacy legacy; > > struct rdac_pg_expanded expanded; > > } mode_select; > > + u8 index; > > + u8 array_name[ARRAY_LABEL_LEN]; > > }; > > struct c8_inquiry { > > u8 peripheral_info; > > @@ -324,6 +327,13 @@ static struct rdac_controller *get_contr > > /* initialize fields of controller */ > > memcpy(ctlr->subsys_id, subsys_id, SUBSYS_ID_LEN); > > memcpy(ctlr->slot_id, slot_id, SLOT_ID_LEN); > > + > > + /* update the controller index */ > > + if (slot_id[1] == 0x31) > > + ctlr->index = 0; > > + else > > + ctlr->index = 1; > > + > > kref_init(&ctlr->kref); > > ctlr->use_ms10 = -1; > > list_add(&ctlr->node, &ctlr_list); > > @@ -381,6 +391,26 @@ static int get_lun(struct scsi_device *s > > return err; > > } > > > > +static int get_array_name(struct scsi_device *sdev, struct > rdac_dh_data *h) > > +{ > > + int err, i; > > + struct c8_inquiry *inqp; > > + > > + err = submit_inquiry(sdev, 0xC8, sizeof(struct c8_inquiry), h); > > + if (err == SCSI_DH_OK) { > > + inqp = &h->inq.c8; > > + if (inqp->page_code != 0xc8) > > + return SCSI_DH_NOSYS; > > + > > + for(i=0; i > + h->ctlr->array_name[i] = inqp- > >array_user_label[(2*i)+1]; > > + > > + h->ctlr->array_name[ARRAY_LABEL_LEN-1] = '\0'; > > + } > > + > > + return err; > > +} > > + > > static int check_ownership(struct scsi_device *sdev, struct > rdac_dh_data *h) > > { > > int err; > > @@ -529,6 +559,10 @@ static int rdac_activate(struct scsi_dev > > err = initialize_controller(sdev, h); > > if (err != SCSI_DH_OK) > > goto done; > > + > > + err = get_array_name(sdev, h); > > + if (err != SCSI_DH_OK) > > + goto done; > > } > > > > if (h->ctlr->use_ms10 == -1) { > > > > --- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel --- linux-2.6.31-rc5/drivers/scsi/device_handler/scsi_dh_rdac.c.orig 2009-08-28 18:31:13.000000000 -0500 +++ linux-2.6.31-rc5/drivers/scsi/device_handler/scsi_dh_rdac.c 2009-08-28 18:33:47.000000000 -0500 @@ -112,6 +112,7 @@ struct c9_inquiry { #define SUBSYS_ID_LEN 16 #define SLOT_ID_LEN 2 +#define ARRAY_LABEL_LEN 31 struct c4_inquiry { u8 peripheral_info; @@ -135,6 +136,8 @@ struct rdac_controller { struct rdac_pg_legacy legacy; struct rdac_pg_expanded expanded; } mode_select; + u8 index; + u8 array_name[ARRAY_LABEL_LEN]; }; struct c8_inquiry { u8 peripheral_info; @@ -303,7 +306,8 @@ static void release_controller(struct kr kfree(ctlr); } -static struct rdac_controller *get_controller(u8 *subsys_id, u8 *slot_id) +static struct rdac_controller *get_controller(u8 *subsys_id, u8 *slot_id, + char *array_name) { struct rdac_controller *ctlr, *tmp; @@ -324,6 +328,14 @@ static struct rdac_controller *get_contr /* initialize fields of controller */ memcpy(ctlr->subsys_id, subsys_id, SUBSYS_ID_LEN); memcpy(ctlr->slot_id, slot_id, SLOT_ID_LEN); + memcpy(ctlr->array_name, array_name, ARRAY_LABEL_LEN); + + /* update the controller index */ + if (slot_id[1] == 0x31) + ctlr->index = 0; + else + ctlr->index = 1; + kref_init(&ctlr->kref); ctlr->use_ms10 = -1; list_add(&ctlr->node, &ctlr_list); @@ -363,9 +375,10 @@ done: return err; } -static int get_lun(struct scsi_device *sdev, struct rdac_dh_data *h) +static int get_lun_info(struct scsi_device *sdev, struct rdac_dh_data *h, + char *array_name) { - int err; + int err, i; struct c8_inquiry *inqp; err = submit_inquiry(sdev, 0xC8, sizeof(struct c8_inquiry), h); @@ -377,6 +390,11 @@ static int get_lun(struct scsi_device *s inqp->page_id[2] != 'i' || inqp->page_id[3] != 'd') return SCSI_DH_NOSYS; h->lun = inqp->lun[7]; /* Uses only the last byte */ + + for(i=0; iarray_user_label[(2*i)+1]; + + h->ctlr->array_name[ARRAY_LABEL_LEN-1] = '\0'; } return err; } @@ -410,7 +428,7 @@ static int check_ownership(struct scsi_d } static int initialize_controller(struct scsi_device *sdev, - struct rdac_dh_data *h) + struct rdac_dh_data *h, char *array_name) { int err; struct c4_inquiry *inqp; @@ -418,7 +436,8 @@ static int initialize_controller(struct err = submit_inquiry(sdev, 0xC4, sizeof(struct c4_inquiry), h); if (err == SCSI_DH_OK) { inqp = &h->inq.c4; - h->ctlr = get_controller(inqp->subsys_id, inqp->slot_id); + h->ctlr = get_controller(inqp->subsys_id, inqp->slot_id, + array_name); if (!h->ctlr) err = SCSI_DH_RES_TEMP_UNAVAIL; } @@ -525,17 +544,6 @@ static int rdac_activate(struct scsi_dev if (err != SCSI_DH_OK) goto done; - if (!h->ctlr) { - err = initialize_controller(sdev, h); - if (err != SCSI_DH_OK) - goto done; - } - - if (h->ctlr->use_ms10 == -1) { - err = set_mode_select(sdev, h); - if (err != SCSI_DH_OK) - goto done; - } if (h->lun_state == RDAC_LUN_UNOWNED) err = send_mode_select(sdev, h); done: @@ -656,6 +664,7 @@ static int rdac_bus_attach(struct scsi_d struct rdac_dh_data *h; unsigned long flags; int err; + char array_name[ARRAY_LABEL_LEN]; scsi_dh_data = kzalloc(sizeof(struct scsi_device_handler *) + sizeof(*h) , GFP_KERNEL); @@ -670,7 +679,11 @@ static int rdac_bus_attach(struct scsi_d h->lun = UNINITIALIZED_LUN; h->state = RDAC_STATE_ACTIVE; - err = get_lun(sdev, h); + err = get_lun_info(sdev, h, array_name); + if (err != SCSI_DH_OK) + goto failed; + + err = initialize_controller(sdev, h, array_name); if (err != SCSI_DH_OK) goto failed; @@ -678,6 +691,10 @@ static int rdac_bus_attach(struct scsi_d if (err != SCSI_DH_OK) goto failed; + err = set_mode_select(sdev, h); + if (err != SCSI_DH_OK) + goto failed; + if (!try_module_get(THIS_MODULE)) goto failed;