Unverified Commit c3c68200 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15197 [openEuler-24.03-LTS][linux-6.6.y sync] Backport 6.6.68-6.6.69 LTS Patches 

Merge Pull Request from: @wenzhiwei11 
 
git log --oneline v6.6.68..v6.6.69 | wc -l
86
65+1+6+14

Conflicts(1):
tcp_bpf: Add sk_rmem_alloc related logic for tcp_bpf ingress redirection

merged(6):
media: dvb-frontends: dib3000mb: fix uninit-value in dib3000_write_reg
tracing/kprobe: Make trace_kprobe's module callback called after jump_label update
sched/task_stack: fix object_is_on_stack() for KASAN tagged pointers
tracing: Prevent bad count for tracing_cpumask_write
scsi: megaraid_sas: Fix for a potential deadlock
virtio-blk: don't keep queue frozen during system suspend

check-kabi error(14):
x86/cpu: Add Lunar Lake to list of CPUs with a broken MONITOR implementation
x86/cpu/intel: Switch to new Intel CPU model defines
x86/cpu/vfm: Update arch/x86/include/asm/intel-family.h
x86/cpu/vfm: Add/initialize x86_vfm field to struct cpuinfo_x86
x86/cpu: Add model number for another Intel Arrow Lake mobile processor
x86/cpu: Add model number for Intel Clearwater Forest processor
x86/cpu/intel: Drop stray FAM6 check with new Intel CPU model defines
i2c: microchip-core: fix "ghost" detections
i2c: imx: add imx7d compatible string for applying erratum ERR007805
PCI/MSI: Handle lack of irqdomain gracefully
i2c: microchip-core: actually use repeated sends   
io_uring/sqpoll: fix sqpoll error handling races
tracing: Constify string literal data member in struct trace_event_call
freezer, sched: Report frozen tasks as 'D' instead of 'R'  
 
Link:https://gitee.com/openeuler/kernel/pulls/15197

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents eb0ce17f 18bbaf0e

arch/loongarch/include/asm/inst.h

+11 −1
Original line number Diff line number Diff line
@@ -673,7 +673,17 @@ DEF_EMIT_REG2I16_FORMAT(blt, blt_op) 
DEF_EMIT_REG2I16_FORMAT(bge, bge_op)

DEF_EMIT_REG2I16_FORMAT(bltu, bltu_op)

DEF_EMIT_REG2I16_FORMAT(bgeu, bgeu_op)

DEF_EMIT_REG2I16_FORMAT(jirl, jirl_op)



static inline void emit_jirl(union loongarch_instruction *insn,

			     enum loongarch_gpr rd,

			     enum loongarch_gpr rj,

			     int offset)

{

	insn->reg2i16_format.opcode = jirl_op;

	insn->reg2i16_format.immediate = offset;

	insn->reg2i16_format.rd = rd;

	insn->reg2i16_format.rj = rj;

}



#define DEF_EMIT_REG2BSTRD_FORMAT(NAME, OP)				\

static inline void emit_##NAME(union loongarch_instruction *insn,	\

arch/loongarch/kernel/efi.c

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ static void __init init_screen_info(void) 
	memset(si, 0, sizeof(*si));

	early_memunmap(si, sizeof(*si));



	memblock_reserve(screen_info.lfb_base, screen_info.lfb_size);

	memblock_reserve(__screen_info_lfb_base(&screen_info), screen_info.lfb_size);

}



void __init efi_init(void)

arch/loongarch/kernel/inst.c

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ u32 larch_insn_gen_jirl(enum loongarch_gpr rd, enum loongarch_gpr rj, int imm) 
		return INSN_BREAK;

	}



	emit_jirl(&insn, rj, rd, imm >> 2);

	emit_jirl(&insn, rd, rj, imm >> 2);



	return insn.word;

}

arch/loongarch/net/bpf_jit.c

+3 −3
Original line number Diff line number Diff line
@@ -181,13 +181,13 @@ static void __build_epilogue(struct jit_ctx *ctx, bool is_tail_call) 
		/* Set return value */

		emit_insn(ctx, addiw, LOONGARCH_GPR_A0, regmap[BPF_REG_0], 0);

		/* Return to the caller */

		emit_insn(ctx, jirl, LOONGARCH_GPR_RA, LOONGARCH_GPR_ZERO, 0);

		emit_insn(ctx, jirl, LOONGARCH_GPR_ZERO, LOONGARCH_GPR_RA, 0);

	} else {

		/*

		 * Call the next bpf prog and skip the first instruction

		 * of TCC initialization.

		 */

		emit_insn(ctx, jirl, LOONGARCH_GPR_T3, LOONGARCH_GPR_ZERO, 1);

		emit_insn(ctx, jirl, LOONGARCH_GPR_ZERO, LOONGARCH_GPR_T3, 1);

	}

}
@@ -841,7 +841,7 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx, bool ext 
			return ret;



		move_addr(ctx, t1, func_addr);

		emit_insn(ctx, jirl, t1, LOONGARCH_GPR_RA, 0);

		emit_insn(ctx, jirl, LOONGARCH_GPR_RA, t1, 0);

		move_reg(ctx, regmap[BPF_REG_0], LOONGARCH_GPR_A0);

		break;

arch/mips/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ drivers-$(CONFIG_PCI) += arch/mips/pci/ 
ifdef CONFIG_64BIT

  ifndef KBUILD_SYM32

    ifeq ($(shell expr $(load-y) \< 0xffffffff80000000), 0)

      KBUILD_SYM32 = y

      KBUILD_SYM32 = $(call cc-option-yn, -msym32)

    endif

  endif