From nobody Mon Oct 05 22:49:29 2026 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 4hzF270Ch5z6vYBM for ; Mon, 05 Oct 2026 22:49:34 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hzF2653vFz3LJs for ; Mon, 05 Oct 2026 22:49:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791240574; 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=lRebtpZCFAzMSEwnSEx091yYr5KHL3dwHX+0X9yXW/Q=; b=IVJ51hrh2LId92Zg2QIfbci4bJZResDDP5nnUyG3e/Tk6xXyDF23W1wCKn4wGIqyy4I/tC YI6XvWrn9Cbqrl/ky3EbooZ/hP3U5ZACBYSWaj+oDSf3nQtSg75lvnrtp8G5SJF4v9R7a6 eixHLQwuf2bqbTTLYPkM94AR6vyBzIprkOI1tsHDSqLsTL0NPR8bZqeypraWC1oLJ1cxiT No+e2eHugrJPRY/GbdC7zZ+2FYlw3LTQlLvm+AXpQy9Hclg1+S0r0cxLl0vf/WHk42PPow p4x9FTdErhw3gKjxJywB6mCEYAUUnvGwH51cqtTa/K5X+hOWhueVyUIu0k+ZPA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791240574; b=u/KB3QKdChfnOdeZVdoQLaNdXXzQOp2/NGZSsrHleHdi3+7m5+9fQ1XRqLycnD+jO3EC44 R/ToGZsUnjY37c+7SOVdI5PFXtXZdZjHiAVO/A9rcJ0kyAzsaJLnOb8sBGbukFCJcH5ry6 /0DN2bNYl4GaZOSi/smF0V2/R21WyHmFToCbID2Y+hlBsPDpKHYbrjEUTxfrZrj1Fl6rXY KdR8jRYA4GjPGsFY3SBgz1bbICwgLh/PfSZpkeUJ73so30wy1wOVDwDuAmY/OxIY+HeKhi 0kiVuXfxhoJrY3Dy0tN8rhvDVwNLy/PuwI8Y7buru1kbKH0rGO3xJ4oSPczBLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791240574; 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=lRebtpZCFAzMSEwnSEx091yYr5KHL3dwHX+0X9yXW/Q=; b=pwH/Rnu2AFgCCouztZKSvuYQMoYuR35qsOtv9oQvLj96pW3mMmTzEcNQy0FU6PkE0NduwE +Fm3sU8ZCd4Vu9A0cpr93OcUFk4SmBhpeO/ahj/gh7cnmkKv9Mra7qKdIfwxyP37r7O23T uhFneHR5fR4bZTNwNt97bDWClqzBvmJjUTLqIbCuF1rYMHpVKf9UJtfY6tQpDejLaomXh6 +P1e1zY3a69TP10M2htOfbDVz81Amck5+pB2n+MGfw9GIWBqvCjv+o+8nPME+8xq9x0Zt2 xJAsnxGwn2GJvQFGWLu3uNx9c9FaCKtSw/GwTV1AnphAi4Xic+uReRJEGVLIZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hzF263bWtzh4K for ; Mon, 05 Oct 2026 22:49:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2608d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 05 Oct 2026 22:49:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: bb5f10e51bd5 - main - linux: implement sched_getattr() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bb5f10e51bd53771f1a438f36f554256fcbd7d08 Auto-Submitted: auto-generated Date: Mon, 05 Oct 2026 22:49:29 +0000 Message-Id: <6ac42979.2608d.d368a5e@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=bb5f10e51bd53771f1a438f36f554256fcbd7d08 commit bb5f10e51bd53771f1a438f36f554256fcbd7d08 Author: Enji Cooper AuthorDate: 2026-10-05 22:48:22 +0000 Commit: Enji Cooper CommitDate: 2026-10-05 22:49:09 +0000 linux: implement sched_getattr() This change adds the necessary glue to translate Linux scheduler policy and priority from FreeBSD so this information is available to Linux applications. This unbreaks using the Linux version of Chromium on FreeBSD. This change was originally submitted via [freebsd/freebsd-src#2370][github-pr]. MFC after: 2 weeks PR: 297468 Co-Authored-By: Enji Cooper Signed-off-by: Joao Bonifacio [github-pr]: https://github.com/freebsd/freebsd-src/pull/2370 Differential Revision: https://reviews.freebsd.org/D60214 --- sys/compat/linux/linux_dummy.c | 1 - sys/compat/linux/linux_misc.c | 89 ++++++++++++++++++++++++++++++++++++++++++ sys/compat/linux/linux_misc.h | 19 ++++++++- 3 files changed, 106 insertions(+), 3 deletions(-) diff --git a/sys/compat/linux/linux_dummy.c b/sys/compat/linux/linux_dummy.c index dfb1c90e9abf..873e2cef3879 100644 --- a/sys/compat/linux/linux_dummy.c +++ b/sys/compat/linux/linux_dummy.c @@ -97,7 +97,6 @@ DUMMY(process_vm_writev); /* Linux 3.8: */ DUMMY(finit_module); DUMMY(sched_setattr); -DUMMY(sched_getattr); /* Linux 3.18: */ DUMMY(bpf); /* Linux 3.19: */ diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 65c9044dd3bd..9e7f6411df17 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -29,6 +29,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include #include @@ -116,6 +117,39 @@ struct l_pselect6arg { l_size_t ss_len; }; +/** + * `SCHED_ATTR_SIZE_VER0` represents the size of the initial published structure. + * + * See `linux/kernel/sched/syscalls.c` for more details. + */ +#define LINUX_SCHED_ATTR_SIZE_VER0 48 +/** + * Linux struct sched_attr + */ +struct linux_sched_attr { + l_uint size; + l_uint sched_policy; + uint64_t sched_flags; + int32_t sched_nice; + l_uint sched_priority; + + uint64_t sched_runtime; + uint64_t sched_deadline; + uint64_t sched_period; + + l_uint sched_util_min; + l_uint sched_util_max; +}; +/** + * `.size` must be checked at runtime as well in the syscall to match the + * Linux implementation. + * + * This `_Static_assert(..)` is a sanity check to ensure that the structure + * meets the minimum expected bar. + */ +_Static_assert(sizeof(struct linux_sched_attr) >= LINUX_SCHED_ATTR_SIZE_VER0, + "struct linux_sched_attr size"); + static int linux_utimensat_lts_to_ts(struct l_timespec *, struct timespec *); #if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) @@ -1350,6 +1384,61 @@ linux_sched_getscheduler(struct thread *td, return (error); } +int +linux_sched_getattr(struct thread *td, struct linux_sched_getattr_args *args) +{ + struct linux_sched_attr attr; + struct sched_param sched_param; + struct thread *tdt; + int error, policy; + + if (args->attr == NULL || args->pid < 0 || args->flags != 0 || + args->size < LINUX_SCHED_ATTR_SIZE_VER0 || args->size > PAGE_SIZE) + return (EINVAL); + + tdt = linux_tdfind(td, args->pid, -1); + if (tdt == NULL) + return (ESRCH); + + error = kern_sched_getscheduler(td, tdt, &policy); + if (error) { + PROC_UNLOCK(tdt->td_proc); + return (error); + } + + error = kern_sched_getparam(td, tdt, &sched_param); + PROC_UNLOCK(tdt->td_proc); + if (error) + return (error); + + memset(&attr, 0, sizeof(attr)); + + attr.size = MIN(args->size, sizeof(attr)); + + if (linux_map_sched_prio) { + switch (policy) { + case SCHED_OTHER: + sched_param.sched_priority = 0; + break; + case SCHED_FIFO: + case SCHED_RR: + /** + * Map [0, RTP_PRIO_MAX - RTP_PRIO_MIN] to + * [1, LINUX_MAX_RT_PRIO - 1] (rounding up). + */ + sched_param.sched_priority = + (sched_param.sched_priority * + (LINUX_MAX_RT_PRIO - 1) + + (RTP_PRIO_MAX - RTP_PRIO_MIN - 1)) / + (RTP_PRIO_MAX - RTP_PRIO_MIN) + 1; + break; + } + } + attr.sched_priority = sched_param.sched_priority; + + return (copyout(&attr, args->attr, args->size)); +} + int linux_sched_get_priority_max(struct thread *td, struct linux_sched_get_priority_max_args *args) diff --git a/sys/compat/linux/linux_misc.h b/sys/compat/linux/linux_misc.h index fb77784ddea8..44dd8e06fcb7 100644 --- a/sys/compat/linux/linux_misc.h +++ b/sys/compat/linux/linux_misc.h @@ -109,10 +109,25 @@ #define __LINUX_NPXCW__ 0x37f #endif -/* Scheduling policies */ -#define LINUX_SCHED_OTHER 0 +/** + * Linux scheduling policies. + * + * Ref: `linux/include/uapi/linux/sched.h` + */ +#define LINUX_SCHED_NORMAL 0 +/* `SCHED_OTHER` is a legacy alias for `SCHED_NORMAL`. */ +#define LINUX_SCHED_OTHER LINUX_SCHED_NORMAL #define LINUX_SCHED_FIFO 1 #define LINUX_SCHED_RR 2 +/** + * FreeBSD does not implement analogs for these Linux scheduling policies. This + * is mostly here for reference and to be self-documenting in `sched_set*()`. + */ +#define LINUX_SCHED_BATCH 3 +/* LINUX_SCHED_ISO: slot reserved, but not implemented upstream. */ +#define LINUX_SCHED_IDLE 5 +#define LINUX_SCHED_DEADLINE 6 +#define LINUX_SCHED_EXT 7 #define LINUX_MAX_RT_PRIO 100