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=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham 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 463B1C433ED for ; Fri, 14 May 2021 01:51:42 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 BB82D613C8 for ; Fri, 14 May 2021 01:51:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BB82D613C8 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=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Cc:To:From:Subject:Mime-Version:Message-Id:Date: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=h/XjV40zFDL0Iy/gEg51lCo9EGgyE8EVIRZVGmf5SD4=; b=Qi+h+Yg5M90UGrlrU/L4GBpKAM 7GFa+yk6sM6l9xbvLQZEQtu9loAc+zR/IzmTRyQhOIN12Wop0rIXEzCR5qTYgc//bC2C9AxsThHfg ERVtXvDnIPuWwrbI2I9ejIIYAJpezov43d2/mYgn1OxjAM0Pq94MrEow95XfbQrUlWYJ2+rn5DybB YMxYq8y2ZPhiM0g8eAusDB9b7ohoxh/ZQEy8occxvp7Ncr6DeH4fQAjSy1r+LvvBGio+64Snh0v9Y o+rDk1lZbxztSRrU/kLqOCDli80nO32ancViM+SxTDTeNa018h1FxMI4YT4JLcPu3vObhxABSpxLn 0IFt8UXw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lhMx9-006tX8-7T; Fri, 14 May 2021 01:49:23 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lhMx1-006tVi-LW for linux-arm-kernel@desiato.infradead.org; Fri, 14 May 2021 01:49:15 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Type:Cc:To:From:Subject: Mime-Version:Message-Id:Date:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:In-Reply-To:References; bh=QeY8+m3KWnutvQnXWbW4ohmSlHmgT5rO46x1+R7ZFH8=; b=D6LsFlcyrUc0iDvnH03KSkXBLz nAzzm8BtnpcrASEO4KdQOSGeKatXnMcz0diuXu2sc1UHi59sjVpr2SpVTGf57xGcFH58+U/eVhOdt JXptQq8vGCPhfkhi5rSEe1HTqVdthqkDFNTK0YaRkJXMVYjhzgQIULtl7tjPQQplnvcYlHAGZ07y0 BqgjaSaENb7fn7xaerQv6D2HSsHcqc1uYS3gOgtgyPrfggWvhKyHQzXfxinYi7xVPPlWXfmeb+s9G 3+sXSKPGmRD3L0FhfngJtF81EPJHARdvuFr4aJjcGNS8GVy13IwMjzofX4QBLgAzM5SqC4MTVHHOC GTNuPDZA==; Received: from mail-pg1-x549.google.com ([2607:f8b0:4864:20::549]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lhMww-00BepV-Qc for linux-arm-kernel@lists.infradead.org; Fri, 14 May 2021 01:49:14 +0000 Received: by mail-pg1-x549.google.com with SMTP id 4-20020a6317440000b029021689797ccaso7246152pgx.4 for ; Thu, 13 May 2021 18:49:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=QeY8+m3KWnutvQnXWbW4ohmSlHmgT5rO46x1+R7ZFH8=; b=u4mwT88i2WyKF5YjRwZPM6aodPWwuRccKa+PCaEPNssUzkqqOAocV2i+YdkoTKg2Ek YJ64eh+q6btfTgSDuaa+626PyyF7aGsKlcb2VFgeXEewQn9S6K9Gdy7vocRnXaeobiTk aNxy33QQZkASBuLUtAzonQQ8vd5yhIzCUumgzStVbcdmM/R35VeElrj1NfLgdk7GFpKO XdQsq+KZi2hoBufYhDgIadm6sN85PIDh2/iscRV2zQ8Mtjm3x11qZEtNw4NoaQqfQXIY XuaSGeTk5YV3N2U3OeZ3pDg3R3hVCvblhBUp4HPfh89IBQV5b7h8rDr9Ppc0DGQXRpUc 98uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=QeY8+m3KWnutvQnXWbW4ohmSlHmgT5rO46x1+R7ZFH8=; b=PwLDJOlCvpjVbklTtGY6ec0174PaKaVSiJ74OAjmR58//a8k1Yw3kBH9N5fJ8lrLWN AXMX6VCSA7DXmjINqiHypyrmpNzy4lyPm57plywem/glr13DHex0YNhaGGQ7+q1NJFrY HrpLRsyoSoxjyGu3yqHxVAqdeDjVPptWIMTjX3awoU9OZznoN0EmnEGv8vVcTEVMp18u ISfBHrTteybLobevA1fZhwkTE6gRI/mJq/ezxyE4fVz52kdmIiaf8q0bNHJLl65D7pmH mLqVO89aJ5lFS+Rk8oEL7rylmeqHS2AbS03zqF6cphqhXT5900pA4xleYc9ZPGgYKttB WBEQ== X-Gm-Message-State: AOAM533tlT8Q96vWcTx6dS2b7bbxZqNGdKUKclNMyfF4Nl+IDq9umlls MN+t4Jt6KOVW55X0EGLmMOJWlEVmiTEbXw== X-Google-Smtp-Source: ABdhPJygmzqfimWcBkdDxlwIxuEldWS9jii32FdtVzJfJsizXYKTC1oalM50Sa7erTToyGoXxQpMorQqUbHmrw== X-Received: from ricarkol2.c.googlers.com ([fda3:e722:ac3:10:24:72f4:c0a8:62fe]) (user=ricarkol job=sendgmr) by 2002:aa7:808d:0:b029:2bf:bf00:c6f6 with SMTP id v13-20020aa7808d0000b02902bfbf00c6f6mr23346781pff.64.1620956949386; Thu, 13 May 2021 18:49:09 -0700 (PDT) Date: Thu, 13 May 2021 18:49:06 -0700 Message-Id: <20210514014906.392401-1-ricarkol@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.31.1.751.gd2f1c929bd-goog Subject: [PATCH] KVM: arm64: Add missing index for trapping debug registers From: Ricardo Koller To: kvmarm@lists.cs.columbia.edu Cc: maz@kernel.org, james.morse@arm.com, alexandru.elisei@arm.com, drjones@redhat.com, suzuki.poulose@arm.com, linux-arm-kernel@lists.infradead.org, Ricardo Koller X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210513_184910_898391_86C71B3C X-CRM114-Status: GOOD ( 11.89 ) 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: , 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 Trapping an access to debug register (like bvr, bcr, wvr, wcr) results in storing and loading values from the vcpu copy at index 0 (irrespective of ). So, this guest test fails: /* traps and wrongly stores 0x123 into vcpu->bvr[0] */ write_sysreg(dbgbvr1_el1, 0x123); /* reads 0 from the real bvr[1] without trapping */ GUEST_ASSERT(read_sysreg(dbgbvr1_el1) == 0x123); /* check fails */ Fix this by setting the register index in macro DBG_BCR_BVR_WCR_WVR_EL1 to . Signed-off-by: Ricardo Koller --- arch/arm64/kvm/sys_regs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 76ea2800c33e..e4ec9edd49fa 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -935,13 +935,13 @@ static bool access_pmuserenr(struct kvm_vcpu *vcpu, struct sys_reg_params *p, /* Silly macro to expand the DBG{BCR,BVR,WVR,WCR}n_EL1 registers in one go */ #define DBG_BCR_BVR_WCR_WVR_EL1(n) \ { SYS_DESC(SYS_DBGBVRn_EL1(n)), \ - trap_bvr, reset_bvr, 0, 0, get_bvr, set_bvr }, \ + trap_bvr, reset_bvr, n, 0, get_bvr, set_bvr }, \ { SYS_DESC(SYS_DBGBCRn_EL1(n)), \ - trap_bcr, reset_bcr, 0, 0, get_bcr, set_bcr }, \ + trap_bcr, reset_bcr, n, 0, get_bcr, set_bcr }, \ { SYS_DESC(SYS_DBGWVRn_EL1(n)), \ - trap_wvr, reset_wvr, 0, 0, get_wvr, set_wvr }, \ + trap_wvr, reset_wvr, n, 0, get_wvr, set_wvr }, \ { SYS_DESC(SYS_DBGWCRn_EL1(n)), \ - trap_wcr, reset_wcr, 0, 0, get_wcr, set_wcr } + trap_wcr, reset_wcr, n, 0, get_wcr, set_wcr } #define PMU_SYS_REG(r) \ SYS_DESC(r), .reset = reset_unknown, .visibility = pmu_visibility -- 2.31.1.751.gd2f1c929bd-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel