From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98583C4727C for ; Thu, 1 Oct 2020 10:59:01 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 490B6207DE for ; Thu, 1 Oct 2020 10:59:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="LdzBXv5m"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="N8ey+Ycu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 490B6207DE Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=o/zbwJJnS09Be9KeFI8P5OHNJJ5AN9NB9wa5KUFK72Y=; b=LdzBXv5moZkSp8wUsdreIRcpY kEiQgQiF5YJeKVNcTn8pel671WnaVlfcBIzlRCJ6D2HJPTawO8e8yKjxJbxEyBMP5rpoZ4d0Ek36E 9mvVUoJ2CKIrDbpdPkGEHcQ9i5/lBLF06/OFOvH75rriPv2oIENVbG9suc2jk+PFnYGVYJxXvinQn kO01ELDav/wnBfBuP1fwnyt0YX1PK80Evb7PNUDr/zkp+pr1dMz4pbVO37rT/519eErWOpxjRw0bC sNxbvkDt/Nkf3GhQ6Wn+H7bTG2sa85VZIRPZmZM/20f9bJdh3cpGzm8CWwo5ChiF77qMeeWIU9xOT wBaKWbnGg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kNwHL-0008Sn-1d; Thu, 01 Oct 2020 10:57:39 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kNwHH-0008SH-Va for linux-arm-kernel@lists.infradead.org; Thu, 01 Oct 2020 10:57:36 +0000 Received: by mail-wm1-x344.google.com with SMTP id e2so2548899wme.1 for ; Thu, 01 Oct 2020 03:57:35 -0700 (PDT) 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=uIC7dj7oltWe68l04x0L6fWnaqmGQcvXiQBbnnS12XU=; b=N8ey+YcuMPXshManX3zPwywfOqeeNx1A+UcGWlWQ42qMYLsZxU5gVninqb376OrTab tNm3q9DB534M24+asCWHSsEssHzbplzSFsBkc/pCgsZEtnQ3elRGtE/Q5IObT50DijC3 UmLLTpgJ4lUr0H3OJqpDW9aKOBWB0RZ5DmvrxumWfUN1rm//1CbPYTGxeQc1Uw8Lz7VG ZKeffsRrg8mjPPKf3ixhWmGOQCKOIMLPWb1x7KTnlxYxloWGwEZphXYNeZxt64BP0cn8 pj2+tCmKLs0ZV7qNvGV4xuQNOpINkqV75Nc+NtD3jroYMhe+0So6sTTrTI+FvV0K3nRF FE0Q== 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=uIC7dj7oltWe68l04x0L6fWnaqmGQcvXiQBbnnS12XU=; b=XUK71sxe3XDdsU8mqFkKBw5xuZ2F9J29l9BsCSyE2cf23x9MiiljWPFDst3ZlXHPpI sVOz3JXxyR6Gg77nh901axHRmGEKcq+k/0oe0LKPBhvaq48g2aH+WVOqZdsga7+MrXe+ iNuxglSu+jRfDiMEoBfFOKMV/v3g1E5FDuf3VrkKXNevq0hzmeBHCAAf2xmjBqsmJSFr mmbW/FTkSc5QFAHWpnsN0ySm1+UmIIH8IK9gvTYFoDAEr3Ihq319hTBXyUTtJIc2ahyl 3KpTKZWm1Maa+MpaCSbI/9x/K77aktC6uTUh4m4R7hoJfm/5i44Cr7P+KvHHkSwRVfV+ JfzA== X-Gm-Message-State: AOAM533HJOCjMKWiX0Vmw/yeXpX49pSGQoH87HA351B8vc7pkknLiNNa JC7yuv2auqt1Ir+qWo2L3DhQjolTgnPlNUCL X-Google-Smtp-Source: ABdhPJzH81yvoV14kh0UBrupVwtAp8vc2BgwRUJ/AgiG5QgwEW8w4M550SI7tTEK9mrDCKojnPs7wA== X-Received: by 2002:a1c:f612:: with SMTP id w18mr7636314wmc.47.1601549854655; Thu, 01 Oct 2020 03:57:34 -0700 (PDT) Received: from google.com ([2a00:79e0:d:109:4a0f:cfff:fe4a:6363]) by smtp.gmail.com with ESMTPSA id z13sm8267476wro.97.2020.10.01.03.57.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Oct 2020 03:57:33 -0700 (PDT) Date: Thu, 1 Oct 2020 11:57:29 +0100 From: Andrew Scull To: George-Aurelian Popescu Subject: Re: [PATCH 07/14] KVM: arm64: Enable UBSAN_BOUNDS for the both the kernel and hyp/nVHE Message-ID: <20201001105729.GA632887@google.com> References: <20200914172750.852684-1-georgepope@google.com> <20200914172750.852684-8-georgepope@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200914172750.852684-8-georgepope@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201001_065736_114192_CF9864C2 X-CRM114-Status: GOOD ( 24.77 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: tglx@linutronix.de, catalin.marinas@arm.com, will@kernel.org, kvmarm@lists.cs.columbia.edu, maskray@google.com, maz@kernel.org, masahiroy@kernel.org, suzuki.poulose@arm.com, clang-built-linux@googlegroups.com, linux-arm-kernel@lists.infradead.org, dbrazdil@google.com, julien.thierry.kdev@gmail.com, elver@google.com, keescook@chromium.org, arnd@arndb.de, linux-kbuild@vger.kernel.org, broonie@kernel.org, natechancellor@gmail.com, dvyukov@google.com, michal.lkml@markovi.net, ndesaulniers@google.com, linux-kernel@vger.kernel.org, james.morse@arm.com, akpm@linux-foundation.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Sep 14, 2020 at 05:27:43PM +0000, George-Aurelian Popescu wrote: > From: George Popescu > > If an out of bounds happens inside the hyp/nVHE code, the > ubsan_out_of_bounds handler stores the logging data inside the > kvm_ubsan_buffer. The one responsible for printing is the kernel > ubsan_out_of_bounds handler. The process of decapsulating the data happens > in kvm_ubsan_buffer.c. > > The struct kvm_ubsan_info contains three main components: > -enum type, which is used to identify which handler to call from the > kernel. > -struct ubsan_values, which stores the operands involved during the > undefined behaviours, which can be one, two or zero, depending on what > undefiend behaviour is reported. As an example for: out_of_bounds there > is only one operand (the index). > > Accessing a slot with no type should do nothing. Each slot is marked > with the UBSAN_NONE tag after it's first usage. > > Signed-off-by: George Popescu > --- > arch/arm64/include/asm/kvm_ubsan.h | 19 ++++++++++++++++++- > arch/arm64/kvm/hyp/nvhe/ubsan.c | 13 ++++++++++++- > arch/arm64/kvm/kvm_ubsan_buffer.c | 13 ++++++++++++- > 3 files changed, 42 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/include/asm/kvm_ubsan.h b/arch/arm64/include/asm/kvm_ubsan.h > index af607a796376..575881e0bd5f 100644 > --- a/arch/arm64/include/asm/kvm_ubsan.h > +++ b/arch/arm64/include/asm/kvm_ubsan.h > @@ -11,7 +11,24 @@ > #define UBSAN_MAX_TYPE 6 > #define KVM_UBSAN_BUFFER_SIZE 1000 > > +struct ubsan_values { > + void *lval; > + void *rval; > + char op; > +}; > + > struct kvm_ubsan_info { > - int type; > + enum { > + UBSAN_NONE, > + UBSAN_OUT_OF_BOUNDS > + } type; > + union { > + struct out_of_bounds_data out_of_bounds_data; > + }; > + union { > + struct ubsan_values u_val; > + }; > }; > #endif > + > +void __ubsan_handle_out_of_bounds(void *_data, void *index); > diff --git a/arch/arm64/kvm/hyp/nvhe/ubsan.c b/arch/arm64/kvm/hyp/nvhe/ubsan.c > index a43c9646e1e8..b2d3404f6215 100644 > --- a/arch/arm64/kvm/hyp/nvhe/ubsan.c > +++ b/arch/arm64/kvm/hyp/nvhe/ubsan.c > @@ -43,7 +43,18 @@ void __ubsan_handle_type_mismatch(struct type_mismatch_data *data, void *ptr) {} > > void __ubsan_handle_type_mismatch_v1(void *_data, void *ptr) {} > > -void __ubsan_handle_out_of_bounds(void *_data, void *index) {} > +void __ubsan_handle_out_of_bounds(void *_data, void *index) > +{ > + struct kvm_ubsan_info *slot = NULL; > + struct out_of_bounds_data *data = _data; > + > + slot = kvm_ubsan_buffer_next_slot(); > + if (slot) { > + slot->type = UBSAN_OUT_OF_BOUNDS; > + slot->out_of_bounds_data = *data; > + slot->u_val.lval = index; > + } > +} > > void __ubsan_handle_shift_out_of_bounds(void *_data, void *lhs, void *rhs) {} > > diff --git a/arch/arm64/kvm/kvm_ubsan_buffer.c b/arch/arm64/kvm/kvm_ubsan_buffer.c > index 28dcf19b5706..ce796bdd027e 100644 > --- a/arch/arm64/kvm/kvm_ubsan_buffer.c > +++ b/arch/arm64/kvm/kvm_ubsan_buffer.c > @@ -16,6 +16,17 @@ > > DECLARE_KVM_DEBUG_BUFFER(struct kvm_ubsan_info, kvm_ubsan_buff, KVM_UBSAN_BUFFER_SIZE); > > +void __kvm_check_ubsan_data(struct kvm_ubsan_info *slot) > +{ > + switch (slot->type) { > + case UBSAN_NONE: > + break; > + case UBSAN_OUT_OF_BOUNDS: > + __ubsan_handle_out_of_bounds(&slot->out_of_bounds_data, > + slot->u_val.lval); > + break; > + } > +} > > void __kvm_check_ubsan_buffer(void) > { > @@ -25,7 +36,7 @@ void __kvm_check_ubsan_buffer(void) > > init_kvm_debug_buffer(kvm_ubsan_buff, struct kvm_ubsan_info, slot, write_ind); > for_each_kvm_debug_buffer_slot(slot, write_ind, it) { > - /* check ubsan data */ > + __kvm_check_ubsan_data(slot); > slot->type = 0; 0's called UBSAN_NONE now > } > } > -- > 2.28.0.618.gf4bc123cb7-goog > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel