From nobody Wed Feb 16 03:04:02 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4DF7B19D9A8B; Wed, 16 Feb 2022 03:04:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jz2q71ghxz4trZ; Wed, 16 Feb 2022 03:04:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644980643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7oC6TDdy4sKltGzxPFycxi8m0ZDKcGcPe8rmkONpx8M=; b=YsyXfWKxjenMfKjEzQmsP9i7Y7r0z9n0C+xP/B3GEA8aXJ1iuzCgh3DS4A2T6GoKDUq9Q8 RrltiiisdS9BFqwcdnuo/VwxLphritBNzYoWID3s+AnW9yTdr2InPXSvFuFl3dYMi6d/SX Z/OwvfSGnZxeFaOO1TDSfcI2GWL6urMt4TwxrArSQjBjsUMQqHRMXEGPJms9oyDXL8ES8e SQKruk6ujm1TsRMeUHVn582txquOCr3eoahQPAwKzhVf7ZwqFmNoIOzW9nSl1i9DFmXIo8 /NOCH/239SqeytgMQHktBskVflLDO136nTKko57xv5ysTOctExrVDAJs1EOOJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1626968CE; Wed, 16 Feb 2022 03:04:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21G342jq059629; Wed, 16 Feb 2022 03:04:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21G342H4059628; Wed, 16 Feb 2022 03:04:02 GMT (envelope-from git) Date: Wed, 16 Feb 2022 03:04:02 GMT Message-Id: <202202160304.21G342H4059628@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 09bfa5cf16a3 - main - opencrypto: Add a routine to copy a crypto buffer cursor List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09bfa5cf16a37509a136367431472f9169a173ad Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644980643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7oC6TDdy4sKltGzxPFycxi8m0ZDKcGcPe8rmkONpx8M=; b=g5FiXEqnLjZ2ZCErPVNiS7bvRjQhnDJg/h5xUk1ba6mGbtrFOw2iNP+kE3i8I3em/86/os oTpos/YdeAuhthAQVtBX9oh9qt4MbOeC5zDx8Rlki8jAroEcxWjTItPQz+uhvyTwWkwaGy iqk71HEcRsabd6iLsVcNVV5SONqrQHsCGIMZe6h4fO5BI9rgitdqmKjaZFil1eY5aUPWOd Zg2fevat6MYyGJB566+/2tdwpLOtqEVuZtoCXiBetFLdbJ4yHXWb2aoNtMaYjurTzvMQyB oHWIgXVLyzLVIlxp6dRbxKGI1Hbu+uJHSDOSi1uCpwlMW1YgKsWIJR4ODL4QJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644980643; a=rsa-sha256; cv=none; b=MY/1itD0bIHD/a21ceyq7daszvhvCxRFwGJnyh4HWsId+RX293NfZZMaWJ2dlQRWXqEIkE 2NuwMKuPSjQIDM1LirhLlmv3CLmgO29jKAnlJL2uRofyqKzpI5215dbMxRION/BBugCV8r ktUh8lt+/0Que4moj6RCq/cwuSEOM7VdyuJH4EjZtmvcPK1HahqbKioo3EACm0Y+fuRvkO RYI6eXtznpAp2QPh+N685BReCL8PRyfIk0Fk9DcZujJYgPCes6MIhM+zX+cw1+an4vYgg4 J+JkPGGYA2YNYb4wcuIVjG/eN8u7PS/klsN2BJqfkB+2YUndBaXZBPscG7MFCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=09bfa5cf16a37509a136367431472f9169a173ad commit 09bfa5cf16a37509a136367431472f9169a173ad Author: Mark Johnston AuthorDate: 2022-02-16 02:45:32 +0000 Commit: Mark Johnston CommitDate: 2022-02-16 02:47:10 +0000 opencrypto: Add a routine to copy a crypto buffer cursor This was useful in converting armv8crypto to use buffer cursors. There are some cases where one wants to make two passes over data, and this provides a way to "reset" a cursor. Reviewed by: jhb MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D28949 --- share/man/man9/crypto_buffer.9 | 13 ++++++++++++- sys/opencrypto/cryptodev.h | 7 +++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/share/man/man9/crypto_buffer.9 b/share/man/man9/crypto_buffer.9 index c6911d3bb1c9..87cdf53b1abd 100644 --- a/share/man/man9/crypto_buffer.9 +++ b/share/man/man9/crypto_buffer.9 @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 16, 2021 +.Dd Feburary 11, 2022 .Dt CRYPTO_BUFFER 9 .Os .Sh NAME @@ -95,6 +95,11 @@ .Fc .Ft void * .Fn crypto_cursor_segment "struct crypto_buffer_cursor *cc" "size_t *len" +.Ft void +.Fo crypto_cursor_copy +.Fa "const struct crypto_buffer_cursor *fromc" +.Fa "struct crypto_buffer_cursor *toc" +.Fc .Ft bool .Fn CRYPTO_HAS_OUTPUT_BUFFER "struct cryptop *crp" .Sh DESCRIPTION @@ -315,6 +320,12 @@ returns the length of a buffer in bytes. .Fn crypto_cursor_seglen returns the length in bytes of a contiguous segment. .Pp +.Fn crypto_cursor_copy +makes a deep copy of the cursor +.Fa fromc . +The two copies do not share any state and can thus be used +independently. +.Pp .Fn CRYPTO_HAS_OUTPUT_BUFFER returns true if the request uses a separate output buffer. .Sh SEE ALSO diff --git a/sys/opencrypto/cryptodev.h b/sys/opencrypto/cryptodev.h index 3eef1aada2a7..3a0022996a3c 100644 --- a/sys/opencrypto/cryptodev.h +++ b/sys/opencrypto/cryptodev.h @@ -685,6 +685,13 @@ void crypto_cursor_copydata(struct crypto_buffer_cursor *cc, int size, void crypto_cursor_copydata_noadv(struct crypto_buffer_cursor *cc, int size, void *vdst); +static __inline void +crypto_cursor_copy(const struct crypto_buffer_cursor *fromc, + struct crypto_buffer_cursor *toc) +{ + memcpy(toc, fromc, sizeof(*toc)); +} + static __inline void crypto_read_iv(struct cryptop *crp, void *iv) {