From patchwork Wed Mar 12 19:05:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 14013772 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 3C36F1DE894; Wed, 12 Mar 2025 19:05:16 +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=1741806319; cv=none; b=JSs/72Y4x4bi7f0QG+p0AMB9Ck/ZaRXdeVNX77oiM3LosgsGW/rVBEDKlv5OTqy1R28pMM160fHXghlYEA7q9pKXjbl9CHZPhjv5/fWYeMpDbiu7RRadTH0xXtATZ8K0tw+37PuosFdG72ajgoGN4D0RHnSFDIRVdk/eVZkB5zI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741806319; c=relaxed/simple; bh=NIVIhCCz+K/CB7Q64BOuH5vbqaQAt1yCOLcw9VdfAlc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dw/vOrTdbQmwHe07538Ms5puXM5j1HJGoDuRFlUZ26AArawluXB9W85s6sSaDD26VCvONq29PwHmSmS2PLQm3gRx5kmZJj2wCxAg9oD4tUqA9g1YWzpXGNDtU7+YqJDAtbX8vlovl9TWkRrJEyNlfIX3HNwjt9zwbi1xkuhk/zU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=fomichev.me; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=fomichev.me Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-223fb0f619dso3985735ad.1; Wed, 12 Mar 2025 12:05:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741806316; x=1742411116; 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=crSfh59H1DrfoRwlw/Ui+uQHFGHRC5k1sriHoxTWyVc=; b=qm1815PP50dXFgcVzhXO/lx3vWstVVTRYkkD8ILuP2oGUWf3lhdsqGYd3m2d2zNY9E 2GqFCzGYWLZ+QPdkrwOKSeXmZpHmLJ2mz4rv2Rs/dDVBr+qHiE/LE78JfLDhWBVS/uBN Kbqw2fEnnLl6YqbSy5jqiLRfWQi1Xanho1YpdW9UKFzh+0+2X8bO3aYu77VJr8j0haKn lGS/nNy43slfjpp5PTNCros/rAPNPHG9jXdQIOG5nNJUcvl4nxctMiUiBmDSWjqIYb4o DqazPDaexSc3WFy8GqhTBnEZCsN6C3GaJueOWOBa6FkZk4qTXLJx6rc484ny7fYRSwlH TNeg== X-Forwarded-Encrypted: i=1; AJvYcCWcdQRiKzagKofGByy95DJ/1fnIwaD79+fODuhs0uOMCoO4tfT2t8/mRt4L69Y5kvsiS6GoOaTMHP+Tfsg=@vger.kernel.org X-Gm-Message-State: AOJu0Yz/pKQK9VciMWLYoODjSTJBop0VTro2SDDe3TKjtykV/3BqbcnK 0HE+PNQvWxqnt/UsNonj8sFdxKWEbrHBlAx2vxlU4+jK0wOvBCuatMllUbM9SA== X-Gm-Gg: ASbGnct0NF8ldbMxXxVxdwMr3zz1iyaTX6u6hjEcBUkZKR0bKsOi8/n62Dn8bTC3BSm U5brerE9rP4xOfC97GTPiZu339+o7OHu08bsfLXQF/3JGLC6/3/LMzDSgG43kWzmxsj1AQdyFYl WDmbBmTMQ7vtgnpvPgcjIXiJKy4nPCcWjCsQcN4BGHsNBrCUuY2WskYFtQXttE2SJfWXTGDhn0+ lqOsQ+WtnKdgbRqhKEMqo+L/fTJ/oN0S00cvWlBcsln9QcJMdjwHU/dBB/qo9gqDCHjX9vzGrUO a+nUV+v2gw1NIPBVP4iVRUkHc6kYeaGAUQXJ+UjFvr4yzLGizhxLICg= X-Google-Smtp-Source: AGHT+IHSueRUWvDQpj3SSLcSjH9f9HmBLO91QtMhxvbIVwpEDdt+bNXtXVD0bmpHCKZvN9YMk9+G5A== X-Received: by 2002:a17:902:d48f:b0:224:76f:9e4a with SMTP id d9443c01a7336-22592e2d5b2mr123534925ad.14.1741806316026; Wed, 12 Mar 2025 12:05:16 -0700 (PDT) Received: from localhost ([2601:646:9e00:f56e:2844:3d8f:bf3e:12cc]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-736be7845c8sm9443218b3a.109.2025.03.12.12.05.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Mar 2025 12:05:15 -0700 (PDT) From: Stanislav Fomichev To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, linux-kernel@vger.kernel.org, willemdebruijn.kernel@gmail.com, jasowang@redhat.com, andrew+netdev@lunn.ch, horms@kernel.org, sdf@fomichev.me, jdamato@fastly.com, kory.maincent@bootlin.com, kuniyu@amazon.com, atenart@kernel.org, Kohei Enju Subject: [PATCH net-next v2 1/2] Revert "net: replace dev_addr_sem with netdev instance lock" Date: Wed, 12 Mar 2025 12:05:12 -0700 Message-ID: <20250312190513.1252045-2-sdf@fomichev.me> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250312190513.1252045-1-sdf@fomichev.me> References: <20250312190513.1252045-1-sdf@fomichev.me> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org This reverts commit df43d8bf10316a7c3b1e47e3cc0057a54df4a5b8. Cc: Kohei Enju Reviewed-by: Kuniyuki Iwashima Fixes: df43d8bf1031 ("net: replace dev_addr_sem with netdev instance lock") Signed-off-by: Stanislav Fomichev --- drivers/net/tap.c | 2 +- drivers/net/tun.c | 2 +- include/linux/netdevice.h | 6 ++++- net/core/dev.c | 52 +++++++++++++++++++-------------------- net/core/dev.h | 3 ++- net/core/dev_api.c | 17 +++++++++++-- net/core/dev_ioctl.c | 2 +- net/core/net-sysfs.c | 7 ++++-- net/core/rtnetlink.c | 6 +---- 9 files changed, 56 insertions(+), 41 deletions(-) diff --git a/drivers/net/tap.c b/drivers/net/tap.c index 4382f5e323b0..d4ece538f1b2 100644 --- a/drivers/net/tap.c +++ b/drivers/net/tap.c @@ -1017,7 +1017,7 @@ static long tap_ioctl(struct file *file, unsigned int cmd, rtnl_unlock(); return -ENOLINK; } - ret = dev_set_mac_address(tap->dev, &sa, NULL); + ret = dev_set_mac_address_user(tap->dev, &sa, NULL); tap_put_tap_dev(tap); rtnl_unlock(); return ret; diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 55b60cb68d00..f75f912a0225 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -3193,7 +3193,7 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, case SIOCSIFHWADDR: /* Set hw address */ - ret = dev_set_mac_address(tun->dev, &ifr.ifr_hwaddr, NULL); + ret = dev_set_mac_address_user(tun->dev, &ifr.ifr_hwaddr, NULL); break; case TUNGETSNDBUF: diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 9a297757df7e..42c75cb028e7 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2498,7 +2498,7 @@ struct net_device { * * Protects: * @gro_flush_timeout, @napi_defer_hard_irqs, @napi_list, - * @net_shaper_hierarchy, @reg_state, @threaded, @dev_addr + * @net_shaper_hierarchy, @reg_state, @threaded * * Partially protects (writers must hold both @lock and rtnl_lock): * @up @@ -4198,6 +4198,10 @@ int netif_set_mac_address(struct net_device *dev, struct sockaddr *sa, struct netlink_ext_ack *extack); int dev_set_mac_address(struct net_device *dev, struct sockaddr *sa, struct netlink_ext_ack *extack); +int netif_set_mac_address_user(struct net_device *dev, struct sockaddr *sa, + struct netlink_ext_ack *extack); +int dev_set_mac_address_user(struct net_device *dev, struct sockaddr *sa, + struct netlink_ext_ack *extack); int dev_get_mac_address(struct sockaddr *sa, struct net *net, char *dev_name); int dev_get_port_parent_id(struct net_device *dev, struct netdev_phys_item_id *ppid, bool recurse); diff --git a/net/core/dev.c b/net/core/dev.c index 1cb134ff7327..5a64389461e2 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1059,28 +1059,6 @@ struct net_device *netdev_get_by_index_lock(struct net *net, int ifindex) return __netdev_put_lock(dev); } -/** - * netdev_get_by_name_lock() - find a device by its name - * @net: the applicable net namespace - * @name: name of device - * - * Search for an interface by name. If a valid device - * with @name is found it will be returned with netdev->lock held. - * netdev_unlock() must be called to release it. - * - * Return: pointer to a device with lock held, NULL if not found. - */ -struct net_device *netdev_get_by_name_lock(struct net *net, const char *name) -{ - struct net_device *dev; - - dev = dev_get_by_name(net, name); - if (!dev) - return NULL; - - return __netdev_put_lock(dev); -} - struct net_device * netdev_xa_find_lock(struct net *net, struct net_device *dev, unsigned long *index) @@ -9612,24 +9590,44 @@ int netif_set_mac_address(struct net_device *dev, struct sockaddr *sa, return 0; } +DECLARE_RWSEM(dev_addr_sem); + +int netif_set_mac_address_user(struct net_device *dev, struct sockaddr *sa, + struct netlink_ext_ack *extack) +{ + int ret; + + down_write(&dev_addr_sem); + ret = netif_set_mac_address(dev, sa, extack); + up_write(&dev_addr_sem); + return ret; +} + int dev_get_mac_address(struct sockaddr *sa, struct net *net, char *dev_name) { size_t size = sizeof(sa->sa_data_min); struct net_device *dev; + int ret = 0; - dev = netdev_get_by_name_lock(net, dev_name); - if (!dev) - return -ENODEV; + down_read(&dev_addr_sem); + rcu_read_lock(); + dev = dev_get_by_name_rcu(net, dev_name); + if (!dev) { + ret = -ENODEV; + goto unlock; + } if (!dev->addr_len) memset(sa->sa_data, 0, size); else memcpy(sa->sa_data, dev->dev_addr, min_t(size_t, size, dev->addr_len)); sa->sa_family = dev->type; - netdev_unlock(dev); - return 0; +unlock: + rcu_read_unlock(); + up_read(&dev_addr_sem); + return ret; } EXPORT_SYMBOL(dev_get_mac_address); diff --git a/net/core/dev.h b/net/core/dev.h index 0ddd3631acb0..7ee203395d8e 100644 --- a/net/core/dev.h +++ b/net/core/dev.h @@ -29,7 +29,6 @@ netdev_napi_by_id_lock(struct net *net, unsigned int napi_id); struct net_device *dev_get_by_napi_id(unsigned int napi_id); struct net_device *netdev_get_by_index_lock(struct net *net, int ifindex); -struct net_device *netdev_get_by_name_lock(struct net *net, const char *name); struct net_device *__netdev_put_lock(struct net_device *dev); struct net_device * netdev_xa_find_lock(struct net *net, struct net_device *dev, @@ -71,6 +70,8 @@ extern int weight_p; extern int dev_weight_rx_bias; extern int dev_weight_tx_bias; +extern struct rw_semaphore dev_addr_sem; + /* rtnl helpers */ extern struct list_head net_todo_list; void netdev_run_todo(void); diff --git a/net/core/dev_api.c b/net/core/dev_api.c index 1f0e24849bc6..2e17548af685 100644 --- a/net/core/dev_api.c +++ b/net/core/dev_api.c @@ -84,6 +84,19 @@ void dev_set_group(struct net_device *dev, int new_group) netdev_unlock_ops(dev); } +int dev_set_mac_address_user(struct net_device *dev, struct sockaddr *sa, + struct netlink_ext_ack *extack) +{ + int ret; + + netdev_lock_ops(dev); + ret = netif_set_mac_address_user(dev, sa, extack); + netdev_unlock_ops(dev); + + return ret; +} +EXPORT_SYMBOL(dev_set_mac_address_user); + /** * dev_change_net_namespace() - move device to different nethost namespace * @dev: device @@ -299,9 +312,9 @@ int dev_set_mac_address(struct net_device *dev, struct sockaddr *sa, { int ret; - netdev_lock(dev); + netdev_lock_ops(dev); ret = netif_set_mac_address(dev, sa, extack); - netdev_unlock(dev); + netdev_unlock_ops(dev); return ret; } diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c index 5471cf4fc984..eb8b41ec5523 100644 --- a/net/core/dev_ioctl.c +++ b/net/core/dev_ioctl.c @@ -575,7 +575,7 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, void __user *data, case SIOCSIFHWADDR: if (dev->addr_len > sizeof(struct sockaddr)) return -EINVAL; - return dev_set_mac_address(dev, &ifr->ifr_hwaddr, NULL); + return dev_set_mac_address_user(dev, &ifr->ifr_hwaddr, NULL); case SIOCSIFHWBROADCAST: if (ifr->ifr_hwaddr.sa_family != dev->type) diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index 529a0f721268..abaa1c919b98 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -263,11 +263,14 @@ static ssize_t address_show(struct device *dev, struct device_attribute *attr, struct net_device *ndev = to_net_dev(dev); ssize_t ret = -EINVAL; - netdev_lock(ndev); + down_read(&dev_addr_sem); + + rcu_read_lock(); if (dev_isalive(ndev)) ret = sysfs_format_mac(buf, ndev->dev_addr, ndev->addr_len); - netdev_unlock(ndev); + rcu_read_unlock(); + up_read(&dev_addr_sem); return ret; } static DEVICE_ATTR_RO(address); diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 90597bf84e3d..9355058bf996 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -3090,11 +3090,7 @@ static int do_setlink(const struct sk_buff *skb, struct net_device *dev, sa->sa_family = dev->type; memcpy(sa->sa_data, nla_data(tb[IFLA_ADDRESS]), dev->addr_len); - if (!netdev_need_ops_lock(dev)) - netdev_lock(dev); - err = netif_set_mac_address(dev, sa, extack); - if (!netdev_need_ops_lock(dev)) - netdev_unlock(dev); + err = netif_set_mac_address_user(dev, sa, extack); kfree(sa); if (err) goto errout; From patchwork Wed Mar 12 19:05:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 14013774 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 6B1E8250BFC; Wed, 12 Mar 2025 19:05:18 +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=1741806321; cv=none; b=RkgtV+MLUVMlxgPV1NUAzaBgwDq0TCsqU+KFhmVwXnvzf+FFFGX/AkqhUOedVBngJz+MEcS9EXJXwEUUlI9bqBW0PDJ2NTPU6E80j3ulMI4CdA46AkGc8JguRx6Bh7fPWbr4MKthYS/B+apfTX4ggxZAsjbhfPsjbTna5KtXsQ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741806321; c=relaxed/simple; bh=lj+QA6MCWR/k/sZj/3DnzloZd5ClpU3EuhrRVY7eYK0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FCdenFPaiNW5ijyie2Kb3/Wc1b5oe3JDel2LzWYMIO5vyyrS4itnGKc7GZWhjjrIvLrDrPkQKlCuut/9RkylHT+TLFGwsAOdT6gdvvutpuDo9DcjHoNv/VE1Su3OnxwaHznV4/gRypIxtxePKUDxmTav5nVTmyjVS639OJsP2DM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=fomichev.me; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.214.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=fomichev.me Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-219f8263ae0so4362625ad.0; Wed, 12 Mar 2025 12:05:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741806317; x=1742411117; 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=jN5XMu0A2kj53iwwAVVDL87iRJmus00zHqg0uekmHLM=; b=hLs+wDZ8nZgyUdQF6aRFzG+1jVaK3uxThwsskFQCQvOY75F27Uh22Qe8TDTlt0zoyU PgNebBl/n9UxqB+VmeqgOr81shdusxROxsKYnK76CILjnkzc341KOIu0VkUw4bfkSy+g mhPRj2MBXGKXrgzGZFer3pnZHo1UQ3c5g8mgpht9pgKLXQA64TXvEv3VtQ+isfV6uEJr lmqzr59pDBU2X2x+i414iZk5hLT7nZM/ImGg4gFKRw53RntabeqvfHHNBfd/BtmCprsd pxR3DEUsrW7/sTZhXi9icOYpmsBv6lrfyMXu3N79QdZ4IS2lWu+0goD2ULPvrLKczFHF bOQw== X-Forwarded-Encrypted: i=1; AJvYcCUVXehDvt7vHcOLHqw2gtpTYfkVdizVFQ7I5Qn9oRZBnvN82LpHrgaJYtNHcvIHuJz2OLUHd5XUqb/2wpg=@vger.kernel.org X-Gm-Message-State: AOJu0Yx3K2g3MIxVQ+gph2LFjkJ1cI3gXRCcE9d/MAl3s7pGr/PZhGZV O7EzUWpk2DRXRKvjJ3m8VS8OwsZFBAyhuN7rIpPTrNtkQH19wKTBl+zPN5kz2g== X-Gm-Gg: ASbGncuNbXnfLZ/aLTiCeVzf1n/FVldARz03eoq7K/RRy86W8x1AGggfkb8sAlnvOgB AvS4Js9K4nCc9D1K5mXbzI4STfTOH7VHDxjkuWv3v7j+99YSHhejjnwUOenNiOX3JEfmy02hkM0 P92ZBSFTPlXFHPPgTG4ZUzECY/uDtSX/w7LAFGV138bZK9YB/b4dSU0tugSBMH4uVC+ypDgKMVW OWg6Fpv4UbqJPuItu5WQgejKUwGLJtOFxP9GU2xxAe2urZKzADMINhmblcsbPtKwYjdo7xVbxr1 7y1cINYpxhuOJ9bBM8oVgZy5wM8h1gb44sSlSH2I3Ecb X-Google-Smtp-Source: AGHT+IFFGcFhKa620lXkXfgQSkQyqnIb+cM+U0WnzVE2vALZVoOpw1kNCt1eCKZ6cnYVg4R0n7nFpw== X-Received: by 2002:a17:903:46c8:b0:224:1220:7f40 with SMTP id d9443c01a7336-22592e20112mr113536415ad.3.1741806317422; Wed, 12 Mar 2025 12:05:17 -0700 (PDT) Received: from localhost ([2601:646:9e00:f56e:2844:3d8f:bf3e:12cc]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-3010345ad34sm2175560a91.1.2025.03.12.12.05.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Mar 2025 12:05:17 -0700 (PDT) From: Stanislav Fomichev To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, linux-kernel@vger.kernel.org, willemdebruijn.kernel@gmail.com, jasowang@redhat.com, andrew+netdev@lunn.ch, horms@kernel.org, sdf@fomichev.me, jdamato@fastly.com, kory.maincent@bootlin.com, kuniyu@amazon.com, atenart@kernel.org, Kohei Enju Subject: [PATCH net-next v2 2/2] net: reorder dev_addr_sem lock Date: Wed, 12 Mar 2025 12:05:13 -0700 Message-ID: <20250312190513.1252045-3-sdf@fomichev.me> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250312190513.1252045-1-sdf@fomichev.me> References: <20250312190513.1252045-1-sdf@fomichev.me> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Lockdep complains about circular lock in 1 -> 2 -> 3 (see below). Change the lock ordering to be: - rtnl_lock - dev_addr_sem - netdev_ops (only for lower devices!) - team_lock (or other per-upper device lock) 1. rtnl_lock -> netdev_ops -> dev_addr_sem rtnl_setlink rtnl_lock do_setlink IFLA_ADDRESS on lower netdev_ops dev_addr_sem 2. rtnl_lock -> team_lock -> netdev_ops rtnl_newlink rtnl_lock do_setlink IFLA_MASTER on lower do_set_master team_add_slave team_lock team_port_add dev_set_mtu netdev_ops 3. rtnl_lock -> dev_addr_sem -> team_lock rtnl_newlink rtnl_lock do_setlink IFLA_ADDRESS on upper dev_addr_sem netif_set_mac_address team_set_mac_address team_lock 4. rtnl_lock -> netdev_ops -> dev_addr_sem rtnl_lock dev_ifsioc dev_set_mac_address_user __tun_chr_ioctl rtnl_lock dev_set_mac_address_user tap_ioctl rtnl_lock dev_set_mac_address_user dev_set_mac_address_user netdev_lock_ops netif_set_mac_address_user dev_addr_sem v2: - move lock reorder to happen after kmalloc (Kuniyuki) Cc: Kohei Enju Fixes: df43d8bf1031 ("net: replace dev_addr_sem with netdev instance lock") Signed-off-by: Stanislav Fomichev --- include/linux/netdevice.h | 2 -- net/core/dev.c | 11 ----------- net/core/dev_api.c | 4 +++- net/core/rtnetlink.c | 15 +++++++++++++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 42c75cb028e7..2bf1f914f61a 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -4198,8 +4198,6 @@ int netif_set_mac_address(struct net_device *dev, struct sockaddr *sa, struct netlink_ext_ack *extack); int dev_set_mac_address(struct net_device *dev, struct sockaddr *sa, struct netlink_ext_ack *extack); -int netif_set_mac_address_user(struct net_device *dev, struct sockaddr *sa, - struct netlink_ext_ack *extack); int dev_set_mac_address_user(struct net_device *dev, struct sockaddr *sa, struct netlink_ext_ack *extack); int dev_get_mac_address(struct sockaddr *sa, struct net *net, char *dev_name); diff --git a/net/core/dev.c b/net/core/dev.c index 5a64389461e2..66290c159ad8 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -9592,17 +9592,6 @@ int netif_set_mac_address(struct net_device *dev, struct sockaddr *sa, DECLARE_RWSEM(dev_addr_sem); -int netif_set_mac_address_user(struct net_device *dev, struct sockaddr *sa, - struct netlink_ext_ack *extack) -{ - int ret; - - down_write(&dev_addr_sem); - ret = netif_set_mac_address(dev, sa, extack); - up_write(&dev_addr_sem); - return ret; -} - int dev_get_mac_address(struct sockaddr *sa, struct net *net, char *dev_name) { size_t size = sizeof(sa->sa_data_min); diff --git a/net/core/dev_api.c b/net/core/dev_api.c index 2e17548af685..8dbc60612100 100644 --- a/net/core/dev_api.c +++ b/net/core/dev_api.c @@ -89,9 +89,11 @@ int dev_set_mac_address_user(struct net_device *dev, struct sockaddr *sa, { int ret; + down_write(&dev_addr_sem); netdev_lock_ops(dev); - ret = netif_set_mac_address_user(dev, sa, extack); + ret = netif_set_mac_address(dev, sa, extack); netdev_unlock_ops(dev); + up_write(&dev_addr_sem); return ret; } diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 9355058bf996..5a24a30dfc2d 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -3088,13 +3088,24 @@ static int do_setlink(const struct sk_buff *skb, struct net_device *dev, goto errout; } sa->sa_family = dev->type; + + netdev_unlock_ops(dev); + + /* dev_addr_sem is an outer lock, enforce proper ordering */ + down_write(&dev_addr_sem); + netdev_lock_ops(dev); + memcpy(sa->sa_data, nla_data(tb[IFLA_ADDRESS]), dev->addr_len); - err = netif_set_mac_address_user(dev, sa, extack); + err = netif_set_mac_address(dev, sa, extack); kfree(sa); - if (err) + if (err) { + up_write(&dev_addr_sem); goto errout; + } status |= DO_SETLINK_MODIFIED; + + up_write(&dev_addr_sem); } if (tb[IFLA_MTU]) {