Skip to content

Commit d3d0b8d

Browse files
committed
Merge tag 'kvm-x86-fixes-6.14-rcN' of https://github.com/kvm-x86/linux into HEAD
KVM fixes for 6.14 part 1 - Reject Hyper-V SEND_IPI hypercalls if the local APIC isn't being emulated by KVM to fix a NULL pointer dereference. - Enter guest mode (L2) from KVM's perspective before initializing the vCPU's nested NPT MMU so that the MMU is properly tagged for L2, not L1. - Load the guest's DR6 outside of the innermost .vcpu_run() loop, as the guest's value may be stale if a VM-Exit is handled in the fastpath.
2 parents 409f453 + c2fee09 commit d3d0b8d

File tree

234 files changed

+2000
-947
lines changed

Some content is hidden

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

234 files changed

+2000
-947
lines changed

CREDITS

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2515,11 +2515,9 @@ D: SLS distribution
25152515
D: Initial implementation of VC's, pty's and select()
25162516

25172517
N: Pavel Machek
2518-
E: pavel@ucw.cz
2518+
E: pavel@kernel.org
25192519
P: 4096R/92DFCE96 4FA7 9EEF FCD4 C44F C585 B8C7 C060 2241 92DF CE96
2520-
D: Softcursor for vga, hypertech cdrom support, vcsa bugfix, nbd,
2521-
D: sun4/330 port, capabilities for elf, speedup for rm on ext2, USB,
2522-
D: work on suspend-to-ram/disk, killing duplicates from ioctl32,
2520+
D: NBD, Sun4/330 port, USB, work on suspend-to-ram/disk,
25232521
D: Altera SoCFPGA and Nokia N900 support.
25242522
S: Czech Republic
25252523

Documentation/devicetree/bindings/interrupt-controller/microchip,lan966x-oic.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ allOf:
1414

1515
description: |
1616
The Microchip LAN966x outband interrupt controller (OIC) maps the internal
17-
interrupt sources of the LAN966x device to an external interrupt.
18-
When the LAN966x device is used as a PCI device, the external interrupt is
19-
routed to the PCI interrupt.
17+
interrupt sources of the LAN966x device to a PCI interrupt when the LAN966x
18+
device is used as a PCI device.
2019
2120
properties:
2221
compatible:
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
Submitting patches to bcachefs:
2+
===============================
3+
4+
Patches must be tested before being submitted, either with the xfstests suite
5+
[0], or the full bcachefs test suite in ktest [1], depending on what's being
6+
touched. Note that ktest wraps xfstests and will be an easier method to running
7+
it for most users; it includes single-command wrappers for all the mainstream
8+
in-kernel local filesystems.
9+
10+
Patches will undergo more testing after being merged (including
11+
lockdep/kasan/preempt/etc. variants), these are not generally required to be
12+
run by the submitter - but do put some thought into what you're changing and
13+
which tests might be relevant, e.g. are you dealing with tricky memory layout
14+
work? kasan, are you doing locking work? then lockdep; and ktest includes
15+
single-command variants for the debug build types you'll most likely need.
16+
17+
The exception to this rule is incomplete WIP/RFC patches: if you're working on
18+
something nontrivial, it's encouraged to send out a WIP patch to let people
19+
know what you're doing and make sure you're on the right track. Just make sure
20+
it includes a brief note as to what's done and what's incomplete, to avoid
21+
confusion.
22+
23+
Rigorous checkpatch.pl adherence is not required (many of its warnings are
24+
considered out of date), but try not to deviate too much without reason.
25+
26+
Focus on writing code that reads well and is organized well; code should be
27+
aesthetically pleasing.
28+
29+
CI:
30+
===
31+
32+
Instead of running your tests locally, when running the full test suite it's
33+
prefereable to let a server farm do it in parallel, and then have the results
34+
in a nice test dashboard (which can tell you which failures are new, and
35+
presents results in a git log view, avoiding the need for most bisecting).
36+
37+
That exists [2], and community members may request an account. If you work for
38+
a big tech company, you'll need to help out with server costs to get access -
39+
but the CI is not restricted to running bcachefs tests: it runs any ktest test
40+
(which generally makes it easy to wrap other tests that can run in qemu).
41+
42+
Other things to think about:
43+
============================
44+
45+
- How will we debug this code? Is there sufficient introspection to diagnose
46+
when something starts acting wonky on a user machine?
47+
48+
We don't necessarily need every single field of every data structure visible
49+
with introspection, but having the important fields of all the core data
50+
types wired up makes debugging drastically easier - a bit of thoughtful
51+
foresight greatly reduces the need to have people build custom kernels with
52+
debug patches.
53+
54+
More broadly, think about all the debug tooling that might be needed.
55+
56+
- Does it make the codebase more or less of a mess? Can we also try to do some
57+
organizing, too?
58+
59+
- Do new tests need to be written? New assertions? How do we know and verify
60+
that the code is correct, and what happens if something goes wrong?
61+
62+
We don't yet have automated code coverage analysis or easy fault injection -
63+
but for now, pretend we did and ask what they might tell us.
64+
65+
Assertions are hugely important, given that we don't yet have a systems
66+
language that can do ergonomic embedded correctness proofs. Hitting an assert
67+
in testing is much better than wandering off into undefined behaviour la-la
68+
land - use them. Use them judiciously, and not as a replacement for proper
69+
error handling, but use them.
70+
71+
- Does it need to be performance tested? Should we add new peformance counters?
72+
73+
bcachefs has a set of persistent runtime counters which can be viewed with
74+
the 'bcachefs fs top' command; this should give users a basic idea of what
75+
their filesystem is currently doing. If you're doing a new feature or looking
76+
at old code, think if anything should be added.
77+
78+
- If it's a new on disk format feature - have upgrades and downgrades been
79+
tested? (Automated tests exists but aren't in the CI, due to the hassle of
80+
disk image management; coordinate to have them run.)
81+
82+
Mailing list, IRC:
83+
==================
84+
85+
Patches should hit the list [3], but much discussion and code review happens on
86+
IRC as well [4]; many people appreciate the more conversational approach and
87+
quicker feedback.
88+
89+
Additionally, we have a lively user community doing excellent QA work, which
90+
exists primarily on IRC. Please make use of that resource; user feedback is
91+
important for any nontrivial feature, and documenting it in commit messages
92+
would be a good idea.
93+
94+
[0]: git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git
95+
[1]: https://evilpiepirate.org/git/ktest.git/
96+
[2]: https://evilpiepirate.org/~testdashboard/ci/
97+
[3]: linux-bcachefs@vger.kernel.org
98+
[4]: irc.oftc.net#bcache, #bcachefs-dev

Documentation/filesystems/bcachefs/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ bcachefs Documentation
99
:numbered:
1010

1111
CodingStyle
12+
SubmittingPatches
1213
errorcodes

MAINTAINERS

Lines changed: 50 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2209,7 +2209,6 @@ F: sound/soc/codecs/cs42l84.*
22092209
F: sound/soc/codecs/ssm3515.c
22102210

22112211
ARM/APPLE MACHINE SUPPORT
2212-
M: Hector Martin <marcan@marcan.st>
22132212
M: Sven Peter <sven@svenpeter.dev>
22142213
R: Alyssa Rosenzweig <alyssa@rosenzweig.io>
22152214
L: asahi@lists.linux.dev
@@ -3955,6 +3954,7 @@ M: Kent Overstreet <kent.overstreet@linux.dev>
39553954
L: linux-bcachefs@vger.kernel.org
39563955
S: Supported
39573956
C: irc://irc.oftc.net/bcache
3957+
P: Documentation/filesystems/bcachefs/SubmittingPatches.rst
39583958
T: git https://evilpiepirate.org/git/bcachefs.git
39593959
F: fs/bcachefs/
39603960
F: Documentation/filesystems/bcachefs/
@@ -9418,7 +9418,7 @@ F: fs/freevxfs/
94189418

94199419
FREEZER
94209420
M: "Rafael J. Wysocki" <rafael@kernel.org>
9421-
M: Pavel Machek <pavel@ucw.cz>
9421+
M: Pavel Machek <pavel@kernel.org>
94229422
L: linux-pm@vger.kernel.org
94239423
S: Supported
94249424
F: Documentation/power/freezing-of-tasks.rst
@@ -9878,7 +9878,7 @@ S: Maintained
98789878
F: drivers/staging/gpib/
98799879

98809880
GPIO ACPI SUPPORT
9881-
M: Mika Westerberg <mika.westerberg@linux.intel.com>
9881+
M: Mika Westerberg <westeri@kernel.org>
98829882
M: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
98839883
L: linux-gpio@vger.kernel.org
98849884
L: linux-acpi@vger.kernel.org
@@ -10253,7 +10253,7 @@ F: drivers/video/fbdev/hgafb.c
1025310253

1025410254
HIBERNATION (aka Software Suspend, aka swsusp)
1025510255
M: "Rafael J. Wysocki" <rafael@kernel.org>
10256-
M: Pavel Machek <pavel@ucw.cz>
10256+
M: Pavel Machek <pavel@kernel.org>
1025710257
L: linux-pm@vger.kernel.org
1025810258
S: Supported
1025910259
B: https://bugzilla.kernel.org
@@ -13124,8 +13124,8 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/har
1312413124
F: scripts/leaking_addresses.pl
1312513125

1312613126
LED SUBSYSTEM
13127-
M: Pavel Machek <pavel@ucw.cz>
1312813127
M: Lee Jones <lee@kernel.org>
13128+
M: Pavel Machek <pavel@kernel.org>
1312913129
L: linux-leds@vger.kernel.org
1313013130
S: Maintained
1313113131
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git
@@ -16462,6 +16462,22 @@ F: include/net/dsa.h
1646216462
F: net/dsa/
1646316463
F: tools/testing/selftests/drivers/net/dsa/
1646416464

16465+
NETWORKING [ETHTOOL]
16466+
M: Andrew Lunn <andrew@lunn.ch>
16467+
M: Jakub Kicinski <kuba@kernel.org>
16468+
F: Documentation/netlink/specs/ethtool.yaml
16469+
F: Documentation/networking/ethtool-netlink.rst
16470+
F: include/linux/ethtool*
16471+
F: include/uapi/linux/ethtool*
16472+
F: net/ethtool/
16473+
F: tools/testing/selftests/drivers/net/*/ethtool*
16474+
16475+
NETWORKING [ETHTOOL CABLE TEST]
16476+
M: Andrew Lunn <andrew@lunn.ch>
16477+
F: net/ethtool/cabletest.c
16478+
F: tools/testing/selftests/drivers/net/*/ethtool*
16479+
K: cable_test
16480+
1646516481
NETWORKING [GENERAL]
1646616482
M: "David S. Miller" <davem@davemloft.net>
1646716483
M: Eric Dumazet <edumazet@google.com>
@@ -16621,6 +16637,7 @@ F: tools/testing/selftests/net/mptcp/
1662116637
NETWORKING [TCP]
1662216638
M: Eric Dumazet <edumazet@google.com>
1662316639
M: Neal Cardwell <ncardwell@google.com>
16640+
R: Kuniyuki Iwashima <kuniyu@amazon.com>
1662416641
L: netdev@vger.kernel.org
1662516642
S: Maintained
1662616643
F: Documentation/networking/net_cachelines/tcp_sock.rst
@@ -16648,6 +16665,31 @@ F: include/net/tls.h
1664816665
F: include/uapi/linux/tls.h
1664916666
F: net/tls/*
1665016667

16668+
NETWORKING [SOCKETS]
16669+
M: Eric Dumazet <edumazet@google.com>
16670+
M: Kuniyuki Iwashima <kuniyu@amazon.com>
16671+
M: Paolo Abeni <pabeni@redhat.com>
16672+
M: Willem de Bruijn <willemb@google.com>
16673+
S: Maintained
16674+
F: include/linux/sock_diag.h
16675+
F: include/linux/socket.h
16676+
F: include/linux/sockptr.h
16677+
F: include/net/sock.h
16678+
F: include/net/sock_reuseport.h
16679+
F: include/uapi/linux/socket.h
16680+
F: net/core/*sock*
16681+
F: net/core/scm.c
16682+
F: net/socket.c
16683+
16684+
NETWORKING [UNIX SOCKETS]
16685+
M: Kuniyuki Iwashima <kuniyu@amazon.com>
16686+
S: Maintained
16687+
F: include/net/af_unix.h
16688+
F: include/net/netns/unix.h
16689+
F: include/uapi/linux/unix_diag.h
16690+
F: net/unix/
16691+
F: tools/testing/selftests/net/af_unix/
16692+
1665116693
NETXEN (1/10) GbE SUPPORT
1665216694
M: Manish Chopra <manishc@marvell.com>
1665316695
M: Rahul Verma <rahulv@marvell.com>
@@ -16781,7 +16823,7 @@ F: include/linux/tick.h
1678116823
F: kernel/time/tick*.*
1678216824

1678316825
NOKIA N900 CAMERA SUPPORT (ET8EK8 SENSOR, AD5820 FOCUS)
16784-
M: Pavel Machek <pavel@ucw.cz>
16826+
M: Pavel Machek <pavel@kernel.org>
1678516827
M: Sakari Ailus <sakari.ailus@iki.fi>
1678616828
L: linux-media@vger.kernel.org
1678716829
S: Maintained
@@ -17713,6 +17755,7 @@ L: netdev@vger.kernel.org
1771317755
L: dev@openvswitch.org
1771417756
S: Maintained
1771517757
W: http://openvswitch.org
17758+
F: Documentation/networking/openvswitch.rst
1771617759
F: include/uapi/linux/openvswitch.h
1771717760
F: net/openvswitch/
1771817761
F: tools/testing/selftests/net/openvswitch/
@@ -22806,7 +22849,7 @@ F: drivers/sh/
2280622849
SUSPEND TO RAM
2280722850
M: "Rafael J. Wysocki" <rafael@kernel.org>
2280822851
M: Len Brown <len.brown@intel.com>
22809-
M: Pavel Machek <pavel@ucw.cz>
22852+
M: Pavel Machek <pavel@kernel.org>
2281022853
L: linux-pm@vger.kernel.org
2281122854
S: Supported
2281222855
B: https://bugzilla.kernel.org

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 6
33
PATCHLEVEL = 14
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc1
5+
EXTRAVERSION = -rc2
66
NAME = Baby Opossum Posse
77

88
# *DOCUMENTATION*

arch/alpha/include/asm/elf.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
7474
/*
7575
* This is used to ensure we don't load something for the wrong architecture.
7676
*/
77-
#define elf_check_arch(x) ((x)->e_machine == EM_ALPHA)
77+
#define elf_check_arch(x) (((x)->e_machine == EM_ALPHA) && !((x)->e_flags & EF_ALPHA_32BIT))
7878

7979
/*
8080
* These are used to set parameters in the core dumps.
@@ -137,10 +137,6 @@ extern int dump_elf_task(elf_greg_t *dest, struct task_struct *task);
137137
: amask (AMASK_CIX) ? "ev6" : "ev67"); \
138138
})
139139

140-
#define SET_PERSONALITY(EX) \
141-
set_personality(((EX).e_flags & EF_ALPHA_32BIT) \
142-
? PER_LINUX_32BIT : PER_LINUX)
143-
144140
extern int alpha_l1i_cacheshape;
145141
extern int alpha_l1d_cacheshape;
146142
extern int alpha_l2_cacheshape;

arch/alpha/include/asm/pgtable.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ static inline pte_t pte_swp_clear_exclusive(pte_t pte)
360360

361361
extern void paging_init(void);
362362

363-
/* We have our own get_unmapped_area to cope with ADDR_LIMIT_32BIT. */
363+
/* We have our own get_unmapped_area */
364364
#define HAVE_ARCH_UNMAPPED_AREA
365365

366366
#endif /* _ALPHA_PGTABLE_H */

arch/alpha/include/asm/processor.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,19 @@
88
#ifndef __ASM_ALPHA_PROCESSOR_H
99
#define __ASM_ALPHA_PROCESSOR_H
1010

11-
#include <linux/personality.h> /* for ADDR_LIMIT_32BIT */
12-
1311
/*
1412
* We have a 42-bit user address space: 4TB user VM...
1513
*/
1614
#define TASK_SIZE (0x40000000000UL)
1715

18-
#define STACK_TOP \
19-
(current->personality & ADDR_LIMIT_32BIT ? 0x80000000 : 0x00120000000UL)
16+
#define STACK_TOP (0x00120000000UL)
2017

2118
#define STACK_TOP_MAX 0x00120000000UL
2219

2320
/* This decides where the kernel will search for a free chunk of vm
2421
* space during mmap's.
2522
*/
26-
#define TASK_UNMAPPED_BASE \
27-
((current->personality & ADDR_LIMIT_32BIT) ? 0x40000000 : TASK_SIZE / 2)
23+
#define TASK_UNMAPPED_BASE (TASK_SIZE / 2)
2824

2925
/* This is dead. Everything has been moved to thread_info. */
3026
struct thread_struct { };

arch/alpha/kernel/osf_sys.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1210,8 +1210,7 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p)
12101210
return ret;
12111211
}
12121212

1213-
/* Get an address range which is currently unmapped. Similar to the
1214-
generic version except that we know how to honor ADDR_LIMIT_32BIT. */
1213+
/* Get an address range which is currently unmapped. */
12151214

12161215
static unsigned long
12171216
arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
@@ -1230,13 +1229,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
12301229
unsigned long len, unsigned long pgoff,
12311230
unsigned long flags, vm_flags_t vm_flags)
12321231
{
1233-
unsigned long limit;
1234-
1235-
/* "32 bit" actually means 31 bit, since pointers sign extend. */
1236-
if (current->personality & ADDR_LIMIT_32BIT)
1237-
limit = 0x80000000;
1238-
else
1239-
limit = TASK_SIZE;
1232+
unsigned long limit = TASK_SIZE;
12401233

12411234
if (len > limit)
12421235
return -ENOMEM;

0 commit comments

Comments
 (0)