From nobody Wed May 24 08:50:27 2023 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 4QR4dc0k0mz4CRQR; Wed, 24 May 2023 08:50:28 +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 4QR4db73Ywz45bb; Wed, 24 May 2023 08:50:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684918228; 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=tumbDtGX76tFOl1+QXHz57Q8n7nvpXgtDDdrCks7Rd8=; b=T67u62WWItpezdJNA8P3qh2cFLBDVXNv99DcaDB4oi40tBQEWmjuoRJm8kzX2bkYtsPmSf RH/w9YVFBaU8QK9Ez8kVjNnlDHekj2CaDC9OaDM9wt7DiAxvbchNhZg7/AkcFkxpr7zIm5 ArmdrK5IZ7ntLb0U0xtoZWB8L/tUJJl9evF7xbvfEueLgVpkXHMPD2owr/OKLnwySL9Z/z N2t/U35MFUlSU6U4HdjcUex+KM8Rw5U+oAC2zs7ILMpl6XNC+oMDxN6XvwdVoEcroLK+xT vecz++2MFdICeJVFh9gYBFeZD6eY1M8MTDaiBI6DFsw9mwOEoP863yl+Ji+PsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684918228; 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=tumbDtGX76tFOl1+QXHz57Q8n7nvpXgtDDdrCks7Rd8=; b=IEwAfileEfVDwdKH5+4LOVRjdNEgTuKtcrGKK8nFs0uLndZz4Nvy7BPN3uKr1Y+Uy3tmdg cN6dKSV5dEB9XU0pCPfGR0mptygJ1goA2sUtmyjO+TsNwIHhAIhqSWLEDju5UFLvUIGRPr 9Wm6iylVe/6i4UNttwaTOvYjNnBf2MjzDXMhllSnUmcFrdjsBZU7VeEXq3SToO+Tx505dV TLOr1V76i19YhIqd5DSOJMWE4g930q+AVBY4tRxXu/qjytH7T7debkjI7zcmyXaQIbOiPm 1478LJNauPm2bxBhdS5WtD6m9tfDMZCQroA85CC9D+aghG4ZfmeFwbM0PDcsLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684918228; a=rsa-sha256; cv=none; b=ldwlYrQD2BL4CFWDewArjj1dvhKSL7v/D4qUchjlrsS5PlRi9FRtbsKeJKnbCTVaH4p8+E DSbxLX/nlKgAmGzo07lzk7UylwhhBoDIGCKygJrItxeSq6EOOMYb4OzJ0//pVRqnkkDIXs wMVezaG1/aYdGNXtXa34AfXw/UsfKS60epMOgPiAzXTCDzpIW1HuX3fTY/v1sGeO4S69Xq H7Yx+wkbz5qfCJ30fPv422k8ypVRktBjy82eb9qV1TNh8ekcFUbPEzv4CmlJUzkxvRVbK+ SfiYxev1FOCVLytQL2t5EG3Cs4Gnr7LoDkQU2LMYk1zgWpAfBOqwHxQYIBfU+g== 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 4QR4db66fVzbW8; Wed, 24 May 2023 08:50:27 +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 34O8oRRN037703; Wed, 24 May 2023 08:50:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34O8oRcs037702; Wed, 24 May 2023 08:50:27 GMT (envelope-from git) Date: Wed, 24 May 2023 08:50:27 GMT Message-Id: <202305240850.34O8oRcs037702@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: ad513b4dba3e - main - LinuxKPI: add utsname for init_utsname() with release 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad513b4dba3e330b6f2714bdde4d864898c4222e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ad513b4dba3e330b6f2714bdde4d864898c4222e commit ad513b4dba3e330b6f2714bdde4d864898c4222e Author: Bjoern A. Zeeb AuthorDate: 2023-05-23 23:12:47 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-05-24 08:41:28 +0000 LinuxKPI: add utsname for init_utsname() with release A wireless dirver is requesting release from the result of init_utsname(). Populate the field on startup. MFC after: 10 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D40248 --- sys/compat/linuxkpi/common/include/linux/utsname.h | 51 ++++++++++++++++++++++ sys/compat/linuxkpi/common/src/linux_compat.c | 4 ++ 2 files changed, 55 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/utsname.h b/sys/compat/linuxkpi/common/include/linux/utsname.h new file mode 100644 index 000000000000..1f7f4b7f4289 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/utsname.h @@ -0,0 +1,51 @@ +/*- + * Copyright (c) 2023 Bjoern A. Zeeb + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _LINUXKPI_LINUX_UTSNAME_H +#define _LINUXKPI_LINUX_UTSNAME_H + +#include +#include + +struct _utsname { + char release[OSRELEASELEN]; +}; + +struct uts_namespace { + struct _utsname name; +}; + +extern struct uts_namespace init_uts_ns; + +static inline struct _utsname * +init_utsname(void) +{ + + return &init_uts_ns.name; +} + +#endif /* _LINUXKPI_LINUX_UTSNAME_H */ diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index 8a2473e82d66..d639cda64dc9 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -83,6 +83,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -139,6 +140,7 @@ struct class linux_class_misc; struct list_head pci_drivers; struct list_head pci_devices; spinlock_t pci_lock; +struct uts_namespace init_uts_ns; unsigned long linux_timer_hz_mask; @@ -2813,6 +2815,8 @@ linux_compat_init(void *arg) */ for (i = 0; i < MAXCPU; i++) CPU_SET(i, &static_single_cpu_mask[i]); + + strlcpy(init_uts_ns.name.release, osrelease, sizeof(init_uts_ns.name.release)); } SYSINIT(linux_compat, SI_SUB_DRIVERS, SI_ORDER_SECOND, linux_compat_init, NULL);