2005-04-17 06:20:36 +08: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.
|
|
|
|
*
|
|
|
|
* Implementation of the Transmission Control Protocol(TCP).
|
|
|
|
*
|
2005-05-06 07:16:16 +08:00
|
|
|
* Authors: Ross Biro
|
2005-04-17 06:20:36 +08:00
|
|
|
* Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
|
|
|
|
* Mark Evans, <evansmp@uhura.aston.ac.uk>
|
|
|
|
* Corey Minyard <wf-rch!minyard@relay.EU.net>
|
|
|
|
* Florian La Roche, <flla@stud.uni-sb.de>
|
|
|
|
* Charles Hedrick, <hedrick@klinzhai.rutgers.edu>
|
|
|
|
* Linus Torvalds, <torvalds@cs.helsinki.fi>
|
|
|
|
* Alan Cox, <gw4pts@gw4pts.ampr.org>
|
|
|
|
* Matthew Dillon, <dillon@apollo.west.oic.com>
|
|
|
|
* Arnt Gulbrandsen, <agulbra@nvg.unit.no>
|
|
|
|
* Jorge Cwik, <jorge@laser.satlink.net>
|
|
|
|
*
|
|
|
|
* Fixes:
|
|
|
|
* Alan Cox : Numerous verify_area() calls
|
|
|
|
* Alan Cox : Set the ACK bit on a reset
|
|
|
|
* Alan Cox : Stopped it crashing if it closed while
|
|
|
|
* sk->inuse=1 and was trying to connect
|
|
|
|
* (tcp_err()).
|
|
|
|
* Alan Cox : All icmp error handling was broken
|
|
|
|
* pointers passed where wrong and the
|
|
|
|
* socket was looked up backwards. Nobody
|
|
|
|
* tested any icmp error code obviously.
|
|
|
|
* Alan Cox : tcp_err() now handled properly. It
|
|
|
|
* wakes people on errors. poll
|
|
|
|
* behaves and the icmp error race
|
|
|
|
* has gone by moving it into sock.c
|
|
|
|
* Alan Cox : tcp_send_reset() fixed to work for
|
|
|
|
* everything not just packets for
|
|
|
|
* unknown sockets.
|
|
|
|
* Alan Cox : tcp option processing.
|
|
|
|
* Alan Cox : Reset tweaked (still not 100%) [Had
|
|
|
|
* syn rule wrong]
|
|
|
|
* Herp Rosmanith : More reset fixes
|
|
|
|
* Alan Cox : No longer acks invalid rst frames.
|
|
|
|
* Acking any kind of RST is right out.
|
|
|
|
* Alan Cox : Sets an ignore me flag on an rst
|
|
|
|
* receive otherwise odd bits of prattle
|
|
|
|
* escape still
|
|
|
|
* Alan Cox : Fixed another acking RST frame bug.
|
|
|
|
* Should stop LAN workplace lockups.
|
|
|
|
* Alan Cox : Some tidyups using the new skb list
|
|
|
|
* facilities
|
|
|
|
* Alan Cox : sk->keepopen now seems to work
|
|
|
|
* Alan Cox : Pulls options out correctly on accepts
|
|
|
|
* Alan Cox : Fixed assorted sk->rqueue->next errors
|
|
|
|
* Alan Cox : PSH doesn't end a TCP read. Switched a
|
|
|
|
* bit to skb ops.
|
|
|
|
* Alan Cox : Tidied tcp_data to avoid a potential
|
|
|
|
* nasty.
|
|
|
|
* Alan Cox : Added some better commenting, as the
|
|
|
|
* tcp is hard to follow
|
|
|
|
* Alan Cox : Removed incorrect check for 20 * psh
|
|
|
|
* Michael O'Reilly : ack < copied bug fix.
|
|
|
|
* Johannes Stille : Misc tcp fixes (not all in yet).
|
|
|
|
* Alan Cox : FIN with no memory -> CRASH
|
|
|
|
* Alan Cox : Added socket option proto entries.
|
|
|
|
* Also added awareness of them to accept.
|
|
|
|
* Alan Cox : Added TCP options (SOL_TCP)
|
|
|
|
* Alan Cox : Switched wakeup calls to callbacks,
|
|
|
|
* so the kernel can layer network
|
|
|
|
* sockets.
|
|
|
|
* Alan Cox : Use ip_tos/ip_ttl settings.
|
|
|
|
* Alan Cox : Handle FIN (more) properly (we hope).
|
|
|
|
* Alan Cox : RST frames sent on unsynchronised
|
|
|
|
* state ack error.
|
|
|
|
* Alan Cox : Put in missing check for SYN bit.
|
|
|
|
* Alan Cox : Added tcp_select_window() aka NET2E
|
|
|
|
* window non shrink trick.
|
|
|
|
* Alan Cox : Added a couple of small NET2E timer
|
|
|
|
* fixes
|
|
|
|
* Charles Hedrick : TCP fixes
|
|
|
|
* Toomas Tamm : TCP window fixes
|
|
|
|
* Alan Cox : Small URG fix to rlogin ^C ack fight
|
|
|
|
* Charles Hedrick : Rewrote most of it to actually work
|
|
|
|
* Linus : Rewrote tcp_read() and URG handling
|
|
|
|
* completely
|
|
|
|
* Gerhard Koerting: Fixed some missing timer handling
|
|
|
|
* Matthew Dillon : Reworked TCP machine states as per RFC
|
|
|
|
* Gerhard Koerting: PC/TCP workarounds
|
|
|
|
* Adam Caldwell : Assorted timer/timing errors
|
|
|
|
* Matthew Dillon : Fixed another RST bug
|
|
|
|
* Alan Cox : Move to kernel side addressing changes.
|
|
|
|
* Alan Cox : Beginning work on TCP fastpathing
|
|
|
|
* (not yet usable)
|
|
|
|
* Arnt Gulbrandsen: Turbocharged tcp_check() routine.
|
|
|
|
* Alan Cox : TCP fast path debugging
|
|
|
|
* Alan Cox : Window clamping
|
|
|
|
* Michael Riepe : Bug in tcp_check()
|
|
|
|
* Matt Dillon : More TCP improvements and RST bug fixes
|
|
|
|
* Matt Dillon : Yet more small nasties remove from the
|
|
|
|
* TCP code (Be very nice to this man if
|
|
|
|
* tcp finally works 100%) 8)
|
|
|
|
* Alan Cox : BSD accept semantics.
|
|
|
|
* Alan Cox : Reset on closedown bug.
|
|
|
|
* Peter De Schrijver : ENOTCONN check missing in tcp_sendto().
|
|
|
|
* Michael Pall : Handle poll() after URG properly in
|
|
|
|
* all cases.
|
|
|
|
* Michael Pall : Undo the last fix in tcp_read_urg()
|
|
|
|
* (multi URG PUSH broke rlogin).
|
|
|
|
* Michael Pall : Fix the multi URG PUSH problem in
|
|
|
|
* tcp_readable(), poll() after URG
|
|
|
|
* works now.
|
|
|
|
* Michael Pall : recv(...,MSG_OOB) never blocks in the
|
|
|
|
* BSD api.
|
|
|
|
* Alan Cox : Changed the semantics of sk->socket to
|
|
|
|
* fix a race and a signal problem with
|
|
|
|
* accept() and async I/O.
|
|
|
|
* Alan Cox : Relaxed the rules on tcp_sendto().
|
|
|
|
* Yury Shevchuk : Really fixed accept() blocking problem.
|
|
|
|
* Craig I. Hagan : Allow for BSD compatible TIME_WAIT for
|
|
|
|
* clients/servers which listen in on
|
|
|
|
* fixed ports.
|
|
|
|
* Alan Cox : Cleaned the above up and shrank it to
|
|
|
|
* a sensible code size.
|
|
|
|
* Alan Cox : Self connect lockup fix.
|
|
|
|
* Alan Cox : No connect to multicast.
|
|
|
|
* Ross Biro : Close unaccepted children on master
|
|
|
|
* socket close.
|
|
|
|
* Alan Cox : Reset tracing code.
|
|
|
|
* Alan Cox : Spurious resets on shutdown.
|
|
|
|
* Alan Cox : Giant 15 minute/60 second timer error
|
|
|
|
* Alan Cox : Small whoops in polling before an
|
|
|
|
* accept.
|
|
|
|
* Alan Cox : Kept the state trace facility since
|
|
|
|
* it's handy for debugging.
|
|
|
|
* Alan Cox : More reset handler fixes.
|
|
|
|
* Alan Cox : Started rewriting the code based on
|
|
|
|
* the RFC's for other useful protocol
|
|
|
|
* references see: Comer, KA9Q NOS, and
|
|
|
|
* for a reference on the difference
|
|
|
|
* between specifications and how BSD
|
|
|
|
* works see the 4.4lite source.
|
|
|
|
* A.N.Kuznetsov : Don't time wait on completion of tidy
|
|
|
|
* close.
|
|
|
|
* Linus Torvalds : Fin/Shutdown & copied_seq changes.
|
|
|
|
* Linus Torvalds : Fixed BSD port reuse to work first syn
|
|
|
|
* Alan Cox : Reimplemented timers as per the RFC
|
|
|
|
* and using multiple timers for sanity.
|
|
|
|
* Alan Cox : Small bug fixes, and a lot of new
|
|
|
|
* comments.
|
|
|
|
* Alan Cox : Fixed dual reader crash by locking
|
|
|
|
* the buffers (much like datagram.c)
|
|
|
|
* Alan Cox : Fixed stuck sockets in probe. A probe
|
|
|
|
* now gets fed up of retrying without
|
|
|
|
* (even a no space) answer.
|
|
|
|
* Alan Cox : Extracted closing code better
|
|
|
|
* Alan Cox : Fixed the closing state machine to
|
|
|
|
* resemble the RFC.
|
|
|
|
* Alan Cox : More 'per spec' fixes.
|
|
|
|
* Jorge Cwik : Even faster checksumming.
|
|
|
|
* Alan Cox : tcp_data() doesn't ack illegal PSH
|
|
|
|
* only frames. At least one pc tcp stack
|
|
|
|
* generates them.
|
|
|
|
* Alan Cox : Cache last socket.
|
|
|
|
* Alan Cox : Per route irtt.
|
|
|
|
* Matt Day : poll()->select() match BSD precisely on error
|
|
|
|
* Alan Cox : New buffers
|
|
|
|
* Marc Tamsky : Various sk->prot->retransmits and
|
|
|
|
* sk->retransmits misupdating fixed.
|
|
|
|
* Fixed tcp_write_timeout: stuck close,
|
|
|
|
* and TCP syn retries gets used now.
|
|
|
|
* Mark Yarvis : In tcp_read_wakeup(), don't send an
|
|
|
|
* ack if state is TCP_CLOSED.
|
|
|
|
* Alan Cox : Look up device on a retransmit - routes may
|
|
|
|
* change. Doesn't yet cope with MSS shrink right
|
|
|
|
* but it's a start!
|
|
|
|
* Marc Tamsky : Closing in closing fixes.
|
|
|
|
* Mike Shaver : RFC1122 verifications.
|
|
|
|
* Alan Cox : rcv_saddr errors.
|
|
|
|
* Alan Cox : Block double connect().
|
|
|
|
* Alan Cox : Small hooks for enSKIP.
|
|
|
|
* Alexey Kuznetsov: Path MTU discovery.
|
|
|
|
* Alan Cox : Support soft errors.
|
|
|
|
* Alan Cox : Fix MTU discovery pathological case
|
|
|
|
* when the remote claims no mtu!
|
|
|
|
* Marc Tamsky : TCP_CLOSE fix.
|
|
|
|
* Colin (G3TNE) : Send a reset on syn ack replies in
|
|
|
|
* window but wrong (fixes NT lpd problems)
|
|
|
|
* Pedro Roque : Better TCP window handling, delayed ack.
|
|
|
|
* Joerg Reuter : No modification of locked buffers in
|
|
|
|
* tcp_do_retransmit()
|
|
|
|
* Eric Schenk : Changed receiver side silly window
|
|
|
|
* avoidance algorithm to BSD style
|
|
|
|
* algorithm. This doubles throughput
|
|
|
|
* against machines running Solaris,
|
|
|
|
* and seems to result in general
|
|
|
|
* improvement.
|
|
|
|
* Stefan Magdalinski : adjusted tcp_readable() to fix FIONREAD
|
|
|
|
* Willy Konynenberg : Transparent proxying support.
|
|
|
|
* Mike McLagan : Routing by source
|
|
|
|
* Keith Owens : Do proper merging with partial SKB's in
|
|
|
|
* tcp_do_sendmsg to avoid burstiness.
|
|
|
|
* Eric Schenk : Fix fast close down bug with
|
|
|
|
* shutdown() followed by close().
|
|
|
|
* Andi Kleen : Make poll agree with SIGIO
|
|
|
|
* Salvatore Sanfilippo : Support SO_LINGER with linger == 1 and
|
|
|
|
* lingertime == 0 (RFC 793 ABORT Call)
|
|
|
|
* Hirokazu Takahashi : Use copy_from_user() instead of
|
|
|
|
* csum_and_copy_from_user() if possible.
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*
|
|
|
|
* Description of States:
|
|
|
|
*
|
|
|
|
* TCP_SYN_SENT sent a connection request, waiting for ack
|
|
|
|
*
|
|
|
|
* TCP_SYN_RECV received a connection request, sent ack,
|
|
|
|
* waiting for final ack in three-way handshake.
|
|
|
|
*
|
|
|
|
* TCP_ESTABLISHED connection established
|
|
|
|
*
|
|
|
|
* TCP_FIN_WAIT1 our side has shutdown, waiting to complete
|
|
|
|
* transmission of remaining buffered data
|
|
|
|
*
|
|
|
|
* TCP_FIN_WAIT2 all buffered data sent, waiting for remote
|
|
|
|
* to shutdown
|
|
|
|
*
|
|
|
|
* TCP_CLOSING both sides have shutdown but we still have
|
|
|
|
* data we have to finish sending
|
|
|
|
*
|
|
|
|
* TCP_TIME_WAIT timeout to catch resent junk before entering
|
|
|
|
* closed, can only be entered from FIN_WAIT2
|
|
|
|
* or CLOSING. Required because the other end
|
|
|
|
* may not have gotten our last ACK causing it
|
|
|
|
* to retransmit the data packet (which we ignore)
|
|
|
|
*
|
|
|
|
* TCP_CLOSE_WAIT remote side has shutdown and is waiting for
|
|
|
|
* us to finish writing our data and to shutdown
|
|
|
|
* (we have to close() to move on to LAST_ACK)
|
|
|
|
*
|
|
|
|
* TCP_LAST_ACK out side has shutdown after remote has
|
|
|
|
* shutdown. There may still be data in our
|
|
|
|
* buffer that we have to finish sending
|
|
|
|
*
|
|
|
|
* TCP_CLOSE socket is finished
|
|
|
|
*/
|
|
|
|
|
2007-08-29 06:50:33 +08:00
|
|
|
#include <linux/kernel.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/types.h>
|
|
|
|
#include <linux/fcntl.h>
|
|
|
|
#include <linux/poll.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/fs.h>
|
2007-11-07 15:30:13 +08:00
|
|
|
#include <linux/skbuff.h>
|
2008-07-03 18:22:02 +08:00
|
|
|
#include <linux/scatterlist.h>
|
2007-11-07 15:30:13 +08:00
|
|
|
#include <linux/splice.h>
|
|
|
|
#include <linux/net.h>
|
|
|
|
#include <linux/socket.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/random.h>
|
|
|
|
#include <linux/bootmem.h>
|
2008-06-28 08:23:57 +08:00
|
|
|
#include <linux/highmem.h>
|
|
|
|
#include <linux/swap.h>
|
2006-03-25 17:36:56 +08:00
|
|
|
#include <linux/cache.h>
|
2006-06-22 18:02:40 +08:00
|
|
|
#include <linux/err.h>
|
2006-11-15 11:07:45 +08:00
|
|
|
#include <linux/crypto.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
#include <net/icmp.h>
|
|
|
|
#include <net/tcp.h>
|
|
|
|
#include <net/xfrm.h>
|
|
|
|
#include <net/ip.h>
|
2006-05-24 09:05:53 +08:00
|
|
|
#include <net/netdma.h>
|
2007-11-07 15:30:13 +08:00
|
|
|
#include <net/sock.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
#include <asm/uaccess.h>
|
|
|
|
#include <asm/ioctls.h>
|
|
|
|
|
2006-09-23 05:15:41 +08:00
|
|
|
int sysctl_tcp_fin_timeout __read_mostly = TCP_FIN_TIMEOUT;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
atomic_t tcp_orphan_count = ATOMIC_INIT(0);
|
|
|
|
|
2005-08-10 11:11:41 +08:00
|
|
|
EXPORT_SYMBOL_GPL(tcp_orphan_count);
|
|
|
|
|
2006-03-25 17:36:56 +08:00
|
|
|
int sysctl_tcp_mem[3] __read_mostly;
|
|
|
|
int sysctl_tcp_wmem[3] __read_mostly;
|
|
|
|
int sysctl_tcp_rmem[3] __read_mostly;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
EXPORT_SYMBOL(sysctl_tcp_mem);
|
|
|
|
EXPORT_SYMBOL(sysctl_tcp_rmem);
|
|
|
|
EXPORT_SYMBOL(sysctl_tcp_wmem);
|
|
|
|
|
|
|
|
atomic_t tcp_memory_allocated; /* Current allocated memory. */
|
|
|
|
atomic_t tcp_sockets_allocated; /* Current number of TCP sockets. */
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(tcp_memory_allocated);
|
|
|
|
EXPORT_SYMBOL(tcp_sockets_allocated);
|
|
|
|
|
2007-11-07 15:30:13 +08:00
|
|
|
/*
|
|
|
|
* TCP splice context
|
|
|
|
*/
|
|
|
|
struct tcp_splice_state {
|
|
|
|
struct pipe_inode_info *pipe;
|
|
|
|
size_t len;
|
|
|
|
unsigned int flags;
|
|
|
|
};
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
* Pressure flag: try to collapse.
|
|
|
|
* Technical note: it is used by multiple contexts non atomically.
|
2007-12-31 16:11:19 +08:00
|
|
|
* All the __sk_mem_schedule() is of this nature: accounting
|
2005-04-17 06:20:36 +08:00
|
|
|
* is strict, actions are advisory and have some latency.
|
|
|
|
*/
|
2007-03-28 04:58:31 +08:00
|
|
|
int tcp_memory_pressure __read_mostly;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
EXPORT_SYMBOL(tcp_memory_pressure);
|
|
|
|
|
2008-07-17 11:28:10 +08:00
|
|
|
void tcp_enter_memory_pressure(struct sock *sk)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
if (!tcp_memory_pressure) {
|
2008-07-17 11:30:14 +08:00
|
|
|
NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPMEMORYPRESSURES);
|
2005-04-17 06:20:36 +08:00
|
|
|
tcp_memory_pressure = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(tcp_enter_memory_pressure);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Wait for a TCP event.
|
|
|
|
*
|
|
|
|
* Note that we don't need to lock the socket, as the upper poll layers
|
|
|
|
* take care of normal races (between the test and the event) and we don't
|
|
|
|
* go look at any of the socket buffers directly.
|
|
|
|
*/
|
|
|
|
unsigned int tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
|
|
|
|
{
|
|
|
|
unsigned int mask;
|
|
|
|
struct sock *sk = sock->sk;
|
|
|
|
struct tcp_sock *tp = tcp_sk(sk);
|
|
|
|
|
|
|
|
poll_wait(file, sk->sk_sleep, wait);
|
|
|
|
if (sk->sk_state == TCP_LISTEN)
|
2005-08-24 12:52:58 +08:00
|
|
|
return inet_csk_listen_poll(sk);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* Socket is not locked. We are protected from async events
|
2008-07-17 11:13:43 +08:00
|
|
|
* by poll logic and correct handling of state changes
|
|
|
|
* made by other threads is impossible in any case.
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
|
|
|
|
|
|
|
mask = 0;
|
|
|
|
if (sk->sk_err)
|
|
|
|
mask = POLLERR;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* POLLHUP is certainly not done right. But poll() doesn't
|
|
|
|
* have a notion of HUP in just one direction, and for a
|
|
|
|
* socket the read side is more interesting.
|
|
|
|
*
|
|
|
|
* Some poll() documentation says that POLLHUP is incompatible
|
|
|
|
* with the POLLOUT/POLLWR flags, so somebody should check this
|
|
|
|
* all. But careful, it tends to be safer to return too many
|
|
|
|
* bits than too few, and you can easily break real applications
|
|
|
|
* if you don't tell them that something has hung up!
|
|
|
|
*
|
|
|
|
* Check-me.
|
|
|
|
*
|
|
|
|
* Check number 1. POLLHUP is _UNMASKABLE_ event (see UNIX98 and
|
|
|
|
* our fs/select.c). It means that after we received EOF,
|
|
|
|
* poll always returns immediately, making impossible poll() on write()
|
|
|
|
* in state CLOSE_WAIT. One solution is evident --- to set POLLHUP
|
|
|
|
* if and only if shutdown has been made in both directions.
|
|
|
|
* Actually, it is interesting to look how Solaris and DUX
|
2008-07-17 11:13:43 +08:00
|
|
|
* solve this dilemma. I would prefer, if POLLHUP were maskable,
|
2005-04-17 06:20:36 +08:00
|
|
|
* then we could set it on SND_SHUTDOWN. BTW examples given
|
|
|
|
* in Stevens' books assume exactly this behaviour, it explains
|
2008-07-17 11:13:43 +08:00
|
|
|
* why POLLHUP is incompatible with POLLOUT. --ANK
|
2005-04-17 06:20:36 +08:00
|
|
|
*
|
|
|
|
* NOTE. Check for TCP_CLOSE is added. The goal is to prevent
|
|
|
|
* blocking on fresh not-connected or disconnected socket. --ANK
|
|
|
|
*/
|
|
|
|
if (sk->sk_shutdown == SHUTDOWN_MASK || sk->sk_state == TCP_CLOSE)
|
|
|
|
mask |= POLLHUP;
|
|
|
|
if (sk->sk_shutdown & RCV_SHUTDOWN)
|
2006-03-25 19:07:39 +08:00
|
|
|
mask |= POLLIN | POLLRDNORM | POLLRDHUP;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* Connected? */
|
|
|
|
if ((1 << sk->sk_state) & ~(TCPF_SYN_SENT | TCPF_SYN_RECV)) {
|
2008-10-07 01:43:54 +08:00
|
|
|
int target = sock_rcvlowat(sk, 0, INT_MAX);
|
|
|
|
|
|
|
|
if (tp->urg_seq == tp->copied_seq &&
|
|
|
|
!sock_flag(sk, SOCK_URGINLINE) &&
|
|
|
|
tp->urg_data)
|
|
|
|
target--;
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* Potential race condition. If read of tp below will
|
|
|
|
* escape above sk->sk_state, we can be illegally awaken
|
|
|
|
* in SYN_* states. */
|
2008-10-07 01:43:54 +08:00
|
|
|
if (tp->rcv_nxt - tp->copied_seq >= target)
|
2005-04-17 06:20:36 +08:00
|
|
|
mask |= POLLIN | POLLRDNORM;
|
|
|
|
|
|
|
|
if (!(sk->sk_shutdown & SEND_SHUTDOWN)) {
|
|
|
|
if (sk_stream_wspace(sk) >= sk_stream_min_wspace(sk)) {
|
|
|
|
mask |= POLLOUT | POLLWRNORM;
|
|
|
|
} else { /* send SIGIO later */
|
|
|
|
set_bit(SOCK_ASYNC_NOSPACE,
|
|
|
|
&sk->sk_socket->flags);
|
|
|
|
set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
|
|
|
|
|
|
|
|
/* Race breaker. If space is freed after
|
|
|
|
* wspace test but before the flags are set,
|
|
|
|
* IO signal will be lost.
|
|
|
|
*/
|
|
|
|
if (sk_stream_wspace(sk) >= sk_stream_min_wspace(sk))
|
|
|
|
mask |= POLLOUT | POLLWRNORM;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tp->urg_data & TCP_URG_VALID)
|
|
|
|
mask |= POLLPRI;
|
|
|
|
}
|
|
|
|
return mask;
|
|
|
|
}
|
|
|
|
|
|
|
|
int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg)
|
|
|
|
{
|
|
|
|
struct tcp_sock *tp = tcp_sk(sk);
|
|
|
|
int answ;
|
|
|
|
|
|
|
|
switch (cmd) {
|
|
|
|
case SIOCINQ:
|
|
|
|
if (sk->sk_state == TCP_LISTEN)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
lock_sock(sk);
|
|
|
|
if ((1 << sk->sk_state) & (TCPF_SYN_SENT | TCPF_SYN_RECV))
|
|
|
|
answ = 0;
|
|
|
|
else if (sock_flag(sk, SOCK_URGINLINE) ||
|
|
|
|
!tp->urg_data ||
|
|
|
|
before(tp->urg_seq, tp->copied_seq) ||
|
|
|
|
!before(tp->urg_seq, tp->rcv_nxt)) {
|
|
|
|
answ = tp->rcv_nxt - tp->copied_seq;
|
|
|
|
|
|
|
|
/* Subtract 1, if FIN is in queue. */
|
|
|
|
if (answ && !skb_queue_empty(&sk->sk_receive_queue))
|
|
|
|
answ -=
|
2007-04-11 12:04:22 +08:00
|
|
|
tcp_hdr((struct sk_buff *)sk->sk_receive_queue.prev)->fin;
|
2005-04-17 06:20:36 +08:00
|
|
|
} else
|
|
|
|
answ = tp->urg_seq - tp->copied_seq;
|
|
|
|
release_sock(sk);
|
|
|
|
break;
|
|
|
|
case SIOCATMARK:
|
|
|
|
answ = tp->urg_data && tp->urg_seq == tp->copied_seq;
|
|
|
|
break;
|
|
|
|
case SIOCOUTQ:
|
|
|
|
if (sk->sk_state == TCP_LISTEN)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if ((1 << sk->sk_state) & (TCPF_SYN_SENT | TCPF_SYN_RECV))
|
|
|
|
answ = 0;
|
|
|
|
else
|
|
|
|
answ = tp->write_seq - tp->snd_una;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return -ENOIOCTLCMD;
|
2007-04-21 08:09:22 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
return put_user(answ, (int __user *)arg);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void tcp_mark_push(struct tcp_sock *tp, struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
TCP_SKB_CB(skb)->flags |= TCPCB_FLAG_PSH;
|
|
|
|
tp->pushed_seq = tp->write_seq;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int forced_push(struct tcp_sock *tp)
|
|
|
|
{
|
|
|
|
return after(tp->write_seq, tp->pushed_seq + (tp->max_window >> 1));
|
|
|
|
}
|
|
|
|
|
[TCP]: Sed magic converts func(sk, tp, ...) -> func(sk, ...)
This is (mostly) automated change using magic:
sed -e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e 's|struct sock \*sk,[\n\t ]*struct tcp_sock \*tp\([^{]*\n{\n\)|
struct sock \*sk\1\tstruct tcp_sock *tp = tcp_sk(sk);\n|g'
-e 's|struct sock \*sk, struct tcp_sock \*tp|
struct sock \*sk|g' -e 's|sk, tp\([^-]\)|sk\1|g'
Fixed four unused variable (tp) warnings that were introduced.
In addition, manually added newlines after local variables and
tweaked function arguments positioning.
$ gcc --version
gcc (GCC) 4.1.1 20060525 (Red Hat 4.1.1-1)
...
$ codiff -fV built-in.o.old built-in.o.new
net/ipv4/route.c:
rt_cache_flush | +14
1 function changed, 14 bytes added
net/ipv4/tcp.c:
tcp_setsockopt | -5
tcp_sendpage | -25
tcp_sendmsg | -16
3 functions changed, 46 bytes removed
net/ipv4/tcp_input.c:
tcp_try_undo_recovery | +3
tcp_try_undo_dsack | +2
tcp_mark_head_lost | -12
tcp_ack | -15
tcp_event_data_recv | -32
tcp_rcv_state_process | -10
tcp_rcv_established | +1
7 functions changed, 6 bytes added, 69 bytes removed, diff: -63
net/ipv4/tcp_output.c:
update_send_head | -9
tcp_transmit_skb | +19
tcp_cwnd_validate | +1
tcp_write_wakeup | -17
__tcp_push_pending_frames | -25
tcp_push_one | -8
tcp_send_fin | -4
7 functions changed, 20 bytes added, 63 bytes removed, diff: -43
built-in.o.new:
18 functions changed, 40 bytes added, 178 bytes removed, diff: -138
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-21 13:18:02 +08:00
|
|
|
static inline void skb_entail(struct sock *sk, struct sk_buff *skb)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
[TCP]: Sed magic converts func(sk, tp, ...) -> func(sk, ...)
This is (mostly) automated change using magic:
sed -e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e 's|struct sock \*sk,[\n\t ]*struct tcp_sock \*tp\([^{]*\n{\n\)|
struct sock \*sk\1\tstruct tcp_sock *tp = tcp_sk(sk);\n|g'
-e 's|struct sock \*sk, struct tcp_sock \*tp|
struct sock \*sk|g' -e 's|sk, tp\([^-]\)|sk\1|g'
Fixed four unused variable (tp) warnings that were introduced.
In addition, manually added newlines after local variables and
tweaked function arguments positioning.
$ gcc --version
gcc (GCC) 4.1.1 20060525 (Red Hat 4.1.1-1)
...
$ codiff -fV built-in.o.old built-in.o.new
net/ipv4/route.c:
rt_cache_flush | +14
1 function changed, 14 bytes added
net/ipv4/tcp.c:
tcp_setsockopt | -5
tcp_sendpage | -25
tcp_sendmsg | -16
3 functions changed, 46 bytes removed
net/ipv4/tcp_input.c:
tcp_try_undo_recovery | +3
tcp_try_undo_dsack | +2
tcp_mark_head_lost | -12
tcp_ack | -15
tcp_event_data_recv | -32
tcp_rcv_state_process | -10
tcp_rcv_established | +1
7 functions changed, 6 bytes added, 69 bytes removed, diff: -63
net/ipv4/tcp_output.c:
update_send_head | -9
tcp_transmit_skb | +19
tcp_cwnd_validate | +1
tcp_write_wakeup | -17
__tcp_push_pending_frames | -25
tcp_push_one | -8
tcp_send_fin | -4
7 functions changed, 20 bytes added, 63 bytes removed, diff: -43
built-in.o.new:
18 functions changed, 40 bytes added, 178 bytes removed, diff: -138
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-21 13:18:02 +08:00
|
|
|
struct tcp_sock *tp = tcp_sk(sk);
|
2006-11-18 05:59:12 +08:00
|
|
|
struct tcp_skb_cb *tcb = TCP_SKB_CB(skb);
|
|
|
|
|
|
|
|
skb->csum = 0;
|
|
|
|
tcb->seq = tcb->end_seq = tp->write_seq;
|
|
|
|
tcb->flags = TCPCB_FLAG_ACK;
|
|
|
|
tcb->sacked = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
skb_header_release(skb);
|
2007-03-08 04:12:44 +08:00
|
|
|
tcp_add_write_queue_tail(sk, skb);
|
2007-12-31 16:11:19 +08:00
|
|
|
sk->sk_wmem_queued += skb->truesize;
|
|
|
|
sk_mem_charge(sk, skb->truesize);
|
2005-08-24 01:13:06 +08:00
|
|
|
if (tp->nonagle & TCP_NAGLE_PUSH)
|
2007-02-09 22:24:47 +08:00
|
|
|
tp->nonagle &= ~TCP_NAGLE_PUSH;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline void tcp_mark_urg(struct tcp_sock *tp, int flags,
|
|
|
|
struct sk_buff *skb)
|
|
|
|
{
|
2008-10-08 05:43:06 +08:00
|
|
|
if (flags & MSG_OOB)
|
2005-04-17 06:20:36 +08:00
|
|
|
tp->snd_up = tp->write_seq;
|
|
|
|
}
|
|
|
|
|
[TCP]: Sed magic converts func(sk, tp, ...) -> func(sk, ...)
This is (mostly) automated change using magic:
sed -e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e 's|struct sock \*sk,[\n\t ]*struct tcp_sock \*tp\([^{]*\n{\n\)|
struct sock \*sk\1\tstruct tcp_sock *tp = tcp_sk(sk);\n|g'
-e 's|struct sock \*sk, struct tcp_sock \*tp|
struct sock \*sk|g' -e 's|sk, tp\([^-]\)|sk\1|g'
Fixed four unused variable (tp) warnings that were introduced.
In addition, manually added newlines after local variables and
tweaked function arguments positioning.
$ gcc --version
gcc (GCC) 4.1.1 20060525 (Red Hat 4.1.1-1)
...
$ codiff -fV built-in.o.old built-in.o.new
net/ipv4/route.c:
rt_cache_flush | +14
1 function changed, 14 bytes added
net/ipv4/tcp.c:
tcp_setsockopt | -5
tcp_sendpage | -25
tcp_sendmsg | -16
3 functions changed, 46 bytes removed
net/ipv4/tcp_input.c:
tcp_try_undo_recovery | +3
tcp_try_undo_dsack | +2
tcp_mark_head_lost | -12
tcp_ack | -15
tcp_event_data_recv | -32
tcp_rcv_state_process | -10
tcp_rcv_established | +1
7 functions changed, 6 bytes added, 69 bytes removed, diff: -63
net/ipv4/tcp_output.c:
update_send_head | -9
tcp_transmit_skb | +19
tcp_cwnd_validate | +1
tcp_write_wakeup | -17
__tcp_push_pending_frames | -25
tcp_push_one | -8
tcp_send_fin | -4
7 functions changed, 20 bytes added, 63 bytes removed, diff: -43
built-in.o.new:
18 functions changed, 40 bytes added, 178 bytes removed, diff: -138
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-21 13:18:02 +08:00
|
|
|
static inline void tcp_push(struct sock *sk, int flags, int mss_now,
|
|
|
|
int nonagle)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
[TCP]: Sed magic converts func(sk, tp, ...) -> func(sk, ...)
This is (mostly) automated change using magic:
sed -e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e 's|struct sock \*sk,[\n\t ]*struct tcp_sock \*tp\([^{]*\n{\n\)|
struct sock \*sk\1\tstruct tcp_sock *tp = tcp_sk(sk);\n|g'
-e 's|struct sock \*sk, struct tcp_sock \*tp|
struct sock \*sk|g' -e 's|sk, tp\([^-]\)|sk\1|g'
Fixed four unused variable (tp) warnings that were introduced.
In addition, manually added newlines after local variables and
tweaked function arguments positioning.
$ gcc --version
gcc (GCC) 4.1.1 20060525 (Red Hat 4.1.1-1)
...
$ codiff -fV built-in.o.old built-in.o.new
net/ipv4/route.c:
rt_cache_flush | +14
1 function changed, 14 bytes added
net/ipv4/tcp.c:
tcp_setsockopt | -5
tcp_sendpage | -25
tcp_sendmsg | -16
3 functions changed, 46 bytes removed
net/ipv4/tcp_input.c:
tcp_try_undo_recovery | +3
tcp_try_undo_dsack | +2
tcp_mark_head_lost | -12
tcp_ack | -15
tcp_event_data_recv | -32
tcp_rcv_state_process | -10
tcp_rcv_established | +1
7 functions changed, 6 bytes added, 69 bytes removed, diff: -63
net/ipv4/tcp_output.c:
update_send_head | -9
tcp_transmit_skb | +19
tcp_cwnd_validate | +1
tcp_write_wakeup | -17
__tcp_push_pending_frames | -25
tcp_push_one | -8
tcp_send_fin | -4
7 functions changed, 20 bytes added, 63 bytes removed, diff: -43
built-in.o.new:
18 functions changed, 40 bytes added, 178 bytes removed, diff: -138
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-21 13:18:02 +08:00
|
|
|
struct tcp_sock *tp = tcp_sk(sk);
|
|
|
|
|
2007-03-08 04:12:44 +08:00
|
|
|
if (tcp_send_head(sk)) {
|
|
|
|
struct sk_buff *skb = tcp_write_queue_tail(sk);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (!(flags & MSG_MORE) || forced_push(tp))
|
|
|
|
tcp_mark_push(tp, skb);
|
|
|
|
tcp_mark_urg(tp, flags, skb);
|
[TCP]: Sed magic converts func(sk, tp, ...) -> func(sk, ...)
This is (mostly) automated change using magic:
sed -e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e 's|struct sock \*sk,[\n\t ]*struct tcp_sock \*tp\([^{]*\n{\n\)|
struct sock \*sk\1\tstruct tcp_sock *tp = tcp_sk(sk);\n|g'
-e 's|struct sock \*sk, struct tcp_sock \*tp|
struct sock \*sk|g' -e 's|sk, tp\([^-]\)|sk\1|g'
Fixed four unused variable (tp) warnings that were introduced.
In addition, manually added newlines after local variables and
tweaked function arguments positioning.
$ gcc --version
gcc (GCC) 4.1.1 20060525 (Red Hat 4.1.1-1)
...
$ codiff -fV built-in.o.old built-in.o.new
net/ipv4/route.c:
rt_cache_flush | +14
1 function changed, 14 bytes added
net/ipv4/tcp.c:
tcp_setsockopt | -5
tcp_sendpage | -25
tcp_sendmsg | -16
3 functions changed, 46 bytes removed
net/ipv4/tcp_input.c:
tcp_try_undo_recovery | +3
tcp_try_undo_dsack | +2
tcp_mark_head_lost | -12
tcp_ack | -15
tcp_event_data_recv | -32
tcp_rcv_state_process | -10
tcp_rcv_established | +1
7 functions changed, 6 bytes added, 69 bytes removed, diff: -63
net/ipv4/tcp_output.c:
update_send_head | -9
tcp_transmit_skb | +19
tcp_cwnd_validate | +1
tcp_write_wakeup | -17
__tcp_push_pending_frames | -25
tcp_push_one | -8
tcp_send_fin | -4
7 functions changed, 20 bytes added, 63 bytes removed, diff: -43
built-in.o.new:
18 functions changed, 40 bytes added, 178 bytes removed, diff: -138
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-21 13:18:02 +08:00
|
|
|
__tcp_push_pending_frames(sk, mss_now,
|
2005-04-17 06:20:36 +08:00
|
|
|
(flags & MSG_MORE) ? TCP_NAGLE_CORK : nonagle);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-11-07 15:32:26 +08:00
|
|
|
static int tcp_splice_data_recv(read_descriptor_t *rd_desc, struct sk_buff *skb,
|
|
|
|
unsigned int offset, size_t len)
|
2007-11-07 15:30:13 +08:00
|
|
|
{
|
|
|
|
struct tcp_splice_state *tss = rd_desc->arg.data;
|
|
|
|
|
|
|
|
return skb_splice_bits(skb, offset, tss->pipe, tss->len, tss->flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int __tcp_splice_read(struct sock *sk, struct tcp_splice_state *tss)
|
|
|
|
{
|
|
|
|
/* Store TCP splice context information in read_descriptor_t. */
|
|
|
|
read_descriptor_t rd_desc = {
|
|
|
|
.arg.data = tss,
|
|
|
|
};
|
|
|
|
|
|
|
|
return tcp_read_sock(sk, &rd_desc, tcp_splice_data_recv);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* tcp_splice_read - splice data from TCP socket to a pipe
|
|
|
|
* @sock: socket to splice from
|
|
|
|
* @ppos: position (not valid)
|
|
|
|
* @pipe: pipe to splice to
|
|
|
|
* @len: number of bytes to splice
|
|
|
|
* @flags: splice modifier flags
|
|
|
|
*
|
|
|
|
* Description:
|
|
|
|
* Will read pages from given socket and fill them into a pipe.
|
|
|
|
*
|
|
|
|
**/
|
|
|
|
ssize_t tcp_splice_read(struct socket *sock, loff_t *ppos,
|
|
|
|
struct pipe_inode_info *pipe, size_t len,
|
|
|
|
unsigned int flags)
|
|
|
|
{
|
|
|
|
struct sock *sk = sock->sk;
|
|
|
|
struct tcp_splice_state tss = {
|
|
|
|
.pipe = pipe,
|
|
|
|
.len = len,
|
|
|
|
.flags = flags,
|
|
|
|
};
|
|
|
|
long timeo;
|
|
|
|
ssize_t spliced;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We can't seek on a socket input
|
|
|
|
*/
|
|
|
|
if (unlikely(*ppos))
|
|
|
|
return -ESPIPE;
|
|
|
|
|
|
|
|
ret = spliced = 0;
|
|
|
|
|
|
|
|
lock_sock(sk);
|
|
|
|
|
|
|
|
timeo = sock_rcvtimeo(sk, flags & SPLICE_F_NONBLOCK);
|
|
|
|
while (tss.len) {
|
|
|
|
ret = __tcp_splice_read(sk, &tss);
|
|
|
|
if (ret < 0)
|
|
|
|
break;
|
|
|
|
else if (!ret) {
|
|
|
|
if (spliced)
|
|
|
|
break;
|
|
|
|
if (flags & SPLICE_F_NONBLOCK) {
|
|
|
|
ret = -EAGAIN;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (sock_flag(sk, SOCK_DONE))
|
|
|
|
break;
|
|
|
|
if (sk->sk_err) {
|
|
|
|
ret = sock_error(sk);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (sk->sk_shutdown & RCV_SHUTDOWN)
|
|
|
|
break;
|
|
|
|
if (sk->sk_state == TCP_CLOSE) {
|
|
|
|
/*
|
|
|
|
* This occurs when user tries to read
|
|
|
|
* from never connected socket.
|
|
|
|
*/
|
|
|
|
if (!sock_flag(sk, SOCK_DONE))
|
|
|
|
ret = -ENOTCONN;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (!timeo) {
|
|
|
|
ret = -EAGAIN;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
sk_wait_data(sk, &timeo);
|
|
|
|
if (signal_pending(current)) {
|
|
|
|
ret = sock_intr_errno(timeo);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
tss.len -= ret;
|
|
|
|
spliced += ret;
|
|
|
|
|
|
|
|
release_sock(sk);
|
|
|
|
lock_sock(sk);
|
|
|
|
|
|
|
|
if (sk->sk_err || sk->sk_state == TCP_CLOSE ||
|
|
|
|
(sk->sk_shutdown & RCV_SHUTDOWN) || !timeo ||
|
|
|
|
signal_pending(current))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
release_sock(sk);
|
|
|
|
|
|
|
|
if (spliced)
|
|
|
|
return spliced;
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2007-11-29 18:22:33 +08:00
|
|
|
struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp)
|
2007-11-29 17:28:50 +08:00
|
|
|
{
|
|
|
|
struct sk_buff *skb;
|
|
|
|
|
|
|
|
/* The TCP header must be at least 32-bit aligned. */
|
|
|
|
size = ALIGN(size, 4);
|
|
|
|
|
|
|
|
skb = alloc_skb_fclone(size + sk->sk_prot->max_header, gfp);
|
|
|
|
if (skb) {
|
2007-12-31 16:11:19 +08:00
|
|
|
if (sk_wmem_schedule(sk, skb->truesize)) {
|
2007-11-29 17:28:50 +08:00
|
|
|
/*
|
|
|
|
* Make sure that we have exactly size bytes
|
|
|
|
* available to the caller, no more, no less.
|
|
|
|
*/
|
|
|
|
skb_reserve(skb, skb_tailroom(skb) - size);
|
|
|
|
return skb;
|
|
|
|
}
|
|
|
|
__kfree_skb(skb);
|
|
|
|
} else {
|
2008-07-17 11:28:10 +08:00
|
|
|
sk->sk_prot->enter_memory_pressure(sk);
|
2007-11-29 17:28:50 +08:00
|
|
|
sk_stream_moderate_sndbuf(sk);
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
static ssize_t do_tcp_sendpages(struct sock *sk, struct page **pages, int poffset,
|
|
|
|
size_t psize, int flags)
|
|
|
|
{
|
|
|
|
struct tcp_sock *tp = tcp_sk(sk);
|
2005-07-06 06:24:38 +08:00
|
|
|
int mss_now, size_goal;
|
2005-04-17 06:20:36 +08:00
|
|
|
int err;
|
|
|
|
ssize_t copied;
|
|
|
|
long timeo = sock_sndtimeo(sk, flags & MSG_DONTWAIT);
|
|
|
|
|
|
|
|
/* Wait for a connection to finish. */
|
|
|
|
if ((1 << sk->sk_state) & ~(TCPF_ESTABLISHED | TCPF_CLOSE_WAIT))
|
|
|
|
if ((err = sk_stream_wait_connect(sk, &timeo)) != 0)
|
|
|
|
goto out_err;
|
|
|
|
|
|
|
|
clear_bit(SOCK_ASYNC_NOSPACE, &sk->sk_socket->flags);
|
|
|
|
|
|
|
|
mss_now = tcp_current_mss(sk, !(flags&MSG_OOB));
|
2005-07-06 06:24:38 +08:00
|
|
|
size_goal = tp->xmit_size_goal;
|
2005-04-17 06:20:36 +08:00
|
|
|
copied = 0;
|
|
|
|
|
|
|
|
err = -EPIPE;
|
|
|
|
if (sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN))
|
|
|
|
goto do_error;
|
|
|
|
|
|
|
|
while (psize > 0) {
|
2007-03-08 04:12:44 +08:00
|
|
|
struct sk_buff *skb = tcp_write_queue_tail(sk);
|
2005-04-17 06:20:36 +08:00
|
|
|
struct page *page = pages[poffset / PAGE_SIZE];
|
|
|
|
int copy, i, can_coalesce;
|
|
|
|
int offset = poffset % PAGE_SIZE;
|
|
|
|
int size = min_t(size_t, psize, PAGE_SIZE - offset);
|
|
|
|
|
2007-03-08 04:12:44 +08:00
|
|
|
if (!tcp_send_head(sk) || (copy = size_goal - skb->len) <= 0) {
|
2005-04-17 06:20:36 +08:00
|
|
|
new_segment:
|
|
|
|
if (!sk_stream_memory_free(sk))
|
|
|
|
goto wait_for_sndbuf;
|
|
|
|
|
2007-11-29 18:22:33 +08:00
|
|
|
skb = sk_stream_alloc_skb(sk, 0, sk->sk_allocation);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (!skb)
|
|
|
|
goto wait_for_memory;
|
|
|
|
|
[TCP]: Sed magic converts func(sk, tp, ...) -> func(sk, ...)
This is (mostly) automated change using magic:
sed -e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e 's|struct sock \*sk,[\n\t ]*struct tcp_sock \*tp\([^{]*\n{\n\)|
struct sock \*sk\1\tstruct tcp_sock *tp = tcp_sk(sk);\n|g'
-e 's|struct sock \*sk, struct tcp_sock \*tp|
struct sock \*sk|g' -e 's|sk, tp\([^-]\)|sk\1|g'
Fixed four unused variable (tp) warnings that were introduced.
In addition, manually added newlines after local variables and
tweaked function arguments positioning.
$ gcc --version
gcc (GCC) 4.1.1 20060525 (Red Hat 4.1.1-1)
...
$ codiff -fV built-in.o.old built-in.o.new
net/ipv4/route.c:
rt_cache_flush | +14
1 function changed, 14 bytes added
net/ipv4/tcp.c:
tcp_setsockopt | -5
tcp_sendpage | -25
tcp_sendmsg | -16
3 functions changed, 46 bytes removed
net/ipv4/tcp_input.c:
tcp_try_undo_recovery | +3
tcp_try_undo_dsack | +2
tcp_mark_head_lost | -12
tcp_ack | -15
tcp_event_data_recv | -32
tcp_rcv_state_process | -10
tcp_rcv_established | +1
7 functions changed, 6 bytes added, 69 bytes removed, diff: -63
net/ipv4/tcp_output.c:
update_send_head | -9
tcp_transmit_skb | +19
tcp_cwnd_validate | +1
tcp_write_wakeup | -17
__tcp_push_pending_frames | -25
tcp_push_one | -8
tcp_send_fin | -4
7 functions changed, 20 bytes added, 63 bytes removed, diff: -43
built-in.o.new:
18 functions changed, 40 bytes added, 178 bytes removed, diff: -138
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-21 13:18:02 +08:00
|
|
|
skb_entail(sk, skb);
|
2005-07-06 06:24:38 +08:00
|
|
|
copy = size_goal;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (copy > size)
|
|
|
|
copy = size;
|
|
|
|
|
|
|
|
i = skb_shinfo(skb)->nr_frags;
|
|
|
|
can_coalesce = skb_can_coalesce(skb, i, page, offset);
|
|
|
|
if (!can_coalesce && i >= MAX_SKB_FRAGS) {
|
|
|
|
tcp_mark_push(tp, skb);
|
|
|
|
goto new_segment;
|
|
|
|
}
|
2007-12-31 16:11:19 +08:00
|
|
|
if (!sk_wmem_schedule(sk, copy))
|
2005-04-17 06:20:36 +08:00
|
|
|
goto wait_for_memory;
|
2007-02-09 22:24:47 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
if (can_coalesce) {
|
|
|
|
skb_shinfo(skb)->frags[i - 1].size += copy;
|
|
|
|
} else {
|
|
|
|
get_page(page);
|
|
|
|
skb_fill_page_desc(skb, i, page, offset, copy);
|
|
|
|
}
|
|
|
|
|
|
|
|
skb->len += copy;
|
|
|
|
skb->data_len += copy;
|
|
|
|
skb->truesize += copy;
|
|
|
|
sk->sk_wmem_queued += copy;
|
2007-12-31 16:11:19 +08:00
|
|
|
sk_mem_charge(sk, copy);
|
2006-08-30 07:44:56 +08:00
|
|
|
skb->ip_summed = CHECKSUM_PARTIAL;
|
2005-04-17 06:20:36 +08:00
|
|
|
tp->write_seq += copy;
|
|
|
|
TCP_SKB_CB(skb)->end_seq += copy;
|
2006-06-22 17:40:14 +08:00
|
|
|
skb_shinfo(skb)->gso_segs = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (!copied)
|
|
|
|
TCP_SKB_CB(skb)->flags &= ~TCPCB_FLAG_PSH;
|
|
|
|
|
|
|
|
copied += copy;
|
|
|
|
poffset += copy;
|
|
|
|
if (!(psize -= copy))
|
|
|
|
goto out;
|
|
|
|
|
2008-03-23 06:47:05 +08:00
|
|
|
if (skb->len < size_goal || (flags & MSG_OOB))
|
2005-04-17 06:20:36 +08:00
|
|
|
continue;
|
|
|
|
|
|
|
|
if (forced_push(tp)) {
|
|
|
|
tcp_mark_push(tp, skb);
|
[TCP]: Sed magic converts func(sk, tp, ...) -> func(sk, ...)
This is (mostly) automated change using magic:
sed -e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e 's|struct sock \*sk,[\n\t ]*struct tcp_sock \*tp\([^{]*\n{\n\)|
struct sock \*sk\1\tstruct tcp_sock *tp = tcp_sk(sk);\n|g'
-e 's|struct sock \*sk, struct tcp_sock \*tp|
struct sock \*sk|g' -e 's|sk, tp\([^-]\)|sk\1|g'
Fixed four unused variable (tp) warnings that were introduced.
In addition, manually added newlines after local variables and
tweaked function arguments positioning.
$ gcc --version
gcc (GCC) 4.1.1 20060525 (Red Hat 4.1.1-1)
...
$ codiff -fV built-in.o.old built-in.o.new
net/ipv4/route.c:
rt_cache_flush | +14
1 function changed, 14 bytes added
net/ipv4/tcp.c:
tcp_setsockopt | -5
tcp_sendpage | -25
tcp_sendmsg | -16
3 functions changed, 46 bytes removed
net/ipv4/tcp_input.c:
tcp_try_undo_recovery | +3
tcp_try_undo_dsack | +2
tcp_mark_head_lost | -12
tcp_ack | -15
tcp_event_data_recv | -32
tcp_rcv_state_process | -10
tcp_rcv_established | +1
7 functions changed, 6 bytes added, 69 bytes removed, diff: -63
net/ipv4/tcp_output.c:
update_send_head | -9
tcp_transmit_skb | +19
tcp_cwnd_validate | +1
tcp_write_wakeup | -17
__tcp_push_pending_frames | -25
tcp_push_one | -8
tcp_send_fin | -4
7 functions changed, 20 bytes added, 63 bytes removed, diff: -43
built-in.o.new:
18 functions changed, 40 bytes added, 178 bytes removed, diff: -138
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-21 13:18:02 +08:00
|
|
|
__tcp_push_pending_frames(sk, mss_now, TCP_NAGLE_PUSH);
|
2007-03-08 04:12:44 +08:00
|
|
|
} else if (skb == tcp_send_head(sk))
|
2005-04-17 06:20:36 +08:00
|
|
|
tcp_push_one(sk, mss_now);
|
|
|
|
continue;
|
|
|
|
|
|
|
|
wait_for_sndbuf:
|
|
|
|
set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
|
|
|
|
wait_for_memory:
|
|
|
|
if (copied)
|
[TCP]: Sed magic converts func(sk, tp, ...) -> func(sk, ...)
This is (mostly) automated change using magic:
sed -e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e 's|struct sock \*sk,[\n\t ]*struct tcp_sock \*tp\([^{]*\n{\n\)|
struct sock \*sk\1\tstruct tcp_sock *tp = tcp_sk(sk);\n|g'
-e 's|struct sock \*sk, struct tcp_sock \*tp|
struct sock \*sk|g' -e 's|sk, tp\([^-]\)|sk\1|g'
Fixed four unused variable (tp) warnings that were introduced.
In addition, manually added newlines after local variables and
tweaked function arguments positioning.
$ gcc --version
gcc (GCC) 4.1.1 20060525 (Red Hat 4.1.1-1)
...
$ codiff -fV built-in.o.old built-in.o.new
net/ipv4/route.c:
rt_cache_flush | +14
1 function changed, 14 bytes added
net/ipv4/tcp.c:
tcp_setsockopt | -5
tcp_sendpage | -25
tcp_sendmsg | -16
3 functions changed, 46 bytes removed
net/ipv4/tcp_input.c:
tcp_try_undo_recovery | +3
tcp_try_undo_dsack | +2
tcp_mark_head_lost | -12
tcp_ack | -15
tcp_event_data_recv | -32
tcp_rcv_state_process | -10
tcp_rcv_established | +1
7 functions changed, 6 bytes added, 69 bytes removed, diff: -63
net/ipv4/tcp_output.c:
update_send_head | -9
tcp_transmit_skb | +19
tcp_cwnd_validate | +1
tcp_write_wakeup | -17
__tcp_push_pending_frames | -25
tcp_push_one | -8
tcp_send_fin | -4
7 functions changed, 20 bytes added, 63 bytes removed, diff: -43
built-in.o.new:
18 functions changed, 40 bytes added, 178 bytes removed, diff: -138
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-21 13:18:02 +08:00
|
|
|
tcp_push(sk, flags & ~MSG_MORE, mss_now, TCP_NAGLE_PUSH);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if ((err = sk_stream_wait_memory(sk, &timeo)) != 0)
|
|
|
|
goto do_error;
|
|
|
|
|
|
|
|
mss_now = tcp_current_mss(sk, !(flags&MSG_OOB));
|
2005-07-06 06:24:38 +08:00
|
|
|
size_goal = tp->xmit_size_goal;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
if (copied)
|
[TCP]: Sed magic converts func(sk, tp, ...) -> func(sk, ...)
This is (mostly) automated change using magic:
sed -e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e 's|struct sock \*sk,[\n\t ]*struct tcp_sock \*tp\([^{]*\n{\n\)|
struct sock \*sk\1\tstruct tcp_sock *tp = tcp_sk(sk);\n|g'
-e 's|struct sock \*sk, struct tcp_sock \*tp|
struct sock \*sk|g' -e 's|sk, tp\([^-]\)|sk\1|g'
Fixed four unused variable (tp) warnings that were introduced.
In addition, manually added newlines after local variables and
tweaked function arguments positioning.
$ gcc --version
gcc (GCC) 4.1.1 20060525 (Red Hat 4.1.1-1)
...
$ codiff -fV built-in.o.old built-in.o.new
net/ipv4/route.c:
rt_cache_flush | +14
1 function changed, 14 bytes added
net/ipv4/tcp.c:
tcp_setsockopt | -5
tcp_sendpage | -25
tcp_sendmsg | -16
3 functions changed, 46 bytes removed
net/ipv4/tcp_input.c:
tcp_try_undo_recovery | +3
tcp_try_undo_dsack | +2
tcp_mark_head_lost | -12
tcp_ack | -15
tcp_event_data_recv | -32
tcp_rcv_state_process | -10
tcp_rcv_established | +1
7 functions changed, 6 bytes added, 69 bytes removed, diff: -63
net/ipv4/tcp_output.c:
update_send_head | -9
tcp_transmit_skb | +19
tcp_cwnd_validate | +1
tcp_write_wakeup | -17
__tcp_push_pending_frames | -25
tcp_push_one | -8
tcp_send_fin | -4
7 functions changed, 20 bytes added, 63 bytes removed, diff: -43
built-in.o.new:
18 functions changed, 40 bytes added, 178 bytes removed, diff: -138
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-21 13:18:02 +08:00
|
|
|
tcp_push(sk, flags, mss_now, tp->nonagle);
|
2005-04-17 06:20:36 +08:00
|
|
|
return copied;
|
|
|
|
|
|
|
|
do_error:
|
|
|
|
if (copied)
|
|
|
|
goto out;
|
|
|
|
out_err:
|
|
|
|
return sk_stream_error(sk, flags, err);
|
|
|
|
}
|
|
|
|
|
|
|
|
ssize_t tcp_sendpage(struct socket *sock, struct page *page, int offset,
|
|
|
|
size_t size, int flags)
|
|
|
|
{
|
|
|
|
ssize_t res;
|
|
|
|
struct sock *sk = sock->sk;
|
|
|
|
|
|
|
|
if (!(sk->sk_route_caps & NETIF_F_SG) ||
|
2006-06-18 13:06:05 +08:00
|
|
|
!(sk->sk_route_caps & NETIF_F_ALL_CSUM))
|
2005-04-17 06:20:36 +08:00
|
|
|
return sock_no_sendpage(sock, page, offset, size, flags);
|
|
|
|
|
|
|
|
lock_sock(sk);
|
|
|
|
TCP_CHECK_TIMER(sk);
|
|
|
|
res = do_tcp_sendpages(sk, &page, offset, size, flags);
|
|
|
|
TCP_CHECK_TIMER(sk);
|
|
|
|
release_sock(sk);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define TCP_PAGE(sk) (sk->sk_sndmsg_page)
|
|
|
|
#define TCP_OFF(sk) (sk->sk_sndmsg_off)
|
|
|
|
|
[TCP]: Sed magic converts func(sk, tp, ...) -> func(sk, ...)
This is (mostly) automated change using magic:
sed -e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e 's|struct sock \*sk,[\n\t ]*struct tcp_sock \*tp\([^{]*\n{\n\)|
struct sock \*sk\1\tstruct tcp_sock *tp = tcp_sk(sk);\n|g'
-e 's|struct sock \*sk, struct tcp_sock \*tp|
struct sock \*sk|g' -e 's|sk, tp\([^-]\)|sk\1|g'
Fixed four unused variable (tp) warnings that were introduced.
In addition, manually added newlines after local variables and
tweaked function arguments positioning.
$ gcc --version
gcc (GCC) 4.1.1 20060525 (Red Hat 4.1.1-1)
...
$ codiff -fV built-in.o.old built-in.o.new
net/ipv4/route.c:
rt_cache_flush | +14
1 function changed, 14 bytes added
net/ipv4/tcp.c:
tcp_setsockopt | -5
tcp_sendpage | -25
tcp_sendmsg | -16
3 functions changed, 46 bytes removed
net/ipv4/tcp_input.c:
tcp_try_undo_recovery | +3
tcp_try_undo_dsack | +2
tcp_mark_head_lost | -12
tcp_ack | -15
tcp_event_data_recv | -32
tcp_rcv_state_process | -10
tcp_rcv_established | +1
7 functions changed, 6 bytes added, 69 bytes removed, diff: -63
net/ipv4/tcp_output.c:
update_send_head | -9
tcp_transmit_skb | +19
tcp_cwnd_validate | +1
tcp_write_wakeup | -17
__tcp_push_pending_frames | -25
tcp_push_one | -8
tcp_send_fin | -4
7 functions changed, 20 bytes added, 63 bytes removed, diff: -43
built-in.o.new:
18 functions changed, 40 bytes added, 178 bytes removed, diff: -138
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-21 13:18:02 +08:00
|
|
|
static inline int select_size(struct sock *sk)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
[TCP]: Sed magic converts func(sk, tp, ...) -> func(sk, ...)
This is (mostly) automated change using magic:
sed -e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e 's|struct sock \*sk,[\n\t ]*struct tcp_sock \*tp\([^{]*\n{\n\)|
struct sock \*sk\1\tstruct tcp_sock *tp = tcp_sk(sk);\n|g'
-e 's|struct sock \*sk, struct tcp_sock \*tp|
struct sock \*sk|g' -e 's|sk, tp\([^-]\)|sk\1|g'
Fixed four unused variable (tp) warnings that were introduced.
In addition, manually added newlines after local variables and
tweaked function arguments positioning.
$ gcc --version
gcc (GCC) 4.1.1 20060525 (Red Hat 4.1.1-1)
...
$ codiff -fV built-in.o.old built-in.o.new
net/ipv4/route.c:
rt_cache_flush | +14
1 function changed, 14 bytes added
net/ipv4/tcp.c:
tcp_setsockopt | -5
tcp_sendpage | -25
tcp_sendmsg | -16
3 functions changed, 46 bytes removed
net/ipv4/tcp_input.c:
tcp_try_undo_recovery | +3
tcp_try_undo_dsack | +2
tcp_mark_head_lost | -12
tcp_ack | -15
tcp_event_data_recv | -32
tcp_rcv_state_process | -10
tcp_rcv_established | +1
7 functions changed, 6 bytes added, 69 bytes removed, diff: -63
net/ipv4/tcp_output.c:
update_send_head | -9
tcp_transmit_skb | +19
tcp_cwnd_validate | +1
tcp_write_wakeup | -17
__tcp_push_pending_frames | -25
tcp_push_one | -8
tcp_send_fin | -4
7 functions changed, 20 bytes added, 63 bytes removed, diff: -43
built-in.o.new:
18 functions changed, 40 bytes added, 178 bytes removed, diff: -138
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-21 13:18:02 +08:00
|
|
|
struct tcp_sock *tp = tcp_sk(sk);
|
2005-07-06 06:24:38 +08:00
|
|
|
int tmp = tp->mss_cache;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2005-07-06 06:20:27 +08:00
|
|
|
if (sk->sk_route_caps & NETIF_F_SG) {
|
2006-07-01 04:36:35 +08:00
|
|
|
if (sk_can_gso(sk))
|
2005-07-06 06:20:27 +08:00
|
|
|
tmp = 0;
|
|
|
|
else {
|
|
|
|
int pgbreak = SKB_MAX_HEAD(MAX_TCP_HEADER);
|
|
|
|
|
|
|
|
if (tmp >= pgbreak &&
|
|
|
|
tmp <= pgbreak + (MAX_SKB_FRAGS - 1) * PAGE_SIZE)
|
|
|
|
tmp = pgbreak;
|
|
|
|
}
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
return tmp;
|
|
|
|
}
|
|
|
|
|
2007-08-03 10:23:56 +08:00
|
|
|
int tcp_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
|
2005-04-17 06:20:36 +08:00
|
|
|
size_t size)
|
|
|
|
{
|
2007-08-03 10:23:56 +08:00
|
|
|
struct sock *sk = sock->sk;
|
2005-04-17 06:20:36 +08:00
|
|
|
struct iovec *iov;
|
|
|
|
struct tcp_sock *tp = tcp_sk(sk);
|
|
|
|
struct sk_buff *skb;
|
|
|
|
int iovlen, flags;
|
2005-07-06 06:24:38 +08:00
|
|
|
int mss_now, size_goal;
|
2005-04-17 06:20:36 +08:00
|
|
|
int err, copied;
|
|
|
|
long timeo;
|
|
|
|
|
|
|
|
lock_sock(sk);
|
|
|
|
TCP_CHECK_TIMER(sk);
|
|
|
|
|
|
|
|
flags = msg->msg_flags;
|
|
|
|
timeo = sock_sndtimeo(sk, flags & MSG_DONTWAIT);
|
|
|
|
|
|
|
|
/* Wait for a connection to finish. */
|
|
|
|
if ((1 << sk->sk_state) & ~(TCPF_ESTABLISHED | TCPF_CLOSE_WAIT))
|
|
|
|
if ((err = sk_stream_wait_connect(sk, &timeo)) != 0)
|
|
|
|
goto out_err;
|
|
|
|
|
|
|
|
/* This should be in poll */
|
|
|
|
clear_bit(SOCK_ASYNC_NOSPACE, &sk->sk_socket->flags);
|
|
|
|
|
|
|
|
mss_now = tcp_current_mss(sk, !(flags&MSG_OOB));
|
2005-07-06 06:24:38 +08:00
|
|
|
size_goal = tp->xmit_size_goal;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* Ok commence sending. */
|
|
|
|
iovlen = msg->msg_iovlen;
|
|
|
|
iov = msg->msg_iov;
|
|
|
|
copied = 0;
|
|
|
|
|
|
|
|
err = -EPIPE;
|
|
|
|
if (sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN))
|
|
|
|
goto do_error;
|
|
|
|
|
|
|
|
while (--iovlen >= 0) {
|
|
|
|
int seglen = iov->iov_len;
|
|
|
|
unsigned char __user *from = iov->iov_base;
|
|
|
|
|
|
|
|
iov++;
|
|
|
|
|
|
|
|
while (seglen > 0) {
|
|
|
|
int copy;
|
|
|
|
|
2007-03-08 04:12:44 +08:00
|
|
|
skb = tcp_write_queue_tail(sk);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-03-08 04:12:44 +08:00
|
|
|
if (!tcp_send_head(sk) ||
|
2005-07-06 06:24:38 +08:00
|
|
|
(copy = size_goal - skb->len) <= 0) {
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
new_segment:
|
|
|
|
/* Allocate new segment. If the interface is SG,
|
|
|
|
* allocate skb fitting to single page.
|
|
|
|
*/
|
|
|
|
if (!sk_stream_memory_free(sk))
|
|
|
|
goto wait_for_sndbuf;
|
|
|
|
|
2007-11-29 18:22:33 +08:00
|
|
|
skb = sk_stream_alloc_skb(sk, select_size(sk),
|
|
|
|
sk->sk_allocation);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (!skb)
|
|
|
|
goto wait_for_memory;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check whether we can use HW checksum.
|
|
|
|
*/
|
2006-06-18 13:06:05 +08:00
|
|
|
if (sk->sk_route_caps & NETIF_F_ALL_CSUM)
|
2006-08-30 07:44:56 +08:00
|
|
|
skb->ip_summed = CHECKSUM_PARTIAL;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
[TCP]: Sed magic converts func(sk, tp, ...) -> func(sk, ...)
This is (mostly) automated change using magic:
sed -e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e 's|struct sock \*sk,[\n\t ]*struct tcp_sock \*tp\([^{]*\n{\n\)|
struct sock \*sk\1\tstruct tcp_sock *tp = tcp_sk(sk);\n|g'
-e 's|struct sock \*sk, struct tcp_sock \*tp|
struct sock \*sk|g' -e 's|sk, tp\([^-]\)|sk\1|g'
Fixed four unused variable (tp) warnings that were introduced.
In addition, manually added newlines after local variables and
tweaked function arguments positioning.
$ gcc --version
gcc (GCC) 4.1.1 20060525 (Red Hat 4.1.1-1)
...
$ codiff -fV built-in.o.old built-in.o.new
net/ipv4/route.c:
rt_cache_flush | +14
1 function changed, 14 bytes added
net/ipv4/tcp.c:
tcp_setsockopt | -5
tcp_sendpage | -25
tcp_sendmsg | -16
3 functions changed, 46 bytes removed
net/ipv4/tcp_input.c:
tcp_try_undo_recovery | +3
tcp_try_undo_dsack | +2
tcp_mark_head_lost | -12
tcp_ack | -15
tcp_event_data_recv | -32
tcp_rcv_state_process | -10
tcp_rcv_established | +1
7 functions changed, 6 bytes added, 69 bytes removed, diff: -63
net/ipv4/tcp_output.c:
update_send_head | -9
tcp_transmit_skb | +19
tcp_cwnd_validate | +1
tcp_write_wakeup | -17
__tcp_push_pending_frames | -25
tcp_push_one | -8
tcp_send_fin | -4
7 functions changed, 20 bytes added, 63 bytes removed, diff: -43
built-in.o.new:
18 functions changed, 40 bytes added, 178 bytes removed, diff: -138
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-21 13:18:02 +08:00
|
|
|
skb_entail(sk, skb);
|
2005-07-06 06:24:38 +08:00
|
|
|
copy = size_goal;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Try to append data to the end of skb. */
|
|
|
|
if (copy > seglen)
|
|
|
|
copy = seglen;
|
|
|
|
|
|
|
|
/* Where to copy to? */
|
|
|
|
if (skb_tailroom(skb) > 0) {
|
|
|
|
/* We have some space in skb head. Superb! */
|
|
|
|
if (copy > skb_tailroom(skb))
|
|
|
|
copy = skb_tailroom(skb);
|
|
|
|
if ((err = skb_add_data(skb, from, copy)) != 0)
|
|
|
|
goto do_fault;
|
|
|
|
} else {
|
|
|
|
int merge = 0;
|
|
|
|
int i = skb_shinfo(skb)->nr_frags;
|
|
|
|
struct page *page = TCP_PAGE(sk);
|
|
|
|
int off = TCP_OFF(sk);
|
|
|
|
|
|
|
|
if (skb_can_coalesce(skb, i, page, off) &&
|
|
|
|
off != PAGE_SIZE) {
|
|
|
|
/* We can extend the last page
|
|
|
|
* fragment. */
|
|
|
|
merge = 1;
|
|
|
|
} else if (i == MAX_SKB_FRAGS ||
|
|
|
|
(!i &&
|
|
|
|
!(sk->sk_route_caps & NETIF_F_SG))) {
|
|
|
|
/* Need to add new fragment and cannot
|
|
|
|
* do this because interface is non-SG,
|
|
|
|
* or because all the page slots are
|
|
|
|
* busy. */
|
|
|
|
tcp_mark_push(tp, skb);
|
|
|
|
goto new_segment;
|
|
|
|
} else if (page) {
|
|
|
|
if (off == PAGE_SIZE) {
|
|
|
|
put_page(page);
|
|
|
|
TCP_PAGE(sk) = page = NULL;
|
2005-09-06 09:55:48 +08:00
|
|
|
off = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2005-09-02 08:48:59 +08:00
|
|
|
} else
|
2005-09-06 09:55:48 +08:00
|
|
|
off = 0;
|
2005-09-02 08:48:59 +08:00
|
|
|
|
|
|
|
if (copy > PAGE_SIZE - off)
|
|
|
|
copy = PAGE_SIZE - off;
|
|
|
|
|
2007-12-31 16:11:19 +08:00
|
|
|
if (!sk_wmem_schedule(sk, copy))
|
2005-09-02 08:48:59 +08:00
|
|
|
goto wait_for_memory;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (!page) {
|
|
|
|
/* Allocate new cache page. */
|
|
|
|
if (!(page = sk_stream_alloc_page(sk)))
|
|
|
|
goto wait_for_memory;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Time to copy data. We are close to
|
|
|
|
* the end! */
|
|
|
|
err = skb_copy_to_page(sk, from, skb, page,
|
|
|
|
off, copy);
|
|
|
|
if (err) {
|
|
|
|
/* If this page was new, give it to the
|
|
|
|
* socket so it does not get leaked.
|
|
|
|
*/
|
|
|
|
if (!TCP_PAGE(sk)) {
|
|
|
|
TCP_PAGE(sk) = page;
|
|
|
|
TCP_OFF(sk) = 0;
|
|
|
|
}
|
|
|
|
goto do_error;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Update the skb. */
|
|
|
|
if (merge) {
|
|
|
|
skb_shinfo(skb)->frags[i - 1].size +=
|
|
|
|
copy;
|
|
|
|
} else {
|
|
|
|
skb_fill_page_desc(skb, i, page, off, copy);
|
|
|
|
if (TCP_PAGE(sk)) {
|
|
|
|
get_page(page);
|
|
|
|
} else if (off + copy < PAGE_SIZE) {
|
|
|
|
get_page(page);
|
|
|
|
TCP_PAGE(sk) = page;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
TCP_OFF(sk) = off + copy;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!copied)
|
|
|
|
TCP_SKB_CB(skb)->flags &= ~TCPCB_FLAG_PSH;
|
|
|
|
|
|
|
|
tp->write_seq += copy;
|
|
|
|
TCP_SKB_CB(skb)->end_seq += copy;
|
2006-06-22 17:40:14 +08:00
|
|
|
skb_shinfo(skb)->gso_segs = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
from += copy;
|
|
|
|
copied += copy;
|
|
|
|
if ((seglen -= copy) == 0 && iovlen == 0)
|
|
|
|
goto out;
|
|
|
|
|
2008-03-23 06:47:05 +08:00
|
|
|
if (skb->len < size_goal || (flags & MSG_OOB))
|
2005-04-17 06:20:36 +08:00
|
|
|
continue;
|
|
|
|
|
|
|
|
if (forced_push(tp)) {
|
|
|
|
tcp_mark_push(tp, skb);
|
[TCP]: Sed magic converts func(sk, tp, ...) -> func(sk, ...)
This is (mostly) automated change using magic:
sed -e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e 's|struct sock \*sk,[\n\t ]*struct tcp_sock \*tp\([^{]*\n{\n\)|
struct sock \*sk\1\tstruct tcp_sock *tp = tcp_sk(sk);\n|g'
-e 's|struct sock \*sk, struct tcp_sock \*tp|
struct sock \*sk|g' -e 's|sk, tp\([^-]\)|sk\1|g'
Fixed four unused variable (tp) warnings that were introduced.
In addition, manually added newlines after local variables and
tweaked function arguments positioning.
$ gcc --version
gcc (GCC) 4.1.1 20060525 (Red Hat 4.1.1-1)
...
$ codiff -fV built-in.o.old built-in.o.new
net/ipv4/route.c:
rt_cache_flush | +14
1 function changed, 14 bytes added
net/ipv4/tcp.c:
tcp_setsockopt | -5
tcp_sendpage | -25
tcp_sendmsg | -16
3 functions changed, 46 bytes removed
net/ipv4/tcp_input.c:
tcp_try_undo_recovery | +3
tcp_try_undo_dsack | +2
tcp_mark_head_lost | -12
tcp_ack | -15
tcp_event_data_recv | -32
tcp_rcv_state_process | -10
tcp_rcv_established | +1
7 functions changed, 6 bytes added, 69 bytes removed, diff: -63
net/ipv4/tcp_output.c:
update_send_head | -9
tcp_transmit_skb | +19
tcp_cwnd_validate | +1
tcp_write_wakeup | -17
__tcp_push_pending_frames | -25
tcp_push_one | -8
tcp_send_fin | -4
7 functions changed, 20 bytes added, 63 bytes removed, diff: -43
built-in.o.new:
18 functions changed, 40 bytes added, 178 bytes removed, diff: -138
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-21 13:18:02 +08:00
|
|
|
__tcp_push_pending_frames(sk, mss_now, TCP_NAGLE_PUSH);
|
2007-03-08 04:12:44 +08:00
|
|
|
} else if (skb == tcp_send_head(sk))
|
2005-04-17 06:20:36 +08:00
|
|
|
tcp_push_one(sk, mss_now);
|
|
|
|
continue;
|
|
|
|
|
|
|
|
wait_for_sndbuf:
|
|
|
|
set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
|
|
|
|
wait_for_memory:
|
|
|
|
if (copied)
|
[TCP]: Sed magic converts func(sk, tp, ...) -> func(sk, ...)
This is (mostly) automated change using magic:
sed -e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e 's|struct sock \*sk,[\n\t ]*struct tcp_sock \*tp\([^{]*\n{\n\)|
struct sock \*sk\1\tstruct tcp_sock *tp = tcp_sk(sk);\n|g'
-e 's|struct sock \*sk, struct tcp_sock \*tp|
struct sock \*sk|g' -e 's|sk, tp\([^-]\)|sk\1|g'
Fixed four unused variable (tp) warnings that were introduced.
In addition, manually added newlines after local variables and
tweaked function arguments positioning.
$ gcc --version
gcc (GCC) 4.1.1 20060525 (Red Hat 4.1.1-1)
...
$ codiff -fV built-in.o.old built-in.o.new
net/ipv4/route.c:
rt_cache_flush | +14
1 function changed, 14 bytes added
net/ipv4/tcp.c:
tcp_setsockopt | -5
tcp_sendpage | -25
tcp_sendmsg | -16
3 functions changed, 46 bytes removed
net/ipv4/tcp_input.c:
tcp_try_undo_recovery | +3
tcp_try_undo_dsack | +2
tcp_mark_head_lost | -12
tcp_ack | -15
tcp_event_data_recv | -32
tcp_rcv_state_process | -10
tcp_rcv_established | +1
7 functions changed, 6 bytes added, 69 bytes removed, diff: -63
net/ipv4/tcp_output.c:
update_send_head | -9
tcp_transmit_skb | +19
tcp_cwnd_validate | +1
tcp_write_wakeup | -17
__tcp_push_pending_frames | -25
tcp_push_one | -8
tcp_send_fin | -4
7 functions changed, 20 bytes added, 63 bytes removed, diff: -43
built-in.o.new:
18 functions changed, 40 bytes added, 178 bytes removed, diff: -138
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-21 13:18:02 +08:00
|
|
|
tcp_push(sk, flags & ~MSG_MORE, mss_now, TCP_NAGLE_PUSH);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if ((err = sk_stream_wait_memory(sk, &timeo)) != 0)
|
|
|
|
goto do_error;
|
|
|
|
|
|
|
|
mss_now = tcp_current_mss(sk, !(flags&MSG_OOB));
|
2005-07-06 06:24:38 +08:00
|
|
|
size_goal = tp->xmit_size_goal;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
if (copied)
|
[TCP]: Sed magic converts func(sk, tp, ...) -> func(sk, ...)
This is (mostly) automated change using magic:
sed -e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e 's|struct sock \*sk,[\n\t ]*struct tcp_sock \*tp\([^{]*\n{\n\)|
struct sock \*sk\1\tstruct tcp_sock *tp = tcp_sk(sk);\n|g'
-e 's|struct sock \*sk, struct tcp_sock \*tp|
struct sock \*sk|g' -e 's|sk, tp\([^-]\)|sk\1|g'
Fixed four unused variable (tp) warnings that were introduced.
In addition, manually added newlines after local variables and
tweaked function arguments positioning.
$ gcc --version
gcc (GCC) 4.1.1 20060525 (Red Hat 4.1.1-1)
...
$ codiff -fV built-in.o.old built-in.o.new
net/ipv4/route.c:
rt_cache_flush | +14
1 function changed, 14 bytes added
net/ipv4/tcp.c:
tcp_setsockopt | -5
tcp_sendpage | -25
tcp_sendmsg | -16
3 functions changed, 46 bytes removed
net/ipv4/tcp_input.c:
tcp_try_undo_recovery | +3
tcp_try_undo_dsack | +2
tcp_mark_head_lost | -12
tcp_ack | -15
tcp_event_data_recv | -32
tcp_rcv_state_process | -10
tcp_rcv_established | +1
7 functions changed, 6 bytes added, 69 bytes removed, diff: -63
net/ipv4/tcp_output.c:
update_send_head | -9
tcp_transmit_skb | +19
tcp_cwnd_validate | +1
tcp_write_wakeup | -17
__tcp_push_pending_frames | -25
tcp_push_one | -8
tcp_send_fin | -4
7 functions changed, 20 bytes added, 63 bytes removed, diff: -43
built-in.o.new:
18 functions changed, 40 bytes added, 178 bytes removed, diff: -138
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-21 13:18:02 +08:00
|
|
|
tcp_push(sk, flags, mss_now, tp->nonagle);
|
2005-04-17 06:20:36 +08:00
|
|
|
TCP_CHECK_TIMER(sk);
|
|
|
|
release_sock(sk);
|
|
|
|
return copied;
|
|
|
|
|
|
|
|
do_fault:
|
|
|
|
if (!skb->len) {
|
2007-03-08 04:12:44 +08:00
|
|
|
tcp_unlink_write_queue(skb, sk);
|
|
|
|
/* It is the one place in all of TCP, except connection
|
|
|
|
* reset, where we can be unlinking the send_head.
|
|
|
|
*/
|
|
|
|
tcp_check_send_head(sk, skb);
|
2007-12-31 16:11:19 +08:00
|
|
|
sk_wmem_free_skb(sk, skb);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
do_error:
|
|
|
|
if (copied)
|
|
|
|
goto out;
|
|
|
|
out_err:
|
|
|
|
err = sk_stream_error(sk, flags, err);
|
|
|
|
TCP_CHECK_TIMER(sk);
|
|
|
|
release_sock(sk);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Handle reading urgent data. BSD has very simple semantics for
|
|
|
|
* this, no blocking and very strange errors 8)
|
|
|
|
*/
|
|
|
|
|
|
|
|
static int tcp_recv_urg(struct sock *sk, long timeo,
|
|
|
|
struct msghdr *msg, int len, int flags,
|
|
|
|
int *addr_len)
|
|
|
|
{
|
|
|
|
struct tcp_sock *tp = tcp_sk(sk);
|
|
|
|
|
|
|
|
/* No URG data to read. */
|
|
|
|
if (sock_flag(sk, SOCK_URGINLINE) || !tp->urg_data ||
|
|
|
|
tp->urg_data == TCP_URG_READ)
|
|
|
|
return -EINVAL; /* Yes this is right ! */
|
|
|
|
|
|
|
|
if (sk->sk_state == TCP_CLOSE && !sock_flag(sk, SOCK_DONE))
|
|
|
|
return -ENOTCONN;
|
|
|
|
|
|
|
|
if (tp->urg_data & TCP_URG_VALID) {
|
|
|
|
int err = 0;
|
|
|
|
char c = tp->urg_data;
|
|
|
|
|
|
|
|
if (!(flags & MSG_PEEK))
|
|
|
|
tp->urg_data = TCP_URG_READ;
|
|
|
|
|
|
|
|
/* Read urgent data. */
|
|
|
|
msg->msg_flags |= MSG_OOB;
|
|
|
|
|
|
|
|
if (len > 0) {
|
|
|
|
if (!(flags & MSG_TRUNC))
|
|
|
|
err = memcpy_toiovec(msg->msg_iov, &c, 1);
|
|
|
|
len = 1;
|
|
|
|
} else
|
|
|
|
msg->msg_flags |= MSG_TRUNC;
|
|
|
|
|
|
|
|
return err ? -EFAULT : len;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (sk->sk_state == TCP_CLOSE || (sk->sk_shutdown & RCV_SHUTDOWN))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* Fixed the recv(..., MSG_OOB) behaviour. BSD docs and
|
|
|
|
* the available implementations agree in this case:
|
|
|
|
* this call should never block, independent of the
|
|
|
|
* blocking state of the socket.
|
|
|
|
* Mike <pall@rz.uni-karlsruhe.de>
|
|
|
|
*/
|
|
|
|
return -EAGAIN;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Clean up the receive buffer for full frames taken by the user,
|
|
|
|
* then send an ACK if necessary. COPIED is the number of bytes
|
|
|
|
* tcp_recvmsg has given to the user so far, it speeds up the
|
|
|
|
* calculation of whether or not we must ACK for the sake of
|
|
|
|
* a window update.
|
|
|
|
*/
|
2006-05-24 09:00:16 +08:00
|
|
|
void tcp_cleanup_rbuf(struct sock *sk, int copied)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct tcp_sock *tp = tcp_sk(sk);
|
|
|
|
int time_to_ack = 0;
|
|
|
|
|
|
|
|
#if TCP_DEBUG
|
|
|
|
struct sk_buff *skb = skb_peek(&sk->sk_receive_queue);
|
|
|
|
|
2008-07-26 12:43:18 +08:00
|
|
|
WARN_ON(skb && !before(tp->copied_seq, TCP_SKB_CB(skb)->end_seq));
|
2005-04-17 06:20:36 +08:00
|
|
|
#endif
|
|
|
|
|
2005-08-10 11:10:42 +08:00
|
|
|
if (inet_csk_ack_scheduled(sk)) {
|
|
|
|
const struct inet_connection_sock *icsk = inet_csk(sk);
|
2005-04-17 06:20:36 +08:00
|
|
|
/* Delayed ACKs frequently hit locked sockets during bulk
|
|
|
|
* receive. */
|
2005-08-10 11:10:42 +08:00
|
|
|
if (icsk->icsk_ack.blocked ||
|
2005-04-17 06:20:36 +08:00
|
|
|
/* Once-per-two-segments ACK was not sent by tcp_input.c */
|
2005-08-10 11:10:42 +08:00
|
|
|
tp->rcv_nxt - tp->rcv_wup > icsk->icsk_ack.rcv_mss ||
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
* If this read emptied read buffer, we send ACK, if
|
|
|
|
* connection is not bidirectional, user drained
|
|
|
|
* receive buffer and there was a small segment
|
|
|
|
* in queue.
|
|
|
|
*/
|
2006-09-20 03:52:50 +08:00
|
|
|
(copied > 0 &&
|
|
|
|
((icsk->icsk_ack.pending & ICSK_ACK_PUSHED2) ||
|
|
|
|
((icsk->icsk_ack.pending & ICSK_ACK_PUSHED) &&
|
|
|
|
!icsk->icsk_ack.pingpong)) &&
|
|
|
|
!atomic_read(&sk->sk_rmem_alloc)))
|
2005-04-17 06:20:36 +08:00
|
|
|
time_to_ack = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We send an ACK if we can now advertise a non-zero window
|
|
|
|
* which has been raised "significantly".
|
|
|
|
*
|
|
|
|
* Even if window raised up to infinity, do not send window open ACK
|
|
|
|
* in states, where we will not receive more. It is useless.
|
|
|
|
*/
|
|
|
|
if (copied > 0 && !time_to_ack && !(sk->sk_shutdown & RCV_SHUTDOWN)) {
|
|
|
|
__u32 rcv_window_now = tcp_receive_window(tp);
|
|
|
|
|
|
|
|
/* Optimize, __tcp_select_window() is not cheap. */
|
|
|
|
if (2*rcv_window_now <= tp->window_clamp) {
|
|
|
|
__u32 new_window = __tcp_select_window(sk);
|
|
|
|
|
|
|
|
/* Send ACK now, if this read freed lots of space
|
|
|
|
* in our buffer. Certainly, new_window is new window.
|
|
|
|
* We can advertise it now, if it is not less than current one.
|
|
|
|
* "Lots" means "at least twice" here.
|
|
|
|
*/
|
|
|
|
if (new_window && new_window >= 2 * rcv_window_now)
|
|
|
|
time_to_ack = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (time_to_ack)
|
|
|
|
tcp_send_ack(sk);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void tcp_prequeue_process(struct sock *sk)
|
|
|
|
{
|
|
|
|
struct sk_buff *skb;
|
|
|
|
struct tcp_sock *tp = tcp_sk(sk);
|
|
|
|
|
2008-07-17 11:31:39 +08:00
|
|
|
NET_INC_STATS_USER(sock_net(sk), LINUX_MIB_TCPPREQUEUED);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* RX process wants to run with disabled BHs, though it is not
|
|
|
|
* necessary */
|
|
|
|
local_bh_disable();
|
|
|
|
while ((skb = __skb_dequeue(&tp->ucopy.prequeue)) != NULL)
|
2008-10-08 05:18:42 +08:00
|
|
|
sk_backlog_rcv(sk, skb);
|
2005-04-17 06:20:36 +08:00
|
|
|
local_bh_enable();
|
|
|
|
|
|
|
|
/* Clear memory counter. */
|
|
|
|
tp->ucopy.memory = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline struct sk_buff *tcp_recv_skb(struct sock *sk, u32 seq, u32 *off)
|
|
|
|
{
|
|
|
|
struct sk_buff *skb;
|
|
|
|
u32 offset;
|
|
|
|
|
|
|
|
skb_queue_walk(&sk->sk_receive_queue, skb) {
|
|
|
|
offset = seq - TCP_SKB_CB(skb)->seq;
|
2007-04-11 12:04:22 +08:00
|
|
|
if (tcp_hdr(skb)->syn)
|
2005-04-17 06:20:36 +08:00
|
|
|
offset--;
|
2007-04-11 12:04:22 +08:00
|
|
|
if (offset < skb->len || tcp_hdr(skb)->fin) {
|
2005-04-17 06:20:36 +08:00
|
|
|
*off = offset;
|
|
|
|
return skb;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This routine provides an alternative to tcp_recvmsg() for routines
|
|
|
|
* that would like to handle copying from skbuffs directly in 'sendfile'
|
|
|
|
* fashion.
|
|
|
|
* Note:
|
|
|
|
* - It is assumed that the socket was locked by the caller.
|
|
|
|
* - The routine does not block.
|
|
|
|
* - At present, there is no support for reading OOB data
|
|
|
|
* or for 'peeking' the socket using this routine
|
|
|
|
* (although both would be easy to implement).
|
|
|
|
*/
|
|
|
|
int tcp_read_sock(struct sock *sk, read_descriptor_t *desc,
|
|
|
|
sk_read_actor_t recv_actor)
|
|
|
|
{
|
|
|
|
struct sk_buff *skb;
|
|
|
|
struct tcp_sock *tp = tcp_sk(sk);
|
|
|
|
u32 seq = tp->copied_seq;
|
|
|
|
u32 offset;
|
|
|
|
int copied = 0;
|
|
|
|
|
|
|
|
if (sk->sk_state == TCP_LISTEN)
|
|
|
|
return -ENOTCONN;
|
|
|
|
while ((skb = tcp_recv_skb(sk, seq, &offset)) != NULL) {
|
|
|
|
if (offset < skb->len) {
|
2008-07-03 18:31:21 +08:00
|
|
|
int used;
|
|
|
|
size_t len;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
len = skb->len - offset;
|
|
|
|
/* Stop reading if we hit a patch of urgent data */
|
|
|
|
if (tp->urg_data) {
|
|
|
|
u32 urg_offset = tp->urg_seq - seq;
|
|
|
|
if (urg_offset < len)
|
|
|
|
len = urg_offset;
|
|
|
|
if (!len)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
used = recv_actor(desc, skb, offset, len);
|
2007-06-24 14:07:50 +08:00
|
|
|
if (used < 0) {
|
|
|
|
if (!copied)
|
|
|
|
copied = used;
|
|
|
|
break;
|
|
|
|
} else if (used <= len) {
|
2005-04-17 06:20:36 +08:00
|
|
|
seq += used;
|
|
|
|
copied += used;
|
|
|
|
offset += used;
|
|
|
|
}
|
2008-06-05 06:45:58 +08:00
|
|
|
/*
|
|
|
|
* If recv_actor drops the lock (e.g. TCP splice
|
|
|
|
* receive) the skb pointer might be invalid when
|
|
|
|
* getting here: tcp_collapse might have deleted it
|
|
|
|
* while aggregating skbs from the socket queue.
|
|
|
|
*/
|
|
|
|
skb = tcp_recv_skb(sk, seq-1, &offset);
|
|
|
|
if (!skb || (offset+1 != skb->len))
|
2005-04-17 06:20:36 +08:00
|
|
|
break;
|
|
|
|
}
|
2007-04-11 12:04:22 +08:00
|
|
|
if (tcp_hdr(skb)->fin) {
|
2006-05-24 09:01:28 +08:00
|
|
|
sk_eat_skb(sk, skb, 0);
|
2005-04-17 06:20:36 +08:00
|
|
|
++seq;
|
|
|
|
break;
|
|
|
|
}
|
2006-05-24 09:01:28 +08:00
|
|
|
sk_eat_skb(sk, skb, 0);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (!desc->count)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
tp->copied_seq = seq;
|
|
|
|
|
|
|
|
tcp_rcv_space_adjust(sk);
|
|
|
|
|
|
|
|
/* Clean up data we have read: This will do ACK frames. */
|
2007-06-24 14:07:50 +08:00
|
|
|
if (copied > 0)
|
2006-05-24 09:00:16 +08:00
|
|
|
tcp_cleanup_rbuf(sk, copied);
|
2005-04-17 06:20:36 +08:00
|
|
|
return copied;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This routine copies from a sock struct into the user buffer.
|
|
|
|
*
|
|
|
|
* Technical note: in 2.3 we work on _locked_ socket, so that
|
|
|
|
* tricks with *seq access order and skb->users are not required.
|
|
|
|
* Probably, code can be easily improved even more.
|
|
|
|
*/
|
|
|
|
|
|
|
|
int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
|
|
|
|
size_t len, int nonblock, int flags, int *addr_len)
|
|
|
|
{
|
|
|
|
struct tcp_sock *tp = tcp_sk(sk);
|
|
|
|
int copied = 0;
|
|
|
|
u32 peek_seq;
|
|
|
|
u32 *seq;
|
|
|
|
unsigned long used;
|
|
|
|
int err;
|
|
|
|
int target; /* Read at least this many bytes */
|
|
|
|
long timeo;
|
|
|
|
struct task_struct *user_recv = NULL;
|
2006-05-24 09:05:53 +08:00
|
|
|
int copied_early = 0;
|
2007-03-09 01:57:36 +08:00
|
|
|
struct sk_buff *skb;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
lock_sock(sk);
|
|
|
|
|
|
|
|
TCP_CHECK_TIMER(sk);
|
|
|
|
|
|
|
|
err = -ENOTCONN;
|
|
|
|
if (sk->sk_state == TCP_LISTEN)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
timeo = sock_rcvtimeo(sk, nonblock);
|
|
|
|
|
|
|
|
/* Urgent data needs to be handled specially. */
|
|
|
|
if (flags & MSG_OOB)
|
|
|
|
goto recv_urg;
|
|
|
|
|
|
|
|
seq = &tp->copied_seq;
|
|
|
|
if (flags & MSG_PEEK) {
|
|
|
|
peek_seq = tp->copied_seq;
|
|
|
|
seq = &peek_seq;
|
|
|
|
}
|
|
|
|
|
|
|
|
target = sock_rcvlowat(sk, flags & MSG_WAITALL, len);
|
|
|
|
|
2006-05-24 09:05:53 +08:00
|
|
|
#ifdef CONFIG_NET_DMA
|
|
|
|
tp->ucopy.dma_chan = NULL;
|
|
|
|
preempt_disable();
|
2007-03-09 01:57:36 +08:00
|
|
|
skb = skb_peek_tail(&sk->sk_receive_queue);
|
2007-03-09 01:57:36 +08:00
|
|
|
{
|
|
|
|
int available = 0;
|
|
|
|
|
|
|
|
if (skb)
|
|
|
|
available = TCP_SKB_CB(skb)->seq + skb->len - (*seq);
|
|
|
|
if ((available < target) &&
|
|
|
|
(len > sysctl_tcp_dma_copybreak) && !(flags & MSG_PEEK) &&
|
|
|
|
!sysctl_tcp_low_latency &&
|
|
|
|
__get_cpu_var(softnet_data).net_dma) {
|
|
|
|
preempt_enable_no_resched();
|
|
|
|
tp->ucopy.pinned_list =
|
|
|
|
dma_pin_iovec_pages(msg->msg_iov, len);
|
|
|
|
} else {
|
|
|
|
preempt_enable_no_resched();
|
|
|
|
}
|
|
|
|
}
|
2006-05-24 09:05:53 +08:00
|
|
|
#endif
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
do {
|
|
|
|
u32 offset;
|
|
|
|
|
|
|
|
/* Are we at urgent data? Stop if we have read anything or have SIGURG pending. */
|
|
|
|
if (tp->urg_data && tp->urg_seq == *seq) {
|
|
|
|
if (copied)
|
|
|
|
break;
|
|
|
|
if (signal_pending(current)) {
|
|
|
|
copied = timeo ? sock_intr_errno(timeo) : -EAGAIN;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Next get a buffer. */
|
|
|
|
|
|
|
|
skb = skb_peek(&sk->sk_receive_queue);
|
|
|
|
do {
|
|
|
|
if (!skb)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* Now that we have two receive queues this
|
|
|
|
* shouldn't happen.
|
|
|
|
*/
|
|
|
|
if (before(*seq, TCP_SKB_CB(skb)->seq)) {
|
|
|
|
printk(KERN_INFO "recvmsg bug: copied %X "
|
|
|
|
"seq %X\n", *seq, TCP_SKB_CB(skb)->seq);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
offset = *seq - TCP_SKB_CB(skb)->seq;
|
2007-04-11 12:04:22 +08:00
|
|
|
if (tcp_hdr(skb)->syn)
|
2005-04-17 06:20:36 +08:00
|
|
|
offset--;
|
|
|
|
if (offset < skb->len)
|
|
|
|
goto found_ok_skb;
|
2007-04-11 12:04:22 +08:00
|
|
|
if (tcp_hdr(skb)->fin)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto found_fin_ok;
|
2008-07-26 12:43:18 +08:00
|
|
|
WARN_ON(!(flags & MSG_PEEK));
|
2005-04-17 06:20:36 +08:00
|
|
|
skb = skb->next;
|
|
|
|
} while (skb != (struct sk_buff *)&sk->sk_receive_queue);
|
|
|
|
|
|
|
|
/* Well, if we have backlog, try to process it now yet. */
|
|
|
|
|
|
|
|
if (copied >= target && !sk->sk_backlog.tail)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (copied) {
|
|
|
|
if (sk->sk_err ||
|
|
|
|
sk->sk_state == TCP_CLOSE ||
|
|
|
|
(sk->sk_shutdown & RCV_SHUTDOWN) ||
|
|
|
|
!timeo ||
|
|
|
|
signal_pending(current) ||
|
|
|
|
(flags & MSG_PEEK))
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
if (sock_flag(sk, SOCK_DONE))
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (sk->sk_err) {
|
|
|
|
copied = sock_error(sk);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (sk->sk_shutdown & RCV_SHUTDOWN)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (sk->sk_state == TCP_CLOSE) {
|
|
|
|
if (!sock_flag(sk, SOCK_DONE)) {
|
|
|
|
/* This occurs when user tries to read
|
|
|
|
* from never connected socket.
|
|
|
|
*/
|
|
|
|
copied = -ENOTCONN;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!timeo) {
|
|
|
|
copied = -EAGAIN;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (signal_pending(current)) {
|
|
|
|
copied = sock_intr_errno(timeo);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-05-24 09:00:16 +08:00
|
|
|
tcp_cleanup_rbuf(sk, copied);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2005-06-19 14:01:10 +08:00
|
|
|
if (!sysctl_tcp_low_latency && tp->ucopy.task == user_recv) {
|
2005-04-17 06:20:36 +08:00
|
|
|
/* Install new reader */
|
|
|
|
if (!user_recv && !(flags & (MSG_TRUNC | MSG_PEEK))) {
|
|
|
|
user_recv = current;
|
|
|
|
tp->ucopy.task = user_recv;
|
|
|
|
tp->ucopy.iov = msg->msg_iov;
|
|
|
|
}
|
|
|
|
|
|
|
|
tp->ucopy.len = len;
|
|
|
|
|
2008-07-26 12:43:18 +08:00
|
|
|
WARN_ON(tp->copied_seq != tp->rcv_nxt &&
|
|
|
|
!(flags & (MSG_PEEK | MSG_TRUNC)));
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* Ugly... If prequeue is not empty, we have to
|
|
|
|
* process it before releasing socket, otherwise
|
|
|
|
* order will be broken at second iteration.
|
|
|
|
* More elegant solution is required!!!
|
|
|
|
*
|
|
|
|
* Look: we have the following (pseudo)queues:
|
|
|
|
*
|
|
|
|
* 1. packets in flight
|
|
|
|
* 2. backlog
|
|
|
|
* 3. prequeue
|
|
|
|
* 4. receive_queue
|
|
|
|
*
|
|
|
|
* Each queue can be processed only if the next ones
|
|
|
|
* are empty. At this point we have empty receive_queue.
|
|
|
|
* But prequeue _can_ be not empty after 2nd iteration,
|
|
|
|
* when we jumped to start of loop because backlog
|
|
|
|
* processing added something to receive_queue.
|
|
|
|
* We cannot release_sock(), because backlog contains
|
|
|
|
* packets arrived _after_ prequeued ones.
|
|
|
|
*
|
|
|
|
* Shortly, algorithm is clear --- to process all
|
|
|
|
* the queues in order. We could make it more directly,
|
|
|
|
* requeueing packets from backlog to prequeue, if
|
|
|
|
* is not empty. It is more elegant, but eats cycles,
|
|
|
|
* unfortunately.
|
|
|
|
*/
|
2005-07-09 05:57:23 +08:00
|
|
|
if (!skb_queue_empty(&tp->ucopy.prequeue))
|
2005-04-17 06:20:36 +08:00
|
|
|
goto do_prequeue;
|
|
|
|
|
|
|
|
/* __ Set realtime policy in scheduler __ */
|
|
|
|
}
|
|
|
|
|
|
|
|
if (copied >= target) {
|
|
|
|
/* Do not sleep, just process backlog. */
|
|
|
|
release_sock(sk);
|
|
|
|
lock_sock(sk);
|
|
|
|
} else
|
|
|
|
sk_wait_data(sk, &timeo);
|
|
|
|
|
2006-05-24 09:05:53 +08:00
|
|
|
#ifdef CONFIG_NET_DMA
|
|
|
|
tp->ucopy.wakeup = 0;
|
|
|
|
#endif
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
if (user_recv) {
|
|
|
|
int chunk;
|
|
|
|
|
|
|
|
/* __ Restore normal policy in scheduler __ */
|
|
|
|
|
|
|
|
if ((chunk = len - tp->ucopy.len) != 0) {
|
2008-07-17 11:32:45 +08:00
|
|
|
NET_ADD_STATS_USER(sock_net(sk), LINUX_MIB_TCPDIRECTCOPYFROMBACKLOG, chunk);
|
2005-04-17 06:20:36 +08:00
|
|
|
len -= chunk;
|
|
|
|
copied += chunk;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tp->rcv_nxt == tp->copied_seq &&
|
2005-07-09 05:57:23 +08:00
|
|
|
!skb_queue_empty(&tp->ucopy.prequeue)) {
|
2005-04-17 06:20:36 +08:00
|
|
|
do_prequeue:
|
|
|
|
tcp_prequeue_process(sk);
|
|
|
|
|
|
|
|
if ((chunk = len - tp->ucopy.len) != 0) {
|
2008-07-17 11:32:45 +08:00
|
|
|
NET_ADD_STATS_USER(sock_net(sk), LINUX_MIB_TCPDIRECTCOPYFROMPREQUEUE, chunk);
|
2005-04-17 06:20:36 +08:00
|
|
|
len -= chunk;
|
|
|
|
copied += chunk;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ((flags & MSG_PEEK) && peek_seq != tp->copied_seq) {
|
|
|
|
if (net_ratelimit())
|
|
|
|
printk(KERN_DEBUG "TCP(%s:%d): Application bug, race in MSG_PEEK.\n",
|
2007-10-19 14:40:40 +08:00
|
|
|
current->comm, task_pid_nr(current));
|
2005-04-17 06:20:36 +08:00
|
|
|
peek_seq = tp->copied_seq;
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
|
|
|
|
found_ok_skb:
|
|
|
|
/* Ok so how much can we use? */
|
|
|
|
used = skb->len - offset;
|
|
|
|
if (len < used)
|
|
|
|
used = len;
|
|
|
|
|
|
|
|
/* Do we have urgent data here? */
|
|
|
|
if (tp->urg_data) {
|
|
|
|
u32 urg_offset = tp->urg_seq - *seq;
|
|
|
|
if (urg_offset < used) {
|
|
|
|
if (!urg_offset) {
|
|
|
|
if (!sock_flag(sk, SOCK_URGINLINE)) {
|
|
|
|
++*seq;
|
|
|
|
offset++;
|
|
|
|
used--;
|
|
|
|
if (!used)
|
|
|
|
goto skip_copy;
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
used = urg_offset;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!(flags & MSG_TRUNC)) {
|
2006-05-24 09:05:53 +08:00
|
|
|
#ifdef CONFIG_NET_DMA
|
|
|
|
if (!tp->ucopy.dma_chan && tp->ucopy.pinned_list)
|
|
|
|
tp->ucopy.dma_chan = get_softnet_dma();
|
|
|
|
|
|
|
|
if (tp->ucopy.dma_chan) {
|
|
|
|
tp->ucopy.dma_cookie = dma_skb_copy_datagram_iovec(
|
|
|
|
tp->ucopy.dma_chan, skb, offset,
|
|
|
|
msg->msg_iov, used,
|
|
|
|
tp->ucopy.pinned_list);
|
|
|
|
|
|
|
|
if (tp->ucopy.dma_cookie < 0) {
|
|
|
|
|
|
|
|
printk(KERN_ALERT "dma_cookie < 0\n");
|
|
|
|
|
|
|
|
/* Exception. Bailout! */
|
|
|
|
if (!copied)
|
|
|
|
copied = -EFAULT;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if ((offset + used) == skb->len)
|
|
|
|
copied_early = 1;
|
|
|
|
|
|
|
|
} else
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
err = skb_copy_datagram_iovec(skb, offset,
|
|
|
|
msg->msg_iov, used);
|
|
|
|
if (err) {
|
|
|
|
/* Exception. Bailout! */
|
|
|
|
if (!copied)
|
|
|
|
copied = -EFAULT;
|
|
|
|
break;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
*seq += used;
|
|
|
|
copied += used;
|
|
|
|
len -= used;
|
|
|
|
|
|
|
|
tcp_rcv_space_adjust(sk);
|
|
|
|
|
|
|
|
skip_copy:
|
|
|
|
if (tp->urg_data && after(tp->copied_seq, tp->urg_seq)) {
|
|
|
|
tp->urg_data = 0;
|
[TCP]: Sed magic converts func(sk, tp, ...) -> func(sk, ...)
This is (mostly) automated change using magic:
sed -e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e 's|struct sock \*sk,[\n\t ]*struct tcp_sock \*tp\([^{]*\n{\n\)|
struct sock \*sk\1\tstruct tcp_sock *tp = tcp_sk(sk);\n|g'
-e 's|struct sock \*sk, struct tcp_sock \*tp|
struct sock \*sk|g' -e 's|sk, tp\([^-]\)|sk\1|g'
Fixed four unused variable (tp) warnings that were introduced.
In addition, manually added newlines after local variables and
tweaked function arguments positioning.
$ gcc --version
gcc (GCC) 4.1.1 20060525 (Red Hat 4.1.1-1)
...
$ codiff -fV built-in.o.old built-in.o.new
net/ipv4/route.c:
rt_cache_flush | +14
1 function changed, 14 bytes added
net/ipv4/tcp.c:
tcp_setsockopt | -5
tcp_sendpage | -25
tcp_sendmsg | -16
3 functions changed, 46 bytes removed
net/ipv4/tcp_input.c:
tcp_try_undo_recovery | +3
tcp_try_undo_dsack | +2
tcp_mark_head_lost | -12
tcp_ack | -15
tcp_event_data_recv | -32
tcp_rcv_state_process | -10
tcp_rcv_established | +1
7 functions changed, 6 bytes added, 69 bytes removed, diff: -63
net/ipv4/tcp_output.c:
update_send_head | -9
tcp_transmit_skb | +19
tcp_cwnd_validate | +1
tcp_write_wakeup | -17
__tcp_push_pending_frames | -25
tcp_push_one | -8
tcp_send_fin | -4
7 functions changed, 20 bytes added, 63 bytes removed, diff: -43
built-in.o.new:
18 functions changed, 40 bytes added, 178 bytes removed, diff: -138
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-21 13:18:02 +08:00
|
|
|
tcp_fast_path_check(sk);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (used + offset < skb->len)
|
|
|
|
continue;
|
|
|
|
|
2007-04-11 12:04:22 +08:00
|
|
|
if (tcp_hdr(skb)->fin)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto found_fin_ok;
|
2006-05-24 09:05:53 +08:00
|
|
|
if (!(flags & MSG_PEEK)) {
|
|
|
|
sk_eat_skb(sk, skb, copied_early);
|
|
|
|
copied_early = 0;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
continue;
|
|
|
|
|
|
|
|
found_fin_ok:
|
|
|
|
/* Process the FIN. */
|
|
|
|
++*seq;
|
2006-05-24 09:05:53 +08:00
|
|
|
if (!(flags & MSG_PEEK)) {
|
|
|
|
sk_eat_skb(sk, skb, copied_early);
|
|
|
|
copied_early = 0;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
break;
|
|
|
|
} while (len > 0);
|
|
|
|
|
|
|
|
if (user_recv) {
|
2005-07-09 05:57:23 +08:00
|
|
|
if (!skb_queue_empty(&tp->ucopy.prequeue)) {
|
2005-04-17 06:20:36 +08:00
|
|
|
int chunk;
|
|
|
|
|
|
|
|
tp->ucopy.len = copied > 0 ? len : 0;
|
|
|
|
|
|
|
|
tcp_prequeue_process(sk);
|
|
|
|
|
|
|
|
if (copied > 0 && (chunk = len - tp->ucopy.len) != 0) {
|
2008-07-17 11:32:45 +08:00
|
|
|
NET_ADD_STATS_USER(sock_net(sk), LINUX_MIB_TCPDIRECTCOPYFROMPREQUEUE, chunk);
|
2005-04-17 06:20:36 +08:00
|
|
|
len -= chunk;
|
|
|
|
copied += chunk;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
tp->ucopy.task = NULL;
|
|
|
|
tp->ucopy.len = 0;
|
|
|
|
}
|
|
|
|
|
2006-05-24 09:05:53 +08:00
|
|
|
#ifdef CONFIG_NET_DMA
|
|
|
|
if (tp->ucopy.dma_chan) {
|
|
|
|
dma_cookie_t done, used;
|
|
|
|
|
|
|
|
dma_async_memcpy_issue_pending(tp->ucopy.dma_chan);
|
|
|
|
|
|
|
|
while (dma_async_memcpy_complete(tp->ucopy.dma_chan,
|
2007-02-09 22:24:47 +08:00
|
|
|
tp->ucopy.dma_cookie, &done,
|
|
|
|
&used) == DMA_IN_PROGRESS) {
|
2006-05-24 09:05:53 +08:00
|
|
|
/* do partial cleanup of sk_async_wait_queue */
|
|
|
|
while ((skb = skb_peek(&sk->sk_async_wait_queue)) &&
|
|
|
|
(dma_async_is_complete(skb->dma_cookie, done,
|
2007-02-09 22:24:47 +08:00
|
|
|
used) == DMA_SUCCESS)) {
|
2006-05-24 09:05:53 +08:00
|
|
|
__skb_dequeue(&sk->sk_async_wait_queue);
|
|
|
|
kfree_skb(skb);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Safe to free early-copied skbs now */
|
|
|
|
__skb_queue_purge(&sk->sk_async_wait_queue);
|
|
|
|
dma_chan_put(tp->ucopy.dma_chan);
|
|
|
|
tp->ucopy.dma_chan = NULL;
|
|
|
|
}
|
|
|
|
if (tp->ucopy.pinned_list) {
|
|
|
|
dma_unpin_iovec_pages(tp->ucopy.pinned_list);
|
|
|
|
tp->ucopy.pinned_list = NULL;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* According to UNIX98, msg_name/msg_namelen are ignored
|
|
|
|
* on connected socket. I was just happy when found this 8) --ANK
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Clean up data we have read: This will do ACK frames. */
|
2006-05-24 09:00:16 +08:00
|
|
|
tcp_cleanup_rbuf(sk, copied);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
TCP_CHECK_TIMER(sk);
|
|
|
|
release_sock(sk);
|
|
|
|
return copied;
|
|
|
|
|
|
|
|
out:
|
|
|
|
TCP_CHECK_TIMER(sk);
|
|
|
|
release_sock(sk);
|
|
|
|
return err;
|
|
|
|
|
|
|
|
recv_urg:
|
|
|
|
err = tcp_recv_urg(sk, timeo, msg, len, flags, addr_len);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
[TCP]: Uninline tcp_set_state
net/ipv4/tcp.c:
tcp_close_state | -226
tcp_done | -145
tcp_close | -564
tcp_disconnect | -141
4 functions changed, 1076 bytes removed, diff: -1076
net/ipv4/tcp_input.c:
tcp_fin | -86
tcp_rcv_state_process | -164
2 functions changed, 250 bytes removed, diff: -250
net/ipv4/tcp_ipv4.c:
tcp_v4_connect | -209
1 function changed, 209 bytes removed, diff: -209
net/ipv4/arp.c:
arp_ignore | +5
1 function changed, 5 bytes added, diff: +5
net/ipv6/tcp_ipv6.c:
tcp_v6_connect | -158
1 function changed, 158 bytes removed, diff: -158
net/sunrpc/xprtsock.c:
xs_sendpages | -2
1 function changed, 2 bytes removed, diff: -2
net/dccp/ccids/ccid3.c:
ccid3_update_send_interval | +7
1 function changed, 7 bytes added, diff: +7
net/ipv4/tcp.c:
tcp_set_state | +238
1 function changed, 238 bytes added, diff: +238
built-in.o:
12 functions changed, 250 bytes added, 1695 bytes removed, diff: -1445
I've no explanation why some unrelated changes seem to occur
consistently as well (arp_ignore, ccid3_update_send_interval;
I checked the arp_ignore asm and it seems to be due to some
reordered of operation order causing some extra opcodes to be
generated). Still, the benefits are pretty obvious from the
codiff's results.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-01-12 19:17:20 +08:00
|
|
|
void tcp_set_state(struct sock *sk, int state)
|
|
|
|
{
|
|
|
|
int oldstate = sk->sk_state;
|
|
|
|
|
|
|
|
switch (state) {
|
|
|
|
case TCP_ESTABLISHED:
|
|
|
|
if (oldstate != TCP_ESTABLISHED)
|
2008-07-17 11:22:04 +08:00
|
|
|
TCP_INC_STATS(sock_net(sk), TCP_MIB_CURRESTAB);
|
[TCP]: Uninline tcp_set_state
net/ipv4/tcp.c:
tcp_close_state | -226
tcp_done | -145
tcp_close | -564
tcp_disconnect | -141
4 functions changed, 1076 bytes removed, diff: -1076
net/ipv4/tcp_input.c:
tcp_fin | -86
tcp_rcv_state_process | -164
2 functions changed, 250 bytes removed, diff: -250
net/ipv4/tcp_ipv4.c:
tcp_v4_connect | -209
1 function changed, 209 bytes removed, diff: -209
net/ipv4/arp.c:
arp_ignore | +5
1 function changed, 5 bytes added, diff: +5
net/ipv6/tcp_ipv6.c:
tcp_v6_connect | -158
1 function changed, 158 bytes removed, diff: -158
net/sunrpc/xprtsock.c:
xs_sendpages | -2
1 function changed, 2 bytes removed, diff: -2
net/dccp/ccids/ccid3.c:
ccid3_update_send_interval | +7
1 function changed, 7 bytes added, diff: +7
net/ipv4/tcp.c:
tcp_set_state | +238
1 function changed, 238 bytes added, diff: +238
built-in.o:
12 functions changed, 250 bytes added, 1695 bytes removed, diff: -1445
I've no explanation why some unrelated changes seem to occur
consistently as well (arp_ignore, ccid3_update_send_interval;
I checked the arp_ignore asm and it seems to be due to some
reordered of operation order causing some extra opcodes to be
generated). Still, the benefits are pretty obvious from the
codiff's results.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-01-12 19:17:20 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
case TCP_CLOSE:
|
|
|
|
if (oldstate == TCP_CLOSE_WAIT || oldstate == TCP_ESTABLISHED)
|
2008-07-17 11:22:04 +08:00
|
|
|
TCP_INC_STATS(sock_net(sk), TCP_MIB_ESTABRESETS);
|
[TCP]: Uninline tcp_set_state
net/ipv4/tcp.c:
tcp_close_state | -226
tcp_done | -145
tcp_close | -564
tcp_disconnect | -141
4 functions changed, 1076 bytes removed, diff: -1076
net/ipv4/tcp_input.c:
tcp_fin | -86
tcp_rcv_state_process | -164
2 functions changed, 250 bytes removed, diff: -250
net/ipv4/tcp_ipv4.c:
tcp_v4_connect | -209
1 function changed, 209 bytes removed, diff: -209
net/ipv4/arp.c:
arp_ignore | +5
1 function changed, 5 bytes added, diff: +5
net/ipv6/tcp_ipv6.c:
tcp_v6_connect | -158
1 function changed, 158 bytes removed, diff: -158
net/sunrpc/xprtsock.c:
xs_sendpages | -2
1 function changed, 2 bytes removed, diff: -2
net/dccp/ccids/ccid3.c:
ccid3_update_send_interval | +7
1 function changed, 7 bytes added, diff: +7
net/ipv4/tcp.c:
tcp_set_state | +238
1 function changed, 238 bytes added, diff: +238
built-in.o:
12 functions changed, 250 bytes added, 1695 bytes removed, diff: -1445
I've no explanation why some unrelated changes seem to occur
consistently as well (arp_ignore, ccid3_update_send_interval;
I checked the arp_ignore asm and it seems to be due to some
reordered of operation order causing some extra opcodes to be
generated). Still, the benefits are pretty obvious from the
codiff's results.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-01-12 19:17:20 +08:00
|
|
|
|
|
|
|
sk->sk_prot->unhash(sk);
|
|
|
|
if (inet_csk(sk)->icsk_bind_hash &&
|
|
|
|
!(sk->sk_userlocks & SOCK_BINDPORT_LOCK))
|
[SOCK] proto: Add hashinfo member to struct proto
This way we can remove TCP and DCCP specific versions of
sk->sk_prot->get_port: both v4 and v6 use inet_csk_get_port
sk->sk_prot->hash: inet_hash is directly used, only v6 need
a specific version to deal with mapped sockets
sk->sk_prot->unhash: both v4 and v6 use inet_hash directly
struct inet_connection_sock_af_ops also gets a new member, bind_conflict, so
that inet_csk_get_port can find the per family routine.
Now only the lookup routines receive as a parameter a struct inet_hashtable.
With this we further reuse code, reducing the difference among INET transport
protocols.
Eventually work has to be done on UDP and SCTP to make them share this
infrastructure and get as a bonus inet_diag interfaces so that iproute can be
used with these protocols.
net-2.6/net/ipv4/inet_hashtables.c:
struct proto | +8
struct inet_connection_sock_af_ops | +8
2 structs changed
__inet_hash_nolisten | +18
__inet_hash | -210
inet_put_port | +8
inet_bind_bucket_create | +1
__inet_hash_connect | -8
5 functions changed, 27 bytes added, 218 bytes removed, diff: -191
net-2.6/net/core/sock.c:
proto_seq_show | +3
1 function changed, 3 bytes added, diff: +3
net-2.6/net/ipv4/inet_connection_sock.c:
inet_csk_get_port | +15
1 function changed, 15 bytes added, diff: +15
net-2.6/net/ipv4/tcp.c:
tcp_set_state | -7
1 function changed, 7 bytes removed, diff: -7
net-2.6/net/ipv4/tcp_ipv4.c:
tcp_v4_get_port | -31
tcp_v4_hash | -48
tcp_v4_destroy_sock | -7
tcp_v4_syn_recv_sock | -2
tcp_unhash | -179
5 functions changed, 267 bytes removed, diff: -267
net-2.6/net/ipv6/inet6_hashtables.c:
__inet6_hash | +8
1 function changed, 8 bytes added, diff: +8
net-2.6/net/ipv4/inet_hashtables.c:
inet_unhash | +190
inet_hash | +242
2 functions changed, 432 bytes added, diff: +432
vmlinux:
16 functions changed, 485 bytes added, 492 bytes removed, diff: -7
/home/acme/git/net-2.6/net/ipv6/tcp_ipv6.c:
tcp_v6_get_port | -31
tcp_v6_hash | -7
tcp_v6_syn_recv_sock | -9
3 functions changed, 47 bytes removed, diff: -47
/home/acme/git/net-2.6/net/dccp/proto.c:
dccp_destroy_sock | -7
dccp_unhash | -179
dccp_hash | -49
dccp_set_state | -7
dccp_done | +1
5 functions changed, 1 bytes added, 242 bytes removed, diff: -241
/home/acme/git/net-2.6/net/dccp/ipv4.c:
dccp_v4_get_port | -31
dccp_v4_request_recv_sock | -2
2 functions changed, 33 bytes removed, diff: -33
/home/acme/git/net-2.6/net/dccp/ipv6.c:
dccp_v6_get_port | -31
dccp_v6_hash | -7
dccp_v6_request_recv_sock | +5
3 functions changed, 5 bytes added, 38 bytes removed, diff: -33
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-02-03 20:06:04 +08:00
|
|
|
inet_put_port(sk);
|
[TCP]: Uninline tcp_set_state
net/ipv4/tcp.c:
tcp_close_state | -226
tcp_done | -145
tcp_close | -564
tcp_disconnect | -141
4 functions changed, 1076 bytes removed, diff: -1076
net/ipv4/tcp_input.c:
tcp_fin | -86
tcp_rcv_state_process | -164
2 functions changed, 250 bytes removed, diff: -250
net/ipv4/tcp_ipv4.c:
tcp_v4_connect | -209
1 function changed, 209 bytes removed, diff: -209
net/ipv4/arp.c:
arp_ignore | +5
1 function changed, 5 bytes added, diff: +5
net/ipv6/tcp_ipv6.c:
tcp_v6_connect | -158
1 function changed, 158 bytes removed, diff: -158
net/sunrpc/xprtsock.c:
xs_sendpages | -2
1 function changed, 2 bytes removed, diff: -2
net/dccp/ccids/ccid3.c:
ccid3_update_send_interval | +7
1 function changed, 7 bytes added, diff: +7
net/ipv4/tcp.c:
tcp_set_state | +238
1 function changed, 238 bytes added, diff: +238
built-in.o:
12 functions changed, 250 bytes added, 1695 bytes removed, diff: -1445
I've no explanation why some unrelated changes seem to occur
consistently as well (arp_ignore, ccid3_update_send_interval;
I checked the arp_ignore asm and it seems to be due to some
reordered of operation order causing some extra opcodes to be
generated). Still, the benefits are pretty obvious from the
codiff's results.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-01-12 19:17:20 +08:00
|
|
|
/* fall through */
|
|
|
|
default:
|
|
|
|
if (oldstate==TCP_ESTABLISHED)
|
2008-07-17 11:22:46 +08:00
|
|
|
TCP_DEC_STATS(sock_net(sk), TCP_MIB_CURRESTAB);
|
[TCP]: Uninline tcp_set_state
net/ipv4/tcp.c:
tcp_close_state | -226
tcp_done | -145
tcp_close | -564
tcp_disconnect | -141
4 functions changed, 1076 bytes removed, diff: -1076
net/ipv4/tcp_input.c:
tcp_fin | -86
tcp_rcv_state_process | -164
2 functions changed, 250 bytes removed, diff: -250
net/ipv4/tcp_ipv4.c:
tcp_v4_connect | -209
1 function changed, 209 bytes removed, diff: -209
net/ipv4/arp.c:
arp_ignore | +5
1 function changed, 5 bytes added, diff: +5
net/ipv6/tcp_ipv6.c:
tcp_v6_connect | -158
1 function changed, 158 bytes removed, diff: -158
net/sunrpc/xprtsock.c:
xs_sendpages | -2
1 function changed, 2 bytes removed, diff: -2
net/dccp/ccids/ccid3.c:
ccid3_update_send_interval | +7
1 function changed, 7 bytes added, diff: +7
net/ipv4/tcp.c:
tcp_set_state | +238
1 function changed, 238 bytes added, diff: +238
built-in.o:
12 functions changed, 250 bytes added, 1695 bytes removed, diff: -1445
I've no explanation why some unrelated changes seem to occur
consistently as well (arp_ignore, ccid3_update_send_interval;
I checked the arp_ignore asm and it seems to be due to some
reordered of operation order causing some extra opcodes to be
generated). Still, the benefits are pretty obvious from the
codiff's results.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-01-12 19:17:20 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Change state AFTER socket is unhashed to avoid closed
|
|
|
|
* socket sitting in hash tables.
|
|
|
|
*/
|
|
|
|
sk->sk_state = state;
|
|
|
|
|
|
|
|
#ifdef STATE_TRACE
|
|
|
|
SOCK_DEBUG(sk, "TCP sk=%p, State %s -> %s\n",sk, statename[oldstate],statename[state]);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(tcp_set_state);
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
* State processing on a close. This implements the state shift for
|
|
|
|
* sending our FIN frame. Note that we only send a FIN for some
|
|
|
|
* states. A shutdown() may have already sent the FIN, or we may be
|
|
|
|
* closed.
|
|
|
|
*/
|
|
|
|
|
2005-11-30 08:21:38 +08:00
|
|
|
static const unsigned char new_state[16] = {
|
2005-04-17 06:20:36 +08:00
|
|
|
/* current state: new state: action: */
|
|
|
|
/* (Invalid) */ TCP_CLOSE,
|
|
|
|
/* TCP_ESTABLISHED */ TCP_FIN_WAIT1 | TCP_ACTION_FIN,
|
|
|
|
/* TCP_SYN_SENT */ TCP_CLOSE,
|
|
|
|
/* TCP_SYN_RECV */ TCP_FIN_WAIT1 | TCP_ACTION_FIN,
|
|
|
|
/* TCP_FIN_WAIT1 */ TCP_FIN_WAIT1,
|
|
|
|
/* TCP_FIN_WAIT2 */ TCP_FIN_WAIT2,
|
|
|
|
/* TCP_TIME_WAIT */ TCP_CLOSE,
|
|
|
|
/* TCP_CLOSE */ TCP_CLOSE,
|
|
|
|
/* TCP_CLOSE_WAIT */ TCP_LAST_ACK | TCP_ACTION_FIN,
|
|
|
|
/* TCP_LAST_ACK */ TCP_LAST_ACK,
|
|
|
|
/* TCP_LISTEN */ TCP_CLOSE,
|
|
|
|
/* TCP_CLOSING */ TCP_CLOSING,
|
|
|
|
};
|
|
|
|
|
|
|
|
static int tcp_close_state(struct sock *sk)
|
|
|
|
{
|
|
|
|
int next = (int)new_state[sk->sk_state];
|
|
|
|
int ns = next & TCP_STATE_MASK;
|
|
|
|
|
|
|
|
tcp_set_state(sk, ns);
|
|
|
|
|
|
|
|
return next & TCP_ACTION_FIN;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Shutdown the sending side of a connection. Much like close except
|
2008-04-21 17:27:58 +08:00
|
|
|
* that we don't receive shut down or sock_set_flag(sk, SOCK_DEAD).
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
|
|
|
|
|
|
|
void tcp_shutdown(struct sock *sk, int how)
|
|
|
|
{
|
|
|
|
/* We need to grab some memory, and put together a FIN,
|
|
|
|
* and then put it into the queue to be sent.
|
|
|
|
* Tim MacKenzie(tym@dibbler.cs.monash.edu.au) 4 Dec '92.
|
|
|
|
*/
|
|
|
|
if (!(how & SEND_SHUTDOWN))
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* If we've already sent a FIN, or it's a closed state, skip this. */
|
|
|
|
if ((1 << sk->sk_state) &
|
|
|
|
(TCPF_ESTABLISHED | TCPF_SYN_SENT |
|
|
|
|
TCPF_SYN_RECV | TCPF_CLOSE_WAIT)) {
|
|
|
|
/* Clear out any half completed packets. FIN if needed. */
|
|
|
|
if (tcp_close_state(sk))
|
|
|
|
tcp_send_fin(sk);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void tcp_close(struct sock *sk, long timeout)
|
|
|
|
{
|
|
|
|
struct sk_buff *skb;
|
|
|
|
int data_was_unread = 0;
|
2006-05-04 14:31:35 +08:00
|
|
|
int state;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
lock_sock(sk);
|
|
|
|
sk->sk_shutdown = SHUTDOWN_MASK;
|
|
|
|
|
|
|
|
if (sk->sk_state == TCP_LISTEN) {
|
|
|
|
tcp_set_state(sk, TCP_CLOSE);
|
|
|
|
|
|
|
|
/* Special case. */
|
2005-08-10 11:11:41 +08:00
|
|
|
inet_csk_listen_stop(sk);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
goto adjudge_to_death;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We need to flush the recv. buffs. We do this only on the
|
|
|
|
* descriptor close, not protocol-sourced closes, because the
|
|
|
|
* reader process may not have drained the data yet!
|
|
|
|
*/
|
|
|
|
while ((skb = __skb_dequeue(&sk->sk_receive_queue)) != NULL) {
|
|
|
|
u32 len = TCP_SKB_CB(skb)->end_seq - TCP_SKB_CB(skb)->seq -
|
2007-04-11 12:04:22 +08:00
|
|
|
tcp_hdr(skb)->fin;
|
2005-04-17 06:20:36 +08:00
|
|
|
data_was_unread += len;
|
|
|
|
__kfree_skb(skb);
|
|
|
|
}
|
|
|
|
|
2007-12-31 16:11:19 +08:00
|
|
|
sk_mem_reclaim(sk);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-04-29 12:21:46 +08:00
|
|
|
/* As outlined in RFC 2525, section 2.17, we send a RST here because
|
|
|
|
* data was lost. To witness the awful effects of the old behavior of
|
|
|
|
* always doing a FIN, run an older 2.1.x kernel or 2.0.x, start a bulk
|
|
|
|
* GET in an FTP client, suspend the process, wait for the client to
|
|
|
|
* advertise a zero window, then kill -9 the FTP client, wheee...
|
|
|
|
* Note: timeout is always zero in such a case.
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
|
|
|
if (data_was_unread) {
|
|
|
|
/* Unread data was tossed, zap the connection. */
|
2008-07-17 11:31:39 +08:00
|
|
|
NET_INC_STATS_USER(sock_net(sk), LINUX_MIB_TCPABORTONCLOSE);
|
2005-04-17 06:20:36 +08:00
|
|
|
tcp_set_state(sk, TCP_CLOSE);
|
|
|
|
tcp_send_active_reset(sk, GFP_KERNEL);
|
|
|
|
} else if (sock_flag(sk, SOCK_LINGER) && !sk->sk_lingertime) {
|
|
|
|
/* Check zero linger _after_ checking for unread data. */
|
|
|
|
sk->sk_prot->disconnect(sk, 0);
|
2008-07-17 11:31:39 +08:00
|
|
|
NET_INC_STATS_USER(sock_net(sk), LINUX_MIB_TCPABORTONDATA);
|
2005-04-17 06:20:36 +08:00
|
|
|
} else if (tcp_close_state(sk)) {
|
|
|
|
/* We FIN if the application ate all the data before
|
|
|
|
* zapping the connection.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* RED-PEN. Formally speaking, we have broken TCP state
|
|
|
|
* machine. State transitions:
|
|
|
|
*
|
|
|
|
* TCP_ESTABLISHED -> TCP_FIN_WAIT1
|
|
|
|
* TCP_SYN_RECV -> TCP_FIN_WAIT1 (forget it, it's impossible)
|
|
|
|
* TCP_CLOSE_WAIT -> TCP_LAST_ACK
|
|
|
|
*
|
|
|
|
* are legal only when FIN has been sent (i.e. in window),
|
|
|
|
* rather than queued out of window. Purists blame.
|
|
|
|
*
|
|
|
|
* F.e. "RFC state" is ESTABLISHED,
|
|
|
|
* if Linux state is FIN-WAIT-1, but FIN is still not sent.
|
|
|
|
*
|
|
|
|
* The visible declinations are that sometimes
|
|
|
|
* we enter time-wait state, when it is not required really
|
|
|
|
* (harmless), do not send active resets, when they are
|
|
|
|
* required by specs (TCP_ESTABLISHED, TCP_CLOSE_WAIT, when
|
|
|
|
* they look as CLOSING or LAST_ACK for Linux)
|
|
|
|
* Probably, I missed some more holelets.
|
|
|
|
* --ANK
|
|
|
|
*/
|
|
|
|
tcp_send_fin(sk);
|
|
|
|
}
|
|
|
|
|
|
|
|
sk_stream_wait_close(sk, timeout);
|
|
|
|
|
|
|
|
adjudge_to_death:
|
2006-05-04 14:31:35 +08:00
|
|
|
state = sk->sk_state;
|
|
|
|
sock_hold(sk);
|
|
|
|
sock_orphan(sk);
|
|
|
|
atomic_inc(sk->sk_prot->orphan_count);
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* It is the last release_sock in its life. It will remove backlog. */
|
|
|
|
release_sock(sk);
|
|
|
|
|
|
|
|
|
|
|
|
/* Now socket is owned by kernel and we acquire BH lock
|
|
|
|
to finish close. No need to check for user refs.
|
|
|
|
*/
|
|
|
|
local_bh_disable();
|
|
|
|
bh_lock_sock(sk);
|
2008-07-26 12:43:18 +08:00
|
|
|
WARN_ON(sock_owned_by_user(sk));
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-05-04 14:31:35 +08:00
|
|
|
/* Have we already been destroyed by a softirq or backlog? */
|
|
|
|
if (state != TCP_CLOSE && sk->sk_state == TCP_CLOSE)
|
|
|
|
goto out;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* This is a (useful) BSD violating of the RFC. There is a
|
|
|
|
* problem with TCP as specified in that the other end could
|
|
|
|
* keep a socket open forever with no application left this end.
|
|
|
|
* We use a 3 minute timeout (about the same as BSD) then kill
|
|
|
|
* our end. If they send after that then tough - BUT: long enough
|
|
|
|
* that we won't make the old 4*rto = almost no time - whoops
|
|
|
|
* reset mistake.
|
|
|
|
*
|
|
|
|
* Nope, it was not mistake. It is really desired behaviour
|
|
|
|
* f.e. on http servers, when such sockets are useless, but
|
|
|
|
* consume significant resources. Let's do it with special
|
|
|
|
* linger2 option. --ANK
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (sk->sk_state == TCP_FIN_WAIT2) {
|
|
|
|
struct tcp_sock *tp = tcp_sk(sk);
|
|
|
|
if (tp->linger2 < 0) {
|
|
|
|
tcp_set_state(sk, TCP_CLOSE);
|
|
|
|
tcp_send_active_reset(sk, GFP_ATOMIC);
|
2008-07-17 11:31:16 +08:00
|
|
|
NET_INC_STATS_BH(sock_net(sk),
|
|
|
|
LINUX_MIB_TCPABORTONLINGER);
|
2005-04-17 06:20:36 +08:00
|
|
|
} else {
|
2005-08-10 11:10:42 +08:00
|
|
|
const int tmo = tcp_fin_time(sk);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (tmo > TCP_TIMEWAIT_LEN) {
|
2006-08-01 13:32:09 +08:00
|
|
|
inet_csk_reset_keepalive_timer(sk,
|
|
|
|
tmo - TCP_TIMEWAIT_LEN);
|
2005-04-17 06:20:36 +08:00
|
|
|
} else {
|
|
|
|
tcp_time_wait(sk, TCP_FIN_WAIT2, tmo);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (sk->sk_state != TCP_CLOSE) {
|
2007-12-31 16:11:19 +08:00
|
|
|
sk_mem_reclaim(sk);
|
2007-05-30 04:19:18 +08:00
|
|
|
if (tcp_too_many_orphans(sk,
|
|
|
|
atomic_read(sk->sk_prot->orphan_count))) {
|
2005-04-17 06:20:36 +08:00
|
|
|
if (net_ratelimit())
|
|
|
|
printk(KERN_INFO "TCP: too many of orphaned "
|
|
|
|
"sockets\n");
|
|
|
|
tcp_set_state(sk, TCP_CLOSE);
|
|
|
|
tcp_send_active_reset(sk, GFP_ATOMIC);
|
2008-07-17 11:31:16 +08:00
|
|
|
NET_INC_STATS_BH(sock_net(sk),
|
|
|
|
LINUX_MIB_TCPABORTONMEMORY);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (sk->sk_state == TCP_CLOSE)
|
2005-08-10 11:11:41 +08:00
|
|
|
inet_csk_destroy_sock(sk);
|
2005-04-17 06:20:36 +08:00
|
|
|
/* Otherwise, socket is reprieved until protocol close. */
|
|
|
|
|
|
|
|
out:
|
|
|
|
bh_unlock_sock(sk);
|
|
|
|
local_bh_enable();
|
|
|
|
sock_put(sk);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* These states need RST on ABORT according to RFC793 */
|
|
|
|
|
|
|
|
static inline int tcp_need_reset(int state)
|
|
|
|
{
|
|
|
|
return (1 << state) &
|
|
|
|
(TCPF_ESTABLISHED | TCPF_CLOSE_WAIT | TCPF_FIN_WAIT1 |
|
|
|
|
TCPF_FIN_WAIT2 | TCPF_SYN_RECV);
|
|
|
|
}
|
|
|
|
|
|
|
|
int tcp_disconnect(struct sock *sk, int flags)
|
|
|
|
{
|
|
|
|
struct inet_sock *inet = inet_sk(sk);
|
2005-08-10 11:10:42 +08:00
|
|
|
struct inet_connection_sock *icsk = inet_csk(sk);
|
2005-04-17 06:20:36 +08:00
|
|
|
struct tcp_sock *tp = tcp_sk(sk);
|
|
|
|
int err = 0;
|
|
|
|
int old_state = sk->sk_state;
|
|
|
|
|
|
|
|
if (old_state != TCP_CLOSE)
|
|
|
|
tcp_set_state(sk, TCP_CLOSE);
|
|
|
|
|
|
|
|
/* ABORT function of RFC793 */
|
|
|
|
if (old_state == TCP_LISTEN) {
|
2005-08-10 11:11:41 +08:00
|
|
|
inet_csk_listen_stop(sk);
|
2005-04-17 06:20:36 +08:00
|
|
|
} else if (tcp_need_reset(old_state) ||
|
|
|
|
(tp->snd_nxt != tp->write_seq &&
|
|
|
|
(1 << old_state) & (TCPF_CLOSING | TCPF_LAST_ACK))) {
|
2005-11-11 09:13:47 +08:00
|
|
|
/* The last check adjusts for discrepancy of Linux wrt. RFC
|
2005-04-17 06:20:36 +08:00
|
|
|
* states
|
|
|
|
*/
|
|
|
|
tcp_send_active_reset(sk, gfp_any());
|
|
|
|
sk->sk_err = ECONNRESET;
|
|
|
|
} else if (old_state == TCP_SYN_SENT)
|
|
|
|
sk->sk_err = ECONNRESET;
|
|
|
|
|
|
|
|
tcp_clear_xmit_timers(sk);
|
|
|
|
__skb_queue_purge(&sk->sk_receive_queue);
|
2007-03-08 04:12:44 +08:00
|
|
|
tcp_write_queue_purge(sk);
|
2005-04-17 06:20:36 +08:00
|
|
|
__skb_queue_purge(&tp->out_of_order_queue);
|
2006-05-24 09:05:53 +08:00
|
|
|
#ifdef CONFIG_NET_DMA
|
|
|
|
__skb_queue_purge(&sk->sk_async_wait_queue);
|
|
|
|
#endif
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
inet->dport = 0;
|
|
|
|
|
|
|
|
if (!(sk->sk_userlocks & SOCK_BINDADDR_LOCK))
|
|
|
|
inet_reset_saddr(sk);
|
|
|
|
|
|
|
|
sk->sk_shutdown = 0;
|
|
|
|
sock_reset_flag(sk, SOCK_DONE);
|
|
|
|
tp->srtt = 0;
|
|
|
|
if ((tp->write_seq += tp->max_window + 2) == 0)
|
|
|
|
tp->write_seq = 1;
|
2005-08-10 11:10:42 +08:00
|
|
|
icsk->icsk_backoff = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
tp->snd_cwnd = 2;
|
2005-08-10 15:03:31 +08:00
|
|
|
icsk->icsk_probes_out = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
tp->packets_out = 0;
|
|
|
|
tp->snd_ssthresh = 0x7fffffff;
|
|
|
|
tp->snd_cwnd_cnt = 0;
|
2005-11-11 09:09:53 +08:00
|
|
|
tp->bytes_acked = 0;
|
2005-08-10 15:03:31 +08:00
|
|
|
tcp_set_ca_state(sk, TCP_CA_Open);
|
2005-04-17 06:20:36 +08:00
|
|
|
tcp_clear_retrans(tp);
|
2005-08-10 11:10:42 +08:00
|
|
|
inet_csk_delack_init(sk);
|
2007-03-08 04:12:44 +08:00
|
|
|
tcp_init_send_head(sk);
|
2007-05-04 08:32:28 +08:00
|
|
|
memset(&tp->rx_opt, 0, sizeof(tp->rx_opt));
|
2005-04-17 06:20:36 +08:00
|
|
|
__sk_dst_reset(sk);
|
|
|
|
|
2008-07-26 12:43:18 +08:00
|
|
|
WARN_ON(inet->num && !icsk->icsk_bind_hash);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
sk->sk_error_report(sk);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Socket option code for TCP.
|
|
|
|
*/
|
2006-03-21 14:45:21 +08:00
|
|
|
static int do_tcp_setsockopt(struct sock *sk, int level,
|
|
|
|
int optname, char __user *optval, int optlen)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct tcp_sock *tp = tcp_sk(sk);
|
2005-08-10 11:10:42 +08:00
|
|
|
struct inet_connection_sock *icsk = inet_csk(sk);
|
2005-04-17 06:20:36 +08:00
|
|
|
int val;
|
|
|
|
int err = 0;
|
|
|
|
|
2005-06-24 11:37:36 +08:00
|
|
|
/* This is a string value all the others are int's */
|
|
|
|
if (optname == TCP_CONGESTION) {
|
|
|
|
char name[TCP_CA_NAME_MAX];
|
|
|
|
|
|
|
|
if (optlen < 1)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
val = strncpy_from_user(name, optval,
|
|
|
|
min(TCP_CA_NAME_MAX-1, optlen));
|
|
|
|
if (val < 0)
|
|
|
|
return -EFAULT;
|
|
|
|
name[val] = 0;
|
|
|
|
|
|
|
|
lock_sock(sk);
|
2005-08-10 15:03:31 +08:00
|
|
|
err = tcp_set_congestion_control(sk, name);
|
2005-06-24 11:37:36 +08:00
|
|
|
release_sock(sk);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
if (optlen < sizeof(int))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (get_user(val, (int __user *)optval))
|
|
|
|
return -EFAULT;
|
|
|
|
|
|
|
|
lock_sock(sk);
|
|
|
|
|
|
|
|
switch (optname) {
|
|
|
|
case TCP_MAXSEG:
|
|
|
|
/* Values greater than interface MTU won't take effect. However
|
|
|
|
* at the point when this call is done we typically don't yet
|
|
|
|
* know which interface is going to be used */
|
|
|
|
if (val < 8 || val > MAX_TCP_WINDOW) {
|
|
|
|
err = -EINVAL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
tp->rx_opt.user_mss = val;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TCP_NODELAY:
|
|
|
|
if (val) {
|
|
|
|
/* TCP_NODELAY is weaker than TCP_CORK, so that
|
|
|
|
* this option on corked socket is remembered, but
|
|
|
|
* it is not activated until cork is cleared.
|
|
|
|
*
|
|
|
|
* However, when TCP_NODELAY is set we make
|
|
|
|
* an explicit push, which overrides even TCP_CORK
|
|
|
|
* for currently queued segments.
|
|
|
|
*/
|
|
|
|
tp->nonagle |= TCP_NAGLE_OFF|TCP_NAGLE_PUSH;
|
[TCP]: Sed magic converts func(sk, tp, ...) -> func(sk, ...)
This is (mostly) automated change using magic:
sed -e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e 's|struct sock \*sk,[\n\t ]*struct tcp_sock \*tp\([^{]*\n{\n\)|
struct sock \*sk\1\tstruct tcp_sock *tp = tcp_sk(sk);\n|g'
-e 's|struct sock \*sk, struct tcp_sock \*tp|
struct sock \*sk|g' -e 's|sk, tp\([^-]\)|sk\1|g'
Fixed four unused variable (tp) warnings that were introduced.
In addition, manually added newlines after local variables and
tweaked function arguments positioning.
$ gcc --version
gcc (GCC) 4.1.1 20060525 (Red Hat 4.1.1-1)
...
$ codiff -fV built-in.o.old built-in.o.new
net/ipv4/route.c:
rt_cache_flush | +14
1 function changed, 14 bytes added
net/ipv4/tcp.c:
tcp_setsockopt | -5
tcp_sendpage | -25
tcp_sendmsg | -16
3 functions changed, 46 bytes removed
net/ipv4/tcp_input.c:
tcp_try_undo_recovery | +3
tcp_try_undo_dsack | +2
tcp_mark_head_lost | -12
tcp_ack | -15
tcp_event_data_recv | -32
tcp_rcv_state_process | -10
tcp_rcv_established | +1
7 functions changed, 6 bytes added, 69 bytes removed, diff: -63
net/ipv4/tcp_output.c:
update_send_head | -9
tcp_transmit_skb | +19
tcp_cwnd_validate | +1
tcp_write_wakeup | -17
__tcp_push_pending_frames | -25
tcp_push_one | -8
tcp_send_fin | -4
7 functions changed, 20 bytes added, 63 bytes removed, diff: -43
built-in.o.new:
18 functions changed, 40 bytes added, 178 bytes removed, diff: -138
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-21 13:18:02 +08:00
|
|
|
tcp_push_pending_frames(sk);
|
2005-04-17 06:20:36 +08:00
|
|
|
} else {
|
|
|
|
tp->nonagle &= ~TCP_NAGLE_OFF;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TCP_CORK:
|
|
|
|
/* When set indicates to always queue non-full frames.
|
|
|
|
* Later the user clears this option and we transmit
|
|
|
|
* any pending partial frames in the queue. This is
|
|
|
|
* meant to be used alongside sendfile() to get properly
|
|
|
|
* filled frames when the user (for example) must write
|
|
|
|
* out headers with a write() call first and then use
|
|
|
|
* sendfile to send out the data parts.
|
|
|
|
*
|
|
|
|
* TCP_CORK can be set together with TCP_NODELAY and it is
|
|
|
|
* stronger than TCP_NODELAY.
|
|
|
|
*/
|
|
|
|
if (val) {
|
|
|
|
tp->nonagle |= TCP_NAGLE_CORK;
|
|
|
|
} else {
|
|
|
|
tp->nonagle &= ~TCP_NAGLE_CORK;
|
|
|
|
if (tp->nonagle&TCP_NAGLE_OFF)
|
|
|
|
tp->nonagle |= TCP_NAGLE_PUSH;
|
[TCP]: Sed magic converts func(sk, tp, ...) -> func(sk, ...)
This is (mostly) automated change using magic:
sed -e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e '/struct sock \*sk/ N' -e '/struct sock \*sk/ N'
-e 's|struct sock \*sk,[\n\t ]*struct tcp_sock \*tp\([^{]*\n{\n\)|
struct sock \*sk\1\tstruct tcp_sock *tp = tcp_sk(sk);\n|g'
-e 's|struct sock \*sk, struct tcp_sock \*tp|
struct sock \*sk|g' -e 's|sk, tp\([^-]\)|sk\1|g'
Fixed four unused variable (tp) warnings that were introduced.
In addition, manually added newlines after local variables and
tweaked function arguments positioning.
$ gcc --version
gcc (GCC) 4.1.1 20060525 (Red Hat 4.1.1-1)
...
$ codiff -fV built-in.o.old built-in.o.new
net/ipv4/route.c:
rt_cache_flush | +14
1 function changed, 14 bytes added
net/ipv4/tcp.c:
tcp_setsockopt | -5
tcp_sendpage | -25
tcp_sendmsg | -16
3 functions changed, 46 bytes removed
net/ipv4/tcp_input.c:
tcp_try_undo_recovery | +3
tcp_try_undo_dsack | +2
tcp_mark_head_lost | -12
tcp_ack | -15
tcp_event_data_recv | -32
tcp_rcv_state_process | -10
tcp_rcv_established | +1
7 functions changed, 6 bytes added, 69 bytes removed, diff: -63
net/ipv4/tcp_output.c:
update_send_head | -9
tcp_transmit_skb | +19
tcp_cwnd_validate | +1
tcp_write_wakeup | -17
__tcp_push_pending_frames | -25
tcp_push_one | -8
tcp_send_fin | -4
7 functions changed, 20 bytes added, 63 bytes removed, diff: -43
built-in.o.new:
18 functions changed, 40 bytes added, 178 bytes removed, diff: -138
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-04-21 13:18:02 +08:00
|
|
|
tcp_push_pending_frames(sk);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TCP_KEEPIDLE:
|
|
|
|
if (val < 1 || val > MAX_TCP_KEEPIDLE)
|
|
|
|
err = -EINVAL;
|
|
|
|
else {
|
|
|
|
tp->keepalive_time = val * HZ;
|
|
|
|
if (sock_flag(sk, SOCK_KEEPOPEN) &&
|
|
|
|
!((1 << sk->sk_state) &
|
|
|
|
(TCPF_CLOSE | TCPF_LISTEN))) {
|
|
|
|
__u32 elapsed = tcp_time_stamp - tp->rcv_tstamp;
|
|
|
|
if (tp->keepalive_time > elapsed)
|
|
|
|
elapsed = tp->keepalive_time - elapsed;
|
|
|
|
else
|
|
|
|
elapsed = 0;
|
2005-08-10 11:10:42 +08:00
|
|
|
inet_csk_reset_keepalive_timer(sk, elapsed);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case TCP_KEEPINTVL:
|
|
|
|
if (val < 1 || val > MAX_TCP_KEEPINTVL)
|
|
|
|
err = -EINVAL;
|
|
|
|
else
|
|
|
|
tp->keepalive_intvl = val * HZ;
|
|
|
|
break;
|
|
|
|
case TCP_KEEPCNT:
|
|
|
|
if (val < 1 || val > MAX_TCP_KEEPCNT)
|
|
|
|
err = -EINVAL;
|
|
|
|
else
|
|
|
|
tp->keepalive_probes = val;
|
|
|
|
break;
|
|
|
|
case TCP_SYNCNT:
|
|
|
|
if (val < 1 || val > MAX_TCP_SYNCNT)
|
|
|
|
err = -EINVAL;
|
|
|
|
else
|
2005-08-10 11:10:42 +08:00
|
|
|
icsk->icsk_syn_retries = val;
|
2005-04-17 06:20:36 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
case TCP_LINGER2:
|
|
|
|
if (val < 0)
|
|
|
|
tp->linger2 = -1;
|
|
|
|
else if (val > sysctl_tcp_fin_timeout / HZ)
|
|
|
|
tp->linger2 = 0;
|
|
|
|
else
|
|
|
|
tp->linger2 = val * HZ;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TCP_DEFER_ACCEPT:
|
tcp: Revert 'process defer accept as established' changes.
This reverts two changesets, ec3c0982a2dd1e671bad8e9d26c28dcba0039d87
("[TCP]: TCP_DEFER_ACCEPT updates - process as established") and
the follow-on bug fix 9ae27e0adbf471c7a6b80102e38e1d5a346b3b38
("tcp: Fix slab corruption with ipv6 and tcp6fuzz").
This change causes several problems, first reported by Ingo Molnar
as a distcc-over-loopback regression where connections were getting
stuck.
Ilpo Järvinen first spotted the locking problems. The new function
added by this code, tcp_defer_accept_check(), only has the
child socket locked, yet it is modifying state of the parent
listening socket.
Fixing that is non-trivial at best, because we can't simply just grab
the parent listening socket lock at this point, because it would
create an ABBA deadlock. The normal ordering is parent listening
socket --> child socket, but this code path would require the
reverse lock ordering.
Next is a problem noticed by Vitaliy Gusev, he noted:
----------------------------------------
>--- a/net/ipv4/tcp_timer.c
>+++ b/net/ipv4/tcp_timer.c
>@@ -481,6 +481,11 @@ static void tcp_keepalive_timer (unsigned long data)
> goto death;
> }
>
>+ if (tp->defer_tcp_accept.request && sk->sk_state == TCP_ESTABLISHED) {
>+ tcp_send_active_reset(sk, GFP_ATOMIC);
>+ goto death;
Here socket sk is not attached to listening socket's request queue. tcp_done()
will not call inet_csk_destroy_sock() (and tcp_v4_destroy_sock() which should
release this sk) as socket is not DEAD. Therefore socket sk will be lost for
freeing.
----------------------------------------
Finally, Alexey Kuznetsov argues that there might not even be any
real value or advantage to these new semantics even if we fix all
of the bugs:
----------------------------------------
Hiding from accept() sockets with only out-of-order data only
is the only thing which is impossible with old approach. Is this really
so valuable? My opinion: no, this is nothing but a new loophole
to consume memory without control.
----------------------------------------
So revert this thing for now.
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-06-13 07:31:35 +08:00
|
|
|
icsk->icsk_accept_queue.rskq_defer_accept = 0;
|
|
|
|
if (val > 0) {
|
|
|
|
/* Translate value in seconds to number of
|
|
|
|
* retransmits */
|
|
|
|
while (icsk->icsk_accept_queue.rskq_defer_accept < 32 &&
|
|
|
|
val > ((TCP_TIMEOUT_INIT / HZ) <<
|
|
|
|
icsk->icsk_accept_queue.rskq_defer_accept))
|
|
|
|
icsk->icsk_accept_queue.rskq_defer_accept++;
|
|
|
|
icsk->icsk_accept_queue.rskq_defer_accept++;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TCP_WINDOW_CLAMP:
|
|
|
|
if (!val) {
|
|
|
|
if (sk->sk_state != TCP_CLOSE) {
|
|
|
|
err = -EINVAL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
tp->window_clamp = 0;
|
|
|
|
} else
|
|
|
|
tp->window_clamp = val < SOCK_MIN_RCVBUF / 2 ?
|
|
|
|
SOCK_MIN_RCVBUF / 2 : val;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TCP_QUICKACK:
|
|
|
|
if (!val) {
|
2005-08-10 11:10:42 +08:00
|
|
|
icsk->icsk_ack.pingpong = 1;
|
2005-04-17 06:20:36 +08:00
|
|
|
} else {
|
2005-08-10 11:10:42 +08:00
|
|
|
icsk->icsk_ack.pingpong = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
if ((1 << sk->sk_state) &
|
|
|
|
(TCPF_ESTABLISHED | TCPF_CLOSE_WAIT) &&
|
2005-08-10 11:10:42 +08:00
|
|
|
inet_csk_ack_scheduled(sk)) {
|
|
|
|
icsk->icsk_ack.pending |= ICSK_ACK_PUSHED;
|
2006-05-24 09:00:16 +08:00
|
|
|
tcp_cleanup_rbuf(sk, 1);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (!(val & 1))
|
2005-08-10 11:10:42 +08:00
|
|
|
icsk->icsk_ack.pingpong = 1;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2006-11-15 11:07:45 +08:00
|
|
|
#ifdef CONFIG_TCP_MD5SIG
|
|
|
|
case TCP_MD5SIG:
|
|
|
|
/* Read the IP->Key mappings from userspace */
|
|
|
|
err = tp->af_specific->md5_parse(sk, optval, optlen);
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
default:
|
|
|
|
err = -ENOPROTOOPT;
|
|
|
|
break;
|
2007-04-21 08:09:22 +08:00
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
release_sock(sk);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2006-03-21 14:45:21 +08:00
|
|
|
int tcp_setsockopt(struct sock *sk, int level, int optname, char __user *optval,
|
|
|
|
int optlen)
|
|
|
|
{
|
|
|
|
struct inet_connection_sock *icsk = inet_csk(sk);
|
|
|
|
|
|
|
|
if (level != SOL_TCP)
|
|
|
|
return icsk->icsk_af_ops->setsockopt(sk, level, optname,
|
|
|
|
optval, optlen);
|
|
|
|
return do_tcp_setsockopt(sk, level, optname, optval, optlen);
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_COMPAT
|
2006-03-21 14:48:35 +08:00
|
|
|
int compat_tcp_setsockopt(struct sock *sk, int level, int optname,
|
|
|
|
char __user *optval, int optlen)
|
2006-03-21 14:45:21 +08:00
|
|
|
{
|
2006-03-21 14:46:16 +08:00
|
|
|
if (level != SOL_TCP)
|
|
|
|
return inet_csk_compat_setsockopt(sk, level, optname,
|
|
|
|
optval, optlen);
|
2006-03-21 14:45:21 +08:00
|
|
|
return do_tcp_setsockopt(sk, level, optname, optval, optlen);
|
|
|
|
}
|
2006-03-21 14:48:35 +08:00
|
|
|
|
|
|
|
EXPORT_SYMBOL(compat_tcp_setsockopt);
|
2006-03-21 14:45:21 +08:00
|
|
|
#endif
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* Return information about state of tcp endpoint in API format. */
|
|
|
|
void tcp_get_info(struct sock *sk, struct tcp_info *info)
|
|
|
|
{
|
|
|
|
struct tcp_sock *tp = tcp_sk(sk);
|
2005-08-10 11:10:42 +08:00
|
|
|
const struct inet_connection_sock *icsk = inet_csk(sk);
|
2005-04-17 06:20:36 +08:00
|
|
|
u32 now = tcp_time_stamp;
|
|
|
|
|
|
|
|
memset(info, 0, sizeof(*info));
|
|
|
|
|
|
|
|
info->tcpi_state = sk->sk_state;
|
2005-08-10 15:03:31 +08:00
|
|
|
info->tcpi_ca_state = icsk->icsk_ca_state;
|
2005-08-10 11:10:42 +08:00
|
|
|
info->tcpi_retransmits = icsk->icsk_retransmits;
|
2005-08-10 15:03:31 +08:00
|
|
|
info->tcpi_probes = icsk->icsk_probes_out;
|
2005-08-10 11:10:42 +08:00
|
|
|
info->tcpi_backoff = icsk->icsk_backoff;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (tp->rx_opt.tstamp_ok)
|
|
|
|
info->tcpi_options |= TCPI_OPT_TIMESTAMPS;
|
2007-08-09 20:14:46 +08:00
|
|
|
if (tcp_is_sack(tp))
|
2005-04-17 06:20:36 +08:00
|
|
|
info->tcpi_options |= TCPI_OPT_SACK;
|
|
|
|
if (tp->rx_opt.wscale_ok) {
|
|
|
|
info->tcpi_options |= TCPI_OPT_WSCALE;
|
|
|
|
info->tcpi_snd_wscale = tp->rx_opt.snd_wscale;
|
|
|
|
info->tcpi_rcv_wscale = tp->rx_opt.rcv_wscale;
|
2007-02-09 22:24:47 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (tp->ecn_flags&TCP_ECN_OK)
|
|
|
|
info->tcpi_options |= TCPI_OPT_ECN;
|
|
|
|
|
2005-08-10 11:10:42 +08:00
|
|
|
info->tcpi_rto = jiffies_to_usecs(icsk->icsk_rto);
|
|
|
|
info->tcpi_ato = jiffies_to_usecs(icsk->icsk_ack.ato);
|
2005-07-06 06:24:38 +08:00
|
|
|
info->tcpi_snd_mss = tp->mss_cache;
|
2005-08-10 11:10:42 +08:00
|
|
|
info->tcpi_rcv_mss = icsk->icsk_ack.rcv_mss;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-09-19 04:26:31 +08:00
|
|
|
if (sk->sk_state == TCP_LISTEN) {
|
|
|
|
info->tcpi_unacked = sk->sk_ack_backlog;
|
|
|
|
info->tcpi_sacked = sk->sk_max_ack_backlog;
|
|
|
|
} else {
|
|
|
|
info->tcpi_unacked = tp->packets_out;
|
|
|
|
info->tcpi_sacked = tp->sacked_out;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
info->tcpi_lost = tp->lost_out;
|
|
|
|
info->tcpi_retrans = tp->retrans_out;
|
|
|
|
info->tcpi_fackets = tp->fackets_out;
|
|
|
|
|
|
|
|
info->tcpi_last_data_sent = jiffies_to_msecs(now - tp->lsndtime);
|
2005-08-10 11:10:42 +08:00
|
|
|
info->tcpi_last_data_recv = jiffies_to_msecs(now - icsk->icsk_ack.lrcvtime);
|
2005-04-17 06:20:36 +08:00
|
|
|
info->tcpi_last_ack_recv = jiffies_to_msecs(now - tp->rcv_tstamp);
|
|
|
|
|
2005-12-14 15:26:10 +08:00
|
|
|
info->tcpi_pmtu = icsk->icsk_pmtu_cookie;
|
2005-04-17 06:20:36 +08:00
|
|
|
info->tcpi_rcv_ssthresh = tp->rcv_ssthresh;
|
|
|
|
info->tcpi_rtt = jiffies_to_usecs(tp->srtt)>>3;
|
|
|
|
info->tcpi_rttvar = jiffies_to_usecs(tp->mdev)>>2;
|
|
|
|
info->tcpi_snd_ssthresh = tp->snd_ssthresh;
|
|
|
|
info->tcpi_snd_cwnd = tp->snd_cwnd;
|
|
|
|
info->tcpi_advmss = tp->advmss;
|
|
|
|
info->tcpi_reordering = tp->reordering;
|
|
|
|
|
|
|
|
info->tcpi_rcv_rtt = jiffies_to_usecs(tp->rcv_rtt_est.rtt)>>3;
|
|
|
|
info->tcpi_rcv_space = tp->rcvq_space.space;
|
|
|
|
|
|
|
|
info->tcpi_total_retrans = tp->total_retrans;
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL_GPL(tcp_get_info);
|
|
|
|
|
2006-03-21 14:45:21 +08:00
|
|
|
static int do_tcp_getsockopt(struct sock *sk, int level,
|
|
|
|
int optname, char __user *optval, int __user *optlen)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2005-08-10 11:11:56 +08:00
|
|
|
struct inet_connection_sock *icsk = inet_csk(sk);
|
2005-04-17 06:20:36 +08:00
|
|
|
struct tcp_sock *tp = tcp_sk(sk);
|
|
|
|
int val, len;
|
|
|
|
|
|
|
|
if (get_user(len, optlen))
|
|
|
|
return -EFAULT;
|
|
|
|
|
|
|
|
len = min_t(unsigned int, len, sizeof(int));
|
|
|
|
|
|
|
|
if (len < 0)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
switch (optname) {
|
|
|
|
case TCP_MAXSEG:
|
2005-07-06 06:24:38 +08:00
|
|
|
val = tp->mss_cache;
|
2005-04-17 06:20:36 +08:00
|
|
|
if (!val && ((1 << sk->sk_state) & (TCPF_CLOSE | TCPF_LISTEN)))
|
|
|
|
val = tp->rx_opt.user_mss;
|
|
|
|
break;
|
|
|
|
case TCP_NODELAY:
|
|
|
|
val = !!(tp->nonagle&TCP_NAGLE_OFF);
|
|
|
|
break;
|
|
|
|
case TCP_CORK:
|
|
|
|
val = !!(tp->nonagle&TCP_NAGLE_CORK);
|
|
|
|
break;
|
|
|
|
case TCP_KEEPIDLE:
|
|
|
|
val = (tp->keepalive_time ? : sysctl_tcp_keepalive_time) / HZ;
|
|
|
|
break;
|
|
|
|
case TCP_KEEPINTVL:
|
|
|
|
val = (tp->keepalive_intvl ? : sysctl_tcp_keepalive_intvl) / HZ;
|
|
|
|
break;
|
|
|
|
case TCP_KEEPCNT:
|
|
|
|
val = tp->keepalive_probes ? : sysctl_tcp_keepalive_probes;
|
|
|
|
break;
|
|
|
|
case TCP_SYNCNT:
|
2005-08-10 11:11:56 +08:00
|
|
|
val = icsk->icsk_syn_retries ? : sysctl_tcp_syn_retries;
|
2005-04-17 06:20:36 +08:00
|
|
|
break;
|
|
|
|
case TCP_LINGER2:
|
|
|
|
val = tp->linger2;
|
|
|
|
if (val >= 0)
|
|
|
|
val = (val ? : sysctl_tcp_fin_timeout) / HZ;
|
|
|
|
break;
|
|
|
|
case TCP_DEFER_ACCEPT:
|
tcp: Revert 'process defer accept as established' changes.
This reverts two changesets, ec3c0982a2dd1e671bad8e9d26c28dcba0039d87
("[TCP]: TCP_DEFER_ACCEPT updates - process as established") and
the follow-on bug fix 9ae27e0adbf471c7a6b80102e38e1d5a346b3b38
("tcp: Fix slab corruption with ipv6 and tcp6fuzz").
This change causes several problems, first reported by Ingo Molnar
as a distcc-over-loopback regression where connections were getting
stuck.
Ilpo Järvinen first spotted the locking problems. The new function
added by this code, tcp_defer_accept_check(), only has the
child socket locked, yet it is modifying state of the parent
listening socket.
Fixing that is non-trivial at best, because we can't simply just grab
the parent listening socket lock at this point, because it would
create an ABBA deadlock. The normal ordering is parent listening
socket --> child socket, but this code path would require the
reverse lock ordering.
Next is a problem noticed by Vitaliy Gusev, he noted:
----------------------------------------
>--- a/net/ipv4/tcp_timer.c
>+++ b/net/ipv4/tcp_timer.c
>@@ -481,6 +481,11 @@ static void tcp_keepalive_timer (unsigned long data)
> goto death;
> }
>
>+ if (tp->defer_tcp_accept.request && sk->sk_state == TCP_ESTABLISHED) {
>+ tcp_send_active_reset(sk, GFP_ATOMIC);
>+ goto death;
Here socket sk is not attached to listening socket's request queue. tcp_done()
will not call inet_csk_destroy_sock() (and tcp_v4_destroy_sock() which should
release this sk) as socket is not DEAD. Therefore socket sk will be lost for
freeing.
----------------------------------------
Finally, Alexey Kuznetsov argues that there might not even be any
real value or advantage to these new semantics even if we fix all
of the bugs:
----------------------------------------
Hiding from accept() sockets with only out-of-order data only
is the only thing which is impossible with old approach. Is this really
so valuable? My opinion: no, this is nothing but a new loophole
to consume memory without control.
----------------------------------------
So revert this thing for now.
Signed-off-by: David S. Miller <davem@davemloft.net>
2008-06-13 07:31:35 +08:00
|
|
|
val = !icsk->icsk_accept_queue.rskq_defer_accept ? 0 :
|
|
|
|
((TCP_TIMEOUT_INIT / HZ) << (icsk->icsk_accept_queue.rskq_defer_accept - 1));
|
2005-04-17 06:20:36 +08:00
|
|
|
break;
|
|
|
|
case TCP_WINDOW_CLAMP:
|
|
|
|
val = tp->window_clamp;
|
|
|
|
break;
|
|
|
|
case TCP_INFO: {
|
|
|
|
struct tcp_info info;
|
|
|
|
|
|
|
|
if (get_user(len, optlen))
|
|
|
|
return -EFAULT;
|
|
|
|
|
|
|
|
tcp_get_info(sk, &info);
|
|
|
|
|
|
|
|
len = min_t(unsigned int, len, sizeof(info));
|
|
|
|
if (put_user(len, optlen))
|
|
|
|
return -EFAULT;
|
|
|
|
if (copy_to_user(optval, &info, len))
|
|
|
|
return -EFAULT;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
case TCP_QUICKACK:
|
2005-08-10 11:11:56 +08:00
|
|
|
val = !icsk->icsk_ack.pingpong;
|
2005-04-17 06:20:36 +08:00
|
|
|
break;
|
2005-06-24 11:37:36 +08:00
|
|
|
|
|
|
|
case TCP_CONGESTION:
|
|
|
|
if (get_user(len, optlen))
|
|
|
|
return -EFAULT;
|
|
|
|
len = min_t(unsigned int, len, TCP_CA_NAME_MAX);
|
|
|
|
if (put_user(len, optlen))
|
|
|
|
return -EFAULT;
|
2005-08-10 15:03:31 +08:00
|
|
|
if (copy_to_user(optval, icsk->icsk_ca_ops->name, len))
|
2005-06-24 11:37:36 +08:00
|
|
|
return -EFAULT;
|
|
|
|
return 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
default:
|
|
|
|
return -ENOPROTOOPT;
|
2007-04-21 08:09:22 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (put_user(len, optlen))
|
|
|
|
return -EFAULT;
|
|
|
|
if (copy_to_user(optval, &val, len))
|
|
|
|
return -EFAULT;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-03-21 14:45:21 +08:00
|
|
|
int tcp_getsockopt(struct sock *sk, int level, int optname, char __user *optval,
|
|
|
|
int __user *optlen)
|
|
|
|
{
|
|
|
|
struct inet_connection_sock *icsk = inet_csk(sk);
|
|
|
|
|
|
|
|
if (level != SOL_TCP)
|
|
|
|
return icsk->icsk_af_ops->getsockopt(sk, level, optname,
|
|
|
|
optval, optlen);
|
|
|
|
return do_tcp_getsockopt(sk, level, optname, optval, optlen);
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_COMPAT
|
2006-03-21 14:48:35 +08:00
|
|
|
int compat_tcp_getsockopt(struct sock *sk, int level, int optname,
|
|
|
|
char __user *optval, int __user *optlen)
|
2006-03-21 14:45:21 +08:00
|
|
|
{
|
2006-03-21 14:46:16 +08:00
|
|
|
if (level != SOL_TCP)
|
|
|
|
return inet_csk_compat_getsockopt(sk, level, optname,
|
|
|
|
optval, optlen);
|
2006-03-21 14:45:21 +08:00
|
|
|
return do_tcp_getsockopt(sk, level, optname, optval, optlen);
|
|
|
|
}
|
2006-03-21 14:48:35 +08:00
|
|
|
|
|
|
|
EXPORT_SYMBOL(compat_tcp_getsockopt);
|
2006-03-21 14:45:21 +08:00
|
|
|
#endif
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-06-28 04:22:38 +08:00
|
|
|
struct sk_buff *tcp_tso_segment(struct sk_buff *skb, int features)
|
2006-06-22 18:02:40 +08:00
|
|
|
{
|
|
|
|
struct sk_buff *segs = ERR_PTR(-EINVAL);
|
|
|
|
struct tcphdr *th;
|
|
|
|
unsigned thlen;
|
|
|
|
unsigned int seq;
|
2006-11-15 13:24:49 +08:00
|
|
|
__be32 delta;
|
2006-06-22 18:02:40 +08:00
|
|
|
unsigned int oldlen;
|
|
|
|
unsigned int len;
|
|
|
|
|
|
|
|
if (!pskb_may_pull(skb, sizeof(*th)))
|
|
|
|
goto out;
|
|
|
|
|
2007-04-11 12:04:22 +08:00
|
|
|
th = tcp_hdr(skb);
|
2006-06-22 18:02:40 +08:00
|
|
|
thlen = th->doff * 4;
|
|
|
|
if (thlen < sizeof(*th))
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
if (!pskb_may_pull(skb, thlen))
|
|
|
|
goto out;
|
|
|
|
|
2006-06-26 14:55:46 +08:00
|
|
|
oldlen = (u16)~skb->len;
|
2006-06-22 18:02:40 +08:00
|
|
|
__skb_pull(skb, thlen);
|
|
|
|
|
2006-06-30 11:11:25 +08:00
|
|
|
if (skb_gso_ok(skb, features | NETIF_F_GSO_ROBUST)) {
|
|
|
|
/* Packet is from an untrusted source, reset gso_segs. */
|
2006-07-04 10:38:35 +08:00
|
|
|
int type = skb_shinfo(skb)->gso_type;
|
|
|
|
int mss;
|
|
|
|
|
|
|
|
if (unlikely(type &
|
|
|
|
~(SKB_GSO_TCPV4 |
|
|
|
|
SKB_GSO_DODGY |
|
|
|
|
SKB_GSO_TCP_ECN |
|
|
|
|
SKB_GSO_TCPV6 |
|
|
|
|
0) ||
|
|
|
|
!(type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6))))
|
|
|
|
goto out;
|
2006-06-30 11:11:25 +08:00
|
|
|
|
2006-07-04 10:38:35 +08:00
|
|
|
mss = skb_shinfo(skb)->gso_size;
|
2007-08-29 06:50:33 +08:00
|
|
|
skb_shinfo(skb)->gso_segs = DIV_ROUND_UP(skb->len, mss);
|
2006-06-30 11:11:25 +08:00
|
|
|
|
|
|
|
segs = NULL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2006-06-28 04:22:38 +08:00
|
|
|
segs = skb_segment(skb, features);
|
2006-06-22 18:02:40 +08:00
|
|
|
if (IS_ERR(segs))
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
len = skb_shinfo(skb)->gso_size;
|
2006-06-26 14:55:46 +08:00
|
|
|
delta = htonl(oldlen + (thlen + len));
|
2006-06-22 18:02:40 +08:00
|
|
|
|
|
|
|
skb = segs;
|
2007-04-11 12:04:22 +08:00
|
|
|
th = tcp_hdr(skb);
|
2006-06-22 18:02:40 +08:00
|
|
|
seq = ntohl(th->seq);
|
|
|
|
|
|
|
|
do {
|
|
|
|
th->fin = th->psh = 0;
|
|
|
|
|
2006-11-15 13:24:49 +08:00
|
|
|
th->check = ~csum_fold((__force __wsum)((__force u32)th->check +
|
|
|
|
(__force u32)delta));
|
2006-08-30 07:44:56 +08:00
|
|
|
if (skb->ip_summed != CHECKSUM_PARTIAL)
|
2007-04-26 09:04:18 +08:00
|
|
|
th->check =
|
|
|
|
csum_fold(csum_partial(skb_transport_header(skb),
|
|
|
|
thlen, skb->csum));
|
2006-06-22 18:02:40 +08:00
|
|
|
|
|
|
|
seq += len;
|
|
|
|
skb = skb->next;
|
2007-04-11 12:04:22 +08:00
|
|
|
th = tcp_hdr(skb);
|
2006-06-22 18:02:40 +08:00
|
|
|
|
|
|
|
th->seq = htonl(seq);
|
|
|
|
th->cwr = 0;
|
|
|
|
} while (skb->next);
|
|
|
|
|
2007-04-20 11:29:13 +08:00
|
|
|
delta = htonl(oldlen + (skb->tail - skb->transport_header) +
|
2007-04-26 09:04:18 +08:00
|
|
|
skb->data_len);
|
2006-11-15 13:24:49 +08:00
|
|
|
th->check = ~csum_fold((__force __wsum)((__force u32)th->check +
|
|
|
|
(__force u32)delta));
|
2006-08-30 07:44:56 +08:00
|
|
|
if (skb->ip_summed != CHECKSUM_PARTIAL)
|
2007-04-26 09:04:18 +08:00
|
|
|
th->check = csum_fold(csum_partial(skb_transport_header(skb),
|
|
|
|
thlen, skb->csum));
|
2006-06-22 18:02:40 +08:00
|
|
|
|
|
|
|
out:
|
|
|
|
return segs;
|
|
|
|
}
|
2006-07-01 04:36:15 +08:00
|
|
|
EXPORT_SYMBOL(tcp_tso_segment);
|
2006-06-22 18:02:40 +08:00
|
|
|
|
2006-11-15 11:07:45 +08:00
|
|
|
#ifdef CONFIG_TCP_MD5SIG
|
|
|
|
static unsigned long tcp_md5sig_users;
|
|
|
|
static struct tcp_md5sig_pool **tcp_md5sig_pool;
|
|
|
|
static DEFINE_SPINLOCK(tcp_md5sig_pool_lock);
|
|
|
|
|
|
|
|
static void __tcp_free_md5sig_pool(struct tcp_md5sig_pool **pool)
|
|
|
|
{
|
|
|
|
int cpu;
|
|
|
|
for_each_possible_cpu(cpu) {
|
|
|
|
struct tcp_md5sig_pool *p = *per_cpu_ptr(pool, cpu);
|
|
|
|
if (p) {
|
|
|
|
if (p->md5_desc.tfm)
|
|
|
|
crypto_free_hash(p->md5_desc.tfm);
|
|
|
|
kfree(p);
|
|
|
|
p = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
free_percpu(pool);
|
|
|
|
}
|
|
|
|
|
|
|
|
void tcp_free_md5sig_pool(void)
|
|
|
|
{
|
|
|
|
struct tcp_md5sig_pool **pool = NULL;
|
|
|
|
|
2007-02-21 15:51:47 +08:00
|
|
|
spin_lock_bh(&tcp_md5sig_pool_lock);
|
2006-11-15 11:07:45 +08:00
|
|
|
if (--tcp_md5sig_users == 0) {
|
|
|
|
pool = tcp_md5sig_pool;
|
|
|
|
tcp_md5sig_pool = NULL;
|
|
|
|
}
|
2007-02-21 15:51:47 +08:00
|
|
|
spin_unlock_bh(&tcp_md5sig_pool_lock);
|
2006-11-15 11:07:45 +08:00
|
|
|
if (pool)
|
|
|
|
__tcp_free_md5sig_pool(pool);
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(tcp_free_md5sig_pool);
|
|
|
|
|
2006-12-01 09:22:29 +08:00
|
|
|
static struct tcp_md5sig_pool **__tcp_alloc_md5sig_pool(void)
|
2006-11-15 11:07:45 +08:00
|
|
|
{
|
|
|
|
int cpu;
|
|
|
|
struct tcp_md5sig_pool **pool;
|
|
|
|
|
|
|
|
pool = alloc_percpu(struct tcp_md5sig_pool *);
|
|
|
|
if (!pool)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
for_each_possible_cpu(cpu) {
|
|
|
|
struct tcp_md5sig_pool *p;
|
|
|
|
struct crypto_hash *hash;
|
|
|
|
|
|
|
|
p = kzalloc(sizeof(*p), GFP_KERNEL);
|
|
|
|
if (!p)
|
|
|
|
goto out_free;
|
|
|
|
*per_cpu_ptr(pool, cpu) = p;
|
|
|
|
|
|
|
|
hash = crypto_alloc_hash("md5", 0, CRYPTO_ALG_ASYNC);
|
|
|
|
if (!hash || IS_ERR(hash))
|
|
|
|
goto out_free;
|
|
|
|
|
|
|
|
p->md5_desc.tfm = hash;
|
|
|
|
}
|
|
|
|
return pool;
|
|
|
|
out_free:
|
|
|
|
__tcp_free_md5sig_pool(pool);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct tcp_md5sig_pool **tcp_alloc_md5sig_pool(void)
|
|
|
|
{
|
|
|
|
struct tcp_md5sig_pool **pool;
|
|
|
|
int alloc = 0;
|
|
|
|
|
|
|
|
retry:
|
2007-02-21 15:51:47 +08:00
|
|
|
spin_lock_bh(&tcp_md5sig_pool_lock);
|
2006-11-15 11:07:45 +08:00
|
|
|
pool = tcp_md5sig_pool;
|
|
|
|
if (tcp_md5sig_users++ == 0) {
|
|
|
|
alloc = 1;
|
2007-02-21 15:51:47 +08:00
|
|
|
spin_unlock_bh(&tcp_md5sig_pool_lock);
|
2006-11-15 11:07:45 +08:00
|
|
|
} else if (!pool) {
|
|
|
|
tcp_md5sig_users--;
|
2007-02-21 15:51:47 +08:00
|
|
|
spin_unlock_bh(&tcp_md5sig_pool_lock);
|
2006-11-15 11:07:45 +08:00
|
|
|
cpu_relax();
|
|
|
|
goto retry;
|
|
|
|
} else
|
2007-02-21 15:51:47 +08:00
|
|
|
spin_unlock_bh(&tcp_md5sig_pool_lock);
|
2006-11-15 11:07:45 +08:00
|
|
|
|
|
|
|
if (alloc) {
|
|
|
|
/* we cannot hold spinlock here because this may sleep. */
|
|
|
|
struct tcp_md5sig_pool **p = __tcp_alloc_md5sig_pool();
|
2007-02-21 15:51:47 +08:00
|
|
|
spin_lock_bh(&tcp_md5sig_pool_lock);
|
2006-11-15 11:07:45 +08:00
|
|
|
if (!p) {
|
|
|
|
tcp_md5sig_users--;
|
2007-02-21 15:51:47 +08:00
|
|
|
spin_unlock_bh(&tcp_md5sig_pool_lock);
|
2006-11-15 11:07:45 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
pool = tcp_md5sig_pool;
|
|
|
|
if (pool) {
|
|
|
|
/* oops, it has already been assigned. */
|
2007-02-21 15:51:47 +08:00
|
|
|
spin_unlock_bh(&tcp_md5sig_pool_lock);
|
2006-11-15 11:07:45 +08:00
|
|
|
__tcp_free_md5sig_pool(p);
|
|
|
|
} else {
|
|
|
|
tcp_md5sig_pool = pool = p;
|
2007-02-21 15:51:47 +08:00
|
|
|
spin_unlock_bh(&tcp_md5sig_pool_lock);
|
2006-11-15 11:07:45 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return pool;
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(tcp_alloc_md5sig_pool);
|
|
|
|
|
|
|
|
struct tcp_md5sig_pool *__tcp_get_md5sig_pool(int cpu)
|
|
|
|
{
|
|
|
|
struct tcp_md5sig_pool **p;
|
2007-02-21 15:51:47 +08:00
|
|
|
spin_lock_bh(&tcp_md5sig_pool_lock);
|
2006-11-15 11:07:45 +08:00
|
|
|
p = tcp_md5sig_pool;
|
|
|
|
if (p)
|
|
|
|
tcp_md5sig_users++;
|
2007-02-21 15:51:47 +08:00
|
|
|
spin_unlock_bh(&tcp_md5sig_pool_lock);
|
2006-11-15 11:07:45 +08:00
|
|
|
return (p ? *per_cpu_ptr(p, cpu) : NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(__tcp_get_md5sig_pool);
|
|
|
|
|
2006-12-14 08:25:44 +08:00
|
|
|
void __tcp_put_md5sig_pool(void)
|
|
|
|
{
|
|
|
|
tcp_free_md5sig_pool();
|
2006-11-15 11:07:45 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(__tcp_put_md5sig_pool);
|
2008-07-19 15:01:42 +08:00
|
|
|
|
|
|
|
int tcp_md5_hash_header(struct tcp_md5sig_pool *hp,
|
|
|
|
struct tcphdr *th)
|
|
|
|
{
|
|
|
|
struct scatterlist sg;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
__sum16 old_checksum = th->check;
|
|
|
|
th->check = 0;
|
|
|
|
/* options aren't included in the hash */
|
|
|
|
sg_init_one(&sg, th, sizeof(struct tcphdr));
|
|
|
|
err = crypto_hash_update(&hp->md5_desc, &sg, sizeof(struct tcphdr));
|
|
|
|
th->check = old_checksum;
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(tcp_md5_hash_header);
|
|
|
|
|
|
|
|
int tcp_md5_hash_skb_data(struct tcp_md5sig_pool *hp,
|
|
|
|
struct sk_buff *skb, unsigned header_len)
|
|
|
|
{
|
|
|
|
struct scatterlist sg;
|
|
|
|
const struct tcphdr *tp = tcp_hdr(skb);
|
|
|
|
struct hash_desc *desc = &hp->md5_desc;
|
|
|
|
unsigned i;
|
|
|
|
const unsigned head_data_len = skb_headlen(skb) > header_len ?
|
|
|
|
skb_headlen(skb) - header_len : 0;
|
|
|
|
const struct skb_shared_info *shi = skb_shinfo(skb);
|
|
|
|
|
|
|
|
sg_init_table(&sg, 1);
|
|
|
|
|
|
|
|
sg_set_buf(&sg, ((u8 *) tp) + header_len, head_data_len);
|
|
|
|
if (crypto_hash_update(desc, &sg, head_data_len))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
for (i = 0; i < shi->nr_frags; ++i) {
|
|
|
|
const struct skb_frag_struct *f = &shi->frags[i];
|
|
|
|
sg_set_page(&sg, f->page, f->size, f->page_offset);
|
|
|
|
if (crypto_hash_update(desc, &sg, f->size))
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(tcp_md5_hash_skb_data);
|
|
|
|
|
|
|
|
int tcp_md5_hash_key(struct tcp_md5sig_pool *hp, struct tcp_md5sig_key *key)
|
|
|
|
{
|
|
|
|
struct scatterlist sg;
|
|
|
|
|
|
|
|
sg_init_one(&sg, key->key, key->keylen);
|
|
|
|
return crypto_hash_update(&hp->md5_desc, &sg, key->keylen);
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(tcp_md5_hash_key);
|
|
|
|
|
2006-11-15 11:07:45 +08:00
|
|
|
#endif
|
|
|
|
|
2007-04-21 08:11:46 +08:00
|
|
|
void tcp_done(struct sock *sk)
|
|
|
|
{
|
|
|
|
if(sk->sk_state == TCP_SYN_SENT || sk->sk_state == TCP_SYN_RECV)
|
2008-07-17 11:22:25 +08:00
|
|
|
TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_ATTEMPTFAILS);
|
2007-04-21 08:11:46 +08:00
|
|
|
|
|
|
|
tcp_set_state(sk, TCP_CLOSE);
|
|
|
|
tcp_clear_xmit_timers(sk);
|
|
|
|
|
|
|
|
sk->sk_shutdown = SHUTDOWN_MASK;
|
|
|
|
|
|
|
|
if (!sock_flag(sk, SOCK_DEAD))
|
|
|
|
sk->sk_state_change(sk);
|
|
|
|
else
|
|
|
|
inet_csk_destroy_sock(sk);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(tcp_done);
|
|
|
|
|
2005-06-24 11:37:36 +08:00
|
|
|
extern struct tcp_congestion_ops tcp_reno;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
static __initdata unsigned long thash_entries;
|
|
|
|
static int __init set_thash_entries(char *str)
|
|
|
|
{
|
|
|
|
if (!str)
|
|
|
|
return 0;
|
|
|
|
thash_entries = simple_strtoul(str, &str, 0);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
__setup("thash_entries=", set_thash_entries);
|
|
|
|
|
|
|
|
void __init tcp_init(void)
|
|
|
|
{
|
|
|
|
struct sk_buff *skb = NULL;
|
2008-06-28 08:23:57 +08:00
|
|
|
unsigned long nr_pages, limit;
|
2006-03-25 17:34:07 +08:00
|
|
|
int order, i, max_share;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-12-11 18:12:04 +08:00
|
|
|
BUILD_BUG_ON(sizeof(struct tcp_skb_cb) > sizeof(skb->cb));
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2005-08-10 11:07:35 +08:00
|
|
|
tcp_hashinfo.bind_bucket_cachep =
|
|
|
|
kmem_cache_create("tcp_bind_bucket",
|
|
|
|
sizeof(struct inet_bind_bucket), 0,
|
2007-07-20 09:11:58 +08:00
|
|
|
SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* Size and allocate the main established and bind bucket
|
|
|
|
* hash tables.
|
|
|
|
*
|
|
|
|
* The methodology is similar to that of the buffer cache.
|
|
|
|
*/
|
2005-08-10 11:07:35 +08:00
|
|
|
tcp_hashinfo.ehash =
|
2005-04-17 06:20:36 +08:00
|
|
|
alloc_large_system_hash("TCP established",
|
2005-08-10 10:59:44 +08:00
|
|
|
sizeof(struct inet_ehash_bucket),
|
2005-04-17 06:20:36 +08:00
|
|
|
thash_entries,
|
|
|
|
(num_physpages >= 128 * 1024) ?
|
[IPV4] tcp/route: Another look at hash table sizes
The tcp_ehash hash table gets too big on systems with really big memory.
It is worse on systems with pages larger than 4KB. It wastes memory that
could be better used. It also makes the netstat command slow because reading
/proc/net/tcp and /proc/net/tcp6 needs to go through the full hash table.
The default value should not be larger for larger page sizes. It seems
that the effect of page size is an unintended error dating back a long
time. I also wonder if the default value really should be a larger
fraction of memory for systems with more memory. While systems with
really big ram can afford more space for hash tables, it is not clear to
me that they benefit from increasing the allocation ratio for this table.
The amount of memory allocated is determined by net/ipv4/tcp.c:tcp_init and
mm/page_alloc.c:alloc_large_system_hash.
tcp_init calls alloc_large_system_hash passing parameters-
bucketsize=sizeof(struct tcp_ehash_bucket)
numentries=thash_entries
scale=(num_physpages >= 128 * 1024) ? (25-PAGE_SHIFT) : (27-PAGE_SHIFT)
limit=0
On i386, PAGE_SHIFT is 12 for a page size of 4K
On ia64, PAGE_SHIFT defaults to 14 for a page size of 16K
The num_physpages test above makes the allocation take a larger fraction
of the total memory on systems with larger memory. The threshold size
for a i386 system is 512MB. For an ia64 system with 16KB pages the
threshold is 2GB.
For smaller memory systems-
On i386, scale = (27 - 12) = 15
On ia64, scale = (27 - 14) = 13
For larger memory systems-
On i386, scale = (25 - 12) = 13
On ia64, scale = (25 - 14) = 11
For the rest of this discussion, I'll just track the larger memory case.
The default behavior has numentries=thash_entries=0, so the allocated
size is determined by either scale or by the default limit of 1/16 of
total memory.
In alloc_large_system_hash-
| numentries = (flags & HASH_HIGHMEM) ? nr_all_pages : nr_kernel_pages;
| numentries += (1UL << (20 - PAGE_SHIFT)) - 1;
| numentries >>= 20 - PAGE_SHIFT;
| numentries <<= 20 - PAGE_SHIFT;
At this point, numentries is pages for all of memory, rounded up to the
nearest megabyte boundary.
| /* limit to 1 bucket per 2^scale bytes of low memory */
| if (scale > PAGE_SHIFT)
| numentries >>= (scale - PAGE_SHIFT);
| else
| numentries <<= (PAGE_SHIFT - scale);
On i386, numentries >>= (13 - 12), so numentries is 1/8196 of
bytes of total memory.
On ia64, numentries <<= (14 - 11), so numentries is 1/2048 of
bytes of total memory.
| log2qty = long_log2(numentries);
|
| do {
| size = bucketsize << log2qty;
bucketsize is 16, so size is 16 times numentries, rounded
down to a power of two.
On i386, size is 1/512 of bytes of total memory.
On ia64, size is 1/128 of bytes of total memory.
For smaller systems the results are
On i386, size is 1/2048 of bytes of total memory.
On ia64, size is 1/512 of bytes of total memory.
The large page effect can be removed by just replacing
the use of PAGE_SHIFT with a constant of 12 in the calls to
alloc_large_system_hash. That makes them more like the other uses of
that function from fs/inode.c and fs/dcache.c
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-11-30 08:12:55 +08:00
|
|
|
13 : 15,
|
2006-11-07 15:10:51 +08:00
|
|
|
0,
|
2005-08-10 11:07:35 +08:00
|
|
|
&tcp_hashinfo.ehash_size,
|
2005-04-17 06:20:36 +08:00
|
|
|
NULL,
|
2007-10-30 15:59:25 +08:00
|
|
|
thash_entries ? 0 : 512 * 1024);
|
[NET]: change layout of ehash table
ehash table layout is currently this one :
First half of this table is used by sockets not in TIME_WAIT state
Second half of it is used by sockets in TIME_WAIT state.
This is non optimal because of for a given hash or socket, the two chain heads
are located in separate cache lines.
Moreover the locks of the second half are never used.
If instead of this halving, we use two list heads in inet_ehash_bucket instead
of only one, we probably can avoid one cache miss, and reduce ram usage,
particularly if sizeof(rwlock_t) is big (various CONFIG_DEBUG_SPINLOCK,
CONFIG_DEBUG_LOCK_ALLOC settings). So we still halves the table but we keep
together related chains to speedup lookups and socket state change.
In this patch I did not try to align struct inet_ehash_bucket, but a future
patch could try to make this structure have a convenient size (a power of two
or a multiple of L1_CACHE_SIZE).
I guess rwlock will just vanish as soon as RCU is plugged into ehash :) , so
maybe we dont need to scratch our heads to align the bucket...
Note : In case struct inet_ehash_bucket is not a power of two, we could
probably change alloc_large_system_hash() (in case it use __get_free_pages())
to free the unused space. It currently allocates a big zone, but the last
quarter of it could be freed. Again, this should be a temporary 'problem'.
Patch tested on ipv4 tcp only, but should be OK for IPV6 and DCCP.
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-02-09 06:16:46 +08:00
|
|
|
tcp_hashinfo.ehash_size = 1 << tcp_hashinfo.ehash_size;
|
|
|
|
for (i = 0; i < tcp_hashinfo.ehash_size; i++) {
|
2005-08-10 11:07:35 +08:00
|
|
|
INIT_HLIST_HEAD(&tcp_hashinfo.ehash[i].chain);
|
[NET]: change layout of ehash table
ehash table layout is currently this one :
First half of this table is used by sockets not in TIME_WAIT state
Second half of it is used by sockets in TIME_WAIT state.
This is non optimal because of for a given hash or socket, the two chain heads
are located in separate cache lines.
Moreover the locks of the second half are never used.
If instead of this halving, we use two list heads in inet_ehash_bucket instead
of only one, we probably can avoid one cache miss, and reduce ram usage,
particularly if sizeof(rwlock_t) is big (various CONFIG_DEBUG_SPINLOCK,
CONFIG_DEBUG_LOCK_ALLOC settings). So we still halves the table but we keep
together related chains to speedup lookups and socket state change.
In this patch I did not try to align struct inet_ehash_bucket, but a future
patch could try to make this structure have a convenient size (a power of two
or a multiple of L1_CACHE_SIZE).
I guess rwlock will just vanish as soon as RCU is plugged into ehash :) , so
maybe we dont need to scratch our heads to align the bucket...
Note : In case struct inet_ehash_bucket is not a power of two, we could
probably change alloc_large_system_hash() (in case it use __get_free_pages())
to free the unused space. It currently allocates a big zone, but the last
quarter of it could be freed. Again, this should be a temporary 'problem'.
Patch tested on ipv4 tcp only, but should be OK for IPV6 and DCCP.
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-02-09 06:16:46 +08:00
|
|
|
INIT_HLIST_HEAD(&tcp_hashinfo.ehash[i].twchain);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2007-11-07 18:40:20 +08:00
|
|
|
if (inet_ehash_locks_alloc(&tcp_hashinfo))
|
|
|
|
panic("TCP: failed to alloc ehash_locks");
|
2005-08-10 11:07:35 +08:00
|
|
|
tcp_hashinfo.bhash =
|
2005-04-17 06:20:36 +08:00
|
|
|
alloc_large_system_hash("TCP bind",
|
2005-08-10 10:59:44 +08:00
|
|
|
sizeof(struct inet_bind_hashbucket),
|
2005-08-10 11:07:35 +08:00
|
|
|
tcp_hashinfo.ehash_size,
|
2005-04-17 06:20:36 +08:00
|
|
|
(num_physpages >= 128 * 1024) ?
|
[IPV4] tcp/route: Another look at hash table sizes
The tcp_ehash hash table gets too big on systems with really big memory.
It is worse on systems with pages larger than 4KB. It wastes memory that
could be better used. It also makes the netstat command slow because reading
/proc/net/tcp and /proc/net/tcp6 needs to go through the full hash table.
The default value should not be larger for larger page sizes. It seems
that the effect of page size is an unintended error dating back a long
time. I also wonder if the default value really should be a larger
fraction of memory for systems with more memory. While systems with
really big ram can afford more space for hash tables, it is not clear to
me that they benefit from increasing the allocation ratio for this table.
The amount of memory allocated is determined by net/ipv4/tcp.c:tcp_init and
mm/page_alloc.c:alloc_large_system_hash.
tcp_init calls alloc_large_system_hash passing parameters-
bucketsize=sizeof(struct tcp_ehash_bucket)
numentries=thash_entries
scale=(num_physpages >= 128 * 1024) ? (25-PAGE_SHIFT) : (27-PAGE_SHIFT)
limit=0
On i386, PAGE_SHIFT is 12 for a page size of 4K
On ia64, PAGE_SHIFT defaults to 14 for a page size of 16K
The num_physpages test above makes the allocation take a larger fraction
of the total memory on systems with larger memory. The threshold size
for a i386 system is 512MB. For an ia64 system with 16KB pages the
threshold is 2GB.
For smaller memory systems-
On i386, scale = (27 - 12) = 15
On ia64, scale = (27 - 14) = 13
For larger memory systems-
On i386, scale = (25 - 12) = 13
On ia64, scale = (25 - 14) = 11
For the rest of this discussion, I'll just track the larger memory case.
The default behavior has numentries=thash_entries=0, so the allocated
size is determined by either scale or by the default limit of 1/16 of
total memory.
In alloc_large_system_hash-
| numentries = (flags & HASH_HIGHMEM) ? nr_all_pages : nr_kernel_pages;
| numentries += (1UL << (20 - PAGE_SHIFT)) - 1;
| numentries >>= 20 - PAGE_SHIFT;
| numentries <<= 20 - PAGE_SHIFT;
At this point, numentries is pages for all of memory, rounded up to the
nearest megabyte boundary.
| /* limit to 1 bucket per 2^scale bytes of low memory */
| if (scale > PAGE_SHIFT)
| numentries >>= (scale - PAGE_SHIFT);
| else
| numentries <<= (PAGE_SHIFT - scale);
On i386, numentries >>= (13 - 12), so numentries is 1/8196 of
bytes of total memory.
On ia64, numentries <<= (14 - 11), so numentries is 1/2048 of
bytes of total memory.
| log2qty = long_log2(numentries);
|
| do {
| size = bucketsize << log2qty;
bucketsize is 16, so size is 16 times numentries, rounded
down to a power of two.
On i386, size is 1/512 of bytes of total memory.
On ia64, size is 1/128 of bytes of total memory.
For smaller systems the results are
On i386, size is 1/2048 of bytes of total memory.
On ia64, size is 1/512 of bytes of total memory.
The large page effect can be removed by just replacing
the use of PAGE_SHIFT with a constant of 12 in the calls to
alloc_large_system_hash. That makes them more like the other uses of
that function from fs/inode.c and fs/dcache.c
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-11-30 08:12:55 +08:00
|
|
|
13 : 15,
|
2006-11-07 15:10:51 +08:00
|
|
|
0,
|
2005-08-10 11:07:35 +08:00
|
|
|
&tcp_hashinfo.bhash_size,
|
2005-04-17 06:20:36 +08:00
|
|
|
NULL,
|
|
|
|
64 * 1024);
|
2005-08-10 11:07:35 +08:00
|
|
|
tcp_hashinfo.bhash_size = 1 << tcp_hashinfo.bhash_size;
|
|
|
|
for (i = 0; i < tcp_hashinfo.bhash_size; i++) {
|
|
|
|
spin_lock_init(&tcp_hashinfo.bhash[i].lock);
|
|
|
|
INIT_HLIST_HEAD(&tcp_hashinfo.bhash[i].chain);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Try to be a bit smarter and adjust defaults depending
|
|
|
|
* on available memory.
|
|
|
|
*/
|
|
|
|
for (order = 0; ((1 << order) << PAGE_SHIFT) <
|
2005-08-10 11:07:35 +08:00
|
|
|
(tcp_hashinfo.bhash_size * sizeof(struct inet_bind_hashbucket));
|
2005-04-17 06:20:36 +08:00
|
|
|
order++)
|
|
|
|
;
|
2005-06-14 05:24:52 +08:00
|
|
|
if (order >= 4) {
|
2005-08-10 11:44:40 +08:00
|
|
|
tcp_death_row.sysctl_max_tw_buckets = 180000;
|
2005-04-17 06:20:36 +08:00
|
|
|
sysctl_tcp_max_orphans = 4096 << (order - 4);
|
|
|
|
sysctl_max_syn_backlog = 1024;
|
|
|
|
} else if (order < 3) {
|
2005-08-10 11:44:40 +08:00
|
|
|
tcp_death_row.sysctl_max_tw_buckets >>= (3 - order);
|
2005-04-17 06:20:36 +08:00
|
|
|
sysctl_tcp_max_orphans >>= (3 - order);
|
|
|
|
sysctl_max_syn_backlog = 128;
|
|
|
|
}
|
|
|
|
|
2007-03-17 06:04:03 +08:00
|
|
|
/* Set the pressure threshold to be a fraction of global memory that
|
|
|
|
* is up to 1/2 at 256 MB, decreasing toward zero with the amount of
|
|
|
|
* memory, with a floor of 128 pages.
|
|
|
|
*/
|
2008-06-28 08:23:57 +08:00
|
|
|
nr_pages = totalram_pages - totalhigh_pages;
|
|
|
|
limit = min(nr_pages, 1UL<<(28-PAGE_SHIFT)) >> (20-PAGE_SHIFT);
|
|
|
|
limit = (limit * (nr_pages >> (20-PAGE_SHIFT))) >> (PAGE_SHIFT-11);
|
2007-03-17 06:04:03 +08:00
|
|
|
limit = max(limit, 128UL);
|
|
|
|
sysctl_tcp_mem[0] = limit / 4 * 3;
|
|
|
|
sysctl_tcp_mem[1] = limit;
|
2006-11-15 12:25:17 +08:00
|
|
|
sysctl_tcp_mem[2] = sysctl_tcp_mem[0] * 2;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-03-17 06:04:03 +08:00
|
|
|
/* Set per-socket limits to no more than 1/128 the pressure threshold */
|
2006-03-25 17:34:07 +08:00
|
|
|
limit = ((unsigned long)sysctl_tcp_mem[1]) << (PAGE_SHIFT - 7);
|
|
|
|
max_share = min(4UL*1024*1024, limit);
|
|
|
|
|
2007-12-31 16:11:19 +08:00
|
|
|
sysctl_tcp_wmem[0] = SK_MEM_QUANTUM;
|
2006-03-25 17:34:07 +08:00
|
|
|
sysctl_tcp_wmem[1] = 16*1024;
|
|
|
|
sysctl_tcp_wmem[2] = max(64*1024, max_share);
|
|
|
|
|
2007-12-31 16:11:19 +08:00
|
|
|
sysctl_tcp_rmem[0] = SK_MEM_QUANTUM;
|
2006-03-25 17:34:07 +08:00
|
|
|
sysctl_tcp_rmem[1] = 87380;
|
|
|
|
sysctl_tcp_rmem[2] = max(87380, max_share);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
printk(KERN_INFO "TCP: Hash tables configured "
|
|
|
|
"(established %d bind %d)\n",
|
[NET]: change layout of ehash table
ehash table layout is currently this one :
First half of this table is used by sockets not in TIME_WAIT state
Second half of it is used by sockets in TIME_WAIT state.
This is non optimal because of for a given hash or socket, the two chain heads
are located in separate cache lines.
Moreover the locks of the second half are never used.
If instead of this halving, we use two list heads in inet_ehash_bucket instead
of only one, we probably can avoid one cache miss, and reduce ram usage,
particularly if sizeof(rwlock_t) is big (various CONFIG_DEBUG_SPINLOCK,
CONFIG_DEBUG_LOCK_ALLOC settings). So we still halves the table but we keep
together related chains to speedup lookups and socket state change.
In this patch I did not try to align struct inet_ehash_bucket, but a future
patch could try to make this structure have a convenient size (a power of two
or a multiple of L1_CACHE_SIZE).
I guess rwlock will just vanish as soon as RCU is plugged into ehash :) , so
maybe we dont need to scratch our heads to align the bucket...
Note : In case struct inet_ehash_bucket is not a power of two, we could
probably change alloc_large_system_hash() (in case it use __get_free_pages())
to free the unused space. It currently allocates a big zone, but the last
quarter of it could be freed. Again, this should be a temporary 'problem'.
Patch tested on ipv4 tcp only, but should be OK for IPV6 and DCCP.
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-02-09 06:16:46 +08:00
|
|
|
tcp_hashinfo.ehash_size, tcp_hashinfo.bhash_size);
|
2005-06-24 03:19:55 +08:00
|
|
|
|
|
|
|
tcp_register_congestion_control(&tcp_reno);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(tcp_close);
|
|
|
|
EXPORT_SYMBOL(tcp_disconnect);
|
|
|
|
EXPORT_SYMBOL(tcp_getsockopt);
|
|
|
|
EXPORT_SYMBOL(tcp_ioctl);
|
|
|
|
EXPORT_SYMBOL(tcp_poll);
|
|
|
|
EXPORT_SYMBOL(tcp_read_sock);
|
|
|
|
EXPORT_SYMBOL(tcp_recvmsg);
|
|
|
|
EXPORT_SYMBOL(tcp_sendmsg);
|
2007-11-07 15:30:13 +08:00
|
|
|
EXPORT_SYMBOL(tcp_splice_read);
|
2005-04-17 06:20:36 +08:00
|
|
|
EXPORT_SYMBOL(tcp_sendpage);
|
|
|
|
EXPORT_SYMBOL(tcp_setsockopt);
|
|
|
|
EXPORT_SYMBOL(tcp_shutdown);
|