From patchwork Tue Jun 27 15:08:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Lendacky X-Patchwork-Id: 9812451 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 14D2760351 for ; Tue, 27 Jun 2017 15:14:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8CCA1283B0 for ; Tue, 27 Jun 2017 15:14:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8033B286BE; Tue, 27 Jun 2017 15:14:09 +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=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EA622283B0 for ; Tue, 27 Jun 2017 15:14:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753121AbdF0POF (ORCPT ); Tue, 27 Jun 2017 11:14:05 -0400 Received: from mail-by2nam01on0052.outbound.protection.outlook.com ([104.47.34.52]:33696 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752871AbdF0PJL (ORCPT ); Tue, 27 Jun 2017 11:09:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=IbvHU+X3HtNhzeyYskwsys/rpVmfaFp1qJ4jHzapIKY=; b=X1RxwZF7LaE4SG3kdXXtxLJs3+ZsAdmuqr5ax9UIYlwQyH/fppLZ592w1p5XGhMpK7G+mhZzeLLUBrZ1WW/KS/1adlgC/SobX3o51mTW9PAy5Knk9xRZwGmM7m9qZs/s0CCSWLLIqLbZvxVEgKQFv4qpTe74yRGjj3aqHcHNPTU= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=amd.com; Received: from tlendack-t1.amdoffice.net (165.204.77.1) by BN6PR12MB1137.namprd12.prod.outlook.com (10.168.226.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1199.15; Tue, 27 Jun 2017 15:08:58 +0000 From: Tom Lendacky Subject: [PATCH v8 RESEND 09/38] x86/mm: Simplify p[g4um]d_page() macros To: linux-arch@vger.kernel.org, linux-efi@vger.kernel.org, kvm@vger.kernel.org, linux-doc@vger.kernel.org, x86@kernel.org, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, xen-devel@lists.xen.org, linux-mm@kvack.org, iommu@lists.linux-foundation.org Cc: Brijesh Singh , Toshimitsu Kani , Radim =?utf-8?b?S3LEjW3DocWZ?= , Matt Fleming , Alexander Potapenko , "H. Peter Anvin" , Larry Woodman , Jonathan Corbet , Joerg Roedel , "Michael S. Tsirkin" , Ingo Molnar , Andrey Ryabinin , Dave Young , Rik van Riel , Arnd Bergmann , Konrad Rzeszutek Wilk , Borislav Petkov , Andy Lutomirski , Boris Ostrovsky , Dmitry Vyukov , Juergen Gross , Thomas Gleixner , Paolo Bonzini Date: Tue, 27 Jun 2017 10:08:55 -0500 Message-ID: <20170627150855.17428.90364.stgit@tlendack-t1.amdoffice.net> In-Reply-To: <20170627150718.17428.81813.stgit@tlendack-t1.amdoffice.net> References: <20170627150718.17428.81813.stgit@tlendack-t1.amdoffice.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: BN6PR03CA0044.namprd03.prod.outlook.com (10.175.124.30) To BN6PR12MB1137.namprd12.prod.outlook.com (10.168.226.139) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 16b58e8d-96db-48e2-f55f-08d4bd6e70b1 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(48565401081)(300000503095)(300135400095)(201703131423075)(201703031133081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506067)(300135500095); SRVR:BN6PR12MB1137; X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1137; 3:OAnPvRcJU6RLkkClrKG7zzRwrOXNNX4ieGDA8NGmSxFfB+OlQ/IGsTCQ5LvgzYEdvT6zSTXecEPy5rfUyLPsAiIJoHE7m8Ub/y9D7ZEHtqVJVIGJNJ6gHIC8XXdWAQ/OIkDAWpCsXlj3w0MCgvorSAXXUnd5N9cOrLnrgI2m00ofa6h0peliaL95hMNj1xXpJC80nG9KR5gcBiGNThMGWPonWulrGDhXPbxKKP4dRSJG5w089foLnaHu+8buSyo7/MVGKb3E64h6BmLXRxpP7dgW3rKd7Cmb8Kjj60hWFGCZ7Y1ivm2ZcZvUGJ6QJgJ50kuzojvt/fe42c+fT7OglS0ivaefMzxvQ/z34BexE3vtuexeUA2yax9ymIXHagUtidZZQRVMmF9DazyfaPjj2eNDdYqKGcmw8UezErWXI/43tPE9Hr/N5ZUfplCimYEZZ8qM/x0s/dm/EhCzMX/Ce30aKNjrnzXWWVoUs9TzI0NtvRLzAhWujfKyWDLpgIoOLZ4urmP0ITeQCIwr6HMCyYKuMV2m0N03de5mnHHJNf9TBdbUEVbzJ1MrkwEuv/ULoCxPps4sm8fecB7gg+7iAA5gEeH3OOTsjYO3BehodQha11BvNbG88/Vp7EGHYDkEl3nm2wOqSOHeIOtWHlQ9sPVqy4ZJol314T1bM9Xgarsw17vWTnWyctP7ZvAaHtgwomuvk2NAauor6x/l5PHSj7EWlQkWbttrNxuuNFQpq62N8lgZWkBjur6Wa2UMEtmJHcOE0g+KL8qwmKn9Sa2eKQ== X-MS-TrafficTypeDiagnostic: BN6PR12MB1137: X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1137; 25:nDGbqxLDdZXWSq/pZADY21l2UcmV/4AIofCGByrmRpFRPgwlPRtrAviA+0cq68hZLw9N8YLHq181Cz+s515TlDGpX0d/C1EkGLJibdTbkid3ux30+tqYtQAmJGsFyONTJLb+9vuDqtXjfofkvVPoKnaUQRd7yF7sJFjsFnoGea0ZMQ7/QCp98/baYw3QxWu29tcrlRWIsCfXgouFmmmUI62opRahiHalDKy4V+cx8BmaI5HiqowxARRwlrSozKIOntq9rjdFTq9QXF1oWmTyc0x9RY9T0a4IBOV8zkqfsLp0P1zrQ+0CV7/p4rDEGbVjToJTSr5T2Pluv/xVGkCn4WVuKMSQRBw0qAwzril3nTQV8kUpxtSmd1vqhfnA+BZ37hq88ewXD++C7mLyPtkrAjImm0PeBGoVW8UXJtVoLT4XleREaMwS0P35M+4mJ3PQVIzpfar/gWPgD+UB/xA/uR1HlzktWjtd6QX7rkVzjwrcG77xQ7Hu+65A9ln+Ok88JI5wv6aNAemE61pWVfNvA1ne0wlzeozGFHppk6QGTGyuhnQ+SPrQs4RzPRIou1iUMFQ6x6M4thuRZK7NhcctZtF/sAddVjah3YVFEai5YvdZIse/UxEw9aoxM9AZaDwDjLFtQStsvVCQKuOkzBFtUYnrfC8TJT+/zDWkjT31+6pEAqNgM2dOnHbU1b0Tvf/IDy5y4wmfSWuZtZIo8T1eyV23lfebWD3ImcjKVGJG22oM7N+l0G6ei2uOjp50uyTSUSp8w3cFyO2l8uzW7Y/GlXM1aZt/DtvZRDPdf1bwcY2mTnOo/7Uz0RJ0CGXoJ+RsIBef2EuhvMLu2CplwIgNdSimnmin7IH5kZSDpoT4S9xSEkivPTJKTA8dYaqZcfsQiPvmo+VOXqueshdjtaMtExxDZBskL2cUvdU8RC7qc J4= X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1137; 31:3qO0SRyyJMslzlbZxNLHcSAzWuMEZFxXkGA2Vf8Xm2gvuK6yoBefxeTegnQZ1pmRf1owcxkAi/7O2IC6/AptYUBLNd7VgdGxF5IFjTqhTViOrF3Bj9oN1LZ4ruEcRR7wPxRIKDH24hu3RJOOUcM/n6txtZTazULIe+r4RLv4jodQX0TImdDYOIx8JAOmB7kiWoJPBngIMZv0ceAQShjAmJMmIPoF84Wll0IcrZjSwtXwYyAMwA8Yeua/HO3SpEdvEZeUS/q9koaukU5jDZARvgoC6Q9mXVZFArjKG6nnn8VIuxB2cFJwzK78i1tOFa3m6Ne+mU+aBBuN4m+qowuYvd+rgTg6oncPxVdvhTKTVasM9SbFJYGHxk9aeDnd340iCUiT1hFPu85RQabCpHBHc3023tXRKMsI9HJQW1VtJX8ywkgkbvuk9z+IU2zAzWFWLCHmcRg3ZEH+dQHdr+UpA99m4SRQWVS6YSOMJP2QSh3BEf194NudsobXsIUmJN3yJoGQG25e1zEOja/kTmtiUU7f8z2cVGpWgXQbYU9ucS7kfOnIJtmAzUbwwk3bT5+hF267QOC9i80AZebRe6xJK1tvtDxKECd16wbMt8PEvUxjTbgGb7YKn2dNWdglXQzhjD3y7vJxfbxB5NdWj8rxcDMpYZprJmwAn3XWDR8NtSY= X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1137; 20:/oqIvBCGXQQIB0XasdhXz3RbmXGbHVCthI5umQ8o8F33m07C5jt7fg0/2grJPxP9tjuwJaD1DpficDqqN2d8QkXJSLswzj0BSKta5LLqitWGP33mqOnWJm1JGZAqyZ9QywNsGrd4mRbxX3W/SwsR3pplhE8RtdLsMWV7Vi+dkDlPG13l1pSXkT7v5rdJ5Rf/xacm2YDTS870Jmf7R2cS3DrfWWoBCGOdNlyaHQEseK1ltkHjosLjFn9N8u1Aof694xUIJ642px606AW39tEMWJnJAt104fspr6498oRrdfoYFYou60Rn5OQbxJ7hpmw1dMH3xn1ms8Ev6krIdah/y/KOV0biPtnR/18N/FcNx90QPi9ADv2talbsq7rMAwoHM4BCCuzcSRfJNLBmfnglz9sNbc+PU4pRSXNHCcKQMkC3UOU/sId+0qo4qiSIMKeI0csf660W7vsbcxaAsrMR0MEVAvD0gUdNLevFa5EJ8rGzu7UW5jnRP7gRBVIUE/5h X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(236129657087228)(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(10201501046)(100000703101)(100105400095)(6055026)(6041248)(20161123562025)(20161123564025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123560025)(6072148)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN6PR12MB1137; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN6PR12MB1137; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjZQUjEyTUIxMTM3OzQ6OTFua2VabFZEV0kzR00zRG5EUFdFYWpaa3N4?= =?utf-8?B?bW9FU1A4L0hGZGd2TmlYMHZwbVRtUlMwa1JCTUpDVWx0eWgreVAzaTdrbW9p?= =?utf-8?B?SlZENlkxbHhXYkdid1BqYVlMODE5NUc0VENldEM1YjFIMnllZnR1SjMyZy9w?= =?utf-8?B?Y1o4QjRlbjg4ZHFlb0lHeDRUeklRY0FPQ28vNG5sWXB3d0lLUnRVbE9tUyth?= =?utf-8?B?WkdPQVpYSlFRam5nZzRUa0ZLbjJUQ1VUWjdaSzhiWEM5M04vRXIvczM0MnEx?= =?utf-8?B?UWF1bG9kSG9POWs1QnpFZENqYUVWV2FXMjhGNXpobEkxQ2dhTmlUOXFQcUxa?= =?utf-8?B?aURlMzBrU2NJdW5IVmNob2RLZklGeWZ2WDRsZEtaVndzYWhjRElPZlB3TCt5?= =?utf-8?B?Z04wNGtRd0tvOFVBa1FKcHQ1NE5jRlpPcU1FcFdEY1RGMXRRREFkNTBGRTI5?= =?utf-8?B?Mms0OCsvcHh3akxhZkRRMDBIR3Q5Z05ua2NpVzlxQ29UMTFGckJ6VUlsSUIw?= =?utf-8?B?d1RnUFdYa0JmWFA5V0swUW0vYUxLZEdvQVZMV0JVWk1wY0VYNndGNVlxK0hG?= =?utf-8?B?Q0NqK3ZTbTlKNXIyK3daWXFUeGVyeXhFZS9PenZSSVFrMCtJVHU3SFJxNllP?= =?utf-8?B?L3F2RzBvbndOUTcvNGpDOUQzcGR1NnZrcjdwR2szVzJhN0hFWFJ6Rk0vSjBx?= =?utf-8?B?SEVNb3RaVmdXZ2tXYWhuNDllaW5sUEowM0pPSlpGSk1vcGsyRmhpYmRWRUpH?= =?utf-8?B?NUFrd1YwQklBU1pSeHlqM2Y4MElmM1pFZmxVVFo3U1ZqUzV5dFozOXZyb0FZ?= =?utf-8?B?NGFaWXR5STk0OU5WOGxNM0E2d0YxZDM0YWpFQ2orVDdzY2ZTWmxWZmhGMGJx?= =?utf-8?B?TnhXUXREclFpYXdUOVczdCtEUFkreXhkOVV5UVFSTE9hSXR2S3dndXR2SFBW?= =?utf-8?B?dTN6R1dvckZ5a2RzcTE5elp2OUFPbGlnLzVvNWNXd2M2eGRBWjlXQTRUTnJ0?= =?utf-8?B?eUVNa2VJZXhickJsVVVHQ0d2cU13d0x0Sko0aWUzRmcwa3RFeW8ra0J0Qmcr?= =?utf-8?B?aEtiYTZid2daNExzZFYxM3ZaU2QvdjhrMDR4RHpJNy9IN1djMkZWUXhtelBB?= =?utf-8?B?R0JpdVpIQk5FYVpkTFI2aDdnQWFiS0NieUxDelZzbzczMzdUQkswTkRpdW1O?= =?utf-8?B?YmJlcXFUNUJvQ0kwd2R1YmVpbDRVa2FMNVNJN1Y5VlhTUzFmbnlrTW5DdzZm?= =?utf-8?B?TnBXTFg0clNNNGxyYkwrUk0ydEp1anFCb1dTU1kwcVZHbEtMakk4bHhJcG1u?= =?utf-8?B?UmdEWkoyNXV5V1pEdWt1Zit3Sk51UjcwL0UrY2diZWhpeUsyL200aHZ6UUVl?= =?utf-8?B?eHRsZFZiU3g1NllrRHAxTTBZT05saXZ6WGh2TFVpVys5UFUzNldIOXZ1TTFh?= =?utf-8?B?OUV2eTI5UFBKclJYeEx0QXlYRHczemhOQTZRWG1pelI0bnFIeDBkSjAzeWdj?= =?utf-8?B?Nk81alAxUFFHZHR5Sy9PeXZnNVU4d1Y4UjZkWXBEeWExOHkxblpVRkxOSkVz?= =?utf-8?B?cHNROUlFNndBcFdwbHNldzcxbVBxTXIxUEZiSmdtZEdhY3V3RjJkdEJpaHE4?= =?utf-8?B?TTZ2K0dRb0dxckNHdXFJQWord3NRNkN3RkljRVc1UXJ1bzJDY0VvZklvdVRv?= =?utf-8?Q?j4kO6/q5UFcHt4vVs=3D?= X-Forefront-PRVS: 0351D213B3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(39840400002)(39410400002)(39450400003)(39850400002)(39860400002)(39400400002)(2906002)(189998001)(110136004)(7416002)(305945005)(4001350100001)(33646002)(8676002)(23676002)(72206003)(38730400002)(25786009)(4326008)(7406005)(55016002)(53936002)(54906002)(6506006)(9686003)(478600001)(50986999)(6666003)(2950100002)(1076002)(81166006)(76176999)(5660300001)(54356999)(53416004)(83506001)(103116003)(42186005)(66066001)(7736002)(47776003)(50466002)(97746001)(86362001)(3846002)(230700001)(6116002)(921003)(1121003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR12MB1137; H:tlendack-t1.amdoffice.net; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjZQUjEyTUIxMTM3OzIzOlNKZ2NZeUhYdS9tVVhQOVF6Z2VyNC9KaEpE?= =?utf-8?B?aDAzOS9SMVFJUVMrNG5uZS90Q3FrZ3B2NnNYd01Fd2dCQTRqWVpvWGF1NHFv?= =?utf-8?B?amhpc2E2K1BFRTh0ZzJOSUZXYi9XcENJQnlCOWUrem5taWpqQThQbEdZdGh0?= =?utf-8?B?eGQxUVoyVkFCYTNlVGIrT0k5MkFqU3F1REdKekhlRHlWUE5aZUphaUxhdGgv?= =?utf-8?B?endOQm9xclFobFFQQkl6WFBydGVOYjlXQXVpOE5lNUg5ZUxML1lmQzNiQ0V6?= =?utf-8?B?V00zTlg0alNHWDZVZXhLUDJiNnZic1l1dUkwM2VONmNJN2dLNGtoeThWUXFZ?= =?utf-8?B?b0ptVHM3MUxYS2ZOZ253cXBocCt5SkNnVG1jRENRQ2lRdnJyR3lnSkdVeHRh?= =?utf-8?B?RDVlamxDTXFyT0pMd1NQUGRFUFVYWi9JSDBZRTMrWVRaR0NzS0U1V01FYmlu?= =?utf-8?B?WFo1WEpOS0FMS0hWbHBPdkpuanl5b1VudXk4MHJDeExGNlh6VkRQSTBVTXk5?= =?utf-8?B?eWtSZ2ZpRllKRlNkUjIrU3VvVlpWZEp3TnFRbndWeXZ2NVh3RC84M1c0RnZX?= =?utf-8?B?SldrZk9VQTMvVU40MlZJSUE5cHVMbllOdUFiUkxKcFE2dWVwYlhTSWpCUVhK?= =?utf-8?B?VkV3T3YzYnBHZVNQbE9pRnRXREdXT25VSFA0ekhyU3ptQnBMang2RVd3Ymxz?= =?utf-8?B?MnQyOVNjM0R1Z2h0UFo1aElSNElhWTR5YnpGWmlxblQ3NGNxaWkwS3FpRkJT?= =?utf-8?B?UTViM0w0MHF0TW91a3FtZXZPU1F0OGp3RU9VZjFKN0FZM0wweEhCRGcyT1da?= =?utf-8?B?V3ZzcDVoSlllZFNEaGYrcndDSSt5NmcxejdYYU1aZm5nczFtZnBiS3FiMGQy?= =?utf-8?B?aDRCTkxsVVV6VkhyQ0RZQ0syTzhRZmJRK3h6KzZQWnJpNGVWVndYdTJQS3BL?= =?utf-8?B?bC91SUptV2hYc1pDL2xmYmx0andSRHdBaHRROFBqSU5JWFVrN2hndXgwKzRT?= =?utf-8?B?dEoyUVIrTnAyaWlzYWtreW1LOFlSZXZjMjBVcFNLZDB3d3I3N2FzM3BqZnd2?= =?utf-8?B?L0VaVjRmY3lKTVFQZ0pvRVpVTkZjWTF2WlhRNzMxeWRaZGYrSVA5R1JieDcv?= =?utf-8?B?UTR6b3VvWlR1R0VOdXUycE9UOGJsQ1U4aGVDdCtEZnZyc3A4MUM2Nm1FMzVS?= =?utf-8?B?UEJHUGxXbGZwVkpBQmRPY2cyaHFtb0tuOTl5QVpRdkZEeWgvZlRZRWlHUHlS?= =?utf-8?B?UENkZENUT1ppWkh6TGVHeWdUZWVHSnJoaG9zTWltR2p4L1RhREl2b0p4Mmg3?= =?utf-8?B?YmQrRlo4U3BBQjhIMkNMQkdhZVJubmJhMFh5eGhkcmE5M056ejZuaW1UTFc0?= =?utf-8?B?S3NkL2VtUHdQTUpPNVpvRzRxNWpod3JUTGFmR3pvb0dZODVzb2FEN25XaW9K?= =?utf-8?B?U0k5UWg3bnU4enlJY2RhdEZFNEpwQWdpTWE1UHNVdGJKcUdHTmZJdWEwUkx6?= =?utf-8?B?OE1STDIrRXR0ZlFmRmtQQitjVXhzNmtKV282dkFRQ2tGbzl2eG00bSt3Vm0z?= =?utf-8?B?Um9EbE5LV1ZBK3VmOGJST3JpTGhyajZRT3pvRXlWRFJrNG5QSlo0QklONVZv?= =?utf-8?B?NURhcnQ0N1JqNU8yYk9PTjJreCt3UVBrRVNTcTNxdDBTNU5hL2pPT3VkaXYw?= =?utf-8?Q?qZ3K1oNLiYws82smy8=3D?= X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjZQUjEyTUIxMTM3OzY6UjJybUxQNjNjMG1INURjYXg4TGlqSUZPSFFM?= =?utf-8?B?LzVxQmtBUnlxbUo5a05hTEFMLzFyZjF1clZRUnpLSVl1VHpCRmp1SWNobUgx?= =?utf-8?B?Q3FRY0o4SGFqcGk2T2ZuY2dKZ0ljNHU4Y1R1U1hndEpCeitsOGJDRE44bUk1?= =?utf-8?B?REN6ZGZ5czF3MDNIUjZwN3NOT05hcDE3U2t3M1RBRTFHUXBvMXY2ZkRURGtk?= =?utf-8?B?M3JucFhaTnZiejFlN1M1WlpDZllnNjFxNmZQMFhlVkhSZUJCU2ZiN0hBWGFh?= =?utf-8?B?SzArbnE1bTlsNVQvbjdhNTgwNGcyQXVVc1hUUXhYeHBIK3V4Yi9BZzhYTjY2?= =?utf-8?B?UzE1a0hUVElpTVVqVitNeE81bS9NcHB4clF3ajdBL0J4M0lobmNBakhjOFBG?= =?utf-8?B?NE0wNlpvZGc5azdjSnk2M1VxQTJpeTdMSVdrTFlacjQyR0ViUW4xazUwZlFC?= =?utf-8?B?QlRzYVNjTXpzcUFobWh3bXVEVTQzcElpd1d4QjZnenRuQyt0UWVZN1A2eGVl?= =?utf-8?B?KzFlOE11b1IwTEFhZmJwZTRrV3E0T0hnaUFZVDEyeWZvN3hNS2ZDMmZjelJu?= =?utf-8?B?Nk14aTJFeUNxRG52c1ZlUXpObDFTdDVCbFd5RmJXc0dIUDZGOUM5QzNONHkv?= =?utf-8?B?eXlzWExtUUgvTndZVWQwN3pybkE2MndxeExCbUR0ZmRFNFB1b1hsM1N3YU4v?= =?utf-8?B?R3gvZ3hQYVdyRkIyYXExV3FUa2RjZ1l5Z1p3K2FmNVhhOUo2NjV0QmhNSzhL?= =?utf-8?B?RGUwenIvNVlKQk1HakJCMjlWMkh2dEcweHgxT3VMOWZ0U0RCQjJHb1ZaSE42?= =?utf-8?B?dTJpQVVPTDN4KytUR0h6bEErME5kaWhzQXFYQjdEZ2lBZGRXTzV6N0dFMEti?= =?utf-8?B?c0MvTTdqcVorWlVWZjFCOStwdTFJTXJyYjJYZFZXWUpYb1JoQ3ZpUXVEVzcx?= =?utf-8?B?eEUySGtObVNLQUh1aGxNRE5lUE1Vb0p3dHNkUjlyRWRROFFyanBzY3RFbE9J?= =?utf-8?B?eDhQM2ZoTmNPZUs4SXdZNHY2emh6OEZyTmxhV0NWSHU2dk5mc1Jkd3grVkVx?= =?utf-8?B?cDhKNVJpNE5sM0VuM0ZreUkxc0NSWnp6WjBmaVVIV2JaRnVDYXJmTjhhZytT?= =?utf-8?B?VW9LdnlkVTUrN1hVWG85SEo2MW04OXRxYVgrdGhwTHdXUCsxaDNXZU9hQW94?= =?utf-8?B?eFVvU3ZHVFFWWG9HUzJ5QkJ1YlpHYlVKaFI2dTZCaFA4akxCVjYxaXlPWkRD?= =?utf-8?B?WFRVM3VBZmhqZmY3NXZ0Z0JlaWZmUUFRTEFKelNWOHBWdmY0NFRPdzVQQjdC?= =?utf-8?B?WXlXNHdSUDIyWWxxUXhueURmcVJMcSs4ZUtRWkx5TkNaVWFTZTZzaG84Njlj?= =?utf-8?Q?6gEIq5S?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1137; 5:J5DxrtFOXzrHH+q1jtXGdgePEGrU3y4wmdkh2UB2pevg3xc7AqrSKIX74fRXASSVwPc6ReT2giWaCXM+zSk2E6YsSh1V3nfI2ZfOtH0fPE3x+x7hjz3fMYrVBAqVGpc+T+RWJUJcJMEsZPt19zEX+PTkkmDdtpYXPZRQJSYuWygDiYHfrIebqd7iaqcAmLKvk3tewHo5saSzAIn4foQ2b/n+r74KTr5En03Kq8RbW4kPhl6/itLkcdCq0SOVACvKgvgFVitzN39HO/ZBKOj7uB2w6TGUL6nn0h/j7XLhNjsmbMctoxGuv383SnBRZotkBb4Boh3ZYTRpf3MO+yxDXd9i9WsiviN+Z0jgu4awk+SPTITJE5xbrv/4k/2JmlEwK13vrwZePIobZ7AJuuclbI5hkdQYQoaAHn7AYGH7jNVQxw1lngG/IGkfzPBIQpxfqAnetEgzUfscgbQKKFx2V9sbWSGIxT+vsgianb19Td16j6EhW4D1zKETL+YOMb6D; 24:2396+FEUgZppseliEF5RCpoy49H6gI75f9V4yI+5hnMZFsWnGutWF8knJ75insHQSNYF2Sw5HVCOIFc6KVcP6apU8hrHeLJ54gA5iUonBrw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1137; 7:e58sGxhWV1pifQZ8RlerjGxr8I5sXxbMSKo+3d8hGpHU4EVaIF0CgtNPnAOgqSaY0hY4/rUt329AmEv/sxxWCwgQ9/cQQyZ0pq8id2ajpnscA7fo5aBkYGeSmlm33ZgBfEvwME/yjorRhq3mFMFDcs3OeXqiLBzrp/MLFBdYnUFcm0xlOaZpkVS9T+5iRPZkh8KS1CzZUzSNj5sGVCY++910whXUQUY/0H2LI5BFpUIZOy1G3ufKJVYmySmAX6Nvrz7C4nGYlcqQJ1plKUDkTXixh8iepaeHxAhjpOSrRXygkQ/wkGeJB266TDSUX8aDOFbt5TCKtcNN1jJ+9A4t5PoYEtJQkZPrcPOMFBVAs1bnGts6KPrhaxspSP3sCx5XjuTbZptbwKveNqAt323A7QfuH82/mg4J7nL5ZTT+ytiNKzSUsyldFaXj/Mjwj8I64KutoaeSOPLp+18ULqcHYOf4jQg6JcLtx4Jr9ElQ3ng8WXZuhq4vNqc4siL9PSvKoyyW4FAIPb8dCEmIbXRE/hX7ashyVJXtLT6IPx4KbVz1HAiTwlZnNw7J/9sz7pe0MoTd+07GY7azaoN8HJtVjMjbUscs2Ezr1HYwSp2QL93dBM8wiBGkukV2C6kmvr6Fmj0NYOqTvTwDius6/IwuNnWESNTY2eNQQP21ATng6MCQr963I980TNMl/Mj0q/UxnEUYub6TnFlW3TRsowBw0sK6V/bp2Ir/kycGGLemvlF2IDJLz9DHIoWBqbaGkt1geBkK9rr21VYndxF5JEMb9qMJdmobiztkYSaZuAQPfaI= X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1137; 20:v8Cape1HzqowShXg3BeBPqM5qhWBe8IRQEIH5xXQtBwUfD1DdizC1lH9O2RcmCz5yvwFHXjOiz2yra0cjeTM32XlrwdrnbIBSO79kgiHat1KEHY2wT2aK2SQe/o4lNDju6xwCq7WY0NlvVgCy3PrPiHHMioIO6wVSTSfeOJGoVY4JgSXknZPho3RcCNQc1PoWVScjCwGMXgjaeKJ5kmu/NoRcWPQy1h8EfxxMIXX3/FDlXN+dbvelP3y4zuer/1o X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2017 15:08:58.5220 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1137 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Create a pgd_pfn() macro similar to the p[4um]d_pfn() macros and then use the p[g4um]d_pfn() macros in the p[g4um]d_page() macros instead of duplicating the code. Reviewed-by: Borislav Petkov Signed-off-by: Tom Lendacky --- arch/x86/include/asm/pgtable.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 77037b6..b64ea52 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -195,6 +195,11 @@ static inline unsigned long p4d_pfn(p4d_t p4d) return (p4d_val(p4d) & p4d_pfn_mask(p4d)) >> PAGE_SHIFT; } +static inline unsigned long pgd_pfn(pgd_t pgd) +{ + return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT; +} + static inline int p4d_large(p4d_t p4d) { /* No 512 GiB pages yet */ @@ -704,8 +709,7 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd) * Currently stuck as a macro due to indirect forward reference to * linux/mmzone.h's __section_mem_map_addr() definition: */ -#define pmd_page(pmd) \ - pfn_to_page((pmd_val(pmd) & pmd_pfn_mask(pmd)) >> PAGE_SHIFT) +#define pmd_page(pmd) pfn_to_page(pmd_pfn(pmd)) /* * the pmd page can be thought of an array like this: pmd_t[PTRS_PER_PMD] @@ -773,8 +777,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud) * Currently stuck as a macro due to indirect forward reference to * linux/mmzone.h's __section_mem_map_addr() definition: */ -#define pud_page(pud) \ - pfn_to_page((pud_val(pud) & pud_pfn_mask(pud)) >> PAGE_SHIFT) +#define pud_page(pud) pfn_to_page(pud_pfn(pud)) /* Find an entry in the second-level page table.. */ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address) @@ -824,8 +827,7 @@ static inline unsigned long p4d_page_vaddr(p4d_t p4d) * Currently stuck as a macro due to indirect forward reference to * linux/mmzone.h's __section_mem_map_addr() definition: */ -#define p4d_page(p4d) \ - pfn_to_page((p4d_val(p4d) & p4d_pfn_mask(p4d)) >> PAGE_SHIFT) +#define p4d_page(p4d) pfn_to_page(p4d_pfn(p4d)) /* Find an entry in the third-level page table.. */ static inline pud_t *pud_offset(p4d_t *p4d, unsigned long address) @@ -859,7 +861,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd) * Currently stuck as a macro due to indirect forward reference to * linux/mmzone.h's __section_mem_map_addr() definition: */ -#define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT) +#define pgd_page(pgd) pfn_to_page(pgd_pfn(pgd)) /* to find an entry in a page-table-directory. */ static inline p4d_t *p4d_offset(pgd_t *pgd, unsigned long address)