From nobody Wed Dec 17 12:12:47 2025 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 87F002080D2 for ; Tue, 18 Mar 2025 09:57:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742291832; cv=none; b=GwnZQsYZ6Nze2xFvPGbtABsX+PIIgYEDPYgOXK6unved456IhQWbu/dnQPkJhJCdcvSr4K6TA8URLdRLCe82YBeVLP1wGf4/HZzcJzrmj6Krh+pWcUUfoOrv9k10HBm71PZP24R5sdH5pEaO1Sax4Zv+SxB7T5GT2eFFULsdj1w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742291832; c=relaxed/simple; bh=kvpzrCPZKG6u1vfeN24Aw1Y9W52FSdUnKV0z3nPYKzc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=B9kkB02/mI/YMGnn+mYALNNaHyDiw61M7T6CmcNuweyAzW3fsRFFbk8s5wFQgav6oCzDJUzgDMi0Xnwc1T0J2rLsmEGA+KAZHRbi83d5hvfT7QvIjL+9r2mSOIm5t4AsMG2VQiOGwLoEXB0idmE9xGEt0FHLsy0cS29XROjaUNs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=daynix.com; spf=pass smtp.mailfrom=daynix.com; dkim=pass (2048-bit key) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.b=fLxEUmBr; arc=none smtp.client-ip=209.85.214.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=daynix.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=daynix.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.b="fLxEUmBr" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-22409077c06so134716115ad.1 for ; Tue, 18 Mar 2025 02:57:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1742291830; x=1742896630; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=PKto7h723Ki7kYMKjnEf4R385v5d75BQEmZfS9JmO3c=; b=fLxEUmBr+h3tUmGwIdtNmxkXe6zYr6+BzanNT6lvAsuSxCf7//IEN4Njfx7htY6x90 hem8HCO8zNdjXhBGQ6B5/vT5ZCqqo87Ge3L8ot0jgiszKq0zPvdN3TwELLkThKNllLnN Qj5CgCjXnJ6SwQ1YYO18bAwxnBWZO4S07ujKHKgu6CsyYHNEQO+EIYHNoOQlrcu5/jOe dm9g6kqImRkgXCjA5OBaOhudJbWKjNpGj4NrclPK4HXxf3nLrc8DoUz0TJWkXsddBJlq tbqcWwYYTecWTXwoXbG6wz7RrMD6tklYp+YPwLZoQxRQrlQOmdFmofCo0l6cdsL5+SPU SQYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742291830; x=1742896630; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PKto7h723Ki7kYMKjnEf4R385v5d75BQEmZfS9JmO3c=; b=hgmoaebokAhwm7aTY9CMvM6ICVqfK0rlY92ebQ7fGPIJ/l4rW/IJX+sXZQMiU8WUQ3 Uzn2UdTd9Uwi8N70hTBO8NolypCiq9zSpoLHl4riGrHTY1kS+0AHvmjUtYB9jLFleCLY GJn3oL7wwx9fznZVVNIoQTaScV1BLUu6DbXLuyNb/w/ykXqQz6nc4jRStklA+p4ZuxfP LT0GST1ieILIIJidNJiI41W1/knjmW56CbyFPOkQpm4P3kWo2G+W3o/me+foMSlGQ57H EzpE6GfAvPwHFLpNDxXRWSv6mPLA/O7f6sjR5xCdG/eJwgEEqVXaJEjpickDFYuNgUb7 hW6A== X-Forwarded-Encrypted: i=1; AJvYcCXuuzbDIgBMToeAe2zYcFetBuPaJ3J7KlmuIestF3X6N+ipxvTr8EntJbnAmcJUgihCbk8hIXYCsInG1zk=@vger.kernel.org X-Gm-Message-State: AOJu0YzH+VnQL9zezfNNKUJBdWuBWHazA1/zsTzU93bIPP+6zDVKD+qd LV6jzCOhT98Np0dw/PMFtf/nR7eWYX2D9v1pT4NIB2baFn9absathUHQTuq1IoE= X-Gm-Gg: ASbGncuoufdKW2QTTDsdqR0QnP8IDjRWFZJJ6sTIIB6S36V80D+wMTHPXZ6sHaKLmtP yhlLE2HwCaIvnB7Jtf+rfk1c2G8hVbRP60OzlZo/W6w2C7xryYjl3w71TlaiMg7vCHgQ26Eu8Pk mSdIqDm8AeMjkZ/klDLHnvVMHL75Zdy4uFEw8fotBJjLT38RPdtT1gNTQAEoJf1JKGsZJib+sTT 5QVuWS2WblP8gBJqUIBxAnOq7VtXrHWguvQL1683EjtexBFXOYmKy3R7rMRKRx2Eog3JjE0UHyi 8D9wvWsLv6Q4hztrn07PUz+PRjjbWTEJkRgF3ai33GwASq3E X-Google-Smtp-Source: AGHT+IE2MIs+V39ucomf0brjofhjxyDBLUBR6ChaUUJySbvQir92UJ3hGg5A3YxoOe1UF+ZtBdVpWQ== X-Received: by 2002:a17:903:2308:b0:224:fa0:36da with SMTP id d9443c01a7336-225e0a537c8mr210649515ad.18.1742291829794; Tue, 18 Mar 2025 02:57:09 -0700 (PDT) Received: from localhost ([157.82.207.107]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-225c6ba6a38sm89927275ad.108.2025.03.18.02.57.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 18 Mar 2025 02:57:09 -0700 (PDT) From: Akihiko Odaki Date: Tue, 18 Mar 2025 18:56:52 +0900 Subject: [PATCH net-next 2/4] virtio_net: Fix endian with virtio_net_ctrl_rss Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250318-virtio-v1-2-344caf336ddd@daynix.com> References: <20250318-virtio-v1-0-344caf336ddd@daynix.com> In-Reply-To: <20250318-virtio-v1-0-344caf336ddd@daynix.com> To: "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Melnychenko , Joe Damato , Philo Lu Cc: virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, devel@daynix.com, Akihiko Odaki X-Mailer: b4 0.15-dev-edae6 Mark the fields of struct virtio_net_ctrl_rss as little endian as they are in struct virtio_net_rss_config, which it follows. Fixes: c7114b1249fa ("drivers/net/virtio_net: Added basic RSS support.") Signed-off-by: Akihiko Odaki Acked-by: Jason Wang --- drivers/net/virtio_net.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 7646ddd9bef7..d1ed544ba03a 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -368,15 +368,15 @@ struct receive_queue { */ #define VIRTIO_NET_RSS_MAX_KEY_SIZE 40 struct virtio_net_ctrl_rss { - u32 hash_types; - u16 indirection_table_mask; - u16 unclassified_queue; - u16 hash_cfg_reserved; /* for HASH_CONFIG (see virtio_net_hash_config for= details) */ - u16 max_tx_vq; + __le32 hash_types; + __le16 indirection_table_mask; + __le16 unclassified_queue; + __le16 hash_cfg_reserved; /* for HASH_CONFIG (see virtio_net_hash_config = for details) */ + __le16 max_tx_vq; u8 hash_key_length; u8 key[VIRTIO_NET_RSS_MAX_KEY_SIZE]; =20 - u16 *indirection_table; + __le16 *indirection_table; }; =20 /* Control VQ buffers: protected by the rtnl lock */ @@ -3576,9 +3576,9 @@ static void virtnet_rss_update_by_qpairs(struct virtn= et_info *vi, u16 queue_pair =20 for (; i < vi->rss_indir_table_size; ++i) { indir_val =3D ethtool_rxfh_indir_default(i, queue_pairs); - vi->rss.indirection_table[i] =3D indir_val; + vi->rss.indirection_table[i] =3D cpu_to_le16(indir_val); } - vi->rss.max_tx_vq =3D queue_pairs; + vi->rss.max_tx_vq =3D cpu_to_le16(queue_pairs); } =20 static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs) @@ -4097,10 +4097,10 @@ static bool virtnet_commit_rss_command(struct virtn= et_info *vi) =20 static void virtnet_init_default_rss(struct virtnet_info *vi) { - vi->rss.hash_types =3D vi->rss_hash_types_supported; + vi->rss.hash_types =3D cpu_to_le32(vi->rss_hash_types_supported); vi->rss_hash_types_saved =3D vi->rss_hash_types_supported; vi->rss.indirection_table_mask =3D vi->rss_indir_table_size - ? vi->rss_indir_table_size - 1 : 0; + ? cpu_to_le16(vi->rss_indir_table_size - 1) : 0; vi->rss.unclassified_queue =3D 0; =20 virtnet_rss_update_by_qpairs(vi, vi->curr_queue_pairs); @@ -4218,7 +4218,7 @@ static bool virtnet_set_hashflow(struct virtnet_info = *vi, struct ethtool_rxnfc * =20 if (new_hashtypes !=3D vi->rss_hash_types_saved) { vi->rss_hash_types_saved =3D new_hashtypes; - vi->rss.hash_types =3D vi->rss_hash_types_saved; + vi->rss.hash_types =3D cpu_to_le32(vi->rss_hash_types_saved); if (vi->dev->features & NETIF_F_RXHASH) return virtnet_commit_rss_command(vi); } @@ -5398,7 +5398,7 @@ static int virtnet_get_rxfh(struct net_device *dev, =20 if (rxfh->indir) { for (i =3D 0; i < vi->rss_indir_table_size; ++i) - rxfh->indir[i] =3D vi->rss.indirection_table[i]; + rxfh->indir[i] =3D le16_to_cpu(vi->rss.indirection_table[i]); } =20 if (rxfh->key) @@ -5426,7 +5426,7 @@ static int virtnet_set_rxfh(struct net_device *dev, return -EOPNOTSUPP; =20 for (i =3D 0; i < vi->rss_indir_table_size; ++i) - vi->rss.indirection_table[i] =3D rxfh->indir[i]; + vi->rss.indirection_table[i] =3D cpu_to_le16(rxfh->indir[i]); update =3D true; } =20 @@ -6044,9 +6044,9 @@ static int virtnet_set_features(struct net_device *de= v, =20 if ((dev->features ^ features) & NETIF_F_RXHASH) { if (features & NETIF_F_RXHASH) - vi->rss.hash_types =3D vi->rss_hash_types_saved; + vi->rss.hash_types =3D cpu_to_le32(vi->rss_hash_types_saved); else - vi->rss.hash_types =3D VIRTIO_NET_HASH_REPORT_NONE; + vi->rss.hash_types =3D cpu_to_le32(VIRTIO_NET_HASH_REPORT_NONE); =20 if (!virtnet_commit_rss_command(vi)) return -EINVAL; --=20 2.48.1