From patchwork Wed Aug 9 16:49:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 133336 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2931530vqr; Wed, 9 Aug 2023 09:51:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHnwv+LI6nszL+ssJWmOT8N6iM0/mD0ll50mDsI72QVhu1fl8NcUKMaGCHB/TGbuu+izDAO X-Received: by 2002:a05:6512:2342:b0:4fe:181f:272c with SMTP id p2-20020a056512234200b004fe181f272cmr2522997lfu.41.1691599866784; Wed, 09 Aug 2023 09:51:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691599866; cv=none; d=google.com; s=arc-20160816; b=UayCLYRUl9Ju5D/qW51kdCf6HxL0CNhcpqfFGmMQwW8Z76euFNY9HNUnaWHmCMQvKw +hu1YUaj7W+j5SSzNawKOrioZEstUryBXPevBLJ5uRKWYsf01jOyjpXZQOralthfM3pX RpZb2Y0w7oP0qheRaOqVo6uvX3LGdlyXvKzqlwIgaxE3J0JcDRAdAu5VLNdVjP4+vws/ eQ+YSt7RZxeg+jD8sYquUya3iFTkD3oVQgHhJjBhw+MwGgOG3xkb0LHVpNVsiw7nrflC MuQlkLx5a4+NjyrFcPvl80CdS33z3mSHpDTfk1jmZoMRQ/BBU9NIdH4SPw8UIxiLaSQF QWgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:cc:subject:to:reply-to:sender:from :dkim-signature:dkim-signature:date; bh=UKw5/C1uPchbtj+s2u/z0diGoWi9F8PI/gN2xtNLYsU=; fh=xeBNGOuZM5vy4okdFvBNsMTGHQ6tdBlFPaNKCUScG5A=; b=WQ++TyXFunngtGh1+md9N082y0JNk81Hd0HdOxC35Lsl7hRroXhcfq4tym7ImIKcyN aO+IwEvfCHTESyzKzMu59tWQMju4XP6bI3L9W7q+/dLXAmASDBZLnT0ODRGdIMNCCNR6 JTDgAf7Mn8dh7I6Vj8kEPe5BKZe5tgY5SnA+YariSpAfN1R105YQ4x8uAOU3GzcI94BD voXNwTb0/Cbjt09JgER7hhQ/XwZEG3v0722pe3QiyhNWx47cZexJLnze2FYV1gHQdV8s q0K+3QiNCHNaHZNzpTR6NUBALUH4nCgOqL4AsipgfMv/PlK+PIIKreNX5UHHOWuN3ilo pP6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=MUahpj6P; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=m+qLr8wN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a1-20020a50ff01000000b00523220e5c17si8186388edu.193.2023.08.09.09.50.42; Wed, 09 Aug 2023 09:51:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=MUahpj6P; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=m+qLr8wN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231372AbjHIQth (ORCPT + 99 others); Wed, 9 Aug 2023 12:49:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230459AbjHIQtb (ORCPT ); Wed, 9 Aug 2023 12:49:31 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1150E1BFA; Wed, 9 Aug 2023 09:49:30 -0700 (PDT) Date: Wed, 09 Aug 2023 16:49:28 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691599769; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UKw5/C1uPchbtj+s2u/z0diGoWi9F8PI/gN2xtNLYsU=; b=MUahpj6Prx5w9b+LGRrkJnio+xCb2ct5iKFQ/7K9A6bgaIDM0ce3jNhIVsrkrqfmX3dVbs a2JgyYRgwdggImuW4AkZTzPNnVtqMqQuF/AzTLpJP2RaNRB6fQJpOrPAvM3YbPE5RzCy79 ejUkbrjPpeh2Gjz6S/RBFC7bvxYl0my4N7TcibI+OXcDT/bLZGBTRRYcKck7+2GN4893Yc OyjqaH/C23fCPg4bPw+oyIbF8yQ4OFdN3bxqNMQ1OsjVhePdYEbOPu2OeP6391219YIr8u cJTgP/8ePlx2z31DNeycwYJoRtJHIUiEhTu74zHHWe4NilTkzX4Lt5hxTdBi8g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691599769; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UKw5/C1uPchbtj+s2u/z0diGoWi9F8PI/gN2xtNLYsU=; b=m+qLr8wNwdOsfbDtnL3xh1I3mW+GVoCDSeKD1Q3XldLSHKLVH9MZsD+7HQwdqgZnis2Q1C WJEG0saB/PBXEODQ== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/apic] x86/apic/x2apic: Share all common IPI functions Cc: Thomas Gleixner , Dave Hansen , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <169159976883.27769.14480642651891900714.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773771021988856693 X-GMAIL-MSGID: 1773771021988856693 The following commit has been merged into the x86/apic branch of tip: Commit-ID: aea264b9b09883cb53963f608d225f90b4195372 Gitweb: https://git.kernel.org/tip/aea264b9b09883cb53963f608d225f90b4195372 Author: Thomas Gleixner AuthorDate: Tue, 08 Aug 2023 15:04:07 -07:00 Committer: Dave Hansen CommitterDate: Wed, 09 Aug 2023 08:10:12 -07:00 x86/apic/x2apic: Share all common IPI functions Yet more copy and pasta gone. Signed-off-by: Thomas Gleixner Signed-off-by: Dave Hansen Acked-by: Peter Zijlstra (Intel) --- arch/x86/kernel/apic/local.h | 4 +- arch/x86/kernel/apic/x2apic_cluster.c | 10 +------ arch/x86/kernel/apic/x2apic_phys.c | 44 +++++++++++++------------- arch/x86/kernel/apic/x2apic_uv_x.c | 14 +------- 4 files changed, 28 insertions(+), 44 deletions(-) diff --git a/arch/x86/kernel/apic/local.h b/arch/x86/kernel/apic/local.h index 98cfe78..a250675 100644 --- a/arch/x86/kernel/apic/local.h +++ b/arch/x86/kernel/apic/local.h @@ -19,8 +19,10 @@ void __x2apic_send_IPI_dest(unsigned int apicid, int vector, unsigned int dest); unsigned int x2apic_get_apic_id(unsigned long id); u32 x2apic_set_apic_id(unsigned int id); int x2apic_phys_pkg_id(int initial_apicid, int index_msb); + +void x2apic_send_IPI_all(int vector); +void x2apic_send_IPI_allbutself(int vector); void x2apic_send_IPI_self(int vector); -void __x2apic_send_IPI_shorthand(int vector, u32 which); /* IPI */ diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c index 355da47..afd2676 100644 --- a/arch/x86/kernel/apic/x2apic_cluster.c +++ b/arch/x86/kernel/apic/x2apic_cluster.c @@ -83,16 +83,6 @@ x2apic_send_IPI_mask_allbutself(const struct cpumask *mask, int vector) __x2apic_send_IPI_mask(mask, vector, APIC_DEST_ALLBUT); } -static void x2apic_send_IPI_allbutself(int vector) -{ - __x2apic_send_IPI_shorthand(vector, APIC_DEST_ALLBUT); -} - -static void x2apic_send_IPI_all(int vector) -{ - __x2apic_send_IPI_shorthand(vector, APIC_DEST_ALLINC); -} - static u32 x2apic_calc_apicid(unsigned int cpu) { return x86_cpu_to_logical_apicid[cpu]; diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c index 2c9a884..c40d19b 100644 --- a/arch/x86/kernel/apic/x2apic_phys.c +++ b/arch/x86/kernel/apic/x2apic_phys.c @@ -81,16 +81,36 @@ static void __x2apic_send_IPI_mask(mask, vector, APIC_DEST_ALLBUT); } -static void x2apic_send_IPI_allbutself(int vector) +static void __x2apic_send_IPI_shorthand(int vector, u32 which) +{ + unsigned long cfg = __prepare_ICR(which, vector, 0); + + /* x2apic MSRs are special and need a special fence: */ + weak_wrmsr_fence(); + native_x2apic_icr_write(cfg, 0); +} + +void x2apic_send_IPI_allbutself(int vector) { __x2apic_send_IPI_shorthand(vector, APIC_DEST_ALLBUT); } -static void x2apic_send_IPI_all(int vector) +void x2apic_send_IPI_all(int vector) { __x2apic_send_IPI_shorthand(vector, APIC_DEST_ALLINC); } +void x2apic_send_IPI_self(int vector) +{ + apic_write(APIC_SELF_IPI, vector); +} + +void __x2apic_send_IPI_dest(unsigned int apicid, int vector, unsigned int dest) +{ + unsigned long cfg = __prepare_ICR(0, vector, dest); + native_x2apic_icr_write(cfg, apicid); +} + static int x2apic_phys_probe(void) { if (!x2apic_mode) @@ -111,21 +131,6 @@ int x2apic_apic_id_valid(u32 apicid) return 1; } -void __x2apic_send_IPI_dest(unsigned int apicid, int vector, unsigned int dest) -{ - unsigned long cfg = __prepare_ICR(0, vector, dest); - native_x2apic_icr_write(cfg, apicid); -} - -void __x2apic_send_IPI_shorthand(int vector, u32 which) -{ - unsigned long cfg = __prepare_ICR(which, vector, 0); - - /* x2apic MSRs are special and need a special fence: */ - weak_wrmsr_fence(); - native_x2apic_icr_write(cfg, 0); -} - unsigned int x2apic_get_apic_id(unsigned long id) { return id; @@ -141,11 +146,6 @@ int x2apic_phys_pkg_id(int initial_apicid, int index_msb) return initial_apicid >> index_msb; } -void x2apic_send_IPI_self(int vector) -{ - apic_write(APIC_SELF_IPI, vector); -} - static struct apic apic_x2apic_phys __ro_after_init = { .name = "physical x2apic", diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index f0580a6..a8ed237 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -25,6 +25,8 @@ #include #include +#include "local.h" + static enum uv_system_type uv_system_type; static int uv_hubbed_system; static int uv_hubless_system; @@ -783,11 +785,6 @@ static int uv_apic_id_valid(u32 apicid) return 1; } -static unsigned int x2apic_get_apic_id(unsigned long id) -{ - return id; -} - static u32 set_apic_id(unsigned int id) { return id; @@ -803,11 +800,6 @@ static int uv_phys_pkg_id(int initial_apicid, int index_msb) return uv_read_apic_id() >> index_msb; } -static void uv_send_IPI_self(int vector) -{ - apic_write(APIC_SELF_IPI, vector); -} - static int uv_probe(void) { return apic == &apic_x2apic_uv_x; @@ -840,7 +832,7 @@ static struct apic apic_x2apic_uv_x __ro_after_init = { .send_IPI_mask_allbutself = uv_send_IPI_mask_allbutself, .send_IPI_allbutself = uv_send_IPI_allbutself, .send_IPI_all = uv_send_IPI_all, - .send_IPI_self = uv_send_IPI_self, + .send_IPI_self = x2apic_send_IPI_self, .wakeup_secondary_cpu = uv_wakeup_secondary,