From: Eric Biggers <ebiggers@kernel.org>
To: linux-crypto@vger.kernel.org
Subject: [PATCH 28/29] crypto: scatterwalk - remove obsolete functions
Date: Sat, 21 Dec 2024 01:10:55 -0800 [thread overview]
Message-ID: <20241221091056.282098-29-ebiggers@kernel.org> (raw)
In-Reply-To: <20241221091056.282098-1-ebiggers@kernel.org>
From: Eric Biggers <ebiggers@google.com>
Remove various functions that are no longer used.
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
crypto/scatterwalk.c | 37 ------------------------------------
include/crypto/scatterwalk.h | 25 ------------------------
2 files changed, 62 deletions(-)
diff --git a/crypto/scatterwalk.c b/crypto/scatterwalk.c
index 2e7a532152d6..87c080f565d4 100644
--- a/crypto/scatterwalk.c
+++ b/crypto/scatterwalk.c
@@ -28,47 +28,10 @@ void scatterwalk_skip(struct scatter_walk *walk, unsigned int nbytes)
walk->sg = sg;
walk->offset = sg->offset + nbytes;
}
EXPORT_SYMBOL_GPL(scatterwalk_skip);
-static inline void memcpy_dir(void *buf, void *sgdata, size_t nbytes, int out)
-{
- void *src = out ? buf : sgdata;
- void *dst = out ? sgdata : buf;
-
- memcpy(dst, src, nbytes);
-}
-
-void scatterwalk_copychunks(void *buf, struct scatter_walk *walk,
- size_t nbytes, int out)
-{
- for (;;) {
- unsigned int len_this_page = scatterwalk_pagelen(walk);
- u8 *vaddr;
-
- if (len_this_page > nbytes)
- len_this_page = nbytes;
-
- if (out != 2) {
- vaddr = scatterwalk_map(walk);
- memcpy_dir(buf, vaddr, len_this_page, out);
- scatterwalk_unmap(vaddr);
- }
-
- scatterwalk_advance(walk, len_this_page);
-
- if (nbytes == len_this_page)
- break;
-
- buf += len_this_page;
- nbytes -= len_this_page;
-
- scatterwalk_pagedone(walk, out & 1, 1);
- }
-}
-EXPORT_SYMBOL_GPL(scatterwalk_copychunks);
-
inline void memcpy_from_scatterwalk(void *buf, struct scatter_walk *walk,
unsigned int nbytes)
{
do {
const void *src_addr;
diff --git a/include/crypto/scatterwalk.h b/include/crypto/scatterwalk.h
index 5e12c07be89b..b542ce69d0bb 100644
--- a/include/crypto/scatterwalk.h
+++ b/include/crypto/scatterwalk.h
@@ -96,32 +96,10 @@ static inline void *scatterwalk_next(struct scatter_walk *walk,
{
*nbytes_ret = scatterwalk_clamp(walk, total);
return scatterwalk_map(walk);
}
-static inline void scatterwalk_pagedone(struct scatter_walk *walk, int out,
- unsigned int more)
-{
- if (out) {
- struct page *page;
-
- page = sg_page(walk->sg) + ((walk->offset - 1) >> PAGE_SHIFT);
- flush_dcache_page(page);
- }
-
- if (more && walk->offset >= walk->sg->offset + walk->sg->length)
- scatterwalk_start(walk, sg_next(walk->sg));
-}
-
-static inline void scatterwalk_done(struct scatter_walk *walk, int out,
- int more)
-{
- if (!more || walk->offset >= walk->sg->offset + walk->sg->length ||
- !(walk->offset & (PAGE_SIZE - 1)))
- scatterwalk_pagedone(walk, out, more);
-}
-
static inline void scatterwalk_advance(struct scatter_walk *walk,
unsigned int nbytes)
{
walk->offset += nbytes;
}
@@ -160,13 +138,10 @@ static inline void scatterwalk_done_dst(struct scatter_walk *walk,
scatterwalk_advance(walk, nbytes);
}
void scatterwalk_skip(struct scatter_walk *walk, unsigned int nbytes);
-void scatterwalk_copychunks(void *buf, struct scatter_walk *walk,
- size_t nbytes, int out);
-
void memcpy_from_scatterwalk(void *buf, struct scatter_walk *walk,
unsigned int nbytes);
void memcpy_to_scatterwalk(struct scatter_walk *walk, const void *buf,
unsigned int nbytes);
--
2.47.1
next prev parent reply other threads:[~2024-12-21 9:11 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-21 9:10 [PATCH 00/29] crypto: scatterlist handling improvements Eric Biggers
2024-12-21 9:10 ` [PATCH 01/29] crypto: skcipher - document skcipher_walk_done() and rename some vars Eric Biggers
2024-12-21 9:10 ` [PATCH 02/29] crypto: skcipher - remove unnecessary page alignment of bounce buffer Eric Biggers
2024-12-21 9:10 ` [PATCH 03/29] crypto: skcipher - remove redundant clamping to page size Eric Biggers
2024-12-21 9:10 ` [PATCH 04/29] crypto: skcipher - remove redundant check for SKCIPHER_WALK_SLOW Eric Biggers
2024-12-21 9:10 ` [PATCH 05/29] crypto: skcipher - fold skcipher_walk_skcipher() into skcipher_walk_virt() Eric Biggers
2024-12-21 9:10 ` [PATCH 06/29] crypto: skcipher - clean up initialization of skcipher_walk::flags Eric Biggers
2024-12-21 9:10 ` [PATCH 07/29] crypto: skcipher - optimize initializing skcipher_walk fields Eric Biggers
2024-12-21 11:16 ` Herbert Xu
2024-12-29 22:10 ` Eric Biggers
2025-01-02 1:03 ` Herbert Xu
2024-12-21 9:10 ` [PATCH 08/29] crypto: skcipher - call cond_resched() directly Eric Biggers
2024-12-21 9:10 ` [PATCH 09/29] crypto: omap - switch from scatter_walk to plain offset Eric Biggers
2024-12-21 9:10 ` [PATCH 10/29] crypto: powerpc/p10-aes-gcm - simplify handling of linear associated data Eric Biggers
2024-12-21 9:10 ` [PATCH 11/29] crypto: scatterwalk - move to next sg entry just in time Eric Biggers
2024-12-21 9:10 ` [PATCH 12/29] crypto: scatterwalk - add new functions for skipping data Eric Biggers
2024-12-21 9:10 ` [PATCH 13/29] crypto: scatterwalk - add new functions for iterating through data Eric Biggers
2024-12-21 11:27 ` Herbert Xu
2024-12-23 19:53 ` Eric Biggers
2024-12-21 9:10 ` [PATCH 14/29] crypto: scatterwalk - add new functions for copying data Eric Biggers
2024-12-21 9:10 ` [PATCH 15/29] crypto: skcipher - use scatterwalk_start_at_pos() Eric Biggers
2024-12-21 9:10 ` [PATCH 16/29] crypto: aegis - use the new scatterwalk functions Eric Biggers
2024-12-21 9:10 ` [PATCH 17/29] crypto: arm/ghash " Eric Biggers
2024-12-21 9:10 ` [PATCH 18/29] crypto: arm64 " Eric Biggers
2024-12-21 9:10 ` [PATCH 19/29] crypto: keywrap " Eric Biggers
2024-12-21 9:10 ` [PATCH 20/29] crypto: nx " Eric Biggers
2024-12-21 9:10 ` [PATCH 21/29] crypto: s390/aes-gcm " Eric Biggers
2024-12-21 9:10 ` [PATCH 22/29] crypto: s5p-sss " Eric Biggers
2024-12-21 9:10 ` [PATCH 23/29] crypto: stm32 " Eric Biggers
2024-12-21 9:10 ` [PATCH 24/29] crypto: x86/aes-gcm " Eric Biggers
2024-12-21 9:10 ` [PATCH 25/29] crypto: x86/aegis " Eric Biggers
2024-12-21 9:10 ` [PATCH 26/29] net/tls: " Eric Biggers
2024-12-23 15:48 ` Jakub Kicinski
2024-12-23 19:42 ` Eric Biggers
2024-12-23 20:44 ` Jakub Kicinski
2024-12-29 23:58 ` Eric Biggers
2024-12-21 9:10 ` [PATCH 27/29] crypto: skcipher - " Eric Biggers
2024-12-21 9:10 ` Eric Biggers [this message]
2024-12-21 9:10 ` [PATCH 29/29] crypto: scatterwalk - don't split at page boundaries when !HIGHMEM Eric Biggers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241221091056.282098-29-ebiggers@kernel.org \
--to=ebiggers@kernel.org \
--cc=linux-crypto@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.