From patchwork Fri Mar 21 06:48:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 14024894 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 6C93F1EBFFC for ; Fri, 21 Mar 2025 06:49:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742539742; cv=none; b=ZyG+LJnYvphUTGMB45dIgQ+eFwj6kGEB+8vAya0wgpt1ckz9mVNJ6lIZD6upM+bAyo9Y0UHk06fa42vAwg2rj8BtHnPvbVCUp1b7UkJzffJj02onHWj7+sRrFif5YAp1MrRe7U0cF7E0gcIKyZhfchgukpRBDJy4HQF88hzJt8U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742539742; c=relaxed/simple; bh=JjapcMVDGbOLgMkpCmBgvZCv2tls7EkMlHjM4nzx7nc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VG2aukyeSvOWxY3yQzfkB33zmbAIJaHp943lwReiW7cyyPg4rY/C4fdQPWFyU7FUCZ8xQ1wRqCWZtVbLmo4YS0mXZualt5gatlwPkWotY1j59XN2Ws0NBzXxVu+DhABJzHgn9u/a3glxqDOmiyMm2fcfOrdKEEiAeR170CxAIYk= 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=MwHkEHTi; arc=none smtp.client-ip=209.85.214.182 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="MwHkEHTi" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-224100e9a5cso30843405ad.2 for ; Thu, 20 Mar 2025 23:49:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1742539741; x=1743144541; 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=b/ZmhDXoFm25C2TQibSTkJHDcTfVUeG1ViV6OOg3xRE=; b=MwHkEHTiKDEeNOyho//Cj5YIGbXiWDHlEToCwMMiDc2SD8naWH/fH4SDgNS5AAY8T+ P/EyId5Hfo3xy8SErJuDVF9ZgtnNknJFku/xi3AjbFigt3TL4i9LVxHtUnQMOvMLgcIt lVgwWpwOh1TQq6S4mNPb9r5HrW7JrH125qjS0mSw2tmIPUZF6bT76P30avhXsTrd03/g NRqryO0lzBfd1DoT0FwkqwvAPxwUpwCJltSw0y49QUkwQsThND73sOTRXoBOjC1zDkbm bH7/fuXin9V7nGY6t0we4DqpW5j6+gPP6fuPm2fFuQz+b9V87rXrHc1w6RxaH42UUbH8 lRWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742539741; x=1743144541; 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=b/ZmhDXoFm25C2TQibSTkJHDcTfVUeG1ViV6OOg3xRE=; b=BykGLbywo9EP1LuJwuj+3/KYSZ7X18asQaLt/Oszr1zgu0Qw/zrBfB7wd9gqoFAud5 te8Fmj5Qg3ni2JQdzuRvJTTrVkGOyMxgqAmSIWTOxv5+HyP5lDZ3y/fJnM6W+AEO/6gP wcpaWxqnPoh48Qb5RmctgnShyJgQrea5Q3DYWitWuk5QqwR5ylMSO8hp6W95ZXfiY1jC wVp1z1ji8A0IZoBHz1Cczni6jx5fyU7tJxDBEocPMpa8IY3h/L9ak1vhffco5XXTZ5G3 SiJILyDlBRMB1TCffaxoXCbUip7E+qry/eS+GMDQJU7u4QtIAxpZy420e4AJsBX6DYyN vtNw== X-Forwarded-Encrypted: i=1; AJvYcCVlE9/1vRH2UGqViYZQe/D2mH7wrdF1dEkjbI2X0HoswejFpJmjbeKfp8Sxm1cZjAIOC83ApHY=@vger.kernel.org X-Gm-Message-State: AOJu0YzkXofuuCelaQD2mUQBhFYbEpa46vq4ta9NRyMbAOEKAK0usOE4 sGy8PYT2Qhz/SoAxyhUhejZgpvysW77pQ8n1s4l/0Bl3T8fRL2oK2YTY0Xgo1xM= X-Gm-Gg: ASbGnct5u22CGVB1daFnNR1dkKXBFfhB1eqEJuSeHt/zBAzjm5B//AZB4jRUgJdTHBo ieLqERw5IHeQA42T0a1KHSzfu/yZcQeFLlt69UqBqWiiHqjE/OnaKi0aWM316jqHkF9bzDVPZgp dBSDKToP97puD8yJzY03qKENRNJn+OzYrclPWpGTCld6T1GtKYWX8+p0xsErr6lvE2tgUKopUrr t/kOjsh4mHMHkX1SXJJIB1UHP0+EEcehSa/Xe1oiKXz+K2EhF9RWXiIyQLNFbGfWM7AsSlJFXrO eQzLKhPwhi4ZX2Hvcio7pxz8ps25dCh5lQIDVM2VPVgaXhH3 X-Google-Smtp-Source: AGHT+IFY57i8l2zIDhAAWUOoYbKyLPQPPGn+mWn2Fuj0WlYT5jMKi+NUy5SRU1dEXrfFRpylN+S9vg== X-Received: by 2002:a17:903:22c4:b0:224:2715:bf44 with SMTP id d9443c01a7336-22780c7b0d9mr33833585ad.19.1742539740663; Thu, 20 Mar 2025 23:49:00 -0700 (PDT) Received: from localhost ([157.82.207.107]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-22780f3977fsm9212645ad.14.2025.03.20.23.48.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 20 Mar 2025 23:49:00 -0700 (PDT) From: Akihiko Odaki Date: Fri, 21 Mar 2025 15:48:32 +0900 Subject: [PATCH net-next v2 1/4] virtio_net: Split struct virtio_net_rss_config Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250321-virtio-v2-1-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 X-Patchwork-Delegate: kuba@kernel.org struct virtio_net_rss_config was less useful in actual code because of a flexible array placed in the middle. Add new structures that split it into two to avoid having a flexible array in the middle. Suggested-by: Jason Wang Signed-off-by: Akihiko Odaki Acked-by: Jason Wang Tested-by: Lei Yang Acked-by: Michael S. Tsirkin --- include/uapi/linux/virtio_net.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/uapi/linux/virtio_net.h b/include/uapi/linux/virtio_net.h index ac9174717ef1..963540deae66 100644 --- a/include/uapi/linux/virtio_net.h +++ b/include/uapi/linux/virtio_net.h @@ -327,6 +327,19 @@ struct virtio_net_rss_config { __u8 hash_key_data[/* hash_key_length */]; }; +struct virtio_net_rss_config_hdr { + __le32 hash_types; + __le16 indirection_table_mask; + __le16 unclassified_queue; + __le16 indirection_table[/* 1 + indirection_table_mask */]; +}; + +struct virtio_net_rss_config_trailer { + __le16 max_tx_vq; + __u8 hash_key_length; + __u8 hash_key_data[/* hash_key_length */]; +}; + #define VIRTIO_NET_CTRL_MQ_RSS_CONFIG 1 /* From patchwork Fri Mar 21 06:48:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 14024895 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 1E7E21E5707 for ; Fri, 21 Mar 2025 06:49:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742539748; cv=none; b=F7q2tTh9M9EFkxpgYOq86v8Z13WlWAjQk8EN9M+Yvmo7yBI6HPqgHml1zR2Qtsez97Jgz4WYzq8mHNjnHfa/v/QvFjWkJZAancTu+FcZywqBbPqXctAt5cqc94Jo6wUeY/qIRAfxiP5SlOsBz3G75vf01pNUPcDwGwKENx7gZqk= 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.174 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-f174.google.com with SMTP id d9443c01a7336-22423adf751so32434875ad.2 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=jZ5OVYMaX8gsValsDHjuBI/IHsCXwq4OYNUavTdXzuinoIfrBLC33DexGFmC1yoiJw JHDFH2z9u/IV2ZLfYJ5MTHOrU1Hs1YygOEFYz4dwu1TeuTlHna+xS6+QG/odlCFxHFwj Sbr1r+1EDiP2Vk7Wwhv4AQD4lb9VoBzyXovv1Yb/+RAgcSmF3el3lh+9w9Fl6GC716vE KizAOH34JUW6dYnoi3hyVUP2U52uHG7aYcbRiOd/4Yy6lyHCnIDyMY31u1tU6lb3eEMx BaMT0KbnVUrl1qOBvuClpDRTU7Jzjxtk6xQrrLfkzaF7hCE+UJmsKjQCruqXcyJlRRfG EpGg== X-Forwarded-Encrypted: i=1; AJvYcCXg1vIp21ryb3sFgm4dUwowem7ewNrIXSCvqPzLoz7KX10YMUMUG6WHGIWAAbj2rE63wvnTS74=@vger.kernel.org X-Gm-Message-State: AOJu0YzCpGPbb3mhBRIvg5DlNlZfANobMTnFAWF423qS1ebgsMBgUCad izD1LBm4EaH0Y5bMOciPYFt7PqJjuKwJg748FeFYDv52nd1vRp5Z01WBXEFtyQA= X-Gm-Gg: ASbGncupkoXfjXTUcsn6n5AwGHgWVYrtr2WUG5NxdLc3vlCEvqXfsr+TdgiUEa1uKvd 7FELlLcuTkC3uEo8/ygS0QWXshbiPYugV1ZJ5Ac0NvywxjHMNhShf5bvs9TbsAk3cfc25yFlawA Im7XLvH5MSjeAdtqYoa6BKVEBhkIQKHcNexbN0aeVp8GyvtROsPKE65TTkEWx8PSTTlincqD9en +OD+Yj8RoI6+WMQYUdngux0LE/JW66ajSIYXWIJ0pBI6R6eJyjBqQ/gQAx1tDznPJTTCOnnwxYC Y8NWeV3Ar1+bXDrem8vuFXC0nOJghzhZNR64hS7qGuqH8rBU 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: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 X-Patchwork-Delegate: kuba@kernel.org 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]; - u16 *indirection_table; + __le16 *indirection_table; }; /* Control VQ buffers: protected by the rtnl lock */ @@ -3576,9 +3576,9 @@ static void virtnet_rss_update_by_qpairs(struct virtnet_info *vi, u16 queue_pair for (; i < vi->rss_indir_table_size; ++i) { indir_val = ethtool_rxfh_indir_default(i, queue_pairs); - vi->rss.indirection_table[i] = indir_val; + vi->rss.indirection_table[i] = cpu_to_le16(indir_val); } - vi->rss.max_tx_vq = queue_pairs; + vi->rss.max_tx_vq = cpu_to_le16(queue_pairs); } static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs) @@ -4097,10 +4097,10 @@ static bool virtnet_commit_rss_command(struct virtnet_info *vi) static void virtnet_init_default_rss(struct virtnet_info *vi) { - vi->rss.hash_types = vi->rss_hash_types_supported; + vi->rss.hash_types = cpu_to_le32(vi->rss_hash_types_supported); vi->rss_hash_types_saved = vi->rss_hash_types_supported; vi->rss.indirection_table_mask = 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 = 0; 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 * if (new_hashtypes != vi->rss_hash_types_saved) { vi->rss_hash_types_saved = new_hashtypes; - vi->rss.hash_types = vi->rss_hash_types_saved; + vi->rss.hash_types = 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, if (rxfh->indir) { for (i = 0; i < vi->rss_indir_table_size; ++i) - rxfh->indir[i] = vi->rss.indirection_table[i]; + rxfh->indir[i] = le16_to_cpu(vi->rss.indirection_table[i]); } if (rxfh->key) @@ -5426,7 +5426,7 @@ static int virtnet_set_rxfh(struct net_device *dev, return -EOPNOTSUPP; for (i = 0; i < vi->rss_indir_table_size; ++i) - vi->rss.indirection_table[i] = rxfh->indir[i]; + vi->rss.indirection_table[i] = cpu_to_le16(rxfh->indir[i]); update = true; } @@ -6044,9 +6044,9 @@ static int virtnet_set_features(struct net_device *dev, if ((dev->features ^ features) & NETIF_F_RXHASH) { if (features & NETIF_F_RXHASH) - vi->rss.hash_types = vi->rss_hash_types_saved; + vi->rss.hash_types = cpu_to_le32(vi->rss_hash_types_saved); else - vi->rss.hash_types = VIRTIO_NET_HASH_REPORT_NONE; + vi->rss.hash_types = cpu_to_le32(VIRTIO_NET_HASH_REPORT_NONE); if (!virtnet_commit_rss_command(vi)) return -EINVAL; From patchwork Fri Mar 21 06:48:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 14024896 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 673C81EC018 for ; Fri, 21 Mar 2025 06:49:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742539755; cv=none; b=Fx473KUaue138Qgu/SUjZ/oe/Eb2pSJi1znMDvowC3qwBTqRzhIP8PFALqqUVX2f10bPYvlsPQPd33YR81PAjMdsDa9ks+Y95R1fQFgt3Ea2fP5uaRJYomvLcEnLuvdanIL6xi1++fEqFg7dHI1rPqd8Duz+R994MjjSWrdic5I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742539755; c=relaxed/simple; bh=Z2Y9O3eqhn1rvYaihC/gieVlbnv+PDXtqqJuzacNaoM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uCANo7o7dGt5/d2pVz4QSOxlUPgsyh6YNU4S3yO6O5RdA+fshCMahq3/e35quxfz+i6FWD5w/yR3A+zy/9dnLb7L6q29b8PWjUZjPm/p8MPs/V/ibPvnNcS9RL6Ox90xroeeZ49WWNX7UXaJ3jqKVGpHB4aftWIcYFISMSQN5A8= 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=BJdeg3rK; arc=none smtp.client-ip=209.85.214.169 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="BJdeg3rK" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-226185948ffso31582145ad.0 for ; Thu, 20 Mar 2025 23:49:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1742539753; x=1743144553; 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=uzn3T+nuCYQGYh/wLolPV7n3f3AMHuiTROhjSuXNiYA=; b=BJdeg3rK29RVMXBiH9JwHZYIVUBt82d1/nJUNKg4wKwnntg6nsS6OCBgB5sf07+vhj 7gLOjUXETStV1HF+LiQTroe8/LFVJ3J4ldiVJk7UyGGlULn5X7MaM6WRErcadDv0cwve 85TTiaY8afMLKfIigEOql10sM2RbJ+QRxOH2wLwh+hEcDiwqquZXHv+q9nCT+ShLkX2e pOhHd5q1DqAytWKzS0Ed4Gdb8NHHL2j+9C5bzpxIcsXgbRAtah/FCOnkCiph/hj8JWGI FnMzVDYubDzFULVLnJ9VrS1WZYitHPO7SBFH4l0ktAnQAewwMW1lYKGom4kTcqSTnAqh FCJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742539753; x=1743144553; 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=uzn3T+nuCYQGYh/wLolPV7n3f3AMHuiTROhjSuXNiYA=; b=tFB2o3a5pyVr4buI52UQuZ5mo0tEH/7sPcCGlfLhm9pk3xG7b6JhFR5mLve0B1LNir iS7EFjZSa8n9gblENMaA8XweembI179Ln3IbYIOITSV6OmLNJjC1YqTe/BFvyqHpquye kK0HsFq4QruVtdBxRNktzlEl8vvKN9Yk1/+V7vWxzuigHmhDP6E5ZtyXygH3n+KUoI23 ckaZgFyp/dQmylyXevNeIwQbGFSwTQ4cSxda1z0yhKKFCwJUnoWS/sIQzmxRbbZpJOvR pxQ38h083ftxneyN1RCL/iSwjbjMIrTDVgL4kxe6wGX6AUO2cI4VjQR3cmtRZfpscLk8 oEVA== X-Forwarded-Encrypted: i=1; AJvYcCVfJnGcq88O5r1V8Bv4GpyAmJ3G99Pd9asPjhsJmQGT16eKjQqUarAlLGUuUMLzOng75ByJZFk=@vger.kernel.org X-Gm-Message-State: AOJu0YyBNvgZv4Hvd9x5ogAtDWSgcV861CU9+2K+VBJnDySddChWzGwa y00sSPmNWsT25BBtXGyvmC45HoLG64BGhZdmTv9MC1hMwk9Nhq+YFx8wgv2l+GM= X-Gm-Gg: ASbGncsU5OP+GHFUCmw7lPxlW5IadQCdz9v+MKbNehq1B2z3gJlIOew7clSJYukgKva mTOfUP3tfqiw/pPs60y6G483RMg3nWLGSR8WilNDdX4PEDI+EMAjRyNt0q6H4Cad4zuwddXdPZX u01KXKawnkVm+1kzC3mGE7S4YUzAEIr23hK6cjhgCWm6H7XN6uiq+03uB8+l7ZRsO/dNJBwt5Ax QqzYb5XS0WMtZ4hTlo1K1+Ncx8cRURTKYBNCQB8fZKeGwlfRpS/JMXun9nCJlB0Hfn6H3aq8PxU 9mXLSjD70scKdxbDKrbPvuf/2HgtOxkJ5Vix51pQJlXl+vFg X-Google-Smtp-Source: AGHT+IG8dBmG9jS+xEQ6Ng0OGzGrq0W4LvqVBYyQ/bWMu3It8TGgG3Ug4znLWd6q2IeFKq2SAqukNg== X-Received: by 2002:a17:902:ec87:b0:216:393b:23d4 with SMTP id d9443c01a7336-22780c68a0fmr31888685ad.11.1742539752424; Thu, 20 Mar 2025 23:49:12 -0700 (PDT) Received: from localhost ([157.82.207.107]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-227811d9f0dsm9039095ad.165.2025.03.20.23.49.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 20 Mar 2025 23:49:12 -0700 (PDT) From: Akihiko Odaki Date: Fri, 21 Mar 2025 15:48:34 +0900 Subject: [PATCH net-next v2 3/4] virtio_net: Use new RSS config structs Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250321-virtio-v2-3-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 X-Patchwork-Delegate: kuba@kernel.org The new RSS configuration structures allow easily constructing data for VIRTIO_NET_CTRL_MQ_RSS_CONFIG as they strictly follow the order of data for the command. Signed-off-by: Akihiko Odaki Tested-by: Lei Yang Acked-by: Michael S. Tsirkin --- drivers/net/virtio_net.c | 117 +++++++++++++++++------------------------------ 1 file changed, 43 insertions(+), 74 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index d1ed544ba03a..570f77534dfb 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -360,24 +360,7 @@ struct receive_queue { struct xdp_buff **xsk_buffs; }; -/* This structure can contain rss message with maximum settings for indirection table and keysize - * Note, that default structure that describes RSS configuration virtio_net_rss_config - * contains same info but can't handle table values. - * In any case, structure would be passed to virtio hw through sg_buf split by parts - * because table sizes may be differ according to the device configuration. - */ #define VIRTIO_NET_RSS_MAX_KEY_SIZE 40 -struct virtio_net_ctrl_rss { - __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]; - - __le16 *indirection_table; -}; /* Control VQ buffers: protected by the rtnl lock */ struct control_buf { @@ -421,7 +404,9 @@ struct virtnet_info { u16 rss_indir_table_size; u32 rss_hash_types_supported; u32 rss_hash_types_saved; - struct virtio_net_ctrl_rss rss; + struct virtio_net_rss_config_hdr *rss_hdr; + struct virtio_net_rss_config_trailer rss_trailer; + u8 rss_hash_key_data[VIRTIO_NET_RSS_MAX_KEY_SIZE]; /* Has control virtqueue */ bool has_cvq; @@ -523,23 +508,16 @@ enum virtnet_xmit_type { VIRTNET_XMIT_TYPE_XSK, }; -static int rss_indirection_table_alloc(struct virtio_net_ctrl_rss *rss, u16 indir_table_size) +static size_t virtnet_rss_hdr_size(const struct virtnet_info *vi) { - if (!indir_table_size) { - rss->indirection_table = NULL; - return 0; - } + u16 indir_table_size = vi->has_rss ? vi->rss_indir_table_size : 1; - rss->indirection_table = kmalloc_array(indir_table_size, sizeof(u16), GFP_KERNEL); - if (!rss->indirection_table) - return -ENOMEM; - - return 0; + return struct_size(vi->rss_hdr, indirection_table, indir_table_size); } -static void rss_indirection_table_free(struct virtio_net_ctrl_rss *rss) +static size_t virtnet_rss_trailer_size(const struct virtnet_info *vi) { - kfree(rss->indirection_table); + return struct_size(&vi->rss_trailer, hash_key_data, vi->rss_key_size); } /* We use the last two bits of the pointer to distinguish the xmit type. */ @@ -3576,15 +3554,16 @@ static void virtnet_rss_update_by_qpairs(struct virtnet_info *vi, u16 queue_pair for (; i < vi->rss_indir_table_size; ++i) { indir_val = ethtool_rxfh_indir_default(i, queue_pairs); - vi->rss.indirection_table[i] = cpu_to_le16(indir_val); + vi->rss_hdr->indirection_table[i] = cpu_to_le16(indir_val); } - vi->rss.max_tx_vq = cpu_to_le16(queue_pairs); + vi->rss_trailer.max_tx_vq = cpu_to_le16(queue_pairs); } static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs) { struct virtio_net_ctrl_mq *mq __free(kfree) = NULL; - struct virtio_net_ctrl_rss old_rss; + struct virtio_net_rss_config_hdr *old_rss_hdr; + struct virtio_net_rss_config_trailer old_rss_trailer; struct net_device *dev = vi->dev; struct scatterlist sg; @@ -3599,24 +3578,28 @@ static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs) * update (VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET below) and return directly. */ if (vi->has_rss && !netif_is_rxfh_configured(dev)) { - memcpy(&old_rss, &vi->rss, sizeof(old_rss)); - if (rss_indirection_table_alloc(&vi->rss, vi->rss_indir_table_size)) { - vi->rss.indirection_table = old_rss.indirection_table; + old_rss_hdr = vi->rss_hdr; + old_rss_trailer = vi->rss_trailer; + vi->rss_hdr = kzalloc(virtnet_rss_hdr_size(vi), GFP_KERNEL); + if (!vi->rss_hdr) { + vi->rss_hdr = old_rss_hdr; return -ENOMEM; } + *vi->rss_hdr = *old_rss_hdr; virtnet_rss_update_by_qpairs(vi, queue_pairs); if (!virtnet_commit_rss_command(vi)) { /* restore ctrl_rss if commit_rss_command failed */ - rss_indirection_table_free(&vi->rss); - memcpy(&vi->rss, &old_rss, sizeof(old_rss)); + kfree(vi->rss_hdr); + vi->rss_hdr = old_rss_hdr; + vi->rss_trailer = old_rss_trailer; dev_warn(&dev->dev, "Fail to set num of queue pairs to %d, because committing RSS failed\n", queue_pairs); return -EINVAL; } - rss_indirection_table_free(&old_rss); + kfree(old_rss_hdr); goto succ; } @@ -4059,28 +4042,12 @@ static int virtnet_set_ringparam(struct net_device *dev, static bool virtnet_commit_rss_command(struct virtnet_info *vi) { struct net_device *dev = vi->dev; - struct scatterlist sgs[4]; - unsigned int sg_buf_size; + struct scatterlist sgs[2]; /* prepare sgs */ - sg_init_table(sgs, 4); - - sg_buf_size = offsetof(struct virtio_net_ctrl_rss, hash_cfg_reserved); - sg_set_buf(&sgs[0], &vi->rss, sg_buf_size); - - if (vi->has_rss) { - sg_buf_size = sizeof(uint16_t) * vi->rss_indir_table_size; - sg_set_buf(&sgs[1], vi->rss.indirection_table, sg_buf_size); - } else { - sg_set_buf(&sgs[1], &vi->rss.hash_cfg_reserved, sizeof(uint16_t)); - } - - sg_buf_size = offsetof(struct virtio_net_ctrl_rss, key) - - offsetof(struct virtio_net_ctrl_rss, max_tx_vq); - sg_set_buf(&sgs[2], &vi->rss.max_tx_vq, sg_buf_size); - - sg_buf_size = vi->rss_key_size; - sg_set_buf(&sgs[3], vi->rss.key, sg_buf_size); + sg_init_table(sgs, 2); + sg_set_buf(&sgs[0], vi->rss_hdr, virtnet_rss_hdr_size(vi)); + sg_set_buf(&sgs[1], &vi->rss_trailer, virtnet_rss_trailer_size(vi)); if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_MQ, vi->has_rss ? VIRTIO_NET_CTRL_MQ_RSS_CONFIG @@ -4097,17 +4064,17 @@ static bool virtnet_commit_rss_command(struct virtnet_info *vi) static void virtnet_init_default_rss(struct virtnet_info *vi) { - vi->rss.hash_types = cpu_to_le32(vi->rss_hash_types_supported); + vi->rss_hdr->hash_types = cpu_to_le32(vi->rss_hash_types_supported); vi->rss_hash_types_saved = vi->rss_hash_types_supported; - vi->rss.indirection_table_mask = vi->rss_indir_table_size + vi->rss_hdr->indirection_table_mask = vi->rss_indir_table_size ? cpu_to_le16(vi->rss_indir_table_size - 1) : 0; - vi->rss.unclassified_queue = 0; + vi->rss_hdr->unclassified_queue = 0; virtnet_rss_update_by_qpairs(vi, vi->curr_queue_pairs); - vi->rss.hash_key_length = vi->rss_key_size; + vi->rss_trailer.hash_key_length = vi->rss_key_size; - netdev_rss_key_fill(vi->rss.key, vi->rss_key_size); + netdev_rss_key_fill(vi->rss_hash_key_data, vi->rss_key_size); } static void virtnet_get_hashflow(const struct virtnet_info *vi, struct ethtool_rxnfc *info) @@ -4218,7 +4185,7 @@ static bool virtnet_set_hashflow(struct virtnet_info *vi, struct ethtool_rxnfc * if (new_hashtypes != vi->rss_hash_types_saved) { vi->rss_hash_types_saved = new_hashtypes; - vi->rss.hash_types = cpu_to_le32(vi->rss_hash_types_saved); + vi->rss_hdr->hash_types = cpu_to_le32(vi->rss_hash_types_saved); if (vi->dev->features & NETIF_F_RXHASH) return virtnet_commit_rss_command(vi); } @@ -5398,11 +5365,11 @@ static int virtnet_get_rxfh(struct net_device *dev, if (rxfh->indir) { for (i = 0; i < vi->rss_indir_table_size; ++i) - rxfh->indir[i] = le16_to_cpu(vi->rss.indirection_table[i]); + rxfh->indir[i] = le16_to_cpu(vi->rss_hdr->indirection_table[i]); } if (rxfh->key) - memcpy(rxfh->key, vi->rss.key, vi->rss_key_size); + memcpy(rxfh->key, vi->rss_hash_key_data, vi->rss_key_size); rxfh->hfunc = ETH_RSS_HASH_TOP; @@ -5426,7 +5393,7 @@ static int virtnet_set_rxfh(struct net_device *dev, return -EOPNOTSUPP; for (i = 0; i < vi->rss_indir_table_size; ++i) - vi->rss.indirection_table[i] = cpu_to_le16(rxfh->indir[i]); + vi->rss_hdr->indirection_table[i] = cpu_to_le16(rxfh->indir[i]); update = true; } @@ -5438,7 +5405,7 @@ static int virtnet_set_rxfh(struct net_device *dev, if (!vi->has_rss && !vi->has_rss_hash_report) return -EOPNOTSUPP; - memcpy(vi->rss.key, rxfh->key, vi->rss_key_size); + memcpy(vi->rss_hash_key_data, rxfh->key, vi->rss_key_size); update = true; } @@ -6044,9 +6011,9 @@ static int virtnet_set_features(struct net_device *dev, if ((dev->features ^ features) & NETIF_F_RXHASH) { if (features & NETIF_F_RXHASH) - vi->rss.hash_types = cpu_to_le32(vi->rss_hash_types_saved); + vi->rss_hdr->hash_types = cpu_to_le32(vi->rss_hash_types_saved); else - vi->rss.hash_types = cpu_to_le32(VIRTIO_NET_HASH_REPORT_NONE); + vi->rss_hdr->hash_types = cpu_to_le32(VIRTIO_NET_HASH_REPORT_NONE); if (!virtnet_commit_rss_command(vi)) return -EINVAL; @@ -6735,9 +6702,11 @@ static int virtnet_probe(struct virtio_device *vdev) virtio_cread16(vdev, offsetof(struct virtio_net_config, rss_max_indirection_table_length)); } - err = rss_indirection_table_alloc(&vi->rss, vi->rss_indir_table_size); - if (err) + vi->rss_hdr = kzalloc(virtnet_rss_hdr_size(vi), GFP_KERNEL); + if (!vi->rss_hdr) { + err = -ENOMEM; goto free; + } if (vi->has_rss || vi->has_rss_hash_report) { vi->rss_key_size = @@ -7016,7 +6985,7 @@ static void virtnet_remove(struct virtio_device *vdev) remove_vq_common(vi); - rss_indirection_table_free(&vi->rss); + kfree(vi->rss_hdr); free_netdev(vi->dev); } From patchwork Fri Mar 21 06:48:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 14024897 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 5C4C81EF0BA for ; Fri, 21 Mar 2025 06:49:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742539759; cv=none; b=WwbzBgb9YrdfKEJ7g89WShFDGsmOiLNzCRfSpTGGNlnuFWyYPNatpTG7y4HkySlpGhZ8yQcGrslRhXOPW8amUg5BKglUujFIo5LXUkdc4PZvJT6QvImLfuGSBRC60KCLalDRoZJCPZy9P6900+dz9K9bsFUKr4it6/gGi4A11IE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742539759; c=relaxed/simple; bh=9CUrz9dhvu15FJYjSA2vyaWutvF8gNFVLxLx3NxqRDI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Q1/WF2JhXy9K5E/HeRrDpXqrcbbmi5eWkYiwco+WOcUEY1avDs2mpWLfXprArWeeOZadVDz6mMmxtrE1OxQMVQnr2xKzOUZp4Mc9FasyNjkHyoNYUWQKf9p8qx2VIe8j+U/qUL5t7sVtiPkDGa4xQ6D9msKVoQH9qWMwtpvD0GA= 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=rNASNJcQ; arc=none smtp.client-ip=209.85.214.177 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="rNASNJcQ" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-224019ad9edso39241955ad.1 for ; Thu, 20 Mar 2025 23:49:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1742539757; x=1743144557; 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=50SxeWFRe74DdNLvKUCrTVWbecxWk/tvvWU0un1oLD8=; b=rNASNJcQKx1LXxq9KSlD5IcbqCzOKA1fC0dbCdndUZ+60VAcRVfzcOP7xYAqgeTols rhAvFaIUg6rvuagZFAmkOwvNvedCQrPrc46SZXMkpkaPqgiiYLHldc53DHUwQDptESZN h01kFl0hMTU8kWJv4/vUdnqWhwgTRzlJqhBWmeNjxMiOobKVvEjR3iOfvBq9fL0/XdTv KnMpZ7AUo+Fq4X9ghxZg22Ttssgz3ZwCKfFihT6gbIh1tAN2SYQ2dWfkvLlfNOvDdsaT uagFyzMqOwZ++bswBrPHwpWStP3HeTRCC0Nhy6Vf93qfdOgaVcXUDohKkF7mtzui0OMw sr5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742539757; x=1743144557; 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=50SxeWFRe74DdNLvKUCrTVWbecxWk/tvvWU0un1oLD8=; b=V2fqPxwisEL6JnEMIGJhF6Y5b6FPYXTr/wOHFHkheiTnLjQ6kue9Nztu61NU1HHhAX 4btMFG40Q0iUqoIONCLjAzSkTWInynlFPZYZh+a8+/ZDoW7G3UPRmMEFe+RrBK0KiF0u dkH6dmMQFMdXzoGRQafYHFG0/Pe57PLKJgljLPe8p7cl9iHOy1e3sDQCZsyFzZ9I3exN 1l3wpYe/ed1PK0kB9+DKeVh/VkdzjBFb2/jQq8nKF0H0juOttw4qXXjBm6gwvDUtV7X/ mf1UfkOoNwfQOr4DwFUJF/n+6mORNcpN1CL1okRbjJP9GF8k21+vrMYPp0QBLzb8fgOn wN/g== X-Forwarded-Encrypted: i=1; AJvYcCXYZKR/MuMC4vZe2/ITppLQQ0cbgxtjwe5hcObMWtpaCk05avaXfwwyoGHu5F6x7B2cO6lI5Pc=@vger.kernel.org X-Gm-Message-State: AOJu0YyG57EshSpZyWXfRRcsH4SOZvOp286tO/vrw3qHh+40M56cdHVc nqDR3sfy+Xyu57WxD1ulBb4Z7PC+kQLsBGUpF0w3qIg9ZYOPpg8wrfDCnzWNikc= X-Gm-Gg: ASbGncvfaNOmpT3QTSRSRFjnP0RVH3fEn+9bMxaBN8t6Rf1EDaYgDWXmbf2/nShHyFW Wf5MAPYheivjiG5DDEiXStiz7TQNwLyBZVxSs+g6SqmawqWajHqFjDp4Jb+pcB4M7uprs+WT0M/ I8ua+9XEdnIgQljsW6Hj/QXPaGgX1EmxbMpdAUblYAY9tUaDv/pLiEQ00DfZ9fRHPh2usKNXla9 cE17K/eJCYZL/cGEViZHr15ag/+bGh6qv+uv9e0rriciqgM80oIxLr1fDO1fphDpopsXYwsrE2z 76FmLVGGNqEe6CnDDq48jTu2Rbseq7/4HWRe6gKL0QvcTSVG X-Google-Smtp-Source: AGHT+IF0uHlKSVlfre+IRVuMyIVROaUprT3kAYWQuGSmWoRdQtDg0pKD8EXS5S828nJMT0659WKQDA== X-Received: by 2002:a17:903:19e6:b0:223:397f:46be with SMTP id d9443c01a7336-22780e19bbfmr36357865ad.47.1742539757618; Thu, 20 Mar 2025 23:49:17 -0700 (PDT) Received: from localhost ([157.82.207.107]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-3030f807533sm1080930a91.49.2025.03.20.23.49.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 20 Mar 2025 23:49:17 -0700 (PDT) From: Akihiko Odaki Date: Fri, 21 Mar 2025 15:48:35 +0900 Subject: [PATCH net-next v2 4/4] virtio_net: Allocate rss_hdr with devres Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250321-virtio-v2-4-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 X-Patchwork-Delegate: kuba@kernel.org virtnet_probe() lacks the code to free rss_hdr in its error path. Allocate rss_hdr with devres so that it will be automatically freed. Fixes: 86a48a00efdf ("virtio_net: Support dynamic rss indirection table size") Signed-off-by: Akihiko Odaki Acked-by: Jason Wang Tested-by: Lei Yang Acked-by: Michael S. Tsirkin --- drivers/net/virtio_net.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 570f77534dfb..6efec9c50b25 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -3580,7 +3580,7 @@ static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs) if (vi->has_rss && !netif_is_rxfh_configured(dev)) { old_rss_hdr = vi->rss_hdr; old_rss_trailer = vi->rss_trailer; - vi->rss_hdr = kzalloc(virtnet_rss_hdr_size(vi), GFP_KERNEL); + vi->rss_hdr = devm_kzalloc(&dev->dev, virtnet_rss_hdr_size(vi), GFP_KERNEL); if (!vi->rss_hdr) { vi->rss_hdr = old_rss_hdr; return -ENOMEM; @@ -3591,7 +3591,7 @@ static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs) if (!virtnet_commit_rss_command(vi)) { /* restore ctrl_rss if commit_rss_command failed */ - kfree(vi->rss_hdr); + devm_kfree(&dev->dev, vi->rss_hdr); vi->rss_hdr = old_rss_hdr; vi->rss_trailer = old_rss_trailer; @@ -3599,7 +3599,7 @@ static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs) queue_pairs); return -EINVAL; } - kfree(old_rss_hdr); + devm_kfree(&dev->dev, old_rss_hdr); goto succ; } @@ -6702,7 +6702,7 @@ static int virtnet_probe(struct virtio_device *vdev) virtio_cread16(vdev, offsetof(struct virtio_net_config, rss_max_indirection_table_length)); } - vi->rss_hdr = kzalloc(virtnet_rss_hdr_size(vi), GFP_KERNEL); + vi->rss_hdr = devm_kzalloc(&vdev->dev, virtnet_rss_hdr_size(vi), GFP_KERNEL); if (!vi->rss_hdr) { err = -ENOMEM; goto free; @@ -6985,8 +6985,6 @@ static void virtnet_remove(struct virtio_device *vdev) remove_vq_common(vi); - kfree(vi->rss_hdr); - free_netdev(vi->dev); }