Commit c3018541 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge branch kvm-arm64/misc-5.18 into kvmarm-master/next 



* kvm-arm64/misc-5.18:
  : .
  : Misc fixes for KVM/arm64 5.18:
  :
  : - Drop unused kvm parameter to kvm_psci_version()
  :
  : - Implement CONFIG_DEBUG_LIST at EL2
  : .
  KVM: arm64: pkvm: Implement CONFIG_DEBUG_LIST at EL2
  KVM: arm64: Drop unused param from kvm_psci_version()

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parents 5206b980 4c68d6c0

arch/arm64/kvm/hyp/nvhe/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -13,10 +13,11 @@ lib-objs := clear_page.o copy_page.o memcpy.o memset.o 
lib-objs := $(addprefix ../../../lib/, $(lib-objs))



obj-y := timer-sr.o sysreg-sr.o debug-sr.o switch.o tlb.o hyp-init.o host.o \

	 hyp-main.o hyp-smp.o psci-relay.o early_alloc.o stub.o page_alloc.o \

	 hyp-main.o hyp-smp.o psci-relay.o early_alloc.o page_alloc.o \

	 cache.o setup.o mm.o mem_protect.o sys_regs.o pkvm.o

obj-y += ../vgic-v3-sr.o ../aarch32.o ../vgic-v2-cpuif-proxy.o ../entry.o \

	 ../fpsimd.o ../hyp-entry.o ../exception.o ../pgtable.o

obj-$(CONFIG_DEBUG_LIST) += list_debug.o

obj-y += $(lib-objs)



##

arch/arm64/kvm/hyp/nvhe/list_debug.c

0 → 100644
+54 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (C) 2022 - Google LLC

 * Author: Keir Fraser <keirf@google.com>

 */



#include <linux/list.h>

#include <linux/bug.h>



static inline __must_check bool nvhe_check_data_corruption(bool v)

{

	return v;

}



#define NVHE_CHECK_DATA_CORRUPTION(condition)				 \

	nvhe_check_data_corruption(({					 \

		bool corruption = unlikely(condition);			 \

		if (corruption) {					 \

			if (IS_ENABLED(CONFIG_BUG_ON_DATA_CORRUPTION)) { \

				BUG_ON(1);				 \

			} else						 \

				WARN_ON(1);				 \

		}							 \

		corruption;						 \

	}))



/* The predicates checked here are taken from lib/list_debug.c. */



bool __list_add_valid(struct list_head *new, struct list_head *prev,

		      struct list_head *next)

{

	if (NVHE_CHECK_DATA_CORRUPTION(next->prev != prev) ||

	    NVHE_CHECK_DATA_CORRUPTION(prev->next != next) ||

	    NVHE_CHECK_DATA_CORRUPTION(new == prev || new == next))

		return false;



	return true;

}



bool __list_del_entry_valid(struct list_head *entry)

{

	struct list_head *prev, *next;



	prev = entry->prev;

	next = entry->next;



	if (NVHE_CHECK_DATA_CORRUPTION(next == LIST_POISON1) ||

	    NVHE_CHECK_DATA_CORRUPTION(prev == LIST_POISON2) ||

	    NVHE_CHECK_DATA_CORRUPTION(prev->next != entry) ||

	    NVHE_CHECK_DATA_CORRUPTION(next->prev != entry))

		return false;



	return true;

}

arch/arm64/kvm/hyp/nvhe/stub.c

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Stubs for out-of-line function calls caused by re-using kernel

 * infrastructure at EL2.

 *

 * Copyright (C) 2020 - Google LLC

 */



#include <linux/list.h>



#ifdef CONFIG_DEBUG_LIST

bool __list_add_valid(struct list_head *new, struct list_head *prev,

		      struct list_head *next)

{

		return true;

}



bool __list_del_entry_valid(struct list_head *entry)

{

		return true;

}

#endif

arch/arm64/kvm/psci.c

+3 −3
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu) 
	if (!vcpu)

		return PSCI_RET_INVALID_PARAMS;

	if (!vcpu->arch.power_off) {

		if (kvm_psci_version(source_vcpu, kvm) != KVM_ARM_PSCI_0_1)

		if (kvm_psci_version(source_vcpu) != KVM_ARM_PSCI_0_1)

			return PSCI_RET_ALREADY_ON;

		else

			return PSCI_RET_INVALID_PARAMS;
@@ -392,7 +392,7 @@ static int kvm_psci_0_1_call(struct kvm_vcpu *vcpu) 
 */

int kvm_psci_call(struct kvm_vcpu *vcpu)

{

	switch (kvm_psci_version(vcpu, vcpu->kvm)) {

	switch (kvm_psci_version(vcpu)) {

	case KVM_ARM_PSCI_1_0:

		return kvm_psci_1_0_call(vcpu);

	case KVM_ARM_PSCI_0_2:
@@ -471,7 +471,7 @@ int kvm_arm_get_fw_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) 


	switch (reg->id) {

	case KVM_REG_ARM_PSCI_VERSION:

		val = kvm_psci_version(vcpu, vcpu->kvm);

		val = kvm_psci_version(vcpu);

		break;

	case KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1:

	case KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2:

include/kvm/arm_psci.h

+1 −5
Original line number Diff line number Diff line
@@ -16,11 +16,7 @@ 


#define KVM_ARM_PSCI_LATEST	KVM_ARM_PSCI_1_0



/*

 * We need the KVM pointer independently from the vcpu as we can call

 * this from HYP, and need to apply kern_hyp_va on it...

 */

static inline int kvm_psci_version(struct kvm_vcpu *vcpu, struct kvm *kvm)

static inline int kvm_psci_version(struct kvm_vcpu *vcpu)

{

	/*

	 * Our PSCI implementation stays the same across versions from