2005-12-14 08:15:24 +01: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.
|
|
|
|
*
|
|
|
|
* Support for INET6 connection oriented protocols.
|
|
|
|
*
|
|
|
|
* Authors: See the TCPv6 sources
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/in6.h>
|
|
|
|
#include <linux/ipv6.h>
|
|
|
|
#include <linux/jhash.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 09:04:11 +01:00
|
|
|
#include <linux/slab.h>
|
2005-12-14 08:15:24 +01:00
|
|
|
|
|
|
|
#include <net/addrconf.h>
|
|
|
|
#include <net/inet_connection_sock.h>
|
2005-12-14 08:22:54 +01:00
|
|
|
#include <net/inet_ecn.h>
|
|
|
|
#include <net/inet_hashtables.h>
|
|
|
|
#include <net/ip6_route.h>
|
2005-12-14 08:15:24 +01:00
|
|
|
#include <net/sock.h>
|
2006-01-07 22:24:25 +01:00
|
|
|
#include <net/inet6_connection_sock.h>
|
2005-12-14 08:15:24 +01:00
|
|
|
|
2005-12-14 08:22:54 +01:00
|
|
|
int inet6_csk_bind_conflict(const struct sock *sk,
|
tcp: bind() use stronger condition for bind_conflict
We must try harder to get unique (addr, port) pairs when
doing port autoselection for sockets with SO_REUSEADDR
option set.
We achieve this by adding a relaxation parameter to
inet_csk_bind_conflict. When 'relax' parameter is off
we return a conflict whenever the current searched
pair (addr, port) is not unique.
This tries to address the problems reported in patch:
8d238b25b1ec22a73b1c2206f111df2faaff8285
Revert "tcp: bind() fix when many ports are bound"
Tests where ran for creating and binding(0) many sockets
on 100 IPs. The results are, on average:
* 60000 sockets, 600 ports / IP:
* 0.210 s, 620 (IP, port) duplicates without patch
* 0.219 s, no duplicates with patch
* 100000 sockets, 1000 ports / IP:
* 0.371 s, 1720 duplicates without patch
* 0.373 s, no duplicates with patch
* 200000 sockets, 2000 ports / IP:
* 0.766 s, 6900 duplicates without patch
* 0.768 s, no duplicates with patch
* 500000 sockets, 5000 ports / IP:
* 2.227 s, 41500 duplicates without patch
* 2.284 s, no duplicates with patch
Signed-off-by: Alex Copot <alex.mihai.c@gmail.com>
Signed-off-by: Daniel Baluta <dbaluta@ixiacom.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-04-13 00:21:45 +02:00
|
|
|
const struct inet_bind_bucket *tb, bool relax)
|
2005-12-14 08:22:54 +01:00
|
|
|
{
|
|
|
|
const struct sock *sk2;
|
2013-01-22 10:50:39 +01:00
|
|
|
int reuse = sk->sk_reuse;
|
|
|
|
int reuseport = sk->sk_reuseport;
|
2013-01-29 03:16:18 +01:00
|
|
|
kuid_t uid = sock_i_uid((struct sock *)sk);
|
2005-12-14 08:22:54 +01:00
|
|
|
|
|
|
|
/* We must walk the whole port owner list in this case. -DaveM */
|
2008-04-14 11:42:27 +02:00
|
|
|
/*
|
|
|
|
* See comment in inet_csk_bind_conflict about sock lookup
|
|
|
|
* vs net namespaces issues.
|
|
|
|
*/
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 02:06:00 +01:00
|
|
|
sk_for_each_bound(sk2, &tb->owners) {
|
2005-12-14 08:22:54 +01:00
|
|
|
if (sk != sk2 &&
|
|
|
|
(!sk->sk_bound_dev_if ||
|
|
|
|
!sk2->sk_bound_dev_if ||
|
2013-01-22 10:50:39 +01:00
|
|
|
sk->sk_bound_dev_if == sk2->sk_bound_dev_if)) {
|
|
|
|
if ((!reuse || !sk2->sk_reuse ||
|
|
|
|
sk2->sk_state == TCP_LISTEN) &&
|
|
|
|
(!reuseport || !sk2->sk_reuseport ||
|
|
|
|
(sk2->sk_state != TCP_TIME_WAIT &&
|
|
|
|
!uid_eq(uid,
|
|
|
|
sock_i_uid((struct sock *)sk2))))) {
|
|
|
|
if (ipv6_rcv_saddr_equal(sk, sk2))
|
|
|
|
break;
|
|
|
|
}
|
2013-03-05 09:11:01 +01:00
|
|
|
if (!relax && reuse && sk2->sk_reuse &&
|
|
|
|
sk2->sk_state != TCP_LISTEN &&
|
|
|
|
ipv6_rcv_saddr_equal(sk, sk2))
|
|
|
|
break;
|
2013-01-22 10:50:39 +01:00
|
|
|
}
|
2005-12-14 08:22:54 +01:00
|
|
|
}
|
|
|
|
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 02:06:00 +01:00
|
|
|
return sk2 != NULL;
|
2005-12-14 08:22:54 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL_GPL(inet6_csk_bind_conflict);
|
|
|
|
|
2010-12-02 19:59:22 +01:00
|
|
|
struct dst_entry *inet6_csk_route_req(struct sock *sk,
|
2012-06-28 14:34:19 +02:00
|
|
|
struct flowi6 *fl6,
|
2010-12-02 19:59:22 +01:00
|
|
|
const struct request_sock *req)
|
|
|
|
{
|
2013-10-10 00:21:29 +02:00
|
|
|
struct inet_request_sock *ireq = inet_rsk(req);
|
2010-12-02 19:59:22 +01:00
|
|
|
struct ipv6_pinfo *np = inet6_sk(sk);
|
|
|
|
struct in6_addr *final_p, final;
|
|
|
|
struct dst_entry *dst;
|
2011-03-12 22:22:43 +01:00
|
|
|
|
2012-06-28 14:34:19 +02:00
|
|
|
memset(fl6, 0, sizeof(*fl6));
|
|
|
|
fl6->flowi6_proto = IPPROTO_TCP;
|
2013-10-10 00:21:29 +02:00
|
|
|
fl6->daddr = ireq->ir_v6_rmt_addr;
|
2012-06-28 14:34:19 +02:00
|
|
|
final_p = fl6_update_dst(fl6, np->opt, &final);
|
2013-10-10 00:21:29 +02:00
|
|
|
fl6->saddr = ireq->ir_v6_loc_addr;
|
|
|
|
fl6->flowi6_oif = ireq->ir_iif;
|
2012-06-28 14:34:19 +02:00
|
|
|
fl6->flowi6_mark = sk->sk_mark;
|
2013-10-10 00:21:29 +02:00
|
|
|
fl6->fl6_dport = ireq->ir_rmt_port;
|
2013-10-10 09:04:37 +02:00
|
|
|
fl6->fl6_sport = htons(ireq->ir_num);
|
2012-06-28 14:34:19 +02:00
|
|
|
security_req_classify_flow(req, flowi6_to_flowi(fl6));
|
2011-03-12 22:22:43 +01:00
|
|
|
|
2013-08-28 08:04:14 +02:00
|
|
|
dst = ip6_dst_lookup_flow(sk, fl6, final_p);
|
2011-03-01 22:19:07 +01:00
|
|
|
if (IS_ERR(dst))
|
2010-12-02 19:59:22 +01:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return dst;
|
|
|
|
}
|
|
|
|
|
2005-12-14 08:15:24 +01:00
|
|
|
/*
|
|
|
|
* request_sock (formerly open request) hash tables.
|
|
|
|
*/
|
2006-11-08 09:25:41 +01:00
|
|
|
static u32 inet6_synq_hash(const struct in6_addr *raddr, const __be16 rport,
|
2011-11-23 21:49:31 +01:00
|
|
|
const u32 rnd, const u32 synq_hsize)
|
2005-12-14 08:15:24 +01:00
|
|
|
{
|
2010-11-25 04:15:07 +01:00
|
|
|
u32 c;
|
2005-12-14 08:15:24 +01:00
|
|
|
|
2010-11-25 04:15:07 +01:00
|
|
|
c = jhash_3words((__force u32)raddr->s6_addr32[0],
|
|
|
|
(__force u32)raddr->s6_addr32[1],
|
|
|
|
(__force u32)raddr->s6_addr32[2],
|
|
|
|
rnd);
|
2005-12-14 08:15:24 +01:00
|
|
|
|
2010-11-25 04:15:07 +01:00
|
|
|
c = jhash_2words((__force u32)raddr->s6_addr32[3],
|
|
|
|
(__force u32)rport,
|
|
|
|
c);
|
2005-12-14 08:15:24 +01:00
|
|
|
|
|
|
|
return c & (synq_hsize - 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
struct request_sock *inet6_csk_search_req(const struct sock *sk,
|
|
|
|
struct request_sock ***prevp,
|
2006-11-08 09:25:41 +01:00
|
|
|
const __be16 rport,
|
2005-12-14 08:15:24 +01:00
|
|
|
const struct in6_addr *raddr,
|
|
|
|
const struct in6_addr *laddr,
|
|
|
|
const int iif)
|
|
|
|
{
|
|
|
|
const struct inet_connection_sock *icsk = inet_csk(sk);
|
|
|
|
struct listen_sock *lopt = icsk->icsk_accept_queue.listen_opt;
|
|
|
|
struct request_sock *req, **prev;
|
|
|
|
|
|
|
|
for (prev = &lopt->syn_table[inet6_synq_hash(raddr, rport,
|
|
|
|
lopt->hash_rnd,
|
|
|
|
lopt->nr_table_entries)];
|
|
|
|
(req = *prev) != NULL;
|
|
|
|
prev = &req->dl_next) {
|
2013-10-10 00:21:29 +02:00
|
|
|
const struct inet_request_sock *ireq = inet_rsk(req);
|
2005-12-14 08:15:24 +01:00
|
|
|
|
2013-10-10 00:21:29 +02:00
|
|
|
if (ireq->ir_rmt_port == rport &&
|
2005-12-14 08:15:24 +01:00
|
|
|
req->rsk_ops->family == AF_INET6 &&
|
2013-10-10 00:21:29 +02:00
|
|
|
ipv6_addr_equal(&ireq->ir_v6_rmt_addr, raddr) &&
|
|
|
|
ipv6_addr_equal(&ireq->ir_v6_loc_addr, laddr) &&
|
|
|
|
(!ireq->ir_iif || ireq->ir_iif == iif)) {
|
2008-07-26 06:43:18 +02:00
|
|
|
WARN_ON(req->sk != NULL);
|
2005-12-14 08:15:24 +01:00
|
|
|
*prevp = prev;
|
|
|
|
return req;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL_GPL(inet6_csk_search_req);
|
|
|
|
|
|
|
|
void inet6_csk_reqsk_queue_hash_add(struct sock *sk,
|
|
|
|
struct request_sock *req,
|
|
|
|
const unsigned long timeout)
|
|
|
|
{
|
|
|
|
struct inet_connection_sock *icsk = inet_csk(sk);
|
|
|
|
struct listen_sock *lopt = icsk->icsk_accept_queue.listen_opt;
|
2013-10-10 00:21:29 +02:00
|
|
|
const u32 h = inet6_synq_hash(&inet_rsk(req)->ir_v6_rmt_addr,
|
|
|
|
inet_rsk(req)->ir_rmt_port,
|
2005-12-14 08:15:24 +01:00
|
|
|
lopt->hash_rnd, lopt->nr_table_entries);
|
|
|
|
|
|
|
|
reqsk_queue_hash_req(&icsk->icsk_accept_queue, h, req, timeout);
|
|
|
|
inet_csk_reqsk_queue_added(sk, timeout);
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL_GPL(inet6_csk_reqsk_queue_hash_add);
|
2005-12-14 08:22:54 +01:00
|
|
|
|
|
|
|
void inet6_csk_addr2sockaddr(struct sock *sk, struct sockaddr * uaddr)
|
|
|
|
{
|
|
|
|
struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) uaddr;
|
|
|
|
|
|
|
|
sin6->sin6_family = AF_INET6;
|
ipv6: make lookups simpler and faster
TCP listener refactoring, part 4 :
To speed up inet lookups, we moved IPv4 addresses from inet to struct
sock_common
Now is time to do the same for IPv6, because it permits us to have fast
lookups for all kind of sockets, including upcoming SYN_RECV.
Getting IPv6 addresses in TCP lookups currently requires two extra cache
lines, plus a dereference (and memory stall).
inet6_sk(sk) does the dereference of inet_sk(__sk)->pinet6
This patch is way bigger than its IPv4 counter part, because for IPv4,
we could add aliases (inet_daddr, inet_rcv_saddr), while on IPv6,
it's not doable easily.
inet6_sk(sk)->daddr becomes sk->sk_v6_daddr
inet6_sk(sk)->rcv_saddr becomes sk->sk_v6_rcv_saddr
And timewait socket also have tw->tw_v6_daddr & tw->tw_v6_rcv_saddr
at the same offset.
We get rid of INET6_TW_MATCH() as INET6_MATCH() is now the generic
macro.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-04 00:42:29 +02:00
|
|
|
sin6->sin6_addr = sk->sk_v6_daddr;
|
2009-10-15 08:30:45 +02:00
|
|
|
sin6->sin6_port = inet_sk(sk)->inet_dport;
|
2005-12-14 08:22:54 +01:00
|
|
|
/* We do not store received flowlabel for TCP */
|
|
|
|
sin6->sin6_flowinfo = 0;
|
2013-03-08 03:07:19 +01:00
|
|
|
sin6->sin6_scope_id = ipv6_iface_scope_id(&sin6->sin6_addr,
|
|
|
|
sk->sk_bound_dev_if);
|
2005-12-14 08:22:54 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL_GPL(inet6_csk_addr2sockaddr);
|
|
|
|
|
2007-09-06 12:31:25 +02:00
|
|
|
static inline
|
|
|
|
void __inet6_csk_dst_store(struct sock *sk, struct dst_entry *dst,
|
2012-07-17 23:38:04 +02:00
|
|
|
const struct in6_addr *daddr,
|
|
|
|
const struct in6_addr *saddr)
|
2007-09-06 12:31:25 +02:00
|
|
|
{
|
|
|
|
__ip6_dst_store(sk, dst, daddr, saddr);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline
|
|
|
|
struct dst_entry *__inet6_csk_dst_check(struct sock *sk, u32 cookie)
|
|
|
|
{
|
2012-09-11 00:09:46 +02:00
|
|
|
return __sk_dst_check(sk, cookie);
|
2007-09-06 12:31:25 +02:00
|
|
|
}
|
|
|
|
|
2012-07-17 23:38:04 +02:00
|
|
|
static struct dst_entry *inet6_csk_route_socket(struct sock *sk,
|
|
|
|
struct flowi6 *fl6)
|
2005-12-14 08:22:54 +01:00
|
|
|
{
|
|
|
|
struct inet_sock *inet = inet_sk(sk);
|
|
|
|
struct ipv6_pinfo *np = inet6_sk(sk);
|
2010-06-01 23:35:01 +02:00
|
|
|
struct in6_addr *final_p, final;
|
2012-07-16 12:44:56 +02:00
|
|
|
struct dst_entry *dst;
|
2005-12-14 08:22:54 +01:00
|
|
|
|
2012-07-17 23:38:04 +02:00
|
|
|
memset(fl6, 0, sizeof(*fl6));
|
|
|
|
fl6->flowi6_proto = sk->sk_protocol;
|
ipv6: make lookups simpler and faster
TCP listener refactoring, part 4 :
To speed up inet lookups, we moved IPv4 addresses from inet to struct
sock_common
Now is time to do the same for IPv6, because it permits us to have fast
lookups for all kind of sockets, including upcoming SYN_RECV.
Getting IPv6 addresses in TCP lookups currently requires two extra cache
lines, plus a dereference (and memory stall).
inet6_sk(sk) does the dereference of inet_sk(__sk)->pinet6
This patch is way bigger than its IPv4 counter part, because for IPv4,
we could add aliases (inet_daddr, inet_rcv_saddr), while on IPv6,
it's not doable easily.
inet6_sk(sk)->daddr becomes sk->sk_v6_daddr
inet6_sk(sk)->rcv_saddr becomes sk->sk_v6_rcv_saddr
And timewait socket also have tw->tw_v6_daddr & tw->tw_v6_rcv_saddr
at the same offset.
We get rid of INET6_TW_MATCH() as INET6_MATCH() is now the generic
macro.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-04 00:42:29 +02:00
|
|
|
fl6->daddr = sk->sk_v6_daddr;
|
2012-07-17 23:38:04 +02:00
|
|
|
fl6->saddr = np->saddr;
|
|
|
|
fl6->flowlabel = np->flow_label;
|
|
|
|
IP6_ECN_flow_xmit(sk, fl6->flowlabel);
|
|
|
|
fl6->flowi6_oif = sk->sk_bound_dev_if;
|
|
|
|
fl6->flowi6_mark = sk->sk_mark;
|
|
|
|
fl6->fl6_sport = inet->inet_sport;
|
|
|
|
fl6->fl6_dport = inet->inet_dport;
|
|
|
|
security_sk_classify_flow(sk, flowi6_to_flowi(fl6));
|
2005-12-14 08:22:54 +01:00
|
|
|
|
2012-07-17 23:38:04 +02:00
|
|
|
final_p = fl6_update_dst(fl6, np->opt, &final);
|
2005-12-14 08:22:54 +01:00
|
|
|
|
2007-09-06 12:31:25 +02:00
|
|
|
dst = __inet6_csk_dst_check(sk, np->dst_cookie);
|
2012-07-16 12:44:56 +02:00
|
|
|
if (!dst) {
|
2013-08-28 08:04:14 +02:00
|
|
|
dst = ip6_dst_lookup_flow(sk, fl6, final_p);
|
2005-12-14 08:22:54 +01:00
|
|
|
|
2012-07-16 12:44:56 +02:00
|
|
|
if (!IS_ERR(dst))
|
|
|
|
__inet6_csk_dst_store(sk, dst, NULL, NULL);
|
|
|
|
}
|
|
|
|
return dst;
|
|
|
|
}
|
2005-12-14 08:22:54 +01:00
|
|
|
|
2012-07-16 12:44:56 +02:00
|
|
|
int inet6_csk_xmit(struct sk_buff *skb, struct flowi *fl_unused)
|
|
|
|
{
|
|
|
|
struct sock *sk = skb->sk;
|
|
|
|
struct ipv6_pinfo *np = inet6_sk(sk);
|
|
|
|
struct flowi6 fl6;
|
|
|
|
struct dst_entry *dst;
|
|
|
|
int res;
|
|
|
|
|
2012-07-17 23:38:04 +02:00
|
|
|
dst = inet6_csk_route_socket(sk, &fl6);
|
2012-07-16 12:44:56 +02:00
|
|
|
if (IS_ERR(dst)) {
|
|
|
|
sk->sk_err_soft = -PTR_ERR(dst);
|
|
|
|
sk->sk_route_caps = 0;
|
|
|
|
kfree_skb(skb);
|
|
|
|
return PTR_ERR(dst);
|
2005-12-14 08:22:54 +01:00
|
|
|
}
|
|
|
|
|
2011-07-28 05:43:47 +02:00
|
|
|
rcu_read_lock();
|
|
|
|
skb_dst_set_noref(skb, dst);
|
2005-12-14 08:22:54 +01:00
|
|
|
|
|
|
|
/* Restore final destination back after routing done */
|
ipv6: make lookups simpler and faster
TCP listener refactoring, part 4 :
To speed up inet lookups, we moved IPv4 addresses from inet to struct
sock_common
Now is time to do the same for IPv6, because it permits us to have fast
lookups for all kind of sockets, including upcoming SYN_RECV.
Getting IPv6 addresses in TCP lookups currently requires two extra cache
lines, plus a dereference (and memory stall).
inet6_sk(sk) does the dereference of inet_sk(__sk)->pinet6
This patch is way bigger than its IPv4 counter part, because for IPv4,
we could add aliases (inet_daddr, inet_rcv_saddr), while on IPv6,
it's not doable easily.
inet6_sk(sk)->daddr becomes sk->sk_v6_daddr
inet6_sk(sk)->rcv_saddr becomes sk->sk_v6_rcv_saddr
And timewait socket also have tw->tw_v6_daddr & tw->tw_v6_rcv_saddr
at the same offset.
We get rid of INET6_TW_MATCH() as INET6_MATCH() is now the generic
macro.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-04 00:42:29 +02:00
|
|
|
fl6.daddr = sk->sk_v6_daddr;
|
2005-12-14 08:22:54 +01:00
|
|
|
|
2011-10-27 06:44:35 +02:00
|
|
|
res = ip6_xmit(sk, skb, &fl6, np->opt, np->tclass);
|
2011-07-28 05:43:47 +02:00
|
|
|
rcu_read_unlock();
|
|
|
|
return res;
|
2005-12-14 08:22:54 +01:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(inet6_csk_xmit);
|
2012-07-16 12:44:56 +02:00
|
|
|
|
|
|
|
struct dst_entry *inet6_csk_update_pmtu(struct sock *sk, u32 mtu)
|
|
|
|
{
|
2012-07-17 23:38:04 +02:00
|
|
|
struct flowi6 fl6;
|
|
|
|
struct dst_entry *dst = inet6_csk_route_socket(sk, &fl6);
|
2012-07-16 12:44:56 +02:00
|
|
|
|
|
|
|
if (IS_ERR(dst))
|
|
|
|
return NULL;
|
2012-07-17 12:29:28 +02:00
|
|
|
dst->ops->update_pmtu(dst, sk, NULL, mtu);
|
2012-07-16 12:44:56 +02:00
|
|
|
|
2012-11-20 21:14:51 +01:00
|
|
|
dst = inet6_csk_route_socket(sk, &fl6);
|
|
|
|
return IS_ERR(dst) ? NULL : dst;
|
2012-07-16 12:44:56 +02:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(inet6_csk_update_pmtu);
|