From patchwork Wed Feb 1 00:39:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seyeong Kim X-Patchwork-Id: 722310 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 3vCkmd4mXVz9svs; Wed, 1 Feb 2017 11:40:01 +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="wxlY7+c7"; 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 1cYixq-0000uZ-A8; Wed, 01 Feb 2017 00:39:58 +0000 Received: from mail-pf0-f171.google.com ([209.85.192.171]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1cYixi-0000mJ-Cf for kernel-team@lists.ubuntu.com; Wed, 01 Feb 2017 00:39:50 +0000 Received: by mail-pf0-f171.google.com with SMTP id f144so113737961pfa.2 for ; Tue, 31 Jan 2017 16:39:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=o3qYZYgdRdMNtaUyMBRnpWajTNI3izFD5Oe5KuFUM0s=; b=wxlY7+c7JP+K6Af324iAREVSu5OwypAMwkynVu3TS6OnhpMxVhBDjS7af8kLUAv2h8 eLU9SQKDbvXDIwWYhDAHdRs6BMwe/NXhPQki9+cFYDMU4xu/GgRfcXlT0feO2RsTG+aN eYntue9kenQHuLANRmrh/jQ5zoC+kqS2FHReYp+qmqAzdJZ3ZnwxrtcvpS56TZatEsUH muTPb4aWL+yYziCoYJFcMNj11QQXG48BPX01H6is7F0NlxIwn5P639OGnR8U8QCrdHQz LZgadwe3qa2wCT/9BAkloVjJT41GSUv0WUvzLc4Hpw5LaFminiTAVJa7LoxR514ohtYO E8MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=o3qYZYgdRdMNtaUyMBRnpWajTNI3izFD5Oe5KuFUM0s=; b=Dx4+MOUc5UT7IrMvLk1d7AQP1aBzoe78Nvb8+KfUDRZboGJaLbNwpVfp23Nowdmboh Q/fSKpOoicrqv/Urk+KOAYZD/AMKFgLOD+PNtT4IPZ4meYuT7SlwPiE102HkNks1C8Fg ZFXRmxF1YNMKi3xAA0UoPoYbQDhVwnuNKe1T6NEHW6FoeiarWkSn7aP8822HOSsLvr25 ezPtzZwSr8+7QKKPQ60HkN4TS4uxCPYrDarBEsOgNqyBfiNRvI3lkPoEioF9bMHjqV+x M+LVD8paWuvmELDn/OiPMFvTREiJniJ39tUfHlXIUbO8A4o70YFR1QuuuC2mSowEI0Jd JNYg== X-Gm-Message-State: AIkVDXIKMOsioIkTVLqYZwbl0ckTsMY/GjsRgo/f8m4UoilWr5+fcs5bvi54EJWEeABrrzIO X-Received: by 10.99.64.4 with SMTP id n4mr151215pga.71.1485909588978; Tue, 31 Jan 2017 16:39:48 -0800 (PST) Received: from localhost.localdomain ([221.140.147.104]) by smtp.gmail.com with ESMTPSA id m12sm44331899pgc.46.2017.01.31.16.39.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 31 Jan 2017 16:39:48 -0800 (PST) From: Seyeong Kim To: kernel-team@lists.ubuntu.com Subject: [Trusty][SRU][PATCH 2/2] KVM: x86: Emulator should set DR6 upon GD like real CPU Date: Wed, 1 Feb 2017 09:39:40 +0900 Message-Id: <1485909580-19185-3-git-send-email-seyeong.kim@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485909580-19185-1-git-send-email-seyeong.kim@canonical.com> References: <1485909580-19185-1-git-send-email-seyeong.kim@canonical.com> Cc: Seyeong Kim , Nadav Amit 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: Seyeong Kim --- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/emulate.c | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 70427d1..4d2cfd8 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -157,6 +157,7 @@ enum { #define DR6_BD (1 << 13) #define DR6_BS (1 << 14) +#define DR6_RTM (1 << 16) #define DR6_FIXED_1 0xffff0ff0 #define DR6_VOLATILE 0x0000e00f 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; }