From patchwork Tue Mar 23 11:29:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 12157405 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 B623AC433C1 for ; Tue, 23 Mar 2021 11:30:07 +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 4B8F061993 for ; Tue, 23 Mar 2021 11:30:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4B8F061993 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.100635.191888 (Exim 4.92) (envelope-from ) id 1lOfDt-0001fD-0L; Tue, 23 Mar 2021 11:29:21 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 100635.191888; Tue, 23 Mar 2021 11:29:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lOfDs-0001f6-T1; Tue, 23 Mar 2021 11:29:20 +0000 Received: by outflank-mailman (input) for mailman id 100635; Tue, 23 Mar 2021 11:29:18 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lOfDq-0001f1-IP for xen-devel@lists.xenproject.org; Tue, 23 Mar 2021 11:29:18 +0000 Received: from esa1.hc3370-68.iphmx.com (unknown [216.71.145.142]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id c3c87e2d-ec61-412d-a176-35a9d68645e7; Tue, 23 Mar 2021 11:29:17 +0000 (UTC) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: c3c87e2d-ec61-412d-a176-35a9d68645e7 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1616498956; h=from:to:cc:subject:date:message-id: content-transfer-encoding:mime-version; bh=xEu885UNxUN9j/ytsYtUWP7Zn2rlbDCRHxIrln+6bdg=; b=U0AP6Hq7N06uyU3TyEckr5gM3XXAH8U7ri+w3bTtBUSkbDlQePFeNLms unPx7LQAc8aI8gJX/0okSKjIqGvnyoH1vusP2RAjzMgwBiGXDckWJRxhO QlfFhf/wuMP9Yak23ZgUXbtaNttiwgYE69Apdd6Epcb0ws36S9dZOcMW1 s=; Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=pass (signature verified) header.i=@citrix.onmicrosoft.com IronPort-SDR: FcKmANCDRKhTvWpykVbRCe2zOaj4T2YZDC3GwJvLY9s5tsPfpQeUh6XJ2N48IbBnAmlxdIGAO7 X1oe7/vwp7NyWXwCr79zTbmJRknU+Tz7QE99ia+hBwKSMh8+xq+BWjiF4PKiwGOZ86+gi4asxA O4DkgOsDfYjNg64tEx8H0q/abQ5JNWi2y+xNEjymTuJSHO6JAZOOoDIyIYE9ZSWM39fUBBEFzL OosO/Y7TZ6BEBvC18/o4HcoVFxCaNWxY0u5yr5stH3B7fIxW+jzm/RIJsp2AyVCvyty56r8H43 gtY= X-SBRS: 5.2 X-MesageID: 40267227 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-HdrOrdr: A9a23:EcQ/i6kqvxtzx1Kfqpf1NN5Zj2TpDfN8iWdD5ilNYBxZY6Wkvu ql9c5rtyPcojAXRX0mhJS8KLCNKEmsi6JdzKswGfOZXAfgsHa1N40K1+Hf6hDpBiGWzJ856Y 5OaK57YeeRMXFbid/9+xSxFNwtqeP3iZyApeCb9Ht1SBEvVqcI1WZEIyK6NmEzewVcH5o+E/ Onl616jh6tY24eYMj+JnRtZZm1m/TxmJjrYQELCnccgWHk4F/GhoLSKBSW0gwTVDlC294ZgA 74ujb04b+irvGlygLNvlWji6h+osfryddIGaW3+74oAwjr4zzYB7hJavmuvCo+pemu7Fom+e O83ysIDoBSwFeUVl7wjDfR9yPc8BAIgkWSu2OwsD/Ciui8bA1/NOZ7v6J+VXLimj8dleA58I lum1iBv55yCx7dmSjmo+LDUQpnjCOP0AofuN9Wr1d6FbEGYLt0q4EC+U9OVKgNBzj77oc8ed Mef/301bJ1fV+CVXzfowBUsaaRd0V2OzKgZFQescqI1DU+pgEF82IogOgWnnIN7/sGOuJ5zt WBC79pkqpPU99+V9MEOM4xBfKtDGrDWBTNN3/XG03uEOU9N3rWrZmf2sR82MiaPKUSyp08gZ LAV04dim4oZ1irNsGUxp1M9Xn2MSyAdAWo9+ZzyLRnsrjhTKfmPES4OS8Tutrlqf4eD6TgKo eOEYMTCfT7JXDjHptI0mTFKu1vFUU= X-IronPort-AV: E=Sophos;i="5.81,271,1610427600"; d="scan'208";a="40267227" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XHtUgSQ3L2eCDLD8uqsXMoj5mZJJ11b9WTeFo1rpv7VZjGxPjQ9P1s1WdqVWlorEyzhHHXxW2YEPa6keoqlHZYfPjClT0RfgFWuBLPywsExQuefl9dWKqO1hlQ4XXaLen2tmBgEZ/tXwlc0iE/vkw3LUIt2S52todPpuxreJD2GAZ3QlAT3b/aX9Jx0Rk4tsMawq/8AHAX4cYxfYZRuaIjOo49lnxRX0B0qIkdQywf2+kKrZPviwmWJ02etkgs94aQad319OzS9R8D5I7shBprshAOOwsIZCTAyUPnc8L5EZGL+pWZK2mg49D5Bjpg/PTLW2WWWfkzaymq4BZYJMiQ== 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=AS+XhQJ/OeI9zJkeGx8nS0NK3z03BOORSOXTHp1QKnk=; b=ZofZqpyzFeiPia7AwmtQupQGU7rUECY08b/0f2+OQe+awb0byLabJtg9B4csIUnLM+47xLdmHYHGZf/9ZmhJVpps1BWk7lPauUiJ9LmEygLPF2V162XKqtg3+R1BY68ibAPni24vZyHO7lmXmq8weNdX8FF9+LJmSEIcgNXHlx7Vkwo7PvVgMaUjun/Vb5ivW5rKV5vGAaDAOXOwL7pvsMHYMbQeyMVr+tMfU/5kMhyxQohKUvEmLvIgjIaJedRMbz7F0NnuYdWp0i2YLKGR3Mh6uTUYvrqE9v9SIPi4cwyshQXhnzcFraZvRlX/YwJOFo86aCD3NiidM9pT9UaIWQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.onmicrosoft.com; s=selector2-citrix-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AS+XhQJ/OeI9zJkeGx8nS0NK3z03BOORSOXTHp1QKnk=; b=JRnGmCeG8xBqMGokL5fvMNLPUwNARF5ZO+KwlJ6Ozk3RRsHKnelgyee1pKUpLp2RiOU6r8Sr1cj+pzBTJmdzQ95ixhPhMq0fDUtOEXC9aQ0AO2F//Um0cz/F1iql/RM6AkSmSdZRCTdlufnvMdEh72af3uzewgF4sFJGhjjteEQ= From: Roger Pau Monne To: CC: Roger Pau Monne , Jan Beulich , Andrew Cooper , Wei Liu Subject: [PATCH] hvm/mtrr: remove unnecessary is_hvm_domain check Date: Tue, 23 Mar 2021 12:29:00 +0100 Message-ID: <20210323112900.40723-1-roger.pau@citrix.com> X-Mailer: git-send-email 2.30.1 X-ClientProxiedBy: MR2P264CA0094.FRAP264.PROD.OUTLOOK.COM (2603:10a6:500:32::34) To DS7PR03MB5608.namprd03.prod.outlook.com (2603:10b6:5:2c9::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e3d43334-5169-4e91-a3fb-08d8edeee1de X-MS-TrafficTypeDiagnostic: DM6PR03MB5339: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4303; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: x6B0qNoRPpSzMfEj+2HTFCTubrge6uZZxNYRmqp4NtHWCW2MWuOjRPAkjqb0aEdEDDJypWTHusvOMga30E1HdABwsztcw0KyqOx+gcHXoqNzqLMB/eEMVpMWsuA0s6nFrlA6rHhHakDE/3YBn1vXpLD2NhCofNg4p3f3cHKHBU63XEv7cJxkeXUsx4lOjONif7q5ehmGg/bWTlUXpLEFD8KLXvQPUc+4jtr+NTbODsBM0+SB/INfyj6JoeUPfHojPYp3a+dWW8f49HaGm9Jn74KJfIQmJA5lCGtKW50iiBpbv4E5EDosqS0AJ7UKN98D4u/RXwjiFljbvTt6kz90x29wmA1EmXiR1hcP4EOk2+q2ga+ehAtRIJvLq1Z/NTMi4ovHNd+V7cvrfSl7D9JF2qdw36v3XvwzMNPfCE4HqBlr0hizdoEbM507uppKMziks5MvJBrG6fN6CeQB+X/0tNuNTJG8vGCQ2tWvMnrt5KSqLgtaEHACX4UhUuQ2Y0q+1xBTPUSzahUU/u74Q2aKJ6TgkL11AR7WlE4WMuMhVhphs5R4oP4odehOyFM4BXixlc083DC5rPNnz5oTMSPZ5Tin+NL58gQwIsLi8/qye7Mka/lsHyqbZN6sDXCEcAT5Va1tA7/O+OEwIcKcbJqU2SkvF46D2RBBj+d8hsz0o0I= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS7PR03MB5608.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(376002)(136003)(39860400002)(396003)(346002)(478600001)(38100700001)(6916009)(26005)(186003)(16526019)(1076003)(36756003)(8936002)(316002)(6496006)(8676002)(5660300002)(4744005)(2616005)(4326008)(956004)(6666004)(6486002)(66556008)(66476007)(2906002)(66946007)(83380400001)(86362001)(54906003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?v/8VuLwc2Xg65RVatOnVBBwdZv+BGY?= =?utf-8?q?T8R9LCfKskOPIKRihaWSepLVR+D/mpYdYUfPg0SumW1DkBg/GSYXXi1dBESw8Jtk1?= =?utf-8?q?PwRo/3WpadjWONQZcdVoJUZpiq5QiJFr2MLan+XQT2UyYh3SeOKYKdo7bGu6nPfYZ?= =?utf-8?q?e+FdCjIHvep82tnyVGxAmP3o+DRmHZ6Kr9LsgAXkbfId/zYPMz5J8kuL9eri3dIYU?= =?utf-8?q?vdlvj8A4cdBqG7W1hT4wzI8mtsco0SZDO0W43BqqLUMyCLIoOt2+IXm2dZVtU+ac5?= =?utf-8?q?wnC7FMBw47VmCCh9BXSRF04TTR2Oqa9WyjtkDJGcNiKTWCJgr1wMWWhXnQOb9HlNl?= =?utf-8?q?KFTBMYTafmLSCsoqV2hrW5r6nH/XN6W3Q/HxFxxA+RuS4PohRrp5KhETLApMFQ75u?= =?utf-8?q?FMKFx0ZvydpBmdLneYQaxwvpPB3By62GFpUArbZ/9MUNwIlRSaxmBxCh+m6WQeZC7?= =?utf-8?q?CngqxD3PVjb5wswm44LphXMq5JcjssDSevmP1fxxsqJkICG9f3mcoDHlRTCZwhhC/?= =?utf-8?q?MMlV13MvIvsRCtk3xI+4VY8wzThD2KnBj1SFO7WMPV/XZJSeSrdECwhiD4GjztT8u?= =?utf-8?q?zeqSn9VCJ9Mau3dNXu7qa758/V4gtAsOGB/35eHLOBCg+VfSybISlJWHxc9idz4pP?= =?utf-8?q?wt1LXOwKkyckfknJyk7kuZXRxIPaijVvB+8tMi2PNE1FCf/pUN3AeKM5MBNmXprLw?= =?utf-8?q?hAOIl0B8lasvNynV510biyM0Vuy3zWEW4eZRv0xJGns1o9QbmNhjshxzb9T5ICz/x?= =?utf-8?q?Cfgavk98c5r1wzmIFQ6Sf+1uAVB8mUQNZsKM3H2JsqKcjXMiwgtsHFK/LVl43ATZu?= =?utf-8?q?5qstnu5yi2g36oS6WNEOL3BJj9l7ULwbEccD3tySTYJLpdUUOh0VwXKRxydzmN2SX?= =?utf-8?q?n/+A/lLxOA/q9lZI1aw/hSR3pUpBLv1BCuS7eUfeOg0+NEUosTIW1KCBnNI8VDu1U?= =?utf-8?q?PBdM12tLBbYDh1amE8LDRm8rJaXp0vpROz7VfNItZF0/Bh15JdyagGE55t2QV71gw?= =?utf-8?q?IfvZqAVNv5GWJRi+7MKXuav2pvrRywXYRG0fZifixhdX91K9Xqoa9LkNx0gRXU5S1?= =?utf-8?q?geAKI16KHXZIPLGVBm6xlbnMWrE7du600pZLYt5rBhV1eGYYB9U14qhGUmqUWVWv5?= =?utf-8?q?3034aUFOtW5Sk54uAtQJhmoICeXlSnArU6guEMz417YZ6MmTg5TwF2ImHE2rY/olq?= =?utf-8?q?TYIRrok6txon4Fi/B1us8hBfDLGeqnnGgtimVHuIKjJD7I2+8z7Goc9CAHshvjnyF?= =?utf-8?q?asYvLWeOqNELtVkS4q81C6Mibu9C9/cgkB6w=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: e3d43334-5169-4e91-a3fb-08d8edeee1de X-MS-Exchange-CrossTenant-AuthSource: DS7PR03MB5608.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2021 11:29:12.1165 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 8a2sFHFctOhvi0iN8RiUQ33CLJjudZ52fM4OIP4TcNPuC9rG4GHwQL9JXAfR0DIgZuh/p3rSqXhSR/LzygkdiQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR03MB5339 X-OriginatorOrg: citrix.com epte_get_entry_emt will only be called for HVM domains, so the is_hvm_domain check is unnecessary. It's a remnant of PVHv1. Shouldn't result in any functional change. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/mtrr.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index fb051d59c3f..82ded1635c3 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -851,10 +851,8 @@ int epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, if ( gmtrr_mtype == -EADDRNOTAVAIL ) return -1; - gmtrr_mtype = is_hvm_domain(d) && v ? - get_mtrr_type(&v->arch.hvm.mtrr, - gfn << PAGE_SHIFT, order) : - MTRR_TYPE_WRBACK; + gmtrr_mtype = v ? get_mtrr_type(&v->arch.hvm.mtrr, gfn << PAGE_SHIFT, order) + : MTRR_TYPE_WRBACK; hmtrr_mtype = get_mtrr_type(&mtrr_state, mfn_x(mfn) << PAGE_SHIFT, order); if ( gmtrr_mtype < 0 || hmtrr_mtype < 0 ) return -1;