From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Ellerman Subject: Re: [2.6.31] Memory leak in SCSI initialization? Date: Tue, 22 Sep 2009 23:13:14 +1000 Message-ID: <1253625194.5923.10.camel@concordia> References: <200909221318.IFD17141.OQLtSFJVOOFFMH@I-love.SAKURA.ne.jp> Reply-To: michael@ellerman.id.au Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit Return-path: Received: from ozlabs.org ([203.10.76.45]:57112 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756276AbZIVNNL (ORCPT ); Tue, 22 Sep 2009 09:13:11 -0400 In-Reply-To: <200909221318.IFD17141.OQLtSFJVOOFFMH@I-love.SAKURA.ne.jp> Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: Tetsuo Handa Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org On Tue, 2009-09-22 at 13:18 +0900, Tetsuo Handa wrote: > Hello. > > I can see below message appears for 15 times in > /sys/kernel/debug/kmemleak after processing /init inside initramfs. > > unreferenced object 0xdeadb5c8 (size 32): > comm "insmod", pid 543, jiffies 4294674766 > backtrace: > [] create_object+0x135/0x202 > [] kmemleak_alloc+0x25/0x49 > [] kmemleak_alloc_recursive+0x1c/0x22 > [] __kmalloc+0x6c/0xb9 > [] kvasprintf+0x2d/0x4a > [] kobject_set_name_vargs+0x21/0x50 > [] dev_set_name+0x1a/0x1c > [] scsi_sysfs_device_initialize+0x8b/0xe4 [scsi_mod] > [] scsi_alloc_sdev+0x134/0x18f [scsi_mod] > [] scsi_probe_and_add_lun+0x107/0xa98 [scsi_mod] > [] __scsi_scan_target+0x70/0x4b1 [scsi_mod] > [] scsi_scan_channel+0x37/0x60 [scsi_mod] > [] scsi_scan_host_selected+0xb8/0xf1 [scsi_mod] > [] do_scsi_scan_host+0x54/0x5d [scsi_mod] > [] scsi_scan_host+0x14d/0x165 [scsi_mod] > [] mptspi_probe+0x2cd/0x2f8 [mptspi] I think this will fix it: diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 9ce5c34..284bcbe 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c @@ -957,7 +957,7 @@ static inline void scsi_destroy_sdev(struct scsi_device *sdev) if (sdev->host->hostt->slave_destroy) sdev->host->hostt->slave_destroy(sdev); transport_destroy_device(&sdev->sdev_gendev); - put_device(&sdev->sdev_gendev); + put_device(&sdev->sdev_dev); } #ifdef CONFIG_SCSI_LOGGING sdev_dev has class == sdev_class. The release function for sdev_class is scsi_device_cls_release(), and _that_ does a put on the sdev_gendev. But someone who groks all that mess, er beauty ;D, should check that makes sense. cheers