From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x227tKBHEhWZdAlPnudZKLw3zJnX4mM1FbcPUde0m9TLZ8biAsyFiVwjx0LmDLmQPHXU9k2Kq ARC-Seal: i=1; a=rsa-sha256; t=1517000787; cv=none; d=google.com; s=arc-20160816; b=pEyHFPibiDuG1V37WzBjE8/f3wbSeKe5EEvBMr17jI3MO9Lrk6Fp5hFCbuExiVyQji 16wD7+/FL9+NgbageAgVMUZFgSEfY5j3OlYLkrXcJJgwVPg/J8RAxcKt3fcrWjVwyiII DHfYOnqNdRn2hQUhRt1j/BbVB+GAnpuBRVdrqMv0lgo56vAfTUzqHr3cV0H9k8aSu+Ub 3yidFWc8GRMCYXG8dGs40zcuZH1GysbTGaxeJ/nASdLE2FESuEyk08Ij4ClmMSrI/hKS 2/P7cx3NYx1HsM3A/bUdZQJaU0u3ELLT1aOPeYhVQQJNB0nv2ZtZCFgUFjy904+sa8Hu GoRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=spamdiagnosticmetadata:spamdiagnosticoutput :content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject :dkim-signature:arc-authentication-results; bh=217e4e8+XU3N3c6EtWjU3B8gxNp1S1OH7ymGTQF55ac=; b=gUgb22cbx/u8iJldY05POPoUhM1cadn6gzXIHpKS84E5v/bYJcQ4Zqm/dIUbaMTG5a hN465xhh2nz2DGqTpWp46ApAF+C91pAlMbhsud/0aSfn9aCPsz0vN9AmQXQFN/DJs07C e2Xlg0YaAv4Nb5Dq3tgXwP/s5/X7RW1jzEVrIz1er2yO9EElnESWCkLtthKyaTAwwb3J veBCjMkHWSLd8hSD8DiWqZ8cJiJwglHFn3QlFBxi1GA7PjIkWxgQpNJ9X7wSwfqt5gEa JI14vH1CmgTCO5lPW0GmodBFhmT3JDFqvtY5DtZsGmQdawyScYWlGeZa0ZUyldwfaLdB 8Zww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector1-amd-com header.b=MiUIT1sG; spf=neutral (google.com: 104.47.32.49 is neither permitted nor denied by best guess record for domain of thomas.lendacky@amd.com) smtp.mailfrom=Thomas.Lendacky@amd.com Authentication-Results: mx.google.com; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector1-amd-com header.b=MiUIT1sG; spf=neutral (google.com: 104.47.32.49 is neither permitted nor denied by best guess record for domain of thomas.lendacky@amd.com) smtp.mailfrom=Thomas.Lendacky@amd.com Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Thomas.Lendacky@amd.com; Subject: Re: [PATCH] x86/cpufeatures: Cleanup AMD speculation feature bits To: Borislav Petkov , David Woodhouse Cc: x86-ml , linux-tip-commits@vger.kernel.org, hpa@zytor.com, gregkh@linuxfoundation.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org References: <1516896855-7642-4-git-send-email-dwmw@amazon.co.uk> <20180126184139.rcfbtk7dvj7kmyfn@pd.tnic> <1516992318.30244.271.camel@infradead.org> <20180126184915.ioqewp56orj2qhrt@pd.tnic> From: Tom Lendacky Message-ID: <7094ed9b-40f7-ba2b-55a6-cc5ab0b06bb9@amd.com> Date: Fri, 26 Jan 2018 15:06:20 -0600 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 MIME-Version: 1.0 In-Reply-To: <20180126184915.ioqewp56orj2qhrt@pd.tnic> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: DM5PR21CA0031.namprd21.prod.outlook.com (10.172.92.145) To CY4PR12MB1143.namprd12.prod.outlook.com (10.168.164.135) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 59ca61b5-be9d-4442-bf20-08d56500a8e7 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020);SRVR:CY4PR12MB1143; X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1143;3:YAizwmClZidUSV++hHDQZNjchdx1QHGvvyWgTtfrrXf2ycwKJ6LXaQTFJFDRsW76Gi09uJlkKzPUTytVoAiBcpuW+HXcW02iuK44c1DBxUnIDcyaY4R/OP0QKAnWuBJEJ1E0Z+xvApjfZw4x/UPFM1Gmnge78XvvnmO8RY7GsXjyqk7Y/3EOBuqPTSaguIXr5jFmkacdXsi5BasaYwESnMZEPbTeyFYNX63a0Miw6fU00icQr6/vYHlGa8gRpyit;25:F6AKcaGCHiC0UP+Ctt+GUwRqo0YPHoZTLyhwO5++IKfuSB3eV5QpTbde1aZZUvXR3pjguo7X//7tX+FDTivrVGHI+TPKt9pUwYGWI96y7o1VCAKDWYGnmP8oHf6UbaXN0lhgf4mJ8lUSdzG9G+dqPNJN+zvn/ckK4ZI2rbQWUHM5bsbJmhB0oiQ+LkCx4OKAnT6kZaNhwLjv0MrOKIjbAbsrIw9lP24aRKO2T6fQpXGsMiaPiJU4bFSYtgIGpmJS0xajRi4yxC5UrYAQuIIqlVTO4Nvydsf4GpeQyDjtuRxZ/lknzh+EuveTeUKY5MTfFStqSbbDtOzAxtZDv+uX3Q==;31:fu87eqZphl/db9RY0aVzcFXbZqtAhHcjGhHIXFl9f6vFQ33r2/iGPsYi1PWT43eHSQJthlXf6IOmQGZPCrYmXL2cBHR+BX4TRlCnZm6MmKV0yCgyZmw+idI4DT8vR/f9W5fwhlKvXJp1q+z+zuovSGQ+bFP1ImulpSqzSfwwR1hj3JqV9amrLd3J0n2Z6TzXf5e9JIdTGVb9fd2CzD7fP7lDjiGwAKUdrhzHt7/e3J4= X-MS-TrafficTypeDiagnostic: CY4PR12MB1143: X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1143;20:1S4kl3oa26pBeNJOqb0bo3nogHK8LCWCIjrCyVL0+pJhnf+0g98h3pVkwWn3FlqCfIvmnlYALPgHDa/cTiV3XqZFyZHLkKMQC7ibMVZAiy3fi8Vy7AKyQASvK8lZDT0/nm+ZQwaIw8yfLme++TsVTXByqh8GKprDJMSlxfWxADwJDPQyJjWQ2Rj0dgu7oo8fot8QRyg5ub/ZZmuIYKdJdPRPtnLoUIJ5CZuyu7TcvOpheiU1ANFbV8p2urQD0+bxy0kDIWdG+frHHLVz/YdS3DXFfTYUckYMXyM3OXVV9vC/Oan9UO6BCfP9D02lAOPp3mtmOskryoc6xF7L7M1SiEWvYtkTg3NlLHIX+4ixyC7ZEsB8HYeuLrDAI+bCX0+aFBnIfDgi8BlQVZrmjSMptXg3JHXOF5Opu8VyhHXt22FJEtG+oamXj/IQgHVSpm3n8xVNIYmRM8cs3GCskxbPc3gnnWQesnnRP1uLtLzHm5S4eobZBq8n5m3zSYl6V6g7;4:jhaDQOhjDMt2WFW3SJfvMn5X2v95Jix4nU/dw4NhzdaR/7YRJJSK4o40MuPm5uqWAcRc948AScoXeN14UQ+RozdxCeJX897raCDguNxTPEnoooFLTiQUzgYgPN2DA9/LANEIyeBtZnrz0M5tu8Kl4ubn4VpFZ3M9gBjc489olOheJNru8uSKC8AMn4ttTJZc+5neGFGn593kI7JCQNSjrDBzuLpKhnz8DB1D2Wi0BDCsqwOV1ZQ055c/9bQSatzwbhb0Y9IyjInBje7hMzM6Lw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040501)(2401047)(5005006)(8121501046)(3231023)(2400081)(944501161)(3002001)(10201501046)(93006095)(93001095)(6055026)(6041288)(20161123562045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011);SRVR:CY4PR12MB1143;BCL:0;PCL:0;RULEID:;SRVR:CY4PR12MB1143; X-Forefront-PRVS: 05641FD966 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6049001)(366004)(376002)(39860400002)(39380400002)(346002)(396003)(199004)(189003)(377424004)(50466002)(3846002)(64126003)(7736002)(6116002)(90366009)(6486002)(53936002)(229853002)(305945005)(26005)(77096007)(2870700001)(97736004)(16526019)(86362001)(186003)(2906002)(8936002)(25786009)(3260700006)(65826007)(58126008)(31696002)(316002)(478600001)(93886005)(105586002)(6666003)(4326008)(2950100002)(65956001)(110136005)(16576012)(8676002)(68736007)(31686004)(81156014)(81166006)(2486003)(23676004)(53546011)(52116002)(36756003)(76176011)(59450400001)(386003)(66066001)(83506002)(52146003)(47776003)(72206003)(65806001)(6246003)(5660300001)(106356001);DIR:OUT;SFP:1101;SCL:1;SRVR:CY4PR12MB1143;H:[10.236.65.116];FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtDWTRQUjEyTUIxMTQzOzIzOjZyOHJVWDFOV096Vk9nQmVxYk11TjlsazRs?= =?utf-8?B?eVFQVGRPY3FFNE5KN0NnMGVOeHhRT21HSXQzNGFORk1oVGU5ZXJyL0loOUZi?= =?utf-8?B?NGRLQUlMY3JvMkpsT1g0TUhIcy9reXFlNVFlbzVlN0VFRTQwZGkrNnE0Y0JX?= =?utf-8?B?TXp2NnJnd0ZZNVM0UEd1a1BOeVczTnBLR0o3MEpBN3dxblBVMU9xM3kzSUlW?= =?utf-8?B?QnVpYnlWUVBmUHpWNURhT0NXZHhzK21XRVozcmVrTWViVUh1RXd6SndianJl?= =?utf-8?B?dG1heVVnRzAyQW1LZ0d5MUkzVUpMVy95YVU0b3dhdHk3Q0FQSlF4SUwwR0VT?= =?utf-8?B?b3VTWCtPR1hkcElQY3ZLa3RHaTBRVHRwVWN6RGhlR05IU25iUVNMZlYwR2Z4?= =?utf-8?B?d3Jzbm43K21DdWo3OWdBK0JBUTczc0x0N3JNS0toMVVPbGV1OXo0UytnMDNv?= =?utf-8?B?QzBuWDRuZFRVcXMyY1VKdEM5RlMzNm5pUFowb3dZNWtHSEMrdEhPSFNmRFJI?= =?utf-8?B?Uis1dXdvdFgzL0FlY2owNGdmc2x3cWVnYTUyK1djMlZ5dUo1V1VxQittMzBj?= =?utf-8?B?cXBPaVVFQU1zNGdxcm9zWkRtMmEvQzZCcHIzSE9DSjBha1JNY05CaWd2QlZx?= =?utf-8?B?UTBHRXJXOHFzY1NzZDRLeVFTZVdTTnhyTGVyL2EzUjBMUm9IZ3lRczdDYW9r?= =?utf-8?B?SExaTy9jdDdBbzBaNllRYmIvc0VXT01GNVAyU0FpZHdsN0tBck5Oemhrd2ht?= =?utf-8?B?YXJLd0ZSR3R4RVVRUTcxMmdxRCtTbTJ2YjlxbkQzVG9IRGFvcWJDTFRWKzJs?= =?utf-8?B?bVJqNit6NmdqZGFhSHZ4ZEttbitQTzdkdmh0d2J1NmxrVXVScVA0bWNMVzlP?= =?utf-8?B?bUEzQjBKM1hYNjBWSkFVejRFUC9KSHJrcDlidXJuVXl1V0FDM0RLemVYdnFP?= =?utf-8?B?a3pnOE1xUnJDQVoyTEQvVlp2U1dJYUpwLzJHelVicnhET0xoSExFSUZmM1Nj?= =?utf-8?B?STFESEw1VUZaZER4VkdFdnBNRE1xTi9IUUJUZmg0WVFBV3M2ZTN3NjcwMFJQ?= =?utf-8?B?NGpZamJlVkF2L1BIVzQrS2RwaXQ5UUNpbXJzcStGVTlseU5kUVh4VmJPbmJZ?= =?utf-8?B?MU5PczBiNjY1czVBeTVBeTlRdy94RmREdlRmM3RNU3d3Nnl6TExkRFdINktl?= =?utf-8?B?aUVpU2VJOGRZOFlCVW5oM21SRW1oWk5vUElsOU0xRXpOTllUR1pkNHFWV2Ru?= =?utf-8?B?QkJUTDFJOEorRWlBMUlOTW1JRUJpR0l6a21kMW45bGtEN3MzVVVwQml3dmx1?= =?utf-8?B?aVI2R1J0Rk5KTXEvOUhTSlY3a3pSaXROSkdsakswbVVNUWtUbWlWV1NtUVgw?= =?utf-8?B?VjZNQUZXQTJWaUxwMDYzenhEcFZuenZyWm9mL1UwemV6citIOVRFWktEaGtF?= =?utf-8?B?MXV2OTFnZ2RLMXI2U2xFOUNTeDk2djEydlZieHBqQ083VTVGdEUrMWltM1Nj?= =?utf-8?B?UGpmZ1dOZ1FUMkZBTHJMUkhBT2xBZzBvSmVnaXZPaTNtZDhjUC9hSFhBZUtT?= =?utf-8?B?a0h6V09NYmZJUWxUd3l4eVNpVzBsTk1ZTHpLOGx4M2FhKzFKN2NLZk9heVI4?= =?utf-8?B?aSs1SktLc3FlUTJPc3RqdHhHOGU1NXMwVlExbG9WanVzSDZZRElRbXNlTlNC?= =?utf-8?B?a1hjZUpoZ3dkcXhiNWpKb0dFb3dlYWhHOGZKODlZdS9HbkFScXBLUk5CZlRE?= =?utf-8?B?cU9jR25DWWdWMzJoejFQV1czR2M1dEVuSGt0aGx0RUY1QnVoNnFOcWdEWUlN?= =?utf-8?B?cGYxWEpkVWt1MWNmemtpRmNxWElhTWdHYjB3QXdoT2VoY1BhaU5aMnl2cUo0?= =?utf-8?B?S2hQcUFZcUlodGxXM294TkNQb0g1cyt1S3RNUjZtODRFZ3lRbC9NbWRwRDhF?= =?utf-8?B?ZmNyUHNOaEwxTVhoUTl5QkFoRTJnVjJ3WmY3b2Y5T1dua2dxRzVIbVdIM0Va?= =?utf-8?B?SE9QMktmMk1icmluMDQ5NlFzM1J4RllwMk5QbWVjV1c5bW1ZSERZc0ViOHZJ?= =?utf-8?Q?iOu4=3D?= X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1143;6:9re4D8HSCqVEEf9C8V13n+QQvIvcQKt6ZslkbyCz5SdgkqCnvDAm+lAgNOerRJjNdxiX4+t4z+jz27Qs1Et0681PITsNzPU6muL4jJ5s0bgiJT/AdtKWlOfgkZYWTCks7gyUtCtfnsUsAhKEExWDAt3xW4XY5S199Gq1CAT+ZDf4VojDHiVxAcTLwJBn6tamZ4qF0owc7i47wuqEsaqb5bYZUHZh/H1B4ut0vNonxct/QE893/HH/xsfc87ulavKT5fUeJ4pA1MxUBFGIZWyv1rhMC6b1p/mHfShIW6bnW26IpXnOojQ3UpjOtQqtvy6FCnLzpcEGjPaKz6Irn9KV80q7cQKcjvTUtJgk2SvrZI=;5:vnG4MbCmKEbRf622yVodExZHQTGj83bSUzFvV71SYMLrOgZXMb0WNUuI1Er13IZMYI4938NsJ7qf5bADXmLZb7yF4QH51QWa220MLK5+cgDgV9AkYgx8PDarX5aPUmzvsJvg5K+Wfj3AsOuq6pPJHSY/kZZ5plfiU/Ek5za/Al0=;24:bVA+MhDfWa+xFHXxuvW8RE7VQKaGGYJZVOErC4zxpuDR/QNET0AAt+CZ8FIOQvHPGpIhk0qe4JdVWlakq2ievfAIfrEN3i0Km+GoBR16VS0=;7:WuRi7OgTjlwzi6iCRwFIR9qFRgyzRwJuhAWtMZqFHTRHcouGmfjVjpiOSqiwhvo4OByC1miBc1snEAaqNSXenkcXgBCwdMxgQsy2E8oFUBskuI77h88pNUqA5p9+mYJZA9YUgArXnQ5FM3xY/MpH6Q9UDoxOQ72VZc9hZ68133eLECO1St/Ww/ZiFyv5W0CRJFk9B6CvnpVREBTtib54o4KSSXaLtiV8LZA4ZyybxBbjkJen63CWu8yNisIoAqE4 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1143;20:YhTpztmh13iqoKfgYw2zgqG29kPCMnLmEDpOVaP8dP87+T5hlgacKqXwphgAg5G/GgkxM6MkVoAjCk1KMnRsDvyCvnFU626WB2Szd1xbR3DPEdFwi6j4FUbdAHRUwOGzUM5uw9Rm1y3lsOMN0g0sJBPrdem4k2/5CfxMay3mIQZbAKXa7DBxmWcuLBuKXfXozRoYp2CAHr/Ig/fQQhuBH7buAfonPz+sbslOMDjD8jV6gVJ8x2UhlgjeX4TT0C+t X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2018 21:06:24.5020 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 59ca61b5-be9d-4442-bf20-08d56500a8e7 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1143 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1590681520403481900?= X-GMAIL-MSGID: =?utf-8?q?1590690617595532926?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: On 1/26/2018 12:49 PM, Borislav Petkov wrote: > On Fri, Jan 26, 2018 at 06:45:18PM +0000, David Woodhouse wrote: >> On Fri, 2018-01-26 at 19:41 +0100, Borislav Petkov wrote: >>> +#define X86_FEATURE_AMD_IBPB           (13*32+12) /* "" Indirect Branch Prediction Barrier MSR */ >> >> Stray quotes. > > No no, those quotes are magical. :) > > They don't show the string in /proc/cpuinfo, see arch/x86/kernel/cpu/mkcapflags.sh > >>> +#define X86_FEATURE_IBRS               (13*32+14) /* Indirect Branch Restricted Speculation */ >> >> Please don't call it that. Call it X86_FEATURE_AMD_IBRS and leave >> X86_FEATURE_IBRS to parallel X86_FEATURE_IBPB as the *software* bit >> which is vendor-independent. > > Do we have a X86_FEATURE_IBRS bit? > > If so, then this bit should become > > #define X86_FEATURE_AMD_IBRS (13*32+14) /* "" Speculation Control MSR only (AMD) */ > > *with* the magic quotes. So I like the idea of AMD_IBRS/AMD_IBPB/AMD_STIBP and then use the magic quotes as appropriate. We could probably use the magic quotes on AMD_STIBP and set X86_FEATURE_STIBP when we see X86_FEATURE_AMD_STIBP. Just my two cents. Thanks, Tom >