From nobody Thu Mar 31 18:01:23 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id AE9FC1A5B186; Thu, 31 Mar 2022 18:01:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KTrhg4VC1z3DTC; Thu, 31 Mar 2022 18:01:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648749683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tbui/op+DoATZ+m/nmV/T51Z+OhaMWWUZ2ZMcz2v2Ec=; b=StAduVndHvaNOBe9+bt5q4eQHjXeQpkeSrPeVEO5jgYg5JnesYn5L37ia6OULr27/KCXJv hqONZaz2xUMRfklz2xru1ILo0Wtyy9VY1MiiUkLIZGZnhGl0d4vui3pCrnuFGoY2i7Atqy hKTsmwUe0/HQ8aqpTZoJbQSIdKcdeIYxvW4xHhfBJk3G8sNXW+j3bmUASyz40pNjf337sb UWQ5MSOqHAq7M517EHr2cWwn1pHGLXSluYa/l62yXhOPy0OL1YmrG9wPNs65YVrL/Ai44p BqdYganbCBJ5QTrryhxCgC5HqI8OT8wjByRol7sdnXcQbLDWItKpOMV2LKS+ww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7A6D32C251; Thu, 31 Mar 2022 18:01:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22VI1NFP057068; Thu, 31 Mar 2022 18:01:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22VI1NOJ057067; Thu, 31 Mar 2022 18:01:23 GMT (envelope-from git) Date: Thu, 31 Mar 2022 18:01:23 GMT Message-Id: <202203311801.22VI1NOJ057067@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: d5dc757e84d8 - main - linux(4): Add compat.linux32.emulate_i386 knob. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5dc757e84d8dc1db987f3a17052e32621d6ea87 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648749683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tbui/op+DoATZ+m/nmV/T51Z+OhaMWWUZ2ZMcz2v2Ec=; b=Oc8Zcp6acAQs2mLS8Lmk92AihqS/fY2U7UzgF/Fv5oHyRXq0EneP5lvmQZoQclt3bE+ef5 1ufC8twvJlA/j9ixwbqlCkmI58rG7jEewQnW6cs5x4F+Fu+gka9kJLe1PGJobBCSZw+mJZ EhVopuzUc8qwajrPETg1rvTV+ev6GrLeBU+Y+8ICn+uoRqfIie7QCLuZGO1qVyC1E5Jwx+ 0k5K20stfuQwuFZ5g2tNIv0CXAk0xnqOdMxOkl8z7hSdMY60Ou7PUjAuosH6R/O0cnRdGQ 6NI9p4kkjIUxrVlNExENOZJIit4VPIuoIpFWTYpMPVpGdWmXI6Z29QZ3E+M8bQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648749683; a=rsa-sha256; cv=none; b=Hel1UaZnUaZGOT7HgggdMca6eK3L3UIWUXziVup/DQyBPa5SUT/RiaxnBeBxXopbaEwLye +xWBmGPs11uXmmYTVX97Ens7geetRcPb4Lr0sCV5Gpe4l2yYniVYIVz7PjmxpRX4/V1vdu 5qi4gfzGEvTNtQjBwyW+WuvRj6fS9QAPM+MqiWmHEYOjEZtTTAIsKiRN9CTwClE/3U0vYM 8JQTRQ/E6RQz846TY+Hn+/0R/ZCPwaikjwOU+P4vqasFnpQQW8KCQvRL+Xqm8ymj1CC29x M0LpFqmu+BCgnwyuAXNWdeZIcQwv+8XSO6XAxUA0krSA1IANwe2j1vJelYtrZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=d5dc757e84d8dc1db987f3a17052e32621d6ea87 commit d5dc757e84d8dc1db987f3a17052e32621d6ea87 Author: Dmitry Chagin AuthorDate: 2022-03-31 18:01:09 +0000 Commit: Dmitry Chagin CommitDate: 2022-03-31 18:01:09 +0000 linux(4): Add compat.linux32.emulate_i386 knob. Historically 32-bit Linuxulator under amd64 emulated the real i386 behavior. Since 3d8dd983 the old i386 Linux world can't be used under amd64 Linuxulator as it don't know anything about amd64 machine (which is returned now by newuname() syscall). So, add a knob to allow to swith the behavior and use i386 Linux binaries on amd64. Set knob to the new behavior as I think this is common to the modern Linux distros. Reviewed by: Pau Amma (doc), emaste Differential revision: https://reviews.freebsd.org/D34708 MFC after: 2 weeks --- share/man/man4/linux.4 | 6 ++++++ sys/amd64/linux32/linux.h | 2 ++ sys/amd64/linux32/linux32_sysvec.c | 3 +++ sys/compat/linux/linux_misc.c | 5 +++++ 4 files changed, 16 insertions(+) diff --git a/share/man/man4/linux.4 b/share/man/man4/linux.4 index ee2629092100..ecf633f39648 100644 --- a/share/man/man4/linux.4 +++ b/share/man/man4/linux.4 @@ -145,6 +145,12 @@ This might be reasonable or even required, because does not emulate the Linux environment completely, and missed features may result in security vulnerabilities. Defaults to 1. +.It Va compat.linux32.emulate_i386 +In the x86_64 (amd64) world enable the real i386 Linuxulator behavior. +For example, when set to 0, Linux uname -m will return "x86_64" even if +uname itself is a i386 Linux executable. When set to 1, Linux i386 +uname -m will return "i686". +Defaults to 0. .El .Sh FILES .Bl -tag -width /compat/linux/dev/shm -compact diff --git a/sys/amd64/linux32/linux.h b/sys/amd64/linux32/linux.h index f1f877181e47..1273ff485dd9 100644 --- a/sys/amd64/linux32/linux.h +++ b/sys/amd64/linux32/linux.h @@ -637,4 +637,6 @@ struct reg32; void bsd_to_linux_regset32(const struct reg32 *b_reg, struct linux_pt_regset32 *l_regset); +extern bool linux32_emulate_i386; + #endif /* !_AMD64_LINUX_H_ */ diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c index ff9ceda795cc..782ab2246061 100644 --- a/sys/amd64/linux32/linux32_sysvec.c +++ b/sys/amd64/linux32/linux32_sysvec.c @@ -885,6 +885,9 @@ SYSCTL_ULONG(_compat_linux32, OID_AUTO, maxssiz, CTLFLAG_RW, static u_long linux32_maxvmem = LINUX32_MAXVMEM; SYSCTL_ULONG(_compat_linux32, OID_AUTO, maxvmem, CTLFLAG_RW, &linux32_maxvmem, 0, ""); +bool linux32_emulate_i386 = false; +SYSCTL_BOOL(_compat_linux32, OID_AUTO, emulate_i386, CTLFLAG_RWTUN, + &linux32_emulate_i386, 0, "Emulate the real i386"); static void linux32_fixlimit(struct rlimit *rl, int which) diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index f4ea92941720..0579ac1a03ce 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -720,6 +720,11 @@ linux_newuname(struct thread *td, struct linux_newuname_args *args) * the string returned by getauxval(AT_PLATFORM) needs * to remain "i686", though. */ +#if defined(COMPAT_LINUX32) + if (linux32_emulate_i386) + strlcpy(utsname.machine, "i686", LINUX_MAX_UTSNAME); + else +#endif strlcpy(utsname.machine, "x86_64", LINUX_MAX_UTSNAME); #elif defined(__aarch64__) strlcpy(utsname.machine, "aarch64", LINUX_MAX_UTSNAME);