Skip to content

Commit 45c226d

Browse files
kuba-mookuba-moo
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR. Conflicts: drivers/net/ethernet/intel/ice/ice_main.c c9663f7 ("ice: adjust switchdev rebuild path") 7758017 ("ice: restore timestamp configuration after device reset") https://lore.kernel.org/all/[email protected]/ Adjacent changes: kernel/bpf/verifier.c bb124da ("bpf: keep track of max number of bpf_loop callback iterations") 5f99f31 ("bpf: add register bounds sanity checks and sanitization") Signed-off-by: Jakub Kicinski <[email protected]>
2 parents c5b9f47 + d3fa86b commit 45c226d

File tree

231 files changed

+4348
-3331
lines changed

Some content is hidden

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

231 files changed

+4348
-3331
lines changed

‎Documentation/arch/loongarch/introduction.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,9 +375,9 @@ Developer web site of Loongson and LoongArch (Software and Documentation):
375375

376376
Documentation of LoongArch ISA:
377377

378-
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.02-CN.pdf (in Chinese)
378+
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.10-CN.pdf (in Chinese)
379379

380-
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.02-EN.pdf (in English)
380+
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.10-EN.pdf (in English)
381381

382382
Documentation of LoongArch ELF psABI:
383383

‎Documentation/arch/x86/boot.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Protocol 2.14 BURNT BY INCORRECT COMMIT
7777
Protocol 2.15 (Kernel 5.5) Added the kernel_info and kernel_info.setup_type_max.
7878
============= ============================================================
7979

80-
.. note::
80+
.. note::
8181
The protocol version number should be changed only if the setup header
8282
is changed. There is no need to update the version number if boot_params
8383
or kernel_info are changed. Additionally, it is recommended to use

‎Documentation/devicetree/bindings/ufs/qcom,ufs.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ properties:
3636
- qcom,sm8350-ufshc
3737
- qcom,sm8450-ufshc
3838
- qcom,sm8550-ufshc
39+
- qcom,sm8650-ufshc
3940
- const: qcom,ufshc
4041
- const: jedec,ufs-2.0
4142

@@ -122,6 +123,7 @@ allOf:
122123
- qcom,sm8350-ufshc
123124
- qcom,sm8450-ufshc
124125
- qcom,sm8550-ufshc
126+
- qcom,sm8650-ufshc
125127
then:
126128
properties:
127129
clocks:

‎Documentation/filesystems/erofs.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@ compatibility checking tool (fsck.erofs), and a debugging tool (dump.erofs):
9191

9292
- git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git
9393

94+
For more information, please also refer to the documentation site:
95+
96+
- https://erofs.docs.kernel.org
97+
9498
Bugs and patches are welcome, please kindly help us and send to the following
9599
linux-erofs mailing list:
96100

‎Documentation/process/maintainer-netdev.rst

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,23 @@ Review timelines
193193
Generally speaking, the patches get triaged quickly (in less than
194194
48h). But be patient, if your patch is active in patchwork (i.e. it's
195195
listed on the project's patch list) the chances it was missed are close to zero.
196-
Asking the maintainer for status updates on your
197-
patch is a good way to ensure your patch is ignored or pushed to the
198-
bottom of the priority list.
196+
197+
The high volume of development on netdev makes reviewers move on
198+
from discussions relatively quickly. New comments and replies
199+
are very unlikely to arrive after a week of silence. If a patch
200+
is no longer active in patchwork and the thread went idle for more
201+
than a week - clarify the next steps and/or post the next version.
202+
203+
For RFC postings specifically, if nobody responded in a week - reviewers
204+
either missed the posting or have no strong opinions. If the code is ready,
205+
repost as a PATCH.
206+
207+
Emails saying just "ping" or "bump" are considered rude. If you can't figure
208+
out the status of the patch from patchwork or where the discussion has
209+
landed - describe your best guess and ask if it's correct. For example::
210+
211+
I don't understand what the next steps are. Person X seems to be unhappy
212+
with A, should I do B and repost the patches?
199213

200214
.. _Changes requested:
201215

‎Documentation/translations/zh_CN/arch/loongarch/introduction.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,9 +338,9 @@ Loongson与LoongArch的开发者网站（软件与文档资源）：
338338

339339
LoongArch指令集架构的文档：
340340

341-
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.02-CN.pdf （中文版）
341+
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.10-CN.pdf （中文版）
342342

343-
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.02-EN.pdf （英文版）
343+
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.10-EN.pdf （英文版）
344344

345345
LoongArch的ELF psABI文档：
346346

‎MAINTAINERS

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7855,6 +7855,7 @@ R: Yue Hu <[email protected]>
78557855
R: Jeffle Xu <[email protected]>
78567856
L: [email protected]
78577857
S: Maintained
7858+
W: https://erofs.docs.kernel.org
78587859
T: git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
78597860
F: Documentation/ABI/testing/sysfs-fs-erofs
78607861
F: Documentation/filesystems/erofs.rst
@@ -11024,7 +11025,6 @@ F: drivers/net/wireless/intel/iwlwifi/
1102411025

1102511026
INTEL WMI SLIM BOOTLOADER (SBL) FIRMWARE UPDATE DRIVER
1102611027
M: Jithu Joseph <[email protected]>
11027-
R: Maurice Ma <[email protected]>
1102811028
S: Maintained
1102911029
W: https://slimbootloader.github.io/security/firmware-update.html
1103011030
F: drivers/platform/x86/intel/wmi/sbl-fw-update.c
@@ -13778,7 +13778,6 @@ F: drivers/net/ethernet/mellanox/mlxfw/
1377813778
MELLANOX HARDWARE PLATFORM SUPPORT
1377913779
M: Hans de Goede <[email protected]>
1378013780
M: Ilpo Järvinen <[email protected]>
13781-
M: Mark Gross <[email protected]>
1378213781
M: Vadim Pasternak <[email protected]>
1378313782
L: [email protected]
1378413783
S: Supported
@@ -14387,7 +14386,6 @@ F: drivers/platform/surface/surface_gpe.c
1438714386
MICROSOFT SURFACE HARDWARE PLATFORM SUPPORT
1438814387
M: Hans de Goede <[email protected]>
1438914388
M: Ilpo Järvinen <[email protected]>
14390-
M: Mark Gross <[email protected]>
1439114389
M: Maximilian Luz <[email protected]>
1439214390
L: [email protected]
1439314391
S: Maintained
@@ -14994,6 +14992,7 @@ M: Jakub Kicinski <[email protected]>
1499414992
M: Paolo Abeni <[email protected]>
1499514993
L: [email protected]
1499614994
S: Maintained
14995+
P: Documentation/process/maintainer-netdev.rst
1499714996
Q: https://patchwork.kernel.org/project/netdevbpf/list/
1499814997
T: git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
1499914998
T: git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
@@ -15045,6 +15044,7 @@ M: Jakub Kicinski <[email protected]>
1504515044
M: Paolo Abeni <[email protected]>
1504615045
L: [email protected]
1504715046
S: Maintained
15047+
P: Documentation/process/maintainer-netdev.rst
1504815048
Q: https://patchwork.kernel.org/project/netdevbpf/list/
1504915049
B: mailto:[email protected]
1505015050
T: git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
@@ -15055,6 +15055,7 @@ F: Documentation/networking/
1505515055
F: Documentation/process/maintainer-netdev.rst
1505615056
F: Documentation/userspace-api/netlink/
1505715057
F: include/linux/in.h
15058+
F: include/linux/indirect_call_wrapper.h
1505815059
F: include/linux/net.h
1505915060
F: include/linux/netdevice.h
1506015061
F: include/net/
@@ -23664,7 +23665,6 @@ F: drivers/platform/x86/x86-android-tablets/
2366423665
X86 PLATFORM DRIVERS
2366523666
M: Hans de Goede <[email protected]>
2366623667
M: Ilpo Järvinen <[email protected]>
23667-
M: Mark Gross <[email protected]>
2366823668
L: [email protected]
2366923669
S: Maintained
2367023670
Q: https://patchwork.kernel.org/project/platform-driver-x86/list/
@@ -23702,6 +23702,20 @@ F: arch/x86/kernel/dumpstack.c
2370223702
F: arch/x86/kernel/stacktrace.c
2370323703
F: arch/x86/kernel/unwind_*.c
2370423704

23705+
X86 TRUST DOMAIN EXTENSIONS (TDX)
23706+
M: Kirill A. Shutemov <[email protected]>
23707+
R: Dave Hansen <[email protected]>
23708+
L: [email protected]
23709+
L: [email protected]
23710+
S: Supported
23711+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/tdx
23712+
F: arch/x86/boot/compressed/tdx*
23713+
F: arch/x86/coco/tdx/
23714+
F: arch/x86/include/asm/shared/tdx.h
23715+
F: arch/x86/include/asm/tdx.h
23716+
F: arch/x86/virt/vmx/tdx/
23717+
F: drivers/virt/coco/tdx-guest
23718+
2370523719
X86 VDSO
2370623720
M: Andy Lutomirski <[email protected]>
2370723721
L: [email protected]
@@ -23882,8 +23896,7 @@ T: git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
2388223896
P: Documentation/filesystems/xfs-maintainer-entry-profile.rst
2388323897
F: Documentation/ABI/testing/sysfs-fs-xfs
2388423898
F: Documentation/admin-guide/xfs.rst
23885-
F: Documentation/filesystems/xfs-delayed-logging-design.rst
23886-
F: Documentation/filesystems/xfs-self-describing-metadata.rst
23899+
F: Documentation/filesystems/xfs-*
2388723900
F: fs/xfs/
2388823901
F: include/uapi/linux/dqblk_xfs.h
2388923902
F: include/uapi/linux/fsmap.h

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 6
33
PATCHLEVEL = 7
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc1
5+
EXTRAVERSION = -rc2
66
NAME = Hurr durr I'ma ninja sloth
77

88
# *DOCUMENTATION*

‎arch/loongarch/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ LDFLAGS_vmlinux += -static -n -nostdlib
6868
ifdef CONFIG_AS_HAS_EXPLICIT_RELOCS
6969
cflags-y += $(call cc-option,-mexplicit-relocs)
7070
KBUILD_CFLAGS_KERNEL += $(call cc-option,-mdirect-extern-access)
71+
KBUILD_CFLAGS_KERNEL += $(call cc-option,-fdirect-access-external-data)
7172
KBUILD_AFLAGS_MODULE += $(call cc-option,-fno-direct-access-external-data)
7273
KBUILD_CFLAGS_MODULE += $(call cc-option,-fno-direct-access-external-data)
7374
KBUILD_AFLAGS_MODULE += $(call cc-option,-mno-relax) $(call cc-option,-Wa$(comma)-mno-relax)
@@ -142,6 +143,8 @@ vdso-install-y += arch/loongarch/vdso/vdso.so.dbg
142143

143144
all: $(notdir $(KBUILD_IMAGE))
144145

146+
vmlinuz.efi: vmlinux.efi
147+
145148
vmlinux.elf vmlinux.efi vmlinuz.efi: vmlinux
146149
$(Q)$(MAKE) $(build)=$(boot) $(bootvars-y) $(boot)/$@
147150

‎arch/loongarch/include/asm/asmmacro.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -609,8 +609,7 @@
609609
lu32i.d \reg, 0
610610
lu52i.d \reg, \reg, 0
611611
.pushsection ".la_abs", "aw", %progbits
612-
768:
613-
.dword 768b-766b
612+
.dword 766b
614613
.dword \sym
615614
.popsection
616615
#endif

‎arch/loongarch/include/asm/percpu.h

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ static __always_inline unsigned long __percpu_##op(void *ptr, \
4040
switch (size) { \
4141
case 4: \
4242
__asm__ __volatile__( \
43-
"am"#asm_op".w" " %[ret], %[val], %[ptr] \n" \
43+
"am"#asm_op".w" " %[ret], %[val], %[ptr] \n" \
4444
: [ret] "=&r" (ret), [ptr] "+ZB"(*(u32 *)ptr) \
4545
: [val] "r" (val)); \
4646
break; \
4747
case 8: \
4848
__asm__ __volatile__( \
49-
"am"#asm_op".d" " %[ret], %[val], %[ptr] \n" \
49+
"am"#asm_op".d" " %[ret], %[val], %[ptr] \n" \
5050
: [ret] "=&r" (ret), [ptr] "+ZB"(*(u64 *)ptr) \
5151
: [val] "r" (val)); \
5252
break; \
@@ -63,7 +63,7 @@ PERCPU_OP(and, and, &)
6363
PERCPU_OP(or, or, |)
6464
#undef PERCPU_OP
6565

66-
static __always_inline unsigned long __percpu_read(void *ptr, int size)
66+
static __always_inline unsigned long __percpu_read(void __percpu *ptr, int size)
6767
{
6868
unsigned long ret;
6969

@@ -100,7 +100,7 @@ static __always_inline unsigned long __percpu_read(void *ptr, int size)
100100
return ret;
101101
}
102102

103-
static __always_inline void __percpu_write(void *ptr, unsigned long val, int size)
103+
static __always_inline void __percpu_write(void __percpu *ptr, unsigned long val, int size)
104104
{
105105
switch (size) {
106106
case 1:
@@ -132,8 +132,7 @@ static __always_inline void __percpu_write(void *ptr, unsigned long val, int siz
132132
}
133133
}
134134

135-
static __always_inline unsigned long __percpu_xchg(void *ptr, unsigned long val,
136-
int size)
135+
static __always_inline unsigned long __percpu_xchg(void *ptr, unsigned long val, int size)
137136
{
138137
switch (size) {
139138
case 1:

‎arch/loongarch/include/asm/setup.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ extern void set_merr_handler(unsigned long offset, void *addr, unsigned long len
2525
#ifdef CONFIG_RELOCATABLE
2626

2727
struct rela_la_abs {
28-
long offset;
28+
long pc;
2929
long symvalue;
3030
};
3131

‎arch/loongarch/kernel/relocate.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ static inline void __init relocate_absolute(long random_offset)
5252
for (p = begin; (void *)p < end; p++) {
5353
long v = p->symvalue;
5454
uint32_t lu12iw, ori, lu32id, lu52id;
55-
union loongarch_instruction *insn = (void *)p - p->offset;
55+
union loongarch_instruction *insn = (void *)p->pc;
5656

5757
lu12iw = (v >> 12) & 0xfffff;
5858
ori = v & 0xfff;
@@ -102,6 +102,14 @@ static inline __init unsigned long get_random_boot(void)
102102
return hash;
103103
}
104104

105+
static int __init nokaslr(char *p)
106+
{
107+
pr_info("KASLR is disabled.\n");
108+
109+
return 0; /* Print a notice and silence the boot warning */
110+
}
111+
early_param("nokaslr", nokaslr);
112+
105113
static inline __init bool kaslr_disabled(void)
106114
{
107115
char *str;

‎arch/loongarch/kernel/time.c

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -58,43 +58,38 @@ static int constant_set_state_oneshot(struct clock_event_device *evt)
5858
return 0;
5959
}
6060

61-
static int constant_set_state_oneshot_stopped(struct clock_event_device *evt)
61+
static int constant_set_state_periodic(struct clock_event_device *evt)
6262
{
63+
unsigned long period;
6364
unsigned long timer_config;
6465

6566
raw_spin_lock(&state_lock);
6667

67-
timer_config = csr_read64(LOONGARCH_CSR_TCFG);
68-
timer_config &= ~CSR_TCFG_EN;
68+
period = const_clock_freq / HZ;
69+
timer_config = period & CSR_TCFG_VAL;
70+
timer_config |= (CSR_TCFG_PERIOD | CSR_TCFG_EN);
6971
csr_write64(timer_config, LOONGARCH_CSR_TCFG);
7072

7173
raw_spin_unlock(&state_lock);
7274

7375
return 0;
7476
}
7577

76-
static int constant_set_state_periodic(struct clock_event_device *evt)
78+
static int constant_set_state_shutdown(struct clock_event_device *evt)
7779
{
78-
unsigned long period;
7980
unsigned long timer_config;
8081

8182
raw_spin_lock(&state_lock);
8283

83-
period = const_clock_freq / HZ;
84-
timer_config = period & CSR_TCFG_VAL;
85-
timer_config |= (CSR_TCFG_PERIOD | CSR_TCFG_EN);
84+
timer_config = csr_read64(LOONGARCH_CSR_TCFG);
85+
timer_config &= ~CSR_TCFG_EN;
8686
csr_write64(timer_config, LOONGARCH_CSR_TCFG);
8787

8888
raw_spin_unlock(&state_lock);
8989

9090
return 0;
9191
}
9292

93-
static int constant_set_state_shutdown(struct clock_event_device *evt)
94-
{
95-
return 0;
96-
}
97-
9893
static int constant_timer_next_event(unsigned long delta, struct clock_event_device *evt)
9994
{
10095
unsigned long timer_config;
@@ -161,7 +156,7 @@ int constant_clockevent_init(void)
161156
cd->rating = 320;
162157
cd->cpumask = cpumask_of(cpu);
163158
cd->set_state_oneshot = constant_set_state_oneshot;
164-
cd->set_state_oneshot_stopped = constant_set_state_oneshot_stopped;
159+
cd->set_state_oneshot_stopped = constant_set_state_shutdown;
165160
cd->set_state_periodic = constant_set_state_periodic;
166161
cd->set_state_shutdown = constant_set_state_shutdown;
167162
cd->set_next_event = constant_timer_next_event;

‎arch/loongarch/mm/pgtable.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ struct page *dmw_virt_to_page(unsigned long kaddr)
1313
{
1414
return pfn_to_page(virt_to_pfn(kaddr));
1515
}
16-
EXPORT_SYMBOL_GPL(dmw_virt_to_page);
16+
EXPORT_SYMBOL(dmw_virt_to_page);
1717

1818
struct page *tlb_virt_to_page(unsigned long kaddr)
1919
{
2020
return pfn_to_page(pte_pfn(*virt_to_kpte(kaddr)));
2121
}
22-
EXPORT_SYMBOL_GPL(tlb_virt_to_page);
22+
EXPORT_SYMBOL(tlb_virt_to_page);
2323

2424
pgd_t *pgd_alloc(struct mm_struct *mm)
2525
{

‎arch/parisc/Kconfig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,11 @@ config ARCH_MMAP_RND_COMPAT_BITS_MIN
140140
default 8
141141

142142
config ARCH_MMAP_RND_BITS_MAX
143-
default 24 if 64BIT
144-
default 17
143+
default 18 if 64BIT
144+
default 13
145145

146146
config ARCH_MMAP_RND_COMPAT_BITS_MAX
147-
default 17
147+
default 13
148148

149149
# unless you want to implement ACPI on PA-RISC ... ;-)
150150
config PM

0 commit comments

Comments
 (0)