Skip to content

Commit 7d8942d

Browse files
bonzinibonzini
committed
Merge tag 'kvm-x86-guest_memfd_fixes-6.8' of https://github.com/kvm-x86/linux into HEAD
KVM GUEST_MEMFD fixes for 6.8: - Make KVM_MEM_GUEST_MEMFD mutually exclusive with KVM_MEM_READONLY to avoid creating ABI that KVM can't sanely support. - Update documentation for KVM_SW_PROTECTED_VM to make it abundantly clear that such VMs are purely a development and testing vehicle, and come with zero guarantees. - Limit KVM_SW_PROTECTED_VM guests to the TDP MMU, as the long term plan is to support confidential VMs with deterministic private memory (SNP and TDX) only in the TDP MMU. - Fix a bug in a GUEST_MEMFD negative test that resulted in false passes when verifying that KVM_MEM_GUEST_MEMFD memslots can't be dirty logged.
2 parents 0cbca1b + 2dfd238 commit 7d8942d

File tree

401 files changed

+2986
-1748
lines changed

Some content is hidden

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

401 files changed

+2986
-1748
lines changed

‎.mailmap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
289289
John Crispin <john@phrozen.org> <blogic@openwrt.org>
290290
John Fastabend <john.fastabend@gmail.com> <john.r.fastabend@intel.com>
291291
John Keeping <john@keeping.me.uk> <john@metanate.com>
292+
John Moon <john@jmoon.dev> <quic_johmoo@quicinc.com>
292293
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
293294
John Stultz <johnstul@us.ibm.com>
294295
<jon.toppins+linux@gmail.com> <jtoppins@cumulusnetworks.com>
@@ -344,6 +345,7 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com>
344345
Leon Romanovsky <leon@kernel.org> <leon@leon.nu>
345346
Leon Romanovsky <leon@kernel.org> <leonro@mellanox.com>
346347
Leon Romanovsky <leon@kernel.org> <leonro@nvidia.com>
348+
Leo Yan <leo.yan@linux.dev> <leo.yan@linaro.org>
347349
Liam Mark <quic_lmark@quicinc.com> <lmark@codeaurora.org>
348350
Linas Vepstas <linas@austin.ibm.com>
349351
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>

‎Documentation/virt/kvm/api.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8791,6 +8791,11 @@ means the VM type with value @n is supported. Possible values of @n are::
87918791
#define KVM_X86_DEFAULT_VM 0
87928792
#define KVM_X86_SW_PROTECTED_VM 1
87938793

8794+
Note, KVM_X86_SW_PROTECTED_VM is currently only for development and testing.
8795+
Do not use KVM_X86_SW_PROTECTED_VM for "real" VMs, and especially not in
8796+
production. The behavior and effective ABI for software-protected VMs is
8797+
unstable.
8798+
87948799
9. Known KVM API problems
87958800
=========================
87968801

‎MAINTAINERS

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4169,14 +4169,14 @@ F: drivers/firmware/broadcom/tee_bnxt_fw.c
41694169
F: drivers/net/ethernet/broadcom/bnxt/
41704170
F: include/linux/firmware/broadcom/tee_bnxt_fw.h
41714171

4172-
BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
4173-
M: Arend van Spriel <aspriel@gmail.com>
4174-
M: Franky Lin <franky.lin@broadcom.com>
4175-
M: Hante Meuleman <hante.meuleman@broadcom.com>
4172+
BROADCOM BRCM80211 IEEE802.11 WIRELESS DRIVERS
4173+
M: Arend van Spriel <arend.vanspriel@broadcom.com>
41764174
L: linux-wireless@vger.kernel.org
4175+
L: brcm80211@lists.linux.dev
41774176
L: brcm80211-dev-list.pdl@broadcom.com
41784177
S: Supported
41794178
F: drivers/net/wireless/broadcom/brcm80211/
4179+
F: include/linux/platform_data/brcmfmac.h
41804180

41814181
BROADCOM BRCMSTB GPIO DRIVER
41824182
M: Doug Berger <opendmb@gmail.com>
@@ -10801,11 +10801,11 @@ F: drivers/gpio/gpio-tangier.h
1080110801

1080210802
INTEL GVT-g DRIVERS (Intel GPU Virtualization)
1080310803
M: Zhenyu Wang <zhenyuw@linux.intel.com>
10804-
M: Zhi Wang <zhi.a.wang@intel.com>
10804+
M: Zhi Wang <zhi.wang.linux@gmail.com>
1080510805
L: intel-gvt-dev@lists.freedesktop.org
1080610806
L: intel-gfx@lists.freedesktop.org
1080710807
S: Supported
10808-
W: https://01.org/igvt-g
10808+
W: https://github.com/intel/gvt-linux/wiki
1080910809
T: git https://github.com/intel/gvt-linux.git
1081010810
F: drivers/gpu/drm/i915/gvt/
1081110811

@@ -11127,7 +11127,6 @@ S: Supported
1112711127
F: drivers/net/wireless/intel/iwlegacy/
1112811128

1112911129
INTEL WIRELESS WIFI LINK (iwlwifi)
11130-
M: Gregory Greenman <gregory.greenman@intel.com>
1113111130
M: Miri Korenblit <miriam.rachel.korenblit@intel.com>
1113211131
L: linux-wireless@vger.kernel.org
1113311132
S: Supported
@@ -17183,7 +17182,7 @@ R: John Garry <john.g.garry@oracle.com>
1718317182
R: Will Deacon <will@kernel.org>
1718417183
R: James Clark <james.clark@arm.com>
1718517184
R: Mike Leach <mike.leach@linaro.org>
17186-
R: Leo Yan <leo.yan@linaro.org>
17185+
R: Leo Yan <leo.yan@linux.dev>
1718717186
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1718817187
S: Supported
1718917188
F: tools/build/feature/test-libopencsd.c
@@ -18432,7 +18431,7 @@ S: Supported
1843218431
F: drivers/infiniband/sw/rdmavt
1843318432

1843418433
RDS - RELIABLE DATAGRAM SOCKETS
18435-
M: Santosh Shilimkar <santosh.shilimkar@oracle.com>
18434+
M: Allison Henderson <allison.henderson@oracle.com>
1843618435
L: netdev@vger.kernel.org
1843718436
L: linux-rdma@vger.kernel.org
1843818437
L: rds-devel@oss.oracle.com (moderated for non-subscribers)

‎Makefile

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

88
# *DOCUMENTATION*

‎arch/arc/include/asm/jump_label.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
static __always_inline bool arch_static_branch(struct static_key *key,
3232
bool branch)
3333
{
34-
asm_volatile_goto(".balign "__stringify(JUMP_LABEL_NOP_SIZE)" \n"
34+
asm goto(".balign "__stringify(JUMP_LABEL_NOP_SIZE)" \n"
3535
"1: \n"
3636
"nop \n"
3737
".pushsection __jump_table, \"aw\" \n"
@@ -47,7 +47,7 @@ static __always_inline bool arch_static_branch(struct static_key *key,
4747
static __always_inline bool arch_static_branch_jump(struct static_key *key,
4848
bool branch)
4949
{
50-
asm_volatile_goto(".balign "__stringify(JUMP_LABEL_NOP_SIZE)" \n"
50+
asm goto(".balign "__stringify(JUMP_LABEL_NOP_SIZE)" \n"
5151
"1: \n"
5252
"b %l[l_yes] \n"
5353
".pushsection __jump_table, \"aw\" \n"

‎arch/arm/include/asm/jump_label.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
static __always_inline bool arch_static_branch(struct static_key *key, bool branch)
1313
{
14-
asm_volatile_goto("1:\n\t"
14+
asm goto("1:\n\t"
1515
WASM(nop) "\n\t"
1616
".pushsection __jump_table, \"aw\"\n\t"
1717
".word 1b, %l[l_yes], %c0\n\t"
@@ -25,7 +25,7 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool bran
2525

2626
static __always_inline bool arch_static_branch_jump(struct static_key *key, bool branch)
2727
{
28-
asm_volatile_goto("1:\n\t"
28+
asm goto("1:\n\t"
2929
WASM(b) " %l[l_yes]\n\t"
3030
".pushsection __jump_table, \"aw\"\n\t"
3131
".word 1b, %l[l_yes], %c0\n\t"

‎arch/arm/mm/fault.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,8 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
298298
goto done;
299299
}
300300
count_vm_vma_lock_event(VMA_LOCK_RETRY);
301+
if (fault & VM_FAULT_MAJOR)
302+
flags |= FAULT_FLAG_TRIED;
301303

302304
/* Quick path to respond to signals */
303305
if (fault_signal_pending(fault, regs)) {

‎arch/arm64/include/asm/alternative-macros.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ alternative_has_cap_likely(const unsigned long cpucap)
229229
if (!cpucap_is_possible(cpucap))
230230
return false;
231231

232-
asm_volatile_goto(
232+
asm goto(
233233
ALTERNATIVE_CB("b %l[l_no]", %[cpucap], alt_cb_patch_nops)
234234
:
235235
: [cpucap] "i" (cpucap)
@@ -247,7 +247,7 @@ alternative_has_cap_unlikely(const unsigned long cpucap)
247247
if (!cpucap_is_possible(cpucap))
248248
return false;
249249

250-
asm_volatile_goto(
250+
asm goto(
251251
ALTERNATIVE("nop", "b %l[l_yes]", %[cpucap])
252252
:
253253
: [cpucap] "i" (cpucap)

‎arch/arm64/include/asm/jump_label.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
static __always_inline bool arch_static_branch(struct static_key * const key,
1919
const bool branch)
2020
{
21-
asm_volatile_goto(
21+
asm goto(
2222
"1: nop \n\t"
2323
" .pushsection __jump_table, \"aw\" \n\t"
2424
" .align 3 \n\t"
@@ -35,7 +35,7 @@ static __always_inline bool arch_static_branch(struct static_key * const key,
3535
static __always_inline bool arch_static_branch_jump(struct static_key * const key,
3636
const bool branch)
3737
{
38-
asm_volatile_goto(
38+
asm goto(
3939
"1: b %l[l_yes] \n\t"
4040
" .pushsection __jump_table, \"aw\" \n\t"
4141
" .align 3 \n\t"

‎arch/arm64/kvm/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# KVM configuration
44
#
55

6-
source "virt/lib/Kconfig"
76
source "virt/kvm/Kconfig"
87

98
menuconfig VIRTUALIZATION

0 commit comments

Comments
 (0)