Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Deepin-Kernel-SIG] [Upstream] Update kernel base to 6.6.63 #488

Merged
merged 82 commits into from
Nov 24, 2024
Merged
Changes from 1 commit
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
7a1129a
netlink: terminate outstanding dump on socket close
kuba-moo Nov 6, 2024
cf7ede4
sctp: fix possible UAF in sctp_v6_available()
Nov 7, 2024
35900cd
net: vertexcom: mse102x: Fix tx_bytes calculation
lategoodbye Nov 8, 2024
c631b2f
drm/rockchip: vop: Fix a dereferenced before check warning
Oct 21, 2024
9976b08
mptcp: error out earlier on disconnect
Nov 8, 2024
d2534d3
mptcp: cope racing subflow creation in mptcp_rcv_space_adjust
Nov 8, 2024
87ae083
net/mlx5: fs, lock FTE when checking if active
mark-bloch Nov 7, 2024
780ffc2
net/mlx5e: kTLS, Fix incorrect page refcounting
dtatulea Nov 7, 2024
3675800
net/mlx5e: clear xdp features on non-uplink representors
williamtu Nov 7, 2024
54ee3b2
net/mlx5e: CT: Fix null-ptr-deref in add rule err flow
mosheshemesh2 Nov 7, 2024
5caca7c
virtio/vsock: Fix accept_queue memory leak
mmhal Nov 7, 2024
2806f59
Revert "RDMA/core: Fix ENODEV error for iWARP test over vlan"
rleon Nov 12, 2024
30f81bc
Bluetooth: hci_core: Fix calling mgmt_device_connected
Vudentz Nov 8, 2024
630b6ab
Bluetooth: btintel: Direct exception event to bluetooth stack
kirankrishnappa-intel Oct 22, 2024
17fa985
net/sched: cls_u32: replace int refcounts with proper refcounts
tammela Nov 14, 2023
463ee69
net: sched: cls_u32: Fix u32's systematic failure to free IDR entries…
ferrieux Nov 10, 2024
af3c144
samples: pktgen: correct dev to DEV
Nov 12, 2024
f1e5f88
net: stmmac: dwmac-mediatek: Fix inverted handling of mediatek,mac-wol
nfraprado Nov 9, 2024
292f56e
net: Make copy_safe_from_sockptr() match documentation
mmhal Nov 10, 2024
5bf56de
net: stmmac: dwmac-intel-plat: use devm_stmmac_probe_config_dt()
xhackerustc Sep 16, 2023
aeaeb5a
net: stmmac: dwmac-visconti: use devm_stmmac_probe_config_dt()
xhackerustc Sep 16, 2023
c2e961f
net: stmmac: rename stmmac_pltfr_remove_no_dt to stmmac_pltfr_remove
xhackerustc Sep 16, 2023
e7b4bb0
stmmac: dwmac-intel-plat: fix call balance of tx_clk handling routines
vmordan Nov 8, 2024
bd45a8d
net: ti: icssg-prueth: Fix 1 PPS sync
MeghanaMalladiTI Nov 11, 2024
2b09d8c
bonding: add ns target multicast address to slave device
liuhangbin Nov 11, 2024
827c050
ARM: 9419/1: mm: Fix kernel memory mapping for xip kernels
HarithGeorge-AlifSemi Sep 18, 2024
f4891b5
tools/mm: fix compile error
motiejus Nov 12, 2024
0924296
x86/mm: Fix a kdump kernel failure on SME system when CONFIG_IMA_KEXEC=y
Sep 11, 2024
3c3e961
mm: fix NULL pointer dereference in alloc_pages_bulk_noprof
tujinjiang11 Nov 13, 2024
f535ce0
ocfs2: uncache inode which has failed entering the group
dmantipov Nov 14, 2024
842c956
mm: revert "mm: shmem: fix data-race in shmem_getattr()"
akpm00 Nov 16, 2024
50703f1
vdpa: solidrun: Fix UB bug with devres
Oct 28, 2024
b012f7b
vdpa/mlx5: Fix PA offset with unaligned starting iotlb map
siwliu-kernel Oct 21, 2024
7ca26e7
vp_vdpa: fix id_table array not null terminated error
Nov 5, 2024
7ed862c
ima: fix buffer overrun in ima_eventdigest_init_common
samasth-norway Aug 7, 2024
eaa602c
KVM: nVMX: Treat vpid01 as current if L2 is active, but with VPID dis…
sean-jc Oct 31, 2024
7497d7c
KVM: x86: Unconditionally set irr_pending when updating APICv state
sean-jc Nov 6, 2024
feb3815
KVM: VMX: Bury Intel PT virtualization (guest/host mode) behind CONFI…
sean-jc Nov 1, 2024
83a08e7
nilfs2: fix null-ptr-deref in block_touch_buffer tracepoint
konis Nov 6, 2024
1eb9dd2
nommu: pass NULL argument to vma_iter_prealloc()
thehajime Nov 8, 2024
12f7269
ALSA: hda/realtek - Fixed Clevo platform headset Mic issue
KailangYang Oct 25, 2024
ba9502e
ALSA: hda/realtek: fix mute/micmute LEDs for a HP EliteBook 645 G10
Nov 12, 2024
187e36e
ocfs2: fix UBSAN warning in ocfs2_verify_volume()
dmantipov Nov 6, 2024
df4d4d0
nilfs2: fix null-ptr-deref in block_dirty_buffer tracepoint
konis Nov 6, 2024
68f600f
LoongArch: Fix early_numa_add_cpu() usage for FDT systems
chenhuacai Nov 12, 2024
ecfbfac
LoongArch: Disable KASAN if PGDIR_SIZE is too large for cpu_vabits
chenhuacai Nov 12, 2024
af2eaa6
LoongArch: Make KASAN work with 5-level page-tables
chenhuacai Nov 12, 2024
26e2a3c
Revert "mmc: dw_mmc: Fix IDMAC operation with pages bigger than 4K"
aurel32 Nov 10, 2024
5df663e
mmc: sunxi-mmc: Fix A100 compatible description
Andre-ARM Nov 7, 2024
66b8a06
drm/bridge: tc358768: Fix DSI command tx
dolcini Sep 26, 2024
7abbe06
pmdomain: imx93-blk-ctrl: correct remove path
MrVan Nov 1, 2024
42dbbbd
drm/amd: Fix initialization mistake for NBIO 7.7.0
vijendarmukunda Nov 12, 2024
3985c46
drm/amd/display: Adjust VSDB parser for replay feature
rodrigosiqueira Nov 5, 2024
2c32921
mm/damon/core: implement scheme-specific apply interval
sjp38 Sep 16, 2023
a1d163f
mm/damon/core: handle zero {aggregation,ops_update} intervals
sjp38 Oct 31, 2024
1ee29f6
staging: vchiq_arm: Get the rid off struct vchiq_2835_state
lategoodbye Jun 21, 2024
0eba195
staging: vchiq_arm: Use devm_kzalloc() for vchiq_arm_state allocation
Oct 16, 2024
8644fe3
lib/buildid: Fix build ID parsing logic
olsajiri Nov 4, 2024
695599a
media: dvbdev: fix the logic when DVB_DYNAMIC_MINORS is not set
mchehab Nov 6, 2024
3a31eb8
NFSD: initialize copy->cp_clp early in nfsd4_copy for use by trace point
daimngo Nov 18, 2024
2aec2ad
NFSD: Async COPY result needs to return a write verifier
chucklever Nov 18, 2024
9617140
NFSD: Limit the number of concurrent async COPY operations
chucklever Nov 18, 2024
298d46d
NFSD: Initialize struct nfsd4_copy earlier
chucklever Nov 18, 2024
391ce96
NFSD: Never decrement pending_async_copies on error
chucklever Nov 18, 2024
5eae979
mptcp: define more local variables sk
geliangtang Nov 18, 2024
438c5b4
mptcp: add userspace_pm_lookup_addr_by_id helper
Nov 18, 2024
2c2863c
mptcp: update local address flags when setting it
Nov 18, 2024
1dd496f
mptcp: hold pm lock when deleting entry
Nov 18, 2024
f5786f8
mptcp: drop lookup_by_id in lookup_addr
Nov 18, 2024
db08cc3
mptcp: pm: use _rcu variant under rcu_read_lock
matttbe Nov 18, 2024
f64f95f
drm/amd/pm: Vangogh: Fix kernel memory out of bounds write
Oct 25, 2024
2cb8b9d
fs/9p: fix uninitialized values during inode evict
ericvh Nov 19, 2024
ff6ff72
leds: mlxreg: Use devm_mutex_init() for mutex initialization
geo-stark Apr 11, 2024
3fb1a83
mm: avoid unsafe VMA hook invocation when error arises on mmap hook
lorenzo-stoakes Nov 15, 2024
a2ce7be
mm: unconditionally close VMAs on error
lorenzo-stoakes Nov 15, 2024
60d8379
mm: refactor map_deny_write_exec()
lorenzo-stoakes Nov 15, 2024
c0ce099
mm: refactor arch_calc_vm_flag_bits() and arm64 MTE handling
lorenzo-stoakes Nov 15, 2024
09e6bea
mm: resolve faulty mmap_region() error path behaviour
lorenzo-stoakes Nov 15, 2024
8864735
mm/damon/core: check apply interval in damon_do_apply_schemes()
sjp38 Feb 5, 2024
711db4d
mm/damon/core: handle zero schemes apply interval
sjp38 Oct 31, 2024
3b1f1db
mm/damon/core: copy nr_accesses when splitting region
sjp38 Nov 19, 2023
cd9060f
Linux 6.6.63
gregkh Nov 22, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
LoongArch: Make KASAN work with 5-level page-tables
commit a410656643ce4844ba9875aa4e87a7779308259b upstream.

Make KASAN work with 5-level page-tables, including:
1. Implement and use __pgd_none() and kasan_p4d_offset().
2. As done in kasan_pmd_populate() and kasan_pte_populate(), restrict
   the loop conditions of kasan_p4d_populate() and kasan_pud_populate()
   to avoid unnecessary population.

Cc: [email protected]
Signed-off-by: Huacai Chen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
chenhuacai authored and Avenger-285714 committed Nov 23, 2024

Verified

This commit was signed with the committer’s verified signature.
commit af2eaa60984ac692eb04200e3006932ca82f60cb
26 changes: 23 additions & 3 deletions arch/loongarch/mm/kasan_init.c
Original file line number Diff line number Diff line change
@@ -13,6 +13,13 @@

static pgd_t kasan_pg_dir[PTRS_PER_PGD] __initdata __aligned(PAGE_SIZE);

#ifdef __PAGETABLE_P4D_FOLDED
#define __pgd_none(early, pgd) (0)
#else
#define __pgd_none(early, pgd) (early ? (pgd_val(pgd) == 0) : \
(__pa(pgd_val(pgd)) == (unsigned long)__pa(kasan_early_shadow_p4d)))
#endif

#ifdef __PAGETABLE_PUD_FOLDED
#define __p4d_none(early, p4d) (0)
#else
@@ -142,6 +149,19 @@ static pud_t *__init kasan_pud_offset(p4d_t *p4dp, unsigned long addr, int node,
return pud_offset(p4dp, addr);
}

static p4d_t *__init kasan_p4d_offset(pgd_t *pgdp, unsigned long addr, int node, bool early)
{
if (__pgd_none(early, pgdp_get(pgdp))) {
phys_addr_t p4d_phys = early ?
__pa_symbol(kasan_early_shadow_p4d) : kasan_alloc_zeroed_page(node);
if (!early)
memcpy(__va(p4d_phys), kasan_early_shadow_p4d, sizeof(kasan_early_shadow_p4d));
pgd_populate(&init_mm, pgdp, (p4d_t *)__va(p4d_phys));
}

return p4d_offset(pgdp, addr);
}

static void __init kasan_pte_populate(pmd_t *pmdp, unsigned long addr,
unsigned long end, int node, bool early)
{
@@ -178,19 +198,19 @@ static void __init kasan_pud_populate(p4d_t *p4dp, unsigned long addr,
do {
next = pud_addr_end(addr, end);
kasan_pmd_populate(pudp, addr, next, node, early);
} while (pudp++, addr = next, addr != end);
} while (pudp++, addr = next, addr != end && __pud_none(early, READ_ONCE(*pudp)));
}

static void __init kasan_p4d_populate(pgd_t *pgdp, unsigned long addr,
unsigned long end, int node, bool early)
{
unsigned long next;
p4d_t *p4dp = p4d_offset(pgdp, addr);
p4d_t *p4dp = kasan_p4d_offset(pgdp, addr, node, early);

do {
next = p4d_addr_end(addr, end);
kasan_pud_populate(p4dp, addr, next, node, early);
} while (p4dp++, addr = next, addr != end);
} while (p4dp++, addr = next, addr != end && __p4d_none(early, READ_ONCE(*p4dp)));
}

static void __init kasan_pgd_populate(unsigned long addr, unsigned long end,