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

!12112 [openEuler-24.03-LTS][linux-6.6.y sync] Backport 6.6.47-6.6.48 LTS Patches

Merge Pull Request from: @wenzhiwei11 
 
git log --oneline v6.6.47..v6.6.48 | wc -l
343

292 + 44 + 6 + 1 = 343

Merged commits(44)

```
tty: serial: fsl_lpuart: mark last busy before uart_add_one_port
fuse: Initialize beyond-EOF page contents before setting uptodate
char: xillybus: Check USB endpoints when probing device
i2c: tegra: Do not mark ACPI devices as irq safe
vfs: Don't evict inode under the inode lru traversing context
s390/cio: rename bitmap_size() -> idset_bitmap_size()
fs/ntfs3: add prefix to bitmap_size() and use BITS_TO_U64()
bitmap: introduce generic optimized bitmap_size()
fix bitmap corruption on close_range() with CLOSE_RANGE_UNSHARE
rtla/osnoise: Prevent NULL dereference in error handling
net: mana: Fix doorbell out of order violation and avoid unnecessary doorbell rings
fs/netfs/fscache_cookie: add missing "n_accesses" check
net/mlx5e: Take state lock during tx timeout reporter
vsock: fix recursive ->recvmsg calls
net: hns3: fix wrong use of semaphore up
net: hns3: use the user's cfg after reset
net: hns3: fix a deadlock problem when config TC during resetting
platform/x86/intel/ifs: Validate image size
md/raid5-cache: use READ_ONCE/WRITE_ONCE for 'conf->log'
block: Fix lockdep warning in blk_mq_mark_tag_wait
net: hns3: add checking for vf id of mailbox
ext4: set the type of max_zeroout to unsigned int to avoid overflow
Revert "bpf, sockmap: Prevent lock inversion deadlock in map delete elem"
gtp: pull network headers in gtp_dev_xmit()
tcp/dccp: bypass empty buckets in inet_twsk_purge()
tcp/dccp: do not care about families in inet_twsk_purge()
tcp: prevent concurrent execution of tcp_sk_exit_batch
kcm: Serialise kcm_sendmsg() for the same socket.
net: dsa: mv88e6xxx: Fix out-of-bound access
netem: fix return value if duplicate enqueue fails
ipv6: prevent UAF in ip6_send_skb()
ipv6: fix possible UAF in ip6_finish_output2()
ipv6: prevent possible UAF in ip6_xmit()
bnxt_en: Fix double DMA unmapping for XDP_REDIRECT
mmc: mmc_test: Fix NULL dereference on allocation failure
Bluetooth: MGMT: Add error handling to pair_device()
mptcp: pm: only decrement add_addr_accepted for MPJ req
mptcp: pm: avoid possible UaF when selecting endp
platform/x86/intel/ifs: Call release_firmware() when handling errors.
tcp: do not export tcp_twsk_purge()
bpf: Fix a kernel verifier crash in stacksafe()
NFSD: simplify error paths in nfsd_svc()
Input: MT - limit max slots
tools: move alignment-related macros to new <linux/align.h>
```

conflicts commits(6)

```
selftests: net: lib: ignore possible errors
selftests: net: lib: kill PIDs before del netns
mm: fix endless reclaim on machines with unaccepted memory
mm/numa: no task_numa_fault() call if PTE is changed
mm/numa: no task_numa_fault() call if PMD is changed
net: ngbe: Fix phy mode set to external phy
```
compilation error(1)

```
change alloc_pages name in dma_map_ops to avoid name conflicts
```
 
 
Link:https://gitee.com/openeuler/kernel/pulls/12112

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents b5213571 3fc8fe07
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -565,7 +565,8 @@ Description: Control Symmetric Multi Threading (SMT)
			 ================ =========================================

			 If control status is "forceoff" or "notsupported" writes
			 are rejected.
			 are rejected. Note that enabling SMT on PowerPC skips
			 offline cores.

What:		/sys/devices/system/cpu/cpuX/power/energy_perf_bias
Date:		March 2019
+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@

#include <asm/numa.h>

static int acpi_early_node_map[NR_CPUS] __initdata = { NUMA_NO_NODE };
static int acpi_early_node_map[NR_CPUS] __initdata = { [0 ... NR_CPUS - 1] = NUMA_NO_NODE };

int __init acpi_numa_get_nid(unsigned int cpu)
{
+0 −3
Original line number Diff line number Diff line
@@ -420,9 +420,6 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p)
	smp_init_cpus();
	smp_build_mpidr_hash();

	/* Init percpu seeds for random tags after cpus are set up. */
	kasan_init_sw_tags();

#ifdef CONFIG_ARM64_SW_TTBR0_PAN
	/*
	 * Make sure init_thread_info.ttbr0 always generates translation
+2 −0
Original line number Diff line number Diff line
@@ -462,6 +462,8 @@ void __init smp_prepare_boot_cpu(void)
		init_gic_priority_masking();

	kasan_init_hw_tags();
	/* Init percpu seeds for random tags after cpus are set up. */
	kasan_init_sw_tags();
}

/*
+6 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@
#include <trace/events/kvm.h>

#include "sys_regs.h"
#include "vgic/vgic.h"

#include "trace.h"

@@ -301,6 +302,11 @@ static bool access_gic_sgi(struct kvm_vcpu *vcpu,
{
	bool g1;

	if (!kvm_has_gicv3(vcpu->kvm)) {
		kvm_inject_undefined(vcpu);
		return false;
	}

	if (!p->is_write)
		return read_from_write_only(vcpu, p, r);

Loading