From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754875AbbFKOm3 (ORCPT ); Thu, 11 Jun 2015 10:42:29 -0400 Received: from mail-bn1bn0106.outbound.protection.outlook.com ([157.56.110.106]:6158 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932188AbbFKOmU (ORCPT ); Thu, 11 Jun 2015 10:42:20 -0400 Authentication-Results: spf=none (sender IP is 165.204.84.221) smtp.mailfrom=amd.com; amacapital.net; dkim=none (message not signed) header.d=none; X-WSS-ID: 0NPSBIB-07-ZK9-02 X-M-MSG: From: Huang Rui To: Borislav Petkov , Andy Lutomirski , Thomas Gleixner , Peter Zijlstra , Ingo Molnar , "Rafael J. Wysocki" , "Len Brown" , John Stultz , =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Weisbecker?= CC: , , Fengguang Wu , Aaron Lu , Suravee Suthikulanit , Tony Li , Huang Rui Subject: [PATCH v4 1/2] x86, mwaitt: add monitorx and mwaitx instruction Date: Thu, 11 Jun 2015 22:41:01 +0800 Message-ID: <1434033662-2291-2-git-send-email-ray.huang@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1434033662-2291-1-git-send-email-ray.huang@amd.com> References: <1434033662-2291-1-git-send-email-ray.huang@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BN1BFFO11FD043;1:u0ckqB7S4mJCFdoVh5k26sDeG0WiIKyQTssrBurxd8GHn7UYa/CNp27tbNQsvOkEqg9GLHNR9meOrmKxu99izEL1/2UT8NMZ17scmvNdmRKiCyS/v0ENmiJ+3cKiHd9+yzjScPP1d/kR0GkvBeysCMDo5sSgqeB9HTsweBjC32OjvPZFQII/SVrYH5SmYIR1DiouEWSsoX176xdh3jt6/g+f0sXfB7AS97rqvDOyTMp8Dqvs10k9/f1mvMUzphNUuGZ0ENxo+IqozNT5jsnS8svduU7K24UcaRINofJbIAzX78Hp58UagllX1+AHdESZ0Ove8IinE+9/y07USbmYMIJVwcHuRffaXbdHpYBNS8A= X-Forefront-Antispam-Report: CIP:165.204.84.221;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(979002)(6009001)(428002)(189002)(199003)(48376002)(68736005)(47776003)(33646002)(87936001)(229853001)(2950100001)(189998001)(77096005)(101416001)(106466001)(76176999)(50986999)(36756003)(105586002)(86362001)(50466002)(19580405001)(19580395003)(53416004)(50226001)(5001770100001)(97736004)(92566002)(46102003)(5003600100002)(77156002)(575784001)(62966003)(969003)(989001)(999001)(1009001)(1019001);DIR:OUT;SFP:1102;SCL:1;SRVR:BY2PR02MB076;H:atltwp01.amd.com;FPR:;SPF:None;MLV:ovrnspm;MX:1;A:1;PTR:InfoDomainNonexistent;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2PR02MB076;2:BG4cSCDNZJneT7H5cvioKNrqXFYmaLsaH+8ENeDnAKkgjCoCEzkQFLmJtIcGfOG4;2:NJMUvsBeeBeR8sA+kLw+BdaS2mYcMX8qMsw5OEiOyPejiN0gPVlWSby5yqmW6srqkes2f/3cumUXhLhEXZl3Og0Sy9YtM60M+OL04B32Wb2TSC2KN95mflJPPgOQVyas20XLxdpxMItROSkaVRTnipzr+4W3RPp8FwSDYiY/umooaYDzS6tbPGbWEupHQjv3aGgmdWSS+akXBXw6KUN/bnVf9vTj5cLvNu46QI0zN2YORse3xo+T+dxhOgU0Arv5;6:UVY4K7vL/YCVfGLkIJxcF2jD7Hp4ts6mgobPTvsL9KXaYGeDHgz8L1+pV+w4+Sst+ki05Dak7nJ4saRKrn6gMvvssbA7FhLqKnRMGHhNQFHGIxdIFFwoKA4+XGermO5A/OQBCPO24LWcYYA42YrS17LdW2LuUsnrs6kdU04cunfNq1lWN7442AHA7R/QmgoyI3rkGYZbqjX2bYyXwedlmKwXJle9BZ/VmI54YUzcxaYgzau/fOiggJIPKA6DoiyrIj0WD4sWfmlf0dCGBGEG9wrrMqmGnszhGSDBFj0JJl1l0riZO7PpnWEKNWgOHRjsfvvI9qcxh0mY/UlxFgiY3IORlPgM0XkrK5b4wyyOKQekeeDNUa+ao0Lmw0PsPk5dktlMH63/RRRF7sHMOBogdjK9/paGlvza7Ce48BxkMs2zAEPBnAE8oOvyJP/SuySaVROdl+pRR9mN1eU7UKza1rJKSaLTlidjV5AaZclbd3WvguzKMKgiucEBpUvrQINo X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR02MB076; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(520003)(5005006)(3002001);SRVR:BY2PR02MB076;BCL:0;PCL:0;RULEID:;SRVR:BY2PR02MB076; X-Microsoft-Exchange-Diagnostics: 1;BY2PR02MB076;3:ggSeb6axQi/Sm5yc3gWAREcB3YM7xky6kYZS+4B3mYm0v78ePT5VkKnDzQN/gVY1LpdaDNTSUhmmIjG8h9If35hmhFvSC8WbxZSlRnQKXF0GwRAHaey0T7MiNrKApG6Y9oEJeNMIhOO/WKvk+sHZPwkye89AVCaT8xWPs7uMYrUmbf1zn01doSWP54D5pMMMFed06hOXgX/qkKMy2jX46GVZm3Vi6WgVl9rgqAiQErKULLiqisJlLSDrh3R6O07l9etIDa3g7DyMhGGbe0eAfssb+oAa9dPdLzF01E1B6qzBQMOd5Q1Yg66LljIBgEbH X-Forefront-PRVS: 0604AFA86B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY2PR02MB076;9:v/t7ejEnc1kXRAu0ZzYOrNkKY8gVA9rw/Kn17Nede77?= =?us-ascii?Q?qtRLqmsgZnUe2zsaifc1RUHUWoWY7lGcyWnGpTsKX88gOHF8U4t1aB/BRV9p?= =?us-ascii?Q?tmrLfp7KkbnmDlMn6mxZx/0WElD13OaiXWaSznEkt+s5owUbRB4wTIGdO85a?= =?us-ascii?Q?nUdV5mB4q8OquhldtiMIvU909VLgdgw3MGv2s7wiC85JGcGvSed4/UeOvvA7?= =?us-ascii?Q?V+vUjjQk3PoiLRXo/uh5mnJEAgIlYeNk0aTNIRTYuxj0KAbX+8o4ava0rclE?= =?us-ascii?Q?to2zDsJQmClM5yq/vIwHJOoc6cQYygqXUre7mV9+9Mxgedaq8rap8SYpW+o9?= =?us-ascii?Q?ugRY/EG47mAZtYgV/GWsUINpL0zjHwaL/ocyCXllM6lti/S1ZeFYLoRShor/?= =?us-ascii?Q?jrGzzjP+lzvrJUKF0jDpIR8bHOCu7SDIevLp9FaudFlhtEdI07sea0ZdASxp?= =?us-ascii?Q?vFcYCqR5sAnAzxKmSumqPMwLezaW2ceF2atEX99vGvpbmDp/r19AtmeSf/9Y?= =?us-ascii?Q?IFmVBo0jvE0/jFLISTaIuo0vVTCl+leFNvtwCw/0zBeTd+bCVznkgx1UFSP9?= =?us-ascii?Q?rQOtm7Btsb47MZY7Gsvl4nUWMYTHfutCFRd4FL55LJukrsT11j+jkuoi44BU?= =?us-ascii?Q?A7Gq6I77XpZENgWzu1gATDBb1RUrL4bPSvLR+tvkqSUeRfaG40CDJNS3bPcM?= =?us-ascii?Q?JNJwOkW/4QkFqIPHeLljPoENl/C4uuNPM/GegzMOt8Pyh/+Qs7WM5I7XWxOE?= =?us-ascii?Q?+zsP3Fr163XGz7lmOktNfJAok/b3mKOdiakxSeymKl9j2AUYHXr66Ewz785b?= =?us-ascii?Q?axQ8p+BoJ/mbC+t8zsbNiLa1CvH1J1yPqgQCx5onp3q4kLWIWlnX5DDBN/gE?= =?us-ascii?Q?j9ocJLeCOym+oGrWsF4aLOlUSbFsPQWLObQGi3zYlDXfY0nF1EldflFoJQ2+?= =?us-ascii?Q?3u/hn3YgGqS9AftPzhVh0CYf0PFrytgSsKlEYKtZdzaMKuUkd5ALjsv9zi50?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1;BY2PR02MB076;3:5QC4k7v1T1f76ea0hHZSqeKM6hAWKBHRUw5XtzbsbWAVE+Njh6GEgzmM96ZNz/vEu4qFcXKnGYiMR/Yegy18ZfoI6mP2DmBzdHoCs22pm3qxmwMpn5YF6BxB2fs5BVZOWqdTNQ364rYSWWdlcFk4SA==;10:I+cEfT8H4vpqV8AFipFC4pD+J0Gepn2n2ebyl3RrA6c9BdFQ0aqV6DFtsEQn+X/ewg+jDAaLO2Zi6rN0Vn9BT9dEbhvAX2WGas673n8pLM4=;6:uUkEd7BDcTz4mQ0u19wiP7QP9P8GKRzQn97FvfvQAuGgGTiK3dNls6zr2v4BfhAQ X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2015 14:42:13.1581 (UTC) X-MS-Exchange-CrossTenant-Id: fde4dada-be84-483f-92cc-e026cbee8e96 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fde4dada-be84-483f-92cc-e026cbee8e96;Ip=[165.204.84.221];Helo=[atltwp01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR02MB076 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On AMD Carrizo processors (Family 15h, Model 60h-6fh), there is a new feature called MWAITT (Mwait with a timer) as an extension of Monitor/Mwait. MWAITT, another name is MWAITX (MWAIT with extensions), has a configurable timer that causes MWAITX to exit on expiration. Compared with MONITOR/MWAIT, there are minor differences in opcode and input parameters. MWAITX ECX[1]: enable timer if set MWAITX EBX[31:0]: max wait time expressed in SW P0 clocks MWAIT MWAITX opcode 0f 01 c9 | 0f 01 fb ECX[0] value of RFLAGS.IF seen by instruction ECX[1] unused/#GP if set | enable timer if set ECX[31:2] unused/#GP if set EAX unused (reserve for hint) EBX[31:0] unused | max wait time (loops) MONITOR MONITORX opcode 0f 01 c8 | 0f 01 fa EAX (logical) address to monitor ECX #GP if not zero The software P0 frequency is the same as the TSC frequency. Max timeout = EBX/(TSC frequency) Signed-off-by: Huang Rui --- arch/x86/include/asm/cpufeature.h | 1 + arch/x86/include/asm/mwait.h | 40 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h index 3d6606f..3ef1f6e 100644 --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h @@ -176,6 +176,7 @@ #define X86_FEATURE_PERFCTR_NB ( 6*32+24) /* NB performance counter extensions */ #define X86_FEATURE_BPEXT (6*32+26) /* data breakpoint extension */ #define X86_FEATURE_PERFCTR_L2 ( 6*32+28) /* L2 performance counter extensions */ +#define X86_FEATURE_MWAITT ( 6*32+29) /* Mwait extension (MonitorX/MwaitX) */ /* * Auxiliary flags: Linux defined - For features scattered in various diff --git a/arch/x86/include/asm/mwait.h b/arch/x86/include/asm/mwait.h index 653dfa7..1fbc89d 100644 --- a/arch/x86/include/asm/mwait.h +++ b/arch/x86/include/asm/mwait.h @@ -23,6 +23,14 @@ static inline void __monitor(const void *eax, unsigned long ecx, :: "a" (eax), "c" (ecx), "d"(edx)); } +static inline void __monitorx(const void *eax, unsigned long ecx, + unsigned long edx) +{ + /* "monitorx %eax, %ecx, %edx;" */ + asm volatile(".byte 0x0f, 0x01, 0xfa;" + :: "a" (eax), "c" (ecx), "d"(edx)); +} + static inline void __mwait(unsigned long eax, unsigned long ecx) { /* "mwait %eax, %ecx;" */ @@ -30,6 +38,38 @@ static inline void __mwait(unsigned long eax, unsigned long ecx) :: "a" (eax), "c" (ecx)); } +/* + * MWAITT allows for both a timer value to get you out of the MWAIT as + * well as the normal exit conditions. + * + * MWAITX ECX[1]: enable timer if set + * MWAITX EBX[31:0]: max wait time expressed in SW P0 clocks + * + * Below is the compared data between MWAIT and MWAITX on AMD + * processors: + * MWAIT MWAITX + * opcode 0f 01 c9 | 0f 01 fb + * ECX[0] value of RFLAGS.IF seen by instruction + * ECX[1] unused/#GP if set | enable timer if set + * ECX[31:2] unused/#GP if set + * EAX unused (reserve for hint) + * EBX[31:0] unused | max wait time (loops) + * + * MONITOR MONITORX + * opcode 0f 01 c8 | 0f 01 fa + * EAX (logical) address to monitor + * ECX #GP if not zero + * + * The software P0 frequency is the same as the TSC frequency. + */ +static inline void __mwaitx(unsigned long eax, unsigned long ebx, + unsigned long ecx) +{ + /* "mwaitx %eax, %ebx, %ecx;" */ + asm volatile(".byte 0x0f, 0x01, 0xfb;" + :: "a" (eax), "b" (ebx), "c" (ecx)); +} + static inline void __sti_mwait(unsigned long eax, unsigned long ecx) { trace_hardirqs_on(); -- 1.9.1