From patchwork Wed Jan 13 08:09:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Reinecke X-Patchwork-Id: 8023121 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id F20D39F2F4 for ; Wed, 13 Jan 2016 08:10:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 06BF62041A for ; Wed, 13 Jan 2016 08:10:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1D83F203F3 for ; Wed, 13 Jan 2016 08:10:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755125AbcAMIK3 (ORCPT ); Wed, 13 Jan 2016 03:10:29 -0500 Received: from mx2.suse.de ([195.135.220.15]:58986 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755006AbcAMIKV (ORCPT ); Wed, 13 Jan 2016 03:10:21 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id A65F2AD8D; Wed, 13 Jan 2016 08:10:14 +0000 (UTC) From: Hannes Reinecke To: "Martin K. Petersen" Cc: James Bottomley , Christoph Hellwig , Bart von Assche , Ewan Milne , linux-scsi@vger.kernel.org, Hannes Reinecke Subject: [PATCHv3 23/24] scsi_dh_alua: update 'access_state' field Date: Wed, 13 Jan 2016 09:09:58 +0100 Message-Id: <1452672599-9820-24-git-send-email-hare@suse.de> X-Mailer: git-send-email 1.8.5.6 In-Reply-To: <1452672599-9820-1-git-send-email-hare@suse.de> References: <1452672599-9820-1-git-send-email-hare@suse.de> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Track attached SCSI devices and update the 'access_state' field whenever an ALUA state change has been detected. Signed-off-by: Hannes Reinecke --- drivers/scsi/device_handler/scsi_dh_alua.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c index 50f42cb..e215ea4 100644 --- a/drivers/scsi/device_handler/scsi_dh_alua.c +++ b/drivers/scsi/device_handler/scsi_dh_alua.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -75,6 +76,7 @@ static struct workqueue_struct *kaluad_sync_wq; struct alua_port_group { struct kref kref; struct list_head node; + struct list_head dh_list; unsigned char device_id_str[256]; int device_id_len; int group_id; @@ -92,6 +94,7 @@ struct alua_port_group { }; struct alua_dh_data { + struct list_head node; struct alua_port_group *pg; int group_id; spinlock_t pg_lock; @@ -247,6 +250,7 @@ struct alua_port_group *alua_alloc_pg(struct scsi_device *sdev, INIT_DELAYED_WORK(&pg->rtpg_work, alua_rtpg_work); INIT_LIST_HEAD(&pg->rtpg_list); INIT_LIST_HEAD(&pg->node); + INIT_LIST_HEAD(&pg->dh_list); spin_lock_init(&pg->lock); spin_lock(&port_group_lock); @@ -329,6 +333,7 @@ static int alua_check_vpd(struct scsi_device *sdev, struct alua_dh_data *h, int rel_port = -1, group_id; struct alua_port_group *pg, *old_pg = NULL; bool pg_updated = false; + unsigned long flags; unsigned int bflags = scsi_get_device_flags_keyed(sdev, &sdev->inquiry[8], &sdev->inquiry[16], @@ -364,6 +369,9 @@ static int alua_check_vpd(struct scsi_device *sdev, struct alua_dh_data *h, /* port_group has changed. Update to new port group */ if (h->pg != pg) { old_pg = h->pg; + spin_lock_irqsave(&old_pg->lock, flags); + list_del_rcu(&h->node); + spin_unlock_irqrestore(&old_pg->lock, flags); rcu_assign_pointer(h->pg, pg); pg_updated = true; } @@ -376,8 +384,12 @@ static int alua_check_vpd(struct scsi_device *sdev, struct alua_dh_data *h, alua_rtpg_queue(h->pg, sdev, NULL, true); spin_unlock(&h->pg_lock); - if (pg_updated) + if (pg_updated) { + spin_lock_irqsave(&pg->lock, flags); + list_add_rcu(&h->node, &pg->dh_list); + spin_unlock_irqrestore(&pg->lock, flags); synchronize_rcu(); + } if (old_pg) kref_put(&old_pg->kref, release_port_group); @@ -621,6 +633,8 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg) spin_lock_irqsave(&port_group_lock, flags); list_for_each_entry(tmp_pg, &port_group_list, node) { + struct alua_dh_data *h; + if (tmp_pg->group_id != group_id) continue; if (tmp_pg->device_id_len != pg->device_id_len) @@ -630,6 +644,13 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg) continue; tmp_pg->state = desc[0] & 0x0f; tmp_pg->pref = desc[0] >> 7; + rcu_read_lock(); + list_for_each_entry_rcu(h, &tmp_pg->dh_list, node) { + /* h->sdev should always be valid */ + BUG_ON(!h->sdev); + h->sdev->access_state = desc[0]; + } + rcu_read_unlock(); if (tmp_pg == pg) valid_states = desc[1]; } @@ -1049,6 +1070,7 @@ static int alua_bus_attach(struct scsi_device *sdev) rcu_assign_pointer(h->pg, NULL); h->init_error = SCSI_DH_OK; h->sdev = sdev; + INIT_LIST_HEAD(&h->node); mutex_init(&h->init_mutex); err = alua_initialize(sdev, h); @@ -1076,12 +1098,15 @@ static void alua_bus_detach(struct scsi_device *sdev) spin_lock(&h->pg_lock); pg = h->pg; rcu_assign_pointer(h->pg, NULL); - h->sdev = NULL; spin_unlock(&h->pg_lock); if (pg) { + spin_lock(&pg->lock); + list_del_rcu(&h->node); + spin_unlock(&pg->lock); synchronize_rcu(); kref_put(&pg->kref, release_port_group); } + h->sdev = NULL; sdev->handler_data = NULL; kfree(h); }