Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756850Ab0GAUTT (ORCPT ); Thu, 1 Jul 2010 16:19:19 -0400 Received: from cantor2.suse.de ([195.135.220.15]:41579 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756141Ab0GAUTQ (ORCPT ); Thu, 1 Jul 2010 16:19:16 -0400 Subject: Re: scsi: address leak in the error path of discard page allocation From: James Bottomley To: Mike Snitzer Cc: FUJITA Tomonori , axboe@kernel.dk, hch@lst.de, linux-scsi@vger.kernel.org, dm-devel@redhat.com, linux-kernel@vger.kernel.org In-Reply-To: <20100701201508.GA28546@redhat.com> References: <1277981359-10717-1-git-send-email-fujita.tomonori@lab.ntt.co.jp> <1277981359-10717-3-git-send-email-fujita.tomonori@lab.ntt.co.jp> <20100701130328.GB19605@redhat.com> <20100701201508.GA28546@redhat.com> Content-Type: text/plain; charset="UTF-8" Date: Thu, 01 Jul 2010 15:19:08 -0500 Message-ID: <1278015548.2813.147.camel@mulgrave.site> Mime-Version: 1.0 X-Mailer: Evolution 2.28.2 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2794 Lines: 69 On Thu, 2010-07-01 at 16:15 -0400, Mike Snitzer wrote: > On Thu, Jul 01 2010 at 9:03am -0400, > Mike Snitzer wrote: > > > On Thu, Jul 01 2010 at 6:49am -0400, > > FUJITA Tomonori wrote: > > > > > This fixes discard page leak by using q->unprep_rq_fn facility. > > > > > > q->unprep_rq_fn is called when all the data buffer (req->bio and > > > scsi_data_buffer) in the request is freed. > > > > > > sd_unprep() uses rq->buffer to free discard page allocated in > > > sd_prepare_discard(). > > > > > > Signed-off-by: FUJITA Tomonori > > > > Thanks for sorting this out Tomo, all 3 patches work great! > > > > BTW, there is one remaining (rare) leak in the allocation path. > > > > The following patch serves to fix it but I'm not sure if there is a more > > elegant way to address this. > > I've continued to look at this to arrive at alternative implementation. > Here is a summary of the problem: > > A 'scsi_setup_discard_cmnd' return other than BLKPREP_OK will not cause > a discard request to get completely stripped down ('blk_finish_request' > isn't calling 'blk_unprep_request' because REQ_DONTPREP is not set by > 'scsi_prep_return' for none BLKPREP_OK return). Therefore the discard > request's page will _not_ get cleaned up. > > Aside from code inspection, I confirmed this by adding some test code to > force a one-time initial BLKPREP_DEFER return from > 'scsi_setup_discard_cmnd'. > > > An alternative would be to check if the page is already allocated > > (before allocating the page in scsi_setup_discard_cmnd)? > > Unfortunatey this "alternative" won't work because it completely ignores > the case where BLKPREP_KILL is returned from scsi_setup_discard_cmnd'. > > > Please advise, thanks. > > In short, I'm not too happy that the following patch doesn't allow for > centralized cleanup of the discard request's page (via sd_unprep_fn). > But in order to do that we'd likely have to: > 1) relax blk_finish_request's REQ_DONTPREP constraint > 2) add other weird conditionals within blk_unprep_request because > the discard request wasn't _really_ prepared? > > So given this I'm inclined to stick with the following patch. > > Jens and/or James, what do you think? The rules are pretty clear: Unprep is only called if the request gets prepped ... that means you have to return BLKPREP_OK. Defer or kill assume there's no teardown to do, so the allocation (if it took place) must be reversed before returning them James -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/