From nobody Wed Dec 17 12:04:54 2025 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 5C1171EC009 for ; Fri, 21 Mar 2025 06:49:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742539748; cv=none; b=guaz0+o1riDUhGae/FSevlJROeVVYn6qFxoPT0t2X1RL68h3F45mYe1wkNZPGvwh1YHCzOtN7Z/hL9pcnV++KOXLng+rha7U8tJfMMbd2wsN1B12iAOLLCpjIGIsIG/y7PJkDc1nnBE/QNKthhn16xH/uuxY8pb/nXhquiBfYe0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742539748; c=relaxed/simple; bh=JA5lB20OwEFvfOBpIlszUUf1X9ZmjUyWnEr7Zb3EhmE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ryl+ZyfBJyjqYgMpxdw4gMW2vX8P8XwSf4IBjRIasXqOpbULYVbTeXND7NrbqFsMFp84ATZt9+c3nmTM0EL84KbxBh+3ANozLM7fkO+lrTbaVl+PHxqSvKhsAk/DP7DPjUzxPrPh84EsdtE0xKNUenbRaTq3xMjRweluXuYpEFY= 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=sqp+oveO; arc=none smtp.client-ip=209.85.214.176 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="sqp+oveO" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-225fbdfc17dso26218065ad.3 for ; Thu, 20 Mar 2025 23:49:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1742539746; x=1743144546; 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=elvR4miFALyu5FnLIhwEFH5pLlJ21X8V+zrz+RJ4D2Y=; b=sqp+oveO2TR9XMcK0UCJya39il7L5DjpK/PBE+aWxCM1016qS/LXQ4+Rx6t3hLkhG7 /IBvw7ve5m27emOOv3RxK4ENO0kyfbwk+Y2Fx3DVEvLwH7dpmoXfdxaos1WUEUOch0sB x/RXW4vad+rhTM+oWRGPZ1+GZIeA73JM5NBHLW+j5mqs5hn+9FqlIrLoj4Fb95npAQ3Y mWLp2rfPattN6/n3xNMYch2LyhPz4RgDkkOtyCW21vxCOI7qN4/DUQEwS7vObhybmrNX ayl46JpIMkJjzfmkA3IY/3p/eMRbZ5sF/eKNm5w+HnzW6RRKpllzYRKoWUuiDBDgTBtc ZzTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742539746; x=1743144546; 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=elvR4miFALyu5FnLIhwEFH5pLlJ21X8V+zrz+RJ4D2Y=; b=fL1ciQi5G5/ug6+utehCPepwFvIUn884ohO4+rRfe+Fi3T/1KcRxC86woXrvlEbd/+ wmlc0GmSS3AnBWskm9KCZyYPiHCsKoW1//vxaJ4I8EEKoP0mQO4I7CXTMyKwojVfpRbC no52LJmjT/CkozufcLxxssTJjyUKMLTwJmQgLowTvVqYEXGWnM5YyU67aixFLHX9JiA9 rS6hhjm2CBSpHZWNtBLaAqE0VYs2HpWY47yLz3GtK/+5mm/mzw2yjcwjsDerlAtcJVIi YEK1pHucecqrNqicYbw049/NZBVD82WHQQEX+rRlHtfoJmAx0ZEVY38Ykm/N/hBJCneX LEPg== X-Forwarded-Encrypted: i=1; AJvYcCV3XXKEPXyRZkm7TL3C92/ML2SIWkb4qq0w7YhGR4hLP64F5GRfpWTw4KXPb/x/dce58K9p/0YL7qoFmAI=@vger.kernel.org X-Gm-Message-State: AOJu0YxV8vsmL09J+jUFL7pqt2N/yse4r6/FIbn7el/g/nXxKtpUQZkb rXwmajBM4D77nNBxEYYSdsMuB1zPSLLj/hdHHFRUEmf4BLoqqbe9ZqG5aIbdiv0= X-Gm-Gg: ASbGnctMXwa1pPmdLMNdsoNjv8U+zNCvrymWmlM3ulZiR/12gOZ3w6gbKkRofbVgW7b K/QqyW+k07R0ilGrA/uxEpKgvjhx9GQLfRyUAmDX/PpWwQXh2BksuGLkUZHCIrcAvlRvmRgNvML 66fV4XgYKHGi4HQUx72kUIu5vWOt2SCEDIKGpy87QCSV8Qvy7GW+AUEFKQ0LJ08EqwCtWcxo0Y8 SFyLviVqGyASH9+dHYySoE8Fcb/CaZEn72MAweFLqsIWmxJUvCcrwfcaxXp5vR8Vsl4X+8fheP0 X87CLR+YJZFr3OvvzV+jW6ZCBAY4AATIFhG6f0zDyLi7cg9C X-Google-Smtp-Source: AGHT+IGfOuNa5fyjN/141rJ7V6SWVAs5O/iHkELWdhBTVf3wR+4vSaQY0IPj0EQaRSWQrfYKVie/Dw== X-Received: by 2002:a05:6a21:2d84:b0:1f3:293b:7aa with SMTP id adf61e73a8af0-1fe42f090f2mr4079673637.4.1742539746583; Thu, 20 Mar 2025 23:49:06 -0700 (PDT) Received: from localhost ([157.82.207.107]) by smtp.gmail.com with UTF8SMTPSA id 41be03b00d2f7-af8a2803d8csm999480a12.26.2025.03.20.23.49.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 20 Mar 2025 23:49:06 -0700 (PDT) From: Akihiko Odaki Date: Fri, 21 Mar 2025 15:48:33 +0900 Subject: [PATCH net-next v2 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: <20250321-virtio-v2-2-33afb8f4640b@daynix.com> References: <20250321-virtio-v2-0-33afb8f4640b@daynix.com> In-Reply-To: <20250321-virtio-v2-0-33afb8f4640b@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 , Lei Yang 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 Tested-by: Lei Yang Acked-by: Michael S. Tsirkin --- 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