Commit 13543d02 authored Jun 14, 2024 by D. Wythe Committed by David S. Miller Jun 17, 2024

net/smc: expose smc proto operations



Externalize smc proto operations (smc_xxx) to allow
access from files other than af_smc.c

This is in preparation for the subsequent implementation
of the AF_INET version of SMC.

Signed-off-by: D. Wythe <alibuda@linux.alibaba.com>
Reviewed-by: Wenjia Zhang <wenjia@linux.ibm.com>
Reviewed-by: Dust Li <dust.li@linux.alibaba.com>
Tested-by: Niklas Schnelle <schnelle@linux.ibm.com>
Tested-by: Wenjia Zhang <wenjia@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent d0e35656

net/smc/af_smc.c

+30 −30

Original line number	Diff line number	Diff line
		@@ -170,15 +170,15 @@ static bool smc_hs_congested(const struct sock *sk)
		return false;
		}

		static struct smc_hashinfo smc_v4_hashinfo = {
		struct smc_hashinfo smc_v4_hashinfo = {
		.lock = __RW_LOCK_UNLOCKED(smc_v4_hashinfo.lock),
		};

		static struct smc_hashinfo smc_v6_hashinfo = {
		struct smc_hashinfo smc_v6_hashinfo = {
		.lock = __RW_LOCK_UNLOCKED(smc_v6_hashinfo.lock),
		};

		static int smc_hash_sk(struct sock *sk)
		int smc_hash_sk(struct sock *sk)
		{
		struct smc_hashinfo *h = sk->sk_prot->h.smc_hash;
		struct hlist_head *head;
		@@ -193,7 +193,7 @@ static int smc_hash_sk(struct sock *sk)
		return 0;
		}

		static void smc_unhash_sk(struct sock *sk)
		void smc_unhash_sk(struct sock *sk)
		{
		struct smc_hashinfo *h = sk->sk_prot->h.smc_hash;

		@@ -207,7 +207,7 @@ static void smc_unhash_sk(struct sock *sk)
		* work which we didn't do because of user hold the sock_lock in the
		* BH context
		*/
		static void smc_release_cb(struct sock *sk)
		void smc_release_cb(struct sock *sk)
		{
		struct smc_sock *smc = smc_sk(sk);

		@@ -307,7 +307,7 @@ static int __smc_release(struct smc_sock *smc)
		return rc;
		}

		static int smc_release(struct socket *sock)
		int smc_release(struct socket *sock)
		{
		struct sock *sk = sock->sk;
		struct smc_sock *smc;
		@@ -401,7 +401,7 @@ static struct sock smc_sock_alloc(struct net net, struct socket *sock,
		return sk;
		}

		static int smc_bind(struct socket sock, struct sockaddr uaddr,
		int smc_bind(struct socket sock, struct sockaddr uaddr,
		int addr_len)
		{
		struct sockaddr_in addr = (struct sockaddr_in )uaddr;
		@@ -1631,7 +1631,7 @@ static void smc_connect_work(struct work_struct *work)
		release_sock(&smc->sk);
		}

		static int smc_connect(struct socket sock, struct sockaddr addr,
		int smc_connect(struct socket sock, struct sockaddr addr,
		int alen, int flags)
		{
		struct sock *sk = sock->sk;
		@@ -2613,7 +2613,7 @@ static void smc_clcsock_data_ready(struct sock *listen_clcsock)
		read_unlock_bh(&listen_clcsock->sk_callback_lock);
		}

		static int smc_listen(struct socket *sock, int backlog)
		int smc_listen(struct socket *sock, int backlog)
		{
		struct sock *sk = sock->sk;
		struct smc_sock *smc;
		@@ -2678,7 +2678,7 @@ static int smc_listen(struct socket *sock, int backlog)
		return rc;
		}

		static int smc_accept(struct socket sock, struct socket new_sock,
		int smc_accept(struct socket sock, struct socket new_sock,
		struct proto_accept_arg *arg)
		{
		struct sock sk = sock->sk, nsk;
		@@ -2748,7 +2748,7 @@ static int smc_accept(struct socket sock, struct socket new_sock,
		return rc;
		}

		static int smc_getname(struct socket sock, struct sockaddr addr,
		int smc_getname(struct socket sock, struct sockaddr addr,
		int peer)
		{
		struct smc_sock *smc;
		@@ -2762,7 +2762,7 @@ static int smc_getname(struct socket sock, struct sockaddr addr,
		return smc->clcsock->ops->getname(smc->clcsock, addr, peer);
		}

		static int smc_sendmsg(struct socket sock, struct msghdr msg, size_t len)
		int smc_sendmsg(struct socket sock, struct msghdr msg, size_t len)
		{
		struct sock *sk = sock->sk;
		struct smc_sock *smc;
		@@ -2800,7 +2800,7 @@ static int smc_sendmsg(struct socket sock, struct msghdr msg, size_t len)
		return rc;
		}

		static int smc_recvmsg(struct socket sock, struct msghdr msg, size_t len,
		int smc_recvmsg(struct socket sock, struct msghdr msg, size_t len,
		int flags)
		{
		struct sock *sk = sock->sk;
		@@ -2850,7 +2850,7 @@ static __poll_t smc_accept_poll(struct sock *parent)
		return mask;
		}

		static __poll_t smc_poll(struct file file, struct socket sock,
		__poll_t smc_poll(struct file file, struct socket sock,
		poll_table *wait)
		{
		struct sock *sk = sock->sk;
		@@ -2903,7 +2903,7 @@ static __poll_t smc_poll(struct file file, struct socket sock,
		return mask;
		}

		static int smc_shutdown(struct socket *sock, int how)
		int smc_shutdown(struct socket *sock, int how)
		{
		struct sock *sk = sock->sk;
		bool do_shutdown = true;
		@@ -3043,7 +3043,7 @@ static int __smc_setsockopt(struct socket *sock, int level, int optname,
		return rc;
		}

		static int smc_setsockopt(struct socket *sock, int level, int optname,
		int smc_setsockopt(struct socket *sock, int level, int optname,
		sockptr_t optval, unsigned int optlen)
		{
		struct sock *sk = sock->sk;
		@@ -3130,7 +3130,7 @@ static int smc_setsockopt(struct socket *sock, int level, int optname,
		return rc;
		}

		static int smc_getsockopt(struct socket *sock, int level, int optname,
		int smc_getsockopt(struct socket *sock, int level, int optname,
		char __user optval, int __user optlen)
		{
		struct smc_sock *smc;
		@@ -3156,7 +3156,7 @@ static int smc_getsockopt(struct socket *sock, int level, int optname,
		return rc;
		}

		static int smc_ioctl(struct socket *sock, unsigned int cmd,
		int smc_ioctl(struct socket *sock, unsigned int cmd,
		unsigned long arg)
		{
		union smc_host_cursor cons, urg;
		@@ -3243,7 +3243,7 @@ static int smc_ioctl(struct socket *sock, unsigned int cmd,
		* Note that subsequent recv() calls have to wait till all splice() processing
		* completed.
		*/
		static ssize_t smc_splice_read(struct socket sock, loff_t ppos,
		ssize_t smc_splice_read(struct socket sock, loff_t ppos,
		struct pipe_inode_info *pipe, size_t len,
		unsigned int flags)
		{

net/smc/smc.h

+33 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,39 @@
		extern struct proto smc_proto;
		extern struct proto smc_proto6;

		extern struct smc_hashinfo smc_v4_hashinfo;
		extern struct smc_hashinfo smc_v6_hashinfo;

		int smc_hash_sk(struct sock *sk);
		void smc_unhash_sk(struct sock *sk);
		void smc_release_cb(struct sock *sk);

		int smc_release(struct socket *sock);
		int smc_bind(struct socket sock, struct sockaddr uaddr,
		int addr_len);
		int smc_connect(struct socket sock, struct sockaddr addr,
		int alen, int flags);
		int smc_accept(struct socket sock, struct socket new_sock,
		struct proto_accept_arg *arg);
		int smc_getname(struct socket sock, struct sockaddr addr,
		int peer);
		__poll_t smc_poll(struct file file, struct socket sock,
		poll_table *wait);
		int smc_ioctl(struct socket *sock, unsigned int cmd,
		unsigned long arg);
		int smc_listen(struct socket *sock, int backlog);
		int smc_shutdown(struct socket *sock, int how);
		int smc_setsockopt(struct socket *sock, int level, int optname,
		sockptr_t optval, unsigned int optlen);
		int smc_getsockopt(struct socket *sock, int level, int optname,
		char __user optval, int __user optlen);
		int smc_sendmsg(struct socket sock, struct msghdr msg, size_t len);
		int smc_recvmsg(struct socket sock, struct msghdr msg, size_t len,
		int flags);
		ssize_t smc_splice_read(struct socket sock, loff_t ppos,
		struct pipe_inode_info *pipe, size_t len,
		unsigned int flags);

		/* smc sock initialization */
		void smc_sk_init(struct net net, struct sock sk, int protocol);
		/* clcsock initialization */