From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755632AbbITRRP (ORCPT ); Sun, 20 Sep 2015 13:17:15 -0400 Received: from mail-db3on0125.outbound.protection.outlook.com ([157.55.234.125]:8989 "EHLO emea01-db3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755601AbbITRRL (ORCPT ); Sun, 20 Sep 2015 13:17:11 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=daniel@numascale.com; From: Daniel J Blueman To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" CC: Daniel J Blueman , , , Daniel Lezcano , Steffen Persvold Subject: [PATCH 3/4] x86: Add Numachip IPI optimisations Date: Mon, 21 Sep 2015 01:02:01 +0800 Message-ID: <1442768522-19217-3-git-send-email-daniel@numascale.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1442768522-19217-1-git-send-email-daniel@numascale.com> References: <1442768522-19217-1-git-send-email-daniel@numascale.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [175.156.157.249] X-ClientProxiedBy: DB5PR03CA0064.eurprd03.prod.outlook.com (25.164.34.32) To AM4PR07MB1298.eurprd07.prod.outlook.com (25.164.81.156) X-Microsoft-Exchange-Diagnostics: 1;AM4PR07MB1298;2:EQKLNuVDuwtnYCgAPQyQOUR5vJfb5ZUqWxu4kEE3/x0JnbH+gMzrIG+tDNi5SJqZKpZIJLNHUFoRQT2szIW5HQOA6rp9ufs9xe6W2bYnJST/YGAXbkfHkkr95zzNrIuc8n5hd1gpRWPW9piLStVmZQb0yHxLNgKof1T4KTk7iiA=;3:m9FBF4AN+L3FSFb/xMdVfVOxguZnkt0Q/SIM7RyrV6LOgmpg/wtZoKPRMmomfYi0pcoybguUVuzpuYK3KGYF1EdZunPOk9zPDnNM71Ahn/i33PMPCBoz73v9unU0UPkYYv2mJ++ic6EF0KMj5CZ/RA==;25:8GJ6scBG+BJ6hB13H52CJ6PWi7XiNcq2qMQfPT556TclLhsQ7wkh6WPhkTLAUn7XdA4a5X9iLXI1XgE2GruLcjejcZ8erSYUnJplLQCCZNOjiMKZFpUI88BH65eho/BoyzGTX7OGiG3CY+ny//P8EooWK7bMO/NZDwUHVj3XVQ+nlndjLX6UBxfNaNxnuuhzDV/bxQSfjK/VQ/4TF1o7fMXbjM9Ww9giGLdhemgR9oV+bHdbiQaoY9vnYjPfmkggg/4GtAzJidbyTjV0eAgi5g==;4:6oA5wzAlCOqW45xOf08RBIxPK8ID+w9y7kOW95MVo4FTP02mGVtYHjWK4uptzROTh5b1R666z5Po07yN71pAPd9SBnWsNmIgeY7uvtRaSE2+BfTtDyqxoikAPEExZBm3XTbhir8oFdyQKfmFukWEWFPHIQRr2VqtQcS4ocAV7x38jg1eA3CSZf9eyHFyk3/X+FggiGWW9kQmkwoHQ1jrnVouW3nEnDXBk4mGZuFn0EYX2LKhQtSKmlGciKyZdAsd X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:AM4PR07MB1298; X-Exchange-Antispam-Report-CFA: BCL:0;PCL:0;RULEID:;SRVR:AM4PR07MB1298;BCL:0;PCL:0;RULEID:;SRVR:AM4PR07MB1298; X-Forefront-PRVS: 0705EB1700 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(979002)(6009001)(6069001)(189002)(199003)(33646002)(122386002)(46102003)(101416001)(92566002)(19580395003)(76176999)(62966003)(19580405001)(5001770100001)(77156002)(50986999)(87976001)(86362001)(36756003)(4001540100001)(40100003)(5001830100001)(81156007)(97736004)(50226001)(5001860100001)(189998001)(2950100001)(42186005)(106356001)(47776003)(77096005)(68736005)(105586002)(5004730100002)(229853001)(5003940100001)(64706001)(50466002)(48376002)(66066001)(969003)(989001)(999001)(1009001)(1019001);DIR:OUT;SFP:1102;SCL:1;SRVR:AM4PR07MB1298;H:localhost.localdomain;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;AM4PR07MB1298;23:QHXYD3e8dKM4BwHukgaP00bAd3ZnYNuvh4tLl0z/l?= =?us-ascii?Q?INnUzNUa/yk4ERHrx/+/MEKVA5eC/KR61Asf+PX9Vtntn/fnwxJZDhDd8avI?= =?us-ascii?Q?f1UtW3ZzUfIvznmeZNEZ7y/IhPmIGuup8evQEJ2PLjpCuPfK0eE52muX4cZP?= =?us-ascii?Q?AroFVY2RC0MWrLGHegs6Ca7n3MAUw+tg+IMo4vkPHQlO12SI0hHFH1J6zm8i?= =?us-ascii?Q?lSyUQjDyi3sire9ixyikEdXLBy5wB4P/PtiSzR/a9sc0v2IPVqIVkKpXyl+o?= =?us-ascii?Q?a0GGgvXWGIhBtJYQ5vQkyzW5nTElFqvp8q30rnOMG/QNF/kzBrgO9cK0e0/M?= =?us-ascii?Q?x+B2ox4o3R6L5DtWn1jmwW8tX4hHp+GPB6tM9+Epwk3vr/R1bd/oV2EokD4t?= =?us-ascii?Q?C9WurO+NKtDBrHqCGar+F9Kz/LuSlnYORq918XtNuvNg16lMutj9OT5+eY5L?= =?us-ascii?Q?WQliAVgMBc5UJAi4h2HgVaq7gBsigT0BRTdmBbHFYQJS3reKQ0YKoFQxNmlq?= =?us-ascii?Q?9BCOSzuRtfgbuxF90jyB1P1VsCjRDySQI9p276w9bZ3KBOZZOKse/lhypZfk?= =?us-ascii?Q?tB9uvJ6kf10W9xVWoZEe0Ya0ktq4VXEvLr9sTP69qoyklPFt3RiZo7ERRjgP?= =?us-ascii?Q?khLn+FoTVXbbeiCcvoiSHftae4vGr+SAM6t3MqK8SdMre3vhJp50yKHNqKM9?= =?us-ascii?Q?3Efp3yvmm2FiPQNxd2BJOz3nNs1NYI/VIA46uRNp8u35sgZ7ya2vvQ83+VzN?= =?us-ascii?Q?IHn1Uy4tbKKm15W8X4lhb9lOTouYFsPNPnnQ2Ue72LWleGsdoMlJltF+5Yme?= =?us-ascii?Q?sSx98riiZbFppoI/Sr82DnK3hC2fI6zE64MsP7BTRXTY21t2v9UV968Y6RBx?= =?us-ascii?Q?IAOpC5f2cpgLIUqZj0sq0dZ82zxur5Tsqn8Hk7/tcEX2yNAoHmBNSTvhtdEF?= =?us-ascii?Q?DBlBCHpfsvOOeCA52lVI5NhaBsQzXU0FoqDJ43i/AOMMne0XCZ9BXrPsKCxG?= =?us-ascii?Q?SYVSTmx20zEnSy9OsKSSOFAxyXffYL7NSJcofCqhezyUpwZIG0SNca+3esab?= =?us-ascii?Q?LdpCCELI9oFkQKRrzHptOugxQ+lqLQgqNYuKtOAoLd4wfzR+fCMu8Idlm6Jc?= =?us-ascii?Q?nSSwR7HLv8tHpoagTSVCbpg/0Z67mS5frRSh9mJPBb4Yiwo/Itf/hc5hCBvs?= =?us-ascii?Q?WeVlqhluZJlBqLH0rzQ0ub8pdwCuvEhzHAO?= X-Microsoft-Exchange-Diagnostics: 1;AM4PR07MB1298;5:wiQ1x6dV9xKIXTymvPnveOZEwyou3/JHRwFp5+Ob0mWRk06PO5eeumMI7ksv0dQGnuR0kgRhjDK5dRF3JxikSEjvwRsVGLiwTMqEyyI7K8J+Kbsk+fihq2lhYDfzMQzvXLu6QiZCZRI+Ak6zKSSQzg==;24:O3P/83bye7E1uKFd6Qh/MpHAdP/V7nnkG93OlZTnpmne/KGNG6hfE614Fu86Z3/6VhisUnc3l5pP5Z5kUJU8AyxaHKoo+r8PULYRL7t6Pwc=;20:6aKED0LR+/oOcttmrJs2W1aee5PehGfIOCbjrNOryySxtckcgRxoc65olnamlMDJevTmgVJ3zoToOZyYfJKftg== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: numascale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2015 17:02:24.5588 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR07MB1298 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When sending IPIs, first check if the non-local part of the source and destination APIC IDs match; if so, send via the local APIC for efficiency. Secondly, since the AMD BIOS-kernel developer guide states IPI delivery will occur invarient of prior deliver status, avoid polling the delivery status bit for efficiency. Signed-off-by: Daniel J Blueman Acked-by: Steffen Persvold --- arch/x86/include/asm/numachip/numachip_csr.h | 1 + arch/x86/kernel/apic/apic_numachip.c | 36 ++++++++++++++++++++++++---- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/numachip/numachip_csr.h b/arch/x86/include/asm/numachip/numachip_csr.h index c7efc25..75379f6 100644 --- a/arch/x86/include/asm/numachip/numachip_csr.h +++ b/arch/x86/include/asm/numachip/numachip_csr.h @@ -34,6 +34,7 @@ #define NUMACHIP_LCSR_BASE 0x3ffffe000000ULL #define NUMACHIP_LCSR_LIM 0x3fffffffffffULL #define NUMACHIP_LCSR_SIZE (NUMACHIP_LCSR_LIM - NUMACHIP_LCSR_BASE + 1) +#define NUMACHIP_LAPIC_BITS 8 static inline void *lcsr_address(unsigned long offset) { diff --git a/arch/x86/kernel/apic/apic_numachip.c b/arch/x86/kernel/apic/apic_numachip.c index dfe2b1c..81bc216 100644 --- a/arch/x86/kernel/apic/apic_numachip.c +++ b/arch/x86/kernel/apic/apic_numachip.c @@ -95,9 +95,25 @@ static int numachip_wakeup_secondary(int phys_apicid, unsigned long start_rip) static void numachip_send_IPI_one(int cpu, int vector) { - int apicid = per_cpu(x86_cpu_to_apicid, cpu); + int local_apicid, apicid = per_cpu(x86_cpu_to_apicid, cpu); unsigned int dmode; + preempt_disable(); + local_apicid = __this_cpu_read(x86_cpu_to_apicid); + + /* Send via local APIC where non-local part matches */ + if (!((apicid ^ local_apicid) >> NUMACHIP_LAPIC_BITS)) { + unsigned long flags; + + local_irq_save(flags); + __default_send_IPI_dest_field(apicid, vector, + APIC_DEST_PHYSICAL); + local_irq_restore(flags); + preempt_enable(); + return; + } + preempt_enable(); + dmode = (vector == NMI_VECTOR) ? APIC_DM_NMI : APIC_DM_FIXED; numachip_apic_icr_write(apicid, dmode | vector); } @@ -217,6 +232,17 @@ static int numachip2_acpi_madt_oem_check(char *oem_id, char *oem_table_id) return 1; } +/* APIC IPIs are queued */ +static void numachip_apic_wait_icr_idle(void) +{ +} + +/* APIC NMI IPIs are queued */ +static u32 numachip_safe_apic_wait_icr_idle(void) +{ + return 0; +} + static const struct apic apic_numachip1 __refconst = { .name = "NumaConnect system", .probe = numachip1_probe, @@ -262,8 +288,8 @@ static const struct apic apic_numachip1 __refconst = { .eoi_write = native_apic_mem_write, .icr_read = native_apic_icr_read, .icr_write = native_apic_icr_write, - .wait_icr_idle = native_apic_wait_icr_idle, - .safe_wait_icr_idle = native_safe_apic_wait_icr_idle, + .wait_icr_idle = numachip_apic_wait_icr_idle, + .safe_wait_icr_idle = numachip_safe_apic_wait_icr_idle, }; apic_driver(apic_numachip1); @@ -313,8 +339,8 @@ static const struct apic apic_numachip2 __refconst = { .eoi_write = native_apic_mem_write, .icr_read = native_apic_icr_read, .icr_write = native_apic_icr_write, - .wait_icr_idle = native_apic_wait_icr_idle, - .safe_wait_icr_idle = native_safe_apic_wait_icr_idle, + .wait_icr_idle = numachip_apic_wait_icr_idle, + .safe_wait_icr_idle = numachip_safe_apic_wait_icr_idle, }; apic_driver(apic_numachip2); -- 2.5.0