From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5BABEC433DF for ; Sat, 13 Jun 2020 01:02:50 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 13C1B206F5 for ; Sat, 13 Jun 2020 01:02:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DGCD5JnP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 13C1B206F5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjuZN-0003SM-AN for qemu-devel@archiver.kernel.org; Fri, 12 Jun 2020 21:02:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjuYb-00030x-D1; Fri, 12 Jun 2020 21:02:01 -0400 Received: from mail-io1-xd42.google.com ([2607:f8b0:4864:20::d42]:45183) by eggs.gnu.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jjuYY-0000Sz-LR; Fri, 12 Jun 2020 21:02:01 -0400 Received: by mail-io1-xd42.google.com with SMTP id y5so12119948iob.12; Fri, 12 Jun 2020 18:01:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=UevGvUZsbLJ64pd01J92B00PQ3Vlyu8PftiS9ERthlY=; b=DGCD5JnPWFqfltLL6aax68imi4tVF6Qw5P0FTz26No6fz0mP9zlaXLWOY4+zSCRAfM 7akG9ma3mDhUp8UlEMHIAdlwrrV4FdxPPaUeWiftOlnv1b9DerC1NvaRcWaWcOuPxrqG YyDZwH+2DDSODec3l7L/0p4hWUgkO8QqbvF6YjMjd2rVxLqqb481WZNrkMr58Ci1kmqO 2utpAn5+ittwD+94/icBO/lpJLpDZqpTqRxj3Vpzq9I9+JuAyoaxTz1mdNEkOiHVoChV 0vD7CPDMet36VVCAJ7b1zBFD+vrwc0paPLtIdtKIWM5ehX0OfODAYiz3VZSLpwOxWg6f eO7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=UevGvUZsbLJ64pd01J92B00PQ3Vlyu8PftiS9ERthlY=; b=bkYI2eYE4zoiI2MXka/VxgUWxu9E2tUTySCZkakGgltB0wDDHQOZjlZssLqgdyBQFy qwTiLQ+P+96vxvVRpSuFnXw/KjNxrE3OO95y6fCMQStCl+0sR+ulmFvhyghJu/E6Lzyv NoduVy3mXUGrot81wiybGz8GZLk2XdTezcNK4KhpcIkLjeqqLXn5Pb3Ksf4jCOvTZ57o 1Zg0U32WMNLKmVLdBYPiQQkylWfLjxGQsyH5XxoAErkH8RNbmcWuMUVxAOApWFGlUZM0 Aljn5ux/A4iTehwbwJV4dCa2AZWb0mBofrHjPanviCmeMUtT94xd9onifJf/IfDMthLf JMbw== X-Gm-Message-State: AOAM530ifIfqH2Kscogiqnp6YP3wi/E+4mJp2/v0A4CjZnDDA3TxW4eY CGet8nkLulQxnj2jAR0KILDHuN3Jc+k/JJnvR6w= X-Google-Smtp-Source: ABdhPJyVFj3fd5tI55sq5fdEOzPxExbU+QZFU2IxFmtYK5DvvwprhNKNj0KRCmQYnk1G/6rjjP+3Mbw6pFWoJsCr0F4= X-Received: by 2002:a02:b782:: with SMTP id f2mr10614948jam.91.1592010106607; Fri, 12 Jun 2020 18:01:46 -0700 (PDT) MIME-Version: 1.0 References: <20200529114641.121332-1-anup.patel@wdc.com> <20200529114641.121332-4-anup.patel@wdc.com> In-Reply-To: From: Alistair Francis Date: Fri, 12 Jun 2020 17:52:19 -0700 Message-ID: Subject: Re: [PATCH v5 3/5] hw/riscv: Add helpers for RISC-V multi-socket NUMA machines To: Anup Patel Content-Type: text/plain; charset="UTF-8" Received-SPF: pass client-ip=2607:f8b0:4864:20::d42; envelope-from=alistair23@gmail.com; helo=mail-io1-xd42.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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=_AUTOLEARN 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: Peter Maydell , "open list:RISC-V" , Sagar Karandikar , Anup Patel , "qemu-devel@nongnu.org Developers" , Atish Patra , Alistair Francis , Palmer Dabbelt Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Thu, Jun 11, 2020 at 6:11 AM Anup Patel wrote: > > > > > -----Original Message----- > > From: Qemu-riscv > bounces+anup.patel=wdc.com@nongnu.org> On Behalf Of Alistair Francis > > Sent: 11 June 2020 04:59 > > To: Anup Patel > > Cc: Peter Maydell ; open list:RISC-V > riscv@nongnu.org>; Sagar Karandikar ; Anup > > Patel ; qemu-devel@nongnu.org Developers > devel@nongnu.org>; Atish Patra ; Alistair Francis > > ; Palmer Dabbelt > > Subject: Re: [PATCH v5 3/5] hw/riscv: Add helpers for RISC-V multi-socket > > NUMA machines > > > > On Fri, May 29, 2020 at 4:48 AM Anup Patel wrote: > > > > > > We add common helper routines which can be shared by RISC-V > > > multi-socket NUMA machines. > > > > > > We have two types of helpers: > > > 1. riscv_socket_xyz() - These helper assist managing multiple > > > sockets irrespective whether QEMU NUMA is enabled/disabled 2. > > > riscv_numa_xyz() - These helpers assist in providing > > > necessary QEMU machine callbacks for QEMU NUMA emulation > > > > > > Signed-off-by: Anup Patel > > > --- > > > hw/riscv/Makefile.objs | 1 + > > > hw/riscv/numa.c | 242 > > ++++++++++++++++++++++++++++++++++++++++ > > > include/hw/riscv/numa.h | 51 +++++++++ > > > 3 files changed, 294 insertions(+) > > > create mode 100644 hw/riscv/numa.c > > > create mode 100644 include/hw/riscv/numa.h > > > > I don't love that we have an entire file of functions to help with NUMA when > > no other arch seems to have anything this complex. > > > > What about RISC-V requires extra complexity? > > Other architectures, generally have one machine supporting NUMA. > > In QEMU RISC-V, we are supporting NUMA in two machines (i.e Virt > and Spike). Both these machines, are synthetic machines and don't > match real-world hardware. The Spike machine is even more unique > because it has minimum number of devices and no interrupt controller. > > In future, we might have few more machines in QEMU RISC-V having > NUMA/multi-socket support. > > Comparted to other architectures, the riscv_numa_xyz() callbacks > defined here do: > 1. Linear mapping of CPU arch_id to CPU logical idx > 2. Linear assignment of node_id to CPU idx > > The requirement 2) mentioned above is because CLINT and PLIC > device emulation require contiguous hard IDs in a socket. Ok, fair enough :) Do you mind sending a new version, I think the Spike part will need to be rebased on top of the Spike machine changes. Then just pressure Atish to ack the DT changes :P Alistair > > Regards, > Anup > > > > > > > > > diff --git a/hw/riscv/Makefile.objs b/hw/riscv/Makefile.objs index > > > fc3c6dd7c8..4483e61879 100644 > > > --- a/hw/riscv/Makefile.objs > > > +++ b/hw/riscv/Makefile.objs > > > @@ -1,4 +1,5 @@ > > > obj-y += boot.o > > > +obj-y += numa.o > > > obj-$(CONFIG_SPIKE) += riscv_htif.o > > > obj-$(CONFIG_HART) += riscv_hart.o > > > obj-$(CONFIG_SIFIVE_E) += sifive_e.o > > > diff --git a/hw/riscv/numa.c b/hw/riscv/numa.c new file mode 100644 > > > index 0000000000..4f92307102 > > > --- /dev/null > > > +++ b/hw/riscv/numa.c > > > @@ -0,0 +1,242 @@ > > > +/* > > > + * QEMU RISC-V NUMA Helper > > > + * > > > + * Copyright (c) 2020 Western Digital Corporation or its affiliates. > > > + * > > > + * This program is free software; you can redistribute it and/or > > > +modify it > > > + * under the terms and conditions of the GNU General Public License, > > > + * version 2 or later, as published by the Free Software Foundation. > > > + * > > > + * This program is distributed in the hope it will be useful, but > > > +WITHOUT > > > + * ANY WARRANTY; without even the implied warranty of > > MERCHANTABILITY > > > +or > > > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public > > > +License for > > > + * more details. > > > + * > > > + * You should have received a copy of the GNU General Public License > > > +along with > > > + * this program. If not, see . > > > + */ > > > + > > > +#include "qemu/osdep.h" > > > +#include "qemu/units.h" > > > +#include "qemu/log.h" > > > +#include "qemu/error-report.h" > > > +#include "qapi/error.h" > > > +#include "hw/boards.h" > > > +#include "hw/qdev-properties.h" > > > +#include "hw/riscv/numa.h" > > > +#include "sysemu/device_tree.h" > > > + > > > +static bool numa_enabled(const MachineState *ms) { > > > + return (ms->numa_state && ms->numa_state->num_nodes) ? true : > > > +false; } > > > + > > > +int riscv_socket_count(const MachineState *ms) { > > > + return (numa_enabled(ms)) ? ms->numa_state->num_nodes : 1; } > > > + > > > +int riscv_socket_first_hartid(const MachineState *ms, int socket_id) > > > +{ > > > + int i, first_hartid = ms->smp.cpus; > > > + > > > + if (!numa_enabled(ms)) { > > > + return (!socket_id) ? 0 : -1; > > > + } > > > + > > > + for (i = 0; i < ms->smp.cpus; i++) { > > > + if (ms->possible_cpus->cpus[i].props.node_id != socket_id) { > > > + continue; > > > + } > > > + if (i < first_hartid) { > > > + first_hartid = i; > > > + } > > > + } > > > + > > > + return (first_hartid < ms->smp.cpus) ? first_hartid : -1; } > > > + > > > +int riscv_socket_last_hartid(const MachineState *ms, int socket_id) { > > > + int i, last_hartid = -1; > > > + > > > + if (!numa_enabled(ms)) { > > > + return (!socket_id) ? ms->smp.cpus - 1 : -1; > > > + } > > > + > > > + for (i = 0; i < ms->smp.cpus; i++) { > > > + if (ms->possible_cpus->cpus[i].props.node_id != socket_id) { > > > + continue; > > > + } > > > + if (i > last_hartid) { > > > + last_hartid = i; > > > + } > > > + } > > > + > > > + return (last_hartid < ms->smp.cpus) ? last_hartid : -1; } > > > + > > > +int riscv_socket_hart_count(const MachineState *ms, int socket_id) { > > > + int first_hartid, last_hartid; > > > + > > > + if (!numa_enabled(ms)) { > > > + return (!socket_id) ? ms->smp.cpus : -1; > > > + } > > > + > > > + first_hartid = riscv_socket_first_hartid(ms, socket_id); > > > + if (first_hartid < 0) { > > > + return -1; > > > + } > > > + > > > + last_hartid = riscv_socket_last_hartid(ms, socket_id); > > > + if (last_hartid < 0) { > > > + return -1; > > > + } > > > + > > > + if (first_hartid > last_hartid) { > > > + return -1; > > > + } > > > + > > > + return last_hartid - first_hartid + 1; } > > > + > > > +bool riscv_socket_check_hartids(const MachineState *ms, int > > > +socket_id) { > > > + int i, first_hartid, last_hartid; > > > + > > > + if (!numa_enabled(ms)) { > > > + return (!socket_id) ? true : false; > > > + } > > > + > > > + first_hartid = riscv_socket_first_hartid(ms, socket_id); > > > + if (first_hartid < 0) { > > > + return false; > > > + } > > > + > > > + last_hartid = riscv_socket_last_hartid(ms, socket_id); > > > + if (last_hartid < 0) { > > > + return false; > > > + } > > > + > > > + for (i = first_hartid; i <= last_hartid; i++) { > > > + if (ms->possible_cpus->cpus[i].props.node_id != socket_id) { > > > + return false; > > > + } > > > + } > > > + > > > + return true; > > > +} > > > + > > > +uint64_t riscv_socket_mem_offset(const MachineState *ms, int > > > +socket_id) { > > > + int i; > > > + uint64_t mem_offset = 0; > > > + > > > + if (!numa_enabled(ms)) { > > > + return 0; > > > + } > > > + > > > + for (i = 0; i < ms->numa_state->num_nodes; i++) { > > > + if (i == socket_id) { > > > + break; > > > + } > > > + mem_offset += ms->numa_state->nodes[i].node_mem; > > > + } > > > + > > > + return (i == socket_id) ? mem_offset : 0; } > > > + > > > +uint64_t riscv_socket_mem_size(const MachineState *ms, int socket_id) > > > +{ > > > + if (!numa_enabled(ms)) { > > > + return (!socket_id) ? ms->ram_size : 0; > > > + } > > > + > > > + return (socket_id < ms->numa_state->num_nodes) ? > > > + ms->numa_state->nodes[socket_id].node_mem : 0; } > > > + > > > +void riscv_socket_fdt_write_id(const MachineState *ms, void *fdt, > > > + const char *node_name, int socket_id) > > > +{ > > > + if (numa_enabled(ms)) { > > > + qemu_fdt_setprop_cell(fdt, node_name, "numa-node-id", > > socket_id); > > > + } > > > +} > > > + > > > +void riscv_socket_fdt_write_distance_matrix(const MachineState *ms, > > > +void *fdt) { > > > + int i, j, idx; > > > + uint32_t *dist_matrix, dist_matrix_size; > > > + > > > + if (numa_enabled(ms) && ms->numa_state->have_numa_distance) { > > > + dist_matrix_size = riscv_socket_count(ms) * riscv_socket_count(ms); > > > + dist_matrix_size *= (3 * sizeof(uint32_t)); > > > + dist_matrix = g_malloc0(dist_matrix_size); > > > + > > > + for (i = 0; i < riscv_socket_count(ms); i++) { > > > + for (j = 0; j < riscv_socket_count(ms); j++) { > > > + idx = (i * riscv_socket_count(ms) + j) * 3; > > > + dist_matrix[idx + 0] = cpu_to_be32(i); > > > + dist_matrix[idx + 1] = cpu_to_be32(j); > > > + dist_matrix[idx + 2] = > > > + cpu_to_be32(ms->numa_state->nodes[i].distance[j]); > > > + } > > > + } > > > + > > > + qemu_fdt_add_subnode(fdt, "/distance-map"); > > > + qemu_fdt_setprop_string(fdt, "/distance-map", "compatible", > > > + "numa-distance-map-v1"); > > > + qemu_fdt_setprop(fdt, "/distance-map", "distance-matrix", > > > + dist_matrix, dist_matrix_size); > > > + g_free(dist_matrix); > > > + } > > > +} > > > + > > > +CpuInstanceProperties > > > +riscv_numa_cpu_index_to_props(MachineState *ms, unsigned > > cpu_index) { > > > + MachineClass *mc = MACHINE_GET_CLASS(ms); > > > + const CPUArchIdList *possible_cpus = > > > +mc->possible_cpu_arch_ids(ms); > > > + > > > + assert(cpu_index < possible_cpus->len); > > > + return possible_cpus->cpus[cpu_index].props; > > > +} > > > + > > > +int64_t riscv_numa_get_default_cpu_node_id(const MachineState *ms, > > > +int idx) { > > > + int64_t nidx = 0; > > > + > > > + if (ms->numa_state->num_nodes) { > > > + nidx = idx / (ms->smp.cpus / ms->numa_state->num_nodes); > > > + if (ms->numa_state->num_nodes <= nidx) { > > > + nidx = ms->numa_state->num_nodes - 1; > > > + } > > > + } > > > + > > > + return nidx; > > > +} > > > + > > > +const CPUArchIdList *riscv_numa_possible_cpu_arch_ids(MachineState > > > +*ms) { > > > + int n; > > > + unsigned int max_cpus = ms->smp.max_cpus; > > > + > > > + if (ms->possible_cpus) { > > > + assert(ms->possible_cpus->len == max_cpus); > > > + return ms->possible_cpus; > > > + } > > > + > > > + ms->possible_cpus = g_malloc0(sizeof(CPUArchIdList) + > > > + sizeof(CPUArchId) * max_cpus); > > > + ms->possible_cpus->len = max_cpus; > > > + for (n = 0; n < ms->possible_cpus->len; n++) { > > > + ms->possible_cpus->cpus[n].type = ms->cpu_type; > > > + ms->possible_cpus->cpus[n].arch_id = n; > > > + ms->possible_cpus->cpus[n].props.has_core_id = true; > > > + ms->possible_cpus->cpus[n].props.core_id = n; > > > + } > > > + > > > + return ms->possible_cpus; > > > +} > > > diff --git a/include/hw/riscv/numa.h b/include/hw/riscv/numa.h new > > > file mode 100644 index 0000000000..fd9517a315 > > > --- /dev/null > > > +++ b/include/hw/riscv/numa.h > > > @@ -0,0 +1,51 @@ > > > +/* > > > + * QEMU RISC-V NUMA Helper > > > + * > > > + * Copyright (c) 2020 Western Digital Corporation or its affiliates. > > > + * > > > + * This program is free software; you can redistribute it and/or > > > +modify it > > > + * under the terms and conditions of the GNU General Public License, > > > + * version 2 or later, as published by the Free Software Foundation. > > > + * > > > + * This program is distributed in the hope it will be useful, but > > > +WITHOUT > > > + * ANY WARRANTY; without even the implied warranty of > > MERCHANTABILITY > > > +or > > > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public > > > +License for > > > + * more details. > > > + * > > > + * You should have received a copy of the GNU General Public License > > > +along with > > > + * this program. If not, see . > > > + */ > > > + > > > +#ifndef RISCV_NUMA_H > > > +#define RISCV_NUMA_H > > > + > > > +#include "hw/sysbus.h" > > > +#include "sysemu/numa.h" > > > + > > > +int riscv_socket_count(const MachineState *ms); > > > + > > > +int riscv_socket_first_hartid(const MachineState *ms, int socket_id); > > > + > > > +int riscv_socket_last_hartid(const MachineState *ms, int socket_id); > > > + > > > +int riscv_socket_hart_count(const MachineState *ms, int socket_id); > > > + > > > +uint64_t riscv_socket_mem_offset(const MachineState *ms, int > > > +socket_id); > > > + > > > +uint64_t riscv_socket_mem_size(const MachineState *ms, int > > > +socket_id); > > > + > > > +bool riscv_socket_check_hartids(const MachineState *ms, int > > > +socket_id); > > > + > > > +void riscv_socket_fdt_write_id(const MachineState *ms, void *fdt, > > > + const char *node_name, int socket_id); > > > + > > > +void riscv_socket_fdt_write_distance_matrix(const MachineState *ms, > > > +void *fdt); > > > + > > > +CpuInstanceProperties > > > +riscv_numa_cpu_index_to_props(MachineState *ms, unsigned > > cpu_index); > > > + > > > +int64_t riscv_numa_get_default_cpu_node_id(const MachineState *ms, > > > +int idx); > > > + > > > +const CPUArchIdList *riscv_numa_possible_cpu_arch_ids(MachineState > > > +*ms); > > > > Can we add some comments for the functions of what they are expected to > > return (and that -1 is an error)? > > > > Alistair > > > > > + > > > +#endif /* RISCV_NUMA_H */ > > > -- > > > 2.25.1 > > > > > > >