crypto: omap-sham - fix buffer handling for split test cases (2b352489) · Commits · 戴 / test

Current buffer handling logic fails in a case where the buffer contains existing data from previous update which is divisible by block size. This results in a block size of data to be left missing from the sg list going out to the hw accelerator, ending up in stalling the crypto accelerator driver (the last request never completes fully due to missing data.) Fix this by passing the total size of the data instead of the data size of current request, and also parsing the buffer contents within the prepare request handling. Signed-off-by:

Tero Kristo <t-kristo@ti.com> Signed-off-by:

Herbert Xu <herbert@gondor.apana.org.au>

drivers/crypto/omap-sham.c

+13 −2

Original line number	Diff line number	Diff line
		@@ -740,11 +740,12 @@ static int omap_sham_align_sgs(struct scatterlist *sg,
		struct scatterlist *sg_tmp = sg;
		int new_len;
		int offset = rctx->offset;
		int bufcnt = rctx->bufcnt;

		if (!sg \|\| !sg->length \|\| !nbytes)
		return 0;

		new_len = nbytes - offset;
		new_len = nbytes;

		if (offset)
		list_ok = false;
		@@ -763,6 +764,16 @@ static int omap_sham_align_sgs(struct scatterlist *sg,
		while (nbytes > 0 && sg_tmp) {
		n++;

		if (bufcnt) {
		if (!IS_ALIGNED(bufcnt, bs)) {
		aligned = false;
		break;
		}
		nbytes -= bufcnt;
		bufcnt = 0;
		continue;
		}

		#ifdef CONFIG_ZONE_DMA
		if (page_zonenum(sg_page(sg_tmp)) != ZONE_DMA) {
		aligned = false;
		@@ -859,7 +870,7 @@ static int omap_sham_prepare_request(struct ahash_request *req, bool update)
		if (rctx->bufcnt)
		memcpy(rctx->dd->xmit_buf, rctx->buffer, rctx->bufcnt);

		ret = omap_sham_align_sgs(req->src, nbytes, bs, final, rctx);
		ret = omap_sham_align_sgs(req->src, rctx->total, bs, final, rctx);
		if (ret)
		return ret;

Admin message