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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C8922C00140 for ; Thu, 18 Aug 2022 22:50:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6CE628E0002; Thu, 18 Aug 2022 18:50:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 67E8B8D0002; Thu, 18 Aug 2022 18:50:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 545B78E0002; Thu, 18 Aug 2022 18:50:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 448008D0002 for ; Thu, 18 Aug 2022 18:50:41 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 1AB4F141AFD for ; Thu, 18 Aug 2022 22:50:41 +0000 (UTC) X-FDA: 79814209482.18.97C290B Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf03.hostedemail.com (Postfix) with ESMTP id 48BB020350 for ; Thu, 18 Aug 2022 22:50:12 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 8B339B824C5; Thu, 18 Aug 2022 22:40:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 39063C433C1; Thu, 18 Aug 2022 22:40:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660862424; bh=d+VDi/Gzjo7yfZhsFUe9vStU/58Sblx/+MTOZeGGqpU=; h=From:To:Cc:Subject:Date:From; b=aDe2BXsT670C0wZrctN/G+XD90FBAsK5JzzZe6avmEOs57eTdIEdPU8gOWBtl3cKd WBc5QJBTeMHNjPuWoGUplKNGpG3PNC5V6vQSjUEQIhLFOPXcIklBxRlSYAfFd5kzQH TcHT1H4675Ufov7Ec+aWGad5tzDxdClTNQIRJY0nKenp6dyF2AXrTrOR+DUCTsdSeA PNyd1OEC80Ri2N1NijnTgusm/XSoDguB1Kgz84ruhTqYzYj/9fE0VJ6xviuxhdZQme myCCywE62Wgd+Vqo5kbf1+fEpCJW7ehXtzJzXaNIyQ7f4E79f8cXuvVlj5//kkq7nC 7dPRgRDBPybJg== From: Eric Biggers To: linux-fscrypt@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, "Fabio M . De Francesco" Subject: [PATCH] fs-verity: use kmap_local_page() instead of kmap() Date: Thu, 18 Aug 2022 15:40:10 -0700 Message-Id: <20220818224010.43778-1-ebiggers@kernel.org> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1660863012; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=eVPJr28QHme+X6kspcQ5pYtrZfPWKDMZ809R22r84fg=; b=RLGF1h6cy+4pJGURUdtsgdAAnlkXzJC2DRiOFJDks9m+UtiLC8GVycQLHpefx+GmGxT9Rp VjbKDl5AC6EUJM3IZhwIxiZ6f+mo0gntx4iaZq/MJvCMiwATn1iL+NBmRPVdewSscg7LZ2 OBUE1v92I2SqUG1qM+PC95iy9zI8W5o= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=aDe2BXsT; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf03.hostedemail.com: domain of ebiggers@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=ebiggers@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660863012; a=rsa-sha256; cv=none; b=sX5tRgW/m4SRHcdoLdwFix7Vy18mFCJ8atYoDQs5jeBv2TPz5+33JOY/Ie5QIavtmonLyR WmDG2SzhDZ1P7ZcEZvYIYWpTvrdZ9nA86mA//zYWKVegKYBL1JjIHqr9Sxajr8gO9Kuo9e 1CnUEKN49UqtHwoGkTjdE0UJWdqHIdg= Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=aDe2BXsT; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf03.hostedemail.com: domain of ebiggers@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=ebiggers@kernel.org X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 48BB020350 X-Stat-Signature: siunqcnyxu6jo8kifntqmgaqaaneuf9i X-Rspam-User: X-HE-Tag: 1660863012-720444 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Eric Biggers Convert the use of kmap() to its recommended replacement kmap_local_page(). This avoids the overhead of doing a non-local mapping, which is unnecessary in this case. Signed-off-by: Eric Biggers --- fs/verity/read_metadata.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/verity/read_metadata.c b/fs/verity/read_metadata.c index 6ee849dc7bc183..2aefc5565152ad 100644 --- a/fs/verity/read_metadata.c +++ b/fs/verity/read_metadata.c @@ -53,14 +53,14 @@ static int fsverity_read_merkle_tree(struct inode *inode, break; } - virt = kmap(page); + virt = kmap_local_page(page); if (copy_to_user(buf, virt + offs_in_page, bytes_to_copy)) { - kunmap(page); + kunmap_local(virt); put_page(page); err = -EFAULT; break; } - kunmap(page); + kunmap_local(virt); put_page(page); retval += bytes_to_copy; base-commit: 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 prerequisite-patch-id: 188e114bdf3546eb18e7984b70be8a7c773acec3 -- 2.37.1