2006-01-03 02:04:38 +08:00
|
|
|
/*
|
|
|
|
* net/tipc/bearer.h: Include file for TIPC bearer code
|
2007-02-09 22:25:21 +08:00
|
|
|
*
|
2013-12-11 12:45:39 +08:00
|
|
|
* Copyright (c) 1996-2006, 2013, Ericsson AB
|
2011-01-08 02:00:11 +08:00
|
|
|
* Copyright (c) 2005, 2010-2011, Wind River Systems
|
2006-01-03 02:04:38 +08:00
|
|
|
* All rights reserved.
|
|
|
|
*
|
2006-01-11 20:30:43 +08:00
|
|
|
* Redistribution and use in source and binary forms, with or without
|
2006-01-03 02:04:38 +08:00
|
|
|
* modification, are permitted provided that the following conditions are met:
|
|
|
|
*
|
2006-01-11 20:30:43 +08: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 02:04:38 +08:00
|
|
|
*
|
2006-01-11 20:30:43 +08: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 02:04:38 +08:00
|
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef _TIPC_BEARER_H
|
|
|
|
#define _TIPC_BEARER_H
|
|
|
|
|
|
|
|
#include "bcast.h"
|
|
|
|
|
2011-05-28 03:09:40 +08:00
|
|
|
#define MAX_BEARERS 2
|
|
|
|
#define MAX_MEDIA 2
|
2006-01-03 02:04:38 +08:00
|
|
|
|
2011-10-08 01:37:34 +08:00
|
|
|
/*
|
|
|
|
* Identifiers associated with TIPC message header media address info
|
|
|
|
*
|
|
|
|
* - address info field is 20 bytes long
|
|
|
|
* - media type identifier located at offset 3
|
|
|
|
* - remaining bytes vary according to media type
|
|
|
|
*/
|
|
|
|
#define TIPC_MEDIA_ADDR_SIZE 20
|
|
|
|
#define TIPC_MEDIA_TYPE_OFFSET 3
|
|
|
|
|
2010-11-30 20:00:53 +08:00
|
|
|
/*
|
|
|
|
* Identifiers of supported TIPC media types
|
|
|
|
*/
|
|
|
|
#define TIPC_MEDIA_TYPE_ETH 1
|
2013-04-17 14:18:28 +08:00
|
|
|
#define TIPC_MEDIA_TYPE_IB 2
|
2010-11-30 20:00:53 +08:00
|
|
|
|
2012-07-10 18:55:09 +08:00
|
|
|
/**
|
2011-10-08 03:19:11 +08:00
|
|
|
* struct tipc_media_addr - destination address used by TIPC bearers
|
|
|
|
* @value: address info (format defined by media)
|
|
|
|
* @media_id: TIPC media type identifier
|
|
|
|
* @broadcast: non-zero if address is a broadcast address
|
2010-11-30 20:00:53 +08:00
|
|
|
*/
|
|
|
|
struct tipc_media_addr {
|
2011-10-08 03:19:11 +08:00
|
|
|
u8 value[TIPC_MEDIA_ADDR_SIZE];
|
|
|
|
u8 media_id;
|
|
|
|
u8 broadcast;
|
2010-11-30 20:00:53 +08:00
|
|
|
};
|
|
|
|
|
2011-01-08 02:00:11 +08:00
|
|
|
struct tipc_bearer;
|
2006-01-03 02:04:38 +08:00
|
|
|
|
|
|
|
/**
|
2013-12-11 12:45:40 +08:00
|
|
|
* struct tipc_media - Media specific info exposed to generic bearer layer
|
2006-01-03 02:04:38 +08:00
|
|
|
* @send_msg: routine which handles buffer transmission
|
2013-10-18 13:23:17 +08:00
|
|
|
* @enable_media: routine which enables a media
|
|
|
|
* @disable_media: routine which disables a media
|
2011-10-08 01:37:34 +08:00
|
|
|
* @addr2str: routine which converts media address to string
|
|
|
|
* @addr2msg: routine which converts media address to protocol message area
|
|
|
|
* @msg2addr: routine which converts media address from protocol message area
|
2006-01-03 02:04:38 +08:00
|
|
|
* @priority: default link (and bearer) priority
|
|
|
|
* @tolerance: default time (in ms) before declaring link failure
|
|
|
|
* @window: default window (in packets) before declaring link congestion
|
2010-11-30 20:00:53 +08:00
|
|
|
* @type_id: TIPC media identifier
|
2006-01-03 02:04:38 +08:00
|
|
|
* @name: media name
|
|
|
|
*/
|
2011-12-30 09:19:42 +08:00
|
|
|
struct tipc_media {
|
2007-02-09 22:25:21 +08:00
|
|
|
int (*send_msg)(struct sk_buff *buf,
|
2006-01-03 02:04:38 +08:00
|
|
|
struct tipc_bearer *b_ptr,
|
|
|
|
struct tipc_media_addr *dest);
|
2013-10-18 13:23:17 +08:00
|
|
|
int (*enable_media)(struct tipc_bearer *b_ptr);
|
|
|
|
void (*disable_media)(struct tipc_bearer *b_ptr);
|
2011-10-07 23:31:49 +08:00
|
|
|
int (*addr2str)(struct tipc_media_addr *a, char *str_buf, int str_size);
|
2011-10-08 01:37:34 +08:00
|
|
|
int (*addr2msg)(struct tipc_media_addr *a, char *msg_area);
|
2013-04-17 14:18:26 +08:00
|
|
|
int (*msg2addr)(const struct tipc_bearer *b_ptr,
|
|
|
|
struct tipc_media_addr *a, char *msg_area);
|
2006-01-03 02:04:38 +08:00
|
|
|
u32 priority;
|
|
|
|
u32 tolerance;
|
|
|
|
u32 window;
|
|
|
|
u32 type_id;
|
|
|
|
char name[TIPC_MAX_MEDIA_NAME];
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
2013-12-11 12:45:40 +08:00
|
|
|
* struct tipc_bearer - Generic TIPC bearer structure
|
tipc: remove TIPC usage of field af_packet_priv in struct net_device
TIPC is currently using the field 'af_packet_priv' in struct net_device
as a handle to find the bearer instance associated to the given network
device. But, by doing so it is blocking other networking cleanups, such
as the one discussed here:
http://patchwork.ozlabs.org/patch/178044/
This commit removes this usage from TIPC. Instead, we introduce a new
field, 'tipc_ptr', to the net_device structure, to serve this purpose.
When TIPC bearer is enabled, the bearer object is associated to
'tipc_ptr'. When a TIPC packet arrives in the recv_msg() upcall
from a networking device, the bearer object can now be obtained from
'tipc_ptr'. When a bearer is disabled, the bearer object is detached
from its underlying network device by setting 'tipc_ptr' to NULL.
Additionally, an RCU lock is used to protect the new pointer.
Henceforth, the existing tipc_net_lock is used in write mode to
serialize write accesses to this pointer, while the new RCU lock is
applied on the read side to ensure that the pointer is 100% valid
within its wrapped area for all readers.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Cc: Patrick McHardy <kaber@trash.net>
Reviewed-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-12-11 12:45:41 +08:00
|
|
|
* @dev: ptr to associated network device
|
2011-01-08 02:00:11 +08:00
|
|
|
* @usr_handle: pointer to additional media-specific information about bearer
|
|
|
|
* @mtu: max packet size bearer can support
|
|
|
|
* @lock: spinlock for controlling access to bearer
|
|
|
|
* @addr: media-specific address associated with bearer
|
|
|
|
* @name: bearer name (format = media:interface)
|
2006-01-03 02:04:38 +08:00
|
|
|
* @media: ptr to media structure associated with bearer
|
2013-12-11 12:45:40 +08:00
|
|
|
* @bcast_addr: media address used in broadcasting
|
2006-01-03 02:04:38 +08:00
|
|
|
* @priority: default link priority for bearer
|
2011-10-18 23:34:29 +08:00
|
|
|
* @window: default window size for bearer
|
|
|
|
* @tolerance: default link tolerance for bearer
|
2006-01-03 02:04:38 +08:00
|
|
|
* @identity: array index of this bearer within TIPC bearer array
|
|
|
|
* @link_req: ptr to (optional) structure making periodic link setup requests
|
|
|
|
* @links: list of non-congested links associated with bearer
|
|
|
|
* @active: non-zero if bearer structure is represents a bearer
|
|
|
|
* @net_plane: network plane ('A' through 'H') currently associated with bearer
|
|
|
|
* @nodes: indicates which nodes in cluster can be reached through bearer
|
2011-01-08 02:00:11 +08:00
|
|
|
*
|
|
|
|
* Note: media-specific code is responsible for initialization of the fields
|
|
|
|
* indicated below when a bearer is enabled; TIPC's generic bearer code takes
|
|
|
|
* care of initializing all other fields.
|
2006-01-03 02:04:38 +08:00
|
|
|
*/
|
2011-01-08 02:00:11 +08:00
|
|
|
struct tipc_bearer {
|
tipc: remove TIPC usage of field af_packet_priv in struct net_device
TIPC is currently using the field 'af_packet_priv' in struct net_device
as a handle to find the bearer instance associated to the given network
device. But, by doing so it is blocking other networking cleanups, such
as the one discussed here:
http://patchwork.ozlabs.org/patch/178044/
This commit removes this usage from TIPC. Instead, we introduce a new
field, 'tipc_ptr', to the net_device structure, to serve this purpose.
When TIPC bearer is enabled, the bearer object is associated to
'tipc_ptr'. When a TIPC packet arrives in the recv_msg() upcall
from a networking device, the bearer object can now be obtained from
'tipc_ptr'. When a bearer is disabled, the bearer object is detached
from its underlying network device by setting 'tipc_ptr' to NULL.
Additionally, an RCU lock is used to protect the new pointer.
Henceforth, the existing tipc_net_lock is used in write mode to
serialize write accesses to this pointer, while the new RCU lock is
applied on the read side to ensure that the pointer is 100% valid
within its wrapped area for all readers.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Cc: Patrick McHardy <kaber@trash.net>
Reviewed-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-12-11 12:45:41 +08:00
|
|
|
struct net_device *dev;
|
2011-01-08 02:00:11 +08:00
|
|
|
void *usr_handle; /* initalized by media */
|
|
|
|
u32 mtu; /* initalized by media */
|
|
|
|
struct tipc_media_addr addr; /* initalized by media */
|
|
|
|
char name[TIPC_MAX_BEARER_NAME];
|
|
|
|
spinlock_t lock;
|
2011-12-30 09:19:42 +08:00
|
|
|
struct tipc_media *media;
|
2013-04-17 14:18:26 +08:00
|
|
|
struct tipc_media_addr bcast_addr;
|
2006-01-03 02:04:38 +08:00
|
|
|
u32 priority;
|
2011-10-18 23:34:29 +08:00
|
|
|
u32 window;
|
|
|
|
u32 tolerance;
|
2006-01-03 02:04:38 +08:00
|
|
|
u32 identity;
|
2011-12-30 09:58:42 +08:00
|
|
|
struct tipc_link_req *link_req;
|
2006-01-03 02:04:38 +08:00
|
|
|
struct list_head links;
|
|
|
|
int active;
|
|
|
|
char net_plane;
|
2008-09-03 14:38:32 +08:00
|
|
|
struct tipc_node_map nodes;
|
2006-01-03 02:04:38 +08:00
|
|
|
};
|
|
|
|
|
2011-12-30 10:39:49 +08:00
|
|
|
struct tipc_bearer_names {
|
2006-01-03 02:04:38 +08:00
|
|
|
char media_name[TIPC_MAX_MEDIA_NAME];
|
|
|
|
char if_name[TIPC_MAX_IF_NAME];
|
|
|
|
};
|
|
|
|
|
2011-12-30 09:58:42 +08:00
|
|
|
struct tipc_link;
|
2006-01-03 02:04:38 +08:00
|
|
|
|
2011-01-08 02:00:11 +08:00
|
|
|
extern struct tipc_bearer tipc_bearers[];
|
2006-01-03 02:04:38 +08:00
|
|
|
|
2010-11-30 20:00:53 +08:00
|
|
|
/*
|
|
|
|
* TIPC routines available to supported media types
|
|
|
|
*/
|
|
|
|
|
|
|
|
void tipc_recv_msg(struct sk_buff *buf, struct tipc_bearer *tb_ptr);
|
|
|
|
|
2011-03-01 03:56:15 +08:00
|
|
|
int tipc_enable_bearer(const char *bearer_name, u32 disc_domain, u32 priority);
|
2010-11-30 20:00:53 +08:00
|
|
|
int tipc_disable_bearer(const char *name);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Routines made available to TIPC by supported media types
|
|
|
|
*/
|
2013-12-11 12:45:39 +08:00
|
|
|
extern struct tipc_media eth_media_info;
|
2010-11-30 20:00:53 +08:00
|
|
|
|
2013-04-17 14:18:28 +08:00
|
|
|
#ifdef CONFIG_TIPC_MEDIA_IB
|
2013-12-11 12:45:39 +08:00
|
|
|
extern struct tipc_media ib_media_info;
|
2013-04-17 14:18:28 +08:00
|
|
|
#endif
|
|
|
|
|
2011-10-18 23:34:29 +08:00
|
|
|
int tipc_media_set_priority(const char *name, u32 new_value);
|
|
|
|
int tipc_media_set_window(const char *name, u32 new_value);
|
2012-06-29 12:50:23 +08:00
|
|
|
void tipc_media_addr_printf(char *buf, int len, struct tipc_media_addr *a);
|
2006-01-18 07:38:21 +08:00
|
|
|
struct sk_buff *tipc_media_get_names(void);
|
2006-01-03 02:04:38 +08:00
|
|
|
|
2006-01-18 07:38:21 +08:00
|
|
|
struct sk_buff *tipc_bearer_get_names(void);
|
2011-01-08 02:00:11 +08:00
|
|
|
void tipc_bearer_add_dest(struct tipc_bearer *b_ptr, u32 dest);
|
|
|
|
void tipc_bearer_remove_dest(struct tipc_bearer *b_ptr, u32 dest);
|
2011-10-18 23:34:29 +08:00
|
|
|
struct tipc_bearer *tipc_bearer_find(const char *name);
|
2011-01-08 02:00:11 +08:00
|
|
|
struct tipc_bearer *tipc_bearer_find_interface(const char *if_name);
|
2011-12-30 09:19:42 +08:00
|
|
|
struct tipc_media *tipc_media_find(const char *name);
|
tipc: relocate common functions from media to bearer
Currently, registering a TIPC stack handler in the network device layer
is done twice, once for Ethernet (eth_media) and Infiniband (ib_media)
repectively. But, as this registration is not media specific, we can
avoid some code duplication by moving the registering function to
the generic bearer layer, to the file bearer.c, and call it only once.
The same is true for the network device event notifier.
As a side effect, the two workqueues we are using for for setting up/
cleaning up media can now be eliminated. Furthermore, the array for
storing the specific media type structs, media_array[], can be entirely
deleted.
Note that the eth_started and ib_started flags were removed during the
code relocation. There is now only one call to bearer_setup and
bearer_cleanup, and these can logically not race against each other.
Despite its size, this cleanup work incurs no functional changes in TIPC.
In particular, it should be noted that the sequence ordering of received
packets is unaffected by this change, since packet reception never was
subject to any work queue handling in the first place.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Cc: Patrick McHardy <kaber@trash.net>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-12-11 12:45:42 +08:00
|
|
|
int tipc_bearer_setup(void);
|
|
|
|
void tipc_bearer_cleanup(void);
|
2006-01-18 07:38:21 +08:00
|
|
|
void tipc_bearer_stop(void);
|
2006-01-03 02:04:38 +08:00
|
|
|
|
|
|
|
/**
|
2007-02-09 22:25:21 +08:00
|
|
|
* tipc_bearer_send- sends buffer to destination over bearer
|
|
|
|
*
|
2006-01-03 02:04:38 +08:00
|
|
|
* IMPORTANT:
|
|
|
|
* The media send routine must not alter the buffer being passed in
|
|
|
|
* as it may be needed for later retransmission!
|
|
|
|
*/
|
2012-11-15 11:34:45 +08:00
|
|
|
static inline void tipc_bearer_send(struct tipc_bearer *b, struct sk_buff *buf,
|
2006-01-18 07:38:21 +08:00
|
|
|
struct tipc_media_addr *dest)
|
2006-01-03 02:04:38 +08:00
|
|
|
{
|
2012-11-15 11:34:45 +08:00
|
|
|
b->media->send_msg(buf, b, dest);
|
2006-01-03 02:04:38 +08:00
|
|
|
}
|
|
|
|
|
2010-05-11 22:30:16 +08:00
|
|
|
#endif /* _TIPC_BEARER_H */
|