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 92A98C32771 for ; Fri, 19 Aug 2022 11:16:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 243BA8D0003; Fri, 19 Aug 2022 07:16:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1F2D98D0002; Fri, 19 Aug 2022 07:16:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0BAB88D0003; Fri, 19 Aug 2022 07:16:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id E5D418D0002 for ; Fri, 19 Aug 2022 07:16:20 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id A3675A0BC9 for ; Fri, 19 Aug 2022 11:16:20 +0000 (UTC) X-FDA: 79816088520.19.717CD12 Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) by imf10.hostedemail.com (Postfix) with ESMTP id D97A8C0010 for ; Fri, 19 Aug 2022 11:16:19 +0000 (UTC) Received: by mail-ed1-f48.google.com with SMTP id s11so5224635edd.13 for ; Fri, 19 Aug 2022 04:16:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=itseYdGoOoNrZ4b7CTSPCW7acA5mJKihiu6lV8OPi8o=; b=o062D1xyt9gEqH+QMY//Eh8mTGWyMmvkY/6jUfPPECOrx9pl6afdiJnQq32Zt+9s8z I2jKDjNhLhlWsuRTFsKvZyfOCtKSwGGvA6NmeLEMxYFMXR54Obvw4fuISrA5uCA6P6cy CDZ43d73oP6/zpEm2zwAY22cx0OtuJv1BtzUi4W7miNG6EL8oNtWuCBHPGTnAeMCdSry rklm38uL35QRtZON09u1J+UOCfCgCqLmzFOG0fjvqE8R8ZF8FQ56pncpn+x2SjXF0iiG ZV52+wx27/7u8YcQGCEatev34SNvRjsEP/XYoSmxv6V7k3G3slBWNP3LwaegiREwBn8S JBVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=itseYdGoOoNrZ4b7CTSPCW7acA5mJKihiu6lV8OPi8o=; b=yBXSNg8QDNBcOiXbl2kf5h4G1t2DA52EpPY+oanoDnvrlv+T0k7x6I74Oh1KzmDtxk hkLtFgCB0oJE0kewkRSC1ZhAva40zwMbJdpmiVpCZYcqsfQUK9FtkcZ6SclS2NZdYHtE mgOVgUXe5TStsIrqmfcdOmr2mZYeWdAncSUJysZr8qylMiFI93PpGnR7rCjBRrSvmPyf 0gM4/eB7tSlQtX5GnRnP7RUH0qvTM4us7Pw09SArluBMTsRFQjdXJUti0LiljyfjlYFZ RhjCR5tV4VyQgF1Ma6QJk90j2yKlE/BzgvyCQyDc+tnTfedEQZ7tWpUldXn5+807eTLn fOdA== X-Gm-Message-State: ACgBeo0PKjogkWp4iOubrLnZ2ciQEaDcm0zGmTGmDk310R6gfaL8NBQ2 lw5z3OVtVKtQanD739rUlJQ= X-Google-Smtp-Source: AA6agR7QEURtBcz9WghqlpLI+jUia82IkHOa3YUWxPiwM58VubLC/Ml8YjQn/NWyOuaKLm5plYECyw== X-Received: by 2002:a05:6402:354e:b0:440:5398:cd65 with SMTP id f14-20020a056402354e00b004405398cd65mr5681684edd.43.1660907779067; Fri, 19 Aug 2022 04:16:19 -0700 (PDT) Received: from localhost.localdomain (host-87-17-106-94.retail.telecomitalia.it. [87.17.106.94]) by smtp.gmail.com with ESMTPSA id k21-20020a170906579500b0072fa24c2ecbsm2210091ejq.94.2022.08.19.04.16.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 04:16:17 -0700 (PDT) From: "Fabio M. De Francesco" To: linux-fscrypt@vger.kernel.org, Eric Biggers Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH] fs-verity: use memcpy_from_page() Date: Fri, 19 Aug 2022 13:16:15 +0200 Message-ID: <8113955.T7Z3S40VBb@localhost.localdomain> In-Reply-To: <20220818223903.43710-1-ebiggers@kernel.org> References: <20220818223903.43710-1-ebiggers@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660907780; a=rsa-sha256; cv=none; b=GM2zcHvs5udKQOWlIPLnuV0sbF8YpuBQOMWqtKgqhpOahl9HT6/h8/JA/kVpsUxAdRYPY7 SHBAhaeRaTI4b8Tm5GS0uJqMhtqHamg19HdSRJHJFH0LvUpinL1GlHsoUyopYFGC9Uf1jn RLH6c2OfK+Z8E48nHYyhGVSXu/an6H0= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=o062D1xy; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of fmdefrancesco@gmail.com designates 209.85.208.48 as permitted sender) smtp.mailfrom=fmdefrancesco@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1660907780; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=itseYdGoOoNrZ4b7CTSPCW7acA5mJKihiu6lV8OPi8o=; b=IzGQSjdTej9SSjCpfDaebTPjch6u4CDCay3m0seAino0l/6W4dKGvm6/b808nSPUoXdFdk uA+MCgNn9CQj/12Mm14ODTrvGUCBvVgjQQ/Snp2QxB6xwubXitgik115EorBruczfIN02b nWMED+pCvGW2M3LKgMX2rNT2gBdWFDU= X-Rspamd-Server: rspam06 X-Rspam-User: X-Stat-Signature: yje3o4skdn5ceh1ydq9ehheyb54g411k Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=o062D1xy; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of fmdefrancesco@gmail.com designates 209.85.208.48 as permitted sender) smtp.mailfrom=fmdefrancesco@gmail.com X-Rspamd-Queue-Id: D97A8C0010 X-HE-Tag: 1660907779-903437 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: On Friday, August 19, 2022 12:39:03 AM CEST Eric Biggers wrote: > From: Eric Biggers > > Replace extract_hash() with the memcpy_from_page() helper function. > > This is simpler, and it has the side effect of replacing the use of > kmap_atomic() with its recommended replacement kmap_local_page(). > > Signed-off-by: Eric Biggers > --- > fs/verity/verify.c | 14 ++------------ > 1 file changed, 2 insertions(+), 12 deletions(-) > It looks good to me... Reviewed-by: Fabio M. De Francesco Thanks, Fabio > diff --git a/fs/verity/verify.c b/fs/verity/verify.c > index 14e2fb49cff561..bde8c9b7d25f64 100644 > --- a/fs/verity/verify.c > +++ b/fs/verity/verify.c > @@ -39,16 +39,6 @@ static void hash_at_level(const struct merkle_tree_params *params, > (params->log_blocksize - params->log_arity); > } > > -/* Extract a hash from a hash page */ > -static void extract_hash(struct page *hpage, unsigned int hoffset, > - unsigned int hsize, u8 *out) > -{ > - void *virt = kmap_atomic(hpage); > - > - memcpy(out, virt + hoffset, hsize); > - kunmap_atomic(virt); > -} > - > static inline int cmp_hashes(const struct fsverity_info *vi, > const u8 *want_hash, const u8 *real_hash, > pgoff_t index, int level) > @@ -129,7 +119,7 @@ static bool verify_page(struct inode *inode, const struct fsverity_info *vi, > } > > if (PageChecked(hpage)) { > - extract_hash(hpage, hoffset, hsize, _want_hash); > + memcpy_from_page(_want_hash, hpage, hoffset, hsize); > want_hash = _want_hash; > put_page(hpage); > pr_debug_ratelimited("Hash page already checked, want %s:%*phN\n", > @@ -158,7 +148,7 @@ static bool verify_page(struct inode *inode, const struct fsverity_info *vi, > if (err) > goto out; > SetPageChecked(hpage); > - extract_hash(hpage, hoffset, hsize, _want_hash); > + memcpy_from_page(_want_hash, hpage, hoffset, hsize); > want_hash = _want_hash; > put_page(hpage); > pr_debug("Verified hash page at level %d, now want %s: %*phN\n", > > base-commit: 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 > -- > 2.37.1 > >