ChangeSet 1.2199.14.27, 2005/03/23 12:08:48-08:00, [EMAIL PROTECTED]
[CRYPTO]: Eliminate most calls to scatterwalk_copychunks from crypt()
Only call scatterwalk_copychunks when the block straddles a page
boundary.
This allows crypt() to skip the out-of-line call most of the time.
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
cipher.c | 16 +++++++++++++---
scatterwalk.c | 26 ++++++++++----------------
scatterwalk.h | 8 ++++++++
3 files changed, 31 insertions(+), 19 deletions(-)
diff -Nru a/crypto/cipher.c b/crypto/cipher.c
--- a/crypto/cipher.c 2005-03-26 17:23:25 -08:00
+++ b/crypto/cipher.c 2005-03-26 17:23:25 -08:00
@@ -17,6 +17,7 @@
#include <linux/errno.h>
#include <linux/mm.h>
#include <linux/slab.h>
+#include <linux/string.h>
#include <asm/scatterlist.h>
#include "internal.h"
#include "scatterwalk.h"
@@ -43,10 +44,13 @@
void *tmp, int in_place)
{
void *src = walk->data;
+ int n = bsize;
- if (unlikely(scatterwalk_across_pages(walk, bsize)))
+ if (unlikely(scatterwalk_across_pages(walk, bsize))) {
src = tmp;
- scatterwalk_copychunks(src, walk, bsize, 0);
+ n = scatterwalk_copychunks(src, walk, bsize, 0);
+ }
+ scatterwalk_advance(walk, n);
return src;
}
@@ -68,7 +72,13 @@
static inline void complete_dst(struct scatter_walk *walk, int bsize,
void *dst, int in_place)
{
- scatterwalk_copychunks(dst, walk, bsize, 1);
+ int n = bsize;
+
+ if (unlikely(scatterwalk_across_pages(walk, bsize)))
+ n = scatterwalk_copychunks(dst, walk, bsize, 1);
+ else if (in_place)
+ memcpy(walk->data, dst, bsize);
+ scatterwalk_advance(walk, n);
}
/*
diff -Nru a/crypto/scatterwalk.c b/crypto/scatterwalk.c
--- a/crypto/scatterwalk.c 2005-03-26 17:23:25 -08:00
+++ b/crypto/scatterwalk.c 2005-03-26 17:23:25 -08:00
@@ -93,22 +93,16 @@
int scatterwalk_copychunks(void *buf, struct scatter_walk *walk,
size_t nbytes, int out)
{
- if (buf != walk->data) {
- while (nbytes > walk->len_this_page) {
- memcpy_dir(buf, walk->data, walk->len_this_page, out);
- buf += walk->len_this_page;
- nbytes -= walk->len_this_page;
+ do {
+ memcpy_dir(buf, walk->data, walk->len_this_page, out);
+ buf += walk->len_this_page;
+ nbytes -= walk->len_this_page;
- crypto_kunmap(walk->data, out);
- scatterwalk_pagedone(walk, out, 1);
- scatterwalk_map(walk, out);
- }
+ crypto_kunmap(walk->data, out);
+ scatterwalk_pagedone(walk, out, 1);
+ scatterwalk_map(walk, out);
+ } while (nbytes > walk->len_this_page);
- memcpy_dir(buf, walk->data, nbytes, out);
- }
-
- walk->offset += nbytes;
- walk->len_this_page -= nbytes;
- walk->len_this_segment -= nbytes;
- return 0;
+ memcpy_dir(buf, walk->data, nbytes, out);
+ return nbytes;
}
diff -Nru a/crypto/scatterwalk.h b/crypto/scatterwalk.h
--- a/crypto/scatterwalk.h 2005-03-26 17:23:25 -08:00
+++ b/crypto/scatterwalk.h 2005-03-26 17:23:25 -08:00
@@ -46,6 +46,14 @@
return nbytes > walk->len_this_page;
}
+static inline void scatterwalk_advance(struct scatter_walk *walk,
+ unsigned int nbytes)
+{
+ walk->offset += nbytes;
+ walk->len_this_page -= nbytes;
+ walk->len_this_segment -= nbytes;
+}
+
void scatterwalk_start(struct scatter_walk *walk, struct scatterlist *sg);
int scatterwalk_copychunks(void *buf, struct scatter_walk *walk, size_t
nbytes, int out);
void scatterwalk_map(struct scatter_walk *walk, int out);
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
