From nobody Tue Feb 10 22:00:01 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29D7AC77B75 for ; Fri, 19 May 2023 19:10:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231375AbjESTKC (ORCPT ); Fri, 19 May 2023 15:10:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230480AbjESTJn (ORCPT ); Fri, 19 May 2023 15:09:43 -0400 Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B0C110CE for ; Fri, 19 May 2023 12:09:19 -0700 (PDT) Received: from pps.filterd (m0150245.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34JDTVWA014535; Fri, 19 May 2023 19:07:56 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hpe.com; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pps0720; bh=rMtFGeLTLqs2vfIhLT9M8T7JC+BTSDdRFHdnK5EA330=; b=XzL5HRaJFK+bju2aJNuP5fhqryinCnnwnwagWqvr05NRdH5zUaBqh3YJQ2TNYYnyqs5E IoODkewrcZ8JtTMdNIKVvFtnoPjGJz8qGDC+uxyAi4emREZsGgtmzwRW+oq4E6sQiF4J OjjtPI0JPYCQ6wcnuo28PhayN68ygJ3nYlhryOaSLDfevsFxVSu1vk3BE9R7SoK5RDKo YqMSp4MHuVXsN/WPbmijWC8BIav0YLxdMaqC/l55hxgpHh8BXRz9M4+kR2FI0pzGBPrY S4eVrMjInxNjkqOC4nWbMIikT1bL+v+c53Swcoio0aJQTfL1YFzSrx0c/pyEoQz4C6vT Bg== Received: from p1lg14879.it.hpe.com (p1lg14879.it.hpe.com [16.230.97.200]) by mx0b-002e3701.pphosted.com (PPS) with ESMTPS id 3qpa1gamap-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 19 May 2023 19:07:56 +0000 Received: from p1lg14886.dc01.its.hpecorp.net (unknown [10.119.18.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by p1lg14879.it.hpe.com (Postfix) with ESMTPS id 4E11C12E96; Fri, 19 May 2023 19:07:55 +0000 (UTC) Received: from dog.eag.rdlabs.hpecorp.net (unknown [16.231.227.36]) by p1lg14886.dc01.its.hpecorp.net (Postfix) with ESMTP id 0F412810920; Fri, 19 May 2023 19:07:55 +0000 (UTC) Received: by dog.eag.rdlabs.hpecorp.net (Postfix, from userid 200934) id 51A5630313049; Fri, 19 May 2023 14:07:52 -0500 (CDT) From: Steve Wahl To: Steve Wahl , Dimitri Sivanich , Russ Anderson , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , linux-kernel@vger.kernel.org Subject: [PATCH RESEND v5 5/8] x86/platform/uv: helper functions for allocating and freeing conversion tables Date: Fri, 19 May 2023 14:07:49 -0500 Message-Id: <20230519190752.3297140-6-steve.wahl@hpe.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20230519190752.3297140-1-steve.wahl@hpe.com> References: <20230519190752.3297140-1-steve.wahl@hpe.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: b-3b5yRCOcMxMuZWYKBIlv42gJsEKfpd X-Proofpoint-GUID: b-3b5yRCOcMxMuZWYKBIlv42gJsEKfpd X-HPE-SCL: -1 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-05-19_14,2023-05-17_02,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 clxscore=1015 priorityscore=1501 bulkscore=0 phishscore=0 impostorscore=0 lowpriorityscore=0 adultscore=0 mlxscore=0 spamscore=0 mlxlogscore=999 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305190164 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add alloc_conv_table() and FREE_1_TO_1_TABLE() to reduce duplicated code among the conversion tables we use. Signed-off-by: Steve Wahl --- arch/x86/kernel/apic/x2apic_uv_x.c | 97 ++++++++++++++++-------------- 1 file changed, 53 insertions(+), 44 deletions(-) diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2ap= ic_uv_x.c index 2da84befabf0..1bd15b1f7712 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -1491,16 +1491,50 @@ static __init void boot_init_possible_blades(struct= uv_hub_info_s *hub_info) pr_info("UV: number nodes/possible blades %d\n", uv_pb); } =20 +static int __init alloc_conv_table(int num_elem, unsigned short **table) +{ + int i; + size_t bytes; + + bytes =3D num_elem * sizeof(*table[0]); + *table =3D kmalloc(bytes, GFP_KERNEL); + if (WARN_ON_ONCE(!*table)) + return -ENOMEM; + for (i =3D 0; i < num_elem; i++) + ((unsigned short *)*table)[i] =3D SOCK_EMPTY; + return 0; +} + +/* Remove conversion table if it's 1:1 */ +#define FREE_1_TO_1_TABLE(tbl, min, max, max2) free_1_to_1_table(&tbl, #tb= l, min, max, max2) + +static void __init free_1_to_1_table(unsigned short **tp, char *tname, int= min, int max, int max2) +{ + int i; + unsigned short *table =3D *tp; + + if (table =3D=3D NULL) + return; + if (max !=3D max2) + return; + for (i =3D 0; i < max; i++) { + if (i !=3D table[i]) + return; + } + kfree(table); + *tp =3D NULL; + pr_info("UV: %s is 1:1, conversion table removed\n", tname); +} + static void __init build_socket_tables(void) { struct uv_gam_range_entry *gre =3D uv_gre_table; - int num, nump; + int nums, numn, nump; int cpu, i, lnid; int minsock =3D _min_socket; int maxsock =3D _max_socket; int minpnode =3D _min_pnode; int maxpnode =3D _max_pnode; - size_t bytes; =20 if (!gre) { if (is_uv2_hub() || is_uv3_hub()) { @@ -1511,22 +1545,20 @@ static void __init build_socket_tables(void) BUG(); } =20 - /* Build socket id -> node id, pnode */ - num =3D maxsock - minsock + 1; - bytes =3D num * sizeof(_socket_to_node[0]); - _socket_to_node =3D kmalloc(bytes, GFP_KERNEL); - _socket_to_pnode =3D kmalloc(bytes, GFP_KERNEL); - + numn =3D num_possible_nodes(); nump =3D maxpnode - minpnode + 1; - bytes =3D nump * sizeof(_pnode_to_socket[0]); - _pnode_to_socket =3D kmalloc(bytes, GFP_KERNEL); - BUG_ON(!_socket_to_node || !_socket_to_pnode || !_pnode_to_socket); - - for (i =3D 0; i < num; i++) - _socket_to_node[i] =3D _socket_to_pnode[i] =3D SOCK_EMPTY; - - for (i =3D 0; i < nump; i++) - _pnode_to_socket[i] =3D SOCK_EMPTY; + nums =3D maxsock - minsock + 1; + + /* Allocate and clear tables */ + if ((alloc_conv_table(nump, &_pnode_to_socket) < 0) + || (alloc_conv_table(nums, &_socket_to_pnode) < 0) + || (alloc_conv_table(numn, &_node_to_pnode) < 0) + || (alloc_conv_table(nums, &_socket_to_node) < 0)) { + kfree(_pnode_to_socket); + kfree(_socket_to_pnode); + kfree(_node_to_pnode); + return; + } =20 /* Fill in pnode/node/addr conversion list values: */ pr_info("UV: GAM Building socket/pnode conversion tables\n"); @@ -1565,10 +1597,6 @@ static void __init build_socket_tables(void) } =20 /* Set up physical blade to pnode translation from GAM Range Table: */ - bytes =3D num_possible_nodes() * sizeof(_node_to_pnode[0]); - _node_to_pnode =3D kmalloc(bytes, GFP_KERNEL); - BUG_ON(!_node_to_pnode); - for (lnid =3D 0; lnid < num_possible_nodes(); lnid++) { unsigned short sockid; =20 @@ -1585,31 +1613,12 @@ static void __init build_socket_tables(void) } =20 /* - * If socket id =3D=3D pnode or socket id =3D=3D node for all nodes, + * If e.g. socket id =3D=3D pnode for all pnodes, * system runs faster by removing corresponding conversion table. */ - pr_info("UV: Checking socket->node/pnode for identity maps\n"); - if (minsock =3D=3D 0) { - for (i =3D 0; i < num; i++) - if (_socket_to_node[i] =3D=3D SOCK_EMPTY || i !=3D _socket_to_node[i]) - break; - if (i >=3D num) { - kfree(_socket_to_node); - _socket_to_node =3D NULL; - pr_info("UV: 1:1 socket_to_node table removed\n"); - } - } - if (minsock =3D=3D minpnode) { - for (i =3D 0; i < num; i++) - if (_socket_to_pnode[i] !=3D SOCK_EMPTY && - _socket_to_pnode[i] !=3D i + minpnode) - break; - if (i >=3D num) { - kfree(_socket_to_pnode); - _socket_to_pnode =3D NULL; - pr_info("UV: 1:1 socket_to_pnode table removed\n"); - } - } + FREE_1_TO_1_TABLE(_socket_to_node, _min_socket, nums, numn); + FREE_1_TO_1_TABLE(_socket_to_pnode, _min_pnode, nums, nump); + FREE_1_TO_1_TABLE(_pnode_to_socket, _min_pnode, nums, nump); } =20 /* Check which reboot to use */ --=20 2.26.2