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

data/Tupfile.lua

@@ -523,7 +523,6 @@ tup.append_table(img_files, {
  {"LIB/RASTERWORKS.OBJ", VAR_PROGS .. "/develop/libraries/fontRasterWorks_unicode/RasterWorks.obj"},
  {"LIB/SORT.OBJ", VAR_PROGS .. "/develop/libraries/sorter/sort.obj"},
  {"LIB/TINYGL.OBJ", VAR_PROGS .. "/develop/libraries/TinyGL/asm_fork/tinygl.obj"},
- {"LIB/XML.OBJ", VAR_PROGS .. "/develop/libraries/asm-xml/xml.obj"},
  {"MEDIA/ANIMAGE", VAR_PROGS .. "/media/animage/animage"},
  {"MEDIA/FILLSCR", VAR_PROGS .. "/media/FillScr/fillscr"},
  {"MEDIA/KIV", VAR_PROGS .. "/media/kiv/kiv"},

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

programs/develop/libraries/asm-xml/LICENSE.txt

@@ -1,25 +0,0 @@
-Copyright (c) 2007-2012, Marc Kerbiquet
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-3. Neither the name of AsmXml nor the names of its contributors may be
-   used to endorse or promote products derived from this software without
-   specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

programs/develop/libraries/asm-xml/Tupfile.lua

@@ -1,2 +0,0 @@
-if tup.getconfig("NO_FASM") ~= "" then return end
-tup.rule("xml.asm", "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "xml.obj")

programs/develop/libraries/asm-xml/xml.asm

@@ -1,59 +0,0 @@
-; SPDX-License-Identifier: GPL-2.0-only
-;
-; xml.obj - AsmXml parser as a KolibriOS library
-; Copyright (C) KolibriOS team 2026
-;
-; asm-xml.asm and LICENSE.txt are the unmodified AsmXml 1.4 release
-; by Marc Kerbiquet (BSD 3-clause), https://tibleiz.net/asm-xml/
-
-format MS COFF
-
-public EXPORTS
-
-section '.flat' code readable align 16
-
-; AsmXml calls malloc/free as cdecl, the heap functions given to lib_init
-; are stdcall: the caller pops the argument they have already taken
-lib_init:
-        mov     [mem.alloc], eax
-        mov     [mem.free], ebx
-        mov     eax, malloc
-        mov     ebx, free
-        jmp     initialize
-
-malloc:
-        push    dword [esp + 4]
-        call    [mem.alloc]
-        ret
-
-free:
-        push    dword [esp + 4]
-        call    [mem.free]
-        ret
-
-align 4
-mem.alloc       dd ?
-mem.free        dd ?
-
-align 16
-EXPORTS:
-        dd      sz_lib_init,                    lib_init
-        dd      sz_initializeParser,            _initializeParser
-        dd      sz_releaseParser,               _releaseParser
-        dd      sz_parse,                       _parse
-        dd      sz_initializeClassParser,       _initializeClassParser
-        dd      sz_releaseClassParser,          _releaseClassParser
-        dd      sz_classFromElement,            _classFromElement
-        dd      sz_classFromString,             _classFromString
-        dd      0, 0
-
-sz_lib_init                     db 'lib_init', 0
-sz_initializeParser             db 'ax_initializeParser', 0
-sz_releaseParser                db 'ax_releaseParser', 0
-sz_parse                        db 'ax_parse', 0
-sz_initializeClassParser        db 'ax_initializeClassParser', 0
-sz_releaseClassParser           db 'ax_releaseClassParser', 0
-sz_classFromElement             db 'ax_classFromElement', 0
-sz_classFromString              db 'ax_classFromString', 0
-
-include 'asm-xml.asm'