From patchwork Thu May 18 15:07:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Pop X-Patchwork-Id: 9734647 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6C36D600CC for ; Thu, 18 May 2017 15:10:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C02D28833 for ; Thu, 18 May 2017 15:10:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 509F328851; Thu, 18 May 2017 15:10:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C684E28833 for ; Thu, 18 May 2017 15:10:38 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBN2W-0008GL-KX; Thu, 18 May 2017 15:08:32 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBN2V-0008Fq-1X for xen-devel@lists.xenproject.org; Thu, 18 May 2017 15:08:31 +0000 Received: from [85.158.143.35] by server-10.bemta-6.messagelabs.com id 63/3F-03613-EE8BD195; Thu, 18 May 2017 15:08:30 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrLIsWRWlGSWpSXmKPExsUSfTxjoe7bHbK RBtdW61t83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBmfj05gKfirUXH6bxtzA+N1+S5GTg4hATeJ N0/vMHcxcgHZaxklFv2cygLhXGCUmDDtAjtElYfEkTWLmCASuxklnl/YwgSSYBNQl9i8dwsri C0ioCRxb9VksCJmgYNMEm0P3oMVCQv4Six/uowNxGYRUJV4cHUx2FReAQuJifNeg8UlBOQlzm 7ZyQxicwpYSizZd40RYrOFxM43fUBzOIBqciTOb1KHMKUk/rcqgaySEFjBIjF18XRGiDEyEo8 m3mSbwCi0gJFhFaN6cWpRWWqRrqVeUlFmekZJbmJmjq6hgZlebmpxcWJ6ak5iUrFecn7uJkZg IDIAwQ7Gu5sCDjFKcjApifIeLpCNFOJLyk+pzEgszogvKs1JLT7EKMPBoSTB+2YbUE6wKDU9t SItMwcYEzBpCQ4eJRFe8+1Aad7igsTc4sx0iNQpRmOOd0s/vGfi2Nf68T2TEEtefl6qlDhvJE ipAEhpRmke3CBYrF5ilJUS5mUEOk2IpyC1KDezBFX+FaM4B6OSMG8JyBSezLwSuH2vgE5hAjq l+YE0yCkliQgpqQbGyZMDndJFeX3kuY8s55xkbapy+/KOe3N/+Rd4z5l+TYZdN9Ay1GzG9sNl i4NEF4rEWWx/WLxC8doawccnu8/esf1yIyorYFLEQrHnP7dpfdK96WX8scNwWVPwke2nj+jtZ eGUjF976oDteeunPzbtfFun/5D5Xqhgb8//C4+D61peMQokC15UUmIpzkg01GIuKk4EAJoWk/ XQAgAA X-Env-Sender: apop@bitdefender.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1495120109!62739408!1 X-Originating-IP: [91.199.104.161] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18562 invoked from network); 18 May 2017 15:08:29 -0000 Received: from mx01.bbu.dsd.mx.bitdefender.com (HELO mx01.bbu.dsd.mx.bitdefender.com) (91.199.104.161) by server-14.tower-21.messagelabs.com with DHE-RSA-AES128-GCM-SHA256 encrypted SMTP; 18 May 2017 15:08:29 -0000 Received: (qmail 480 invoked from network); 18 May 2017 18:08:28 +0300 Received: from unknown (HELO mx-sr.buh.bitdefender.com) (10.17.80.103) by mx01.bbu.dsd.mx.bitdefender.com with AES256-GCM-SHA384 encrypted SMTP; 18 May 2017 18:08:28 +0300 Received: from smtp03.buh.bitdefender.org (unknown [10.17.80.77]) by mx-sr.buh.bitdefender.com (Postfix) with ESMTP id 2F2BF80F48 for ; Thu, 18 May 2017 18:08:28 +0300 (EEST) Received: (qmail 25436 invoked from network); 18 May 2017 18:08:10 +0300 Received: from unknown (HELO hel.clj.bitdefender.biz) (apop@bitdefender.com@10.220.12.75) by smtp03.buh.bitdefender.org with AES128-GCM-SHA256 encrypted SMTP; 18 May 2017 18:08:09 +0300 From: Adrian Pop To: xen-devel@lists.xenproject.org Date: Thu, 18 May 2017 18:07:57 +0300 Message-Id: <20170518150758.9414-3-apop@bitdefender.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170518150758.9414-1-apop@bitdefender.com> References: <20170518150758.9414-1-apop@bitdefender.com> X-BitDefender-Scanner: Clean, Agent: BitDefender qmail 3.1.6 on smtp03.buh.bitdefender.org, sigver: 7.71440 X-BitDefender-Spam: No (0) X-BitDefender-SpamStamp: Build: [Engines: 2.15.8.1074, Dats: 449447, Stamp: 3], Multi: [Enabled, t: (0.000014, 0.025611)], BW: [Enabled, t: (0.000010)], RBL DNSBL: [Disabled], APM: [Enabled, Score: 500, t: (0.006502), Flags: 85D2ED72; NN_NO_CONTENT_TYPE; NN_LEGIT_SUMM_400_WORDS; NN_NO_LINK_NMD; NN_LEGIT_BITDEFENDER; NN_LEGIT_S_SQARE_BRACKETS; NN_LEGIT_MAILING_LIST_TO], SGN: [Enabled, t: (0.010389,0.000316)], URL: [Enabled, t: (0.000006)], RTDA: [Enabled, t: (0.176719), Hit: No, Details: v2.4.9; Id: 15.5f40om.1bfmq5s0p.at27e], total: 0(775) X-BitDefender-CF-Stamp: none Cc: Tamas K Lengyel , Wei Liu , Razvan Cojocaru , Adrian Pop , George Dunlap , Andrew Cooper , Ian Jackson , Jan Beulich Subject: [Xen-devel] [PATCH 2/3] x86/altp2m: Add a hvmop for setting the suppress #VE bit X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Introduce a new hvmop, HVMOP_altp2m_set_suppress_ve, which allows a domain to change the value of the #VE suppress bit for a page. Signed-off-by: Adrian Pop --- xen/arch/x86/hvm/hvm.c | 14 ++++++++++++ xen/arch/x86/mm/mem_access.c | 48 +++++++++++++++++++++++++++++++++++++++++ xen/include/public/hvm/hvm_op.h | 15 +++++++++++++ xen/include/xen/mem_access.h | 3 +++ 4 files changed, 80 insertions(+) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 2e76c2345b..eb01527c5b 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4356,6 +4356,7 @@ static int do_altp2m_op( case HVMOP_altp2m_destroy_p2m: case HVMOP_altp2m_switch_p2m: case HVMOP_altp2m_set_mem_access: + case HVMOP_altp2m_set_suppress_ve: case HVMOP_altp2m_change_gfn: break; default: @@ -4472,6 +4473,19 @@ static int do_altp2m_op( a.u.set_mem_access.view); break; + case HVMOP_altp2m_set_suppress_ve: + if ( a.u.set_suppress_ve.pad1 || a.u.set_suppress_ve.pad2 ) + rc = -EINVAL; + else + { + gfn_t gfn = _gfn(a.u.set_mem_access.gfn); + unsigned int altp2m_idx = a.u.set_mem_access.view; + uint8_t suppress_ve = a.u.set_suppress_ve.suppress_ve; + + rc = p2m_set_suppress_ve(d, gfn, suppress_ve, altp2m_idx); + } + break; + case HVMOP_altp2m_change_gfn: if ( a.u.change_gfn.pad1 || a.u.change_gfn.pad2 ) rc = -EINVAL; diff --git a/xen/arch/x86/mm/mem_access.c b/xen/arch/x86/mm/mem_access.c index d0b0767855..b9e611d3db 100644 --- a/xen/arch/x86/mm/mem_access.c +++ b/xen/arch/x86/mm/mem_access.c @@ -466,6 +466,54 @@ int p2m_get_mem_access(struct domain *d, gfn_t gfn, xenmem_access_t *access) } /* + * Set/clear the #VE suppress bit for a page. Only available on VMX. + */ +int p2m_set_suppress_ve(struct domain *d, gfn_t gfn, uint8_t suppress_ve, + unsigned int altp2m_idx) +{ + struct p2m_domain *host_p2m = p2m_get_hostp2m(d); + struct p2m_domain *ap2m = NULL; + struct p2m_domain *p2m = NULL; + mfn_t mfn; + p2m_access_t a; + p2m_type_t t; + unsigned long gfn_l; + int rc = 0; + + if ( !cpu_has_vmx ) + return -EOPNOTSUPP; + + if ( altp2m_idx > 0 ) + { + if ( altp2m_idx >= MAX_ALTP2M || + d->arch.altp2m_eptp[altp2m_idx] == mfn_x(INVALID_MFN) ) + return -EINVAL; + + p2m = ap2m = d->arch.altp2m_p2m[altp2m_idx]; + } + else + { + p2m = host_p2m; + } + + p2m_lock(host_p2m); + if ( ap2m ) + p2m_lock(ap2m); + + gfn_l = gfn_x(gfn); + mfn = p2m->get_entry(p2m, gfn_l, &t, &a, 0, NULL, NULL); + if ( !mfn_valid(mfn) ) + return -ESRCH; + rc = p2m->set_entry(p2m, gfn_l, mfn, PAGE_ORDER_4K, t, a, + suppress_ve); + if ( ap2m ) + p2m_unlock(ap2m); + p2m_unlock(host_p2m); + + return rc; +} + +/* * Local variables: * mode: C * c-file-style: "BSD" diff --git a/xen/include/public/hvm/hvm_op.h b/xen/include/public/hvm/hvm_op.h index bc00ef0e65..9736092f58 100644 --- a/xen/include/public/hvm/hvm_op.h +++ b/xen/include/public/hvm/hvm_op.h @@ -231,6 +231,18 @@ struct xen_hvm_altp2m_set_mem_access { typedef struct xen_hvm_altp2m_set_mem_access xen_hvm_altp2m_set_mem_access_t; DEFINE_XEN_GUEST_HANDLE(xen_hvm_altp2m_set_mem_access_t); +struct xen_hvm_altp2m_set_suppress_ve { + /* view */ + uint16_t view; + uint8_t suppress_ve; + uint8_t pad1; + uint32_t pad2; + /* gfn */ + uint64_t gfn; +}; +typedef struct xen_hvm_altp2m_set_suppress_ve xen_hvm_altp2m_set_suppress_ve_t; +DEFINE_XEN_GUEST_HANDLE(xen_hvm_altp2m_set_suppress_ve_t); + struct xen_hvm_altp2m_change_gfn { /* view */ uint16_t view; @@ -262,6 +274,8 @@ struct xen_hvm_altp2m_op { #define HVMOP_altp2m_set_mem_access 7 /* Change a p2m entry to have a different gfn->mfn mapping */ #define HVMOP_altp2m_change_gfn 8 +/* Set the "Suppress #VE" bit on a page */ +#define HVMOP_altp2m_set_suppress_ve 9 domid_t domain; uint16_t pad1; uint32_t pad2; @@ -270,6 +284,7 @@ struct xen_hvm_altp2m_op { struct xen_hvm_altp2m_vcpu_enable_notify enable_notify; struct xen_hvm_altp2m_view view; struct xen_hvm_altp2m_set_mem_access set_mem_access; + struct xen_hvm_altp2m_set_suppress_ve set_suppress_ve; struct xen_hvm_altp2m_change_gfn change_gfn; uint8_t pad[64]; } u; diff --git a/xen/include/xen/mem_access.h b/xen/include/xen/mem_access.h index 5ab34c1553..b6e6a7650a 100644 --- a/xen/include/xen/mem_access.h +++ b/xen/include/xen/mem_access.h @@ -78,6 +78,9 @@ long p2m_set_mem_access_multi(struct domain *d, */ int p2m_get_mem_access(struct domain *d, gfn_t gfn, xenmem_access_t *access); +int p2m_set_suppress_ve(struct domain *d, gfn_t gfn, uint8_t suppress_ve, + unsigned int altp2m_idx); + #ifdef CONFIG_HAS_MEM_ACCESS int mem_access_memop(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(xen_mem_access_op_t) arg);