Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp6162914pxb; Tue, 16 Feb 2021 18:55:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJxabXemxzI8O+Qn/uxZLffCIc3H/N14sIfNkyqxb1fasf8gDi+KLdAY21IB0J3p6F+9u0w/ X-Received: by 2002:a05:6402:2547:: with SMTP id l7mr23602349edb.157.1613530509218; Tue, 16 Feb 2021 18:55:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613530509; cv=none; d=google.com; s=arc-20160816; b=lnUuTojljGRvEODd6c1OiMWWxp/YyNTGqxvSc/2UguvLTHShFKbdJuuO6mnE53Hnkv kUhcuHu2dFlnFxeUe/jd15iF6dVkbPdguqP7y2LTLHF35cq8BRe5uDeZ3dzknFZyI+0j MiPlGWKDPEAD3jwrsChtkou6R5S2YOh5BujfVViL8a8C0I2opjaGrT71JTSaW6Ox2e0M CIzbCrsiprf3KoOGR9FpMWBgayxQ86avJysOipmMuJjGMK8vA+IuRNXkXJz8p40R8l8/ TEnWZNLcCgbI0ojjMq+W12LS+QrpZL1QSCMkSKEqZ+SDxokfEY6dmraNXF+4OGnP1vXU yJJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=Z8Pc0xu8XvK0ZGB/1mdBQWzEc4LdR31y/flzP7zIlso=; b=jmNPRGJ99T1gR8YF8u4fimTH1NaGQ9p5G07/hpiOxX/G466NyzFsbfqIl+HKjpt5xF luw56A2g4OEZW/Qx685rR1ZUTEvwU4EOcsAFqzUnReonjNzPwLmPq10+eXS121BpSiWv 3vFHbHPmYJIuIe5ljUN7wvI/KRg8EKTbfaQ7LC7WNYkxPlqKlL9Y+WG7TGs8TgOWUZCl QYE3Nr1l5+9RWdwHLXKDp48+SMmr8bo3S37Bl7hlCM6JVBOklylLuNxsSfb25tJ4FGMm rj3a488QAG6gdzAOij7C5HvYTt5fIOnmV36k2vDD1IgR7r9ZNMoUj10zfzgZ9k7J8LV/ PnBg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id js10si546941ejc.446.2021.02.16.18.54.46; Tue, 16 Feb 2021 18:55:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230352AbhBQCtk (ORCPT + 99 others); Tue, 16 Feb 2021 21:49:40 -0500 Received: from mga07.intel.com ([134.134.136.100]:54813 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230145AbhBQCtR (ORCPT ); Tue, 16 Feb 2021 21:49:17 -0500 IronPort-SDR: lEyuVT08owUMycw9JzL008vbOfC1YTohkqcAi8pOTWajr3zlj2fmTfqpgVD3ayoDC5Cf0KWjHc RX55TiuUpLTA== X-IronPort-AV: E=McAfee;i="6000,8403,9897"; a="247152597" X-IronPort-AV: E=Sophos;i="5.81,184,1610438400"; d="scan'208";a="247152597" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Feb 2021 18:48:37 -0800 IronPort-SDR: won9GElpyf/mmgQjIw0Bm5UnBTO8WiUreqoAca3j8srJDIXe2GSLkSOQnL3uzXoBtOzvup+3hh zMEyPXbpveTQ== X-IronPort-AV: E=Sophos;i="5.81,184,1610438400"; d="scan'208";a="384922288" Received: from iweiny-desk2.sc.intel.com (HELO localhost) ([10.3.52.147]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Feb 2021 18:48:36 -0800 From: ira.weiny@intel.com To: David Sterba Cc: Ira Weiny , Chris Mason , Josef Bacik , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 3/4] fs/btrfs: Use kmap_local_page() in __btrfsic_submit_bio() Date: Tue, 16 Feb 2021 18:48:25 -0800 Message-Id: <20210217024826.3466046-4-ira.weiny@intel.com> X-Mailer: git-send-email 2.28.0.rc0.12.gb6a658bd00c9 In-Reply-To: <20210217024826.3466046-1-ira.weiny@intel.com> References: <20210217024826.3466046-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 Again there is an array of pointers which must be unmapped in the correct order. Convert the kmap()'s to kmap_local_page() and adjust the unmapping to work backwards through the unmapping loop. Signed-off-by: Ira Weiny --- fs/btrfs/check-integrity.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c index 6ff44e53814c..726eb894be8b 100644 --- a/fs/btrfs/check-integrity.c +++ b/fs/btrfs/check-integrity.c @@ -2677,7 +2677,7 @@ static void __btrfsic_submit_bio(struct bio *bio) dev_state = btrfsic_dev_state_lookup(bio_dev(bio) + bio->bi_partno); if (NULL != dev_state && (bio_op(bio) == REQ_OP_WRITE) && bio_has_data(bio)) { - unsigned int i = 0; + int i = 0; u64 dev_bytenr; u64 cur_bytenr; struct bio_vec bvec; @@ -2702,7 +2702,7 @@ static void __btrfsic_submit_bio(struct bio *bio) bio_for_each_segment(bvec, bio, iter) { BUG_ON(bvec.bv_len != PAGE_SIZE); - mapped_datav[i] = kmap(bvec.bv_page); + mapped_datav[i] = kmap_local_page(bvec.bv_page); i++; if (dev_state->state->print_mask & @@ -2715,8 +2715,8 @@ static void __btrfsic_submit_bio(struct bio *bio) mapped_datav, segs, bio, &bio_is_patched, bio->bi_opf); - bio_for_each_segment(bvec, bio, iter) - kunmap(bvec.bv_page); + for (--i; i >= 0; i--) + kunmap_local(mapped_datav[i]); kfree(mapped_datav); } else if (NULL != dev_state && (bio->bi_opf & REQ_PREFLUSH)) { if (dev_state->state->print_mask & -- 2.28.0.rc0.12.gb6a658bd00c9