From nobody Sun Feb 8 06:04:44 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E7B91340A5D for ; Tue, 21 Oct 2025 14:57:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761058625; cv=none; b=SQ4FAvapRxuWbmjbdWin5ixOD+ffKFwvf7CxKn+j98le1MEkdk2XUNwmALW+8bh18750JB3bQ66k2aDuQpRhDfJFVytgy67F9JmOI23+icxrOXFjO5xMktBDb+Y7s6MhUw88JIuu5kRHfKUKczg1xo8dVwlQ2dol5TRddA631/Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761058625; c=relaxed/simple; bh=AVLIVvLMmzihyiFoqaCOv7LfcX6ztXU/U0RIozF0X1I=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=BGxPOrvdy4W44Cj+QhuFqVqtB1whFqgxpVp+8DsB9RnZu4CyKWonDicY3tJ6Anm7hS+Sz9rrmNqAuUYEpTBQakgD4Hpmf9ubGVfKeRhZ1MiuIH4RELYpAIgzReNC40IHUAZhteMF5IUbjXVyWMfIe8Whsa5MxbqdwtEO59rjWSo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=H/mP48Ke; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="H/mP48Ke" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761058622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=3HnyN62VmsQSoZltMt/v/Uw3xN8BXbh3poYMFdnESII=; b=H/mP48KeDn9hNS2M3j+vXYSZhp8fb6uKZZfXljxtATTyBe/bVLWRSSQuAl4pl1neXkNARa 4mxwlzM2EZUULvuRCr6emqaAzW/PRF5FH6hx+f9OgqS+olJAMz3KkDQO7Xlplyx3xJ/vF9 WA5ESVoHLfUkKp39BL4GS7DtRCzeKHI= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-213-wG1UYrP4Pe6tjkOCoXFcpw-1; Tue, 21 Oct 2025 10:57:00 -0400 X-MC-Unique: wG1UYrP4Pe6tjkOCoXFcpw-1 X-Mimecast-MFC-AGG-ID: wG1UYrP4Pe6tjkOCoXFcpw_1761058619 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-471005f28d2so22183615e9.0 for ; Tue, 21 Oct 2025 07:56:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761058618; x=1761663418; 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=3HnyN62VmsQSoZltMt/v/Uw3xN8BXbh3poYMFdnESII=; b=kFLjuwKn6HRC8TGadj+GSvd6R5y2BCkTTX5Y48Vn1DdJ3spI87uzZObw99y6SbaPaQ zCGGArMLfAiVwPbdRsnncJyBM0j3TOl6m58pSBwSFSJE1MNi6vUbAJqimltB1UpxCKH0 5x5Om4fAPiRZ7o3enjI+h8FxyW1Xk4kp2gnwXYneE2PY2mTIi3m8zr2zY/R0GrAzZuTD BFZ9yJlfLtoZcLQXRnVJuhH7T1ltqr4hYz0KyqgCU5itL9jSpIO/MZ9GELJ3zUUHeQHN vK5YEfjhNFLdd2Yay+h0RIqXrq2BeX0I5FyPHpdv4t7DEx24JXWcFOeS8OzleGYRQSOo LYdg== X-Gm-Message-State: AOJu0Yz0rYubK8h6P2SJEn2igsFjIG6F0Ap5S/aZPYIdIp2/re6spmOo NxJdW51nn7JMAQYk2eLGkmieFp8shwmgzZOSyvVsNDS/Zlyy8F5gwEEwUXL+3WmvpROutq+4Q2D bcE3/vEsZNV4yXFarGUsrIigxLkfzTMGPz1Y9CHFEcyvJ921euIwvPFLqVz4o97egBi8rQEaMaq UidGd1URGqqbUqCZ84gni07pYTHuAFd8Z3dmgAJbnCF7A= X-Gm-Gg: ASbGncsOLR+sOetWqNMsrihG+AWhxVJaAFf5VZuOjFn9S+tWVBfWOEcXjorDun6Mgji eAe2f1eAXuUafucxaC626OFhPtEFgLd+AhYzbYXhvUq6IAowdxJ0J5m9xZSxmBLr1Ofnoq1PH9W 7Ihyj5tPD81gbvVfvzyRe90W7o4ROeS1wLREPWW1vX6OEeviACNOPlUN8fEKtaVB7toBafU1Glw tSd15J8TU+QUh8sXA4pUtVNJei+KJdUNwWAP0atDoxSH93z0Saoi4OJcZHWIT7L3q8cA8TdQB66 dXQavvvVbfrlSoweboqqCmX1hV5ODk7QkAnijIj6l80IezOc84SyxJr7fpZnKt/ZC5Rz X-Received: by 2002:a05:600c:8b0c:b0:471:1717:41c with SMTP id 5b1f17b1804b1-471179121f4mr109537295e9.24.1761058617911; Tue, 21 Oct 2025 07:56:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHBZOzYc7c2VHuQcOpok5r/wPxNoUAyILdkMl2YowqSV8PzFe0v+m+49YouxOUkzwhM1pn3Qw== X-Received: by 2002:a05:600c:8b0c:b0:471:1717:41c with SMTP id 5b1f17b1804b1-471179121f4mr109536935e9.24.1761058617149; Tue, 21 Oct 2025 07:56:57 -0700 (PDT) Received: from redhat.com ([2a0d:6fc0:152d:b200:2a90:8f13:7c1e:f479]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4731c95efb9sm169701525e9.8.2025.10.21.07.56.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 07:56:56 -0700 (PDT) Date: Tue, 21 Oct 2025 10:56:54 -0400 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: Andrew Lunn , netdev@vger.kernel.org, Paolo Abeni , Jason Wang , Eugenio =?utf-8?B?UMOpcmV6?= , Xuan Zhuo , Jonathan Corbet , kvm@vger.kernel.org, virtualization@lists.linux.dev, linux-doc@vger.kernel.org Subject: [PATCH v2 1/2] virtio: clean up features qword/dword terms Message-ID: <492ef5aaa196d155d0535b5b6f4ad5b3fba70a1b.1761058528.git.mst@redhat.com> References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" virtio pci uses word to mean "16 bits". mmio uses it to mean "32 bits". To avoid confusion, let's avoid the term in core virtio altogether. Just say U64 to mean "64 bit". Fixes: e7d4c1c5a546 ("virtio: introduce extended features") Cc: "Paolo Abeni" Signed-off-by: Michael S. Tsirkin --- drivers/vhost/net.c | 12 +++++------ drivers/virtio/virtio.c | 12 +++++------ drivers/virtio/virtio_debug.c | 10 ++++----- drivers/virtio/virtio_pci_modern_dev.c | 6 +++--- include/linux/virtio.h | 2 +- include/linux/virtio_config.h | 2 +- include/linux/virtio_features.h | 29 +++++++++++++------------- include/linux/virtio_pci_modern.h | 8 +++---- scripts/lib/kdoc/kdoc_parser.py | 2 +- 9 files changed, 42 insertions(+), 41 deletions(-) diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 35ded4330431..afabc5cf31a6 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -69,7 +69,7 @@ MODULE_PARM_DESC(experimental_zcopytx, "Enable Zero Copy = TX;" =20 #define VHOST_DMA_IS_DONE(len) ((__force u32)(len) >=3D (__force u32)VHOST= _DMA_DONE_LEN) =20 -static const u64 vhost_net_features[VIRTIO_FEATURES_DWORDS] =3D { +static const u64 vhost_net_features[VIRTIO_FEATURES_ARRAY_SIZE] =3D { VHOST_FEATURES | (1ULL << VHOST_NET_F_VIRTIO_NET_HDR) | (1ULL << VIRTIO_NET_F_MRG_RXBUF) | @@ -1720,7 +1720,7 @@ static long vhost_net_set_owner(struct vhost_net *n) static long vhost_net_ioctl(struct file *f, unsigned int ioctl, unsigned long arg) { - u64 all_features[VIRTIO_FEATURES_DWORDS]; + u64 all_features[VIRTIO_FEATURES_ARRAY_SIZE]; struct vhost_net *n =3D f->private_data; void __user *argp =3D (void __user *)arg; u64 __user *featurep =3D argp; @@ -1752,7 +1752,7 @@ static long vhost_net_ioctl(struct file *f, unsigned = int ioctl, =20 /* Copy the net features, up to the user-provided buffer size */ argp +=3D sizeof(u64); - copied =3D min(count, VIRTIO_FEATURES_DWORDS); + copied =3D min(count, (u64)VIRTIO_FEATURES_ARRAY_SIZE); if (copy_to_user(argp, vhost_net_features, copied * sizeof(u64))) return -EFAULT; @@ -1767,13 +1767,13 @@ static long vhost_net_ioctl(struct file *f, unsigne= d int ioctl, =20 virtio_features_zero(all_features); argp +=3D sizeof(u64); - copied =3D min(count, VIRTIO_FEATURES_DWORDS); + copied =3D min(count, (u64)VIRTIO_FEATURES_ARRAY_SIZE); if (copy_from_user(all_features, argp, copied * sizeof(u64))) return -EFAULT; =20 /* * Any feature specified by user-space above - * VIRTIO_FEATURES_MAX is not supported by definition. + * VIRTIO_FEATURES_BITS is not supported by definition. */ for (i =3D copied; i < count; ++i) { if (copy_from_user(&features, featurep + 1 + i, @@ -1783,7 +1783,7 @@ static long vhost_net_ioctl(struct file *f, unsigned = int ioctl, return -EOPNOTSUPP; } =20 - for (i =3D 0; i < VIRTIO_FEATURES_DWORDS; i++) + for (i =3D 0; i < VIRTIO_FEATURES_ARRAY_SIZE; i++) if (all_features[i] & ~vhost_net_features[i]) return -EOPNOTSUPP; =20 diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c index a09eb4d62f82..49aa21a7443c 100644 --- a/drivers/virtio/virtio.c +++ b/drivers/virtio/virtio.c @@ -53,7 +53,7 @@ static ssize_t features_show(struct device *_d, =20 /* We actually represent this as a bitstring, as it could be * arbitrary length in future. */ - for (i =3D 0; i < VIRTIO_FEATURES_MAX; i++) + for (i =3D 0; i < VIRTIO_FEATURES_BITS; i++) len +=3D sysfs_emit_at(buf, len, "%c", __virtio_test_bit(dev, i) ? '1' : '0'); len +=3D sysfs_emit_at(buf, len, "\n"); @@ -272,8 +272,8 @@ static int virtio_dev_probe(struct device *_d) int err, i; struct virtio_device *dev =3D dev_to_virtio(_d); struct virtio_driver *drv =3D drv_to_virtio(dev->dev.driver); - u64 device_features[VIRTIO_FEATURES_DWORDS]; - u64 driver_features[VIRTIO_FEATURES_DWORDS]; + u64 device_features[VIRTIO_FEATURES_ARRAY_SIZE]; + u64 driver_features[VIRTIO_FEATURES_ARRAY_SIZE]; u64 driver_features_legacy; =20 /* We have a driver! */ @@ -286,7 +286,7 @@ static int virtio_dev_probe(struct device *_d) virtio_features_zero(driver_features); for (i =3D 0; i < drv->feature_table_size; i++) { unsigned int f =3D drv->feature_table[i]; - if (!WARN_ON_ONCE(f >=3D VIRTIO_FEATURES_MAX)) + if (!WARN_ON_ONCE(f >=3D VIRTIO_FEATURES_BITS)) virtio_features_set_bit(driver_features, f); } =20 @@ -303,7 +303,7 @@ static int virtio_dev_probe(struct device *_d) } =20 if (virtio_features_test_bit(device_features, VIRTIO_F_VERSION_1)) { - for (i =3D 0; i < VIRTIO_FEATURES_DWORDS; ++i) + for (i =3D 0; i < VIRTIO_FEATURES_ARRAY_SIZE; ++i) dev->features_array[i] =3D driver_features[i] & device_features[i]; } else { @@ -325,7 +325,7 @@ static int virtio_dev_probe(struct device *_d) goto err; =20 if (drv->validate) { - u64 features[VIRTIO_FEATURES_DWORDS]; + u64 features[VIRTIO_FEATURES_ARRAY_SIZE]; =20 virtio_features_copy(features, dev->features_array); err =3D drv->validate(dev); diff --git a/drivers/virtio/virtio_debug.c b/drivers/virtio/virtio_debug.c index d58713ddf2e5..92055dc15860 100644 --- a/drivers/virtio/virtio_debug.c +++ b/drivers/virtio/virtio_debug.c @@ -8,12 +8,12 @@ static struct dentry *virtio_debugfs_dir; =20 static int virtio_debug_device_features_show(struct seq_file *s, void *dat= a) { - u64 device_features[VIRTIO_FEATURES_DWORDS]; + u64 device_features[VIRTIO_FEATURES_ARRAY_SIZE]; struct virtio_device *dev =3D s->private; unsigned int i; =20 virtio_get_features(dev, device_features); - for (i =3D 0; i < VIRTIO_FEATURES_MAX; i++) { + for (i =3D 0; i < VIRTIO_FEATURES_BITS; i++) { if (virtio_features_test_bit(device_features, i)) seq_printf(s, "%u\n", i); } @@ -26,7 +26,7 @@ static int virtio_debug_filter_features_show(struct seq_f= ile *s, void *data) struct virtio_device *dev =3D s->private; unsigned int i; =20 - for (i =3D 0; i < VIRTIO_FEATURES_MAX; i++) { + for (i =3D 0; i < VIRTIO_FEATURES_BITS; i++) { if (virtio_features_test_bit(dev->debugfs_filter_features, i)) seq_printf(s, "%u\n", i); } @@ -50,7 +50,7 @@ static int virtio_debug_filter_feature_add(void *data, u6= 4 val) { struct virtio_device *dev =3D data; =20 - if (val >=3D VIRTIO_FEATURES_MAX) + if (val >=3D VIRTIO_FEATURES_BITS) return -EINVAL; =20 virtio_features_set_bit(dev->debugfs_filter_features, val); @@ -64,7 +64,7 @@ static int virtio_debug_filter_feature_del(void *data, u6= 4 val) { struct virtio_device *dev =3D data; =20 - if (val >=3D VIRTIO_FEATURES_MAX) + if (val >=3D VIRTIO_FEATURES_BITS) return -EINVAL; =20 virtio_features_clear_bit(dev->debugfs_filter_features, val); diff --git a/drivers/virtio/virtio_pci_modern_dev.c b/drivers/virtio/virtio= _pci_modern_dev.c index 9e503b7a58d8..413a8c353463 100644 --- a/drivers/virtio/virtio_pci_modern_dev.c +++ b/drivers/virtio/virtio_pci_modern_dev.c @@ -401,7 +401,7 @@ void vp_modern_get_extended_features(struct virtio_pci_= modern_device *mdev, int i; =20 virtio_features_zero(features); - for (i =3D 0; i < VIRTIO_FEATURES_WORDS; i++) { + for (i =3D 0; i < VIRTIO_FEATURES_BITS / 32; i++) { u64 cur; =20 vp_iowrite32(i, &cfg->device_feature_select); @@ -427,7 +427,7 @@ vp_modern_get_driver_extended_features(struct virtio_pc= i_modern_device *mdev, int i; =20 virtio_features_zero(features); - for (i =3D 0; i < VIRTIO_FEATURES_WORDS; i++) { + for (i =3D 0; i < VIRTIO_FEATURES_BITS / 32; i++) { u64 cur; =20 vp_iowrite32(i, &cfg->guest_feature_select); @@ -448,7 +448,7 @@ void vp_modern_set_extended_features(struct virtio_pci_= modern_device *mdev, struct virtio_pci_common_cfg __iomem *cfg =3D mdev->common; int i; =20 - for (i =3D 0; i < VIRTIO_FEATURES_WORDS; i++) { + for (i =3D 0; i < VIRTIO_FEATURES_BITS / 32; i++) { u32 cur =3D features[i >> 1] >> (32 * (i & 1)); =20 vp_iowrite32(i, &cfg->guest_feature_select); diff --git a/include/linux/virtio.h b/include/linux/virtio.h index 96c66126c074..9778adf8c6e3 100644 --- a/include/linux/virtio.h +++ b/include/linux/virtio.h @@ -177,7 +177,7 @@ struct virtio_device { union virtio_map vmap; #ifdef CONFIG_VIRTIO_DEBUG struct dentry *debugfs_dir; - u64 debugfs_filter_features[VIRTIO_FEATURES_DWORDS]; + u64 debugfs_filter_features[VIRTIO_FEATURES_ARRAY_SIZE]; #endif }; =20 diff --git a/include/linux/virtio_config.h b/include/linux/virtio_config.h index 16001e9f9b39..a9b7a5bc90ce 100644 --- a/include/linux/virtio_config.h +++ b/include/linux/virtio_config.h @@ -80,7 +80,7 @@ struct virtqueue_info { * Returns the first 64 feature bits. * @get_extended_features: * vdev: the virtio_device - * Returns the first VIRTIO_FEATURES_MAX feature bits (all we current= ly + * Returns the first VIRTIO_FEATURES_BITS feature bits (all we curren= tly * need). * @finalize_features: confirm what device features we'll be using. * vdev: the virtio_device diff --git a/include/linux/virtio_features.h b/include/linux/virtio_feature= s.h index f748f2f87de8..9c99014196ea 100644 --- a/include/linux/virtio_features.h +++ b/include/linux/virtio_features.h @@ -4,15 +4,16 @@ =20 #include =20 -#define VIRTIO_FEATURES_DWORDS 2 -#define VIRTIO_FEATURES_MAX (VIRTIO_FEATURES_DWORDS * 64) -#define VIRTIO_FEATURES_WORDS (VIRTIO_FEATURES_DWORDS * 2) +#define VIRTIO_FEATURES_BITS (128) #define VIRTIO_BIT(b) BIT_ULL((b) & 0x3f) -#define VIRTIO_DWORD(b) ((b) >> 6) +#define VIRTIO_U64(b) ((b) >> 6) + +#define VIRTIO_FEATURES_ARRAY_SIZE VIRTIO_U64(VIRTIO_FEATURES_BITS) + #define VIRTIO_DECLARE_FEATURES(name) \ union { \ u64 name; \ - u64 name##_array[VIRTIO_FEATURES_DWORDS];\ + u64 name##_array[VIRTIO_FEATURES_ARRAY_SIZE];\ } =20 static inline bool virtio_features_chk_bit(unsigned int bit) @@ -22,9 +23,9 @@ static inline bool virtio_features_chk_bit(unsigned int b= it) * Don't care returning the correct value: the build * will fail before any bad features access */ - BUILD_BUG_ON(bit >=3D VIRTIO_FEATURES_MAX); + BUILD_BUG_ON(bit >=3D VIRTIO_FEATURES_BITS); } else { - if (WARN_ON_ONCE(bit >=3D VIRTIO_FEATURES_MAX)) + if (WARN_ON_ONCE(bit >=3D VIRTIO_FEATURES_BITS)) return false; } return true; @@ -34,26 +35,26 @@ static inline bool virtio_features_test_bit(const u64 *= features, unsigned int bit) { return virtio_features_chk_bit(bit) && - !!(features[VIRTIO_DWORD(bit)] & VIRTIO_BIT(bit)); + !!(features[VIRTIO_U64(bit)] & VIRTIO_BIT(bit)); } =20 static inline void virtio_features_set_bit(u64 *features, unsigned int bit) { if (virtio_features_chk_bit(bit)) - features[VIRTIO_DWORD(bit)] |=3D VIRTIO_BIT(bit); + features[VIRTIO_U64(bit)] |=3D VIRTIO_BIT(bit); } =20 static inline void virtio_features_clear_bit(u64 *features, unsigned int bit) { if (virtio_features_chk_bit(bit)) - features[VIRTIO_DWORD(bit)] &=3D ~VIRTIO_BIT(bit); + features[VIRTIO_U64(bit)] &=3D ~VIRTIO_BIT(bit); } =20 static inline void virtio_features_zero(u64 *features) { - memset(features, 0, sizeof(features[0]) * VIRTIO_FEATURES_DWORDS); + memset(features, 0, sizeof(features[0]) * VIRTIO_FEATURES_ARRAY_SIZE); } =20 static inline void virtio_features_from_u64(u64 *features, u64 from) @@ -66,7 +67,7 @@ static inline bool virtio_features_equal(const u64 *f1, c= onst u64 *f2) { int i; =20 - for (i =3D 0; i < VIRTIO_FEATURES_DWORDS; ++i) + for (i =3D 0; i < VIRTIO_FEATURES_ARRAY_SIZE; ++i) if (f1[i] !=3D f2[i]) return false; return true; @@ -74,14 +75,14 @@ static inline bool virtio_features_equal(const u64 *f1,= const u64 *f2) =20 static inline void virtio_features_copy(u64 *to, const u64 *from) { - memcpy(to, from, sizeof(to[0]) * VIRTIO_FEATURES_DWORDS); + memcpy(to, from, sizeof(to[0]) * VIRTIO_FEATURES_ARRAY_SIZE); } =20 static inline void virtio_features_andnot(u64 *to, const u64 *f1, const u6= 4 *f2) { int i; =20 - for (i =3D 0; i < VIRTIO_FEATURES_DWORDS; i++) + for (i =3D 0; i < VIRTIO_FEATURES_ARRAY_SIZE; i++) to[i] =3D f1[i] & ~f2[i]; } =20 diff --git a/include/linux/virtio_pci_modern.h b/include/linux/virtio_pci_m= odern.h index 48bc12d1045b..eba5977126ed 100644 --- a/include/linux/virtio_pci_modern.h +++ b/include/linux/virtio_pci_modern.h @@ -107,7 +107,7 @@ void vp_modern_set_extended_features(struct virtio_pci_= modern_device *mdev, static inline u64 vp_modern_get_features(struct virtio_pci_modern_device *mdev) { - u64 features_array[VIRTIO_FEATURES_DWORDS]; + u64 features_array[VIRTIO_FEATURES_ARRAY_SIZE]; =20 vp_modern_get_extended_features(mdev, features_array); return features_array[0]; @@ -116,11 +116,11 @@ vp_modern_get_features(struct virtio_pci_modern_devic= e *mdev) static inline u64 vp_modern_get_driver_features(struct virtio_pci_modern_device *mdev) { - u64 features_array[VIRTIO_FEATURES_DWORDS]; + u64 features_array[VIRTIO_FEATURES_ARRAY_SIZE]; int i; =20 vp_modern_get_driver_extended_features(mdev, features_array); - for (i =3D 1; i < VIRTIO_FEATURES_DWORDS; ++i) + for (i =3D 1; i < VIRTIO_FEATURES_ARRAY_SIZE; ++i) WARN_ON_ONCE(features_array[i]); return features_array[0]; } @@ -128,7 +128,7 @@ vp_modern_get_driver_features(struct virtio_pci_modern_= device *mdev) static inline void vp_modern_set_features(struct virtio_pci_modern_device *mdev, u64 features) { - u64 features_array[VIRTIO_FEATURES_DWORDS]; + u64 features_array[VIRTIO_FEATURES_ARRAY_SIZE]; =20 virtio_features_from_u64(features_array, features); vp_modern_set_extended_features(mdev, features_array); diff --git a/scripts/lib/kdoc/kdoc_parser.py b/scripts/lib/kdoc/kdoc_parser= .py index fe730099eca8..5d629aebc8f0 100644 --- a/scripts/lib/kdoc/kdoc_parser.py +++ b/scripts/lib/kdoc/kdoc_parser.py @@ -638,7 +638,7 @@ class KernelDoc: (KernRe(r'(?:__)?DECLARE_FLEX_ARRAY\s*\(' + args_pattern + r',= \s*' + args_pattern + r'\)', re.S), r'\1 \2[]'), (KernRe(r'DEFINE_DMA_UNMAP_ADDR\s*\(' + args_pattern + r'\)', = re.S), r'dma_addr_t \1'), (KernRe(r'DEFINE_DMA_UNMAP_LEN\s*\(' + args_pattern + r'\)', r= e.S), r'__u32 \1'), - (KernRe(r'VIRTIO_DECLARE_FEATURES\s*\(' + args_pattern + r'\)'= , re.S), r'u64 \1; u64 \1_array[VIRTIO_FEATURES_DWORDS]'), + (KernRe(r'VIRTIO_DECLARE_FEATURES\s*\(' + args_pattern + r'\)'= , re.S), r'u64 \1; u64 \1_array[VIRTIO_FEATURES_QWORDS]'), ] =20 # Regexes here are guaranteed to have the end limiter matching --=20 MST