2005-04-17 02:20:36 +04:00
|
|
|
/*
|
|
|
|
* INET An implementation of the TCP/IP protocol suite for the LINUX
|
|
|
|
* operating system. INET is implemented using the BSD Socket
|
|
|
|
* interface as the means of communication with the user level.
|
|
|
|
*
|
|
|
|
* PF_INET protocol family socket handler.
|
|
|
|
*
|
2005-05-06 03:16:16 +04:00
|
|
|
* Authors: Ross Biro
|
2005-04-17 02:20:36 +04:00
|
|
|
* Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
|
|
|
|
* Florian La Roche, <flla@stud.uni-sb.de>
|
|
|
|
* Alan Cox, <A.Cox@swansea.ac.uk>
|
|
|
|
*
|
|
|
|
* Changes (see also sock.c)
|
|
|
|
*
|
|
|
|
* piggy,
|
|
|
|
* Karl Knutson : Socket protocol table
|
|
|
|
* A.N.Kuznetsov : Socket death error in accept().
|
|
|
|
* John Richardson : Fix non blocking error in connect()
|
|
|
|
* so sockets that fail to connect
|
|
|
|
* don't return -EINPROGRESS.
|
|
|
|
* Alan Cox : Asynchronous I/O support
|
|
|
|
* Alan Cox : Keep correct socket pointer on sock
|
|
|
|
* structures
|
|
|
|
* when accept() ed
|
|
|
|
* Alan Cox : Semantics of SO_LINGER aren't state
|
|
|
|
* moved to close when you look carefully.
|
|
|
|
* With this fixed and the accept bug fixed
|
|
|
|
* some RPC stuff seems happier.
|
|
|
|
* Niibe Yutaka : 4.4BSD style write async I/O
|
|
|
|
* Alan Cox,
|
|
|
|
* Tony Gale : Fixed reuse semantics.
|
|
|
|
* Alan Cox : bind() shouldn't abort existing but dead
|
|
|
|
* sockets. Stops FTP netin:.. I hope.
|
|
|
|
* Alan Cox : bind() works correctly for RAW sockets.
|
|
|
|
* Note that FreeBSD at least was broken
|
|
|
|
* in this respect so be careful with
|
|
|
|
* compatibility tests...
|
|
|
|
* Alan Cox : routing cache support
|
|
|
|
* Alan Cox : memzero the socket structure for
|
|
|
|
* compactness.
|
|
|
|
* Matt Day : nonblock connect error handler
|
|
|
|
* Alan Cox : Allow large numbers of pending sockets
|
|
|
|
* (eg for big web sites), but only if
|
|
|
|
* specifically application requested.
|
|
|
|
* Alan Cox : New buffering throughout IP. Used
|
|
|
|
* dumbly.
|
|
|
|
* Alan Cox : New buffering now used smartly.
|
|
|
|
* Alan Cox : BSD rather than common sense
|
|
|
|
* interpretation of listen.
|
|
|
|
* Germano Caronni : Assorted small races.
|
|
|
|
* Alan Cox : sendmsg/recvmsg basic support.
|
|
|
|
* Alan Cox : Only sendmsg/recvmsg now supported.
|
|
|
|
* Alan Cox : Locked down bind (see security list).
|
|
|
|
* Alan Cox : Loosened bind a little.
|
|
|
|
* Mike McLagan : ADD/DEL DLCI Ioctls
|
|
|
|
* Willy Konynenberg : Transparent proxying support.
|
|
|
|
* David S. Miller : New socket lookup architecture.
|
|
|
|
* Some other random speedups.
|
|
|
|
* Cyrus Durgin : Cleaned up file for kmod hacks.
|
|
|
|
* Andi Kleen : Fix inet_stream_connect TCP race.
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version
|
|
|
|
* 2 of the License, or (at your option) any later version.
|
|
|
|
*/
|
|
|
|
|
2012-03-12 11:03:32 +04:00
|
|
|
#define pr_fmt(fmt) "IPv4: " fmt
|
|
|
|
|
2006-06-22 14:02:40 +04:00
|
|
|
#include <linux/err.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
#include <linux/errno.h>
|
|
|
|
#include <linux/types.h>
|
|
|
|
#include <linux/socket.h>
|
|
|
|
#include <linux/in.h>
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/sched.h>
|
|
|
|
#include <linux/timer.h>
|
|
|
|
#include <linux/string.h>
|
|
|
|
#include <linux/sockios.h>
|
|
|
|
#include <linux/net.h>
|
2006-01-11 23:17:47 +03:00
|
|
|
#include <linux/capability.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
#include <linux/fcntl.h>
|
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <linux/interrupt.h>
|
|
|
|
#include <linux/stat.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/poll.h>
|
|
|
|
#include <linux/netfilter_ipv4.h>
|
2007-03-23 21:40:27 +03:00
|
|
|
#include <linux/random.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 11:04:11 +03:00
|
|
|
#include <linux/slab.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
#include <asm/uaccess.h>
|
|
|
|
|
|
|
|
#include <linux/inet.h>
|
|
|
|
#include <linux/igmp.h>
|
2005-12-27 07:43:12 +03:00
|
|
|
#include <linux/inetdevice.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
#include <linux/netdevice.h>
|
2008-12-16 10:41:09 +03:00
|
|
|
#include <net/checksum.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
#include <net/ip.h>
|
|
|
|
#include <net/protocol.h>
|
|
|
|
#include <net/arp.h>
|
|
|
|
#include <net/route.h>
|
|
|
|
#include <net/ip_fib.h>
|
2005-08-10 07:11:56 +04:00
|
|
|
#include <net/inet_connection_sock.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
#include <net/tcp.h>
|
|
|
|
#include <net/udp.h>
|
2006-11-27 22:10:57 +03:00
|
|
|
#include <net/udplite.h>
|
net: ipv4: add IPPROTO_ICMP socket kind
This patch adds IPPROTO_ICMP socket kind. It makes it possible to send
ICMP_ECHO messages and receive the corresponding ICMP_ECHOREPLY messages
without any special privileges. In other words, the patch makes it
possible to implement setuid-less and CAP_NET_RAW-less /bin/ping. In
order not to increase the kernel's attack surface, the new functionality
is disabled by default, but is enabled at bootup by supporting Linux
distributions, optionally with restriction to a group or a group range
(see below).
Similar functionality is implemented in Mac OS X:
http://www.manpagez.com/man/4/icmp/
A new ping socket is created with
socket(PF_INET, SOCK_DGRAM, PROT_ICMP)
Message identifiers (octets 4-5 of ICMP header) are interpreted as local
ports. Addresses are stored in struct sockaddr_in. No port numbers are
reserved for privileged processes, port 0 is reserved for API ("let the
kernel pick a free number"). There is no notion of remote ports, remote
port numbers provided by the user (e.g. in connect()) are ignored.
Data sent and received include ICMP headers. This is deliberate to:
1) Avoid the need to transport headers values like sequence numbers by
other means.
2) Make it easier to port existing programs using raw sockets.
ICMP headers given to send() are checked and sanitized. The type must be
ICMP_ECHO and the code must be zero (future extensions might relax this,
see below). The id is set to the number (local port) of the socket, the
checksum is always recomputed.
ICMP reply packets received from the network are demultiplexed according
to their id's, and are returned by recv() without any modifications.
IP header information and ICMP errors of those packets may be obtained
via ancillary data (IP_RECVTTL, IP_RETOPTS, and IP_RECVERR). ICMP source
quenches and redirects are reported as fake errors via the error queue
(IP_RECVERR); the next hop address for redirects is saved to ee_info (in
network order).
socket(2) is restricted to the group range specified in
"/proc/sys/net/ipv4/ping_group_range". It is "1 0" by default, meaning
that nobody (not even root) may create ping sockets. Setting it to "100
100" would grant permissions to the single group (to either make
/sbin/ping g+s and owned by this group or to grant permissions to the
"netadmins" group), "0 4294967295" would enable it for the world, "100
4294967295" would enable it for the users, but not daemons.
The existing code might be (in the unlikely case anyone needs it)
extended rather easily to handle other similar pairs of ICMP messages
(Timestamp/Reply, Information Request/Reply, Address Mask Request/Reply
etc.).
Userspace ping util & patch for it:
http://openwall.info/wiki/people/segoon/ping
For Openwall GNU/*/Linux it was the last step on the road to the
setuid-less distro. A revision of this patch (for RHEL5/OpenVZ kernels)
is in use in Owl-current, such as in the 2011/03/12 LiveCD ISOs:
http://mirrors.kernel.org/openwall/Owl/current/iso/
Initially this functionality was written by Pavel Kankovsky for
Linux 2.4.32, but unfortunately it was never made public.
All ping options (-b, -p, -Q, -R, -s, -t, -T, -M, -I), are tested with
the patch.
PATCH v3:
- switched to flowi4.
- minor changes to be consistent with raw sockets code.
PATCH v2:
- changed ping_debug() to pr_debug().
- removed CONFIG_IP_PING.
- removed ping_seq_fops.owner field (unused for procfs).
- switched to proc_net_fops_create().
- switched to %pK in seq_printf().
PATCH v1:
- fixed checksumming bug.
- CAP_NET_RAW may not create icmp sockets anymore.
RFC v2:
- minor cleanups.
- introduced sysctl'able group range to restrict socket(2).
Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-05-13 14:01:00 +04:00
|
|
|
#include <net/ping.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
#include <linux/skbuff.h>
|
|
|
|
#include <net/sock.h>
|
|
|
|
#include <net/raw.h>
|
|
|
|
#include <net/icmp.h>
|
|
|
|
#include <net/inet_common.h>
|
|
|
|
#include <net/xfrm.h>
|
2008-07-18 15:01:44 +04:00
|
|
|
#include <net/net_namespace.h>
|
2013-04-29 09:58:52 +04:00
|
|
|
#include <net/secure_seq.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
#ifdef CONFIG_IP_MROUTE
|
|
|
|
#include <linux/mroute.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
/* The inetsw table contains everything that inet_create needs to
|
|
|
|
* build a new socket.
|
|
|
|
*/
|
|
|
|
static struct list_head inetsw[SOCK_MAX];
|
|
|
|
static DEFINE_SPINLOCK(inetsw_lock);
|
|
|
|
|
|
|
|
/* New destruction routine */
|
|
|
|
|
|
|
|
void inet_sock_destruct(struct sock *sk)
|
|
|
|
{
|
|
|
|
struct inet_sock *inet = inet_sk(sk);
|
|
|
|
|
|
|
|
__skb_queue_purge(&sk->sk_receive_queue);
|
|
|
|
__skb_queue_purge(&sk->sk_error_queue);
|
|
|
|
|
2007-12-31 11:29:24 +03:00
|
|
|
sk_mem_reclaim(sk);
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
if (sk->sk_type == SOCK_STREAM && sk->sk_state != TCP_CLOSE) {
|
2009-08-29 10:45:21 +04:00
|
|
|
pr_err("Attempt to release TCP socket in state %d %p\n",
|
2005-04-17 02:20:36 +04:00
|
|
|
sk->sk_state, sk);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (!sock_flag(sk, SOCK_DEAD)) {
|
2009-08-29 10:45:21 +04:00
|
|
|
pr_err("Attempt to release alive inet socket %p\n", sk);
|
2005-04-17 02:20:36 +04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2008-07-26 08:43:18 +04:00
|
|
|
WARN_ON(atomic_read(&sk->sk_rmem_alloc));
|
|
|
|
WARN_ON(atomic_read(&sk->sk_wmem_alloc));
|
|
|
|
WARN_ON(sk->sk_wmem_queued);
|
|
|
|
WARN_ON(sk->sk_forward_alloc);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2011-04-21 13:45:37 +04:00
|
|
|
kfree(rcu_dereference_protected(inet->inet_opt, 1));
|
2010-04-09 03:03:29 +04:00
|
|
|
dst_release(rcu_dereference_check(sk->sk_dst_cache, 1));
|
2012-06-20 08:22:05 +04:00
|
|
|
dst_release(sk->sk_rx_dst);
|
2005-08-10 06:45:38 +04:00
|
|
|
sk_refcnt_debug_dec(sk);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2009-08-29 10:45:21 +04:00
|
|
|
EXPORT_SYMBOL(inet_sock_destruct);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* The routines beyond this point handle the behaviour of an AF_INET
|
|
|
|
* socket object. Mostly it punts to the subprotocols of IP to do
|
|
|
|
* the work.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Automatically bind an unbound socket.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static int inet_autobind(struct sock *sk)
|
|
|
|
{
|
|
|
|
struct inet_sock *inet;
|
|
|
|
/* We may need to bind the socket. */
|
|
|
|
lock_sock(sk);
|
|
|
|
inet = inet_sk(sk);
|
2009-10-15 10:30:45 +04:00
|
|
|
if (!inet->inet_num) {
|
2005-04-17 02:20:36 +04:00
|
|
|
if (sk->sk_prot->get_port(sk, 0)) {
|
|
|
|
release_sock(sk);
|
|
|
|
return -EAGAIN;
|
|
|
|
}
|
2009-10-15 10:30:45 +04:00
|
|
|
inet->inet_sport = htons(inet->inet_num);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
release_sock(sk);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Move a socket into listening state.
|
|
|
|
*/
|
|
|
|
int inet_listen(struct socket *sock, int backlog)
|
|
|
|
{
|
|
|
|
struct sock *sk = sock->sk;
|
|
|
|
unsigned char old_state;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
lock_sock(sk);
|
|
|
|
|
|
|
|
err = -EINVAL;
|
|
|
|
if (sock->state != SS_UNCONNECTED || sock->type != SOCK_STREAM)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
old_state = sk->sk_state;
|
|
|
|
if (!((1 << old_state) & (TCPF_CLOSE | TCPF_LISTEN)))
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
/* Really, if the socket is already in listen state
|
|
|
|
* we can only allow the backlog to be adjusted.
|
|
|
|
*/
|
|
|
|
if (old_state != TCP_LISTEN) {
|
2012-08-31 16:29:12 +04:00
|
|
|
/* Check special setups for testing purpose to enable TFO w/o
|
|
|
|
* requiring TCP_FASTOPEN sockopt.
|
|
|
|
* Note that only TCP sockets (SOCK_STREAM) will reach here.
|
|
|
|
* Also fastopenq may already been allocated because this
|
|
|
|
* socket was in TCP_LISTEN state previously but was
|
|
|
|
* shutdown() (rather than close()).
|
|
|
|
*/
|
|
|
|
if ((sysctl_tcp_fastopen & TFO_SERVER_ENABLE) != 0 &&
|
|
|
|
inet_csk(sk)->icsk_accept_queue.fastopenq == NULL) {
|
|
|
|
if ((sysctl_tcp_fastopen & TFO_SERVER_WO_SOCKOPT1) != 0)
|
|
|
|
err = fastopen_init_queue(sk, backlog);
|
|
|
|
else if ((sysctl_tcp_fastopen &
|
|
|
|
TFO_SERVER_WO_SOCKOPT2) != 0)
|
|
|
|
err = fastopen_init_queue(sk,
|
|
|
|
((uint)sysctl_tcp_fastopen) >> 16);
|
|
|
|
else
|
|
|
|
err = 0;
|
|
|
|
if (err)
|
|
|
|
goto out;
|
|
|
|
}
|
2006-11-16 13:30:37 +03:00
|
|
|
err = inet_csk_listen_start(sk, backlog);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (err)
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
sk->sk_max_ack_backlog = backlog;
|
|
|
|
err = 0;
|
|
|
|
|
|
|
|
out:
|
|
|
|
release_sock(sk);
|
|
|
|
return err;
|
|
|
|
}
|
2009-08-29 10:45:21 +04:00
|
|
|
EXPORT_SYMBOL(inet_listen);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Create an inet socket.
|
|
|
|
*/
|
|
|
|
|
2009-11-06 09:18:14 +03:00
|
|
|
static int inet_create(struct net *net, struct socket *sock, int protocol,
|
|
|
|
int kern)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
struct sock *sk;
|
|
|
|
struct inet_protosw *answer;
|
|
|
|
struct inet_sock *inet;
|
|
|
|
struct proto *answer_prot;
|
|
|
|
unsigned char answer_flags;
|
|
|
|
char answer_no_check;
|
2005-08-10 07:19:14 +04:00
|
|
|
int try_loading_module = 0;
|
2005-12-03 07:43:26 +03:00
|
|
|
int err;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
sock->state = SS_UNCONNECTED;
|
|
|
|
|
|
|
|
/* Look for the requested type/protocol pair. */
|
2005-08-10 07:19:14 +04:00
|
|
|
lookup_protocol:
|
2005-12-03 07:43:26 +03:00
|
|
|
err = -ESOCKTNOSUPPORT;
|
2005-04-17 02:20:36 +04:00
|
|
|
rcu_read_lock();
|
2008-07-25 12:45:34 +04:00
|
|
|
list_for_each_entry_rcu(answer, &inetsw[sock->type], list) {
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2008-07-25 12:45:34 +04:00
|
|
|
err = 0;
|
2005-04-17 02:20:36 +04:00
|
|
|
/* Check the non-wild match. */
|
|
|
|
if (protocol == answer->protocol) {
|
|
|
|
if (protocol != IPPROTO_IP)
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
/* Check for the two wild cases. */
|
|
|
|
if (IPPROTO_IP == protocol) {
|
|
|
|
protocol = answer->protocol;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (IPPROTO_IP == answer->protocol)
|
|
|
|
break;
|
|
|
|
}
|
2005-12-03 07:43:26 +03:00
|
|
|
err = -EPROTONOSUPPORT;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2008-07-25 12:45:34 +04:00
|
|
|
if (unlikely(err)) {
|
2005-08-10 07:19:14 +04:00
|
|
|
if (try_loading_module < 2) {
|
|
|
|
rcu_read_unlock();
|
|
|
|
/*
|
|
|
|
* Be more specific, e.g. net-pf-2-proto-132-type-1
|
|
|
|
* (net-pf-PF_INET-proto-IPPROTO_SCTP-type-SOCK_STREAM)
|
|
|
|
*/
|
|
|
|
if (++try_loading_module == 1)
|
|
|
|
request_module("net-pf-%d-proto-%d-type-%d",
|
|
|
|
PF_INET, protocol, sock->type);
|
|
|
|
/*
|
|
|
|
* Fall back to generic, e.g. net-pf-2-proto-132
|
|
|
|
* (net-pf-PF_INET-proto-IPPROTO_SCTP)
|
|
|
|
*/
|
|
|
|
else
|
|
|
|
request_module("net-pf-%d-proto-%d",
|
|
|
|
PF_INET, protocol);
|
|
|
|
goto lookup_protocol;
|
|
|
|
} else
|
|
|
|
goto out_rcu_unlock;
|
|
|
|
}
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
err = -EPERM;
|
net: Allow userns root to control ipv4
Allow an unpriviled user who has created a user namespace, and then
created a network namespace to effectively use the new network
namespace, by reducing capable(CAP_NET_ADMIN) and
capable(CAP_NET_RAW) calls to be ns_capable(net->user_ns,
CAP_NET_ADMIN), or capable(net->user_ns, CAP_NET_RAW) calls.
Settings that merely control a single network device are allowed.
Either the network device is a logical network device where
restrictions make no difference or the network device is hardware NIC
that has been explicity moved from the initial network namespace.
In general policy and network stack state changes are allowed
while resource control is left unchanged.
Allow creating raw sockets.
Allow the SIOCSARP ioctl to control the arp cache.
Allow the SIOCSIFFLAG ioctl to allow setting network device flags.
Allow the SIOCSIFADDR ioctl to allow setting a netdevice ipv4 address.
Allow the SIOCSIFBRDADDR ioctl to allow setting a netdevice ipv4 broadcast address.
Allow the SIOCSIFDSTADDR ioctl to allow setting a netdevice ipv4 destination address.
Allow the SIOCSIFNETMASK ioctl to allow setting a netdevice ipv4 netmask.
Allow the SIOCADDRT and SIOCDELRT ioctls to allow adding and deleting ipv4 routes.
Allow the SIOCADDTUNNEL, SIOCCHGTUNNEL and SIOCDELTUNNEL ioctls for
adding, changing and deleting gre tunnels.
Allow the SIOCADDTUNNEL, SIOCCHGTUNNEL and SIOCDELTUNNEL ioctls for
adding, changing and deleting ipip tunnels.
Allow the SIOCADDTUNNEL, SIOCCHGTUNNEL and SIOCDELTUNNEL ioctls for
adding, changing and deleting ipsec virtual tunnel interfaces.
Allow setting the MRT_INIT, MRT_DONE, MRT_ADD_VIF, MRT_DEL_VIF, MRT_ADD_MFC,
MRT_DEL_MFC, MRT_ASSERT, MRT_PIM, MRT_TABLE socket options on multicast routing
sockets.
Allow setting and receiving IPOPT_CIPSO, IP_OPT_SEC, IP_OPT_SID and
arbitrary ip options.
Allow setting IP_SEC_POLICY/IP_XFRM_POLICY ipv4 socket option.
Allow setting the IP_TRANSPARENT ipv4 socket option.
Allow setting the TCP_REPAIR socket option.
Allow setting the TCP_CONGESTION socket option.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-11-16 07:03:05 +04:00
|
|
|
if (sock->type == SOCK_RAW && !kern &&
|
|
|
|
!ns_capable(net->user_ns, CAP_NET_RAW))
|
2005-04-17 02:20:36 +04:00
|
|
|
goto out_rcu_unlock;
|
|
|
|
|
|
|
|
sock->ops = answer->ops;
|
|
|
|
answer_prot = answer->prot;
|
|
|
|
answer_no_check = answer->no_check;
|
|
|
|
answer_flags = answer->flags;
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
2008-07-26 08:43:18 +04:00
|
|
|
WARN_ON(answer_prot->slab == NULL);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
err = -ENOBUFS;
|
2007-11-01 10:39:31 +03:00
|
|
|
sk = sk_alloc(net, PF_INET, GFP_KERNEL, answer_prot);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (sk == NULL)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
err = 0;
|
|
|
|
sk->sk_no_check = answer_no_check;
|
|
|
|
if (INET_PROTOSW_REUSE & answer_flags)
|
2012-04-19 07:39:36 +04:00
|
|
|
sk->sk_reuse = SK_CAN_REUSE;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
inet = inet_sk(sk);
|
2007-01-10 01:37:06 +03:00
|
|
|
inet->is_icsk = (INET_PROTOSW_ICSK & answer_flags) != 0;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-06-15 05:07:31 +04:00
|
|
|
inet->nodefrag = 0;
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
if (SOCK_RAW == sock->type) {
|
2009-10-15 10:30:45 +04:00
|
|
|
inet->inet_num = protocol;
|
2005-04-17 02:20:36 +04:00
|
|
|
if (IPPROTO_RAW == protocol)
|
|
|
|
inet->hdrincl = 1;
|
|
|
|
}
|
|
|
|
|
2013-12-14 08:13:38 +04:00
|
|
|
if (net->ipv4.sysctl_ip_no_pmtu_disc)
|
2005-04-17 02:20:36 +04:00
|
|
|
inet->pmtudisc = IP_PMTUDISC_DONT;
|
|
|
|
else
|
|
|
|
inet->pmtudisc = IP_PMTUDISC_WANT;
|
|
|
|
|
2009-10-15 10:30:45 +04:00
|
|
|
inet->inet_id = 0;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
sock_init_data(sock, sk);
|
|
|
|
|
|
|
|
sk->sk_destruct = inet_sock_destruct;
|
|
|
|
sk->sk_protocol = protocol;
|
|
|
|
sk->sk_backlog_rcv = sk->sk_prot->backlog_rcv;
|
|
|
|
|
|
|
|
inet->uc_ttl = -1;
|
|
|
|
inet->mc_loop = 1;
|
|
|
|
inet->mc_ttl = 1;
|
2009-05-28 11:00:46 +04:00
|
|
|
inet->mc_all = 1;
|
2005-04-17 02:20:36 +04:00
|
|
|
inet->mc_index = 0;
|
|
|
|
inet->mc_list = NULL;
|
2012-02-09 13:35:49 +04:00
|
|
|
inet->rcv_tos = 0;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2005-08-10 06:45:38 +04:00
|
|
|
sk_refcnt_debug_inc(sk);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2009-10-15 10:30:45 +04:00
|
|
|
if (inet->inet_num) {
|
2005-04-17 02:20:36 +04:00
|
|
|
/* It assumes that any protocol which allows
|
|
|
|
* the user to assign a number at socket
|
|
|
|
* creation time automatically
|
|
|
|
* shares.
|
|
|
|
*/
|
2009-10-15 10:30:45 +04:00
|
|
|
inet->inet_sport = htons(inet->inet_num);
|
2005-04-17 02:20:36 +04:00
|
|
|
/* Add to protocol hash chains. */
|
|
|
|
sk->sk_prot->hash(sk);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (sk->sk_prot->init) {
|
|
|
|
err = sk->sk_prot->init(sk);
|
|
|
|
if (err)
|
|
|
|
sk_common_release(sk);
|
|
|
|
}
|
|
|
|
out:
|
|
|
|
return err;
|
|
|
|
out_rcu_unlock:
|
|
|
|
rcu_read_unlock();
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The peer socket should always be NULL (or else). When we call this
|
|
|
|
* function we are destroying the object and from then on nobody
|
|
|
|
* should refer to it.
|
|
|
|
*/
|
|
|
|
int inet_release(struct socket *sock)
|
|
|
|
{
|
|
|
|
struct sock *sk = sock->sk;
|
|
|
|
|
|
|
|
if (sk) {
|
|
|
|
long timeout;
|
|
|
|
|
2010-04-28 02:05:31 +04:00
|
|
|
sock_rps_reset_flow(sk);
|
rfs: Receive Flow Steering
This patch implements receive flow steering (RFS). RFS steers
received packets for layer 3 and 4 processing to the CPU where
the application for the corresponding flow is running. RFS is an
extension of Receive Packet Steering (RPS).
The basic idea of RFS is that when an application calls recvmsg
(or sendmsg) the application's running CPU is stored in a hash
table that is indexed by the connection's rxhash which is stored in
the socket structure. The rxhash is passed in skb's received on
the connection from netif_receive_skb. For each received packet,
the associated rxhash is used to look up the CPU in the hash table,
if a valid CPU is set then the packet is steered to that CPU using
the RPS mechanisms.
The convolution of the simple approach is that it would potentially
allow OOO packets. If threads are thrashing around CPUs or multiple
threads are trying to read from the same sockets, a quickly changing
CPU value in the hash table could cause rampant OOO packets--
we consider this a non-starter.
To avoid OOO packets, this solution implements two types of hash
tables: rps_sock_flow_table and rps_dev_flow_table.
rps_sock_table is a global hash table. Each entry is just a CPU
number and it is populated in recvmsg and sendmsg as described above.
This table contains the "desired" CPUs for flows.
rps_dev_flow_table is specific to each device queue. Each entry
contains a CPU and a tail queue counter. The CPU is the "current"
CPU for a matching flow. The tail queue counter holds the value
of a tail queue counter for the associated CPU's backlog queue at
the time of last enqueue for a flow matching the entry.
Each backlog queue has a queue head counter which is incremented
on dequeue, and so a queue tail counter is computed as queue head
count + queue length. When a packet is enqueued on a backlog queue,
the current value of the queue tail counter is saved in the hash
entry of the rps_dev_flow_table.
And now the trick: when selecting the CPU for RPS (get_rps_cpu)
the rps_sock_flow table and the rps_dev_flow table for the RX queue
are consulted. When the desired CPU for the flow (found in the
rps_sock_flow table) does not match the current CPU (found in the
rps_dev_flow table), the current CPU is changed to the desired CPU
if one of the following is true:
- The current CPU is unset (equal to RPS_NO_CPU)
- Current CPU is offline
- The current CPU's queue head counter >= queue tail counter in the
rps_dev_flow table. This checks if the queue tail has advanced
beyond the last packet that was enqueued using this table entry.
This guarantees that all packets queued using this entry have been
dequeued, thus preserving in order delivery.
Making each queue have its own rps_dev_flow table has two advantages:
1) the tail queue counters will be written on each receive, so
keeping the table local to interrupting CPU s good for locality. 2)
this allows lockless access to the table-- the CPU number and queue
tail counter need to be accessed together under mutual exclusion
from netif_receive_skb, we assume that this is only called from
device napi_poll which is non-reentrant.
This patch implements RFS for TCP and connected UDP sockets.
It should be usable for other flow oriented protocols.
There are two configuration parameters for RFS. The
"rps_flow_entries" kernel init parameter sets the number of
entries in the rps_sock_flow_table, the per rxqueue sysfs entry
"rps_flow_cnt" contains the number of entries in the rps_dev_flow
table for the rxqueue. Both are rounded to power of two.
The obvious benefit of RFS (over just RPS) is that it achieves
CPU locality between the receive processing for a flow and the
applications processing; this can result in increased performance
(higher pps, lower latency).
The benefits of RFS are dependent on cache hierarchy, application
load, and other factors. On simple benchmarks, we don't necessarily
see improvement and sometimes see degradation. However, for more
complex benchmarks and for applications where cache pressure is
much higher this technique seems to perform very well.
Below are some benchmark results which show the potential benfit of
this patch. The netperf test has 500 instances of netperf TCP_RR
test with 1 byte req. and resp. The RPC test is an request/response
test similar in structure to netperf RR test ith 100 threads on
each host, but does more work in userspace that netperf.
e1000e on 8 core Intel
No RFS or RPS 104K tps at 30% CPU
No RFS (best RPS config): 290K tps at 63% CPU
RFS 303K tps at 61% CPU
RPC test tps CPU% 50/90/99% usec latency Latency StdDev
No RFS/RPS 103K 48% 757/900/3185 4472.35
RPS only: 174K 73% 415/993/2468 491.66
RFS 223K 73% 379/651/1382 315.61
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-04-17 03:01:27 +04:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/* Applications forget to leave groups before exiting */
|
|
|
|
ip_mc_drop_socket(sk);
|
|
|
|
|
|
|
|
/* If linger is set, we don't return until the close
|
|
|
|
* is complete. Otherwise we return immediately. The
|
|
|
|
* actually closing is done the same either way.
|
|
|
|
*
|
|
|
|
* If the close is due to the process exiting, we never
|
|
|
|
* linger..
|
|
|
|
*/
|
|
|
|
timeout = 0;
|
|
|
|
if (sock_flag(sk, SOCK_LINGER) &&
|
|
|
|
!(current->flags & PF_EXITING))
|
|
|
|
timeout = sk->sk_lingertime;
|
|
|
|
sock->sk = NULL;
|
|
|
|
sk->sk_prot->close(sk, timeout);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2009-08-29 10:45:21 +04:00
|
|
|
EXPORT_SYMBOL(inet_release);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/* It is off by default, see below. */
|
2006-09-23 01:15:41 +04:00
|
|
|
int sysctl_ip_nonlocal_bind __read_mostly;
|
2009-08-29 10:45:21 +04:00
|
|
|
EXPORT_SYMBOL(sysctl_ip_nonlocal_bind);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
|
|
|
|
{
|
|
|
|
struct sockaddr_in *addr = (struct sockaddr_in *)uaddr;
|
|
|
|
struct sock *sk = sock->sk;
|
|
|
|
struct inet_sock *inet = inet_sk(sk);
|
2012-11-16 07:03:12 +04:00
|
|
|
struct net *net = sock_net(sk);
|
2005-04-17 02:20:36 +04:00
|
|
|
unsigned short snum;
|
|
|
|
int chk_addr_ret;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
/* If the socket has its own bind function then use it. (RAW) */
|
|
|
|
if (sk->sk_prot->bind) {
|
|
|
|
err = sk->sk_prot->bind(sk, uaddr, addr_len);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
err = -EINVAL;
|
|
|
|
if (addr_len < sizeof(struct sockaddr_in))
|
|
|
|
goto out;
|
|
|
|
|
net: bind() fix error return on wrong address family
Hi,
Reinhard Max also pointed out that the error should EAFNOSUPPORT according
to POSIX.
The Linux manpages have it as EINVAL, some other OSes (Minix, HPUX, perhaps BSD) use
EAFNOSUPPORT. Windows uses WSAEFAULT according to MSDN.
Other protocols error values in their af bind() methods in current mainline git as far
as a brief look shows:
EAFNOSUPPORT: atm, appletalk, l2tp, llc, phonet, rxrpc
EINVAL: ax25, bluetooth, decnet, econet, ieee802154, iucv, netlink, netrom, packet, rds, rose, unix, x25,
No check?: can/raw, ipv6/raw, irda, l2tp/l2tp_ip
Ciao, Marcus
Signed-off-by: Marcus Meissner <meissner@suse.de>
Cc: Reinhard Max <max@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-07-04 05:30:29 +04:00
|
|
|
if (addr->sin_family != AF_INET) {
|
2011-08-31 02:57:00 +04:00
|
|
|
/* Compatibility games : accept AF_UNSPEC (mapped to AF_INET)
|
|
|
|
* only if s_addr is INADDR_ANY.
|
|
|
|
*/
|
net: bind() fix error return on wrong address family
Hi,
Reinhard Max also pointed out that the error should EAFNOSUPPORT according
to POSIX.
The Linux manpages have it as EINVAL, some other OSes (Minix, HPUX, perhaps BSD) use
EAFNOSUPPORT. Windows uses WSAEFAULT according to MSDN.
Other protocols error values in their af bind() methods in current mainline git as far
as a brief look shows:
EAFNOSUPPORT: atm, appletalk, l2tp, llc, phonet, rxrpc
EINVAL: ax25, bluetooth, decnet, econet, ieee802154, iucv, netlink, netrom, packet, rds, rose, unix, x25,
No check?: can/raw, ipv6/raw, irda, l2tp/l2tp_ip
Ciao, Marcus
Signed-off-by: Marcus Meissner <meissner@suse.de>
Cc: Reinhard Max <max@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-07-04 05:30:29 +04:00
|
|
|
err = -EAFNOSUPPORT;
|
2011-08-31 02:57:00 +04:00
|
|
|
if (addr->sin_family != AF_UNSPEC ||
|
|
|
|
addr->sin_addr.s_addr != htonl(INADDR_ANY))
|
|
|
|
goto out;
|
net: bind() fix error return on wrong address family
Hi,
Reinhard Max also pointed out that the error should EAFNOSUPPORT according
to POSIX.
The Linux manpages have it as EINVAL, some other OSes (Minix, HPUX, perhaps BSD) use
EAFNOSUPPORT. Windows uses WSAEFAULT according to MSDN.
Other protocols error values in their af bind() methods in current mainline git as far
as a brief look shows:
EAFNOSUPPORT: atm, appletalk, l2tp, llc, phonet, rxrpc
EINVAL: ax25, bluetooth, decnet, econet, ieee802154, iucv, netlink, netrom, packet, rds, rose, unix, x25,
No check?: can/raw, ipv6/raw, irda, l2tp/l2tp_ip
Ciao, Marcus
Signed-off-by: Marcus Meissner <meissner@suse.de>
Cc: Reinhard Max <max@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-07-04 05:30:29 +04:00
|
|
|
}
|
2011-06-02 08:05:22 +04:00
|
|
|
|
2012-11-16 07:03:12 +04:00
|
|
|
chk_addr_ret = inet_addr_type(net, addr->sin_addr.s_addr);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/* Not specified by any standard per-se, however it breaks too
|
|
|
|
* many applications when removed. It is unfortunate since
|
|
|
|
* allowing applications to make a non-local bind solves
|
|
|
|
* several problems with systems using dynamic addressing.
|
|
|
|
* (ie. your servers still start up even if your ISDN link
|
|
|
|
* is temporarily down)
|
|
|
|
*/
|
|
|
|
err = -EADDRNOTAVAIL;
|
|
|
|
if (!sysctl_ip_nonlocal_bind &&
|
2008-10-01 18:31:24 +04:00
|
|
|
!(inet->freebind || inet->transparent) &&
|
2008-03-18 08:44:53 +03:00
|
|
|
addr->sin_addr.s_addr != htonl(INADDR_ANY) &&
|
2005-04-17 02:20:36 +04:00
|
|
|
chk_addr_ret != RTN_LOCAL &&
|
|
|
|
chk_addr_ret != RTN_MULTICAST &&
|
|
|
|
chk_addr_ret != RTN_BROADCAST)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
snum = ntohs(addr->sin_port);
|
|
|
|
err = -EACCES;
|
2012-11-16 07:03:12 +04:00
|
|
|
if (snum && snum < PROT_SOCK &&
|
|
|
|
!ns_capable(net->user_ns, CAP_NET_BIND_SERVICE))
|
2005-04-17 02:20:36 +04:00
|
|
|
goto out;
|
|
|
|
|
|
|
|
/* We keep a pair of addresses. rcv_saddr is the one
|
|
|
|
* used by hash lookups, and saddr is used for transmit.
|
|
|
|
*
|
|
|
|
* In the BSD API these are the same except where it
|
|
|
|
* would be illegal to use them (multicast/broadcast) in
|
|
|
|
* which case the sending device address is used.
|
|
|
|
*/
|
|
|
|
lock_sock(sk);
|
|
|
|
|
|
|
|
/* Check these errors (active socket, double bind). */
|
|
|
|
err = -EINVAL;
|
2009-10-15 10:30:45 +04:00
|
|
|
if (sk->sk_state != TCP_CLOSE || inet->inet_num)
|
2005-04-17 02:20:36 +04:00
|
|
|
goto out_release_sock;
|
|
|
|
|
2009-10-15 10:30:45 +04:00
|
|
|
inet->inet_rcv_saddr = inet->inet_saddr = addr->sin_addr.s_addr;
|
2005-04-17 02:20:36 +04:00
|
|
|
if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
|
2009-10-15 10:30:45 +04:00
|
|
|
inet->inet_saddr = 0; /* Use device */
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/* Make sure we are allowed to bind here. */
|
|
|
|
if (sk->sk_prot->get_port(sk, snum)) {
|
2009-10-15 10:30:45 +04:00
|
|
|
inet->inet_saddr = inet->inet_rcv_saddr = 0;
|
2005-04-17 02:20:36 +04:00
|
|
|
err = -EADDRINUSE;
|
|
|
|
goto out_release_sock;
|
|
|
|
}
|
|
|
|
|
2009-10-15 10:30:45 +04:00
|
|
|
if (inet->inet_rcv_saddr)
|
2005-04-17 02:20:36 +04:00
|
|
|
sk->sk_userlocks |= SOCK_BINDADDR_LOCK;
|
|
|
|
if (snum)
|
|
|
|
sk->sk_userlocks |= SOCK_BINDPORT_LOCK;
|
2009-10-15 10:30:45 +04:00
|
|
|
inet->inet_sport = htons(inet->inet_num);
|
|
|
|
inet->inet_daddr = 0;
|
|
|
|
inet->inet_dport = 0;
|
2005-04-17 02:20:36 +04:00
|
|
|
sk_dst_reset(sk);
|
|
|
|
err = 0;
|
|
|
|
out_release_sock:
|
|
|
|
release_sock(sk);
|
|
|
|
out:
|
|
|
|
return err;
|
|
|
|
}
|
2009-08-29 10:45:21 +04:00
|
|
|
EXPORT_SYMBOL(inet_bind);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2012-04-15 05:34:41 +04:00
|
|
|
int inet_dgram_connect(struct socket *sock, struct sockaddr *uaddr,
|
2005-04-17 02:20:36 +04:00
|
|
|
int addr_len, int flags)
|
|
|
|
{
|
|
|
|
struct sock *sk = sock->sk;
|
|
|
|
|
2010-04-01 02:58:26 +04:00
|
|
|
if (addr_len < sizeof(uaddr->sa_family))
|
|
|
|
return -EINVAL;
|
2005-04-17 02:20:36 +04:00
|
|
|
if (uaddr->sa_family == AF_UNSPEC)
|
|
|
|
return sk->sk_prot->disconnect(sk, flags);
|
|
|
|
|
2009-10-15 10:30:45 +04:00
|
|
|
if (!inet_sk(sk)->inet_num && inet_autobind(sk))
|
2005-04-17 02:20:36 +04:00
|
|
|
return -EAGAIN;
|
2012-06-03 21:41:40 +04:00
|
|
|
return sk->sk_prot->connect(sk, uaddr, addr_len);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2009-08-29 10:45:21 +04:00
|
|
|
EXPORT_SYMBOL(inet_dgram_connect);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2012-07-19 10:43:07 +04:00
|
|
|
static long inet_wait_for_connect(struct sock *sk, long timeo, int writebias)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
DEFINE_WAIT(wait);
|
|
|
|
|
2010-04-20 17:03:51 +04:00
|
|
|
prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
|
2012-07-19 10:43:07 +04:00
|
|
|
sk->sk_write_pending += writebias;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/* Basic assumption: if someone sets sk->sk_err, he _must_
|
|
|
|
* change state of the socket from TCP_SYN_*.
|
|
|
|
* Connect() does not allow to get error notifications
|
|
|
|
* without closing the socket.
|
|
|
|
*/
|
|
|
|
while ((1 << sk->sk_state) & (TCPF_SYN_SENT | TCPF_SYN_RECV)) {
|
|
|
|
release_sock(sk);
|
|
|
|
timeo = schedule_timeout(timeo);
|
|
|
|
lock_sock(sk);
|
|
|
|
if (signal_pending(current) || !timeo)
|
|
|
|
break;
|
2010-04-20 17:03:51 +04:00
|
|
|
prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2010-04-20 17:03:51 +04:00
|
|
|
finish_wait(sk_sleep(sk), &wait);
|
2012-07-19 10:43:07 +04:00
|
|
|
sk->sk_write_pending -= writebias;
|
2005-04-17 02:20:36 +04:00
|
|
|
return timeo;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Connect to a remote host. There is regrettably still a little
|
|
|
|
* TCP 'magic' in here.
|
|
|
|
*/
|
2012-07-19 10:43:09 +04:00
|
|
|
int __inet_stream_connect(struct socket *sock, struct sockaddr *uaddr,
|
|
|
|
int addr_len, int flags)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
struct sock *sk = sock->sk;
|
|
|
|
int err;
|
|
|
|
long timeo;
|
|
|
|
|
2010-04-01 02:58:26 +04:00
|
|
|
if (addr_len < sizeof(uaddr->sa_family))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
if (uaddr->sa_family == AF_UNSPEC) {
|
|
|
|
err = sk->sk_prot->disconnect(sk, flags);
|
|
|
|
sock->state = err ? SS_DISCONNECTING : SS_UNCONNECTED;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (sock->state) {
|
|
|
|
default:
|
|
|
|
err = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
case SS_CONNECTED:
|
|
|
|
err = -EISCONN;
|
|
|
|
goto out;
|
|
|
|
case SS_CONNECTING:
|
|
|
|
err = -EALREADY;
|
|
|
|
/* Fall out of switch with err, set for this state */
|
|
|
|
break;
|
|
|
|
case SS_UNCONNECTED:
|
|
|
|
err = -EISCONN;
|
|
|
|
if (sk->sk_state != TCP_CLOSE)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
err = sk->sk_prot->connect(sk, uaddr, addr_len);
|
|
|
|
if (err < 0)
|
|
|
|
goto out;
|
|
|
|
|
2007-02-09 17:24:47 +03:00
|
|
|
sock->state = SS_CONNECTING;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/* Just entered SS_CONNECTING state; the only
|
|
|
|
* difference is that return value in non-blocking
|
|
|
|
* case is EINPROGRESS, rather than EALREADY.
|
|
|
|
*/
|
|
|
|
err = -EINPROGRESS;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
timeo = sock_sndtimeo(sk, flags & O_NONBLOCK);
|
|
|
|
|
|
|
|
if ((1 << sk->sk_state) & (TCPF_SYN_SENT | TCPF_SYN_RECV)) {
|
2012-07-19 10:43:07 +04:00
|
|
|
int writebias = (sk->sk_protocol == IPPROTO_TCP) &&
|
|
|
|
tcp_sk(sk)->fastopen_req &&
|
|
|
|
tcp_sk(sk)->fastopen_req->data ? 1 : 0;
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/* Error code is set above */
|
2012-07-19 10:43:07 +04:00
|
|
|
if (!timeo || !inet_wait_for_connect(sk, timeo, writebias))
|
2005-04-17 02:20:36 +04:00
|
|
|
goto out;
|
|
|
|
|
|
|
|
err = sock_intr_errno(timeo);
|
|
|
|
if (signal_pending(current))
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Connection was closed by RST, timeout, ICMP error
|
|
|
|
* or another process disconnected us.
|
|
|
|
*/
|
|
|
|
if (sk->sk_state == TCP_CLOSE)
|
|
|
|
goto sock_error;
|
|
|
|
|
|
|
|
/* sk->sk_err may be not zero now, if RECVERR was ordered by user
|
|
|
|
* and error was received after socket entered established state.
|
|
|
|
* Hence, it is handled normally after connect() return successfully.
|
|
|
|
*/
|
|
|
|
|
|
|
|
sock->state = SS_CONNECTED;
|
|
|
|
err = 0;
|
|
|
|
out:
|
|
|
|
return err;
|
|
|
|
|
|
|
|
sock_error:
|
|
|
|
err = sock_error(sk) ? : -ECONNABORTED;
|
|
|
|
sock->state = SS_UNCONNECTED;
|
|
|
|
if (sk->sk_prot->disconnect(sk, flags))
|
|
|
|
sock->state = SS_DISCONNECTING;
|
|
|
|
goto out;
|
|
|
|
}
|
2012-07-19 10:43:09 +04:00
|
|
|
EXPORT_SYMBOL(__inet_stream_connect);
|
|
|
|
|
|
|
|
int inet_stream_connect(struct socket *sock, struct sockaddr *uaddr,
|
|
|
|
int addr_len, int flags)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
lock_sock(sock->sk);
|
|
|
|
err = __inet_stream_connect(sock, uaddr, addr_len, flags);
|
|
|
|
release_sock(sock->sk);
|
|
|
|
return err;
|
|
|
|
}
|
2009-08-29 10:45:21 +04:00
|
|
|
EXPORT_SYMBOL(inet_stream_connect);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Accept a pending connection. The TCP layer now gives BSD semantics.
|
|
|
|
*/
|
|
|
|
|
|
|
|
int inet_accept(struct socket *sock, struct socket *newsock, int flags)
|
|
|
|
{
|
|
|
|
struct sock *sk1 = sock->sk;
|
|
|
|
int err = -EINVAL;
|
|
|
|
struct sock *sk2 = sk1->sk_prot->accept(sk1, flags, &err);
|
|
|
|
|
|
|
|
if (!sk2)
|
|
|
|
goto do_err;
|
|
|
|
|
|
|
|
lock_sock(sk2);
|
|
|
|
|
net: rfs: enable RFS before first data packet is received
Le jeudi 16 juin 2011 à 23:38 -0400, David Miller a écrit :
> From: Ben Hutchings <bhutchings@solarflare.com>
> Date: Fri, 17 Jun 2011 00:50:46 +0100
>
> > On Wed, 2011-06-15 at 04:15 +0200, Eric Dumazet wrote:
> >> @@ -1594,6 +1594,7 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
> >> goto discard;
> >>
> >> if (nsk != sk) {
> >> + sock_rps_save_rxhash(nsk, skb->rxhash);
> >> if (tcp_child_process(sk, nsk, skb)) {
> >> rsk = nsk;
> >> goto reset;
> >>
> >
> > I haven't tried this, but it looks reasonable to me.
> >
> > What about IPv6? The logic in tcp_v6_do_rcv() looks very similar.
>
> Indeed ipv6 side needs the same fix.
>
> Eric please add that part and resubmit. And in fact I might stick
> this into net-2.6 instead of net-next-2.6
>
OK, here is the net-2.6 based one then, thanks !
[PATCH v2] net: rfs: enable RFS before first data packet is received
First packet received on a passive tcp flow is not correctly RFS
steered.
One sock_rps_record_flow() call is missing in inet_accept()
But before that, we also must record rxhash when child socket is setup.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Tom Herbert <therbert@google.com>
CC: Ben Hutchings <bhutchings@solarflare.com>
CC: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@conan.davemloft.net>
2011-06-17 07:45:15 +04:00
|
|
|
sock_rps_record_flow(sk2);
|
2008-07-26 08:43:18 +04:00
|
|
|
WARN_ON(!((1 << sk2->sk_state) &
|
2012-08-31 16:29:12 +04:00
|
|
|
(TCPF_ESTABLISHED | TCPF_SYN_RECV |
|
|
|
|
TCPF_CLOSE_WAIT | TCPF_CLOSE)));
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
sock_graft(sk2, newsock);
|
|
|
|
|
|
|
|
newsock->state = SS_CONNECTED;
|
|
|
|
err = 0;
|
|
|
|
release_sock(sk2);
|
|
|
|
do_err:
|
|
|
|
return err;
|
|
|
|
}
|
2009-08-29 10:45:21 +04:00
|
|
|
EXPORT_SYMBOL(inet_accept);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This does both peername and sockname.
|
|
|
|
*/
|
|
|
|
int inet_getname(struct socket *sock, struct sockaddr *uaddr,
|
|
|
|
int *uaddr_len, int peer)
|
|
|
|
{
|
|
|
|
struct sock *sk = sock->sk;
|
|
|
|
struct inet_sock *inet = inet_sk(sk);
|
2009-10-29 12:59:18 +03:00
|
|
|
DECLARE_SOCKADDR(struct sockaddr_in *, sin, uaddr);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
sin->sin_family = AF_INET;
|
|
|
|
if (peer) {
|
2009-10-15 10:30:45 +04:00
|
|
|
if (!inet->inet_dport ||
|
2005-04-17 02:20:36 +04:00
|
|
|
(((1 << sk->sk_state) & (TCPF_CLOSE | TCPF_SYN_SENT)) &&
|
|
|
|
peer == 1))
|
|
|
|
return -ENOTCONN;
|
2009-10-15 10:30:45 +04:00
|
|
|
sin->sin_port = inet->inet_dport;
|
|
|
|
sin->sin_addr.s_addr = inet->inet_daddr;
|
2005-04-17 02:20:36 +04:00
|
|
|
} else {
|
2009-10-15 10:30:45 +04:00
|
|
|
__be32 addr = inet->inet_rcv_saddr;
|
2005-04-17 02:20:36 +04:00
|
|
|
if (!addr)
|
2009-10-15 10:30:45 +04:00
|
|
|
addr = inet->inet_saddr;
|
|
|
|
sin->sin_port = inet->inet_sport;
|
2005-04-17 02:20:36 +04:00
|
|
|
sin->sin_addr.s_addr = addr;
|
|
|
|
}
|
|
|
|
memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
|
|
|
|
*uaddr_len = sizeof(*sin);
|
|
|
|
return 0;
|
|
|
|
}
|
2009-08-29 10:45:21 +04:00
|
|
|
EXPORT_SYMBOL(inet_getname);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
int inet_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
|
|
|
|
size_t size)
|
|
|
|
{
|
|
|
|
struct sock *sk = sock->sk;
|
|
|
|
|
2010-04-28 02:05:31 +04:00
|
|
|
sock_rps_record_flow(sk);
|
rfs: Receive Flow Steering
This patch implements receive flow steering (RFS). RFS steers
received packets for layer 3 and 4 processing to the CPU where
the application for the corresponding flow is running. RFS is an
extension of Receive Packet Steering (RPS).
The basic idea of RFS is that when an application calls recvmsg
(or sendmsg) the application's running CPU is stored in a hash
table that is indexed by the connection's rxhash which is stored in
the socket structure. The rxhash is passed in skb's received on
the connection from netif_receive_skb. For each received packet,
the associated rxhash is used to look up the CPU in the hash table,
if a valid CPU is set then the packet is steered to that CPU using
the RPS mechanisms.
The convolution of the simple approach is that it would potentially
allow OOO packets. If threads are thrashing around CPUs or multiple
threads are trying to read from the same sockets, a quickly changing
CPU value in the hash table could cause rampant OOO packets--
we consider this a non-starter.
To avoid OOO packets, this solution implements two types of hash
tables: rps_sock_flow_table and rps_dev_flow_table.
rps_sock_table is a global hash table. Each entry is just a CPU
number and it is populated in recvmsg and sendmsg as described above.
This table contains the "desired" CPUs for flows.
rps_dev_flow_table is specific to each device queue. Each entry
contains a CPU and a tail queue counter. The CPU is the "current"
CPU for a matching flow. The tail queue counter holds the value
of a tail queue counter for the associated CPU's backlog queue at
the time of last enqueue for a flow matching the entry.
Each backlog queue has a queue head counter which is incremented
on dequeue, and so a queue tail counter is computed as queue head
count + queue length. When a packet is enqueued on a backlog queue,
the current value of the queue tail counter is saved in the hash
entry of the rps_dev_flow_table.
And now the trick: when selecting the CPU for RPS (get_rps_cpu)
the rps_sock_flow table and the rps_dev_flow table for the RX queue
are consulted. When the desired CPU for the flow (found in the
rps_sock_flow table) does not match the current CPU (found in the
rps_dev_flow table), the current CPU is changed to the desired CPU
if one of the following is true:
- The current CPU is unset (equal to RPS_NO_CPU)
- Current CPU is offline
- The current CPU's queue head counter >= queue tail counter in the
rps_dev_flow table. This checks if the queue tail has advanced
beyond the last packet that was enqueued using this table entry.
This guarantees that all packets queued using this entry have been
dequeued, thus preserving in order delivery.
Making each queue have its own rps_dev_flow table has two advantages:
1) the tail queue counters will be written on each receive, so
keeping the table local to interrupting CPU s good for locality. 2)
this allows lockless access to the table-- the CPU number and queue
tail counter need to be accessed together under mutual exclusion
from netif_receive_skb, we assume that this is only called from
device napi_poll which is non-reentrant.
This patch implements RFS for TCP and connected UDP sockets.
It should be usable for other flow oriented protocols.
There are two configuration parameters for RFS. The
"rps_flow_entries" kernel init parameter sets the number of
entries in the rps_sock_flow_table, the per rxqueue sysfs entry
"rps_flow_cnt" contains the number of entries in the rps_dev_flow
table for the rxqueue. Both are rounded to power of two.
The obvious benefit of RFS (over just RPS) is that it achieves
CPU locality between the receive processing for a flow and the
applications processing; this can result in increased performance
(higher pps, lower latency).
The benefits of RFS are dependent on cache hierarchy, application
load, and other factors. On simple benchmarks, we don't necessarily
see improvement and sometimes see degradation. However, for more
complex benchmarks and for applications where cache pressure is
much higher this technique seems to perform very well.
Below are some benchmark results which show the potential benfit of
this patch. The netperf test has 500 instances of netperf TCP_RR
test with 1 byte req. and resp. The RPC test is an request/response
test similar in structure to netperf RR test ith 100 threads on
each host, but does more work in userspace that netperf.
e1000e on 8 core Intel
No RFS or RPS 104K tps at 30% CPU
No RFS (best RPS config): 290K tps at 63% CPU
RFS 303K tps at 61% CPU
RPC test tps CPU% 50/90/99% usec latency Latency StdDev
No RFS/RPS 103K 48% 757/900/3185 4472.35
RPS only: 174K 73% 415/993/2468 491.66
RFS 223K 73% 379/651/1382 315.61
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-04-17 03:01:27 +04:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/* We may need to bind the socket. */
|
2010-07-11 00:41:55 +04:00
|
|
|
if (!inet_sk(sk)->inet_num && !sk->sk_prot->no_autobind &&
|
|
|
|
inet_autobind(sk))
|
2005-04-17 02:20:36 +04:00
|
|
|
return -EAGAIN;
|
|
|
|
|
|
|
|
return sk->sk_prot->sendmsg(iocb, sk, msg, size);
|
|
|
|
}
|
2009-08-29 10:45:21 +04:00
|
|
|
EXPORT_SYMBOL(inet_sendmsg);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-07-11 00:41:55 +04:00
|
|
|
ssize_t inet_sendpage(struct socket *sock, struct page *page, int offset,
|
|
|
|
size_t size, int flags)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
struct sock *sk = sock->sk;
|
|
|
|
|
2010-04-28 02:05:31 +04:00
|
|
|
sock_rps_record_flow(sk);
|
rfs: Receive Flow Steering
This patch implements receive flow steering (RFS). RFS steers
received packets for layer 3 and 4 processing to the CPU where
the application for the corresponding flow is running. RFS is an
extension of Receive Packet Steering (RPS).
The basic idea of RFS is that when an application calls recvmsg
(or sendmsg) the application's running CPU is stored in a hash
table that is indexed by the connection's rxhash which is stored in
the socket structure. The rxhash is passed in skb's received on
the connection from netif_receive_skb. For each received packet,
the associated rxhash is used to look up the CPU in the hash table,
if a valid CPU is set then the packet is steered to that CPU using
the RPS mechanisms.
The convolution of the simple approach is that it would potentially
allow OOO packets. If threads are thrashing around CPUs or multiple
threads are trying to read from the same sockets, a quickly changing
CPU value in the hash table could cause rampant OOO packets--
we consider this a non-starter.
To avoid OOO packets, this solution implements two types of hash
tables: rps_sock_flow_table and rps_dev_flow_table.
rps_sock_table is a global hash table. Each entry is just a CPU
number and it is populated in recvmsg and sendmsg as described above.
This table contains the "desired" CPUs for flows.
rps_dev_flow_table is specific to each device queue. Each entry
contains a CPU and a tail queue counter. The CPU is the "current"
CPU for a matching flow. The tail queue counter holds the value
of a tail queue counter for the associated CPU's backlog queue at
the time of last enqueue for a flow matching the entry.
Each backlog queue has a queue head counter which is incremented
on dequeue, and so a queue tail counter is computed as queue head
count + queue length. When a packet is enqueued on a backlog queue,
the current value of the queue tail counter is saved in the hash
entry of the rps_dev_flow_table.
And now the trick: when selecting the CPU for RPS (get_rps_cpu)
the rps_sock_flow table and the rps_dev_flow table for the RX queue
are consulted. When the desired CPU for the flow (found in the
rps_sock_flow table) does not match the current CPU (found in the
rps_dev_flow table), the current CPU is changed to the desired CPU
if one of the following is true:
- The current CPU is unset (equal to RPS_NO_CPU)
- Current CPU is offline
- The current CPU's queue head counter >= queue tail counter in the
rps_dev_flow table. This checks if the queue tail has advanced
beyond the last packet that was enqueued using this table entry.
This guarantees that all packets queued using this entry have been
dequeued, thus preserving in order delivery.
Making each queue have its own rps_dev_flow table has two advantages:
1) the tail queue counters will be written on each receive, so
keeping the table local to interrupting CPU s good for locality. 2)
this allows lockless access to the table-- the CPU number and queue
tail counter need to be accessed together under mutual exclusion
from netif_receive_skb, we assume that this is only called from
device napi_poll which is non-reentrant.
This patch implements RFS for TCP and connected UDP sockets.
It should be usable for other flow oriented protocols.
There are two configuration parameters for RFS. The
"rps_flow_entries" kernel init parameter sets the number of
entries in the rps_sock_flow_table, the per rxqueue sysfs entry
"rps_flow_cnt" contains the number of entries in the rps_dev_flow
table for the rxqueue. Both are rounded to power of two.
The obvious benefit of RFS (over just RPS) is that it achieves
CPU locality between the receive processing for a flow and the
applications processing; this can result in increased performance
(higher pps, lower latency).
The benefits of RFS are dependent on cache hierarchy, application
load, and other factors. On simple benchmarks, we don't necessarily
see improvement and sometimes see degradation. However, for more
complex benchmarks and for applications where cache pressure is
much higher this technique seems to perform very well.
Below are some benchmark results which show the potential benfit of
this patch. The netperf test has 500 instances of netperf TCP_RR
test with 1 byte req. and resp. The RPC test is an request/response
test similar in structure to netperf RR test ith 100 threads on
each host, but does more work in userspace that netperf.
e1000e on 8 core Intel
No RFS or RPS 104K tps at 30% CPU
No RFS (best RPS config): 290K tps at 63% CPU
RFS 303K tps at 61% CPU
RPC test tps CPU% 50/90/99% usec latency Latency StdDev
No RFS/RPS 103K 48% 757/900/3185 4472.35
RPS only: 174K 73% 415/993/2468 491.66
RFS 223K 73% 379/651/1382 315.61
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-04-17 03:01:27 +04:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/* We may need to bind the socket. */
|
2010-07-11 00:41:55 +04:00
|
|
|
if (!inet_sk(sk)->inet_num && !sk->sk_prot->no_autobind &&
|
|
|
|
inet_autobind(sk))
|
2005-04-17 02:20:36 +04:00
|
|
|
return -EAGAIN;
|
|
|
|
|
|
|
|
if (sk->sk_prot->sendpage)
|
|
|
|
return sk->sk_prot->sendpage(sk, page, offset, size, flags);
|
|
|
|
return sock_no_sendpage(sock, page, offset, size, flags);
|
|
|
|
}
|
2010-07-11 00:41:55 +04:00
|
|
|
EXPORT_SYMBOL(inet_sendpage);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
rfs: Receive Flow Steering
This patch implements receive flow steering (RFS). RFS steers
received packets for layer 3 and 4 processing to the CPU where
the application for the corresponding flow is running. RFS is an
extension of Receive Packet Steering (RPS).
The basic idea of RFS is that when an application calls recvmsg
(or sendmsg) the application's running CPU is stored in a hash
table that is indexed by the connection's rxhash which is stored in
the socket structure. The rxhash is passed in skb's received on
the connection from netif_receive_skb. For each received packet,
the associated rxhash is used to look up the CPU in the hash table,
if a valid CPU is set then the packet is steered to that CPU using
the RPS mechanisms.
The convolution of the simple approach is that it would potentially
allow OOO packets. If threads are thrashing around CPUs or multiple
threads are trying to read from the same sockets, a quickly changing
CPU value in the hash table could cause rampant OOO packets--
we consider this a non-starter.
To avoid OOO packets, this solution implements two types of hash
tables: rps_sock_flow_table and rps_dev_flow_table.
rps_sock_table is a global hash table. Each entry is just a CPU
number and it is populated in recvmsg and sendmsg as described above.
This table contains the "desired" CPUs for flows.
rps_dev_flow_table is specific to each device queue. Each entry
contains a CPU and a tail queue counter. The CPU is the "current"
CPU for a matching flow. The tail queue counter holds the value
of a tail queue counter for the associated CPU's backlog queue at
the time of last enqueue for a flow matching the entry.
Each backlog queue has a queue head counter which is incremented
on dequeue, and so a queue tail counter is computed as queue head
count + queue length. When a packet is enqueued on a backlog queue,
the current value of the queue tail counter is saved in the hash
entry of the rps_dev_flow_table.
And now the trick: when selecting the CPU for RPS (get_rps_cpu)
the rps_sock_flow table and the rps_dev_flow table for the RX queue
are consulted. When the desired CPU for the flow (found in the
rps_sock_flow table) does not match the current CPU (found in the
rps_dev_flow table), the current CPU is changed to the desired CPU
if one of the following is true:
- The current CPU is unset (equal to RPS_NO_CPU)
- Current CPU is offline
- The current CPU's queue head counter >= queue tail counter in the
rps_dev_flow table. This checks if the queue tail has advanced
beyond the last packet that was enqueued using this table entry.
This guarantees that all packets queued using this entry have been
dequeued, thus preserving in order delivery.
Making each queue have its own rps_dev_flow table has two advantages:
1) the tail queue counters will be written on each receive, so
keeping the table local to interrupting CPU s good for locality. 2)
this allows lockless access to the table-- the CPU number and queue
tail counter need to be accessed together under mutual exclusion
from netif_receive_skb, we assume that this is only called from
device napi_poll which is non-reentrant.
This patch implements RFS for TCP and connected UDP sockets.
It should be usable for other flow oriented protocols.
There are two configuration parameters for RFS. The
"rps_flow_entries" kernel init parameter sets the number of
entries in the rps_sock_flow_table, the per rxqueue sysfs entry
"rps_flow_cnt" contains the number of entries in the rps_dev_flow
table for the rxqueue. Both are rounded to power of two.
The obvious benefit of RFS (over just RPS) is that it achieves
CPU locality between the receive processing for a flow and the
applications processing; this can result in increased performance
(higher pps, lower latency).
The benefits of RFS are dependent on cache hierarchy, application
load, and other factors. On simple benchmarks, we don't necessarily
see improvement and sometimes see degradation. However, for more
complex benchmarks and for applications where cache pressure is
much higher this technique seems to perform very well.
Below are some benchmark results which show the potential benfit of
this patch. The netperf test has 500 instances of netperf TCP_RR
test with 1 byte req. and resp. The RPC test is an request/response
test similar in structure to netperf RR test ith 100 threads on
each host, but does more work in userspace that netperf.
e1000e on 8 core Intel
No RFS or RPS 104K tps at 30% CPU
No RFS (best RPS config): 290K tps at 63% CPU
RFS 303K tps at 61% CPU
RPC test tps CPU% 50/90/99% usec latency Latency StdDev
No RFS/RPS 103K 48% 757/900/3185 4472.35
RPS only: 174K 73% 415/993/2468 491.66
RFS 223K 73% 379/651/1382 315.61
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-04-17 03:01:27 +04:00
|
|
|
int inet_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
|
|
|
|
size_t size, int flags)
|
|
|
|
{
|
|
|
|
struct sock *sk = sock->sk;
|
|
|
|
int addr_len = 0;
|
|
|
|
int err;
|
|
|
|
|
2010-04-28 02:05:31 +04:00
|
|
|
sock_rps_record_flow(sk);
|
rfs: Receive Flow Steering
This patch implements receive flow steering (RFS). RFS steers
received packets for layer 3 and 4 processing to the CPU where
the application for the corresponding flow is running. RFS is an
extension of Receive Packet Steering (RPS).
The basic idea of RFS is that when an application calls recvmsg
(or sendmsg) the application's running CPU is stored in a hash
table that is indexed by the connection's rxhash which is stored in
the socket structure. The rxhash is passed in skb's received on
the connection from netif_receive_skb. For each received packet,
the associated rxhash is used to look up the CPU in the hash table,
if a valid CPU is set then the packet is steered to that CPU using
the RPS mechanisms.
The convolution of the simple approach is that it would potentially
allow OOO packets. If threads are thrashing around CPUs or multiple
threads are trying to read from the same sockets, a quickly changing
CPU value in the hash table could cause rampant OOO packets--
we consider this a non-starter.
To avoid OOO packets, this solution implements two types of hash
tables: rps_sock_flow_table and rps_dev_flow_table.
rps_sock_table is a global hash table. Each entry is just a CPU
number and it is populated in recvmsg and sendmsg as described above.
This table contains the "desired" CPUs for flows.
rps_dev_flow_table is specific to each device queue. Each entry
contains a CPU and a tail queue counter. The CPU is the "current"
CPU for a matching flow. The tail queue counter holds the value
of a tail queue counter for the associated CPU's backlog queue at
the time of last enqueue for a flow matching the entry.
Each backlog queue has a queue head counter which is incremented
on dequeue, and so a queue tail counter is computed as queue head
count + queue length. When a packet is enqueued on a backlog queue,
the current value of the queue tail counter is saved in the hash
entry of the rps_dev_flow_table.
And now the trick: when selecting the CPU for RPS (get_rps_cpu)
the rps_sock_flow table and the rps_dev_flow table for the RX queue
are consulted. When the desired CPU for the flow (found in the
rps_sock_flow table) does not match the current CPU (found in the
rps_dev_flow table), the current CPU is changed to the desired CPU
if one of the following is true:
- The current CPU is unset (equal to RPS_NO_CPU)
- Current CPU is offline
- The current CPU's queue head counter >= queue tail counter in the
rps_dev_flow table. This checks if the queue tail has advanced
beyond the last packet that was enqueued using this table entry.
This guarantees that all packets queued using this entry have been
dequeued, thus preserving in order delivery.
Making each queue have its own rps_dev_flow table has two advantages:
1) the tail queue counters will be written on each receive, so
keeping the table local to interrupting CPU s good for locality. 2)
this allows lockless access to the table-- the CPU number and queue
tail counter need to be accessed together under mutual exclusion
from netif_receive_skb, we assume that this is only called from
device napi_poll which is non-reentrant.
This patch implements RFS for TCP and connected UDP sockets.
It should be usable for other flow oriented protocols.
There are two configuration parameters for RFS. The
"rps_flow_entries" kernel init parameter sets the number of
entries in the rps_sock_flow_table, the per rxqueue sysfs entry
"rps_flow_cnt" contains the number of entries in the rps_dev_flow
table for the rxqueue. Both are rounded to power of two.
The obvious benefit of RFS (over just RPS) is that it achieves
CPU locality between the receive processing for a flow and the
applications processing; this can result in increased performance
(higher pps, lower latency).
The benefits of RFS are dependent on cache hierarchy, application
load, and other factors. On simple benchmarks, we don't necessarily
see improvement and sometimes see degradation. However, for more
complex benchmarks and for applications where cache pressure is
much higher this technique seems to perform very well.
Below are some benchmark results which show the potential benfit of
this patch. The netperf test has 500 instances of netperf TCP_RR
test with 1 byte req. and resp. The RPC test is an request/response
test similar in structure to netperf RR test ith 100 threads on
each host, but does more work in userspace that netperf.
e1000e on 8 core Intel
No RFS or RPS 104K tps at 30% CPU
No RFS (best RPS config): 290K tps at 63% CPU
RFS 303K tps at 61% CPU
RPC test tps CPU% 50/90/99% usec latency Latency StdDev
No RFS/RPS 103K 48% 757/900/3185 4472.35
RPS only: 174K 73% 415/993/2468 491.66
RFS 223K 73% 379/651/1382 315.61
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-04-17 03:01:27 +04:00
|
|
|
|
|
|
|
err = sk->sk_prot->recvmsg(iocb, sk, msg, size, flags & MSG_DONTWAIT,
|
|
|
|
flags & ~MSG_DONTWAIT, &addr_len);
|
|
|
|
if (err >= 0)
|
|
|
|
msg->msg_namelen = addr_len;
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(inet_recvmsg);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
int inet_shutdown(struct socket *sock, int how)
|
|
|
|
{
|
|
|
|
struct sock *sk = sock->sk;
|
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
/* This should really check to make sure
|
|
|
|
* the socket is a TCP socket. (WHY AC...)
|
|
|
|
*/
|
|
|
|
how++; /* maps 0->1 has the advantage of making bit 1 rcvs and
|
|
|
|
1->2 bit 2 snds.
|
|
|
|
2->3 */
|
|
|
|
if ((how & ~SHUTDOWN_MASK) || !how) /* MAXINT->0 */
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
lock_sock(sk);
|
|
|
|
if (sock->state == SS_CONNECTING) {
|
|
|
|
if ((1 << sk->sk_state) &
|
|
|
|
(TCPF_SYN_SENT | TCPF_SYN_RECV | TCPF_CLOSE))
|
|
|
|
sock->state = SS_DISCONNECTING;
|
|
|
|
else
|
|
|
|
sock->state = SS_CONNECTED;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (sk->sk_state) {
|
|
|
|
case TCP_CLOSE:
|
|
|
|
err = -ENOTCONN;
|
|
|
|
/* Hack to wake up other listeners, who can poll for
|
|
|
|
POLLHUP, even on eg. unconnected UDP sockets -- RR */
|
|
|
|
default:
|
|
|
|
sk->sk_shutdown |= how;
|
|
|
|
if (sk->sk_prot->shutdown)
|
|
|
|
sk->sk_prot->shutdown(sk, how);
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* Remaining two branches are temporary solution for missing
|
|
|
|
* close() in multithreaded environment. It is _not_ a good idea,
|
|
|
|
* but we have no choice until close() is repaired at VFS level.
|
|
|
|
*/
|
|
|
|
case TCP_LISTEN:
|
|
|
|
if (!(how & RCV_SHUTDOWN))
|
|
|
|
break;
|
|
|
|
/* Fall through */
|
|
|
|
case TCP_SYN_SENT:
|
|
|
|
err = sk->sk_prot->disconnect(sk, O_NONBLOCK);
|
|
|
|
sock->state = err ? SS_DISCONNECTING : SS_UNCONNECTED;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Wake up anyone sleeping in poll. */
|
|
|
|
sk->sk_state_change(sk);
|
|
|
|
release_sock(sk);
|
|
|
|
return err;
|
|
|
|
}
|
2009-08-29 10:45:21 +04:00
|
|
|
EXPORT_SYMBOL(inet_shutdown);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* ioctl() calls you can issue on an INET socket. Most of these are
|
|
|
|
* device configuration and stuff and very rarely used. Some ioctls
|
|
|
|
* pass on to the socket itself.
|
|
|
|
*
|
|
|
|
* NOTE: I like the idea of a module for the config stuff. ie ifconfig
|
|
|
|
* loads the devconfigure module does its configuring and unloads it.
|
|
|
|
* There's a good 20K of config code hanging around the kernel.
|
|
|
|
*/
|
|
|
|
|
|
|
|
int inet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
|
|
|
|
{
|
|
|
|
struct sock *sk = sock->sk;
|
|
|
|
int err = 0;
|
2008-03-25 20:26:21 +03:00
|
|
|
struct net *net = sock_net(sk);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
switch (cmd) {
|
2009-08-29 10:45:21 +04:00
|
|
|
case SIOCGSTAMP:
|
|
|
|
err = sock_get_timestamp(sk, (struct timeval __user *)arg);
|
|
|
|
break;
|
|
|
|
case SIOCGSTAMPNS:
|
|
|
|
err = sock_get_timestampns(sk, (struct timespec __user *)arg);
|
|
|
|
break;
|
|
|
|
case SIOCADDRT:
|
|
|
|
case SIOCDELRT:
|
|
|
|
case SIOCRTMSG:
|
|
|
|
err = ip_rt_ioctl(net, cmd, (void __user *)arg);
|
|
|
|
break;
|
|
|
|
case SIOCDARP:
|
|
|
|
case SIOCGARP:
|
|
|
|
case SIOCSARP:
|
|
|
|
err = arp_ioctl(net, cmd, (void __user *)arg);
|
|
|
|
break;
|
|
|
|
case SIOCGIFADDR:
|
|
|
|
case SIOCSIFADDR:
|
|
|
|
case SIOCGIFBRDADDR:
|
|
|
|
case SIOCSIFBRDADDR:
|
|
|
|
case SIOCGIFNETMASK:
|
|
|
|
case SIOCSIFNETMASK:
|
|
|
|
case SIOCGIFDSTADDR:
|
|
|
|
case SIOCSIFDSTADDR:
|
|
|
|
case SIOCSIFPFLAGS:
|
|
|
|
case SIOCGIFPFLAGS:
|
|
|
|
case SIOCSIFFLAGS:
|
|
|
|
err = devinet_ioctl(net, cmd, (void __user *)arg);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
if (sk->sk_prot->ioctl)
|
|
|
|
err = sk->sk_prot->ioctl(sk, cmd, arg);
|
|
|
|
else
|
|
|
|
err = -ENOIOCTLCMD;
|
|
|
|
break;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
return err;
|
|
|
|
}
|
2009-08-29 10:45:21 +04:00
|
|
|
EXPORT_SYMBOL(inet_ioctl);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2011-01-29 19:15:56 +03:00
|
|
|
#ifdef CONFIG_COMPAT
|
2011-10-15 13:26:56 +04:00
|
|
|
static int inet_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
|
2011-01-29 19:15:56 +03:00
|
|
|
{
|
|
|
|
struct sock *sk = sock->sk;
|
|
|
|
int err = -ENOIOCTLCMD;
|
|
|
|
|
|
|
|
if (sk->sk_prot->compat_ioctl)
|
|
|
|
err = sk->sk_prot->compat_ioctl(sk, cmd, arg);
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2005-12-22 23:49:22 +03:00
|
|
|
const struct proto_ops inet_stream_ops = {
|
2006-03-21 09:48:35 +03:00
|
|
|
.family = PF_INET,
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.release = inet_release,
|
|
|
|
.bind = inet_bind,
|
|
|
|
.connect = inet_stream_connect,
|
|
|
|
.socketpair = sock_no_socketpair,
|
|
|
|
.accept = inet_accept,
|
|
|
|
.getname = inet_getname,
|
|
|
|
.poll = tcp_poll,
|
|
|
|
.ioctl = inet_ioctl,
|
|
|
|
.listen = inet_listen,
|
|
|
|
.shutdown = inet_shutdown,
|
|
|
|
.setsockopt = sock_common_setsockopt,
|
|
|
|
.getsockopt = sock_common_getsockopt,
|
2010-07-11 00:41:55 +04:00
|
|
|
.sendmsg = inet_sendmsg,
|
rfs: Receive Flow Steering
This patch implements receive flow steering (RFS). RFS steers
received packets for layer 3 and 4 processing to the CPU where
the application for the corresponding flow is running. RFS is an
extension of Receive Packet Steering (RPS).
The basic idea of RFS is that when an application calls recvmsg
(or sendmsg) the application's running CPU is stored in a hash
table that is indexed by the connection's rxhash which is stored in
the socket structure. The rxhash is passed in skb's received on
the connection from netif_receive_skb. For each received packet,
the associated rxhash is used to look up the CPU in the hash table,
if a valid CPU is set then the packet is steered to that CPU using
the RPS mechanisms.
The convolution of the simple approach is that it would potentially
allow OOO packets. If threads are thrashing around CPUs or multiple
threads are trying to read from the same sockets, a quickly changing
CPU value in the hash table could cause rampant OOO packets--
we consider this a non-starter.
To avoid OOO packets, this solution implements two types of hash
tables: rps_sock_flow_table and rps_dev_flow_table.
rps_sock_table is a global hash table. Each entry is just a CPU
number and it is populated in recvmsg and sendmsg as described above.
This table contains the "desired" CPUs for flows.
rps_dev_flow_table is specific to each device queue. Each entry
contains a CPU and a tail queue counter. The CPU is the "current"
CPU for a matching flow. The tail queue counter holds the value
of a tail queue counter for the associated CPU's backlog queue at
the time of last enqueue for a flow matching the entry.
Each backlog queue has a queue head counter which is incremented
on dequeue, and so a queue tail counter is computed as queue head
count + queue length. When a packet is enqueued on a backlog queue,
the current value of the queue tail counter is saved in the hash
entry of the rps_dev_flow_table.
And now the trick: when selecting the CPU for RPS (get_rps_cpu)
the rps_sock_flow table and the rps_dev_flow table for the RX queue
are consulted. When the desired CPU for the flow (found in the
rps_sock_flow table) does not match the current CPU (found in the
rps_dev_flow table), the current CPU is changed to the desired CPU
if one of the following is true:
- The current CPU is unset (equal to RPS_NO_CPU)
- Current CPU is offline
- The current CPU's queue head counter >= queue tail counter in the
rps_dev_flow table. This checks if the queue tail has advanced
beyond the last packet that was enqueued using this table entry.
This guarantees that all packets queued using this entry have been
dequeued, thus preserving in order delivery.
Making each queue have its own rps_dev_flow table has two advantages:
1) the tail queue counters will be written on each receive, so
keeping the table local to interrupting CPU s good for locality. 2)
this allows lockless access to the table-- the CPU number and queue
tail counter need to be accessed together under mutual exclusion
from netif_receive_skb, we assume that this is only called from
device napi_poll which is non-reentrant.
This patch implements RFS for TCP and connected UDP sockets.
It should be usable for other flow oriented protocols.
There are two configuration parameters for RFS. The
"rps_flow_entries" kernel init parameter sets the number of
entries in the rps_sock_flow_table, the per rxqueue sysfs entry
"rps_flow_cnt" contains the number of entries in the rps_dev_flow
table for the rxqueue. Both are rounded to power of two.
The obvious benefit of RFS (over just RPS) is that it achieves
CPU locality between the receive processing for a flow and the
applications processing; this can result in increased performance
(higher pps, lower latency).
The benefits of RFS are dependent on cache hierarchy, application
load, and other factors. On simple benchmarks, we don't necessarily
see improvement and sometimes see degradation. However, for more
complex benchmarks and for applications where cache pressure is
much higher this technique seems to perform very well.
Below are some benchmark results which show the potential benfit of
this patch. The netperf test has 500 instances of netperf TCP_RR
test with 1 byte req. and resp. The RPC test is an request/response
test similar in structure to netperf RR test ith 100 threads on
each host, but does more work in userspace that netperf.
e1000e on 8 core Intel
No RFS or RPS 104K tps at 30% CPU
No RFS (best RPS config): 290K tps at 63% CPU
RFS 303K tps at 61% CPU
RPC test tps CPU% 50/90/99% usec latency Latency StdDev
No RFS/RPS 103K 48% 757/900/3185 4472.35
RPS only: 174K 73% 415/993/2468 491.66
RFS 223K 73% 379/651/1382 315.61
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-04-17 03:01:27 +04:00
|
|
|
.recvmsg = inet_recvmsg,
|
2006-03-21 09:48:35 +03:00
|
|
|
.mmap = sock_no_mmap,
|
2010-07-11 00:41:55 +04:00
|
|
|
.sendpage = inet_sendpage,
|
2007-11-07 10:30:13 +03:00
|
|
|
.splice_read = tcp_splice_read,
|
2006-03-21 09:45:21 +03:00
|
|
|
#ifdef CONFIG_COMPAT
|
2006-03-21 09:48:35 +03:00
|
|
|
.compat_setsockopt = compat_sock_common_setsockopt,
|
|
|
|
.compat_getsockopt = compat_sock_common_getsockopt,
|
2011-01-29 19:15:56 +03:00
|
|
|
.compat_ioctl = inet_compat_ioctl,
|
2006-03-21 09:45:21 +03:00
|
|
|
#endif
|
2005-04-17 02:20:36 +04:00
|
|
|
};
|
2009-08-29 10:45:21 +04:00
|
|
|
EXPORT_SYMBOL(inet_stream_ops);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2005-12-22 23:49:22 +03:00
|
|
|
const struct proto_ops inet_dgram_ops = {
|
2006-03-21 09:48:35 +03:00
|
|
|
.family = PF_INET,
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.release = inet_release,
|
|
|
|
.bind = inet_bind,
|
|
|
|
.connect = inet_dgram_connect,
|
|
|
|
.socketpair = sock_no_socketpair,
|
|
|
|
.accept = sock_no_accept,
|
|
|
|
.getname = inet_getname,
|
|
|
|
.poll = udp_poll,
|
|
|
|
.ioctl = inet_ioctl,
|
|
|
|
.listen = sock_no_listen,
|
|
|
|
.shutdown = inet_shutdown,
|
|
|
|
.setsockopt = sock_common_setsockopt,
|
|
|
|
.getsockopt = sock_common_getsockopt,
|
|
|
|
.sendmsg = inet_sendmsg,
|
rfs: Receive Flow Steering
This patch implements receive flow steering (RFS). RFS steers
received packets for layer 3 and 4 processing to the CPU where
the application for the corresponding flow is running. RFS is an
extension of Receive Packet Steering (RPS).
The basic idea of RFS is that when an application calls recvmsg
(or sendmsg) the application's running CPU is stored in a hash
table that is indexed by the connection's rxhash which is stored in
the socket structure. The rxhash is passed in skb's received on
the connection from netif_receive_skb. For each received packet,
the associated rxhash is used to look up the CPU in the hash table,
if a valid CPU is set then the packet is steered to that CPU using
the RPS mechanisms.
The convolution of the simple approach is that it would potentially
allow OOO packets. If threads are thrashing around CPUs or multiple
threads are trying to read from the same sockets, a quickly changing
CPU value in the hash table could cause rampant OOO packets--
we consider this a non-starter.
To avoid OOO packets, this solution implements two types of hash
tables: rps_sock_flow_table and rps_dev_flow_table.
rps_sock_table is a global hash table. Each entry is just a CPU
number and it is populated in recvmsg and sendmsg as described above.
This table contains the "desired" CPUs for flows.
rps_dev_flow_table is specific to each device queue. Each entry
contains a CPU and a tail queue counter. The CPU is the "current"
CPU for a matching flow. The tail queue counter holds the value
of a tail queue counter for the associated CPU's backlog queue at
the time of last enqueue for a flow matching the entry.
Each backlog queue has a queue head counter which is incremented
on dequeue, and so a queue tail counter is computed as queue head
count + queue length. When a packet is enqueued on a backlog queue,
the current value of the queue tail counter is saved in the hash
entry of the rps_dev_flow_table.
And now the trick: when selecting the CPU for RPS (get_rps_cpu)
the rps_sock_flow table and the rps_dev_flow table for the RX queue
are consulted. When the desired CPU for the flow (found in the
rps_sock_flow table) does not match the current CPU (found in the
rps_dev_flow table), the current CPU is changed to the desired CPU
if one of the following is true:
- The current CPU is unset (equal to RPS_NO_CPU)
- Current CPU is offline
- The current CPU's queue head counter >= queue tail counter in the
rps_dev_flow table. This checks if the queue tail has advanced
beyond the last packet that was enqueued using this table entry.
This guarantees that all packets queued using this entry have been
dequeued, thus preserving in order delivery.
Making each queue have its own rps_dev_flow table has two advantages:
1) the tail queue counters will be written on each receive, so
keeping the table local to interrupting CPU s good for locality. 2)
this allows lockless access to the table-- the CPU number and queue
tail counter need to be accessed together under mutual exclusion
from netif_receive_skb, we assume that this is only called from
device napi_poll which is non-reentrant.
This patch implements RFS for TCP and connected UDP sockets.
It should be usable for other flow oriented protocols.
There are two configuration parameters for RFS. The
"rps_flow_entries" kernel init parameter sets the number of
entries in the rps_sock_flow_table, the per rxqueue sysfs entry
"rps_flow_cnt" contains the number of entries in the rps_dev_flow
table for the rxqueue. Both are rounded to power of two.
The obvious benefit of RFS (over just RPS) is that it achieves
CPU locality between the receive processing for a flow and the
applications processing; this can result in increased performance
(higher pps, lower latency).
The benefits of RFS are dependent on cache hierarchy, application
load, and other factors. On simple benchmarks, we don't necessarily
see improvement and sometimes see degradation. However, for more
complex benchmarks and for applications where cache pressure is
much higher this technique seems to perform very well.
Below are some benchmark results which show the potential benfit of
this patch. The netperf test has 500 instances of netperf TCP_RR
test with 1 byte req. and resp. The RPC test is an request/response
test similar in structure to netperf RR test ith 100 threads on
each host, but does more work in userspace that netperf.
e1000e on 8 core Intel
No RFS or RPS 104K tps at 30% CPU
No RFS (best RPS config): 290K tps at 63% CPU
RFS 303K tps at 61% CPU
RPC test tps CPU% 50/90/99% usec latency Latency StdDev
No RFS/RPS 103K 48% 757/900/3185 4472.35
RPS only: 174K 73% 415/993/2468 491.66
RFS 223K 73% 379/651/1382 315.61
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-04-17 03:01:27 +04:00
|
|
|
.recvmsg = inet_recvmsg,
|
2006-03-21 09:48:35 +03:00
|
|
|
.mmap = sock_no_mmap,
|
|
|
|
.sendpage = inet_sendpage,
|
2006-03-21 09:45:21 +03:00
|
|
|
#ifdef CONFIG_COMPAT
|
2006-03-21 09:48:35 +03:00
|
|
|
.compat_setsockopt = compat_sock_common_setsockopt,
|
|
|
|
.compat_getsockopt = compat_sock_common_getsockopt,
|
2011-01-29 19:15:56 +03:00
|
|
|
.compat_ioctl = inet_compat_ioctl,
|
2006-03-21 09:45:21 +03:00
|
|
|
#endif
|
2005-04-17 02:20:36 +04:00
|
|
|
};
|
2009-08-29 10:45:21 +04:00
|
|
|
EXPORT_SYMBOL(inet_dgram_ops);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* For SOCK_RAW sockets; should be the same as inet_dgram_ops but without
|
|
|
|
* udp_poll
|
|
|
|
*/
|
2005-12-22 23:49:22 +03:00
|
|
|
static const struct proto_ops inet_sockraw_ops = {
|
2006-03-21 09:48:35 +03:00
|
|
|
.family = PF_INET,
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.release = inet_release,
|
|
|
|
.bind = inet_bind,
|
|
|
|
.connect = inet_dgram_connect,
|
|
|
|
.socketpair = sock_no_socketpair,
|
|
|
|
.accept = sock_no_accept,
|
|
|
|
.getname = inet_getname,
|
|
|
|
.poll = datagram_poll,
|
|
|
|
.ioctl = inet_ioctl,
|
|
|
|
.listen = sock_no_listen,
|
|
|
|
.shutdown = inet_shutdown,
|
|
|
|
.setsockopt = sock_common_setsockopt,
|
|
|
|
.getsockopt = sock_common_getsockopt,
|
|
|
|
.sendmsg = inet_sendmsg,
|
rfs: Receive Flow Steering
This patch implements receive flow steering (RFS). RFS steers
received packets for layer 3 and 4 processing to the CPU where
the application for the corresponding flow is running. RFS is an
extension of Receive Packet Steering (RPS).
The basic idea of RFS is that when an application calls recvmsg
(or sendmsg) the application's running CPU is stored in a hash
table that is indexed by the connection's rxhash which is stored in
the socket structure. The rxhash is passed in skb's received on
the connection from netif_receive_skb. For each received packet,
the associated rxhash is used to look up the CPU in the hash table,
if a valid CPU is set then the packet is steered to that CPU using
the RPS mechanisms.
The convolution of the simple approach is that it would potentially
allow OOO packets. If threads are thrashing around CPUs or multiple
threads are trying to read from the same sockets, a quickly changing
CPU value in the hash table could cause rampant OOO packets--
we consider this a non-starter.
To avoid OOO packets, this solution implements two types of hash
tables: rps_sock_flow_table and rps_dev_flow_table.
rps_sock_table is a global hash table. Each entry is just a CPU
number and it is populated in recvmsg and sendmsg as described above.
This table contains the "desired" CPUs for flows.
rps_dev_flow_table is specific to each device queue. Each entry
contains a CPU and a tail queue counter. The CPU is the "current"
CPU for a matching flow. The tail queue counter holds the value
of a tail queue counter for the associated CPU's backlog queue at
the time of last enqueue for a flow matching the entry.
Each backlog queue has a queue head counter which is incremented
on dequeue, and so a queue tail counter is computed as queue head
count + queue length. When a packet is enqueued on a backlog queue,
the current value of the queue tail counter is saved in the hash
entry of the rps_dev_flow_table.
And now the trick: when selecting the CPU for RPS (get_rps_cpu)
the rps_sock_flow table and the rps_dev_flow table for the RX queue
are consulted. When the desired CPU for the flow (found in the
rps_sock_flow table) does not match the current CPU (found in the
rps_dev_flow table), the current CPU is changed to the desired CPU
if one of the following is true:
- The current CPU is unset (equal to RPS_NO_CPU)
- Current CPU is offline
- The current CPU's queue head counter >= queue tail counter in the
rps_dev_flow table. This checks if the queue tail has advanced
beyond the last packet that was enqueued using this table entry.
This guarantees that all packets queued using this entry have been
dequeued, thus preserving in order delivery.
Making each queue have its own rps_dev_flow table has two advantages:
1) the tail queue counters will be written on each receive, so
keeping the table local to interrupting CPU s good for locality. 2)
this allows lockless access to the table-- the CPU number and queue
tail counter need to be accessed together under mutual exclusion
from netif_receive_skb, we assume that this is only called from
device napi_poll which is non-reentrant.
This patch implements RFS for TCP and connected UDP sockets.
It should be usable for other flow oriented protocols.
There are two configuration parameters for RFS. The
"rps_flow_entries" kernel init parameter sets the number of
entries in the rps_sock_flow_table, the per rxqueue sysfs entry
"rps_flow_cnt" contains the number of entries in the rps_dev_flow
table for the rxqueue. Both are rounded to power of two.
The obvious benefit of RFS (over just RPS) is that it achieves
CPU locality between the receive processing for a flow and the
applications processing; this can result in increased performance
(higher pps, lower latency).
The benefits of RFS are dependent on cache hierarchy, application
load, and other factors. On simple benchmarks, we don't necessarily
see improvement and sometimes see degradation. However, for more
complex benchmarks and for applications where cache pressure is
much higher this technique seems to perform very well.
Below are some benchmark results which show the potential benfit of
this patch. The netperf test has 500 instances of netperf TCP_RR
test with 1 byte req. and resp. The RPC test is an request/response
test similar in structure to netperf RR test ith 100 threads on
each host, but does more work in userspace that netperf.
e1000e on 8 core Intel
No RFS or RPS 104K tps at 30% CPU
No RFS (best RPS config): 290K tps at 63% CPU
RFS 303K tps at 61% CPU
RPC test tps CPU% 50/90/99% usec latency Latency StdDev
No RFS/RPS 103K 48% 757/900/3185 4472.35
RPS only: 174K 73% 415/993/2468 491.66
RFS 223K 73% 379/651/1382 315.61
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-04-17 03:01:27 +04:00
|
|
|
.recvmsg = inet_recvmsg,
|
2006-03-21 09:48:35 +03:00
|
|
|
.mmap = sock_no_mmap,
|
|
|
|
.sendpage = inet_sendpage,
|
2006-03-21 09:45:21 +03:00
|
|
|
#ifdef CONFIG_COMPAT
|
2006-03-21 09:48:35 +03:00
|
|
|
.compat_setsockopt = compat_sock_common_setsockopt,
|
|
|
|
.compat_getsockopt = compat_sock_common_getsockopt,
|
2011-01-29 19:15:56 +03:00
|
|
|
.compat_ioctl = inet_compat_ioctl,
|
2006-03-21 09:45:21 +03:00
|
|
|
#endif
|
2005-04-17 02:20:36 +04:00
|
|
|
};
|
|
|
|
|
2009-10-05 09:58:39 +04:00
|
|
|
static const struct net_proto_family inet_family_ops = {
|
2005-04-17 02:20:36 +04:00
|
|
|
.family = PF_INET,
|
|
|
|
.create = inet_create,
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Upon startup we insert all the elements in inetsw_array[] into
|
|
|
|
* the linked list inetsw.
|
|
|
|
*/
|
|
|
|
static struct inet_protosw inetsw_array[] =
|
|
|
|
{
|
2007-02-09 17:24:47 +03:00
|
|
|
{
|
|
|
|
.type = SOCK_STREAM,
|
|
|
|
.protocol = IPPROTO_TCP,
|
|
|
|
.prot = &tcp_prot,
|
|
|
|
.ops = &inet_stream_ops,
|
|
|
|
.no_check = 0,
|
|
|
|
.flags = INET_PROTOSW_PERMANENT |
|
2005-12-14 10:26:10 +03:00
|
|
|
INET_PROTOSW_ICSK,
|
2007-02-09 17:24:47 +03:00
|
|
|
},
|
|
|
|
|
|
|
|
{
|
|
|
|
.type = SOCK_DGRAM,
|
|
|
|
.protocol = IPPROTO_UDP,
|
|
|
|
.prot = &udp_prot,
|
|
|
|
.ops = &inet_dgram_ops,
|
|
|
|
.no_check = UDP_CSUM_DEFAULT,
|
|
|
|
.flags = INET_PROTOSW_PERMANENT,
|
2005-04-17 02:20:36 +04:00
|
|
|
},
|
2007-02-09 17:24:47 +03:00
|
|
|
|
net: ipv4: add IPPROTO_ICMP socket kind
This patch adds IPPROTO_ICMP socket kind. It makes it possible to send
ICMP_ECHO messages and receive the corresponding ICMP_ECHOREPLY messages
without any special privileges. In other words, the patch makes it
possible to implement setuid-less and CAP_NET_RAW-less /bin/ping. In
order not to increase the kernel's attack surface, the new functionality
is disabled by default, but is enabled at bootup by supporting Linux
distributions, optionally with restriction to a group or a group range
(see below).
Similar functionality is implemented in Mac OS X:
http://www.manpagez.com/man/4/icmp/
A new ping socket is created with
socket(PF_INET, SOCK_DGRAM, PROT_ICMP)
Message identifiers (octets 4-5 of ICMP header) are interpreted as local
ports. Addresses are stored in struct sockaddr_in. No port numbers are
reserved for privileged processes, port 0 is reserved for API ("let the
kernel pick a free number"). There is no notion of remote ports, remote
port numbers provided by the user (e.g. in connect()) are ignored.
Data sent and received include ICMP headers. This is deliberate to:
1) Avoid the need to transport headers values like sequence numbers by
other means.
2) Make it easier to port existing programs using raw sockets.
ICMP headers given to send() are checked and sanitized. The type must be
ICMP_ECHO and the code must be zero (future extensions might relax this,
see below). The id is set to the number (local port) of the socket, the
checksum is always recomputed.
ICMP reply packets received from the network are demultiplexed according
to their id's, and are returned by recv() without any modifications.
IP header information and ICMP errors of those packets may be obtained
via ancillary data (IP_RECVTTL, IP_RETOPTS, and IP_RECVERR). ICMP source
quenches and redirects are reported as fake errors via the error queue
(IP_RECVERR); the next hop address for redirects is saved to ee_info (in
network order).
socket(2) is restricted to the group range specified in
"/proc/sys/net/ipv4/ping_group_range". It is "1 0" by default, meaning
that nobody (not even root) may create ping sockets. Setting it to "100
100" would grant permissions to the single group (to either make
/sbin/ping g+s and owned by this group or to grant permissions to the
"netadmins" group), "0 4294967295" would enable it for the world, "100
4294967295" would enable it for the users, but not daemons.
The existing code might be (in the unlikely case anyone needs it)
extended rather easily to handle other similar pairs of ICMP messages
(Timestamp/Reply, Information Request/Reply, Address Mask Request/Reply
etc.).
Userspace ping util & patch for it:
http://openwall.info/wiki/people/segoon/ping
For Openwall GNU/*/Linux it was the last step on the road to the
setuid-less distro. A revision of this patch (for RHEL5/OpenVZ kernels)
is in use in Owl-current, such as in the 2011/03/12 LiveCD ISOs:
http://mirrors.kernel.org/openwall/Owl/current/iso/
Initially this functionality was written by Pavel Kankovsky for
Linux 2.4.32, but unfortunately it was never made public.
All ping options (-b, -p, -Q, -R, -s, -t, -T, -M, -I), are tested with
the patch.
PATCH v3:
- switched to flowi4.
- minor changes to be consistent with raw sockets code.
PATCH v2:
- changed ping_debug() to pr_debug().
- removed CONFIG_IP_PING.
- removed ping_seq_fops.owner field (unused for procfs).
- switched to proc_net_fops_create().
- switched to %pK in seq_printf().
PATCH v1:
- fixed checksumming bug.
- CAP_NET_RAW may not create icmp sockets anymore.
RFC v2:
- minor cleanups.
- introduced sysctl'able group range to restrict socket(2).
Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-05-13 14:01:00 +04:00
|
|
|
{
|
|
|
|
.type = SOCK_DGRAM,
|
|
|
|
.protocol = IPPROTO_ICMP,
|
|
|
|
.prot = &ping_prot,
|
|
|
|
.ops = &inet_dgram_ops,
|
|
|
|
.no_check = UDP_CSUM_DEFAULT,
|
|
|
|
.flags = INET_PROTOSW_REUSE,
|
|
|
|
},
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
{
|
2007-02-09 17:24:47 +03:00
|
|
|
.type = SOCK_RAW,
|
|
|
|
.protocol = IPPROTO_IP, /* wild card */
|
|
|
|
.prot = &raw_prot,
|
|
|
|
.ops = &inet_sockraw_ops,
|
|
|
|
.no_check = UDP_CSUM_DEFAULT,
|
|
|
|
.flags = INET_PROTOSW_REUSE,
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2007-09-17 03:39:25 +04:00
|
|
|
#define INETSW_ARRAY_LEN ARRAY_SIZE(inetsw_array)
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
void inet_register_protosw(struct inet_protosw *p)
|
|
|
|
{
|
|
|
|
struct list_head *lh;
|
|
|
|
struct inet_protosw *answer;
|
|
|
|
int protocol = p->protocol;
|
|
|
|
struct list_head *last_perm;
|
|
|
|
|
|
|
|
spin_lock_bh(&inetsw_lock);
|
|
|
|
|
|
|
|
if (p->type >= SOCK_MAX)
|
|
|
|
goto out_illegal;
|
|
|
|
|
|
|
|
/* If we are trying to override a permanent protocol, bail. */
|
|
|
|
answer = NULL;
|
|
|
|
last_perm = &inetsw[p->type];
|
|
|
|
list_for_each(lh, &inetsw[p->type]) {
|
|
|
|
answer = list_entry(lh, struct inet_protosw, list);
|
|
|
|
|
|
|
|
/* Check only the non-wild match. */
|
|
|
|
if (INET_PROTOSW_PERMANENT & answer->flags) {
|
|
|
|
if (protocol == answer->protocol)
|
|
|
|
break;
|
|
|
|
last_perm = lh;
|
|
|
|
}
|
|
|
|
|
|
|
|
answer = NULL;
|
|
|
|
}
|
|
|
|
if (answer)
|
|
|
|
goto out_permanent;
|
|
|
|
|
|
|
|
/* Add the new entry after the last permanent entry if any, so that
|
|
|
|
* the new entry does not override a permanent entry when matched with
|
|
|
|
* a wild-card protocol. But it is allowed to override any existing
|
2007-02-09 17:24:47 +03:00
|
|
|
* non-permanent entry. This means that when we remove this entry, the
|
2005-04-17 02:20:36 +04:00
|
|
|
* system automatically returns to the old behavior.
|
|
|
|
*/
|
|
|
|
list_add_rcu(&p->list, last_perm);
|
|
|
|
out:
|
|
|
|
spin_unlock_bh(&inetsw_lock);
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
out_permanent:
|
2012-03-11 22:36:11 +04:00
|
|
|
pr_err("Attempt to override permanent protocol %d\n", protocol);
|
2005-04-17 02:20:36 +04:00
|
|
|
goto out;
|
|
|
|
|
|
|
|
out_illegal:
|
2012-03-11 22:36:11 +04:00
|
|
|
pr_err("Ignoring attempt to register invalid socket type %d\n",
|
2005-04-17 02:20:36 +04:00
|
|
|
p->type);
|
|
|
|
goto out;
|
|
|
|
}
|
2009-08-29 10:45:21 +04:00
|
|
|
EXPORT_SYMBOL(inet_register_protosw);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
void inet_unregister_protosw(struct inet_protosw *p)
|
|
|
|
{
|
|
|
|
if (INET_PROTOSW_PERMANENT & p->flags) {
|
2012-03-11 22:36:11 +04:00
|
|
|
pr_err("Attempt to unregister permanent protocol %d\n",
|
2005-04-17 02:20:36 +04:00
|
|
|
p->protocol);
|
|
|
|
} else {
|
|
|
|
spin_lock_bh(&inetsw_lock);
|
|
|
|
list_del_rcu(&p->list);
|
|
|
|
spin_unlock_bh(&inetsw_lock);
|
|
|
|
|
|
|
|
synchronize_net();
|
|
|
|
}
|
|
|
|
}
|
2009-08-29 10:45:21 +04:00
|
|
|
EXPORT_SYMBOL(inet_unregister_protosw);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2005-08-10 06:50:02 +04:00
|
|
|
/*
|
|
|
|
* Shall we try to damage output packets if routing dev changes?
|
|
|
|
*/
|
|
|
|
|
2006-09-23 01:15:41 +04:00
|
|
|
int sysctl_ip_dynaddr __read_mostly;
|
2005-08-10 06:50:02 +04:00
|
|
|
|
|
|
|
static int inet_sk_reselect_saddr(struct sock *sk)
|
|
|
|
{
|
|
|
|
struct inet_sock *inet = inet_sk(sk);
|
2009-10-15 10:30:45 +04:00
|
|
|
__be32 old_saddr = inet->inet_saddr;
|
|
|
|
__be32 daddr = inet->inet_daddr;
|
2011-05-07 03:18:04 +04:00
|
|
|
struct flowi4 *fl4;
|
2011-03-03 01:31:35 +03:00
|
|
|
struct rtable *rt;
|
|
|
|
__be32 new_saddr;
|
2011-04-21 13:45:37 +04:00
|
|
|
struct ip_options_rcu *inet_opt;
|
2005-08-10 06:50:02 +04:00
|
|
|
|
2011-04-21 13:45:37 +04:00
|
|
|
inet_opt = rcu_dereference_protected(inet->inet_opt,
|
|
|
|
sock_owned_by_user(sk));
|
|
|
|
if (inet_opt && inet_opt->opt.srr)
|
|
|
|
daddr = inet_opt->opt.faddr;
|
2005-08-10 06:50:02 +04:00
|
|
|
|
|
|
|
/* Query new route. */
|
2011-05-07 03:18:04 +04:00
|
|
|
fl4 = &inet->cork.fl.u.ip4;
|
|
|
|
rt = ip_route_connect(fl4, daddr, 0, RT_CONN_FLAGS(sk),
|
2011-03-03 01:31:35 +03:00
|
|
|
sk->sk_bound_dev_if, sk->sk_protocol,
|
2013-08-28 10:04:14 +04:00
|
|
|
inet->inet_sport, inet->inet_dport, sk);
|
2011-03-03 01:31:35 +03:00
|
|
|
if (IS_ERR(rt))
|
|
|
|
return PTR_ERR(rt);
|
2005-08-10 06:50:02 +04:00
|
|
|
|
2010-06-11 10:31:35 +04:00
|
|
|
sk_setup_caps(sk, &rt->dst);
|
2005-08-10 06:50:02 +04:00
|
|
|
|
2011-05-07 03:18:04 +04:00
|
|
|
new_saddr = fl4->saddr;
|
2005-08-10 06:50:02 +04:00
|
|
|
|
|
|
|
if (new_saddr == old_saddr)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (sysctl_ip_dynaddr > 1) {
|
2012-03-11 22:36:11 +04:00
|
|
|
pr_info("%s(): shifting inet->saddr from %pI4 to %pI4\n",
|
|
|
|
__func__, &old_saddr, &new_saddr);
|
2005-08-10 06:50:02 +04:00
|
|
|
}
|
|
|
|
|
2009-10-15 10:30:45 +04:00
|
|
|
inet->inet_saddr = inet->inet_rcv_saddr = new_saddr;
|
2005-08-10 06:50:02 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* XXX The only one ugly spot where we need to
|
|
|
|
* XXX really change the sockets identity after
|
|
|
|
* XXX it has entered the hashes. -DaveM
|
|
|
|
*
|
|
|
|
* Besides that, it does not check for connection
|
|
|
|
* uniqueness. Wait for troubles.
|
|
|
|
*/
|
|
|
|
__sk_prot_rehash(sk);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int inet_sk_rebuild_header(struct sock *sk)
|
|
|
|
{
|
|
|
|
struct inet_sock *inet = inet_sk(sk);
|
|
|
|
struct rtable *rt = (struct rtable *)__sk_dst_check(sk, 0);
|
2006-09-28 05:28:07 +04:00
|
|
|
__be32 daddr;
|
2011-04-21 13:45:37 +04:00
|
|
|
struct ip_options_rcu *inet_opt;
|
2011-05-07 03:18:04 +04:00
|
|
|
struct flowi4 *fl4;
|
2005-08-10 06:50:02 +04:00
|
|
|
int err;
|
|
|
|
|
|
|
|
/* Route is OK, nothing to do. */
|
|
|
|
if (rt)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* Reroute. */
|
2011-04-21 13:45:37 +04:00
|
|
|
rcu_read_lock();
|
|
|
|
inet_opt = rcu_dereference(inet->inet_opt);
|
2009-10-15 10:30:45 +04:00
|
|
|
daddr = inet->inet_daddr;
|
2011-04-21 13:45:37 +04:00
|
|
|
if (inet_opt && inet_opt->opt.srr)
|
|
|
|
daddr = inet_opt->opt.faddr;
|
|
|
|
rcu_read_unlock();
|
2011-05-07 03:18:04 +04:00
|
|
|
fl4 = &inet->cork.fl.u.ip4;
|
|
|
|
rt = ip_route_output_ports(sock_net(sk), fl4, sk, daddr, inet->inet_saddr,
|
2011-03-12 08:00:52 +03:00
|
|
|
inet->inet_dport, inet->inet_sport,
|
|
|
|
sk->sk_protocol, RT_CONN_FLAGS(sk),
|
|
|
|
sk->sk_bound_dev_if);
|
2011-03-03 01:31:35 +03:00
|
|
|
if (!IS_ERR(rt)) {
|
|
|
|
err = 0;
|
2010-06-11 10:31:35 +04:00
|
|
|
sk_setup_caps(sk, &rt->dst);
|
2011-03-03 01:31:35 +03:00
|
|
|
} else {
|
|
|
|
err = PTR_ERR(rt);
|
|
|
|
|
2005-08-10 06:50:02 +04:00
|
|
|
/* Routing failed... */
|
|
|
|
sk->sk_route_caps = 0;
|
|
|
|
/*
|
|
|
|
* Other protocols have to map its equivalent state to TCP_SYN_SENT.
|
|
|
|
* DCCP maps its DCCP_REQUESTING state to TCP_SYN_SENT. -acme
|
|
|
|
*/
|
|
|
|
if (!sysctl_ip_dynaddr ||
|
|
|
|
sk->sk_state != TCP_SYN_SENT ||
|
|
|
|
(sk->sk_userlocks & SOCK_BINDADDR_LOCK) ||
|
|
|
|
(err = inet_sk_reselect_saddr(sk)) != 0)
|
|
|
|
sk->sk_err_soft = -err;
|
|
|
|
}
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(inet_sk_rebuild_header);
|
|
|
|
|
2006-07-09 00:34:56 +04:00
|
|
|
static int inet_gso_send_check(struct sk_buff *skb)
|
|
|
|
{
|
2012-11-15 12:49:14 +04:00
|
|
|
const struct net_offload *ops;
|
2012-06-20 05:56:21 +04:00
|
|
|
const struct iphdr *iph;
|
2006-07-09 00:34:56 +04:00
|
|
|
int proto;
|
|
|
|
int ihl;
|
|
|
|
int err = -EINVAL;
|
|
|
|
|
|
|
|
if (unlikely(!pskb_may_pull(skb, sizeof(*iph))))
|
|
|
|
goto out;
|
|
|
|
|
2007-04-21 09:47:35 +04:00
|
|
|
iph = ip_hdr(skb);
|
2006-07-09 00:34:56 +04:00
|
|
|
ihl = iph->ihl * 4;
|
|
|
|
if (ihl < sizeof(*iph))
|
|
|
|
goto out;
|
|
|
|
|
2013-10-19 00:13:27 +04:00
|
|
|
proto = iph->protocol;
|
|
|
|
|
|
|
|
/* Warning: after this point, iph might be no longer valid */
|
2006-07-09 00:34:56 +04:00
|
|
|
if (unlikely(!pskb_may_pull(skb, ihl)))
|
|
|
|
goto out;
|
2007-03-13 19:06:52 +03:00
|
|
|
__skb_pull(skb, ihl);
|
2013-10-19 00:13:27 +04:00
|
|
|
|
2007-03-13 19:06:52 +03:00
|
|
|
skb_reset_transport_header(skb);
|
2006-07-09 00:34:56 +04:00
|
|
|
err = -EPROTONOSUPPORT;
|
|
|
|
|
2012-11-15 12:49:14 +04:00
|
|
|
ops = rcu_dereference(inet_offloads[proto]);
|
2012-11-15 12:49:23 +04:00
|
|
|
if (likely(ops && ops->callbacks.gso_send_check))
|
|
|
|
err = ops->callbacks.gso_send_check(skb);
|
2006-07-09 00:34:56 +04:00
|
|
|
|
|
|
|
out:
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2011-11-15 19:29:55 +04:00
|
|
|
static struct sk_buff *inet_gso_segment(struct sk_buff *skb,
|
2013-10-19 22:42:56 +04:00
|
|
|
netdev_features_t features)
|
2006-06-22 14:02:40 +04:00
|
|
|
{
|
|
|
|
struct sk_buff *segs = ERR_PTR(-EINVAL);
|
2012-11-15 12:49:14 +04:00
|
|
|
const struct net_offload *ops;
|
2013-10-19 22:42:56 +04:00
|
|
|
unsigned int offset = 0;
|
2013-10-28 05:18:16 +04:00
|
|
|
bool udpfrag, encap;
|
2012-06-20 05:56:21 +04:00
|
|
|
struct iphdr *iph;
|
2006-06-22 14:02:40 +04:00
|
|
|
int proto;
|
2013-10-19 22:42:56 +04:00
|
|
|
int nhoff;
|
2006-06-22 14:02:40 +04:00
|
|
|
int ihl;
|
|
|
|
int id;
|
|
|
|
|
2006-07-04 06:38:35 +04:00
|
|
|
if (unlikely(skb_shinfo(skb)->gso_type &
|
|
|
|
~(SKB_GSO_TCPV4 |
|
|
|
|
SKB_GSO_UDP |
|
|
|
|
SKB_GSO_DODGY |
|
|
|
|
SKB_GSO_TCP_ECN |
|
2013-02-14 18:02:41 +04:00
|
|
|
SKB_GSO_GRE |
|
2013-10-19 22:42:57 +04:00
|
|
|
SKB_GSO_IPIP |
|
2013-10-21 07:47:30 +04:00
|
|
|
SKB_GSO_SIT |
|
2013-05-02 20:14:19 +04:00
|
|
|
SKB_GSO_TCPV6 |
|
2013-03-07 17:21:51 +04:00
|
|
|
SKB_GSO_UDP_TUNNEL |
|
2013-05-24 01:02:52 +04:00
|
|
|
SKB_GSO_MPLS |
|
2006-07-04 06:38:35 +04:00
|
|
|
0)))
|
|
|
|
goto out;
|
|
|
|
|
2013-10-19 22:42:56 +04:00
|
|
|
skb_reset_network_header(skb);
|
|
|
|
nhoff = skb_network_header(skb) - skb_mac_header(skb);
|
2006-07-04 06:38:35 +04:00
|
|
|
if (unlikely(!pskb_may_pull(skb, sizeof(*iph))))
|
2006-06-22 14:02:40 +04:00
|
|
|
goto out;
|
|
|
|
|
2007-04-21 09:47:35 +04:00
|
|
|
iph = ip_hdr(skb);
|
2006-06-22 14:02:40 +04:00
|
|
|
ihl = iph->ihl * 4;
|
|
|
|
if (ihl < sizeof(*iph))
|
|
|
|
goto out;
|
|
|
|
|
2013-10-19 00:13:27 +04:00
|
|
|
id = ntohs(iph->id);
|
|
|
|
proto = iph->protocol;
|
|
|
|
|
|
|
|
/* Warning: after this point, iph might be no longer valid */
|
2006-07-04 06:38:35 +04:00
|
|
|
if (unlikely(!pskb_may_pull(skb, ihl)))
|
2006-06-22 14:02:40 +04:00
|
|
|
goto out;
|
2013-10-19 00:13:27 +04:00
|
|
|
__skb_pull(skb, ihl);
|
2006-06-22 14:02:40 +04:00
|
|
|
|
2013-10-28 05:18:16 +04:00
|
|
|
encap = SKB_GSO_CB(skb)->encap_level > 0;
|
|
|
|
if (encap)
|
2013-10-19 22:42:56 +04:00
|
|
|
features = skb->dev->hw_enc_features & netif_skb_features(skb);
|
|
|
|
SKB_GSO_CB(skb)->encap_level += ihl;
|
2013-03-07 17:21:51 +04:00
|
|
|
|
2007-03-13 19:06:52 +03:00
|
|
|
skb_reset_transport_header(skb);
|
2013-10-19 00:13:27 +04:00
|
|
|
|
2006-06-22 14:02:40 +04:00
|
|
|
segs = ERR_PTR(-EPROTONOSUPPORT);
|
|
|
|
|
2013-11-08 06:32:06 +04:00
|
|
|
/* Note : following gso_segment() might change skb->encapsulation */
|
|
|
|
udpfrag = !skb->encapsulation && proto == IPPROTO_UDP;
|
|
|
|
|
2012-11-15 12:49:14 +04:00
|
|
|
ops = rcu_dereference(inet_offloads[proto]);
|
2012-11-15 12:49:23 +04:00
|
|
|
if (likely(ops && ops->callbacks.gso_segment))
|
|
|
|
segs = ops->callbacks.gso_segment(skb, features);
|
2006-06-22 14:02:40 +04:00
|
|
|
|
2013-01-22 10:32:49 +04:00
|
|
|
if (IS_ERR_OR_NULL(segs))
|
2006-06-22 14:02:40 +04:00
|
|
|
goto out;
|
|
|
|
|
|
|
|
skb = segs;
|
|
|
|
do {
|
2013-10-19 22:42:56 +04:00
|
|
|
iph = (struct iphdr *)(skb_mac_header(skb) + nhoff);
|
2013-10-28 05:18:16 +04:00
|
|
|
if (udpfrag) {
|
2009-07-09 12:09:47 +04:00
|
|
|
iph->id = htons(id);
|
|
|
|
iph->frag_off = htons(offset >> 3);
|
|
|
|
if (skb->next != NULL)
|
|
|
|
iph->frag_off |= htons(IP_MF);
|
2013-10-19 22:42:56 +04:00
|
|
|
offset += skb->len - nhoff - ihl;
|
2013-10-28 05:18:16 +04:00
|
|
|
} else {
|
2013-03-24 21:36:29 +04:00
|
|
|
iph->id = htons(id++);
|
2013-02-22 11:30:30 +04:00
|
|
|
}
|
2013-10-19 22:42:56 +04:00
|
|
|
iph->tot_len = htons(skb->len - nhoff);
|
2013-10-19 00:13:27 +04:00
|
|
|
ip_send_check(iph);
|
2013-10-28 05:18:16 +04:00
|
|
|
if (encap)
|
2013-10-19 22:42:56 +04:00
|
|
|
skb_reset_inner_headers(skb);
|
|
|
|
skb->network_header = (u8 *)iph - skb->head;
|
2006-06-22 14:02:40 +04:00
|
|
|
} while ((skb = skb->next));
|
|
|
|
|
|
|
|
out:
|
|
|
|
return segs;
|
|
|
|
}
|
|
|
|
|
2008-12-16 10:41:09 +03:00
|
|
|
static struct sk_buff **inet_gro_receive(struct sk_buff **head,
|
|
|
|
struct sk_buff *skb)
|
|
|
|
{
|
2012-11-15 12:49:14 +04:00
|
|
|
const struct net_offload *ops;
|
2008-12-16 10:41:09 +03:00
|
|
|
struct sk_buff **pp = NULL;
|
|
|
|
struct sk_buff *p;
|
2011-04-22 08:53:02 +04:00
|
|
|
const struct iphdr *iph;
|
2009-05-26 22:50:28 +04:00
|
|
|
unsigned int hlen;
|
|
|
|
unsigned int off;
|
2009-05-26 22:50:29 +04:00
|
|
|
unsigned int id;
|
2008-12-16 10:41:09 +03:00
|
|
|
int flush = 1;
|
|
|
|
int proto;
|
|
|
|
|
2009-05-26 22:50:28 +04:00
|
|
|
off = skb_gro_offset(skb);
|
|
|
|
hlen = off + sizeof(*iph);
|
|
|
|
iph = skb_gro_header_fast(skb, off);
|
|
|
|
if (skb_gro_header_hard(skb, hlen)) {
|
|
|
|
iph = skb_gro_header_slow(skb, hlen, off);
|
|
|
|
if (unlikely(!iph))
|
|
|
|
goto out;
|
|
|
|
}
|
2008-12-16 10:41:09 +03:00
|
|
|
|
2012-06-20 05:56:21 +04:00
|
|
|
proto = iph->protocol;
|
2008-12-16 10:41:09 +03:00
|
|
|
|
|
|
|
rcu_read_lock();
|
2012-11-15 12:49:14 +04:00
|
|
|
ops = rcu_dereference(inet_offloads[proto]);
|
2012-11-15 12:49:23 +04:00
|
|
|
if (!ops || !ops->callbacks.gro_receive)
|
2008-12-16 10:41:09 +03:00
|
|
|
goto out_unlock;
|
|
|
|
|
2009-02-08 21:00:39 +03:00
|
|
|
if (*(u8 *)iph != 0x45)
|
2008-12-16 10:41:09 +03:00
|
|
|
goto out_unlock;
|
|
|
|
|
net: tcp: GRO should be ECN friendly
While doing TCP ECN tests, I discovered GRO was reordering packets if it
receives one packet with CE set, while previous packets in same NAPI run
have ECT(0) for the same flow :
09:25:25.857620 IP (tos 0x2,ECT(0), ttl 64, id 27893, offset 0, flags
[DF], proto TCP (6), length 4396)
172.30.42.19.54550 > 172.30.42.13.44139: Flags [.], seq
233801:238145, ack 1, win 115, options [nop,nop,TS val 3397779 ecr
1990627], length 4344
09:25:25.857626 IP (tos 0x3,CE, ttl 64, id 27892, offset 0, flags [DF],
proto TCP (6), length 1500)
172.30.42.19.54550 > 172.30.42.13.44139: Flags [.], seq
232353:233801, ack 1, win 115, options [nop,nop,TS val 3397779 ecr
1990627], length 1448
09:25:25.857638 IP (tos 0x0, ttl 64, id 34581, offset 0, flags [DF],
proto TCP (6), length 64)
172.30.42.13.44139 > 172.30.42.19.54550: Flags [.], cksum 0xac8f
(incorrect -> 0xca69), ack 232353, win 1271, options [nop,nop,TS val
1990627 ecr 3397779,nop,nop,sack 1 {233801:238145}], length 0
We have two problems here :
1) GRO reorders packets
If NIC gave packet1, then packet2, which happen to be from "different
flows" GRO feeds stack with packet2, then packet1. I have yet to
understand how to solve this problem.
2) GRO is not ECN friendly
Delivering packets out of order makes TCP stack not as fast as it could
be.
In this patch I suggest we make the tos test not part of the 'same_flow'
determination, but part of the 'should flush' logic
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-08-06 02:34:50 +04:00
|
|
|
if (unlikely(ip_fast_csum((u8 *)iph, 5)))
|
2008-12-16 10:41:09 +03:00
|
|
|
goto out_unlock;
|
|
|
|
|
2010-04-21 06:06:52 +04:00
|
|
|
id = ntohl(*(__be32 *)&iph->id);
|
2013-05-31 15:18:10 +04:00
|
|
|
flush = (u16)((ntohl(*(__be32 *)iph) ^ skb_gro_len(skb)) | (id & ~IP_DF));
|
2009-05-26 22:50:29 +04:00
|
|
|
id >>= 16;
|
2008-12-16 10:41:09 +03:00
|
|
|
|
|
|
|
for (p = *head; p; p = p->next) {
|
|
|
|
struct iphdr *iph2;
|
|
|
|
|
|
|
|
if (!NAPI_GRO_CB(p)->same_flow)
|
|
|
|
continue;
|
|
|
|
|
net-gro: Prepare GRO stack for the upcoming tunneling support
This patch modifies the GRO stack to avoid the use of "network_header"
and associated macros like ip_hdr() and ipv6_hdr() in order to allow
an arbitary number of IP hdrs (v4 or v6) to be used in the
encapsulation chain. This lays the foundation for various IP
tunneling support (IP-in-IP, GRE, VXLAN, SIT,...) to be added later.
With this patch, the GRO stack traversing now is mostly based on
skb_gro_offset rather than special hdr offsets saved in skb (e.g.,
skb->network_header). As a result all but the top layer (i.e., the
the transport layer) must have hdrs of the same length in order for
a pkt to be considered for aggregation. Therefore when adding a new
encap layer (e.g., for tunneling), one must check and skip flows
(e.g., by setting NAPI_GRO_CB(p)->same_flow to 0) that have a
different hdr length.
Note that unlike the network header, the transport header can and
will continue to be set by the GRO code since there will be at
most one "transport layer" in the encap chain.
Signed-off-by: H.K. Jerry Chu <hkchu@google.com>
Suggested-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-12-12 08:53:45 +04:00
|
|
|
iph2 = (struct iphdr *)(p->data + off);
|
|
|
|
/* The above works because, with the exception of the top
|
|
|
|
* (inner most) layer, we only aggregate pkts with the same
|
|
|
|
* hdr length so all the hdrs we'll need to verify will start
|
|
|
|
* at the same offset.
|
|
|
|
*/
|
2009-02-08 21:00:39 +03:00
|
|
|
if ((iph->protocol ^ iph2->protocol) |
|
2010-04-21 06:06:52 +04:00
|
|
|
((__force u32)iph->saddr ^ (__force u32)iph2->saddr) |
|
|
|
|
((__force u32)iph->daddr ^ (__force u32)iph2->daddr)) {
|
2008-12-16 10:41:09 +03:00
|
|
|
NAPI_GRO_CB(p)->same_flow = 0;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* All fields must match except length and checksum. */
|
|
|
|
NAPI_GRO_CB(p)->flush |=
|
2009-02-08 21:00:39 +03:00
|
|
|
(iph->ttl ^ iph2->ttl) |
|
net: tcp: GRO should be ECN friendly
While doing TCP ECN tests, I discovered GRO was reordering packets if it
receives one packet with CE set, while previous packets in same NAPI run
have ECT(0) for the same flow :
09:25:25.857620 IP (tos 0x2,ECT(0), ttl 64, id 27893, offset 0, flags
[DF], proto TCP (6), length 4396)
172.30.42.19.54550 > 172.30.42.13.44139: Flags [.], seq
233801:238145, ack 1, win 115, options [nop,nop,TS val 3397779 ecr
1990627], length 4344
09:25:25.857626 IP (tos 0x3,CE, ttl 64, id 27892, offset 0, flags [DF],
proto TCP (6), length 1500)
172.30.42.19.54550 > 172.30.42.13.44139: Flags [.], seq
232353:233801, ack 1, win 115, options [nop,nop,TS val 3397779 ecr
1990627], length 1448
09:25:25.857638 IP (tos 0x0, ttl 64, id 34581, offset 0, flags [DF],
proto TCP (6), length 64)
172.30.42.13.44139 > 172.30.42.19.54550: Flags [.], cksum 0xac8f
(incorrect -> 0xca69), ack 232353, win 1271, options [nop,nop,TS val
1990627 ecr 3397779,nop,nop,sack 1 {233801:238145}], length 0
We have two problems here :
1) GRO reorders packets
If NIC gave packet1, then packet2, which happen to be from "different
flows" GRO feeds stack with packet2, then packet1. I have yet to
understand how to solve this problem.
2) GRO is not ECN friendly
Delivering packets out of order makes TCP stack not as fast as it could
be.
In this patch I suggest we make the tos test not part of the 'same_flow'
determination, but part of the 'should flush' logic
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-08-06 02:34:50 +04:00
|
|
|
(iph->tos ^ iph2->tos) |
|
net-gre-gro: Add GRE support to the GRO stack
This patch built on top of Commit 299603e8370a93dd5d8e8d800f0dff1ce2c53d36
("net-gro: Prepare GRO stack for the upcoming tunneling support") to add
the support of the standard GRE (RFC1701/RFC2784/RFC2890) to the GRO
stack. It also serves as an example for supporting other encapsulation
protocols in the GRO stack in the future.
The patch supports version 0 and all the flags (key, csum, seq#) but
will flush any pkt with the S (seq#) flag. This is because the S flag
is not support by GSO, and a GRO pkt may end up in the forwarding path,
thus requiring GSO support to break it up correctly.
Currently the "packet_offload" structure only contains L3 (ETH_P_IP/
ETH_P_IPV6) GRO offload support so the encapped pkts are limited to
IP pkts (i.e., w/o L2 hdr). But support for other protocol type can
be easily added, so is the support for GRE variations like NVGRE.
The patch also support csum offload. Specifically if the csum flag is on
and the h/w is capable of checksumming the payload (CHECKSUM_COMPLETE),
the code will take advantage of the csum computed by the h/w when
validating the GRE csum.
Note that commit 60769a5dcd8755715c7143b4571d5c44f01796f1 "ipv4: gre:
add GRO capability" already introduces GRO capability to IPv4 GRE
tunnels, using the gro_cells infrastructure. But GRO is done after
GRE hdr has been removed (i.e., decapped). The following patch applies
GRO when pkts first come in (before hitting the GRE tunnel code). There
is some performance advantage for applying GRO as early as possible.
Also this approach is transparent to other subsystem like Open vSwitch
where GRE decap is handled outside of the IP stack hence making it
harder for the gro_cells stuff to apply. On the other hand, some NICs
are still not capable of hashing on the inner hdr of a GRE pkt (RSS).
In that case the GRO processing of pkts from the same remote host will
all happen on the same CPU and the performance may be suboptimal.
I'm including some rough preliminary performance numbers below. Note
that the performance will be highly dependent on traffic load, mix as
usual. Moreover it also depends on NIC offload features hence the
following is by no means a comprehesive study. Local testing and tuning
will be needed to decide the best setting.
All tests spawned 50 copies of netperf TCP_STREAM and ran for 30 secs.
(super_netperf 50 -H 192.168.1.18 -l 30)
An IP GRE tunnel with only the key flag on (e.g., ip tunnel add gre1
mode gre local 10.246.17.18 remote 10.246.17.17 ttl 255 key 123)
is configured.
The GRO support for pkts AFTER decap are controlled through the device
feature of the GRE device (e.g., ethtool -K gre1 gro on/off).
1.1 ethtool -K gre1 gro off; ethtool -K eth0 gro off
thruput: 9.16Gbps
CPU utilization: 19%
1.2 ethtool -K gre1 gro on; ethtool -K eth0 gro off
thruput: 5.9Gbps
CPU utilization: 15%
1.3 ethtool -K gre1 gro off; ethtool -K eth0 gro on
thruput: 9.26Gbps
CPU utilization: 12-13%
1.4 ethtool -K gre1 gro on; ethtool -K eth0 gro on
thruput: 9.26Gbps
CPU utilization: 10%
The following tests were performed on a different NIC that is capable of
csum offload. I.e., the h/w is capable of computing IP payload csum
(CHECKSUM_COMPLETE).
2.1 ethtool -K gre1 gro on (hence will use gro_cells)
2.1.1 ethtool -K eth0 gro off; csum offload disabled
thruput: 8.53Gbps
CPU utilization: 9%
2.1.2 ethtool -K eth0 gro off; csum offload enabled
thruput: 8.97Gbps
CPU utilization: 7-8%
2.1.3 ethtool -K eth0 gro on; csum offload disabled
thruput: 8.83Gbps
CPU utilization: 5-6%
2.1.4 ethtool -K eth0 gro on; csum offload enabled
thruput: 8.98Gbps
CPU utilization: 5%
2.2 ethtool -K gre1 gro off
2.2.1 ethtool -K eth0 gro off; csum offload disabled
thruput: 5.93Gbps
CPU utilization: 9%
2.2.2 ethtool -K eth0 gro off; csum offload enabled
thruput: 5.62Gbps
CPU utilization: 8%
2.2.3 ethtool -K eth0 gro on; csum offload disabled
thruput: 7.69Gbps
CPU utilization: 8%
2.2.4 ethtool -K eth0 gro on; csum offload enabled
thruput: 8.96Gbps
CPU utilization: 5-6%
Signed-off-by: H.K. Jerry Chu <hkchu@google.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-01-07 22:23:19 +04:00
|
|
|
((iph->frag_off ^ iph2->frag_off) & htons(IP_DF));
|
2008-12-16 10:41:09 +03:00
|
|
|
|
net-gre-gro: Add GRE support to the GRO stack
This patch built on top of Commit 299603e8370a93dd5d8e8d800f0dff1ce2c53d36
("net-gro: Prepare GRO stack for the upcoming tunneling support") to add
the support of the standard GRE (RFC1701/RFC2784/RFC2890) to the GRO
stack. It also serves as an example for supporting other encapsulation
protocols in the GRO stack in the future.
The patch supports version 0 and all the flags (key, csum, seq#) but
will flush any pkt with the S (seq#) flag. This is because the S flag
is not support by GSO, and a GRO pkt may end up in the forwarding path,
thus requiring GSO support to break it up correctly.
Currently the "packet_offload" structure only contains L3 (ETH_P_IP/
ETH_P_IPV6) GRO offload support so the encapped pkts are limited to
IP pkts (i.e., w/o L2 hdr). But support for other protocol type can
be easily added, so is the support for GRE variations like NVGRE.
The patch also support csum offload. Specifically if the csum flag is on
and the h/w is capable of checksumming the payload (CHECKSUM_COMPLETE),
the code will take advantage of the csum computed by the h/w when
validating the GRE csum.
Note that commit 60769a5dcd8755715c7143b4571d5c44f01796f1 "ipv4: gre:
add GRO capability" already introduces GRO capability to IPv4 GRE
tunnels, using the gro_cells infrastructure. But GRO is done after
GRE hdr has been removed (i.e., decapped). The following patch applies
GRO when pkts first come in (before hitting the GRE tunnel code). There
is some performance advantage for applying GRO as early as possible.
Also this approach is transparent to other subsystem like Open vSwitch
where GRE decap is handled outside of the IP stack hence making it
harder for the gro_cells stuff to apply. On the other hand, some NICs
are still not capable of hashing on the inner hdr of a GRE pkt (RSS).
In that case the GRO processing of pkts from the same remote host will
all happen on the same CPU and the performance may be suboptimal.
I'm including some rough preliminary performance numbers below. Note
that the performance will be highly dependent on traffic load, mix as
usual. Moreover it also depends on NIC offload features hence the
following is by no means a comprehesive study. Local testing and tuning
will be needed to decide the best setting.
All tests spawned 50 copies of netperf TCP_STREAM and ran for 30 secs.
(super_netperf 50 -H 192.168.1.18 -l 30)
An IP GRE tunnel with only the key flag on (e.g., ip tunnel add gre1
mode gre local 10.246.17.18 remote 10.246.17.17 ttl 255 key 123)
is configured.
The GRO support for pkts AFTER decap are controlled through the device
feature of the GRE device (e.g., ethtool -K gre1 gro on/off).
1.1 ethtool -K gre1 gro off; ethtool -K eth0 gro off
thruput: 9.16Gbps
CPU utilization: 19%
1.2 ethtool -K gre1 gro on; ethtool -K eth0 gro off
thruput: 5.9Gbps
CPU utilization: 15%
1.3 ethtool -K gre1 gro off; ethtool -K eth0 gro on
thruput: 9.26Gbps
CPU utilization: 12-13%
1.4 ethtool -K gre1 gro on; ethtool -K eth0 gro on
thruput: 9.26Gbps
CPU utilization: 10%
The following tests were performed on a different NIC that is capable of
csum offload. I.e., the h/w is capable of computing IP payload csum
(CHECKSUM_COMPLETE).
2.1 ethtool -K gre1 gro on (hence will use gro_cells)
2.1.1 ethtool -K eth0 gro off; csum offload disabled
thruput: 8.53Gbps
CPU utilization: 9%
2.1.2 ethtool -K eth0 gro off; csum offload enabled
thruput: 8.97Gbps
CPU utilization: 7-8%
2.1.3 ethtool -K eth0 gro on; csum offload disabled
thruput: 8.83Gbps
CPU utilization: 5-6%
2.1.4 ethtool -K eth0 gro on; csum offload enabled
thruput: 8.98Gbps
CPU utilization: 5%
2.2 ethtool -K gre1 gro off
2.2.1 ethtool -K eth0 gro off; csum offload disabled
thruput: 5.93Gbps
CPU utilization: 9%
2.2.2 ethtool -K eth0 gro off; csum offload enabled
thruput: 5.62Gbps
CPU utilization: 8%
2.2.3 ethtool -K eth0 gro on; csum offload disabled
thruput: 7.69Gbps
CPU utilization: 8%
2.2.4 ethtool -K eth0 gro on; csum offload enabled
thruput: 8.96Gbps
CPU utilization: 5-6%
Signed-off-by: H.K. Jerry Chu <hkchu@google.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-01-07 22:23:19 +04:00
|
|
|
/* Save the IP ID check to be included later when we get to
|
|
|
|
* the transport layer so only the inner most IP ID is checked.
|
|
|
|
* This is because some GSO/TSO implementations do not
|
|
|
|
* correctly increment the IP ID for the outer hdrs.
|
|
|
|
*/
|
|
|
|
NAPI_GRO_CB(p)->flush_id =
|
|
|
|
((u16)(ntohs(iph2->id) + NAPI_GRO_CB(p)->count) ^ id);
|
2008-12-16 10:41:09 +03:00
|
|
|
NAPI_GRO_CB(p)->flush |= flush;
|
|
|
|
}
|
|
|
|
|
|
|
|
NAPI_GRO_CB(skb)->flush |= flush;
|
net-gro: Prepare GRO stack for the upcoming tunneling support
This patch modifies the GRO stack to avoid the use of "network_header"
and associated macros like ip_hdr() and ipv6_hdr() in order to allow
an arbitary number of IP hdrs (v4 or v6) to be used in the
encapsulation chain. This lays the foundation for various IP
tunneling support (IP-in-IP, GRE, VXLAN, SIT,...) to be added later.
With this patch, the GRO stack traversing now is mostly based on
skb_gro_offset rather than special hdr offsets saved in skb (e.g.,
skb->network_header). As a result all but the top layer (i.e., the
the transport layer) must have hdrs of the same length in order for
a pkt to be considered for aggregation. Therefore when adding a new
encap layer (e.g., for tunneling), one must check and skip flows
(e.g., by setting NAPI_GRO_CB(p)->same_flow to 0) that have a
different hdr length.
Note that unlike the network header, the transport header can and
will continue to be set by the GRO code since there will be at
most one "transport layer" in the encap chain.
Signed-off-by: H.K. Jerry Chu <hkchu@google.com>
Suggested-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-12-12 08:53:45 +04:00
|
|
|
skb_set_network_header(skb, off);
|
|
|
|
/* The above will be needed by the transport layer if there is one
|
|
|
|
* immediately following this IP hdr.
|
|
|
|
*/
|
|
|
|
|
2009-01-29 17:19:50 +03:00
|
|
|
skb_gro_pull(skb, sizeof(*iph));
|
|
|
|
skb_set_transport_header(skb, skb_gro_offset(skb));
|
2008-12-16 10:41:09 +03:00
|
|
|
|
2012-11-15 12:49:23 +04:00
|
|
|
pp = ops->callbacks.gro_receive(head, skb);
|
2008-12-16 10:41:09 +03:00
|
|
|
|
|
|
|
out_unlock:
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
out:
|
|
|
|
NAPI_GRO_CB(skb)->flush |= flush;
|
|
|
|
|
|
|
|
return pp;
|
|
|
|
}
|
|
|
|
|
net-gro: Prepare GRO stack for the upcoming tunneling support
This patch modifies the GRO stack to avoid the use of "network_header"
and associated macros like ip_hdr() and ipv6_hdr() in order to allow
an arbitary number of IP hdrs (v4 or v6) to be used in the
encapsulation chain. This lays the foundation for various IP
tunneling support (IP-in-IP, GRE, VXLAN, SIT,...) to be added later.
With this patch, the GRO stack traversing now is mostly based on
skb_gro_offset rather than special hdr offsets saved in skb (e.g.,
skb->network_header). As a result all but the top layer (i.e., the
the transport layer) must have hdrs of the same length in order for
a pkt to be considered for aggregation. Therefore when adding a new
encap layer (e.g., for tunneling), one must check and skip flows
(e.g., by setting NAPI_GRO_CB(p)->same_flow to 0) that have a
different hdr length.
Note that unlike the network header, the transport header can and
will continue to be set by the GRO code since there will be at
most one "transport layer" in the encap chain.
Signed-off-by: H.K. Jerry Chu <hkchu@google.com>
Suggested-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-12-12 08:53:45 +04:00
|
|
|
static int inet_gro_complete(struct sk_buff *skb, int nhoff)
|
2008-12-16 10:41:09 +03:00
|
|
|
{
|
net-gro: Prepare GRO stack for the upcoming tunneling support
This patch modifies the GRO stack to avoid the use of "network_header"
and associated macros like ip_hdr() and ipv6_hdr() in order to allow
an arbitary number of IP hdrs (v4 or v6) to be used in the
encapsulation chain. This lays the foundation for various IP
tunneling support (IP-in-IP, GRE, VXLAN, SIT,...) to be added later.
With this patch, the GRO stack traversing now is mostly based on
skb_gro_offset rather than special hdr offsets saved in skb (e.g.,
skb->network_header). As a result all but the top layer (i.e., the
the transport layer) must have hdrs of the same length in order for
a pkt to be considered for aggregation. Therefore when adding a new
encap layer (e.g., for tunneling), one must check and skip flows
(e.g., by setting NAPI_GRO_CB(p)->same_flow to 0) that have a
different hdr length.
Note that unlike the network header, the transport header can and
will continue to be set by the GRO code since there will be at
most one "transport layer" in the encap chain.
Signed-off-by: H.K. Jerry Chu <hkchu@google.com>
Suggested-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-12-12 08:53:45 +04:00
|
|
|
__be16 newlen = htons(skb->len - nhoff);
|
|
|
|
struct iphdr *iph = (struct iphdr *)(skb->data + nhoff);
|
2012-11-15 12:49:14 +04:00
|
|
|
const struct net_offload *ops;
|
2012-06-20 05:56:21 +04:00
|
|
|
int proto = iph->protocol;
|
2008-12-16 10:41:09 +03:00
|
|
|
int err = -ENOSYS;
|
|
|
|
|
|
|
|
csum_replace2(&iph->check, iph->tot_len, newlen);
|
|
|
|
iph->tot_len = newlen;
|
|
|
|
|
|
|
|
rcu_read_lock();
|
2012-11-15 12:49:14 +04:00
|
|
|
ops = rcu_dereference(inet_offloads[proto]);
|
2012-11-15 12:49:23 +04:00
|
|
|
if (WARN_ON(!ops || !ops->callbacks.gro_complete))
|
2008-12-16 10:41:09 +03:00
|
|
|
goto out_unlock;
|
|
|
|
|
net-gro: Prepare GRO stack for the upcoming tunneling support
This patch modifies the GRO stack to avoid the use of "network_header"
and associated macros like ip_hdr() and ipv6_hdr() in order to allow
an arbitary number of IP hdrs (v4 or v6) to be used in the
encapsulation chain. This lays the foundation for various IP
tunneling support (IP-in-IP, GRE, VXLAN, SIT,...) to be added later.
With this patch, the GRO stack traversing now is mostly based on
skb_gro_offset rather than special hdr offsets saved in skb (e.g.,
skb->network_header). As a result all but the top layer (i.e., the
the transport layer) must have hdrs of the same length in order for
a pkt to be considered for aggregation. Therefore when adding a new
encap layer (e.g., for tunneling), one must check and skip flows
(e.g., by setting NAPI_GRO_CB(p)->same_flow to 0) that have a
different hdr length.
Note that unlike the network header, the transport header can and
will continue to be set by the GRO code since there will be at
most one "transport layer" in the encap chain.
Signed-off-by: H.K. Jerry Chu <hkchu@google.com>
Suggested-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-12-12 08:53:45 +04:00
|
|
|
/* Only need to add sizeof(*iph) to get to the next hdr below
|
|
|
|
* because any hdr with option will have been flushed in
|
|
|
|
* inet_gro_receive().
|
|
|
|
*/
|
|
|
|
err = ops->callbacks.gro_complete(skb, nhoff + sizeof(*iph));
|
2008-12-16 10:41:09 +03:00
|
|
|
|
|
|
|
out_unlock:
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2008-04-04 01:27:58 +04:00
|
|
|
int inet_ctl_sock_create(struct sock **sk, unsigned short family,
|
2008-04-04 01:28:30 +04:00
|
|
|
unsigned short type, unsigned char protocol,
|
|
|
|
struct net *net)
|
2008-04-04 01:22:32 +04:00
|
|
|
{
|
2008-04-04 01:27:58 +04:00
|
|
|
struct socket *sock;
|
|
|
|
int rc = sock_create_kern(family, type, protocol, &sock);
|
2008-04-04 01:22:32 +04:00
|
|
|
|
|
|
|
if (rc == 0) {
|
2008-04-04 01:27:58 +04:00
|
|
|
*sk = sock->sk;
|
|
|
|
(*sk)->sk_allocation = GFP_ATOMIC;
|
2008-04-04 01:22:32 +04:00
|
|
|
/*
|
|
|
|
* Unhash it so that IP input processing does not even see it,
|
|
|
|
* we do not wish this socket to see incoming packets.
|
|
|
|
*/
|
2008-04-04 01:27:58 +04:00
|
|
|
(*sk)->sk_prot->unhash(*sk);
|
2008-04-04 01:28:30 +04:00
|
|
|
|
|
|
|
sk_change_net(*sk, net);
|
2008-04-04 01:22:32 +04:00
|
|
|
}
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(inet_ctl_sock_create);
|
|
|
|
|
2010-02-16 18:20:26 +03:00
|
|
|
unsigned long snmp_fold_field(void __percpu *mib[], int offt)
|
2007-04-25 08:53:35 +04:00
|
|
|
{
|
|
|
|
unsigned long res = 0;
|
snmp: reduce percpu needs by 50%
SNMP mibs use two percpu arrays, one used in BH context, another in USER
context. With increasing number of cpus in machines, and fact that ipv6
uses per network device ipstats_mib, this is consuming a lot of memory
if many network devices are registered.
commit be281e554e2a (ipv6: reduce per device ICMP mib sizes) shrinked
percpu needs for ipv6, but we can reduce memory use a bit more.
With recent percpu infrastructure (irqsafe_cpu_inc() ...), we no longer
need this BH/USER separation since we can update counters in a single
x86 instruction, regardless of the BH/USER context.
Other arches than x86 might need to disable irq in their
irqsafe_cpu_inc() implementation : If this happens to be a problem, we
can make SNMP_ARRAY_SZ arch dependent, but a previous poll
( https://lkml.org/lkml/2011/3/17/174 ) to arch maintainers did not
raise strong opposition.
Only on 32bit arches, we need to disable BH for 64bit counters updates
done from USER context (currently used for IP MIB)
This also reduces vmlinux size :
1) x86_64 build
$ size vmlinux.before vmlinux.after
text data bss dec hex filename
7853650 1293772 1896448 11043870 a8841e vmlinux.before
7850578 1293772 1896448 11040798 a8781e vmlinux.after
2) i386 build
$ size vmlinux.before vmlinux.afterpatch
text data bss dec hex filename
6039335 635076 3670016 10344427 9dd7eb vmlinux.before
6037342 635076 3670016 10342434 9dd022 vmlinux.afterpatch
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Andi Kleen <andi@firstfloor.org>
CC: Ingo Molnar <mingo@elte.hu>
CC: Tejun Heo <tj@kernel.org>
CC: Christoph Lameter <cl@linux-foundation.org>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org
CC: linux-arch@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-06-10 23:45:51 +04:00
|
|
|
int i, j;
|
2007-04-25 08:53:35 +04:00
|
|
|
|
|
|
|
for_each_possible_cpu(i) {
|
snmp: reduce percpu needs by 50%
SNMP mibs use two percpu arrays, one used in BH context, another in USER
context. With increasing number of cpus in machines, and fact that ipv6
uses per network device ipstats_mib, this is consuming a lot of memory
if many network devices are registered.
commit be281e554e2a (ipv6: reduce per device ICMP mib sizes) shrinked
percpu needs for ipv6, but we can reduce memory use a bit more.
With recent percpu infrastructure (irqsafe_cpu_inc() ...), we no longer
need this BH/USER separation since we can update counters in a single
x86 instruction, regardless of the BH/USER context.
Other arches than x86 might need to disable irq in their
irqsafe_cpu_inc() implementation : If this happens to be a problem, we
can make SNMP_ARRAY_SZ arch dependent, but a previous poll
( https://lkml.org/lkml/2011/3/17/174 ) to arch maintainers did not
raise strong opposition.
Only on 32bit arches, we need to disable BH for 64bit counters updates
done from USER context (currently used for IP MIB)
This also reduces vmlinux size :
1) x86_64 build
$ size vmlinux.before vmlinux.after
text data bss dec hex filename
7853650 1293772 1896448 11043870 a8841e vmlinux.before
7850578 1293772 1896448 11040798 a8781e vmlinux.after
2) i386 build
$ size vmlinux.before vmlinux.afterpatch
text data bss dec hex filename
6039335 635076 3670016 10344427 9dd7eb vmlinux.before
6037342 635076 3670016 10342434 9dd022 vmlinux.afterpatch
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Andi Kleen <andi@firstfloor.org>
CC: Ingo Molnar <mingo@elte.hu>
CC: Tejun Heo <tj@kernel.org>
CC: Christoph Lameter <cl@linux-foundation.org>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org
CC: linux-arch@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-06-10 23:45:51 +04:00
|
|
|
for (j = 0; j < SNMP_ARRAY_SZ; j++)
|
|
|
|
res += *(((unsigned long *) per_cpu_ptr(mib[j], i)) + offt);
|
2007-04-25 08:53:35 +04:00
|
|
|
}
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(snmp_fold_field);
|
|
|
|
|
2010-07-01 00:31:19 +04:00
|
|
|
#if BITS_PER_LONG==32
|
|
|
|
|
|
|
|
u64 snmp_fold_field64(void __percpu *mib[], int offt, size_t syncp_offset)
|
|
|
|
{
|
|
|
|
u64 res = 0;
|
|
|
|
int cpu;
|
|
|
|
|
|
|
|
for_each_possible_cpu(cpu) {
|
snmp: reduce percpu needs by 50%
SNMP mibs use two percpu arrays, one used in BH context, another in USER
context. With increasing number of cpus in machines, and fact that ipv6
uses per network device ipstats_mib, this is consuming a lot of memory
if many network devices are registered.
commit be281e554e2a (ipv6: reduce per device ICMP mib sizes) shrinked
percpu needs for ipv6, but we can reduce memory use a bit more.
With recent percpu infrastructure (irqsafe_cpu_inc() ...), we no longer
need this BH/USER separation since we can update counters in a single
x86 instruction, regardless of the BH/USER context.
Other arches than x86 might need to disable irq in their
irqsafe_cpu_inc() implementation : If this happens to be a problem, we
can make SNMP_ARRAY_SZ arch dependent, but a previous poll
( https://lkml.org/lkml/2011/3/17/174 ) to arch maintainers did not
raise strong opposition.
Only on 32bit arches, we need to disable BH for 64bit counters updates
done from USER context (currently used for IP MIB)
This also reduces vmlinux size :
1) x86_64 build
$ size vmlinux.before vmlinux.after
text data bss dec hex filename
7853650 1293772 1896448 11043870 a8841e vmlinux.before
7850578 1293772 1896448 11040798 a8781e vmlinux.after
2) i386 build
$ size vmlinux.before vmlinux.afterpatch
text data bss dec hex filename
6039335 635076 3670016 10344427 9dd7eb vmlinux.before
6037342 635076 3670016 10342434 9dd022 vmlinux.afterpatch
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Andi Kleen <andi@firstfloor.org>
CC: Ingo Molnar <mingo@elte.hu>
CC: Tejun Heo <tj@kernel.org>
CC: Christoph Lameter <cl@linux-foundation.org>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org
CC: linux-arch@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-06-10 23:45:51 +04:00
|
|
|
void *bhptr;
|
2010-07-01 00:31:19 +04:00
|
|
|
struct u64_stats_sync *syncp;
|
snmp: reduce percpu needs by 50%
SNMP mibs use two percpu arrays, one used in BH context, another in USER
context. With increasing number of cpus in machines, and fact that ipv6
uses per network device ipstats_mib, this is consuming a lot of memory
if many network devices are registered.
commit be281e554e2a (ipv6: reduce per device ICMP mib sizes) shrinked
percpu needs for ipv6, but we can reduce memory use a bit more.
With recent percpu infrastructure (irqsafe_cpu_inc() ...), we no longer
need this BH/USER separation since we can update counters in a single
x86 instruction, regardless of the BH/USER context.
Other arches than x86 might need to disable irq in their
irqsafe_cpu_inc() implementation : If this happens to be a problem, we
can make SNMP_ARRAY_SZ arch dependent, but a previous poll
( https://lkml.org/lkml/2011/3/17/174 ) to arch maintainers did not
raise strong opposition.
Only on 32bit arches, we need to disable BH for 64bit counters updates
done from USER context (currently used for IP MIB)
This also reduces vmlinux size :
1) x86_64 build
$ size vmlinux.before vmlinux.after
text data bss dec hex filename
7853650 1293772 1896448 11043870 a8841e vmlinux.before
7850578 1293772 1896448 11040798 a8781e vmlinux.after
2) i386 build
$ size vmlinux.before vmlinux.afterpatch
text data bss dec hex filename
6039335 635076 3670016 10344427 9dd7eb vmlinux.before
6037342 635076 3670016 10342434 9dd022 vmlinux.afterpatch
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Andi Kleen <andi@firstfloor.org>
CC: Ingo Molnar <mingo@elte.hu>
CC: Tejun Heo <tj@kernel.org>
CC: Christoph Lameter <cl@linux-foundation.org>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org
CC: linux-arch@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-06-10 23:45:51 +04:00
|
|
|
u64 v;
|
2010-07-01 00:31:19 +04:00
|
|
|
unsigned int start;
|
|
|
|
|
snmp: reduce percpu needs by 50%
SNMP mibs use two percpu arrays, one used in BH context, another in USER
context. With increasing number of cpus in machines, and fact that ipv6
uses per network device ipstats_mib, this is consuming a lot of memory
if many network devices are registered.
commit be281e554e2a (ipv6: reduce per device ICMP mib sizes) shrinked
percpu needs for ipv6, but we can reduce memory use a bit more.
With recent percpu infrastructure (irqsafe_cpu_inc() ...), we no longer
need this BH/USER separation since we can update counters in a single
x86 instruction, regardless of the BH/USER context.
Other arches than x86 might need to disable irq in their
irqsafe_cpu_inc() implementation : If this happens to be a problem, we
can make SNMP_ARRAY_SZ arch dependent, but a previous poll
( https://lkml.org/lkml/2011/3/17/174 ) to arch maintainers did not
raise strong opposition.
Only on 32bit arches, we need to disable BH for 64bit counters updates
done from USER context (currently used for IP MIB)
This also reduces vmlinux size :
1) x86_64 build
$ size vmlinux.before vmlinux.after
text data bss dec hex filename
7853650 1293772 1896448 11043870 a8841e vmlinux.before
7850578 1293772 1896448 11040798 a8781e vmlinux.after
2) i386 build
$ size vmlinux.before vmlinux.afterpatch
text data bss dec hex filename
6039335 635076 3670016 10344427 9dd7eb vmlinux.before
6037342 635076 3670016 10342434 9dd022 vmlinux.afterpatch
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Andi Kleen <andi@firstfloor.org>
CC: Ingo Molnar <mingo@elte.hu>
CC: Tejun Heo <tj@kernel.org>
CC: Christoph Lameter <cl@linux-foundation.org>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org
CC: linux-arch@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-06-10 23:45:51 +04:00
|
|
|
bhptr = per_cpu_ptr(mib[0], cpu);
|
2010-07-01 00:31:19 +04:00
|
|
|
syncp = (struct u64_stats_sync *)(bhptr + syncp_offset);
|
|
|
|
do {
|
|
|
|
start = u64_stats_fetch_begin_bh(syncp);
|
snmp: reduce percpu needs by 50%
SNMP mibs use two percpu arrays, one used in BH context, another in USER
context. With increasing number of cpus in machines, and fact that ipv6
uses per network device ipstats_mib, this is consuming a lot of memory
if many network devices are registered.
commit be281e554e2a (ipv6: reduce per device ICMP mib sizes) shrinked
percpu needs for ipv6, but we can reduce memory use a bit more.
With recent percpu infrastructure (irqsafe_cpu_inc() ...), we no longer
need this BH/USER separation since we can update counters in a single
x86 instruction, regardless of the BH/USER context.
Other arches than x86 might need to disable irq in their
irqsafe_cpu_inc() implementation : If this happens to be a problem, we
can make SNMP_ARRAY_SZ arch dependent, but a previous poll
( https://lkml.org/lkml/2011/3/17/174 ) to arch maintainers did not
raise strong opposition.
Only on 32bit arches, we need to disable BH for 64bit counters updates
done from USER context (currently used for IP MIB)
This also reduces vmlinux size :
1) x86_64 build
$ size vmlinux.before vmlinux.after
text data bss dec hex filename
7853650 1293772 1896448 11043870 a8841e vmlinux.before
7850578 1293772 1896448 11040798 a8781e vmlinux.after
2) i386 build
$ size vmlinux.before vmlinux.afterpatch
text data bss dec hex filename
6039335 635076 3670016 10344427 9dd7eb vmlinux.before
6037342 635076 3670016 10342434 9dd022 vmlinux.afterpatch
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Andi Kleen <andi@firstfloor.org>
CC: Ingo Molnar <mingo@elte.hu>
CC: Tejun Heo <tj@kernel.org>
CC: Christoph Lameter <cl@linux-foundation.org>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org
CC: linux-arch@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-06-10 23:45:51 +04:00
|
|
|
v = *(((u64 *) bhptr) + offt);
|
2010-07-01 00:31:19 +04:00
|
|
|
} while (u64_stats_fetch_retry_bh(syncp, start));
|
|
|
|
|
snmp: reduce percpu needs by 50%
SNMP mibs use two percpu arrays, one used in BH context, another in USER
context. With increasing number of cpus in machines, and fact that ipv6
uses per network device ipstats_mib, this is consuming a lot of memory
if many network devices are registered.
commit be281e554e2a (ipv6: reduce per device ICMP mib sizes) shrinked
percpu needs for ipv6, but we can reduce memory use a bit more.
With recent percpu infrastructure (irqsafe_cpu_inc() ...), we no longer
need this BH/USER separation since we can update counters in a single
x86 instruction, regardless of the BH/USER context.
Other arches than x86 might need to disable irq in their
irqsafe_cpu_inc() implementation : If this happens to be a problem, we
can make SNMP_ARRAY_SZ arch dependent, but a previous poll
( https://lkml.org/lkml/2011/3/17/174 ) to arch maintainers did not
raise strong opposition.
Only on 32bit arches, we need to disable BH for 64bit counters updates
done from USER context (currently used for IP MIB)
This also reduces vmlinux size :
1) x86_64 build
$ size vmlinux.before vmlinux.after
text data bss dec hex filename
7853650 1293772 1896448 11043870 a8841e vmlinux.before
7850578 1293772 1896448 11040798 a8781e vmlinux.after
2) i386 build
$ size vmlinux.before vmlinux.afterpatch
text data bss dec hex filename
6039335 635076 3670016 10344427 9dd7eb vmlinux.before
6037342 635076 3670016 10342434 9dd022 vmlinux.afterpatch
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Andi Kleen <andi@firstfloor.org>
CC: Ingo Molnar <mingo@elte.hu>
CC: Tejun Heo <tj@kernel.org>
CC: Christoph Lameter <cl@linux-foundation.org>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org
CC: linux-arch@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-06-10 23:45:51 +04:00
|
|
|
res += v;
|
2010-07-01 00:31:19 +04:00
|
|
|
}
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(snmp_fold_field64);
|
|
|
|
#endif
|
|
|
|
|
2010-06-23 00:58:41 +04:00
|
|
|
int snmp_mib_init(void __percpu *ptr[2], size_t mibsize, size_t align)
|
2007-04-25 08:53:35 +04:00
|
|
|
{
|
|
|
|
BUG_ON(ptr == NULL);
|
2010-06-23 00:58:41 +04:00
|
|
|
ptr[0] = __alloc_percpu(mibsize, align);
|
2007-04-25 08:53:35 +04:00
|
|
|
if (!ptr[0])
|
snmp: reduce percpu needs by 50%
SNMP mibs use two percpu arrays, one used in BH context, another in USER
context. With increasing number of cpus in machines, and fact that ipv6
uses per network device ipstats_mib, this is consuming a lot of memory
if many network devices are registered.
commit be281e554e2a (ipv6: reduce per device ICMP mib sizes) shrinked
percpu needs for ipv6, but we can reduce memory use a bit more.
With recent percpu infrastructure (irqsafe_cpu_inc() ...), we no longer
need this BH/USER separation since we can update counters in a single
x86 instruction, regardless of the BH/USER context.
Other arches than x86 might need to disable irq in their
irqsafe_cpu_inc() implementation : If this happens to be a problem, we
can make SNMP_ARRAY_SZ arch dependent, but a previous poll
( https://lkml.org/lkml/2011/3/17/174 ) to arch maintainers did not
raise strong opposition.
Only on 32bit arches, we need to disable BH for 64bit counters updates
done from USER context (currently used for IP MIB)
This also reduces vmlinux size :
1) x86_64 build
$ size vmlinux.before vmlinux.after
text data bss dec hex filename
7853650 1293772 1896448 11043870 a8841e vmlinux.before
7850578 1293772 1896448 11040798 a8781e vmlinux.after
2) i386 build
$ size vmlinux.before vmlinux.afterpatch
text data bss dec hex filename
6039335 635076 3670016 10344427 9dd7eb vmlinux.before
6037342 635076 3670016 10342434 9dd022 vmlinux.afterpatch
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Andi Kleen <andi@firstfloor.org>
CC: Ingo Molnar <mingo@elte.hu>
CC: Tejun Heo <tj@kernel.org>
CC: Christoph Lameter <cl@linux-foundation.org>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org
CC: linux-arch@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-06-10 23:45:51 +04:00
|
|
|
return -ENOMEM;
|
2013-10-08 02:51:58 +04:00
|
|
|
|
snmp: reduce percpu needs by 50%
SNMP mibs use two percpu arrays, one used in BH context, another in USER
context. With increasing number of cpus in machines, and fact that ipv6
uses per network device ipstats_mib, this is consuming a lot of memory
if many network devices are registered.
commit be281e554e2a (ipv6: reduce per device ICMP mib sizes) shrinked
percpu needs for ipv6, but we can reduce memory use a bit more.
With recent percpu infrastructure (irqsafe_cpu_inc() ...), we no longer
need this BH/USER separation since we can update counters in a single
x86 instruction, regardless of the BH/USER context.
Other arches than x86 might need to disable irq in their
irqsafe_cpu_inc() implementation : If this happens to be a problem, we
can make SNMP_ARRAY_SZ arch dependent, but a previous poll
( https://lkml.org/lkml/2011/3/17/174 ) to arch maintainers did not
raise strong opposition.
Only on 32bit arches, we need to disable BH for 64bit counters updates
done from USER context (currently used for IP MIB)
This also reduces vmlinux size :
1) x86_64 build
$ size vmlinux.before vmlinux.after
text data bss dec hex filename
7853650 1293772 1896448 11043870 a8841e vmlinux.before
7850578 1293772 1896448 11040798 a8781e vmlinux.after
2) i386 build
$ size vmlinux.before vmlinux.afterpatch
text data bss dec hex filename
6039335 635076 3670016 10344427 9dd7eb vmlinux.before
6037342 635076 3670016 10342434 9dd022 vmlinux.afterpatch
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Andi Kleen <andi@firstfloor.org>
CC: Ingo Molnar <mingo@elte.hu>
CC: Tejun Heo <tj@kernel.org>
CC: Christoph Lameter <cl@linux-foundation.org>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org
CC: linux-arch@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-06-10 23:45:51 +04:00
|
|
|
#if SNMP_ARRAY_SZ == 2
|
2010-06-23 00:58:41 +04:00
|
|
|
ptr[1] = __alloc_percpu(mibsize, align);
|
snmp: reduce percpu needs by 50%
SNMP mibs use two percpu arrays, one used in BH context, another in USER
context. With increasing number of cpus in machines, and fact that ipv6
uses per network device ipstats_mib, this is consuming a lot of memory
if many network devices are registered.
commit be281e554e2a (ipv6: reduce per device ICMP mib sizes) shrinked
percpu needs for ipv6, but we can reduce memory use a bit more.
With recent percpu infrastructure (irqsafe_cpu_inc() ...), we no longer
need this BH/USER separation since we can update counters in a single
x86 instruction, regardless of the BH/USER context.
Other arches than x86 might need to disable irq in their
irqsafe_cpu_inc() implementation : If this happens to be a problem, we
can make SNMP_ARRAY_SZ arch dependent, but a previous poll
( https://lkml.org/lkml/2011/3/17/174 ) to arch maintainers did not
raise strong opposition.
Only on 32bit arches, we need to disable BH for 64bit counters updates
done from USER context (currently used for IP MIB)
This also reduces vmlinux size :
1) x86_64 build
$ size vmlinux.before vmlinux.after
text data bss dec hex filename
7853650 1293772 1896448 11043870 a8841e vmlinux.before
7850578 1293772 1896448 11040798 a8781e vmlinux.after
2) i386 build
$ size vmlinux.before vmlinux.afterpatch
text data bss dec hex filename
6039335 635076 3670016 10344427 9dd7eb vmlinux.before
6037342 635076 3670016 10342434 9dd022 vmlinux.afterpatch
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Andi Kleen <andi@firstfloor.org>
CC: Ingo Molnar <mingo@elte.hu>
CC: Tejun Heo <tj@kernel.org>
CC: Christoph Lameter <cl@linux-foundation.org>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org
CC: linux-arch@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-06-10 23:45:51 +04:00
|
|
|
if (!ptr[1]) {
|
|
|
|
free_percpu(ptr[0]);
|
|
|
|
ptr[0] = NULL;
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
#endif
|
2007-04-25 08:53:35 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(snmp_mib_init);
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
#ifdef CONFIG_IP_MULTICAST
|
2009-09-14 16:21:47 +04:00
|
|
|
static const struct net_protocol igmp_protocol = {
|
2005-04-17 02:20:36 +04:00
|
|
|
.handler = igmp_rcv,
|
2008-12-26 03:42:23 +03:00
|
|
|
.netns_ok = 1,
|
2005-04-17 02:20:36 +04:00
|
|
|
};
|
|
|
|
#endif
|
|
|
|
|
2009-09-14 16:21:47 +04:00
|
|
|
static const struct net_protocol tcp_protocol = {
|
2012-06-20 08:22:05 +04:00
|
|
|
.early_demux = tcp_v4_early_demux,
|
|
|
|
.handler = tcp_v4_rcv,
|
|
|
|
.err_handler = tcp_v4_err,
|
|
|
|
.no_policy = 1,
|
|
|
|
.netns_ok = 1,
|
2014-01-09 13:01:17 +04:00
|
|
|
.icmp_strict_tag_validation = 1,
|
2005-04-17 02:20:36 +04:00
|
|
|
};
|
|
|
|
|
2009-09-14 16:21:47 +04:00
|
|
|
static const struct net_protocol udp_protocol = {
|
2013-10-07 20:01:39 +04:00
|
|
|
.early_demux = udp_v4_early_demux,
|
2005-04-17 02:20:36 +04:00
|
|
|
.handler = udp_rcv,
|
|
|
|
.err_handler = udp_err,
|
|
|
|
.no_policy = 1,
|
2008-03-25 01:34:06 +03:00
|
|
|
.netns_ok = 1,
|
2005-04-17 02:20:36 +04:00
|
|
|
};
|
|
|
|
|
2009-09-14 16:21:47 +04:00
|
|
|
static const struct net_protocol icmp_protocol = {
|
2005-04-17 02:20:36 +04:00
|
|
|
.handler = icmp_rcv,
|
2013-02-22 02:18:44 +04:00
|
|
|
.err_handler = icmp_err,
|
2007-12-12 21:44:43 +03:00
|
|
|
.no_policy = 1,
|
2008-03-25 01:34:06 +03:00
|
|
|
.netns_ok = 1,
|
2005-04-17 02:20:36 +04:00
|
|
|
};
|
|
|
|
|
2008-07-18 15:01:44 +04:00
|
|
|
static __net_init int ipv4_mib_init_net(struct net *net)
|
|
|
|
{
|
2013-10-08 02:51:58 +04:00
|
|
|
int i;
|
|
|
|
|
2010-02-16 18:20:26 +03:00
|
|
|
if (snmp_mib_init((void __percpu **)net->mib.tcp_statistics,
|
2010-06-23 00:58:41 +04:00
|
|
|
sizeof(struct tcp_mib),
|
|
|
|
__alignof__(struct tcp_mib)) < 0)
|
2008-07-18 15:02:08 +04:00
|
|
|
goto err_tcp_mib;
|
2010-02-16 18:20:26 +03:00
|
|
|
if (snmp_mib_init((void __percpu **)net->mib.ip_statistics,
|
2010-06-23 00:58:41 +04:00
|
|
|
sizeof(struct ipstats_mib),
|
|
|
|
__alignof__(struct ipstats_mib)) < 0)
|
2008-07-18 15:02:42 +04:00
|
|
|
goto err_ip_mib;
|
2013-10-08 02:51:58 +04:00
|
|
|
|
|
|
|
for_each_possible_cpu(i) {
|
|
|
|
struct ipstats_mib *af_inet_stats;
|
|
|
|
af_inet_stats = per_cpu_ptr(net->mib.ip_statistics[0], i);
|
|
|
|
u64_stats_init(&af_inet_stats->syncp);
|
|
|
|
#if SNMP_ARRAY_SZ == 2
|
|
|
|
af_inet_stats = per_cpu_ptr(net->mib.ip_statistics[1], i);
|
|
|
|
u64_stats_init(&af_inet_stats->syncp);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2010-02-16 18:20:26 +03:00
|
|
|
if (snmp_mib_init((void __percpu **)net->mib.net_statistics,
|
2010-06-23 00:58:41 +04:00
|
|
|
sizeof(struct linux_mib),
|
|
|
|
__alignof__(struct linux_mib)) < 0)
|
2008-07-18 15:03:08 +04:00
|
|
|
goto err_net_mib;
|
2010-02-16 18:20:26 +03:00
|
|
|
if (snmp_mib_init((void __percpu **)net->mib.udp_statistics,
|
2010-06-23 00:58:41 +04:00
|
|
|
sizeof(struct udp_mib),
|
|
|
|
__alignof__(struct udp_mib)) < 0)
|
2008-07-18 15:03:27 +04:00
|
|
|
goto err_udp_mib;
|
2010-02-16 18:20:26 +03:00
|
|
|
if (snmp_mib_init((void __percpu **)net->mib.udplite_statistics,
|
2010-06-23 00:58:41 +04:00
|
|
|
sizeof(struct udp_mib),
|
|
|
|
__alignof__(struct udp_mib)) < 0)
|
2008-07-18 15:03:45 +04:00
|
|
|
goto err_udplite_mib;
|
2010-02-16 18:20:26 +03:00
|
|
|
if (snmp_mib_init((void __percpu **)net->mib.icmp_statistics,
|
2010-06-23 00:58:41 +04:00
|
|
|
sizeof(struct icmp_mib),
|
|
|
|
__alignof__(struct icmp_mib)) < 0)
|
2008-07-18 15:04:02 +04:00
|
|
|
goto err_icmp_mib;
|
2011-11-08 17:04:43 +04:00
|
|
|
net->mib.icmpmsg_statistics = kzalloc(sizeof(struct icmpmsg_mib),
|
|
|
|
GFP_KERNEL);
|
|
|
|
if (!net->mib.icmpmsg_statistics)
|
2008-07-18 15:04:22 +04:00
|
|
|
goto err_icmpmsg_mib;
|
2008-07-18 15:02:08 +04:00
|
|
|
|
|
|
|
tcp_mib_init(net);
|
2008-07-18 15:01:44 +04:00
|
|
|
return 0;
|
2008-07-18 15:02:08 +04:00
|
|
|
|
2008-07-18 15:04:22 +04:00
|
|
|
err_icmpmsg_mib:
|
2010-02-16 18:20:26 +03:00
|
|
|
snmp_mib_free((void __percpu **)net->mib.icmp_statistics);
|
2008-07-18 15:04:02 +04:00
|
|
|
err_icmp_mib:
|
2010-02-16 18:20:26 +03:00
|
|
|
snmp_mib_free((void __percpu **)net->mib.udplite_statistics);
|
2008-07-18 15:03:45 +04:00
|
|
|
err_udplite_mib:
|
2010-02-16 18:20:26 +03:00
|
|
|
snmp_mib_free((void __percpu **)net->mib.udp_statistics);
|
2008-07-18 15:03:27 +04:00
|
|
|
err_udp_mib:
|
2010-02-16 18:20:26 +03:00
|
|
|
snmp_mib_free((void __percpu **)net->mib.net_statistics);
|
2008-07-18 15:03:08 +04:00
|
|
|
err_net_mib:
|
2010-02-16 18:20:26 +03:00
|
|
|
snmp_mib_free((void __percpu **)net->mib.ip_statistics);
|
2008-07-18 15:02:42 +04:00
|
|
|
err_ip_mib:
|
2010-02-16 18:20:26 +03:00
|
|
|
snmp_mib_free((void __percpu **)net->mib.tcp_statistics);
|
2008-07-18 15:02:08 +04:00
|
|
|
err_tcp_mib:
|
|
|
|
return -ENOMEM;
|
2008-07-18 15:01:44 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static __net_exit void ipv4_mib_exit_net(struct net *net)
|
|
|
|
{
|
2011-11-08 17:04:43 +04:00
|
|
|
kfree(net->mib.icmpmsg_statistics);
|
2010-02-16 18:20:26 +03:00
|
|
|
snmp_mib_free((void __percpu **)net->mib.icmp_statistics);
|
|
|
|
snmp_mib_free((void __percpu **)net->mib.udplite_statistics);
|
|
|
|
snmp_mib_free((void __percpu **)net->mib.udp_statistics);
|
|
|
|
snmp_mib_free((void __percpu **)net->mib.net_statistics);
|
|
|
|
snmp_mib_free((void __percpu **)net->mib.ip_statistics);
|
|
|
|
snmp_mib_free((void __percpu **)net->mib.tcp_statistics);
|
2008-07-18 15:01:44 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static __net_initdata struct pernet_operations ipv4_mib_ops = {
|
|
|
|
.init = ipv4_mib_init_net,
|
|
|
|
.exit = ipv4_mib_exit_net,
|
|
|
|
};
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
static int __init init_ipv4_mibs(void)
|
|
|
|
{
|
2008-07-18 15:04:51 +04:00
|
|
|
return register_pernet_subsys(&ipv4_mib_ops);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static int ipv4_proc_init(void);
|
|
|
|
|
2005-07-06 01:40:10 +04:00
|
|
|
/*
|
|
|
|
* IP protocol layer initialiser
|
|
|
|
*/
|
|
|
|
|
2012-11-15 12:49:11 +04:00
|
|
|
static struct packet_offload ip_packet_offload __read_mostly = {
|
|
|
|
.type = cpu_to_be16(ETH_P_IP),
|
2012-11-15 12:49:23 +04:00
|
|
|
.callbacks = {
|
|
|
|
.gso_send_check = inet_gso_send_check,
|
|
|
|
.gso_segment = inet_gso_segment,
|
|
|
|
.gro_receive = inet_gro_receive,
|
|
|
|
.gro_complete = inet_gro_complete,
|
|
|
|
},
|
2005-07-06 01:40:10 +04:00
|
|
|
};
|
|
|
|
|
2013-10-19 22:42:57 +04:00
|
|
|
static const struct net_offload ipip_offload = {
|
|
|
|
.callbacks = {
|
|
|
|
.gso_send_check = inet_gso_send_check,
|
|
|
|
.gso_segment = inet_gso_segment,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
2012-11-15 12:49:21 +04:00
|
|
|
static int __init ipv4_offload_init(void)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Add offloads
|
|
|
|
*/
|
2013-06-08 14:56:03 +04:00
|
|
|
if (udpv4_offload_init() < 0)
|
2012-11-15 12:49:21 +04:00
|
|
|
pr_crit("%s: Cannot add UDP protocol offload\n", __func__);
|
2013-06-07 09:11:46 +04:00
|
|
|
if (tcpv4_offload_init() < 0)
|
|
|
|
pr_crit("%s: Cannot add TCP protocol offload\n", __func__);
|
2012-11-15 12:49:21 +04:00
|
|
|
|
|
|
|
dev_add_offload(&ip_packet_offload);
|
2013-10-19 22:42:57 +04:00
|
|
|
inet_add_offload(&ipip_offload, IPPROTO_IPIP);
|
2012-11-15 12:49:21 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
fs_initcall(ipv4_offload_init);
|
|
|
|
|
|
|
|
static struct packet_type ip_packet_type __read_mostly = {
|
|
|
|
.type = cpu_to_be16(ETH_P_IP),
|
|
|
|
.func = ip_rcv,
|
|
|
|
};
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
static int __init inet_init(void)
|
|
|
|
{
|
|
|
|
struct inet_protosw *q;
|
|
|
|
struct list_head *r;
|
|
|
|
int rc = -EINVAL;
|
|
|
|
|
2013-01-09 11:19:37 +04:00
|
|
|
BUILD_BUG_ON(sizeof(struct inet_skb_parm) > FIELD_SIZEOF(struct sk_buff, cb));
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-05-05 04:27:06 +04:00
|
|
|
sysctl_local_reserved_ports = kzalloc(65536 / 8, GFP_KERNEL);
|
|
|
|
if (!sysctl_local_reserved_ports)
|
|
|
|
goto out;
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
rc = proto_register(&tcp_prot, 1);
|
|
|
|
if (rc)
|
2010-05-05 04:27:06 +04:00
|
|
|
goto out_free_reserved_ports;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
rc = proto_register(&udp_prot, 1);
|
|
|
|
if (rc)
|
|
|
|
goto out_unregister_tcp_proto;
|
|
|
|
|
|
|
|
rc = proto_register(&raw_prot, 1);
|
|
|
|
if (rc)
|
|
|
|
goto out_unregister_udp_proto;
|
|
|
|
|
net: ipv4: add IPPROTO_ICMP socket kind
This patch adds IPPROTO_ICMP socket kind. It makes it possible to send
ICMP_ECHO messages and receive the corresponding ICMP_ECHOREPLY messages
without any special privileges. In other words, the patch makes it
possible to implement setuid-less and CAP_NET_RAW-less /bin/ping. In
order not to increase the kernel's attack surface, the new functionality
is disabled by default, but is enabled at bootup by supporting Linux
distributions, optionally with restriction to a group or a group range
(see below).
Similar functionality is implemented in Mac OS X:
http://www.manpagez.com/man/4/icmp/
A new ping socket is created with
socket(PF_INET, SOCK_DGRAM, PROT_ICMP)
Message identifiers (octets 4-5 of ICMP header) are interpreted as local
ports. Addresses are stored in struct sockaddr_in. No port numbers are
reserved for privileged processes, port 0 is reserved for API ("let the
kernel pick a free number"). There is no notion of remote ports, remote
port numbers provided by the user (e.g. in connect()) are ignored.
Data sent and received include ICMP headers. This is deliberate to:
1) Avoid the need to transport headers values like sequence numbers by
other means.
2) Make it easier to port existing programs using raw sockets.
ICMP headers given to send() are checked and sanitized. The type must be
ICMP_ECHO and the code must be zero (future extensions might relax this,
see below). The id is set to the number (local port) of the socket, the
checksum is always recomputed.
ICMP reply packets received from the network are demultiplexed according
to their id's, and are returned by recv() without any modifications.
IP header information and ICMP errors of those packets may be obtained
via ancillary data (IP_RECVTTL, IP_RETOPTS, and IP_RECVERR). ICMP source
quenches and redirects are reported as fake errors via the error queue
(IP_RECVERR); the next hop address for redirects is saved to ee_info (in
network order).
socket(2) is restricted to the group range specified in
"/proc/sys/net/ipv4/ping_group_range". It is "1 0" by default, meaning
that nobody (not even root) may create ping sockets. Setting it to "100
100" would grant permissions to the single group (to either make
/sbin/ping g+s and owned by this group or to grant permissions to the
"netadmins" group), "0 4294967295" would enable it for the world, "100
4294967295" would enable it for the users, but not daemons.
The existing code might be (in the unlikely case anyone needs it)
extended rather easily to handle other similar pairs of ICMP messages
(Timestamp/Reply, Information Request/Reply, Address Mask Request/Reply
etc.).
Userspace ping util & patch for it:
http://openwall.info/wiki/people/segoon/ping
For Openwall GNU/*/Linux it was the last step on the road to the
setuid-less distro. A revision of this patch (for RHEL5/OpenVZ kernels)
is in use in Owl-current, such as in the 2011/03/12 LiveCD ISOs:
http://mirrors.kernel.org/openwall/Owl/current/iso/
Initially this functionality was written by Pavel Kankovsky for
Linux 2.4.32, but unfortunately it was never made public.
All ping options (-b, -p, -Q, -R, -s, -t, -T, -M, -I), are tested with
the patch.
PATCH v3:
- switched to flowi4.
- minor changes to be consistent with raw sockets code.
PATCH v2:
- changed ping_debug() to pr_debug().
- removed CONFIG_IP_PING.
- removed ping_seq_fops.owner field (unused for procfs).
- switched to proc_net_fops_create().
- switched to %pK in seq_printf().
PATCH v1:
- fixed checksumming bug.
- CAP_NET_RAW may not create icmp sockets anymore.
RFC v2:
- minor cleanups.
- introduced sysctl'able group range to restrict socket(2).
Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-05-13 14:01:00 +04:00
|
|
|
rc = proto_register(&ping_prot, 1);
|
|
|
|
if (rc)
|
|
|
|
goto out_unregister_raw_proto;
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/*
|
2007-02-09 17:24:47 +03:00
|
|
|
* Tell SOCKET that we are alive...
|
2005-04-17 02:20:36 +04:00
|
|
|
*/
|
|
|
|
|
2007-02-09 17:24:47 +03:00
|
|
|
(void)sock_register(&inet_family_ops);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2008-07-16 00:00:59 +04:00
|
|
|
#ifdef CONFIG_SYSCTL
|
|
|
|
ip_static_sysctl_init();
|
|
|
|
#endif
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/*
|
|
|
|
* Add all the base protocols.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (inet_add_protocol(&icmp_protocol, IPPROTO_ICMP) < 0)
|
2012-03-11 22:36:11 +04:00
|
|
|
pr_crit("%s: Cannot add ICMP protocol\n", __func__);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (inet_add_protocol(&udp_protocol, IPPROTO_UDP) < 0)
|
2012-03-11 22:36:11 +04:00
|
|
|
pr_crit("%s: Cannot add UDP protocol\n", __func__);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (inet_add_protocol(&tcp_protocol, IPPROTO_TCP) < 0)
|
2012-03-11 22:36:11 +04:00
|
|
|
pr_crit("%s: Cannot add TCP protocol\n", __func__);
|
2005-04-17 02:20:36 +04:00
|
|
|
#ifdef CONFIG_IP_MULTICAST
|
|
|
|
if (inet_add_protocol(&igmp_protocol, IPPROTO_IGMP) < 0)
|
2012-03-11 22:36:11 +04:00
|
|
|
pr_crit("%s: Cannot add IGMP protocol\n", __func__);
|
2005-04-17 02:20:36 +04:00
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Register the socket-side information for inet_create. */
|
|
|
|
for (r = &inetsw[0]; r < &inetsw[SOCK_MAX]; ++r)
|
|
|
|
INIT_LIST_HEAD(r);
|
|
|
|
|
|
|
|
for (q = inetsw_array; q < &inetsw_array[INETSW_ARRAY_LEN]; ++q)
|
|
|
|
inet_register_protosw(q);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Set the ARP module up
|
|
|
|
*/
|
|
|
|
|
|
|
|
arp_init();
|
|
|
|
|
2007-02-09 17:24:47 +03:00
|
|
|
/*
|
|
|
|
* Set the IP module up
|
|
|
|
*/
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
ip_init();
|
|
|
|
|
2008-02-29 22:13:15 +03:00
|
|
|
tcp_v4_init();
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/* Setup TCP slab cache for open requests. */
|
|
|
|
tcp_init();
|
|
|
|
|
2007-12-31 11:29:24 +03:00
|
|
|
/* Setup UDP memory threshold */
|
|
|
|
udp_init();
|
|
|
|
|
2006-11-27 22:10:57 +03:00
|
|
|
/* Add UDP-Lite (RFC 3828) */
|
|
|
|
udplite4_register();
|
2005-04-17 02:20:36 +04:00
|
|
|
|
net: ipv4: add IPPROTO_ICMP socket kind
This patch adds IPPROTO_ICMP socket kind. It makes it possible to send
ICMP_ECHO messages and receive the corresponding ICMP_ECHOREPLY messages
without any special privileges. In other words, the patch makes it
possible to implement setuid-less and CAP_NET_RAW-less /bin/ping. In
order not to increase the kernel's attack surface, the new functionality
is disabled by default, but is enabled at bootup by supporting Linux
distributions, optionally with restriction to a group or a group range
(see below).
Similar functionality is implemented in Mac OS X:
http://www.manpagez.com/man/4/icmp/
A new ping socket is created with
socket(PF_INET, SOCK_DGRAM, PROT_ICMP)
Message identifiers (octets 4-5 of ICMP header) are interpreted as local
ports. Addresses are stored in struct sockaddr_in. No port numbers are
reserved for privileged processes, port 0 is reserved for API ("let the
kernel pick a free number"). There is no notion of remote ports, remote
port numbers provided by the user (e.g. in connect()) are ignored.
Data sent and received include ICMP headers. This is deliberate to:
1) Avoid the need to transport headers values like sequence numbers by
other means.
2) Make it easier to port existing programs using raw sockets.
ICMP headers given to send() are checked and sanitized. The type must be
ICMP_ECHO and the code must be zero (future extensions might relax this,
see below). The id is set to the number (local port) of the socket, the
checksum is always recomputed.
ICMP reply packets received from the network are demultiplexed according
to their id's, and are returned by recv() without any modifications.
IP header information and ICMP errors of those packets may be obtained
via ancillary data (IP_RECVTTL, IP_RETOPTS, and IP_RECVERR). ICMP source
quenches and redirects are reported as fake errors via the error queue
(IP_RECVERR); the next hop address for redirects is saved to ee_info (in
network order).
socket(2) is restricted to the group range specified in
"/proc/sys/net/ipv4/ping_group_range". It is "1 0" by default, meaning
that nobody (not even root) may create ping sockets. Setting it to "100
100" would grant permissions to the single group (to either make
/sbin/ping g+s and owned by this group or to grant permissions to the
"netadmins" group), "0 4294967295" would enable it for the world, "100
4294967295" would enable it for the users, but not daemons.
The existing code might be (in the unlikely case anyone needs it)
extended rather easily to handle other similar pairs of ICMP messages
(Timestamp/Reply, Information Request/Reply, Address Mask Request/Reply
etc.).
Userspace ping util & patch for it:
http://openwall.info/wiki/people/segoon/ping
For Openwall GNU/*/Linux it was the last step on the road to the
setuid-less distro. A revision of this patch (for RHEL5/OpenVZ kernels)
is in use in Owl-current, such as in the 2011/03/12 LiveCD ISOs:
http://mirrors.kernel.org/openwall/Owl/current/iso/
Initially this functionality was written by Pavel Kankovsky for
Linux 2.4.32, but unfortunately it was never made public.
All ping options (-b, -p, -Q, -R, -s, -t, -T, -M, -I), are tested with
the patch.
PATCH v3:
- switched to flowi4.
- minor changes to be consistent with raw sockets code.
PATCH v2:
- changed ping_debug() to pr_debug().
- removed CONFIG_IP_PING.
- removed ping_seq_fops.owner field (unused for procfs).
- switched to proc_net_fops_create().
- switched to %pK in seq_printf().
PATCH v1:
- fixed checksumming bug.
- CAP_NET_RAW may not create icmp sockets anymore.
RFC v2:
- minor cleanups.
- introduced sysctl'able group range to restrict socket(2).
Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-05-13 14:01:00 +04:00
|
|
|
ping_init();
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/*
|
|
|
|
* Set the ICMP layer up
|
|
|
|
*/
|
|
|
|
|
2008-02-29 22:14:50 +03:00
|
|
|
if (icmp_init() < 0)
|
|
|
|
panic("Failed to create the ICMP control socket.\n");
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Initialise the multicast router
|
|
|
|
*/
|
|
|
|
#if defined(CONFIG_IP_MROUTE)
|
2008-07-03 08:13:36 +04:00
|
|
|
if (ip_mr_init())
|
2012-03-11 22:36:11 +04:00
|
|
|
pr_crit("%s: Cannot init ipv4 mroute\n", __func__);
|
2005-04-17 02:20:36 +04:00
|
|
|
#endif
|
|
|
|
/*
|
|
|
|
* Initialise per-cpu ipv4 mibs
|
2007-02-09 17:24:47 +03:00
|
|
|
*/
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2007-03-09 07:44:43 +03:00
|
|
|
if (init_ipv4_mibs())
|
2012-03-11 22:36:11 +04:00
|
|
|
pr_crit("%s: Cannot init ipv4 mibs\n", __func__);
|
2007-02-09 17:24:47 +03:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
ipv4_proc_init();
|
|
|
|
|
|
|
|
ipfrag_init();
|
|
|
|
|
2005-07-06 01:40:10 +04:00
|
|
|
dev_add_pack(&ip_packet_type);
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
rc = 0;
|
|
|
|
out:
|
|
|
|
return rc;
|
net: ipv4: add IPPROTO_ICMP socket kind
This patch adds IPPROTO_ICMP socket kind. It makes it possible to send
ICMP_ECHO messages and receive the corresponding ICMP_ECHOREPLY messages
without any special privileges. In other words, the patch makes it
possible to implement setuid-less and CAP_NET_RAW-less /bin/ping. In
order not to increase the kernel's attack surface, the new functionality
is disabled by default, but is enabled at bootup by supporting Linux
distributions, optionally with restriction to a group or a group range
(see below).
Similar functionality is implemented in Mac OS X:
http://www.manpagez.com/man/4/icmp/
A new ping socket is created with
socket(PF_INET, SOCK_DGRAM, PROT_ICMP)
Message identifiers (octets 4-5 of ICMP header) are interpreted as local
ports. Addresses are stored in struct sockaddr_in. No port numbers are
reserved for privileged processes, port 0 is reserved for API ("let the
kernel pick a free number"). There is no notion of remote ports, remote
port numbers provided by the user (e.g. in connect()) are ignored.
Data sent and received include ICMP headers. This is deliberate to:
1) Avoid the need to transport headers values like sequence numbers by
other means.
2) Make it easier to port existing programs using raw sockets.
ICMP headers given to send() are checked and sanitized. The type must be
ICMP_ECHO and the code must be zero (future extensions might relax this,
see below). The id is set to the number (local port) of the socket, the
checksum is always recomputed.
ICMP reply packets received from the network are demultiplexed according
to their id's, and are returned by recv() without any modifications.
IP header information and ICMP errors of those packets may be obtained
via ancillary data (IP_RECVTTL, IP_RETOPTS, and IP_RECVERR). ICMP source
quenches and redirects are reported as fake errors via the error queue
(IP_RECVERR); the next hop address for redirects is saved to ee_info (in
network order).
socket(2) is restricted to the group range specified in
"/proc/sys/net/ipv4/ping_group_range". It is "1 0" by default, meaning
that nobody (not even root) may create ping sockets. Setting it to "100
100" would grant permissions to the single group (to either make
/sbin/ping g+s and owned by this group or to grant permissions to the
"netadmins" group), "0 4294967295" would enable it for the world, "100
4294967295" would enable it for the users, but not daemons.
The existing code might be (in the unlikely case anyone needs it)
extended rather easily to handle other similar pairs of ICMP messages
(Timestamp/Reply, Information Request/Reply, Address Mask Request/Reply
etc.).
Userspace ping util & patch for it:
http://openwall.info/wiki/people/segoon/ping
For Openwall GNU/*/Linux it was the last step on the road to the
setuid-less distro. A revision of this patch (for RHEL5/OpenVZ kernels)
is in use in Owl-current, such as in the 2011/03/12 LiveCD ISOs:
http://mirrors.kernel.org/openwall/Owl/current/iso/
Initially this functionality was written by Pavel Kankovsky for
Linux 2.4.32, but unfortunately it was never made public.
All ping options (-b, -p, -Q, -R, -s, -t, -T, -M, -I), are tested with
the patch.
PATCH v3:
- switched to flowi4.
- minor changes to be consistent with raw sockets code.
PATCH v2:
- changed ping_debug() to pr_debug().
- removed CONFIG_IP_PING.
- removed ping_seq_fops.owner field (unused for procfs).
- switched to proc_net_fops_create().
- switched to %pK in seq_printf().
PATCH v1:
- fixed checksumming bug.
- CAP_NET_RAW may not create icmp sockets anymore.
RFC v2:
- minor cleanups.
- introduced sysctl'able group range to restrict socket(2).
Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-05-13 14:01:00 +04:00
|
|
|
out_unregister_raw_proto:
|
|
|
|
proto_unregister(&raw_prot);
|
2005-04-17 02:20:36 +04:00
|
|
|
out_unregister_udp_proto:
|
|
|
|
proto_unregister(&udp_prot);
|
2006-09-28 03:33:45 +04:00
|
|
|
out_unregister_tcp_proto:
|
|
|
|
proto_unregister(&tcp_prot);
|
2010-05-05 04:27:06 +04:00
|
|
|
out_free_reserved_ports:
|
|
|
|
kfree(sysctl_local_reserved_ports);
|
2005-04-17 02:20:36 +04:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2006-04-29 02:19:17 +04:00
|
|
|
fs_initcall(inet_init);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/* ------------------------------------------------------------------------ */
|
|
|
|
|
|
|
|
#ifdef CONFIG_PROC_FS
|
|
|
|
static int __init ipv4_proc_init(void)
|
|
|
|
{
|
|
|
|
int rc = 0;
|
|
|
|
|
|
|
|
if (raw_proc_init())
|
|
|
|
goto out_raw;
|
|
|
|
if (tcp4_proc_init())
|
|
|
|
goto out_tcp;
|
|
|
|
if (udp4_proc_init())
|
|
|
|
goto out_udp;
|
net: ipv4: add IPPROTO_ICMP socket kind
This patch adds IPPROTO_ICMP socket kind. It makes it possible to send
ICMP_ECHO messages and receive the corresponding ICMP_ECHOREPLY messages
without any special privileges. In other words, the patch makes it
possible to implement setuid-less and CAP_NET_RAW-less /bin/ping. In
order not to increase the kernel's attack surface, the new functionality
is disabled by default, but is enabled at bootup by supporting Linux
distributions, optionally with restriction to a group or a group range
(see below).
Similar functionality is implemented in Mac OS X:
http://www.manpagez.com/man/4/icmp/
A new ping socket is created with
socket(PF_INET, SOCK_DGRAM, PROT_ICMP)
Message identifiers (octets 4-5 of ICMP header) are interpreted as local
ports. Addresses are stored in struct sockaddr_in. No port numbers are
reserved for privileged processes, port 0 is reserved for API ("let the
kernel pick a free number"). There is no notion of remote ports, remote
port numbers provided by the user (e.g. in connect()) are ignored.
Data sent and received include ICMP headers. This is deliberate to:
1) Avoid the need to transport headers values like sequence numbers by
other means.
2) Make it easier to port existing programs using raw sockets.
ICMP headers given to send() are checked and sanitized. The type must be
ICMP_ECHO and the code must be zero (future extensions might relax this,
see below). The id is set to the number (local port) of the socket, the
checksum is always recomputed.
ICMP reply packets received from the network are demultiplexed according
to their id's, and are returned by recv() without any modifications.
IP header information and ICMP errors of those packets may be obtained
via ancillary data (IP_RECVTTL, IP_RETOPTS, and IP_RECVERR). ICMP source
quenches and redirects are reported as fake errors via the error queue
(IP_RECVERR); the next hop address for redirects is saved to ee_info (in
network order).
socket(2) is restricted to the group range specified in
"/proc/sys/net/ipv4/ping_group_range". It is "1 0" by default, meaning
that nobody (not even root) may create ping sockets. Setting it to "100
100" would grant permissions to the single group (to either make
/sbin/ping g+s and owned by this group or to grant permissions to the
"netadmins" group), "0 4294967295" would enable it for the world, "100
4294967295" would enable it for the users, but not daemons.
The existing code might be (in the unlikely case anyone needs it)
extended rather easily to handle other similar pairs of ICMP messages
(Timestamp/Reply, Information Request/Reply, Address Mask Request/Reply
etc.).
Userspace ping util & patch for it:
http://openwall.info/wiki/people/segoon/ping
For Openwall GNU/*/Linux it was the last step on the road to the
setuid-less distro. A revision of this patch (for RHEL5/OpenVZ kernels)
is in use in Owl-current, such as in the 2011/03/12 LiveCD ISOs:
http://mirrors.kernel.org/openwall/Owl/current/iso/
Initially this functionality was written by Pavel Kankovsky for
Linux 2.4.32, but unfortunately it was never made public.
All ping options (-b, -p, -Q, -R, -s, -t, -T, -M, -I), are tested with
the patch.
PATCH v3:
- switched to flowi4.
- minor changes to be consistent with raw sockets code.
PATCH v2:
- changed ping_debug() to pr_debug().
- removed CONFIG_IP_PING.
- removed ping_seq_fops.owner field (unused for procfs).
- switched to proc_net_fops_create().
- switched to %pK in seq_printf().
PATCH v1:
- fixed checksumming bug.
- CAP_NET_RAW may not create icmp sockets anymore.
RFC v2:
- minor cleanups.
- introduced sysctl'able group range to restrict socket(2).
Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-05-13 14:01:00 +04:00
|
|
|
if (ping_proc_init())
|
|
|
|
goto out_ping;
|
2005-04-17 02:20:36 +04:00
|
|
|
if (ip_misc_proc_init())
|
|
|
|
goto out_misc;
|
|
|
|
out:
|
|
|
|
return rc;
|
|
|
|
out_misc:
|
net: ipv4: add IPPROTO_ICMP socket kind
This patch adds IPPROTO_ICMP socket kind. It makes it possible to send
ICMP_ECHO messages and receive the corresponding ICMP_ECHOREPLY messages
without any special privileges. In other words, the patch makes it
possible to implement setuid-less and CAP_NET_RAW-less /bin/ping. In
order not to increase the kernel's attack surface, the new functionality
is disabled by default, but is enabled at bootup by supporting Linux
distributions, optionally with restriction to a group or a group range
(see below).
Similar functionality is implemented in Mac OS X:
http://www.manpagez.com/man/4/icmp/
A new ping socket is created with
socket(PF_INET, SOCK_DGRAM, PROT_ICMP)
Message identifiers (octets 4-5 of ICMP header) are interpreted as local
ports. Addresses are stored in struct sockaddr_in. No port numbers are
reserved for privileged processes, port 0 is reserved for API ("let the
kernel pick a free number"). There is no notion of remote ports, remote
port numbers provided by the user (e.g. in connect()) are ignored.
Data sent and received include ICMP headers. This is deliberate to:
1) Avoid the need to transport headers values like sequence numbers by
other means.
2) Make it easier to port existing programs using raw sockets.
ICMP headers given to send() are checked and sanitized. The type must be
ICMP_ECHO and the code must be zero (future extensions might relax this,
see below). The id is set to the number (local port) of the socket, the
checksum is always recomputed.
ICMP reply packets received from the network are demultiplexed according
to their id's, and are returned by recv() without any modifications.
IP header information and ICMP errors of those packets may be obtained
via ancillary data (IP_RECVTTL, IP_RETOPTS, and IP_RECVERR). ICMP source
quenches and redirects are reported as fake errors via the error queue
(IP_RECVERR); the next hop address for redirects is saved to ee_info (in
network order).
socket(2) is restricted to the group range specified in
"/proc/sys/net/ipv4/ping_group_range". It is "1 0" by default, meaning
that nobody (not even root) may create ping sockets. Setting it to "100
100" would grant permissions to the single group (to either make
/sbin/ping g+s and owned by this group or to grant permissions to the
"netadmins" group), "0 4294967295" would enable it for the world, "100
4294967295" would enable it for the users, but not daemons.
The existing code might be (in the unlikely case anyone needs it)
extended rather easily to handle other similar pairs of ICMP messages
(Timestamp/Reply, Information Request/Reply, Address Mask Request/Reply
etc.).
Userspace ping util & patch for it:
http://openwall.info/wiki/people/segoon/ping
For Openwall GNU/*/Linux it was the last step on the road to the
setuid-less distro. A revision of this patch (for RHEL5/OpenVZ kernels)
is in use in Owl-current, such as in the 2011/03/12 LiveCD ISOs:
http://mirrors.kernel.org/openwall/Owl/current/iso/
Initially this functionality was written by Pavel Kankovsky for
Linux 2.4.32, but unfortunately it was never made public.
All ping options (-b, -p, -Q, -R, -s, -t, -T, -M, -I), are tested with
the patch.
PATCH v3:
- switched to flowi4.
- minor changes to be consistent with raw sockets code.
PATCH v2:
- changed ping_debug() to pr_debug().
- removed CONFIG_IP_PING.
- removed ping_seq_fops.owner field (unused for procfs).
- switched to proc_net_fops_create().
- switched to %pK in seq_printf().
PATCH v1:
- fixed checksumming bug.
- CAP_NET_RAW may not create icmp sockets anymore.
RFC v2:
- minor cleanups.
- introduced sysctl'able group range to restrict socket(2).
Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-05-13 14:01:00 +04:00
|
|
|
ping_proc_exit();
|
|
|
|
out_ping:
|
2005-04-17 02:20:36 +04:00
|
|
|
udp4_proc_exit();
|
|
|
|
out_udp:
|
|
|
|
tcp4_proc_exit();
|
|
|
|
out_tcp:
|
|
|
|
raw_proc_exit();
|
|
|
|
out_raw:
|
|
|
|
rc = -ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
#else /* CONFIG_PROC_FS */
|
|
|
|
static int __init ipv4_proc_init(void)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_PROC_FS */
|
|
|
|
|
|
|
|
MODULE_ALIAS_NETPROTO(PF_INET);
|
|
|
|
|