Skip to content

Commit

Permalink
tipc: simplify signature of tipc_nametbl_withdraw() functions
Browse files Browse the repository at this point in the history 
Following the principles of the preceding commits, we reduce
the number of parameters passed along in tipc_sk_withdraw(),
tipc_nametbl_withdraw() and associated functions.

Signed-off-by: Jon Maloy <[email protected]>
Acked-by: Ying Xue <[email protected]>
Acked-by: Hoang Le <[email protected]>
Acked-by: Tung Nguyen <[email protected]>
Acked-by: Xin Long <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
@lmcjoma @davem330
lmcjoma authored and davem330 committed Mar 17, 2021
1 parent a45ffa6 commit 2c98da0
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 68 deletions.
11 changes: 6 additions & 5 deletions net/tipc/name_distr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,17 +244,19 @@ static void tipc_publ_purge(struct net *net, struct publication *p, u32 addr)
{
struct tipc_net *tn = tipc_net(net);
struct publication *_p;
struct tipc_uaddr ua;

tipc_uaddr(&ua, TIPC_SERVICE_RANGE, p->scope, p->sr.type,
p->sr.lower, p->sr.upper);
spin_lock_bh(&tn->nametbl_lock);
_p = tipc_nametbl_remove_publ(net, p->sr.type, p->sr.lower,
p->sr.upper, p->sk.node, p->key);
_p = tipc_nametbl_remove_publ(net, &ua, &p->sk, p->key);
if (_p)
tipc_node_unsubscribe(net, &_p->binding_node, addr);
spin_unlock_bh(&tn->nametbl_lock);

if (_p != p) {
pr_err("Unable to remove publication from failed node\n"
" (type=%u, lower=%u, node=0x%x, port=%u, key=%u)\n",
" (type=%u, lower=%u, node=%u, port=%u, key=%u)\n",
p->sr.type, p->sr.lower, p->sk.node, p->sk.ref, p->key);
}

Expand Down Expand Up @@ -309,8 +311,7 @@ static bool tipc_update_nametbl(struct net *net, struct distr_item *i,
return true;
}
} else if (dtype == WITHDRAWAL) {
p = tipc_nametbl_remove_publ(net, ua.sr.type, ua.sr.lower,
ua.sr.upper, node, key);
p = tipc_nametbl_remove_publ(net, &ua, &sk, key);
if (p) {
tipc_node_unsubscribe(net, &p->binding_node, node);
kfree_rcu(p, rcu);
Expand Down
51 changes: 26 additions & 25 deletions net/tipc/name_table.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -366,16 +366,18 @@ static bool tipc_service_insert_publ(struct net *net,

/**
* tipc_service_remove_publ - remove a publication from a service
* @sr: service_range to remove publication from
* @node: target node
* @r: service_range to remove publication from
* @sk: address publishing socket
* @key: target publication key
*/
static struct publication *tipc_service_remove_publ(struct service_range *sr,
u32 node, u32 key)
static struct publication *tipc_service_remove_publ(struct service_range *r,
struct tipc_socket_addr *sk,
u32 key)
{
struct publication *p;
u32 node = sk->node;

list_for_each_entry(p, &sr->all_publ, all_publ) {
list_for_each_entry(p, &r->all_publ, all_publ) {
if (p->key != key || (node && node != p->sk.node))
continue;
list_del(&p->all_publ);
Expand Down Expand Up @@ -493,32 +495,36 @@ struct publication *tipc_nametbl_insert_publ(struct net *net,
return NULL;
}

struct publication *tipc_nametbl_remove_publ(struct net *net, u32 type,
u32 lower, u32 upper,
u32 node, u32 key)
struct publication *tipc_nametbl_remove_publ(struct net *net,
struct tipc_uaddr *ua,
struct tipc_socket_addr *sk,
u32 key)
{
struct tipc_service *sc = tipc_service_find(net, type);
struct tipc_subscription *sub, *tmp;
struct service_range *sr = NULL;
struct publication *p = NULL;
struct service_range *sr;
struct tipc_service *sc;
u32 upper = ua->sr.upper;
u32 lower = ua->sr.lower;
bool last;

sc = tipc_service_find(net, ua->sr.type);
if (!sc)
return NULL;

spin_lock_bh(&sc->lock);
sr = tipc_service_find_range(sc, lower, upper);
if (!sr)
goto exit;
p = tipc_service_remove_publ(sr, node, key);
p = tipc_service_remove_publ(sr, sk, key);
if (!p)
goto exit;

/* Notify any waiting subscriptions */
last = list_empty(&sr->all_publ);
list_for_each_entry_safe(sub, tmp, &sc->subscriptions, service_list) {
tipc_sub_report_overlap(sub, lower, upper, TIPC_WITHDRAWN,
p->sk.ref, node, p->scope, last);
sk->ref, sk->node, ua->scope, last);
}

/* Remove service range item if this was its last publication */
Expand Down Expand Up @@ -768,41 +774,36 @@ struct publication *tipc_nametbl_publish(struct net *net, struct tipc_uaddr *ua,
/**
* tipc_nametbl_withdraw - withdraw a service binding
* @net: network namespace
* @type: service type
* @lower: service range lower bound
* @upper: service range upper bound
* @ua: service address/range being unbound
* @sk: address of the socket being unbound from
* @key: target publication key
*/
int tipc_nametbl_withdraw(struct net *net, u32 type, u32 lower,
u32 upper, u32 key)
void tipc_nametbl_withdraw(struct net *net, struct tipc_uaddr *ua,
struct tipc_socket_addr *sk, u32 key)
{
struct name_table *nt = tipc_name_table(net);
struct tipc_net *tn = tipc_net(net);
u32 self = tipc_own_addr(net);
struct sk_buff *skb = NULL;
struct publication *p;
u32 rc_dests;

spin_lock_bh(&tn->nametbl_lock);

p = tipc_nametbl_remove_publ(net, type, lower, upper, self, key);
p = tipc_nametbl_remove_publ(net, ua, sk, key);
if (p) {
nt->local_publ_count--;
skb = tipc_named_withdraw(net, p);
list_del_init(&p->binding_sock);
kfree_rcu(p, rcu);
} else {
pr_err("Failed to remove local publication {%u,%u,%u}/%u\n",
type, lower, upper, key);
ua->sr.type, ua->sr.lower, ua->sr.upper, key);
}
rc_dests = nt->rc_dests;
spin_unlock_bh(&tn->nametbl_lock);

if (skb) {
if (skb)
tipc_node_broadcast(net, skb, rc_dests);
return 1;
}
return 0;
}

/**
Expand Down Expand Up @@ -900,7 +901,7 @@ static void tipc_service_delete(struct net *net, struct tipc_service *sc)
spin_lock_bh(&sc->lock);
rbtree_postorder_for_each_entry_safe(sr, tmpr, &sc->ranges, tree_node) {
list_for_each_entry_safe(p, tmp, &sr->all_publ, all_publ) {
tipc_service_remove_publ(sr, p->sk.node, p->key);
tipc_service_remove_publ(sr, &p->sk, p->key);
kfree_rcu(p, rcu);
}
rb_erase_augmented(&sr->tree_node, &sc->ranges, &sr_callbacks);
Expand Down
11 changes: 6 additions & 5 deletions net/tipc/name_table.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,16 @@ bool tipc_nametbl_lookup(struct net *net, u32 type, u32 instance, u32 domain,
bool all);
struct publication *tipc_nametbl_publish(struct net *net, struct tipc_uaddr *ua,
struct tipc_socket_addr *sk, u32 key);
int tipc_nametbl_withdraw(struct net *net, u32 type, u32 lower, u32 upper,
u32 key);
void tipc_nametbl_withdraw(struct net *net, struct tipc_uaddr *ua,
struct tipc_socket_addr *sk, u32 key);
struct publication *tipc_nametbl_insert_publ(struct net *net,
struct tipc_uaddr *ua,
struct tipc_socket_addr *sk,
u32 key);
struct publication *tipc_nametbl_remove_publ(struct net *net, u32 type,
u32 lower, u32 upper,
u32 node, u32 key);
struct publication *tipc_nametbl_remove_publ(struct net *net,
struct tipc_uaddr *ua,
struct tipc_socket_addr *sk,
u32 key);
bool tipc_nametbl_subscribe(struct tipc_subscription *s);
void tipc_nametbl_unsubscribe(struct tipc_subscription *s);
int tipc_nametbl_init(struct net *net);
Expand Down
3 changes: 1 addition & 2 deletions net/tipc/node.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -434,8 +434,7 @@ static void tipc_node_write_unlock(struct tipc_node *n)
}
if (flags & TIPC_NOTIFY_LINK_DOWN) {
tipc_mon_peer_down(net, n->addr, bearer_id);
tipc_nametbl_withdraw(net, TIPC_LINK_STATE, n->addr,
n->addr, n->link_id);
tipc_nametbl_withdraw(net, &ua, &sk, n->link_id);
}
}

Expand Down
62 changes: 31 additions & 31 deletions net/tipc/socket.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,7 @@ static int tipc_accept(struct socket *sock, struct socket *new_sock, int flags,
bool kern);
static void tipc_sk_timeout(struct timer_list *t);
static int tipc_sk_publish(struct tipc_sock *tsk, struct tipc_uaddr *ua);
static int tipc_sk_withdraw(struct tipc_sock *tsk, uint scope,
struct tipc_service_range const *seq);
static int tipc_sk_withdraw(struct tipc_sock *tsk, struct tipc_uaddr *ua);
static int tipc_sk_leave(struct tipc_sock *tsk);
static struct tipc_sock *tipc_sk_lookup(struct net *net, u32 portid);
static int tipc_sk_insert(struct tipc_sock *tsk);
Expand Down Expand Up @@ -643,7 +642,7 @@ static int tipc_release(struct socket *sock)
__tipc_shutdown(sock, TIPC_ERR_NO_PORT);
sk->sk_shutdown = SHUTDOWN_MASK;
tipc_sk_leave(tsk);
tipc_sk_withdraw(tsk, 0, NULL);
tipc_sk_withdraw(tsk, NULL);
__skb_queue_purge(&tsk->mc_method.deferredq);
sk_stop_timer(sk, &sk->sk_timer);
tipc_sk_remove(tsk);
Expand Down Expand Up @@ -681,7 +680,7 @@ static int __tipc_bind(struct socket *sock, struct sockaddr *skaddr, int alen)
bool unbind = false;

if (unlikely(!alen))
return tipc_sk_withdraw(tsk, 0, NULL);
return tipc_sk_withdraw(tsk, NULL);

if (ua->addrtype == TIPC_SERVICE_ADDR) {
ua->addrtype = TIPC_SERVICE_RANGE;
Expand All @@ -699,7 +698,7 @@ static int __tipc_bind(struct socket *sock, struct sockaddr *skaddr, int alen)
return -EACCES;

if (unbind)
return tipc_sk_withdraw(tsk, ua->scope, &ua->sr);
return tipc_sk_withdraw(tsk, ua);
return tipc_sk_publish(tsk, ua);
}

Expand Down Expand Up @@ -2923,38 +2922,37 @@ static int tipc_sk_publish(struct tipc_sock *tsk, struct tipc_uaddr *ua)
return 0;
}

static int tipc_sk_withdraw(struct tipc_sock *tsk, uint scope,
struct tipc_service_range const *seq)
static int tipc_sk_withdraw(struct tipc_sock *tsk, struct tipc_uaddr *ua)
{
struct net *net = sock_net(&tsk->sk);
struct publication *p;
struct publication *safe;
struct publication *safe, *p;
struct tipc_uaddr _ua;
int rc = -EINVAL;

if (scope != TIPC_NODE_SCOPE)
scope = TIPC_CLUSTER_SCOPE;

list_for_each_entry_safe(p, safe, &tsk->publications, binding_sock) {
if (seq) {
if (p->scope != scope)
continue;
if (p->sr.type != seq->type)
continue;
if (p->sr.lower != seq->lower)
continue;
if (p->sr.upper != seq->upper)
break;
tipc_nametbl_withdraw(net, p->sr.type, p->sr.lower,
p->sr.upper, p->key);
rc = 0;
break;
if (!ua) {
tipc_uaddr(&_ua, TIPC_SERVICE_RANGE, p->scope,
p->sr.type, p->sr.lower, p->sr.upper);
tipc_nametbl_withdraw(net, &_ua, &p->sk, p->key);
continue;
}
tipc_nametbl_withdraw(net, p->sr.type, p->sr.lower,
p->sr.upper, p->key);
/* Unbind specific publication */
if (p->scope != ua->scope)
continue;
if (p->sr.type != ua->sr.type)
continue;
if (p->sr.lower != ua->sr.lower)
continue;
if (p->sr.upper != ua->sr.upper)
break;
tipc_nametbl_withdraw(net, ua, &p->sk, p->key);
rc = 0;
break;
}
if (list_empty(&tsk->publications))
if (list_empty(&tsk->publications)) {
tsk->published = 0;
rc = 0;
}
return rc;
}

Expand Down Expand Up @@ -3109,15 +3107,17 @@ static int tipc_sk_leave(struct tipc_sock *tsk)
{
struct net *net = sock_net(&tsk->sk);
struct tipc_group *grp = tsk->group;
struct tipc_service_range seq;
struct tipc_uaddr ua;
int scope;

if (!grp)
return -EINVAL;
tipc_group_self(grp, &seq, &scope);
ua.addrtype = TIPC_SERVICE_RANGE;
tipc_group_self(grp, &ua.sr, &scope);
ua.scope = scope;
tipc_group_delete(net, grp);
tsk->group = NULL;
tipc_sk_withdraw(tsk, scope, &seq);
tipc_sk_withdraw(tsk, &ua);
return 0;
}

Expand Down

0 comments on commit 2c98da0

Please sign in to comment.