From patchwork Tue Mar 18 09:56:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 14020725 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 F3BB4207DE3 for ; Tue, 18 Mar 2025 09:57:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742291829; cv=none; b=L99M/UJmK4ZvcJ5W9ztHDOvncgyaDH7qlqUsfq6kVxc/B+9WW4CljGgFb7GHFvCuGuzdKey9EtQdLgkM0LgITFr09ak7jsRD40XYkpGaJebp+fDqbYbrhXPetQy7g1jgr1SanEHX0jDhQKVpe9vrWLOApXN9rW2uS1pICwB6pkA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742291829; c=relaxed/simple; bh=y7xGmXz1+joLuyF7rRKoRaRnhcPRU8zLLhDGbCzRvUU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WM7QrC9cCE9M4BAMZpmUIEXY/ufnC3X6K9dA/9mzccksXDilLuHDFtGI7/Ui+m5FzYF/kG2JPV3jocdWf2VYikvupCKG9hvTj4bEG/N01jQxX/g6okziz3zVOy9UqitN2Q1Zq8KTk7xBRImR4K3pDs0LHlY9lD+10ILMlluo4ZU= 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=VYE+pb0g; arc=none smtp.client-ip=209.85.214.172 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="VYE+pb0g" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-22435603572so85599545ad.1 for ; Tue, 18 Mar 2025 02:57:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1742291824; x=1742896624; 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=VFcdkuZXdG0nFv0JVqG4IlwwkUXBEREwH0bBsZlwErc=; b=VYE+pb0gott8bXBnveB/YaMuIqCVjTM4+OzTRmcJq0mgofuKNn80ebEBJlfl7zHSgV NpHP2SOLr1JyDyASJM15U8mkOXoYK474ks600F9F705p82n/M+o/mnWq2/Q/tH3FbGvr XNrqWVoPnvQIjTmjCwXj5h2M2no3fRzO6k9UU1N/RS7LB7sliMaBmXKBwJFQS5md9ORd FU++dJ8QPuOXZ2ZCtjTHhe22SslJ2FtRhJUhFEFZ4604vzWhMl3poInMW1GIAG88l9hC XmYwNMGUpbagKnWD3lIqKa67e7iZvjaKmmK8ink/xVVkbOZHQfwihFUptCIAwVt9LyNx HX5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742291824; x=1742896624; 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=VFcdkuZXdG0nFv0JVqG4IlwwkUXBEREwH0bBsZlwErc=; b=qQnXHN+THVDezY2kE/OWRILP/CTD2yRtBrn8MS9UhLwiwfrIdyvLMxos3Hog8r2Dqe 48KAd19/6rJmfe351WgYFTlhYxuoeYcCqIFrfrZYImwB1jo6hOPrlRkoizKEx3vfIHPQ EAvjgfnKn3hbuLmT7d8zygh5JodJ0WEegd+qRvULC/MOB2RSGiMLX2oqA4T+FY7rl4Cv HvD06mDoItZly4GIfom1S5Jn6zlhdH+xG3SWcicudUNP8mGKmHESyoej0SzR6TS8bxrh jM+mXSI5utclmSeaIlOLaIaiP03wgefNmm2ChednhSmaRptyR+TLfrWw94Gahk7AYqDB wI/Q== X-Forwarded-Encrypted: i=1; AJvYcCVO4bCEbOY27V+cxFaZn66RI2/4CLzQ3lBUlUkKZHoHNofAtn6QllM7vbRfRCEaYWUpOl64rZg=@vger.kernel.org X-Gm-Message-State: AOJu0YyBes1KNs5T+wEMIh24/fZp3PvOsCoceDYboPeLy8V2ddDbLyWM 7p4b+1ftx7rSIFf50wF0w4sC1GTn3n16RcvDYBfHHmaB6bOwaxh2rqIxtNfbxuo= X-Gm-Gg: ASbGncvHIRRof4q/PuB8Z5dXNMzWkFLDmrRl3tAywVgWsjzoZ5+N33Ms8vbF9Kb0vXL xgbuN/huzUc7TLRTMbLbuZqi8vW9cy4G/gweqTz8U0bRWwRK7o/QiCLXCwMnjBcDN/YusEEXM0E PK6JDVPqsoVwd5+yynU6ja4UPRG/GUq3tsiuj4WWxia85L28/Okz8x9H9/RAO9CRpG943bhFU0y Q8qyeuACBV5Ex8X2SrCYfXnMuyg0Nyv7fiRyxXQzx+CP5LCH9EnrLwZwKN/pqY8zPTmcdAN/sc7 gv66uzDwoVI9xUumua82iqnwYVsuaj8HWm183ejOSatqF6yA X-Google-Smtp-Source: AGHT+IEDg7sBznXHtheXcTwTR0qQJ5XZCTzq1W3+7+Ny1lJUvohFaD6bIzC8LuHltfp6YLS3zy5cUg== X-Received: by 2002:a05:6a00:2d95:b0:736:4d44:8b77 with SMTP id d2e1a72fcca58-7372236edfbmr23606104b3a.8.1742291824189; Tue, 18 Mar 2025 02:57:04 -0700 (PDT) Received: from localhost ([157.82.207.107]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-737115781f3sm9150521b3a.76.2025.03.18.02.57.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 18 Mar 2025 02:57:03 -0700 (PDT) From: Akihiko Odaki Date: Tue, 18 Mar 2025 18:56:51 +0900 Subject: [PATCH net-next 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: <20250318-virtio-v1-1-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 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 --- 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 Tue Mar 18 09:56:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 14020726 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (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 828DE2080CF for ; Tue, 18 Mar 2025 09:57:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742291832; cv=none; b=Osq29db+DOGcnpc37rJN1Lg/xJ7tOArkR55AZm5cfU9Nol7DoqAZBEN54pQrbm00UTZ9QwlBbXBdtlGmzI0wwhnLIim9T7lHXefPLC8Zea3LsFflhOtUbNCCi6mFyuRxtivKDPRI8kZoui16U7np3DQkV7A5TkcpyVbdPgbdw1E= 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.170 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-f170.google.com with SMTP id d9443c01a7336-22409077c06so134716095ad.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=ubCDk6rXGq83puwaw+6CJpD3Y2P9MMsyS7mc6fja7D9fh+ZJynLaKUlYC/FkHtHFdK JtRlLwDjubVx+GFN4xIPAND0Y+xPJmXRj47oy9fzvawrEoTtCh/E7iZUACG8C/In70uV 6mLhZ8A07zwj2q/h7NieRbNisB/1c5ThPJW7QUWSUMdTlKqxdGNi6ACpB06guZisWND+ 4jPyqhybN8lQyUlGyl/EoZ49yYAa1deUYgrT4GGEXt2hSDskHpA5G2YYkp+t6CXlbgir h83jwvOyzWgonBmjKT3TkX0Cg6LVV9PitSS63NdiaXxafJ8gSz1/osk6YZWkrlduVy1f yW6A== X-Forwarded-Encrypted: i=1; AJvYcCXE45MwG0KAS+ALfWbU/roRi9uA4sMj1IVMaE+9vfXW81c9aVCoSYjk340SZMgb6o9gHljPRIA=@vger.kernel.org X-Gm-Message-State: AOJu0YxQyDpgf3hB55t+tmtbS3GMFOVa+vCNiFlA2FOpisXnPHrFlTg9 1fUZZhL6wW3n4F7WUxaJ5KF2WK189yDSwbscNpy3qROXlTX8YmNS7FOEQiSH6Dw= X-Gm-Gg: ASbGnctvKR8XOeSXgoYPQ+TdoW0dsRLlHSH4lF2B6/mHQwzSZmD/biY4MIzlNwQF9Fa 67S8dlrML0COiZJlAeFu3Ms7go42RdawGK8PHTD8HcjxqUrrw16Iloz/Yn7w7BBOK3timX1J78g /E0ByEamd56WTw2thgz2Ouus0SYtz1cp0OCa/12iuORzX/xgFe2xy9xqBNFpxgfaZoO5FeM415A VTpEaRgosWG7I1l+ODpHwhD/blv+VWw+7y4bLsWCPl6lnPaJg0Km5xqa3EKo0uEiNJ+3iQ4iqTa /HaalbAwOxQJEiiVHQNmjOhj/JqJxAflCsKHnRKjpkx+IsdE 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: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 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 --- 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 Tue Mar 18 09:56:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 14020727 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (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 F164C207A27 for ; Tue, 18 Mar 2025 09:57:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742291837; cv=none; b=E0i7ZGTOchOgGDi1VAkYtfBciZK9mg8mxRkOp0usnduKlxvy71RdnqCty4/NiNKEqdLZy2sQCkmCWHZGLB7C2fvxzBglXEvB3Iryg6Wf01y2RfyC4RYetI4Zxgoa1f2bihfMfjNOsiM21Rh4jxl4xRqlLf24vA3twdSJ4OtjssI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742291837; c=relaxed/simple; bh=2H0LOy1dl1R4X21fJQz5w5DwYt+uC1RiozFTUOPEQtI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FIfbCXBvCp4wcgl+NtZJJlGUY0s+bnD0UCLqarvTk0CU2ZZmqo9ayckvY9yuqD4WU46+Lr6CnJw91zUWiNl1UZNZ469qO2h8mggYr7o8ika8rPIuIvHnxRaGqsUGQJt9/Ioz2sAD790T16DO+UdHI4yukiL0oABtf8qur0nWOc0= 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=tmZXoT7u; arc=none smtp.client-ip=209.85.214.170 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="tmZXoT7u" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-22435603572so85601595ad.1 for ; Tue, 18 Mar 2025 02:57:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1742291835; x=1742896635; 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=MwN32a07GbawJSXlfUmDtsmEJH/9PVnotVoppSFrOi8=; b=tmZXoT7ufJQ0dgLkSMnvRmi6XrVJO+9l+oQPUMvjft2mKuzQw8Gzp++81ckvaRngNJ 6c9GEWV6O+PuWCKi+ndIVxEEP5TG3q+ls2TY/irNVDnVDohTWJ9wo2g6hZveBePkqAgR HoyFv0HlYnHtvsSp0RZ11yFTDbR4R1tUZS8dFh12zPSBaPwmGj5TA7QSTaBAPG0lv1oF BfG7JgHJpZVTUdU6ujDfxvF0GMoyY7qnw+GBPBfhjSEhhSR/StIzZpn0P3myP0VRUFNC UxsLnTbc9Hxp7jnic/+A2s0VgAlb4N+OmrEzUNqGoMqhSoKU5tOZ2qOH3mSy+Ohz7b93 AWWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742291835; x=1742896635; 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=MwN32a07GbawJSXlfUmDtsmEJH/9PVnotVoppSFrOi8=; b=SPia+Ko+PFp8JMo67+whlatL44K0XA7QeM5hGWmFo8TFdwNS3XI+/bwT+KWy7Ogszo Y1hs1yPD5gAZTssVCEeX+AD5PO7AwnFsx5ySvSMkaleOAOm/41qdhQj8ZKUya6mlpvX1 WrNGL6ytD76AQtJlxETIy/SXawtPopOVYCqamLAYX4n/72AL75/o48U4dXu+jjecHnUg F5xogSTiWcL0oHUCFFSYl4IERr3tgCvdEthyRh7UQS7SFWEfqMImFAJhkMFYqvgIF+PQ d4x+PvchUGuaT2U67equPerxTCVl4n7THPM4YeXtub8ZOxzLNH/vWCErIUcFq92LWz9Q qC6Q== X-Forwarded-Encrypted: i=1; AJvYcCVrBjK8k5bLZi96sqWOrF7OeKiD+r8ScXCfjJ6nGDGjBw7scBxXjdIMkLnEQHdZYV2E3kXloH4=@vger.kernel.org X-Gm-Message-State: AOJu0Yy0h+WpkP2M4gBIJmzlIhfQU4/K220l5/SUadPRXrJxSOESKk8y Us2PA4xbf+f8aoJAE6dNcclrA15Xleg18f/mRivoEj1FAPuHfnIve/gHlxojJpAMliQpbWmiAbJ 2ZBs= X-Gm-Gg: ASbGncspHf+44uA55cKvfinvZWwvOzDkqqNAuujT5JAGMwF/Off5zf0kDwD1Yuoo2Ab DQXvjd8joMcc6vBNNPaGTUNyVzLVFHAKcfSOV6E4r7xRoQ7DKYTWh3hXKRwKLjVKfpzQy3MC+j1 ZWDO0QIasjRxqwi9XkSs/7u3sTBfP4zu0oOufnPdYd/CrOYGLJfknCK1vU9sx/VpHCMYLP0kX80 y4uw5mbVkwtUTz7ujaJ79kXna23dkwJv07pM6Bgpcdn+bQyM0mgm3JOFt+oH6O2ETBmSIn2yDrV 76tvNAKoPiPAOMu7gWypFiBfvaBo9Aspc5kClvnFJKKmFS8+ X-Google-Smtp-Source: AGHT+IE1M6ocCW9rTlNS1UlNLsp7Dsf3oTTmarN4fQcPRxkzPeR3CnVRs/sC2YRmUWRBq1CjvKmChA== X-Received: by 2002:a17:903:2cd:b0:223:66a1:4503 with SMTP id d9443c01a7336-225e0a8fbfbmr165428575ad.30.1742291834854; Tue, 18 Mar 2025 02:57:14 -0700 (PDT) Received: from localhost ([157.82.207.107]) by smtp.gmail.com with UTF8SMTPSA id 41be03b00d2f7-af56ea0428fsm8588661a12.38.2025.03.18.02.57.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 18 Mar 2025 02:57:14 -0700 (PDT) From: Akihiko Odaki Date: Tue, 18 Mar 2025 18:56:53 +0900 Subject: [PATCH net-next 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: <20250318-virtio-v1-3-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 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 --- 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..4153a0a5f278 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 = kmalloc(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 = kmalloc(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 Tue Mar 18 09:56:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 14020728 X-Patchwork-Delegate: kuba@kernel.org 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 6919C20969A for ; Tue, 18 Mar 2025 09:57:21 +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=1742291843; cv=none; b=oPncv2s5G3CjjBAE0rapvxHxdbogim11cwR/0lQBilZk7ACC+ZVDJkJEmK9hAB6On3ShShaOXM5XIK4WR15j/lDtFloR4uppTzwfk0oQxmLoyaJPsRX1fWzgBzSox2ObIads+vpQwoCmqWMMrOJo22PzjaoReIUWIemb+2p0B14= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742291843; c=relaxed/simple; bh=PTPRleizS1Yo/Zj2lCHknRUrDScXS7LpuAGSZt5GrG4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Bff/+1zX1RRLHV7q6fY8xi1oaFZjyfp0QfsTCcSFLMLyfynJdCRDvFupEAyc7HlO5dGnR8ke2KYlYVY2U9NkraPoGAqFyhL3WWJUKi37ZVQqE/2vligoo3AIYfnC2abETyL4BZY65RhbPkjU/xxyu0DzCcj6xOQcRDZiWB9IbDI= 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=oXLIOhHA; 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="oXLIOhHA" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2241053582dso2594385ad.1 for ; Tue, 18 Mar 2025 02:57:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1742291840; x=1742896640; 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=Wp+TkaR3KA/C/LJhQd39jSgt/1NvtxrTDAfmjY+x69o=; b=oXLIOhHAhV10Z2A570QWtBlOh7NEPNDR9tLgewiBfnLklZBhn56079pbqUAsBCuIif wHvc7bHlPoSYzgOjJUbIrFeWpozstExJZjVE0pe47dYPgu2OfaDeBm12i3r2KPCDN+UT JU2bVcqNvc5XRyliWGntIdVNpq6qlvNVCNfO5j/7kDCJdlksyWCR5chnDgmQKl2QkZ7F 8WBqX1W3KOXORw0h0xE1YZiiYc5Mk2KfbGNl1AmAs/dcFaV03uspdjCDuZCtaqoSv6mE M1GpKNp2mI2huLCMX9HFITIz4+MbbKnTUrMblvI+SF4dyQt3WzRfkrfQioIsQJN3MhGQ +mHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742291840; x=1742896640; 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=Wp+TkaR3KA/C/LJhQd39jSgt/1NvtxrTDAfmjY+x69o=; b=hI+dOqF+XZJkM1qdjET+atYUr4KqOPKvsBpsLQX+YT8hrXsMhRPY6nAWNHnAuTHTLs nJUafqP4h80UEMgU68ZXX2swzjzFmdg/qjO5NG7I9kIdh4ayv2xrpQIUVq2sOY4i+ylk VPvlAHYFcqhggw2g5YZftNuzPd3570YtJV+64eil56+IdUKzjZ9EmWJbrXN/hpGQ0wlk eFeupREOl49WiRxybFxf501pkrM1sMRNRNprd8qzlNsohL50e0d+KuAs36IqfWs82OsQ mFHb/YLD5Q/DIbN2zHE0XaSQqLvFz7udVHzBa9X7GPRE+c+2VstsJfAfFg+HC3w9U3sQ vx8w== X-Forwarded-Encrypted: i=1; AJvYcCUDP+DsblskxR8zOj0Iedxsz8wWhbrQvZKIiHQubXjlyX29XjZt2lWnldJlRHOWmymHR8f+xWM=@vger.kernel.org X-Gm-Message-State: AOJu0Ywv5Zdb+kv6I7iR9sPywMPn3HVVHDvQ1ghfux8fa3Q3JV0NbYgB tsKZWiw1Bx+QpD1sMtzuBvPDFF3Xi0bnDSSHYLDw+z0tvUvo1x4O2nFP75AFa8A= X-Gm-Gg: ASbGnctMngIrBv6GpJqF2j95TX+FjK4vdEEvqkAuXlJv7rvm46E2EG0osWl22R2dLAU MzjyGySxNo5TebXmo78Yr7G8zyOWRs8xihNIiqdX+hVp3ofm/k3i/+hNiiyS8xaa91kizYqfzH+ NzwijHXKNe/F0l7d7zvzqsZi2bYHjjoHsXhWYEGg6uxrSKGigO+v19UmzVar5FOxCAaO9kb3wf4 LiBdK/+dfzmAFUOPh8fbHNk7y/OAKeqXX8Nmg8bbvL62ERBGX2avwJ9fpl/NpUEXy75h+5FgCB/ J+K3ay6pUUL21Xt+IEI5ZotN12VS3HI/WxaPbDBUYuCTM+DQ X-Google-Smtp-Source: AGHT+IEau+wjrdRHJMlS5nyOT1rvXp0wuHKf/Prbu5sQ6Jh/4b7CF8c7TS8qmvF6EWe5N8kKungcAQ== X-Received: by 2002:a05:6a00:b91:b0:736:42a8:a742 with SMTP id d2e1a72fcca58-737223b9098mr15931032b3a.11.1742291840607; Tue, 18 Mar 2025 02:57:20 -0700 (PDT) Received: from localhost ([157.82.207.107]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-737116b0ec4sm9074760b3a.159.2025.03.18.02.57.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 18 Mar 2025 02:57:20 -0700 (PDT) From: Akihiko Odaki Date: Tue, 18 Mar 2025 18:56:54 +0900 Subject: [PATCH net-next 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: <20250318-virtio-v1-4-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 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 --- 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 4153a0a5f278..6cbeba65a4a4 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 = kmalloc(virtnet_rss_hdr_size(vi), GFP_KERNEL); + vi->rss_hdr = devm_kmalloc(&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 = kmalloc(virtnet_rss_hdr_size(vi), GFP_KERNEL); + vi->rss_hdr = devm_kmalloc(&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); }