Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement more socket options. #858

Merged
merged 4 commits into from
Sep 29, 2023
Merged

Implement more socket options. #858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
304e920
Implement more socket options.
sunfishcode Sep 29, 2023
9f5c925
Fixes.
sunfishcode Sep 29, 2023
ad8c225
More features in QEMU.
sunfishcode Sep 29, 2023
45ffd2c
More fixes.
sunfishcode Sep 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,7 @@ jobs:
patch -p1 < $GITHUB_WORKSPACE/ci/s390x-stat-have-nsec.patch
patch -p1 < $GITHUB_WORKSPACE/ci/aarch64-o-largefile.patch
patch -p1 < $GITHUB_WORKSPACE/ci/tcgets2-tcsets2.patch
patch -p1 < $GITHUB_WORKSPACE/ci/more-sockopts.patch
./configure --target-list=${{ matrix.qemu_target }} --prefix=${{ runner.tool_cache }}/qemu --disable-tools --disable-slirp --disable-fdt --disable-capstone --disable-docs
ninja -C build install
if: matrix.qemu != '' && matrix.os == 'ubuntu-latest'
Expand Down Expand Up @@ -605,6 +606,7 @@ jobs:
patch -p1 < $GITHUB_WORKSPACE/ci/s390x-stat-have-nsec.patch
patch -p1 < $GITHUB_WORKSPACE/ci/aarch64-o-largefile.patch
patch -p1 < $GITHUB_WORKSPACE/ci/tcgets2-tcsets2.patch
patch -p1 < $GITHUB_WORKSPACE/ci/more-sockopts.patch
./configure --target-list=${{ matrix.qemu_target }} --prefix=${{ runner.tool_cache }}/qemu --disable-tools --disable-slirp --disable-fdt --disable-capstone --disable-docs
ninja -C build install
if: matrix.qemu != '' && matrix.os == 'ubuntu-latest'
Expand Down Expand Up @@ -696,6 +698,7 @@ jobs:
patch -p1 < $GITHUB_WORKSPACE/ci/s390x-stat-have-nsec.patch
patch -p1 < $GITHUB_WORKSPACE/ci/aarch64-o-largefile.patch
patch -p1 < $GITHUB_WORKSPACE/ci/tcgets2-tcsets2.patch
patch -p1 < $GITHUB_WORKSPACE/ci/more-sockopts.patch
./configure --target-list=${{ matrix.qemu_target }} --prefix=${{ runner.tool_cache }}/qemu --disable-tools --disable-slirp --disable-fdt --disable-capstone --disable-docs
ninja -C build install
if: matrix.qemu != '' && matrix.os == 'ubuntu-latest'
Expand Down
79 changes: 79 additions & 0 deletions ci/more-sockopts.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
From Dan Gohman <[email protected]>
Subject: [PATCH] Implement various socket options.

This implements the `SO_INCOMING_CPU`, `SO_COOKIE`, and `SO_PROTOCOL`
socket options.

diff -ur -x roms -x build a/linux-user/generic/sockbits.h b/linux-user/generic/sockbits.h
--- a/linux-user/generic/sockbits.h
+++ b/linux-user/generic/sockbits.h
@@ -60,4 +60,10 @@

#define TARGET_SO_PROTOCOL 38
#define TARGET_SO_DOMAIN 39
+#ifndef TARGET_SO_INCOMING_CPU
+#define TARGET_SO_INCOMING_CPU 49
+#endif
+#ifndef TARGET_SO_COOKIE
+#define TARGET_SO_COOKIE 57
+#endif
#endif
diff -ur -x roms -x build a/linux-user/syscall.c b/linux-user/syscall.c
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -2476,6 +2476,9 @@
case TARGET_SO_RCVLOWAT:
optname = SO_RCVLOWAT;
break;
+ case TARGET_SO_INCOMING_CPU:
+ optname = SO_INCOMING_CPU;
+ break;
default:
goto unimplemented;
}
@@ -2534,6 +2537,7 @@
{
abi_long ret;
int len, val;
+ int64_t val64;
socklen_t lv;

switch(level) {
@@ -2733,6 +2737,27 @@
case TARGET_SO_DOMAIN:
optname = SO_DOMAIN;
goto int_case;
+ case TARGET_SO_INCOMING_CPU:
+ optname = SO_INCOMING_CPU;
+ goto int_case;
+ case TARGET_SO_COOKIE:
+ optname = SO_COOKIE;
+ if (get_user_u32(len, optlen))
+ return -TARGET_EFAULT;
+ if (len < 0)
+ return -TARGET_EINVAL;
+ lv = sizeof(val64);
+ ret = get_errno(getsockopt(sockfd, level, optname, &val64, &lv));
+ if (ret < 0)
+ return ret;
+ if (len > lv)
+ len = lv;
+ assert(len == 8);
+ if (put_user_u64(val64, optval_addr))
+ return -TARGET_EFAULT;
+ if (put_user_u32(len, optlen))
+ return -TARGET_EFAULT;
+ break;
default:
goto int_case;
}
@@ -2756,6 +2781,9 @@
case SO_ERROR:
val = host_to_target_errno(val);
break;
+ case SO_PROTOCOL:
+ val = host_to_target_errno(val);
+ break;
}
if (level == SOL_SOCKET && optname == SO_ERROR) {
val = host_to_target_errno(val);
Loading