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 F2A85EB64DA for ; Tue, 4 Jul 2023 15:13:20 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGhht-00038B-Fm; Tue, 04 Jul 2023 11:12:45 -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 1qGhhr-000374-Na for qemu-devel@nongnu.org; Tue, 04 Jul 2023 11:12:43 -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 1qGhhp-0007zC-M7 for qemu-devel@nongnu.org; Tue, 04 Jul 2023 11:12:43 -0400 Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-992f15c36fcso523641166b.3 for ; Tue, 04 Jul 2023 08:12:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1688483560; x=1691075560; 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=UmwEhHGCiPaByJisLi3VmUJ7Uu9s7XovyhRxpM0ByVo=; b=S6xyKfnLmgSL390ag4/Mb5Pi2POMaMiUvAQJKyXPglWbayXbrZd0XXtwnAPq/ilWFE QGNaETVwgm/jP4XR6Sjamsu0dtchAKrsZiUVurN1uc1LsjKMQ4QhqaJrWeR0m7y2lCFk JqNP5QA6jaqdWcCYmf6Lg/1rGFnGgYGTFZJ4VD4u97Z8HAa2bzHemsA2sxXGZ6iW71jA t/kV+SUUMDd8ZALULU6nHk41KmwzHbM/QM0hN2dpIYG9IXSFwK61hLeLUmMfX8uyKWuq mOfNUVW/szx0Qr2Bf6yfzSrqiksX3HG/jSpRK0AzI5t3pXwN5UNDN64sHuZ+aGLzTYNq rr8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688483560; x=1691075560; 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=UmwEhHGCiPaByJisLi3VmUJ7Uu9s7XovyhRxpM0ByVo=; b=kkAL4ijwXAGrfBms+fa1H7YivX6HX+aRP38aPDrX3ve2MnSMNHp6xWTre13d0ECIz9 9U+ToZlY+XHMSpEADPVCTDpZoQMJLXp8A/6HrGWkH7rVczo/ZePicHogqVFeQTZRecby ZWl9fvTftqBYfXoOmGV9/3rysAeM/o8i1KBlD3iY8XXKTvf6XFlolVSKPqcVISrRyetI MRMHRWZrBQ44RV/+xM9rSrqtc+gni1VFJQ4+30p0UIQ5arGek4GsHsePjeYvbfRhDXxZ Jr0prlKFBO4MKaqbtTLrN/uBuez/R6YyVjAhAN0/DCgW88h7VmaVwVJ2pkXvvCoCVPWM jKbw== X-Gm-Message-State: AC+VfDzXN4xTQgHs6uQ2GWMRxZPnaVz8OeX4S/q1SWh1QEB6i9ymgxPw EEBFwp4fzaB5uAB6jtwWef0fBA== X-Google-Smtp-Source: APBJJlEFsaTF0C9YEC6MH3s75YSrBseUxS4LBAy0tC0lcDgNKEGdMAsHr1mltmZVIS/RuN6vnv9Yuw== X-Received: by 2002:a17:906:f196:b0:992:7295:61c9 with SMTP id gs22-20020a170906f19600b00992729561c9mr9981772ejb.69.1688483559913; Tue, 04 Jul 2023 08:12:39 -0700 (PDT) Received: from localhost (cst2-173-16.cust.vodafone.cz. [31.30.173.16]) by smtp.gmail.com with ESMTPSA id i16-20020a1709061cd000b00992e14af9b9sm6189928ejh.134.2023.07.04.08.12.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:12:39 -0700 (PDT) Date: Tue, 4 Jul 2023 17:12:37 +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 , Paolo Bonzini , kvm@vger.kernel.org Subject: Re: [PATCH v4 4/6] target/riscv: Create an KVM AIA irqchip Message-ID: <20230704-e98d67cadfcb3fc3fdf3d958@orel> References: <20230621145500.25624-1-yongxuan.wang@sifive.com> <20230621145500.25624-5-yongxuan.wang@sifive.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230621145500.25624-5-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:54PM +0000, Yong-Xuan Wang wrote: > implement a function to create an KVM AIA chip This is a bit too terse. We should at least summarize the KVM API this uses. > > Signed-off-by: Yong-Xuan Wang > Reviewed-by: Jim Shu > --- > target/riscv/kvm.c | 163 +++++++++++++++++++++++++++++++++++++++ > target/riscv/kvm_riscv.h | 6 ++ > 2 files changed, 169 insertions(+) > > diff --git a/target/riscv/kvm.c b/target/riscv/kvm.c > index eb469e8ca5..3dd8467031 100644 > --- a/target/riscv/kvm.c > +++ b/target/riscv/kvm.c > @@ -34,6 +34,7 @@ > #include "exec/address-spaces.h" > #include "hw/boards.h" > #include "hw/irq.h" > +#include "hw/intc/riscv_imsic.h" > #include "qemu/log.h" > #include "hw/loader.h" > #include "kvm_riscv.h" > @@ -41,6 +42,7 @@ > #include "chardev/char-fe.h" > #include "migration/migration.h" > #include "sysemu/runstate.h" > +#include "hw/riscv/numa.h" > > static uint64_t kvm_riscv_reg_id(CPURISCVState *env, uint64_t type, > uint64_t idx) > @@ -548,3 +550,164 @@ bool kvm_arch_cpu_check_are_resettable(void) > void kvm_arch_accel_class_init(ObjectClass *oc) > { > } > + > +char *kvm_aia_mode_str(uint64_t aia_mode) > +{ > + const char *val; > + > + switch (aia_mode) { > + case KVM_DEV_RISCV_AIA_MODE_EMUL: > + val = "emul"; > + break; > + case KVM_DEV_RISCV_AIA_MODE_HWACCEL: > + val = "hwaccel"; > + break; > + case KVM_DEV_RISCV_AIA_MODE_AUTO: > + default: > + val = "auto"; > + break; > + }; > + > + return g_strdup(val); There's no need to duplicate statically allocated strings unless they need to be manipulated. These strings do not, so this should just be const char *kvm_aia_mode_str(uint64_t aia_mode) { switch (aia_mode) { case KVM_DEV_RISCV_AIA_MODE_EMUL: return "emul"; ... or even just an array const char *kvm_aia_mode_str[] = { "emul", "hwaccel", "auto" }; > +} > + > +void kvm_riscv_aia_create(MachineState *machine, > + uint64_t aia_mode, uint64_t group_shift, > + uint64_t aia_irq_num, uint64_t aia_msi_num, > + uint64_t aplic_base, uint64_t imsic_base, > + uint64_t guest_num) > +{ > + int ret, i; > + int aia_fd = -1; > + uint64_t default_aia_mode; > + uint64_t socket_count = riscv_socket_count(machine); > + uint64_t max_hart_per_socket = 0; > + uint64_t socket, base_hart, hart_count, socket_imsic_base, imsic_addr; > + uint64_t socket_bits, hart_bits, guest_bits; > + > + aia_fd = kvm_create_device(kvm_state, KVM_DEV_TYPE_RISCV_AIA, false); > + > + if (aia_fd < 0) { > + error_report("Unable to create in-kernel irqchip"); > + exit(1); > + } > + For all the "fail to..." error messages below I would change them to "failed to..." > + ret = kvm_device_access(aia_fd, KVM_DEV_RISCV_AIA_GRP_CONFIG, > + KVM_DEV_RISCV_AIA_CONFIG_MODE, > + &default_aia_mode, false, NULL); > + if (ret < 0) { > + error_report("KVM AIA: fail to get current KVM AIA mode"); > + exit(1); > + } > + qemu_log("KVM AIA: default mode is %s\n", > + kvm_aia_mode_str(default_aia_mode)); > + > + if (default_aia_mode != aia_mode) { > + ret = kvm_device_access(aia_fd, KVM_DEV_RISCV_AIA_GRP_CONFIG, > + KVM_DEV_RISCV_AIA_CONFIG_MODE, > + &aia_mode, true, NULL); > + if (ret < 0) > + warn_report("KVM AIA: fail to set KVM AIA mode"); > + else > + qemu_log("KVM AIA: set current mode to %s\n", > + kvm_aia_mode_str(aia_mode)); > + } > + > + ret = kvm_device_access(aia_fd, KVM_DEV_RISCV_AIA_GRP_CONFIG, > + KVM_DEV_RISCV_AIA_CONFIG_SRCS, > + &aia_irq_num, true, NULL); > + if (ret < 0) { > + error_report("KVM AIA: fail to set number of input irq lines"); > + exit(1); > + } > + > + ret = kvm_device_access(aia_fd, KVM_DEV_RISCV_AIA_GRP_CONFIG, > + KVM_DEV_RISCV_AIA_CONFIG_IDS, > + &aia_msi_num, true, NULL); > + if (ret < 0) { > + error_report("KVM AIA: fail to set number of msi"); > + exit(1); > + } > + > + socket_bits = find_last_bit(&socket_count, BITS_PER_LONG) + 1; > + ret = kvm_device_access(aia_fd, KVM_DEV_RISCV_AIA_GRP_CONFIG, > + KVM_DEV_RISCV_AIA_CONFIG_GROUP_BITS, > + &socket_bits, true, NULL); > + if (ret < 0) { > + error_report("KVM AIA: fail to set group_bits"); > + exit(1); > + } > + > + ret = kvm_device_access(aia_fd, KVM_DEV_RISCV_AIA_GRP_CONFIG, > + KVM_DEV_RISCV_AIA_CONFIG_GROUP_SHIFT, > + &group_shift, true, NULL); > + if (ret < 0) { > + error_report("KVM AIA: fail to set group_shift"); > + exit(1); > + } > + > + guest_bits = guest_num == 0 ? 0 : > + find_last_bit(&guest_num, BITS_PER_LONG) + 1; > + ret = kvm_device_access(aia_fd, KVM_DEV_RISCV_AIA_GRP_CONFIG, > + KVM_DEV_RISCV_AIA_CONFIG_GUEST_BITS, > + &guest_bits, true, NULL); > + if (ret < 0) { > + error_report("KVM AIA: fail to set guest_bits"); > + exit(1); > + } > + > + ret = kvm_device_access(aia_fd, KVM_DEV_RISCV_AIA_GRP_ADDR, > + KVM_DEV_RISCV_AIA_ADDR_APLIC, > + &aplic_base, true, NULL); > + if (ret < 0) { > + error_report("KVM AIA: fail to set the base address of APLIC"); > + exit(1); > + } > + > + for (socket = 0; socket < socket_count; socket++) { > + socket_imsic_base = imsic_base + socket * (1U << group_shift); > + hart_count = riscv_socket_hart_count(machine, socket); > + base_hart = riscv_socket_first_hartid(machine, socket); > + > + if (max_hart_per_socket < hart_count) { > + max_hart_per_socket = hart_count; > + } > + > + for (i = 0; i < hart_count; i++) { > + imsic_addr = socket_imsic_base + i * IMSIC_HART_SIZE(guest_bits); > + ret = kvm_device_access(aia_fd, KVM_DEV_RISCV_AIA_GRP_ADDR, > + KVM_DEV_RISCV_AIA_ADDR_IMSIC(i + base_hart), > + &imsic_addr, true, NULL); > + if (ret < 0) { > + error_report("KVM AIA: fail to set the address of IMSICs"); ("KVM AIA: failed to set the IMSIC address for hart index %d", i) > + exit(1); > + } > + } > + } > + > + hart_bits = find_last_bit(&max_hart_per_socket, BITS_PER_LONG) + 1; > + ret = kvm_device_access(aia_fd, KVM_DEV_RISCV_AIA_GRP_CONFIG, > + KVM_DEV_RISCV_AIA_CONFIG_HART_BITS, > + &hart_bits, true, NULL); > + if (ret < 0) { > + error_report("KVM AIA: fail to set hart_bits"); > + exit(1); > + } > + > + if (kvm_has_gsi_routing()) { > + for (uint64_t idx = 0; idx < aia_irq_num + 1; ++idx) { > + /* KVM AIA only has one APLIC instance */ > + kvm_irqchip_add_irq_route(kvm_state, idx, 0, idx); > + } > + kvm_gsi_routing_allowed = true; > + kvm_irqchip_commit_routes(kvm_state); > + } > + > + ret = kvm_device_access(aia_fd, KVM_DEV_RISCV_AIA_GRP_CTRL, > + KVM_DEV_RISCV_AIA_CTRL_INIT, > + NULL, true, NULL); > + if (ret < 0) { > + error_report("KVM AIA: initialized fail"); "KVM AIA: failed to initialize" > + exit(1); > + } > +} > diff --git a/target/riscv/kvm_riscv.h b/target/riscv/kvm_riscv.h > index ed281bdce0..a61f552d1d 100644 > --- a/target/riscv/kvm_riscv.h > +++ b/target/riscv/kvm_riscv.h > @@ -21,5 +21,11 @@ > > void kvm_riscv_reset_vcpu(RISCVCPU *cpu); > void kvm_riscv_set_irq(RISCVCPU *cpu, int irq, int level); > +char *kvm_aia_mode_str(uint64_t aia_mode); > +void kvm_riscv_aia_create(MachineState *machine, > + uint64_t aia_mode, uint64_t group_shift, > + uint64_t aia_irq_num, uint64_t aia_msi_num, > + uint64_t aplic_base, uint64_t imsic_base, > + uint64_t guest_num); > > #endif > -- > 2.17.1 > > Thanks, drew