kernel/net: allocate socket rings from non-contiguous pages

kernel/trunk/core/heap.inc

@@ -463,7 +463,7 @@ proc kernel_alloc stdcall, size:dword
         and     eax, -PAGE_SIZE;
         mov     [size], eax
         and     eax, eax
-        jz      .err
+        jz      .err0
         mov     ebx, eax
         shr     ebx, 12
         mov     [pages_count], ebx
@@ -509,6 +509,13 @@ proc kernel_alloc stdcall, size:dword
         pop     ebx
         ret
 .err:
+        mov     eax, [lin_addr]
+        test    eax, eax
+        jz      .err0
+        mov     ecx, [pages_count]
+        call    release_pages
+        stdcall free_kernel_space, [lin_addr]
+.err0:
         xor     eax, eax
         pop     edi
         pop     ebx

kernel/trunk/core/memory.inc

@@ -1397,7 +1397,9 @@ proc create_ring_buffer stdcall, size:dword, flags:dword
         mov     [page_tabs + edi], eax
         mov     [page_tabs + edi + edx], eax
         invlpg  [ebx]
-        invlpg  [ebx+0x10000]
+        add     ebx, [size]
+        invlpg  [ebx]                   ; the mirror half
+        sub     ebx, [size]
         add     eax, 0x1000
         add     ebx, 0x1000
         add     edi, 4
@@ -1416,6 +1418,62 @@ proc create_ring_buffer stdcall, size:dword, flags:dword
         ret
 endp
 
+; Same as create_ring_buffer, but from non-contiguous pages.
+; Not for DMA. Free with kernel_free.
+align 4
+proc create_ring_buffer_sparse stdcall, size:dword, flags:dword
+           locals
+             buf_ptr  dd ?
+           endl
+
+        mov     eax, [size]
+        test    eax, eax
+        jz      .fail
+
+        add     eax, eax
+        stdcall alloc_kernel_space, eax
+        test    eax, eax
+        jz      .fail
+        mov     [buf_ptr], eax
+
+        push    ebx esi edi
+        mov     ebx, eax                ; page being mapped
+        mov     esi, [size]             ; distance to its mirror
+        mov     edi, esi
+        shr     edi, 12                 ; pages left
+  .page:
+        call    alloc_page
+        test    eax, eax
+        jz      .mm_fail
+        or      eax, [flags]
+        mov     edx, ebx
+        shr     edx, 12
+        mov     [page_tabs + edx*4], eax
+        invlpg  [ebx]
+        lea     edx, [ebx + esi]
+        shr     edx, 12
+        mov     [page_tabs + edx*4], eax
+        invlpg  [ebx + esi]
+        add     ebx, PAGE_SIZE
+        dec     edi
+        jnz     .page
+
+        mov     eax, [buf_ptr]
+        pop     edi esi ebx
+        ret
+
+  .mm_fail:
+        mov     eax, [buf_ptr]
+        mov     ecx, [size]
+        shr     ecx, 11                 ; both halves, in pages
+        call    release_pages
+        stdcall free_kernel_space, [buf_ptr]
+        pop     edi esi ebx
+        xor     eax, eax
+  .fail:
+        ret
+endp
+
 
 align 4
 proc print_mem

kernel/trunk/network/socket.inc

@@ -198,6 +198,10 @@ ends
 
 SOCKET_STRUCT_SIZE      = 4096          ; in bytes
 
+if sizeof.STREAM_SOCKET > SOCKET_STRUCT_SIZE
+  err "STREAM_SOCKET does not fit in SOCKET_STRUCT_SIZE"
+end if
+
 SOCKET_QUEUE_SIZE       = 10            ; maximum number of incoming packets queued for 1 socket
 ; the incoming packet queue for sockets is placed in the socket struct itself, at this location from start
 SOCKET_QUEUE_LOCATION   = (SOCKET_STRUCT_SIZE - SOCKET_QUEUE_SIZE*sizeof.socket_queue_entry - sizeof.queue)
@@ -1647,7 +1651,7 @@ socket_ring_create:
         mov     esi, eax
 
         push    edx
-        stdcall create_ring_buffer, SOCKET_BUFFER_SIZE, PG_SWR
+        stdcall create_ring_buffer_sparse, SOCKET_BUFFER_SIZE, PG_SWR
         pop     edx
         test    eax, eax
         jz      .fail

kernel/trunk/network/tcp.inc

@@ -72,7 +72,7 @@ TCP_time_rtt_default    = 5           ; default Round Trip Time (3,2s)
 TCP_time_srtt_default   = 0           ;
 TCP_time_max_idle       = 8*TCP_time_keep_interval      ; FIXME
 
-TCP_time_connect        = 1000        ; in 1/100s (default=10s)
+TCP_time_connect        = 300         ; in 1/100s (default=3s)
 
 ; timer constants
 TCP_max_rxtshift        = 12          ; max retransmissions waiting for ACK

kernel/trunk/network/tcp_input.inc

@@ -399,7 +399,6 @@ endl
         bswap   eax
         mov     [ebx + TCP_SOCKET.ts_val], eax
         lodsd                                   ; timestamp echo reply
-        bswap   eax
         mov     [ebx + TCP_SOCKET.ts_ecr], eax
         or      [temp_bits], TCP_BIT_TIMESTAMP
 
@@ -979,7 +978,7 @@ endl
 
         inc     [ebx + TCP_SOCKET.t_dupacks]
         cmp     [ebx + TCP_SOCKET.t_dupacks], TCP_re_xmit_thresh
-        jb      .ack_processed
+        jb      .dup_ack_complete
         ja      .another_lost
 
         DEBUGF  DEBUG_NETWORK_VERBOSE, "TCP_input: Re-transmitting lost segment\n"

kernel/trunk/network/tcp_output.inc

@@ -391,14 +391,8 @@ endl
         jz      .no_timestamp
 
   .timestamp:
-        push    ebx
-        mov     ebx, [eax + TCP_SOCKET.ts_recent]
-        bswap   ebx
-        xchg    ebx, [esp]                      ; TSecr
-        push    ebx
-        mov     ebx, [timer_ticks]
-        bswap   ebx
-        xchg    ebx, [esp]                      ; TSval
+        pushd   0
+        pushd   [timer_ticks]
         pushd   TCP_OPT_NOP + TCP_OPT_NOP shl 8 + TCP_OPT_TIMESTAMP shl 16 + 10 shl 24
         add     di, 12
 
@@ -419,12 +413,10 @@ endl
 ; check if we don't exceed the max segment size
 
         add     esi, edi                        ; total TCP segment size
-        mov     ebx, [eax + TCP_SOCKET.t_maxseg]
-        add     ebx, sizeof.TCP_header          ; MSS does not count the header
-        cmp     esi, ebx
+        cmp     esi, [eax + TCP_SOCKET.t_maxseg]
         jbe     .no_overflow
 
-        mov     esi, ebx
+        mov     esi, [eax + TCP_SOCKET.t_maxseg]
         or      [temp_bits], TCP_BIT_SENDALOT
   .no_overflow: