Commit 7d8942d8 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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.
parents 0cbca1bf 2dfd2383

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com> 
John Crispin <john@phrozen.org> <blogic@openwrt.org>

John Fastabend <john.fastabend@gmail.com> <john.r.fastabend@intel.com>

John Keeping <john@keeping.me.uk> <john@metanate.com>

John Moon <john@jmoon.dev> <quic_johmoo@quicinc.com>

John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

John Stultz <johnstul@us.ibm.com>

<jon.toppins+linux@gmail.com> <jtoppins@cumulusnetworks.com>
@@ -344,6 +345,7 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com> 
Leon Romanovsky <leon@kernel.org> <leon@leon.nu>

Leon Romanovsky <leon@kernel.org> <leonro@mellanox.com>

Leon Romanovsky <leon@kernel.org> <leonro@nvidia.com>

Leo Yan <leo.yan@linux.dev> <leo.yan@linaro.org>

Liam Mark <quic_lmark@quicinc.com> <lmark@codeaurora.org>

Linas Vepstas <linas@austin.ibm.com>

Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>

Documentation/virt/kvm/api.rst

+5 −0
Original line number Diff line number Diff line
@@ -8791,6 +8791,11 @@ means the VM type with value @n is supported. Possible values of @n are:: 
  #define KVM_X86_DEFAULT_VM	0

  #define KVM_X86_SW_PROTECTED_VM	1



Note, KVM_X86_SW_PROTECTED_VM is currently only for development and testing.

Do not use KVM_X86_SW_PROTECTED_VM for "real" VMs, and especially not in

production.  The behavior and effective ABI for software-protected VMs is

unstable.



9. Known KVM API problems

=========================

MAINTAINERS

+8 −9
Original line number Diff line number Diff line
@@ -4169,14 +4169,14 @@ F: drivers/firmware/broadcom/tee_bnxt_fw.c 
F:	drivers/net/ethernet/broadcom/bnxt/

F:	include/linux/firmware/broadcom/tee_bnxt_fw.h









BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER









M:	Arend van Spriel <aspriel@gmail.com>









M:	Franky Lin <franky.lin@broadcom.com>









M:	Hante Meuleman <hante.meuleman@broadcom.com>









BROADCOM BRCM80211 IEEE802.11 WIRELESS DRIVERS









M:	Arend van Spriel <arend.vanspriel@broadcom.com>









L:	linux-wireless@vger.kernel.org









L:	brcm80211@lists.linux.dev









L:	brcm80211-dev-list.pdl@broadcom.com









S:	Supported









F:	drivers/net/wireless/broadcom/brcm80211/









F:	include/linux/platform_data/brcmfmac.h

















BROADCOM BRCMSTB GPIO DRIVER









M:	Doug Berger <opendmb@gmail.com>










@@ -10801,11 +10801,11 @@ F:	drivers/gpio/gpio-tangier.h















INTEL GVT-g DRIVERS (Intel GPU Virtualization)









M:	Zhenyu Wang <zhenyuw@linux.intel.com>









M:	Zhi Wang <zhi.a.wang@intel.com>









M:	Zhi Wang <zhi.wang.linux@gmail.com>









L:	intel-gvt-dev@lists.freedesktop.org









L:	intel-gfx@lists.freedesktop.org









S:	Supported









W:	https://01.org/igvt-g









W:	https://github.com/intel/gvt-linux/wiki









T:	git https://github.com/intel/gvt-linux.git









F:	drivers/gpu/drm/i915/gvt/


















@@ -11127,7 +11127,6 @@ S:	Supported







F:	drivers/net/wireless/intel/iwlegacy/

















INTEL WIRELESS WIFI LINK (iwlwifi)









M:	Gregory Greenman <gregory.greenman@intel.com>









M:	Miri Korenblit <miriam.rachel.korenblit@intel.com>









L:	linux-wireless@vger.kernel.org









S:	Supported










@@ -17183,7 +17182,7 @@ R:	John Garry <john.g.garry@oracle.com>







R:	Will Deacon <will@kernel.org>









R:	James Clark <james.clark@arm.com>









R:	Mike Leach <mike.leach@linaro.org>









R:	Leo Yan <leo.yan@linaro.org>









R:	Leo Yan <leo.yan@linux.dev>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Supported









F:	tools/build/feature/test-libopencsd.c










@@ -18432,7 +18431,7 @@ S:	Supported







F:	drivers/infiniband/sw/rdmavt

















RDS - RELIABLE DATAGRAM SOCKETS









M:	Santosh Shilimkar <santosh.shilimkar@oracle.com>









M:	Allison Henderson <allison.henderson@oracle.com>









L:	netdev@vger.kernel.org









L:	linux-rdma@vger.kernel.org









L:	rds-devel@oss.oracle.com (moderated for non-subscribers)

























Makefile



+1
−1






























Original line number
Diff line number
Diff line







@@ -2,7 +2,7 @@







VERSION = 6









PATCHLEVEL = 8









SUBLEVEL = 0









EXTRAVERSION = -rc3









EXTRAVERSION = -rc4









NAME = Hurr durr I'ma ninja sloth



















# *DOCUMENTATION*


































arch/arc/include/asm/jump_label.h



+2
−2






























Original line number
Diff line number
Diff line







@@ -31,7 +31,7 @@







static __always_inline bool arch_static_branch(struct static_key *key,









					       bool branch)









{









	asm_volatile_goto(".balign "__stringify(JUMP_LABEL_NOP_SIZE)"	\n"









	asm goto(".balign "__stringify(JUMP_LABEL_NOP_SIZE)"		\n"









		 "1:							\n"









		 "nop							\n"









		 ".pushsection __jump_table, \"aw\"			\n"










@@ -47,7 +47,7 @@ static __always_inline bool arch_static_branch(struct static_key *key,







static __always_inline bool arch_static_branch_jump(struct static_key *key,









						    bool branch)









{









	asm_volatile_goto(".balign "__stringify(JUMP_LABEL_NOP_SIZE)"	\n"









	asm goto(".balign "__stringify(JUMP_LABEL_NOP_SIZE)"		\n"









		 "1:							\n"









		 "b %l[l_yes]						\n"









		 ".pushsection __jump_table, \"aw\"			\n"