From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D28D4C64E7D for ; Tue, 24 Nov 2020 06:08:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AC67E2080A for ; Tue, 24 Nov 2020 06:08:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729469AbgKXGIM (ORCPT ); Tue, 24 Nov 2020 01:08:12 -0500 Received: from mga05.intel.com ([192.55.52.43]:21151 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729436AbgKXGIL (ORCPT ); Tue, 24 Nov 2020 01:08:11 -0500 IronPort-SDR: ICaA16cn1+bjeTk8rTrQvus1leZ5p+xVkHr1OPV7Ua9tr063k+pDWrIcZwUM10KnGCIJO9/V1/ RwtNHSJYGutw== X-IronPort-AV: E=McAfee;i="6000,8403,9814"; a="256605368" X-IronPort-AV: E=Sophos;i="5.78,365,1599548400"; d="scan'208";a="256605368" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2020 22:08:11 -0800 IronPort-SDR: nxOA9JzerR2df98ZEZCOtQOv4YxKKey5Z+ptd/fz+0d5s84KFhcL2FX9m4me8mvLGLPHx9Zpgh v8YxPHFT6dWg== X-IronPort-AV: E=Sophos;i="5.78,365,1599548400"; d="scan'208";a="402819429" Received: from iweiny-desk2.sc.intel.com (HELO localhost) ([10.3.52.147]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2020 22:08:10 -0800 From: ira.weiny@intel.com To: Andrew Morton Cc: Ira Weiny , "Martin K. Petersen" , Thomas Gleixner , Dave Hansen , Matthew Wilcox , Christoph Hellwig , Dan Williams , Al Viro , Eric Biggers , Luis Chamberlain , Patrik Jakobsson , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , David Howells , Chris Mason , Josef Bacik , David Sterba , Steve French , Jaegeuk Kim , Chao Yu , Nicolas Pitre , Brian King , Greg Kroah-Hartman , Alexei Starovoitov , Daniel Borkmann , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Kirti Wankhede , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 13/17] drivers/target: Convert to mem*_page() Date: Mon, 23 Nov 2020 22:07:51 -0800 Message-Id: <20201124060755.1405602-14-ira.weiny@intel.com> X-Mailer: git-send-email 2.28.0.rc0.12.gb6a658bd00c9 In-Reply-To: <20201124060755.1405602-1-ira.weiny@intel.com> References: <20201124060755.1405602-1-ira.weiny@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ira Weiny Remove the kmap/mem*()/kunmap patter and use the new mem*_page() functions. Cc: "Martin K. Petersen" Signed-off-by: Ira Weiny --- drivers/target/target_core_rd.c | 6 ++---- drivers/target/target_core_transport.c | 10 +++------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/target/target_core_rd.c b/drivers/target/target_core_rd.c index bf936bbeccfe..30bf0fcae519 100644 --- a/drivers/target/target_core_rd.c +++ b/drivers/target/target_core_rd.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -117,7 +118,6 @@ static int rd_allocate_sgl_table(struct rd_dev *rd_dev, struct rd_dev_sg_table * sizeof(struct scatterlist)); struct page *pg; struct scatterlist *sg; - unsigned char *p; while (total_sg_needed) { unsigned int chain_entry = 0; @@ -159,9 +159,7 @@ static int rd_allocate_sgl_table(struct rd_dev *rd_dev, struct rd_dev_sg_table * sg_assign_page(&sg[j], pg); sg[j].length = PAGE_SIZE; - p = kmap(pg); - memset(p, init_payload, PAGE_SIZE); - kunmap(pg); + memset_page(pg, init_payload, 0, PAGE_SIZE); } page_offset += sg_per_table; diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index ff26ab0a5f60..4fec5c728344 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -1689,15 +1690,10 @@ int target_submit_cmd_map_sgls(struct se_cmd *se_cmd, struct se_session *se_sess */ if (!(se_cmd->se_cmd_flags & SCF_SCSI_DATA_CDB) && se_cmd->data_direction == DMA_FROM_DEVICE) { - unsigned char *buf = NULL; if (sgl) - buf = kmap(sg_page(sgl)) + sgl->offset; - - if (buf) { - memset(buf, 0, sgl->length); - kunmap(sg_page(sgl)); - } + memzero_page(sg_page(sgl), sgl->offset, + sgl->length); } rc = transport_generic_map_mem_to_cmd(se_cmd, sgl, sgl_count, -- 2.28.0.rc0.12.gb6a658bd00c9