Commit b0e3dd79 authored Dec 18, 2023 by Tom Zanussi Committed by Xiaochen Shen Jun 18, 2024

crypto: iaa - Change desc->priv to 0

mainline inclusion
from mainline-v6.8-rc1
commit 98bb0dd15133a66ce4d1079193367c536b9e3fec
category: bugfix
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I9TA1S
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=98bb0dd15133a66ce4d1079193367c536b9e3fec



--------------------------------

In order for shared workqeues to work properly, desc->priv should be
set to 0 rather than 1.  The need for this is described in commit
f5ccf55e (dmaengine/idxd: Re-enable kernel workqueue under DMA
API), so we need to make IAA consistent with IOMMU settings, otherwise
we get:

  [  141.948389] IOMMU: dmar15: Page request in Privilege Mode
  [  141.948394] dmar15: Invalid page request: 2000026a100101 ffffb167

Dedicated workqueues ignore this field and are unaffected.

Intel-SIG: commit 98bb0dd15133 crypto: iaa - Change desc->priv to 0.
Backporting patches for Intel IAA crypto driver on Intel Xeon platform.

Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
Reviewed-by: Fenghua Yu <fenghua.yu@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Xiaochen Shen <xiaochen.shen@intel.com>

parent 8769a6fe

drivers/crypto/intel/iaa/iaa_crypto_main.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -484,7 +484,7 @@ static int decompress_header(struct iaa_device_compression_mode *device_mode,

		desc->decompr_flags = mode->gen_decomp_table_flags;

		desc->priv = 1;
		desc->priv = 0;

		desc->completion_addr = idxd_desc->compl_dma;

		@@ -1255,7 +1255,7 @@ static int iaa_compress(struct crypto_tfm tfm, struct acomp_req req,
		IDXD_OP_FLAG_RD_SRC2_AECS \| IDXD_OP_FLAG_CC;
		desc->opcode = IAX_OPCODE_COMPRESS;
		desc->compr_flags = IAA_COMP_FLAGS;
		desc->priv = 1;
		desc->priv = 0;

		desc->src1_addr = (u64)src_addr;
		desc->src1_size = slen;
		@@ -1409,7 +1409,7 @@ static int iaa_compress_verify(struct crypto_tfm tfm, struct acomp_req req,
		desc->flags = IDXD_OP_FLAG_CRAV \| IDXD_OP_FLAG_RCR \| IDXD_OP_FLAG_CC;
		desc->opcode = IAX_OPCODE_DECOMPRESS;
		desc->decompr_flags = IAA_DECOMP_FLAGS \| IAA_DECOMP_SUPPRESS_OUTPUT;
		desc->priv = 1;
		desc->priv = 0;

		desc->src1_addr = (u64)dst_addr;
		desc->src1_size = *dlen;
		@@ -1495,7 +1495,7 @@ static int iaa_decompress(struct crypto_tfm tfm, struct acomp_req req,
		desc->opcode = IAX_OPCODE_DECOMPRESS;
		desc->max_dst_size = PAGE_SIZE;
		desc->decompr_flags = IAA_DECOMP_FLAGS;
		desc->priv = 1;
		desc->priv = 0;

		desc->src1_addr = (u64)src_addr;
		desc->dst_addr = (u64)dst_addr;