sr-dev November 2023

sr-dev@lists.kamailio.org

15 participants
389 discussions

git:master:80d1f105: core: qm/fm memory align size can be set with define KSR_MEMORY_ALIGN

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 80d1f10507190ae1a42c25f0c173188b8326b5b9 URL: https://github.com/kamailio/kamailio/commit/80d1f10507190ae1a42c25f0c173188… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-10T14:08:09+01:00 core: qm/fm memory align size can be set with define KSR_MEMORY_ALIGN - flexibility to be set at compile time via make or compiler parameter --- Modified: src/core/mem/f_malloc.h Modified: src/core/mem/q_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/80d1f10507190ae1a42c25f0c173188… Patch: https://github.com/kamailio/kamailio/commit/80d1f10507190ae1a42c25f0c173188… --- diff --git a/src/core/mem/f_malloc.h b/src/core/mem/f_malloc.h index c05a243af6f..5a9d28ece42 100644 --- a/src/core/mem/f_malloc.h +++ b/src/core/mem/f_malloc.h @@ -46,10 +46,15 @@ * can be 32 bits aligned => malloc should return multiple of long long * aligned memory * - malloc() on gnu/linux: multiple of 8 or 16 on 64-bit systems - * - for simplicity settle for 16 always + * - for simplicity settle for 16 by default * - sizeof(fm_frag) must be multiple of ROUNDTO! */ +#ifndef KSR_MEMORY_ALIGN #define ROUNDTO 16UL +#else +#define ROUNDTO KSR_MEMORY_ALIGN +#endif + #define MIN_FRAG_SIZE ROUNDTO diff --git a/src/core/mem/q_malloc.h b/src/core/mem/q_malloc.h index b3bfaab3689..5b440688af3 100644 --- a/src/core/mem/q_malloc.h +++ b/src/core/mem/q_malloc.h @@ -39,10 +39,14 @@ * can be 32 bits aligned => malloc should return multiple of long long * aligned memory * - malloc() on gnu/linux: multiple of 8 or 16 on 64-bit systems - * - for simplicity settle for 16 always + * - for simplicity settle for 16 by default * - sizeof(qm_frag) and sizeof(qm_frag_end) must be multiple of ROUNDTO! */ +#ifndef KSR_MEMORY_ALIGN #define ROUNDTO 16UL +#else +#define ROUNDTO KSR_MEMORY_ALIGN +#endif #define MIN_FRAG_SIZE ROUNDTO

1 year

git:master:7cc22301: core: mem - fm memory manager updated to align to 16

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7cc22301b37ae2a214900af9628b148f59dcce21 URL: https://github.com/kamailio/kamailio/commit/7cc22301b37ae2a214900af9628b148… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-10T08:24:51+01:00 core: mem - fm memory manager updated to align to 16 - same as malloc() on linux 64b - https://www.gnu.org/software/libc/manual/html_node/Aligned-Memory-Blocks.ht… - some libraries (e.g., libwolfssl) expect such alignement for specific optimizations - done even for 32b, expected rather low overhead in average, not expected many chunks under 16 bytes versus those over - malloc optimization factor increased to 15 --- Modified: src/core/mem/f_malloc.c Modified: src/core/mem/f_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/7cc22301b37ae2a214900af9628b148… Patch: https://github.com/kamailio/kamailio/commit/7cc22301b37ae2a214900af9628b148…

1 year

git:master:d56b96f7: core: mem - qm check for alignment of main block structure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d56b96f79c21c23957051eee1b6f7aa22cb075f1 URL: https://github.com/kamailio/kamailio/commit/d56b96f79c21c23957051eee1b6f7aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-10T07:58:24+01:00 core: mem - qm check for alignment of main block structure --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/d56b96f79c21c23957051eee1b6f7aa… Patch: https://github.com/kamailio/kamailio/commit/d56b96f79c21c23957051eee1b6f7aa… --- diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index ce01af2dfcf..45e15a8a2e9 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -198,20 +198,28 @@ struct qm_block *qm_malloc_init(char *address, unsigned long size, int type) if((sizeof(struct qm_frag) % ROUNDTO != 0) || (sizeof(struct qm_frag_end) % ROUNDTO != 0)) { - LM_ERR("memory align constraints failure (%lu %% %lu = %lu ::: %lu %% " + LM_ERR("memory fragment align constraints failure (%lu %% %lu = %lu " + "::: %lu %% " "%lu = %lu)\n", sizeof(struct qm_frag), ROUNDTO, sizeof(struct qm_frag) % ROUNDTO, sizeof(struct qm_frag_end), ROUNDTO, sizeof(struct qm_frag_end) % ROUNDTO); return 0; } - + if(sizeof(struct qm_block) % ROUNDTO != 0) { + LM_ERR("memory block align constraints failure (%lu %% %lu = %lu)\n", + sizeof(struct qm_block), ROUNDTO, + sizeof(struct qm_block) % ROUNDTO); + return 0; + } /* make address and size multiple of ROUNDTO */ start = (char *)ROUNDUP((unsigned long)address); LM_DBG("QM_OPTIMIZE=%lu, QM_OPTIMIZE/ROUNDTO=%lu, ROUNDTO=%lu\n", QM_MALLOC_OPTIMIZE, QM_MALLOC_OPTIMIZE / ROUNDTO, ROUNDTO); - LM_DBG("QM_HASH_SIZE=%lu, qm_block size=%lu\n", QM_HASH_SIZE, - (unsigned long)sizeof(struct qm_block)); + LM_DBG("QM_HASH_SIZE=%lu, qm_block_size=%lu, qm_block_size %% " + "ROUNDTO=%lu\n", + QM_HASH_SIZE, (unsigned long)sizeof(struct qm_block), + (unsigned long)sizeof(struct qm_block) % ROUNDTO); LM_DBG("qm_malloc_init(%p, %lu), start=%p\n", address, (unsigned long)size, start); if(size < start - address)

1 year

[kamailio/kamailio] kamailio 5.7.2 - tls_wolfssl - failed: Free fragment not found (Issue #3634)

by badien

tls_wolfssl falied: Nov 9 18:56:32 server99 /usr/local/sbin/kamailio[199263]: ERROR: <core> [core/mem/q_malloc.c:297]: qm_find_free(): qm_find_free(0x7f1a9117a000, 3216); Free fragment not found! Nov 9 18:56:32 server99 /usr/local/sbin/kamailio[199263]: ERROR: <core> [core/mem/q_malloc.c:430]: qm_malloc(): qm_malloc(0x7f1a9117a000, 3216) called from tls_wolfssl: tls_init.c: ser_malloc(220), module: tls_wolfssl; Free fragment not found! ### Description - Ubuntu 22.04 - kamailio 5.7.2 - wolfssl 5.6.3-stable - hardware: + CPU(s) 28 - Intel(R) Xeon(R) CPU E5-2680 v4 @ 2.40GHz + memory 32GB - testing on some users: using JWT token (AWS cognito) authentication via header (may be message too large) - don't have issue with 64GB memory (other server) yet ### Troubleshooting #### Log Messages ``` Nov 9 18:56:32 server99 /usr/local/sbin/kamailio[199263]: ERROR: <core> [core/mem/q_malloc.c:297]: qm_find_free(): qm_find_free(0x7f1a9117a000, 3216); Free fragment not found! Nov 9 18:56:32 server99 /usr/local/sbin/kamailio[199263]: ERROR: <core> [core/mem/q_malloc.c:430]: qm_malloc(): qm_malloc(0x7f1a9117a000, 3216) called from tls_wolfssl: tls_init.c: ser_malloc(220), module: tls_wolfssl; Free fragment not found! ``` ### Possible Solutions i am trying to enable mem_join ### Additional Information ``` version: kamailio 5.7.2 (x86_64/linux) 7af9dc flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 7af9dc compiled on 20:15:34 Nov 9 2023 with gcc 11.4.0 ``` * **Operating System**: ``` Distributor ID: Ubuntu Description: Ubuntu 22.04.2 LTS Release: 22.04 Codename: jammy ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3634 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3634(a)github.com>

1 year

[kamailio/kamailio] Nonexisted route in KEMI python causes "ksr_request_route not found or is not callable" (Issue #3572)

by ShadoWalkeR31

### Description I migrate one of our old project on native to KEMI on app_python3 and get strange behavior - after some time kamailio stops processing requests/replies wit message "ksr_request_route/ksr_reply_route not found or is not callable" ### Troubleshooting After some research with debug=3 and reading debug logs i found, that some of routes i forgot to rename in calls t_on_reply() and t_on_failure() - because they generates "not found or is not callable" in logs too. Also i check all event routes and found that some event_callbacks point to wrong KEMI functions. Events of the form (which gave me the idea that it was the wrong names) DEBUG: 887937087 INVITE app_python3 [python_exec.c:93]: apy_exec(): ksr_onrl_MANAGE not found or is not callable DEBUG: app_python3 [python_exec.c:93]: apy_exec(): ksr_dialog_event not found or is not callable presents in logs very rarely (I saw them only after hours of debugging) even after restart. For me its look like that nonexisted routes completly stops interpretator and block all subsequent processing in the fork and kamailio very rarely has time to log it. When i use right names of functions it works well and no "ksr_request_route/ksr_reply_route not found or is not callable" PS: KSR.tm.t_on_branch() with wrong route generates normal exception and nonblock execution #### Reproduction Just use wrong names in KSR.tm.t_on_reply()/KSR.tm.t_on_failure() or modparam event_callback in any module (i got it with dispatcher and dialog) #### Log Messages Exception that generates by wrong function in KSR.tm.t_on_branch() ERROR: 63586697 BYE app_python3 [python_support.c:156]: python_handle_exception(): apy_exec: ksr_request_route((null)): Unhandled exception in the Python code: AttributeError: 'kamailio' object has no attribute 'ksr_br_MANAGE' The above exception was the direct cause of the following exception: Traceback (most recent call last): File "/etc/kamailio(a)REGION/python/request_route.py", line 38, in ksr_request_route if self.ksr_WITHINDLG() == -255: File "/etc/kamailio(a)REGION/python/ksr_WITHINDLG.py", line 27, in ksr_WITHINDLG return self.ksr_RELAY() File "/etc/kamailio(a)REGION/python/ksr_RELAY.py", line 17, in ksr_RELAY if KSR.tm.t_relay() < 0: SystemError: <built-in function t_relay> returned a result with an error set ### Possible Solutions Use rigth names ### Additional Information version: kamailio 5.7.1 (x86_64/linux) 4238e4 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 4238e4 compiled on 00:00:00 Sep 13 2022 with gcc 11.3.1 version: kamailio 5.6.4 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 10.2.1 * **Operating System**: PRETTY_NAME="Oracle Linux Server 9.2" PRETTY_NAME="Debian GNU/Linux 11 (bullseye)" -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3572 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3572(a)github.com>

1 year

git:master:695dc54d: app_python3: enable error log mode for some of missing callback functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 695dc54dc1547fdee18b00cfa8e4d15f047834a5 URL: https://github.com/kamailio/kamailio/commit/695dc54dc1547fdee18b00cfa8e4d15… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-10T07:31:38+01:00 app_python3: enable error log mode for some of missing callback functions - tm-specific callbacks should trigger error log messages if not found --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/695dc54dc1547fdee18b00cfa8e4d15… Patch: https://github.com/kamailio/kamailio/commit/695dc54dc1547fdee18b00cfa8e4d15… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 339d505cdda..2d271b2e271 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -71,19 +71,19 @@ int sr_kemi_config_engine_python( } } else if(rtype == BRANCH_ROUTE) { if(rname != NULL && rname->s != NULL) { - ret = apy_exec(msg, rname->s, NULL, 0); + ret = apy_exec(msg, rname->s, NULL, 1); } } else if(rtype == FAILURE_ROUTE) { if(rname != NULL && rname->s != NULL) { - ret = apy_exec(msg, rname->s, NULL, 0); + ret = apy_exec(msg, rname->s, NULL, 1); } } else if(rtype == BRANCH_FAILURE_ROUTE) { if(rname != NULL && rname->s != NULL) { - ret = apy_exec(msg, rname->s, NULL, 0); + ret = apy_exec(msg, rname->s, NULL, 1); } } else if(rtype == TM_ONREPLY_ROUTE) { if(rname != NULL && rname->s != NULL) { - ret = apy_exec(msg, rname->s, NULL, 0); + ret = apy_exec(msg, rname->s, NULL, 1); } } else if(rtype == ONSEND_ROUTE) { if(kemi_onsend_route_callback.len > 0) {

1 year

git:master:eabd1e2c: core: mem - qm malloc optimization factor increased to 15

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: eabd1e2c49b3e67455d5d8b13809332832036fa8 URL: https://github.com/kamailio/kamailio/commit/eabd1e2c49b3e67455d5d8b13809332… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-10T07:29:51+01:00 core: mem - qm malloc optimization factor increased to 15 --- Modified: src/core/mem/q_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/eabd1e2c49b3e67455d5d8b13809332… Patch: https://github.com/kamailio/kamailio/commit/eabd1e2c49b3e67455d5d8b13809332… --- diff --git a/src/core/mem/q_malloc.h b/src/core/mem/q_malloc.h index 47ea674d837..b3bfaab3689 100644 --- a/src/core/mem/q_malloc.h +++ b/src/core/mem/q_malloc.h @@ -46,7 +46,7 @@ #define MIN_FRAG_SIZE ROUNDTO -#define QM_MALLOC_OPTIMIZE_FACTOR 14UL /*used below */ +#define QM_MALLOC_OPTIMIZE_FACTOR 15UL /*used below */ /* size to optimize for, (most allocs <= this size), must be 2^k */ #define QM_MALLOC_OPTIMIZE ((unsigned long)(1UL << QM_MALLOC_OPTIMIZE_FACTOR))

1 year

git:master:a5bc1c03: core: mem - qm memory manager updated to align to 16

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a5bc1c03968b797ac03d5b648ad3b417dfee265d URL: https://github.com/kamailio/kamailio/commit/a5bc1c03968b797ac03d5b648ad3b41… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-09T20:33:31+01:00 core: mem - qm memory manager updated to align to 16 - same as malloc() on linux 64b - https://www.gnu.org/software/libc/manual/html_node/Aligned-Memory-Blocks.ht… - some libraries (e.g., libwolfssl) expect such alignement for specific optimizations - done even for 32b, expected rather low overhead in average, not expected many chunks under 16 bytes versus those over --- Modified: src/core/mem/q_malloc.c Modified: src/core/mem/q_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/a5bc1c03968b797ac03d5b648ad3b41… Patch: https://github.com/kamailio/kamailio/commit/a5bc1c03968b797ac03d5b648ad3b41…

1 year

git:master:7bdd7fb4: dialog: use memcpy to fill profile uid

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7bdd7fb4aa666b5f56ae3e554770126ad5b68c2e URL: https://github.com/kamailio/kamailio/commit/7bdd7fb4aa666b5f56ae3e554770126… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-09T15:32:39+01:00 dialog: use memcpy to fill profile uid --- Modified: src/modules/dialog/dlg_profile.c --- Diff: https://github.com/kamailio/kamailio/commit/7bdd7fb4aa666b5f56ae3e554770126… Patch: https://github.com/kamailio/kamailio/commit/7bdd7fb4aa666b5f56ae3e554770126… --- diff --git a/src/modules/dialog/dlg_profile.c b/src/modules/dialog/dlg_profile.c index fd605d000c9..5dd3b372d49 100644 --- a/src/modules/dialog/dlg_profile.c +++ b/src/modules/dialog/dlg_profile.c @@ -603,7 +603,9 @@ int set_dlg_profile( } sruid_next_safe(&_dlg_profile_sruid); if(_dlg_profile_sruid.uid.len < SRUID_SIZE) { - strcpy(linker->hash_linker.puid, _dlg_profile_sruid.uid.s); + memcpy(linker->hash_linker.puid, _dlg_profile_sruid.uid.s, + _dlg_profile_sruid.uid.len); + linker->hash_linker.puid[_dlg_profile_sruid.uid.len] = '\0'; linker->hash_linker.puid_len = _dlg_profile_sruid.uid.len; } else { LM_ERR("sruid size is too large\n"); @@ -951,7 +953,7 @@ int dlg_set_timeout_by_profile( unsigned int h_id; unsigned int h_entry; struct dlg_map_list *next; - } * map_head, *map_scan, *map_scan_next; + } *map_head, *map_scan, *map_scan_next; map_head = NULL;

1 year

git:master:36806bea: imc: coverted some static global str variables to macros

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 36806bea261f7a29dc1d2a8aedac837a06043968 URL: https://github.com/kamailio/kamailio/commit/36806bea261f7a29dc1d2a8aedac837… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-09T14:54:13+01:00 imc: coverted some static global str variables to macros --- Modified: src/modules/imc/imc_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/36806bea261f7a29dc1d2a8aedac837… Patch: https://github.com/kamailio/kamailio/commit/36806bea261f7a29dc1d2a8aedac837…

1 year

← Newer
1
...
30
31
32
33
34
35
36
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2023