From patchwork Thu May 21 11:09:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Gordon X-Patchwork-Id: 6454051 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 CF9F7C0432 for ; Thu, 21 May 2015 11:10:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1965320435 for ; Thu, 21 May 2015 11:10:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 340B02039C for ; Thu, 21 May 2015 11:10:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751385AbbEULKI (ORCPT ); Thu, 21 May 2015 07:10:08 -0400 Received: from mga09.intel.com ([134.134.136.24]:27153 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753536AbbEULKG (ORCPT ); Thu, 21 May 2015 07:10:06 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP; 21 May 2015 04:10:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,468,1427785200"; d="scan'208,223";a="713594982" Received: from dsgordon-linux.isw.intel.com (HELO [10.102.226.51]) ([10.102.226.51]) by fmsmga001.fm.intel.com with ESMTP; 21 May 2015 04:09:59 -0700 Message-ID: <555DBD06.7060601@intel.com> Date: Thu, 21 May 2015 12:09:58 +0100 From: Dave Gordon Organization: Intel Corporation (UK) Ltd. - Co. Reg. #1134945 - Pipers Way, Swindon SN3 1RJ User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Arnd Bergmann , Andrew Morton CC: "Martin K. Petersen" , Akinobu Mita , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, jbottomley@odin.com Subject: Re: [PATCH] scsi: debug: fix type mismatch warning for sg_pcopy_from_buffer References: <6309932.EjHf7uUo1X@wuerfel> <20150520125329.d63f66765a552efa69a45038@linux-foundation.org> <2386515.9NuRN4zp72@wuerfel> In-Reply-To: <2386515.9NuRN4zp72@wuerfel> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, T_TVD_MIME_EPI, 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 On 20/05/15 21:31, Arnd Bergmann wrote: > On Wednesday 20 May 2015 12:53:29 Andrew Morton wrote: >> On Tue, 19 May 2015 23:22:39 +0200 Arnd Bergmann wrote: >>> >>> I can't decide if this is actually a good idea, or if we should rather drop >>> the sg_pcopy_from_buffer() patch. Maybe someone else sees a better solution. >> >> Could make do_device_access() call sg_copy_buffer() directly. >> >> But yes, dropping the sg_pcopy_from/to_buffer changes is reasonable. >> sg_copy_buffer() is bidirectional and that won't be changing, so >> putting constified wrapeprs around it is kinda fake. > > Ok. The part I only saw now is that do_device_access() is the only user > of sg_pcopy_from_buffer(), so if that passes a non-const argument, > there is dropping the patch will be teh best solution. > > Arnd do_device_access() may the only user of sg_pcopy_from_buffer() in the -mm tree at the moment, but the const-patch was created because we were using the sg_pcopy_{to,from}_buffer functions in new code in the i915 driver (published to the intel-gfx mailing list, but not yet folded into the upstream versions). So quite soon it won't be the only user :) The various sg_[p]copy_* wrappers all just supply trailing parameters for the convenience of those who don't need (and don't want to deal with) the full capabilities of the underlying sg_copy_buffer(). In particular, we want the wrappers for the benefit of users that *don't* use this flag-specifies-direction style (which I think is actually quite rare and not really conducive to robust checking). The separate-source-and-destination style seems much more common (cf. memcpy()). And scsi_debug.c itself has functions fill_from_dev_buffer() and fetch_to_dev_buffer() that call the separate sg_copy_{to,from}_buffer() wrappers. But since do_device_access() has the same parameter style as sg_copy_buffer() (i.e. pointer parameters that may be either source or destination, plus a flag to specify direction of transfer, as opposed to one (const *) parameter for the input and a separate one for the (non-const) destination), I think it quite reasonable that do_device_access() should call sg_copy_buffer() directly rather than going through one or other wrapper. In fact it simplifies the code further; we can lose four lines and get rid of the function pointer entirely, just by passing 'do_write' down to sg_copy_buffer(). See attached patch :) .Dave. Acked-by: Arnd Bergmann From b304c5a99ea260eac1cf98ced5f3c79c793ad4fd Mon Sep 17 00:00:00 2001 From: Dave Gordon Date: Thu, 21 May 2015 12:06:27 +0100 Subject: [PATCH] scsi: resolve sg buffer const-ness issue do_device_access() takes a separate parameter to indicate the direction of data transfer, which it used to use to select the appropriate function out of sg_pcopy_{to,from}_buffer(). However these two functions now have different const-ness in their signatures, leading to compiler warnings. So this patch makes it bypass these wrappers and call the underlying function sg_copy_buffer() directly; this has the same calling style as do_device_access() i.e. a separate direction-of-transfer parameter and no pointers-to-const, so skipping the wrappers not only eliminates the warning, it also make the code simpler :) Signed-off-by: Dave Gordon --- drivers/scsi/scsi_debug.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c index 1f8e2dc..30268bb 100644 --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c @@ -2363,17 +2363,13 @@ do_device_access(struct scsi_cmnd *scmd, u64 lba, u32 num, bool do_write) u64 block, rest = 0; struct scsi_data_buffer *sdb; enum dma_data_direction dir; - size_t (*func)(struct scatterlist *, unsigned int, void *, size_t, - off_t); if (do_write) { sdb = scsi_out(scmd); dir = DMA_TO_DEVICE; - func = sg_pcopy_to_buffer; } else { sdb = scsi_in(scmd); dir = DMA_FROM_DEVICE; - func = sg_pcopy_from_buffer; } if (!sdb->length) @@ -2385,16 +2381,16 @@ do_device_access(struct scsi_cmnd *scmd, u64 lba, u32 num, bool do_write) if (block + num > sdebug_store_sectors) rest = block + num - sdebug_store_sectors; - ret = func(sdb->table.sgl, sdb->table.nents, + ret = sg_copy_buffer(sdb->table.sgl, sdb->table.nents, fake_storep + (block * scsi_debug_sector_size), - (num - rest) * scsi_debug_sector_size, 0); + (num - rest) * scsi_debug_sector_size, 0, do_write); if (ret != (num - rest) * scsi_debug_sector_size) return ret; if (rest) { - ret += func(sdb->table.sgl, sdb->table.nents, + ret += sg_copy_buffer(sdb->table.sgl, sdb->table.nents, fake_storep, rest * scsi_debug_sector_size, - (num - rest) * scsi_debug_sector_size); + (num - rest) * scsi_debug_sector_size, do_write); } return ret; -- 1.7.9.5