From patchwork Thu Feb 15 19:43:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Wei X-Patchwork-Id: 13559099 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 D2FC613A26F for ; Thu, 15 Feb 2024 19:43:28 +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=1708026210; cv=none; b=ryQ0w3qWolZP3Oa8Ofw/M679BGeGZnnvedMO/9Zv/LcQhGb7EQclcHZYzj9o2FG5ZxUnB/r2jGbeFRm6HkkIkmZl4pZHezBlH8/CnyEaadzSecTfmrMkAdmya5ijG+D6uao5uk4IldBAhS4GnkLBQtJ2osLiNnmlgmyPL3yS7BE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708026210; c=relaxed/simple; bh=0MOnMdwRFX+dop9REMdKnrHyttPB/b1CWskzz7FnzdQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rrZs6AipOXoW0vmun2Ke082KPzh0gD7DKcTscBSfsEUp1IDkyihRawW3cSmx/Ds5/K/J6GAJAMADP1jbFCqfQ5ekj4p8TI6f3uqQb8p0R8jkBslDEf+29j2WT3xcsanS/y5LKywm1MiLbiwMxoWFFv6jnN5nFevgL/6ZPfYW9Vc= 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=b9XYQeVj; arc=none smtp.client-ip=209.85.214.172 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="b9XYQeVj" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1d7393de183so10824275ad.3 for ; Thu, 15 Feb 2024 11:43:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=davidwei-uk.20230601.gappssmtp.com; s=20230601; t=1708026208; x=1708631008; 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=tpvAV5bh7+9HTdlXs/ImEQRlIrypU0HqHp/bHD697NU=; b=b9XYQeVju9pFEnYTc4oE7Wu5JLIonvO6X5w+R02tEQuVf7vVXXJSAR21RaNTX27fiN o6SaNNXnmPM16lZ9O7Fi8JtG203NOnFtabE0Uco9kfQ8ffCg5cdXD7W5iv0ULe2HJAK3 TS7ZXwACmwE9kOhLRLZVALHb+n9Bmp14LGeekuNF+IUfa1RutF6hnulo1cg7soF+Ilv6 aP7yxxyRMS5gLDWcFDOKe/diMzFruP0twgpaEIEGHCP9TlnJhXdyiKOM+3YP7PgcYElr KRwz64Xi11TaRGv+quQeLBtlJzFNSVvCaG7kzieYywpYspMJkZVP/nNtDg0pg0Aa+iNN CJww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708026208; x=1708631008; 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=tpvAV5bh7+9HTdlXs/ImEQRlIrypU0HqHp/bHD697NU=; b=FVwFgqQk4A8BH4NqbiyALujipBZIZ4TC5Iy3KDZyvE3avjJ/MCkvbY5kkKr4HIUxZ+ tamPJHYOZkqQkEB00NZ7mQCxAMc0D5ZwHqcQpqxjGVFwqCq2iPgEfOiDmitZxON98lO2 WgGGJPaE+nUz9n2SBsZow5D+NhlC/NkUAjmkQ/9YBQrKexduwdQEmdWJhKZhgeodv2SX rHKF3evfETK/kdVucf1fvUGFwBsG8CpLPKKWFa1FdnEdLStqgtPHbXBcRuzpVepORl/g uVhpKjNKrVlkfyctsv1hy+p9os7HaVmyoP7FPQvudjeJsfG0UVE19C6dbYJtRlJP7Is8 O7mQ== X-Forwarded-Encrypted: i=1; AJvYcCW1ctR6ihx2twCIX7NBZdeJXCqEjTNcUbHzh75FUpeDv5r4RwrlnO2HlkzRcuJKkoqlPrbY7eMx6Z5GachAfX4KaJ5LiMWg X-Gm-Message-State: AOJu0YwMoGrOfQqU9YTyWSqnl8QEb3WCtypTF7Me1XDRU58tUAOjC/IJ GIKKy1YrCuUXPkWDHjVXW3Phh2uEmpBjQ4cirq8RvRhc8cezLxftqYKfFaZphO8= X-Google-Smtp-Source: AGHT+IHvtUL8JyBysrGNoCKHBeUZ7+eoqKeI94qXNDs4gi+fj4sKHoQ+sF3B1e+OnYZ2U4ZmiZGFsw== X-Received: by 2002:a17:903:25c2:b0:1d9:db3e:e3d8 with SMTP id jc2-20020a17090325c200b001d9db3ee3d8mr2188642plb.5.1708026208107; Thu, 15 Feb 2024 11:43:28 -0800 (PST) Received: from localhost (fwdproxy-prn-016.fbsv.net. [2a03:2880:ff:10::face:b00c]) by smtp.gmail.com with ESMTPSA id m18-20020a170902f21200b001db9d2c1874sm503836plc.29.2024.02.15.11.43.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 11:43:27 -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 v11 1/3] netdevsim: allow two netdevsim ports to be connected Date: Thu, 15 Feb 2024 11:43:23 -0800 Message-Id: <20240215194325.1364466-2-dw@davidwei.uk> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20240215194325.1364466-1-dw@davidwei.uk> References: <20240215194325.1364466-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 aedab1d9623a..819c74a7c625 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); From patchwork Thu Feb 15 19:43:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Wei X-Patchwork-Id: 13559100 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 B7AD213A864 for ; Thu, 15 Feb 2024 19:43:29 +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=1708026211; cv=none; b=AZt/obWy1i8Gkqxc74tJUXUTniJPrIJFh0n9ENd64GVzaNtn8Mf5sHd0Av6XOjxIu/drmnlHwgP3mtuMAuZ3dm4I0ZyHQb4ZRkYkkJaHrw4dSk2DEcWfz9EJsdK9mkrf3VUlZ/41+/YlrEXXzAjapyC+iBne1tb+AYBzp2l+pxs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708026211; c=relaxed/simple; bh=WuVQ9tyy4qXVzj8fg5jT1T8KjKLN2WSR7176fQweBTk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=U354y2mXmJ7WXMONmXZl/xXXh0vbhaGVKIVwJTR5UF8/3cQY3UYtb3aw/o/Ix0q/urz78VwL8VLh47tbPFPPiQlJEx0h1881TnTHpeCg7ymyLtHbXdnHVCi2bv4V6MrCjwJDgi5n2TkNHERolMmV1iT3m68rDgNGYpwR163eO84= 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=nJX0Li4y; arc=none smtp.client-ip=209.85.214.172 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="nJX0Li4y" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1d7393de183so10824525ad.3 for ; Thu, 15 Feb 2024 11:43:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=davidwei-uk.20230601.gappssmtp.com; s=20230601; t=1708026209; x=1708631009; 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=PVNOE9NzOpHv+S2/C5c0rGW7n1qxuHkxnBJNavNR7kw=; b=nJX0Li4yFNKBI8kN69ms8rD+IVTlmC16abKW7rQ6pz1wVaO03drSRsVuFwS4Y1CFQy vAPLd+QV2EvDNFK+y0FnpTE9ontKtO7c41SDgMV0fhP2dT1TMpnliEOu47CRNbLSWCuh SEX2IYB5BDwek4OwSmpUXpvFXUQ/FmYC4/r5w+Qeu4qR6uYaxt/5MaOJWFwel/Z5nlPJ bd8JLhpJ2Pyw1tjXn9Y938go3mBMCZvU6PgOEXU7yY6Fa+Q1ncZO6gYr55gYaQBAVK3p dfOtxByKEvpgNN3icR43sK1giGFXqCajBrby4ijPzOppfjYcGgj4kBv+79Y3+dwSAhhu LzrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708026209; x=1708631009; 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=PVNOE9NzOpHv+S2/C5c0rGW7n1qxuHkxnBJNavNR7kw=; b=pT2dMP+p/XwkjMFOX1ysy0AwNpwH6QDju8w0T8ipUQ0AOtspDiHk7T53+l/BDRMzP1 /VctcahzmRFJ3snwpGKyNQONlMjV3IlhrqLtbB+r4IxZZ5FG6D4MKXqLIw4hnWicNIpb O0wspaNiq2FF6IUuLUJhv3Zzq59mhd3Wwk0heXUvpxJraAbuMj9YNkeOOIfnoh7tbOHr f/Z6um/dUZMx05+F0WJja7qsQBGjtsKkFBq4+uS2/satMI3HMlpJjwSVvvkLfA0K2nMr O60Ax1ZYqOpIM74u8T5+5KFHJZKTaPNP/IxLgulgIfBRScWaQjs54EEdDnF/IV4QV8EF wUNg== X-Forwarded-Encrypted: i=1; AJvYcCWYfNYQ/H/RmX+KfK+xTZn/ivFJwQ9y2eVxmrHM3uoBQjieSX89W+1wn5OUJil3ATcTS6clfr/ys2NiLs4TtZdXyLDo5WPL X-Gm-Message-State: AOJu0Yzhwp9q4ME5k/Bd2vX4q8Law/jO7OuJkBqNokHFJQcpKRt+tiMQ iyUCOPfoAVVKzdQJ1R6CVZLrbhc2XCLzUxnAzBKvYvN5l5Tc4FzRNJbAZYfdMcY= X-Google-Smtp-Source: AGHT+IG8KsGzzymvkYoQrDvGFMozbWo0M2bmO3grIunI1becpu0a7ObwoRqfWkShsSAA9SUakQt+Ng== X-Received: by 2002:a17:903:264e:b0:1db:94a9:f9f7 with SMTP id je14-20020a170903264e00b001db94a9f9f7mr1589864plb.20.1708026209112; Thu, 15 Feb 2024 11:43:29 -0800 (PST) Received: from localhost (fwdproxy-prn-004.fbsv.net. [2a03:2880:ff:4::face:b00c]) by smtp.gmail.com with ESMTPSA id bh6-20020a170902a98600b001d9537cf238sm1620782plb.295.2024.02.15.11.43.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 11:43:28 -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 v11 2/3] netdevsim: forward skbs from one connected port to another Date: Thu, 15 Feb 2024 11:43:24 -0800 Message-Id: <20240215194325.1364466-3-dw@davidwei.uk> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20240215194325.1364466-1-dw@davidwei.uk> References: <20240215194325.1364466-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 Forward skbs sent from one netdevsim port to its connected netdevsim port using dev_forward_skb, in a spirit similar to veth. Add a tx_dropped variable to struct netdevsim, tracking the number of skbs that could not be forwarded using dev_forward_skb(). The xmit() function accessing the peer ptr is protected by an RCU read critical section. The rcu_read_lock() is functionally redundant as since v5.0 all softirqs are implicitly RCU read critical sections; but it is useful for human readers. If another CPU is concurrently in nsim_destroy(), then it will first set the peer ptr to NULL. This does not affect any existing readers that dereferenced a non-NULL peer. Then, in unregister_netdevice(), there is a synchronize_rcu() before the netdev is actually unregistered and freed. This ensures that any readers i.e. xmit() that got a non-NULL peer will complete before the netdev is freed. Any readers after the RCU_INIT_POINTER() but before synchronize_rcu() will dereference NULL, making it safe. The codepath to nsim_destroy() and nsim_create() takes both the newly added nsim_dev_list_lock and rtnl_lock. This makes it safe with concurrent calls to linking two netdevsims together. Signed-off-by: David Wei --- drivers/net/netdevsim/netdev.c | 30 +++++++++++++++++++++++++----- drivers/net/netdevsim/netdevsim.h | 1 + 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c index 9063f4f2971b..d151859fa2c0 100644 --- a/drivers/net/netdevsim/netdev.c +++ b/drivers/net/netdevsim/netdev.c @@ -29,19 +29,39 @@ static netdev_tx_t nsim_start_xmit(struct sk_buff *skb, struct net_device *dev) { struct netdevsim *ns = netdev_priv(dev); + unsigned int len = skb->len; + struct netdevsim *peer_ns; + int ret = NETDEV_TX_OK; if (!nsim_ipsec_tx(ns, skb)) goto out; + rcu_read_lock(); + peer_ns = rcu_dereference(ns->peer); + if (!peer_ns) { + dev_kfree_skb(skb); + goto out_stats; + } + + skb_tx_timestamp(skb); + if (unlikely(dev_forward_skb(peer_ns->netdev, skb) == NET_RX_DROP)) + ret = NET_XMIT_DROP; + +out_stats: + rcu_read_unlock(); u64_stats_update_begin(&ns->syncp); - ns->tx_packets++; - ns->tx_bytes += skb->len; + if (ret == NET_XMIT_DROP) { + ns->tx_dropped++; + } else { + ns->tx_packets++; + ns->tx_bytes += len; + } u64_stats_update_end(&ns->syncp); + return ret; out: dev_kfree_skb(skb); - - return NETDEV_TX_OK; + return ret; } static void nsim_set_rx_mode(struct net_device *dev) @@ -70,6 +90,7 @@ nsim_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats) start = u64_stats_fetch_begin(&ns->syncp); stats->tx_bytes = ns->tx_bytes; stats->tx_packets = ns->tx_packets; + stats->tx_dropped = ns->tx_dropped; } while (u64_stats_fetch_retry(&ns->syncp, start)); } @@ -302,7 +323,6 @@ static void nsim_setup(struct net_device *dev) eth_hw_addr_random(dev); dev->tx_queue_len = 0; - dev->flags |= IFF_NOARP; dev->flags &= ~IFF_MULTICAST; dev->priv_flags |= IFF_LIVE_ADDR_CHANGE | IFF_NO_QUEUE; diff --git a/drivers/net/netdevsim/netdevsim.h b/drivers/net/netdevsim/netdevsim.h index c8b45b0d955e..553c4b9b4f63 100644 --- a/drivers/net/netdevsim/netdevsim.h +++ b/drivers/net/netdevsim/netdevsim.h @@ -98,6 +98,7 @@ struct netdevsim { u64 tx_packets; u64 tx_bytes; + u64 tx_dropped; struct u64_stats_sync syncp; struct nsim_bus_dev *nsim_bus_dev; From patchwork Thu Feb 15 19:43:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Wei X-Patchwork-Id: 13559101 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 A9C0F13A890 for ; Thu, 15 Feb 2024 19:43:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708026212; cv=none; b=im255mMc0VgtbZ2D93860ggKJox+moEm5Nb1oOuq9U6usovkoXC+uWE1RFGY1GNz0qsat3H60D42mHGezwfLcqLc4qVLCNtrBaB6OoAKXpX08h2WVhVK6KX9AQRrqZaIasalaKzMrfPb/F9mMU8PUtjhuyQQAzdL9BIs8SJnvDE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708026212; c=relaxed/simple; bh=0cUVoJTJr3QlY4VeIpHF08NETkkBRKcCVRXoF8XuXsc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Md/OolLxvq2mgyvJ+lAtEnOEKUAExv6MRn0ysjEpBYK9tyPuZtHeXl0zp0WhDsE4B/YoXT7Hd+joViv6uq2ghHRdwJSdMGQRN0t4qrUtlOi6jqxUNWT26OLD59Z6fi2rUSTlSobvjg6BxY7LS1MPSfYdW9SlSvOF/qqtR8f2TQw= 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=hOrba9R7; arc=none smtp.client-ip=209.85.214.181 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="hOrba9R7" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1d918008b99so10195745ad.3 for ; Thu, 15 Feb 2024 11:43:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=davidwei-uk.20230601.gappssmtp.com; s=20230601; t=1708026210; x=1708631010; 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=ofa1RGnWd2lIotrEIt0lDKejuMRo/GrQuejfvweLENM=; b=hOrba9R7Vmv4z9n5BsyKC8JjXM5Lz/kgV0Nyhe1g887Xyo2NFKgD0tNgQUCcvQzRe4 UWLP3LV9tJR9L7JyztA5z/JLpEy3XbtDODiMssrAbIoyXybCnlL7Kpg1USftSjh7mdZM 6ZderDx3MWheGulltXjLv5rUnd2VdCxZHk7Alx3qrHpbCfzRAI/v+xnfNCHB5LPrzmsj hl9p6cFFNuJ3MbAkv3xtb2pK7UcTAHqfia2c/gDZIxOjT2ETDfjdPc+T4prkDWFizz++ AivwHwPchgwkPmUmg5hzJrZ5MaFm5cA6NKTtWs1x5EH1bjodtM/7paO+4EoAoLyz8+6k dJJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708026210; x=1708631010; 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=ofa1RGnWd2lIotrEIt0lDKejuMRo/GrQuejfvweLENM=; b=ABllDMp1oBhVZ0A7tyYZtGQGn8lrnLMgJ9ZUOhPEXWJhS30fN7VnYiUSLFlej1V9/Y 3945R1u0KAKlr3yFrQ+Xys2P2Jor3e/66N72KsGEVKKM80woGB9fT2/FBksaz6KQ7bYI D0OFMp5OaDJQtZrTHkktMe2qi4Z+r5B18hvMPcfG78Sz/qei9Y8PfXk9EhGze38l0+6+ QtsjGiWg9gHpfxjfDreDtlDLYf/EBiZ/sgnEz36y6m8QM7NMrJ2FHorLFWXJ5/aMDhOp 1tI3+0ley4StERMoaYzVN50rPD0ALRIraI4428tb+ravtZ1uqiHkbzA70C+bXb7RK18h dAsQ== X-Forwarded-Encrypted: i=1; AJvYcCWZneicv3OLwEHzaERILZ21mIG7paAN4EHxDdNv6gmRnh2cFPvWc4Rxo5I2DOp8Ib06e0FEIZjJ+q67oxasQy7hQj1N+Y7o X-Gm-Message-State: AOJu0YyufqzTqkC8AHLSdlMk6MwlBhp/0SLycQjC3Fa+GVywAkRhfpwf 3S23N/5hXGTCXfuzWWsa3QrVrdoTAvWLlUvYPH3VU7UEwwchsGeot2MM/9HSLV0= X-Google-Smtp-Source: AGHT+IGb+1niMXOr2Rpw7FTwjOc8Qlh0P/ebw0stYPP7Qb4XiCeSOszANEsdItmKGfHOPJ86wg6juA== X-Received: by 2002:a17:903:187:b0:1db:2c9a:2150 with SMTP id z7-20020a170903018700b001db2c9a2150mr3044215plg.54.1708026209995; Thu, 15 Feb 2024 11:43:29 -0800 (PST) Received: from localhost (fwdproxy-prn-005.fbsv.net. [2a03:2880:ff:5::face:b00c]) by smtp.gmail.com with ESMTPSA id jy8-20020a17090342c800b001dba356b96esm108650plb.306.2024.02.15.11.43.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 11:43:29 -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 v11 3/3] netdevsim: add selftest for forwarding skb between connected ports Date: Thu, 15 Feb 2024 11:43:25 -0800 Message-Id: <20240215194325.1364466-4-dw@davidwei.uk> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20240215194325.1364466-1-dw@davidwei.uk> References: <20240215194325.1364466-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 Connect two netdevsim ports in different namespaces together, then send packets between them using socat. Signed-off-by: David Wei --- .../selftests/drivers/net/netdevsim/Makefile | 1 + .../selftests/drivers/net/netdevsim/peer.sh | 139 ++++++++++++++++++ 2 files changed, 140 insertions(+) create mode 100755 tools/testing/selftests/drivers/net/netdevsim/peer.sh diff --git a/tools/testing/selftests/drivers/net/netdevsim/Makefile b/tools/testing/selftests/drivers/net/netdevsim/Makefile index 7a29a05bea8b..5bace0b7fb57 100644 --- a/tools/testing/selftests/drivers/net/netdevsim/Makefile +++ b/tools/testing/selftests/drivers/net/netdevsim/Makefile @@ -10,6 +10,7 @@ TEST_PROGS = devlink.sh \ fib.sh \ hw_stats_l3.sh \ nexthop.sh \ + peer.sh \ psample.sh \ tc-mq-visibility.sh \ udp_tunnel_nic.sh \ diff --git a/tools/testing/selftests/drivers/net/netdevsim/peer.sh b/tools/testing/selftests/drivers/net/netdevsim/peer.sh new file mode 100755 index 000000000000..c3051399c509 --- /dev/null +++ b/tools/testing/selftests/drivers/net/netdevsim/peer.sh @@ -0,0 +1,139 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0-only + +NSIM_DEV_1_ID=$((256 + RANDOM % 256)) +NSIM_DEV_1_SYS=/sys/bus/netdevsim/devices/netdevsim$NSIM_DEV_1_ID +NSIM_DEV_2_ID=$((512 + RANDOM % 256)) +NSIM_DEV_2_SYS=/sys/bus/netdevsim/devices/netdevsim$NSIM_DEV_2_ID + +NSIM_DEV_SYS_NEW=/sys/bus/netdevsim/new_device +NSIM_DEV_SYS_DEL=/sys/bus/netdevsim/del_device +NSIM_DEV_SYS_LINK=/sys/bus/netdevsim/link_device +NSIM_DEV_SYS_UNLINK=/sys/bus/netdevsim/unlink_device + +socat_check() +{ + if [ ! -x "$(command -v socat)" ]; then + echo "socat command not found. Skipping test" + return 1 + fi + + return 0 +} + +setup_ns() +{ + set -e + ip netns add nssv + ip netns add nscl + + NSIM_DEV_1_NAME=$(find $NSIM_DEV_1_SYS/net -maxdepth 1 -type d ! \ + -path $NSIM_DEV_1_SYS/net -exec basename {} \;) + NSIM_DEV_2_NAME=$(find $NSIM_DEV_2_SYS/net -maxdepth 1 -type d ! \ + -path $NSIM_DEV_2_SYS/net -exec basename {} \;) + + ip link set $NSIM_DEV_1_NAME netns nssv + ip link set $NSIM_DEV_2_NAME netns nscl + + ip netns exec nssv ip addr add '192.168.1.1/24' dev $NSIM_DEV_1_NAME + ip netns exec nscl ip addr add '192.168.1.2/24' dev $NSIM_DEV_2_NAME + + ip netns exec nssv ip link set dev $NSIM_DEV_1_NAME up + ip netns exec nscl ip link set dev $NSIM_DEV_2_NAME up + set +e +} + +cleanup_ns() +{ + ip netns del nscl + ip netns del nssv +} + +### +### Code start +### + +socat_check || exit 4 + +modprobe netdevsim + +# linking + +echo $NSIM_DEV_1_ID > $NSIM_DEV_SYS_NEW +echo $NSIM_DEV_2_ID > $NSIM_DEV_SYS_NEW +udevadm settle + +setup_ns + +NSIM_DEV_1_FD=$((256 + RANDOM % 256)) +exec {NSIM_DEV_1_FD} $NSIM_DEV_SYS_LINK 2>/dev/null +if [ $? -eq 0 ]; then + echo "linking with non-existent netdevsim should fail" + cleanup_ns + exit 1 +fi + +echo "$NSIM_DEV_1_FD:$NSIM_DEV_1_IFIDX 2000:$NSIM_DEV_2_IFIDX" > $NSIM_DEV_SYS_LINK 2>/dev/null +if [ $? -eq 0 ]; then + echo "linking with non-existent netnsid should fail" + cleanup_ns + exit 1 +fi + +echo "$NSIM_DEV_1_FD:$NSIM_DEV_1_IFIDX $NSIM_DEV_1_FD:$NSIM_DEV_1_IFIDX" > $NSIM_DEV_SYS_LINK 2>/dev/null +if [ $? -eq 0 ]; then + echo "linking with self should fail" + cleanup_ns + exit 1 +fi + +echo "$NSIM_DEV_1_FD:$NSIM_DEV_1_IFIDX $NSIM_DEV_2_FD:$NSIM_DEV_2_IFIDX" > $NSIM_DEV_SYS_LINK +if [ $? -ne 0 ]; then + echo "linking netdevsim1 with netdevsim2 should succeed" + cleanup_ns + exit 1 +fi + +# argument error checking + +echo "$NSIM_DEV_1_FD:$NSIM_DEV_1_IFIDX $NSIM_DEV_2_FD:a" > $NSIM_DEV_SYS_LINK 2>/dev/null +if [ $? -eq 0 ]; then + echo "invalid arg should fail" + cleanup_ns + exit 1 +fi + +# send/recv packets + +tmp_file=$(mktemp) +ip netns exec nssv socat TCP-LISTEN:1234,fork $tmp_file & +pid=$! +res=0 + +echo "HI" | ip netns exec nscl socat STDIN TCP:192.168.1.1:1234 + +count=$(cat $tmp_file | wc -c) +if [[ $count -ne 3 ]]; then + echo "expected 3 bytes, got $count" + res=1 +fi + +echo "$NSIM_DEV_1_FD:$NSIM_DEV_1_IFIDX" > $NSIM_DEV_SYS_UNLINK + +echo $NSIM_DEV_2_ID > $NSIM_DEV_SYS_DEL + +kill $pid +echo $NSIM_DEV_1_ID > $NSIM_DEV_SYS_DEL + +cleanup_ns + +modprobe -r netdevsim + +exit $res