From patchwork Wed Apr 13 08:41:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Thumshirn X-Patchwork-Id: 8819561 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A0179C0553 for ; Wed, 13 Apr 2016 08:42:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CEB8E20270 for ; Wed, 13 Apr 2016 08:42:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D4A782026C for ; Wed, 13 Apr 2016 08:42:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932705AbcDMIl5 (ORCPT ); Wed, 13 Apr 2016 04:41:57 -0400 Received: from mx2.suse.de ([195.135.220.15]:33783 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756549AbcDMIly convert rfc822-to-8bit (ORCPT ); Wed, 13 Apr 2016 04:41:54 -0400 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 68DB5ACE7; Wed, 13 Apr 2016 08:41:50 +0000 (UTC) From: Johannes Thumshirn To: Sergey Senozhatsky Cc: "Ewan D. Milne" , Hannes Reinecke , James Bottomley , "Martin K. Petersen" , Stephen Rothwell , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, linux-next@vger.kernel.org, Sergey Senozhatsky , Xiong Zhou Subject: Re: [-next] BUG_ON in scsi_target_destroy() Date: Wed, 13 Apr 2016 10:41:50 +0200 Message-ID: <2201725.I2to9GCRQJ@c203> User-Agent: KMail/5.1.3 (Linux/4.5.0-3-default; KDE/5.20.0; x86_64; ; ) In-Reply-To: <20160411090146.GA537@swordfish> References: <20160411090146.GA537@swordfish> MIME-Version: 1.0 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Hi Sergey, Xiong, Can you try below patch? On Montag, 11. April 2016 18:01:47 CEST Sergey Senozhatsky wrote: > Hello, > > commit 7b106f2de6938c31ce5e9c86bc70ad3904666b96 > Author: Johannes Thumshirn > Date: Tue Apr 5 11:50:44 2016 +0200 > > scsi: Add intermediate STARGET_REMOVE state to scsi_target_state > > > BUG_ON()s (next-20160411) each time I remove a usb flash > > [ 49.561600] [] scsi_target_destroy+0x5a/0xcb [scsi_mod] > [ 49.561607] [] scsi_target_reap+0x4a/0x4f [scsi_mod] > [ 49.561613] [] __scsi_remove_device+0xc3/0xd0 [scsi_mod] > [ 49.561619] [] scsi_forget_host+0x52/0x63 [scsi_mod] > [ 49.561623] [] scsi_remove_host+0x8c/0x102 [scsi_mod] > [ 49.561627] [] usb_stor_disconnect+0x6b/0xab [usb_storage] > [ 49.561634] [] usb_unbind_interface+0x77/0x1ca [usbcore] > [ 49.561636] [] __device_release_driver+0x9d/0x121 > [ 49.561638] [] device_release_driver+0x23/0x30 > [ 49.561639] [] bus_remove_device+0xfb/0x10e > [ 49.561641] [] device_del+0x164/0x1e6 > [ 49.561648] [] ? remove_intf_ep_devs+0x3b/0x48 [usbcore] > [ 49.561655] [] usb_disable_device+0x84/0x1a5 [usbcore] > [ 49.561661] [] usb_disconnect+0x94/0x19f [usbcore] > [ 49.561667] [] hub_event+0x5c1/0xdea [usbcore] > [ 49.561670] [] process_one_work+0x1dc/0x37f > [ 49.561672] [] worker_thread+0x282/0x36d > [ 49.561673] [] ? rescuer_thread+0x2ae/0x2ae > [ 49.561675] [] kthread+0xd2/0xda > [ 49.561678] [] ret_from_fork+0x22/0x40 > [ 49.561679] [] ? kthread_worker_fn+0x13e/0x13e > > -ss > -- > 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 > diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index 0734927..0c00928 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c @@ -1276,6 +1276,7 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev) void __scsi_remove_device(struct scsi_device *sdev) { struct device *dev = &sdev->sdev_gendev; + struct scsi_target *starget; /* * This cleanup path is not reentrant and while it is impossible @@ -1315,7 +1316,9 @@ void __scsi_remove_device(struct scsi_device *sdev) * remoed sysfs visibility from the device, so make the target * invisible if this was the last device underneath it. */ - scsi_target_reap(scsi_target(sdev)); + starget = scsi_target(sdev); + starget->state = STARGET_REMOVE; + scsi_target_reap(starget); put_device(dev); }