From patchwork Wed Sep 4 18:40:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taehee Yoo X-Patchwork-Id: 1157900 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ns4/yhTt"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46Nt1r1QF3z9s4Y for ; Thu, 5 Sep 2019 04:41:04 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387759AbfIDSlD (ORCPT ); Wed, 4 Sep 2019 14:41:03 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:44466 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732543AbfIDSlD (ORCPT ); Wed, 4 Sep 2019 14:41:03 -0400 Received: by mail-pl1-f194.google.com with SMTP id k1so2607811pls.11 for ; Wed, 04 Sep 2019 11:41:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=xTQKEQ6Ui/AXXfKIWIQiYloo4DpFVjrVF9m6m1aadIw=; b=ns4/yhTtwFuHl0OzCY6V/3cKyZkuDtazC+3sNyDAV3nm0a4dS2ua91e5mva65D6BTE kbf5fiPQ62E1N9ZA+YsCTzbsp/WgItqTtDMuuoC/FxOaxzVRNbMpsuQdc6ZBKYiGEH2U 96+ERAZzU2XWwsVIRK0U/JjQykl5WVQe7XmwizGvdu479/zfy+FfwFDQvDa5T96fW/Gl uksMuN9hRbMJQEbQ17/+RPGMPVpCfKCkC5FNV7eQ2ZWV7NneIi3ZD2x8UGWTmS3DAuyC osXIG21lYBcprV4OGGvkhFGj5t645w18i7Gz102QQhpk3nBEvPhPgWdHHKQ0hnaEZS5h qzTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=xTQKEQ6Ui/AXXfKIWIQiYloo4DpFVjrVF9m6m1aadIw=; b=l5Iraz30wtqC2F+jKfLRVZAvNwM0KchZTPBUFnzIHeKFAqolhWFALd6x2FdfxZ187Q MF2V+M6QDyzGGAutmdAw9Vw4TaHFQxqIc46IguoAEZBiB25v7mitAbUC6svyZ1CXncc2 72EselWJOyOcsT/hM1XKLpJDYiepYDUUS7uSI/A0xKY8fb7lQxUoVINq1In1llDSG93Z dYEsok0fSrX7JyroMjZQpRCtUrqx2sZw527NFosjVj7o5YjttGZ1LzY6mUivwk9piFcT jOUJLpIyazdoHwtdHKS21Y9p+WPYhm8sVDLBQkCj5V0SIoEMYQ8+fvoz90uJkjrbvJC8 vEtQ== X-Gm-Message-State: APjAAAUPkyGwlSSv2tedm5JfgRemi7wvxH/4nXb/CkWvWsgdJMcDaiFH 6mYHRL6XAIjrl7X2L1cfyHVNGToV9c8= X-Google-Smtp-Source: APXvYqzewZeNFogWpu6R97seVy3a+RZDcCaf6Vctvxnb7MruBiN9hR+ngE7J8u2j9QW7F82bgZh+4A== X-Received: by 2002:a17:902:7791:: with SMTP id o17mr26009686pll.10.1567622462106; Wed, 04 Sep 2019 11:41:02 -0700 (PDT) Received: from ap-To-be-filled-by-O-E-M.1.1.1.1 ([14.33.120.60]) by smtp.gmail.com with ESMTPSA id a17sm24511431pfc.26.2019.09.04.11.40.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 11:41:00 -0700 (PDT) From: Taehee Yoo To: davem@davemloft.net, netdev@vger.kernel.org, j.vosburgh@gmail.com, vfalico@gmail.com, andy@greyhouse.net, jiri@resnulli.us, sd@queasysnail.net, roopa@cumulusnetworks.com, saeedm@mellanox.com, manishc@marvell.com, rahulv@marvell.com, kys@microsoft.com, haiyangz@microsoft.com, sthemmin@microsoft.com, sashal@kernel.org, hare@suse.de, varun@chelsio.com, ubraun@linux.ibm.com, kgraul@linux.ibm.com Cc: ap420073@gmail.com Subject: [PATCH net 09/11] net: core: add ignore flag to netdev_adjacent structure Date: Thu, 5 Sep 2019 03:40:52 +0900 Message-Id: <20190904184052.15324-1-ap420073@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In order to link an adjacent node, netdev_upper_dev_link() is used and in order to unlink an adjacent node, netdev_upper_dev_unlink() is used. unlink operation does not fail, but link operation can fail. In order to exchange adjacent nodes, we should unlink an old adjacent node first. then, link a new adjacent node. If link operation is failed, we should link an old adjacent node again. But this link operation can fail too. It eventually breaks the adjacent link relationship. This patch adds an ignore flag into the netdev_adjacent structure. If this flag is set, netdev_upper_dev_link() ignores an old adjacent node for a moment. So we can skip unlink operation before link operation. Signed-off-by: Taehee Yoo --- include/linux/netdevice.h | 4 + net/core/dev.c | 160 +++++++++++++++++++++++++++++++++----- 2 files changed, 144 insertions(+), 20 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index a2c47f43e54b..d9ca4a79f715 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -4322,6 +4322,10 @@ int netdev_master_upper_dev_link(struct net_device *dev, struct netlink_ext_ack *extack); void netdev_upper_dev_unlink(struct net_device *dev, struct net_device *upper_dev); +void netdev_adjacent_dev_disable(struct net_device *upper_dev, + struct net_device *lower_dev); +void netdev_adjacent_dev_enable(struct net_device *upper_dev, + struct net_device *lower_dev); void netdev_adjacent_rename_links(struct net_device *dev, char *oldname); void *netdev_lower_dev_get_private(struct net_device *dev, struct net_device *lower_dev); diff --git a/net/core/dev.c b/net/core/dev.c index 6a4b4ce62204..ac055b531c96 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -6448,6 +6448,9 @@ struct netdev_adjacent { /* upper master flag, there can only be one master device per list */ bool master; + /* lookup ignore flag */ + bool ignore; + /* counter for the number of times this device was added to us */ u16 ref_nr; @@ -6553,6 +6556,22 @@ struct net_device *netdev_master_upper_dev_get(struct net_device *dev) } EXPORT_SYMBOL(netdev_master_upper_dev_get); +struct net_device *netdev_master_upper_dev_get_ignore(struct net_device *dev) +{ + struct netdev_adjacent *upper; + + ASSERT_RTNL(); + + if (list_empty(&dev->adj_list.upper)) + return NULL; + + upper = list_first_entry(&dev->adj_list.upper, + struct netdev_adjacent, list); + if (likely(upper->master) && !upper->ignore) + return upper->dev; + return NULL; +} + /** * netdev_has_any_lower_dev - Check if device is linked to some device * @dev: device @@ -6603,8 +6622,9 @@ struct net_device *netdev_upper_get_next_dev_rcu(struct net_device *dev, } EXPORT_SYMBOL(netdev_upper_get_next_dev_rcu); -static struct net_device *netdev_next_upper_dev(struct net_device *dev, - struct list_head **iter) +static struct net_device *netdev_next_upper_dev_ignore(struct net_device *dev, + struct list_head **iter, + bool *ignore) { struct netdev_adjacent *upper; @@ -6614,6 +6634,7 @@ static struct net_device *netdev_next_upper_dev(struct net_device *dev, return NULL; *iter = &upper->list; + *ignore = upper->ignore; return upper->dev; } @@ -6635,26 +6656,29 @@ static struct net_device *netdev_next_upper_dev_rcu(struct net_device *dev, return upper->dev; } -int netdev_walk_all_upper_dev(struct net_device *dev, - int (*fn)(struct net_device *dev, - void *data), - void *data) +int netdev_walk_all_upper_dev_ignore(struct net_device *dev, + int (*fn)(struct net_device *dev, + void *data), + void *data) { struct net_device *udev; struct list_head *iter; int ret; + bool ignore; for (iter = &dev->adj_list.upper, - udev = netdev_next_upper_dev(dev, &iter); + udev = netdev_next_upper_dev_ignore(dev, &iter, &ignore); udev; - udev = netdev_next_upper_dev(dev, &iter)) { + udev = netdev_next_upper_dev_ignore(dev, &iter, &ignore)) { + if (ignore) + continue; /* first is the upper device itself */ ret = fn(udev, data); if (ret) return ret; /* then look at all of its upper devices */ - ret = netdev_walk_all_upper_dev(udev, fn, data); + ret = netdev_walk_all_upper_dev_ignore(udev, fn, data); if (ret) return ret; } @@ -6690,6 +6714,15 @@ int netdev_walk_all_upper_dev_rcu(struct net_device *dev, } EXPORT_SYMBOL_GPL(netdev_walk_all_upper_dev_rcu); +bool netdev_has_upper_dev_ignore(struct net_device *dev, + struct net_device *upper_dev) +{ + ASSERT_RTNL(); + + return netdev_walk_all_upper_dev_ignore(dev, __netdev_has_upper_dev, + upper_dev); +} + /** * netdev_lower_get_next_private - Get the next ->private from the * lower neighbour list @@ -6786,6 +6819,23 @@ static struct net_device *netdev_next_lower_dev(struct net_device *dev, return lower->dev; } +static struct net_device *netdev_next_lower_dev_ignore(struct net_device *dev, + struct list_head **iter, + bool *ignore) +{ + struct netdev_adjacent *lower; + + lower = list_entry((*iter)->next, struct netdev_adjacent, list); + + if (&lower->list == &dev->adj_list.lower) + return NULL; + + *iter = &lower->list; + *ignore = lower->ignore; + + return lower->dev; +} + int netdev_walk_all_lower_dev(struct net_device *dev, int (*fn)(struct net_device *dev, void *data), @@ -6814,6 +6864,36 @@ int netdev_walk_all_lower_dev(struct net_device *dev, } EXPORT_SYMBOL_GPL(netdev_walk_all_lower_dev); +int netdev_walk_all_lower_dev_ignore(struct net_device *dev, + int (*fn)(struct net_device *dev, + void *data), + void *data) +{ + struct net_device *ldev; + struct list_head *iter; + int ret; + bool ignore; + + for (iter = &dev->adj_list.lower, + ldev = netdev_next_lower_dev_ignore(dev, &iter, &ignore); + ldev; + ldev = netdev_next_lower_dev_ignore(dev, &iter, &ignore)) { + if (ignore) + continue; + /* first is the lower device itself */ + ret = fn(ldev, data); + if (ret) + return ret; + + /* then look at all of its lower devices */ + ret = netdev_walk_all_lower_dev_ignore(ldev, fn, data); + if (ret) + return ret; + } + + return 0; +} + static struct net_device *netdev_next_lower_dev_rcu(struct net_device *dev, struct list_head **iter) { @@ -6833,11 +6913,14 @@ static u8 __netdev_upper_depth(struct net_device *dev) struct net_device *udev; struct list_head *iter; u8 max_depth = 0; + bool ignore; for (iter = &dev->adj_list.upper, - udev = netdev_next_upper_dev(dev, &iter); + udev = netdev_next_upper_dev_ignore(dev, &iter, &ignore); udev; - udev = netdev_next_upper_dev(dev, &iter)) { + udev = netdev_next_upper_dev_ignore(dev, &iter, &ignore)) { + if (ignore) + continue; if (max_depth < udev->upper_level) max_depth = udev->upper_level; } @@ -6850,11 +6933,14 @@ static u8 __netdev_lower_depth(struct net_device *dev) struct net_device *ldev; struct list_head *iter; u8 max_depth = 0; + bool ignore; for (iter = &dev->adj_list.lower, - ldev = netdev_next_lower_dev(dev, &iter); + ldev = netdev_next_lower_dev_ignore(dev, &iter, &ignore); ldev; - ldev = netdev_next_lower_dev(dev, &iter)) { + ldev = netdev_next_lower_dev_ignore(dev, &iter, &ignore)) { + if (ignore) + continue; if (max_depth < ldev->lower_level) max_depth = ldev->lower_level; } @@ -6999,6 +7085,7 @@ static int __netdev_adjacent_dev_insert(struct net_device *dev, adj->master = master; adj->ref_nr = 1; adj->private = private; + adj->ignore = false; dev_hold(adj_dev); pr_debug("Insert adjacency: dev %s adj_dev %s adj->ref_nr %d; dev_hold on %s\n", @@ -7149,17 +7236,17 @@ static int __netdev_upper_dev_link(struct net_device *dev, return -EBUSY; /* To prevent loops, check if dev is not upper device to upper_dev. */ - if (netdev_has_upper_dev(upper_dev, dev)) + if (netdev_has_upper_dev_ignore(upper_dev, dev)) return -EBUSY; if ((dev->lower_level + upper_dev->upper_level) > MAX_NEST_DEV) return -EMLINK; if (!master) { - if (netdev_has_upper_dev(dev, upper_dev)) + if (netdev_has_upper_dev_ignore(dev, upper_dev)) return -EEXIST; } else { - master_dev = netdev_master_upper_dev_get(dev); + master_dev = netdev_master_upper_dev_get_ignore(dev); if (master_dev) return master_dev == upper_dev ? -EEXIST : -EBUSY; } @@ -7182,10 +7269,12 @@ static int __netdev_upper_dev_link(struct net_device *dev, goto rollback; __netdev_update_upper_level(dev, NULL); - netdev_walk_all_lower_dev(dev, __netdev_update_upper_level, NULL); + netdev_walk_all_lower_dev_ignore(dev, __netdev_update_upper_level, + NULL); __netdev_update_lower_level(upper_dev, NULL); - netdev_walk_all_upper_dev(upper_dev, __netdev_update_lower_level, NULL); + netdev_walk_all_upper_dev_ignore(upper_dev, + __netdev_update_lower_level, NULL); return 0; @@ -7271,13 +7360,44 @@ void netdev_upper_dev_unlink(struct net_device *dev, &changeupper_info.info); __netdev_update_upper_level(dev, NULL); - netdev_walk_all_lower_dev(dev, __netdev_update_upper_level, NULL); + netdev_walk_all_lower_dev_ignore(dev, __netdev_update_upper_level, + NULL); __netdev_update_lower_level(upper_dev, NULL); - netdev_walk_all_upper_dev(upper_dev, __netdev_update_lower_level, NULL); + netdev_walk_all_upper_dev_ignore(upper_dev, + __netdev_update_lower_level, NULL); } EXPORT_SYMBOL(netdev_upper_dev_unlink); +void __netdev_adjacent_dev_set(struct net_device *upper_dev, + struct net_device *lower_dev, + bool val) +{ + struct netdev_adjacent *adj; + + adj = __netdev_find_adj(lower_dev, &upper_dev->adj_list.lower); + if (adj) + adj->ignore = val; + + adj = __netdev_find_adj(upper_dev, &lower_dev->adj_list.upper); + if (adj) + adj->ignore = val; +} + +void netdev_adjacent_dev_disable(struct net_device *upper_dev, + struct net_device *lower_dev) +{ + __netdev_adjacent_dev_set(upper_dev, lower_dev, true); +} +EXPORT_SYMBOL(netdev_adjacent_dev_disable); + +void netdev_adjacent_dev_enable(struct net_device *upper_dev, + struct net_device *lower_dev) +{ + __netdev_adjacent_dev_set(upper_dev, lower_dev, false); +} +EXPORT_SYMBOL(netdev_adjacent_dev_enable); + /** * netdev_bonding_info_change - Dispatch event about slave change * @dev: device