From patchwork Fri Apr 13 23:37:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 152451 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B2654B7011 for ; Sat, 14 Apr 2012 09:22:15 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932485Ab2DMXWN (ORCPT ); Fri, 13 Apr 2012 19:22:13 -0400 Received: from mga11.intel.com ([192.55.52.93]:18769 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932474Ab2DMXWM (ORCPT ); Fri, 13 Apr 2012 19:22:12 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 13 Apr 2012 16:22:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.71,315,1320652800"; d="scan'208";a="141547871" Received: from dwillia2-linux.jf.intel.com ([10.23.45.110]) by fmsmga001.fm.intel.com with ESMTP; 13 Apr 2012 16:22:12 -0700 Received: from dwillia2-linux.jf.intel.com (localhost.localdomain [IPv6:::1]) by dwillia2-linux.jf.intel.com (Postfix) with ESMTP id D1A9F80005; Fri, 13 Apr 2012 16:37:52 -0700 (PDT) Subject: [PATCH 12/12] scsi_transport_sas: fix delete vs scan race To: JBottomley@parallels.com From: Dan Williams Cc: linux-ide@vger.kernel.org, linux-scsi@vger.kernel.org Date: Fri, 13 Apr 2012 16:37:52 -0700 Message-ID: <20120413233752.8025.97983.stgit@dwillia2-linux.jf.intel.com> In-Reply-To: <20120413233343.8025.18101.stgit@dwillia2-linux.jf.intel.com> References: <20120413233343.8025.18101.stgit@dwillia2-linux.jf.intel.com> User-Agent: StGit/0.16-1-g7004 MIME-Version: 1.0 Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org The following crash results from cases where the end_device has been removed before scsi_sysfs_add_sdev has had a chance to run. BUG: unable to handle kernel NULL pointer dereference at 0000000000000098 IP: [] sysfs_create_dir+0x32/0xb6 ... Call Trace: [] kobject_add_internal+0x120/0x1e3 [] ? trace_hardirqs_on+0xd/0xf [] kobject_add_varg+0x41/0x50 [] kobject_add+0x64/0x66 [] device_add+0x12d/0x63a [] ? _raw_spin_unlock_irqrestore+0x47/0x56 [] ? module_refcount+0x89/0xa0 [] scsi_sysfs_add_sdev+0x4e/0x28a [] do_scan_async+0x9c/0x145 ...teach sas_rphy_remove to wait for async scanning to quiesce before removing the end_device. It seems this is a more general problem [1], but this patch only addresses sas transport. [1]: 23edb6e [SCSI] mpt2sas: Do not set sas_device->starget to NULL from the slave_destroy callback when all the LUNS have been deleted Signed-off-by: Dan Williams --- drivers/scsi/scsi_transport_sas.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c index f7565fc..47abb90 100644 --- a/drivers/scsi/scsi_transport_sas.c +++ b/drivers/scsi/scsi_transport_sas.c @@ -33,8 +33,9 @@ #include #include -#include #include +#include +#include #include #include @@ -1667,6 +1668,9 @@ sas_rphy_remove(struct sas_rphy *rphy) { struct device *dev = &rphy->dev; + /* prevent device_del() while child device_add() may be in-flight */ + scsi_complete_async_scans(); + switch (rphy->identify.device_type) { case SAS_END_DEVICE: scsi_remove_target(dev);