summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/assoc_array.c4
-rw-r--r--lib/extable.c50
-rw-r--r--lib/lz4/lz4defs.h21
-rw-r--r--lib/mpi/mpicoder.c39
-rw-r--r--lib/test-string_helpers.c67
5 files changed, 55 insertions, 126 deletions
diff --git a/lib/assoc_array.c b/lib/assoc_array.c
index 59fd7c0b119c..03dd576e6773 100644
--- a/lib/assoc_array.c
+++ b/lib/assoc_array.c
@@ -524,9 +524,7 @@ static bool assoc_array_insert_into_terminal_node(struct assoc_array_edit *edit,
free_slot = i;
continue;
}
- if (assoc_array_ptr_is_leaf(ptr) &&
- ops->compare_object(assoc_array_ptr_to_leaf(ptr),
- index_key)) {
+ if (ops->compare_object(assoc_array_ptr_to_leaf(ptr), index_key)) {
pr_devel("replace in slot %d\n", i);
edit->leaf_p = &node->slots[i];
edit->dead_leaf = node->slots[i];
diff --git a/lib/extable.c b/lib/extable.c
index 0be02ad561e9..4cac81ec225e 100644
--- a/lib/extable.c
+++ b/lib/extable.c
@@ -14,37 +14,7 @@
#include <linux/sort.h>
#include <asm/uaccess.h>
-#ifndef ARCH_HAS_RELATIVE_EXTABLE
-#define ex_to_insn(x) ((x)->insn)
-#else
-static inline unsigned long ex_to_insn(const struct exception_table_entry *x)
-{
- return (unsigned long)&x->insn + x->insn;
-}
-#endif
-
#ifndef ARCH_HAS_SORT_EXTABLE
-#ifndef ARCH_HAS_RELATIVE_EXTABLE
-#define swap_ex NULL
-#else
-static void swap_ex(void *a, void *b, int size)
-{
- struct exception_table_entry *x = a, *y = b, tmp;
- int delta = b - a;
-
- tmp = *x;
- x->insn = y->insn + delta;
- y->insn = tmp.insn - delta;
-
-#ifdef swap_ex_entry_fixup
- swap_ex_entry_fixup(x, y, tmp, delta);
-#else
- x->fixup = y->fixup + delta;
- y->fixup = tmp.fixup - delta;
-#endif
-}
-#endif /* ARCH_HAS_RELATIVE_EXTABLE */
-
/*
* The exception table needs to be sorted so that the binary
* search that we use to find entries in it works properly.
@@ -56,9 +26,9 @@ static int cmp_ex(const void *a, const void *b)
const struct exception_table_entry *x = a, *y = b;
/* avoid overflow */
- if (ex_to_insn(x) > ex_to_insn(y))
+ if (x->insn > y->insn)
return 1;
- if (ex_to_insn(x) < ex_to_insn(y))
+ if (x->insn < y->insn)
return -1;
return 0;
}
@@ -67,7 +37,7 @@ void sort_extable(struct exception_table_entry *start,
struct exception_table_entry *finish)
{
sort(start, finish - start, sizeof(struct exception_table_entry),
- cmp_ex, swap_ex);
+ cmp_ex, NULL);
}
#ifdef CONFIG_MODULES
@@ -78,15 +48,13 @@ void sort_extable(struct exception_table_entry *start,
void trim_init_extable(struct module *m)
{
/*trim the beginning*/
- while (m->num_exentries &&
- within_module_init(ex_to_insn(&m->extable[0]), m)) {
+ while (m->num_exentries && within_module_init(m->extable[0].insn, m)) {
m->extable++;
m->num_exentries--;
}
/*trim the end*/
while (m->num_exentries &&
- within_module_init(ex_to_insn(&m->extable[m->num_exentries - 1]),
- m))
+ within_module_init(m->extable[m->num_exentries-1].insn, m))
m->num_exentries--;
}
#endif /* CONFIG_MODULES */
@@ -113,13 +81,13 @@ search_extable(const struct exception_table_entry *first,
* careful, the distance between value and insn
* can be larger than MAX_LONG:
*/
- if (ex_to_insn(mid) < value)
+ if (mid->insn < value)
first = mid + 1;
- else if (ex_to_insn(mid) > value)
+ else if (mid->insn > value)
last = mid - 1;
else
return mid;
- }
- return NULL;
+ }
+ return NULL;
}
#endif
diff --git a/lib/lz4/lz4defs.h b/lib/lz4/lz4defs.h
index 0710a62ad2f6..abcecdc2d0f2 100644
--- a/lib/lz4/lz4defs.h
+++ b/lib/lz4/lz4defs.h
@@ -11,7 +11,8 @@
/*
* Detects 64 bits mode
*/
-#if defined(CONFIG_64BIT)
+#if (defined(__x86_64__) || defined(__x86_64) || defined(__amd64__) \
+ || defined(__ppc64__) || defined(__LP64__))
#define LZ4_ARCH64 1
#else
#define LZ4_ARCH64 0
@@ -34,10 +35,6 @@ typedef struct _U64_S { u64 v; } U64_S;
#define PUT4(s, d) (A32(d) = A32(s))
#define PUT8(s, d) (A64(d) = A64(s))
-
-#define LZ4_READ_LITTLEENDIAN_16(d, s, p) \
- (d = s - A16(p))
-
#define LZ4_WRITE_LITTLEENDIAN_16(p, v) \
do { \
A16(p) = v; \
@@ -54,13 +51,10 @@ typedef struct _U64_S { u64 v; } U64_S;
#define PUT8(s, d) \
put_unaligned(get_unaligned((const u64 *) s), (u64 *) d)
-#define LZ4_READ_LITTLEENDIAN_16(d, s, p) \
- (d = s - get_unaligned_le16(p))
-
-#define LZ4_WRITE_LITTLEENDIAN_16(p, v) \
- do { \
- put_unaligned_le16(v, (u16 *)(p)); \
- p += 2; \
+#define LZ4_WRITE_LITTLEENDIAN_16(p, v) \
+ do { \
+ put_unaligned(v, (u16 *)(p)); \
+ p += 2; \
} while (0)
#endif
@@ -146,6 +140,9 @@ typedef struct _U64_S { u64 v; } U64_S;
#endif
+#define LZ4_READ_LITTLEENDIAN_16(d, s, p) \
+ (d = s - get_unaligned_le16(p))
+
#define LZ4_WILDCOPY(s, d, e) \
do { \
LZ4_COPYPACKET(s, d); \
diff --git a/lib/mpi/mpicoder.c b/lib/mpi/mpicoder.c
index e00ff00e861c..3db76b8c1115 100644
--- a/lib/mpi/mpicoder.c
+++ b/lib/mpi/mpicoder.c
@@ -128,23 +128,6 @@ leave:
}
EXPORT_SYMBOL_GPL(mpi_read_from_buffer);
-static int count_lzeros(MPI a)
-{
- mpi_limb_t alimb;
- int i, lzeros = 0;
-
- for (i = a->nlimbs - 1; i >= 0; i--) {
- alimb = a->d[i];
- if (alimb == 0) {
- lzeros += sizeof(mpi_limb_t);
- } else {
- lzeros += count_leading_zeros(alimb) / 8;
- break;
- }
- }
- return lzeros;
-}
-
/**
* mpi_read_buffer() - read MPI to a bufer provided by user (msb first)
*
@@ -163,7 +146,7 @@ int mpi_read_buffer(MPI a, uint8_t *buf, unsigned buf_len, unsigned *nbytes,
uint8_t *p;
mpi_limb_t alimb;
unsigned int n = mpi_get_size(a);
- int i, lzeros;
+ int i, lzeros = 0;
if (buf_len < n || !buf || !nbytes)
return -EINVAL;
@@ -171,7 +154,14 @@ int mpi_read_buffer(MPI a, uint8_t *buf, unsigned buf_len, unsigned *nbytes,
if (sign)
*sign = a->sign;
- lzeros = count_lzeros(a);
+ p = (void *)&a->d[a->nlimbs] - 1;
+
+ for (i = a->nlimbs * sizeof(alimb) - 1; i >= 0; i--, p--) {
+ if (!*p)
+ lzeros++;
+ else
+ break;
+ }
p = buf;
*nbytes = n - lzeros;
@@ -353,7 +343,7 @@ int mpi_write_to_sgl(MPI a, struct scatterlist *sgl, unsigned *nbytes,
u8 *p, *p2;
mpi_limb_t alimb, alimb2;
unsigned int n = mpi_get_size(a);
- int i, x, y = 0, lzeros, buf_len;
+ int i, x, y = 0, lzeros = 0, buf_len;
if (!nbytes || *nbytes < n)
return -EINVAL;
@@ -361,7 +351,14 @@ int mpi_write_to_sgl(MPI a, struct scatterlist *sgl, unsigned *nbytes,
if (sign)
*sign = a->sign;
- lzeros = count_lzeros(a);
+ p = (void *)&a->d[a->nlimbs] - 1;
+
+ for (i = a->nlimbs * sizeof(alimb) - 1; i >= 0; i--, p--) {
+ if (!*p)
+ lzeros++;
+ else
+ break;
+ }
*nbytes = n - lzeros;
buf_len = sgl->length;
diff --git a/lib/test-string_helpers.c b/lib/test-string_helpers.c
index 25b5cbfb7615..98866a770770 100644
--- a/lib/test-string_helpers.c
+++ b/lib/test-string_helpers.c
@@ -327,67 +327,36 @@ out:
}
#define string_get_size_maxbuf 16
-#define test_string_get_size_one(size, blk_size, exp_result10, exp_result2) \
+#define test_string_get_size_one(size, blk_size, units, exp_result) \
do { \
- BUILD_BUG_ON(sizeof(exp_result10) >= string_get_size_maxbuf); \
- BUILD_BUG_ON(sizeof(exp_result2) >= string_get_size_maxbuf); \
- __test_string_get_size((size), (blk_size), (exp_result10), \
- (exp_result2)); \
+ BUILD_BUG_ON(sizeof(exp_result) >= string_get_size_maxbuf); \
+ __test_string_get_size((size), (blk_size), (units), \
+ (exp_result)); \
} while (0)
-static __init void test_string_get_size_check(const char *units,
- const char *exp,
- char *res,
- const u64 size,
- const u64 blk_size)
-{
- if (!memcmp(res, exp, strlen(exp) + 1))
- return;
-
- res[string_get_size_maxbuf - 1] = '\0';
-
- pr_warn("Test 'test_string_get_size' failed!\n");
- pr_warn("string_get_size(size = %llu, blk_size = %llu, units = %s)\n",
- size, blk_size, units);
- pr_warn("expected: '%s', got '%s'\n", exp, res);
-}
-
static __init void __test_string_get_size(const u64 size, const u64 blk_size,
- const char *exp_result10,
- const char *exp_result2)
+ const enum string_size_units units,
+ const char *exp_result)
{
- char buf10[string_get_size_maxbuf];
- char buf2[string_get_size_maxbuf];
-
- string_get_size(size, blk_size, STRING_UNITS_10, buf10, sizeof(buf10));
- string_get_size(size, blk_size, STRING_UNITS_2, buf2, sizeof(buf2));
+ char buf[string_get_size_maxbuf];
- test_string_get_size_check("STRING_UNITS_10", exp_result10, buf10,
- size, blk_size);
+ string_get_size(size, blk_size, units, buf, sizeof(buf));
+ if (!memcmp(buf, exp_result, strlen(exp_result) + 1))
+ return;
- test_string_get_size_check("STRING_UNITS_2", exp_result2, buf2,
- size, blk_size);
+ buf[sizeof(buf) - 1] = '\0';
+ pr_warn("Test 'test_string_get_size_one' failed!\n");
+ pr_warn("string_get_size(size = %llu, blk_size = %llu, units = %d\n",
+ size, blk_size, units);
+ pr_warn("expected: '%s', got '%s'\n", exp_result, buf);
}
static __init void test_string_get_size(void)
{
- /* small values */
- test_string_get_size_one(0, 512, "0 B", "0 B");
- test_string_get_size_one(1, 512, "512 B", "512 B");
- test_string_get_size_one(1100, 1, "1.10 kB", "1.07 KiB");
-
- /* normal values */
- test_string_get_size_one(16384, 512, "8.39 MB", "8.00 MiB");
- test_string_get_size_one(500118192, 512, "256 GB", "238 GiB");
- test_string_get_size_one(8192, 4096, "33.6 MB", "32.0 MiB");
-
- /* weird block sizes */
- test_string_get_size_one(3000, 1900, "5.70 MB", "5.44 MiB");
-
- /* huge values */
- test_string_get_size_one(U64_MAX, 4096, "75.6 ZB", "64.0 ZiB");
- test_string_get_size_one(4096, U64_MAX, "75.6 ZB", "64.0 ZiB");
+ test_string_get_size_one(16384, 512, STRING_UNITS_2, "8.00 MiB");
+ test_string_get_size_one(8192, 4096, STRING_UNITS_10, "32.7 MB");
+ test_string_get_size_one(1, 512, STRING_UNITS_10, "512 B");
}
static int __init test_string_helpers_init(void)
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-17 19:36:35 +0000