2006-01-03 01:04:38 +07:00
|
|
|
/*
|
|
|
|
* net/tipc/name_table.c: TIPC name table code
|
2007-02-09 21:25:21 +07:00
|
|
|
*
|
2014-11-20 16:29:20 +07:00
|
|
|
* Copyright (c) 2000-2006, 2014, Ericsson AB
|
2011-05-30 21:48:48 +07:00
|
|
|
* Copyright (c) 2004-2008, 2010-2011, Wind River Systems
|
2006-01-03 01:04:38 +07:00
|
|
|
* All rights reserved.
|
|
|
|
*
|
2006-01-11 19:30:43 +07:00
|
|
|
* Redistribution and use in source and binary forms, with or without
|
2006-01-03 01:04:38 +07:00
|
|
|
* modification, are permitted provided that the following conditions are met:
|
|
|
|
*
|
2006-01-11 19:30:43 +07:00
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
* 3. Neither the names of the copyright holders nor the names of its
|
|
|
|
* contributors may be used to endorse or promote products derived from
|
|
|
|
* this software without specific prior written permission.
|
2006-01-03 01:04:38 +07:00
|
|
|
*
|
2006-01-11 19:30:43 +07:00
|
|
|
* Alternatively, this software may be distributed under the terms of the
|
|
|
|
* GNU General Public License ("GPL") version 2 as published by the Free
|
|
|
|
* Software Foundation.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
|
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
|
|
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
2006-01-03 01:04:38 +07:00
|
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "core.h"
|
|
|
|
#include "config.h"
|
|
|
|
#include "name_table.h"
|
|
|
|
#include "name_distr.h"
|
|
|
|
#include "subscr.h"
|
|
|
|
|
2012-08-16 19:09:11 +07:00
|
|
|
#define TIPC_NAMETBL_SIZE 1024 /* must be a power of 2 */
|
2006-01-03 01:04:38 +07:00
|
|
|
|
2014-11-20 16:29:20 +07:00
|
|
|
static const struct nla_policy
|
|
|
|
tipc_nl_name_table_policy[TIPC_NLA_NAME_TABLE_MAX + 1] = {
|
|
|
|
[TIPC_NLA_NAME_TABLE_UNSPEC] = { .type = NLA_UNSPEC },
|
|
|
|
[TIPC_NLA_NAME_TABLE_PUBL] = { .type = NLA_NESTED }
|
|
|
|
};
|
|
|
|
|
2006-01-03 01:04:38 +07:00
|
|
|
/**
|
2011-05-30 20:44:38 +07:00
|
|
|
* struct name_info - name sequence publication info
|
2008-07-15 12:45:33 +07:00
|
|
|
* @node_list: circular list of publications made by own node
|
|
|
|
* @cluster_list: circular list of publications made by own cluster
|
|
|
|
* @zone_list: circular list of publications made by own zone
|
|
|
|
* @node_list_size: number of entries in "node_list"
|
|
|
|
* @cluster_list_size: number of entries in "cluster_list"
|
|
|
|
* @zone_list_size: number of entries in "zone_list"
|
|
|
|
*
|
|
|
|
* Note: The zone list always contains at least one entry, since all
|
|
|
|
* publications of the associated name sequence belong to it.
|
|
|
|
* (The cluster and node lists may be empty.)
|
2006-01-03 01:04:38 +07:00
|
|
|
*/
|
2011-05-30 20:44:38 +07:00
|
|
|
struct name_info {
|
2011-05-30 21:48:48 +07:00
|
|
|
struct list_head node_list;
|
|
|
|
struct list_head cluster_list;
|
|
|
|
struct list_head zone_list;
|
2008-07-15 12:45:33 +07:00
|
|
|
u32 node_list_size;
|
|
|
|
u32 cluster_list_size;
|
|
|
|
u32 zone_list_size;
|
2006-01-03 01:04:38 +07:00
|
|
|
};
|
|
|
|
|
2011-05-30 20:44:38 +07:00
|
|
|
/**
|
|
|
|
* struct sub_seq - container for all published instances of a name sequence
|
|
|
|
* @lower: name sequence lower bound
|
|
|
|
* @upper: name sequence upper bound
|
|
|
|
* @info: pointer to name sequence publication info
|
|
|
|
*/
|
|
|
|
struct sub_seq {
|
|
|
|
u32 lower;
|
|
|
|
u32 upper;
|
|
|
|
struct name_info *info;
|
|
|
|
};
|
|
|
|
|
2007-02-09 21:25:21 +07:00
|
|
|
/**
|
2006-01-03 01:04:38 +07:00
|
|
|
* struct name_seq - container for all published instances of a name type
|
|
|
|
* @type: 32 bit 'type' value for name sequence
|
|
|
|
* @sseq: pointer to dynamically-sized array of sub-sequences of this 'type';
|
|
|
|
* sub-sequences are sorted in ascending order
|
|
|
|
* @alloc: number of sub-sequences currently in array
|
2006-06-26 13:51:37 +07:00
|
|
|
* @first_free: array index of first unused sub-sequence entry
|
2006-01-03 01:04:38 +07:00
|
|
|
* @ns_list: links to adjacent name sequences in hash chain
|
|
|
|
* @subscriptions: list of subscriptions for this 'type'
|
2008-06-05 07:38:22 +07:00
|
|
|
* @lock: spinlock controlling access to publication lists of all sub-sequences
|
2006-01-03 01:04:38 +07:00
|
|
|
*/
|
|
|
|
struct name_seq {
|
|
|
|
u32 type;
|
|
|
|
struct sub_seq *sseqs;
|
|
|
|
u32 alloc;
|
|
|
|
u32 first_free;
|
|
|
|
struct hlist_node ns_list;
|
|
|
|
struct list_head subscriptions;
|
|
|
|
spinlock_t lock;
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* struct name_table - table containing all existing port name publications
|
2007-02-09 21:25:21 +07:00
|
|
|
* @types: pointer to fixed-sized array of name sequence lists,
|
2006-01-03 01:04:38 +07:00
|
|
|
* 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;
|
|
|
|
};
|
|
|
|
|
2011-01-01 01:59:34 +07:00
|
|
|
static struct name_table table;
|
2006-06-27 16:53:55 +07:00
|
|
|
DEFINE_RWLOCK(tipc_nametbl_lock);
|
2006-01-03 01:04:38 +07:00
|
|
|
|
2006-03-21 13:37:04 +07:00
|
|
|
static int hash(int x)
|
2006-01-03 01:04:38 +07:00
|
|
|
{
|
2012-08-16 19:09:11 +07:00
|
|
|
return x & (TIPC_NAMETBL_SIZE - 1);
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* publ_create - create a publication structure
|
|
|
|
*/
|
2007-02-09 21:25:21 +07:00
|
|
|
static struct publication *publ_create(u32 type, u32 lower, u32 upper,
|
|
|
|
u32 scope, u32 node, u32 port_ref,
|
2006-01-03 01:04:38 +07:00
|
|
|
u32 key)
|
|
|
|
{
|
2006-07-22 04:51:30 +07:00
|
|
|
struct publication *publ = kzalloc(sizeof(*publ), GFP_ATOMIC);
|
2006-01-03 01:04:38 +07:00
|
|
|
if (publ == NULL) {
|
2012-06-29 11:16:37 +07:00
|
|
|
pr_warn("Publication creation failure, no memory\n");
|
2006-03-21 13:36:47 +07:00
|
|
|
return NULL;
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
publ->type = type;
|
|
|
|
publ->lower = lower;
|
|
|
|
publ->upper = upper;
|
|
|
|
publ->scope = scope;
|
|
|
|
publ->node = node;
|
|
|
|
publ->ref = port_ref;
|
|
|
|
publ->key = key;
|
|
|
|
INIT_LIST_HEAD(&publ->local_list);
|
|
|
|
INIT_LIST_HEAD(&publ->pport_list);
|
2014-11-26 10:41:45 +07:00
|
|
|
INIT_LIST_HEAD(&publ->nodesub_list);
|
2006-01-03 01:04:38 +07:00
|
|
|
return publ;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2006-01-18 06:38:21 +07:00
|
|
|
* tipc_subseq_alloc - allocate a specified number of sub-sequence structures
|
2006-01-03 01:04:38 +07:00
|
|
|
*/
|
2006-03-21 13:37:52 +07:00
|
|
|
static struct sub_seq *tipc_subseq_alloc(u32 cnt)
|
2006-01-03 01:04:38 +07:00
|
|
|
{
|
2013-12-12 08:36:39 +07:00
|
|
|
return kcalloc(cnt, sizeof(struct sub_seq), GFP_ATOMIC);
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2006-01-18 06:38:21 +07:00
|
|
|
* tipc_nameseq_create - create a name sequence structure for the specified 'type'
|
2007-02-09 21:25:21 +07:00
|
|
|
*
|
2006-01-03 01:04:38 +07:00
|
|
|
* Allocates a single sub-sequence structure and sets it to all 0's.
|
|
|
|
*/
|
2006-03-21 13:37:52 +07:00
|
|
|
static struct name_seq *tipc_nameseq_create(u32 type, struct hlist_head *seq_head)
|
2006-01-03 01:04:38 +07:00
|
|
|
{
|
2006-07-22 04:51:30 +07:00
|
|
|
struct name_seq *nseq = kzalloc(sizeof(*nseq), GFP_ATOMIC);
|
2006-01-18 06:38:21 +07:00
|
|
|
struct sub_seq *sseq = tipc_subseq_alloc(1);
|
2006-01-03 01:04:38 +07:00
|
|
|
|
|
|
|
if (!nseq || !sseq) {
|
2012-06-29 11:16:37 +07:00
|
|
|
pr_warn("Name sequence creation failed, no memory\n");
|
2006-01-03 01:04:38 +07:00
|
|
|
kfree(nseq);
|
|
|
|
kfree(sseq);
|
2006-03-21 13:36:47 +07:00
|
|
|
return NULL;
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
|
|
|
|
2006-06-27 16:53:55 +07:00
|
|
|
spin_lock_init(&nseq->lock);
|
2006-01-03 01:04:38 +07:00
|
|
|
nseq->type = type;
|
|
|
|
nseq->sseqs = sseq;
|
|
|
|
nseq->alloc = 1;
|
|
|
|
INIT_HLIST_NODE(&nseq->ns_list);
|
|
|
|
INIT_LIST_HEAD(&nseq->subscriptions);
|
|
|
|
hlist_add_head(&nseq->ns_list, seq_head);
|
|
|
|
return nseq;
|
|
|
|
}
|
|
|
|
|
2012-04-27 04:53:03 +07:00
|
|
|
/*
|
|
|
|
* nameseq_delete_empty - deletes a name sequence structure if now unused
|
|
|
|
*/
|
|
|
|
static void nameseq_delete_empty(struct name_seq *seq)
|
|
|
|
{
|
|
|
|
if (!seq->first_free && list_empty(&seq->subscriptions)) {
|
|
|
|
hlist_del_init(&seq->ns_list);
|
|
|
|
kfree(seq->sseqs);
|
|
|
|
kfree(seq);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-07-10 17:55:09 +07:00
|
|
|
/**
|
2006-01-03 01:04:38 +07:00
|
|
|
* nameseq_find_subseq - find sub-sequence (if any) matching a name instance
|
2007-02-09 21:25:21 +07:00
|
|
|
*
|
2006-01-03 01:04:38 +07:00
|
|
|
* Very time-critical, so binary searches through sub-sequence array.
|
|
|
|
*/
|
2006-03-21 13:37:04 +07:00
|
|
|
static struct sub_seq *nameseq_find_subseq(struct name_seq *nseq,
|
|
|
|
u32 instance)
|
2006-01-03 01:04:38 +07:00
|
|
|
{
|
|
|
|
struct sub_seq *sseqs = nseq->sseqs;
|
|
|
|
int low = 0;
|
|
|
|
int high = nseq->first_free - 1;
|
|
|
|
int mid;
|
|
|
|
|
|
|
|
while (low <= high) {
|
|
|
|
mid = (low + high) / 2;
|
|
|
|
if (instance < sseqs[mid].lower)
|
|
|
|
high = mid - 1;
|
|
|
|
else if (instance > sseqs[mid].upper)
|
|
|
|
low = mid + 1;
|
|
|
|
else
|
|
|
|
return &sseqs[mid];
|
|
|
|
}
|
2006-03-21 13:36:47 +07:00
|
|
|
return NULL;
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* nameseq_locate_subseq - determine position of name instance in sub-sequence
|
2007-02-09 21:25:21 +07:00
|
|
|
*
|
2006-01-03 01:04:38 +07:00
|
|
|
* Returns index in sub-sequence array of the entry that contains the specified
|
|
|
|
* instance value; if no entry contains that value, returns the position
|
|
|
|
* where a new entry for it would be inserted in the array.
|
|
|
|
*
|
|
|
|
* Note: Similar to binary search code for locating a sub-sequence.
|
|
|
|
*/
|
|
|
|
static u32 nameseq_locate_subseq(struct name_seq *nseq, u32 instance)
|
|
|
|
{
|
|
|
|
struct sub_seq *sseqs = nseq->sseqs;
|
|
|
|
int low = 0;
|
|
|
|
int high = nseq->first_free - 1;
|
|
|
|
int mid;
|
|
|
|
|
|
|
|
while (low <= high) {
|
|
|
|
mid = (low + high) / 2;
|
|
|
|
if (instance < sseqs[mid].lower)
|
|
|
|
high = mid - 1;
|
|
|
|
else if (instance > sseqs[mid].upper)
|
|
|
|
low = mid + 1;
|
|
|
|
else
|
|
|
|
return mid;
|
|
|
|
}
|
|
|
|
return low;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2012-05-01 02:29:02 +07:00
|
|
|
* tipc_nameseq_insert_publ
|
2006-01-03 01:04:38 +07:00
|
|
|
*/
|
2006-03-21 13:37:52 +07:00
|
|
|
static struct publication *tipc_nameseq_insert_publ(struct name_seq *nseq,
|
|
|
|
u32 type, u32 lower, u32 upper,
|
|
|
|
u32 scope, u32 node, u32 port, u32 key)
|
2006-01-03 01:04:38 +07:00
|
|
|
{
|
2011-12-30 08:43:44 +07:00
|
|
|
struct tipc_subscription *s;
|
|
|
|
struct tipc_subscription *st;
|
2006-01-03 01:04:38 +07:00
|
|
|
struct publication *publ;
|
|
|
|
struct sub_seq *sseq;
|
2011-05-30 20:44:38 +07:00
|
|
|
struct name_info *info;
|
2006-01-03 01:04:38 +07:00
|
|
|
int created_subseq = 0;
|
|
|
|
|
|
|
|
sseq = nameseq_find_subseq(nseq, lower);
|
|
|
|
if (sseq) {
|
|
|
|
|
|
|
|
/* Lower end overlaps existing entry => need an exact match */
|
|
|
|
if ((sseq->lower != lower) || (sseq->upper != upper)) {
|
2006-03-21 13:36:47 +07:00
|
|
|
return NULL;
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
2011-05-30 20:44:38 +07:00
|
|
|
|
|
|
|
info = sseq->info;
|
2011-11-03 22:12:01 +07:00
|
|
|
|
|
|
|
/* Check if an identical publication already exists */
|
|
|
|
list_for_each_entry(publ, &info->zone_list, zone_list) {
|
|
|
|
if ((publ->ref == port) && (publ->key == key) &&
|
|
|
|
(!publ->node || (publ->node == node)))
|
|
|
|
return NULL;
|
|
|
|
}
|
2006-01-03 01:04:38 +07:00
|
|
|
} else {
|
|
|
|
u32 inspos;
|
|
|
|
struct sub_seq *freesseq;
|
|
|
|
|
|
|
|
/* Find where lower end should be inserted */
|
|
|
|
inspos = nameseq_locate_subseq(nseq, lower);
|
|
|
|
|
|
|
|
/* Fail if upper end overlaps into an existing entry */
|
|
|
|
if ((inspos < nseq->first_free) &&
|
|
|
|
(upper >= nseq->sseqs[inspos].lower)) {
|
2006-03-21 13:36:47 +07:00
|
|
|
return NULL;
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Ensure there is space for new sub-sequence */
|
|
|
|
if (nseq->first_free == nseq->alloc) {
|
2006-06-26 13:37:24 +07:00
|
|
|
struct sub_seq *sseqs = tipc_subseq_alloc(nseq->alloc * 2);
|
|
|
|
|
|
|
|
if (!sseqs) {
|
2012-06-29 11:16:37 +07:00
|
|
|
pr_warn("Cannot publish {%u,%u,%u}, no memory\n",
|
|
|
|
type, lower, upper);
|
2006-03-21 13:36:47 +07:00
|
|
|
return NULL;
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
2006-06-26 13:37:24 +07:00
|
|
|
memcpy(sseqs, nseq->sseqs,
|
|
|
|
nseq->alloc * sizeof(struct sub_seq));
|
|
|
|
kfree(nseq->sseqs);
|
|
|
|
nseq->sseqs = sseqs;
|
|
|
|
nseq->alloc *= 2;
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
|
|
|
|
2011-05-30 20:44:38 +07:00
|
|
|
info = kzalloc(sizeof(*info), GFP_ATOMIC);
|
|
|
|
if (!info) {
|
2012-06-29 11:16:37 +07:00
|
|
|
pr_warn("Cannot publish {%u,%u,%u}, no memory\n",
|
|
|
|
type, lower, upper);
|
2011-05-30 20:44:38 +07:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2011-05-30 21:48:48 +07:00
|
|
|
INIT_LIST_HEAD(&info->node_list);
|
|
|
|
INIT_LIST_HEAD(&info->cluster_list);
|
|
|
|
INIT_LIST_HEAD(&info->zone_list);
|
|
|
|
|
2006-01-03 01:04:38 +07:00
|
|
|
/* Insert new sub-sequence */
|
|
|
|
sseq = &nseq->sseqs[inspos];
|
|
|
|
freesseq = &nseq->sseqs[nseq->first_free];
|
2011-01-01 01:59:32 +07:00
|
|
|
memmove(sseq + 1, sseq, (freesseq - sseq) * sizeof(*sseq));
|
|
|
|
memset(sseq, 0, sizeof(*sseq));
|
2006-01-03 01:04:38 +07:00
|
|
|
nseq->first_free++;
|
|
|
|
sseq->lower = lower;
|
|
|
|
sseq->upper = upper;
|
2011-05-30 20:44:38 +07:00
|
|
|
sseq->info = info;
|
2006-01-03 01:04:38 +07:00
|
|
|
created_subseq = 1;
|
|
|
|
}
|
|
|
|
|
2012-05-01 02:29:02 +07:00
|
|
|
/* Insert a publication */
|
2006-01-03 01:04:38 +07:00
|
|
|
publ = publ_create(type, lower, upper, scope, node, port, key);
|
|
|
|
if (!publ)
|
2006-03-21 13:36:47 +07:00
|
|
|
return NULL;
|
2006-01-03 01:04:38 +07:00
|
|
|
|
2011-05-30 21:48:48 +07:00
|
|
|
list_add(&publ->zone_list, &info->zone_list);
|
2011-05-30 20:44:38 +07:00
|
|
|
info->zone_list_size++;
|
2006-01-03 01:04:38 +07:00
|
|
|
|
2012-04-18 05:16:34 +07:00
|
|
|
if (in_own_cluster(node)) {
|
2011-05-30 21:48:48 +07:00
|
|
|
list_add(&publ->cluster_list, &info->cluster_list);
|
2011-05-30 20:44:38 +07:00
|
|
|
info->cluster_list_size++;
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
|
|
|
|
2012-04-18 05:16:34 +07:00
|
|
|
if (in_own_node(node)) {
|
2011-05-30 21:48:48 +07:00
|
|
|
list_add(&publ->node_list, &info->node_list);
|
2011-05-30 20:44:38 +07:00
|
|
|
info->node_list_size++;
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
|
|
|
|
2012-05-01 02:29:02 +07:00
|
|
|
/* Any subscriptions waiting for notification? */
|
2006-01-03 01:04:38 +07:00
|
|
|
list_for_each_entry_safe(s, st, &nseq->subscriptions, nameseq_list) {
|
2006-01-18 06:38:21 +07:00
|
|
|
tipc_subscr_report_overlap(s,
|
|
|
|
publ->lower,
|
|
|
|
publ->upper,
|
|
|
|
TIPC_PUBLISHED,
|
2007-02-09 21:25:21 +07:00
|
|
|
publ->ref,
|
2006-01-18 06:38:21 +07:00
|
|
|
publ->node,
|
|
|
|
created_subseq);
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
|
|
|
return publ;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2012-05-01 02:29:02 +07:00
|
|
|
* tipc_nameseq_remove_publ
|
2007-02-09 21:25:21 +07:00
|
|
|
*
|
2006-06-26 13:51:37 +07:00
|
|
|
* NOTE: There may be cases where TIPC is asked to remove a publication
|
|
|
|
* that is not in the name table. For example, if another node issues a
|
|
|
|
* publication for a name sequence that overlaps an existing name sequence
|
|
|
|
* the publication will not be recorded, which means the publication won't
|
|
|
|
* be found when the name sequence is later withdrawn by that node.
|
|
|
|
* A failed withdraw request simply returns a failure indication and lets the
|
|
|
|
* caller issue any error or warning messages associated with such a problem.
|
2006-01-03 01:04:38 +07:00
|
|
|
*/
|
2006-03-21 13:37:52 +07:00
|
|
|
static struct publication *tipc_nameseq_remove_publ(struct name_seq *nseq, u32 inst,
|
|
|
|
u32 node, u32 ref, u32 key)
|
2006-01-03 01:04:38 +07:00
|
|
|
{
|
|
|
|
struct publication *publ;
|
|
|
|
struct sub_seq *sseq = nameseq_find_subseq(nseq, inst);
|
2011-05-30 20:44:38 +07:00
|
|
|
struct name_info *info;
|
2006-01-03 01:04:38 +07:00
|
|
|
struct sub_seq *free;
|
2011-12-30 08:43:44 +07:00
|
|
|
struct tipc_subscription *s, *st;
|
2006-01-03 01:04:38 +07:00
|
|
|
int removed_subseq = 0;
|
|
|
|
|
2006-06-26 13:51:37 +07:00
|
|
|
if (!sseq)
|
2006-03-21 13:36:47 +07:00
|
|
|
return NULL;
|
2006-06-26 13:51:37 +07:00
|
|
|
|
2011-05-30 20:44:38 +07:00
|
|
|
info = sseq->info;
|
|
|
|
|
2011-05-30 21:48:48 +07:00
|
|
|
/* Locate publication, if it exists */
|
|
|
|
list_for_each_entry(publ, &info->zone_list, zone_list) {
|
|
|
|
if ((publ->key == key) && (publ->ref == ref) &&
|
|
|
|
(!publ->node || (publ->node == node)))
|
|
|
|
goto found;
|
|
|
|
}
|
|
|
|
return NULL;
|
2007-02-09 21:25:21 +07:00
|
|
|
|
2011-05-30 21:48:48 +07:00
|
|
|
found:
|
|
|
|
/* Remove publication from zone scope list */
|
|
|
|
list_del(&publ->zone_list);
|
2011-05-30 20:44:38 +07:00
|
|
|
info->zone_list_size--;
|
2006-01-03 01:04:38 +07:00
|
|
|
|
2006-06-26 13:51:37 +07:00
|
|
|
/* Remove publication from cluster scope list, if present */
|
2012-04-18 05:16:34 +07:00
|
|
|
if (in_own_cluster(node)) {
|
2011-05-30 21:48:48 +07:00
|
|
|
list_del(&publ->cluster_list);
|
2011-05-30 20:44:38 +07:00
|
|
|
info->cluster_list_size--;
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
2006-06-26 13:51:37 +07:00
|
|
|
|
|
|
|
/* Remove publication from node scope list, if present */
|
2012-04-18 05:16:34 +07:00
|
|
|
if (in_own_node(node)) {
|
2011-05-30 21:48:48 +07:00
|
|
|
list_del(&publ->node_list);
|
2011-05-30 20:44:38 +07:00
|
|
|
info->node_list_size--;
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
|
|
|
|
2006-06-26 13:51:37 +07:00
|
|
|
/* Contract subseq list if no more publications for that subseq */
|
2011-05-30 21:48:48 +07:00
|
|
|
if (list_empty(&info->zone_list)) {
|
2011-05-30 20:44:38 +07:00
|
|
|
kfree(info);
|
2006-01-03 01:04:38 +07:00
|
|
|
free = &nseq->sseqs[nseq->first_free--];
|
2011-01-01 01:59:32 +07:00
|
|
|
memmove(sseq, sseq + 1, (free - (sseq + 1)) * sizeof(*sseq));
|
2006-01-03 01:04:38 +07:00
|
|
|
removed_subseq = 1;
|
|
|
|
}
|
|
|
|
|
2006-06-26 13:51:37 +07:00
|
|
|
/* Notify any waiting subscriptions */
|
2006-01-03 01:04:38 +07:00
|
|
|
list_for_each_entry_safe(s, st, &nseq->subscriptions, nameseq_list) {
|
2006-01-18 06:38:21 +07:00
|
|
|
tipc_subscr_report_overlap(s,
|
|
|
|
publ->lower,
|
|
|
|
publ->upper,
|
2007-02-09 21:25:21 +07:00
|
|
|
TIPC_WITHDRAWN,
|
|
|
|
publ->ref,
|
2006-01-18 06:38:21 +07:00
|
|
|
publ->node,
|
|
|
|
removed_subseq);
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
2006-06-26 13:51:37 +07:00
|
|
|
|
2006-01-03 01:04:38 +07:00
|
|
|
return publ;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2012-07-10 17:55:09 +07:00
|
|
|
* tipc_nameseq_subscribe - attach a subscription, and issue
|
2006-01-03 01:04:38 +07:00
|
|
|
* the prescribed number of events if there is any sub-
|
|
|
|
* sequence overlapping with the requested sequence
|
|
|
|
*/
|
2011-12-30 08:43:44 +07:00
|
|
|
static void tipc_nameseq_subscribe(struct name_seq *nseq,
|
2013-06-17 21:54:47 +07:00
|
|
|
struct tipc_subscription *s)
|
2006-01-03 01:04:38 +07:00
|
|
|
{
|
|
|
|
struct sub_seq *sseq = nseq->sseqs;
|
|
|
|
|
|
|
|
list_add(&s->nameseq_list, &nseq->subscriptions);
|
|
|
|
|
|
|
|
if (!sseq)
|
|
|
|
return;
|
|
|
|
|
|
|
|
while (sseq != &nseq->sseqs[nseq->first_free]) {
|
2011-05-30 21:48:48 +07:00
|
|
|
if (tipc_subscr_overlap(s, sseq->lower, sseq->upper)) {
|
|
|
|
struct publication *crs;
|
|
|
|
struct name_info *info = sseq->info;
|
2006-01-03 01:04:38 +07:00
|
|
|
int must_report = 1;
|
|
|
|
|
2011-05-30 21:48:48 +07:00
|
|
|
list_for_each_entry(crs, &info->zone_list, zone_list) {
|
2007-02-09 21:25:21 +07:00
|
|
|
tipc_subscr_report_overlap(s,
|
|
|
|
sseq->lower,
|
2006-01-18 06:38:21 +07:00
|
|
|
sseq->upper,
|
|
|
|
TIPC_PUBLISHED,
|
|
|
|
crs->ref,
|
|
|
|
crs->node,
|
|
|
|
must_report);
|
2006-01-03 01:04:38 +07:00
|
|
|
must_report = 0;
|
2011-05-30 21:48:48 +07:00
|
|
|
}
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
|
|
|
sseq++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct name_seq *nametbl_find_seq(u32 type)
|
|
|
|
{
|
|
|
|
struct hlist_head *seq_head;
|
|
|
|
struct name_seq *ns;
|
|
|
|
|
|
|
|
seq_head = &table.types[hash(type)];
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 08:06:00 +07:00
|
|
|
hlist_for_each_entry(ns, seq_head, ns_list) {
|
2011-01-01 01:59:25 +07:00
|
|
|
if (ns->type == type)
|
2006-01-03 01:04:38 +07:00
|
|
|
return ns;
|
|
|
|
}
|
|
|
|
|
2006-03-21 13:36:47 +07:00
|
|
|
return NULL;
|
2006-01-03 01:04:38 +07:00
|
|
|
};
|
|
|
|
|
2006-01-18 06:38:21 +07:00
|
|
|
struct publication *tipc_nametbl_insert_publ(u32 type, u32 lower, u32 upper,
|
|
|
|
u32 scope, u32 node, u32 port, u32 key)
|
2006-01-03 01:04:38 +07:00
|
|
|
{
|
|
|
|
struct name_seq *seq = nametbl_find_seq(type);
|
|
|
|
|
2012-04-27 04:57:17 +07:00
|
|
|
if ((scope < TIPC_ZONE_SCOPE) || (scope > TIPC_NODE_SCOPE) ||
|
|
|
|
(lower > upper)) {
|
2012-06-29 11:16:37 +07:00
|
|
|
pr_debug("Failed to publish illegal {%u,%u,%u} with scope %u\n",
|
|
|
|
type, lower, upper, scope);
|
2006-03-21 13:36:47 +07:00
|
|
|
return NULL;
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
|
|
|
|
2011-01-01 01:59:25 +07:00
|
|
|
if (!seq)
|
2006-01-18 06:38:21 +07:00
|
|
|
seq = tipc_nameseq_create(type, &table.types[hash(type)]);
|
2006-01-03 01:04:38 +07:00
|
|
|
if (!seq)
|
2006-03-21 13:36:47 +07:00
|
|
|
return NULL;
|
2006-01-03 01:04:38 +07:00
|
|
|
|
2006-01-18 06:38:21 +07:00
|
|
|
return tipc_nameseq_insert_publ(seq, type, lower, upper,
|
|
|
|
scope, node, port, key);
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
|
|
|
|
2007-02-09 21:25:21 +07:00
|
|
|
struct publication *tipc_nametbl_remove_publ(u32 type, u32 lower,
|
2006-01-18 06:38:21 +07:00
|
|
|
u32 node, u32 ref, u32 key)
|
2006-01-03 01:04:38 +07:00
|
|
|
{
|
|
|
|
struct publication *publ;
|
|
|
|
struct name_seq *seq = nametbl_find_seq(type);
|
|
|
|
|
|
|
|
if (!seq)
|
2006-03-21 13:36:47 +07:00
|
|
|
return NULL;
|
2006-01-03 01:04:38 +07:00
|
|
|
|
2006-01-18 06:38:21 +07:00
|
|
|
publ = tipc_nameseq_remove_publ(seq, lower, node, ref, key);
|
2012-04-27 04:53:03 +07:00
|
|
|
nameseq_delete_empty(seq);
|
2006-01-03 01:04:38 +07:00
|
|
|
return publ;
|
|
|
|
}
|
|
|
|
|
2012-07-10 17:55:09 +07:00
|
|
|
/**
|
2011-11-08 05:00:54 +07:00
|
|
|
* tipc_nametbl_translate - perform name translation
|
2006-01-03 01:04:38 +07:00
|
|
|
*
|
2011-11-08 05:00:54 +07:00
|
|
|
* On entry, 'destnode' is the search domain used during translation.
|
|
|
|
*
|
|
|
|
* On exit:
|
|
|
|
* - if name translation is deferred to another node/cluster/zone,
|
|
|
|
* leaves 'destnode' unchanged (will be non-zero) and returns 0
|
|
|
|
* - if name translation is attempted and succeeds, sets 'destnode'
|
|
|
|
* to publishing node and returns port reference (will be non-zero)
|
|
|
|
* - if name translation is attempted and fails, sets 'destnode' to 0
|
|
|
|
* and returns 0
|
2006-01-03 01:04:38 +07:00
|
|
|
*/
|
2006-01-18 06:38:21 +07:00
|
|
|
u32 tipc_nametbl_translate(u32 type, u32 instance, u32 *destnode)
|
2006-01-03 01:04:38 +07:00
|
|
|
{
|
|
|
|
struct sub_seq *sseq;
|
2011-05-30 20:44:38 +07:00
|
|
|
struct name_info *info;
|
2011-05-30 21:48:48 +07:00
|
|
|
struct publication *publ;
|
2006-01-03 01:04:38 +07:00
|
|
|
struct name_seq *seq;
|
2011-05-30 21:48:48 +07:00
|
|
|
u32 ref = 0;
|
2011-11-08 05:00:54 +07:00
|
|
|
u32 node = 0;
|
2006-01-03 01:04:38 +07:00
|
|
|
|
2010-05-11 21:30:12 +07:00
|
|
|
if (!tipc_in_scope(*destnode, tipc_own_addr))
|
2006-01-03 01:04:38 +07:00
|
|
|
return 0;
|
|
|
|
|
2006-01-18 06:38:21 +07:00
|
|
|
read_lock_bh(&tipc_nametbl_lock);
|
2006-01-03 01:04:38 +07:00
|
|
|
seq = nametbl_find_seq(type);
|
|
|
|
if (unlikely(!seq))
|
|
|
|
goto not_found;
|
|
|
|
sseq = nameseq_find_subseq(seq, instance);
|
|
|
|
if (unlikely(!sseq))
|
|
|
|
goto not_found;
|
|
|
|
spin_lock_bh(&seq->lock);
|
2011-05-30 20:44:38 +07:00
|
|
|
info = sseq->info;
|
2006-01-03 01:04:38 +07:00
|
|
|
|
2012-05-01 02:29:02 +07:00
|
|
|
/* Closest-First Algorithm */
|
2006-01-03 01:04:38 +07:00
|
|
|
if (likely(!*destnode)) {
|
2011-05-30 21:48:48 +07:00
|
|
|
if (!list_empty(&info->node_list)) {
|
|
|
|
publ = list_first_entry(&info->node_list,
|
|
|
|
struct publication,
|
|
|
|
node_list);
|
|
|
|
list_move_tail(&publ->node_list,
|
|
|
|
&info->node_list);
|
|
|
|
} else if (!list_empty(&info->cluster_list)) {
|
|
|
|
publ = list_first_entry(&info->cluster_list,
|
|
|
|
struct publication,
|
|
|
|
cluster_list);
|
|
|
|
list_move_tail(&publ->cluster_list,
|
|
|
|
&info->cluster_list);
|
2011-05-30 22:27:50 +07:00
|
|
|
} else {
|
2011-05-30 21:48:48 +07:00
|
|
|
publ = list_first_entry(&info->zone_list,
|
|
|
|
struct publication,
|
|
|
|
zone_list);
|
|
|
|
list_move_tail(&publ->zone_list,
|
|
|
|
&info->zone_list);
|
2011-05-30 22:27:50 +07:00
|
|
|
}
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
|
|
|
|
2012-05-01 02:29:02 +07:00
|
|
|
/* Round-Robin Algorithm */
|
2006-01-03 01:04:38 +07:00
|
|
|
else if (*destnode == tipc_own_addr) {
|
2011-05-30 21:48:48 +07:00
|
|
|
if (list_empty(&info->node_list))
|
|
|
|
goto no_match;
|
|
|
|
publ = list_first_entry(&info->node_list, struct publication,
|
|
|
|
node_list);
|
|
|
|
list_move_tail(&publ->node_list, &info->node_list);
|
2012-04-18 05:02:01 +07:00
|
|
|
} else if (in_own_cluster_exact(*destnode)) {
|
2011-05-30 21:48:48 +07:00
|
|
|
if (list_empty(&info->cluster_list))
|
|
|
|
goto no_match;
|
|
|
|
publ = list_first_entry(&info->cluster_list, struct publication,
|
|
|
|
cluster_list);
|
|
|
|
list_move_tail(&publ->cluster_list, &info->cluster_list);
|
2006-01-03 01:04:38 +07:00
|
|
|
} else {
|
2011-05-30 21:48:48 +07:00
|
|
|
publ = list_first_entry(&info->zone_list, struct publication,
|
|
|
|
zone_list);
|
|
|
|
list_move_tail(&publ->zone_list, &info->zone_list);
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
2011-05-30 21:48:48 +07:00
|
|
|
|
|
|
|
ref = publ->ref;
|
2011-11-08 05:00:54 +07:00
|
|
|
node = publ->node;
|
2011-05-30 21:48:48 +07:00
|
|
|
no_match:
|
2006-01-03 01:04:38 +07:00
|
|
|
spin_unlock_bh(&seq->lock);
|
|
|
|
not_found:
|
2006-01-18 06:38:21 +07:00
|
|
|
read_unlock_bh(&tipc_nametbl_lock);
|
2011-11-08 05:00:54 +07:00
|
|
|
*destnode = node;
|
2011-05-30 21:48:48 +07:00
|
|
|
return ref;
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2006-01-18 06:38:21 +07:00
|
|
|
* tipc_nametbl_mc_translate - find multicast destinations
|
2007-02-09 21:25:21 +07:00
|
|
|
*
|
2006-01-03 01:04:38 +07:00
|
|
|
* Creates list of all local ports that overlap the given multicast address;
|
|
|
|
* also determines if any off-node ports overlap.
|
|
|
|
*
|
|
|
|
* Note: Publications with a scope narrower than 'limit' are ignored.
|
|
|
|
* (i.e. local node-scope publications mustn't receive messages arriving
|
|
|
|
* from another node, even if the multcast link brought it here)
|
2007-02-09 21:25:21 +07:00
|
|
|
*
|
2006-01-03 01:04:38 +07:00
|
|
|
* Returns non-zero if any off-node ports overlap
|
|
|
|
*/
|
2006-01-18 06:38:21 +07:00
|
|
|
int tipc_nametbl_mc_translate(u32 type, u32 lower, u32 upper, u32 limit,
|
2011-12-30 08:33:30 +07:00
|
|
|
struct tipc_port_list *dports)
|
2006-01-03 01:04:38 +07:00
|
|
|
{
|
|
|
|
struct name_seq *seq;
|
|
|
|
struct sub_seq *sseq;
|
|
|
|
struct sub_seq *sseq_stop;
|
2011-05-30 20:44:38 +07:00
|
|
|
struct name_info *info;
|
2006-01-03 01:04:38 +07:00
|
|
|
int res = 0;
|
|
|
|
|
2006-01-18 06:38:21 +07:00
|
|
|
read_lock_bh(&tipc_nametbl_lock);
|
2006-01-03 01:04:38 +07:00
|
|
|
seq = nametbl_find_seq(type);
|
|
|
|
if (!seq)
|
|
|
|
goto exit;
|
|
|
|
|
|
|
|
spin_lock_bh(&seq->lock);
|
|
|
|
|
|
|
|
sseq = seq->sseqs + nameseq_locate_subseq(seq, lower);
|
|
|
|
sseq_stop = seq->sseqs + seq->first_free;
|
|
|
|
for (; sseq != sseq_stop; sseq++) {
|
|
|
|
struct publication *publ;
|
|
|
|
|
|
|
|
if (sseq->lower > upper)
|
|
|
|
break;
|
2008-07-15 12:45:33 +07:00
|
|
|
|
2011-05-30 20:44:38 +07:00
|
|
|
info = sseq->info;
|
2011-05-30 21:48:48 +07:00
|
|
|
list_for_each_entry(publ, &info->node_list, node_list) {
|
|
|
|
if (publ->scope <= limit)
|
|
|
|
tipc_port_list_add(dports, publ->ref);
|
2008-07-15 12:45:33 +07:00
|
|
|
}
|
|
|
|
|
2011-05-30 20:44:38 +07:00
|
|
|
if (info->cluster_list_size != info->node_list_size)
|
2008-07-15 12:45:33 +07:00
|
|
|
res = 1;
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
spin_unlock_bh(&seq->lock);
|
|
|
|
exit:
|
2006-01-18 06:38:21 +07:00
|
|
|
read_unlock_bh(&tipc_nametbl_lock);
|
2006-01-03 01:04:38 +07:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2011-11-03 02:49:40 +07:00
|
|
|
/*
|
2006-01-18 06:38:21 +07:00
|
|
|
* tipc_nametbl_publish - add name publication to network name tables
|
2006-01-03 01:04:38 +07:00
|
|
|
*/
|
2007-02-09 21:25:21 +07:00
|
|
|
struct publication *tipc_nametbl_publish(u32 type, u32 lower, u32 upper,
|
2013-06-17 21:54:47 +07:00
|
|
|
u32 scope, u32 port_ref, u32 key)
|
2006-01-03 01:04:38 +07:00
|
|
|
{
|
|
|
|
struct publication *publ;
|
2014-04-28 17:00:10 +07:00
|
|
|
struct sk_buff *buf = NULL;
|
2006-01-03 01:04:38 +07:00
|
|
|
|
2012-08-16 19:09:14 +07:00
|
|
|
if (table.local_publ_count >= TIPC_MAX_PUBLICATIONS) {
|
2012-06-29 11:16:37 +07:00
|
|
|
pr_warn("Publication failed, local publication limit reached (%u)\n",
|
2012-08-16 19:09:14 +07:00
|
|
|
TIPC_MAX_PUBLICATIONS);
|
2006-03-21 13:36:47 +07:00
|
|
|
return NULL;
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
|
|
|
|
2006-01-18 06:38:21 +07:00
|
|
|
write_lock_bh(&tipc_nametbl_lock);
|
|
|
|
publ = tipc_nametbl_insert_publ(type, lower, upper, scope,
|
2006-01-03 01:04:38 +07:00
|
|
|
tipc_own_addr, port_ref, key);
|
2011-11-10 02:22:52 +07:00
|
|
|
if (likely(publ)) {
|
|
|
|
table.local_publ_count++;
|
2014-04-28 17:00:10 +07:00
|
|
|
buf = tipc_named_publish(publ);
|
tipc: add name distributor resiliency queue
TIPC name table updates are distributed asynchronously in a cluster,
entailing a risk of certain race conditions. E.g., if two nodes
simultaneously issue conflicting (overlapping) publications, this may
not be detected until both publications have reached a third node, in
which case one of the publications will be silently dropped on that
node. Hence, we end up with an inconsistent name table.
In most cases this conflict is just a temporary race, e.g., one
node is issuing a publication under the assumption that a previous,
conflicting, publication has already been withdrawn by the other node.
However, because of the (rtt related) distributed update delay, this
may not yet hold true on all nodes. The symptom of this failure is a
syslog message: "tipc: Cannot publish {%u,%u,%u}, overlap error".
In this commit we add a resiliency queue at the receiving end of
the name table distributor. When insertion of an arriving publication
fails, we retain it in this queue for a short amount of time, assuming
that another update will arrive very soon and clear the conflict. If so
happens, we insert the publication, otherwise we drop it.
The (configurable) retention value defaults to 2000 ms. Knowing from
experience that the situation described above is extremely rare, there
is no risk that the queue will accumulate any large number of items.
Signed-off-by: Erik Hugne <erik.hugne@ericsson.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Acked-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-08-28 14:08:47 +07:00
|
|
|
/* Any pending external events? */
|
|
|
|
tipc_named_process_backlog();
|
2011-11-10 02:22:52 +07:00
|
|
|
}
|
2006-01-18 06:38:21 +07:00
|
|
|
write_unlock_bh(&tipc_nametbl_lock);
|
2014-04-28 17:00:10 +07:00
|
|
|
|
|
|
|
if (buf)
|
|
|
|
named_cluster_distribute(buf);
|
2006-01-03 01:04:38 +07:00
|
|
|
return publ;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2006-01-18 06:38:21 +07:00
|
|
|
* tipc_nametbl_withdraw - withdraw name publication from network name tables
|
2006-01-03 01:04:38 +07:00
|
|
|
*/
|
2006-01-18 06:38:21 +07:00
|
|
|
int tipc_nametbl_withdraw(u32 type, u32 lower, u32 ref, u32 key)
|
2006-01-03 01:04:38 +07:00
|
|
|
{
|
|
|
|
struct publication *publ;
|
2014-04-28 17:00:10 +07:00
|
|
|
struct sk_buff *buf;
|
2006-01-03 01:04:38 +07:00
|
|
|
|
2006-01-18 06:38:21 +07:00
|
|
|
write_lock_bh(&tipc_nametbl_lock);
|
|
|
|
publ = tipc_nametbl_remove_publ(type, lower, tipc_own_addr, ref, key);
|
2006-06-26 13:51:37 +07:00
|
|
|
if (likely(publ)) {
|
2006-01-03 01:04:38 +07:00
|
|
|
table.local_publ_count--;
|
2014-04-28 17:00:10 +07:00
|
|
|
buf = tipc_named_withdraw(publ);
|
tipc: add name distributor resiliency queue
TIPC name table updates are distributed asynchronously in a cluster,
entailing a risk of certain race conditions. E.g., if two nodes
simultaneously issue conflicting (overlapping) publications, this may
not be detected until both publications have reached a third node, in
which case one of the publications will be silently dropped on that
node. Hence, we end up with an inconsistent name table.
In most cases this conflict is just a temporary race, e.g., one
node is issuing a publication under the assumption that a previous,
conflicting, publication has already been withdrawn by the other node.
However, because of the (rtt related) distributed update delay, this
may not yet hold true on all nodes. The symptom of this failure is a
syslog message: "tipc: Cannot publish {%u,%u,%u}, overlap error".
In this commit we add a resiliency queue at the receiving end of
the name table distributor. When insertion of an arriving publication
fails, we retain it in this queue for a short amount of time, assuming
that another update will arrive very soon and clear the conflict. If so
happens, we insert the publication, otherwise we drop it.
The (configurable) retention value defaults to 2000 ms. Knowing from
experience that the situation described above is extremely rare, there
is no risk that the queue will accumulate any large number of items.
Signed-off-by: Erik Hugne <erik.hugne@ericsson.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Acked-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-08-28 14:08:47 +07:00
|
|
|
/* Any pending external events? */
|
|
|
|
tipc_named_process_backlog();
|
2006-01-18 06:38:21 +07:00
|
|
|
write_unlock_bh(&tipc_nametbl_lock);
|
2006-01-03 01:04:38 +07:00
|
|
|
list_del_init(&publ->pport_list);
|
|
|
|
kfree(publ);
|
2014-04-28 17:00:10 +07:00
|
|
|
|
|
|
|
if (buf)
|
|
|
|
named_cluster_distribute(buf);
|
2006-01-03 01:04:38 +07:00
|
|
|
return 1;
|
|
|
|
}
|
2006-01-18 06:38:21 +07:00
|
|
|
write_unlock_bh(&tipc_nametbl_lock);
|
2012-06-29 11:16:37 +07:00
|
|
|
pr_err("Unable to remove local publication\n"
|
|
|
|
"(type=%u, lower=%u, ref=%u, key=%u)\n",
|
|
|
|
type, lower, ref, key);
|
2006-01-03 01:04:38 +07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2006-01-18 06:38:21 +07:00
|
|
|
* tipc_nametbl_subscribe - add a subscription object to the name table
|
2006-01-03 01:04:38 +07:00
|
|
|
*/
|
2011-12-30 08:43:44 +07:00
|
|
|
void tipc_nametbl_subscribe(struct tipc_subscription *s)
|
2006-01-03 01:04:38 +07:00
|
|
|
{
|
|
|
|
u32 type = s->seq.type;
|
|
|
|
struct name_seq *seq;
|
|
|
|
|
2007-02-09 21:25:21 +07:00
|
|
|
write_lock_bh(&tipc_nametbl_lock);
|
2006-01-03 01:04:38 +07:00
|
|
|
seq = nametbl_find_seq(type);
|
2011-01-01 01:59:35 +07:00
|
|
|
if (!seq)
|
2006-01-18 06:38:21 +07:00
|
|
|
seq = tipc_nameseq_create(type, &table.types[hash(type)]);
|
2011-01-01 01:59:32 +07:00
|
|
|
if (seq) {
|
2007-02-09 21:25:21 +07:00
|
|
|
spin_lock_bh(&seq->lock);
|
|
|
|
tipc_nameseq_subscribe(seq, s);
|
|
|
|
spin_unlock_bh(&seq->lock);
|
|
|
|
} else {
|
2012-06-29 11:16:37 +07:00
|
|
|
pr_warn("Failed to create subscription for {%u,%u,%u}\n",
|
|
|
|
s->seq.type, s->seq.lower, s->seq.upper);
|
2007-02-09 21:25:21 +07:00
|
|
|
}
|
|
|
|
write_unlock_bh(&tipc_nametbl_lock);
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2006-01-18 06:38:21 +07:00
|
|
|
* tipc_nametbl_unsubscribe - remove a subscription object from name table
|
2006-01-03 01:04:38 +07:00
|
|
|
*/
|
2011-12-30 08:43:44 +07:00
|
|
|
void tipc_nametbl_unsubscribe(struct tipc_subscription *s)
|
2006-01-03 01:04:38 +07:00
|
|
|
{
|
|
|
|
struct name_seq *seq;
|
|
|
|
|
2007-02-09 21:25:21 +07:00
|
|
|
write_lock_bh(&tipc_nametbl_lock);
|
|
|
|
seq = nametbl_find_seq(s->seq.type);
|
2011-01-01 01:59:32 +07:00
|
|
|
if (seq != NULL) {
|
2007-02-09 21:25:21 +07:00
|
|
|
spin_lock_bh(&seq->lock);
|
|
|
|
list_del_init(&s->nameseq_list);
|
|
|
|
spin_unlock_bh(&seq->lock);
|
2012-04-27 04:53:03 +07:00
|
|
|
nameseq_delete_empty(seq);
|
2007-02-09 21:25:21 +07:00
|
|
|
}
|
|
|
|
write_unlock_bh(&tipc_nametbl_lock);
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
2012-07-10 17:55:09 +07:00
|
|
|
* subseq_list - print specified sub-sequence contents into the given buffer
|
2006-01-03 01:04:38 +07:00
|
|
|
*/
|
2012-06-29 11:50:23 +07:00
|
|
|
static int subseq_list(struct sub_seq *sseq, char *buf, int len, u32 depth,
|
2013-06-17 21:54:47 +07:00
|
|
|
u32 index)
|
2006-01-03 01:04:38 +07:00
|
|
|
{
|
|
|
|
char portIdStr[27];
|
2010-08-17 18:00:14 +07:00
|
|
|
const char *scope_str[] = {"", " zone", " cluster", " node"};
|
2011-05-30 21:48:48 +07:00
|
|
|
struct publication *publ;
|
|
|
|
struct name_info *info;
|
2012-06-29 11:50:23 +07:00
|
|
|
int ret;
|
2006-01-03 01:04:38 +07:00
|
|
|
|
2012-06-29 11:50:23 +07:00
|
|
|
ret = tipc_snprintf(buf, len, "%-10u %-10u ", sseq->lower, sseq->upper);
|
2006-01-03 01:04:38 +07:00
|
|
|
|
2011-05-30 21:48:48 +07:00
|
|
|
if (depth == 2) {
|
2012-06-29 11:50:23 +07:00
|
|
|
ret += tipc_snprintf(buf - ret, len + ret, "\n");
|
|
|
|
return ret;
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
|
|
|
|
2011-05-30 21:48:48 +07:00
|
|
|
info = sseq->info;
|
|
|
|
|
|
|
|
list_for_each_entry(publ, &info->zone_list, zone_list) {
|
2011-01-01 01:59:32 +07:00
|
|
|
sprintf(portIdStr, "<%u.%u.%u:%u>",
|
2006-01-03 01:04:38 +07:00
|
|
|
tipc_zone(publ->node), tipc_cluster(publ->node),
|
|
|
|
tipc_node(publ->node), publ->ref);
|
2012-06-29 11:50:23 +07:00
|
|
|
ret += tipc_snprintf(buf + ret, len - ret, "%-26s ", portIdStr);
|
2006-01-03 01:04:38 +07:00
|
|
|
if (depth > 3) {
|
2012-06-29 11:50:23 +07:00
|
|
|
ret += tipc_snprintf(buf + ret, len - ret, "%-10u %s",
|
|
|
|
publ->key, scope_str[publ->scope]);
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
2011-05-30 21:48:48 +07:00
|
|
|
if (!list_is_last(&publ->zone_list, &info->zone_list))
|
2012-06-29 11:50:23 +07:00
|
|
|
ret += tipc_snprintf(buf + ret, len - ret,
|
|
|
|
"\n%33s", " ");
|
2012-09-18 14:10:45 +07:00
|
|
|
}
|
2006-01-03 01:04:38 +07:00
|
|
|
|
2012-06-29 11:50:23 +07:00
|
|
|
ret += tipc_snprintf(buf + ret, len - ret, "\n");
|
|
|
|
return ret;
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2012-07-10 17:55:09 +07:00
|
|
|
* nameseq_list - print specified name sequence contents into the given buffer
|
2006-01-03 01:04:38 +07:00
|
|
|
*/
|
2012-06-29 11:50:23 +07:00
|
|
|
static int nameseq_list(struct name_seq *seq, char *buf, int len, u32 depth,
|
2013-06-17 21:54:47 +07:00
|
|
|
u32 type, u32 lowbound, u32 upbound, u32 index)
|
2006-01-03 01:04:38 +07:00
|
|
|
{
|
|
|
|
struct sub_seq *sseq;
|
|
|
|
char typearea[11];
|
2012-06-29 11:50:23 +07:00
|
|
|
int ret = 0;
|
2006-01-03 01:04:38 +07:00
|
|
|
|
2008-06-05 07:37:59 +07:00
|
|
|
if (seq->first_free == 0)
|
2012-06-29 11:50:23 +07:00
|
|
|
return 0;
|
2008-06-05 07:37:59 +07:00
|
|
|
|
2006-01-03 01:04:38 +07:00
|
|
|
sprintf(typearea, "%-10u", seq->type);
|
|
|
|
|
|
|
|
if (depth == 1) {
|
2012-06-29 11:50:23 +07:00
|
|
|
ret += tipc_snprintf(buf, len, "%s\n", typearea);
|
|
|
|
return ret;
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
for (sseq = seq->sseqs; sseq != &seq->sseqs[seq->first_free]; sseq++) {
|
|
|
|
if ((lowbound <= sseq->upper) && (upbound >= sseq->lower)) {
|
2012-06-29 11:50:23 +07:00
|
|
|
ret += tipc_snprintf(buf + ret, len - ret, "%s ",
|
|
|
|
typearea);
|
2008-06-05 07:38:22 +07:00
|
|
|
spin_lock_bh(&seq->lock);
|
2012-06-29 11:50:23 +07:00
|
|
|
ret += subseq_list(sseq, buf + ret, len - ret,
|
|
|
|
depth, index);
|
2008-06-05 07:38:22 +07:00
|
|
|
spin_unlock_bh(&seq->lock);
|
2006-01-03 01:04:38 +07:00
|
|
|
sprintf(typearea, "%10s", " ");
|
|
|
|
}
|
|
|
|
}
|
2012-06-29 11:50:23 +07:00
|
|
|
return ret;
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* nametbl_header - print name table header into the given buffer
|
|
|
|
*/
|
2012-06-29 11:50:23 +07:00
|
|
|
static int nametbl_header(char *buf, int len, u32 depth)
|
2006-01-03 01:04:38 +07:00
|
|
|
{
|
2010-08-17 18:00:14 +07:00
|
|
|
const char *header[] = {
|
|
|
|
"Type ",
|
|
|
|
"Lower Upper ",
|
|
|
|
"Port Identity ",
|
|
|
|
"Publication Scope"
|
|
|
|
};
|
|
|
|
|
|
|
|
int i;
|
2012-06-29 11:50:23 +07:00
|
|
|
int ret = 0;
|
2010-08-17 18:00:14 +07:00
|
|
|
|
|
|
|
if (depth > 4)
|
|
|
|
depth = 4;
|
|
|
|
for (i = 0; i < depth; i++)
|
2012-06-29 11:50:23 +07:00
|
|
|
ret += tipc_snprintf(buf + ret, len - ret, header[i]);
|
|
|
|
ret += tipc_snprintf(buf + ret, len - ret, "\n");
|
|
|
|
return ret;
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* nametbl_list - print specified name table contents into the given buffer
|
|
|
|
*/
|
2012-06-29 11:50:23 +07:00
|
|
|
static int nametbl_list(char *buf, int len, u32 depth_info,
|
2013-06-17 21:54:47 +07:00
|
|
|
u32 type, u32 lowbound, u32 upbound)
|
2006-01-03 01:04:38 +07:00
|
|
|
{
|
|
|
|
struct hlist_head *seq_head;
|
|
|
|
struct name_seq *seq;
|
|
|
|
int all_types;
|
2012-06-29 11:50:23 +07:00
|
|
|
int ret = 0;
|
2006-01-03 01:04:38 +07:00
|
|
|
u32 depth;
|
|
|
|
u32 i;
|
|
|
|
|
|
|
|
all_types = (depth_info & TIPC_NTQ_ALLTYPES);
|
|
|
|
depth = (depth_info & ~TIPC_NTQ_ALLTYPES);
|
|
|
|
|
|
|
|
if (depth == 0)
|
2012-06-29 11:50:23 +07:00
|
|
|
return 0;
|
2006-01-03 01:04:38 +07:00
|
|
|
|
|
|
|
if (all_types) {
|
|
|
|
/* display all entries in name table to specified depth */
|
2012-06-29 11:50:23 +07:00
|
|
|
ret += nametbl_header(buf, len, depth);
|
2006-01-03 01:04:38 +07:00
|
|
|
lowbound = 0;
|
|
|
|
upbound = ~0;
|
2012-08-16 19:09:11 +07:00
|
|
|
for (i = 0; i < TIPC_NAMETBL_SIZE; i++) {
|
2006-01-03 01:04:38 +07:00
|
|
|
seq_head = &table.types[i];
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 08:06:00 +07:00
|
|
|
hlist_for_each_entry(seq, seq_head, ns_list) {
|
2012-06-29 11:50:23 +07:00
|
|
|
ret += nameseq_list(seq, buf + ret, len - ret,
|
|
|
|
depth, seq->type,
|
|
|
|
lowbound, upbound, i);
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* display only the sequence that matches the specified type */
|
|
|
|
if (upbound < lowbound) {
|
2012-06-29 11:50:23 +07:00
|
|
|
ret += tipc_snprintf(buf + ret, len - ret,
|
|
|
|
"invalid name sequence specified\n");
|
|
|
|
return ret;
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
2012-06-29 11:50:23 +07:00
|
|
|
ret += nametbl_header(buf + ret, len - ret, depth);
|
2006-01-03 01:04:38 +07:00
|
|
|
i = hash(type);
|
|
|
|
seq_head = &table.types[i];
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 08:06:00 +07:00
|
|
|
hlist_for_each_entry(seq, seq_head, ns_list) {
|
2006-01-03 01:04:38 +07:00
|
|
|
if (seq->type == type) {
|
2012-06-29 11:50:23 +07:00
|
|
|
ret += nameseq_list(seq, buf + ret, len - ret,
|
|
|
|
depth, type,
|
|
|
|
lowbound, upbound, i);
|
2006-01-03 01:04:38 +07:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2012-06-29 11:50:23 +07:00
|
|
|
return ret;
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
|
|
|
|
2006-01-18 06:38:21 +07:00
|
|
|
struct sk_buff *tipc_nametbl_get(const void *req_tlv_area, int req_tlv_space)
|
2006-01-03 01:04:38 +07:00
|
|
|
{
|
|
|
|
struct sk_buff *buf;
|
|
|
|
struct tipc_name_table_query *argv;
|
|
|
|
struct tlv_desc *rep_tlv;
|
2012-06-29 11:50:23 +07:00
|
|
|
char *pb;
|
|
|
|
int pb_len;
|
2006-01-03 01:04:38 +07:00
|
|
|
int str_len;
|
|
|
|
|
|
|
|
if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_NAME_TBL_QUERY))
|
2006-01-18 06:38:21 +07:00
|
|
|
return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
|
2006-01-03 01:04:38 +07:00
|
|
|
|
2012-06-29 11:50:23 +07:00
|
|
|
buf = tipc_cfg_reply_alloc(TLV_SPACE(ULTRA_STRING_MAX_LEN));
|
2006-01-03 01:04:38 +07:00
|
|
|
if (!buf)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
rep_tlv = (struct tlv_desc *)buf->data;
|
2012-06-29 11:50:23 +07:00
|
|
|
pb = TLV_DATA(rep_tlv);
|
|
|
|
pb_len = ULTRA_STRING_MAX_LEN;
|
2006-01-03 01:04:38 +07:00
|
|
|
argv = (struct tipc_name_table_query *)TLV_DATA(req_tlv_area);
|
2006-01-18 06:38:21 +07:00
|
|
|
read_lock_bh(&tipc_nametbl_lock);
|
2012-06-29 11:50:23 +07:00
|
|
|
str_len = nametbl_list(pb, pb_len, ntohl(argv->depth),
|
|
|
|
ntohl(argv->type),
|
|
|
|
ntohl(argv->lowbound), ntohl(argv->upbound));
|
2006-01-18 06:38:21 +07:00
|
|
|
read_unlock_bh(&tipc_nametbl_lock);
|
2012-06-29 11:50:23 +07:00
|
|
|
str_len += 1; /* for "\0" */
|
2006-01-03 01:04:38 +07:00
|
|
|
skb_put(buf, TLV_SPACE(str_len));
|
|
|
|
TLV_SET(rep_tlv, TIPC_TLV_ULTRA_STRING, NULL, str_len);
|
|
|
|
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
2006-01-18 06:38:21 +07:00
|
|
|
int tipc_nametbl_init(void)
|
2006-01-03 01:04:38 +07:00
|
|
|
{
|
2012-08-16 19:09:11 +07:00
|
|
|
table.types = kcalloc(TIPC_NAMETBL_SIZE, sizeof(struct hlist_head),
|
2008-05-13 05:41:53 +07:00
|
|
|
GFP_ATOMIC);
|
2006-01-03 01:04:38 +07:00
|
|
|
if (!table.types)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
table.local_publ_count = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-03-06 20:40:20 +07:00
|
|
|
/**
|
|
|
|
* tipc_purge_publications - remove all publications for a given type
|
|
|
|
*
|
|
|
|
* tipc_nametbl_lock must be held when calling this function
|
|
|
|
*/
|
|
|
|
static void tipc_purge_publications(struct name_seq *seq)
|
|
|
|
{
|
|
|
|
struct publication *publ, *safe;
|
|
|
|
struct sub_seq *sseq;
|
|
|
|
struct name_info *info;
|
|
|
|
|
|
|
|
if (!seq->sseqs) {
|
|
|
|
nameseq_delete_empty(seq);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
sseq = seq->sseqs;
|
|
|
|
info = sseq->info;
|
|
|
|
list_for_each_entry_safe(publ, safe, &info->zone_list, zone_list) {
|
|
|
|
tipc_nametbl_remove_publ(publ->type, publ->lower, publ->node,
|
|
|
|
publ->ref, publ->key);
|
2014-04-29 10:12:18 +07:00
|
|
|
kfree(publ);
|
2014-03-06 20:40:20 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-01-18 06:38:21 +07:00
|
|
|
void tipc_nametbl_stop(void)
|
2006-01-03 01:04:38 +07:00
|
|
|
{
|
|
|
|
u32 i;
|
2014-03-06 20:40:20 +07:00
|
|
|
struct name_seq *seq;
|
|
|
|
struct hlist_head *seq_head;
|
|
|
|
struct hlist_node *safe;
|
2006-01-03 01:04:38 +07:00
|
|
|
|
2014-03-06 20:40:20 +07:00
|
|
|
/* Verify name table is empty and purge any lingering
|
|
|
|
* publications, then release the name table
|
|
|
|
*/
|
2006-01-18 06:38:21 +07:00
|
|
|
write_lock_bh(&tipc_nametbl_lock);
|
2012-08-16 19:09:11 +07:00
|
|
|
for (i = 0; i < TIPC_NAMETBL_SIZE; i++) {
|
2012-07-12 04:35:01 +07:00
|
|
|
if (hlist_empty(&table.types[i]))
|
|
|
|
continue;
|
2014-03-06 20:40:20 +07:00
|
|
|
seq_head = &table.types[i];
|
|
|
|
hlist_for_each_entry_safe(seq, safe, seq_head, ns_list) {
|
|
|
|
tipc_purge_publications(seq);
|
|
|
|
}
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
|
|
|
kfree(table.types);
|
|
|
|
table.types = NULL;
|
2006-01-18 06:38:21 +07:00
|
|
|
write_unlock_bh(&tipc_nametbl_lock);
|
2006-01-03 01:04:38 +07:00
|
|
|
}
|
2014-11-20 16:29:20 +07:00
|
|
|
|
2014-11-24 17:10:29 +07:00
|
|
|
static int __tipc_nl_add_nametable_publ(struct tipc_nl_msg *msg,
|
|
|
|
struct name_seq *seq,
|
|
|
|
struct sub_seq *sseq, u32 *last_publ)
|
2014-11-20 16:29:20 +07:00
|
|
|
{
|
|
|
|
void *hdr;
|
|
|
|
struct nlattr *attrs;
|
|
|
|
struct nlattr *publ;
|
|
|
|
struct publication *p;
|
|
|
|
|
|
|
|
if (*last_publ) {
|
|
|
|
list_for_each_entry(p, &sseq->info->zone_list, zone_list)
|
|
|
|
if (p->key == *last_publ)
|
|
|
|
break;
|
|
|
|
if (p->key != *last_publ)
|
|
|
|
return -EPIPE;
|
|
|
|
} else {
|
|
|
|
p = list_first_entry(&sseq->info->zone_list, struct publication,
|
|
|
|
zone_list);
|
|
|
|
}
|
|
|
|
|
|
|
|
list_for_each_entry_from(p, &sseq->info->zone_list, zone_list) {
|
|
|
|
*last_publ = p->key;
|
|
|
|
|
|
|
|
hdr = genlmsg_put(msg->skb, msg->portid, msg->seq,
|
|
|
|
&tipc_genl_v2_family, NLM_F_MULTI,
|
|
|
|
TIPC_NL_NAME_TABLE_GET);
|
|
|
|
if (!hdr)
|
|
|
|
return -EMSGSIZE;
|
|
|
|
|
|
|
|
attrs = nla_nest_start(msg->skb, TIPC_NLA_NAME_TABLE);
|
|
|
|
if (!attrs)
|
|
|
|
goto msg_full;
|
|
|
|
|
|
|
|
publ = nla_nest_start(msg->skb, TIPC_NLA_NAME_TABLE_PUBL);
|
|
|
|
if (!publ)
|
|
|
|
goto attr_msg_full;
|
|
|
|
|
|
|
|
if (nla_put_u32(msg->skb, TIPC_NLA_PUBL_TYPE, seq->type))
|
|
|
|
goto publ_msg_full;
|
|
|
|
if (nla_put_u32(msg->skb, TIPC_NLA_PUBL_LOWER, sseq->lower))
|
|
|
|
goto publ_msg_full;
|
|
|
|
if (nla_put_u32(msg->skb, TIPC_NLA_PUBL_UPPER, sseq->upper))
|
|
|
|
goto publ_msg_full;
|
|
|
|
if (nla_put_u32(msg->skb, TIPC_NLA_PUBL_SCOPE, p->scope))
|
|
|
|
goto publ_msg_full;
|
|
|
|
if (nla_put_u32(msg->skb, TIPC_NLA_PUBL_NODE, p->node))
|
|
|
|
goto publ_msg_full;
|
|
|
|
if (nla_put_u32(msg->skb, TIPC_NLA_PUBL_REF, p->ref))
|
|
|
|
goto publ_msg_full;
|
|
|
|
if (nla_put_u32(msg->skb, TIPC_NLA_PUBL_KEY, p->key))
|
|
|
|
goto publ_msg_full;
|
|
|
|
|
|
|
|
nla_nest_end(msg->skb, publ);
|
|
|
|
nla_nest_end(msg->skb, attrs);
|
|
|
|
genlmsg_end(msg->skb, hdr);
|
|
|
|
}
|
|
|
|
*last_publ = 0;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
publ_msg_full:
|
|
|
|
nla_nest_cancel(msg->skb, publ);
|
|
|
|
attr_msg_full:
|
|
|
|
nla_nest_cancel(msg->skb, attrs);
|
|
|
|
msg_full:
|
|
|
|
genlmsg_cancel(msg->skb, hdr);
|
|
|
|
|
|
|
|
return -EMSGSIZE;
|
|
|
|
}
|
|
|
|
|
2014-11-24 17:10:29 +07:00
|
|
|
static int __tipc_nl_subseq_list(struct tipc_nl_msg *msg, struct name_seq *seq,
|
|
|
|
u32 *last_lower, u32 *last_publ)
|
2014-11-20 16:29:20 +07:00
|
|
|
{
|
|
|
|
struct sub_seq *sseq;
|
|
|
|
struct sub_seq *sseq_start;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
if (*last_lower) {
|
|
|
|
sseq_start = nameseq_find_subseq(seq, *last_lower);
|
|
|
|
if (!sseq_start)
|
|
|
|
return -EPIPE;
|
|
|
|
} else {
|
|
|
|
sseq_start = seq->sseqs;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (sseq = sseq_start; sseq != &seq->sseqs[seq->first_free]; sseq++) {
|
|
|
|
err = __tipc_nl_add_nametable_publ(msg, seq, sseq, last_publ);
|
|
|
|
if (err) {
|
|
|
|
*last_lower = sseq->lower;
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*last_lower = 0;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-11-24 17:10:29 +07:00
|
|
|
static int __tipc_nl_seq_list(struct tipc_nl_msg *msg, u32 *last_type,
|
|
|
|
u32 *last_lower, u32 *last_publ)
|
2014-11-20 16:29:20 +07:00
|
|
|
{
|
|
|
|
struct hlist_head *seq_head;
|
|
|
|
struct name_seq *seq;
|
|
|
|
int err;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (*last_type)
|
|
|
|
i = hash(*last_type);
|
|
|
|
else
|
|
|
|
i = 0;
|
|
|
|
|
|
|
|
for (; i < TIPC_NAMETBL_SIZE; i++) {
|
|
|
|
seq_head = &table.types[i];
|
|
|
|
|
|
|
|
if (*last_type) {
|
|
|
|
seq = nametbl_find_seq(*last_type);
|
|
|
|
if (!seq)
|
|
|
|
return -EPIPE;
|
|
|
|
} else {
|
|
|
|
seq = hlist_entry_safe((seq_head)->first,
|
|
|
|
struct name_seq, ns_list);
|
|
|
|
if (!seq)
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
hlist_for_each_entry_from(seq, ns_list) {
|
|
|
|
spin_lock_bh(&seq->lock);
|
|
|
|
|
|
|
|
err = __tipc_nl_subseq_list(msg, seq, last_lower,
|
|
|
|
last_publ);
|
|
|
|
|
|
|
|
if (err) {
|
|
|
|
*last_type = seq->type;
|
|
|
|
spin_unlock_bh(&seq->lock);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
spin_unlock_bh(&seq->lock);
|
|
|
|
}
|
|
|
|
*last_type = 0;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int tipc_nl_name_table_dump(struct sk_buff *skb, struct netlink_callback *cb)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
int done = cb->args[3];
|
|
|
|
u32 last_type = cb->args[0];
|
|
|
|
u32 last_lower = cb->args[1];
|
|
|
|
u32 last_publ = cb->args[2];
|
|
|
|
struct tipc_nl_msg msg;
|
|
|
|
|
|
|
|
if (done)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
msg.skb = skb;
|
|
|
|
msg.portid = NETLINK_CB(cb->skb).portid;
|
|
|
|
msg.seq = cb->nlh->nlmsg_seq;
|
|
|
|
|
|
|
|
read_lock_bh(&tipc_nametbl_lock);
|
|
|
|
|
|
|
|
err = __tipc_nl_seq_list(&msg, &last_type, &last_lower, &last_publ);
|
|
|
|
if (!err) {
|
|
|
|
done = 1;
|
|
|
|
} else if (err != -EMSGSIZE) {
|
|
|
|
/* We never set seq or call nl_dump_check_consistent() this
|
|
|
|
* means that setting prev_seq here will cause the consistence
|
|
|
|
* check to fail in the netlink callback handler. Resulting in
|
|
|
|
* the NLMSG_DONE message having the NLM_F_DUMP_INTR flag set if
|
|
|
|
* we got an error.
|
|
|
|
*/
|
|
|
|
cb->prev_seq = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
read_unlock_bh(&tipc_nametbl_lock);
|
|
|
|
|
|
|
|
cb->args[0] = last_type;
|
|
|
|
cb->args[1] = last_lower;
|
|
|
|
cb->args[2] = last_publ;
|
|
|
|
cb->args[3] = done;
|
|
|
|
|
|
|
|
return skb->len;
|
|
|
|
}
|