From patchwork Thu Jan 18 14:19:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: weiping zhang X-Patchwork-Id: 10173333 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0D72C60230 for ; Thu, 18 Jan 2018 14:35:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EEF8028397 for ; Thu, 18 Jan 2018 14:35:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E31DD28382; Thu, 18 Jan 2018 14:35:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3B2312833E for ; Thu, 18 Jan 2018 14:35:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756460AbeAROfA (ORCPT ); Thu, 18 Jan 2018 09:35:00 -0500 Received: from mx2.didichuxing.com ([36.110.17.22]:20788 "EHLO BJEXCAS004.didichuxing.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756417AbeAROfA (ORCPT ); Thu, 18 Jan 2018 09:35:00 -0500 Received: from bogon.didichuxing.com (172.22.50.20) by BJSGEXMBX03.didichuxing.com (172.20.15.133) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Thu, 18 Jan 2018 22:19:37 +0800 Date: Thu, 18 Jan 2018 22:19:32 +0800 From: weiping zhang To: , CC: Subject: [PATCH v2] scsi: sd: add new match array for cache_type Message-ID: <20180118141928.GA28320@bogon.didichuxing.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Originating-IP: [172.22.50.20] X-ClientProxiedBy: BJEXCAS004.didichuxing.com (172.20.1.44) To BJSGEXMBX03.didichuxing.com (172.20.15.133) Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add user friendly command strings sd_wce_rcd to enable/disable write&read cache. User can enable both write and read cache by one of the following commands: echo 10 > cache_type echo "write back" > cache_type wce rcd write_cache read_cache 0 0 off on 0 1 off off 1 0 on on 1 1 on off When execute "cat cache_type", it will show more detail info like following: write back 10 write:on, read:on Signed-off-by: weiping zhang --- drivers/scsi/sd.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index a028ab3..722e440 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -139,6 +139,15 @@ static const char *sd_cache_types[] = { "write back, no read (daft)" }; +/* + * wce rcd write_cache read_cache + * 0 0 off on + * 0 1 off off + * 1 0 on on + * 1 1 on off + */ +static const char * const sd_wce_rcd[] = {"00", "01", "10", "11"}; + static void sd_set_flush_flag(struct scsi_disk *sdkp) { bool wc = false, fua = false; @@ -180,8 +189,11 @@ cache_type_store(struct device *dev, struct device_attribute *attr, } ct = sysfs_match_string(sd_cache_types, buf); - if (ct < 0) - return -EINVAL; + if (ct < 0) { + ct = sysfs_match_string(sd_wce_rcd, buf); + if (ct < 0) + return -EINVAL; + } rcd = ct & 0x01 ? 1 : 0; wce = (ct & 0x02) && !sdkp->write_prot ? 1 : 0; @@ -282,7 +294,9 @@ cache_type_show(struct device *dev, struct device_attribute *attr, char *buf) struct scsi_disk *sdkp = to_scsi_disk(dev); int ct = sdkp->RCD + 2*sdkp->WCE; - return sprintf(buf, "%s\n", sd_cache_types[ct]); + return sprintf(buf, "%s\n%s\nwrite:%s, read:%s\n", sd_cache_types[ct], + sd_wce_rcd[ct], sdkp->WCE ? "on" : "off", + sdkp->RCD ? "off" : "on"); } static DEVICE_ATTR_RW(cache_type);