Commit ebccb53e authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvmarm-fixes-6.1-2' of... 

Merge tag 'kvmarm-fixes-6.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

KVM/arm64 fixes for 6.1, take #2

- Fix a bug preventing restoring an ITS containing mappings
  for very large and very sparse device topology

- Work around a relocation handling error when compiling
  the nVHE object with profile optimisation
parents 58348168 c000a260

arch/arm64/kvm/hyp/nvhe/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -92,6 +92,10 @@ quiet_cmd_hypcopy = HYPCOPY $@ 
# Remove ftrace, Shadow Call Stack, and CFI CFLAGS.

# This is equivalent to the 'notrace', '__noscs', and '__nocfi' annotations.

KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_FTRACE) $(CC_FLAGS_SCS) $(CC_FLAGS_CFI), $(KBUILD_CFLAGS))

# Starting from 13.0.0 llvm emits SHT_REL section '.llvm.call-graph-profile'

# when profile optimization is applied. gen-hyprel does not support SHT_REL and

# causes a build failure. Remove profile optimization flags.

KBUILD_CFLAGS := $(filter-out -fprofile-sample-use=% -fprofile-use=%, $(KBUILD_CFLAGS))



# KVM nVHE code is run at a different exception code with a different map, so

# compiler instrumentation that inserts callbacks or checks into the code may

arch/arm64/kvm/vgic/vgic-its.c

+4 −1
Original line number Diff line number Diff line
@@ -2149,7 +2149,7 @@ static int scan_its_table(struct vgic_its *its, gpa_t base, int size, u32 esz, 


	memset(entry, 0, esz);



	while (len > 0) {

	while (true) {

		int next_offset;

		size_t byte_offset;
@@ -2162,6 +2162,9 @@ static int scan_its_table(struct vgic_its *its, gpa_t base, int size, u32 esz, 
			return next_offset;



		byte_offset = next_offset * esz;

		if (byte_offset >= len)

			break;



		id += next_offset;

		gpa += byte_offset;

		len -= byte_offset;