Skip to content

Commit

Permalink
KVM: arm64: Add UBSan tests for PKVM.
Browse files Browse the repository at this point in the history
Test the UBsan functionality inside hyp/nVHE.
Because modules are not supported inside of hyp/nVHE code, the default
testing module for UBSan can not be used.
New functions have to be defined inside of hyp/nVHE.
They are called in kvm_get_mdcr_el2, to test UBSAN whenever a VM starts.

Change-Id: Icf998da0af023c74d45be90788ac9f694e61c97c
Signed-off-by: Elena Petrova <lenaptr@google.com>
  • Loading branch information
George-Aurelian Popescu authored and intel-lab-lkp committed Jan 15, 2021
1 parent aaa9326 commit cd5e508
Show file tree
Hide file tree
Showing 6 changed files with 128 additions and 17 deletions.
17 changes: 8 additions & 9 deletions arch/arm64/include/asm/assembler.h
Expand Up @@ -259,16 +259,15 @@ alternative_endif
.endm

/*
* @sym: The name of the per-cpu variable
* @reg: value to store
* @tmp1: scratch register
* @tmp2: scratch register
*/
.macro str_this_cpu sym, reg, tmp1, tmp2
adr_this_cpu \tmp1, \sym, \tmp2
* @sym: The name of the per-cpu variable
* @reg: value to store
* @tmp1: scratch register
* @tmp2: scratch register
*/
.macro str_this_cpu sym, reg, tmp1, tmp2
adr_this_cpu \tmp1, \sym, \tmp2
str \reg, [\tmp1]
.endm

.endm
/*
* vma_vm_mm - get mm pointer from vma pointer (vma->vm_mm)
*/
Expand Down
10 changes: 4 additions & 6 deletions arch/arm64/include/asm/kvm_debug_buffer.h
Expand Up @@ -3,10 +3,8 @@
* Copyright 2020 Google LLC
* Author: George Popescu <georgepope@google.com>
*/

#include <linux/percpu-defs.h>


#define KVM_DEBUG_BUFFER_SIZE 1000

#ifdef __KVM_NVHE_HYPERVISOR__
Expand All @@ -20,17 +18,17 @@
#else
#define DECLARE_KVM_DEBUG_BUFFER(type_name, buffer_name, write_ind, size)\
DECLARE_KVM_NVHE_PER_CPU(type_name, buffer_name)[size]; \
DECLARE_KVM_NVHE_PER_CPU(unsigned long, write_ind);
DECLARE_KVM_NVHE_PER_CPU(unsigned long, write_ind);
#endif //__KVM_NVHE_HYPERVISOR__

#ifdef __ASSEMBLY__
#include <asm/assembler.h>

.macro clear_buffer tmp1, tmp2, tmp3
mov \tmp1, 0
mov \tmp1, 0
#ifdef CONFIG_UBSAN
str_this_cpu kvm_ubsan_buff_wr_ind, \tmp1, \tmp2, \tmp3
str_this_cpu kvm_ubsan_buff_wr_ind, \tmp1, \tmp2, \tmp3
#endif //CONFIG_UBSAN
.endm

#endif
#endif
2 changes: 1 addition & 1 deletion arch/arm64/include/asm/kvm_ubsan.h
Expand Up @@ -9,7 +9,6 @@
#define UBSAN_MAX_TYPE 6
#define KVM_UBSAN_BUFFER_SIZE 1000


struct ubsan_values {
void *lval;
void *rval;
Expand All @@ -18,6 +17,7 @@ struct ubsan_values {

struct kvm_ubsan_info {
enum {
UBSAN_NONE,
UBSAN_OUT_OF_BOUNDS,
UBSAN_UNREACHABLE_DATA,
UBSAN_SHIFT_OUT_OF_BOUNDS,
Expand Down
112 changes: 112 additions & 0 deletions arch/arm64/kvm/hyp/include/hyp/test_ubsan.h
@@ -0,0 +1,112 @@
/* SPDX-License-Identifier: GPL-2.0-only */

#include <linux/ctype.h>

typedef void(*test_ubsan_fp)(void);

static void test_ubsan_add_overflow(void)
{
volatile int val = INT_MAX;

val += 2;
}

static void test_ubsan_sub_overflow(void)
{
volatile int val = INT_MIN;
volatile int val2 = 2;

val -= val2;
}

static void test_ubsan_mul_overflow(void)
{
volatile int val = INT_MAX / 2;

val *= 3;
}

static void test_ubsan_negate_overflow(void)
{
volatile int val = INT_MIN;

val = -val;
}

static void test_ubsan_divrem_overflow(void)
{
volatile int val = 16;
volatile int val2 = 0;

val /= val2;
}

static void test_ubsan_shift_out_of_bounds(void)
{
volatile int val = -1;
int val2 = 10;

val2 <<= val;
}

static void test_ubsan_out_of_bounds(void)
{
volatile int i = 4, j = 5;
volatile int arr[4];

arr[j] = i;
}

static void test_ubsan_load_invalid_value(void)
{
volatile char *dst, *src;
bool val, val2, *ptr;
char c = 4;

dst = (char *)&val;
src = &c;
*dst = *src;

ptr = &val2;
val2 = val;
}

static void test_ubsan_misaligned_access(void)
{
volatile char arr[5] __aligned(4) = {1, 2, 3, 4, 5};
volatile int *ptr, val = 6;

ptr = (int *)(arr + 1);
*ptr = val;
}

static void test_ubsan_object_size_mismatch(void)
{
/* "((aligned(8)))" helps this not into be misaligned for ptr-access. */
volatile int val __aligned(8) = 4;
volatile long long *ptr, val2;

ptr = (long long *)&val;
val2 = *ptr;
}

static const test_ubsan_fp test_ubsan_array[] = {
test_ubsan_out_of_bounds,
test_ubsan_add_overflow,
test_ubsan_sub_overflow,
test_ubsan_mul_overflow,
test_ubsan_negate_overflow,
test_ubsan_divrem_overflow,
test_ubsan_shift_out_of_bounds,
test_ubsan_load_invalid_value,
test_ubsan_misaligned_access,
test_ubsan_object_size_mismatch,
};

static void test_ubsan(void)
{
unsigned int i;

for (i = 0; i < ARRAY_SIZE(test_ubsan_array); i++)
test_ubsan_array[i]();
}
3 changes: 3 additions & 0 deletions arch/arm64/kvm/hyp/nvhe/hyp-main.c
Expand Up @@ -13,6 +13,7 @@
#include <asm/kvm_mmu.h>

#include <nvhe/trap_handler.h>
#include <hyp/test_ubsan.h>

DEFINE_PER_CPU(struct kvm_nvhe_init_params, kvm_init_params);

Expand Down Expand Up @@ -90,6 +91,8 @@ static void handle___vgic_v3_init_lrs(struct kvm_cpu_context *host_ctxt)
static void handle___kvm_get_mdcr_el2(struct kvm_cpu_context *host_ctxt)
{
cpu_reg(host_ctxt, 1) = __kvm_get_mdcr_el2();
if (IS_ENABLED(CONFIG_TEST_UBSAN))
test_ubsan();
}

static void handle___vgic_v3_save_aprs(struct kvm_cpu_context *host_ctxt)
Expand Down
1 change: 0 additions & 1 deletion arch/arm64/kvm/kvm_ubsan_buffer.c
Expand Up @@ -11,7 +11,6 @@
#include <asm/kvm_asm.h>
#include <kvm/arm_pmu.h>

#include <ubsan.h>
#include <asm/kvm_ubsan.h>

DECLARE_KVM_DEBUG_BUFFER(struct kvm_ubsan_info, kvm_ubsan_buffer,
Expand Down

0 comments on commit cd5e508

Please sign in to comment.