From patchwork Wed Feb 1 13:01:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 722517 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3vD3Dl2yPrz9sxS; Thu, 2 Feb 2017 00:01:59 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical-com.20150623.gappssmtp.com header.i=@canonical-com.20150623.gappssmtp.com header.b="YIi6v737"; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1cYuXs-0002Kd-3p; Wed, 01 Feb 2017 13:01:56 +0000 Received: from mail-io0-f177.google.com ([209.85.223.177]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1cYuXm-0002Ie-CQ for kernel-team@lists.ubuntu.com; Wed, 01 Feb 2017 13:01:50 +0000 Received: by mail-io0-f177.google.com with SMTP id j13so155326942iod.3 for ; Wed, 01 Feb 2017 05:01:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=LqyyjNWJUprR8P2LV6dz0/KmxRjp11r9TZg+okvytzU=; b=YIi6v7372AzKKC2sIPYCwbFbjhIY85QG4naDDI6d3blPm2n0wwknIJx40HDYTDQSAl khLblbnPblAgVNJ7tnJa148CnRfd0d5VggVzBxi07vEg8LoKUt1UyrlRN9zOxe0r5jTZ xeQMz+D5nz2EllVHZYoxJxXUHlRMA6uVvKC9eKvwRkPNYzTBXvt+1iV06XK6jdscFlX6 GwfNH8Zen2kgyylT5m+HA9R+higgq1mLv2W1M82o2Nu4KxRfskQB/uPPMkSZHTGuz3wc 7FnWPye8n4aVQ8UNT9iLYfXyl7YlCFkMr9UEyo+pSY2DkDggu10US8re6EzGICqbo5o+ g9jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=LqyyjNWJUprR8P2LV6dz0/KmxRjp11r9TZg+okvytzU=; b=rFKTy6a15LJ+eVRuzCQ4ovzc302Yx8PvxS8rf51Sdy+xIrRcY9Hk2AM+iTCluieZ4+ JiZF29v5o7mfHzvmpe8IipQJjPGgk5A3CAGQweDZ4ENl/PaJBKxlAxW1+7LMIU3o34tp IzGgQxIxoXKlOSyWVBfCGNmMd2zFPBHzcWVDLjpf041TKjq5hlmkN9EQbA1j1S1bTWPD eIJQ/LL/AsjrwozevH89QtR8v67mNGkTd/IbS0aXFNtOjzAyJqtJdT9AHx/LbNiNoHkE diMXfj3RTsCTCWF32VdVwHPKkZtUQdJ9rO4xWaiHI0Q6zDBXz9P40tnttYjB3dqyqFNR 4MCw== X-Gm-Message-State: AIkVDXIZKJ8sZaRnBtTjP89xLDFdcjjn5W6nZshd2ZonFN/UaQ/06oYvNQimpJQ3tEG+6vcQ X-Received: by 10.107.128.204 with SMTP id k73mr1906175ioi.188.1485954104176; Wed, 01 Feb 2017 05:01:44 -0800 (PST) Received: from localhost.localdomain (host-98-127-250-84.bln-mt.client.bresnan.net. [98.127.250.84]) by smtp.gmail.com with ESMTPSA id g82sm11869327ioa.13.2017.02.01.05.01.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Feb 2017 05:01:43 -0800 (PST) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2] KVM: x86: Emulator should set DR6 upon GD like real CPU Date: Wed, 1 Feb 2017 06:01:37 -0700 Message-Id: <1485954097-26456-3-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485954097-26456-1-git-send-email-tim.gardner@canonical.com> References: <1485909580-19185-1-git-send-email-seyeong.kim@canonical.com> <1485954097-26456-1-git-send-email-tim.gardner@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Nadav Amit BugLink: http://bugs.launchpad.net/bugs/1660519 It should clear B0-B3 and set BD. Signed-off-by: Nadav Amit Signed-off-by: Paolo Bonzini (cherry picked from commit 6d2a0526b09e551d0f395cfb63e7cb965db825af) Signed-off-by: Tim Gardner --- arch/x86/kvm/emulate.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index f8eea19..46d0145 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -3533,8 +3533,15 @@ static int check_dr_read(struct x86_emulate_ctxt *ctxt) if ((cr4 & X86_CR4_DE) && (dr == 4 || dr == 5)) return emulate_ud(ctxt); - if (check_dr7_gd(ctxt)) + if (check_dr7_gd(ctxt)) { + ulong dr6; + + ctxt->ops->get_dr(ctxt, 6, &dr6); + dr6 &= ~15; + dr6 |= DR6_BD | DR6_RTM; + ctxt->ops->set_dr(ctxt, 6, dr6); return emulate_db(ctxt); + } return X86EMUL_CONTINUE; }