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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 038C3EB64D9 for ; Tue, 4 Jul 2023 14:35:42 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGh7g-0006S7-H4; Tue, 04 Jul 2023 10:35:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qGh7d-0006RG-Pz for qemu-devel@nongnu.org; Tue, 04 Jul 2023 10:35:18 -0400 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qGh7b-00085j-AJ for qemu-devel@nongnu.org; Tue, 04 Jul 2023 10:35:17 -0400 Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-98de21518fbso652402366b.0 for ; Tue, 04 Jul 2023 07:35:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1688481313; x=1691073313; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=/idiex8dlcjOhgojERQFTwrXQXeG/V0jjTYQO/PRIqk=; b=NRmR6/JjS7rXaCjIOS3OQO7sJrt0qrOfQWXX94dai5aWP3RaPJQKOKupv0AHONx9ro bKzLTjkIxoTpMEBJ6IXB6qTUaK8+CSaJb48inmcUjTk0YisbrzYVm/0PnwQyBeqki6Xo ObQeLxS4TyEWKkkJOUduhhchx2jp7f7CtZJ9dthUIYxe69lKso/RekOhhXNOBBf/8oRO jDBqn3pFo6peDRBiTA2M/8bBHdGJJymRZdpb26WDhYOLkN09kQZ4wMC9t8QaPwDdGFRm vIjq6mLuXQuD2aG6pVzpomEzuZqCYZNsFVg6VMzeLkt2TmZVp8d8DNqSk+91uGuW6vSl qcIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688481313; x=1691073313; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=/idiex8dlcjOhgojERQFTwrXQXeG/V0jjTYQO/PRIqk=; b=cfo9z39vQvWr8VyMDsFkoOaVmgJuuOzQ7o8mQgFSe8V8Yv8iHKSDDYaX2GJ2HIsQPj Yll/TaZCzF86qN5dZVVdlrzHc/F6CMK330DPBzjGjc9sOkMl9pUuK5XgZ3Fl2SrQXZw9 2A0iWgerePFBnnGOCIPTzN0/4ctoHI0//U2usbG370I7K3qNVXiIukeQQBX7TJ6JgBlU hbrxQYRTiePviemz0Ho9459jnhRSK5Jjc7qg/ZZtJXM2Y5YYRW1AWDN9d3z+0y4G+Aim RQrlNIxtoN63B8XjnKwcTBeGi7u5TSEjIIt01QD+knmXzjzWewCsoNvo40Wq2Wku1SZS zSEQ== X-Gm-Message-State: ABy/qLa/+cXLaGqLxDr556BUV3IlIoiF2+iBS1Mak42V/jZB+kGio8zP gHeZfPfrshbwTjfU+OJsdK+mBg== X-Google-Smtp-Source: ACHHUZ45seF8rO4CtYVQcT1gzZHWxziW7kRWMP34xAnt/a9m4PoXjfSzteSGxwpfupO/HDuZIqYnuw== X-Received: by 2002:a17:906:d14a:b0:98e:35d1:9946 with SMTP id br10-20020a170906d14a00b0098e35d19946mr11126812ejb.64.1688481313144; Tue, 04 Jul 2023 07:35:13 -0700 (PDT) Received: from localhost (cst2-173-16.cust.vodafone.cz. [31.30.173.16]) by smtp.gmail.com with ESMTPSA id qn13-20020a170907210d00b00992e51fecfbsm5979585ejb.64.2023.07.04.07.35.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 07:35:12 -0700 (PDT) Date: Tue, 4 Jul 2023 16:35:11 +0200 From: Andrew Jones To: Yong-Xuan Wang Cc: qemu-devel@nongnu.org, qemu-riscv@nongnu.org, rkanwal@rivosinc.com, anup@brainfault.org, dbarboza@ventanamicro.com, atishp@atishpatra.org, vincent.chen@sifive.com, greentime.hu@sifive.com, frank.chang@sifive.com, jim.shu@sifive.com, Palmer Dabbelt , Alistair Francis , Bin Meng , Weiwei Li , Liu Zhiwei Subject: Re: [PATCH v4 2/6] target/riscv: support the AIA device emulation with KVM enabled Message-ID: <20230704-638773f9b5dbcca74d214380@orel> References: <20230621145500.25624-1-yongxuan.wang@sifive.com> <20230621145500.25624-3-yongxuan.wang@sifive.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230621145500.25624-3-yongxuan.wang@sifive.com> Received-SPF: pass client-ip=2a00:1450:4864:20::631; envelope-from=ajones@ventanamicro.com; helo=mail-ej1-x631.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Wed, Jun 21, 2023 at 02:54:52PM +0000, Yong-Xuan Wang wrote: > Remove M mode AIA devices when using KVM acceleration > > Signed-off-by: Yong-Xuan Wang > Reviewed-by: Jim Shu > --- > hw/riscv/virt.c | 207 +++++++++++++++++++++++++----------------------- > 1 file changed, 108 insertions(+), 99 deletions(-) > > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c > index 245c7b97b2..4a1d29a741 100644 > --- a/hw/riscv/virt.c > +++ b/hw/riscv/virt.c > @@ -531,52 +531,54 @@ static void create_fdt_imsic(RISCVVirtState *s, const MemMapEntry *memmap, > imsic_cells = g_new0(uint32_t, ms->smp.cpus * 2); > imsic_regs = g_new0(uint32_t, socket_count * 4); > > - /* M-level IMSIC node */ > - for (cpu = 0; cpu < ms->smp.cpus; cpu++) { > - imsic_cells[cpu * 2 + 0] = cpu_to_be32(intc_phandles[cpu]); > - imsic_cells[cpu * 2 + 1] = cpu_to_be32(IRQ_M_EXT); > - } > - imsic_max_hart_per_socket = 0; > - for (socket = 0; socket < socket_count; socket++) { > - imsic_addr = memmap[VIRT_IMSIC_M].base + > - socket * VIRT_IMSIC_GROUP_MAX_SIZE; > - imsic_size = IMSIC_HART_SIZE(0) * s->soc[socket].num_harts; > - imsic_regs[socket * 4 + 0] = 0; > - imsic_regs[socket * 4 + 1] = cpu_to_be32(imsic_addr); > - imsic_regs[socket * 4 + 2] = 0; > - imsic_regs[socket * 4 + 3] = cpu_to_be32(imsic_size); > - if (imsic_max_hart_per_socket < s->soc[socket].num_harts) { > - imsic_max_hart_per_socket = s->soc[socket].num_harts; > + if (!kvm_enabled()) { > + /* M-level IMSIC node */ > + for (cpu = 0; cpu < ms->smp.cpus; cpu++) { > + imsic_cells[cpu * 2 + 0] = cpu_to_be32(intc_phandles[cpu]); > + imsic_cells[cpu * 2 + 1] = cpu_to_be32(IRQ_M_EXT); > } > - } > - imsic_name = g_strdup_printf("/soc/imsics@%lx", > - (unsigned long)memmap[VIRT_IMSIC_M].base); > - qemu_fdt_add_subnode(ms->fdt, imsic_name); > - qemu_fdt_setprop_string(ms->fdt, imsic_name, "compatible", > - "riscv,imsics"); > - qemu_fdt_setprop_cell(ms->fdt, imsic_name, "#interrupt-cells", > - FDT_IMSIC_INT_CELLS); > - qemu_fdt_setprop(ms->fdt, imsic_name, "interrupt-controller", > - NULL, 0); > - qemu_fdt_setprop(ms->fdt, imsic_name, "msi-controller", > - NULL, 0); > - qemu_fdt_setprop(ms->fdt, imsic_name, "interrupts-extended", > - imsic_cells, ms->smp.cpus * sizeof(uint32_t) * 2); > - qemu_fdt_setprop(ms->fdt, imsic_name, "reg", imsic_regs, > - socket_count * sizeof(uint32_t) * 4); > - qemu_fdt_setprop_cell(ms->fdt, imsic_name, "riscv,num-ids", > - VIRT_IRQCHIP_NUM_MSIS); > - if (socket_count > 1) { > - qemu_fdt_setprop_cell(ms->fdt, imsic_name, "riscv,hart-index-bits", > - imsic_num_bits(imsic_max_hart_per_socket)); > - qemu_fdt_setprop_cell(ms->fdt, imsic_name, "riscv,group-index-bits", > - imsic_num_bits(socket_count)); > - qemu_fdt_setprop_cell(ms->fdt, imsic_name, "riscv,group-index-shift", > - IMSIC_MMIO_GROUP_MIN_SHIFT); > - } > - qemu_fdt_setprop_cell(ms->fdt, imsic_name, "phandle", *msi_m_phandle); > + imsic_max_hart_per_socket = 0; > + for (socket = 0; socket < socket_count; socket++) { > + imsic_addr = memmap[VIRT_IMSIC_M].base + > + socket * VIRT_IMSIC_GROUP_MAX_SIZE; > + imsic_size = IMSIC_HART_SIZE(0) * s->soc[socket].num_harts; > + imsic_regs[socket * 4 + 0] = 0; > + imsic_regs[socket * 4 + 1] = cpu_to_be32(imsic_addr); > + imsic_regs[socket * 4 + 2] = 0; > + imsic_regs[socket * 4 + 3] = cpu_to_be32(imsic_size); > + if (imsic_max_hart_per_socket < s->soc[socket].num_harts) { > + imsic_max_hart_per_socket = s->soc[socket].num_harts; > + } > + } > + imsic_name = g_strdup_printf("/soc/imsics@%lx", > + (unsigned long)memmap[VIRT_IMSIC_M].base); > + qemu_fdt_add_subnode(ms->fdt, imsic_name); > + qemu_fdt_setprop_string(ms->fdt, imsic_name, "compatible", > + "riscv,imsics"); > + qemu_fdt_setprop_cell(ms->fdt, imsic_name, "#interrupt-cells", > + FDT_IMSIC_INT_CELLS); > + qemu_fdt_setprop(ms->fdt, imsic_name, "interrupt-controller", > + NULL, 0); > + qemu_fdt_setprop(ms->fdt, imsic_name, "msi-controller", > + NULL, 0); > + qemu_fdt_setprop(ms->fdt, imsic_name, "interrupts-extended", > + imsic_cells, ms->smp.cpus * sizeof(uint32_t) * 2); > + qemu_fdt_setprop(ms->fdt, imsic_name, "reg", imsic_regs, > + socket_count * sizeof(uint32_t) * 4); > + qemu_fdt_setprop_cell(ms->fdt, imsic_name, "riscv,num-ids", > + VIRT_IRQCHIP_NUM_MSIS); > + if (socket_count > 1) { > + qemu_fdt_setprop_cell(ms->fdt, imsic_name, "riscv,hart-index-bits", > + imsic_num_bits(imsic_max_hart_per_socket)); > + qemu_fdt_setprop_cell(ms->fdt, imsic_name, "riscv,group-index-bits", > + imsic_num_bits(socket_count)); > + qemu_fdt_setprop_cell(ms->fdt, imsic_name, > + "riscv,group-index-shift", IMSIC_MMIO_GROUP_MIN_SHIFT); > + } > + qemu_fdt_setprop_cell(ms->fdt, imsic_name, "phandle", *msi_m_phandle); > > - g_free(imsic_name); > + g_free(imsic_name); > + } The create_fdt_imsic() code for M-mode and S-mode is nearly identical. I suggest creating a helper function where the differences have been parameterized so we can write this something like void create_fdt_imsic(...) { if (!kvm_enabled()) { create_fdt_one_imsic(VIRT_IMSIC_M, 0, ...); } create_fdt_one_imsic(VIRT_IMSIC_S, imsic_num_bits(s->aia_guests + 1), ...); } > > /* S-level IMSIC node */ > for (cpu = 0; cpu < ms->smp.cpus; cpu++) { > @@ -653,37 +655,40 @@ static void create_fdt_socket_aplic(RISCVVirtState *s, > aplic_s_phandle = (*phandle)++; > aplic_cells = g_new0(uint32_t, s->soc[socket].num_harts * 2); > > - /* M-level APLIC node */ > - for (cpu = 0; cpu < s->soc[socket].num_harts; cpu++) { > - aplic_cells[cpu * 2 + 0] = cpu_to_be32(intc_phandles[cpu]); > - aplic_cells[cpu * 2 + 1] = cpu_to_be32(IRQ_M_EXT); > - } > - aplic_addr = memmap[VIRT_APLIC_M].base + > - (memmap[VIRT_APLIC_M].size * socket); > - aplic_name = g_strdup_printf("/soc/aplic@%lx", aplic_addr); > - qemu_fdt_add_subnode(ms->fdt, aplic_name); > - qemu_fdt_setprop_string(ms->fdt, aplic_name, "compatible", "riscv,aplic"); > - qemu_fdt_setprop_cell(ms->fdt, aplic_name, > - "#interrupt-cells", FDT_APLIC_INT_CELLS); > - qemu_fdt_setprop(ms->fdt, aplic_name, "interrupt-controller", NULL, 0); > - if (s->aia_type == VIRT_AIA_TYPE_APLIC) { > - qemu_fdt_setprop(ms->fdt, aplic_name, "interrupts-extended", > - aplic_cells, s->soc[socket].num_harts * sizeof(uint32_t) * 2); > - } else { > - qemu_fdt_setprop_cell(ms->fdt, aplic_name, "msi-parent", > - msi_m_phandle); > + if (!kvm_enabled()) { > + /* M-level APLIC node */ > + for (cpu = 0; cpu < s->soc[socket].num_harts; cpu++) { > + aplic_cells[cpu * 2 + 0] = cpu_to_be32(intc_phandles[cpu]); > + aplic_cells[cpu * 2 + 1] = cpu_to_be32(IRQ_M_EXT); > + } > + aplic_addr = memmap[VIRT_APLIC_M].base + > + (memmap[VIRT_APLIC_M].size * socket); > + aplic_name = g_strdup_printf("/soc/aplic@%lx", aplic_addr); > + qemu_fdt_add_subnode(ms->fdt, aplic_name); > + qemu_fdt_setprop_string(ms->fdt, aplic_name, > + "compatible", "riscv,aplic"); > + qemu_fdt_setprop_cell(ms->fdt, aplic_name, > + "#interrupt-cells", FDT_APLIC_INT_CELLS); > + qemu_fdt_setprop(ms->fdt, aplic_name, "interrupt-controller", NULL, 0); > + if (s->aia_type == VIRT_AIA_TYPE_APLIC) { > + qemu_fdt_setprop(ms->fdt, aplic_name, "interrupts-extended", > + aplic_cells, s->soc[socket].num_harts * sizeof(uint32_t) * 2); > + } else { > + qemu_fdt_setprop_cell(ms->fdt, aplic_name, "msi-parent", > + msi_m_phandle); > + } > + qemu_fdt_setprop_cells(ms->fdt, aplic_name, "reg", > + 0x0, aplic_addr, 0x0, memmap[VIRT_APLIC_M].size); > + qemu_fdt_setprop_cell(ms->fdt, aplic_name, "riscv,num-sources", > + VIRT_IRQCHIP_NUM_SOURCES); > + qemu_fdt_setprop_cell(ms->fdt, aplic_name, "riscv,children", > + aplic_s_phandle); > + qemu_fdt_setprop_cells(ms->fdt, aplic_name, "riscv,delegate", > + aplic_s_phandle, 0x1, VIRT_IRQCHIP_NUM_SOURCES); > + riscv_socket_fdt_write_id(ms, aplic_name, socket); > + qemu_fdt_setprop_cell(ms->fdt, aplic_name, "phandle", aplic_m_phandle); > + g_free(aplic_name); > } > - qemu_fdt_setprop_cells(ms->fdt, aplic_name, "reg", > - 0x0, aplic_addr, 0x0, memmap[VIRT_APLIC_M].size); > - qemu_fdt_setprop_cell(ms->fdt, aplic_name, "riscv,num-sources", > - VIRT_IRQCHIP_NUM_SOURCES); > - qemu_fdt_setprop_cell(ms->fdt, aplic_name, "riscv,children", > - aplic_s_phandle); > - qemu_fdt_setprop_cells(ms->fdt, aplic_name, "riscv,delegate", > - aplic_s_phandle, 0x1, VIRT_IRQCHIP_NUM_SOURCES); > - riscv_socket_fdt_write_id(ms, aplic_name, socket); > - qemu_fdt_setprop_cell(ms->fdt, aplic_name, "phandle", aplic_m_phandle); > - g_free(aplic_name); I think it should be possible to parameterize an aplic helper as well. > > /* S-level APLIC node */ > for (cpu = 0; cpu < s->soc[socket].num_harts; cpu++) { > @@ -1162,16 +1167,20 @@ static DeviceState *virt_create_aia(RISCVVirtAIAType aia_type, int aia_guests, > int i; > hwaddr addr; > uint32_t guest_bits; > - DeviceState *aplic_m; > + DeviceState *aplic_s = NULL; > + DeviceState *aplic_m = NULL; > bool msimode = (aia_type == VIRT_AIA_TYPE_APLIC_IMSIC) ? true : false; Not introduced with this patch, but we should drop the unnecessary () and '? true : false' on this line. > > if (msimode) { > - /* Per-socket M-level IMSICs */ > - addr = memmap[VIRT_IMSIC_M].base + socket * VIRT_IMSIC_GROUP_MAX_SIZE; > - for (i = 0; i < hart_count; i++) { > - riscv_imsic_create(addr + i * IMSIC_HART_SIZE(0), > - base_hartid + i, true, 1, > - VIRT_IRQCHIP_NUM_MSIS); > + if (!kvm_enabled()) { > + /* Per-socket M-level IMSICs */ > + addr = memmap[VIRT_IMSIC_M].base + > + socket * VIRT_IMSIC_GROUP_MAX_SIZE; > + for (i = 0; i < hart_count; i++) { > + riscv_imsic_create(addr + i * IMSIC_HART_SIZE(0), > + base_hartid + i, true, 1, > + VIRT_IRQCHIP_NUM_MSIS); > + } > } > > /* Per-socket S-level IMSICs */ > @@ -1184,29 +1193,29 @@ static DeviceState *virt_create_aia(RISCVVirtAIAType aia_type, int aia_guests, > } > } > > - /* Per-socket M-level APLIC */ > - aplic_m = riscv_aplic_create( > - memmap[VIRT_APLIC_M].base + socket * memmap[VIRT_APLIC_M].size, > - memmap[VIRT_APLIC_M].size, > + if (!kvm_enabled()) { > + /* Per-socket M-level APLIC */ > + aplic_m = riscv_aplic_create( > + memmap[VIRT_APLIC_M].base + socket * memmap[VIRT_APLIC_M].size, > + memmap[VIRT_APLIC_M].size, > + (msimode) ? 0 : base_hartid, > + (msimode) ? 0 : hart_count, > + VIRT_IRQCHIP_NUM_SOURCES, > + VIRT_IRQCHIP_NUM_PRIO_BITS, > + msimode, true, NULL); > + } > + > + /* Per-socket S-level APLIC */ > + aplic_s = riscv_aplic_create( > + memmap[VIRT_APLIC_S].base + socket * memmap[VIRT_APLIC_S].size, > + memmap[VIRT_APLIC_S].size, > (msimode) ? 0 : base_hartid, > (msimode) ? 0 : hart_count, > VIRT_IRQCHIP_NUM_SOURCES, > VIRT_IRQCHIP_NUM_PRIO_BITS, > - msimode, true, NULL); > - > - if (aplic_m) { > - /* Per-socket S-level APLIC */ > - riscv_aplic_create( > - memmap[VIRT_APLIC_S].base + socket * memmap[VIRT_APLIC_S].size, > - memmap[VIRT_APLIC_S].size, > - (msimode) ? 0 : base_hartid, > - (msimode) ? 0 : hart_count, > - VIRT_IRQCHIP_NUM_SOURCES, > - VIRT_IRQCHIP_NUM_PRIO_BITS, > - msimode, false, aplic_m); > - } > + msimode, false, aplic_m); > > - return aplic_m; > + return kvm_enabled() ? aplic_s : aplic_m; > } > > static void create_platform_bus(RISCVVirtState *s, DeviceState *irqchip) > -- > 2.17.1 > > Thanks, drew