[PATCH RT 0/1] Linux v4.19.306-rt132-rc1

[PATCH RT 0/1] Linux v4.19.306-rt132-rc1

[Daniel Wagner]

Dear RT Folks,

This is the RT stable review cycle of patch 4.19.306-rt132-rc1.

I reverted one -rt specific commit to be able to merge the 4.19.306
release:

  0cb152421350 ("crypto: scompress - serialize RT percpu scratch buffer access with a local lock")

because the stable backport

  f8f261f9ade2 ("crypto: scompress - Use per-CPU struct instead multiple variables")

seems to make the downstream -rt fix unnecessary.


Please scream at me if I messed something up. Please test the patches
too.

The -rc release is also available on kernel.org

  https://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt.git

on the v4.19-rt-next branch.

If all goes well, this patch will be converted to the next main
release on 2024-02-09.

Signing key fingerprint:

  5BF6 7BC5 0826 72CA BB45  ACAE 587C 5ECA 5D0A 306C

All keys used for the above files and repositories can be found on the
following git repository:

   git://git.kernel.org/pub/scm/docs/kernel/pgpkeys.git

Enjoy!
Daniel

[PATCH] Revert "crypto: scompress - serialize RT percpu scratch buffer access with a local lock"

[Daniel Wagner]

This reverts commit 0cb152421350004d4dcf3a4523d88c002d0a7973.

The stable backport f8f261f9ade2 ("crypto: scompress - Use per-CPU
struct instead multiple variables") replaces this downstream workaround.

Signed-off-by: Daniel Wagner <wagi@monom.org>
---
 crypto/scompress.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/crypto/scompress.c b/crypto/scompress.c
index c2f0077e0801..968bbcf65c94 100644
--- a/crypto/scompress.c
+++ b/crypto/scompress.c
@@ -24,7 +24,6 @@
 #include <linux/cryptouser.h>
 #include <net/netlink.h>
 #include <linux/scatterlist.h>
-#include <linux/locallock.h>
 #include <crypto/scatterwalk.h>
 #include <crypto/internal/acompress.h>
 #include <crypto/internal/scompress.h>
@@ -35,7 +34,6 @@ static void * __percpu *scomp_src_scratches;
 static void * __percpu *scomp_dst_scratches;
 static int scomp_scratch_users;
 static DEFINE_MUTEX(scomp_lock);
-static DEFINE_LOCAL_IRQ_LOCK(scomp_scratches_lock);
 
 #ifdef CONFIG_NET
 static int crypto_scomp_report(struct sk_buff *skb, struct crypto_alg *alg)
@@ -148,7 +146,7 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir)
 	void **tfm_ctx = acomp_tfm_ctx(tfm);
 	struct crypto_scomp *scomp = *tfm_ctx;
 	void **ctx = acomp_request_ctx(req);
-	const int cpu = local_lock_cpu(scomp_scratches_lock);
+	const int cpu = get_cpu();
 	u8 *scratch_src = *per_cpu_ptr(scomp_src_scratches, cpu);
 	u8 *scratch_dst = *per_cpu_ptr(scomp_dst_scratches, cpu);
 	int ret;
@@ -183,7 +181,7 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir)
 					 1);
 	}
 out:
-	local_unlock_cpu(scomp_scratches_lock);
+	put_cpu();
 	return ret;
 }
 
-- 
2.43.0

Re: [PATCH RT 0/1] Linux v4.19.306-rt132-rc1

[Sebastian Andrzej Siewior]

On 2024-02-02 18:04:56 [+0100], Daniel Wagner wrote:
> Dear RT Folks,
Hi,

> This is the RT stable review cycle of patch 4.19.306-rt132-rc1.
…
> Please scream at me if I messed something up. Please test the patches
> too.

Good.

> Enjoy!
> Daniel

Sebastian