From nobody Tue Feb 10 17:13:49 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1662449738; cv=none; d=zohomail.com; s=zohoarc; b=PLZETlYXw42FFSDfFdEv02osBOaC8Dv1H66hX0tSpRLe6eAuLci+Kw2sFe/IZDesA3Cp0zYbUHqMeekFXXHpYXIrkGfEmfzUZqysuspZG6IoJefem/ffu4FVeLt+JPb8eFMAT5Y/S08MBZc6l//o1LVpweLjx167DJVQFodEr9Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662449738; 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=KNrFvrgdy1NLNEup9+sDAaS59t6E16z0cqN39qUBNac=; b=YiTUgk7p0/t+ceouKhlOKi18fTAMsAYAgW885ZBoTGvOHRWf1MO1yqi43bguosaVZh5OOmQ2Tf/HijUUZkd1xnYfneVgVQYYhrpjCr1XuIAMZcssEc8jwNpi4SA+eHacVWQLOuK5ag0lmbMHxy1NfWsWaXJigNWFIMv7d923oZs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1662449738403840.9333330829505; Tue, 6 Sep 2022 00:35:38 -0700 (PDT) Received: from localhost ([::1]:48408 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oVT7R-0005y7-02 for importer@patchew.org; Tue, 06 Sep 2022 03:35:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oVT3Y-0003Is-0z; Tue, 06 Sep 2022 03:31:36 -0400 Received: from forwardcorp1o.mail.yandex.net ([2a02:6b8:0:1a2d::193]:43740) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oVT3S-0002xN-BR; Tue, 06 Sep 2022 03:31:35 -0400 Received: from vla1-81430ab5870b.qloud-c.yandex.net (vla1-81430ab5870b.qloud-c.yandex.net [IPv6:2a02:6b8:c0d:35a1:0:640:8143:ab5]) by forwardcorp1o.mail.yandex.net (Yandex) with ESMTP id F18FF2E0F42; Tue, 6 Sep 2022 10:31:17 +0300 (MSK) Received: from d-tatianin-nix.yandex.net (unknown [2a02:6b8:0:419:d8d0:8d85:2aad:ab5b]) by vla1-81430ab5870b.qloud-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id WefwVQnsrp-VGXi6Avj; Tue, 06 Sep 2022 10:31:16 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) Precedence: bulk X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1662449476; bh=KNrFvrgdy1NLNEup9+sDAaS59t6E16z0cqN39qUBNac=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=xZZ2bBNlYnCt0xJ1ttSE3NyiWeCLYdIISK+50vWvWRt1pjTiEDtEzLlkrXOQBqIFe 9lWU4ScDY5PMrLl1p4Uj4JUzhW9BUx7/jW435vnpH9nv5a4YCSuiZeXs5ifRr3sCi5 U9Z3/w9byLx0tST9dVI1Mshs2xkXL9sxXR3qjfIc= Authentication-Results: vla1-81430ab5870b.qloud-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Daniil Tatianin To: qemu-devel@nongnu.org Cc: yc-core@yandex-team.ru, mst@redhat.com, stefanha@redhat.com, raphael.norwitz@nutanix.com, kwolf@redhat.com, qemu-block@nongnu.org, jasowang@redhat.com, d-tatianin@yandex-team.ru Subject: [PATCH v3 1/5] virtio: introduce VirtIOConfigSizeParams & virtio_get_config_size Date: Tue, 6 Sep 2022 10:31:07 +0300 Message-Id: <20220906073111.353245-2-d-tatianin@yandex-team.ru> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220906073111.353245-1-d-tatianin@yandex-team.ru> References: <20220906073111.353245-1-d-tatianin@yandex-team.ru> 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=2a02:6b8:0:1a2d::193; envelope-from=d-tatianin@yandex-team.ru; helo=forwardcorp1o.mail.yandex.net 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, 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 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @yandex-team.ru) X-ZM-MESSAGEID: 1662449741056100001 Content-Type: text/plain; charset="utf-8" This is the first step towards moving all device config size calculation logic into the virtio core code. In particular, this adds a struct that contains all the necessary information for common virtio code to be able to calculate the final config size for a device. This is expected to be used with the new virtio_get_config_size helper, which calculates the final length based on the provided host features. This builds on top of already existing code like VirtIOFeature and virtio_feature_get_config_size(), but adds additional fields, as well as sanity checking so that device-specifc code doesn't have to duplicate it. An example usage would be: static const VirtIOFeature dev_features[] =3D { {.flags =3D 1ULL << FEATURE_1_BIT, .end =3D endof(struct virtio_dev_config, feature_1)}, {.flags =3D 1ULL << FEATURE_2_BIT, .end =3D endof(struct virtio_dev_config, feature_2)}, {} }; static const VirtIOConfigSizeParams dev_cfg_size_params =3D { .min_size =3D DEV_BASE_CONFIG_SIZE, .max_size =3D sizeof(struct virtio_dev_config), .feature_sizes =3D dev_features }; // code inside my_dev_device_realize() size_t config_size =3D virtio_get_config_size(&dev_cfg_size_params, host_features); virtio_init(vdev, VIRTIO_ID_MYDEV, config_size); Currently every device is expected to write its own boilerplate from the example above in device_realize(), however, the next step of this transition is moving VirtIOConfigSizeParams into VirtioDeviceClass, so that it can be done automatically by the virtio initialization code. All of the users of virtio_feature_get_config_size have been converted to use virtio_get_config_size so it's no longer needed and is removed with this commit. Signed-off-by: Daniil Tatianin --- hw/block/virtio-blk.c | 16 +++++++--------- hw/net/virtio-net.c | 9 +++++++-- hw/virtio/virtio.c | 10 ++++++---- include/hw/virtio/virtio.h | 10 ++++++++-- 4 files changed, 28 insertions(+), 17 deletions(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index e9ba752f6b..10c47c2934 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -49,13 +49,11 @@ static const VirtIOFeature feature_sizes[] =3D { {} }; =20 -static void virtio_blk_set_config_size(VirtIOBlock *s, uint64_t host_featu= res) -{ - s->config_size =3D MAX(VIRTIO_BLK_CFG_SIZE, - virtio_feature_get_config_size(feature_sizes, host_features)); - - assert(s->config_size <=3D sizeof(struct virtio_blk_config)); -} +static const VirtIOConfigSizeParams cfg_size_params =3D { + .min_size =3D VIRTIO_BLK_CFG_SIZE, + .max_size =3D sizeof(struct virtio_blk_config), + .feature_sizes =3D feature_sizes +}; =20 static void virtio_blk_init_request(VirtIOBlock *s, VirtQueue *vq, VirtIOBlockReq *req) @@ -1204,8 +1202,8 @@ static void virtio_blk_device_realize(DeviceState *de= v, Error **errp) return; } =20 - virtio_blk_set_config_size(s, s->host_features); - + s->config_size =3D virtio_get_config_size(&cfg_size_params, + s->host_features); virtio_init(vdev, VIRTIO_ID_BLOCK, s->config_size); =20 s->blk =3D conf->conf.blk; diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index dd0d056fde..78b003a158 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -106,6 +106,12 @@ static const VirtIOFeature feature_sizes[] =3D { {} }; =20 +static const VirtIOConfigSizeParams cfg_size_params =3D { + .min_size =3D endof(struct virtio_net_config, mac), + .max_size =3D sizeof(struct virtio_net_config), + .feature_sizes =3D feature_sizes +}; + static VirtIONetQueue *virtio_net_get_subqueue(NetClientState *nc) { VirtIONet *n =3D qemu_get_nic_opaque(nc); @@ -3246,8 +3252,7 @@ static void virtio_net_set_config_size(VirtIONet *n, = uint64_t host_features) { virtio_add_feature(&host_features, VIRTIO_NET_F_MAC); =20 - n->config_size =3D virtio_feature_get_config_size(feature_sizes, - host_features); + n->config_size =3D virtio_get_config_size(&cfg_size_params, host_featu= res); } =20 void virtio_net_set_netclient_name(VirtIONet *n, const char *name, diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 5d607aeaa0..c0bf8dd6fd 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -2999,11 +2999,12 @@ int virtio_set_features(VirtIODevice *vdev, uint64_= t val) return ret; } =20 -size_t virtio_feature_get_config_size(const VirtIOFeature *feature_sizes, - uint64_t host_features) +size_t virtio_get_config_size(const VirtIOConfigSizeParams *params, + uint64_t host_features) { - size_t config_size =3D 0; - int i; + size_t config_size =3D params->min_size; + const VirtIOFeature *feature_sizes =3D params->feature_sizes; + size_t i; =20 for (i =3D 0; feature_sizes[i].flags !=3D 0; i++) { if (host_features & feature_sizes[i].flags) { @@ -3011,6 +3012,7 @@ size_t virtio_feature_get_config_size(const VirtIOFea= ture *feature_sizes, } } =20 + assert(config_size <=3D params->max_size); return config_size; } =20 diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index db1c0ddf6b..f3ff6710d5 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -44,8 +44,14 @@ typedef struct VirtIOFeature { size_t end; } VirtIOFeature; =20 -size_t virtio_feature_get_config_size(const VirtIOFeature *features, - uint64_t host_features); +typedef struct VirtIOConfigSizeParams { + size_t min_size; + size_t max_size; + const VirtIOFeature *feature_sizes; +} VirtIOConfigSizeParams; + +size_t virtio_get_config_size(const VirtIOConfigSizeParams *params, + uint64_t host_features); =20 typedef struct VirtQueue VirtQueue; =20 --=20 2.25.1