From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 21C021494B2; Fri, 6 Dec 2024 14:52:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733496728; cv=none; b=na92KtuSyPlqg+AekR9CJ41LpoB1yV50gkqP5qm3q3bjyAorvCTMA6dE0mzmBeLmxrLFRhgqPZAV1I/lXFho97uLq+hlv5tuPp2aIUFfkHPvu5UmFKZq9G/200oZOrXQmQxf/hJSDTjaIPe6tbDw0WqTtj50BpOxHX8gAfZdHI4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733496728; c=relaxed/simple; bh=dkUjxb37JtpL431IblSYkJbfsbFRgLUWONsrGrGcC8s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OTtZd7pVFd2lw3HcUjvRaPo+HQwfx861063AfaiNkgavwofhrnOtiSdJ1CcrBtyEgqQrfuJq3cmkpE9VeNkS/VXI57voQH56/0YJ6u00oIW3EqlbgihuRGNd7LxMrpmncrKEGEQd4bhanYCooXKyHzca7Sh5QergwJm0eIQHl18= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=U+kz5Ixv; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="U+kz5Ixv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 83736C4CED1; Fri, 6 Dec 2024 14:52:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1733496728; bh=dkUjxb37JtpL431IblSYkJbfsbFRgLUWONsrGrGcC8s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U+kz5Ixvbj4Ny21VHrT+OP3dgOKJb/AdVBiCaZ7Nq5hsPSOlVG0nTh/KCV3uPvTl1 RVgfRJg2WpkTlyFdsMfPYcOch661W2JQznoWFbrzBuWZW8YEQ127YrIWuVOfn8AcD3 rGkTsLGe6KD8zufXRF6VgENiSPoYJGudWTr8QZeo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yi Yang , Herbert Xu , Sasha Levin Subject: [PATCH 6.6 087/676] crypto: pcrypt - Call crypto layer directly when padata_do_parallel() return -EBUSY Date: Fri, 6 Dec 2024 15:28:26 +0100 Message-ID: <20241206143656.759350429@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241206143653.344873888@linuxfoundation.org> References: <20241206143653.344873888@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yi Yang [ Upstream commit 662f2f13e66d3883b9238b0b96b17886179e60e2 ] Since commit 8f4f68e788c3 ("crypto: pcrypt - Fix hungtask for PADATA_RESET"), the pcrypt encryption and decryption operations return -EAGAIN when the CPU goes online or offline. In alg_test(), a WARN is generated when pcrypt_aead_decrypt() or pcrypt_aead_encrypt() returns -EAGAIN, the unnecessary panic will occur when panic_on_warn set 1. Fix this issue by calling crypto layer directly without parallelization in that case. Fixes: 8f4f68e788c3 ("crypto: pcrypt - Fix hungtask for PADATA_RESET") Signed-off-by: Yi Yang Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- crypto/pcrypt.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c index d0d954fe9d54f..7fc79e7dce44a 100644 --- a/crypto/pcrypt.c +++ b/crypto/pcrypt.c @@ -117,8 +117,10 @@ static int pcrypt_aead_encrypt(struct aead_request *req) err = padata_do_parallel(ictx->psenc, padata, &ctx->cb_cpu); if (!err) return -EINPROGRESS; - if (err == -EBUSY) - return -EAGAIN; + if (err == -EBUSY) { + /* try non-parallel mode */ + return crypto_aead_encrypt(creq); + } return err; } @@ -166,8 +168,10 @@ static int pcrypt_aead_decrypt(struct aead_request *req) err = padata_do_parallel(ictx->psdec, padata, &ctx->cb_cpu); if (!err) return -EINPROGRESS; - if (err == -EBUSY) - return -EAGAIN; + if (err == -EBUSY) { + /* try non-parallel mode */ + return crypto_aead_decrypt(creq); + } return err; } -- 2.43.0