AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

lib/mpi: Do not do sg_virt

Browse Source 
Currently the mpi SG helpers use sg_virt which is completely
broken.  It happens to work with normal kernel memory but will
fail with anything that is not linearly mapped.

This patch fixes this by using the SG iterator helpers.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Herbert Xu 2016-06-29 19:32:22 +08:00
parent 9b45b7bba3
commit 127827b9c2
1 changed files with 51 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
lib/mpi/mpicoder.c
View File

@ -21,6 +21,7 @@
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/count_zeros.h> #include <linux/count_zeros.h>
#include <linux/byteorder/generic.h> #include <linux/byteorder/generic.h>
#include <linux/scatterlist.h>
#include <linux/string.h> #include <linux/string.h>
#include "mpi-internal.h" #include "mpi-internal.h"
@ -255,7 +256,9 @@ int mpi_write_to_sgl(MPI a, struct scatterlist *sgl, unsigned nbytes,
#error please implement for this limb size. #error please implement for this limb size.
#endif #endif
unsigned int n = mpi_get_size(a); unsigned int n = mpi_get_size(a);
struct sg_mapping_iter miter;
int i, x, buf_len; int i, x, buf_len;
int nents;
if (sign) if (sign)
*sign = a->sign; *sign = a->sign;
@ -263,23 +266,27 @@ int mpi_write_to_sgl(MPI a, struct scatterlist *sgl, unsigned nbytes,
if (nbytes < n) if (nbytes < n)
return -EOVERFLOW; return -EOVERFLOW;
buf_len = sgl->length; nents = sg_nents_for_len(sgl, nbytes);
p2 = sg_virt(sgl); if (nents < 0)
return -EINVAL;
sg_miter_start(&miter, sgl, nents, SG_MITER_ATOMIC | SG_MITER_TO_SG);
sg_miter_next(&miter);
buf_len = miter.length;
p2 = miter.addr;
while (nbytes > n) { while (nbytes > n) {
if (!buf_len) {
sgl = sg_next(sgl);
if (!sgl)
return -EINVAL;
buf_len = sgl->length;
p2 = sg_virt(sgl);
}
i = min_t(unsigned, nbytes - n, buf_len); i = min_t(unsigned, nbytes - n, buf_len);
memset(p2, 0, i); memset(p2, 0, i);
p2 += i; p2 += i;
buf_len -= i;
nbytes -= i; nbytes -= i;
buf_len -= i;
if (!buf_len) {
sg_miter_next(&miter);
buf_len = miter.length;
p2 = miter.addr;
}
} }
for (i = a->nlimbs - 1; i >= 0; i--) { for (i = a->nlimbs - 1; i >= 0; i--) {
@ -293,17 +300,16 @@ int mpi_write_to_sgl(MPI a, struct scatterlist *sgl, unsigned nbytes,
p = (u8 *)&alimb; p = (u8 *)&alimb;
for (x = 0; x < sizeof(alimb); x++) { for (x = 0; x < sizeof(alimb); x++) {
if (!buf_len) {
sgl = sg_next(sgl);
if (!sgl)
return -EINVAL;
buf_len = sgl->length;
p2 = sg_virt(sgl);
}
*p2++ = *p++; *p2++ = *p++;
buf_len--; if (!--buf_len) {
sg_miter_next(&miter);
buf_len = miter.length;
p2 = miter.addr;
}
} }
} }
sg_miter_stop(&miter);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(mpi_write_to_sgl); EXPORT_SYMBOL_GPL(mpi_write_to_sgl);
@ -323,19 +329,23 @@ EXPORT_SYMBOL_GPL(mpi_write_to_sgl);
*/ */
MPI mpi_read_raw_from_sgl(struct scatterlist *sgl, unsigned int nbytes) MPI mpi_read_raw_from_sgl(struct scatterlist *sgl, unsigned int nbytes)
{ {
struct scatterlist *sg; struct sg_mapping_iter miter;
int x, i, j, z, lzeros, ents;
unsigned int nbits, nlimbs; unsigned int nbits, nlimbs;
int x, j, z, lzeros, ents;
unsigned int len;
const u8 *buff;
mpi_limb_t a; mpi_limb_t a;
MPI val = NULL; MPI val = NULL;
ents = sg_nents_for_len(sgl, nbytes);
if (ents < 0)
return NULL;
sg_miter_start(&miter, sgl, ents, SG_MITER_ATOMIC | SG_MITER_FROM_SG);
lzeros = 0; lzeros = 0;
ents = sg_nents(sgl); len = 0;
while (nbytes > 0) {
for_each_sg(sgl, sg, ents, i) {
const u8 *buff = sg_virt(sg);
int len = sg->length;
while (len && !*buff) { while (len && !*buff) {
lzeros++; lzeros++;
len--; len--;
@ -345,12 +355,14 @@ MPI mpi_read_raw_from_sgl(struct scatterlist *sgl, unsigned int nbytes)
if (len && *buff) if (len && *buff)
break; break;
ents--; sg_miter_next(&miter);
buff = miter.addr;
len = miter.length;
nbytes -= lzeros; nbytes -= lzeros;
lzeros = 0; lzeros = 0;
} }
sgl = sg;
nbytes -= lzeros; nbytes -= lzeros;
nbits = nbytes * 8; nbits = nbytes * 8;
if (nbits > MAX_EXTERN_MPI_BITS) { if (nbits > MAX_EXTERN_MPI_BITS) {
@ -359,8 +371,7 @@ MPI mpi_read_raw_from_sgl(struct scatterlist *sgl, unsigned int nbytes)
} }
if (nbytes > 0) if (nbytes > 0)
nbits -= count_leading_zeros(*(u8 *)(sg_virt(sgl) + lzeros)) - nbits -= count_leading_zeros(*buff) - (BITS_PER_LONG - 8);
(BITS_PER_LONG - 8);
nlimbs = DIV_ROUND_UP(nbytes, BYTES_PER_MPI_LIMB); nlimbs = DIV_ROUND_UP(nbytes, BYTES_PER_MPI_LIMB);
val = mpi_alloc(nlimbs); val = mpi_alloc(nlimbs);
@ -379,21 +390,24 @@ MPI mpi_read_raw_from_sgl(struct scatterlist *sgl, unsigned int nbytes)
z = BYTES_PER_MPI_LIMB - nbytes % BYTES_PER_MPI_LIMB; z = BYTES_PER_MPI_LIMB - nbytes % BYTES_PER_MPI_LIMB;
z %= BYTES_PER_MPI_LIMB; z %= BYTES_PER_MPI_LIMB;
for_each_sg(sgl, sg, ents, i) { for (;;) {
const u8 *buffer = sg_virt(sg) + lzeros;
int len = sg->length - lzeros;
for (x = 0; x < len; x++) { for (x = 0; x < len; x++) {
a <<= 8; a <<= 8;
a |= *buffer++; a |= *buff++;
if (((z + x + 1) % BYTES_PER_MPI_LIMB) == 0) { if (((z + x + 1) % BYTES_PER_MPI_LIMB) == 0) {
val->d[j--] = a; val->d[j--] = a;
a = 0; a = 0;
} }
} }
z += x; z += x;
lzeros = 0;
if (!sg_miter_next(&miter))
break;
buff = miter.addr;
len = miter.length;
} }
return val; return val;
} }
EXPORT_SYMBOL_GPL(mpi_read_raw_from_sgl); EXPORT_SYMBOL_GPL(mpi_read_raw_from_sgl);