From patchwork Thu Feb 3 17:41:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Upton X-Patchwork-Id: 12734500 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 28FFAC433F5 for ; Thu, 3 Feb 2022 17:49:23 +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=gCqfLGHpYimtTfsjdT/y0PzVp9vPBGti5h7gVDUFiwk=; b=uPDLVUD5y67MSZSqWqZA8qkBwf SkUHlJKpR3a+GjCaofWG6nW4QmLyTBQrwX0DxRyNfRWkGU3be1gYMlEEFTLBl7ntEDNwKfUSicy0D a27umvtczzOJ3iL4RvxLTxSE1eQkJgA0o0VHK9z/8hllW/u8jlqGiBsdBefZn0X+ki2ai6rSVtreA leeT/Rn8vRW0IDEigKm/VZi6x/AtQMx2PlXczJmfnhTGCiuUbkHD4NIbsMuuwf4pCBZQaaUWrxHBI rHPobd52v1JOSTGvgxb05GgSetqaloNFNiazlpVSEdr6ON9PD45NgDgOdWT6L41fcgHr9Q0bGaXmg roQ5Y5pw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nFgCn-002KJl-LO; Thu, 03 Feb 2022 17:47:37 +0000 Received: from mail-io1-xd49.google.com ([2607:f8b0:4864:20::d49]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nFg7X-002IIb-Vx for linux-arm-kernel@lists.infradead.org; Thu, 03 Feb 2022 17:42:14 +0000 Received: by mail-io1-xd49.google.com with SMTP id r4-20020a6b4404000000b00614d5a865f7so2449781ioa.5 for ; Thu, 03 Feb 2022 09:42:09 -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=wrgfEfV14EVeGeVBLAsKjtwiGuvuEQxGhzBYOaaTqP4=; b=YpzyUoEg7zq/DcVh3KyeU4vERdGA8ReR59CxEznCRJob+oEp3QY3eZ0VWIBhuOBMrr t1Bj4upczXAJsjg23H0UQlGn7PuUMxUMi8BnCfkyRMADFajSDMHQIGaFP57BQ4wXw7G5 GSF1ORFT9coE27YVzmUtB3ha4th1yqtzjz6KjGvoOu/Zy9PMrrOwSOjQUIFbfcuv3Urm fb8z8xZQ8TEtnL4YLX+tdae00N4XGnnVaeO1pnTiBfxZRmo+6zKUOYvvSyhc4D0dfjRM fWtZ00OZbBqz7pz1CZfMeIB6r5m99pcTN9V3MWn+XMZs+DjbS8hHQhhN6/KJ7SzQCTtW vO9w== 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=wrgfEfV14EVeGeVBLAsKjtwiGuvuEQxGhzBYOaaTqP4=; b=PB6kH886wQkwN9ZNukJgnVqy71j+1q1TEFPikXOoD/yNYcDqi2OWArk8HlSXhcWW9C k4m7c/DkE2lXd5DgCt+28VCfteaN87TYEKN/CTTgndwo5Db5dxq68pQIg2Sp3JF3BBI8 nEnRJtPGDTefF1ddwPKOD4YyqEC+azhcGNV3FJnzsdDPxw7psXN830DrzKvWuezW4302 QPsh8zWl7iEtxi5xqY9kfxe37GmAJiGAj892TOt8Nc8XhGnfwOfiifP0On5bCPoXqCex LABKd8m45OcedYiG1gKKtuN7wKXUxOr+QauTIOcpizWKUb4FXh4a9r3L8J62b5JV8h35 98pA== X-Gm-Message-State: AOAM531SbGqnyV3+3uD2WSMq6bgHStQRuVGdRAb7CnktwEN7OnT8Y9T2 1iyIc2eCWgNznERDdVEmX+B74LXCYHs= X-Google-Smtp-Source: ABdhPJy86QQxEmk8vHHLHMGD7z7jHF4YL6H2YGYKUKkBCDrOUwuinXMawx6qJjo17l9XbIu4Ypf6lAox+V4= X-Received: from oupton.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:404]) (user=oupton job=sendgmr) by 2002:a05:6638:3045:: with SMTP id u5mr17309119jak.105.1643910128871; Thu, 03 Feb 2022 09:42:08 -0800 (PST) Date: Thu, 3 Feb 2022 17:41:59 +0000 In-Reply-To: <20220203174159.2887882-1-oupton@google.com> Message-Id: <20220203174159.2887882-7-oupton@google.com> Mime-Version: 1.0 References: <20220203174159.2887882-1-oupton@google.com> X-Mailer: git-send-email 2.35.0.263.gb82422642f-goog Subject: [PATCH v5 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 , Mark Rutland , Oliver Upton X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220203_094212_119154_DEA82BE4 X-CRM114-Status: GOOD ( 11.93 ) 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)) {