tipc: aggregate port structure into socket structure (8826cde6) · Commits · 戴 / test

net/tipc/port.c

+4 −11

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* net/tipc/port.c: TIPC port code		* net/tipc/port.c: TIPC port code
	*		*
	* Copyright (c) 1992-2007, Ericsson AB		* Copyright (c) 1992-2007, 2014, Ericsson AB
	* Copyright (c) 2004-2008, 2010-2013, Wind River Systems		* Copyright (c) 2004-2008, 2010-2013, Wind River Systems
	* All rights reserved.		* All rights reserved.
	*		*
	@@ -38,6 +38,7 @@
	#include "config.h"		#include "config.h"
	#include "port.h"		#include "port.h"
	#include "name_table.h"		#include "name_table.h"
			#include "socket.h"

	/* Connection management: */		/* Connection management: */
	#define PROBING_INTERVAL 3600000 /* [ms] => 1 h */		#define PROBING_INTERVAL 3600000 /* [ms] => 1 h */
	@@ -200,23 +201,16 @@ struct tipc_port tipc_createport(struct sock sk,
	void (wakeup)(struct tipc_port ),		void (wakeup)(struct tipc_port ),
	const u32 importance)		const u32 importance)
	{		{
	struct tipc_port *p_ptr;		struct tipc_port *p_ptr = tipc_sk_port(sk);
	struct tipc_msg *msg;		struct tipc_msg *msg;
	u32 ref;		u32 ref;

	p_ptr = kzalloc(sizeof(*p_ptr), GFP_ATOMIC);
	if (!p_ptr) {
	pr_warn("Port creation failed, no memory\n");
	return NULL;
	}
	ref = tipc_ref_acquire(p_ptr, &p_ptr->lock);		ref = tipc_ref_acquire(p_ptr, &p_ptr->lock);
	if (!ref) {		if (!ref) {
	pr_warn("Port creation failed, ref. table exhausted\n");		pr_warn("Port registration failed, ref. table exhausted\n");
	kfree(p_ptr);
	return NULL;		return NULL;
	}		}

	p_ptr->sk = sk;
	p_ptr->max_pkt = MAX_PKT_DEFAULT;		p_ptr->max_pkt = MAX_PKT_DEFAULT;
	p_ptr->ref = ref;		p_ptr->ref = ref;
	INIT_LIST_HEAD(&p_ptr->wait_list);		INIT_LIST_HEAD(&p_ptr->wait_list);
	@@ -262,7 +256,6 @@ int tipc_deleteport(struct tipc_port *p_ptr)
	list_del(&p_ptr->wait_list);		list_del(&p_ptr->wait_list);
	spin_unlock_bh(&tipc_port_list_lock);		spin_unlock_bh(&tipc_port_list_lock);
	k_term_timer(&p_ptr->timer);		k_term_timer(&p_ptr->timer);
	kfree(p_ptr);
	tipc_net_route_msg(buf);		tipc_net_route_msg(buf);
	return 0;		return 0;
	}		}

net/tipc/port.h

+1 −3

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* net/tipc/port.h: Include file for TIPC port code		* net/tipc/port.h: Include file for TIPC port code
	*		*
	* Copyright (c) 1994-2007, Ericsson AB		* Copyright (c) 1994-2007, 2014, Ericsson AB
	* Copyright (c) 2004-2007, 2010-2013, Wind River Systems		* Copyright (c) 2004-2007, 2010-2013, Wind River Systems
	* All rights reserved.		* All rights reserved.
	*		*
	@@ -48,7 +48,6 @@

	/**		/**
	* struct tipc_port - TIPC port structure		* struct tipc_port - TIPC port structure
	* @sk: pointer to socket handle
	* @lock: pointer to spinlock for controlling access to port		* @lock: pointer to spinlock for controlling access to port
	* @connected: non-zero if port is currently connected to a peer port		* @connected: non-zero if port is currently connected to a peer port
	* @conn_type: TIPC type used when connection was established		* @conn_type: TIPC type used when connection was established
	@@ -74,7 +73,6 @@
	* @subscription: "node down" subscription used to terminate failed connections		* @subscription: "node down" subscription used to terminate failed connections
	*/		*/
	struct tipc_port {		struct tipc_port {
	struct sock *sk;
	spinlock_t *lock;		spinlock_t *lock;
	int connected;		int connected;
	u32 conn_type;		u32 conn_type;

net/tipc/socket.c

+26 −40

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* net/tipc/socket.c: TIPC socket API		* net/tipc/socket.c: TIPC socket API
	*		*
	* Copyright (c) 2001-2007, 2012 Ericsson AB		* Copyright (c) 2001-2007, 2012-2014, Ericsson AB
	* Copyright (c) 2004-2008, 2010-2013, Wind River Systems		* Copyright (c) 2004-2008, 2010-2013, Wind River Systems
	* All rights reserved.		* All rights reserved.
	*		*
	@@ -38,21 +38,12 @@
	#include "port.h"		#include "port.h"

	#include <linux/export.h>		#include <linux/export.h>
	#include <net/sock.h>

	#define SS_LISTENING -1 /* socket is listening */		#define SS_LISTENING -1 /* socket is listening */
	#define SS_READY -2 /* socket is connectionless */		#define SS_READY -2 /* socket is connectionless */

	#define CONN_TIMEOUT_DEFAULT 8000 /* default connect timeout = 8s */		#define CONN_TIMEOUT_DEFAULT 8000 /* default connect timeout = 8s */

	struct tipc_sock {
	struct sock sk;
	struct tipc_port *p;
	unsigned int conn_timeout;
	};

	#define tipc_sk(sk) ((struct tipc_sock *)(sk))
	#define tipc_sk_port(sk) (tipc_sk(sk)->p)

	static int backlog_rcv(struct sock sk, struct sk_buff skb);		static int backlog_rcv(struct sock sk, struct sk_buff skb);
	static u32 dispatch(struct tipc_port tport, struct sk_buff buf);		static u32 dispatch(struct tipc_port tport, struct sk_buff buf);
	@@ -114,6 +105,8 @@ static struct proto tipc_proto_kern;
	* - port reference		* - port reference
	*/		*/

			#include "socket.h"

	/**		/**
	* advance_rx_queue - discard first buffer in socket receive queue		* advance_rx_queue - discard first buffer in socket receive queue
	*		*
	@@ -205,7 +198,6 @@ static int tipc_sk_create(struct net net, struct socket sock, int protocol,
	sk->sk_rcvbuf = sysctl_tipc_rmem[1];		sk->sk_rcvbuf = sysctl_tipc_rmem[1];
	sk->sk_data_ready = tipc_data_ready;		sk->sk_data_ready = tipc_data_ready;
	sk->sk_write_space = tipc_write_space;		sk->sk_write_space = tipc_write_space;
	tipc_sk(sk)->p = tp_ptr;
	tipc_sk(sk)->conn_timeout = CONN_TIMEOUT_DEFAULT;		tipc_sk(sk)->conn_timeout = CONN_TIMEOUT_DEFAULT;

	spin_unlock_bh(tp_ptr->lock);		spin_unlock_bh(tp_ptr->lock);
	@@ -437,18 +429,17 @@ static int tipc_getname(struct socket sock, struct sockaddr uaddr,
	int *uaddr_len, int peer)		int *uaddr_len, int peer)
	{		{
	struct sockaddr_tipc addr = (struct sockaddr_tipc )uaddr;		struct sockaddr_tipc addr = (struct sockaddr_tipc )uaddr;
	struct tipc_sock *tsock = tipc_sk(sock->sk);		struct tipc_port *port = tipc_sk_port(sock->sk);

	memset(addr, 0, sizeof(*addr));		memset(addr, 0, sizeof(*addr));
	if (peer) {		if (peer) {
	if ((sock->state != SS_CONNECTED) &&		if ((sock->state != SS_CONNECTED) &&
	((peer != 2) \|\| (sock->state != SS_DISCONNECTING)))		((peer != 2) \|\| (sock->state != SS_DISCONNECTING)))
	return -ENOTCONN;		return -ENOTCONN;
			addr->addr.id.ref = tipc_port_peerport(port);
	addr->addr.id.ref = tipc_port_peerport(tsock->p);		addr->addr.id.node = tipc_port_peernode(port);
	addr->addr.id.node = tipc_port_peernode(tsock->p);
	} else {		} else {
	addr->addr.id.ref = tsock->p->ref;		addr->addr.id.ref = port->ref;
	addr->addr.id.node = tipc_own_addr;		addr->addr.id.node = tipc_own_addr;
	}		}

	@@ -879,14 +870,13 @@ exit:
	*/		*/
	static int auto_connect(struct socket sock, struct tipc_msg msg)		static int auto_connect(struct socket sock, struct tipc_msg msg)
	{		{
	struct tipc_sock *tsock = tipc_sk(sock->sk);		struct tipc_port *p_ptr = tipc_sk_port(sock->sk);
	struct tipc_port *p_ptr;
	struct tipc_portid peer;		struct tipc_portid peer;

	peer.ref = msg_origport(msg);		peer.ref = msg_origport(msg);
	peer.node = msg_orignode(msg);		peer.node = msg_orignode(msg);

	p_ptr = tipc_port_deref(tsock->p->ref);		p_ptr = tipc_port_deref(p_ptr->ref);
	if (!p_ptr)		if (!p_ptr)
	return -EINVAL;		return -EINVAL;

	@@ -1270,17 +1260,18 @@ static void tipc_data_ready(struct sock *sk, int len)

	/**		/**
	* filter_connect - Handle all incoming messages for a connection-based socket		* filter_connect - Handle all incoming messages for a connection-based socket
	* @tsock: TIPC socket		* @port: TIPC port
	* @msg: message		* @msg: message
	*		*
	* Returns TIPC error status code and socket error status code		* Returns TIPC error status code and socket error status code
	* once it encounters some errors		* once it encounters some errors
	*/		*/
	static u32 filter_connect(struct tipc_sock tsock, struct sk_buff *buf)		static u32 filter_connect(struct tipc_port port, struct sk_buff *buf)
	{		{
	struct socket *sock = tsock->sk.sk_socket;		struct sock *sk = tipc_port_to_sk(port);
			struct socket *sock = sk->sk_socket;
	struct tipc_msg msg = buf_msg(buf);		struct tipc_msg msg = buf_msg(buf);
	struct sock *sk = &tsock->sk;
	u32 retval = TIPC_ERR_NO_PORT;		u32 retval = TIPC_ERR_NO_PORT;
	int res;		int res;

	@@ -1290,10 +1281,10 @@ static u32 filter_connect(struct tipc_sock tsock, struct sk_buff *buf)
	switch ((int)sock->state) {		switch ((int)sock->state) {
	case SS_CONNECTED:		case SS_CONNECTED:
	/* Accept only connection-based messages sent by peer */		/* Accept only connection-based messages sent by peer */
	if (msg_connected(msg) && tipc_port_peer_msg(tsock->p, msg)) {		if (msg_connected(msg) && tipc_port_peer_msg(port, msg)) {
	if (unlikely(msg_errcode(msg))) {		if (unlikely(msg_errcode(msg))) {
	sock->state = SS_DISCONNECTING;		sock->state = SS_DISCONNECTING;
	__tipc_port_disconnect(tsock->p);		__tipc_port_disconnect(port);
	}		}
	retval = TIPC_OK;		retval = TIPC_OK;
	}		}
	@@ -1401,7 +1392,7 @@ static u32 filter_rcv(struct sock sk, struct sk_buff buf)
	if (msg_connected(msg))		if (msg_connected(msg))
	return TIPC_ERR_NO_PORT;		return TIPC_ERR_NO_PORT;
	} else {		} else {
	res = filter_connect(tipc_sk(sk), &buf);		res = filter_connect(tipc_sk_port(sk), &buf);
	if (res != TIPC_OK \|\| buf == NULL)		if (res != TIPC_OK \|\| buf == NULL)
	return res;		return res;
	}		}
	@@ -1447,9 +1438,9 @@ static int backlog_rcv(struct sock sk, struct sk_buff buf)
	*		*
	* Returns TIPC error status code (TIPC_OK if message is not to be rejected)		* Returns TIPC error status code (TIPC_OK if message is not to be rejected)
	*/		*/
	static u32 dispatch(struct tipc_port tport, struct sk_buff buf)		static u32 dispatch(struct tipc_port port, struct sk_buff buf)
	{		{
	struct sock *sk = tport->sk;		struct sock *sk = tipc_port_to_sk(port);
	u32 res;		u32 res;

	/*		/*
	@@ -1478,10 +1469,9 @@ static u32 dispatch(struct tipc_port tport, struct sk_buff buf)
	*		*
	* Called with port lock already taken.		* Called with port lock already taken.
	*/		*/
	static void wakeupdispatch(struct tipc_port *tport)		static void wakeupdispatch(struct tipc_port *port)
	{		{
	struct sock *sk = tport->sk;		struct sock *sk = tipc_port_to_sk(port);

	sk->sk_write_space(sk);		sk->sk_write_space(sk);
	}		}

	@@ -1661,8 +1651,7 @@ static int tipc_accept(struct socket sock, struct socket new_sock, int flags)
	{		{
	struct sock new_sk, sk = sock->sk;		struct sock new_sk, sk = sock->sk;
	struct sk_buff *buf;		struct sk_buff *buf;
	struct tipc_sock *new_tsock;		struct tipc_port *new_port;
	struct tipc_port *new_tport;
	struct tipc_msg *msg;		struct tipc_msg *msg;
	struct tipc_portid peer;		struct tipc_portid peer;
	u32 new_ref;		u32 new_ref;
	@@ -1675,7 +1664,6 @@ static int tipc_accept(struct socket sock, struct socket new_sock, int flags)
	res = -EINVAL;		res = -EINVAL;
	goto exit;		goto exit;
	}		}

	timeo = sock_rcvtimeo(sk, flags & O_NONBLOCK);		timeo = sock_rcvtimeo(sk, flags & O_NONBLOCK);
	res = tipc_wait_for_accept(sock, timeo);		res = tipc_wait_for_accept(sock, timeo);
	if (res)		if (res)
	@@ -1688,9 +1676,8 @@ static int tipc_accept(struct socket sock, struct socket new_sock, int flags)
	goto exit;		goto exit;

	new_sk = new_sock->sk;		new_sk = new_sock->sk;
	new_tsock = tipc_sk(new_sk);		new_port = tipc_sk_port(new_sk);
	new_tport = new_tsock->p;		new_ref = new_port->ref;
	new_ref = new_tport->ref;
	msg = buf_msg(buf);		msg = buf_msg(buf);

	/* we lock on new_sk; but lockdep sees the lock on sk */		/* we lock on new_sk; but lockdep sees the lock on sk */
	@@ -1710,8 +1697,8 @@ static int tipc_accept(struct socket sock, struct socket new_sock, int flags)

	tipc_set_portimportance(new_ref, msg_importance(msg));		tipc_set_portimportance(new_ref, msg_importance(msg));
	if (msg_named(msg)) {		if (msg_named(msg)) {
	new_tport->conn_type = msg_nametype(msg);		new_port->conn_type = msg_nametype(msg);
	new_tport->conn_instance = msg_nameinst(msg);		new_port->conn_instance = msg_nameinst(msg);
	}		}

	/*		/*
	@@ -1729,7 +1716,6 @@ static int tipc_accept(struct socket sock, struct socket new_sock, int flags)
	skb_set_owner_r(buf, new_sk);		skb_set_owner_r(buf, new_sk);
	}		}
	release_sock(new_sk);		release_sock(new_sk);

	exit:		exit:
	release_sock(sk);		release_sock(sk);
	return res;		return res;

net/tipc/socket.h

0 → 100644

+70 −0

Original line number	Original line	Diff line number	Diff line
			/* net/tipc/socket.h: Include file for TIPC socket code
			*
			* Copyright (c) 2014, Ericsson AB
			* All rights reserved.
			*
			* Redistribution and use in source and binary forms, with or without
			* modification, are permitted provided that the following conditions are met:
			*
			* 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.
			*
			* 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
			* POSSIBILITY OF SUCH DAMAGE.
			*/

			#ifndef _TIPC_SOCK_H
			#define _TIPC_SOCK_H

			#include "port.h"
			#include <net/sock.h>

			/**
			* struct tipc_sock - TIPC socket structure
			* @sk: socket - interacts with 'port' and with user via the socket API
			* @port: port - interacts with 'sk' and with the rest of the TIPC stack
			* @peer_name: the peer of the connection, if any
			* @conn_timeout: the time we can wait for an unresponded setup request
			*/

			struct tipc_sock {
			struct sock sk;
			struct tipc_port port;
			unsigned int conn_timeout;
			};

			static inline struct tipc_sock tipc_sk(const struct sock sk)
			{
			return container_of(sk, struct tipc_sock, sk);
			}

			static inline struct tipc_port tipc_sk_port(const struct sock sk)
			{
			return &(tipc_sk(sk)->port);
			}

			static inline struct sock tipc_port_to_sk(const struct tipc_port port)
			{
			return &(container_of(port, struct tipc_sock, port))->sk;
			}

			#endif

Admin message