Skip to content

L
linux
Commit 07f6c4bc authored by Ying Xue's avatar Ying Xue Committed by David S. Miller
Browse files
Options

tipc: convert tipc reference table to use generic rhashtable 

As tipc reference table is statically allocated, its memory size
requested on stack initialization stage is quite big even if the
maximum port number is just restricted to 8191 currently, however,
the number already becomes insufficient in practice. But if the
maximum ports is allowed to its theory value - 2^32, its consumed
memory size will reach a ridiculously unacceptable value. Apart from
this, heavy tipc users spend a considerable amount of time in
tipc_sk_get() due to the read-lock on ref_table_lock.

If tipc reference table is converted with generic rhashtable, above
mentioned both disadvantages would be resolved respectively: making
use of the new resizable hash table can avoid locking on the lookup;
smaller memory size is required at initial stage, for example, 256
hash bucket slots are requested at the beginning phase instead of
allocating the entire 8191 slots in old mode. The hash table will
grow if entries exceeds 75% of table size up to a total table size
of 1M, and it will automatically shrink if usage falls below 30%,
but the minimum table size is allowed down to 256.

Also converts ref_table_lock to a separate mutex to protect hash table
mutations on write side. Lastly defers the release of the socket
reference using call_rcu() to allow using an RCU read-side protected
call to rhashtable_lookup().
Signed-off-by: default avatarYing Xue <ying.xue@windriver.com>
Acked-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Acked-by: default avatarErik Hugne <erik.hugne@ericsson.com>
Cc: Thomas Graf <tgraf@suug.ch>
Acked-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 545a148e
Show whitespace changes
Inline Side-by-side
Showing with 180 additions and 353 deletions
net/tipc/Kconfig
View file @ 07f6c4bc
...@@ -20,18 +20,6 @@ menuconfig TIPC ...@@ -20,18 +20,6 @@ menuconfig TIPC
If in doubt, say N. If in doubt, say N.
config TIPC_PORTS
int "Maximum number of ports in a node"
depends on TIPC
range 127 65535
default "8191"
help
Specifies how many ports can be supported by a node.
Can range from 127 to 65535 ports; default is 8191.
Setting this to a smaller value saves some memory,
setting it to higher allows for more ports.
config TIPC_MEDIA_IB config TIPC_MEDIA_IB
bool "InfiniBand media type support" bool "InfiniBand media type support"
depends on TIPC && INFINIBAND_IPOIB depends on TIPC && INFINIBAND_IPOIB
......
net/tipc/config.c
View file @ 07f6c4bc
...@@ -183,22 +183,6 @@ static struct sk_buff *cfg_set_own_addr(void) ...@@ -183,22 +183,6 @@ static struct sk_buff *cfg_set_own_addr(void)
return tipc_cfg_reply_error_string("cannot change to network mode"); return tipc_cfg_reply_error_string("cannot change to network mode");
} }
static struct sk_buff *cfg_set_max_ports(void)
{
u32 value;
if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_UNSIGNED))
return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
if (value == tipc_max_ports)
return tipc_cfg_reply_none();
if (value < 127 || value > 65535)
return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
" (max ports must be 127-65535)");
return tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED
" (cannot change max ports while TIPC is active)");
}
static struct sk_buff *cfg_set_netid(void) static struct sk_buff *cfg_set_netid(void)
{ {
u32 value; u32 value;
...@@ -285,15 +269,9 @@ struct sk_buff *tipc_cfg_do_cmd(u32 orig_node, u16 cmd, const void *request_area ...@@ -285,15 +269,9 @@ struct sk_buff *tipc_cfg_do_cmd(u32 orig_node, u16 cmd, const void *request_area
case TIPC_CMD_SET_NODE_ADDR: case TIPC_CMD_SET_NODE_ADDR:
rep_tlv_buf = cfg_set_own_addr(); rep_tlv_buf = cfg_set_own_addr();
break; break;
case TIPC_CMD_SET_MAX_PORTS:
rep_tlv_buf = cfg_set_max_ports();
break;
case TIPC_CMD_SET_NETID: case TIPC_CMD_SET_NETID:
rep_tlv_buf = cfg_set_netid(); rep_tlv_buf = cfg_set_netid();
break; break;
case TIPC_CMD_GET_MAX_PORTS:
rep_tlv_buf = tipc_cfg_reply_unsigned(tipc_max_ports);
break;
case TIPC_CMD_GET_NETID: case TIPC_CMD_GET_NETID:
rep_tlv_buf = tipc_cfg_reply_unsigned(tipc_net_id); rep_tlv_buf = tipc_cfg_reply_unsigned(tipc_net_id);
break; break;
...@@ -317,6 +295,8 @@ struct sk_buff *tipc_cfg_do_cmd(u32 orig_node, u16 cmd, const void *request_area ...@@ -317,6 +295,8 @@ struct sk_buff *tipc_cfg_do_cmd(u32 orig_node, u16 cmd, const void *request_area
case TIPC_CMD_SET_REMOTE_MNG: case TIPC_CMD_SET_REMOTE_MNG:
case TIPC_CMD_GET_REMOTE_MNG: case TIPC_CMD_GET_REMOTE_MNG:
case TIPC_CMD_DUMP_LOG: case TIPC_CMD_DUMP_LOG:
case TIPC_CMD_SET_MAX_PORTS:
case TIPC_CMD_GET_MAX_PORTS:
rep_tlv_buf = tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED rep_tlv_buf = tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED
" (obsolete command)"); " (obsolete command)");
break; break;
......
net/tipc/core.c
View file @ 07f6c4bc
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include "core.h" #include "core.h"
#include "name_table.h" #include "name_table.h"
#include "subscr.h" #include "subscr.h"
...@@ -47,7 +49,6 @@ int tipc_random __read_mostly; ...@@ -47,7 +49,6 @@ int tipc_random __read_mostly;
/* configurable TIPC parameters */ /* configurable TIPC parameters */
u32 tipc_own_addr __read_mostly; u32 tipc_own_addr __read_mostly;
int tipc_max_ports __read_mostly;
int tipc_net_id __read_mostly; int tipc_net_id __read_mostly;
int sysctl_tipc_rmem[3] __read_mostly; /* min/default/max */ int sysctl_tipc_rmem[3] __read_mostly; /* min/default/max */
...@@ -84,9 +85,9 @@ static void tipc_core_stop(void) ...@@ -84,9 +85,9 @@ static void tipc_core_stop(void)
tipc_netlink_stop(); tipc_netlink_stop();
tipc_subscr_stop(); tipc_subscr_stop();
tipc_nametbl_stop(); tipc_nametbl_stop();
tipc_sk_ref_table_stop();
tipc_socket_stop(); tipc_socket_stop();
tipc_unregister_sysctl(); tipc_unregister_sysctl();
tipc_sk_rht_destroy();
} }
/** /**
...@@ -98,7 +99,7 @@ static int tipc_core_start(void) ...@@ -98,7 +99,7 @@ static int tipc_core_start(void)
get_random_bytes(&tipc_random, sizeof(tipc_random)); get_random_bytes(&tipc_random, sizeof(tipc_random));
err = tipc_sk_ref_table_init(tipc_max_ports, tipc_random); err = tipc_sk_rht_init();
if (err) if (err)
goto out_reftbl; goto out_reftbl;
...@@ -138,7 +139,7 @@ static int tipc_core_start(void) ...@@ -138,7 +139,7 @@ static int tipc_core_start(void)
out_netlink: out_netlink:
tipc_nametbl_stop(); tipc_nametbl_stop();
out_nametbl: out_nametbl:
tipc_sk_ref_table_stop(); tipc_sk_rht_destroy();
out_reftbl: out_reftbl:
return err; return err;
} }
...@@ -150,7 +151,6 @@ static int __init tipc_init(void) ...@@ -150,7 +151,6 @@ static int __init tipc_init(void)
pr_info("Activated (version " TIPC_MOD_VER ")\n"); pr_info("Activated (version " TIPC_MOD_VER ")\n");
tipc_own_addr = 0; tipc_own_addr = 0;
tipc_max_ports = CONFIG_TIPC_PORTS;
tipc_net_id = 4711; tipc_net_id = 4711;
sysctl_tipc_rmem[0] = TIPC_CONN_OVERLOAD_LIMIT >> 4 << sysctl_tipc_rmem[0] = TIPC_CONN_OVERLOAD_LIMIT >> 4 <<
......
net/tipc/core.h
View file @ 07f6c4bc
...@@ -37,8 +37,6 @@ ...@@ -37,8 +37,6 @@
#ifndef _TIPC_CORE_H #ifndef _TIPC_CORE_H
#define _TIPC_CORE_H #define _TIPC_CORE_H
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/tipc.h> #include <linux/tipc.h>
#include <linux/tipc_config.h> #include <linux/tipc_config.h>
#include <linux/tipc_netlink.h> #include <linux/tipc_netlink.h>
...@@ -79,7 +77,6 @@ int tipc_snprintf(char *buf, int len, const char *fmt, ...); ...@@ -79,7 +77,6 @@ int tipc_snprintf(char *buf, int len, const char *fmt, ...);
* Global configuration variables * Global configuration variables
*/ */
extern u32 tipc_own_addr __read_mostly; extern u32 tipc_own_addr __read_mostly;
extern int tipc_max_ports __read_mostly;
extern int tipc_net_id __read_mostly; extern 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;
......
net/tipc/socket.c
View file @ 07f6c4bc
...@@ -34,11 +34,12 @@ ...@@ -34,11 +34,12 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <linux/rhashtable.h>
#include <linux/jhash.h>
#include "core.h" #include "core.h"
#include "name_table.h" #include "name_table.h"
#include "node.h" #include "node.h"
#include "link.h" #include "link.h"
#include <linux/export.h>
#include "config.h" #include "config.h"
#include "socket.h" #include "socket.h"
...@@ -50,6 +51,8 @@ ...@@ -50,6 +51,8 @@
#define TIPC_FWD_MSG 1 #define TIPC_FWD_MSG 1
#define TIPC_CONN_OK 0 #define TIPC_CONN_OK 0
#define TIPC_CONN_PROBING 1 #define TIPC_CONN_PROBING 1
#define TIPC_MAX_PORT 0xffffffff
#define TIPC_MIN_PORT 1
/** /**
* struct tipc_sock - TIPC socket structure * struct tipc_sock - TIPC socket structure
...@@ -59,7 +62,7 @@ ...@@ -59,7 +62,7 @@
* @conn_instance: TIPC instance used when connection was established * @conn_instance: TIPC instance used when connection was established
* @published: non-zero if port has one or more associated names * @published: non-zero if port has one or more associated names
* @max_pkt: maximum packet size "hint" used when building messages sent by port * @max_pkt: maximum packet size "hint" used when building messages sent by port
* @ref: unique reference to port in TIPC object registry * @portid: unique port identity in TIPC socket hash table
* @phdr: preformatted message header used when sending messages * @phdr: preformatted message header used when sending messages
* @port_list: adjacent ports in TIPC's global list of ports * @port_list: adjacent ports in TIPC's global list of ports
* @publications: list of publications for port * @publications: list of publications for port
...@@ -74,6 +77,8 @@ ...@@ -74,6 +77,8 @@
* @link_cong: non-zero if owner must sleep because of link congestion * @link_cong: non-zero if owner must sleep because of link congestion
* @sent_unacked: # messages sent by socket, and not yet acked by peer * @sent_unacked: # messages sent by socket, and not yet acked by peer
* @rcv_unacked: # messages read by user, but not yet acked back to peer * @rcv_unacked: # messages read by user, but not yet acked back to peer
* @node: hash table node
* @rcu: rcu struct for tipc_sock
*/ */
struct tipc_sock { struct tipc_sock {
struct sock sk; struct sock sk;
...@@ -82,7 +87,7 @@ struct tipc_sock { ...@@ -82,7 +87,7 @@ struct tipc_sock {
u32 conn_instance; u32 conn_instance;
int published; int published;
u32 max_pkt; u32 max_pkt;
u32 ref; u32 portid;
struct tipc_msg phdr; struct tipc_msg phdr;
struct list_head sock_list; struct list_head sock_list;
struct list_head publications; struct list_head publications;
...@@ -95,6 +100,8 @@ struct tipc_sock { ...@@ -95,6 +100,8 @@ struct tipc_sock {
bool link_cong; bool link_cong;
uint sent_unacked; uint sent_unacked;
uint rcv_unacked; uint rcv_unacked;
struct rhash_head node;
struct rcu_head rcu;
}; };
static int tipc_backlog_rcv(struct sock *sk, struct sk_buff *skb); static int tipc_backlog_rcv(struct sock *sk, struct sk_buff *skb);
...@@ -103,16 +110,14 @@ static void tipc_write_space(struct sock *sk); ...@@ -103,16 +110,14 @@ static void tipc_write_space(struct sock *sk);
static int tipc_release(struct socket *sock); static int tipc_release(struct socket *sock);
static int tipc_accept(struct socket *sock, struct socket *new_sock, int flags); static int tipc_accept(struct socket *sock, struct socket *new_sock, int flags);
static int tipc_wait_for_sndmsg(struct socket *sock, long *timeo_p); static int tipc_wait_for_sndmsg(struct socket *sock, long *timeo_p);
static void tipc_sk_timeout(unsigned long ref); static void tipc_sk_timeout(unsigned long portid);
static int tipc_sk_publish(struct tipc_sock *tsk, uint scope, static int tipc_sk_publish(struct tipc_sock *tsk, uint scope,
struct tipc_name_seq const *seq); struct tipc_name_seq const *seq);
static int tipc_sk_withdraw(struct tipc_sock *tsk, uint scope, static int tipc_sk_withdraw(struct tipc_sock *tsk, uint scope,
struct tipc_name_seq const *seq); struct tipc_name_seq const *seq);
static u32 tipc_sk_ref_acquire(struct tipc_sock *tsk); static struct tipc_sock *tipc_sk_lookup(u32 portid);
static void tipc_sk_ref_discard(u32 ref); static int tipc_sk_insert(struct tipc_sock *tsk);
static struct tipc_sock *tipc_sk_get(u32 ref); static void tipc_sk_remove(struct tipc_sock *tsk);
static struct tipc_sock *tipc_sk_get_next(u32 *ref);
static void tipc_sk_put(struct tipc_sock *tsk);
static const struct proto_ops packet_ops; static const struct proto_ops packet_ops;
static const struct proto_ops stream_ops; static const struct proto_ops stream_ops;
...@@ -174,6 +179,9 @@ static const struct nla_policy tipc_nl_sock_policy[TIPC_NLA_SOCK_MAX + 1] = { ...@@ -174,6 +179,9 @@ static const struct nla_policy tipc_nl_sock_policy[TIPC_NLA_SOCK_MAX + 1] = {
* - port reference * - port reference
*/ */
/* Protects tipc socket hash table mutations */
static struct rhashtable tipc_sk_rht;
static u32 tsk_peer_node(struct tipc_sock *tsk) static u32 tsk_peer_node(struct tipc_sock *tsk)
{ {
return msg_destnode(&tsk->phdr); return msg_destnode(&tsk->phdr);
...@@ -305,7 +313,6 @@ static int tipc_sk_create(struct net *net, struct socket *sock, ...@@ -305,7 +313,6 @@ static int tipc_sk_create(struct net *net, struct socket *sock,
struct sock *sk; struct sock *sk;
struct tipc_sock *tsk; struct tipc_sock *tsk;
struct tipc_msg *msg; struct tipc_msg *msg;
u32 ref;
/* Validate arguments */ /* Validate arguments */
if (unlikely(protocol != 0)) if (unlikely(protocol != 0))
...@@ -339,24 +346,22 @@ static int tipc_sk_create(struct net *net, struct socket *sock, ...@@ -339,24 +346,22 @@ static int tipc_sk_create(struct net *net, struct socket *sock,
return -ENOMEM; return -ENOMEM;
tsk = tipc_sk(sk); tsk = tipc_sk(sk);
ref = tipc_sk_ref_acquire(tsk);
if (!ref) {
pr_warn("Socket create failed; reference table exhausted\n");
return -ENOMEM;
}
tsk->max_pkt = MAX_PKT_DEFAULT; tsk->max_pkt = MAX_PKT_DEFAULT;
tsk->ref = ref;
INIT_LIST_HEAD(&tsk->publications); INIT_LIST_HEAD(&tsk->publications);
msg = &tsk->phdr; msg = &tsk->phdr;
tipc_msg_init(msg, TIPC_LOW_IMPORTANCE, TIPC_NAMED_MSG, tipc_msg_init(msg, TIPC_LOW_IMPORTANCE, TIPC_NAMED_MSG,
NAMED_H_SIZE, 0); NAMED_H_SIZE, 0);
msg_set_origport(msg, ref);
/* Finish initializing socket data structures */ /* Finish initializing socket data structures */
sock->ops = ops; sock->ops = ops;
sock->state = state; sock->state = state;
sock_init_data(sock, sk); sock_init_data(sock, sk);
k_init_timer(&tsk->timer, (Handler)tipc_sk_timeout, ref); if (tipc_sk_insert(tsk)) {
pr_warn("Socket create failed; port numbrer exhausted\n");
return -EINVAL;
}
msg_set_origport(msg, tsk->portid);
k_init_timer(&tsk->timer, (Handler)tipc_sk_timeout, tsk->portid);
sk->sk_backlog_rcv = tipc_backlog_rcv; sk->sk_backlog_rcv = tipc_backlog_rcv;
sk->sk_rcvbuf = sysctl_tipc_rmem[1]; sk->sk_rcvbuf = sysctl_tipc_rmem[1];
sk->sk_data_ready = tipc_data_ready; sk->sk_data_ready = tipc_data_ready;
...@@ -442,6 +447,13 @@ int tipc_sock_accept_local(struct socket *sock, struct socket **newsock, ...@@ -442,6 +447,13 @@ int tipc_sock_accept_local(struct socket *sock, struct socket **newsock,
return ret; return ret;
} }
static void tipc_sk_callback(struct rcu_head *head)
{
struct tipc_sock *tsk = container_of(head, struct tipc_sock, rcu);
sock_put(&tsk->sk);
}
/** /**
* tipc_release - destroy a TIPC socket * tipc_release - destroy a TIPC socket
* @sock: socket to destroy * @sock: socket to destroy
...@@ -491,7 +503,7 @@ static int tipc_release(struct socket *sock) ...@@ -491,7 +503,7 @@ static int tipc_release(struct socket *sock)
(sock->state == SS_CONNECTED)) { (sock->state == SS_CONNECTED)) {
sock->state = SS_DISCONNECTING; sock->state = SS_DISCONNECTING;
tsk->connected = 0; tsk->connected = 0;
tipc_node_remove_conn(dnode, tsk->ref); tipc_node_remove_conn(dnode, tsk->portid);
} }
if (tipc_msg_reverse(skb, &dnode, TIPC_ERR_NO_PORT)) if (tipc_msg_reverse(skb, &dnode, TIPC_ERR_NO_PORT))
tipc_link_xmit_skb(skb, dnode, 0); tipc_link_xmit_skb(skb, dnode, 0);
...@@ -499,16 +511,16 @@ static int tipc_release(struct socket *sock) ...@@ -499,16 +511,16 @@ static int tipc_release(struct socket *sock)
} }
tipc_sk_withdraw(tsk, 0, NULL); tipc_sk_withdraw(tsk, 0, NULL);
tipc_sk_ref_discard(tsk->ref);
k_cancel_timer(&tsk->timer); k_cancel_timer(&tsk->timer);
tipc_sk_remove(tsk);
if (tsk->connected) { if (tsk->connected) {
skb = tipc_msg_create(TIPC_CRITICAL_IMPORTANCE, TIPC_CONN_MSG, skb = tipc_msg_create(TIPC_CRITICAL_IMPORTANCE, TIPC_CONN_MSG,
SHORT_H_SIZE, 0, dnode, tipc_own_addr, SHORT_H_SIZE, 0, dnode, tipc_own_addr,
tsk_peer_port(tsk), tsk_peer_port(tsk),
tsk->ref, TIPC_ERR_NO_PORT); tsk->portid, TIPC_ERR_NO_PORT);
if (skb) if (skb)
tipc_link_xmit_skb(skb, dnode, tsk->ref); tipc_link_xmit_skb(skb, dnode, tsk->portid);
tipc_node_remove_conn(dnode, tsk->ref); tipc_node_remove_conn(dnode, tsk->portid);
} }
k_term_timer(&tsk->timer); k_term_timer(&tsk->timer);
...@@ -518,7 +530,8 @@ static int tipc_release(struct socket *sock) ...@@ -518,7 +530,8 @@ static int tipc_release(struct socket *sock)
/* Reject any messages that accumulated in backlog queue */ /* Reject any messages that accumulated in backlog queue */
sock->state = SS_DISCONNECTING; sock->state = SS_DISCONNECTING;
release_sock(sk); release_sock(sk);
sock_put(sk);
call_rcu(&tsk->rcu, tipc_sk_callback);
sock->sk = NULL; sock->sk = NULL;
return 0; return 0;
...@@ -611,7 +624,7 @@ static int tipc_getname(struct socket *sock, struct sockaddr *uaddr, ...@@ -611,7 +624,7 @@ static int tipc_getname(struct socket *sock, struct sockaddr *uaddr,
addr->addr.id.ref = tsk_peer_port(tsk); addr->addr.id.ref = tsk_peer_port(tsk);
addr->addr.id.node = tsk_peer_node(tsk); addr->addr.id.node = tsk_peer_node(tsk);
} else { } else {
addr->addr.id.ref = tsk->ref; addr->addr.id.ref = tsk->portid;
addr->addr.id.node = tipc_own_addr; addr->addr.id.node = tipc_own_addr;
} }
...@@ -946,7 +959,7 @@ static int tipc_sendmsg(struct kiocb *iocb, struct socket *sock, ...@@ -946,7 +959,7 @@ static int tipc_sendmsg(struct kiocb *iocb, struct socket *sock,
} }
new_mtu: new_mtu:
mtu = tipc_node_get_mtu(dnode, tsk->ref); mtu = tipc_node_get_mtu(dnode, tsk->portid);
__skb_queue_head_init(&head); __skb_queue_head_init(&head);
rc = tipc_msg_build(mhdr, m, 0, dsz, mtu, &head); rc = tipc_msg_build(mhdr, m, 0, dsz, mtu, &head);
if (rc < 0) if (rc < 0)
...@@ -955,7 +968,7 @@ static int tipc_sendmsg(struct kiocb *iocb, struct socket *sock, ...@@ -955,7 +968,7 @@ static int tipc_sendmsg(struct kiocb *iocb, struct socket *sock,
do { do {
skb = skb_peek(&head); skb = skb_peek(&head);
TIPC_SKB_CB(skb)->wakeup_pending = tsk->link_cong; TIPC_SKB_CB(skb)->wakeup_pending = tsk->link_cong;
rc = tipc_link_xmit(&head, dnode, tsk->ref); rc = tipc_link_xmit(&head, dnode, tsk->portid);
if (likely(rc >= 0)) { if (likely(rc >= 0)) {
if (sock->state != SS_READY) if (sock->state != SS_READY)
sock->state = SS_CONNECTING; sock->state = SS_CONNECTING;
...@@ -1028,7 +1041,7 @@ static int tipc_send_stream(struct kiocb *iocb, struct socket *sock, ...@@ -1028,7 +1041,7 @@ static int tipc_send_stream(struct kiocb *iocb, struct socket *sock,
struct tipc_msg *mhdr = &tsk->phdr; struct tipc_msg *mhdr = &tsk->phdr;
struct sk_buff_head head; struct sk_buff_head head;
DECLARE_SOCKADDR(struct sockaddr_tipc *, dest, m->msg_name); DECLARE_SOCKADDR(struct sockaddr_tipc *, dest, m->msg_name);
u32 ref = tsk->ref; u32 portid = tsk->portid;
int rc = -EINVAL; int rc = -EINVAL;
long timeo; long timeo;
u32 dnode; u32 dnode;
...@@ -1067,7 +1080,7 @@ static int tipc_send_stream(struct kiocb *iocb, struct socket *sock, ...@@ -1067,7 +1080,7 @@ static int tipc_send_stream(struct kiocb *iocb, struct socket *sock,
goto exit; goto exit;
do { do {
if (likely(!tsk_conn_cong(tsk))) { if (likely(!tsk_conn_cong(tsk))) {
rc = tipc_link_xmit(&head, dnode, ref); rc = tipc_link_xmit(&head, dnode, portid);
if (likely(!rc)) { if (likely(!rc)) {
tsk->sent_unacked++; tsk->sent_unacked++;
sent += send; sent += send;
...@@ -1076,7 +1089,7 @@ static int tipc_send_stream(struct kiocb *iocb, struct socket *sock, ...@@ -1076,7 +1089,7 @@ static int tipc_send_stream(struct kiocb *iocb, struct socket *sock,
goto next; goto next;
} }
if (rc == -EMSGSIZE) { if (rc == -EMSGSIZE) {
tsk->max_pkt = tipc_node_get_mtu(dnode, ref); tsk->max_pkt = tipc_node_get_mtu(dnode, portid);
goto next; goto next;
} }
if (rc != -ELINKCONG) if (rc != -ELINKCONG)
...@@ -1130,8 +1143,8 @@ static void tipc_sk_finish_conn(struct tipc_sock *tsk, u32 peer_port, ...@@ -1130,8 +1143,8 @@ static void tipc_sk_finish_conn(struct tipc_sock *tsk, u32 peer_port,
tsk->probing_state = TIPC_CONN_OK; tsk->probing_state = TIPC_CONN_OK;
tsk->connected = 1; tsk->connected = 1;
k_start_timer(&tsk->timer, tsk->probing_interval); k_start_timer(&tsk->timer, tsk->probing_interval);
tipc_node_add_conn(peer_node, tsk->ref, peer_port); tipc_node_add_conn(peer_node, tsk->portid, peer_port);
tsk->max_pkt = tipc_node_get_mtu(peer_node, tsk->ref); tsk->max_pkt = tipc_node_get_mtu(peer_node, tsk->portid);
} }
/** /**
...@@ -1238,7 +1251,7 @@ static void tipc_sk_send_ack(struct tipc_sock *tsk, uint ack) ...@@ -1238,7 +1251,7 @@ static void tipc_sk_send_ack(struct tipc_sock *tsk, uint ack)
if (!tsk->connected) if (!tsk->connected)
return; return;
skb = tipc_msg_create(CONN_MANAGER, CONN_ACK, INT_H_SIZE, 0, dnode, skb = tipc_msg_create(CONN_MANAGER, CONN_ACK, INT_H_SIZE, 0, dnode,
tipc_own_addr, peer_port, tsk->ref, TIPC_OK); tipc_own_addr, peer_port, tsk->portid, TIPC_OK);
if (!skb) if (!skb)
return; return;
msg = buf_msg(skb); msg = buf_msg(skb);
...@@ -1552,7 +1565,7 @@ static int filter_connect(struct tipc_sock *tsk, struct sk_buff **buf) ...@@ -1552,7 +1565,7 @@ static int filter_connect(struct tipc_sock *tsk, struct sk_buff **buf)
tsk->connected = 0; tsk->connected = 0;
/* let timer expire on it's own */ /* let timer expire on it's own */
tipc_node_remove_conn(tsk_peer_node(tsk), tipc_node_remove_conn(tsk_peer_node(tsk),
tsk->ref); tsk->portid);
} }
retval = TIPC_OK; retval = TIPC_OK;
} }
...@@ -1743,7 +1756,7 @@ int tipc_sk_rcv(struct sk_buff *skb) ...@@ -1743,7 +1756,7 @@ int tipc_sk_rcv(struct sk_buff *skb)
u32 dnode; u32 dnode;
/* Validate destination and message */ /* Validate destination and message */
tsk = tipc_sk_get(dport); tsk = tipc_sk_lookup(dport);
if (unlikely(!tsk)) { if (unlikely(!tsk)) {
rc = tipc_msg_eval(skb, &dnode); rc = tipc_msg_eval(skb, &dnode);
goto exit; goto exit;
...@@ -1763,7 +1776,7 @@ int tipc_sk_rcv(struct sk_buff *skb) ...@@ -1763,7 +1776,7 @@ int tipc_sk_rcv(struct sk_buff *skb)
rc = -TIPC_ERR_OVERLOAD; rc = -TIPC_ERR_OVERLOAD;
} }
spin_unlock_bh(&sk->sk_lock.slock); spin_unlock_bh(&sk->sk_lock.slock);
tipc_sk_put(tsk); sock_put(sk);
if (likely(!rc)) if (likely(!rc))
return 0; return 0;
exit: exit:
...@@ -2050,20 +2063,20 @@ static int tipc_shutdown(struct socket *sock, int how) ...@@ -2050,20 +2063,20 @@ static int tipc_shutdown(struct socket *sock, int how)
goto restart; goto restart;
} }
if (tipc_msg_reverse(skb, &dnode, TIPC_CONN_SHUTDOWN)) if (tipc_msg_reverse(skb, &dnode, TIPC_CONN_SHUTDOWN))
tipc_link_xmit_skb(skb, dnode, tsk->ref); tipc_link_xmit_skb(skb, dnode, tsk->portid);
tipc_node_remove_conn(dnode, tsk->ref); tipc_node_remove_conn(dnode, tsk->portid);
} else { } else {
dnode = tsk_peer_node(tsk); dnode = tsk_peer_node(tsk);
skb = tipc_msg_create(TIPC_CRITICAL_IMPORTANCE, skb = tipc_msg_create(TIPC_CRITICAL_IMPORTANCE,
TIPC_CONN_MSG, SHORT_H_SIZE, TIPC_CONN_MSG, SHORT_H_SIZE,
0, dnode, tipc_own_addr, 0, dnode, tipc_own_addr,
tsk_peer_port(tsk), tsk_peer_port(tsk),
tsk->ref, TIPC_CONN_SHUTDOWN); tsk->portid, TIPC_CONN_SHUTDOWN);
tipc_link_xmit_skb(skb, dnode, tsk->ref); tipc_link_xmit_skb(skb, dnode, tsk->portid);
} }
tsk->connected = 0; tsk->connected = 0;
sock->state = SS_DISCONNECTING; sock->state = SS_DISCONNECTING;
tipc_node_remove_conn(dnode, tsk->ref); tipc_node_remove_conn(dnode, tsk->portid);
/* fall through */ /* fall through */
case SS_DISCONNECTING: case SS_DISCONNECTING:
...@@ -2084,14 +2097,14 @@ static int tipc_shutdown(struct socket *sock, int how) ...@@ -2084,14 +2097,14 @@ static int tipc_shutdown(struct socket *sock, int how)
return res; return res;
} }
static void tipc_sk_timeout(unsigned long ref) static void tipc_sk_timeout(unsigned long portid)
{ {
struct tipc_sock *tsk; struct tipc_sock *tsk;
struct sock *sk; struct sock *sk;
struct sk_buff *skb = NULL; struct sk_buff *skb = NULL;
u32 peer_port, peer_node; u32 peer_port, peer_node;
tsk = tipc_sk_get(ref); tsk = tipc_sk_lookup(portid);
if (!tsk) if (!tsk)
return; return;
...@@ -2108,20 +2121,20 @@ static void tipc_sk_timeout(unsigned long ref) ...@@ -2108,20 +2121,20 @@ static void tipc_sk_timeout(unsigned long ref)
/* Previous probe not answered -> self abort */ /* Previous probe not answered -> self abort */
skb = tipc_msg_create(TIPC_CRITICAL_IMPORTANCE, TIPC_CONN_MSG, skb = tipc_msg_create(TIPC_CRITICAL_IMPORTANCE, TIPC_CONN_MSG,
SHORT_H_SIZE, 0, tipc_own_addr, SHORT_H_SIZE, 0, tipc_own_addr,
peer_node, ref, peer_port, peer_node, portid, peer_port,
TIPC_ERR_NO_PORT); TIPC_ERR_NO_PORT);
} else { } else {
skb = tipc_msg_create(CONN_MANAGER, CONN_PROBE, INT_H_SIZE, skb = tipc_msg_create(CONN_MANAGER, CONN_PROBE, INT_H_SIZE,
0, peer_node, tipc_own_addr, 0, peer_node, tipc_own_addr,
peer_port, ref, TIPC_OK); peer_port, portid, TIPC_OK);
tsk->probing_state = TIPC_CONN_PROBING; tsk->probing_state = TIPC_CONN_PROBING;
k_start_timer(&tsk->timer, tsk->probing_interval); k_start_timer(&tsk->timer, tsk->probing_interval);
} }
bh_unlock_sock(sk); bh_unlock_sock(sk);
if (skb) if (skb)
tipc_link_xmit_skb(skb, peer_node, ref); tipc_link_xmit_skb(skb, peer_node, portid);
exit: exit:
tipc_sk_put(tsk); sock_put(sk);
} }
static int tipc_sk_publish(struct tipc_sock *tsk, uint scope, static int tipc_sk_publish(struct tipc_sock *tsk, uint scope,
...@@ -2132,12 +2145,12 @@ static int tipc_sk_publish(struct tipc_sock *tsk, uint scope, ...@@ -2132,12 +2145,12 @@ static int tipc_sk_publish(struct tipc_sock *tsk, uint scope,
if (tsk->connected) if (tsk->connected)
return -EINVAL; return -EINVAL;
key = tsk->ref + tsk->pub_count + 1; key = tsk->portid + tsk->pub_count + 1;
if (key == tsk->ref) if (key == tsk->portid)
return -EADDRINUSE; return -EADDRINUSE;
publ = tipc_nametbl_publish(seq->type, seq->lower, seq->upper, publ = tipc_nametbl_publish(seq->type, seq->lower, seq->upper,
scope, tsk->ref, key); scope, tsk->portid, key);
if (unlikely(!publ)) if (unlikely(!publ))
return -EINVAL; return -EINVAL;
...@@ -2188,9 +2201,9 @@ static int tipc_sk_show(struct tipc_sock *tsk, char *buf, ...@@ -2188,9 +2201,9 @@ static int tipc_sk_show(struct tipc_sock *tsk, char *buf,
ret = tipc_snprintf(buf, len, "<%u.%u.%u:%u>:", ret = tipc_snprintf(buf, len, "<%u.%u.%u:%u>:",
tipc_zone(tipc_own_addr), tipc_zone(tipc_own_addr),
tipc_cluster(tipc_own_addr), tipc_cluster(tipc_own_addr),
tipc_node(tipc_own_addr), tsk->ref); tipc_node(tipc_own_addr), tsk->portid);
else else
ret = tipc_snprintf(buf, len, "%-10u:", tsk->ref); ret = tipc_snprintf(buf, len, "%-10u:", tsk->portid);
if (tsk->connected) { if (tsk->connected) {
u32 dport = tsk_peer_port(tsk); u32 dport = tsk_peer_port(tsk);
...@@ -2224,13 +2237,15 @@ static int tipc_sk_show(struct tipc_sock *tsk, char *buf, ...@@ -2224,13 +2237,15 @@ static int tipc_sk_show(struct tipc_sock *tsk, char *buf,
struct sk_buff *tipc_sk_socks_show(void) struct sk_buff *tipc_sk_socks_show(void)
{ {
const struct bucket_table *tbl;
struct rhash_head *pos;
struct sk_buff *buf; struct sk_buff *buf;
struct tlv_desc *rep_tlv; struct tlv_desc *rep_tlv;
char *pb; char *pb;
int pb_len; int pb_len;
struct tipc_sock *tsk; struct tipc_sock *tsk;
int str_len = 0; int str_len = 0;
u32 ref = 0; int i;
buf = tipc_cfg_reply_alloc(TLV_SPACE(ULTRA_STRING_MAX_LEN)); buf = tipc_cfg_reply_alloc(TLV_SPACE(ULTRA_STRING_MAX_LEN));
if (!buf) if (!buf)
...@@ -2239,14 +2254,18 @@ struct sk_buff *tipc_sk_socks_show(void) ...@@ -2239,14 +2254,18 @@ struct sk_buff *tipc_sk_socks_show(void)
pb = TLV_DATA(rep_tlv); pb = TLV_DATA(rep_tlv);
pb_len = ULTRA_STRING_MAX_LEN; pb_len = ULTRA_STRING_MAX_LEN;
tsk = tipc_sk_get_next(&ref); rcu_read_lock();
for (; tsk; tsk = tipc_sk_get_next(&ref)) { tbl = rht_dereference_rcu((&tipc_sk_rht)->tbl, &tipc_sk_rht);
lock_sock(&tsk->sk); for (i = 0; i < tbl->size; i++) {
rht_for_each_entry_rcu(tsk, pos, tbl, i, node) {
spin_lock_bh(&tsk->sk.sk_lock.slock);
str_len += tipc_sk_show(tsk, pb + str_len, str_len += tipc_sk_show(tsk, pb + str_len,
pb_len - str_len, 0); pb_len - str_len, 0);
release_sock(&tsk->sk); spin_unlock_bh(&tsk->sk.sk_lock.slock);
tipc_sk_put(tsk); }
} }
rcu_read_unlock();
str_len += 1; /* for "\0" */ str_len += 1; /* for "\0" */
skb_put(buf, TLV_SPACE(str_len)); skb_put(buf, TLV_SPACE(str_len));
TLV_SET(rep_tlv, TIPC_TLV_ULTRA_STRING, NULL, str_len); TLV_SET(rep_tlv, TIPC_TLV_ULTRA_STRING, NULL, str_len);
...@@ -2259,255 +2278,91 @@ struct sk_buff *tipc_sk_socks_show(void) ...@@ -2259,255 +2278,91 @@ struct sk_buff *tipc_sk_socks_show(void)
*/ */
void tipc_sk_reinit(void) void tipc_sk_reinit(void)
{ {
const struct bucket_table *tbl;
struct rhash_head *pos;
struct tipc_sock *tsk;
struct tipc_msg *msg; struct tipc_msg *msg;
u32 ref = 0; int i;
struct tipc_sock *tsk = tipc_sk_get_next(&ref);
for (; tsk; tsk = tipc_sk_get_next(&ref)) { rcu_read_lock();
lock_sock(&tsk->sk); tbl = rht_dereference_rcu((&tipc_sk_rht)->tbl, &tipc_sk_rht);
for (i = 0; i < tbl->size; i++) {
rht_for_each_entry_rcu(tsk, pos, tbl, i, node) {
spin_lock_bh(&tsk->sk.sk_lock.slock);
msg = &tsk->phdr; msg = &tsk->phdr;
msg_set_prevnode(msg, tipc_own_addr); msg_set_prevnode(msg, tipc_own_addr);
msg_set_orignode(msg, tipc_own_addr); msg_set_orignode(msg, tipc_own_addr);
release_sock(&tsk->sk); spin_unlock_bh(&tsk->sk.sk_lock.slock);
tipc_sk_put(tsk); }
} }
rcu_read_unlock();
} }
/** static struct tipc_sock *tipc_sk_lookup(u32 portid)
* struct reference - TIPC socket reference entry
* @tsk: pointer to socket associated with reference entry
* @ref: reference value for socket (combines instance & array index info)
*/
struct reference {
struct tipc_sock *tsk;
u32 ref;
};
/**
* struct tipc_ref_table - table of TIPC socket reference entries
* @entries: pointer to array of reference entries
* @capacity: array index of first unusable entry
* @init_point: array index of first uninitialized entry
* @first_free: array index of first unused socket reference entry
* @last_free: array index of last unused socket reference entry
* @index_mask: bitmask for array index portion of reference values
* @start_mask: initial value for instance value portion of reference values
*/
struct ref_table {
struct reference *entries;
u32 capacity;
u32 init_point;
u32 first_free;
u32 last_free;
u32 index_mask;
u32 start_mask;
};
/* Socket reference table consists of 2**N entries.
*
* State Socket ptr Reference
* ----- ---------- ---------
* In use non-NULL XXXX|own index
* (XXXX changes each time entry is acquired)
* Free NULL YYYY|next free index
* (YYYY is one more than last used XXXX)
* Uninitialized NULL 0
*
* Entry 0 is not used; this allows index 0 to denote the end of the free list.
*
* Note that a reference value of 0 does not necessarily indicate that an
* entry is uninitialized, since the last entry in the free list could also
* have a reference value of 0 (although this is unlikely).
*/
static struct ref_table tipc_ref_table;
static DEFINE_RWLOCK(ref_table_lock);
/**
* tipc_ref_table_init - create reference table for sockets
*/
int tipc_sk_ref_table_init(u32 req_sz, u32 start)
{ {
struct reference *table; struct tipc_sock *tsk;
u32 actual_sz;
/* account for unused entry, then round up size to a power of 2 */
req_sz++;
for (actual_sz = 16; actual_sz < req_sz; actual_sz <<= 1) {
/* do nothing */
};
/* allocate table & mark all entries as uninitialized */
table = vzalloc(actual_sz * sizeof(struct reference));
if (table == NULL)
return -ENOMEM;
tipc_ref_table.entries = table;
tipc_ref_table.capacity = req_sz;
tipc_ref_table.init_point = 1;
tipc_ref_table.first_free = 0;
tipc_ref_table.last_free = 0;
tipc_ref_table.index_mask = actual_sz - 1;
tipc_ref_table.start_mask = start & ~tipc_ref_table.index_mask;
return 0; rcu_read_lock();
} tsk = rhashtable_lookup(&tipc_sk_rht, &portid);
if (tsk)
sock_hold(&tsk->sk);
rcu_read_unlock();
/** return tsk;
* tipc_ref_table_stop - destroy reference table for sockets
*/
void tipc_sk_ref_table_stop(void)
{
if (!tipc_ref_table.entries)
return;
vfree(tipc_ref_table.entries);
tipc_ref_table.entries = NULL;
} }
/* tipc_ref_acquire - create reference to a socket static int tipc_sk_insert(struct tipc_sock *tsk)
*
* Register an socket pointer in the reference table.
* Returns a unique reference value that is used from then on to retrieve the
* socket pointer, or to determine if the socket has been deregistered.
*/
u32 tipc_sk_ref_acquire(struct tipc_sock *tsk)
{ {
u32 index; u32 remaining = (TIPC_MAX_PORT - TIPC_MIN_PORT) + 1;
u32 index_mask; u32 portid = prandom_u32() % remaining + TIPC_MIN_PORT;
u32 next_plus_upper;
u32 ref = 0;
struct reference *entry;
if (unlikely(!tsk)) { while (remaining--) {
pr_err("Attempt to acquire ref. to non-existent obj\n"); portid++;
return 0; if ((portid < TIPC_MIN_PORT) || (portid > TIPC_MAX_PORT))
} portid = TIPC_MIN_PORT;
if (unlikely(!tipc_ref_table.entries)) { tsk->portid = portid;
pr_err("Ref. table not found in acquisition attempt\n"); sock_hold(&tsk->sk);
if (rhashtable_lookup_insert(&tipc_sk_rht, &tsk->node))
return 0; return 0;
sock_put(&tsk->sk);
} }
/* Take a free entry, if available; otherwise initialize a new one */ return -1;
write_lock_bh(&ref_table_lock);
index = tipc_ref_table.first_free;
entry = &tipc_ref_table.entries[index];
if (likely(index)) {
index = tipc_ref_table.first_free;
entry = &tipc_ref_table.entries[index];
index_mask = tipc_ref_table.index_mask;
next_plus_upper = entry->ref;
tipc_ref_table.first_free = next_plus_upper & index_mask;
ref = (next_plus_upper & ~index_mask) + index;
entry->tsk = tsk;
} else if (tipc_ref_table.init_point < tipc_ref_table.capacity) {
index = tipc_ref_table.init_point++;
entry = &tipc_ref_table.entries[index];
ref = tipc_ref_table.start_mask + index;
}
if (ref) {
entry->ref = ref;
entry->tsk = tsk;
}
write_unlock_bh(&ref_table_lock);
return ref;
} }
/* tipc_sk_ref_discard - invalidate reference to an socket static void tipc_sk_remove(struct tipc_sock *tsk)
*
* Disallow future references to an socket and free up the entry for re-use.
*/
void tipc_sk_ref_discard(u32 ref)
{ {
struct reference *entry; struct sock *sk = &tsk->sk;
u32 index;
u32 index_mask;
if (unlikely(!tipc_ref_table.entries)) {
pr_err("Ref. table not found during discard attempt\n");
return;
}
index_mask = tipc_ref_table.index_mask;
index = ref & index_mask;
entry = &tipc_ref_table.entries[index];
write_lock_bh(&ref_table_lock);
if (unlikely(!entry->tsk)) { if (rhashtable_remove(&tipc_sk_rht, &tsk->node)) {
pr_err("Attempt to discard ref. to non-existent socket\n"); WARN_ON(atomic_read(&sk->sk_refcnt) == 1);
goto exit; __sock_put(sk);
} }
if (unlikely(entry->ref != ref)) {
pr_err("Attempt to discard non-existent reference\n");
goto exit;
}
/* Mark entry as unused; increment instance part of entry's
* reference to invalidate any subsequent references
*/
entry->tsk = NULL;
entry->ref = (ref & ~index_mask) + (index_mask + 1);
/* Append entry to free entry list */
if (unlikely(tipc_ref_table.first_free == 0))
tipc_ref_table.first_free = index;
else
tipc_ref_table.entries[tipc_ref_table.last_free].ref |= index;
tipc_ref_table.last_free = index;
exit:
write_unlock_bh(&ref_table_lock);
} }
/* tipc_sk_get - find referenced socket and return pointer to it int tipc_sk_rht_init(void)
*/
struct tipc_sock *tipc_sk_get(u32 ref)
{ {
struct reference *entry; struct rhashtable_params rht_params = {
struct tipc_sock *tsk; .nelem_hint = 192,
.head_offset = offsetof(struct tipc_sock, node),
.key_offset = offsetof(struct tipc_sock, portid),
.key_len = sizeof(u32), /* portid */
.hashfn = jhash,
.max_shift = 20, /* 1M */
.min_shift = 8, /* 256 */
.grow_decision = rht_grow_above_75,
.shrink_decision = rht_shrink_below_30,
};
if (unlikely(!tipc_ref_table.entries)) return rhashtable_init(&tipc_sk_rht, &rht_params);
return NULL;
read_lock_bh(&ref_table_lock);
entry = &tipc_ref_table.entries[ref & tipc_ref_table.index_mask];
tsk = entry->tsk;
if (likely(tsk && (entry->ref == ref)))
sock_hold(&tsk->sk);
else
tsk = NULL;
read_unlock_bh(&ref_table_lock);
return tsk;
} }
/* tipc_sk_get_next - lock & return next socket after referenced one void tipc_sk_rht_destroy(void)
*/
struct tipc_sock *tipc_sk_get_next(u32 *ref)
{ {
struct reference *entry; /* Wait for socket readers to complete */
struct tipc_sock *tsk = NULL; synchronize_net();
uint index = *ref & tipc_ref_table.index_mask;
read_lock_bh(&ref_table_lock); rhashtable_destroy(&tipc_sk_rht);
while (++index < tipc_ref_table.capacity) {
entry = &tipc_ref_table.entries[index];
if (!entry->tsk)
continue;
tsk = entry->tsk;
sock_hold(&tsk->sk);
*ref = entry->ref;
break;
}
read_unlock_bh(&ref_table_lock);
return tsk;
}
static void tipc_sk_put(struct tipc_sock *tsk)
{
sock_put(&tsk->sk);
} }
/** /**
...@@ -2829,7 +2684,7 @@ static int __tipc_nl_add_sk(struct sk_buff *skb, struct netlink_callback *cb, ...@@ -2829,7 +2684,7 @@ static int __tipc_nl_add_sk(struct sk_buff *skb, struct netlink_callback *cb,
attrs = nla_nest_start(skb, TIPC_NLA_SOCK); attrs = nla_nest_start(skb, TIPC_NLA_SOCK);
if (!attrs) if (!attrs)
goto genlmsg_cancel; goto genlmsg_cancel;
if (nla_put_u32(skb, TIPC_NLA_SOCK_REF, tsk->ref)) if (nla_put_u32(skb, TIPC_NLA_SOCK_REF, tsk->portid))
goto attr_msg_cancel; goto attr_msg_cancel;
if (nla_put_u32(skb, TIPC_NLA_SOCK_ADDR, tipc_own_addr)) if (nla_put_u32(skb, TIPC_NLA_SOCK_ADDR, tipc_own_addr))
goto attr_msg_cancel; goto attr_msg_cancel;
...@@ -2859,22 +2714,29 @@ int tipc_nl_sk_dump(struct sk_buff *skb, struct netlink_callback *cb) ...@@ -2859,22 +2714,29 @@ int tipc_nl_sk_dump(struct sk_buff *skb, struct netlink_callback *cb)
{ {
int err; int err;
struct tipc_sock *tsk; struct tipc_sock *tsk;
u32 prev_ref = cb->args[0]; const struct bucket_table *tbl;
u32 ref = prev_ref; struct rhash_head *pos;
u32 prev_portid = cb->args[0];
u32 portid = prev_portid;
int i;
tsk = tipc_sk_get_next(&ref); rcu_read_lock();
for (; tsk; tsk = tipc_sk_get_next(&ref)) { tbl = rht_dereference_rcu((&tipc_sk_rht)->tbl, &tipc_sk_rht);
lock_sock(&tsk->sk); for (i = 0; i < tbl->size; i++) {
rht_for_each_entry_rcu(tsk, pos, tbl, i, node) {
spin_lock_bh(&tsk->sk.sk_lock.slock);
portid = tsk->portid;
err = __tipc_nl_add_sk(skb, cb, tsk); err = __tipc_nl_add_sk(skb, cb, tsk);
release_sock(&tsk->sk); spin_unlock_bh(&tsk->sk.sk_lock.slock);
tipc_sk_put(tsk);
if (err) if (err)
break; break;
prev_ref = ref; prev_portid = portid;
} }
}
rcu_read_unlock();
cb->args[0] = prev_ref; cb->args[0] = prev_portid;
return skb->len; return skb->len;
} }
...@@ -2962,12 +2824,12 @@ static int __tipc_nl_list_sk_publ(struct sk_buff *skb, ...@@ -2962,12 +2824,12 @@ static int __tipc_nl_list_sk_publ(struct sk_buff *skb,
int tipc_nl_publ_dump(struct sk_buff *skb, struct netlink_callback *cb) int tipc_nl_publ_dump(struct sk_buff *skb, struct netlink_callback *cb)
{ {
int err; int err;
u32 tsk_ref = cb->args[0]; u32 tsk_portid = cb->args[0];
u32 last_publ = cb->args[1]; u32 last_publ = cb->args[1];
u32 done = cb->args[2]; u32 done = cb->args[2];
struct tipc_sock *tsk; struct tipc_sock *tsk;
if (!tsk_ref) { if (!tsk_portid) {
struct nlattr **attrs; struct nlattr **attrs;
struct nlattr *sock[TIPC_NLA_SOCK_MAX + 1]; struct nlattr *sock[TIPC_NLA_SOCK_MAX + 1];
...@@ -2984,13 +2846,13 @@ int tipc_nl_publ_dump(struct sk_buff *skb, struct netlink_callback *cb) ...@@ -2984,13 +2846,13 @@ int tipc_nl_publ_dump(struct sk_buff *skb, struct netlink_callback *cb)
if (!sock[TIPC_NLA_SOCK_REF]) if (!sock[TIPC_NLA_SOCK_REF])
return -EINVAL; return -EINVAL;
tsk_ref = nla_get_u32(sock[TIPC_NLA_SOCK_REF]); tsk_portid = nla_get_u32(sock[TIPC_NLA_SOCK_REF]);
} }
if (done) if (done)
return 0; return 0;
tsk = tipc_sk_get(tsk_ref); tsk = tipc_sk_lookup(tsk_portid);
if (!tsk) if (!tsk)
return -EINVAL; return -EINVAL;
...@@ -2999,9 +2861,9 @@ int tipc_nl_publ_dump(struct sk_buff *skb, struct netlink_callback *cb) ...@@ -2999,9 +2861,9 @@ int tipc_nl_publ_dump(struct sk_buff *skb, struct netlink_callback *cb)
if (!err) if (!err)
done = 1; done = 1;
release_sock(&tsk->sk); release_sock(&tsk->sk);
tipc_sk_put(tsk); sock_put(&tsk->sk);
cb->args[0] = tsk_ref; cb->args[0] = tsk_portid;
cb->args[1] = last_publ; cb->args[1] = last_publ;
cb->args[2] = done; cb->args[2] = done;
......
net/tipc/socket.h
View file @ 07f6c4bc
...@@ -46,8 +46,8 @@ int tipc_sk_rcv(struct sk_buff *buf); ...@@ -46,8 +46,8 @@ int tipc_sk_rcv(struct sk_buff *buf);
struct sk_buff *tipc_sk_socks_show(void); struct sk_buff *tipc_sk_socks_show(void);
void tipc_sk_mcast_rcv(struct sk_buff *buf); void tipc_sk_mcast_rcv(struct sk_buff *buf);
void tipc_sk_reinit(void); void tipc_sk_reinit(void);
int tipc_sk_ref_table_init(u32 requested_size, u32 start); int tipc_sk_rht_init(void);
void tipc_sk_ref_table_stop(void); void tipc_sk_rht_destroy(void);
int tipc_nl_sk_dump(struct sk_buff *skb, struct netlink_callback *cb); int tipc_nl_sk_dump(struct sk_buff *skb, struct netlink_callback *cb);
int tipc_nl_publ_dump(struct sk_buff *skb, struct netlink_callback *cb); int tipc_nl_publ_dump(struct sk_buff *skb, struct netlink_callback *cb);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7