AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-04-14 18:37:32 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

tipc: make name table allocated dynamically

Browse Source 
Name table locking policy is going to be adjusted from read-write
lock protection to RCU lock protection in the future commits. But
its essential precondition is to convert the allocation way of name
table from static to dynamic mode.

Signed-off-by: Ying Xue <ying.xue@windriver.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Tested-by: Erik Hugne <erik.hugne@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ying Xue 2014-12-02 15:00:24 +08:00 committed by David S. Miller
parent 1b61e70ad1
commit 993bfe5daf
3 changed files with 55 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
net/tipc/name_distr.c
View File

@ -38,34 +38,6 @@
#include "link.h" #include "link.h"
#include "name_distr.h" #include "name_distr.h"
/**
* struct publ_list - list of publications made by this node
* @list: circular list of publications
*/
struct publ_list {
struct list_head list;
};
static struct publ_list publ_zone = {
.list = LIST_HEAD_INIT(publ_zone.list),
};
static struct publ_list publ_cluster = {
.list = LIST_HEAD_INIT(publ_cluster.list),
};
static struct publ_list publ_node = {
.list = LIST_HEAD_INIT(publ_node.list),
};
static struct publ_list *publ_lists[] = {
NULL,
&publ_zone, /* publ_lists[TIPC_ZONE_SCOPE] */
&publ_cluster, /* publ_lists[TIPC_CLUSTER_SCOPE] */
&publ_node /* publ_lists[TIPC_NODE_SCOPE] */
};
int sysctl_tipc_named_timeout __read_mostly = 2000; int sysctl_tipc_named_timeout __read_mostly = 2000;
/** /**
@ -141,7 +113,8 @@ struct sk_buff *tipc_named_publish(struct publication *publ)
struct sk_buff *buf; struct sk_buff *buf;
struct distr_item *item; struct distr_item *item;
list_add_tail(&publ->local_list, &publ_lists[publ->scope]->list); list_add_tail(&publ->local_list,
&tipc_nametbl->publ_list[publ->scope]);
if (publ->scope == TIPC_NODE_SCOPE) if (publ->scope == TIPC_NODE_SCOPE)
return NULL; return NULL;
@ -188,7 +161,7 @@ struct sk_buff *tipc_named_withdraw(struct publication *publ)
* @pls: linked list of publication items to be packed into buffer chain * @pls: linked list of publication items to be packed into buffer chain
*/ */
static void named_distribute(struct sk_buff_head *list, u32 dnode, static void named_distribute(struct sk_buff_head *list, u32 dnode,
struct publ_list *pls) struct list_head *pls)
{ {
struct publication *publ; struct publication *publ;
struct sk_buff *skb = NULL; struct sk_buff *skb = NULL;
@ -196,7 +169,7 @@ static void named_distribute(struct sk_buff_head *list, u32 dnode,
uint msg_dsz = (tipc_node_get_mtu(dnode, 0) / ITEM_SIZE) * ITEM_SIZE; uint msg_dsz = (tipc_node_get_mtu(dnode, 0) / ITEM_SIZE) * ITEM_SIZE;
uint msg_rem = msg_dsz; uint msg_rem = msg_dsz;
list_for_each_entry(publ, &pls->list, local_list) { list_for_each_entry(publ, pls, local_list) {
/* Prepare next buffer: */ /* Prepare next buffer: */
if (!skb) { if (!skb) {
skb = named_prepare_buf(PUBLICATION, msg_rem, dnode); skb = named_prepare_buf(PUBLICATION, msg_rem, dnode);
@ -236,8 +209,10 @@ void tipc_named_node_up(u32 dnode)
__skb_queue_head_init(&head); __skb_queue_head_init(&head);
read_lock_bh(&tipc_nametbl_lock); read_lock_bh(&tipc_nametbl_lock);
named_distribute(&head, dnode, &publ_cluster); named_distribute(&head, dnode,
named_distribute(&head, dnode, &publ_zone); &tipc_nametbl->publ_list[TIPC_CLUSTER_SCOPE]);
named_distribute(&head, dnode,
&tipc_nametbl->publ_list[TIPC_ZONE_SCOPE]);
read_unlock_bh(&tipc_nametbl_lock); read_unlock_bh(&tipc_nametbl_lock);
tipc_link_xmit(&head, dnode, dnode); tipc_link_xmit(&head, dnode, dnode);
@ -427,7 +402,8 @@ void tipc_named_reinit(void)
write_lock_bh(&tipc_nametbl_lock); write_lock_bh(&tipc_nametbl_lock);
for (scope = TIPC_ZONE_SCOPE; scope <= TIPC_NODE_SCOPE; scope++) for (scope = TIPC_ZONE_SCOPE; scope <= TIPC_NODE_SCOPE; scope++)
list_for_each_entry(publ, &publ_lists[scope]->list, local_list) list_for_each_entry(publ, &tipc_nametbl->publ_list[scope],
local_list)
publ->node = tipc_own_addr; publ->node = tipc_own_addr;
write_unlock_bh(&tipc_nametbl_lock); write_unlock_bh(&tipc_nametbl_lock);

60
net/tipc/name_table.c
View File

@ -2,7 +2,7 @@
* net/tipc/name_table.c: TIPC name table code * net/tipc/name_table.c: TIPC name table code
* *
* Copyright (c) 2000-2006, 2014, Ericsson AB * Copyright (c) 2000-2006, 2014, Ericsson AB
* Copyright (c) 2004-2008, 2010-2011, Wind River Systems * Copyright (c) 2004-2008, 2010-2014, Wind River Systems
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -103,18 +103,7 @@ struct name_seq {
spinlock_t lock; spinlock_t lock;
}; };
/** struct name_table *tipc_nametbl;
* struct name_table - table containing all existing port name publications
* @types: pointer to fixed-sized array of name sequence lists,
* accessed via hashing on 'type'; name sequence lists are *not* sorted
* @local_publ_count: number of publications issued by this node
*/
struct name_table {
struct hlist_head *types;
u32 local_publ_count;
};
static struct name_table table;
DEFINE_RWLOCK(tipc_nametbl_lock); DEFINE_RWLOCK(tipc_nametbl_lock);
static int hash(int x) static int hash(int x)
@ -475,7 +464,7 @@ static struct name_seq *nametbl_find_seq(u32 type)
struct hlist_head *seq_head; struct hlist_head *seq_head;
struct name_seq *ns; struct name_seq *ns;
seq_head = &table.types[hash(type)]; seq_head = &tipc_nametbl->seq_hlist[hash(type)];
hlist_for_each_entry(ns, seq_head, ns_list) { hlist_for_each_entry(ns, seq_head, ns_list) {
if (ns->type == type) if (ns->type == type)
return ns; return ns;
@ -488,6 +477,7 @@ struct publication *tipc_nametbl_insert_publ(u32 type, u32 lower, u32 upper,
u32 scope, u32 node, u32 port, u32 key) u32 scope, u32 node, u32 port, u32 key)
{ {
struct name_seq *seq = nametbl_find_seq(type); struct name_seq *seq = nametbl_find_seq(type);
int index = hash(type);
if ((scope < TIPC_ZONE_SCOPE) || (scope > TIPC_NODE_SCOPE) || if ((scope < TIPC_ZONE_SCOPE) || (scope > TIPC_NODE_SCOPE) ||
(lower > upper)) { (lower > upper)) {
@ -497,7 +487,8 @@ struct publication *tipc_nametbl_insert_publ(u32 type, u32 lower, u32 upper,
} }
if (!seq) if (!seq)
seq = tipc_nameseq_create(type, &table.types[hash(type)]); seq = tipc_nameseq_create(type,
&tipc_nametbl->seq_hlist[index]);
if (!seq) if (!seq)
return NULL; return NULL;
@ -667,7 +658,7 @@ struct publication *tipc_nametbl_publish(u32 type, u32 lower, u32 upper,
struct publication *publ; struct publication *publ;
struct sk_buff *buf = NULL; struct sk_buff *buf = NULL;
if (table.local_publ_count >= TIPC_MAX_PUBLICATIONS) { if (tipc_nametbl->local_publ_count >= TIPC_MAX_PUBLICATIONS) {
pr_warn("Publication failed, local publication limit reached (%u)\n", pr_warn("Publication failed, local publication limit reached (%u)\n",
TIPC_MAX_PUBLICATIONS); TIPC_MAX_PUBLICATIONS);
return NULL; return NULL;
@ -677,7 +668,7 @@ struct publication *tipc_nametbl_publish(u32 type, u32 lower, u32 upper,
publ = tipc_nametbl_insert_publ(type, lower, upper, scope, publ = tipc_nametbl_insert_publ(type, lower, upper, scope,
tipc_own_addr, port_ref, key); tipc_own_addr, port_ref, key);
if (likely(publ)) { if (likely(publ)) {
table.local_publ_count++; tipc_nametbl->local_publ_count++;
buf = tipc_named_publish(publ); buf = tipc_named_publish(publ);
/* Any pending external events? */ /* Any pending external events? */
tipc_named_process_backlog(); tipc_named_process_backlog();
@ -700,7 +691,7 @@ int tipc_nametbl_withdraw(u32 type, u32 lower, u32 ref, u32 key)
write_lock_bh(&tipc_nametbl_lock); write_lock_bh(&tipc_nametbl_lock);
publ = tipc_nametbl_remove_publ(type, lower, tipc_own_addr, ref, key); publ = tipc_nametbl_remove_publ(type, lower, tipc_own_addr, ref, key);
if (likely(publ)) { if (likely(publ)) {
table.local_publ_count--; tipc_nametbl->local_publ_count--;
buf = tipc_named_withdraw(publ); buf = tipc_named_withdraw(publ);
/* Any pending external events? */ /* Any pending external events? */
tipc_named_process_backlog(); tipc_named_process_backlog();
@ -725,12 +716,14 @@ int tipc_nametbl_withdraw(u32 type, u32 lower, u32 ref, u32 key)
void tipc_nametbl_subscribe(struct tipc_subscription *s) void tipc_nametbl_subscribe(struct tipc_subscription *s)
{ {
u32 type = s->seq.type; u32 type = s->seq.type;
int index = hash(type);
struct name_seq *seq; struct name_seq *seq;
write_lock_bh(&tipc_nametbl_lock); write_lock_bh(&tipc_nametbl_lock);
seq = nametbl_find_seq(type); seq = nametbl_find_seq(type);
if (!seq) if (!seq)
seq = tipc_nameseq_create(type, &table.types[hash(type)]); seq = tipc_nameseq_create(type,
&tipc_nametbl->seq_hlist[index]);
if (seq) { if (seq) {
spin_lock_bh(&seq->lock); spin_lock_bh(&seq->lock);
tipc_nameseq_subscribe(seq, s); tipc_nameseq_subscribe(seq, s);
@ -882,7 +875,7 @@ static int nametbl_list(char *buf, int len, u32 depth_info,
lowbound = 0; lowbound = 0;
upbound = ~0; upbound = ~0;
for (i = 0; i < TIPC_NAMETBL_SIZE; i++) { for (i = 0; i < TIPC_NAMETBL_SIZE; i++) {
seq_head = &table.types[i]; seq_head = &tipc_nametbl->seq_hlist[i];
hlist_for_each_entry(seq, seq_head, ns_list) { hlist_for_each_entry(seq, seq_head, ns_list) {
ret += nameseq_list(seq, buf + ret, len - ret, ret += nameseq_list(seq, buf + ret, len - ret,
depth, seq->type, depth, seq->type,
@ -898,7 +891,7 @@ static int nametbl_list(char *buf, int len, u32 depth_info,
} }
ret += nametbl_header(buf + ret, len - ret, depth); ret += nametbl_header(buf + ret, len - ret, depth);
i = hash(type); i = hash(type);
seq_head = &table.types[i]; seq_head = &tipc_nametbl->seq_hlist[i];
hlist_for_each_entry(seq, seq_head, ns_list) { hlist_for_each_entry(seq, seq_head, ns_list) {
if (seq->type == type) { if (seq->type == type) {
ret += nameseq_list(seq, buf + ret, len - ret, ret += nameseq_list(seq, buf + ret, len - ret,
@ -945,12 +938,18 @@ struct sk_buff *tipc_nametbl_get(const void *req_tlv_area, int req_tlv_space)
int tipc_nametbl_init(void) int tipc_nametbl_init(void)
{ {
table.types = kcalloc(TIPC_NAMETBL_SIZE, sizeof(struct hlist_head), int i;
GFP_ATOMIC);
if (!table.types) tipc_nametbl = kzalloc(sizeof(*tipc_nametbl), GFP_ATOMIC);
if (!tipc_nametbl)
return -ENOMEM; return -ENOMEM;
table.local_publ_count = 0; for (i = 0; i < TIPC_NAMETBL_SIZE; i++)
INIT_HLIST_HEAD(&tipc_nametbl->seq_hlist[i]);
INIT_LIST_HEAD(&tipc_nametbl->publ_list[TIPC_ZONE_SCOPE]);
INIT_LIST_HEAD(&tipc_nametbl->publ_list[TIPC_CLUSTER_SCOPE]);
INIT_LIST_HEAD(&tipc_nametbl->publ_list[TIPC_NODE_SCOPE]);
return 0; return 0;
} }
@ -990,16 +989,17 @@ void tipc_nametbl_stop(void)
*/ */
write_lock_bh(&tipc_nametbl_lock); write_lock_bh(&tipc_nametbl_lock);
for (i = 0; i < TIPC_NAMETBL_SIZE; i++) { for (i = 0; i < TIPC_NAMETBL_SIZE; i++) {
if (hlist_empty(&table.types[i])) if (hlist_empty(&tipc_nametbl->seq_hlist[i]))
continue; continue;
seq_head = &table.types[i]; seq_head = &tipc_nametbl->seq_hlist[i];
hlist_for_each_entry_safe(seq, safe, seq_head, ns_list) { hlist_for_each_entry_safe(seq, safe, seq_head, ns_list) {
tipc_purge_publications(seq); tipc_purge_publications(seq);
} }
} }
kfree(table.types);
table.types = NULL;
write_unlock_bh(&tipc_nametbl_lock); write_unlock_bh(&tipc_nametbl_lock);
kfree(tipc_nametbl);
} }
static int __tipc_nl_add_nametable_publ(struct tipc_nl_msg *msg, static int __tipc_nl_add_nametable_publ(struct tipc_nl_msg *msg,
@ -1113,7 +1113,7 @@ static int __tipc_nl_seq_list(struct tipc_nl_msg *msg, u32 *last_type,
i = 0; i = 0;
for (; i < TIPC_NAMETBL_SIZE; i++) { for (; i < TIPC_NAMETBL_SIZE; i++) {
seq_head = &table.types[i]; seq_head = &tipc_nametbl->seq_hlist[i];
if (*last_type) { if (*last_type) {
seq = nametbl_find_seq(*last_type); seq = nametbl_find_seq(*last_type);

16
net/tipc/name_table.h
View File

@ -43,7 +43,9 @@ struct tipc_port_list;
/* /*
* TIPC name types reserved for internal TIPC use (both current and planned) * TIPC name types reserved for internal TIPC use (both current and planned)
*/ */
#define TIPC_ZM_SRV 3 /* zone master service name type */ #define TIPC_ZM_SRV 3 /* zone master service name type */
#define TIPC_PUBL_SCOPE_NUM (TIPC_NODE_SCOPE + 1)
#define TIPC_NAMETBL_SIZE 1024 /* must be a power of 2 */
/** /**
* struct publication - info about a published (name or) name sequence * struct publication - info about a published (name or) name sequence
@ -79,8 +81,20 @@ struct publication {
struct list_head zone_list; struct list_head zone_list;
}; };
/**
* struct name_table - table containing all existing port name publications
* @seq_hlist: name sequence hash lists
* @publ_list: pulication lists
* @local_publ_count: number of publications issued by this node
*/
struct name_table {
struct hlist_head seq_hlist[TIPC_NAMETBL_SIZE];
struct list_head publ_list[TIPC_PUBL_SCOPE_NUM];
u32 local_publ_count;
};
extern rwlock_t tipc_nametbl_lock; extern rwlock_t tipc_nametbl_lock;
extern struct name_table *tipc_nametbl;
int tipc_nl_name_table_dump(struct sk_buff *skb, struct netlink_callback *cb); int tipc_nl_name_table_dump(struct sk_buff *skb, struct netlink_callback *cb);