From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1035728AbdEXUmR (ORCPT ); Wed, 24 May 2017 16:42:17 -0400 Received: from mail-bl2nam02on0085.outbound.protection.outlook.com ([104.47.38.85]:3520 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1032964AbdEXUmL (ORCPT ); Wed, 24 May 2017 16:42:11 -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: Yazen Ghannam To: CC: Borislav Petkov , Tony Luck , , , Yazen Ghannam Subject: [PATCH 3/3] x86/mce/AMD: Use saved threshold block info in interrupt handler Date: Wed, 24 May 2017 15:41:47 -0500 Message-ID: <1495658507-7413-3-git-send-email-Yazen.Ghannam@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1495658507-7413-1-git-send-email-Yazen.Ghannam@amd.com> References: <1495658507-7413-1-git-send-email-Yazen.Ghannam@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: DM5PR20CA0046.namprd20.prod.outlook.com (10.171.161.160) To CY4PR1201MB0133.namprd12.prod.outlook.com (10.172.78.15) X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PR1201MB0133: X-MS-Office365-Filtering-Correlation-Id: 29f3b1a3-5f6e-4f13-8987-08d4a2e5590f X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(48565401081)(201703131423075)(201703031133081);SRVR:CY4PR1201MB0133; X-Microsoft-Exchange-Diagnostics: 1;CY4PR1201MB0133;3:ffKrU7CWnMBzVb1UfBko0u/d0nSaXI1UX7yUYc4b3lSLACEgbnTr+++U+9qXnxr20TW92/+bv0AE89Qy/KwsJpBR/HunoMECD6S68AhbEnevfRDZpkfmvAliYlD6UmqmFCJKgkvY7F7jIIns38kdKyetkVWOeAEfaF43l0W/T6AlvB3eAxYtgKwi8a1JQ3Z0yzGfGCIWByY/z6C43FU6hd8PDB8LkVtNGTcFYpysbFDl2SkvWmCUDP963K3dxSZuMVvmvLCvxcHeJEM0aueXnm56JtBQXbVquEaPcYpypP1ni5iw0TZshdQ/zSMVxmknr7FhMULxJVpTWrocDxuD1MzK5l0h+4sFu1cPDCKnM/U=;25:02eyJi19Z0k4XbzYZ7Sn3nOiCjHzdGD6226dcsTyUsjGszjsaaS5i4VEV3ej2A+xjNs5BhoGVhEbzTqsmfIx86Dkr7Lk7FKu21BcRW0utnMY96VC4rvUGJcIv4ipgjrFyDz9wPA1HEZtAhTqFabGAwGx7HFrQRatr6XcQo2sZDoccnINP/6T3xowJvaVy9XBhkARqBuTGKcnlYVZ0iq7yM6dqpmnF1S9zvah75QTKDZJs94+ojPYYoIKrMW5sr63zPGoD5ybYnAHhSxsFNSqpG5Fk5cX/YpZbySnDihnbN6hl52z3ONCv570wCMa1z7U0q7bzfZkwBu+k5HL4qIDEZId79w6R1gWuMBLjEH//K9j8rgr4tjAuDmr9LV2lwe3xg5f4I8EyQxoYMwQrvGXjM9/NeqH5ZF8IcV2kbVt5QMHsahpCobKtQxWympnjT7DebJ6RWTqmdd53KUp6JWs3IBwahoDH58GPW6sRKRft5s= X-Microsoft-Exchange-Diagnostics: 1;CY4PR1201MB0133;31:gLAfgqVKVixovfFxv24GBUyIX/U1mtX4sRqaO2o3s6sVBLgdA+xgnrUtbrd8z+Ep0ZCmwoU87wLyzN9pV6TmaiWMW+A24O/f/si+JGt/JdIp4pLjlaY3JPxTSlcXNBFxarqPdJzviiJmbsKG6xsa7CrZv4EP5XPntyUYgC3H6kqUO1gzLOpzzmcOMkSpjGXkH7Tf+Tt0kFtmFQBsb2Z6kTZRL5sg4cjZYSy/sYoAgoI=;20:7RK2fVNKNPzSaTUH1w4KduYx/eL1KCsUbD5XYl+uI1S50uEK7WW0zO1Nasjec0bb6/SKYWp1LNOzGMXE06F+ghjHWu6PiBvDGeRNZgGThEC+eqF+gTlNfDNhAKXM5RoyHxcBGv4SwzyyYWWRp6wXgP91HNsPFMwDwxxP2VfQUmVHYdtDX6cdVHtquyEsiDID+5AIqborb5FD3lCBFmeiHqmM3dJSpWbiU39qKXucHQf2UWffSkoqMpaJFcm5e0GsbBsSqQnhUCr/Jn0C5Fx7arQKqrj4dVC3OjInH19kf4wkmmoxRNiRf7s+acw7kKp6lJsV5NBKzizp/iFXiKaIfMOzE0iNM7qIvPir6FrvSBGpGJlG23Q3f+vXLXzcPbWt1RgpaffJg1k0FAC3JqHUW7RV1a6Z9zLbLY4oAhFFy4hmZ7XJzDv+FCLXuYwLBXqvcxQwwF1H9UYSQoaWFC7hgtnqGsdgju5Y9NPU2JvNAmeK0nXtK4tsQYCYlqu5ixD0 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(6055026)(6041248)(20161123564025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123560025)(20161123562025)(6072148);SRVR:CY4PR1201MB0133;BCL:0;PCL:0;RULEID:;SRVR:CY4PR1201MB0133; X-Microsoft-Exchange-Diagnostics: 1;CY4PR1201MB0133;4:Fq8HcHrH3LDr6Zp31pDK3LVRXXxIqVADNjNgko6w72b2Z/P0V0LFJp66s+tuw7Ln4D4JNvb6mNTHSpV3GM21UXOOQsU6kVtt5ZsLqub63Q/6aEqon6TiUf3ZJPzlQQ55OFhnkINy5UL162mMB5PsEvyRZyY1gt/ZOMRfucOofr0NkxwGUq+LE5hHsPyyew2CuIReogkatfm62cxbBsq07FIDkOM5MxR+7S5nbfiPMRnpIGcmYky/N/++h9g8v0Ytw/C7QmMgcbLL9aAnMcVNXXaPQHrvXoXzwteOrjzU9MTTpNTWwValcit3QPZ7FGBW8EPHc080sI4AUipqpIpVvKHoPBmYKuSFuYOzP575skLfJg7hK+PJCd7VQ3KKuGEBzKVy4eiFsSmhA2GSLry7r3sZQNKwmCBEXc1pHpE6l1p+tOgUsdlKqCU9lLZpoKmaWFGEPyelDwbHnG5aer9nsHcM13ezBOzyiwMAMzzFBxIa7EaB/naa2QIeu/BTIMgsyNg9dzEnMNaemntUFN9XzAFYx60R4tIrfCvQUdBDdPvb8rRQy6LcmG0An4HgEJfbxjj4R+mg4eOzOz6TdIri183+X1S5ZmtjSrZIVUOGCFBO+5OTFPaaG0CIN0fVgK9wzcqyXnAT3ilnSq6JcVk+yTGDSsW5P6Z4jIHuViSSq5sQvugcC7/tyadxsbiYqPjB4NShH3EOKTH3LLJC6eOdUeOlgY6guueXk+Zi2FWB7h9AsHKXqT3gYaMf4c8DkiJ9uUa/8ydyk0s582SN+TpBCS7AjXtpfbpWNvu/Aq2+hkKA10t/SJXz2pPgn2Ywn86TX41Rl60rAjqgWWpylpBeNBtXX955JYWz5WpX/AusOEs= X-Forefront-PRVS: 031763BCAF X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(39850400002)(39400400002)(39410400002)(39860400002)(39840400002)(39450400003)(42186005)(72206003)(6116002)(53416004)(54906002)(2950100002)(3846002)(50986999)(76176999)(6916009)(305945005)(2351001)(86362001)(7736002)(6486002)(5003940100001)(53936002)(25786009)(110136004)(38730400002)(47776003)(2906002)(50226002)(8676002)(81166006)(478600001)(66066001)(189998001)(4326008)(50466002)(5660300001)(36756003)(6666003);DIR:OUT;SFP:1101;SCL:1;SRVR:CY4PR1201MB0133;H:yaz-diesel.amd.com;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY4PR1201MB0133;23:PwSAITOmYRwrx6IxO14/leI03Z4sQxwMYaOVy9U?= =?us-ascii?Q?q5UMSpc98g5vQd5/BquoJ+Ep3POEFTililguBpNBzHU5nYMOwIgzqXvejk9U?= =?us-ascii?Q?m0M0KrwpgdN+82vg8xrarwLM3N4u6vurG+g3AqYj8fFVE0JlQ6jN41/Gy2Tx?= =?us-ascii?Q?Rb4V6kqtIYUSDx4hJBWQZ5TJTBXHlvry7NGV4iHbF9yCuISgxy3gxpqSdlUf?= =?us-ascii?Q?BOQs0+e9fMKQPFimmAqNC5XX1AHMACdUv5Q5IwbKriGUfu5kqXY84EzDYaxG?= =?us-ascii?Q?8Ge0pakX1ASUze9uy/oX0xwaWj8oaoBm1++biYoHyhQXNB9m7PWOC9gmOtQd?= =?us-ascii?Q?v3lajruTeMnrKepAMrJiyc7QonT0yuU3/bupR8rqIuK/kwwkfkvY2q7McNMa?= =?us-ascii?Q?7xR7h35S+8EZpELQy+Rcs2OfJXFFWxo/teSVEMU0qDHiLXGkZHNAK+bmT9f9?= =?us-ascii?Q?OlGx6cQdX0i7oFYcjc9lMCT/BVUABam4Kazs8xiDofYAZjreSIbvZChS10zN?= =?us-ascii?Q?DraqcbfhHkJyiKTAhKjru8fm/zgqLGOTfWiP1aZDAiqNe1BCVMzWvkuEpfRJ?= =?us-ascii?Q?YncXkd20hEA15TgirHAdpgHW4DxSiJmvOFzEDRIzk+LheGe3IOS89b3qO2ae?= =?us-ascii?Q?rdY82U89U7FmA+wlawp9Ic/UUTbozVhK88Dk9gTIGR6UXLsk9tbAqINPqRLd?= =?us-ascii?Q?eWRp04LdnYCzb0qwXIyyYGCWu+IBgvsQWb5euQ5S1krrlrgPA13nwAzLEJWt?= =?us-ascii?Q?GbOMz8kZTbakG7SImDOTsxwPZeKGSW6qN2kXk0wWgKrNAchVVY9j98a4Ojc2?= =?us-ascii?Q?UqKtQy0Epk5QN/wuVOZxHDFyTYEYg9zHL/djnw5ag1S90Jt9cCzpLhAWgNmk?= =?us-ascii?Q?5Ok4WdIN+DMVMerZvWkfi6D1SC8ZVuKkvE5tqHfxHUnXb4XRIW4nmZuPt1uX?= =?us-ascii?Q?yH9wmlxIuJF+ksEA0K6pVn28WpeDZFUFZW2h/bEAEptMdj2+BOouFRIhh2Qc?= =?us-ascii?Q?2LKSLI0JsNejZ+0CIa4BKT7RkEBUEP385xkUXaUt/tPvZbiabcvt33yBLrWt?= =?us-ascii?Q?iTzoF2Kg=3D?= X-Microsoft-Exchange-Diagnostics: 1;CY4PR1201MB0133;6:Yg1+NxJWYjtkL3hOg2bSNRgq7ElhdlbPKuOl7I0sioWPvHrUeIgaAfgRgjgWPY2AldB6309/7oyfrqSagqhTNcSknbK2sMQuqBn5Qae8x2hU1b6k1kbrJLdLf91Umwi0Gpl+wvGyx3E0VO7NpU4B+9r6dEySFEmCQ4rW3365wd0dXSPc5WyVpAd7TtOiQglneZacvXQPbMFI9JJtUcJ59cAaH8wVwDcFyeEdJz0b82tA6dDAEJbd6taAqUedIdyJm3SDf+wkNYsd8z5B5VAZDqlnSWPzQe/Kj/lSKCYgthgUQzeBRNTyLjQh08X4onKWdWtRArwlRJ6UjVkQLK/QcGIT+EZ9UL5Ux+/XrW+aNjuJPL28cWwH4+umkSbekdGTN/eIXM+/LixLtXcU3uaM7CApYlohYaJ29tAZ5I+7niqagcPlCUN6blS6mYrUtU2/yvcggOSCcaM68stSog/e2SWaAGbkg/pBTBY21daC4Mef25fHMRMgpWFN8UXngGWkGy6kJ2bvM16Ksvs+KHRuKhmaBLbkn/HIKIdyjrPM/uQ=;5:LwT2i09B0LarZterzLWvJ0jUUvvGk2jxuq7BrLoyx5q11FWhGOcwLs8I3CeDsrsIoySWa701/v+x0d6SYwags+u4kjfvYaGgIRkdiaX4AtA4lxfkDMgcNou59l4e+oua/ZfuryPLK0xFpyw22ryKMEZ1YA9NWFYIumJpWvT+7To=;24:i3E4ivWPPW+splcEMMaW7obnXLI92/kiBjN3MN/iKNmfcnW5mJQfHwqB4wHYGJTaVu01B1cY9pMq3SAoJSFJpFMDnxIk1jleeCZJU3I0444= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CY4PR1201MB0133;7:fx120fxQF+BayMsUpMc0sdNRqSnMmAC/IDEA3qaAbLsImfYqGUVJFKIshjTGC+fT30IEzRQcU8gB7CTKMqTnGWr9zQBoqXE/5e6qAKB8AUW9zDGnom6y8RZ/9NMYLPIgFZghgga8MhonfyQLhnkSg+X6uGF5oRBMrePGJghMTryu1noDQN4vE52ab/m4u9IsJropZZS/83ogmy99GbAfvzsD+bOxfnK3UXtW6wSBcer6NxyATIEuStg1m1BBOAUBrV5PW6FLu8EHM9aBCn0Co0t7FBKNJFJ9fQAbGucshYow1cxkzTbiX8crBU/aV9F8l715Jjj9PXMJmA+nouwvBw==;20:LZZIkUs0ITkduE8Hom1kljUQ4ml+nakz9H/X5rrSet363QBaTx33LVWtt8FBKwWqBQIXWPwcgP4iTAYDSnkr8pCebKqtFvebpcq6OYJfx2bOrHY7RVary8t6IHHnQ2WzF5TId2twNhbD7qMIMaxcChYVASFaiAkhMrC5BZXq8T2bdFs2727qPRfyEgG4FTZPzRr0iJMsvnzHXs5HgBgwtSm6QB9JwNo1Sx8s9tqspacTGWXpcThkPAAoWXrggKL8 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2017 20:42:08.7920 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1201MB0133 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yazen Ghannam In the amd_threshold_interrupt() handler, we loop through every possible block in each bank and rediscover the block's address and if it's valid, e.g. valid, counter present and not locked. However, we already have the address saved in the threshold blocks list for each CPU and bank. The list only contains blocks that have passed all the valid checks. Besides the redundancy, there's also an smp_call_function* in get_block_address() and this causes a warning when servicing the interrupt. WARNING: CPU: 0 PID: 0 at kernel/smp.c:281 smp_call_function_single+0xdd/0xf0 ... Call Trace: rdmsr_safe_on_cpu+0x5d/0x90 get_block_address.isra.2+0x97/0x100 amd_threshold_interrupt+0xae/0x220 smp_threshold_interrupt+0x1b/0x40 threshold_interrupt+0x89/0x90 Iterate over the threshold blocks list and use the saved address. Also, drop the redundant valid checks. Signed-off-by: Yazen Ghannam --- arch/x86/kernel/cpu/mcheck/mce_amd.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c index 2074b870..14e4dab 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_amd.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c @@ -873,30 +873,23 @@ static void log_error_thresholding(unsigned int bank, u64 misc) */ static void amd_threshold_interrupt(void) { - u32 low = 0, high = 0, address = 0; - unsigned int bank, block, cpu = smp_processor_id(); + u32 low = 0, high = 0; + unsigned int bank, cpu = smp_processor_id(); struct thresh_restart tr; + struct threshold_block *block = NULL, *tmp = NULL; + struct list_head *head = NULL; for (bank = 0; bank < mca_cfg.banks; ++bank) { if (!(per_cpu(bank_map, cpu) & (1 << bank))) continue; - for (block = 0; block < NR_BLOCKS; ++block) { - address = get_block_address(cpu, address, low, high, bank, block); - if (!address) - break; - if (rdmsr_safe(address, &low, &high)) - break; + if (!per_cpu(threshold_banks, cpu)[bank]->blocks) + continue; - if (!(high & MASK_VALID_HI)) { - if (block) - continue; - else - break; - } + head = &per_cpu(threshold_banks, cpu)[bank]->blocks_head; - if (!(high & MASK_CNTP_HI) || - (high & MASK_LOCKED_HI)) + list_for_each_entry_safe(block, tmp, head, miscj) { + if (rdmsr_safe(block->address, &low, &high)) continue; if (!(high & MASK_OVERFLOW_HI)) @@ -907,7 +900,7 @@ static void amd_threshold_interrupt(void) /* Reset threshold block after logging error. */ memset(&tr, 0, sizeof(tr)); - tr.b = &per_cpu(threshold_banks, cpu)[bank]->blocks[block]; + tr.b = block; threshold_restart_bank(&tr); } } -- 2.7.4