Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp2245493pxb; Mon, 18 Jan 2021 12:10:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJwYBl//Mfvzi2jP14iOeEU/PlW97BidZPGKXPxGF+FFAgej/am4jhoW+Pok4VaNxkIrWEhm X-Received: by 2002:aa7:d651:: with SMTP id v17mr861108edr.91.1611000625929; Mon, 18 Jan 2021 12:10:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611000625; cv=none; d=google.com; s=arc-20160816; b=Iv7MilQrQY8hu8/xnoHnfvul52Je5I22u3eN8o9nWjGZ8umLtoWjHNDL4l9oD4ZVgK 0B51oCDQBk9tet8mHPl1UTT4cW0hRRoX0tfOooRNw2aveImwN7zjvDffZNPg6MQbriMy dg0MpRF2BHPnGLldRoMaQhDhoemAQSuhQrYE5S23GV/n6ZUEeZQPpInHS+xI43Ik1GYi 5H2HQUedO673Oxk35v+D11CZ7VX/N2adoLEdGrptfHevNcTCYUhK/A5yJ3Pj9N9AxPGP SlOJnWI1rbbXKixKGQDxSxb8CzKJocu444rPVxZ8bMxD/SMZySqgfc9G0i3052CntbS5 i9CA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=D1pAk7xGgVeCRed9BW46rD3wGjZNlE83S5fKikDTrRs=; b=aY1JxRJFSAtS7OX/NoeBuaN0yf3Wx6H7XzZ5yuJt/IRIqGvoQ+dQHn0rX95p84p7bQ OY89yujpUeRcqoYs2HBS01oMgz2P0O1GcbYutl84XiV4x3eGiiBlU+TZldMpgZ5nJomG BV+qNY6xr9f8iHUhLTF0yra2DrGY6jjaRlLLiw4Bi4OUNl2XPalX+Ba9AT3j44gilK/i MHzjparZ+sGNMIl52XA+teKardGXitJhdIleP60qs9qcuaZqylQhZdkqShI0/tuKpiQt zmi+v/ocS5+cu4Ama34tu+k+y+OeUX5OcW83r1JePBYuRLPRvk1l5jVNVlK8cxmTeMQa awfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=oPO1wSd2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b6si9267704edu.567.2021.01.18.12.10.01; Mon, 18 Jan 2021 12:10:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=oPO1wSd2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388075AbhARUIa (ORCPT + 99 others); Mon, 18 Jan 2021 15:08:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33942 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727459AbhARKpL (ORCPT ); Mon, 18 Jan 2021 05:45:11 -0500 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46F3DC061575 for ; Mon, 18 Jan 2021 02:44:31 -0800 (PST) Received: by mail-wm1-x32e.google.com with SMTP id h17so12950587wmq.1 for ; Mon, 18 Jan 2021 02:44:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=D1pAk7xGgVeCRed9BW46rD3wGjZNlE83S5fKikDTrRs=; b=oPO1wSd2myGMZ7dLrKqaMyK1BUOrzdWKFwOg1QR6RwJAsGRLu66DeuJmtpP29/2xHe r+QntBek0c6IoJytOdjwnz0S6pz+M1Sn2SMzu2r4gb9V+8aMgXz5slpN6ga2aY/0d8F1 oXRGgXYKVUXuzvxzL6V853FdBI2XLYv5hifSnPePMEt8X1N19dRPh4JqQhB/Cue3WooU uIgOoIZhcG2+QzGSqVUAVMca6B4NNT7gu77e1hhofoEx2YOOxkTTCO7KiVSI725Zi2KG 4l8nvE3UsokMmQWr5PoT7rna7rGH9VUhANQOjP5vx0iUYDCvKsvYjpRopwLZCS5Anxq4 Xr0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=D1pAk7xGgVeCRed9BW46rD3wGjZNlE83S5fKikDTrRs=; b=TM4nBn6JiivFs7ezauGvZ7u50WjvAqDfSL7E+3ZCYv58me32iWpFTYR65+saILPmQ9 wNfILerCxQhtXcUbkkYG+I60f9rgx3QVvazCxzPHMXGplfjWdJ8bJACxW+cEahc90cPi yVrr8tCbo9ngySzj+I/5j4E3mQeiLkIDTtdWs/XHf+wC90wDzUfd1/h0KwBLfAbbSaZ6 CDQo2CiOds7GK6OvWNJeU67HrnUsaqiDG+SclBg+R/A4Xb3R3MWsa9uYYCKErNYla+Be Dqox3BAkNW4HJfzjVhZgpKGCXsaQ7KcnJOLmwhCNMu0b/nIMf6jfILoA5vw/DYbYXQFU y1pQ== X-Gm-Message-State: AOAM533ZjOczgxvYVuck7shYMzAomSB6akmaW1YBat4ikJavHy5eQCw1 4NcFGa0mpzOHIE0BMIH0lSe1oQ== X-Received: by 2002:a1c:cc14:: with SMTP id h20mr20335651wmb.180.1610966669862; Mon, 18 Jan 2021 02:44:29 -0800 (PST) Received: from google.com ([2a01:4b00:8523:2d03:3d4d:985d:87b7:4d55]) by smtp.gmail.com with ESMTPSA id s4sm23004969wme.38.2021.01.18.02.44.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jan 2021 02:44:28 -0800 (PST) Date: Mon, 18 Jan 2021 10:44:27 +0000 From: David Brazdil To: Elena Petrova Cc: kvmarm@lists.cs.columbia.edu, George-Aurelian Popescu , Marc Zyngier , open list , linux-arm-kernel@lists.infradead.org, George Popescu Subject: Re: [PATCH v3 9/9] KVM: arm64: Add UBSan tests for PKVM. Message-ID: <20210118104427.lgjt4ndhnntz4bld@google.com> References: <20210115171830.3602110-1-lenaptr@google.com> <20210115171830.3602110-10-lenaptr@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210115171830.3602110-10-lenaptr@google.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jan 15, 2021 at 05:18:30PM +0000, Elena Petrova wrote: > From: George-Aurelian Popescu > > 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. > > Signed-off-by: Elena Petrova > --- > arch/arm64/include/asm/assembler.h | 17 ++- > arch/arm64/include/asm/kvm_debug_buffer.h | 10 +- > arch/arm64/include/asm/kvm_ubsan.h | 2 +- > arch/arm64/kvm/hyp/include/hyp/test_ubsan.h | 112 ++++++++++++++++++++ > arch/arm64/kvm/hyp/nvhe/hyp-main.c | 3 + > arch/arm64/kvm/kvm_ubsan_buffer.c | 1 - > 6 files changed, 128 insertions(+), 17 deletions(-) > create mode 100644 arch/arm64/kvm/hyp/include/hyp/test_ubsan.h > > diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h > index ebc18a8a0e1f..8422b0d925e8 100644 > --- a/arch/arm64/include/asm/assembler.h > +++ b/arch/arm64/include/asm/assembler.h > @@ -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) > */ > diff --git a/arch/arm64/include/asm/kvm_debug_buffer.h b/arch/arm64/include/asm/kvm_debug_buffer.h > index e5375c2cff1a..361b473bb004 100644 > --- a/arch/arm64/include/asm/kvm_debug_buffer.h > +++ b/arch/arm64/include/asm/kvm_debug_buffer.h > @@ -3,10 +3,8 @@ > * Copyright 2020 Google LLC > * Author: George Popescu > */ > - > #include > > - > #define KVM_DEBUG_BUFFER_SIZE 1000 > > #ifdef __KVM_NVHE_HYPERVISOR__ > @@ -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 > > .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 Are these fixing formatting? If so, move it to the patch that introduced this. > > -#endif > \ No newline at end of file > +#endif > diff --git a/arch/arm64/include/asm/kvm_ubsan.h b/arch/arm64/include/asm/kvm_ubsan.h > index da4a3b4e28e0..0b8bed08d48e 100644 > --- a/arch/arm64/include/asm/kvm_ubsan.h > +++ b/arch/arm64/include/asm/kvm_ubsan.h > @@ -9,7 +9,6 @@ > #define UBSAN_MAX_TYPE 6 > #define KVM_UBSAN_BUFFER_SIZE 1000 > > - ditto > struct ubsan_values { > void *lval; > void *rval; > @@ -18,6 +17,7 @@ struct ubsan_values { > > struct kvm_ubsan_info { > enum { > + UBSAN_NONE, This also looks like it should have been in a previous patch. The code assumes that 'type == 0' means 'empty slot'. So presumably this is fixing a bug? > UBSAN_OUT_OF_BOUNDS, > UBSAN_UNREACHABLE_DATA, > UBSAN_SHIFT_OUT_OF_BOUNDS, > diff --git a/arch/arm64/kvm/hyp/include/hyp/test_ubsan.h b/arch/arm64/kvm/hyp/include/hyp/test_ubsan.h > new file mode 100644 > index 000000000000..07759c0d1e0e > --- /dev/null > +++ b/arch/arm64/kvm/hyp/include/hyp/test_ubsan.h > @@ -0,0 +1,112 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > + > +#include > + > +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](); > +} > diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c > index a906f9e2ff34..939600e9fdd6 100644 > --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c > +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c > @@ -13,6 +13,7 @@ > #include > > #include > +#include > > DEFINE_PER_CPU(struct kvm_nvhe_init_params, kvm_init_params); > > @@ -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(); > } We cannot keep this in here. It's useful to exercise your code in development but not something you should upstream. I would either remove this completely or implement it as a separate hypercall. > > static void handle___vgic_v3_save_aprs(struct kvm_cpu_context *host_ctxt) > diff --git a/arch/arm64/kvm/kvm_ubsan_buffer.c b/arch/arm64/kvm/kvm_ubsan_buffer.c > index 2c7060cbb48b..49bedc9de139 100644 > --- a/arch/arm64/kvm/kvm_ubsan_buffer.c > +++ b/arch/arm64/kvm/kvm_ubsan_buffer.c > @@ -11,7 +11,6 @@ > #include > #include > > -#include ditto > #include > > DECLARE_KVM_DEBUG_BUFFER(struct kvm_ubsan_info, kvm_ubsan_buffer, > -- > 2.30.0.296.g2bfb1c46d8-goog > > _______________________________________________ > kvmarm mailing list > kvmarm@lists.cs.columbia.edu > https://lists.cs.columbia.edu/mailman/listinfo/kvmarm