forked from Minki/linux
307fd543f3
Replace equivalent (and partially incorrect) scatter-gather functions with ones from crypto-API. The replacement is motivated by page-faults in sg_copy_part triggered by successive calls to crypto_hash_update. The following fault appears after calling crypto_ahash_update twice, first with 13 and then with 285 bytes: Unable to handle kernel paging request for data at address 0x00000008 Faulting instruction address: 0xf9bf9a8c Oops: Kernel access of bad area, sig: 11 [#1] SMP NR_CPUS=8 CoreNet Generic Modules linked in: tcrypt(+) caamhash caam_jr caam tls CPU: 6 PID: 1497 Comm: cryptomgr_test Not tainted 3.12.19-rt30-QorIQ-SDK-V1.6+g9fda9f2 #75 task: e9308530 ti: e700e000 task.ti: e700e000 NIP: f9bf9a8c LR: f9bfcf28 CTR: c0019ea0 REGS: e700fb80 TRAP: 0300 Not tainted (3.12.19-rt30-QorIQ-SDK-V1.6+g9fda9f2) MSR: 00029002 <CE,EE,ME> CR: 44f92024 XER: 20000000 DEAR: 00000008, ESR: 00000000 GPR00: f9bfcf28 e700fc30 e9308530 e70b1e55 00000000 ffffffdd e70b1e54 0bebf888 GPR08: 902c7ef5 c0e771e2 00000002 00000888 c0019ea0 00000000 00000000 c07a4154 GPR16: c08d0000 e91a8f9c 00000001 e98fb400 00000100 e9c83028 e70b1e08 e70b1d48 GPR24: e992ce10 e70b1dc8 f9bfe4f4 e70b1e55 ffffffdd e70b1ce0 00000000 00000000 NIP [f9bf9a8c] sg_copy+0x1c/0x100 [caamhash] LR [f9bfcf28] ahash_update_no_ctx+0x628/0x660 [caamhash] Call Trace: [e700fc30] [f9bf9c50] sg_copy_part+0xe0/0x160 [caamhash] (unreliable) [e700fc50] [f9bfcf28] ahash_update_no_ctx+0x628/0x660 [caamhash] [e700fcb0] [f954e19c] crypto_tls_genicv+0x13c/0x300 [tls] [e700fd10] [f954e65c] crypto_tls_encrypt+0x5c/0x260 [tls] [e700fd40] [c02250ec] __test_aead.constprop.9+0x2bc/0xb70 [e700fe40] [c02259f0] alg_test_aead+0x50/0xc0 [e700fe60] [c02241e4] alg_test+0x114/0x2e0 [e700fee0] [c022276c] cryptomgr_test+0x4c/0x60 [e700fef0] [c004f658] kthread+0x98/0xa0 [e700ff40] [c000fd04] ret_from_kernel_thread+0x5c/0x64 Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
119 lines
2.8 KiB
C
119 lines
2.8 KiB
C
/*
|
|
* CAAM/SEC 4.x functions for using scatterlists in caam driver
|
|
*
|
|
* Copyright 2008-2011 Freescale Semiconductor, Inc.
|
|
*
|
|
*/
|
|
|
|
struct sec4_sg_entry;
|
|
|
|
/*
|
|
* convert single dma address to h/w link table format
|
|
*/
|
|
static inline void dma_to_sec4_sg_one(struct sec4_sg_entry *sec4_sg_ptr,
|
|
dma_addr_t dma, u32 len, u32 offset)
|
|
{
|
|
sec4_sg_ptr->ptr = dma;
|
|
sec4_sg_ptr->len = len;
|
|
sec4_sg_ptr->reserved = 0;
|
|
sec4_sg_ptr->buf_pool_id = 0;
|
|
sec4_sg_ptr->offset = offset;
|
|
#ifdef DEBUG
|
|
print_hex_dump(KERN_ERR, "sec4_sg_ptr@: ",
|
|
DUMP_PREFIX_ADDRESS, 16, 4, sec4_sg_ptr,
|
|
sizeof(struct sec4_sg_entry), 1);
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* convert scatterlist to h/w link table format
|
|
* but does not have final bit; instead, returns last entry
|
|
*/
|
|
static inline struct sec4_sg_entry *
|
|
sg_to_sec4_sg(struct scatterlist *sg, int sg_count,
|
|
struct sec4_sg_entry *sec4_sg_ptr, u32 offset)
|
|
{
|
|
while (sg_count) {
|
|
dma_to_sec4_sg_one(sec4_sg_ptr, sg_dma_address(sg),
|
|
sg_dma_len(sg), offset);
|
|
sec4_sg_ptr++;
|
|
sg = scatterwalk_sg_next(sg);
|
|
sg_count--;
|
|
}
|
|
return sec4_sg_ptr - 1;
|
|
}
|
|
|
|
/*
|
|
* convert scatterlist to h/w link table format
|
|
* scatterlist must have been previously dma mapped
|
|
*/
|
|
static inline void sg_to_sec4_sg_last(struct scatterlist *sg, int sg_count,
|
|
struct sec4_sg_entry *sec4_sg_ptr,
|
|
u32 offset)
|
|
{
|
|
sec4_sg_ptr = sg_to_sec4_sg(sg, sg_count, sec4_sg_ptr, offset);
|
|
sec4_sg_ptr->len |= SEC4_SG_LEN_FIN;
|
|
}
|
|
|
|
/* count number of elements in scatterlist */
|
|
static inline int __sg_count(struct scatterlist *sg_list, int nbytes,
|
|
bool *chained)
|
|
{
|
|
struct scatterlist *sg = sg_list;
|
|
int sg_nents = 0;
|
|
|
|
while (nbytes > 0) {
|
|
sg_nents++;
|
|
nbytes -= sg->length;
|
|
if (!sg_is_last(sg) && (sg + 1)->length == 0)
|
|
*chained = true;
|
|
sg = scatterwalk_sg_next(sg);
|
|
}
|
|
|
|
return sg_nents;
|
|
}
|
|
|
|
/* derive number of elements in scatterlist, but return 0 for 1 */
|
|
static inline int sg_count(struct scatterlist *sg_list, int nbytes,
|
|
bool *chained)
|
|
{
|
|
int sg_nents = __sg_count(sg_list, nbytes, chained);
|
|
|
|
if (likely(sg_nents == 1))
|
|
return 0;
|
|
|
|
return sg_nents;
|
|
}
|
|
|
|
static int dma_map_sg_chained(struct device *dev, struct scatterlist *sg,
|
|
unsigned int nents, enum dma_data_direction dir,
|
|
bool chained)
|
|
{
|
|
if (unlikely(chained)) {
|
|
int i;
|
|
for (i = 0; i < nents; i++) {
|
|
dma_map_sg(dev, sg, 1, dir);
|
|
sg = scatterwalk_sg_next(sg);
|
|
}
|
|
} else {
|
|
dma_map_sg(dev, sg, nents, dir);
|
|
}
|
|
return nents;
|
|
}
|
|
|
|
static int dma_unmap_sg_chained(struct device *dev, struct scatterlist *sg,
|
|
unsigned int nents, enum dma_data_direction dir,
|
|
bool chained)
|
|
{
|
|
if (unlikely(chained)) {
|
|
int i;
|
|
for (i = 0; i < nents; i++) {
|
|
dma_unmap_sg(dev, sg, 1, dir);
|
|
sg = scatterwalk_sg_next(sg);
|
|
}
|
|
} else {
|
|
dma_unmap_sg(dev, sg, nents, dir);
|
|
}
|
|
return nents;
|
|
}
|