From patchwork Thu Feb 16 21:47:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13143996 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 34D13C636D6 for ; Thu, 16 Feb 2023 21:48:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 401A26B0083; Thu, 16 Feb 2023 16:48:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3B2056B0085; Thu, 16 Feb 2023 16:48:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 252D86B0087; Thu, 16 Feb 2023 16:48:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 144F66B0083 for ; Thu, 16 Feb 2023 16:48:45 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id C36DF140A14 for ; Thu, 16 Feb 2023 21:48:44 +0000 (UTC) X-FDA: 80474494968.25.6D7791F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf17.hostedemail.com (Postfix) with ESMTP id 285DE40012 for ; Thu, 16 Feb 2023 21:48:42 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=VT2rfh7p; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf17.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676584123; 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:in-reply-to:references:references:dkim-signature; bh=jlR4JcCg1XC8eTF3I+rHcc7NxJf4yOAtTyxChrY5i+Y=; b=trW4k4330XjuLrXWJcDQPJQMdFC+1xzlavbXYF2Uy6lH86Y7JoPdLpZglF/sFzTGJcuG7s g1zeWNradnNS3H5K1YyG4tLR2NwjntkTNMaA4vUplC337Rif9his7AXYX5+BPR4Dp07X/p d+ziGsRo4LxvkCS9rtev/uhvQpI3ico= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=VT2rfh7p; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf17.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676584123; a=rsa-sha256; cv=none; b=pEEh5HcFeZj2AeifrbPe8bqJt1iKAbU/5l0XzieNUVEYJmoIRQCjbTZ8bG2+tO35Jd9eZg 3mqljF5NtGhI7EWtwV08iurjJnJVdtrMT3XmEYfLfHyMq1K/uz/hCbL9k0OvsVJ7Rx/osN bzqp3iaFn3rGDMmqR5ci7YQmYbYVjGk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676584122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jlR4JcCg1XC8eTF3I+rHcc7NxJf4yOAtTyxChrY5i+Y=; b=VT2rfh7p893K3pJAWXnPOkIWNv6LQzhfKaLkFff+/jMS0XTO4x4e+r2S+1zm7rg3gWBnXL Z3NcNYAkEVX9djgoJ7T9FDt/EIPV1xZfbVxOWMiBA1e1As4HmFd0jgigyaB22CALrvDg+B Wfns/iC2MCWuue0RDdmWhVY9IR5hHVE= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-260-Qs6jji0IPnqiPKBLR7YHAw-1; Thu, 16 Feb 2023 16:48:39 -0500 X-MC-Unique: Qs6jji0IPnqiPKBLR7YHAw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3C9431C05AF6; Thu, 16 Feb 2023 21:48:38 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3E0D751FF; Thu, 16 Feb 2023 21:48:36 +0000 (UTC) From: David Howells To: Steve French Cc: David Howells , Jens Axboe , Al Viro , Shyam Prasad N , Rohith Surabattula , Tom Talpey , Stefan Metzmacher , Christoph Hellwig , Matthew Wilcox , Jeff Layton , linux-cifs@vger.kernel.org, linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Steve French , linux-crypto@vger.kernel.org Subject: [PATCH 11/17] cifs: Add a function to Hash the contents of an iterator Date: Thu, 16 Feb 2023 21:47:39 +0000 Message-Id: <20230216214745.3985496-12-dhowells@redhat.com> In-Reply-To: <20230216214745.3985496-1-dhowells@redhat.com> References: <20230216214745.3985496-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Rspamd-Queue-Id: 285DE40012 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: i864934ejadsisg8yf5f5pfhsctfqup5 X-HE-Tag: 1676584122-954903 X-HE-Meta: U2FsdGVkX19SumsntEhm4rHnCl5Jp+QGT1fj6cAv5JkaIT3h5u59iKqcc8ABbxaH4lXVkaEPn6wUjhfrxZ8HOwKsA3xVG4W5Wgclbtx3o94VoU1tMKRbLqJ/DiCT85ng3sEXRFdllUOkug9VK+UMnnmv1ZgpzkBKkTDIda72KGYjQkH5LHKl6ZzHRB3uveab9ng6A6uPp/9yTNt5A+YqYpSxO9Pl6CCapl7NIv/KKgFW4PA/mljS5V51FuapokfJZ96XXYxwzWEHyZ26Ndd63Opni+RlrZY7vBmKbpJmvnGbSQKLx/Zy259H315Tb782wMnGySlorMbgQxAwhYlhfKayS9kZHDS+5j27UFenZF8f1iEpRA1TsSCF3rB1e751zbc/ZsLrUxYVQX9kSN28+UI4T6R7iH1UVytqLtMgZk82kJ+HG7y/d3jESCaDwxOlQ9fKPaqLQcWdqQivo46P6xeSxkwY4iOAhZZTM262qTPeXe0cpQ5avlgbtFS3+5ZMK2pjBaCIKOg9uFffW6T+DjCvlADETBDkBbhebPKC1Awv10f1+4GhyLEX8B/s5HPZLYFE5CGUMiZ7fhGL6jN1edJhfgnExmC0S7zLtzzknA/scU+fkaa0/L5zmwoODNjtOC8rMKNqEsUPLggo4qS2U81LlX3PudXZxlMxTceARzzOCmxo+Ogv0J8jEM/+hbjstN+CObsNYU0suHSxEVMmCgu597cx/aSBViLoH9yc4fxJRVaZtGJEpcfNt9M5AcpjSCyxm5QIaCQvgjlAI7cxGEctaOKPVaN7ySfH8dvwQM9ukV34TO72H2KT/EpUWArxxBU16ckBPCkaeFIKe36ypHzmS+X2Hjru1mvGth3dC2JoPYh/Isi8OUa8lAYNuyr9WWO8WhmX+SGxhc8sBofvARGn38FoUrpzVQpukwMVQgnkRe0zucmj0qkOF7RdhCDPL0hsSePdiSK63d16yaF 6hk5B4wz sUNAnyuyJ5pVbZEf1OtF2KbRG3lHsMGIo/KeHHHowxwGKkUulfvEhKi8BiBYhVPaf7HTjoE4FoP7XkcEmYuNnsAL0LJUfadUwaBnQkYCuJdXXk6IuwiOqjG8ZbWjJuW3JarngSqwJVQcIbGRaOriQo/Bx6UNNC2y9PHZ+dtph9LmZ1f6ry5LNJYS4Yjx12DpGQj0SlOBsPkE14eK30gn3XV52+7KkAQ/PuIcf+V/MDRcQOBqUuIrFnUPNI5eUySMsG1ZyVhgT77d0X1FbNfSu7B9KcCI0o4Od3BXEBsNM9vpgBCZ3QsMpY5pw6LaLWxsg/z9NTaKgpeKTFjvXEsrM+jVwsYCzAEaYfJFhcktCdQujmmGRWKWACNtwd5mK3zE8cbLlicr0Gwhw3Rgs5lvqBMI5f3xyJf0lmi1ZH0FQxOEquEvl5+I0deJSbbElVCDr+iqN2SbFDbM//4k4VzC7VdmhfQ== 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: Add a function to push the contents of a BVEC-, KVEC- or XARRAY-type iterator into a symmetric hash algorithm. UBUF- and IOBUF-type iterators are not supported on the assumption that either we're doing buffered I/O, in which case we won't see them, or we're doing direct I/O, in which case the iterator will have been extracted into a BVEC-type iterator higher up. Signed-off-by: David Howells cc: Steve French cc: Shyam Prasad N cc: Rohith Surabattula cc: Jeff Layton cc: linux-cifs@vger.kernel.org cc: linux-fsdevel@vger.kernel.org cc: linux-crypto@vger.kernel.org Link: https://lore.kernel.org/r/166697257423.61150.12070648579830206483.stgit@warthog.procyon.org.uk/ # rfc Link: https://lore.kernel.org/r/166732029577.3186319.17162612653237909961.stgit@warthog.procyon.org.uk/ # rfc --- fs/cifs/cifsencrypt.c | 144 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/fs/cifs/cifsencrypt.c b/fs/cifs/cifsencrypt.c index cbc18b4a9cb2..7be589aeb520 100644 --- a/fs/cifs/cifsencrypt.c +++ b/fs/cifs/cifsencrypt.c @@ -24,6 +24,150 @@ #include "../smbfs_common/arc4.h" #include +/* + * Hash data from a BVEC-type iterator. + */ +static int cifs_shash_bvec(const struct iov_iter *iter, ssize_t maxsize, + struct shash_desc *shash) +{ + const struct bio_vec *bv = iter->bvec; + unsigned long start = iter->iov_offset; + unsigned int i; + void *p; + int ret; + + for (i = 0; i < iter->nr_segs; i++) { + size_t off, len; + + len = bv[i].bv_len; + if (start >= len) { + start -= len; + continue; + } + + len = min_t(size_t, maxsize, len - start); + off = bv[i].bv_offset + start; + + p = kmap_local_page(bv[i].bv_page); + ret = crypto_shash_update(shash, p + off, len); + kunmap_local(p); + if (ret < 0) + return ret; + + maxsize -= len; + if (maxsize <= 0) + break; + start = 0; + } + + return 0; +} + +/* + * Hash data from a KVEC-type iterator. + */ +static int cifs_shash_kvec(const struct iov_iter *iter, ssize_t maxsize, + struct shash_desc *shash) +{ + const struct kvec *kv = iter->kvec; + unsigned long start = iter->iov_offset; + unsigned int i; + int ret; + + for (i = 0; i < iter->nr_segs; i++) { + size_t len; + + len = kv[i].iov_len; + if (start >= len) { + start -= len; + continue; + } + + len = min_t(size_t, maxsize, len - start); + ret = crypto_shash_update(shash, kv[i].iov_base + start, len); + if (ret < 0) + return ret; + maxsize -= len; + + if (maxsize <= 0) + break; + start = 0; + } + + return 0; +} + +/* + * Hash data from an XARRAY-type iterator. + */ +static ssize_t cifs_shash_xarray(const struct iov_iter *iter, ssize_t maxsize, + struct shash_desc *shash) +{ + struct folio *folios[16], *folio; + unsigned int nr, i, j, npages; + loff_t start = iter->xarray_start + iter->iov_offset; + pgoff_t last, index = start / PAGE_SIZE; + ssize_t ret = 0; + size_t len, offset, foffset; + void *p; + + if (maxsize == 0) + return 0; + + last = (start + maxsize - 1) / PAGE_SIZE; + do { + nr = xa_extract(iter->xarray, (void **)folios, index, last, + ARRAY_SIZE(folios), XA_PRESENT); + if (nr == 0) + return -EIO; + + for (i = 0; i < nr; i++) { + folio = folios[i]; + npages = folio_nr_pages(folio); + foffset = start - folio_pos(folio); + offset = foffset % PAGE_SIZE; + for (j = foffset / PAGE_SIZE; j < npages; j++) { + len = min_t(size_t, maxsize, PAGE_SIZE - offset); + p = kmap_local_page(folio_page(folio, j)); + ret = crypto_shash_update(shash, p, len); + kunmap_local(p); + if (ret < 0) + return ret; + maxsize -= len; + if (maxsize <= 0) + return 0; + start += len; + offset = 0; + index++; + } + } + } while (nr == ARRAY_SIZE(folios)); + return 0; +} + +/* + * Pass the data from an iterator into a hash. + */ +static int cifs_shash_iter(const struct iov_iter *iter, size_t maxsize, + struct shash_desc *shash) +{ + if (maxsize == 0) + return 0; + + switch (iov_iter_type(iter)) { + case ITER_BVEC: + return cifs_shash_bvec(iter, maxsize, shash); + case ITER_KVEC: + return cifs_shash_kvec(iter, maxsize, shash); + case ITER_XARRAY: + return cifs_shash_xarray(iter, maxsize, shash); + default: + pr_err("cifs_shash_iter(%u) unsupported\n", iov_iter_type(iter)); + WARN_ON_ONCE(1); + return -EIO; + } +} + int __cifs_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server, char *signature, struct shash_desc *shash)