Commit 657dd5f9 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by David S. Miller
Browse files

net: inline skb_zerocopy_iter_dgram 



skb_zerocopy_iter_dgram() is a small proxy function, inline it. For
that, move __zerocopy_sg_from_iter into linux/skbuff.h

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent de32bc6a

include/linux/skbuff.h

+22 −14
Original line number Diff line number Diff line
@@ -684,20 +684,6 @@ struct ubuf_info { 
int mm_account_pinned_pages(struct mmpin *mmp, size_t size);

void mm_unaccount_pinned_pages(struct mmpin *mmp);



struct ubuf_info *msg_zerocopy_alloc(struct sock *sk, size_t size);

struct ubuf_info *msg_zerocopy_realloc(struct sock *sk, size_t size,

				       struct ubuf_info *uarg);



void msg_zerocopy_put_abort(struct ubuf_info *uarg, bool have_uref);



void msg_zerocopy_callback(struct sk_buff *skb, struct ubuf_info *uarg,

			   bool success);



int skb_zerocopy_iter_dgram(struct sk_buff *skb, struct msghdr *msg, int len);

int skb_zerocopy_iter_stream(struct sock *sk, struct sk_buff *skb,

			     struct msghdr *msg, int len,

			     struct ubuf_info *uarg);



/* This data is invariant across clones and lives at

 * the end of the header data, ie. at skb->end.

 */
@@ -1679,6 +1665,28 @@ static inline void skb_set_end_offset(struct sk_buff *skb, unsigned int offset) 
}

#endif



struct ubuf_info *msg_zerocopy_alloc(struct sock *sk, size_t size);

struct ubuf_info *msg_zerocopy_realloc(struct sock *sk, size_t size,

				       struct ubuf_info *uarg);



void msg_zerocopy_put_abort(struct ubuf_info *uarg, bool have_uref);



void msg_zerocopy_callback(struct sk_buff *skb, struct ubuf_info *uarg,

			   bool success);



int __zerocopy_sg_from_iter(struct sock *sk, struct sk_buff *skb,

			    struct iov_iter *from, size_t length);



static inline int skb_zerocopy_iter_dgram(struct sk_buff *skb,

					  struct msghdr *msg, int len)

{

	return __zerocopy_sg_from_iter(skb->sk, skb, &msg->msg_iter, len);

}



int skb_zerocopy_iter_stream(struct sock *sk, struct sk_buff *skb,

			     struct msghdr *msg, int len,

			     struct ubuf_info *uarg);



/* Internal */

#define skb_shinfo(SKB)	((struct skb_shared_info *)(skb_end_pointer(SKB)))

net/core/datagram.c

+0 −2
Original line number Diff line number Diff line
@@ -62,8 +62,6 @@ 
#include <trace/events/skb.h>

#include <net/busy_poll.h>



#include "datagram.h"



/*

 *	Is a socket 'connection oriented' ?

 */

net/core/datagram.h

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



#ifndef _NET_CORE_DATAGRAM_H_

#define _NET_CORE_DATAGRAM_H_



#include <linux/types.h>



struct sock;

struct sk_buff;

struct iov_iter;



int __zerocopy_sg_from_iter(struct sock *sk, struct sk_buff *skb,

			    struct iov_iter *from, size_t length);



#endif /* _NET_CORE_DATAGRAM_H_ */

net/core/skbuff.c

+0 −7
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ 
#include <linux/user_namespace.h>

#include <linux/indirect_call_wrapper.h>



#include "datagram.h"

#include "sock_destructor.h"



struct kmem_cache *skbuff_head_cache __ro_after_init;
@@ -1340,12 +1339,6 @@ void msg_zerocopy_put_abort(struct ubuf_info *uarg, bool have_uref) 
}

EXPORT_SYMBOL_GPL(msg_zerocopy_put_abort);



int skb_zerocopy_iter_dgram(struct sk_buff *skb, struct msghdr *msg, int len)

{

	return __zerocopy_sg_from_iter(skb->sk, skb, &msg->msg_iter, len);

}

EXPORT_SYMBOL_GPL(skb_zerocopy_iter_dgram);



int skb_zerocopy_iter_stream(struct sock *sk, struct sk_buff *skb,

			     struct msghdr *msg, int len,

			     struct ubuf_info *uarg)