Skip to content

Commit 3b269e1

Browse files
frank-wfrank-w
committed
Merge tag 'v6.18.16' into 6.18-main
Linux 6.18.16 # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEE4n5dijQDou9mhzu83qZv95d3LNwFAmmoLVcACgkQ3qZv95d3 # LNygmQ//boGAEdYY3Xfgs+TC23cpmRK6iT3l7SWGw9RADxK44yxwA3v1l3suZDeT # duz9j02GZEV+ICmzJ2iUkZB2dB6I56NcRPxaqY3q9O+MQykkqCC9d/tAZcX5uxA5 # oaPkrhZd+Ib3d4Ud8tBSNyWA+RBrtV2crgpOU8ufnyMUdNJNuaXg3iw6GTJD425A # dobDmgKra8j72qpnYBP0Njw3OE7Jn3Prv0x2c58Tm+0KwfHXc7X1kRFHkT2WYdkf # 91eRpIYj4PtwD6lk8WcYlbj1q6H3ZZ3ixrMxRJooCa+1lhydeu8tdfP1bxRMRIMw # 51PgbQDHWrBattutk+21xxBPzngsyXKOjUrPZlMUAYV+oRCA3CQbSFxcaeAKEvrY # edbValv3pOfZ/TppqiYRkkiXzHt7aORhLRNgvV0AiP3iQxymLLCCA2Qd9BbjUZ4L # CkeziL+FcHHHBML6TZo3woBI54J+MBGBeMCV83920w8FDICE8arc1tb4nfKaCuCX # JCsXNicYxE/C5E9+f+90B4OszE8kcsKdf147lfW1r0ZPOQSuIhG+jZIeZaF8G+gt # tBZK09g8jqpoCClfyqXaTwq8440uX8yw3Rtz1w21mwqEatZwvcao+Raov1bm8NJv # bw2LFLuoHMaKaLdYSTBfSQDkNHWk9943ewdnzoxQyFakoH6ylhU= # =dBFN # -----END PGP SIGNATURE----- # gpg: Signature made Wed Mar 4 14:02:15 2026 CET # gpg: using RSA key E27E5D8A3403A2EF66873BBCDEA66FF797772CDC # gpg: Can't check signature: No public key
2 parents b341211 + 6258e29 commit 3b269e1

768 files changed

Lines changed: 7029 additions & 3323 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Documentation/admin-guide/cgroup-v2.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2538,10 +2538,10 @@ Cpuset Interface Files
25382538
Users can manually set it to a value that is different from
25392539
"cpuset.cpus". One constraint in setting it is that the list of
25402540
CPUs must be exclusive with respect to "cpuset.cpus.exclusive"
2541-
of its sibling. If "cpuset.cpus.exclusive" of a sibling cgroup
2542-
isn't set, its "cpuset.cpus" value, if set, cannot be a subset
2543-
of it to leave at least one CPU available when the exclusive
2544-
CPUs are taken away.
2541+
and "cpuset.cpus.exclusive.effective" of its siblings. Another
2542+
constraint is that it cannot be a superset of "cpuset.cpus"
2543+
of its sibling in order to leave at least one CPU available to
2544+
that sibling when the exclusive CPUs are taken away.
25452545

25462546
For a parent cgroup, any one of its exclusive CPUs can only
25472547
be distributed to at most one of its child cgroups. Having an

‎Documentation/hwmon/nct6683.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ AMD BC-250 NCT6686D EC firmware version 1.0 build 07/28/21
6565
ASRock X570 NCT6683D EC firmware version 1.0 build 06/28/19
6666
ASRock X670E NCT6686D EC firmware version 1.0 build 05/19/22
6767
ASRock B650 Steel Legend WiFi NCT6686D EC firmware version 1.0 build 11/09/23
68+
ASRock Z590 Taichi NCT6686D EC firmware version 1.0 build 01/25/21
6869
MSI B550 NCT6687D EC firmware version 1.0 build 05/07/20
6970
MSI X670-P NCT6687D EC firmware version 0.0 build 09/27/22
7071
MSI X870E NCT6687D EC firmware version 0.0 build 11/13/24

‎Documentation/networking/net_cachelines/inet_sock.rst‎

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -5,42 +5,43 @@
55
inet_sock struct fast path usage breakdown
66
==========================================
77

8-
======================= ===================== =================== =================== ======================================================================================================
9-
Type Name fastpath_tx_access fastpath_rx_access comment
10-
======================= ===================== =================== =================== ======================================================================================================
11-
struct sock sk read_mostly read_mostly tcp_init_buffer_space,tcp_init_transfer,tcp_finish_connect,tcp_connect,tcp_send_rcvq,tcp_send_syn_data
12-
struct ipv6_pinfo* pinet6
13-
be16 inet_sport read_mostly __tcp_transmit_skb
14-
be32 inet_daddr read_mostly ip_select_ident_segs
15-
be32 inet_rcv_saddr
16-
be16 inet_dport read_mostly __tcp_transmit_skb
17-
u16 inet_num
18-
be32 inet_saddr
19-
s16 uc_ttl read_mostly __ip_queue_xmit/ip_select_ttl
20-
u16 cmsg_flags
21-
struct ip_options_rcu* inet_opt read_mostly __ip_queue_xmit
22-
u16 inet_id read_mostly ip_select_ident_segs
23-
u8 tos read_mostly ip_queue_xmit
24-
u8 min_ttl
25-
u8 mc_ttl
26-
u8 pmtudisc
27-
u8:1 recverr
28-
u8:1 is_icsk
29-
u8:1 freebind
30-
u8:1 hdrincl
31-
u8:1 mc_loop
32-
u8:1 transparent
33-
u8:1 mc_all
34-
u8:1 nodefrag
35-
u8:1 bind_address_no_port
36-
u8:1 recverr_rfc4884
37-
u8:1 defer_connect read_mostly tcp_sendmsg_fastopen
38-
u8 rcv_tos
39-
u8 convert_csum
40-
int uc_index
41-
int mc_index
42-
be32 mc_addr
43-
struct ip_mc_socklist* mc_list
44-
struct inet_cork_full cork read_mostly __tcp_transmit_skb
45-
struct local_port_range
46-
======================= ===================== =================== =================== ======================================================================================================
8+
======================== ===================== =================== =================== ======================================================================================================
9+
Type Name fastpath_tx_access fastpath_rx_access comment
10+
======================== ===================== =================== =================== ======================================================================================================
11+
struct sock sk read_mostly read_mostly tcp_init_buffer_space,tcp_init_transfer,tcp_finish_connect,tcp_connect,tcp_send_rcvq,tcp_send_syn_data
12+
struct ipv6_pinfo* pinet6
13+
struct ipv6_fl_socklist* ipv6_fl_list read_mostly tcp_v6_connect,__ip6_datagram_connect,udpv6_sendmsg,rawv6_sendmsg
14+
be16 inet_sport read_mostly __tcp_transmit_skb
15+
be32 inet_daddr read_mostly ip_select_ident_segs
16+
be32 inet_rcv_saddr
17+
be16 inet_dport read_mostly __tcp_transmit_skb
18+
u16 inet_num
19+
be32 inet_saddr
20+
s16 uc_ttl read_mostly __ip_queue_xmit/ip_select_ttl
21+
u16 cmsg_flags
22+
struct ip_options_rcu* inet_opt read_mostly __ip_queue_xmit
23+
u16 inet_id read_mostly ip_select_ident_segs
24+
u8 tos read_mostly ip_queue_xmit
25+
u8 min_ttl
26+
u8 mc_ttl
27+
u8 pmtudisc
28+
u8:1 recverr
29+
u8:1 is_icsk
30+
u8:1 freebind
31+
u8:1 hdrincl
32+
u8:1 mc_loop
33+
u8:1 transparent
34+
u8:1 mc_all
35+
u8:1 nodefrag
36+
u8:1 bind_address_no_port
37+
u8:1 recverr_rfc4884
38+
u8:1 defer_connect read_mostly tcp_sendmsg_fastopen
39+
u8 rcv_tos
40+
u8 convert_csum
41+
int uc_index
42+
int mc_index
43+
be32 mc_addr
44+
struct ip_mc_socklist* mc_list
45+
struct inet_cork_full cork read_mostly __tcp_transmit_skb
46+
struct local_port_range
47+
======================== ===================== =================== =================== ======================================================================================================

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 18
4-
SUBLEVEL = 15
4+
SUBLEVEL = 16
55
EXTRAVERSION =
66
NAME = Baby Opossum Posse
77

‎arch/alpha/include/asm/pgtable.h‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <asm/processor.h> /* For TASK_SIZE */
1818
#include <asm/machvec.h>
1919
#include <asm/setup.h>
20+
#include <linux/page_table_check.h>
2021

2122
struct mm_struct;
2223
struct vm_area_struct;
@@ -183,6 +184,9 @@ extern inline void pud_set(pud_t * pudp, pmd_t * pmdp)
183184
{ pud_val(*pudp) = _PAGE_TABLE | ((((unsigned long) pmdp) - PAGE_OFFSET) << (32-PAGE_SHIFT)); }
184185

185186

187+
extern void migrate_flush_tlb_page(struct vm_area_struct *vma,
188+
unsigned long addr);
189+
186190
extern inline unsigned long
187191
pmd_page_vaddr(pmd_t pmd)
188192
{
@@ -202,7 +206,7 @@ extern inline int pte_none(pte_t pte) { return !pte_val(pte); }
202206
extern inline int pte_present(pte_t pte) { return pte_val(pte) & _PAGE_VALID; }
203207
extern inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
204208
{
205-
pte_val(*ptep) = 0;
209+
WRITE_ONCE(pte_val(*ptep), 0);
206210
}
207211

208212
extern inline int pmd_none(pmd_t pmd) { return !pmd_val(pmd); }
@@ -264,6 +268,33 @@ extern inline pte_t * pte_offset_kernel(pmd_t * dir, unsigned long address)
264268

265269
extern pgd_t swapper_pg_dir[1024];
266270

271+
#ifdef CONFIG_COMPACTION
272+
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
273+
274+
static inline pte_t ptep_get_and_clear(struct mm_struct *mm,
275+
unsigned long address,
276+
pte_t *ptep)
277+
{
278+
pte_t pte = READ_ONCE(*ptep);
279+
280+
pte_clear(mm, address, ptep);
281+
return pte;
282+
}
283+
284+
#define __HAVE_ARCH_PTEP_CLEAR_FLUSH
285+
286+
static inline pte_t ptep_clear_flush(struct vm_area_struct *vma,
287+
unsigned long addr, pte_t *ptep)
288+
{
289+
struct mm_struct *mm = vma->vm_mm;
290+
pte_t pte = ptep_get_and_clear(mm, addr, ptep);
291+
292+
page_table_check_pte_clear(mm, pte);
293+
migrate_flush_tlb_page(vma, addr);
294+
return pte;
295+
}
296+
297+
#endif
267298
/*
268299
* The Alpha doesn't have any external MMU info: the kernel page
269300
* tables contain all the necessary information.

‎arch/alpha/include/asm/tlbflush.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ flush_tlb_other(struct mm_struct *mm)
5858
unsigned long *mmc = &mm->context[smp_processor_id()];
5959
/* Check it's not zero first to avoid cacheline ping pong
6060
when possible. */
61-
if (*mmc) *mmc = 0;
61+
62+
if (READ_ONCE(*mmc))
63+
WRITE_ONCE(*mmc, 0);
6264
}
6365

6466
#ifndef CONFIG_SMP

‎arch/alpha/mm/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
# Makefile for the linux alpha-specific parts of the memory manager.
44
#
55

6-
obj-y := init.o fault.o
6+
obj-y := init.o fault.o tlbflush.o

‎arch/alpha/mm/tlbflush.c‎

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
// SPDX-License-Identifier: GPL-2.0
2+
/*
3+
* Alpha TLB shootdown helpers
4+
*
5+
* Copyright (C) 2025 Magnus Lindholm <linmag7@gmail.com>
6+
*
7+
* Alpha-specific TLB flush helpers that cannot be expressed purely
8+
* as inline functions.
9+
*
10+
* These helpers provide combined MM context handling (ASN rollover)
11+
* and immediate TLB invalidation for page migration and memory
12+
* compaction paths, where lazy shootdowns are insufficient.
13+
*/
14+
15+
#include <linux/mm.h>
16+
#include <linux/smp.h>
17+
#include <linux/sched.h>
18+
#include <asm/tlbflush.h>
19+
#include <asm/pal.h>
20+
#include <asm/mmu_context.h>
21+
22+
#define asn_locked() (cpu_data[smp_processor_id()].asn_lock)
23+
24+
/*
25+
* Migration/compaction helper: combine mm context (ASN) handling with an
26+
* immediate per-page TLB invalidate and (for exec) an instruction barrier.
27+
*
28+
* This mirrors the SMP combined IPI handler semantics, but runs locally on UP.
29+
*/
30+
#ifndef CONFIG_SMP
31+
void migrate_flush_tlb_page(struct vm_area_struct *vma,
32+
unsigned long addr)
33+
{
34+
struct mm_struct *mm = vma->vm_mm;
35+
int tbi_type = (vma->vm_flags & VM_EXEC) ? 3 : 2;
36+
37+
/*
38+
* First do the mm-context side:
39+
* If we're currently running this mm, reload a fresh context ASN.
40+
* Otherwise, mark context invalid.
41+
*
42+
* On UP, this is mostly about matching the SMP semantics and ensuring
43+
* exec/i-cache tagging assumptions hold when compaction migrates pages.
44+
*/
45+
if (mm == current->active_mm)
46+
flush_tlb_current(mm);
47+
else
48+
flush_tlb_other(mm);
49+
50+
/*
51+
* Then do the immediate translation kill for this VA.
52+
* For exec mappings, order instruction fetch after invalidation.
53+
*/
54+
tbi(tbi_type, addr);
55+
}
56+
57+
#else
58+
struct tlb_mm_and_addr {
59+
struct mm_struct *mm;
60+
unsigned long addr;
61+
int tbi_type; /* 2 = DTB, 3 = ITB+DTB */
62+
};
63+
64+
static void ipi_flush_mm_and_page(void *x)
65+
{
66+
struct tlb_mm_and_addr *d = x;
67+
68+
/* Part 1: mm context side (Alpha uses ASN/context as a key mechanism). */
69+
if (d->mm == current->active_mm && !asn_locked())
70+
__load_new_mm_context(d->mm);
71+
else
72+
flush_tlb_other(d->mm);
73+
74+
/* Part 2: immediate per-VA invalidation on this CPU. */
75+
tbi(d->tbi_type, d->addr);
76+
}
77+
78+
void migrate_flush_tlb_page(struct vm_area_struct *vma, unsigned long addr)
79+
{
80+
struct mm_struct *mm = vma->vm_mm;
81+
struct tlb_mm_and_addr d = {
82+
.mm = mm,
83+
.addr = addr,
84+
.tbi_type = (vma->vm_flags & VM_EXEC) ? 3 : 2,
85+
};
86+
87+
/*
88+
* One synchronous rendezvous: every CPU runs ipi_flush_mm_and_page().
89+
* This is the "combined" version of flush_tlb_mm + per-page invalidate.
90+
*/
91+
preempt_disable();
92+
on_each_cpu(ipi_flush_mm_and_page, &d, 1);
93+
94+
/*
95+
* mimic flush_tlb_mm()'s mm_users<=1 optimization.
96+
*/
97+
if (atomic_read(&mm->mm_users) <= 1) {
98+
99+
int cpu, this_cpu;
100+
this_cpu = smp_processor_id();
101+
102+
for (cpu = 0; cpu < NR_CPUS; cpu++) {
103+
if (!cpu_online(cpu) || cpu == this_cpu)
104+
continue;
105+
if (READ_ONCE(mm->context[cpu]))
106+
WRITE_ONCE(mm->context[cpu], 0);
107+
}
108+
}
109+
preempt_enable();
110+
}
111+
112+
#endif

‎arch/arm/mach-omap2/control.c‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ int __init omap2_control_base_init(void)
732732
*/
733733
int __init omap_control_init(void)
734734
{
735-
struct device_node *np, *scm_conf;
735+
struct device_node *np, *scm_conf, *clocks_node;
736736
const struct of_device_id *match;
737737
const struct omap_prcm_init_data *data;
738738
int ret;
@@ -753,16 +753,19 @@ int __init omap_control_init(void)
753753

754754
if (IS_ERR(syscon)) {
755755
ret = PTR_ERR(syscon);
756-
goto of_node_put;
756+
goto err_put_scm_conf;
757757
}
758758

759-
if (of_get_child_by_name(scm_conf, "clocks")) {
759+
clocks_node = of_get_child_by_name(scm_conf, "clocks");
760+
if (clocks_node) {
761+
of_node_put(clocks_node);
760762
ret = omap2_clk_provider_init(scm_conf,
761763
data->index,
762764
syscon, NULL);
763765
if (ret)
764-
goto of_node_put;
766+
goto err_put_scm_conf;
765767
}
768+
of_node_put(scm_conf);
766769
} else {
767770
/* No scm_conf found, direct access */
768771
ret = omap2_clk_provider_init(np, data->index, NULL,
@@ -780,6 +783,9 @@ int __init omap_control_init(void)
780783

781784
return 0;
782785

786+
err_put_scm_conf:
787+
if (scm_conf)
788+
of_node_put(scm_conf);
783789
of_node_put:
784790
of_node_put(np);
785791
return ret;

‎arch/arm/mm/physaddr.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ static inline bool __virt_addr_valid(unsigned long x)
3838
phys_addr_t __virt_to_phys(unsigned long x)
3939
{
4040
WARN(!__virt_addr_valid(x),
41-
"virt_to_phys used for non-linear address: %pK (%pS)\n",
41+
"virt_to_phys used for non-linear address: %px (%pS)\n",
4242
(void *)x, (void *)x);
4343

4444
return __virt_to_phys_nodebug(x);

0 commit comments

Comments
 (0)