From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752851AbdF0O67 (ORCPT ); Tue, 27 Jun 2017 10:58:59 -0400 Received: from mail-by2nam01on0048.outbound.protection.outlook.com ([104.47.34.48]:22880 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751575AbdF0O6A (ORCPT ); Tue, 27 Jun 2017 10:58:00 -0400 Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=amd.com; From: Tom Lendacky Subject: [PATCH v8 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 09:57:51 -0500 Message-ID: <20170627145751.15908.55617.stgit@tlendack-t1.amdoffice.net> In-Reply-To: <20170627145607.15908.26571.stgit@tlendack-t1.amdoffice.net> References: <20170627145607.15908.26571.stgit@tlendack-t1.amdoffice.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: DM3PR12CA0063.namprd12.prod.outlook.com (10.161.151.31) To MWHPR12MB1150.namprd12.prod.outlook.com (10.169.204.14) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d01237c9-490b-4921-d068-08d4bd6ce512 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:MWHPR12MB1150; X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1150;3:tPB09GSYSwmr2tmCfCvUIxTzqIn3805FBd8tNFDF2KQKeRmFKE97DmANsciakS46WKPzaJbQmIM76njL+lCWfnaNzJ+CakNbJ0HoXYzZzr90iNZ8keFd0/Y1ae6/eChSVZfDDuZfnY7+do5K2/tCxWhRhvkQdRpv1wudzj8PIMDKvlM2WEuTqMJNl8FjKJDlRHRAj0ChF64ml0mAGazn73C/LrhqIDAVHlqguinLj7JbKpLDKWRuiAQjur+zuJXVYWTFh4ua47cQb3EXTBBQ4uNIOjqQU4ZZf19RAErinuSGCZefBZAbGvOeCokigUiqwrLLPnC+FE+bPhhbad2P5sz1GfRlLB5s17AmTz3dG5DQY4UfOpGy62qaSLCsDVWjRu3f5yD2J9G6GS4JuWxo9QYb04z60qpggHsKi7qOLLrisp8orskXHxYEAmlFWXGjHykI5WzCAoskom/D6+j0v7oc+VoTVK5JxfnbKVpfacUdjDHfk5j/yZx3AsQDTB3nWVEjUr+0S2P41s9WyW0s0nZgvuQP+Hot8fUCY8zvCLiJ/764H15TaAjoeVAu916g1LL2FVd5ZZhmvq4Z6TRpDBNSIXeGzhQycRTIj2DyuOMWORxWROl2CB8UTjc1MPnAG0ePJ/ksVa0PjZ16dhAV1DgqQ20dRo6G0sOOQVMCTxTlCHFW4Trf8xhrxyLxvukaBoxwPtlr4Om2gV7MDMIHUv5mgIEFof4ld5uPt3smxOGSDKIfjNev/XUaqLsP/Pv5zBwDOsR3U0m/7xH4BbsmIw== X-MS-TrafficTypeDiagnostic: MWHPR12MB1150: X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1150;25:CN6lleWocVag5kiBUOPfFnYpgvGqY6AEK+Tl7csi8LwVuQyEHqBLPQy4iW4eQg7AyH2KrQhvY6evMjkvXLF0t3GllVMgrmX7nLJKGBT8a6b33+dzGu+XyWW/GSii6rOeuJ1/+SxI0dlqgm/8ecJgLEm/Cm4oN3infGQIn9VPFgFdVMBMFEewPDO17NuNjGYpU/s+NQ9bSZX6KbNYKbJ+OfBc7y1kL+cfrHQyRWTyrikcRJOHAPg5xNP0uoN/hj9qkF712NeHn1bDydlfKXIlY6OWN/8axa1yCTnS9WGuJFvKfvKo+d455ZnjnM3xxzcgB+XPeB/gqfL9HFkm49ouhdzgFcBn8uAHAOd8ouUJWJquT0bI7MR8jJ1gR+o7zRyb3a2jMZQqzFRSl+rU0QKOkkUf0qlo+fBNrxJT5k8/zztXo3vZsmSS1Nz5WPBIRHYBcOQpWZ37eDpDZhoM6AWbA0TlQ+aq+xGTQ3Z4EyxHbqR7Bfo+ORUbmxOwDMOFnRngPvbjxInJWQmMofWESCsvuKjCRoTBWtNYLOojRXwTtukjBAKIGGnxSWCFegbh5ZGLzGvBJrWTUWkbKsJN7lXwT23QUQgoxTRp03KX+UGN2BZNDgO7100UaakcMaierVPc5tKSjoWXw4CMuRB5W8p1bRR1gKArm6+cBJhiXPvBAWak9om4leFsXeqKHpt02zOVZTPJotGgwjR1p/d2ZeZJjQSJwrC/y42iwNjzQpchvHpt90gb1SrUViV7rl6rg42rVR1lBr37Dp0YXUYgxWiSXd6wd0KODiL5HFMm/Opn3evl2bauvqCa47ju1vtOdrxvkl9vUIsLk5pgiSZh75vecoq+mW+Jn60yMqFe4c+uhWtorzrEd3dgDXnfgNvTRVt85RwScsc4iNdhr4C7oUaNIv9ygTxard+0m1nhYny0Ovc= X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1150;31:G/Rbz4AVEFMfHJvwmmP3UfTXXMA5EtE2qYKgks8F7QgMzXsTgwAs+jpiOKXNi8gR3bE1DN7528fmvSJaen5Voib2jfxeSlQIjNt8TafW5+dpidWBzHDiKIx0cX9Ouq8prAt27F1PMfxZW7roxoz4zIJvbIXlFndU4swvtg68xfo4hSZloM23ZN2NU33sr7/fckYYyZ4wt4NqX0cX40OiiYlWKDAkaeK4Bh3prwy/Ac4SHpFWm32LB02Qxr4gVytTwuXPs3Y3uXNKddiAa8Kpc1L9KRwUPZPZDN8dgeydVSDFGMI5GmOpXcpvI2B8AShntF9DZUBriXm02bFWdqqfxYFP5c2jtZYROKOeFUqWjarXG1gsOplWmC2suZANnl0+3KNbja5ZHUxJPsWhtGNJlOiETlPd7T9V8muiT5od/rZJ2LDgyW0KLrhAvGMn1HIYPmDkmLt3B391UGk4BkGznkYuEJ8RjZoOtil4nQQCjdGDKYLPzdUkJMlCVjAqAgLLg4Ft/gxm7TS9icWmqGOp93KDPQ9T2I8ZtEPfQeHJd1K4Mi/qZapW6IGVaV7houEDaStJvtqr4WN9QES5BJgUdmiK3m7Q77+1NW9FaR4PJf/hEuF0OFFOuQG1MkKVvqNCITnmYxgWtHBD/zrJ7jLw2FsTG122HSSHYyLO+1LHO6c= X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1150;20:kRa65uictxSpdplbSpUVHs5ZivTaLrT+zRv5xpGqiB8etd4IF4sgg32rJgrXRuzB2P95NpJKM5G2b+cBGNlBWioQi7C877dX9OprEqK4scYdDe+JQlQDm3qgyr6ikBKhFx44HkEgtigiohDsWBP8fVGlHCfV88F3neaoqlkuN1BoPXYAU7xqEqPS//JvBP8m9ZtKdF/E0gtNQXZuE0qRsSxiK/rMxX9yiewdlnwVeDxH19pxuaeogxKteIKQFQLxoGRCmyeMpkx/7bZjGuu/Q8ZEpWeAGVdmd3RYT2Gwnt6wJLxkbNwsjpwk7tBXdB5aOlTqAwV8h+rko89aYMTjPPyTPTWBYJTZlfIGMU1wUz1DR5gr1rZnZj0Smz3QWnpacryrWvDK/U6r4MZoKxghXQHw0qwlLQKhHrzOUaDqlELkm8vstWR3CylqOp55kyZ4liUYxSM/LY5EHSTjDsRHdNuHdUVPXLFOki9KyCGWOn2RH/9N6nzF5X/Fti5QxuKs 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)(8121501046)(5005006)(100000703101)(100105400095)(10201501046)(93006095)(93001095)(3002001)(6055026)(6041248)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123562025)(20161123555025)(20161123564025)(6072148)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:MWHPR12MB1150;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:MWHPR12MB1150; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtNV0hQUjEyTUIxMTUwOzQ6dzBWZCtBUDBGdWtkekl4cDg1SFR5L2NLT1VK?= =?utf-8?B?cTlZbmxvYjlreUZjenVzSTBsenRWbDV6WjRWZjIweXcvRXNMbm80U1pCMER6?= =?utf-8?B?YTUyRFhocFExcFRyTXZmZit5NFVaWXp3cUpJRFNJMktwUG5mbTZKRXpNbzc3?= =?utf-8?B?bUd5Q2hYY1I4R2FTSFYra1JYOVkwYnVFMld2NHlnVFBxYzRPRjNTMkJtUTlN?= =?utf-8?B?VFcrNEtEeHY3NnR6akZZTmg3WGtuM2dFZ3o0OUZzb1YxTDZsa01ndyt6MVZ0?= =?utf-8?B?MDRoUDgwTUtoaVFITUVNYzFjalRqVzR6WEpDek13bWJONFZRa2VHVExydlly?= =?utf-8?B?cFhzZVh5dHNzVXJUWUl0YVVaTlY1ZElmUk81YUkxZGFtbElWZ3V3Vit4c3dk?= =?utf-8?B?Z2F6dXJMK3o1Nmc1UHRDVU1JZ1B5Vk5aQ2Y5TnJ0a05jR1pRZ01QdnJ6QW8y?= =?utf-8?B?UjJod0dYN0JoL0FFd0ZDRmZxb0ZYT3VLSUpKdis5QjJML2psd0RmakE5dWxv?= =?utf-8?B?SkR1NGliUXRIek9rZWlyNmFLNVlxdGJJSDkxbzN0SW83czRZMjQ2Wmh2WEd5?= =?utf-8?B?ZXRUeVo1YkplbEZMYUNWYmNvZUFJM1NiWWt2a3pTVEcrc25tOGxJVEpRakpw?= =?utf-8?B?SWZ5bjBoZmt3ZG0wOGpkZ1cvNzE4bis5UEE1SjZobXdUUUkvOElwdXpTL3Zz?= =?utf-8?B?dDlNSW54ZlZ3bXBaaCttNGNyNkVnZUdKR1o4UUFieFJIVjQzOHhsMUpsR1NF?= =?utf-8?B?QVdJam9tb3pSR2x4NHlURmtvTHFXQjlIUk85U0tpRWpJQSsrMHBCMjROWVJ4?= =?utf-8?B?ZWo3V2Z2TTB1cmZiYTVQSW5BSnM3QTErLzA4TGMrNXBUYWd2UnVuMHo0V3FI?= =?utf-8?B?eGRaeExmcGZvaWMwbUlaa0xTUFpnQkg3eTRKdXRuRWl1eHpuYnhLZ3RPTVpF?= =?utf-8?B?ZUw3V1QvZ08rT0xKVjBuS3BkSHZGaTc3cHcyU2ZEUHB1UjF6Nzl6NkxPY1l0?= =?utf-8?B?dnZWVXBOTG9pbHpGVnJ3NCthL1E4aXUwK3lwbGJ3Z0R0UkdZVFpRQ1hSeUtJ?= =?utf-8?B?YUdlbTAvWmhzMkhtQ3BiZzM2NGJHbEJGVk5ia2pBaU9KMThaeTB4QmhBZ2xF?= =?utf-8?B?d1JEWXYvc0VySUxFTHhCNE1kUE9LaEdKYUdNSmNyYU4vWVhITzhLWnFnZjJI?= =?utf-8?B?ZHNzd2M0czhKVmtqL3N0Sk1jQmlqdG9RZ05BUlhWRFd1a2wyM212NFFrVjZ2?= =?utf-8?B?dU5BcWRsZmdiM1JpVEt0dFc4cm1aMndPeHdkWFJLMFMrck1UMklHRU1HTWs1?= =?utf-8?B?L0YxWjhNRnFFSi85dHQ0Tm9salFBQWhvVHNUeTd6UHRLUG1hSWpSaGRBRzhK?= =?utf-8?B?N1JvM2lxbnhZZGZpUktyaStsMyt4RnMvbTRNUnNjbFJibW5xUVVmMnNhelFo?= =?utf-8?B?Z0dZNnVYUzdwMDdUYUpVRTJBL2I0RjdoWnBsUEl4Uklyek82R25FVlhZZVpK?= =?utf-8?B?VU5SWFdBREJjR1dSK0VwdEZqWldQUWFCY29GbzFHRjBjOUJIeXNDRzRUZHgr?= =?utf-8?B?SllPYlMrNVZ5TDZjeE1USjhhY2s1dWJLbHcwd2hDTVdHY2JYUkFVVzZFbHJu?= =?utf-8?B?RGJjUUhmNzYxSEh4dnljdGFPdUlhOGpuL3VOakhleXNiaXk2YnBJazRtVkh0?= =?utf-8?Q?WTuV4OjCuYgIjbOBE=3D?= X-Forefront-PRVS: 0351D213B3 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(39850400002)(39400400002)(39840400002)(39450400003)(39860400002)(39410400002)(54356999)(25786009)(76176999)(47776003)(72206003)(478600001)(66066001)(23676002)(2906002)(3846002)(1076002)(6116002)(230700001)(50466002)(53416004)(50986999)(33646002)(97746001)(86362001)(54906002)(55016002)(6666003)(6506006)(103116003)(42186005)(4001350100001)(110136004)(2950100002)(189998001)(38730400002)(7736002)(9686003)(83506001)(5660300001)(7416002)(81166006)(53936002)(4326008)(8676002)(7406005)(305945005)(921003)(1121003);DIR:OUT;SFP:1101;SCL:1;SRVR:MWHPR12MB1150;H:tlendack-t1.amdoffice.net;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtNV0hQUjEyTUIxMTUwOzIzOkxjayt5ZDloa082R3JqZ1BTMGRiM0RHN3hU?= =?utf-8?B?U3VxNGIxL0gyVjlrblJwbWlrMGxwdlF0V0gxZ3JCbWE3UWJOTk5tMEpsR2x3?= =?utf-8?B?Q1VFbDRTSzlDQ29PbVVCOFZSbzRvWGVpUDM4VTNGNjlwZmRtaDh4NStTRHFx?= =?utf-8?B?S05SM25zSjR0UzVFRGtmL2dCV1RGL2FLQ2w5UHJITVJMOXk2NmNsa0dDbHAv?= =?utf-8?B?SGZveC9kUDVjN3Zsa0QzR29OWmZLeDRvbHY1UE1YMllSMTJ2VzVFQ1NxSnR5?= =?utf-8?B?MlpCWmpNcXBGY2ZRclZoKzhpVlNudG5wZUdrUTljUG9yWVgwN3J3ZnNyUzg4?= =?utf-8?B?bU0rMVlUaU81Y1JTdzVuRjRlY05qUWsycTNxRDJaSFJUZmVJR1VvSHJBdDBz?= =?utf-8?B?aklvb09zU0E1Mjdwdy9RVWMvR2tQUXkyK1U1U2tWVjhDUGF4RG8zMG1jUnE2?= =?utf-8?B?ZExIMlM4MGx6V0pPbVRxS3pvWWZSUmx5Tm0zK3FUemdsZk1DWTZKanphaVBq?= =?utf-8?B?NThTM1E1OXpJai9jYUVKTmZ1ZWl5RkFZUjRDclZpdlBtbVVHNm9VbElybkl3?= =?utf-8?B?eVRTZitEZGhZWUVadXd1Qm85dlFWMDZrSjhyM2pHUmlIdlZIbnpFVTk4Wm93?= =?utf-8?B?L20zd0F5c2lLdjZ5UnBWaWx2ZVR1d0VyOG4xdDdRbDF6cllmTTRCNnRGc0Mr?= =?utf-8?B?OU5tSlpDMEV6K0FnMHBON2pkOG9xZUhBL0VBbmtsTVFHVnBuWWZZUE5CeEZt?= =?utf-8?B?ZkZFWFM3akdjS3UrdWpkYmt0RVYrT1VhYlBVcDUrMHJHdjA4Tk85U3JHSjFq?= =?utf-8?B?WXpSMXp0dmJINlJhQUpGMElWbmdxWkdMRWg4LzRyNGdib2NCQm43R0hJenhR?= =?utf-8?B?SXdWQ28rc0pLUHRwT1Bwd1FBeGJ2UUR5L0NFeDNBVEJFODNYN0RQM2RRNjhB?= =?utf-8?B?cDkzOGVhZXlVeFU1QzNFTHdQbWR3U1NJcDdQYWhZUG94RFhrdjlJMTA1cUVD?= =?utf-8?B?SGp0WldqQjM1ckFscEE1TGMzeE9hS2RvOU5SQzdLWTRKOFV5WWZsVkQ3cVpK?= =?utf-8?B?ZHlUSTZXUjZidmNFYm1TL2oreVFkNnNqREVVVWRGQ0REdEdSM1dGMTk2dytw?= =?utf-8?B?MnZLRWxweDRjZWFqMVdMOSs2ODkxT2RJNzFocE1xNG45UndyS3RQMmgrVkdP?= =?utf-8?B?MUozR3BicW9qcEx0TW1ZWWVoMjFWSjQ2UUUwcjhwdDhsUUQ0aHBSRWpDTGFm?= =?utf-8?B?RjQxVUNvemNNU3dwQzhld1c3dVNjOW9RYmJBelQ4U2IwYXpvamw3ZUcvWHM5?= =?utf-8?B?cGxSTlU1VjNycS9NVEtodit5emdtY2xyQVgxdjc0NHFqZDh1K0pwa0FiUWhI?= =?utf-8?B?dFNXcFkxK3dGbXdoTjdEUk9RbFhPempVQUovRDVBbXY3WCsycjlSY0JPN0hH?= =?utf-8?B?NG5leUVIQXJoeFdYNFpmWk1rM3duc2FnRHJQZExvK3phZmhwZ1pFMHBSRmZw?= =?utf-8?B?Z0kvYnJZSi9BeWZkbTh5UG9KdE5LVHo1QlFtYUkwNnRoWDJJcFhSbG1HenB6?= =?utf-8?B?elZPSjJKNzRNb0RzQzNwT05DcWJIK3Zkd2ZGUEJka0R1UXZyb3NYdk5UbC9L?= =?utf-8?B?c093cHp1MDVHUEZJdWIzU0JIdkpCTktVZ0o1anRDby9PUE8yR3lleWZTb09V?= =?utf-8?Q?t9taxyJh17ws+TCHeQ=3D?= X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtNV0hQUjEyTUIxMTUwOzY6YkVOb1RMZ1J3OExzd3h1UDVpeDVKbGtWTUJE?= =?utf-8?B?aGZ6RnRFWnY1ZXdUWTV6TktHVDdrZ2d6LzZKNC9HWDVsWVY0eERqalp0VWlB?= =?utf-8?B?cVNoR0I5TmN2d3ByS0NhK2xpV3ppZzIzOElQNmxwZWNBeWd4T0VFSTVhU21a?= =?utf-8?B?N0JHTG9KUDJ2U0E4bzVac3ZmV0hYZkQya2cwa2pWRDBjeHM5N2ZFN2pUdkNJ?= =?utf-8?B?ekZhVFFIaW4ySU1TY0RiaFF5LytGU3RSa0V6VzFUL3BoUWpobTg3Z2N1MU9i?= =?utf-8?B?VjFpOEExUGR2VWZkSXM3R3duc1k1MXA5RTBqT09IRHpEQlo4ZTVZbWhsdVJP?= =?utf-8?B?eW5Icm0yNUhzSGJiQTljTXVNS1lMZDBXSjNjc1JWbllzZXI5elk5UVFCNHZH?= =?utf-8?B?bHhUdU5LelVPUXNqRk94UkhxVXdFbFVzZ2xRVXRRQ0hnTHBFaGlkYlRFbHo0?= =?utf-8?B?SlV4cW94VUs5blJzaHBVSXlib3piMzdFQk9hNEdTREFZekVJY3lPR21EeVJr?= =?utf-8?B?TWF3YjB0ODFpVUFPUEpSYWcza2ZMYkx6NktKamJuMEtVTFQ3d0VabW1FR1dJ?= =?utf-8?B?dG10L2RmanVUMGhveVJacWZlMmdvMCtadTEvNDRwVmpDL0IwZUs3b0ZDVDk4?= =?utf-8?B?bW9tMnhyelNxVUY3ZHFpUWxKd3BFNVdnOVo0RDVXNk1vV1RwbUUvUFF3Mjl1?= =?utf-8?B?QmZ5U1pBb0JCMi9pQ0RIV2x0WVRoNWYzOU5HcHFsR3JGd0poYStkQWZTYWU3?= =?utf-8?B?R3RJZXFWTGR4b3lpL1YyaWxJUWhSNEx5c01vTEtHTjhPRiswVGlvK3hDbmkw?= =?utf-8?B?aC9kZXBlVmtZNjI4SmpBZ2xvd1hZTTRIZmIrSzJyck92Ymx6eGpkRHR5eGQw?= =?utf-8?B?c2ZGN1pEL1J3aFdGRzJpamZveGlhMlN2RlQyRVkrRGJJQ283L3dhWXVnYVlE?= =?utf-8?B?NjNoVXI2RkcyWnUzQnp0WUJMeXN5TThWTFBTR1ZicDJkZzNkNk9XcllMY21K?= =?utf-8?B?SVZlaVZWME10eWcrQTZ4cC9EVGxaWWdaNUw2ODNjQVI1SDNNMTRMZkE2UlA1?= =?utf-8?B?Z1Y1Z2FRMzBadWpaR3p6YkRZUGJhQU9VWlNXNytTbmlsMjFHSis4SjlZWEZ2?= =?utf-8?B?TFZoeWdlUS9ybmpwZU1abW5VSzROaVp0UnVORktwSlZjR0Z5NEx5dGRuQkhs?= =?utf-8?B?SW1mRng4QzZLYnkxcTI0UTBBQlFsTnQxVnkwWVYrTElLaWtkT3JuRGNyWTZT?= =?utf-8?B?RVlQbnNjR3NvTzcrRFNqbUwzZUZ5amJiTGVqeDJCTDVWOWRCSFlBaEVsUE5J?= =?utf-8?B?cXpHZzhoNDVubFhGdHVvSDFuNmk5TFVNVVFpWDJockRQbHVlZEJVOXZqc1dY?= =?utf-8?Q?QZi8yNx?= X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1150;5:Acx/EsrYX/mbF8bgKTHfUPigLsKu7ZR8KQgWcrnH1Y/T1xfDKWtOQNjrIf44Ktc8JmNSor1lqJBtLEf2+8yY2aWOO0WnKkHIETClp0n8P5Vbz94+yloZbtg4ty7LdVFZjufDm9L+Pk3Kr174ZgPF1MCqEboE7Y2vnFkhb3KjeSgN6gAEdbHZa7t4YGWzb2wushlQXo8u4X9tKVbFm6tRuuqk0WjfTZ97VIKTFBqS81qrJAJK2bwqjMdL7dJXkSr/598Bjh1+3jCqRMI8kCNiLry5p/mZvOa6HklhRcmmAtvl3HCdF8DnLkcKXI0vx30RJc+7Z3rfnQgj1VSsxpf327RBd8BpwHnpgD5r0o39jA7Sk394r2nu02eNPVCUdD0ZKbWG3dhzh/FeE6ZIvly++BMDwHJY4vja+eETJ4wfj2bejt7m3ossdx8KqAK5qcsk1Qp/G6DrRhx6x6aB58mTyNLxF7oplVp0Md2jZIr4NNi9eXbRT0OED0ZZAF8c8Onf;24:eeilsGM2AFK9FTZu7FMFpyTHSoTB0vIYyoYmwMCDwUsSdSQDqyp19etl4XkXDiwc1/O/Cy15SVmOnV8bMcT2OgySBfwOsl8H5s0N90krknI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1150;7:SE6WL8QMym7uWetBRldWYOdRt9IQvaQBW+CPUblrMWvXOEqs7Pg2cqyEv4PlKOFZcT+4dmK22jSDYfmJ7CgFWQfxxnkdQ/v9lQ9dVsGoGb0TSulkdqEQipKGNzwedn2HE43N8ctAo+OKkthLsLdGFs+KfnupvaqbQdseIfveRQTTv+FaOKyt/+Mf6gZm0f4kUYhXH0xRpbku7XyektIzPX08a5SJRQYMvzKgETfgUco+4lO0PdqaTCiwhmSOGIeQ2GkppHb4bG1cwIGlzKU4dQjwcXJJ+YXu+Cx0QZMgqBt9tpviRszizuXPFpVlPVzW6ON12h6/yueIAWdMrcEu++IAaCoXYsVcIH5SE/3QpZ6M33/nxgUwPHuKd3pDAMFQUVKHql09t+Dk9Vn8yv+y1YC1py0BAyDKKLurfDZjNp2y56du98m6+65HIZjF2MweN0hT+p/qGUXr5MzNK0ntQHOiSo7v16aGcr8mSxhaBCI0ymnxiYVa9yl951ijNVC2ty6mSDo+e9YduFdyoujoXG3cL46gVmJKgmeLrP6UxKQq+hTjpiP0wQZEhWIc8CFU9auo2QFR2iCyCGB2Lvn1AVKsucCk+KpwxLNBplUVb4vgi6354pj5smDCE0BcNSPU8rnA8AOdfdbxqhk3bby5DPn7TFQT6AVcx/v2bSm05NPgR095K+uvzKmaR/eDZ8vS/xPBSImdncjDFVA65phGDA2tebqzcLZVWUv7/7tqcExZdtNSf7iLIp+ANqnzLZu4gzRmVnCjHRdrWba4OI/8BU+m4GkN0ZeppyTTIq30glA= X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1150;20:5N7jEWFBq4ooz6Fzi9NhYcGA7gcbXujnuR885Laq2IFZDwYp/zUoc00CNYeWWdQ3sls8VtiMvjKD3fbXl+VLqSN2jVZzR8oURVy4MTb0z+6xLXJSE3nRsEgMBAxZvPG6o9DrjjXESDfabcWD20ZeXGoNfkLJF3RJQtOQTj7OdeGimxhlnSm6I7sc/kz1NOEHOMjFvri3xezM4gAUBCGi2oo+4fMX0jBxTSbKXyXwwbqizg4GmQU/JbGdEx0j4o7Z X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2017 14:57:54.2321 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1150 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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)