From patchwork Wed Dec 13 22:41:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Price X-Patchwork-Id: 13491972 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55AE6C4332F for ; Wed, 13 Dec 2023 22:41:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D85326B0446; Wed, 13 Dec 2023 17:41:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D0B026B0448; Wed, 13 Dec 2023 17:41:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AEB216B0449; Wed, 13 Dec 2023 17:41:41 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 9186A6B0446 for ; Wed, 13 Dec 2023 17:41:41 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 5B13214035D for ; Wed, 13 Dec 2023 22:41:41 +0000 (UTC) X-FDA: 81563268402.28.BC066D0 Received: from mail-yw1-f195.google.com (mail-yw1-f195.google.com [209.85.128.195]) by imf13.hostedemail.com (Postfix) with ESMTP id 890C420011 for ; Wed, 13 Dec 2023 22:41:39 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=HkU2buvS; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf13.hostedemail.com: domain of gourry.memverge@gmail.com designates 209.85.128.195 as permitted sender) smtp.mailfrom=gourry.memverge@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702507299; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=lipR8XQlYrI4nz9NVeJQmAt2/A+ckhzHN/RL9jRzBRI=; b=onRa6FYRTM+KjpEN8Q1osVxZdCI2b9hrwzbbJPIGk3jR9c9AceiZ9Edcz/ikl0ad2UuXVq fvRONWUiEV1DQmytnKrdtritSQGp++GIJCoOP8iTFhnpS+VwhTvGtrhiN9MlOQ9OE2svB6 125Phbko1UVHEPsr53H53SXcHmfgnJE= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=HkU2buvS; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf13.hostedemail.com: domain of gourry.memverge@gmail.com designates 209.85.128.195 as permitted sender) smtp.mailfrom=gourry.memverge@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702507299; a=rsa-sha256; cv=none; b=em+9u+bhF0HvcsrwHMTcvaiTBgRjWN2AYPeC9su2EOGHHxW+tCUQlCOHFDDgDBArVFLSC6 /j2QqFUdI9CuCOfbMfQRal/TW9oHlbb+7MpU8jCaHxjH0ThufvhRc+u9oRWUDZi//ovggd +JCNyqGBw4bn9dqbUJCR03VYzib2vXA= Received: by mail-yw1-f195.google.com with SMTP id 00721157ae682-5e2e873ed29so10718347b3.0 for ; Wed, 13 Dec 2023 14:41:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702507298; x=1703112098; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lipR8XQlYrI4nz9NVeJQmAt2/A+ckhzHN/RL9jRzBRI=; b=HkU2buvShFGBjRzA2/vdwZChEW43RZFV7Ahf1F+z1gk8nszsLL6WS53vGYNR1XCWHs Q1EGDg4dCpt3tYMNtWkmq+epAgXz0+OJ0NFaZkiaRXpdWceIj4/nYuQrvuTOeVfnjxOg W6bQL2CBQi/egTZXk9NPwlM8XEVSqd5v+YCncXaq1TX0FLxiu8VgKzMippAoIzMWG2AI 9psUoWEYsAuL9u818sWF943xRf0EpDCTxaU1cOAlPfzrtXGvoGqpGeGUy5Qs0R0GXtpi LdEkaFnVok5cfnoxKUTInqQzd5qDnWRUiOIdQP+ylkhsvbCGFVKf9Kx0GbtCvrVx+J2c KdXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702507298; x=1703112098; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lipR8XQlYrI4nz9NVeJQmAt2/A+ckhzHN/RL9jRzBRI=; b=en80mNxozHK7WqabNiQDUVItrQOri/bLqOu7j7ljcV/KTQA6JxZOtwI8udsYs6XaJQ JQ9Deegxf+xCO0shRgnJUR3t1/IAAEws93NF8W16zUuaIZQkNL+UtTjvlBeZ9PQx2jYi GjL59xRuvNTaxdaw1uum0oArypR8NG+Ap/9wgwvCg3NYg2++tnsUKSsb7e85JYQ7H9Yz Ynx87fUFjG0B892wSXzWmy7OAviltaUIbFvEIJjbcjVHC58qX/NEcQwnglJBVkIUa6qU Sxrwn0k/WlvJvJAvflL6oJK63aBbTYYbSNdfqw7mPtmaYOarr+WWkSqcJohGG7mN3uu3 iWiQ== X-Gm-Message-State: AOJu0YyYIczrQiAMpv+cZdixfTkVtZB92R4zHZGTggNyx0QjbhqSPTOK qyHjdrKs7nd2Ag7GmhfcYJ+HzPa1j1EQ X-Google-Smtp-Source: AGHT+IGVfVIlTjCY9BSQlcFJSdFROjcHB9iS5xvEreYoD0kyQO+vkenLn3JHmIqFato8sU7T8CJn9g== X-Received: by 2002:a81:7206:0:b0:5d9:c21d:ae03 with SMTP id n6-20020a817206000000b005d9c21dae03mr6634702ywc.98.1702507298546; Wed, 13 Dec 2023 14:41:38 -0800 (PST) Received: from fedora.mshome.net (pool-173-79-56-208.washdc.fios.verizon.net. [173.79.56.208]) by smtp.gmail.com with ESMTPSA id v4-20020a818504000000b005d9729068f5sm5050583ywf.42.2023.12.13.14.41.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 14:41:38 -0800 (PST) From: Gregory Price X-Google-Original-From: Gregory Price To: linux-mm@kvack.org Cc: linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-api@vger.kernel.org, x86@kernel.org, akpm@linux-foundation.org, arnd@arndb.de, tglx@linutronix.de, luto@kernel.org, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, mhocko@kernel.org, tj@kernel.org, ying.huang@intel.com, gregory.price@memverge.com, corbet@lwn.net, rakie.kim@sk.com, hyeongtak.ji@sk.com, honggyu.kim@sk.com, vtavarespetr@micron.com, peterz@infradead.org, jgroves@micron.com, ravis.opensrc@micron.com, sthanneeru@micron.com, emirakhur@micron.com, Hasan.Maruf@amd.com, seungjun.ha@samsung.com, Michal Hocko Subject: [PATCH v3 09/11] mm/mempolicy: add get_mempolicy2 syscall Date: Wed, 13 Dec 2023 17:41:16 -0500 Message-Id: <20231213224118.1949-10-gregory.price@memverge.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231213224118.1949-1-gregory.price@memverge.com> References: <20231213224118.1949-1-gregory.price@memverge.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: 3hde7rz5de9z1xaydei1usd6fag54dmw X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 890C420011 X-HE-Tag: 1702507299-558864 X-HE-Meta: U2FsdGVkX1/NgAUt0tSga7dQR+rOFELjGyv307XS+EJsA0la0AkKoAAVFmV2B40dXgjBsIPW5PXIzVzlFC4SQ5lTPlrxjluU9PAUXaU452YtfjmIfD+SR0tSf2tjYC1ilsb24RSzAkE4OVZvMfkaSItj9zze3U5S341QVu82ZEZLMfXPSmKeSOnuVbbqWvXZDptzaH7zBVU/OeOH9j1MjsLzD2FLVSf32iAWM3ji48FP/mzeS49LV5CCn0DFFv0586jZCAgMOCX2q/6aLNrfQNYIaYJE9kwmat4JRFCNIYMQj5gadMPd7n3y60a4ORM4E5XAEGK8WpEmnWspF+XufwkNdyshWb4388LCA0hVogqz4iykT0jEfGD36wi1MVoy6ycFVZxgESsFQ6yFxqtItD9eDOkd/sc41O+L3dCYa+hSZ1zTX85RI57Y3Z8gwo2DzaX8cK++he5bdgJ62crnM/Cv3cdQE8TLGzkguuOAEUJOmT8ibr86JIKJSXZXkZt1topvJH2H5I4Z69PY8xa99TWArGEY5j2+IDauA2o+MAI+Ib1Judw7UFANOGLYGKwbdRF0lalbjjqIyv6EMEMvTStT03pAL6CDgl51kv5qV3RvWeraCiN9Ya/cBjLYrYRb4sCHoxV7wD4bo34iS25SDcQnpGlsZlOpn+BNKCjDUXp+JMR2rov0CcniaGMx4yMGXObypq5OgYBup0sj1TAZJJs2I4dh5+6b3baOU67eTskKf3dswuING//YBmym31VNY8uKondUVY7I/lxr8srIY9oB5Ltqs3VsRNHpBu85jGJ3qazrWwvt4NQqk0sS6f3lorvr0nKZxce5iP3u1iH20rqNGvUsrBXb72k2+vqKtG8g8txs/rxKZLqnyEjAXA9TXhjO93t4Zc/+XY2PCtU2liegI7DRKZgT1tKLXHv96FW2HAp0v3N7NjrQY4gh3DTLElCCgTDIRAbT3O8pvbc zXfINjCf ZUKi11BW7J+6S3SQ0PUhItsFEEYs+FniTlo5sTjw9l5jK8STK9Z3vBr4v3KztajJV2BFOAbZRAm9FvrgFU3kvvtDU2ev8RV1WXnPhQeIvmkufZ6/JLuPorGXN9xyN3NPwOa4cD0+GQipRQC8mqQB8cquhbV1nfO82dFLhIVYZRv30xO3AB4rNS9MRZoIjfcBDSLScaMTL4I0ekrs+RB0h3i2XUXwRqGeI4nzOnB4i11GK/7trlagPixaFbA9icQrvRr+k3cmZg4uGRxzQnlzMimUe0tyuZfKaldQVIc7I2TzVoMWPNRd/7rpDdKA2lr3ls8y5Cv4BvHkJGn8t++Ygvo9XD0idb2iWG/f5tUGzmbFtI0aeAA6O5ohnM2LlHiQ4rDTNC+wOq3kwM0q7MQkWmbYsz219LxdFBiWG5814Gyg+3550vTRL0mbr/ztkS+L9RnZtPifq95P61Pf/HYGvxj+ZV/8gvts43TVlmLXcW6dsrJDL1yJL8qA1zPxzNYXxTzZqIxLD4fnfAI8QqF3xvt0Eps4kG1RwpMyV7Bf5aAxUvbDfXU9F+kj6m5DsadEO+J89Rt1N1eFE0QA= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: get_mempolicy2 is an extensible get_mempolicy interface which allows a user to retrieve the memory policy for a task or address. Defined as: get_mempolicy2(struct mpol_args *args, size_t size, unsigned long addr, unsigned long flags) Top level input values: mpol_args: The field which collects information about the mempolicy returned to userspace. addr: if MPOL_F_ADDR is passed in `flags`, this address will be used to return the mempolicy details of the vma the address belongs to flags: if MPOL_F_ADDR, return mempolicy info vma containing addr else, returns task mempolicy information Input values include the following fields of mpol_args: pol_nodes: if set, the nodemask of the policy returned here pol_maxnodes: if pol_nodes is set, must describe max number of nodes to be copied to pol_nodes Output values include the following fields of mpol_args: mode: mempolicy mode mode_flags: mempolicy mode flags home_node: policy home node will be returned here, or -1 if not. pol_nodes: if set, the nodemask for the mempolicy policy_node: if the policy has extended node information, it will be placed here. For example MPOL_INTERLEAVE will return the next node which will be used for allocation MPOL_F_NODE has been dropped from get_mempolicy2 (EINVAL). Suggested-by: Michal Hocko Signed-off-by: Gregory Price --- .../admin-guide/mm/numa_memory_policy.rst | 10 ++++- arch/alpha/kernel/syscalls/syscall.tbl | 1 + arch/arm/tools/syscall.tbl | 1 + arch/m68k/kernel/syscalls/syscall.tbl | 1 + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + arch/parisc/kernel/syscalls/syscall.tbl | 1 + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + arch/s390/kernel/syscalls/syscall.tbl | 1 + arch/sh/kernel/syscalls/syscall.tbl | 1 + arch/sparc/kernel/syscalls/syscall.tbl | 1 + arch/x86/entry/syscalls/syscall_32.tbl | 1 + arch/x86/entry/syscalls/syscall_64.tbl | 1 + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + include/linux/syscalls.h | 2 + include/uapi/asm-generic/unistd.h | 4 +- mm/mempolicy.c | 43 +++++++++++++++++++ 18 files changed, 71 insertions(+), 2 deletions(-) diff --git a/Documentation/admin-guide/mm/numa_memory_policy.rst b/Documentation/admin-guide/mm/numa_memory_policy.rst index e57d400d0281..8c1fcdb30602 100644 --- a/Documentation/admin-guide/mm/numa_memory_policy.rst +++ b/Documentation/admin-guide/mm/numa_memory_policy.rst @@ -456,11 +456,19 @@ Get [Task] Memory Policy or Related Information:: long get_mempolicy(int *mode, const unsigned long *nmask, unsigned long maxnode, void *addr, int flags); + long get_mempolicy2(struct mpol_args args, size_t size, + unsigned long addr, unsigned long flags); Queries the "task/process memory policy" of the calling task, or the policy or location of a specified virtual address, depending on the 'flags' argument. +get_mempolicy2() is an extended version of get_mempolicy() capable of +acquiring extended information about a mempolicy, including those +that can only be set via set_mempolicy2() or mbind2(). + +MPOL_F_NODE functionality has been removed from get_mempolicy2(). + See the get_mempolicy(2) man page for more details @@ -504,7 +512,7 @@ Extended Mempolicy Arguments:: The extended mempolicy argument structure is defined to allow the mempolicy interfaces future extensibility without the need for additional system calls. -Extended interfaces (set_mempolicy2) use this argument structure. +Extended interfaces (set_mempolicy2 and get_mempolicy2) use this structure. The core arguments (mode, mode_flags, pol_nodes, and pol_maxnodes) apply to all interfaces relative to their non-extended counterparts. Each additional diff --git a/arch/alpha/kernel/syscalls/syscall.tbl b/arch/alpha/kernel/syscalls/syscall.tbl index 0dc288a1118a..0301a8b0a262 100644 --- a/arch/alpha/kernel/syscalls/syscall.tbl +++ b/arch/alpha/kernel/syscalls/syscall.tbl @@ -497,3 +497,4 @@ 565 common futex_wait sys_futex_wait 566 common futex_requeue sys_futex_requeue 567 common set_mempolicy2 sys_set_mempolicy2 +568 common get_mempolicy2 sys_get_mempolicy2 diff --git a/arch/arm/tools/syscall.tbl b/arch/arm/tools/syscall.tbl index 50172ec0e1f5..771a33446e8e 100644 --- a/arch/arm/tools/syscall.tbl +++ b/arch/arm/tools/syscall.tbl @@ -471,3 +471,4 @@ 455 common futex_wait sys_futex_wait 456 common futex_requeue sys_futex_requeue 457 common set_mempolicy2 sys_set_mempolicy2 +458 common get_mempolicy2 sys_get_mempolicy2 diff --git a/arch/m68k/kernel/syscalls/syscall.tbl b/arch/m68k/kernel/syscalls/syscall.tbl index 839d90c535f2..048a409e684c 100644 --- a/arch/m68k/kernel/syscalls/syscall.tbl +++ b/arch/m68k/kernel/syscalls/syscall.tbl @@ -457,3 +457,4 @@ 455 common futex_wait sys_futex_wait 456 common futex_requeue sys_futex_requeue 457 common set_mempolicy2 sys_set_mempolicy2 +458 common get_mempolicy2 sys_get_mempolicy2 diff --git a/arch/microblaze/kernel/syscalls/syscall.tbl b/arch/microblaze/kernel/syscalls/syscall.tbl index 567c8b883735..327b01bd6793 100644 --- a/arch/microblaze/kernel/syscalls/syscall.tbl +++ b/arch/microblaze/kernel/syscalls/syscall.tbl @@ -463,3 +463,4 @@ 455 common futex_wait sys_futex_wait 456 common futex_requeue sys_futex_requeue 457 common set_mempolicy2 sys_set_mempolicy2 +458 common get_mempolicy2 sys_get_mempolicy2 diff --git a/arch/mips/kernel/syscalls/syscall_n32.tbl b/arch/mips/kernel/syscalls/syscall_n32.tbl index cc0640e16f2f..921d58e1da23 100644 --- a/arch/mips/kernel/syscalls/syscall_n32.tbl +++ b/arch/mips/kernel/syscalls/syscall_n32.tbl @@ -396,3 +396,4 @@ 455 n32 futex_wait sys_futex_wait 456 n32 futex_requeue sys_futex_requeue 457 n32 set_mempolicy2 sys_set_mempolicy2 +458 n32 get_mempolicy2 sys_get_mempolicy2 diff --git a/arch/mips/kernel/syscalls/syscall_o32.tbl b/arch/mips/kernel/syscalls/syscall_o32.tbl index f7262fde98d9..9271c83c9993 100644 --- a/arch/mips/kernel/syscalls/syscall_o32.tbl +++ b/arch/mips/kernel/syscalls/syscall_o32.tbl @@ -445,3 +445,4 @@ 455 o32 futex_wait sys_futex_wait 456 o32 futex_requeue sys_futex_requeue 457 o32 set_mempolicy2 sys_set_mempolicy2 +458 o32 get_mempolicy2 sys_get_mempolicy2 diff --git a/arch/parisc/kernel/syscalls/syscall.tbl b/arch/parisc/kernel/syscalls/syscall.tbl index e10f0e8bd064..0654f3f89fc7 100644 --- a/arch/parisc/kernel/syscalls/syscall.tbl +++ b/arch/parisc/kernel/syscalls/syscall.tbl @@ -456,3 +456,4 @@ 455 common futex_wait sys_futex_wait 456 common futex_requeue sys_futex_requeue 457 common set_mempolicy2 sys_set_mempolicy2 +458 common get_mempolicy2 sys_get_mempolicy2 diff --git a/arch/powerpc/kernel/syscalls/syscall.tbl b/arch/powerpc/kernel/syscalls/syscall.tbl index 4f03f5f42b78..ac11d2064e7a 100644 --- a/arch/powerpc/kernel/syscalls/syscall.tbl +++ b/arch/powerpc/kernel/syscalls/syscall.tbl @@ -544,3 +544,4 @@ 455 common futex_wait sys_futex_wait 456 common futex_requeue sys_futex_requeue 457 common set_mempolicy2 sys_set_mempolicy2 +458 common get_mempolicy2 sys_get_mempolicy2 diff --git a/arch/s390/kernel/syscalls/syscall.tbl b/arch/s390/kernel/syscalls/syscall.tbl index f98dadc2e9df..1cdcafe1ccca 100644 --- a/arch/s390/kernel/syscalls/syscall.tbl +++ b/arch/s390/kernel/syscalls/syscall.tbl @@ -460,3 +460,4 @@ 455 common futex_wait sys_futex_wait sys_futex_wait 456 common futex_requeue sys_futex_requeue sys_futex_requeue 457 common set_mempolicy2 sys_set_mempolicy2 sys_set_mempolicy2 +458 common get_mempolicy2 sys_get_mempolicy2 sys_get_mempolicy2 diff --git a/arch/sh/kernel/syscalls/syscall.tbl b/arch/sh/kernel/syscalls/syscall.tbl index f47ba9f2d05d..f71742024c29 100644 --- a/arch/sh/kernel/syscalls/syscall.tbl +++ b/arch/sh/kernel/syscalls/syscall.tbl @@ -460,3 +460,4 @@ 455 common futex_wait sys_futex_wait 456 common futex_requeue sys_futex_requeue 457 common set_mempolicy2 sys_set_mempolicy2 +458 common get_mempolicy2 sys_get_mempolicy2 diff --git a/arch/sparc/kernel/syscalls/syscall.tbl b/arch/sparc/kernel/syscalls/syscall.tbl index 53fb16616728..2fbf5dbe0620 100644 --- a/arch/sparc/kernel/syscalls/syscall.tbl +++ b/arch/sparc/kernel/syscalls/syscall.tbl @@ -503,3 +503,4 @@ 455 common futex_wait sys_futex_wait 456 common futex_requeue sys_futex_requeue 457 common set_mempolicy2 sys_set_mempolicy2 +458 common get_mempolicy2 sys_get_mempolicy2 diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl index 4b4dc41b24ee..0af813b9a118 100644 --- a/arch/x86/entry/syscalls/syscall_32.tbl +++ b/arch/x86/entry/syscalls/syscall_32.tbl @@ -462,3 +462,4 @@ 455 i386 futex_wait sys_futex_wait 456 i386 futex_requeue sys_futex_requeue 457 i386 set_mempolicy2 sys_set_mempolicy2 +458 i386 get_mempolicy2 sys_get_mempolicy2 diff --git a/arch/x86/entry/syscalls/syscall_64.tbl b/arch/x86/entry/syscalls/syscall_64.tbl index 1bc2190bec27..0b777876fc15 100644 --- a/arch/x86/entry/syscalls/syscall_64.tbl +++ b/arch/x86/entry/syscalls/syscall_64.tbl @@ -379,6 +379,7 @@ 455 common futex_wait sys_futex_wait 456 common futex_requeue sys_futex_requeue 457 common set_mempolicy2 sys_set_mempolicy2 +458 common get_mempolicy2 sys_get_mempolicy2 # # Due to a historical design error, certain syscalls are numbered differently diff --git a/arch/xtensa/kernel/syscalls/syscall.tbl b/arch/xtensa/kernel/syscalls/syscall.tbl index e26dc89399eb..4536c9a4227d 100644 --- a/arch/xtensa/kernel/syscalls/syscall.tbl +++ b/arch/xtensa/kernel/syscalls/syscall.tbl @@ -428,3 +428,4 @@ 455 common futex_wait sys_futex_wait 456 common futex_requeue sys_futex_requeue 457 common set_mempolicy2 sys_set_mempolicy2 +458 common get_mempolicy2 sys_get_mempolicy2 diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 451f0089601f..f696855cbe8c 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h @@ -821,6 +821,8 @@ asmlinkage long sys_get_mempolicy(int __user *policy, unsigned long __user *nmask, unsigned long maxnode, unsigned long addr, unsigned long flags); +asmlinkage long sys_get_mempolicy2(struct mpol_args __user *args, size_t size, + unsigned long addr, unsigned long flags); asmlinkage long sys_set_mempolicy(int mode, const unsigned long __user *nmask, unsigned long maxnode); asmlinkage long sys_set_mempolicy2(struct mpol_args __user *args, size_t size, diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h index 55486aba099f..719accc731db 100644 --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h @@ -830,9 +830,11 @@ __SYSCALL(__NR_futex_wait, sys_futex_wait) __SYSCALL(__NR_futex_requeue, sys_futex_requeue) #define __NR_set_mempolicy2 457 __SYSCALL(__NR_set_mempolicy2, sys_set_mempolicy2) +#define __NR_get_mempolicy2 458 +__SYSCALL(__NR_get_mempolicy2, sys_get_mempolicy2) #undef __NR_syscalls -#define __NR_syscalls 458 +#define __NR_syscalls 459 /* * 32 bit systems traditionally used different diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 4bf563f3732b..09c613113c7c 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -1863,6 +1863,49 @@ SYSCALL_DEFINE5(get_mempolicy, int __user *, policy, return kernel_get_mempolicy(policy, nmask, maxnode, addr, flags); } +SYSCALL_DEFINE4(get_mempolicy2, struct mpol_args __user *, uargs, size_t, usize, + unsigned long, addr, unsigned long, flags) +{ + struct mpol_args kargs; + struct mempolicy_args margs; + int err; + nodemask_t policy_nodemask; + unsigned long __user *nodes_ptr; + + if (flags & ~(MPOL_F_ADDR)) + return -EINVAL; + + /* initialize any memory liable to be copied to userland */ + memset(&margs, 0, sizeof(margs)); + + err = copy_struct_from_user(&kargs, sizeof(kargs), uargs, usize); + if (err) + return -EINVAL; + + margs.policy_nodes = kargs.pol_nodes ? &policy_nodemask : NULL; + if (flags & MPOL_F_ADDR) + err = do_get_vma_mempolicy(untagged_addr(addr), NULL, &margs); + else + err = do_get_task_mempolicy(&margs); + + if (err) + return err; + + kargs.mode = margs.mode; + kargs.mode_flags = margs.mode_flags; + kargs.policy_node = margs.policy_node; + kargs.home_node = margs.home_node; + if (kargs.pol_nodes) { + nodes_ptr = u64_to_user_ptr(kargs.pol_nodes); + err = copy_nodes_to_user(nodes_ptr, kargs.pol_maxnodes, + margs.policy_nodes); + if (err) + return err; + } + + return copy_to_user(uargs, &kargs, usize) ? -EFAULT : 0; +} + bool vma_migratable(struct vm_area_struct *vma) { if (vma->vm_flags & (VM_IO | VM_PFNMAP))