From patchwork Tue Dec 14 17:28:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Upton X-Patchwork-Id: 12696102 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F086DC433F5 for ; Tue, 14 Dec 2021 17:31:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=oC5sGxXijbAHU3NRyo/jdph+vfSPOOvJr4qhdw9eosU=; b=R963Fu5wCzIs+uXalVRUO/v0L0 /6agoAE4UaSHj+xbALsKCz/3jgCViH0oCmMErASre6oshlgUeFYmLZ0nfS2Jw49AW1WRf1xxZfYFr XSPSeuO1vAk4crpvyk97UC4wKQZCAWhxuLrCd6MSZGPeA5Qsg37vuAuJFf2N1H9ZuREf5/j5bhDxK 5MnPOwdqbdkytMCwz7d6wARJU7gRBmD+vU9tjgk9W0Urem57o8CafQ5AiIaLaLebW77Uz02Kulhtn 2D0PazhQHova8c97XnoDYiO9KpPgQd9tS2/29aTOv+Da7SuuJyseEY94GQgxX+fnCJTrR+lqTkMB6 BU8TgwKQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mxBcV-00F6zn-8m; Tue, 14 Dec 2021 17:29:43 +0000 Received: from mail-il1-x149.google.com ([2607:f8b0:4864:20::149]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mxBbE-00F6Ww-Cf for linux-arm-kernel@lists.infradead.org; Tue, 14 Dec 2021 17:28:25 +0000 Received: by mail-il1-x149.google.com with SMTP id 11-20020a056e0220cb00b002ac12986811so5242890ilq.9 for ; Tue, 14 Dec 2021 09:28:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=2KsIfF/OkZ9dy42g5M0MSW1Bp0JJrNex4RjUkPqKNds=; b=BTupxORVlkQAx/Iy53cFyu5AChY6Dwql1j31uAUZPphY3Jkui/DZwf9uw/Epm3gPtH hhofflryL/VpdwS/YjAPHRLHjUiQ7tfPr23XRtOSeu33fEtjMwJoAibQ9ny7R0BsrLkI 1m5llWRHwW1COSo0402NBQtIYNNDTHrVwVP6maaHol9MJoUZK5s7nE3zBRw0wnIXNhSm cblJ0vEgi9/GfY2FtvAP6pUgeNHIJiw3zuhTXUQuhydKDKcab5ntd30uRQ4g6NmhjZt5 1t5Motk6j/C51AN5IwNjSy4tZ8SOmuicISUuHtolxa31fcA0htcP47S+v4+2gnq/0/sg 7D+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=2KsIfF/OkZ9dy42g5M0MSW1Bp0JJrNex4RjUkPqKNds=; b=5YCR4aoOJR1RnZio6rd08n2JqoxjQu7tbHGG4Ud5OUyYhpUv2XijBiX2aaoUb8wo4w 6hp94Ora8vRM+XQH5bnH65ZoQMxAH8fTGJhC3IIEZ7nWQ4M9UrrRQ9YDF+wajkyuOqoA LICOibbuth3q+PAKnZN3qLmbuR9NOPrhUEGZDHKlbu95dA1qB4bKdngMBfEAXyprzC7p pgXmTelrKIWcb7vVx/9d2AfOHCMVKkHIDBpC+AfLaHkc3+I/vzuFKpvHIv+oMgYZ1Tta CYGUJvveXdGzpQ3BVeaD0t7MTLo5Td7c3ji8GUktcR3rY54uQbCxcsgjOy0/JWSqHEFI onAA== X-Gm-Message-State: AOAM531daw2Q7ZMl3MSwOHhel3fyA+HVYNyudrsColLOlZadq+KGDk8I mHoVUasJqD+6ZrAn6+5W/1yLQdrTe44= X-Google-Smtp-Source: ABdhPJwobQAZeq2s7m3v81+Wf50FFSnaXP3bVgG+rf4cUMi0f5NKEKThGGU9QLnF3Rxf9jtnho1DIhl9g/k= X-Received: from oupton.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:404]) (user=oupton job=sendgmr) by 2002:a05:6e02:2162:: with SMTP id s2mr4543585ilv.247.1639502903053; Tue, 14 Dec 2021 09:28:23 -0800 (PST) Date: Tue, 14 Dec 2021 17:28:12 +0000 In-Reply-To: <20211214172812.2894560-1-oupton@google.com> Message-Id: <20211214172812.2894560-7-oupton@google.com> Mime-Version: 1.0 References: <20211214172812.2894560-1-oupton@google.com> X-Mailer: git-send-email 2.34.1.173.g76aa8bc2d0-goog Subject: [PATCH v4 6/6] selftests: KVM: Test OS lock behavior From: Oliver Upton To: kvmarm@lists.cs.columbia.edu Cc: kvm@vger.kernel.org, Marc Zyngier , James Morse , Alexandru Elisei , Suzuki K Poulose , linux-arm-kernel@lists.infradead.org, Andrew Jones , Peter Shier , Ricardo Koller , Reiji Watanabe , Oliver Upton X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211214_092824_470059_768BD29C X-CRM114-Status: GOOD ( 11.62 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org KVM now correctly handles the OS Lock for its guests. When set, KVM blocks all debug exceptions originating from the guest. Add test cases to the debug-exceptions test to assert that software breakpoint, hardware breakpoint, watchpoint, and single-step exceptions are in fact blocked. Signed-off-by: Oliver Upton --- .../selftests/kvm/aarch64/debug-exceptions.c | 58 ++++++++++++++++++- 1 file changed, 56 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/aarch64/debug-exceptions.c b/tools/testing/selftests/kvm/aarch64/debug-exceptions.c index ea189d83abf7..63b2178210c4 100644 --- a/tools/testing/selftests/kvm/aarch64/debug-exceptions.c +++ b/tools/testing/selftests/kvm/aarch64/debug-exceptions.c @@ -23,7 +23,7 @@ #define SPSR_D (1 << 9) #define SPSR_SS (1 << 21) -extern unsigned char sw_bp, hw_bp, bp_svc, bp_brk, hw_wp, ss_start; +extern unsigned char sw_bp, sw_bp2, hw_bp, hw_bp2, bp_svc, bp_brk, hw_wp, ss_start; static volatile uint64_t sw_bp_addr, hw_bp_addr; static volatile uint64_t wp_addr, wp_data_addr; static volatile uint64_t svc_addr; @@ -47,6 +47,14 @@ static void reset_debug_state(void) isb(); } +static void enable_os_lock(void) +{ + write_sysreg(1, oslar_el1); + isb(); + + GUEST_ASSERT(read_sysreg(oslsr_el1) & 2); +} + static void install_wp(uint64_t addr) { uint32_t wcr; @@ -99,6 +107,7 @@ static void guest_code(void) GUEST_SYNC(0); /* Software-breakpoint */ + reset_debug_state(); asm volatile("sw_bp: brk #0"); GUEST_ASSERT_EQ(sw_bp_addr, PC(sw_bp)); @@ -152,6 +161,51 @@ static void guest_code(void) GUEST_ASSERT_EQ(ss_addr[1], PC(ss_start) + 4); GUEST_ASSERT_EQ(ss_addr[2], PC(ss_start) + 8); + GUEST_SYNC(6); + + /* OS Lock does not block software-breakpoint */ + reset_debug_state(); + enable_os_lock(); + sw_bp_addr = 0; + asm volatile("sw_bp2: brk #0"); + GUEST_ASSERT_EQ(sw_bp_addr, PC(sw_bp2)); + + GUEST_SYNC(7); + + /* OS Lock blocking hardware-breakpoint */ + reset_debug_state(); + enable_os_lock(); + install_hw_bp(PC(hw_bp2)); + hw_bp_addr = 0; + asm volatile("hw_bp2: nop"); + GUEST_ASSERT_EQ(hw_bp_addr, 0); + + GUEST_SYNC(8); + + /* OS Lock blocking watchpoint */ + reset_debug_state(); + enable_os_lock(); + write_data = '\0'; + wp_data_addr = 0; + install_wp(PC(write_data)); + write_data = 'x'; + GUEST_ASSERT_EQ(write_data, 'x'); + GUEST_ASSERT_EQ(wp_data_addr, 0); + + GUEST_SYNC(9); + + /* OS Lock blocking single-step */ + reset_debug_state(); + enable_os_lock(); + ss_addr[0] = 0; + install_ss(); + ss_idx = 0; + asm volatile("mrs x0, esr_el1\n\t" + "add x0, x0, #1\n\t" + "msr daifset, #8\n\t" + : : : "x0"); + GUEST_ASSERT_EQ(ss_addr[0], 0); + GUEST_DONE(); } @@ -223,7 +277,7 @@ int main(int argc, char *argv[]) vm_install_sync_handler(vm, VECTOR_SYNC_CURRENT, ESR_EC_SVC64, guest_svc_handler); - for (stage = 0; stage < 7; stage++) { + for (stage = 0; stage < 11; stage++) { vcpu_run(vm, VCPU_ID); switch (get_ucall(vm, VCPU_ID, &uc)) {