Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 306b13eb authored by Tom Herbert's avatar Tom Herbert Committed by David S. Miller
Browse files

proto_ops: Add locked held versions of sendmsg and sendpage 



Add new proto_ops sendmsg_locked and sendpage_locked that can be
called when the socket lock is already held. Correspondingly, add
kernel_sendmsg_locked and kernel_sendpage_locked as front end
functions.

These functions will be used in zero proxy so that we can take
the socket lock in a ULP sendmsg/sendpage and then directly call the
backend transport proto_ops functions.

Signed-off-by: default avatarTom Herbert <tom@quantonium.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 29fda25a

include/linux/net.h

+12 −0
Original line number Diff line number Diff line
@@ -190,8 +190,16 @@ struct proto_ops { 
				       struct pipe_inode_info *pipe, size_t len, unsigned int flags);

	int		(*set_peek_off)(struct sock *sk, int val);

	int		(*peek_len)(struct socket *sock);



	/* The following functions are called internally by kernel with

	 * sock lock already held.

	 */

	int		(*read_sock)(struct sock *sk, read_descriptor_t *desc,

				     sk_read_actor_t recv_actor);

	int		(*sendpage_locked)(struct sock *sk, struct page *page,

					   int offset, size_t size, int flags);

	int		(*sendmsg_locked)(struct sock *sk, struct msghdr *msg,

					  size_t size);

};



#define DECLARE_SOCKADDR(type, dst, src)	\
@@ -279,6 +287,8 @@ do { \ 


int kernel_sendmsg(struct socket *sock, struct msghdr *msg, struct kvec *vec,

		   size_t num, size_t len);

int kernel_sendmsg_locked(struct sock *sk, struct msghdr *msg,

			  struct kvec *vec, size_t num, size_t len);

int kernel_recvmsg(struct socket *sock, struct msghdr *msg, struct kvec *vec,

		   size_t num, size_t len, int flags);
@@ -297,6 +307,8 @@ int kernel_setsockopt(struct socket *sock, int level, int optname, char *optval, 
		      unsigned int optlen);

int kernel_sendpage(struct socket *sock, struct page *page, int offset,

		    size_t size, int flags);

int kernel_sendpage_locked(struct sock *sk, struct page *page, int offset,

			   size_t size, int flags);

int kernel_sock_ioctl(struct socket *sock, int cmd, unsigned long arg);

int kernel_sock_shutdown(struct socket *sock, enum sock_shutdown_cmd how);

include/net/sock.h

+3 −0
Original line number Diff line number Diff line
@@ -1582,11 +1582,14 @@ int sock_no_shutdown(struct socket *, int); 
int sock_no_getsockopt(struct socket *, int , int, char __user *, int __user *);

int sock_no_setsockopt(struct socket *, int, int, char __user *, unsigned int);

int sock_no_sendmsg(struct socket *, struct msghdr *, size_t);

int sock_no_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t len);

int sock_no_recvmsg(struct socket *, struct msghdr *, size_t, int);

int sock_no_mmap(struct file *file, struct socket *sock,

		 struct vm_area_struct *vma);

ssize_t sock_no_sendpage(struct socket *sock, struct page *page, int offset,

			 size_t size, int flags);

ssize_t sock_no_sendpage_locked(struct sock *sk, struct page *page,

				int offset, size_t size, int flags);



/*

 * Functions to fill in entries in struct proto_ops when a protocol

include/net/tcp.h

+3 −0
Original line number Diff line number Diff line
@@ -350,8 +350,11 @@ int tcp_v4_rcv(struct sk_buff *skb); 


int tcp_v4_tw_remember_stamp(struct inet_timewait_sock *tw);

int tcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t size);

int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size);

int tcp_sendpage(struct sock *sk, struct page *page, int offset, size_t size,

		 int flags);

int tcp_sendpage_locked(struct sock *sk, struct page *page, int offset,

			size_t size, int flags);

ssize_t do_tcp_sendpages(struct sock *sk, struct page *page, int offset,

		 size_t size, int flags);

void tcp_release_cb(struct sock *sk);

net/core/sock.c

+22 −0
Original line number Diff line number Diff line
@@ -2500,6 +2500,12 @@ int sock_no_sendmsg(struct socket *sock, struct msghdr *m, size_t len) 
}

EXPORT_SYMBOL(sock_no_sendmsg);



int sock_no_sendmsg_locked(struct sock *sk, struct msghdr *m, size_t len)

{

	return -EOPNOTSUPP;

}

EXPORT_SYMBOL(sock_no_sendmsg_locked);



int sock_no_recvmsg(struct socket *sock, struct msghdr *m, size_t len,

		    int flags)

{
@@ -2528,6 +2534,22 @@ ssize_t sock_no_sendpage(struct socket *sock, struct page *page, int offset, siz 
}

EXPORT_SYMBOL(sock_no_sendpage);



ssize_t sock_no_sendpage_locked(struct sock *sk, struct page *page,

				int offset, size_t size, int flags)

{

	ssize_t res;

	struct msghdr msg = {.msg_flags = flags};

	struct kvec iov;

	char *kaddr = kmap(page);



	iov.iov_base = kaddr + offset;

	iov.iov_len = size;

	res = kernel_sendmsg_locked(sk, &msg, &iov, 1, size);

	kunmap(page);

	return res;

}

EXPORT_SYMBOL(sock_no_sendpage_locked);



/*

 *	Default Socket Callbacks

 */

net/ipv4/af_inet.c

+2 −0
Original line number Diff line number Diff line
@@ -944,6 +944,8 @@ const struct proto_ops inet_stream_ops = { 
	.sendpage	   = inet_sendpage,

	.splice_read	   = tcp_splice_read,

	.read_sock	   = tcp_read_sock,

	.sendmsg_locked    = tcp_sendmsg_locked,

	.sendpage_locked   = tcp_sendpage_locked,

	.peek_len	   = tcp_peek_len,

#ifdef CONFIG_COMPAT

	.compat_setsockopt = compat_sock_common_setsockopt,