From nobody Thu Mar 31 18:04:54 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 E05371A5CD25; Thu, 31 Mar 2022 18:04:54 +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 4KTrmk5s3rz3GMw; Thu, 31 Mar 2022 18:04:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648749894; 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=iOe4H2JUW9ix/18r2eQGQhtkxh/iMUMr0J/wdblca8Q=; b=fWYz9syozCH8l3PHImCjdcmKW+1gw8zT8OLhUaUztCow7LR+6p1F0SkEu6KtRn8RT4rhgT fc8PRA2Ra1zzHUF0WkI7hQSNVj+UFVLaLtL/CwYJFQIfDr5h/yCWqmudS5ypi6MuW+pPgg T9maW5ADX8UG61HELU7jYZFogps0AoeucTN1En2riByxEOYFSgBoAFgHGyfOU4z9trYKMx R94Wvz8LSqvN5lPtqcj6qtWlUu5oG0lVphTsSulioTNrrXPppX8stg/Sq7HxdWlLOugQy2 282ybJtGpWVjK3euoVpinPooPiQm+gz6ZOBoyFTKOGrPtRyUgPIWy0/hdkJ0pg== 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 A59452C37F; Thu, 31 Mar 2022 18:04:54 +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 22VI4s4G058513; Thu, 31 Mar 2022 18:04:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22VI4sbZ058512; Thu, 31 Mar 2022 18:04:54 GMT (envelope-from git) Date: Thu, 31 Mar 2022 18:04:54 GMT Message-Id: <202203311804.22VI4sbZ058512@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: b7df7b987e8f - main - linprocfs: Add /proc/self/oom_score_adj. 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: b7df7b987e8fac05006aa5f132c424e2b2bcf156 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648749894; 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=iOe4H2JUW9ix/18r2eQGQhtkxh/iMUMr0J/wdblca8Q=; b=uNbhBVX/bNIeaNlGEi8UbqrESLK8HltGWSieOKevwO1lbFJKoVIeS9S0MxbE5pK8emusCm z33r+OlGB0DqVqEyAo/BFygp0XUO0ElUOfh046ZFcwwnY+T52VH/voigZ0B4R1IfEI/eC3 5lmUnpYWMrYNU06oS09dEPQMQ65kB2UdSj4S5awhwzJU8yziZSd+aOhy6vkDv/GQBFzSiH wZAHq9AsAKYB0xlU5hzbH7NEXj5Fv5rh48XLOAsdkvGOoXqa0g0niaTzp85YvnMBRgxpeK UddC74DWSgvC/8t3NlCmkXZBFWAeD2z0iRK44+Udrd3aYztaHbzraRhEBUTdDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648749894; a=rsa-sha256; cv=none; b=m+YZdzFGe6ApP0YrZ0oVltnMbAG1yB365CYRQv7IhWcza0R/QeQQbOPbBgdbLQUu3aEyKt qOY2CFJptXlXUtV17zi4IquKSyZjKn5EacQLjZfaXjzc5qYlYkzheojYt340jLvUxIIEuV sOlMQ6kbcKmBpSVbka7S5aXKQWqSnkL5rZp2NZ8ppO89R+DA/MdgierWGhBAaDOtToHXOf 0oHe83SwrCb/ST4kepGJdKBKineF4/FQ98THkEFsJJzmIS30bmWBygq6UTk/is0Gl+2AeS VApwF87vxQXJ1oKbWF9aXk2N/a554zYjfYfZjERSkdVB3xvbAn0Hu9WQ7kHqIQ== 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=b7df7b987e8fac05006aa5f132c424e2b2bcf156 commit b7df7b987e8fac05006aa5f132c424e2b2bcf156 Author: Dmitry Chagin AuthorDate: 2022-03-31 18:04:44 +0000 Commit: Dmitry Chagin CommitDate: 2022-03-31 18:04:44 +0000 linprocfs: Add /proc/self/oom_score_adj. To avoid annoyng messages from LTP test suites add the simple implementation of /proc/self/oom_score_adj which is do nothing. Reviewed by: emaste Differential revision: https://reviews.freebsd.org/D34710 MFC after: 2 weeks --- sys/compat/linprocfs/linprocfs.c | 30 ++++++++++++++++++++++++++++++ sys/compat/linux/linux_emul.c | 1 + sys/compat/linux/linux_emul.h | 1 + sys/compat/linux/linux_misc.h | 4 ++++ 4 files changed, 36 insertions(+) diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index 6a1a680f622a..8a9525b4375d 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -80,6 +80,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -104,6 +105,7 @@ __FBSDID("$FreeBSD$"); #endif /* __i386__ || __amd64__ */ #include +#include #include #include #include @@ -1932,6 +1934,32 @@ linprocfs_doauxv(PFS_FILL_ARGS) return (error); } +/* + * Filler function for proc/self/oom_score_adj + */ +static int +linprocfs_do_oom_score_adj(PFS_FILL_ARGS) +{ + struct linux_pemuldata *pem; + long oom; + + pem = pem_find(p); + if (pem == NULL || uio == NULL) + return (EOPNOTSUPP); + if (uio->uio_rw == UIO_READ) { + sbuf_printf(sb, "%d\n", pem->oom_score_adj); + } else { + sbuf_trim(sb); + sbuf_finish(sb); + oom = strtol(sbuf_data(sb), NULL, 10); + if (oom < LINUX_OOM_SCORE_ADJ_MIN || + oom > LINUX_OOM_SCORE_ADJ_MAX) + return (EINVAL); + pem->oom_score_adj = oom; + } + return (0); +} + /* * Constructor */ @@ -2018,6 +2046,8 @@ linprocfs_init(PFS_INIT_ARGS) NULL, &procfs_candebug, NULL, PFS_RD|PFS_RAWRD); pfs_create_file(dir, "limits", &linprocfs_doproclimits, NULL, NULL, NULL, PFS_RD); + pfs_create_file(dir, "oom_score_adj", &linprocfs_do_oom_score_adj, + procfs_attr_rw, &procfs_candebug, NULL, PFS_RDWR); /* /proc//task/... */ dir = pfs_create_dir(dir, "task", linprocfs_dotaskattr, NULL, NULL, 0); diff --git a/sys/compat/linux/linux_emul.c b/sys/compat/linux/linux_emul.c index eb132d97db4a..12e078546ac6 100644 --- a/sys/compat/linux/linux_emul.c +++ b/sys/compat/linux/linux_emul.c @@ -187,6 +187,7 @@ linux_proc_init(struct thread *td, struct thread *newtd, bool init_thread) pem = pem_find(p); KASSERT(pem != NULL, ("proc_exit: proc emuldata not found.\n")); pem->persona = 0; + pem->oom_score_adj = 0; } } diff --git a/sys/compat/linux/linux_emul.h b/sys/compat/linux/linux_emul.h index 70646cc93847..4e35da64606f 100644 --- a/sys/compat/linux/linux_emul.h +++ b/sys/compat/linux/linux_emul.h @@ -75,6 +75,7 @@ struct linux_pemuldata { struct sx pem_sx; /* lock for this struct */ uint32_t persona; /* process execution domain */ uint32_t ptrace_flags; /* used by ptrace(2) */ + uint32_t oom_score_adj; /* /proc/self/oom_score_adj */ }; #define LINUX_PEM_XLOCK(p) sx_xlock(&(p)->pem_sx) diff --git a/sys/compat/linux/linux_misc.h b/sys/compat/linux/linux_misc.h index a2dd5eb9f82b..0f134fc62e72 100644 --- a/sys/compat/linux/linux_misc.h +++ b/sys/compat/linux/linux_misc.h @@ -157,6 +157,10 @@ extern int stclohz; /* Linux seccomp flags */ #define LINUX_SECCOMP_GET_ACTION_AVAIL 2 +/* Linux /proc/self/oom_score_adj */ +#define LINUX_OOM_SCORE_ADJ_MIN -1000 +#define LINUX_OOM_SCORE_ADJ_MAX 1000 + #if defined(__aarch64__) || (defined(__amd64__) && !defined(COMPAT_LINUX32)) int linux_ptrace_status(struct thread *td, int pid, int status); #endif