microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge branch 'net-tipc-fix-all-kernel-doc-and-add-tipc-networking-chapter' 

Randy Dunlap says:

====================
net/tipc: fix all kernel-doc and add TIPC networking chapter

Fix lots of net/tipc/ kernel-doc warnings. Add many struct field and
function parameter descriptions.

Then add a TIPC chapter to the networking documentation book.

All patches have been rebased to current net-next.

Note: some of the struct members and function parameters are marked
with "FIXME". They could use some additional descriptions if
someone could help add to them. Thanks.
====================

Link: https://lore.kernel.org/r/20201129183251.7049-1-rdunlap@infradead.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2020-12-01 15:38:46 -08:00
Родитель 7fe2af16e6 2fc30decf7
Коммит f7cf335c7d
19 изменённых файлов: 403 добавлений и 113 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
Documentation/networking/index.rst
Просмотреть файл

@ -101,6 +101,7 @@ Contents:
tcp-thin tcp-thin
team team
timestamping timestamping
tipc
tproxy tproxy
tuntap tuntap
udplite udplite

100
Documentation/networking/tipc.rst Normal file
Просмотреть файл

@ -0,0 +1,100 @@
.. SPDX-License-Identifier: GPL-2.0
=================
Linux Kernel TIPC
=================
TIPC (Transparent Inter Process Communication) is a protocol that is
specially designed for intra-cluster communication.
For more information about TIPC, see http://tipc.sourceforge.net.
TIPC Base Types
---------------
.. kernel-doc:: net/tipc/subscr.h
:internal:
.. kernel-doc:: net/tipc/bearer.h
:internal:
.. kernel-doc:: net/tipc/name_table.h
:internal:
.. kernel-doc:: net/tipc/name_distr.h
:internal:
.. kernel-doc:: net/tipc/bcast.c
:internal:
TIPC Bearer Interfaces
----------------------
.. kernel-doc:: net/tipc/bearer.c
:internal:
.. kernel-doc:: net/tipc/udp_media.c
:internal:
TIPC Crypto Interfaces
----------------------
.. kernel-doc:: net/tipc/crypto.c
:internal:
TIPC Discoverer Interfaces
--------------------------
.. kernel-doc:: net/tipc/discover.c
:internal:
TIPC Link Interfaces
--------------------
.. kernel-doc:: net/tipc/link.c
:internal:
TIPC msg Interfaces
-------------------
.. kernel-doc:: net/tipc/msg.c
:internal:
TIPC Name Interfaces
--------------------
.. kernel-doc:: net/tipc/name_table.c
:internal:
.. kernel-doc:: net/tipc/name_distr.c
:internal:
TIPC Node Management Interfaces
-------------------------------
.. kernel-doc:: net/tipc/node.c
:internal:
TIPC Socket Interfaces
----------------------
.. kernel-doc:: net/tipc/socket.c
:internal:
TIPC Network Topology Interfaces
--------------------------------
.. kernel-doc:: net/tipc/subscr.c
:internal:
TIPC Server Interfaces
----------------------
.. kernel-doc:: net/tipc/topsrv.c
:internal:
TIPC Trace Interfaces
---------------------
.. kernel-doc:: net/tipc/trace.c
:internal:

22
net/tipc/bearer.c
Просмотреть файл

@ -72,6 +72,7 @@ static int tipc_l2_rcv_msg(struct sk_buff *skb, struct net_device *dev,
/** /**
* tipc_media_find - locates specified media object by name * tipc_media_find - locates specified media object by name
* @name: name to locate
*/ */
struct tipc_media *tipc_media_find(const char *name) struct tipc_media *tipc_media_find(const char *name)
{ {
@ -86,6 +87,7 @@ struct tipc_media *tipc_media_find(const char *name)
/** /**
* media_find_id - locates specified media object by type identifier * media_find_id - locates specified media object by type identifier
* @type: type identifier to locate
*/ */
static struct tipc_media *media_find_id(u8 type) static struct tipc_media *media_find_id(u8 type)
{ {
@ -100,6 +102,9 @@ static struct tipc_media *media_find_id(u8 type)
/** /**
* tipc_media_addr_printf - record media address in print buffer * tipc_media_addr_printf - record media address in print buffer
* @buf: output buffer
* @len: output buffer size remaining
* @a: input media address
*/ */
int tipc_media_addr_printf(char *buf, int len, struct tipc_media_addr *a) int tipc_media_addr_printf(char *buf, int len, struct tipc_media_addr *a)
{ {
@ -127,7 +132,7 @@ int tipc_media_addr_printf(char *buf, int len, struct tipc_media_addr *a)
* @name: ptr to bearer name string * @name: ptr to bearer name string
* @name_parts: ptr to area for bearer name components (or NULL if not needed) * @name_parts: ptr to area for bearer name components (or NULL if not needed)
* *
* Returns 1 if bearer name is valid, otherwise 0. * Return: 1 if bearer name is valid, otherwise 0.
*/ */
static int bearer_name_validate(const char *name, static int bearer_name_validate(const char *name,
struct tipc_bearer_names *name_parts) struct tipc_bearer_names *name_parts)
@ -166,6 +171,8 @@ static int bearer_name_validate(const char *name,
/** /**
* tipc_bearer_find - locates bearer object with matching bearer name * tipc_bearer_find - locates bearer object with matching bearer name
* @net: the applicable net namespace
* @name: bearer name to locate
*/ */
struct tipc_bearer *tipc_bearer_find(struct net *net, const char *name) struct tipc_bearer *tipc_bearer_find(struct net *net, const char *name)
{ {
@ -228,6 +235,11 @@ void tipc_bearer_remove_dest(struct net *net, u32 bearer_id, u32 dest)
/** /**
* tipc_enable_bearer - enable bearer with the given name * tipc_enable_bearer - enable bearer with the given name
* @net: the applicable net namespace
* @name: bearer name to enable
* @disc_domain: bearer domain
* @prio: bearer priority
* @attr: nlattr array
*/ */
static int tipc_enable_bearer(struct net *net, const char *name, static int tipc_enable_bearer(struct net *net, const char *name,
u32 disc_domain, u32 prio, u32 disc_domain, u32 prio,
@ -342,6 +354,8 @@ rejected:
/** /**
* tipc_reset_bearer - Reset all links established over this bearer * tipc_reset_bearer - Reset all links established over this bearer
* @net: the applicable net namespace
* @b: the target bearer
*/ */
static int tipc_reset_bearer(struct net *net, struct tipc_bearer *b) static int tipc_reset_bearer(struct net *net, struct tipc_bearer *b)
{ {
@ -363,7 +377,9 @@ void tipc_bearer_put(struct tipc_bearer *b)
} }
/** /**
* bearer_disable * bearer_disable - disable this bearer
* @net: the applicable net namespace
* @b: the bearer to disable
* *
* Note: This routine assumes caller holds RTNL lock. * Note: This routine assumes caller holds RTNL lock.
*/ */
@ -434,6 +450,7 @@ int tipc_enable_l2_media(struct net *net, struct tipc_bearer *b,
} }
/* tipc_disable_l2_media - detach TIPC bearer from an L2 interface /* tipc_disable_l2_media - detach TIPC bearer from an L2 interface
* @b: the target bearer
* *
* Mark L2 bearer as inactive so that incoming buffers are thrown away * Mark L2 bearer as inactive so that incoming buffers are thrown away
*/ */
@ -450,6 +467,7 @@ void tipc_disable_l2_media(struct tipc_bearer *b)
/** /**
* tipc_l2_send_msg - send a TIPC packet out over an L2 interface * tipc_l2_send_msg - send a TIPC packet out over an L2 interface
* @net: the associated network namespace
* @skb: the packet to be sent * @skb: the packet to be sent
* @b: the bearer through which the packet is to be sent * @b: the bearer through which the packet is to be sent
* @dest: peer destination address * @dest: peer destination address

10
net/tipc/bearer.h
Просмотреть файл

@ -93,7 +93,8 @@ struct tipc_bearer;
* @raw2addr: convert from raw addr format to media addr format * @raw2addr: convert from raw addr format to media addr format
* @priority: default link (and bearer) priority * @priority: default link (and bearer) priority
* @tolerance: default time (in ms) before declaring link failure * @tolerance: default time (in ms) before declaring link failure
* @window: default window (in packets) before declaring link congestion * @min_win: minimum window (in packets) before declaring link congestion
* @max_win: maximum window (in packets) before declaring link congestion
* @mtu: max packet size bearer can support for media type not dependent on * @mtu: max packet size bearer can support for media type not dependent on
* underlying device MTU * underlying device MTU
* @type_id: TIPC media identifier * @type_id: TIPC media identifier
@ -138,12 +139,15 @@ struct tipc_media {
* @pt: packet type for bearer * @pt: packet type for bearer
* @rcu: rcu struct for tipc_bearer * @rcu: rcu struct for tipc_bearer
* @priority: default link priority for bearer * @priority: default link priority for bearer
* @window: default window size for bearer * @min_win: minimum window (in packets) before declaring link congestion
* @max_win: maximum window (in packets) before declaring link congestion
* @tolerance: default link tolerance for bearer * @tolerance: default link tolerance for bearer
* @domain: network domain to which links can be established * @domain: network domain to which links can be established
* @identity: array index of this bearer within TIPC bearer array * @identity: array index of this bearer within TIPC bearer array
* @link_req: ptr to (optional) structure making periodic link setup requests * @disc: ptr to link setup request
* @net_plane: network plane ('A' through 'H') currently associated with bearer * @net_plane: network plane ('A' through 'H') currently associated with bearer
* @up: bearer up flag (bit 0)
* @refcnt: tipc_bearer reference counter
* *
* Note: media-specific code is responsible for initialization of the fields * Note: media-specific code is responsible for initialization of the fields
* indicated below when a bearer is enabled; TIPC's generic bearer code takes * indicated below when a bearer is enabled; TIPC's generic bearer code takes

55
net/tipc/crypto.c
Просмотреть файл

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/** /*
* net/tipc/crypto.c: TIPC crypto for key handling & packet en/decryption * net/tipc/crypto.c: TIPC crypto for key handling & packet en/decryption
* *
* Copyright (c) 2019, Ericsson AB * Copyright (c) 2019, Ericsson AB
@ -51,7 +51,7 @@
#define TIPC_REKEYING_INTV_DEF (60 * 24) /* default: 1 day */ #define TIPC_REKEYING_INTV_DEF (60 * 24) /* default: 1 day */
/** /*
* TIPC Key ids * TIPC Key ids
*/ */
enum { enum {
@ -63,7 +63,7 @@ enum {
KEY_MAX = KEY_3, KEY_MAX = KEY_3,
}; };
/** /*
* TIPC Crypto statistics * TIPC Crypto statistics
*/ */
enum { enum {
@ -90,7 +90,7 @@ int sysctl_tipc_max_tfms __read_mostly = TIPC_MAX_TFMS_DEF;
/* Key exchange switch, default: on */ /* Key exchange switch, default: on */
int sysctl_tipc_key_exchange_enabled __read_mostly = 1; int sysctl_tipc_key_exchange_enabled __read_mostly = 1;
/** /*
* struct tipc_key - TIPC keys' status indicator * struct tipc_key - TIPC keys' status indicator
* *
* 7 6 5 4 3 2 1 0 * 7 6 5 4 3 2 1 0
@ -123,6 +123,8 @@ struct tipc_key {
/** /**
* struct tipc_tfm - TIPC TFM structure to form a list of TFMs * struct tipc_tfm - TIPC TFM structure to form a list of TFMs
* @tfm: cipher handle/key
* @list: linked list of TFMs
*/ */
struct tipc_tfm { struct tipc_tfm {
struct crypto_aead *tfm; struct crypto_aead *tfm;
@ -138,7 +140,7 @@ struct tipc_tfm {
* @salt: the key's SALT value * @salt: the key's SALT value
* @authsize: authentication tag size (max = 16) * @authsize: authentication tag size (max = 16)
* @mode: crypto mode is applied to the key * @mode: crypto mode is applied to the key
* @hint[]: a hint for user key * @hint: a hint for user key
* @rcu: struct rcu_head * @rcu: struct rcu_head
* @key: the aead key * @key: the aead key
* @gen: the key's generation * @gen: the key's generation
@ -166,6 +168,7 @@ struct tipc_aead {
/** /**
* struct tipc_crypto_stats - TIPC Crypto statistics * struct tipc_crypto_stats - TIPC Crypto statistics
* @stat: array of crypto statistics
*/ */
struct tipc_crypto_stats { struct tipc_crypto_stats {
unsigned int stat[MAX_STATS]; unsigned int stat[MAX_STATS];
@ -194,6 +197,7 @@ struct tipc_crypto_stats {
* @key_master: flag indicates if master key exists * @key_master: flag indicates if master key exists
* @legacy_user: flag indicates if a peer joins w/o master key (for bwd comp.) * @legacy_user: flag indicates if a peer joins w/o master key (for bwd comp.)
* @nokey: no key indication * @nokey: no key indication
* @flags: combined flags field
* @lock: tipc_key lock * @lock: tipc_key lock
*/ */
struct tipc_crypto { struct tipc_crypto {
@ -324,6 +328,8 @@ do { \
/** /**
* tipc_aead_key_validate - Validate a AEAD user key * tipc_aead_key_validate - Validate a AEAD user key
* @ukey: pointer to user key data
* @info: netlink info pointer
*/ */
int tipc_aead_key_validate(struct tipc_aead_key *ukey, struct genl_info *info) int tipc_aead_key_validate(struct tipc_aead_key *ukey, struct genl_info *info)
{ {
@ -477,6 +483,7 @@ static void tipc_aead_users_set(struct tipc_aead __rcu *aead, int val)
/** /**
* tipc_aead_tfm_next - Move TFM entry to the next one in list and return it * tipc_aead_tfm_next - Move TFM entry to the next one in list and return it
* @aead: the AEAD key pointer
*/ */
static struct crypto_aead *tipc_aead_tfm_next(struct tipc_aead *aead) static struct crypto_aead *tipc_aead_tfm_next(struct tipc_aead *aead)
{ {
@ -714,9 +721,9 @@ static void *tipc_aead_mem_alloc(struct crypto_aead *tfm,
* @__dnode: TIPC dest node if "known" * @__dnode: TIPC dest node if "known"
* *
* Return: * Return:
* 0 : if the encryption has completed * * 0 : if the encryption has completed
* -EINPROGRESS/-EBUSY : if a callback will be performed * * -EINPROGRESS/-EBUSY : if a callback will be performed
* < 0 : the encryption has failed * * < 0 : the encryption has failed
*/ */
static int tipc_aead_encrypt(struct tipc_aead *aead, struct sk_buff *skb, static int tipc_aead_encrypt(struct tipc_aead *aead, struct sk_buff *skb,
struct tipc_bearer *b, struct tipc_bearer *b,
@ -870,9 +877,9 @@ static void tipc_aead_encrypt_done(struct crypto_async_request *base, int err)
* @b: TIPC bearer where the message has been received * @b: TIPC bearer where the message has been received
* *
* Return: * Return:
* 0 : if the decryption has completed * * 0 : if the decryption has completed
* -EINPROGRESS/-EBUSY : if a callback will be performed * * -EINPROGRESS/-EBUSY : if a callback will be performed
* < 0 : the decryption has failed * * < 0 : the decryption has failed
*/ */
static int tipc_aead_decrypt(struct net *net, struct tipc_aead *aead, static int tipc_aead_decrypt(struct net *net, struct tipc_aead *aead,
struct sk_buff *skb, struct tipc_bearer *b) struct sk_buff *skb, struct tipc_bearer *b)
@ -1001,7 +1008,7 @@ static inline int tipc_ehdr_size(struct tipc_ehdr *ehdr)
* tipc_ehdr_validate - Validate an encryption message * tipc_ehdr_validate - Validate an encryption message
* @skb: the message buffer * @skb: the message buffer
* *
* Returns "true" if this is a valid encryption message, otherwise "false" * Return: "true" if this is a valid encryption message, otherwise "false"
*/ */
bool tipc_ehdr_validate(struct sk_buff *skb) bool tipc_ehdr_validate(struct sk_buff *skb)
{ {
@ -1674,12 +1681,12 @@ static inline void tipc_crypto_clone_msg(struct net *net, struct sk_buff *_skb,
* Otherwise, the skb is freed! * Otherwise, the skb is freed!
* *
* Return: * Return:
* 0 : the encryption has succeeded (or no encryption) * * 0 : the encryption has succeeded (or no encryption)
* -EINPROGRESS/-EBUSY : the encryption is ongoing, a callback will be made * * -EINPROGRESS/-EBUSY : the encryption is ongoing, a callback will be made
* -ENOKEK : the encryption has failed due to no key * * -ENOKEK : the encryption has failed due to no key
* -EKEYREVOKED : the encryption has failed due to key revoked * * -EKEYREVOKED : the encryption has failed due to key revoked
* -ENOMEM : the encryption has failed due to no memory * * -ENOMEM : the encryption has failed due to no memory
* < 0 : the encryption has failed due to other reasons * * < 0 : the encryption has failed due to other reasons
*/ */
int tipc_crypto_xmit(struct net *net, struct sk_buff **skb, int tipc_crypto_xmit(struct net *net, struct sk_buff **skb,
struct tipc_bearer *b, struct tipc_media_addr *dst, struct tipc_bearer *b, struct tipc_media_addr *dst,
@ -1799,12 +1806,12 @@ exit:
* cluster key(s) can be taken for decryption (- recursive). * cluster key(s) can be taken for decryption (- recursive).
* *
* Return: * Return:
* 0 : the decryption has successfully completed * * 0 : the decryption has successfully completed
* -EINPROGRESS/-EBUSY : the decryption is ongoing, a callback will be made * * -EINPROGRESS/-EBUSY : the decryption is ongoing, a callback will be made
* -ENOKEY : the decryption has failed due to no key * * -ENOKEY : the decryption has failed due to no key
* -EBADMSG : the decryption has failed due to bad message * * -EBADMSG : the decryption has failed due to bad message
* -ENOMEM : the decryption has failed due to no memory * * -ENOMEM : the decryption has failed due to no memory
* < 0 : the decryption has failed due to other reasons * * < 0 : the decryption has failed due to other reasons
*/ */
int tipc_crypto_rcv(struct net *net, struct tipc_crypto *rx, int tipc_crypto_rcv(struct net *net, struct tipc_crypto *rx,
struct sk_buff **skb, struct tipc_bearer *b) struct sk_buff **skb, struct tipc_bearer *b)

6
net/tipc/crypto.h
Просмотреть файл

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/** /*
* net/tipc/crypto.h: Include file for TIPC crypto * net/tipc/crypto.h: Include file for TIPC crypto
* *
* Copyright (c) 2019, Ericsson AB * Copyright (c) 2019, Ericsson AB
@ -53,7 +53,7 @@
#define TIPC_AES_GCM_IV_SIZE 12 #define TIPC_AES_GCM_IV_SIZE 12
#define TIPC_AES_GCM_TAG_SIZE 16 #define TIPC_AES_GCM_TAG_SIZE 16
/** /*
* TIPC crypto modes: * TIPC crypto modes:
* - CLUSTER_KEY: * - CLUSTER_KEY:
* One single key is used for both TX & RX in all nodes in the cluster. * One single key is used for both TX & RX in all nodes in the cluster.
@ -69,7 +69,7 @@ enum {
extern int sysctl_tipc_max_tfms __read_mostly; extern int sysctl_tipc_max_tfms __read_mostly;
extern int sysctl_tipc_key_exchange_enabled __read_mostly; extern int sysctl_tipc_key_exchange_enabled __read_mostly;
/** /*
* TIPC encryption message format: * TIPC encryption message format:
* *
* 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 * 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0

5
net/tipc/discover.c
Просмотреть файл

@ -74,6 +74,7 @@ struct tipc_discoverer {
/** /**
* tipc_disc_init_msg - initialize a link setup message * tipc_disc_init_msg - initialize a link setup message
* @net: the applicable net namespace * @net: the applicable net namespace
* @skb: buffer containing message
* @mtyp: message type (request or response) * @mtyp: message type (request or response)
* @b: ptr to bearer issuing message * @b: ptr to bearer issuing message
*/ */
@ -341,7 +342,7 @@ exit:
* @dest: destination address for request messages * @dest: destination address for request messages
* @skb: pointer to created frame * @skb: pointer to created frame
* *
* Returns 0 if successful, otherwise -errno. * Return: 0 if successful, otherwise -errno.
*/ */
int tipc_disc_create(struct net *net, struct tipc_bearer *b, int tipc_disc_create(struct net *net, struct tipc_bearer *b,
struct tipc_media_addr *dest, struct sk_buff **skb) struct tipc_media_addr *dest, struct sk_buff **skb)
@ -380,7 +381,7 @@ int tipc_disc_create(struct net *net, struct tipc_bearer *b,
/** /**
* tipc_disc_delete - destroy object sending periodic link setup requests * tipc_disc_delete - destroy object sending periodic link setup requests
* @d: ptr to link duest structure * @d: ptr to link dest structure
*/ */
void tipc_disc_delete(struct tipc_discoverer *d) void tipc_disc_delete(struct tipc_discoverer *d)
{ {

46
net/tipc/link.c
Просмотреть файл

@ -120,6 +120,34 @@ struct tipc_stats {
* @reasm_buf: head of partially reassembled inbound message fragments * @reasm_buf: head of partially reassembled inbound message fragments
* @bc_rcvr: marks that this is a broadcast receiver link * @bc_rcvr: marks that this is a broadcast receiver link
* @stats: collects statistics regarding link activity * @stats: collects statistics regarding link activity
* @session: session to be used by link
* @snd_nxt_state: next send seq number
* @rcv_nxt_state: next rcv seq number
* @in_session: have received ACTIVATE_MSG from peer
* @active: link is active
* @if_name: associated interface name
* @rst_cnt: link reset counter
* @drop_point: seq number for failover handling (FIXME)
* @failover_reasm_skb: saved failover msg ptr (FIXME)
* @failover_deferdq: deferred message queue for failover processing (FIXME)
* @transmq: the link's transmit queue
* @backlog: link's backlog by priority (importance)
* @snd_nxt: next sequence number to be used
* @rcv_unacked: # messages read by user, but not yet acked back to peer
* @deferdq: deferred receive queue
* @window: sliding window size for congestion handling
* @min_win: minimal send window to be used by link
* @ssthresh: slow start threshold for congestion handling
* @max_win: maximal send window to be used by link
* @cong_acks: congestion acks for congestion avoidance (FIXME)
* @checkpoint: seq number for congestion window size handling
* @reasm_tnlmsg: fragmentation/reassembly area for tunnel protocol message
* @last_gap: last gap ack blocks for bcast (FIXME)
* @last_ga: ptr to gap ack blocks
* @bc_rcvlink: the peer specific link used for broadcast reception
* @bc_sndlink: the namespace global link used for broadcast sending
* @nack_state: bcast nack state
* @bc_peer_is_up: peer has acked the bcast init msg
*/ */
struct tipc_link { struct tipc_link {
u32 addr; u32 addr;
@ -450,7 +478,6 @@ u32 tipc_link_state(struct tipc_link *l)
* @min_win: minimal send window to be used by link * @min_win: minimal send window to be used by link
* @max_win: maximal send window to be used by link * @max_win: maximal send window to be used by link
* @session: session to be used by link * @session: session to be used by link
* @ownnode: identity of own node
* @peer: node id of peer node * @peer: node id of peer node
* @peer_caps: bitmap describing peer node capabilities * @peer_caps: bitmap describing peer node capabilities
* @bc_sndlink: the namespace global link used for broadcast sending * @bc_sndlink: the namespace global link used for broadcast sending
@ -458,8 +485,10 @@ u32 tipc_link_state(struct tipc_link *l)
* @inputq: queue to put messages ready for delivery * @inputq: queue to put messages ready for delivery
* @namedq: queue to put binding table update messages ready for delivery * @namedq: queue to put binding table update messages ready for delivery
* @link: return value, pointer to put the created link * @link: return value, pointer to put the created link
* @self: local unicast link id
* @peer_id: 128-bit ID of peer
* *
* Returns true if link was created, otherwise false * Return: true if link was created, otherwise false
*/ */
bool tipc_link_create(struct net *net, char *if_name, int bearer_id, bool tipc_link_create(struct net *net, char *if_name, int bearer_id,
int tolerance, char net_plane, u32 mtu, int priority, int tolerance, char net_plane, u32 mtu, int priority,
@ -532,8 +561,13 @@ bool tipc_link_create(struct net *net, char *if_name, int bearer_id,
* @inputq: queue to put messages ready for delivery * @inputq: queue to put messages ready for delivery
* @namedq: queue to put binding table update messages ready for delivery * @namedq: queue to put binding table update messages ready for delivery
* @link: return value, pointer to put the created link * @link: return value, pointer to put the created link
* @ownnode: identity of own node
* @peer: node id of peer node
* @peer_id: 128-bit ID of peer
* @peer_caps: bitmap describing peer node capabilities
* @bc_sndlink: the namespace global link used for broadcast sending
* *
* Returns true if link was created, otherwise false * Return: true if link was created, otherwise false
*/ */
bool tipc_link_bc_create(struct net *net, u32 ownnode, u32 peer, u8 *peer_id, bool tipc_link_bc_create(struct net *net, u32 ownnode, u32 peer, u8 *peer_id,
int mtu, u32 min_win, u32 max_win, u16 peer_caps, int mtu, u32 min_win, u32 max_win, u16 peer_caps,
@ -788,7 +822,7 @@ static void link_profile_stats(struct tipc_link *l)
* tipc_link_too_silent - check if link is "too silent" * tipc_link_too_silent - check if link is "too silent"
* @l: tipc link to be checked * @l: tipc link to be checked
* *
* Returns true if the link 'silent_intv_cnt' is about to reach the * Return: true if the link 'silent_intv_cnt' is about to reach the
* 'abort_limit' value, otherwise false * 'abort_limit' value, otherwise false
*/ */
bool tipc_link_too_silent(struct tipc_link *l) bool tipc_link_too_silent(struct tipc_link *l)
@ -990,8 +1024,8 @@ void tipc_link_reset(struct tipc_link *l)
* @xmitq: returned list of packets to be sent by caller * @xmitq: returned list of packets to be sent by caller
* *
* Consumes the buffer chain. * Consumes the buffer chain.
* Returns 0 if success, or errno: -ELINKCONG, -EMSGSIZE or -ENOBUFS
* Messages at TIPC_SYSTEM_IMPORTANCE are always accepted * Messages at TIPC_SYSTEM_IMPORTANCE are always accepted
* Return: 0 if success, or errno: -ELINKCONG, -EMSGSIZE or -ENOBUFS
*/ */
int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list, int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list,
struct sk_buff_head *xmitq) struct sk_buff_head *xmitq)
@ -2376,7 +2410,7 @@ int tipc_link_bc_sync_rcv(struct tipc_link *l, struct tipc_msg *hdr,
if (!msg_peer_node_is_up(hdr)) if (!msg_peer_node_is_up(hdr))
return rc; return rc;
/* Open when peer ackowledges our bcast init msg (pkt #1) */ /* Open when peer acknowledges our bcast init msg (pkt #1) */
if (msg_ack(hdr)) if (msg_ack(hdr))
l->bc_peer_is_up = true; l->bc_peer_is_up = true;

29
net/tipc/msg.c
Просмотреть файл

@ -58,11 +58,13 @@ static unsigned int align(unsigned int i)
/** /**
* tipc_buf_acquire - creates a TIPC message buffer * tipc_buf_acquire - creates a TIPC message buffer
* @size: message size (including TIPC header) * @size: message size (including TIPC header)
* @gfp: memory allocation flags
* *
* Returns a new buffer with data pointers set to the specified size. * Return: a new buffer with data pointers set to the specified size.
* *
* NOTE: Headroom is reserved to allow prepending of a data link header. * NOTE:
* There may also be unrequested tailroom present at the buffer's end. * Headroom is reserved to allow prepending of a data link header.
* There may also be unrequested tailroom present at the buffer's end.
*/ */
struct sk_buff *tipc_buf_acquire(u32 size, gfp_t gfp) struct sk_buff *tipc_buf_acquire(u32 size, gfp_t gfp)
{ {
@ -207,8 +209,9 @@ err:
* @m: the data to be appended * @m: the data to be appended
* @mss: max allowable size of buffer * @mss: max allowable size of buffer
* @dlen: size of data to be appended * @dlen: size of data to be appended
* @txq: queue to appand to * @txq: queue to append to
* Returns the number og 1k blocks appended or errno value *
* Return: the number of 1k blocks appended or errno value
*/ */
int tipc_msg_append(struct tipc_msg *_hdr, struct msghdr *m, int dlen, int tipc_msg_append(struct tipc_msg *_hdr, struct msghdr *m, int dlen,
int mss, struct sk_buff_head *txq) int mss, struct sk_buff_head *txq)
@ -312,7 +315,7 @@ bool tipc_msg_validate(struct sk_buff **_skb)
* @pktmax: max size of a fragment incl. the header * @pktmax: max size of a fragment incl. the header
* @frags: returned fragment skb list * @frags: returned fragment skb list
* *
* Returns 0 if the fragmentation is successful, otherwise: -EINVAL * Return: 0 if the fragmentation is successful, otherwise: -EINVAL
* or -ENOMEM * or -ENOMEM
*/ */
int tipc_msg_fragment(struct sk_buff *skb, const struct tipc_msg *hdr, int tipc_msg_fragment(struct sk_buff *skb, const struct tipc_msg *hdr,
@ -367,6 +370,7 @@ error:
* tipc_msg_build - create buffer chain containing specified header and data * tipc_msg_build - create buffer chain containing specified header and data
* @mhdr: Message header, to be prepended to data * @mhdr: Message header, to be prepended to data
* @m: User message * @m: User message
* @offset: buffer offset for fragmented messages (FIXME)
* @dsz: Total length of user data * @dsz: Total length of user data
* @pktmax: Max packet size that can be used * @pktmax: Max packet size that can be used
* @list: Buffer or chain of buffers to be returned to caller * @list: Buffer or chain of buffers to be returned to caller
@ -374,7 +378,7 @@ error:
* Note that the recursive call we are making here is safe, since it can * Note that the recursive call we are making here is safe, since it can
* logically go only one further level down. * logically go only one further level down.
* *
* Returns message data size or errno: -ENOMEM, -EFAULT * Return: message data size or errno: -ENOMEM, -EFAULT
*/ */
int tipc_msg_build(struct tipc_msg *mhdr, struct msghdr *m, int offset, int tipc_msg_build(struct tipc_msg *mhdr, struct msghdr *m, int offset,
int dsz, int pktmax, struct sk_buff_head *list) int dsz, int pktmax, struct sk_buff_head *list)
@ -485,7 +489,7 @@ error:
* @msg: message to be appended * @msg: message to be appended
* @max: max allowable size for the bundle buffer * @max: max allowable size for the bundle buffer
* *
* Returns "true" if bundling has been performed, otherwise "false" * Return: "true" if bundling has been performed, otherwise "false"
*/ */
static bool tipc_msg_bundle(struct sk_buff *bskb, struct tipc_msg *msg, static bool tipc_msg_bundle(struct sk_buff *bskb, struct tipc_msg *msg,
u32 max) u32 max)
@ -580,9 +584,9 @@ bundle:
* @skb: buffer to be extracted from. * @skb: buffer to be extracted from.
* @iskb: extracted inner buffer, to be returned * @iskb: extracted inner buffer, to be returned
* @pos: position in outer message of msg to be extracted. * @pos: position in outer message of msg to be extracted.
* Returns position of next msg * Returns position of next msg.
* Consumes outer buffer when last packet extracted * Consumes outer buffer when last packet extracted
* Returns true when there is an extracted buffer, otherwise false * Return: true when there is an extracted buffer, otherwise false
*/ */
bool tipc_msg_extract(struct sk_buff *skb, struct sk_buff **iskb, int *pos) bool tipc_msg_extract(struct sk_buff *skb, struct sk_buff **iskb, int *pos)
{ {
@ -626,7 +630,7 @@ none:
* @skb: buffer containing message to be reversed; will be consumed * @skb: buffer containing message to be reversed; will be consumed
* @err: error code to be set in message, if any * @err: error code to be set in message, if any
* Replaces consumed buffer with new one when successful * Replaces consumed buffer with new one when successful
* Returns true if success, otherwise false * Return: true if success, otherwise false
*/ */
bool tipc_msg_reverse(u32 own_node, struct sk_buff **skb, int err) bool tipc_msg_reverse(u32 own_node, struct sk_buff **skb, int err)
{ {
@ -698,10 +702,11 @@ bool tipc_msg_skb_clone(struct sk_buff_head *msg, struct sk_buff_head *cpy)
/** /**
* tipc_msg_lookup_dest(): try to find new destination for named message * tipc_msg_lookup_dest(): try to find new destination for named message
* @net: pointer to associated network namespace
* @skb: the buffer containing the message. * @skb: the buffer containing the message.
* @err: error code to be used by caller if lookup fails * @err: error code to be used by caller if lookup fails
* Does not consume buffer * Does not consume buffer
* Returns true if a destination is found, false otherwise * Return: true if a destination is found, false otherwise
*/ */
bool tipc_msg_lookup_dest(struct net *net, struct sk_buff *skb, int *err) bool tipc_msg_lookup_dest(struct net *net, struct sk_buff *skb, int *err)
{ {

29
net/tipc/name_distr.c
Просмотреть файл

@ -50,6 +50,8 @@ struct distr_queue_item {
/** /**
* publ_to_item - add publication info to a publication message * publ_to_item - add publication info to a publication message
* @p: publication info
* @i: location of item in the message
*/ */
static void publ_to_item(struct distr_item *i, struct publication *p) static void publ_to_item(struct distr_item *i, struct publication *p)
{ {
@ -62,6 +64,10 @@ static void publ_to_item(struct distr_item *i, struct publication *p)
/** /**
* named_prepare_buf - allocate & initialize a publication message * named_prepare_buf - allocate & initialize a publication message
* @net: the associated network namespace
* @type: message type
* @size: payload size
* @dest: destination node
* *
* The buffer returned is of size INT_H_SIZE + payload size * The buffer returned is of size INT_H_SIZE + payload size
*/ */
@ -83,6 +89,8 @@ static struct sk_buff *named_prepare_buf(struct net *net, u32 type, u32 size,
/** /**
* tipc_named_publish - tell other nodes about a new publication by this node * tipc_named_publish - tell other nodes about a new publication by this node
* @net: the associated network namespace
* @publ: the new publication
*/ */
struct sk_buff *tipc_named_publish(struct net *net, struct publication *publ) struct sk_buff *tipc_named_publish(struct net *net, struct publication *publ)
{ {
@ -111,6 +119,8 @@ struct sk_buff *tipc_named_publish(struct net *net, struct publication *publ)
/** /**
* tipc_named_withdraw - tell other nodes about a withdrawn publication by this node * tipc_named_withdraw - tell other nodes about a withdrawn publication by this node
* @net: the associated network namespace
* @publ: the withdrawn publication
*/ */
struct sk_buff *tipc_named_withdraw(struct net *net, struct publication *publ) struct sk_buff *tipc_named_withdraw(struct net *net, struct publication *publ)
{ {
@ -138,9 +148,11 @@ struct sk_buff *tipc_named_withdraw(struct net *net, struct publication *publ)
/** /**
* named_distribute - prepare name info for bulk distribution to another node * named_distribute - prepare name info for bulk distribution to another node
* @net: the associated network namespace
* @list: list of messages (buffers) to be returned from this function * @list: list of messages (buffers) to be returned from this function
* @dnode: node to be updated * @dnode: node to be updated
* @pls: linked list of publication items to be packed into buffer chain * @pls: linked list of publication items to be packed into buffer chain
* @seqno: sequence number for this message
*/ */
static void named_distribute(struct net *net, struct sk_buff_head *list, static void named_distribute(struct net *net, struct sk_buff_head *list,
u32 dnode, struct list_head *pls, u16 seqno) u32 dnode, struct list_head *pls, u16 seqno)
@ -194,6 +206,9 @@ static void named_distribute(struct net *net, struct sk_buff_head *list,
/** /**
* tipc_named_node_up - tell specified node about all publications by this node * tipc_named_node_up - tell specified node about all publications by this node
* @net: the associated network namespace
* @dnode: destination node
* @capabilities: peer node's capabilities
*/ */
void tipc_named_node_up(struct net *net, u32 dnode, u16 capabilities) void tipc_named_node_up(struct net *net, u32 dnode, u16 capabilities)
{ {
@ -217,6 +232,9 @@ void tipc_named_node_up(struct net *net, u32 dnode, u16 capabilities)
/** /**
* tipc_publ_purge - remove publication associated with a failed node * tipc_publ_purge - remove publication associated with a failed node
* @net: the associated network namespace
* @publ: the publication to remove
* @addr: failed node's address
* *
* Invoked for each publication issued by a newly failed node. * Invoked for each publication issued by a newly failed node.
* Removes publication structure from name table & deletes it. * Removes publication structure from name table & deletes it.
@ -263,9 +281,13 @@ void tipc_publ_notify(struct net *net, struct list_head *nsub_list,
/** /**
* tipc_update_nametbl - try to process a nametable update and notify * tipc_update_nametbl - try to process a nametable update and notify
* subscribers * subscribers
* @net: the associated network namespace
* @i: location of item in the message
* @node: node address
* @dtype: name distributor message type
* *
* tipc_nametbl_lock must be held. * tipc_nametbl_lock must be held.
* Returns the publication item if successful, otherwise NULL. * Return: the publication item if successful, otherwise NULL.
*/ */
static bool tipc_update_nametbl(struct net *net, struct distr_item *i, static bool tipc_update_nametbl(struct net *net, struct distr_item *i,
u32 node, u32 dtype) u32 node, u32 dtype)
@ -347,6 +369,10 @@ static struct sk_buff *tipc_named_dequeue(struct sk_buff_head *namedq,
/** /**
* tipc_named_rcv - process name table update messages sent by another node * tipc_named_rcv - process name table update messages sent by another node
* @net: the associated network namespace
* @namedq: queue to receive from
* @rcv_nxt: store last received seqno here
* @open: last bulk msg was received (FIXME)
*/ */
void tipc_named_rcv(struct net *net, struct sk_buff_head *namedq, void tipc_named_rcv(struct net *net, struct sk_buff_head *namedq,
u16 *rcv_nxt, bool *open) u16 *rcv_nxt, bool *open)
@ -374,6 +400,7 @@ void tipc_named_rcv(struct net *net, struct sk_buff_head *namedq,
/** /**
* tipc_named_reinit - re-initialize local publications * tipc_named_reinit - re-initialize local publications
* @net: the associated network namespace
* *
* This routine is called whenever TIPC networking is enabled. * This routine is called whenever TIPC networking is enabled.
* All name table entries published by this node are updated to reflect * All name table entries published by this node are updated to reflect

2
net/tipc/name_distr.h
Просмотреть файл

@ -46,7 +46,7 @@
* @type: name sequence type * @type: name sequence type
* @lower: name sequence lower bound * @lower: name sequence lower bound
* @upper: name sequence upper bound * @upper: name sequence upper bound
* @ref: publishing port reference * @port: publishing port reference
* @key: publication key * @key: publication key
* *
* ===> All fields are stored in network byte order. <=== * ===> All fields are stored in network byte order. <===

46
net/tipc/name_table.c
Просмотреть файл

@ -104,7 +104,8 @@ RB_DECLARE_CALLBACKS_MAX(static, sr_callbacks,
* range match * range match
* @sr: the service range pointer as a loop cursor * @sr: the service range pointer as a loop cursor
* @sc: the pointer to tipc service which holds the service range rbtree * @sc: the pointer to tipc service which holds the service range rbtree
* @start, end: the range (end >= start) for matching * @start: beginning of the search range (end >= start) for matching
* @end: end of the search range (end >= start) for matching
*/ */
#define service_range_foreach_match(sr, sc, start, end) \ #define service_range_foreach_match(sr, sc, start, end) \
for (sr = service_range_match_first((sc)->ranges.rb_node, \ for (sr = service_range_match_first((sc)->ranges.rb_node, \
@ -118,7 +119,8 @@ RB_DECLARE_CALLBACKS_MAX(static, sr_callbacks,
/** /**
* service_range_match_first - find first service range matching a range * service_range_match_first - find first service range matching a range
* @n: the root node of service range rbtree for searching * @n: the root node of service range rbtree for searching
* @start, end: the range (end >= start) for matching * @start: beginning of the search range (end >= start) for matching
* @end: end of the search range (end >= start) for matching
* *
* Return: the leftmost service range node in the rbtree that overlaps the * Return: the leftmost service range node in the rbtree that overlaps the
* specific range if any. Otherwise, returns NULL. * specific range if any. Otherwise, returns NULL.
@ -167,7 +169,8 @@ static struct service_range *service_range_match_first(struct rb_node *n,
/** /**
* service_range_match_next - find next service range matching a range * service_range_match_next - find next service range matching a range
* @n: a node in service range rbtree from which the searching starts * @n: a node in service range rbtree from which the searching starts
* @start, end: the range (end >= start) for matching * @start: beginning of the search range (end >= start) for matching
* @end: end of the search range (end >= start) for matching
* *
* Return: the next service range node to the given node in the rbtree that * Return: the next service range node to the given node in the rbtree that
* overlaps the specific range if any. Otherwise, returns NULL. * overlaps the specific range if any. Otherwise, returns NULL.
@ -219,6 +222,13 @@ static int hash(int x)
/** /**
* tipc_publ_create - create a publication structure * tipc_publ_create - create a publication structure
* @type: name sequence type
* @lower: name sequence lower bound
* @upper: name sequence upper bound
* @scope: publication scope
* @node: network address of publishing socket
* @port: publishing port
* @key: publication key
*/ */
static struct publication *tipc_publ_create(u32 type, u32 lower, u32 upper, static struct publication *tipc_publ_create(u32 type, u32 lower, u32 upper,
u32 scope, u32 node, u32 port, u32 scope, u32 node, u32 port,
@ -246,6 +256,8 @@ static struct publication *tipc_publ_create(u32 type, u32 lower, u32 upper,
/** /**
* tipc_service_create - create a service structure for the specified 'type' * tipc_service_create - create a service structure for the specified 'type'
* @type: service type
* @hd: name_table services list
* *
* Allocates a single range structure and sets it to all 0's. * Allocates a single range structure and sets it to all 0's.
*/ */
@ -362,6 +374,9 @@ err:
/** /**
* tipc_service_remove_publ - remove a publication from a service * tipc_service_remove_publ - remove a publication from a service
* @sr: service_range to remove publication from
* @node: target node
* @key: target publication key
*/ */
static struct publication *tipc_service_remove_publ(struct service_range *sr, static struct publication *tipc_service_remove_publ(struct service_range *sr,
u32 node, u32 key) u32 node, u32 key)
@ -378,7 +393,7 @@ static struct publication *tipc_service_remove_publ(struct service_range *sr,
return NULL; return NULL;
} }
/** /*
* Code reused: time_after32() for the same purpose * Code reused: time_after32() for the same purpose
*/ */
#define publication_after(pa, pb) time_after32((pa)->id, (pb)->id) #define publication_after(pa, pb) time_after32((pa)->id, (pb)->id)
@ -396,6 +411,8 @@ static int tipc_publ_sort(void *priv, struct list_head *a,
* tipc_service_subscribe - attach a subscription, and optionally * tipc_service_subscribe - attach a subscription, and optionally
* issue the prescribed number of events if there is any service * issue the prescribed number of events if there is any service
* range overlapping with the requested range * range overlapping with the requested range
* @service: the tipc_service to attach the @sub to
* @sub: the subscription to attach
*/ */
static void tipc_service_subscribe(struct tipc_service *service, static void tipc_service_subscribe(struct tipc_service *service,
struct tipc_subscription *sub) struct tipc_subscription *sub)
@ -529,14 +546,16 @@ exit:
/** /**
* tipc_nametbl_translate - perform service instance to socket translation * tipc_nametbl_translate - perform service instance to socket translation
* * @net: network namespace
* On entry, 'dnode' is the search domain used during translation. * @type: message type
* @instance: message instance
* @dnode: the search domain used during translation
* *
* On exit: * On exit:
* - if translation is deferred to another node, leave 'dnode' unchanged and * - if translation is deferred to another node, leave 'dnode' unchanged and
* return 0 * return 0
* - if translation is attempted and succeeds, set 'dnode' to the publishing * - if translation is attempted and succeeds, set 'dnode' to the publishing
* node and return the published (non-zero) port number * node and return the published (non-zero) port number
* - if translation is attempted and fails, set 'dnode' to 0 and return 0 * - if translation is attempted and fails, set 'dnode' to 0 and return 0
* *
* Note that for legacy users (node configured with Z.C.N address format) the * Note that for legacy users (node configured with Z.C.N address format) the
@ -757,6 +776,11 @@ exit:
/** /**
* tipc_nametbl_withdraw - withdraw a service binding * tipc_nametbl_withdraw - withdraw a service binding
* @net: network namespace
* @type: service type
* @lower: service range lower bound
* @upper: service range upper bound
* @key: target publication key
*/ */
int tipc_nametbl_withdraw(struct net *net, u32 type, u32 lower, int tipc_nametbl_withdraw(struct net *net, u32 type, u32 lower,
u32 upper, u32 key) u32 upper, u32 key)
@ -792,6 +816,7 @@ int tipc_nametbl_withdraw(struct net *net, u32 type, u32 lower,
/** /**
* tipc_nametbl_subscribe - add a subscription object to the name table * tipc_nametbl_subscribe - add a subscription object to the name table
* @sub: subscription to add
*/ */
bool tipc_nametbl_subscribe(struct tipc_subscription *sub) bool tipc_nametbl_subscribe(struct tipc_subscription *sub)
{ {
@ -822,6 +847,7 @@ bool tipc_nametbl_subscribe(struct tipc_subscription *sub)
/** /**
* tipc_nametbl_unsubscribe - remove a subscription object from name table * tipc_nametbl_unsubscribe - remove a subscription object from name table
* @sub: subscription to remove
*/ */
void tipc_nametbl_unsubscribe(struct tipc_subscription *sub) void tipc_nametbl_unsubscribe(struct tipc_subscription *sub)
{ {
@ -871,7 +897,9 @@ int tipc_nametbl_init(struct net *net)
} }
/** /**
* tipc_service_delete - purge all publications for a service and delete it * tipc_service_delete - purge all publications for a service and delete it
* @net: the associated network namespace
* @sc: tipc_service to delete
*/ */
static void tipc_service_delete(struct net *net, struct tipc_service *sc) static void tipc_service_delete(struct net *net, struct tipc_service *sc)
{ {

9
net/tipc/name_table.h
Просмотреть файл

@ -60,8 +60,8 @@ struct tipc_group;
* @key: publication key, unique across the cluster * @key: publication key, unique across the cluster
* @id: publication id * @id: publication id
* @binding_node: all publications from the same node which bound this one * @binding_node: all publications from the same node which bound this one
* - Remote publications: in node->publ_list * - Remote publications: in node->publ_list;
* Used by node/name distr to withdraw publications when node is lost * Used by node/name distr to withdraw publications when node is lost
* - Local/node scope publications: in name_table->node_scope list * - Local/node scope publications: in name_table->node_scope list
* - Local/cluster scope publications: in name_table->cluster_scope list * - Local/cluster scope publications: in name_table->cluster_scope list
* @binding_sock: all publications from the same socket which bound this one * @binding_sock: all publications from the same socket which bound this one
@ -92,13 +92,16 @@ struct publication {
/** /**
* struct name_table - table containing all existing port name publications * struct name_table - table containing all existing port name publications
* @seq_hlist: name sequence hash lists * @services: name sequence hash lists
* @node_scope: all local publications with node scope * @node_scope: all local publications with node scope
* - used by name_distr during re-init of name table * - used by name_distr during re-init of name table
* @cluster_scope: all local publications with cluster scope * @cluster_scope: all local publications with cluster scope
* - used by name_distr to send bulk updates to new nodes * - used by name_distr to send bulk updates to new nodes
* - used by name_distr during re-init of name table * - used by name_distr during re-init of name table
* @cluster_scope_lock: lock for accessing @cluster_scope
* @local_publ_count: number of publications issued by this node * @local_publ_count: number of publications issued by this node
* @rc_dests: destination node counter
* @snd_nxt: next sequence number to be used
*/ */
struct name_table { struct name_table {
struct hlist_head services[TIPC_NAMETBL_SIZE]; struct hlist_head services[TIPC_NAMETBL_SIZE];

37
net/tipc/node.c
Просмотреть файл

@ -82,7 +82,7 @@ struct tipc_bclink_entry {
/** /**
* struct tipc_node - TIPC node structure * struct tipc_node - TIPC node structure
* @addr: network address of node * @addr: network address of node
* @ref: reference counter to node object * @kref: reference counter to node object
* @lock: rwlock governing access to structure * @lock: rwlock governing access to structure
* @net: the applicable net namespace * @net: the applicable net namespace
* @hash: links to adjacent nodes in unsorted hash chain * @hash: links to adjacent nodes in unsorted hash chain
@ -90,9 +90,11 @@ struct tipc_bclink_entry {
* @namedq: pointer to name table input queue with name table messages * @namedq: pointer to name table input queue with name table messages
* @active_links: bearer ids of active links, used as index into links[] array * @active_links: bearer ids of active links, used as index into links[] array
* @links: array containing references to all links to node * @links: array containing references to all links to node
* @bc_entry: broadcast link entry
* @action_flags: bit mask of different types of node actions * @action_flags: bit mask of different types of node actions
* @state: connectivity state vs peer node * @state: connectivity state vs peer node
* @preliminary: a preliminary node or not * @preliminary: a preliminary node or not
* @failover_sent: failover sent or not
* @sync_point: sequence number where synch/failover is finished * @sync_point: sequence number where synch/failover is finished
* @list: links to adjacent nodes in sorted list of cluster's nodes * @list: links to adjacent nodes in sorted list of cluster's nodes
* @working_links: number of working links to node (both active and standby) * @working_links: number of working links to node (both active and standby)
@ -100,9 +102,16 @@ struct tipc_bclink_entry {
* @capabilities: bitmap, indicating peer node's functional capabilities * @capabilities: bitmap, indicating peer node's functional capabilities
* @signature: node instance identifier * @signature: node instance identifier
* @link_id: local and remote bearer ids of changing link, if any * @link_id: local and remote bearer ids of changing link, if any
* @peer_id: 128-bit ID of peer
* @peer_id_string: ID string of peer
* @publ_list: list of publications * @publ_list: list of publications
* @conn_sks: list of connections (FIXME)
* @timer: node's keepalive timer
* @keepalive_intv: keepalive interval in milliseconds
* @rcu: rcu struct for tipc_node * @rcu: rcu struct for tipc_node
* @delete_at: indicates the time for deleting a down node * @delete_at: indicates the time for deleting a down node
* @peer_net: peer's net namespace
* @peer_hash_mix: hash for this peer (FIXME)
* @crypto_rx: RX crypto handler * @crypto_rx: RX crypto handler
*/ */
struct tipc_node { struct tipc_node {
@ -267,6 +276,7 @@ char *tipc_node_get_id_str(struct tipc_node *node)
#ifdef CONFIG_TIPC_CRYPTO #ifdef CONFIG_TIPC_CRYPTO
/** /**
* tipc_node_crypto_rx - Retrieve crypto RX handle from node * tipc_node_crypto_rx - Retrieve crypto RX handle from node
* @__n: target tipc_node
* Note: node ref counter must be held first! * Note: node ref counter must be held first!
*/ */
struct tipc_crypto *tipc_node_crypto_rx(struct tipc_node *__n) struct tipc_crypto *tipc_node_crypto_rx(struct tipc_node *__n)
@ -814,6 +824,9 @@ static void tipc_node_timeout(struct timer_list *t)
/** /**
* __tipc_node_link_up - handle addition of link * __tipc_node_link_up - handle addition of link
* @n: target tipc_node
* @bearer_id: id of the bearer
* @xmitq: queue for messages to be xmited on
* Node lock must be held by caller * Node lock must be held by caller
* Link becomes active (alone or shared) or standby, depending on its priority. * Link becomes active (alone or shared) or standby, depending on its priority.
*/ */
@ -880,6 +893,9 @@ static void __tipc_node_link_up(struct tipc_node *n, int bearer_id,
/** /**
* tipc_node_link_up - handle addition of link * tipc_node_link_up - handle addition of link
* @n: target tipc_node
* @bearer_id: id of the bearer
* @xmitq: queue for messages to be xmited on
* *
* Link becomes active (alone or shared) or standby, depending on its priority. * Link becomes active (alone or shared) or standby, depending on its priority.
*/ */
@ -900,10 +916,11 @@ static void tipc_node_link_up(struct tipc_node *n, int bearer_id,
* *
* This function is only called in a very special situation where link * This function is only called in a very special situation where link
* failover can be already started on peer node but not on this node. * failover can be already started on peer node but not on this node.
* This can happen when e.g. * This can happen when e.g.::
*
* 1. Both links <1A-2A>, <1B-2B> down * 1. Both links <1A-2A>, <1B-2B> down
* 2. Link endpoint 2A up, but 1A still down (e.g. due to network * 2. Link endpoint 2A up, but 1A still down (e.g. due to network
* disturbance, wrong session, etc.) * disturbance, wrong session, etc.)
* 3. Link <1B-2B> up * 3. Link <1B-2B> up
* 4. Link endpoint 2A down (e.g. due to link tolerance timeout) * 4. Link endpoint 2A down (e.g. due to link tolerance timeout)
* 5. Node 2 starts failover onto link <1B-2B> * 5. Node 2 starts failover onto link <1B-2B>
@ -940,6 +957,10 @@ static void tipc_node_link_failover(struct tipc_node *n, struct tipc_link *l,
/** /**
* __tipc_node_link_down - handle loss of link * __tipc_node_link_down - handle loss of link
* @n: target tipc_node
* @bearer_id: id of the bearer
* @xmitq: queue for messages to be xmited on
* @maddr: output media address of the bearer
*/ */
static void __tipc_node_link_down(struct tipc_node *n, int *bearer_id, static void __tipc_node_link_down(struct tipc_node *n, int *bearer_id,
struct sk_buff_head *xmitq, struct sk_buff_head *xmitq,
@ -1525,11 +1546,13 @@ static void node_lost_contact(struct tipc_node *n,
/** /**
* tipc_node_get_linkname - get the name of a link * tipc_node_get_linkname - get the name of a link
* *
* @net: the applicable net namespace
* @bearer_id: id of the bearer * @bearer_id: id of the bearer
* @addr: peer node address * @addr: peer node address
* @linkname: link name output buffer * @linkname: link name output buffer
* @len: size of @linkname output buffer
* *
* Returns 0 on success * Return: 0 on success
*/ */
int tipc_node_get_linkname(struct net *net, u32 bearer_id, u32 addr, int tipc_node_get_linkname(struct net *net, u32 bearer_id, u32 addr,
char *linkname, size_t len) char *linkname, size_t len)
@ -1648,7 +1671,7 @@ static void tipc_lxc_xmit(struct net *peer_net, struct sk_buff_head *list)
* @dnode: address of destination node * @dnode: address of destination node
* @selector: a number used for deterministic link selection * @selector: a number used for deterministic link selection
* Consumes the buffer chain. * Consumes the buffer chain.
* Returns 0 if success, otherwise: -ELINKCONG,-EHOSTUNREACH,-EMSGSIZE,-ENOBUF * Return: 0 if success, otherwise: -ELINKCONG,-EHOSTUNREACH,-EMSGSIZE,-ENOBUF
*/ */
int tipc_node_xmit(struct net *net, struct sk_buff_head *list, int tipc_node_xmit(struct net *net, struct sk_buff_head *list,
u32 dnode, int selector) u32 dnode, int selector)
@ -1881,9 +1904,11 @@ static void tipc_node_bc_rcv(struct net *net, struct sk_buff *skb, int bearer_id
/** /**
* tipc_node_check_state - check and if necessary update node state * tipc_node_check_state - check and if necessary update node state
* @n: target tipc_node
* @skb: TIPC packet * @skb: TIPC packet
* @bearer_id: identity of bearer delivering the packet * @bearer_id: identity of bearer delivering the packet
* Returns true if state and msg are ok, otherwise false * @xmitq: queue for messages to be xmited on
* Return: true if state and msg are ok, otherwise false
*/ */
static bool tipc_node_check_state(struct tipc_node *n, struct sk_buff *skb, static bool tipc_node_check_state(struct tipc_node *n, struct sk_buff *skb,
int bearer_id, struct sk_buff_head *xmitq) int bearer_id, struct sk_buff_head *xmitq)

90
net/tipc/socket.c
Просмотреть файл

@ -80,19 +80,32 @@ struct sockaddr_pair {
* @maxnagle: maximum size of msg which can be subject to nagle * @maxnagle: maximum size of msg which can be subject to nagle
* @portid: unique port identity in TIPC socket hash table * @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
* #cong_links: list of congested links * @cong_links: list of congested links
* @publications: list of publications for port * @publications: list of publications for port
* @blocking_link: address of the congested link we are currently sleeping on * @blocking_link: address of the congested link we are currently sleeping on
* @pub_count: total # of publications port has made during its lifetime * @pub_count: total # of publications port has made during its lifetime
* @conn_timeout: the time we can wait for an unresponded setup request * @conn_timeout: the time we can wait for an unresponded setup request
* @probe_unacked: probe has not received ack yet
* @dupl_rcvcnt: number of bytes counted twice, in both backlog and rcv queue * @dupl_rcvcnt: number of bytes counted twice, in both backlog and rcv queue
* @cong_link_cnt: number of congested links * @cong_link_cnt: number of congested links
* @snt_unacked: # messages sent by socket, and not yet acked by peer * @snt_unacked: # messages sent by socket, and not yet acked by peer
* @snd_win: send window size
* @peer_caps: peer capabilities mask
* @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
* @rcv_win: receive window size
* @peer: 'connected' peer for dgram/rdm * @peer: 'connected' peer for dgram/rdm
* @node: hash table node * @node: hash table node
* @mc_method: cookie for use between socket and broadcast layer * @mc_method: cookie for use between socket and broadcast layer
* @rcu: rcu struct for tipc_sock * @rcu: rcu struct for tipc_sock
* @group: TIPC communications group
* @oneway: message count in one direction (FIXME)
* @nagle_start: current nagle value
* @snd_backlog: send backlog count
* @msg_acc: messages accepted; used in managing backlog and nagle
* @pkt_cnt: TIPC socket packet count
* @expect_ack: whether this TIPC socket is expecting an ack
* @nodelay: setsockopt() TIPC_NODELAY setting
* @group_is_open: TIPC socket group is fully open (FIXME)
*/ */
struct tipc_sock { struct tipc_sock {
struct sock sk; struct sock sk;
@ -261,6 +274,7 @@ static void tsk_set_nagle(struct tipc_sock *tsk)
/** /**
* tsk_advance_rx_queue - discard first buffer in socket receive queue * tsk_advance_rx_queue - discard first buffer in socket receive queue
* @sk: network socket
* *
* Caller must hold socket lock * Caller must hold socket lock
*/ */
@ -289,6 +303,8 @@ static void tipc_sk_respond(struct sock *sk, struct sk_buff *skb, int err)
/** /**
* tsk_rej_rx_queue - reject all buffers in socket receive queue * tsk_rej_rx_queue - reject all buffers in socket receive queue
* @sk: network socket
* @error: response error code
* *
* Caller must hold socket lock * Caller must hold socket lock
*/ */
@ -442,7 +458,7 @@ static int tipc_sk_sock_err(struct socket *sock, long *timeout)
* This routine creates additional data structures used by the TIPC socket, * This routine creates additional data structures used by the TIPC socket,
* initializes them, and links them together. * initializes them, and links them together.
* *
* Returns 0 on success, errno otherwise * Return: 0 on success, errno otherwise
*/ */
static int tipc_sk_create(struct net *net, struct socket *sock, static int tipc_sk_create(struct net *net, struct socket *sock,
int protocol, int kern) int protocol, int kern)
@ -607,7 +623,7 @@ static void __tipc_shutdown(struct socket *sock, int error)
* are returned or discarded according to the "destination droppable" setting * are returned or discarded according to the "destination droppable" setting
* specified for the message by the sender. * specified for the message by the sender.
* *
* Returns 0 on success, errno otherwise * Return: 0 on success, errno otherwise
*/ */
static int tipc_release(struct socket *sock) static int tipc_release(struct socket *sock)
{ {
@ -654,7 +670,7 @@ static int tipc_release(struct socket *sock)
* a negative scope value unbinds the specified name. Specifying no name * a negative scope value unbinds the specified name. Specifying no name
* (i.e. a socket address length of 0) unbinds all names from the socket. * (i.e. a socket address length of 0) unbinds all names from the socket.
* *
* Returns 0 on success, errno otherwise * Return: 0 on success, errno otherwise
* *
* NOTE: This routine doesn't need to take the socket lock since it doesn't * NOTE: This routine doesn't need to take the socket lock since it doesn't
* access any non-constant socket information. * access any non-constant socket information.
@ -715,7 +731,7 @@ static int tipc_bind(struct socket *sock, struct sockaddr *skaddr, int alen)
* @uaddr: area for returned socket address * @uaddr: area for returned socket address
* @peer: 0 = own ID, 1 = current peer ID, 2 = current/former peer ID * @peer: 0 = own ID, 1 = current peer ID, 2 = current/former peer ID
* *
* Returns 0 on success, errno otherwise * Return: 0 on success, errno otherwise
* *
* NOTE: This routine doesn't need to take the socket lock since it only * NOTE: This routine doesn't need to take the socket lock since it only
* accesses socket information that is unchanging (or which changes in * accesses socket information that is unchanging (or which changes in
@ -754,7 +770,7 @@ static int tipc_getname(struct socket *sock, struct sockaddr *uaddr,
* @sock: socket for which to calculate the poll bits * @sock: socket for which to calculate the poll bits
* @wait: ??? * @wait: ???
* *
* Returns pollmask value * Return: pollmask value
* *
* COMMENTARY: * COMMENTARY:
* It appears that the usual socket locking mechanisms are not useful here * It appears that the usual socket locking mechanisms are not useful here
@ -816,7 +832,7 @@ static __poll_t tipc_poll(struct file *file, struct socket *sock,
* @timeout: timeout to wait for wakeup * @timeout: timeout to wait for wakeup
* *
* Called from function tipc_sendmsg(), which has done all sanity checks * Called from function tipc_sendmsg(), which has done all sanity checks
* Returns the number of bytes sent on success, or errno * Return: the number of bytes sent on success, or errno
*/ */
static int tipc_sendmcast(struct socket *sock, struct tipc_service_range *seq, static int tipc_sendmcast(struct socket *sock, struct tipc_service_range *seq,
struct msghdr *msg, size_t dlen, long timeout) struct msghdr *msg, size_t dlen, long timeout)
@ -876,6 +892,7 @@ static int tipc_sendmcast(struct socket *sock, struct tipc_service_range *seq,
/** /**
* tipc_send_group_msg - send a message to a member in the group * tipc_send_group_msg - send a message to a member in the group
* @net: network namespace * @net: network namespace
* @tsk: tipc socket
* @m: message to send * @m: message to send
* @mb: group member * @mb: group member
* @dnode: destination node * @dnode: destination node
@ -931,7 +948,7 @@ static int tipc_send_group_msg(struct net *net, struct tipc_sock *tsk,
* @timeout: timeout to wait for wakeup * @timeout: timeout to wait for wakeup
* *
* Called from function tipc_sendmsg(), which has done all sanity checks * Called from function tipc_sendmsg(), which has done all sanity checks
* Returns the number of bytes sent on success, or errno * Return: the number of bytes sent on success, or errno
*/ */
static int tipc_send_group_unicast(struct socket *sock, struct msghdr *m, static int tipc_send_group_unicast(struct socket *sock, struct msghdr *m,
int dlen, long timeout) int dlen, long timeout)
@ -975,7 +992,7 @@ static int tipc_send_group_unicast(struct socket *sock, struct msghdr *m,
* @timeout: timeout to wait for wakeup * @timeout: timeout to wait for wakeup
* *
* Called from function tipc_sendmsg(), which has done all sanity checks * Called from function tipc_sendmsg(), which has done all sanity checks
* Returns the number of bytes sent on success, or errno * Return: the number of bytes sent on success, or errno
*/ */
static int tipc_send_group_anycast(struct socket *sock, struct msghdr *m, static int tipc_send_group_anycast(struct socket *sock, struct msghdr *m,
int dlen, long timeout) int dlen, long timeout)
@ -1060,7 +1077,7 @@ static int tipc_send_group_anycast(struct socket *sock, struct msghdr *m,
* @timeout: timeout to wait for wakeup * @timeout: timeout to wait for wakeup
* *
* Called from function tipc_sendmsg(), which has done all sanity checks * Called from function tipc_sendmsg(), which has done all sanity checks
* Returns the number of bytes sent on success, or errno * Return: the number of bytes sent on success, or errno
*/ */
static int tipc_send_group_bcast(struct socket *sock, struct msghdr *m, static int tipc_send_group_bcast(struct socket *sock, struct msghdr *m,
int dlen, long timeout) int dlen, long timeout)
@ -1134,7 +1151,7 @@ static int tipc_send_group_bcast(struct socket *sock, struct msghdr *m,
* @timeout: timeout to wait for wakeup * @timeout: timeout to wait for wakeup
* *
* Called from function tipc_sendmsg(), which has done all sanity checks * Called from function tipc_sendmsg(), which has done all sanity checks
* Returns the number of bytes sent on success, or errno * Return: the number of bytes sent on success, or errno
*/ */
static int tipc_send_group_mcast(struct socket *sock, struct msghdr *m, static int tipc_send_group_mcast(struct socket *sock, struct msghdr *m,
int dlen, long timeout) int dlen, long timeout)
@ -1171,6 +1188,7 @@ static int tipc_send_group_mcast(struct socket *sock, struct msghdr *m,
/** /**
* tipc_sk_mcast_rcv - Deliver multicast messages to all destination sockets * tipc_sk_mcast_rcv - Deliver multicast messages to all destination sockets
* @net: the associated network namespace
* @arrvq: queue with arriving messages, to be cloned after destination lookup * @arrvq: queue with arriving messages, to be cloned after destination lookup
* @inputq: queue with cloned messages, delivered to socket after dest lookup * @inputq: queue with cloned messages, delivered to socket after dest lookup
* *
@ -1310,6 +1328,8 @@ static void tipc_sk_push_backlog(struct tipc_sock *tsk, bool nagle_ack)
* tipc_sk_conn_proto_rcv - receive a connection mng protocol message * tipc_sk_conn_proto_rcv - receive a connection mng protocol message
* @tsk: receiving socket * @tsk: receiving socket
* @skb: pointer to message buffer. * @skb: pointer to message buffer.
* @inputq: buffer list containing the buffers
* @xmitq: output message area
*/ */
static void tipc_sk_conn_proto_rcv(struct tipc_sock *tsk, struct sk_buff *skb, static void tipc_sk_conn_proto_rcv(struct tipc_sock *tsk, struct sk_buff *skb,
struct sk_buff_head *inputq, struct sk_buff_head *inputq,
@ -1377,7 +1397,7 @@ exit:
* and for 'SYN' messages on SOCK_SEQPACKET and SOCK_STREAM connections. * and for 'SYN' messages on SOCK_SEQPACKET and SOCK_STREAM connections.
* (Note: 'SYN+' is prohibited on SOCK_STREAM.) * (Note: 'SYN+' is prohibited on SOCK_STREAM.)
* *
* Returns the number of bytes sent on success, or errno otherwise * Return: the number of bytes sent on success, or errno otherwise
*/ */
static int tipc_sendmsg(struct socket *sock, static int tipc_sendmsg(struct socket *sock,
struct msghdr *m, size_t dsz) struct msghdr *m, size_t dsz)
@ -1522,7 +1542,7 @@ static int __tipc_sendmsg(struct socket *sock, struct msghdr *m, size_t dlen)
* *
* Used for SOCK_STREAM data. * Used for SOCK_STREAM data.
* *
* Returns the number of bytes sent on success (or partial success), * Return: the number of bytes sent on success (or partial success),
* or errno if no data sent * or errno if no data sent
*/ */
static int tipc_sendstream(struct socket *sock, struct msghdr *m, size_t dsz) static int tipc_sendstream(struct socket *sock, struct msghdr *m, size_t dsz)
@ -1630,7 +1650,7 @@ static int __tipc_sendstream(struct socket *sock, struct msghdr *m, size_t dlen)
* *
* Used for SOCK_SEQPACKET messages. * Used for SOCK_SEQPACKET messages.
* *
* Returns the number of bytes sent on success, or errno otherwise * Return: the number of bytes sent on success, or errno otherwise
*/ */
static int tipc_send_packet(struct socket *sock, struct msghdr *m, size_t dsz) static int tipc_send_packet(struct socket *sock, struct msghdr *m, size_t dsz)
{ {
@ -1715,7 +1735,7 @@ static void tipc_sk_set_orig_addr(struct msghdr *m, struct sk_buff *skb)
* *
* Note: Ancillary data is not captured if not requested by receiver. * Note: Ancillary data is not captured if not requested by receiver.
* *
* Returns 0 if successful, otherwise errno * Return: 0 if successful, otherwise errno
*/ */
static int tipc_sk_anc_data_recv(struct msghdr *m, struct sk_buff *skb, static int tipc_sk_anc_data_recv(struct msghdr *m, struct sk_buff *skb,
struct tipc_sock *tsk) struct tipc_sock *tsk)
@ -1865,6 +1885,7 @@ static int tipc_wait_for_rcvmsg(struct socket *sock, long *timeop)
/** /**
* tipc_recvmsg - receive packet-oriented message * tipc_recvmsg - receive packet-oriented message
* @sock: network socket
* @m: descriptor for message info * @m: descriptor for message info
* @buflen: length of user buffer area * @buflen: length of user buffer area
* @flags: receive flags * @flags: receive flags
@ -1872,7 +1893,7 @@ static int tipc_wait_for_rcvmsg(struct socket *sock, long *timeop)
* Used for SOCK_DGRAM, SOCK_RDM, and SOCK_SEQPACKET messages. * Used for SOCK_DGRAM, SOCK_RDM, and SOCK_SEQPACKET messages.
* If the complete message doesn't fit in user area, truncate it. * If the complete message doesn't fit in user area, truncate it.
* *
* Returns size of returned message data, errno otherwise * Return: size of returned message data, errno otherwise
*/ */
static int tipc_recvmsg(struct socket *sock, struct msghdr *m, static int tipc_recvmsg(struct socket *sock, struct msghdr *m,
size_t buflen, int flags) size_t buflen, int flags)
@ -1973,6 +1994,7 @@ exit:
/** /**
* tipc_recvstream - receive stream-oriented data * tipc_recvstream - receive stream-oriented data
* @sock: network socket
* @m: descriptor for message info * @m: descriptor for message info
* @buflen: total size of user buffer area * @buflen: total size of user buffer area
* @flags: receive flags * @flags: receive flags
@ -1980,7 +2002,7 @@ exit:
* Used for SOCK_STREAM messages only. If not enough data is available * Used for SOCK_STREAM messages only. If not enough data is available
* will optionally wait for more; never truncates data. * will optionally wait for more; never truncates data.
* *
* Returns size of returned message data, errno otherwise * Return: size of returned message data, errno otherwise
*/ */
static int tipc_recvstream(struct socket *sock, struct msghdr *m, static int tipc_recvstream(struct socket *sock, struct msghdr *m,
size_t buflen, int flags) size_t buflen, int flags)
@ -2158,7 +2180,7 @@ static void tipc_sk_proto_rcv(struct sock *sk,
* @tsk: TIPC socket * @tsk: TIPC socket
* @skb: pointer to message buffer. * @skb: pointer to message buffer.
* @xmitq: for Nagle ACK if any * @xmitq: for Nagle ACK if any
* Returns true if message should be added to receive queue, false otherwise * Return: true if message should be added to receive queue, false otherwise
*/ */
static bool tipc_sk_filter_connect(struct tipc_sock *tsk, struct sk_buff *skb, static bool tipc_sk_filter_connect(struct tipc_sock *tsk, struct sk_buff *skb,
struct sk_buff_head *xmitq) struct sk_buff_head *xmitq)
@ -2272,7 +2294,7 @@ static bool tipc_sk_filter_connect(struct tipc_sock *tsk, struct sk_buff *skb,
* TIPC_HIGH_IMPORTANCE (8 MB) * TIPC_HIGH_IMPORTANCE (8 MB)
* TIPC_CRITICAL_IMPORTANCE (16 MB) * TIPC_CRITICAL_IMPORTANCE (16 MB)
* *
* Returns overload limit according to corresponding message importance * Return: overload limit according to corresponding message importance
*/ */
static unsigned int rcvbuf_limit(struct sock *sk, struct sk_buff *skb) static unsigned int rcvbuf_limit(struct sock *sk, struct sk_buff *skb)
{ {
@ -2295,12 +2317,12 @@ static unsigned int rcvbuf_limit(struct sock *sk, struct sk_buff *skb)
* tipc_sk_filter_rcv - validate incoming message * tipc_sk_filter_rcv - validate incoming message
* @sk: socket * @sk: socket
* @skb: pointer to message. * @skb: pointer to message.
* @xmitq: output message area (FIXME)
* *
* Enqueues message on receive queue if acceptable; optionally handles * Enqueues message on receive queue if acceptable; optionally handles
* disconnect indication for a connected socket. * disconnect indication for a connected socket.
* *
* Called with socket lock already taken * Called with socket lock already taken
*
*/ */
static void tipc_sk_filter_rcv(struct sock *sk, struct sk_buff *skb, static void tipc_sk_filter_rcv(struct sock *sk, struct sk_buff *skb,
struct sk_buff_head *xmitq) struct sk_buff_head *xmitq)
@ -2390,6 +2412,7 @@ static int tipc_sk_backlog_rcv(struct sock *sk, struct sk_buff *skb)
* @inputq: list of incoming buffers with potentially different destinations * @inputq: list of incoming buffers with potentially different destinations
* @sk: socket where the buffers should be enqueued * @sk: socket where the buffers should be enqueued
* @dport: port number for the socket * @dport: port number for the socket
* @xmitq: output queue
* *
* Caller must hold socket lock * Caller must hold socket lock
*/ */
@ -2442,6 +2465,7 @@ static void tipc_sk_enqueue(struct sk_buff_head *inputq, struct sock *sk,
/** /**
* tipc_sk_rcv - handle a chain of incoming buffers * tipc_sk_rcv - handle a chain of incoming buffers
* @net: the associated network namespace
* @inputq: buffer list containing the buffers * @inputq: buffer list containing the buffers
* Consumes all buffers in list until inputq is empty * Consumes all buffers in list until inputq is empty
* Note: may be called in multiple threads referring to the same queue * Note: may be called in multiple threads referring to the same queue
@ -2534,7 +2558,7 @@ static bool tipc_sockaddr_is_sane(struct sockaddr_tipc *addr)
* @destlen: size of socket address data structure * @destlen: size of socket address data structure
* @flags: file-related flags associated with socket * @flags: file-related flags associated with socket
* *
* Returns 0 on success, errno otherwise * Return: 0 on success, errno otherwise
*/ */
static int tipc_connect(struct socket *sock, struct sockaddr *dest, static int tipc_connect(struct socket *sock, struct sockaddr *dest,
int destlen, int flags) int destlen, int flags)
@ -2627,7 +2651,7 @@ exit:
* @sock: socket structure * @sock: socket structure
* @len: (unused) * @len: (unused)
* *
* Returns 0 on success, errno otherwise * Return: 0 on success, errno otherwise
*/ */
static int tipc_listen(struct socket *sock, int len) static int tipc_listen(struct socket *sock, int len)
{ {
@ -2679,8 +2703,9 @@ static int tipc_wait_for_accept(struct socket *sock, long timeo)
* @sock: listening socket * @sock: listening socket
* @new_sock: new socket that is to be connected * @new_sock: new socket that is to be connected
* @flags: file-related flags associated with socket * @flags: file-related flags associated with socket
* @kern: caused by kernel or by userspace?
* *
* Returns 0 on success, errno otherwise * Return: 0 on success, errno otherwise
*/ */
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,
bool kern) bool kern)
@ -2759,7 +2784,7 @@ exit:
* *
* Terminates connection (if necessary), then purges socket's receive queue. * Terminates connection (if necessary), then purges socket's receive queue.
* *
* Returns 0 on success, errno otherwise * Return: 0 on success, errno otherwise
*/ */
static int tipc_shutdown(struct socket *sock, int how) static int tipc_shutdown(struct socket *sock, int how)
{ {
@ -3102,7 +3127,7 @@ static int tipc_sk_leave(struct tipc_sock *tsk)
* For stream sockets only, accepts and ignores all IPPROTO_TCP options * For stream sockets only, accepts and ignores all IPPROTO_TCP options
* (to ease compatibility). * (to ease compatibility).
* *
* Returns 0 on success, errno otherwise * Return: 0 on success, errno otherwise
*/ */
static int tipc_setsockopt(struct socket *sock, int lvl, int opt, static int tipc_setsockopt(struct socket *sock, int lvl, int opt,
sockptr_t ov, unsigned int ol) sockptr_t ov, unsigned int ol)
@ -3196,7 +3221,7 @@ static int tipc_setsockopt(struct socket *sock, int lvl, int opt,
* For stream sockets only, returns 0 length result for all IPPROTO_TCP options * For stream sockets only, returns 0 length result for all IPPROTO_TCP options
* (to ease compatibility). * (to ease compatibility).
* *
* Returns 0 on success, errno otherwise * Return: 0 on success, errno otherwise
*/ */
static int tipc_getsockopt(struct socket *sock, int lvl, int opt, static int tipc_getsockopt(struct socket *sock, int lvl, int opt,
char __user *ov, int __user *ol) char __user *ov, int __user *ol)
@ -3400,7 +3425,7 @@ static struct proto tipc_proto = {
/** /**
* tipc_socket_init - initialize TIPC socket interface * tipc_socket_init - initialize TIPC socket interface
* *
* Returns 0 on success, errno otherwise * Return: 0 on success, errno otherwise
*/ */
int tipc_socket_init(void) int tipc_socket_init(void)
{ {
@ -3799,10 +3824,11 @@ int tipc_nl_publ_dump(struct sk_buff *skb, struct netlink_callback *cb)
/** /**
* tipc_sk_filtering - check if a socket should be traced * tipc_sk_filtering - check if a socket should be traced
* @sk: the socket to be examined * @sk: the socket to be examined
* @sysctl_tipc_sk_filter[]: the socket tuple for filtering,
* (portid, sock type, name type, name lower, name upper)
* *
* Returns true if the socket meets the socket tuple data * @sysctl_tipc_sk_filter is used as the socket tuple for filtering:
* (portid, sock type, name type, name lower, name upper)
*
* Return: true if the socket meets the socket tuple data
* (value 0 = 'any') or when there is no tuple set (all = 0), * (value 0 = 'any') or when there is no tuple set (all = 0),
* otherwise false * otherwise false
*/ */
@ -3867,7 +3893,7 @@ u32 tipc_sock_get_portid(struct sock *sk)
* @sk: tipc sk to be checked * @sk: tipc sk to be checked
* @skb: tipc msg to be checked * @skb: tipc msg to be checked
* *
* Returns true if the socket rx queue allocation is > 90%, otherwise false * Return: true if the socket rx queue allocation is > 90%, otherwise false
*/ */
bool tipc_sk_overlimit1(struct sock *sk, struct sk_buff *skb) bool tipc_sk_overlimit1(struct sock *sk, struct sk_buff *skb)
@ -3885,7 +3911,7 @@ bool tipc_sk_overlimit1(struct sock *sk, struct sk_buff *skb)
* @sk: tipc sk to be checked * @sk: tipc sk to be checked
* @skb: tipc msg to be checked * @skb: tipc msg to be checked
* *
* Returns true if the socket rx queue allocation is > 90%, otherwise false * Return: true if the socket rx queue allocation is > 90%, otherwise false
*/ */
bool tipc_sk_overlimit2(struct sock *sk, struct sk_buff *skb) bool tipc_sk_overlimit2(struct sock *sk, struct sk_buff *skb)

8
net/tipc/subscr.c
Просмотреть файл

@ -56,10 +56,12 @@ static void tipc_sub_send_event(struct tipc_subscription *sub,
} }
/** /**
* tipc_sub_check_overlap - test for subscription overlap with the * tipc_sub_check_overlap - test for subscription overlap with the given values
* given values * @seq: tipc_name_seq to check
* @found_lower: lower value to test
* @found_upper: upper value to test
* *
* Returns 1 if there is overlap, otherwise 0. * Return: 1 if there is overlap, otherwise 0.
*/ */
int tipc_sub_check_overlap(struct tipc_service_range *seq, u32 found_lower, int tipc_sub_check_overlap(struct tipc_service_range *seq, u32 found_lower,
u32 found_upper) u32 found_upper)

11
net/tipc/subscr.h
Просмотреть файл

@ -48,12 +48,15 @@ struct tipc_conn;
/** /**
* struct tipc_subscription - TIPC network topology subscription object * struct tipc_subscription - TIPC network topology subscription object
* @subscriber: pointer to its subscriber * @kref: reference count for this subscription
* @seq: name sequence associated with subscription * @net: network namespace associated with subscription
* @timer: timer governing subscription duration (optional) * @timer: timer governing subscription duration (optional)
* @nameseq_list: adjacent subscriptions in name sequence's subscription list * @service_list: adjacent subscriptions in name sequence's subscription list
* @sub_list: adjacent subscriptions in subscriber's subscription list * @sub_list: adjacent subscriptions in subscriber's subscription list
* @evt: template for events generated by subscription * @evt: template for events generated by subscription
* @conid: connection identifier of topology server
* @inactive: true if this subscription is inactive
* @lock: serialize up/down and timer events
*/ */
struct tipc_subscription { struct tipc_subscription {
struct kref kref; struct kref kref;
@ -64,7 +67,7 @@ struct tipc_subscription {
struct tipc_event evt; struct tipc_event evt;
int conid; int conid;
bool inactive; bool inactive;
spinlock_t lock; /* serialize up/down and timer events */ spinlock_t lock;
}; };
struct tipc_subscription *tipc_sub_subscribe(struct net *net, struct tipc_subscription *tipc_sub_subscribe(struct net *net,

2
net/tipc/trace.c
Просмотреть файл

@ -36,7 +36,7 @@
#define CREATE_TRACE_POINTS #define CREATE_TRACE_POINTS
#include "trace.h" #include "trace.h"
/** /*
* socket tuples for filtering in socket traces: * socket tuples for filtering in socket traces:
* (portid, sock type, name type, name lower, name upper) * (portid, sock type, name type, name lower, name upper)
*/ */

8
net/tipc/udp_media.c
Просмотреть файл

@ -64,6 +64,11 @@
* *
* This is the bearer level originating address used in neighbor discovery * This is the bearer level originating address used in neighbor discovery
* messages, and all fields should be in network byte order * messages, and all fields should be in network byte order
*
* @proto: Ethernet protocol in use
* @port: port being used
* @ipv4: IPv4 address of neighbor
* @ipv6: IPv6 address of neighbor
*/ */
struct udp_media_addr { struct udp_media_addr {
__be16 proto; __be16 proto;
@ -88,6 +93,7 @@ struct udp_replicast {
* @ubsock: bearer associated socket * @ubsock: bearer associated socket
* @ifindex: local address scope * @ifindex: local address scope
* @work: used to schedule deferred work on a bearer * @work: used to schedule deferred work on a bearer
* @rcast: associated udp_replicast container
*/ */
struct udp_bearer { struct udp_bearer {
struct tipc_bearer __rcu *bearer; struct tipc_bearer __rcu *bearer;
@ -772,7 +778,7 @@ static int tipc_udp_enable(struct net *net, struct tipc_bearer *b,
if (err) if (err)
goto free; goto free;
/** /*
* The bcast media address port is used for all peers and the ip * The bcast media address port is used for all peers and the ip
* is used if it's a multicast address. * is used if it's a multicast address.
*/ */