mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-21 01:51:18 +00:00
crypto: sun4i-ss - fix kmap usage
[ Upstream commit9bc3dd24e7
] With the recent kmap change, some tests which were conditional on CONFIG_DEBUG_HIGHMEM now are enabled by default. This permit to detect a problem in sun4i-ss usage of kmap. sun4i-ss uses two kmap via sg_miter (one for input, one for output), but using two kmap at the same time is hard: "the ordering has to be correct and with sg_miter that's probably hard to get right." (quoting Tlgx) So the easiest solution is to never have two sg_miter/kmap open at the same time. After each use of sg_miter, I store the current index, for being able to resume sg_miter to the right place. Fixes:6298e94821
("crypto: sunxi-ss - Add Allwinner Security System crypto accelerator") Signed-off-by: Corentin Labbe <clabbe@baylibre.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
99e9cb7bc1
commit
2f7287fbcb
1 changed files with 65 additions and 44 deletions
|
@ -30,6 +30,8 @@ static int noinline_for_stack sun4i_ss_opti_poll(struct skcipher_request *areq)
|
||||||
unsigned int ileft = areq->cryptlen;
|
unsigned int ileft = areq->cryptlen;
|
||||||
unsigned int oleft = areq->cryptlen;
|
unsigned int oleft = areq->cryptlen;
|
||||||
unsigned int todo;
|
unsigned int todo;
|
||||||
|
unsigned long pi = 0, po = 0; /* progress for in and out */
|
||||||
|
bool miter_err;
|
||||||
struct sg_mapping_iter mi, mo;
|
struct sg_mapping_iter mi, mo;
|
||||||
unsigned int oi, oo; /* offset for in and out */
|
unsigned int oi, oo; /* offset for in and out */
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
@ -55,39 +57,51 @@ static int noinline_for_stack sun4i_ss_opti_poll(struct skcipher_request *areq)
|
||||||
}
|
}
|
||||||
writel(mode, ss->base + SS_CTL);
|
writel(mode, ss->base + SS_CTL);
|
||||||
|
|
||||||
sg_miter_start(&mi, areq->src, sg_nents(areq->src),
|
|
||||||
SG_MITER_FROM_SG | SG_MITER_ATOMIC);
|
|
||||||
sg_miter_start(&mo, areq->dst, sg_nents(areq->dst),
|
|
||||||
SG_MITER_TO_SG | SG_MITER_ATOMIC);
|
|
||||||
sg_miter_next(&mi);
|
|
||||||
sg_miter_next(&mo);
|
|
||||||
if (!mi.addr || !mo.addr) {
|
|
||||||
dev_err_ratelimited(ss->dev, "ERROR: sg_miter return null\n");
|
|
||||||
err = -EINVAL;
|
|
||||||
goto release_ss;
|
|
||||||
}
|
|
||||||
|
|
||||||
ileft = areq->cryptlen / 4;
|
ileft = areq->cryptlen / 4;
|
||||||
oleft = areq->cryptlen / 4;
|
oleft = areq->cryptlen / 4;
|
||||||
oi = 0;
|
oi = 0;
|
||||||
oo = 0;
|
oo = 0;
|
||||||
do {
|
do {
|
||||||
todo = min(rx_cnt, ileft);
|
if (ileft) {
|
||||||
todo = min_t(size_t, todo, (mi.length - oi) / 4);
|
sg_miter_start(&mi, areq->src, sg_nents(areq->src),
|
||||||
if (todo) {
|
SG_MITER_FROM_SG | SG_MITER_ATOMIC);
|
||||||
ileft -= todo;
|
if (pi)
|
||||||
writesl(ss->base + SS_RXFIFO, mi.addr + oi, todo);
|
sg_miter_skip(&mi, pi);
|
||||||
oi += todo * 4;
|
miter_err = sg_miter_next(&mi);
|
||||||
}
|
if (!miter_err || !mi.addr) {
|
||||||
if (oi == mi.length) {
|
dev_err_ratelimited(ss->dev, "ERROR: sg_miter return null\n");
|
||||||
sg_miter_next(&mi);
|
err = -EINVAL;
|
||||||
oi = 0;
|
goto release_ss;
|
||||||
|
}
|
||||||
|
todo = min(rx_cnt, ileft);
|
||||||
|
todo = min_t(size_t, todo, (mi.length - oi) / 4);
|
||||||
|
if (todo) {
|
||||||
|
ileft -= todo;
|
||||||
|
writesl(ss->base + SS_RXFIFO, mi.addr + oi, todo);
|
||||||
|
oi += todo * 4;
|
||||||
|
}
|
||||||
|
if (oi == mi.length) {
|
||||||
|
pi += mi.length;
|
||||||
|
oi = 0;
|
||||||
|
}
|
||||||
|
sg_miter_stop(&mi);
|
||||||
}
|
}
|
||||||
|
|
||||||
spaces = readl(ss->base + SS_FCSR);
|
spaces = readl(ss->base + SS_FCSR);
|
||||||
rx_cnt = SS_RXFIFO_SPACES(spaces);
|
rx_cnt = SS_RXFIFO_SPACES(spaces);
|
||||||
tx_cnt = SS_TXFIFO_SPACES(spaces);
|
tx_cnt = SS_TXFIFO_SPACES(spaces);
|
||||||
|
|
||||||
|
sg_miter_start(&mo, areq->dst, sg_nents(areq->dst),
|
||||||
|
SG_MITER_TO_SG | SG_MITER_ATOMIC);
|
||||||
|
if (po)
|
||||||
|
sg_miter_skip(&mo, po);
|
||||||
|
miter_err = sg_miter_next(&mo);
|
||||||
|
if (!miter_err || !mo.addr) {
|
||||||
|
dev_err_ratelimited(ss->dev, "ERROR: sg_miter return null\n");
|
||||||
|
err = -EINVAL;
|
||||||
|
goto release_ss;
|
||||||
|
}
|
||||||
todo = min(tx_cnt, oleft);
|
todo = min(tx_cnt, oleft);
|
||||||
todo = min_t(size_t, todo, (mo.length - oo) / 4);
|
todo = min_t(size_t, todo, (mo.length - oo) / 4);
|
||||||
if (todo) {
|
if (todo) {
|
||||||
|
@ -96,9 +110,10 @@ static int noinline_for_stack sun4i_ss_opti_poll(struct skcipher_request *areq)
|
||||||
oo += todo * 4;
|
oo += todo * 4;
|
||||||
}
|
}
|
||||||
if (oo == mo.length) {
|
if (oo == mo.length) {
|
||||||
sg_miter_next(&mo);
|
|
||||||
oo = 0;
|
oo = 0;
|
||||||
|
po += mo.length;
|
||||||
}
|
}
|
||||||
|
sg_miter_stop(&mo);
|
||||||
} while (oleft);
|
} while (oleft);
|
||||||
|
|
||||||
if (areq->iv) {
|
if (areq->iv) {
|
||||||
|
@ -109,8 +124,6 @@ static int noinline_for_stack sun4i_ss_opti_poll(struct skcipher_request *areq)
|
||||||
}
|
}
|
||||||
|
|
||||||
release_ss:
|
release_ss:
|
||||||
sg_miter_stop(&mi);
|
|
||||||
sg_miter_stop(&mo);
|
|
||||||
writel(0, ss->base + SS_CTL);
|
writel(0, ss->base + SS_CTL);
|
||||||
spin_unlock_irqrestore(&ss->slock, flags);
|
spin_unlock_irqrestore(&ss->slock, flags);
|
||||||
return err;
|
return err;
|
||||||
|
@ -162,6 +175,8 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq)
|
||||||
unsigned int oleft = areq->cryptlen;
|
unsigned int oleft = areq->cryptlen;
|
||||||
unsigned int todo;
|
unsigned int todo;
|
||||||
struct sg_mapping_iter mi, mo;
|
struct sg_mapping_iter mi, mo;
|
||||||
|
unsigned long pi = 0, po = 0; /* progress for in and out */
|
||||||
|
bool miter_err;
|
||||||
unsigned int oi, oo; /* offset for in and out */
|
unsigned int oi, oo; /* offset for in and out */
|
||||||
unsigned int ob = 0; /* offset in buf */
|
unsigned int ob = 0; /* offset in buf */
|
||||||
unsigned int obo = 0; /* offset in bufo*/
|
unsigned int obo = 0; /* offset in bufo*/
|
||||||
|
@ -215,17 +230,6 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq)
|
||||||
}
|
}
|
||||||
writel(mode, ss->base + SS_CTL);
|
writel(mode, ss->base + SS_CTL);
|
||||||
|
|
||||||
sg_miter_start(&mi, areq->src, sg_nents(areq->src),
|
|
||||||
SG_MITER_FROM_SG | SG_MITER_ATOMIC);
|
|
||||||
sg_miter_start(&mo, areq->dst, sg_nents(areq->dst),
|
|
||||||
SG_MITER_TO_SG | SG_MITER_ATOMIC);
|
|
||||||
sg_miter_next(&mi);
|
|
||||||
sg_miter_next(&mo);
|
|
||||||
if (!mi.addr || !mo.addr) {
|
|
||||||
dev_err_ratelimited(ss->dev, "ERROR: sg_miter return null\n");
|
|
||||||
err = -EINVAL;
|
|
||||||
goto release_ss;
|
|
||||||
}
|
|
||||||
ileft = areq->cryptlen;
|
ileft = areq->cryptlen;
|
||||||
oleft = areq->cryptlen;
|
oleft = areq->cryptlen;
|
||||||
oi = 0;
|
oi = 0;
|
||||||
|
@ -233,6 +237,16 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq)
|
||||||
|
|
||||||
while (oleft) {
|
while (oleft) {
|
||||||
if (ileft) {
|
if (ileft) {
|
||||||
|
sg_miter_start(&mi, areq->src, sg_nents(areq->src),
|
||||||
|
SG_MITER_FROM_SG | SG_MITER_ATOMIC);
|
||||||
|
if (pi)
|
||||||
|
sg_miter_skip(&mi, pi);
|
||||||
|
miter_err = sg_miter_next(&mi);
|
||||||
|
if (!miter_err || !mi.addr) {
|
||||||
|
dev_err_ratelimited(ss->dev, "ERROR: sg_miter return null\n");
|
||||||
|
err = -EINVAL;
|
||||||
|
goto release_ss;
|
||||||
|
}
|
||||||
/*
|
/*
|
||||||
* todo is the number of consecutive 4byte word that we
|
* todo is the number of consecutive 4byte word that we
|
||||||
* can read from current SG
|
* can read from current SG
|
||||||
|
@ -265,31 +279,38 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (oi == mi.length) {
|
if (oi == mi.length) {
|
||||||
sg_miter_next(&mi);
|
pi += mi.length;
|
||||||
oi = 0;
|
oi = 0;
|
||||||
}
|
}
|
||||||
|
sg_miter_stop(&mi);
|
||||||
}
|
}
|
||||||
|
|
||||||
spaces = readl(ss->base + SS_FCSR);
|
spaces = readl(ss->base + SS_FCSR);
|
||||||
rx_cnt = SS_RXFIFO_SPACES(spaces);
|
rx_cnt = SS_RXFIFO_SPACES(spaces);
|
||||||
tx_cnt = SS_TXFIFO_SPACES(spaces);
|
tx_cnt = SS_TXFIFO_SPACES(spaces);
|
||||||
dev_dbg(ss->dev,
|
|
||||||
"%x %u/%zu %u/%u cnt=%u %u/%zu %u/%u cnt=%u %u\n",
|
|
||||||
mode,
|
|
||||||
oi, mi.length, ileft, areq->cryptlen, rx_cnt,
|
|
||||||
oo, mo.length, oleft, areq->cryptlen, tx_cnt, ob);
|
|
||||||
|
|
||||||
if (!tx_cnt)
|
if (!tx_cnt)
|
||||||
continue;
|
continue;
|
||||||
|
sg_miter_start(&mo, areq->dst, sg_nents(areq->dst),
|
||||||
|
SG_MITER_TO_SG | SG_MITER_ATOMIC);
|
||||||
|
if (po)
|
||||||
|
sg_miter_skip(&mo, po);
|
||||||
|
miter_err = sg_miter_next(&mo);
|
||||||
|
if (!miter_err || !mo.addr) {
|
||||||
|
dev_err_ratelimited(ss->dev, "ERROR: sg_miter return null\n");
|
||||||
|
err = -EINVAL;
|
||||||
|
goto release_ss;
|
||||||
|
}
|
||||||
/* todo in 4bytes word */
|
/* todo in 4bytes word */
|
||||||
todo = min(tx_cnt, oleft / 4);
|
todo = min(tx_cnt, oleft / 4);
|
||||||
todo = min_t(size_t, todo, (mo.length - oo) / 4);
|
todo = min_t(size_t, todo, (mo.length - oo) / 4);
|
||||||
|
|
||||||
if (todo) {
|
if (todo) {
|
||||||
readsl(ss->base + SS_TXFIFO, mo.addr + oo, todo);
|
readsl(ss->base + SS_TXFIFO, mo.addr + oo, todo);
|
||||||
oleft -= todo * 4;
|
oleft -= todo * 4;
|
||||||
oo += todo * 4;
|
oo += todo * 4;
|
||||||
if (oo == mo.length) {
|
if (oo == mo.length) {
|
||||||
sg_miter_next(&mo);
|
po += mo.length;
|
||||||
oo = 0;
|
oo = 0;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -314,12 +335,14 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq)
|
||||||
obo += todo;
|
obo += todo;
|
||||||
oo += todo;
|
oo += todo;
|
||||||
if (oo == mo.length) {
|
if (oo == mo.length) {
|
||||||
|
po += mo.length;
|
||||||
sg_miter_next(&mo);
|
sg_miter_next(&mo);
|
||||||
oo = 0;
|
oo = 0;
|
||||||
}
|
}
|
||||||
} while (obo < obl);
|
} while (obo < obl);
|
||||||
/* bufo must be fully used here */
|
/* bufo must be fully used here */
|
||||||
}
|
}
|
||||||
|
sg_miter_stop(&mo);
|
||||||
}
|
}
|
||||||
if (areq->iv) {
|
if (areq->iv) {
|
||||||
for (i = 0; i < 4 && i < ivsize / 4; i++) {
|
for (i = 0; i < 4 && i < ivsize / 4; i++) {
|
||||||
|
@ -329,8 +352,6 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq)
|
||||||
}
|
}
|
||||||
|
|
||||||
release_ss:
|
release_ss:
|
||||||
sg_miter_stop(&mi);
|
|
||||||
sg_miter_stop(&mo);
|
|
||||||
writel(0, ss->base + SS_CTL);
|
writel(0, ss->base + SS_CTL);
|
||||||
spin_unlock_irqrestore(&ss->slock, flags);
|
spin_unlock_irqrestore(&ss->slock, flags);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue