Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753002AbdDLH15 (ORCPT ); Wed, 12 Apr 2017 03:27:57 -0400 Received: from mx2.suse.de ([195.135.220.15]:53911 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752319AbdDLH1z (ORCPT ); Wed, 12 Apr 2017 03:27:55 -0400 Subject: Re: [PATCH v2] scsi: return correct blkprep status code in case scsi_init_io() fails. To: Johannes Thumshirn , "Martin K . Petersen" , James Bottomley References: <20170412072119.7529-1-jthumshirn@suse.de> Cc: Christoph Hellwig , Bart Van Assche , Linux SCSI Mailinglist , Linux Kernel Mailinglist , stable@vger.kernel.org From: Hannes Reinecke Message-ID: <87f33ed5-fae3-e7e3-6e86-0c0539cc157e@suse.de> Date: Wed, 12 Apr 2017 09:27:52 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <20170412072119.7529-1-jthumshirn@suse.de> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1653 Lines: 52 On 04/12/2017 09:21 AM, Johannes Thumshirn wrote: > When instrumenting the SCSI layer to run into the > !blk_rq_nr_phys_segments(rq) case the following warning emitted from the > block layer: > > blk_peek_request: bad return=-22 > > This happens because since commit fd3fc0b4d730 ('scsi: don't BUG_ON() > empty DMA transfers') we return the wrong error value from scsi_prep_fn() > back to the block layer. > > Signed-off-by: Johannes Thumshirn > Fixes: fd3fc0b4d730 scsi: don't BUG_ON() empty DMA transfers > Cc: > Reviewed-by: Christoph Hellwig > --- > Changes to v1: > * s/iscsi_prep_fn()/scsi_prep_fn() > * Add Cc stable > > drivers/scsi/scsi_lib.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c > index 19125d72f322..5558e212368b 100644 > --- a/drivers/scsi/scsi_lib.c > +++ b/drivers/scsi/scsi_lib.c > @@ -1061,10 +1061,10 @@ int scsi_init_io(struct scsi_cmnd *cmd) > struct scsi_device *sdev = cmd->device; > struct request *rq = cmd->request; > bool is_mq = (rq->mq_ctx != NULL); > - int error; > + int error = BLKPREP_KILL; > > if (WARN_ON_ONCE(!blk_rq_nr_phys_segments(rq))) > - return -EINVAL; > + goto err_exit; > > error = scsi_init_sgtable(rq, &cmd->sdb); > if (error) > Reviewed-by: Hannes Reinecke Cheers, Hannes -- Dr. Hannes Reinecke Teamlead Storage & Networking hare@suse.de +49 911 74053 688 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N?rnberg GF: F. Imend?rffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton HRB 21284 (AG N?rnberg)