* [PATCH net-next] tipc: replace open-code bearer rcu_dereference access in bearer.c
@ 2023-06-05 14:40 Xin Long
2023-06-06 9:13 ` Larysa Zaremba
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Xin Long @ 2023-06-05 14:40 UTC (permalink / raw)
To: network dev, tipc-discussion
Cc: davem, kuba, Eric Dumazet, Paolo Abeni, Jon Maloy, Tung Nguyen
Replace these open-code bearer rcu_dereference access with bearer_get(),
like other places in bearer.c. While at it, also use tipc_net() instead
of net_generic(net, tipc_net_id) to get "tn" in bearer.c.
Signed-off-by: Xin Long <lucien.xin@gmail.com>
---
net/tipc/bearer.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index 114140c49108..1d5d3677bdaf 100644
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -176,7 +176,7 @@ static int bearer_name_validate(const char *name,
*/
struct tipc_bearer *tipc_bearer_find(struct net *net, const char *name)
{
- struct tipc_net *tn = net_generic(net, tipc_net_id);
+ struct tipc_net *tn = tipc_net(net);
struct tipc_bearer *b;
u32 i;
@@ -211,11 +211,10 @@ int tipc_bearer_get_name(struct net *net, char *name, u32 bearer_id)
void tipc_bearer_add_dest(struct net *net, u32 bearer_id, u32 dest)
{
- struct tipc_net *tn = net_generic(net, tipc_net_id);
struct tipc_bearer *b;
rcu_read_lock();
- b = rcu_dereference(tn->bearer_list[bearer_id]);
+ b = bearer_get(net, bearer_id);
if (b)
tipc_disc_add_dest(b->disc);
rcu_read_unlock();
@@ -223,11 +222,10 @@ void tipc_bearer_add_dest(struct net *net, u32 bearer_id, u32 dest)
void tipc_bearer_remove_dest(struct net *net, u32 bearer_id, u32 dest)
{
- struct tipc_net *tn = net_generic(net, tipc_net_id);
struct tipc_bearer *b;
rcu_read_lock();
- b = rcu_dereference(tn->bearer_list[bearer_id]);
+ b = bearer_get(net, bearer_id);
if (b)
tipc_disc_remove_dest(b->disc);
rcu_read_unlock();
@@ -534,7 +532,7 @@ int tipc_bearer_mtu(struct net *net, u32 bearer_id)
struct tipc_bearer *b;
rcu_read_lock();
- b = rcu_dereference(tipc_net(net)->bearer_list[bearer_id]);
+ b = bearer_get(net, bearer_id);
if (b)
mtu = b->mtu;
rcu_read_unlock();
@@ -745,7 +743,7 @@ void tipc_bearer_cleanup(void)
void tipc_bearer_stop(struct net *net)
{
- struct tipc_net *tn = net_generic(net, tipc_net_id);
+ struct tipc_net *tn = tipc_net(net);
struct tipc_bearer *b;
u32 i;
@@ -881,7 +879,7 @@ int tipc_nl_bearer_dump(struct sk_buff *skb, struct netlink_callback *cb)
struct tipc_bearer *bearer;
struct tipc_nl_msg msg;
struct net *net = sock_net(skb->sk);
- struct tipc_net *tn = net_generic(net, tipc_net_id);
+ struct tipc_net *tn = tipc_net(net);
if (i == MAX_BEARERS)
return 0;
--
2.39.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH net-next] tipc: replace open-code bearer rcu_dereference access in bearer.c
2023-06-05 14:40 [PATCH net-next] tipc: replace open-code bearer rcu_dereference access in bearer.c Xin Long
@ 2023-06-06 9:13 ` Larysa Zaremba
2023-06-06 9:35 ` Tung Quang Nguyen
2023-06-07 5:00 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Larysa Zaremba @ 2023-06-06 9:13 UTC (permalink / raw)
To: Xin Long
Cc: network dev, tipc-discussion, davem, kuba, Eric Dumazet,
Paolo Abeni, Jon Maloy, Tung Nguyen
On Mon, Jun 05, 2023 at 10:40:44AM -0400, Xin Long wrote:
> Replace these open-code bearer rcu_dereference access with bearer_get(),
> like other places in bearer.c. While at it, also use tipc_net() instead
> of net_generic(net, tipc_net_id) to get "tn" in bearer.c.
>
From what I see, logic was not changed.
Reviewed-by: Larysa Zaremba <larysa.zaremba@intel.com>
> Signed-off-by: Xin Long <lucien.xin@gmail.com>
> ---
> net/tipc/bearer.c | 14 ++++++--------
> 1 file changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
> index 114140c49108..1d5d3677bdaf 100644
> --- a/net/tipc/bearer.c
> +++ b/net/tipc/bearer.c
> @@ -176,7 +176,7 @@ static int bearer_name_validate(const char *name,
> */
> struct tipc_bearer *tipc_bearer_find(struct net *net, const char *name)
> {
> - struct tipc_net *tn = net_generic(net, tipc_net_id);
> + struct tipc_net *tn = tipc_net(net);
> struct tipc_bearer *b;
> u32 i;
>
> @@ -211,11 +211,10 @@ int tipc_bearer_get_name(struct net *net, char *name, u32 bearer_id)
>
> void tipc_bearer_add_dest(struct net *net, u32 bearer_id, u32 dest)
> {
> - struct tipc_net *tn = net_generic(net, tipc_net_id);
> struct tipc_bearer *b;
>
> rcu_read_lock();
> - b = rcu_dereference(tn->bearer_list[bearer_id]);
> + b = bearer_get(net, bearer_id);
> if (b)
> tipc_disc_add_dest(b->disc);
> rcu_read_unlock();
> @@ -223,11 +222,10 @@ void tipc_bearer_add_dest(struct net *net, u32 bearer_id, u32 dest)
>
> void tipc_bearer_remove_dest(struct net *net, u32 bearer_id, u32 dest)
> {
> - struct tipc_net *tn = net_generic(net, tipc_net_id);
> struct tipc_bearer *b;
>
> rcu_read_lock();
> - b = rcu_dereference(tn->bearer_list[bearer_id]);
> + b = bearer_get(net, bearer_id);
> if (b)
> tipc_disc_remove_dest(b->disc);
> rcu_read_unlock();
> @@ -534,7 +532,7 @@ int tipc_bearer_mtu(struct net *net, u32 bearer_id)
> struct tipc_bearer *b;
>
> rcu_read_lock();
> - b = rcu_dereference(tipc_net(net)->bearer_list[bearer_id]);
> + b = bearer_get(net, bearer_id);
> if (b)
> mtu = b->mtu;
> rcu_read_unlock();
> @@ -745,7 +743,7 @@ void tipc_bearer_cleanup(void)
>
> void tipc_bearer_stop(struct net *net)
> {
> - struct tipc_net *tn = net_generic(net, tipc_net_id);
> + struct tipc_net *tn = tipc_net(net);
> struct tipc_bearer *b;
> u32 i;
>
> @@ -881,7 +879,7 @@ int tipc_nl_bearer_dump(struct sk_buff *skb, struct netlink_callback *cb)
> struct tipc_bearer *bearer;
> struct tipc_nl_msg msg;
> struct net *net = sock_net(skb->sk);
> - struct tipc_net *tn = net_generic(net, tipc_net_id);
> + struct tipc_net *tn = tipc_net(net);
>
> if (i == MAX_BEARERS)
> return 0;
> --
> 2.39.1
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread* RE: [PATCH net-next] tipc: replace open-code bearer rcu_dereference access in bearer.c
2023-06-05 14:40 [PATCH net-next] tipc: replace open-code bearer rcu_dereference access in bearer.c Xin Long
2023-06-06 9:13 ` Larysa Zaremba
@ 2023-06-06 9:35 ` Tung Quang Nguyen
2023-06-07 5:00 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Tung Quang Nguyen @ 2023-06-06 9:35 UTC (permalink / raw)
To: Xin Long, network dev, tipc-discussion@lists.sourceforge.net
Cc: davem@davemloft.net, kuba@kernel.org, Eric Dumazet, Paolo Abeni,
Jon Maloy
>Subject: [PATCH net-next] tipc: replace open-code bearer rcu_dereference access in bearer.c
>
>Replace these open-code bearer rcu_dereference access with bearer_get(),
>like other places in bearer.c. While at it, also use tipc_net() instead
>of net_generic(net, tipc_net_id) to get "tn" in bearer.c.
>
>Signed-off-by: Xin Long <lucien.xin@gmail.com>
>---
Reviewed-by: Tung Nguyen <tung.q.nguyen@dektech.com.au>
> net/tipc/bearer.c | 14 ++++++--------
> 1 file changed, 6 insertions(+), 8 deletions(-)
>
>diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
>index 114140c49108..1d5d3677bdaf 100644
>--- a/net/tipc/bearer.c
>+++ b/net/tipc/bearer.c
>@@ -176,7 +176,7 @@ static int bearer_name_validate(const char *name,
> */
> struct tipc_bearer *tipc_bearer_find(struct net *net, const char *name)
> {
>- struct tipc_net *tn = net_generic(net, tipc_net_id);
>+ struct tipc_net *tn = tipc_net(net);
> struct tipc_bearer *b;
> u32 i;
>
>@@ -211,11 +211,10 @@ int tipc_bearer_get_name(struct net *net, char *name, u32 bearer_id)
>
> void tipc_bearer_add_dest(struct net *net, u32 bearer_id, u32 dest)
> {
>- struct tipc_net *tn = net_generic(net, tipc_net_id);
> struct tipc_bearer *b;
>
> rcu_read_lock();
>- b = rcu_dereference(tn->bearer_list[bearer_id]);
>+ b = bearer_get(net, bearer_id);
> if (b)
> tipc_disc_add_dest(b->disc);
> rcu_read_unlock();
>@@ -223,11 +222,10 @@ void tipc_bearer_add_dest(struct net *net, u32 bearer_id, u32 dest)
>
> void tipc_bearer_remove_dest(struct net *net, u32 bearer_id, u32 dest)
> {
>- struct tipc_net *tn = net_generic(net, tipc_net_id);
> struct tipc_bearer *b;
>
> rcu_read_lock();
>- b = rcu_dereference(tn->bearer_list[bearer_id]);
>+ b = bearer_get(net, bearer_id);
> if (b)
> tipc_disc_remove_dest(b->disc);
> rcu_read_unlock();
>@@ -534,7 +532,7 @@ int tipc_bearer_mtu(struct net *net, u32 bearer_id)
> struct tipc_bearer *b;
>
> rcu_read_lock();
>- b = rcu_dereference(tipc_net(net)->bearer_list[bearer_id]);
>+ b = bearer_get(net, bearer_id);
> if (b)
> mtu = b->mtu;
> rcu_read_unlock();
>@@ -745,7 +743,7 @@ void tipc_bearer_cleanup(void)
>
> void tipc_bearer_stop(struct net *net)
> {
>- struct tipc_net *tn = net_generic(net, tipc_net_id);
>+ struct tipc_net *tn = tipc_net(net);
> struct tipc_bearer *b;
> u32 i;
>
>@@ -881,7 +879,7 @@ int tipc_nl_bearer_dump(struct sk_buff *skb, struct netlink_callback *cb)
> struct tipc_bearer *bearer;
> struct tipc_nl_msg msg;
> struct net *net = sock_net(skb->sk);
>- struct tipc_net *tn = net_generic(net, tipc_net_id);
>+ struct tipc_net *tn = tipc_net(net);
>
> if (i == MAX_BEARERS)
> return 0;
>--
>2.39.1
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net-next] tipc: replace open-code bearer rcu_dereference access in bearer.c
2023-06-05 14:40 [PATCH net-next] tipc: replace open-code bearer rcu_dereference access in bearer.c Xin Long
2023-06-06 9:13 ` Larysa Zaremba
2023-06-06 9:35 ` Tung Quang Nguyen
@ 2023-06-07 5:00 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-06-07 5:00 UTC (permalink / raw)
To: Xin Long
Cc: netdev, tipc-discussion, davem, kuba, edumazet, pabeni, jmaloy,
tung.q.nguyen
Hello:
This patch was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:
On Mon, 5 Jun 2023 10:40:44 -0400 you wrote:
> Replace these open-code bearer rcu_dereference access with bearer_get(),
> like other places in bearer.c. While at it, also use tipc_net() instead
> of net_generic(net, tipc_net_id) to get "tn" in bearer.c.
>
> Signed-off-by: Xin Long <lucien.xin@gmail.com>
> ---
> net/tipc/bearer.c | 14 ++++++--------
> 1 file changed, 6 insertions(+), 8 deletions(-)
Here is the summary with links:
- [net-next] tipc: replace open-code bearer rcu_dereference access in bearer.c
https://git.kernel.org/netdev/net-next/c/ae28ea5cbdee
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-06-07 5:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-05 14:40 [PATCH net-next] tipc: replace open-code bearer rcu_dereference access in bearer.c Xin Long
2023-06-06 9:13 ` Larysa Zaremba
2023-06-06 9:35 ` Tung Quang Nguyen
2023-06-07 5:00 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).