mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tipc: simplify the finalize work queue

Browse source 
This patch is to use "struct work_struct" for the finalize work queue
instead of "struct tipc_net_work", as it can get the "net" and "addr"
from tipc_net's other members and there is no need to add extra net
and addr in tipc_net by defining "struct tipc_net_work".

Note that it's safe to get net from tn->bcl as bcl is always released
after the finalize work queue is done.

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Jon Maloy <jmaloy@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Xin Long 2021-05-18 10:09:08 +08:00 committed by David S. Miller
parent 1dde47a66d
commit be07f05639
6 changed files with 14 additions and 23 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
net/tipc/core.c
View file

@ -60,7 +60,7 @@ static int __net_init tipc_init_net(struct net *net)
tn->trial_addr = 0; tn->trial_addr = 0;
tn->addr_trial_end = 0; tn->addr_trial_end = 0;
tn->capabilities = TIPC_NODE_CAPABILITIES; tn->capabilities = TIPC_NODE_CAPABILITIES;
INIT_WORK(&tn->final_work.work, tipc_net_finalize_work); INIT_WORK(&tn->work, tipc_net_finalize_work);
memset(tn->node_id, 0, sizeof(tn->node_id)); memset(tn->node_id, 0, sizeof(tn->node_id));
memset(tn->node_id_string, 0, sizeof(tn->node_id_string)); memset(tn->node_id_string, 0, sizeof(tn->node_id_string));
tn->mon_threshold = TIPC_DEF_MON_THRESHOLD; tn->mon_threshold = TIPC_DEF_MON_THRESHOLD;
@ -110,7 +110,7 @@ static void __net_exit tipc_exit_net(struct net *net)
tipc_detach_loopback(net); tipc_detach_loopback(net);
/* Make sure the tipc_net_finalize_work() finished */ /* Make sure the tipc_net_finalize_work() finished */
cancel_work_sync(&tn->final_work.work); cancel_work_sync(&tn->work);
tipc_net_stop(net); tipc_net_stop(net);
tipc_bcast_stop(net); tipc_bcast_stop(net);

8
net/tipc/core.h
View file

@ -91,12 +91,6 @@ extern unsigned int tipc_net_id __read_mostly;
extern int sysctl_tipc_rmem[3] __read_mostly; extern int sysctl_tipc_rmem[3] __read_mostly;
extern int sysctl_tipc_named_timeout __read_mostly; extern int sysctl_tipc_named_timeout __read_mostly;
struct tipc_net_work {
struct work_struct work;
struct net *net;
u32 addr;
};
struct tipc_net { struct tipc_net {
u8 node_id[NODE_ID_LEN]; u8 node_id[NODE_ID_LEN];
u32 node_addr; u32 node_addr;
@ -148,7 +142,7 @@ struct tipc_net {
struct tipc_crypto *crypto_tx; struct tipc_crypto *crypto_tx;
#endif #endif
/* Work item for net finalize */ /* Work item for net finalize */
struct tipc_net_work final_work; struct work_struct work;
/* The numbers of work queues in schedule */ /* The numbers of work queues in schedule */
atomic_t wq_count; atomic_t wq_count;
}; };

4
net/tipc/discover.c
View file

@ -168,7 +168,7 @@ static bool tipc_disc_addr_trial_msg(struct tipc_discoverer *d,
/* Apply trial address if we just left trial period */ /* Apply trial address if we just left trial period */
if (!trial && !self) { if (!trial && !self) {
tipc_sched_net_finalize(net, tn->trial_addr); schedule_work(&tn->work);
msg_set_prevnode(buf_msg(d->skb), tn->trial_addr); msg_set_prevnode(buf_msg(d->skb), tn->trial_addr);
msg_set_type(buf_msg(d->skb), DSC_REQ_MSG); msg_set_type(buf_msg(d->skb), DSC_REQ_MSG);
} }
@ -308,7 +308,7 @@ static void tipc_disc_timeout(struct timer_list *t)
if (!time_before(jiffies, tn->addr_trial_end) && !tipc_own_addr(net)) { if (!time_before(jiffies, tn->addr_trial_end) && !tipc_own_addr(net)) {
mod_timer(&d->timer, jiffies + TIPC_DISC_INIT); mod_timer(&d->timer, jiffies + TIPC_DISC_INIT);
spin_unlock_bh(&d->lock); spin_unlock_bh(&d->lock);
tipc_sched_net_finalize(net, tn->trial_addr); schedule_work(&tn->work);
return; return;
} }

5
net/tipc/link.c
View file

@ -372,6 +372,11 @@ char tipc_link_plane(struct tipc_link *l)
return l->net_plane; return l->net_plane;
} }
struct net *tipc_link_net(struct tipc_link *l)
{
return l->net;
}
void tipc_link_update_caps(struct tipc_link *l, u16 capabilities) void tipc_link_update_caps(struct tipc_link *l, u16 capabilities)
{ {
l->peer_caps = capabilities; l->peer_caps = capabilities;

1
net/tipc/link.h
View file

@ -156,4 +156,5 @@ int tipc_link_bc_sync_rcv(struct tipc_link *l, struct tipc_msg *hdr,
int tipc_link_bc_nack_rcv(struct tipc_link *l, struct sk_buff *skb, int tipc_link_bc_nack_rcv(struct tipc_link *l, struct sk_buff *skb,
struct sk_buff_head *xmitq); struct sk_buff_head *xmitq);
bool tipc_link_too_silent(struct tipc_link *l); bool tipc_link_too_silent(struct tipc_link *l);
struct net *tipc_link_net(struct tipc_link *l);
#endif #endif

15
net/tipc/net.c
View file

@ -41,6 +41,7 @@
#include "socket.h" #include "socket.h"
#include "node.h" #include "node.h"
#include "bcast.h" #include "bcast.h"
#include "link.h"
#include "netlink.h" #include "netlink.h"
#include "monitor.h" #include "monitor.h"
@ -142,19 +143,9 @@ static void tipc_net_finalize(struct net *net, u32 addr)
void tipc_net_finalize_work(struct work_struct *work) void tipc_net_finalize_work(struct work_struct *work)
{ {
struct tipc_net_work *fwork; struct tipc_net *tn = container_of(work, struct tipc_net, work);
fwork = container_of(work, struct tipc_net_work, work); tipc_net_finalize(tipc_link_net(tn->bcl), tn->trial_addr);
tipc_net_finalize(fwork->net, fwork->addr);
}
void tipc_sched_net_finalize(struct net *net, u32 addr)
{
struct tipc_net *tn = tipc_net(net);
tn->final_work.net = net;
tn->final_work.addr = addr;
schedule_work(&tn->final_work.work);
} }
void tipc_net_stop(struct net *net) void tipc_net_stop(struct net *net)