Merge pull request #1224 from no92/systemd-udev-3

systemd-udevd on managarm: part 3, socket work
managarm · Jan 16, 2025 · 00d79d9 · 00d79d9
2 parents a3bdc24 + d6eac95
commit 00d79d9
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 1 deletion.
diff --git a/sysdeps/managarm/generic/ioctl.cpp b/sysdeps/managarm/generic/ioctl.cpp
@@ -3,11 +3,13 @@
 #include <linux/cdrom.h>
 #include <linux/input.h>
 #include <linux/kd.h>
+#include <linux/sockios.h>
 #include <linux/usb/cdc-wdm.h>
 #include <linux/vt.h>
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <netinet/in.h>
+#include <scsi/sg.h>
 #include <sys/ioctl.h>
 
 #include <bits/ensure.h>
@@ -505,6 +507,18 @@ int sys_ioctl(int fd, unsigned long request, void *arg, int *result) {
 			*result = resp.result();
 			return 0;
 		}
+		case SIOCETHTOOL:
+			mlibc::infoLogger() << "\e[35mmlibc: SIOCETHTOOL is a stub" << frg::endlog;
+			*result = 0;
+			return ENOSYS;
+		case SIOCGSKNS:
+			mlibc::infoLogger() << "\e[35mmlibc: SIOCGSKNS is a stub" << frg::endlog;
+			*result = 0;
+			return ENOSYS;
+		case SG_IO:
+			mlibc::infoLogger() << "\e[35mmlibc: SG_IO is a stub" << frg::endlog;
+			*result = 0;
+			return ENOSYS;
 	} // end of switch()
 
 	if (_IOC_TYPE(request) == 'E' && _IOC_NR(request) == _IOC_NR(EVIOCGVERSION)) {

diff --git a/sysdeps/managarm/generic/socket.cpp b/sysdeps/managarm/generic/socket.cpp
@@ -251,6 +251,15 @@ int sys_peername(
 	}
 }
 
+namespace {
+
+std::array<std::pair<int, int>, 2> getsockopt_passthrough = {{
+    {SOL_SOCKET, SO_PROTOCOL},
+    {SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS},
+}};
+
+}
+
 int
 sys_getsockopt(int fd, int layer, int number, void *__restrict buffer, socklen_t *__restrict size) {
 	SignalGuard sguard;
@@ -341,6 +350,49 @@ sys_getsockopt(int fd, int layer, int number, void *__restrict buffer, socklen_t
 		                    << frg::endlog;
 		*(int *)buffer = 1;
 		return 0;
+	} else if (std::find(
+	               getsockopt_passthrough.begin(),
+	               getsockopt_passthrough.end(),
+	               std::pair<int, int>{layer, number}
+	           )
+	           != getsockopt_passthrough.end()) {
+		auto handle = getHandleForFd(fd);
+		if (!handle)
+			return EBADF;
+
+		size_t buffer_size = size ? *size : 0;
+
+		managarm::fs::GetSockOpt<MemoryAllocator> req(getSysdepsAllocator());
+		req.set_layer(layer);
+		req.set_number(number);
+		req.set_optlen(size ? *size : 0);
+
+		auto [offer, send_req, recv_resp, recv_buffer] = exchangeMsgsSync(
+		    handle,
+		    helix_ng::offer(
+		        helix_ng::sendBragiHeadOnly(req, getSysdepsAllocator()),
+		        helix_ng::recvInline(),
+		        helix_ng::recvBuffer(buffer, buffer_size)
+		    )
+		);
+		HEL_CHECK(offer.error());
+		HEL_CHECK(send_req.error());
+		HEL_CHECK(recv_resp.error());
+		HEL_CHECK(recv_buffer.error());
+
+		managarm::fs::SvrResponse<MemoryAllocator> resp(getSysdepsAllocator());
+		resp.ParseFromArray(recv_resp.data(), recv_resp.length());
+		if (resp.error() == managarm::fs::Errors::SUCCESS)
+			return 0;
+		else if (resp.error() == managarm::fs::Errors::ILLEGAL_OPERATION_TARGET)
+			return EINVAL;
+		else if (resp.error() == managarm::fs::Errors::ILLEGAL_ARGUMENT)
+			return EINVAL;
+		else if (resp.error() == managarm::fs::Errors::INVALID_PROTOCOL_OPTION)
+			return ENOPROTOOPT;
+		else
+			__ensure(resp.error() == managarm::fs::Errors::SUCCESS);
+		__builtin_unreachable();
 	} else {
 		mlibc::panicLogger() << "\e[31mmlibc: Unexpected getsockopt() call, layer: " << layer
 		                     << " number: " << number << "\e[39m" << frg::endlog;
@@ -358,12 +410,13 @@ std::array<std::pair<int, int>, 5> setsockopt_readonly = {{
     {SOL_SOCKET, SO_TYPE},
 }};
 
-std::array<std::pair<int, int>, 5> setsockopt_passthrough = {{
+std::array<std::pair<int, int>, 6> setsockopt_passthrough = {{
     {SOL_PACKET, PACKET_AUXDATA},
     {SOL_SOCKET, SO_LOCK_FILTER},
     {SOL_SOCKET, SO_BINDTODEVICE},
     {SOL_IP, IP_PKTINFO},
     {SOL_NETLINK, NETLINK_ADD_MEMBERSHIP},
+    {SOL_NETLINK, NETLINK_PKTINFO},
 }};
 
 std::array<std::pair<int, int>, 2> setsockopt_passthrough_noopt = {{