Linux 5.13.1

Linux 5.13.1

[Sasha Levin]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

I'm announcing the release of the 5.13.1 kernel.

All users of the 5.13 kernel series must upgrade.

The updated 5.13.y git tree can be found at:
        git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.13.y
and can be browsed at the normal kernel.org git web browser:
        https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary


Thanks,
Sasha

- ------------


 Makefile                        | 2 +-
 arch/x86/include/asm/kvm_host.h | 1 +
 arch/x86/kvm/mmu/mmu.c          | 1 +
 mm/page_alloc.c                 | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

Mel Gorman (1):
      mm/page_alloc: correct return value of populated elements if bulk array is populated

Sasha Levin (1):
      Linux 5.13.1

Sean Christopherson (1):
      Revert "KVM: x86/mmu: Drop kvm_mmu_extended_role.cr4_la57 hack"

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEE4n5dijQDou9mhzu83qZv95d3LNwFAmDlolkACgkQ3qZv95d3
LNyHdw//Yv2YwPIPDRntmmSPZE2E0MwOZu+W2B+OoKJHJ8MJeYpMwoNwObwqoa7u
7oxHuiUgQ7iTBcvDdvwLCDAKZkIa6sm5WAb3x5qzmvQNYIAWsQrsHo42A1yhMLIT
YMuo7GQkn5E9WNs+aOGrI38Ea91Ckdd5GcwsKRcXuY30phvnzTEVoXKdLzFJFOWk
O/8nbDT1X+msLxndzwW/Vl4AAiaYbnQpzSyhFiswD4r0jYL5yg1jc2UaWUxSP+yj
mbgZ2QQAHh1dvE4rzPyl6tmFhVDg+yiT6UO1f7tont8FA4dUdJ4sJDW2QINKXRxf
RwEY6fsU9kcpH2IfZa25Fi2E+kesKEeT0a/uCGJOYmZZkXfPtnlNHE4FVlKdtlRh
q761ApqR5JGOXSE08iSxTMXJNsbyGxG4CYP8vbUhYm/wIJbOqBCF9DOkH7sr5MA4
TyWuG4uexfmE00dWfljuAma07Sd4F+mILsC/55O9lQt80aiSRUsuoFM6e7FQmBgj
g7uSEzm476z/4B+v1ewjPfT6gw4KGahV9a6EfSztm/JdvotFaImkjdYneGuSkmaF
56rt3ZF+7LD05mK9/nQd713F2hOD6yVzyIiWiSzO9250qRMb3SR0xjaUC9iKpuQb
/VkcKU+yMLbZnZwoBONedk/gfnKpvjzo/9EBBWOLyln0FWVuBdA=
=QsF8
-----END PGP SIGNATURE-----

Re: Linux 5.13.1

[Sasha Levin]

diff --git a/Makefile b/Makefile
index 0565caea0362..069607cfe283 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 5
 PATCHLEVEL = 13
-SUBLEVEL = 0
+SUBLEVEL = 1
 EXTRAVERSION =
 NAME = Opossums on Parade
 
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 9c7ced0e3171..682e82956ea5 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -320,6 +320,7 @@ union kvm_mmu_extended_role {
 		unsigned int cr4_pke:1;
 		unsigned int cr4_smap:1;
 		unsigned int cr4_smep:1;
+		unsigned int cr4_la57:1;
 		unsigned int maxphyaddr:6;
 	};
 };
diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index 8d5876dfc6b7..a54f72c31be9 100644
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -4476,6 +4476,7 @@ static union kvm_mmu_extended_role kvm_calc_mmu_role_ext(struct kvm_vcpu *vcpu)
 	ext.cr4_smap = !!kvm_read_cr4_bits(vcpu, X86_CR4_SMAP);
 	ext.cr4_pse = !!is_pse(vcpu);
 	ext.cr4_pke = !!kvm_read_cr4_bits(vcpu, X86_CR4_PKE);
+	ext.cr4_la57 = !!kvm_read_cr4_bits(vcpu, X86_CR4_LA57);
 	ext.maxphyaddr = cpuid_maxphyaddr(vcpu);
 
 	ext.valid = 1;
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index ef2265f86b91..04220581579c 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5058,7 +5058,7 @@ unsigned long __alloc_pages_bulk(gfp_t gfp, int preferred_nid,
 
 	/* Already populated array? */
 	if (unlikely(page_array && nr_pages - nr_populated == 0))
-		return 0;
+		return nr_populated;
 
 	/* Use the single page allocator for one page. */
 	if (nr_pages - nr_populated == 1)