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 30A9ECFB450 for ; Mon, 7 Oct 2024 18:04:43 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sxs5f-0007fx-Mn; Mon, 07 Oct 2024 14:04:15 -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 1sxs5c-0007eh-DP for qemu-devel@nongnu.org; Mon, 07 Oct 2024 14:04:12 -0400 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sxs5Y-00023t-KT for qemu-devel@nongnu.org; Mon, 07 Oct 2024 14:04:11 -0400 Received: by mail-pg1-x536.google.com with SMTP id 41be03b00d2f7-7ea06275ef2so972035a12.0 for ; Mon, 07 Oct 2024 11:04:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1728324247; x=1728929047; darn=nongnu.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=Aau8fGkCg5aBn9fZ8bbHYXM3XPYvUDH4wISezj3kCq8=; b=Il0cDIbDwvQaqzbN2cHqRKY7IkODivwSRmnz8hDAa/vfmgyMyzgMS9RMqnN8UgHBqR TZIj6HNJVOyRhVVGNl8YzgVFqBy+H4iPJlU4LgRpMwOQ2wsx5CvRq91s2qvieiZL6Y9z mHYIPptNEeVuegfPdt40Q/LZWkTNqOQamBmZSJteW1D/2yWeL3SUkEsD2X+5L2NC1fhx A7lyG3KvIpIYPp5pjK7f/I8twBTcF5nVrPVrYwGXwRIIc8qwgvnB+bXT8B+HbE4KlOHQ GSkr0pHq0uwurUMbjD78vAd/RzZIDOvlhCaJ8hSyNhkTWLTkEE1BEsvJfBwBaq2+r3KU Fugg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728324247; x=1728929047; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Aau8fGkCg5aBn9fZ8bbHYXM3XPYvUDH4wISezj3kCq8=; b=r8F34zz6vIC9R6aFZON1wiGdsX36am71Sr6rBtNwUpInZ6Q9XfhFCsUsb/Mk9+mX1+ ++pRaFoiZ2H5K/hdjLFtdOJIt2D68LjOJlD+d9OC0oOSNAP+7/+KtvqjVSRmnL2sRMkC 0eGXFL2a5yH30On/X1PzbTUXdufnpY+Mb3o2naGWw9QKZkwJgrhgmsfTxqgbBIOj7QEa mrTz0MI95H3iTOy+dxWK7MhWQKp9nyaSWskiVWS7lqFnM1PIgmA2IbWdi+9LEc9+p+n0 Qweqc7g33HjphtkuSX5GjZ/ZA2MG0wVzWdmzEQlHg1MciwXqoKczKNGSfLSsk9U/HOy2 +3YA== X-Gm-Message-State: AOJu0Yy0bhn5PwrM5763pqjo6trwuuI255ygf1fol28hyW4b2IKapKFl NhK4za+uzc/b4V9mBVJU4uJkt+tMtQFQYzWabzzPyKFiNrd3lLSifV0RY3dFFSo= X-Google-Smtp-Source: AGHT+IEOOImKAFSreH5rJrk7Rw1Rw42FZ3u3A0Ao3rU/uoxdkKl+KLfSfM5DOk3BECEMUrspwwJiMw== X-Received: by 2002:a17:90a:77c4:b0:2e1:ce67:5d29 with SMTP id 98e67ed59e1d1-2e1e62a197dmr15443053a91.21.1728324246929; Mon, 07 Oct 2024 11:04:06 -0700 (PDT) Received: from ?IPV6:2400:4050:a840:1e00:32ed:25ae:21b1:72d6? ([2400:4050:a840:1e00:32ed:25ae:21b1:72d6]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e20aed02c2sm5768439a91.24.2024.10.07.11.04.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 07 Oct 2024 11:04:06 -0700 (PDT) Message-ID: <60753df2-c1da-400f-a9d4-36077ab0c1f7@daynix.com> Date: Tue, 8 Oct 2024 03:03:58 +0900 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 12/14] hw/vmapple/cfg: Introduce vmapple cfg region To: Phil Dennis-Jordan Cc: qemu-devel@nongnu.org, agraf@csgraf.de, peter.maydell@linaro.org, pbonzini@redhat.com, rad@semihalf.com, quic_llindhol@quicinc.com, marcin.juszkiewicz@linaro.org, stefanha@redhat.com, mst@redhat.com, slp@redhat.com, richard.henderson@linaro.org, eduardo@habkost.net, marcel.apfelbaum@gmail.com, gaosong@loongson.cn, jiaxun.yang@flygoat.com, chenhuacai@kernel.org, kwolf@redhat.com, hreitz@redhat.com, philmd@linaro.org, shorne@gmail.com, palmer@dabbelt.com, alistair.francis@wdc.com, bmeng.cn@gmail.com, liwei1518@gmail.com, dbarboza@ventanamicro.com, zhiwei_liu@linux.alibaba.com, jcmvbkbc@gmail.com, marcandre.lureau@redhat.com, berrange@redhat.com, qemu-arm@nongnu.org, qemu-block@nongnu.org, qemu-riscv@nongnu.org, Alexander Graf References: <20240928085727.56883-1-phil@philjordan.eu> <20240928085727.56883-13-phil@philjordan.eu> <08fb08f5-b0ca-4334-8896-b0941cea614a@daynix.com> Content-Language: en-US From: Akihiko Odaki In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=2607:f8b0:4864:20::536; envelope-from=akihiko.odaki@daynix.com; helo=mail-pg1-x536.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=unavailable 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 2024/10/07 23:10, Phil Dennis-Jordan wrote: > > > On Sat, 5 Oct 2024 at 07:35, Akihiko Odaki > wrote: > > On 2024/09/28 17:57, Phil Dennis-Jordan wrote: > > From: Alexander Graf > > > > > Instead of device tree or other more standardized means, VMApple > passes > > platform configuration to the first stage boot loader in a binary > encoded > > format that resides at a dedicated RAM region in physical address > space. > > > > This patch models this configuration space as a qdev device which > we can > > then map at the fixed location in the address space. That way, we can > > influence and annotate all configuration fields easily. > > > > Signed-off-by: Alexander Graf > > > Signed-off-by: Phil Dennis-Jordan > > > > > --- > > v3: > > > >   * Replaced legacy device reset method with Resettable method > > > >   hw/vmapple/Kconfig       |   3 ++ > >   hw/vmapple/cfg.c         | 106 ++++++++++++++++++++++++++++++++ > +++++++ > >   hw/vmapple/meson.build   |   1 + > >   include/hw/vmapple/cfg.h |  68 +++++++++++++++++++++++++ > >   4 files changed, 178 insertions(+) > >   create mode 100644 hw/vmapple/cfg.c > >   create mode 100644 include/hw/vmapple/cfg.h > > > > diff --git a/hw/vmapple/Kconfig b/hw/vmapple/Kconfig > > index 68f88876eb9..8bbeb9a9237 100644 > > --- a/hw/vmapple/Kconfig > > +++ b/hw/vmapple/Kconfig > > @@ -4,3 +4,6 @@ config VMAPPLE_AES > >   config VMAPPLE_BDIF > >       bool > > > > +config VMAPPLE_CFG > > +    bool > > + > > diff --git a/hw/vmapple/cfg.c b/hw/vmapple/cfg.c > > new file mode 100644 > > index 00000000000..a5e5c62f59f > > --- /dev/null > > +++ b/hw/vmapple/cfg.c > > @@ -0,0 +1,106 @@ > > +/* > > + * VMApple Configuration Region > > + * > > + * Copyright © 2023 Amazon.com, Inc. or its affiliates. All > Rights Reserved. > > + * > > + * This work is licensed under the terms of the GNU GPL, version > 2 or later. > > + * See the COPYING file in the top-level directory. > > + */ > > + > > +#include "qemu/osdep.h" > > +#include "hw/vmapple/cfg.h" > > +#include "qemu/log.h" > > +#include "qemu/module.h" > > +#include "qapi/error.h" > > + > > +static void vmapple_cfg_reset(Object *obj, ResetType type) > > +{ > > +    VMAppleCfgState *s = VMAPPLE_CFG(obj); > > +    VMAppleCfg *cfg; > > + > > +    cfg = memory_region_get_ram_ptr(&s->mem); > > +    memset((void *)cfg, 0, VMAPPLE_CFG_SIZE); > > +    *cfg = s->cfg; >  > +}> + > > +static void vmapple_cfg_realize(DeviceState *dev, Error **errp) > > +{ > > +    VMAppleCfgState *s = VMAPPLE_CFG(dev); > > +    uint32_t i; > > + > > +    strncpy(s->cfg.serial, s->serial, sizeof(s->cfg.serial)); > > +    strncpy(s->cfg.model, s->model, sizeof(s->cfg.model)); > > +    strncpy(s->cfg.soc_name, s->soc_name, sizeof(s->cfg.soc_name)); > > +    strncpy(s->cfg.unk8, "D/A", sizeof(s->cfg.soc_name)); > > Use qemu_strnlen() to report an error for too long strings. > > > Hmm, I don't see any existing instances of such a pattern. I do however > see a couple of uses of g_strlcpy in the Qemu codebase - that would be a > better candidate for error checked string copying, though it still > involves some awkward return value checks. I'm going to wrap that in a > helper function and macro to replace all 4 strncpy instances here. If > the same thing is useful elsewhere later, it can be promoted to cutils > or similar. g_strlcpy() internally performs strlen(), which is worse than qemu_strnlen(). It is nice to have a helper function. Linux also has something similar called strscpy(): https://www.kernel.org/doc/html/latest/core-api/kernel-api.html#c.strscpy > > (Also, I notice that last strncpy actually uses the wrong destination > size; my wrapper macro uses ARRAY_SIZE to avoid this mistake altogether.) > > > +    s->cfg.ecid = cpu_to_be64(s->cfg.ecid); > > +    s->cfg.version = 2; > > +    s->cfg.unk1 = 1; > > +    s->cfg.unk2 = 1; > > +    s->cfg.unk3 = 0x20; > > +    s->cfg.unk4 = 0; > > +    s->cfg.unk5 = 1; > > +    s->cfg.unk6 = 1; > > +    s->cfg.unk7 = 0; > > +    s->cfg.unk10 = 1; > > + > > +    g_assert(s->cfg.nr_cpus < ARRAY_SIZE(s->cfg.cpu_ids)); > > Report an error instead of asserting. > > > +    for (i = 0; i < s->cfg.nr_cpus; i++) { > > +        s->cfg.cpu_ids[i] = i; > > +    } >  > +}> + > > +static void vmapple_cfg_init(Object *obj) > > +{ > > +    VMAppleCfgState *s = VMAPPLE_CFG(obj); > > + > > +    memory_region_init_ram(&s->mem, obj, "VMApple Config", > VMAPPLE_CFG_SIZE, > > +                           &error_fatal); > > +    sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mem); > > + > > +    s->serial = (char *)"1234"; > > +    s->model = (char *)"VM0001"; > > +    s->soc_name = (char *)"Apple M1 (Virtual)"; > > These casts are unsafe; these pointers will be freed when this > device is > freed. > > > Good catch! The more usual pattern for default string property values > seems to be to fill them in _realize() (using g_strdup()) if no other > value was previously set, so I've applied that here for the next version > of the patch. > > > > +} > > + > > +static Property vmapple_cfg_properties[] = { > > +    DEFINE_PROP_UINT32("nr-cpus", VMAppleCfgState, cfg.nr_cpus, 1), > > +    DEFINE_PROP_UINT64("ecid", VMAppleCfgState, cfg.ecid, 0), > > +    DEFINE_PROP_UINT64("ram-size", VMAppleCfgState, > cfg.ram_size, 0), > > +    DEFINE_PROP_UINT32("run_installer1", VMAppleCfgState, > cfg.run_installer1, 0), > > +    DEFINE_PROP_UINT32("run_installer2", VMAppleCfgState, > cfg.run_installer2, 0), > > +    DEFINE_PROP_UINT32("rnd", VMAppleCfgState, cfg.rnd, 0), > > +    DEFINE_PROP_MACADDR("mac-en0", VMAppleCfgState, cfg.mac_en0), > > +    DEFINE_PROP_MACADDR("mac-en1", VMAppleCfgState, cfg.mac_en1), > > +    DEFINE_PROP_MACADDR("mac-wifi0", VMAppleCfgState, > cfg.mac_wifi0), > > +    DEFINE_PROP_MACADDR("mac-bt0", VMAppleCfgState, cfg.mac_bt0), > > +    DEFINE_PROP_STRING("serial", VMAppleCfgState, serial), > > +    DEFINE_PROP_STRING("model", VMAppleCfgState, model), > > +    DEFINE_PROP_STRING("soc_name", VMAppleCfgState, soc_name), > > +    DEFINE_PROP_END_OF_LIST(), > > +}; > > + > > +static void vmapple_cfg_class_init(ObjectClass *klass, void *data) > > +{ > > +    DeviceClass *dc = DEVICE_CLASS(klass); > > +    ResettableClass *rc = RESETTABLE_CLASS(klass); > > + > > +    dc->realize = vmapple_cfg_realize; > > +    dc->desc = "VMApple Configuration Region"; > > +    device_class_set_props(dc, vmapple_cfg_properties); > > +    rc->phases.hold = vmapple_cfg_reset; > > +} > > + > > +static const TypeInfo vmapple_cfg_info = { > > +    .name          = TYPE_VMAPPLE_CFG, > > +    .parent        = TYPE_SYS_BUS_DEVICE, > > +    .instance_size = sizeof(VMAppleCfgState), > > +    .instance_init = vmapple_cfg_init, > > +    .class_init    = vmapple_cfg_class_init, > > +}; > > + > > +static void vmapple_cfg_register_types(void) > > +{ > > +    type_register_static(&vmapple_cfg_info); > > +} > > + > > +type_init(vmapple_cfg_register_types) > > diff --git a/hw/vmapple/meson.build b/hw/vmapple/meson.build > > index d4624713deb..64b78693a31 100644 > > --- a/hw/vmapple/meson.build > > +++ b/hw/vmapple/meson.build > > @@ -1,2 +1,3 @@ > >   system_ss.add(when: 'CONFIG_VMAPPLE_AES',  if_true: files('aes.c')) > >   system_ss.add(when: 'CONFIG_VMAPPLE_BDIF', if_true: > files('bdif.c')) > > +system_ss.add(when: 'CONFIG_VMAPPLE_CFG',  if_true: files('cfg.c')) > > diff --git a/include/hw/vmapple/cfg.h b/include/hw/vmapple/cfg.h > > new file mode 100644 > > index 00000000000..3337064e447 > > --- /dev/null > > +++ b/include/hw/vmapple/cfg.h > > @@ -0,0 +1,68 @@ > > +/* > > + * VMApple Configuration Region > > + * > > + * Copyright © 2023 Amazon.com, Inc. or its affiliates. All > Rights Reserved. > > + * > > + * This work is licensed under the terms of the GNU GPL, version > 2 or later. > > + * See the COPYING file in the top-level directory. > > + */ > > + > > +#ifndef HW_VMAPPLE_CFG_H > > +#define HW_VMAPPLE_CFG_H > > + > > +#include "hw/sysbus.h" > > +#include "qom/object.h" > > +#include "net/net.h" > > + > > +typedef struct VMAppleCfg { > > +    uint32_t version;         /* 0x000 */ > > +    uint32_t nr_cpus;         /* 0x004 */ > > +    uint32_t unk1;            /* 0x008 */ > > +    uint32_t unk2;            /* 0x00c */ > > +    uint32_t unk3;            /* 0x010 */ > > +    uint32_t unk4;            /* 0x014 */ > > +    uint64_t ecid;            /* 0x018 */ > > +    uint64_t ram_size;        /* 0x020 */ > > +    uint32_t run_installer1;  /* 0x028 */ > > +    uint32_t unk5;            /* 0x02c */ > > +    uint32_t unk6;            /* 0x030 */ > > +    uint32_t run_installer2;  /* 0x034 */ > > +    uint32_t rnd;             /* 0x038 */ > > +    uint32_t unk7;            /* 0x03c */ > > +    MACAddr mac_en0;          /* 0x040 */ > > +    uint8_t pad1[2]; > > +    MACAddr mac_en1;          /* 0x048 */ > > +    uint8_t pad2[2]; > > +    MACAddr mac_wifi0;        /* 0x050 */ > > +    uint8_t pad3[2]; > > +    MACAddr mac_bt0;          /* 0x058 */ > > +    uint8_t pad4[2]; > > +    uint8_t reserved[0xa0];   /* 0x060 */ > > +    uint32_t cpu_ids[0x80];   /* 0x100 */ > > +    uint8_t scratch[0x200];   /* 0x180 */ > > +    char serial[32];          /* 0x380 */ > > +    char unk8[32];            /* 0x3a0 */ > > +    char model[32];           /* 0x3c0 */ > > +    uint8_t unk9[32];         /* 0x3e0 */ > > +    uint32_t unk10;           /* 0x400 */ > > +    char soc_name[32];        /* 0x404 */ > > +} VMAppleCfg; > > + > > +#define TYPE_VMAPPLE_CFG "vmapple-cfg" > > +OBJECT_DECLARE_SIMPLE_TYPE(VMAppleCfgState, VMAPPLE_CFG) > > + > > +struct VMAppleCfgState { > > +    /* */ > > +    SysBusDevice parent_obj; > > +    VMAppleCfg cfg; > > + > > +    /* */ > > +    MemoryRegion mem; > > +    char *serial; > > +    char *model; > > +    char *soc_name; > > +}; > > + > > +#define VMAPPLE_CFG_SIZE 0x00010000 > > + > > +#endif /* HW_VMAPPLE_CFG_H */ >