Syscall forwarding refactored from #21 #39

Thaodan · 2025-08-06T09:52:38Z

Originally based on work by Frajo Haider but completely reworked
to use the existing interface system.

Contains #32, obsoletes #21.

piggz · 2025-10-06T07:03:45Z

This appears to fix the issues building qt6, with file permission errors. See https://build.sailfishos.org/project/monitor/home:piggz:qt6sb2?arch_aarch64=1&defaults=0&repo_sailfish_latest_aarch64=1&succeeded=1 i had to fork and make some build fixes, minor printf formatting placeholders.

vige · 2025-10-10T05:22:31Z

You should rebase the PR on top of current master. It would still be a huge PR but at least a bit more comprehensible.

piggz · 2025-10-13T20:31:00Z

execs/exec_policy_ruletree.c

 		if (str) {
 			SB_LOG(SB_LOGLEVEL_NOISE,
-				"%s: %s='%s'", __func__, s_name, str, fldoffs);
+				"%s: %s='%s' o=%lu", __func__, s_name, str, fldoffs);


Should be %u for size_t

Discussed with @mlehtima , %zu is probably better?

piggz · 2025-10-13T20:31:21Z

execs/exec_policy_ruletree.c

 		} else {
 			SB_LOG(SB_LOGLEVEL_NOISE,
-				"%s: No %s", __func__, s_name, fldoffs);
+				"%s: No %s o=%lu", __func__, s_name, fldoffs);


Should be %u

piggz · 2025-10-13T20:31:43Z

execs/exec_policy_ruletree.c

 		uip = ruletree_get_pointer_to_boolean(offs);
                SB_LOG(SB_LOGLEVEL_NOISE,
-                        "%s: @%u = *%p = %d",
+                        "%s: @%u = *%p = %d o=%lu",


Should be %u

piggz · 2025-10-13T20:32:24Z

execs/exec_policy_ruletree.c

 		uip = ruletree_get_pointer_to_uint32(offs);
 		SB_LOG(SB_LOGLEVEL_NOISE,
-			"%s: @%u = *%p = %u",
+			"%s: @%u = *%p = %u o=%lu",


Should be %u

piggz · 2025-10-13T20:32:50Z

execs/exec_policy_ruletree.c

 			eph.exec_policy_offset, r_name);
                SB_LOG(SB_LOGLEVEL_NOISE,
-                        "%s: @%u", __func__, offs, fldoffs);
+                        "%s: @%u o=%lu", __func__, offs, fldoffs);


Should be %u

piggz · 2025-10-13T20:33:02Z

execs/exec_policy_selection.c


 	SB_LOG(SB_LOGLEVEL_NOISE,
-		"%s: '%s' (%u), '%s' (%u) => %d (%s)",
+		"%s: '%s' (%lu), '%s' (%u) => %d (%s)",


Should be %u

piggz · 2025-10-13T20:34:06Z

pathmapping/paths_ruletree_mapping.c


 	SB_LOG(SB_LOGLEVEL_NOISE,
-		"ruletree_test_path_match '%s' (%u), '%s' (%u) => %d (%s)",
+		"ruletree_test_path_match '%s' (%lu), '%s' (%u) => %d (%s)",


Should be %u

piggz · 2025-10-13T20:35:04Z

rule_tree/rule_tree.c

 		if (write(ruletree_ctx.rtree_ruletree_fd, ptr, size) < (int)size) {
 			SB_LOG(SB_LOGLEVEL_ERROR,
-				"Failed to append a struct (%d bytes) to the rule tree", size);
+				"Failed to append a struct (%lu bytes) to the rule tree", size);


Should be %u

piggz · 2025-10-13T20:35:34Z

rule_tree/rule_tree.c

 	if ((wr_result == -1) || ((size_t)wr_result < list_size_in_bytes)) {
 		SB_LOG(SB_LOGLEVEL_ERROR,
-			"Failed to append a list (%d items, %d bytes) to the rule tree", 
+			"Failed to append a list (%d items, %lu bytes) to the rule tree",


Should be %u

piggz · 2025-10-13T20:35:58Z

rule_tree/rule_tree.c


 	SB_LOG(SB_LOGLEVEL_NOISE,
-		"ruletree_find_inodestat (dev=%lld,ino=%lld,key=%llX)",
+		"ruletree_find_inodestat (dev=%lld,ino=%lld,key=%lu)",


Should be %llu

piggz · 2025-10-13T20:36:12Z

rule_tree/rule_tree.c

 {
 	SB_LOG(SB_LOGLEVEL_NOISE,
-		"ruletree_set_inodestat (dev=%lld,ino=%lld,key=%llX))",
+		"ruletree_set_inodestat (dev=%lld,ino=%lld,key=%lu))",


Should be %llu

ldexportlist was removed earlier for export.map. Replace with export.map where not done already. Remove obsolete references such as the target in preload/Makefile. Fixes: 20180ac Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Previously in some instance the assumption was $(SRCDIR) = $(OBJDIR). If $(OBJDIR) isn't equal to $(SRCDIR) these files were not found anymore. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Resolves error when using a compiler with stricter settings such as when using LTO. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

…JB#61866 Both open and openat load their last argument 'mode' lazily, using va_arg() only if O_CREAT is found in oflag. This is wrong, mode is also necessary if O_TMPFILE is in oflag. Adapt __OPEN_NEEDS_MODE(oflag) present since glibc 2.22 to solve the issue. Read more down below: https://sourceware.org/git/?p=glibc.git;a=commit;h=65f6f938cd562a614a68e15d0581a34b177ec29d Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Once in autogen.sh and once in %make Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Previously preload/exported.h depended on preload/wrappers.c even thou both where generated from interface.master by gen-interface.pl. Refactor so that all generated preloader files depend on the interface and the gen-interface script. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

The builtin multilib support as unused. It's cleaner to built libsb2 for 32bit targets in a 32bit worker. The side effect of these changes is that make file pickup the correct directories passed to configure in %configure. Also now we can use regular build macros. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

By detecting if configure.ac has changed and thus configure will change in the following step we can run autogen.sh and config.status to rerun configure with the previously set built options. The change removes the need for .configure file, correctly detects if configures sources changed and doesn't run configure again without all the previously passed options. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

In case the root Makefile isn't in PWD assume that the Makefiles directory is the source directory. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Remove obsolete and unused things. Own all directories correctly (this will be an error in later RPM versions). Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Remove useless checks like: ``` command if [ $# -eq 0 ] ; then error fi ``` Or replace obsolescent -a and -o with `[ ] && [ ] ` and `[ ] || [ ]`. https://github.com/koalaman/shellcheck/wiki/SC2166 https://github.com/koalaman/shellcheck/wiki/SC2181

Doing so exits with a clearer error message then errors about sb2d failing to start later such as these: Runtime-Error loading /tmp/sb2-bidar-20240329-145433.AwoNRb/lua_scripts/init.lua (...dar-20240329-145433.AwoNRb/lua_scripts/argvenvp_misc.lua:28: bad argument #1 to 'files' (/tmp/sb2-bidar-20240329-145433.AwoNRb/wrappers.sdk-build: No such file or directory)) sb2: Error: startup of sb2d failed. Tested-by: Björn Bidar <bjorn.bidar@jolla.com>

To make it easier to detect where Scratchbox2 helper scripts and binaries are found on the host and partially on the tooling/target. This is especially important for helper binaries such as sb2dctl. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

The version used in the Makefile and version header was extracted using git with a phony target which resulted in unintended rebuilds. Using the autoconf script avoids these as now the version only updates when the autoconf script changes. Further the version originally set in the autoconf was also out of date. This change fixes both of these issues. The script in build-aux was taken from Gnulib. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Previously config.status was also clean as part of the clean making rebuilds impossible without calling configure again. Clean isn't supposed to clean the generated build- or distribution-system files. Further somefiles that should be clean where not cleaned at all. This change also aligns the name of the clean target which removes the distribution to the one configure mentions when it fails. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

When configure.ac or config.mak.in change but not their output their will be repeated rebuilds as the timestamp their output files such as config.mak stay older than their dependency. The timestamp file's timestamp will always update after the targets dependency changed. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Co-authored-by: Matti Viljanen <matti.viljanen@jolla.com> Co-authored-by: Björn Bidar <bjorn.bidar@jolla.com> Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

In case not available. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Sets basic indentation across editors and reviews on Github. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

The char arrays in sblog_vprintf_line_to_logfile where not initialized which can cause the the call to vsnprintf can fail. See for example the backtrace below: from ~/dev/vms/jolla/targets/SailfishOS-devel-i486/lib/libc.so.6 level=9, format=0xf7f6c488 "%s gate: calling mapped syscall(%s) to %s", ap=0xffcd9f10 "\304\035\367\367\005") at ~/dev/sailfish/jolla/pkgs/pj_oss/scratchbox2/sblib/sb_log.c:318 level=9, format=0xf7f6c488 "%s gate: calling mapped syscall(%s) to %s") at ~/dev/sailfish/jolla/pkgs/pj_oss/scratchbox2/sblib/sb_log.c:423 realfnname=0xf7f71988 <__func__.292> "syscall", number=5, ap=0xffcd9fc4 "\034\240\004\b") at preload/syscallgate.c:91

…ile time

Also remove some extra white space at end or in empty lines.

…tently

Originally based on work by Frajo Haider but completely reworked to use the existing interface system. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Thaodan mentioned this pull request Aug 6, 2025

Native static binaries cpu transparency fixes #40

Open

Thaodan force-pushed the master branch from 9ac8bf4 to 5373beb Compare August 6, 2025 09:58

Thaodan force-pushed the syscall_forwarding_refactored_jb59837 branch from cf6e4fc to e4a0ced Compare August 6, 2025 09:58

piggz reviewed Oct 13, 2025

View reviewed changes

Thaodan added 14 commits December 10, 2025 13:39

[sb2] Avoid errors in out of tree builds for files from $(OBJDIR)

4ce0ddb

Previously in some instance the assumption was $(SRCDIR) = $(OBJDIR). If $(OBJDIR) isn't equal to $(SRCDIR) these files were not found anymore. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

[utils] Use va_args in open_nomap_nolog to match wrappers. JB#61866

537fd90

Resolves error when using a compiler with stricter settings such as when using LTO. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

[sb2] Don't run make twice

ba5e7b1

Once in autogen.sh and once in %make Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

[llbuild] Refactor import_dir to match other Makefiles

a9e21b5

Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

[sb2] Automatically detect out of tree builds

af381c7

In case the root Makefile isn't in PWD assume that the Makefiles directory is the source directory. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

packaging: Cleanup spec file

19ade22

Remove obsolete and unused things. Own all directories correctly (this will be an error in later RPM versions). Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Thaodan and others added 9 commits December 10, 2025 13:39

sb2: Remove trailing slash

062dfbc

Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

[sb2] Make sure config.h is updated and cleaned

f129f21

Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

sb2: Move logic to functions, session checks to parser, shorten code

9b31b6d

Co-authored-by: Matti Viljanen <matti.viljanen@jolla.com> Co-authored-by: Björn Bidar <bjorn.bidar@jolla.com> Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

packaging: Also include x86_64 in ExclusiveArch

bb7c6d2

In case not available. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Add EditorConfig and dir-locals

90a1c9e

Sets basic indentation across editors and reviews on Github. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Thaodan force-pushed the syscall_forwarding_refactored_jb59837 branch from e4a0ced to 8c36b9c Compare December 10, 2025 11:41

Thaodan added 5 commits December 12, 2025 11:59

[sblog] Add format attribute to detect type conversion errors at comp…

9fbe8ba

…ile time

[sb2] Make format string specifiers match the target architecture

c32facc

Also remove some extra white space at end or in empty lines.

[sb2] Wrap rule typedef into its own PRI macro, use PRI macros consis…

a936cb3

…tently

[sb2] Allow redirecting syscalls (not all are supported yet). JB#59837

7dcd175

Originally based on work by Frajo Haider but completely reworked to use the existing interface system. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

[preloader] Add gates for wait3 and wait4

f96ddc0

Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Thaodan force-pushed the syscall_forwarding_refactored_jb59837 branch from 8c36b9c to f96ddc0 Compare December 15, 2025 10:52

Syscall forwarding refactored from #21 #39

Are you sure you want to change the base?

Syscall forwarding refactored from #21 #39

Uh oh!

Conversation

Thaodan commented Aug 6, 2025

Uh oh!

piggz commented Oct 6, 2025

Uh oh!

vige commented Oct 10, 2025

Uh oh!

piggz Oct 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

piggz Oct 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

piggz Oct 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

piggz Oct 13, 2025 •

edited

Loading

piggz Oct 13, 2025 •

edited

Loading

piggz Oct 13, 2025 •

edited

Loading