6.1.30-rc1 review
Subsystems (6)
Greg Kroah-Hartman
maintainerPATCH 285/292 arm64: mte: Do not set PG_mte_tagged if tags were not initialized
In reply to Greg Kroah-HartmanFrom: Peter Collingbourne <[email protected]>
commit c4c597f1b367433c52c531dccd6859a39b4580fb upstream.
The mte_sync_page_tags() function sets PG_mte_tagged if it initializes page tags. Then we return to mte_sync_tags(), which sets PG_mte_tagged again. At best, this is redundant. However, it is possible for mte_sync_page_tags() to return without having initialized tags for the page, i.e. in the case where check_swap is true (non-compound page), is_swap_pte(old_pte) is false and pte_is_tagged is false. So at worst, we set PG_mte_tagged on a page with uninitialized tags. This can happen if, for example, page migration causes a PTE for an untagged page to be replaced. If the userspace program subsequently uses mprotect() to enable PROT_MTE for that page, the uninitialized tags will be exposed to userspace.
Fix it by removing the redundant call to set_page_mte_tagged().
--- arch/arm64/kernel/mte.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
arch/arm64/kernel/mte.c +2 -5
@@ -72,13 +72,10 @@ void mte_sync_tags(pte_t old_pte, pte_treturn ;/* if PG_mte_tagged is set, tags have already been initialised */ -for (i =0 ; i < nr_pages; i++, page++) { -if (!page_mte_tagged (page)) { +for (i =0 ; i < nr_pages; i++, page++) +if (!page_mte_tagged (page))mte_sync_page_tags (page, old_pte, check_swap, pte_is_tagged); -set_page_mte_tagged (page); - } - }/* ensure the tags are visible before the PTE is set */ smp_wmb ();
Greg Kroah-Hartman
maintainerPATCH 286/292 rethook: use preempt_{disable, enable}_notrace in rethook_trampoline_handler
In reply to Greg Kroah-HartmanFrom: Ze Gao <[email protected]>
commit be243bacfb25f5219f2396d787408e8cf1301dd1 upstream.
This patch replaces preempt_{disable, enable} with its corresponding notrace version in rethook_trampoline_handler so no worries about stack recursion or overflow introduced by preempt_count_{add, sub} under fprobe + rethook context.
--- kernel/trace/rethook.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/trace/rethook.c +2 -2
@@ -288,7 +288,7 @@ unsigned long rethook_trampoline_handler* These loops must be protected from rethook_free_rcu() because those * are accessing 'rhn->rethook'. */ -preempt_disable (); +preempt_disable_notrace ();/* * Run the handler on the shadow stack. Do not unlink the list here because
@@ -321,7 +321,7 @@ unsigned long rethook_trampoline_handler first = first->next;rethook_recycle (rhn); } -preempt_enable (); +preempt_enable_notrace ();return correct_ret_addr; }
Greg Kroah-Hartman
maintainerPATCH 287/292 rethook, fprobe: do not trace rethook related functions
In reply to Greg Kroah-HartmanFrom: Ze Gao <[email protected]>
commit 571a2a50a8fc546145ffd3bf673547e9fe128ed2 upstream.
These functions are already marked as NOKPROBE to prevent recursion and we have the same reason to blacklist them if rethook is used with fprobe, since they are beyond the recursion-free region ftrace can guard.
--- arch/riscv/kernel/probes/Makefile | 2 ++ arch/s390/kernel/Makefile | 1 + arch/x86/kernel/Makefile | 1 + 3 files changed, 4 insertions(+)
arch/riscv/kernel/probes/Makefile +2 -0
@@ -4,3 +4,5 @@ obj-$(CONFIG_KPROBES) += kprobes_trampo obj-$(CONFIG_KPROBES_ON_FTRACE) += ftrace.o obj-$(CONFIG_UPROBES) += uprobes.o decode-insn.o simulate-insn.o CFLAGS_REMOVE_simulate-insn.o = $(CC_FLAGS_FTRACE) +CFLAGS_REMOVE_rethook.o = $(CC_FLAGS_FTRACE) +CFLAGS_REMOVE_rethook_trampoline.o = $(CC_FLAGS_FTRACE)
arch/s390/kernel/Makefile +1 -0
@@ -10,6 +10,7 @@ CFLAGS_REMOVE_ftrace.o = $(CC_FLAGS_FTR # Do not trace early setup code CFLAGS_REMOVE_early.o = $(CC_FLAGS_FTRACE) +CFLAGS_REMOVE_rethook.o = $(CC_FLAGS_FTRACE) endif
arch/x86/kernel/Makefile +1 -0
@@ -17,6 +17,7 @@ CFLAGS_REMOVE_ftrace.o = -pg CFLAGS_REMOVE_early_printk.o = -pg CFLAGS_REMOVE_head64.o = -pg CFLAGS_REMOVE_sev.o = -pg +CFLAGS_REMOVE_rethook.o = -pg endif KASAN_SANITIZE_head$(BITS).o := n
Greg Kroah-Hartman
maintainerPATCH 288/292 remoteproc: imx_dsp_rproc: Fix kernel test robot sparse warning
In reply to Greg Kroah-HartmanFrom: Mathieu Poirier <[email protected]>
[ Upstream commit 3c497f624d40171ebead1a6705793100d92ecb85 ]
This patch fixes the kernel test robot warning reported here:
https://lore.kernel.org/bpf/642f916b.pPIKZ%2Fl%2F%2Fbw8tvIH%[email protected]/T/
--- drivers/remoteproc/imx_dsp_rproc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/remoteproc/imx_dsp_rproc.c +4 -4
@@ -727,12 +727,12 @@ static void imx_dsp_rproc_kick(struct rproc *rproc, int vqid)* The IRAM is part of the HiFi DSP. * According to hw specs only 32-bits writes are allowed. */ -static int imx_dsp_rproc_memcpy (void *dest,const void *src,size_t size) +static int imx_dsp_rproc_memcpy (void *dst,const void *src,size_t size) { +void __iomem *dest = (void __iomem *)dst;const u8 *src_byte = src;const u32 *source = src;u32 affected_mask; -u32 *dst = dest;int i, q, r;u32 tmp;
@@ -745,7 +745,7 @@ static int imx_dsp_rproc_memcpy(void *dest, const void *src, size_t size)/* copy data in units of 32 bits at a time */ for (i =0 ; i < q; i++) -writel (source[i], &dst[i]); +writel (source[i], dest + i *4 );if (r) { affected_mask =GENMASK (8 * r,0 );
@@ -776,8 +776,8 @@ static int imx_dsp_rproc_memcpy(void *dest, const void *src, size_t size)*/ static int imx_dsp_rproc_memset (void *addr,u8 value,size_t size) { +void __iomem *tmp_dst = (void __iomem *)addr;u32 tmp_val = value; -u32 *tmp_dst = addr;u32 affected_mask;int q, r;u32 tmp;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 289/292 crypto: testmgr - fix RNG performance in fuzz tests
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
commit f900fde28883602b6c5e1027a6c912b673382aaf upstream.
The performance of the crypto fuzz tests has greatly regressed since v5.18. When booting a kernel on an arm64 dev board with all software crypto algorithms and CONFIG_CRYPTO_MANAGER_EXTRA_TESTS enabled, the fuzz tests now take about 200 seconds to run, or about 325 seconds with lockdep enabled, compared to about 5 seconds before.
The root cause is that the random number generation has become much slower due to commit d4150779e60f ("random32: use real rng for non-deterministic randomness"). On my same arm64 dev board, at the time the fuzz tests are run, get_random_u8() is about 345x slower than prandom_u32_state(), or about 469x if lockdep is enabled.
Lockdep makes a big difference, but much of the rest comes from the get_random_*() functions taking a *very* slow path when the CRNG is not yet initialized. Since the crypto self-tests run early during boot, even having a hardware RNG driver enabled (CONFIG_CRYPTO_DEV_QCOM_RNG in my case) doesn't prevent this. x86 systems don't have this issue, but they still see a significant regression if lockdep is enabled.
Converting the "Fully random bytes" case in generate_random_bytes() to use get_random_bytes() helps significantly, improving the test time to about 27 seconds. But that's still over 5x slower than before.
This is all a bit silly, though, since the fuzz tests don't actually need cryptographically secure random numbers. So let's just make them use a non-cryptographically-secure RNG as they did before. The original prandom_u32() is gone now, so let's use prandom_u32_state() instead, with an explicitly managed state, like various other self-tests in the kernel source tree (rbtree_test.c, test_scanf.c, etc.) already do. This also has the benefit that no locking is required anymore, so performance should be even better than the original version that used prandom_u32().
--- crypto/testmgr.c | 266 ++++++++++++++++++++++++++++++----------------- 1 file changed, 169 insertions(+), 97 deletions(-)
crypto/testmgr.c +169 -97
@@ -852,12 +852,50 @@ static int prepare_keybuf(const u8 *key, unsigned int ksize,#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS +/* +* The fuzz tests use prandom instead of the normal Linux RNG since they don't +* need cryptographically secure random numbers. This greatly improves the +* performance of these tests, especially if they are run before the Linux RNG +* has been initialized or if they are run on a lockdep-enabled kernel. +*/ + +static inline void init_rnd_state (struct rnd_state *rng) +{ +prandom_seed_state (rng,get_random_u64 ()); +} + +static inline u8 prandom_u8 (struct rnd_state *rng) +{ +return prandom_u32_state (rng); +} + +static inline u32 prandom_u32_below (struct rnd_state *rng,u32 ceil) +{ +/* +* This is slightly biased for non-power-of-2 values of 'ceil', but this +* isn't important here. +*/ +return prandom_u32_state (rng) % ceil; +} + +static inline bool prandom_bool (struct rnd_state *rng) +{ +return prandom_u32_below (rng,2 ); +} + +static inline u32 prandom_u32_inclusive (struct rnd_state *rng, +u32 floor,u32 ceil) +{ +return floor +prandom_u32_below (rng, ceil - floor +1 ); +} +/* Generate a random length in range [0, max_len], but prefer smaller values */ -static unsigned int generate_random_length (unsigned int max_len) +static unsigned int generate_random_length (struct rnd_state *rng, +unsigned int max_len) { -unsigned int len =prandom_u32_max (max_len +1 ); +unsigned int len =prandom_u32_below (rng, max_len +1 ); -switch (prandom_u32_max (4 )) { +switch (prandom_u32_below (rng,4 )) {case 0 :return len %64 ;case 1 :
@@ -870,43 +908,44 @@ static unsigned int generate_random_length(unsigned int max_len) }/* Flip a random bit in the given nonempty data buffer */ -static void flip_random_bit (u8 *buf,size_t size) +static void flip_random_bit (struct rnd_state *rng,u8 *buf,size_t size) {size_t bitpos; - bitpos =prandom_u32_max (size *8 ); + bitpos =prandom_u32_below (rng, size *8 ); buf[bitpos /8 ] ^=1 << (bitpos %8 ); }/* Flip a random byte in the given nonempty data buffer */ -static void flip_random_byte (u8 *buf,size_t size) +static void flip_random_byte (struct rnd_state *rng,u8 *buf,size_t size) { - buf[prandom_u32_max (size)] ^=0xff ; + buf[prandom_u32_below (rng, size)] ^=0xff ; }/* Sometimes make some random changes to the given nonempty data buffer */ -static void mutate_buffer (u8 *buf,size_t size) +static void mutate_buffer (struct rnd_state *rng,u8 *buf,size_t size) {size_t num_flips;size_t i;/* Sometimes flip some bits */ -if (prandom_u32_max (4 ) ==0 ) { - num_flips =min_t (size_t,1 <<prandom_u32_max (8 ), size *8 ); +if (prandom_u32_below (rng,4 ) ==0 ) { + num_flips =min_t (size_t,1 <<prandom_u32_below (rng,8 ), + size *8 );for (i =0 ; i < num_flips; i++) -flip_random_bit (buf, size); +flip_random_bit (rng, buf, size); }/* Sometimes flip some bytes */ -if (prandom_u32_max (4 ) ==0 ) { - num_flips =min_t (size_t,1 <<prandom_u32_max (8 ), size); +if (prandom_u32_below (rng,4 ) ==0 ) { + num_flips =min_t (size_t,1 <<prandom_u32_below (rng,8 ), size);for (i =0 ; i < num_flips; i++) -flip_random_byte (buf, size); +flip_random_byte (rng, buf, size); } }/* Randomly generate 'count' bytes, but sometimes make them "interesting" */ -static void generate_random_bytes (u8 *buf,size_t count) +static void generate_random_bytes (struct rnd_state *rng,u8 *buf,size_t count) {u8 b;u8 increment;
@@ -915,11 +954,11 @@ static void generate_random_bytes(u8 *buf, size_t count)if (count ==0 )return ; -switch (prandom_u32_max (8 )) {/* Choose a generation strategy */ +switch (prandom_u32_below (rng,8 )) {/* Choose a generation strategy */ case 0 :case 1 :/* All the same byte, plus optional mutations */ -switch (prandom_u32_max (4 )) { +switch (prandom_u32_below (rng,4 )) {case 0 : b =0x00 ;break ;
@@ -927,28 +966,28 @@ static void generate_random_bytes(u8 *buf, size_t count) b =0xff ;break ;default : - b =get_random_u8 (); + b =prandom_u8 (rng);break ; }memset (buf, b, count); -mutate_buffer (buf, count); +mutate_buffer (rng, buf, count);break ;case 2 :/* Ascending or descending bytes, plus optional mutations */ - increment =get_random_u8 (); - b =get_random_u8 (); + increment =prandom_u8 (rng); + b =prandom_u8 (rng);for (i =0 ; i < count; i++, b += increment) buf[i] = b; -mutate_buffer (buf, count); +mutate_buffer (rng, buf, count);break ;default :/* Fully random bytes */ -for (i =0 ; i < count; i++) - buf[i] =get_random_u8 (); +prandom_bytes_state (rng, buf, count); } } -static char *generate_random_sgl_divisions (struct test_sg_division *divs, +static char *generate_random_sgl_divisions (struct rnd_state *rng, +struct test_sg_division *divs,size_t max_divs,char *p,char *end,bool gen_flushes,u32 req_flags) {
@@ -959,24 +998,26 @@ static char *generate_random_sgl_divisions(struct test_sg_division *divs,unsigned int this_len;const char *flushtype_str; -if (div == &divs[max_divs -1 ] ||prandom_u32_max (2 ) ==0 ) +if (div == &divs[max_divs -1 ] ||prandom_bool (rng)) this_len = remaining;else - this_len =1 +prandom_u32_max (remaining); + this_len =prandom_u32_inclusive (rng,1 , remaining); div->proportion_of_total = this_len; -if (prandom_u32_max (4 ) ==0 ) - div->offset = (PAGE_SIZE -128 ) +prandom_u32_max (128 ); -else if (prandom_u32_max (2 ) ==0 ) - div->offset =prandom_u32_max (32 ); +if (prandom_u32_below (rng,4 ) ==0 ) + div->offset =prandom_u32_inclusive (rng, +PAGE_SIZE -128 , +PAGE_SIZE -1 ); +else if (prandom_bool (rng)) + div->offset =prandom_u32_below (rng,32 );else - div->offset =prandom_u32_max (PAGE_SIZE ); -if (prandom_u32_max (8 ) ==0 ) + div->offset =prandom_u32_below (rng,PAGE_SIZE ); +if (prandom_u32_below (rng,8 ) ==0 ) div->offset_relative_to_alignmask = true; div->flush_type =FLUSH_TYPE_NONE ;if (gen_flushes) { -switch (prandom_u32_max (4 )) { +switch (prandom_u32_below (rng,4 )) {case 0 : div->flush_type =FLUSH_TYPE_REIMPORT ;break ;
@@ -988,7 +1029,7 @@ static char *generate_random_sgl_divisions(struct test_sg_division *divs,if (div->flush_type !=FLUSH_TYPE_NONE && !(req_flags &CRYPTO_TFM_REQ_MAY_SLEEP ) && -prandom_u32_max (2 ) ==0 ) +prandom_bool (rng)) div->nosimd = true;switch (div->flush_type) {
@@ -1023,7 +1064,8 @@ static char *generate_random_sgl_divisions(struct test_sg_division *divs, }/* Generate a random testvec_config for fuzz testing */ -static void generate_random_testvec_config (struct testvec_config *cfg, +static void generate_random_testvec_config (struct rnd_state *rng, +struct testvec_config *cfg,char *name,size_t max_namelen) {char *p = name;
@@ -1035,7 +1077,7 @@ static void generate_random_testvec_config(struct testvec_config *cfg, p +=scnprintf (p, end - p,"random:" ); -switch (prandom_u32_max (4 )) { +switch (prandom_u32_below (rng,4 )) {case 0 :case 1 : cfg->inplace_mode =OUT_OF_PLACE ;
@@ -1050,12 +1092,12 @@ static void generate_random_testvec_config(struct testvec_config *cfg,break ; } -if (prandom_u32_max (2 ) ==0 ) { +if (prandom_bool (rng)) { cfg->req_flags |=CRYPTO_TFM_REQ_MAY_SLEEP ; p +=scnprintf (p, end - p," may_sleep" ); } -switch (prandom_u32_max (4 )) { +switch (prandom_u32_below (rng,4 )) {case 0 : cfg->finalization_type =FINALIZATION_TYPE_FINAL ; p +=scnprintf (p, end - p," use_final" );
@@ -1070,36 +1112,37 @@ static void generate_random_testvec_config(struct testvec_config *cfg,break ; } -if (!(cfg->req_flags &CRYPTO_TFM_REQ_MAY_SLEEP ) && -prandom_u32_max (2 ) ==0 ) { +if (!(cfg->req_flags &CRYPTO_TFM_REQ_MAY_SLEEP ) &&prandom_bool (rng)) { cfg->nosimd = true; p +=scnprintf (p, end - p," nosimd" ); } p +=scnprintf (p, end - p," src_divs=[" ); - p =generate_random_sgl_divisions (cfg->src_divs, + p =generate_random_sgl_divisions (rng, cfg->src_divs,ARRAY_SIZE (cfg->src_divs), p, end, (cfg->finalization_type !=FINALIZATION_TYPE_DIGEST ), cfg->req_flags); p +=scnprintf (p, end - p,"]" ); -if (cfg->inplace_mode ==OUT_OF_PLACE &&prandom_u32_max (2 ) ==0 ) { +if (cfg->inplace_mode ==OUT_OF_PLACE &&prandom_bool (rng)) { p +=scnprintf (p, end - p," dst_divs=[" ); - p =generate_random_sgl_divisions (cfg->dst_divs, + p =generate_random_sgl_divisions (rng, cfg->dst_divs,ARRAY_SIZE (cfg->dst_divs), p, end, false, cfg->req_flags); p +=scnprintf (p, end - p,"]" ); } -if (prandom_u32_max (2 ) ==0 ) { - cfg->iv_offset =1 +prandom_u32_max (MAX_ALGAPI_ALIGNMASK ); +if (prandom_bool (rng)) { + cfg->iv_offset =prandom_u32_inclusive (rng,1 , +MAX_ALGAPI_ALIGNMASK ); p +=scnprintf (p, end - p," iv_offset=%u" , cfg->iv_offset); } -if (prandom_u32_max (2 ) ==0 ) { - cfg->key_offset =1 +prandom_u32_max (MAX_ALGAPI_ALIGNMASK ); +if (prandom_bool (rng)) { + cfg->key_offset =prandom_u32_inclusive (rng,1 , +MAX_ALGAPI_ALIGNMASK ); p +=scnprintf (p, end - p," key_offset=%u" , cfg->key_offset); }
@@ -1612,11 +1655,14 @@ static int test_hash_vec(const struct hash_testvec *vec, unsigned int vec_num,#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS if (!noextratests) { +struct rnd_state rng;struct testvec_config cfg;char cfgname[TESTVEC_CONFIG_NAMELEN ]; +init_rnd_state (&rng); +for (i =0 ; i < fuzz_iterations; i++) { -generate_random_testvec_config (&cfg, cfgname, +generate_random_testvec_config (&rng, &cfg, cfgname,sizeof (cfgname)); err =test_hash_vec_cfg (vec, vec_name, &cfg, req, desc, tsgl, hashstate);
@@ -1634,15 +1680,16 @@ static int test_hash_vec(const struct hash_testvec *vec, unsigned int vec_num,* Generate a hash test vector from the given implementation. * Assumes the buffers in 'vec' were already allocated. */ -static void generate_random_hash_testvec (struct shash_desc *desc, +static void generate_random_hash_testvec (struct rnd_state *rng, +struct shash_desc *desc,struct hash_testvec *vec,unsigned int maxkeysize,unsigned int maxdatasize,char *name,size_t max_namelen) {/* Data */ - vec->psize =generate_random_length (maxdatasize); -generate_random_bytes ((u8 *)vec->plaintext, vec->psize); + vec->psize =generate_random_length (rng, maxdatasize); +generate_random_bytes (rng, (u8 *)vec->plaintext, vec->psize);/* * Key: length in range [1, maxkeysize], but usually choose maxkeysize.
@@ -1652,9 +1699,9 @@ static void generate_random_hash_testvec(struct shash_desc *desc, vec->ksize =0 ;if (maxkeysize) { vec->ksize = maxkeysize; -if (prandom_u32_max (4 ) ==0 ) - vec->ksize =1 +prandom_u32_max (maxkeysize); -generate_random_bytes ((u8 *)vec->key, vec->ksize); +if (prandom_u32_below (rng,4 ) ==0 ) + vec->ksize =prandom_u32_inclusive (rng,1 , maxkeysize); +generate_random_bytes (rng, (u8 *)vec->key, vec->ksize); vec->setkey_error =crypto_shash_setkey (desc->tfm, vec->key, vec->ksize);
@@ -1688,6 +1735,7 @@ static int test_hash_vs_generic_impl(const char *generic_driver,const unsigned int maxdatasize = (2 *PAGE_SIZE ) -TESTMGR_POISON_LEN ;const char *algname =crypto_hash_alg_common (tfm)->base.cra_name;const char *driver =crypto_ahash_driver_name (tfm); +struct rnd_state rng;char _generic_driver[CRYPTO_MAX_ALG_NAME ];struct crypto_shash *generic_tfm =NULL ;struct shash_desc *generic_desc =NULL ;
@@ -1701,6 +1749,8 @@ static int test_hash_vs_generic_impl(const char *generic_driver,if (noextratests)return 0 ; +init_rnd_state (&rng); +if (!generic_driver) {/* Use default naming convention? */ err =build_generic_driver_name (algname, _generic_driver);if (err)
@@ -1769,10 +1819,11 @@ static int test_hash_vs_generic_impl(const char *generic_driver, }for (i =0 ; i < fuzz_iterations *8 ; i++) { -generate_random_hash_testvec (generic_desc, &vec, +generate_random_hash_testvec (&rng, generic_desc, &vec, maxkeysize, maxdatasize, vec_name,sizeof (vec_name)); -generate_random_testvec_config (cfg, cfgname,sizeof (cfgname)); +generate_random_testvec_config (&rng, cfg, cfgname, +sizeof (cfgname)); err =test_hash_vec_cfg (&vec, vec_name, cfg, req, desc, tsgl, hashstate);
@@ -2174,11 +2225,14 @@ static int test_aead_vec(int enc, const struct aead_testvec *vec,#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS if (!noextratests) { +struct rnd_state rng;struct testvec_config cfg;char cfgname[TESTVEC_CONFIG_NAMELEN ]; +init_rnd_state (&rng); +for (i =0 ; i < fuzz_iterations; i++) { -generate_random_testvec_config (&cfg, cfgname, +generate_random_testvec_config (&rng, &cfg, cfgname,sizeof (cfgname)); err =test_aead_vec_cfg (enc, vec, vec_name, &cfg, req, tsgls);
@@ -2194,6 +2248,7 @@ static int test_aead_vec(int enc, const struct aead_testvec *vec, #ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS struct aead_extra_tests_ctx { + struct rnd_state rng; struct aead_request *req; struct crypto_aead *tfm; const struct alg_test_desc *test_desc;
@@ -2212,24 +2267,26 @@ struct aead_extra_tests_ctx {* here means the full ciphertext including the authentication tag. The * authentication tag (and hence also the ciphertext) is assumed to be nonempty. */ -static void mutate_aead_message (struct aead_testvec *vec,bool aad_iv, +static void mutate_aead_message (struct rnd_state *rng, +struct aead_testvec *vec,bool aad_iv,unsigned int ivsize) {const unsigned int aad_tail_size = aad_iv ? ivsize :0 ;const unsigned int authsize = vec->clen - vec->plen; -if (prandom_u32_max (2 ) ==0 && vec->alen > aad_tail_size) { +if (prandom_bool (rng) && vec->alen > aad_tail_size) {/* Mutate the AAD */ -flip_random_bit ((u8 *)vec->assoc, vec->alen - aad_tail_size); -if (prandom_u32_max (2 ) ==0 ) +flip_random_bit (rng, (u8 *)vec->assoc, + vec->alen - aad_tail_size); +if (prandom_bool (rng))return ; } -if (prandom_u32_max (2 ) ==0 ) { +if (prandom_bool (rng)) {/* Mutate auth tag (assuming it's at the end of ciphertext) */ -flip_random_bit ((u8 *)vec->ctext + vec->plen, authsize); +flip_random_bit (rng, (u8 *)vec->ctext + vec->plen, authsize); }else {/* Mutate any part of the ciphertext */ -flip_random_bit ((u8 *)vec->ctext, vec->clen); +flip_random_bit (rng, (u8 *)vec->ctext, vec->clen); } }
@@ -2240,7 +2297,8 @@ static void mutate_aead_message(struct aead_testvec *vec, bool aad_iv,*/ #define MIN_COLLISION_FREE_AUTHSIZE 8 -static void generate_aead_message (struct aead_request *req, +static void generate_aead_message (struct rnd_state *rng, +struct aead_request *req,const struct aead_test_suite *suite,struct aead_testvec *vec,bool prefer_inauthentic)
@@ -2249,17 +2307,18 @@ static void generate_aead_message(struct aead_request *req,const unsigned int ivsize =crypto_aead_ivsize (tfm);const unsigned int authsize = vec->clen - vec->plen;const bool inauthentic = (authsize >=MIN_COLLISION_FREE_AUTHSIZE ) && - (prefer_inauthentic ||prandom_u32_max (4 ) ==0 ); + (prefer_inauthentic || +prandom_u32_below (rng,4 ) ==0 );/* Generate the AAD. */ -generate_random_bytes ((u8 *)vec->assoc, vec->alen); +generate_random_bytes (rng, (u8 *)vec->assoc, vec->alen);if (suite->aad_iv && vec->alen >= ivsize)/* Avoid implementation-defined behavior. */ memcpy ((u8 *)vec->assoc + vec->alen - ivsize, vec->iv, ivsize); -if (inauthentic &&prandom_u32_max (2 ) ==0 ) { +if (inauthentic &&prandom_bool (rng)) {/* Generate a random ciphertext. */ -generate_random_bytes ((u8 *)vec->ctext, vec->clen); +generate_random_bytes (rng, (u8 *)vec->ctext, vec->clen); }else {int i =0 ;struct scatterlist src[2 ], dst;
@@ -2271,7 +2330,7 @@ static void generate_aead_message(struct aead_request *req,if (vec->alen)sg_set_buf (&src[i++], vec->assoc, vec->alen);if (vec->plen) { -generate_random_bytes ((u8 *)vec->ptext, vec->plen); +generate_random_bytes (rng, (u8 *)vec->ptext, vec->plen);sg_set_buf (&src[i++], vec->ptext, vec->plen); }sg_init_one (&dst, vec->ctext, vec->alen + vec->clen);
@@ -2291,7 +2350,7 @@ static void generate_aead_message(struct aead_request *req,* Mutate the authentic (ciphertext, AAD) pair to get an * inauthentic one. */ -mutate_aead_message (vec, suite->aad_iv, ivsize); +mutate_aead_message (rng, vec, suite->aad_iv, ivsize); } vec->novrfy =1 ;if (suite->einval_allowed)
@@ -2305,7 +2364,8 @@ static void generate_aead_message(struct aead_request *req,* If 'prefer_inauthentic' is true, then this function will generate inauthentic * test vectors (i.e. vectors with 'vec->novrfy=1') more often. */ -static void generate_random_aead_testvec(struct aead_request *req, +static void generate_random_aead_testvec(struct rnd_state *rng, + struct aead_request *req, struct aead_testvec *vec, const struct aead_test_suite *suite, unsigned int maxkeysize,
@@ -2321,18 +2381,18 @@ static void generate_random_aead_testvec(struct aead_request *req,/* Key: length in [0, maxkeysize], but usually choose maxkeysize */ vec->klen = maxkeysize; -if (prandom_u32_max (4 ) ==0 ) - vec->klen =prandom_u32_max (maxkeysize +1 ); -generate_random_bytes ((u8 *)vec->key, vec->klen); +if (prandom_u32_below (rng,4 ) ==0 ) + vec->klen =prandom_u32_below (rng, maxkeysize +1 ); +generate_random_bytes (rng, (u8 *)vec->key, vec->klen); vec->setkey_error =crypto_aead_setkey (tfm, vec->key, vec->klen);/* IV */ -generate_random_bytes ((u8 *)vec->iv, ivsize); +generate_random_bytes (rng, (u8 *)vec->iv, ivsize);/* Tag length: in [0, maxauthsize], but usually choose maxauthsize */ authsize = maxauthsize; -if (prandom_u32_max (4 ) ==0 ) - authsize =prandom_u32_max (maxauthsize +1 ); +if (prandom_u32_below (rng,4 ) ==0 ) + authsize =prandom_u32_below (rng, maxauthsize +1 );if (prefer_inauthentic && authsize <MIN_COLLISION_FREE_AUTHSIZE ) authsize =MIN_COLLISION_FREE_AUTHSIZE ;if (WARN_ON (authsize > maxdatasize))
@@ -2341,11 +2401,11 @@ static void generate_random_aead_testvec(struct aead_request *req, vec->setauthsize_error =crypto_aead_setauthsize (tfm, authsize);/* AAD, plaintext, and ciphertext lengths */ - total_len =generate_random_length (maxdatasize); -if (prandom_u32_max (4 ) ==0 ) + total_len =generate_random_length (rng, maxdatasize); +if (prandom_u32_below (rng,4 ) ==0 ) vec->alen =0 ;else - vec->alen =generate_random_length (total_len); + vec->alen =generate_random_length (rng, total_len); vec->plen = total_len - vec->alen; vec->clen = vec->plen + authsize;
@@ -2356,7 +2416,7 @@ static void generate_random_aead_testvec(struct aead_request *req, vec->novrfy =0 ; vec->crypt_error =0 ;if (vec->setkey_error ==0 && vec->setauthsize_error ==0 ) -generate_aead_message (req, suite, vec, prefer_inauthentic); +generate_aead_message (rng, req, suite, vec, prefer_inauthentic);snprintf (name, max_namelen,"\"random: alen=%u plen=%u authsize=%u klen=%u novrfy=%d\"" , vec->alen, vec->plen, authsize, vec->klen, vec->novrfy);
@@ -2368,7 +2428,7 @@ static void try_to_generate_inauthentic_testvec(int i;for (i =0 ; i <10 ; i++) { - generate_random_aead_testvec(ctx->req, &ctx->vec, + generate_random_aead_testvec(&ctx->rng, ctx->req, &ctx->vec, &ctx->test_desc->suite.aead, ctx->maxkeysize, ctx->maxdatasize, ctx->vec_name,
@@ -2399,7 +2459,8 @@ static int test_aead_inauthentic_inputs(struct aead_extra_tests_ctx *ctx)*/ try_to_generate_inauthentic_testvec (ctx);if (ctx->vec.novrfy) { -generate_random_testvec_config (&ctx->cfg, ctx->cfgname, +generate_random_testvec_config (&ctx->rng, &ctx->cfg, + ctx->cfgname,sizeof (ctx->cfgname)); err = test_aead_vec_cfg(DECRYPT, &ctx->vec, ctx->vec_name, &ctx->cfg,
@@ -2489,12 +2550,13 @@ static int test_aead_vs_generic_impl(struct aead_extra_tests_ctx *ctx)* the other implementation against them. */ for (i =0 ; i < fuzz_iterations *8 ; i++) { -generate_random_aead_testvec (generic_req, &ctx->vec, +generate_random_aead_testvec (&ctx->rng, generic_req, &ctx->vec, &ctx->test_desc->suite.aead, ctx->maxkeysize, ctx->maxdatasize, ctx->vec_name,sizeof (ctx->vec_name), false); -generate_random_testvec_config (&ctx->cfg, ctx->cfgname, +generate_random_testvec_config (&ctx->rng, &ctx->cfg, + ctx->cfgname,sizeof (ctx->cfgname));if (!ctx->vec.novrfy) { err = test_aead_vec_cfg(ENCRYPT, &ctx->vec,
@@ -2533,6 +2595,7 @@ static int test_aead_extra(const struct alg_test_desc *test_desc, ctx =kzalloc (sizeof (*ctx),GFP_KERNEL );if (!ctx)return -ENOMEM ; +init_rnd_state (&ctx->rng); ctx->req = req; ctx->tfm =crypto_aead_reqtfm (req); ctx->test_desc = test_desc;
@@ -2922,11 +2985,14 @@ static int test_skcipher_vec(int enc, const struct cipher_testvec *vec,#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS if (!noextratests) { +struct rnd_state rng;struct testvec_config cfg;char cfgname[TESTVEC_CONFIG_NAMELEN ]; +init_rnd_state (&rng); +for (i =0 ; i < fuzz_iterations; i++) { -generate_random_testvec_config (&cfg, cfgname, +generate_random_testvec_config (&rng, &cfg, cfgname,sizeof (cfgname)); err =test_skcipher_vec_cfg (enc, vec, vec_name, &cfg, req, tsgls);
@@ -2944,7 +3010,8 @@ static int test_skcipher_vec(int enc, const struct cipher_testvec *vec,* Generate a symmetric cipher test vector from the given implementation. * Assumes the buffers in 'vec' were already allocated. */ -static void generate_random_cipher_testvec (struct skcipher_request *req, +static void generate_random_cipher_testvec (struct rnd_state *rng, +struct skcipher_request *req,struct cipher_testvec *vec,unsigned int maxdatasize,char *name,size_t max_namelen)
@@ -2958,17 +3025,17 @@ static void generate_random_cipher_testvec(struct skcipher_request *req,/* Key: length in [0, maxkeysize], but usually choose maxkeysize */ vec->klen = maxkeysize; -if (prandom_u32_max (4 ) ==0 ) - vec->klen =prandom_u32_max (maxkeysize +1 ); -generate_random_bytes ((u8 *)vec->key, vec->klen); +if (prandom_u32_below (rng,4 ) ==0 ) + vec->klen =prandom_u32_below (rng, maxkeysize +1 ); +generate_random_bytes (rng, (u8 *)vec->key, vec->klen); vec->setkey_error =crypto_skcipher_setkey (tfm, vec->key, vec->klen);/* IV */ -generate_random_bytes ((u8 *)vec->iv, ivsize); +generate_random_bytes (rng, (u8 *)vec->iv, ivsize);/* Plaintext */ - vec->len =generate_random_length (maxdatasize); -generate_random_bytes ((u8 *)vec->ptext, vec->len); + vec->len =generate_random_length (rng, maxdatasize); +generate_random_bytes (rng, (u8 *)vec->ptext, vec->len);/* If the key couldn't be set, no need to continue to encrypt. */ if (vec->setkey_error)
@@ -3010,6 +3077,7 @@ static int test_skcipher_vs_generic_impl(const char *generic_driver,const unsigned int maxdatasize = (2 *PAGE_SIZE ) -TESTMGR_POISON_LEN ;const char *algname =crypto_skcipher_alg (tfm)->base.cra_name;const char *driver =crypto_skcipher_driver_name (tfm); +struct rnd_state rng;char _generic_driver[CRYPTO_MAX_ALG_NAME ];struct crypto_skcipher *generic_tfm =NULL ;struct skcipher_request *generic_req =NULL ;
@@ -3027,6 +3095,8 @@ static int test_skcipher_vs_generic_impl(const char *generic_driver,if (strncmp (algname,"kw(" ,3 ) ==0 )return 0 ; +init_rnd_state (&rng); +if (!generic_driver) {/* Use default naming convention? */ err =build_generic_driver_name (algname, _generic_driver);if (err)
@@ -3111,9 +3181,11 @@ static int test_skcipher_vs_generic_impl(const char *generic_driver, }for (i =0 ; i < fuzz_iterations *8 ; i++) { -generate_random_cipher_testvec (generic_req, &vec, maxdatasize, +generate_random_cipher_testvec (&rng, generic_req, &vec, + maxdatasize, vec_name,sizeof (vec_name)); -generate_random_testvec_config (cfg, cfgname,sizeof (cfgname)); +generate_random_testvec_config (&rng, cfg, cfgname, +sizeof (cfgname)); err =test_skcipher_vec_cfg (ENCRYPT , &vec, vec_name, cfg, req, tsgls);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 290/292 drm/amdgpu: declare firmware for new MES 11.0.4
In reply to Greg Kroah-HartmanFrom: Li Ma <[email protected]>
commit a462ef872fd1e83ebd075cf82d91f111acaa629e upstream.
To support new mes ip block
--- drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +2 -0
@@ -40,6 +40,8 @@ MODULE_FIRMWARE("amdgpu/gc_11_0_2_mes.biMODULE_FIRMWARE ("amdgpu/gc_11_0_2_mes1.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_0_3_mes.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_0_3_mes1.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_0_4_mes.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_0_4_mes1.bin" );static int mes_v11_0_hw_fini (void *handle);static int mes_v11_0_kiq_hw_init (struct amdgpu_device *adev);
Greg Kroah-Hartman
maintainerPATCH 291/292 drm/amd/amdgpu: introduce gc_*_mes_2.bin v2
In reply to Greg Kroah-HartmanFrom: Jack Xiao <[email protected]>
commit 97998b893c3000b27a780a4982e16cfc8f4ea555 upstream.
To avoid new mes fw running with old driver, rename mes schq fw to gc_*_mes_2.bin.
v2: add MODULE_FIRMWARE declaration
v3: squash in fixup patch
--- drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 26 ++++++++++++++++++++++---- drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 10 +++++----- 2 files changed, 27 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +22 -4
@@ -1432,13 +1432,31 @@ int amdgpu_mes_init_microcode(struct amdstruct amdgpu_firmware_info *info;char ucode_prefix[30 ];char fw_name[40 ]; +bool need_retry = false;int r; -amdgpu_ucode_ip_version_decode (adev,GC_HWIP , ucode_prefix,sizeof (ucode_prefix)); -snprintf (fw_name,sizeof (fw_name),"amdgpu/%s_mes%s.bin" , - ucode_prefix, - pipe ==AMDGPU_MES_SCHED_PIPE ?"" :"1" ); +amdgpu_ucode_ip_version_decode (adev,GC_HWIP , ucode_prefix, +sizeof (ucode_prefix)); +if (adev->ip_versions[GC_HWIP ][0 ] >=IP_VERSION (11 ,0 ,0 )) { +snprintf (fw_name,sizeof (fw_name),"amdgpu/%s_mes%s.bin" , + ucode_prefix, + pipe ==AMDGPU_MES_SCHED_PIPE ?"_2" :"1" ); + need_retry = true; + }else { +snprintf (fw_name,sizeof (fw_name),"amdgpu/%s_mes%s.bin" , + ucode_prefix, + pipe ==AMDGPU_MES_SCHED_PIPE ?"" :"1" ); + } + r =amdgpu_ucode_request (adev, &adev->mes.fw[pipe], fw_name); +if (r && need_retry && pipe ==AMDGPU_MES_SCHED_PIPE ) { +snprintf (fw_name,sizeof (fw_name),"amdgpu/%s_mes.bin" , + ucode_prefix); +DRM_INFO ("try to fall back to %s\n" , fw_name); + r =amdgpu_ucode_request (adev, &adev->mes.fw[pipe], + fw_name); + } +if (r) goto out;
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +5 -5
@@ -32,15 +32,15 @@#include "v11_structs.h" #include "mes_v11_api_def.h" -MODULE_FIRMWARE ("amdgpu/gc_11_0_0_mes.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_0_0_mes_2.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_0_0_mes1.bin" ); -MODULE_FIRMWARE ("amdgpu/gc_11_0_1_mes.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_0_1_mes_2.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_0_1_mes1.bin" ); -MODULE_FIRMWARE ("amdgpu/gc_11_0_2_mes.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_0_2_mes_2.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_0_2_mes1.bin" ); -MODULE_FIRMWARE ("amdgpu/gc_11_0_3_mes.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_0_3_mes_2.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_0_3_mes1.bin" ); -MODULE_FIRMWARE ("amdgpu/gc_11_0_4_mes.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_0_4_mes_2.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_0_4_mes1.bin" );static int mes_v11_0_hw_fini (void *handle);
Greg Kroah-Hartman
maintainerPATCH 292/292 drm/amdgpu: reserve the old gc_11_0_*_mes.bin
In reply to Greg Kroah-HartmanFrom: Li Ma <[email protected]>
commit 8855818ce7554fb7420200187fac9c3b69500da0 upstream.
Reserve the MOUDLE_FIRMWARE declaration of gc_11_0_*_mes.bin to fix falling back to old mes bin on failure via autoload.
--- drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +5 -0
@@ -32,14 +32,19 @@#include "v11_structs.h" #include "mes_v11_api_def.h" +MODULE_FIRMWARE ("amdgpu/gc_11_0_0_mes.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_0_0_mes_2.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_0_0_mes1.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_0_1_mes.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_0_1_mes_2.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_0_1_mes1.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_0_2_mes.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_0_2_mes_2.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_0_2_mes1.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_0_3_mes.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_0_3_mes_2.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_0_3_mes1.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_0_4_mes.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_0_4_mes_2.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_0_4_mes1.bin" );
Hello Greg,
Quoted 10 lines
From: Greg Kroah-Hartman <[email protected]>
Sent: Monday, May 22, 2023 8:06 PMThis is the start of the stable review cycle for the 6.1.30 release. There are 292 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 24 May 2023 19:03:25 +0000. Anything received after that time might be too late.
CIP configurations built and booted with Linux 6.1.30-rc1 (e00a3d96f756):
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/pipelines/875108845
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/commits/linux-6.1.y
Kind regards, Chris
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.1.30 release. There are 292 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 24 May 2023 19:03:25 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.1.30-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.1.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels, build tested on BMIPS_GENERIC:
We would also need this patch from upstream to be backported into the stable-6.1.y queue to avoid:
[ 0.001228] Early cacheinfo failed, ret = -22
Thanks!
Signature · 1 line
Florian
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.1.30 release. There are 292 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 24 May 2023 19:03:25 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.1.30-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.1.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 4 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.1.30 release. There are 292 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
No regressions found for ext4.
- Ted
TESTRUNID: ltm-20230522173053 KERNEL: kernel 6.1.30-rc1-xfstests-00293-ge00a3d96f756 #26 SMP PREEMPT_DYNAMIC Mon May 22 17:25:13 EDT 2023 x86_64 CMDLINE: full --kernel gs://gce-xfstests/kernel.deb CPUS: 2 MEM: 7680
ext4/4k: 530 tests, 32 skipped, 4755 seconds
ext4/1k: 526 tests, 1 failures, 45 skipped, 5810 seconds
Flaky: generic/475: 80% (4/5)
ext4/ext3: 522 tests, 1 failures, 121 skipped, 4805 seconds
Failures: generic/347
ext4/encrypt: 508 tests, 3 failures, 139 skipped, 2729 seconds
Failures: generic/681 generic/682 generic/691
ext4/nojournal: 525 tests, 3 failures, 100 skipped, 4619 seconds
Failures: ext4/301 ext4/304 generic/455
ext4/ext3conv: 527 tests, 3 failures, 33 skipped, 4535 seconds
Failures: generic/347
Flaky: generic/475: 40% (2/5) generic/645: 20% (1/5)
ext4/adv: 527 tests, 4 failures, 40 skipped, 4432 seconds
Failures: generic/477
Flaky: generic/455: 60% (3/5) generic/475: 80% (4/5)
generic/482: 40% (2/5)
ext4/dioread_nolock: 528 tests, 1 failures, 32 skipped, 5437 seconds
Flaky: generic/475: 20% (1/5)
ext4/data_journal: 526 tests, 3 failures, 100 skipped, 4571 seconds
Failures: generic/231 generic/347 generic/455
ext4/bigalloc_4k: 502 tests, 1 failures, 37 skipped, 4430 seconds
Flaky: generic/077: 20% (1/5)
ext4/bigalloc_1k: 502 tests, 1 failures, 55 skipped, 5167 seconds
Failures: shared/298
ext4/dax: 517 tests, 135 skipped, 2763 seconds
Totals: 6324 tests, 869 skipped, 83 failures, 0 errors, 53773s
FSTESTIMG: gce-xfstests/xfstests-amd64-202303031351
FSTESTPRJ: gce-xfstests
FSTESTVER: blktests 676d42c (Thu, 2 Mar 2023 15:25:44 +0900)
FSTESTVER: fio fio-3.31 (Tue, 9 Aug 2022 14:41:25 -0600)
FSTESTVER: fsverity v1.5-6-g5d6f7c4 (Mon, 30 Jan 2023 23:22:45 -0800)
FSTESTVER: ima-evm-utils v1.3.2 (Wed, 28 Oct 2020 13:18:08 -0400)
FSTESTVER: nvme-cli v1.16 (Thu, 11 Nov 2021 13:09:06 -0800)
FSTESTVER: quota v4.05-53-gd90b7d5 (Tue, 6 Dec 2022 12:59:03 +0100)
FSTESTVER: util-linux v2.38.1 (Thu, 4 Aug 2022 11:06:21 +0200)
FSTESTVER: xfsprogs v6.1.1 (Fri, 13 Jan 2023 19:06:37 +0100)
FSTESTVER: xfstests-bld 2e60cef3 (Thu, 23 Feb 2023 15:02:58 -0500)
FSTESTVER: xfstests v2023.02.26-8-g821ef4889 (Thu, 2 Mar 2023 10:23:51 -0500)
FSTESTVER: zz_build-distro bullseye
FSTESTSET: -g auto
FSTESTOPT: aex
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.1.30 release. There are 292 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Successfully compiled and installed bindeb-pkgs on my computer (Acer Aspire E15, Intel Core i3 Haswell). No noticeable regressions.
Signature · 1 line
An old man doll... just what I always wanted! - Clara
Hi Greg
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.1.30 release. There are 292 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 24 May 2023 19:03:25 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.1.30-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.1.y
and the diffstat can be found below.thanks,
greg k-h
6.1.30-rc1 tested.
x86_64
Build successfully completed.
Boot successfully completed.
No dmesg regressions.
Video output normal.
Sound output normal.
Lenovo ThinkPad X1 Carbon Gen10(Intel i7-1260P, arch linux)
Thanks
Hi!
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.1.30 release. There are 292 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Jorge Lopez <[email protected]>
platform/x86: Move existing HP drivers to a new hp subdir
This moves multiple files, and even the remaining fixups are over 200 lines. It is not suitable for stable.
Quoted 2 lines
Hans de Goede <[email protected]>
ACPI: video: Remove desktops without backlight DMI quirks
As far as I can see, this is only cleanup in 6.1, and we don't really need it in stable?
Quoted 2 lines
lyndonli <[email protected]>
drm/amdgpu: Fix sdma v4 sw fini error
Could someone double check this? Changelog does not explain that 4.2.0 hardware no long needs special handling.
Quoted 4 lines
Bastien Nocera <[email protected]>
HID: logitech-hidpp: Reconcile USB and Unifying serials
Bastien Nocera <[email protected]>
HID: logitech-hidpp: Don't use the USB serial for USB devices
I see this changes serial numbers for users. Is it good idea for stable?
Best regards,
Pavel
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.1.30 release. There are 292 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 24 May 2023 19:03:25 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.1.30-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.1.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v6.1:
11 builds: 11 pass, 0 fail
28 boots: 28 pass, 0 fail
130 tests: 130 pass, 0 failLinux version: 6.1.30-rc1-ge00a3d96f756
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra194-p3509-0000+p3668-0000,
tegra20-ventana, tegra210-p2371-2180,
tegra210-p3450-0000, tegra30-cardhu-a04Jon
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.1.30 release. There are 292 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 24 May 2023 19:03:25 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.1.30-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.1.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
NOTE:
Following are the list of intermittent failures.
LTP syscalls msync04 started failing intermittently on 6.3, 6.1 and 5.15 on arm64 devices which are using NFS mounted rootfs and external mounted drive. Where as on arm x15 device it is always fails from 6.3.2-rc1, 6.1.28-rc1 and 5.15.111-rc1.
Test log:
========
tst_test.c:1634: TINFO: === Testing on vfat ===
tst_test.c:1093: TINFO: Formatting /dev/loop0 with vfat opts='' extra opts='' msync04.c:72: TPASS: msync() working correctly
tst_test.c:1634: TINFO: === Testing on ntfs ===
tst_test.c:1093: TINFO: Formatting /dev/loop0 with ntfs opts='' extra opts='' The partition start sector was not specified for /dev/loop0 and it could not be obtained automatically. It has been set to 0.
The number of sectors per track was not specified for /dev/loop0 and it could not be obtained automatically. It has been set to 0. The number of heads was not specified for /dev/loop0 and it could not be obtained automatically. It has been set to 0.
To boot from a device, Windows needs the 'partition start sector', the 'sectors per track' and the 'number of heads' to be set.
Windows will not be able to boot from this device. tst_test.c:1107: TINFO: Trying FUSE...
msync04.c:59: TFAIL: Expected dirty bit to be set after writing to mmap()-ed area
log:
- https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.3.y/build/v6.3.3-365-g20efcce0526d/testrun/17163865/suite/ltp-syscalls/test/msync04/log
- https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.3.y/build/v6.3.3-365-g20efcce0526d/testrun/17163865/suite/ltp-syscalls/test/msync04/history/
Test results compare across 6.3, 6.1 and 5.15.
- https://qa-reports.linaro.org/_/comparetest/?project=1764&project=1597&project=1022&suite=ltp-syscalls&test=msync04
=====
Following Perf CoreSight test cases failing intermittently on arm64 Qualcomm dragonboard 410c.
78: CoreSight / Thread Loop 10 Threads - Check TID :
--- start ---
test child forked, pid 1196
[ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 6.477 MB ./perf-thread_loop-check-tid-10th.data ] Thread IDs 1211 not found in perf AUX data test child finished with -1
---- end ----
CoreSight / Thread Loop 10 Threads - Check TID: FAILED!
79: CoreSight / Thread Loop 2 Threads - Check TID :
--- start ---
test child forked, pid 1285
[ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.005 MB ./perf-thread_loop-check-tid-2th.data ] Thread IDs 1290 1290 not found in perf AUX data test child finished with -1
---- end ----
CoreSight / Thread Loop 2 Threads - Check TID: FAILED!
logs:
- https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.1.y/build/v6.1.29-293-ge00a3d96f756/testrun/17164102/suite/perf/test/CoreSight_Thread_Loop_10_Threads__Check_TID/history/
- https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.1.y/build/v6.1.29-293-ge00a3d96f756/testrun/17164102/suite/perf/test/CoreSight_Thread_Loop_10_Threads__Check_TID/log
- https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.1.y/build/v6.1.29-293-ge00a3d96f756/testrun/17164102/suite/perf/test/CoreSight_Thread_Loop_10_Threads__Check_TID/details/
- https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.1.y/build/v6.1.29-293-ge00a3d96f756/testrun/17164102/suite/perf/test/CoreSight_Thread_Loop_2_Threads__Check_TID/history/
- https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.1.y/build/v6.1.29-293-ge00a3d96f756/testrun/17164102/suite/perf/test/CoreSight_Thread_Loop_2_Threads__Check_TID/details/
=====
selftests: net/mptcp: diag.sh started failing on 6.1.30-rc1 but passed on 6.3.4-rc1. This is due to changes in latest kselftest (6.3) running on 6.1.
test logs:
=======
# selftests: net/mptcp: diag.sh
# no msk on netns creation [ ok ] # listen match for dport 10000 [ ok ] # listen match for sport 10000 [ ok ] # listen match for saddr and sport [ ok ] # all listen sockets [ ok ] # after MPC handshake [ ok ] # ....chk remote_key [ ok ] # ....chk no fallback [ ok ] # ....chk 2 msk in use [ fail ] expected 2 found 0 # ....chk 0 msk in use after flush [ ok ] # check fallback [ ok ] # ....chk 1 msk in use [ fail ] expected 1 found 0 # ....chk 0 msk in use after flush [ ok ] # many msk socket present [ ok ] # ....chk many msk in use [ fail ] expected 254 found 0 # ....chk 0 msk in use after flush [ ok ] not ok 4 selftests: net/mptcp: diag.sh # exit=11
logs:
- https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.1.y/build/v6.1.29-293-ge00a3d96f756/testrun/17163977/suite/kselftest-net-mptcp/test/net_mptcp_diag_sh/history/
- https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.1.y/build/v6.1.29-293-ge00a3d96f756/testrun/17163977/suite/kselftest-net-mptcp/test/net_mptcp_diag_sh/details/
## Build
* kernel: 6.1.30-rc1
* git: https://gitlab.com/Linaro/lkft/mirrors/stable/linux-stable-rc
* git branch: linux-6.1.y
* git commit: e00a3d96f756a884ab864ae21c22bc1b86d0844d
* git describe: v6.1.29-293-ge00a3d96f756
* test details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.1.y/build/v6.1.29-293-ge00a3d96f756
## Test Regressions (compared to v6.1.29)
* bcm2711-rpi-4-b, ltp-syscalls - intermittent failures
- msync04
* dragonboard-410c, perf - intermittent failures
- CoreSight_Thread_Loop_10_Threads__Check_TID
- CoreSight_Thread_Loop_2_Threads__Check_TID
* qemu_i386, kselftest-net-mptcp - fails only on 32-bit architectures.
- net_mptcp_diag_sh
## Metric Regressions (compared to v6.1.29)
## Test Fixes (compared to v6.1.29)
## Metric Fixes (compared to v6.1.29)
## Test result summary
total: 171342, pass: 147295, fail: 4403, skip: 19372, xfail: 272
## Build Summary
* arc: 5 total, 5 passed, 0 failed
* arm: 151 total, 150 passed, 1 failed
* arm64: 54 total, 53 passed, 1 failed
* i386: 41 total, 38 passed, 3 failed
* mips: 30 total, 28 passed, 2 failed
* parisc: 8 total, 8 passed, 0 failed
* powerpc: 38 total, 36 passed, 2 failed
* riscv: 16 total, 15 passed, 1 failed
* s390: 16 total, 16 passed, 0 failed
* sh: 14 total, 12 passed, 2 failed
* sparc: 8 total, 8 passed, 0 failed
* x86_64: 46 total, 46 passed, 0 failed
## Test suites summary
* boot
* fwts
* igt-gpu-tools
* kselftest-android
* kselftest-arm64
* kselftest-breakpoints
* kselftest-capabilities
* kselftest-cgroup
* kselftest-clone3
* kselftest-core
* kselftest-cpu-hotplug
* kselftest-cpufreq
* kselftest-drivers-dma-buf
* kselftest-efivarfs
* kselftest-exec
* kselftest-filesystems
* kselftest-filesystems-binderfs
* kselftest-firmware
* kselftest-fpu
* kselftest-ftrace
* kselftest-futex
* kselftest-gpio
* kselftest-intel_pstate
* kselftest-ipc
* kselftest-ir
* kselftest-kcmp
* kselftest-kexec
* kselftest-kvm
* kselftest-lib
* kselftest-livepatch
* kselftest-membarrier
* kselftest-memfd
* kselftest-memory-hotplug
* kselftest-mincore
* kselftest-mount
* kselftest-mqueue
* kselftest-net
* kselftest-net-forwarding
* kselftest-net-mptcp
* kselftest-netfilter
* kselftest-nsfs
* kselftest-openat2
* kselftest-pid_namespace
* kselftest-pidfd
* kselftest-proc
* kselftest-pstore
* kselftest-ptrace
* kselftest-rseq
* kselftest-rtc
* kselftest-seccomp
* kselftest-sigaltstack
* kselftest-size
* kselftest-splice
* kselftest-static_keys
* kselftest-sync
* kselftest-sysctl
* kselftest-tc-testing
* kselftest-timens
* kselftest-timers
* kselftest-tmpfs
* kselftest-tpm2
* kselftest-user
* kselftest-user_events
* kselftest-vDSO
* kselftest-watchdog
* kselftest-x86
* kselftest-zram
* kunit
* kvm-unit-tests
* libgpiod
* libhugetlbfs
* log-parser-boot
* log-parser-test
* ltp-cap_bounds
* ltp-commands
* ltp-containers
* ltp-controllers
* ltp-cpuhotplug
* ltp-crypto
* ltp-cve
* ltp-dio
* ltp-fcntl-locktests
* ltp-filecaps
* ltp-fs
* ltp-fs_bind
* ltp-fs_perms_simple
* ltp-fsx
* ltp-hugetlb
* ltp-io
* ltp-ipc
* ltp-math
* ltp-mm
* ltp-nptl
* ltp-pty
* ltp-sched
* ltp-securebits
* ltp-smoke
* ltp-syscalls
* ltp-tracing
* network-basic-tests
* perf
* rcutorture
* v4l2-compliance
* vdso
--
Linaro LKFT
https://lkft.linaro.org
Hi Naresh,
Quoted 26 lines · Naresh Kamboju
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.1.30 release. There are 292 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 24 May 2023 19:03:25 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.1.30-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.1.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm,x86_64, and i386.
(...)
Quoted 26 lines
selftests: net/mptcp:
diag.shstarted failing on 6.1.30-rc1 but passed on 6.3.4-rc1. This is due to changes in latest kselftest (6.3) running on 6.1.test logs:
=======
# selftests: net/mptcp:diag.sh# no msk on netns creation [ ok ] # listen match for dport 10000 [ ok ] # listen match for sport 10000 [ ok ] # listen match for saddr and sport [ ok ] # all listen sockets [ ok ] # after MPC handshake [ ok ] # ....chk remote_key [ ok ] # ....chk no fallback [ ok ] # ....chk 2 msk in use [ fail ] expected 2 found 0 # ....chk 0 msk in use after flush [ ok ] # check fallback [ ok ] # ....chk 1 msk in use [ fail ] expected 1 found 0 # ....chk 0 msk in use after flush [ ok ] # many msk socket present [ ok ] # ....chk many msk in use [ fail ] expected 254 found 0 # ....chk 0 msk in use after flush [ ok ] not ok 4 selftests: net/mptcp: diag.sh # exit=11
Quoted 3 lines
logs:
- https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.1.y/build/v6.1.29-293-ge00a3d96f756/testrun/17163977/suite/kselftest-net-mptcp/test/net_mptcp_diag_sh/history/
- https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.1.y/build/v6.1.29-293-ge00a3d96f756/testrun/17163977/suite/kselftest-net-mptcp/test/net_mptcp_diag_sh/details/
Thank you for looking at these MPTCP selftests and for having reported these issues.
We are looking at having MPTCP selftests supporting previous kernel versions but that's not easy because our selftests are verifying some internal behaviours, not just what is exposed to the uAPI, e.g. what network packets are being sent, etc.. Also, some socket options and counters -- like what you reported here above with diag.sh -- were returning 0 before being implemented in MPTCP: so we need to accept that these counters might not work, that's not ideal for a test that wants to check if they work :)
Anyway, for those who wants to follow the evolution, patches have been shared on our mailing list:
https://patchwork.kernel.org/project/mptcp/list/?series=749868&state=*
https://github.com/multipath-tcp/mptcp_net-next/commits/7220c4c22b88
https://github.com/multipath-tcp/mptcp_net-next/issues/368
Cheers,
Matt
Signature · 2 lines
Tessares | Belgium | Hybrid Access Solutions www.tessares.net
Quoted 4 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.1.30 release. There are 292 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Thanks,
Conor.
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.1.30 release. There are 292 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 24 May 2023 19:03:25 +0000. Anything received after that time might be too late.
Hi Greg
6.1.30-rc1
compiles, boots and runs here on x86_64
(AMD Ryzen 5 PRO 4650G, Slackware64-15.0)
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.1.30 release. There are 292 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 24 May 2023 19:03:25 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.1.30-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.1.y
and the diffstat can be found below.thanks,
greg k-h
Built and booted successfully on RISC-V RV64 (HiFive Unmatched).
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.1.30 release. There are 292 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 24 May 2023 19:03:25 +0000. Anything received after that time might be too late.
Build results:
total: 155 pass: 155 fail: 0 Qemu test results: total: 519 pass: 519 fail: 0
Guenter