From: Jiri Pirko <jiri@resnulli•us>
To: David Wei <dw@davidwei•uk>
Cc: Jakub Kicinski <kuba@kernel•org>,
Sabrina Dubroca <sd@queasysnail•net>,
netdev@vger•kernel.org, "David S. Miller" <davem@davemloft•net>,
Eric Dumazet <edumazet@google•com>,
Paolo Abeni <pabeni@redhat•com>
Subject: Re: [PATCH net-next v4 3/5] netdevsim: forward skbs from one connected port to another
Date: Wed, 20 Dec 2023 10:04:14 +0100 [thread overview]
Message-ID: <ZYKuDmMh_PyouG8K@nanopsycho> (raw)
In-Reply-To: <20231220014747.1508581-4-dw@davidwei.uk>
Wed, Dec 20, 2023 at 02:47:45AM CET, dw@davidwei•uk wrote:
>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 <dw@davidwei•uk>
>---
> drivers/net/netdevsim/netdev.c | 25 ++++++++++++++++++++++---
> drivers/net/netdevsim/netdevsim.h | 1 +
> 2 files changed, 23 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c
>index 434322f6a565..00ab3098eb9f 100644
>--- a/drivers/net/netdevsim/netdev.c
>+++ b/drivers/net/netdevsim/netdev.c
>@@ -29,6 +29,8 @@
> static netdev_tx_t nsim_start_xmit(struct sk_buff *skb, struct net_device *dev)
> {
> struct netdevsim *ns = netdev_priv(dev);
>+ struct netdevsim *peer_ns;
>+ int ret = NETDEV_TX_OK;
>
> if (!nsim_ipsec_tx(ns, skb))
> goto out;
>@@ -36,12 +38,29 @@ static netdev_tx_t nsim_start_xmit(struct sk_buff *skb, struct net_device *dev)
> u64_stats_update_begin(&ns->syncp);
> ns->tx_packets++;
> ns->tx_bytes += skb->len;
>+
>+ rcu_read_lock();
>+ peer_ns = rcu_dereference(ns->peer);
>+ if (!peer_ns)
>+ goto out_stats;
>+
>+ skb_tx_timestamp(skb);
>+ if (unlikely(dev_forward_skb(peer_ns->netdev, skb) == NET_RX_DROP)) {
>+ ret = NET_XMIT_DROP;
>+ ns->tx_dropped++;
Idk, does not look fine to me to be in u64_stats_update section while
calling dev_forward_skb()
>+ }
>+
>+ rcu_read_unlock();
> u64_stats_update_end(&ns->syncp);
>
>+ return ret;
>+
>+out_stats:
>+ rcu_read_unlock();
>+ u64_stats_update_end(&ns->syncp);
> out:
> dev_kfree_skb(skb);
>-
>- return NETDEV_TX_OK;
>+ return ret;
> }
>
> static void nsim_set_rx_mode(struct net_device *dev)
>@@ -70,6 +89,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 +322,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 24fc3fbda791..083b1ee7a1a2 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;
>--
>2.39.3
>
next prev parent reply other threads:[~2023-12-20 9:04 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-20 1:47 [PATCH net-next v4 0/5] netdevsim: link and forward skbs between ports David Wei
2023-12-20 1:47 ` [PATCH net-next v4 1/5] netdevsim: maintain a list of probed netdevsims David Wei
2023-12-20 8:57 ` Jiri Pirko
2023-12-22 0:45 ` David Wei
2023-12-22 4:54 ` David Wei
2024-01-02 10:55 ` Jiri Pirko
2024-01-02 11:01 ` Jiri Pirko
2023-12-20 16:40 ` Simon Horman
2023-12-22 0:49 ` David Wei
2023-12-20 1:47 ` [PATCH net-next v4 2/5] netdevsim: allow two netdevsim ports to be connected David Wei
2023-12-20 9:09 ` Jiri Pirko
2023-12-22 0:47 ` David Wei
2024-01-02 10:56 ` Jiri Pirko
2023-12-20 12:58 ` kernel test robot
2023-12-20 1:47 ` [PATCH net-next v4 3/5] netdevsim: forward skbs from one connected port to another David Wei
2023-12-20 9:04 ` Jiri Pirko [this message]
2023-12-22 0:58 ` David Wei
2023-12-20 1:47 ` [PATCH net-next v4 4/5] netdevsim: add selftest for forwarding skb between connected ports David Wei
2023-12-20 1:47 ` [PATCH net-next v4 5/5] netdevsim: add Makefile for selftests David Wei
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZYKuDmMh_PyouG8K@nanopsycho \
--to=jiri@resnulli$(echo .)us \
--cc=davem@davemloft$(echo .)net \
--cc=dw@davidwei$(echo .)uk \
--cc=edumazet@google$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=sd@queasysnail$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox