From nobody Fri May 17 14:22:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1611847328; cv=none; d=zohomail.com; s=zohoarc; b=AJYKpK9AlJt0oBhBF5c6F04zBcU+jH1h8CQJG8Phc/QejwZu6CZ5FMdmRtNg7rDABPn+N0gLdScTQCPLnaztUFLIj4ExBkY6zMXKeknJjG3hrXmhYIrHRGFh/r27ahvUBMafCYxxH/4Tm+G2A7OmUOb5PQ+3js4uGCPr3+//4zE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611847328; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xZnPREoSLA2mBWqQq37aioqdTP1auiz0Zy+GVHBK248=; b=k1sX+8GYxEp6KsUkudhdEIkmQARy0GLqq52X+yVv6tIxdCYoI/aRpWxN1bQpPD9+xIpmCwV9RopiYMJaXqaJhjORIi0sQmi/tmr2cuCUFpEXqe+j9J9rC/p0GHGqmKgrptTL9hPMrE5zay3vTVcAX3eVMnFE3ha/MY5DmYRHVRw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1611847328799291.705958441682; Thu, 28 Jan 2021 07:22:08 -0800 (PST) Received: from localhost ([::1]:47198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l597X-0005h8-Hm for importer@patchew.org; Thu, 28 Jan 2021 10:22:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l593U-0001Cl-Fa; Thu, 28 Jan 2021 10:17:58 -0500 Received: from mail-qt1-x82c.google.com ([2607:f8b0:4864:20::82c]:39354) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l593O-0003Sx-93; Thu, 28 Jan 2021 10:17:56 -0500 Received: by mail-qt1-x82c.google.com with SMTP id z9so4285008qtv.6; Thu, 28 Jan 2021 07:17:49 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c6:6df1:6267:881f:cc79:a1f7]) by smtp.gmail.com with ESMTPSA id g131sm810855qkb.91.2021.01.28.07.17.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Jan 2021 07:17:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xZnPREoSLA2mBWqQq37aioqdTP1auiz0Zy+GVHBK248=; b=aoJr90I4MkK8kM3yW1zNZCoB1bk98P6AAjk2/B6IDxGy99Zm+7POD06Xnv6i4bpPAr KrgnTOGSnai4aJzJr/05H5ZQjXNtoTSrCJ1Z8DbuBJ6+zHMcdslzMoxiRS8vH6YPd51j VAxLyqGaHqKadzhBzeromtJXa8bQ+BUZWAgMX95bQquWUtRZCRkLXXHT8K/OYqJr+yMC lj2a9pShgX6oml7XrKmpNzfAWGuLcmYqB6jdEsJRhSixfGbZ9E/qruTUtVYS+BbcVnzx EPqJ+WhYikuh5dH4aBaDLBDs+mO6BAmbYUjOHYEjX5y/+EehhL/8Ht5zYLYnE/l4ORZ2 zsjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xZnPREoSLA2mBWqQq37aioqdTP1auiz0Zy+GVHBK248=; b=HwYpmnhb3Ee53GumCGDREMEjP3E4BvQ5LA8IkGNQfIoJXvw00VWkWn4pz5dvpOO8KY CO7E8QTNCiB/qKndapu0urV+OU7hhhcOYE0GGyx3GrQeWzjCy1IBpomz0zJZdysrLsOx lvNd4SIr0wDCMKpX97ChBERDfWS/MX3k//nJhaQIKP6Lztl0NtToGWLTCW6NKJJ8+MUq zFZ1/eOGanYHfI5RXrgiAClar+f9dicXZZsuXJNrSEvH28VyIUanJFSrBkO54kGjiDWS qIfGs5GlbOoOIXYQXv3CYIv3ntALCjFZBNV3541jmsrF9ZF57NQSZ0f456P/X4+tdQZa 1yqA== X-Gm-Message-State: AOAM531XvGtcQSvIDEL+foBTJcHQQO+ewZ+ywNcmQnnnMF8vJFIWm1qY BYVUUD/z4wpiyvGZ9xKm4KwZlvK9hP6rlQ== X-Google-Smtp-Source: ABdhPJwVntXjeUHXtBa64ObquL/Gd8thYITFqTB9m5UCSgBtK6oifrGz4bSwj5i5pLLckn3+aE2Muw== X-Received: by 2002:ac8:5e50:: with SMTP id i16mr4010599qtx.5.1611847068942; Thu, 28 Jan 2021 07:17:48 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Subject: [PATCH 1/3] spapr: move spapr_machine_using_legacy_numa() to spapr_numa.c Date: Thu, 28 Jan 2021 12:17:29 -0300 Message-Id: <20210128151731.1333664-2-danielhb413@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210128151731.1333664-1-danielhb413@gmail.com> References: <20210128151731.1333664-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::82c; envelope-from=danielhb413@gmail.com; helo=mail-qt1-x82c.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: clg@kaod.org, Daniel Henrique Barboza , qemu-ppc@nongnu.org, groug@kaod.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This function is used only in spapr_numa.c. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Greg Kurz Tested-by: C=C3=A9dric Le Goater --- hw/ppc/spapr.c | 9 --------- hw/ppc/spapr_numa.c | 9 +++++++++ include/hw/ppc/spapr.h | 1 - 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 6c47466fc2..2d60c6f594 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -295,15 +295,6 @@ static hwaddr spapr_node0_size(MachineState *machine) return machine->ram_size; } =20 -bool spapr_machine_using_legacy_numa(SpaprMachineState *spapr) -{ - MachineState *machine =3D MACHINE(spapr); - SpaprMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(machine); - - return smc->pre_5_2_numa_associativity || - machine->numa_state->num_nodes <=3D 1; -} - static void add_str(GString *s, const gchar *s1) { g_string_append_len(s, s1, strlen(s1) + 1); diff --git a/hw/ppc/spapr_numa.c b/hw/ppc/spapr_numa.c index b50796bbe3..261810525b 100644 --- a/hw/ppc/spapr_numa.c +++ b/hw/ppc/spapr_numa.c @@ -19,6 +19,15 @@ /* Moved from hw/ppc/spapr_pci_nvlink2.c */ #define SPAPR_GPU_NUMA_ID (cpu_to_be32(1)) =20 +static bool spapr_machine_using_legacy_numa(SpaprMachineState *spapr) +{ + MachineState *machine =3D MACHINE(spapr); + SpaprMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(machine); + + return smc->pre_5_2_numa_associativity || + machine->numa_state->num_nodes <=3D 1; +} + static bool spapr_numa_is_symmetrical(MachineState *ms) { int src, dst; diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index c27c7ce515..ccbeeca1de 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -851,7 +851,6 @@ int spapr_max_server_number(SpaprMachineState *spapr); void spapr_store_hpte(PowerPCCPU *cpu, hwaddr ptex, uint64_t pte0, uint64_t pte1); void spapr_mce_req_event(PowerPCCPU *cpu, bool recovered); -bool spapr_machine_using_legacy_numa(SpaprMachineState *spapr); =20 /* DRC callbacks. */ void spapr_core_release(DeviceState *dev); --=20 2.26.2 From nobody Fri May 17 14:22:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1611847205; cv=none; d=zohomail.com; s=zohoarc; b=P9AInClXQHOJY6yqmxrrtRrsdC4Lcdsdn8iAmTWQh5XCu0fxc55wjzPBysrm/dQYUN10Vdnh6KypUPT3PFyzxiIhO1eV6QQ8HdkKkQQ2mCtuZWm4dYSpTtRo7GGsd6+n0relfHwzynbLuawK4VWEtBM6MB0Tusj8cIOD4xLJwWg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611847205; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/s7AFYY3ob+DDHZCiZzxMY5KJpsEqCyeH2D7K+jx/V0=; b=XQiM8JahiU3SNsKhLNq9LtllLZxlns9zy61oXW5pqYNZR5yoVS3ifz7KQKNFERDQPTxQiSSG0DNQccQvmaBb5+PNVHI8B3vcZwdrhf7/EIdhTx/F5Lm0TMX172ei5PRG/b9ZdR2/SU4RCDLUezFDPyDmVRUFEJEp3ZSnRBrhpi0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161184720593550.208051296105396; Thu, 28 Jan 2021 07:20:05 -0800 (PST) Received: from localhost ([::1]:42800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l595Y-0003gX-OI for importer@patchew.org; Thu, 28 Jan 2021 10:20:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58702) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l593e-0001GW-3u; Thu, 28 Jan 2021 10:18:06 -0500 Received: from mail-qt1-x82e.google.com ([2607:f8b0:4864:20::82e]:44845) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l593S-0003TA-Ms; Thu, 28 Jan 2021 10:18:05 -0500 Received: by mail-qt1-x82e.google.com with SMTP id h16so3183054qth.11; Thu, 28 Jan 2021 07:17:51 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c6:6df1:6267:881f:cc79:a1f7]) by smtp.gmail.com with ESMTPSA id g131sm810855qkb.91.2021.01.28.07.17.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Jan 2021 07:17:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/s7AFYY3ob+DDHZCiZzxMY5KJpsEqCyeH2D7K+jx/V0=; b=HjZ2Qm7IaPqdcVYV1uFGHzW+ynV+WcU7SDNKP5+wYdJKeMvJKBDCs29ybERuRPoyW7 epvyaJzMWMgvafgVNizbVk8ci/ORq6Lt4oMlAC0YfETVGse1pgejStf3qKhECFAfc6/z jZpyYAjomDcG84OzzHOdBr85kAvl/b1WgwMfEcHuO6nhMuImvD1hW9swjkJo3h+fILNG CbGOxSIGL+p2vUxHkzhQuug9lYub8pW7GT9qt15U0ZKmeVCgCAwad0wtF4eNNX/3xape Y5kDQoSOUM5bs6G3gBoJu+nwhBjoU7FqmoB+bXhS5eqXnGD8mAA3fg61H7V0fJQgy0c/ thsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/s7AFYY3ob+DDHZCiZzxMY5KJpsEqCyeH2D7K+jx/V0=; b=QnDewRBg1hnWsFsGgYYEWvbNcpBHTD+KaGlRzCgLUlL5Hadi5BufmlK+qDR3nNFwEF z5Z0gFrHDUttsOe6XjdDS6U2+GAYzebdIEigQ43KprpqscF9Pe/RLdcfkMjLEApfL3DL Ki+TvTjb9yiBbVPp4I6a8c5R5h4Y6UrvqjhpLxMqSDgveRmmIiGt/XVzXSiEJRMflgAs HSdPCyaCXMqUkHYKGNKKMwBmxrHDecSyFvb90yTOoHPbRwvN89Sht6t4Pjjzht2lftNS 1XKJ+qimvTs9C17wNwu6WtqLRDGcvw2+WU0FCd89YomLC2KjuQ1COeuREOewCKhh8LzJ F8FA== X-Gm-Message-State: AOAM531fwCL1nz/laN1fScsWf7rG8bQ9th0+R07tg+3UaLzsiHxFpojs bofC2GDuAAwyWwX2UM6uBgH+wDffbt451A== X-Google-Smtp-Source: ABdhPJwAEsr+gtu3VOcXwyS9oQsPNaD0fdi4UEUT6abNjWPtOgTUGeF/gKOBfqSfwntEtHtqA8vYhg== X-Received: by 2002:ac8:39e6:: with SMTP id v93mr14893067qte.139.1611847070962; Thu, 28 Jan 2021 07:17:50 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Subject: [PATCH 2/3] spapr_numa.c: create spapr_numa_initial_nvgpu_NUMA_id() helper Date: Thu, 28 Jan 2021 12:17:30 -0300 Message-Id: <20210128151731.1333664-3-danielhb413@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210128151731.1333664-1-danielhb413@gmail.com> References: <20210128151731.1333664-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::82e; envelope-from=danielhb413@gmail.com; helo=mail-qt1-x82e.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: clg@kaod.org, Daniel Henrique Barboza , qemu-ppc@nongnu.org, groug@kaod.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" We'll need to check the initial value given to spapr->gpu_numa_id when building the rtas DT, so put it in a helper for easier access and to avoid repetition. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Greg Kurz Tested-by: C=C3=A9dric Le Goater --- hw/ppc/spapr.c | 12 ++---------- hw/ppc/spapr_numa.c | 14 ++++++++++++++ include/hw/ppc/spapr_numa.h | 1 + 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 2d60c6f594..c2b74cbfdf 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2765,16 +2765,8 @@ static void spapr_machine_init(MachineState *machine) =20 } =20 - /* - * NVLink2-connected GPU RAM needs to be placed on a separate NUMA nod= e. - * We assign a new numa ID per GPU in spapr_pci_collect_nvgpu() which = is - * called from vPHB reset handler so we initialize the counter here. - * If no NUMA is configured from the QEMU side, we start from 1 as GPU= RAM - * must be equally distant from any other node. - * The final value of spapr->gpu_numa_id is going to be written to - * max-associativity-domains in spapr_build_fdt(). - */ - spapr->gpu_numa_id =3D MAX(1, machine->numa_state->num_nodes); + /* Init gpu_numa_id */ + spapr->gpu_numa_id =3D spapr_numa_initial_nvgpu_NUMA_id(machine); =20 /* Init numa_assoc_array */ spapr_numa_associativity_init(spapr, machine); diff --git a/hw/ppc/spapr_numa.c b/hw/ppc/spapr_numa.c index 261810525b..f71105c783 100644 --- a/hw/ppc/spapr_numa.c +++ b/hw/ppc/spapr_numa.c @@ -46,6 +46,20 @@ static bool spapr_numa_is_symmetrical(MachineState *ms) return true; } =20 +/* + * NVLink2-connected GPU RAM needs to be placed on a separate NUMA node. + * We assign a new numa ID per GPU in spapr_pci_collect_nvgpu() which is + * called from vPHB reset handler so we initialize the counter here. + * If no NUMA is configured from the QEMU side, we start from 1 as GPU RAM + * must be equally distant from any other node. + * The final value of spapr->gpu_numa_id is going to be written to + * max-associativity-domains in spapr_build_fdt(). + */ +unsigned int spapr_numa_initial_nvgpu_NUMA_id(MachineState *machine) +{ + return MAX(1, machine->numa_state->num_nodes); +} + /* * This function will translate the user distances into * what the kernel understand as possible values: 10 diff --git a/include/hw/ppc/spapr_numa.h b/include/hw/ppc/spapr_numa.h index b3fd950634..6655bcf281 100644 --- a/include/hw/ppc/spapr_numa.h +++ b/include/hw/ppc/spapr_numa.h @@ -31,5 +31,6 @@ int spapr_numa_fixup_cpu_dt(SpaprMachineState *spapr, voi= d *fdt, int offset, PowerPCCPU *cpu); int spapr_numa_write_assoc_lookup_arrays(SpaprMachineState *spapr, void *f= dt, int offset); +unsigned int spapr_numa_initial_nvgpu_NUMA_id(MachineState *machine); =20 #endif /* HW_SPAPR_NUMA_H */ --=20 2.26.2 From nobody Fri May 17 14:22:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1611847329; cv=none; d=zohomail.com; s=zohoarc; b=GAu33cAxyrlsDKQG8U2uEwFe186Dskk/MZa/jmyqra/TpB5n0KPcHQx1SGABzrJzJo2BXo4SPtG/M9FiiSPRxOuR8FW3DfVcGcxJO+W8AVzdHa67FVJjvHjy6CK4/tVwnKlhH4ldqLpe0ZsMNSTAn05pZ75MDe33ev1Q/96y3xU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611847329; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sZ5seEbSS5exNcttANlInxArUOCK6rcMzRK2ZFJq80Y=; b=gbVVLcHKhrdSXIQ1OzJhJm0wqNwNmqPCzaNuY1HxsvIS/G37/7C45rBU+V81eqARPPxbWIgn808rGe5KnZ60mgejQNbyOH1ImFtGaFqcdmQGvgMgcc6ds5q7bIpd0uj1UNT5eN4hbo0n671PDjd9t37pRkYhS7DXBugPynEBpE0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16118473297281020.3264456781828; Thu, 28 Jan 2021 07:22:09 -0800 (PST) Received: from localhost ([::1]:47238 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l597Y-0005i9-IT for importer@patchew.org; Thu, 28 Jan 2021 10:22:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l593Y-0001FH-E7; Thu, 28 Jan 2021 10:18:05 -0500 Received: from mail-qt1-x82e.google.com ([2607:f8b0:4864:20::82e]:41166) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l593S-0003TF-Ol; Thu, 28 Jan 2021 10:18:00 -0500 Received: by mail-qt1-x82e.google.com with SMTP id t14so4270773qto.8; Thu, 28 Jan 2021 07:17:54 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c6:6df1:6267:881f:cc79:a1f7]) by smtp.gmail.com with ESMTPSA id g131sm810855qkb.91.2021.01.28.07.17.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Jan 2021 07:17:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sZ5seEbSS5exNcttANlInxArUOCK6rcMzRK2ZFJq80Y=; b=Ek3x9m5g8vQya6kJs6K0ZLokYfo3xl8E/ED++b1wrt8/BwRcs+0I8L80GLfDxIWSm4 ihi57ZtRmrWvXusm1NY83r02y3lp7PJigNwAXL5iazRmb55VIM/pL/fdLDiPHTsw+ibX tD+PIjn/alDkOAIx+W8xiMQdxty7IqBmuVVu3Ocil57DwUBxo7aIYaxzb3HRqrCEZ2/I OgACC7abUs+VZDn7+PUys8Du/DeRpoYP7IJh+W590Svyb/PhhPF3IdiyZxVK6ebjFWsN IdJx6yjcrrfFemMGZi+exFRzTtKn316WwIXhxL7Amt2RxMWEOXXiUBraOyM/gghCJQHn V88w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sZ5seEbSS5exNcttANlInxArUOCK6rcMzRK2ZFJq80Y=; b=SSjFcNz/5aWrLgGvjmFFvEBi4V3mPmUuErZIuv/JHIysS3sX0iq+128fh19rAOVKHA oV740OunrdHSAkRtrCGRHNiQ4jNefxL/SfTcNcekZDMhaTg1pBo/K1FpeexZFR2uXLx1 rYoryP4Tq8JlEjOSpsOTcCJ7HaEifQD7cqxmV7zNNNv0UmZfrNpX3Dhr68uQCFLN7AIA pmdcTWKAh28tN6TgkMMMwZoQ2xcBUXcSS1wQO/yDSknQhPaS+KGM+orBuV2hjkz+jMVF gZj3vnJZvYc5TIipOkU3C1B4I/0+3z5WHJxuPm+E2gznhZaN7oPKCH0x/zX3/Zd9LA/r TFKg== X-Gm-Message-State: AOAM531kgffVFQldbakxSjDdlBN9em9/atgMUR4HBJ3j7ntqfKJFZJE3 zCUZIJrkVOuPyIOmOhM8i9EueHP+Lss/Gw== X-Google-Smtp-Source: ABdhPJzyuQwQQ/Utkpu1OFmdPZTWUpK9i9PM21fINI4ODIUROBYXqLbaMCytT9eMW+PjkPi33QT0fg== X-Received: by 2002:ac8:6799:: with SMTP id b25mr14668449qtp.100.1611847073348; Thu, 28 Jan 2021 07:17:53 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Subject: [PATCH 3/3] spapr_numa.c: fix ibm, max-associativity-domains calculation Date: Thu, 28 Jan 2021 12:17:31 -0300 Message-Id: <20210128151731.1333664-4-danielhb413@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210128151731.1333664-1-danielhb413@gmail.com> References: <20210128151731.1333664-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::82e; envelope-from=danielhb413@gmail.com; helo=mail-qt1-x82e.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: clg@kaod.org, Daniel Henrique Barboza , qemu-ppc@nongnu.org, groug@kaod.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The current logic for calculating 'maxdomain' making it a sum of numa_state->num_nodes with spapr->gpu_numa_id. spapr->gpu_numa_id is used as a index to determine the next available NUMA id that a given NVGPU can use. The problem is that the initial value of gpu_numa_id, for any topology that has more than one NUMA node, is equal to numa_state->num_nodes. This means that our maxdomain will always be, at least, twice the amount of existing NUMA nodes. This means that a guest with 4 NUMA nodes will end up with the following max-associativity-domains: rtas/ibm,max-associativity-domains 00000004 00000008 00000008 00000008 00000008 This overtuning of maxdomains doesn't go unnoticed in the guest, being detected in SLUB during boot: dmesg | grep SLUB [ 0.000000] SLUB: HWalign=3D128, Order=3D0-3, MinObjects=3D0, CPUs=3D4, = Nodes=3D8 SLUB is detecting 8 total nodes, with 4 nodes being online. This patch fixes ibm,max-associativity-domains by considering the amount of NVGPUs NUMA nodes presented in the guest, instead of spapr->gpu_numa_id. Reported-by: C=C3=A9dric Le Goater Signed-off-by: Daniel Henrique Barboza Tested-by: C=C3=A9dric Le Goater --- hw/ppc/spapr_numa.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/hw/ppc/spapr_numa.c b/hw/ppc/spapr_numa.c index f71105c783..f4d6abce87 100644 --- a/hw/ppc/spapr_numa.c +++ b/hw/ppc/spapr_numa.c @@ -60,6 +60,19 @@ unsigned int spapr_numa_initial_nvgpu_NUMA_id(MachineSta= te *machine) return MAX(1, machine->numa_state->num_nodes); } =20 +/* + * Note: if called before spapr_phb_pci_collect_nvgpu() finishes collecting + * all NVGPUs, this function will not give the right number of NVGPUs NUMA + * nodes. + */ +static +unsigned int spapr_numa_get_number_nvgpus_nodes(SpaprMachineState *spapr) +{ + MachineState *ms =3D MACHINE(spapr); + + return spapr->gpu_numa_id - spapr_numa_initial_nvgpu_NUMA_id(ms); +} + /* * This function will translate the user distances into * what the kernel understand as possible values: 10 @@ -311,6 +324,7 @@ void spapr_numa_write_rtas_dt(SpaprMachineState *spapr,= void *fdt, int rtas) { MachineState *ms =3D MACHINE(spapr); SpaprMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(spapr); + uint32_t number_nvgpus_nodes =3D spapr_numa_get_number_nvgpus_nodes(sp= apr); uint32_t refpoints[] =3D { cpu_to_be32(0x4), cpu_to_be32(0x3), @@ -318,7 +332,7 @@ void spapr_numa_write_rtas_dt(SpaprMachineState *spapr,= void *fdt, int rtas) cpu_to_be32(0x1), }; uint32_t nr_refpoints =3D ARRAY_SIZE(refpoints); - uint32_t maxdomain =3D ms->numa_state->num_nodes + spapr->gpu_numa_id; + uint32_t maxdomain =3D ms->numa_state->num_nodes + number_nvgpus_nodes; uint32_t maxdomains[] =3D { cpu_to_be32(4), cpu_to_be32(maxdomain), --=20 2.26.2