From nobody Thu Dec 18 00:09:24 2025 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (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 40C753112C0 for ; Mon, 13 Oct 2025 14:53:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760367226; cv=none; b=lb3P7ehTH+hJM9i37eAG0/AGsqIkYM/SJVQdf1gX22ctFJIONLTK0JAs2Ieg5thf1ZeA71IvyxwA8vi/UNu6Rqb6ePbXdm/UTwKS0vJzjq4jFYnaKZzVWTjn5ZHpRkfUxXuIdzBkZV/2nTjJVXCvl+Kw3Y1fQztC5nTUzBq5BEI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760367226; c=relaxed/simple; bh=E8WoJuBOO+qk8Q5hqtoULQ0PwkM4ocuACiUdIi2N6so=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OaDRFUSM7Ad62tG4h7s8FTAJqtgZEZCZa6mii2oWbjXnAcIvNkFcwklWSFAnMy27vD5QcNnb87/oZfj5nX545aiSU+x+/2yIkJsS5qquzdowzGw1DsTeu6Ae0L7A1/h50pywSoi5mUTkH0ogXWeRj1sDa2nZ3oJwyWL9+VLW1FY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=hiNG2nGf; arc=none smtp.client-ip=209.85.221.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hiNG2nGf" Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-3fc36b99e92so3810151f8f.0 for ; Mon, 13 Oct 2025 07:53:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760367222; x=1760972022; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bxISOHK0sfOtFB4YWzm4iWfmIyELFZH9BHOLFWLiapg=; b=hiNG2nGfIOADsE6zv+QCnp6aPiVdaHd6GuPVT8fBfgs6P1Ceh+IqHgXZoWTBEFkZkH a4/69ZYAqcwdOPfap5Ut7XpJFErQFPsha4AGKWF5CmCtwz9FRbmXx5cvA6Y5bsZ8YBSx QPmSYVGVKPwHebxDSKmjK7zoRoN9d49lh2s9O3YaLp3r2oUUA9B3/oibXpoSViZj/3sW iEDiycF9RUBsiUZRWqg9buB/7ynAbXx3TphsvpMV0RUOsm+xsoIrxOrWdyl1xSxOrTvS we8LnQeyHQqLvwGdlj+bDLwgtQDUBhSLTC2Ce/Hnwu3qUGVALaWi9veZy3A37I7avq16 V27A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760367222; x=1760972022; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bxISOHK0sfOtFB4YWzm4iWfmIyELFZH9BHOLFWLiapg=; b=IK2Jm66SRFW7zW/azcu7SSjSe0dhCTDfy1o9Yzh4boocjS3QXw9boc8mYHKXeJgOAu 9/o3+2TS+Yow+D8Opg5rHpp3q+yoVIIVhwm5t35V8dQ/JSNrfiFoePSbUtGxocSyzwoF 14d9/oSyi3W8jkS/GKW+ZB+MCr/mlkuW807tj+o4DsJeYY56Xy4SaimBJvcNe2FBd2q5 03ghxUC3UZaaoyJMUR3CYMLrHTWr+OeZy3XNLV2wtkNyrZLXolnTV2gNxNgGHrFikSxC G+x674rEJDp3Sf74sffuHeePdfyL+fks+9WT+1bB+8A8ilZPl+PuebkTnMW6kHjQZe6h nH/g== X-Forwarded-Encrypted: i=1; AJvYcCXhvf7BKs30jSRoVSir8W0jb9m+O5rpWDYVu/SJCF05yCoN/vV/Uw2eKpCkt9kmlEdgecxauhQaUIdklcM=@vger.kernel.org X-Gm-Message-State: AOJu0YyXuNwlAQX57wajXeWLRh8G0uxgMzxzPIWq9jO5AdeqlseAQ72U XijPfD1kkOeKDhQTC3kg0XlJfqVdaOnj2wpuKXsfRz/jvrx0X9yYgJK2 X-Gm-Gg: ASbGncuApwFtHf0JzqJ9cNGeqP1DIrAbapb906LHetscZw11uFjFAH2bu/8N3kWU6Nz 2YMXtU4qgkWnIIQrziWDcaDHwhH8pSpOSOWLZ+XBNxH7mXh9yDGPlzTvWoY5zp6tuuppFPJvLYF 09bXSChV7wruHNc9bofbViCRWVokUMf1dHUkf84d8R0NImTZ5FlctySOAlIURy9+pOB2TiR2DrC HgdpHq+/I0kygvG6YcMNBQPkzN1ZB+cDafjxZYnQJDn9ADIcxxDWtJjJ2DsE3NjfCWdUWAMydMs Kxrcqklgz9p9l+wsDPlvgAVRVDgx0BD2xR/1qUWesjOgApGm+tJBOH9peWVnKaccLQKwiGGcaOF WM3pEt/Pd/iMrsMjJgXrDGFBeqFz0P9CLmLY= X-Google-Smtp-Source: AGHT+IEzTwZdHTurtXtAEUjWNLzW7QhST7sltiH1Xg9KXxn65EDy7cgKglM2V8lRa6iGebxt7MLQeg== X-Received: by 2002:a05:6000:609:b0:3ec:db87:ff53 with SMTP id ffacd0b85a97d-42666aa67demr15479799f8f.12.1760367222156; Mon, 13 Oct 2025 07:53:42 -0700 (PDT) Received: from 127.com ([2620:10d:c092:600::1:eb09]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-426ce5e0e70sm18641085f8f.40.2025.10.13.07.53.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Oct 2025 07:53:41 -0700 (PDT) From: Pavel Begunkov To: netdev@vger.kernel.org Cc: Andrew Lunn , Jakub Kicinski , davem@davemloft.net, Eric Dumazet , Paolo Abeni , Simon Horman , Donald Hunter , Michael Chan , Pavan Chebbi , Jesper Dangaard Brouer , John Fastabend , Stanislav Fomichev , Joshua Washington , Harshitha Ramamurthy , Jian Shen , Salil Mehta , Jijie Shao , Sunil Goutham , Geetha sowjanya , Subbaraya Sundeep , hariprasad , Bharat Bhushan , Saeed Mahameed , Tariq Toukan , Mark Bloch , Leon Romanovsky , Alexander Duyck , kernel-team@meta.com, Ilias Apalodimas , Joe Damato , David Wei , Willem de Bruijn , Mina Almasry , Pavel Begunkov , Breno Leitao , Dragos Tatulea , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-rdma@vger.kernel.org, Jonathan Corbet Subject: [PATCH net-next v4 11/24] net: move netdev_config manipulation to dedicated helpers Date: Mon, 13 Oct 2025 15:54:13 +0100 Message-ID: <247a04527829dcc9e7a6e580b3cd5fe4745c9e84.1760364551.git.asml.silence@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jakub Kicinski netdev_config manipulation will become slightly more complicated soon and we will need to call if from ethtool as well as queue API. Encapsulate the logic into helper functions. Signed-off-by: Jakub Kicinski Reviewed-by: Mina Almasry Signed-off-by: Pavel Begunkov --- net/core/Makefile | 1 + net/core/dev.c | 7 ++----- net/core/dev.h | 5 +++++ net/core/netdev_config.c | 43 ++++++++++++++++++++++++++++++++++++++++ net/ethtool/netlink.c | 14 ++++++------- 5 files changed, 57 insertions(+), 13 deletions(-) create mode 100644 net/core/netdev_config.c diff --git a/net/core/Makefile b/net/core/Makefile index 9ef2099c5426..9f1f08ff585f 100644 --- a/net/core/Makefile +++ b/net/core/Makefile @@ -21,6 +21,7 @@ obj-y +=3D net-sysfs.o obj-y +=3D hotdata.o obj-y +=3D netdev_rx_queue.o obj-y +=3D netdev_queues.o +obj-y +=3D netdev_config.o obj-$(CONFIG_PAGE_POOL) +=3D page_pool.o page_pool_user.o obj-$(CONFIG_PROC_FS) +=3D net-procfs.o obj-$(CONFIG_NET_PKTGEN) +=3D pktgen.o diff --git a/net/core/dev.c b/net/core/dev.c index a64cef2c537e..5f92425dfdbd 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -11973,10 +11973,8 @@ struct net_device *alloc_netdev_mqs(int sizeof_pri= v, const char *name, if (!dev->ethtool) goto free_all; =20 - dev->cfg =3D kzalloc(sizeof(*dev->cfg), GFP_KERNEL_ACCOUNT); - if (!dev->cfg) + if (netdev_alloc_config(dev)) goto free_all; - dev->cfg_pending =3D dev->cfg; =20 dev->num_napi_configs =3D maxqs; napi_config_sz =3D array_size(maxqs, sizeof(*dev->napi_config)); @@ -12047,8 +12045,7 @@ void free_netdev(struct net_device *dev) return; } =20 - WARN_ON(dev->cfg !=3D dev->cfg_pending); - kfree(dev->cfg); + netdev_free_config(dev); kfree(dev->ethtool); netif_free_tx_queues(dev); netif_free_rx_queues(dev); diff --git a/net/core/dev.h b/net/core/dev.h index 900880e8b5b4..1ec0b836c652 100644 --- a/net/core/dev.h +++ b/net/core/dev.h @@ -92,6 +92,11 @@ extern struct rw_semaphore dev_addr_sem; extern struct list_head net_todo_list; void netdev_run_todo(void); =20 +int netdev_alloc_config(struct net_device *dev); +void __netdev_free_config(struct netdev_config *cfg); +void netdev_free_config(struct net_device *dev); +int netdev_reconfig_start(struct net_device *dev); + /* netdev management, shared between various uAPI entry points */ struct netdev_name_node { struct hlist_node hlist; diff --git a/net/core/netdev_config.c b/net/core/netdev_config.c new file mode 100644 index 000000000000..270b7f10a192 --- /dev/null +++ b/net/core/netdev_config.c @@ -0,0 +1,43 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include +#include + +#include "dev.h" + +int netdev_alloc_config(struct net_device *dev) +{ + struct netdev_config *cfg; + + cfg =3D kzalloc(sizeof(*dev->cfg), GFP_KERNEL_ACCOUNT); + if (!cfg) + return -ENOMEM; + + dev->cfg =3D cfg; + dev->cfg_pending =3D cfg; + return 0; +} + +void __netdev_free_config(struct netdev_config *cfg) +{ + kfree(cfg); +} + +void netdev_free_config(struct net_device *dev) +{ + WARN_ON(dev->cfg !=3D dev->cfg_pending); + __netdev_free_config(dev->cfg); +} + +int netdev_reconfig_start(struct net_device *dev) +{ + struct netdev_config *cfg; + + WARN_ON(dev->cfg !=3D dev->cfg_pending); + cfg =3D kmemdup(dev->cfg, sizeof(*dev->cfg), GFP_KERNEL_ACCOUNT); + if (!cfg) + return -ENOMEM; + + dev->cfg_pending =3D cfg; + return 0; +} diff --git a/net/ethtool/netlink.c b/net/ethtool/netlink.c index 2f813f25f07e..d376d3043177 100644 --- a/net/ethtool/netlink.c +++ b/net/ethtool/netlink.c @@ -6,6 +6,7 @@ #include #include #include +#include "../core/dev.h" #include "netlink.h" #include "module_fw.h" =20 @@ -906,12 +907,9 @@ static int ethnl_default_set_doit(struct sk_buff *skb,= struct genl_info *info) =20 rtnl_lock(); netdev_lock_ops(dev); - dev->cfg_pending =3D kmemdup(dev->cfg, sizeof(*dev->cfg), - GFP_KERNEL_ACCOUNT); - if (!dev->cfg_pending) { - ret =3D -ENOMEM; - goto out_tie_cfg; - } + ret =3D netdev_reconfig_start(dev); + if (ret) + goto out_unlock; =20 ret =3D ethnl_ops_begin(dev); if (ret < 0) @@ -930,9 +928,9 @@ static int ethnl_default_set_doit(struct sk_buff *skb, = struct genl_info *info) out_ops: ethnl_ops_complete(dev); out_free_cfg: - kfree(dev->cfg_pending); -out_tie_cfg: + __netdev_free_config(dev->cfg_pending); dev->cfg_pending =3D dev->cfg; +out_unlock: netdev_unlock_ops(dev); rtnl_unlock(); out_dev: --=20 2.49.0