From patchwork Sat Feb 10 00:32:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Wei X-Patchwork-Id: 13552005 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (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 CD7C51FB3 for ; Sat, 10 Feb 2024 00:32:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707525181; cv=none; b=MGYeH82UW1ESx4X1FtQ1uFAkTKCg1XJ+SmjtCjoSnb+l6XnENXCbMiGWzVNpwmphSgVQMpmapJBEuOWpHLn5Rs6Qyox1tlgsSDsBxROR+5z+W2hIrzgjjpi+WOzjt0xVzi8t638F9FnCyQYD8yCPP3r8fmeKlxZu+Yakf1l0Ev4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707525181; c=relaxed/simple; bh=ua5FlgwlbLI/krpJR329L52YoNxt8f23aRJl8Yls6Xo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=nAPShKvUTLdATVsi6Ue4mV37robdYCu+zCFQWJqt9uN957TZ4dqc6aG2/xQNYmrPZ+678FJSo3BBk02BVxZVeL7VVCPH+qYidPs9CwM5Vwvstzdw7JCutVai9T6BRyWU2LNx2XH52E5BuIr2UaFDZHM5ox+QVwpyc/aG6DNuft0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=davidwei.uk; spf=none smtp.mailfrom=davidwei.uk; dkim=pass (2048-bit key) header.d=davidwei-uk.20230601.gappssmtp.com header.i=@davidwei-uk.20230601.gappssmtp.com header.b=cbMXJooG; arc=none smtp.client-ip=209.85.214.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=davidwei.uk Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=davidwei.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=davidwei-uk.20230601.gappssmtp.com header.i=@davidwei-uk.20230601.gappssmtp.com header.b="cbMXJooG" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1d93edfa76dso12720995ad.1 for ; Fri, 09 Feb 2024 16:32:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=davidwei-uk.20230601.gappssmtp.com; s=20230601; t=1707525179; x=1708129979; 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=TX6IXW2MOyUvIcwe8DD66ySCaXJgK+9LvJoSEqu60Mw=; b=cbMXJooGOs4xuLuYffiEGUJ4H03/NU+p6Vd+UrDh6YNXbyxr64J02bZPJfeBsROkyW rLxgQenlCBLU/2T9eypAdyTqXRtXDMVU7BBuUMiuJ00rlCsiB/Q/gMZzjbUQr0xQsUtz KAV88cxfkpxVm0AUm7cz3qltiWb6rv4EnANSoJwgSCov1x5zlXvnRbKji33d8eU1O7rh O9IJWJHzDrkDIXELfRKESWci7bIRweZvyBVWRma8xlCAzu7ae4TIK6SN/XG2cIWh5hHi e5twDiWGgDfDFBqeUW+YT2rdTqb3B+fpz9WxaUtuycvXcOhTGq048vhIsNjJcdBw4kJy U9tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707525179; x=1708129979; 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=TX6IXW2MOyUvIcwe8DD66ySCaXJgK+9LvJoSEqu60Mw=; b=QgCiIlNbeH/ZOgRei0CSvHL66qOL7YAw7I9PlK14mzuYz/dkDQaYl5QNWlHFvrHLUn kR74ewyO5mBkObPWACiTCKcEfX8OV40RIZeGi9++yX+nGgadPIF17pJbTN/66V0eeygO cmr41OPZOia1hyhY1iE4alBJAjw0wOJOV9Or9loOQjQH1DLCF8T43CKvqwNA0dlxxdn6 8SUDfhX1fgaxoOVVWuhRo6lMLa802bowA+DxhIkWrdmSNFUF/L6vVebgQuCOjzVi6hcV a8MDUc0k5gtMwwLduxp+7zOuZU29YzsNRknePkEb8tIVFHO8bgnUrasIEgL8hb8Jt6Q+ gAbg== X-Forwarded-Encrypted: i=1; AJvYcCU20DZ1Ot3fTa2iqLAVkKR3CHwLEv5R4zNebkXAvwH8xn2Hm3lVr3sw2F77rQLJJYhk07hCzvqSjVpNBfLhVA2gWtHggtxs X-Gm-Message-State: AOJu0YxiFM2Aq4gxPNSr55W5riM+CVSpU6YSfSI2F9xZu6gIbHUoeNlz UOTpxrxGTo6rDXROncKFtgpp84NHnflHQJCRp02n8RUXR+R2PfFCKt6tLuv7PBY= X-Google-Smtp-Source: AGHT+IFx6pcrEqCZkHs8cg6uSKhzUzsEUI7hiJXNoyzbFW2JidxKXZhoNyFgeGsmRAcq1mi6fwaa7A== X-Received: by 2002:a17:902:6e10:b0:1d9:7121:170e with SMTP id u16-20020a1709026e1000b001d97121170emr829136plk.35.1707525179100; Fri, 09 Feb 2024 16:32:59 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCX2YQPnqT8oXW3K1TkrKa+s16nB6xyF0w9fTckUVfeXLCwXdk9kkYq3NuPKls62UAZvOGQ4b+KTShKlMw6JSxpYZKnXfG6+UWcgK8I6cYYaAVDJijULsQqN2YmhHkmT23EG93wjVbV6w//ZGTKteDi12IHmxmdFUxEbD5b2O1EKhInpAa/jqWFy1U9zzckcswibNPfQ Received: from localhost (fwdproxy-prn-020.fbsv.net. [2a03:2880:ff:14::face:b00c]) by smtp.gmail.com with ESMTPSA id d8-20020a170903230800b001d8f81ecea1sm2055382plh.172.2024.02.09.16.32.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 16:32:58 -0800 (PST) From: David Wei To: Jakub Kicinski , Jiri Pirko , Sabrina Dubroca , netdev@vger.kernel.org Cc: "David S. Miller" , Eric Dumazet , Paolo Abeni Subject: [PATCH net-next v9 1/3] netdevsim: allow two netdevsim ports to be connected Date: Fri, 9 Feb 2024 16:32:38 -0800 Message-Id: <20240210003240.847392-2-dw@davidwei.uk> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20240210003240.847392-1-dw@davidwei.uk> References: <20240210003240.847392-1-dw@davidwei.uk> 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 Add two netdevsim bus attribute to sysfs: /sys/bus/netdevsim/link_device /sys/bus/netdevsim/unlink_device Writing "A M B N" to link_device will link netdevsim M in netnsid A with netdevsim N in netnsid B. Writing "A M" to unlink_device will unlink netdevsim M in netnsid A from its peer, if any. rtnl_lock is taken to ensure nothing changes during the linking. Signed-off-by: David Wei --- drivers/net/netdevsim/bus.c | 135 ++++++++++++++++++++++++++++++ drivers/net/netdevsim/netdev.c | 10 +++ drivers/net/netdevsim/netdevsim.h | 2 + 3 files changed, 147 insertions(+) diff --git a/drivers/net/netdevsim/bus.c b/drivers/net/netdevsim/bus.c index bcbc1e19edde..7f98e4d4e738 100644 --- a/drivers/net/netdevsim/bus.c +++ b/drivers/net/netdevsim/bus.c @@ -232,9 +232,144 @@ del_device_store(const struct bus_type *bus, const char *buf, size_t count) } static BUS_ATTR_WO(del_device); +static ssize_t link_device_store(const struct bus_type *bus, const char *buf, size_t count) +{ + struct netdevsim *nsim_a, *nsim_b, *peer; + struct net_device *dev_a, *dev_b; + unsigned int ifidx_a, ifidx_b; + int netnsfd_a, netnsfd_b, err; + struct net *ns_a, *ns_b; + + err = sscanf(buf, "%d:%u %d:%u", &netnsfd_a, &ifidx_a, &netnsfd_b, &ifidx_b); + if (err != 4) { + pr_err("Format for linking two devices is \"netnsfd_a:ifidx_a netnsfd_b:ifidx_b\" (int uint int uint).\n"); + return -EINVAL; + } + + ns_a = get_net_ns_by_fd(netnsfd_a); + if (IS_ERR(ns_a)) { + pr_err("Could not find netns with fd: %d\n", netnsfd_a); + return -EINVAL; + } + + ns_b = get_net_ns_by_fd(netnsfd_b); + if (IS_ERR(ns_b)) { + pr_err("Could not find netns with fd: %d\n", netnsfd_b); + return -EINVAL; + } + + err = -EINVAL; + rtnl_lock(); + dev_a = __dev_get_by_index(ns_a, ifidx_a); + if (!dev_a) { + pr_err("Could not find device with ifindex %u in netnsfd %d\n", ifidx_a, netnsfd_a); + goto out_put_netns_a; + } + + if (!netdev_is_nsim(dev_a)) { + pr_err("Device with ifindex %u in netnsfd %d is not a netdevsim\n", ifidx_a, netnsfd_a); + goto out_put_netns_a; + } + + dev_b = __dev_get_by_index(ns_b, ifidx_b); + if (!dev_b) { + pr_err("Could not find device with ifindex %u in netnsfd %d\n", ifidx_b, netnsfd_b); + goto out_put_netns_b; + } + + if (!netdev_is_nsim(dev_b)) { + pr_err("Device with ifindex %u in netnsfd %d is not a netdevsim\n", ifidx_b, netnsfd_b); + goto out_put_netns_b; + } + + if (dev_a == dev_b) { + pr_err("Cannot link a netdevsim to itself\n"); + goto out_put_netns_b; + } + + err = 0; + nsim_a = netdev_priv(dev_a); + peer = rtnl_dereference(nsim_a->peer); + if (peer) { + pr_err("Netdevsim %d:%u is already linked\n", netnsfd_a, ifidx_a); + goto out_put_netns_b; + } + + nsim_b = netdev_priv(dev_b); + peer = rtnl_dereference(nsim_b->peer); + if (peer) { + pr_err("Netdevsim %d:%u is already linked\n", netnsfd_b, ifidx_b); + goto out_put_netns_b; + } + + rcu_assign_pointer(nsim_a->peer, nsim_b); + rcu_assign_pointer(nsim_b->peer, nsim_a); + +out_put_netns_b: + put_net(ns_b); +out_put_netns_a: + put_net(ns_a); + rtnl_unlock(); + + return !err ? count : err; +} +static BUS_ATTR_WO(link_device); + +static ssize_t unlink_device_store(const struct bus_type *bus, const char *buf, size_t count) +{ + struct netdevsim *nsim, *peer; + struct net_device *dev; + unsigned int ifidx; + int netnsfd, err; + struct net *ns; + + err = sscanf(buf, "%u:%u", &netnsfd, &ifidx); + if (err != 2) { + pr_err("Format for unlinking a device is \"netnsfd:ifidx\" (int uint).\n"); + return -EINVAL; + } + + ns = get_net_ns_by_fd(netnsfd); + if (IS_ERR(ns)) { + pr_err("Could not find netns with fd: %d\n", netnsfd); + return -EINVAL; + } + + err = -EINVAL; + rtnl_lock(); + dev = __dev_get_by_index(ns, ifidx); + if (!dev) { + pr_err("Could not find device with ifindex %u in netnsfd %d\n", ifidx, netnsfd); + goto out_put_netns; + } + + if (!netdev_is_nsim(dev)) { + pr_err("Device with ifindex %u in netnsfd %d is not a netdevsim\n", ifidx, netnsfd); + goto out_put_netns; + } + + err = 0; + nsim = netdev_priv(dev); + peer = rtnl_dereference(nsim->peer); + if (!peer) + goto out_put_netns; + + RCU_INIT_POINTER(nsim->peer, NULL); + RCU_INIT_POINTER(peer->peer, NULL); + +out_put_netns: + put_net(ns); + rtnl_unlock(); + + return !err ? count : err; +} +static BUS_ATTR_WO(unlink_device); + static struct attribute *nsim_bus_attrs[] = { &bus_attr_new_device.attr, &bus_attr_del_device.attr, + &bus_attr_link_device.attr, + &bus_attr_unlink_device.attr, NULL }; ATTRIBUTE_GROUPS(nsim_bus); diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c index 77e8250282a5..9063f4f2971b 100644 --- a/drivers/net/netdevsim/netdev.c +++ b/drivers/net/netdevsim/netdev.c @@ -413,8 +413,13 @@ nsim_create(struct nsim_dev *nsim_dev, struct nsim_dev_port *nsim_dev_port) void nsim_destroy(struct netdevsim *ns) { struct net_device *dev = ns->netdev; + struct netdevsim *peer; rtnl_lock(); + peer = rtnl_dereference(ns->peer); + if (peer) + RCU_INIT_POINTER(peer->peer, NULL); + RCU_INIT_POINTER(ns->peer, NULL); unregister_netdevice(dev); if (nsim_dev_port_is_pf(ns->nsim_dev_port)) { nsim_macsec_teardown(ns); @@ -427,6 +432,11 @@ void nsim_destroy(struct netdevsim *ns) free_netdev(dev); } +bool netdev_is_nsim(struct net_device *dev) +{ + return dev->netdev_ops == &nsim_netdev_ops; +} + static int nsim_validate(struct nlattr *tb[], struct nlattr *data[], struct netlink_ext_ack *extack) { diff --git a/drivers/net/netdevsim/netdevsim.h b/drivers/net/netdevsim/netdevsim.h index 028c825b86db..c8b45b0d955e 100644 --- a/drivers/net/netdevsim/netdevsim.h +++ b/drivers/net/netdevsim/netdevsim.h @@ -125,11 +125,13 @@ struct netdevsim { } udp_ports; struct nsim_ethtool ethtool; + struct netdevsim __rcu *peer; }; struct netdevsim * nsim_create(struct nsim_dev *nsim_dev, struct nsim_dev_port *nsim_dev_port); void nsim_destroy(struct netdevsim *ns); +bool netdev_is_nsim(struct net_device *dev); void nsim_ethtool_init(struct netdevsim *ns);