From patchwork Tue Nov 5 12:43:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Stefan ISAILA X-Patchwork-Id: 11227659 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DAF5A14E5 for ; Tue, 5 Nov 2019 12:45:42 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 AB0FC217F4 for ; Tue, 5 Nov 2019 12:45:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=bitdefender.onmicrosoft.com header.i=@bitdefender.onmicrosoft.com header.b="UUvxfRAD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AB0FC217F4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bitdefender.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iRyBd-00011L-5j; Tue, 05 Nov 2019 12:43:53 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iRyBb-00011G-KR for xen-devel@lists.xenproject.org; Tue, 05 Nov 2019 12:43:51 +0000 X-Inumbo-ID: ea61ebcc-ffc9-11e9-a196-12813bfff9fa Received: from EUR04-DB3-obe.outbound.protection.outlook.com (unknown [40.107.6.139]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id ea61ebcc-ffc9-11e9-a196-12813bfff9fa; Tue, 05 Nov 2019 12:43:50 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h7Lvia25Hc7bR6ZF0Wf3SNYOW0IC0jnkj4aKuTfHo0NlZS/sViyYcdLOHIHoqrC74SsvfGSQtggRowK86NGLBygxDS42JYugr7VWMUOOM6Zwo0FqYBTz9tZIH4lW4cOGmZwUOmMfADx8NoxG3LrOi+FFVpDtj3xdo/QaqpTSIiDedGSd5q7tNBOrcnDe0Fk11UQnOmTfAoZEqoJjLc+pcueX0k+yhSaYsHe9yFCaxpbv//I38d1QqJo0GTlC2kHf++EJtYSD0h57glO3ZjdJ+YV1lBRuPQxDOHP/iwp0Kp5IYxvIkM+P51oOaTnuN8+o9M1qKBmu5AzRBiqj88BqWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=T6yJJH5ZhT84PCuYIi31YHlDdWVU0C1ZXEE/+H9/cH8=; b=jBgZlBKM0U/6vvlfwLf+wlH3KCNusw7zBBwLIOwzej8nyyRsbndtlavLzaDCLlt3IhCIFqo0BxeSPYvlye1oq8csAn7f15CGI//xrIj8vqge4nF5LP/sZRbWjaud8aYg7kWCShDsF/fkMfs3KBjf/inrYhnUQVyorAit7KtO3lZYfrx5I2ivpM8ef26lLWpwTkEMSOWoZwl95QN7Bk7lQSn+ME7p6HDHatwgdHU5ngJO3cQBdPOeSVtVT/TRQrt0trlUGYaPWta+az9GcqiY6vlx+fxZ3zNwb1CMy8WcUBG5BJe9DNjng3nC9bgUFq9BdXyTu0opGcdMdi6ehSl87g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bitdefender.com; dmarc=pass action=none header.from=bitdefender.com; dkim=pass header.d=bitdefender.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bitdefender.onmicrosoft.com; s=selector2-bitdefender-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=T6yJJH5ZhT84PCuYIi31YHlDdWVU0C1ZXEE/+H9/cH8=; b=UUvxfRADlVbR61FpLwHMotDdstYMkcqis3LTcluIv+iCPhatTFiMWxQAZQCdS4k3JbftIVC9SlLrIqH1eG+yAQdLPnqopNlSj0E+EfgGhLQZnvgOZdVy1tAmjaGFLXO3Fc5cEH/dH8pKIIV/MAvRU2mfa+7Hoybpeu42F094Kpc= Received: from AM6PR0202MB3413.eurprd02.prod.outlook.com (52.133.30.28) by AM6PR0202MB3381.eurprd02.prod.outlook.com (52.133.28.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2408.24; Tue, 5 Nov 2019 12:43:48 +0000 Received: from AM6PR0202MB3413.eurprd02.prod.outlook.com ([fe80::a569:5be5:9861:577d]) by AM6PR0202MB3413.eurprd02.prod.outlook.com ([fe80::a569:5be5:9861:577d%5]) with mapi id 15.20.2408.024; Tue, 5 Nov 2019 12:43:48 +0000 From: Alexandru Stefan ISAILA To: "xen-devel@lists.xenproject.org" Thread-Topic: [PATCH V1 2/2] x86/mm: Make use of the default access param from xc_altp2m_create_view Thread-Index: AQHVk9arLQo4LWM9kUCPbXccC8LyKw== Date: Tue, 5 Nov 2019 12:43:48 +0000 Message-ID: <20191105124332.4380-2-aisaila@bitdefender.com> References: <20191105124332.4380-1-aisaila@bitdefender.com> In-Reply-To: <20191105124332.4380-1-aisaila@bitdefender.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM0PR10CA0014.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:17c::24) To AM6PR0202MB3413.eurprd02.prod.outlook.com (2603:10a6:209:1c::28) authentication-results: spf=none (sender IP is ) smtp.mailfrom=aisaila@bitdefender.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [91.199.104.6] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 0bcaf248-a1de-49f9-627a-08d761edcd9a x-ms-traffictypediagnostic: AM6PR0202MB3381:|AM6PR0202MB3381:|AM6PR0202MB3381: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1850; x-forefront-prvs: 0212BDE3BE x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39860400002)(346002)(136003)(366004)(396003)(376002)(199004)(189003)(5660300002)(386003)(6506007)(316002)(107886003)(66556008)(186003)(66476007)(66946007)(6486002)(66066001)(25786009)(6116002)(2616005)(446003)(11346002)(7416002)(66446008)(7736002)(102836004)(64756008)(478600001)(26005)(476003)(3846002)(305945005)(6916009)(99286004)(6512007)(2351001)(76176011)(81166006)(52116002)(36756003)(5640700003)(86362001)(1076003)(14454004)(4326008)(486006)(8676002)(71190400001)(71200400001)(50226002)(14444005)(256004)(8936002)(2501003)(2906002)(6436002)(81156014)(54906003); DIR:OUT; SFP:1102; SCL:1; SRVR:AM6PR0202MB3381; H:AM6PR0202MB3413.eurprd02.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: bitdefender.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: RH4yG6K6Lm+2p0CwuUWOC//iMT3IEREK2SdfY4DWPOmTYH33+i8b6vjDjxniVd2j1t11rg4JUQfl6bKYmOMAIlifmOkTFAM6f8t6BJTlppIB2K+cqjEJzpSuVyRW7eZJTQihDoDfbbnrAxNdljB8vcuxxsBdh5CM20ee+4zeXgARiyw4ve64fTyxSsID1jrBeW/y3qDyMEBJzAN6pzTUMvXQFvYNoehfQWFjh3vLYOfIZ3fBcIZZamiczbkNOCvdjy9Y8PfB30HBVs2NhhBfUTe3lia4JvyVPZ6yP0FtFBlurBS6zTYb1R6Y2kRDUnsXCgQOu7VJVH3XLK3OSufNCChJ1gY/FslefmeL4erysXS500zUac9wCgonRCDqA7B6FALYNRC5DhHHU7Ev4a+3SLLnWXUa6iyUp+bruq01cR/nNPMZE9jV4IjMvqIS9tce MIME-Version: 1.0 X-OriginatorOrg: bitdefender.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0bcaf248-a1de-49f9-627a-08d761edcd9a X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Nov 2019 12:43:48.3203 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 487baf29-f1da-469a-9221-243f830c36f3 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: jjdFsH0PxK+0FzlsuyTjdXI4Ek2LnUzDbBJ7gxjp4g4TVastdzl91zAD/OoegqtAEV9lbRRjY4RJW/tlk138ytuYdlbdUWnPWc80jr20u4k= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0202MB3381 Subject: [Xen-devel] [PATCH V1 2/2] x86/mm: Make use of the default access param from xc_altp2m_create_view X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Petre Ovidiu PIRCALABU , "sstabellini@kernel.org" , "julien@xen.org" , Razvan COJOCARU , "wl@xen.org" , "konrad.wilk@oracle.com" , "george.dunlap@eu.citrix.com" , "andrew.cooper3@citrix.com" , "ian.jackson@eu.citrix.com" , "tamas@tklengyel.com" , "jbeulich@suse.com" , Alexandru Stefan ISAILA , "roger.pau@citrix.com" Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" At this moment the default_access param from xc_altp2m_create_view is not used. This patch assigns default_access to p2m->default_access at the time of initializing a new altp2m view. Signed-off-by: Alexandru Isaila Reviewed-by: Tamas K Lengyel Acked-by: George Dunlap --- xen/arch/x86/hvm/hvm.c | 3 ++- xen/arch/x86/mm/p2m-ept.c | 5 +++-- xen/arch/x86/mm/p2m.c | 31 ++++++++++++++++++++++++++----- xen/include/asm-x86/hvm/vmx/vmx.h | 3 ++- xen/include/asm-x86/p2m.h | 3 ++- xen/include/public/hvm/hvm_op.h | 2 -- 6 files changed, 35 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index d3d9f8c30f..1239e4cbf0 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4669,7 +4669,8 @@ static int do_altp2m_op( } case HVMOP_altp2m_create_p2m: - if ( !(rc = p2m_init_next_altp2m(d, &a.u.view.view)) ) + if ( !(rc = p2m_init_next_altp2m(d, &a.u.view.view, + a.u.view.hvmmem_default_access)) ) rc = __copy_to_guest(arg, &a, 1) ? -EFAULT : 0; break; diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 220990f017..e62e749ec5 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -1345,13 +1345,14 @@ void setup_ept_dump(void) register_keyhandler('D', ept_dump_p2m_table, "dump VT-x EPT tables", 0); } -void p2m_init_altp2m_ept(struct domain *d, unsigned int i) +void p2m_init_altp2m_ept(struct domain *d, unsigned int i, + p2m_access_t default_access) { struct p2m_domain *p2m = d->arch.altp2m_p2m[i]; struct p2m_domain *hostp2m = p2m_get_hostp2m(d); struct ept_data *ept; - p2m->default_access = hostp2m->default_access; + p2m->default_access = default_access; p2m->domain = hostp2m->domain; p2m->global_logdirty = hostp2m->global_logdirty; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index b2e63e75ff..c07e369359 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -2528,7 +2528,8 @@ void p2m_flush_altp2m(struct domain *d) altp2m_list_unlock(d); } -static int p2m_activate_altp2m(struct domain *d, unsigned int idx) +static int p2m_activate_altp2m(struct domain *d, unsigned int idx, + p2m_access_t hvmmem_default_access) { struct p2m_domain *hostp2m, *p2m; int rc; @@ -2554,7 +2555,7 @@ static int p2m_activate_altp2m(struct domain *d, unsigned int idx) goto out; } - p2m_init_altp2m_ept(d, idx); + p2m_init_altp2m_ept(d, idx, hvmmem_default_access); out: p2m_unlock(p2m); @@ -2565,6 +2566,7 @@ static int p2m_activate_altp2m(struct domain *d, unsigned int idx) int p2m_init_altp2m_by_id(struct domain *d, unsigned int idx) { int rc = -EINVAL; + struct p2m_domain *hostp2m = p2m_get_hostp2m(d); if ( idx >= MAX_ALTP2M ) return rc; @@ -2572,17 +2574,36 @@ int p2m_init_altp2m_by_id(struct domain *d, unsigned int idx) altp2m_list_lock(d); if ( d->arch.altp2m_eptp[idx] == mfn_x(INVALID_MFN) ) - rc = p2m_activate_altp2m(d, idx); + rc = p2m_activate_altp2m(d, idx, hostp2m->default_access); altp2m_list_unlock(d); return rc; } -int p2m_init_next_altp2m(struct domain *d, uint16_t *idx) +int p2m_init_next_altp2m(struct domain *d, uint16_t *idx, + uint16_t hvmmem_default_access) { int rc = -EINVAL; unsigned int i; + static const p2m_access_t memaccess[] = { +#define ACCESS(ac) [XENMEM_access_##ac] = p2m_access_##ac + ACCESS(n), + ACCESS(r), + ACCESS(w), + ACCESS(rw), + ACCESS(x), + ACCESS(rx), + ACCESS(wx), + ACCESS(rwx), + ACCESS(rx2rw), + ACCESS(n2rwx), +#undef ACCESS + }; + + if ( hvmmem_default_access > XENMEM_access_default ) + return rc; + altp2m_list_lock(d); for ( i = 0; i < MAX_ALTP2M; i++ ) @@ -2590,7 +2611,7 @@ int p2m_init_next_altp2m(struct domain *d, uint16_t *idx) if ( d->arch.altp2m_eptp[i] != mfn_x(INVALID_MFN) ) continue; - rc = p2m_activate_altp2m(d, i); + rc = p2m_activate_altp2m(d, i, memaccess[hvmmem_default_access]); if ( !rc ) *idx = i; diff --git a/xen/include/asm-x86/hvm/vmx/vmx.h b/xen/include/asm-x86/hvm/vmx/vmx.h index ebaa74449b..a9601e8f7e 100644 --- a/xen/include/asm-x86/hvm/vmx/vmx.h +++ b/xen/include/asm-x86/hvm/vmx/vmx.h @@ -598,7 +598,8 @@ void ept_p2m_uninit(struct p2m_domain *p2m); void ept_walk_table(struct domain *d, unsigned long gfn); bool_t ept_handle_misconfig(uint64_t gpa); void setup_ept_dump(void); -void p2m_init_altp2m_ept(struct domain *d, unsigned int i); +void p2m_init_altp2m_ept(struct domain *d, unsigned int i, + p2m_access_t default_access); /* Locate an alternate p2m by its EPTP */ unsigned int p2m_find_altp2m_by_eptp(struct domain *d, uint64_t eptp); diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index 94285db1b4..321d5e70a8 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -884,7 +884,8 @@ bool p2m_altp2m_get_or_propagate(struct p2m_domain *ap2m, unsigned long gfn_l, int p2m_init_altp2m_by_id(struct domain *d, unsigned int idx); /* Find an available alternate p2m and make it valid */ -int p2m_init_next_altp2m(struct domain *d, uint16_t *idx); +int p2m_init_next_altp2m(struct domain *d, uint16_t *idx, + uint16_t hvmmem_default_access); /* Make a specific alternate p2m invalid */ int p2m_destroy_altp2m_by_id(struct domain *d, unsigned int idx); diff --git a/xen/include/public/hvm/hvm_op.h b/xen/include/public/hvm/hvm_op.h index bccfc45a07..67f6f45610 100644 --- a/xen/include/public/hvm/hvm_op.h +++ b/xen/include/public/hvm/hvm_op.h @@ -241,8 +241,6 @@ DEFINE_XEN_GUEST_HANDLE(xen_hvm_altp2m_vcpu_disable_notify_t); struct xen_hvm_altp2m_view { /* IN/OUT variable */ uint16_t view; - /* Create view only: default access type - * NOTE: currently ignored */ uint16_t hvmmem_default_access; /* xenmem_access_t */ }; typedef struct xen_hvm_altp2m_view xen_hvm_altp2m_view_t;