Commit 43db6d65 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

socket: sk_filter deinline 



The sk_filter function is too big to be inlined. This saves 2296 bytes
of text on allyesconfig.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b715631f

include/linux/filter.h

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ static inline unsigned int sk_filter_len(const struct sk_filter *fp) 
struct sk_buff;

struct sock;



extern int sk_filter(struct sock *sk, struct sk_buff *skb);

extern unsigned int sk_run_filter(struct sk_buff *skb,

				  struct sock_filter *filter, int flen);

extern int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk);

include/net/sock.h

+0 −35
Original line number Diff line number Diff line
@@ -927,41 +927,6 @@ extern void sk_common_release(struct sock *sk); 
/* Initialise core socket variables */

extern void sock_init_data(struct socket *sock, struct sock *sk);



/**

 *	sk_filter - run a packet through a socket filter

 *	@sk: sock associated with &sk_buff

 *	@skb: buffer to filter

 *	@needlock: set to 1 if the sock is not locked by caller.

 *

 * Run the filter code and then cut skb->data to correct size returned by

 * sk_run_filter. If pkt_len is 0 we toss packet. If skb->len is smaller

 * than pkt_len we keep whole skb->data. This is the socket level

 * wrapper to sk_run_filter. It returns 0 if the packet should

 * be accepted or -EPERM if the packet should be tossed.

 *

 */



static inline int sk_filter(struct sock *sk, struct sk_buff *skb)

{

	int err;

	struct sk_filter *filter;

	

	err = security_sock_rcv_skb(sk, skb);

	if (err)

		return err;

	

	rcu_read_lock_bh();

	filter = rcu_dereference(sk->sk_filter);

	if (filter) {

		unsigned int pkt_len = sk_run_filter(skb, filter->insns,

				filter->len);

		err = pkt_len ? pskb_trim(skb, pkt_len) : -EPERM;

	}

 	rcu_read_unlock_bh();



	return err;

}



/**

 *	sk_filter_release: Release a socket filter

 *	@sk: socket

net/core/filter.c

+35 −0
Original line number Diff line number Diff line
@@ -63,6 +63,41 @@ static inline void *load_pointer(struct sk_buff *skb, int k, 
	}

}



/**

 *	sk_filter - run a packet through a socket filter

 *	@sk: sock associated with &sk_buff

 *	@skb: buffer to filter

 *	@needlock: set to 1 if the sock is not locked by caller.

 *

 * Run the filter code and then cut skb->data to correct size returned by

 * sk_run_filter. If pkt_len is 0 we toss packet. If skb->len is smaller

 * than pkt_len we keep whole skb->data. This is the socket level

 * wrapper to sk_run_filter. It returns 0 if the packet should

 * be accepted or -EPERM if the packet should be tossed.

 *

 */

int sk_filter(struct sock *sk, struct sk_buff *skb)

{

	int err;

	struct sk_filter *filter;



	err = security_sock_rcv_skb(sk, skb);

	if (err)

		return err;



	rcu_read_lock_bh();

	filter = rcu_dereference(sk->sk_filter);

	if (filter) {

		unsigned int pkt_len = sk_run_filter(skb, filter->insns,

				filter->len);

		err = pkt_len ? pskb_trim(skb, pkt_len) : -EPERM;

	}

	rcu_read_unlock_bh();



	return err;

}

EXPORT_SYMBOL(sk_filter);



/**

 *	sk_run_filter - run a filter on a socket

 *	@skb: buffer to run the filter on