From mboxrd@z Thu Jan 1 00:00:00 1970 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 005DFC4332F for ; Wed, 13 Dec 2023 22:41:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4F88E6B0448; Wed, 13 Dec 2023 17:41:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 40F0C6B044A; Wed, 13 Dec 2023 17:41:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1754E6B044C; Wed, 13 Dec 2023 17:41:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id EB9F66B0448 for ; Wed, 13 Dec 2023 17:41:43 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id BCCF3802DC for ; Wed, 13 Dec 2023 22:41:43 +0000 (UTC) X-FDA: 81563268486.10.CE33C40 Received: from mail-yw1-f194.google.com (mail-yw1-f194.google.com [209.85.128.194]) by imf27.hostedemail.com (Postfix) with ESMTP id DFC9940016 for ; Wed, 13 Dec 2023 22:41:41 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=UeL4EV5j; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf27.hostedemail.com: domain of gourry.memverge@gmail.com designates 209.85.128.194 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=1702507301; 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=U4QR2jDtIC+ikBI6LTrOgPcCr9veK3NAIkq+BcbaxTQ=; b=zK81I4Y/LpxVo3jHlLpNcCdk7xS/Jkxesueu+7GvRi0Y1CzyPdiAP4d0iX1UWqW2aYgX2+ 9VJiJ/CXDsRUTCHK+AsTePgMqNK9Dz4MDcA18zdl189VjHz7JgPIH1zDEKYyKy3Hy+cWxF bPlrij9t729yc6G2MMKufpOPmFvk5E4= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=UeL4EV5j; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf27.hostedemail.com: domain of gourry.memverge@gmail.com designates 209.85.128.194 as permitted sender) smtp.mailfrom=gourry.memverge@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702507301; a=rsa-sha256; cv=none; b=I+NZXRHAifBeqVSXhLpMv/PnTnpSLr4q8mUK+iaJ0DNZdm8e/dtVHDx1K6SWS04b0PF8he q5CdeeAESs9Tv1+GIJhLIwCaUaSdcLRDfvn4AFa4smbFzqLNci9PV0dald8ro6tl6nG5Vf z7o40FvnD6dYj8p/AXSAXQkamEb28VI= Received: by mail-yw1-f194.google.com with SMTP id 00721157ae682-5e2cfece112so11154267b3.2 for ; Wed, 13 Dec 2023 14:41:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702507301; x=1703112101; 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=U4QR2jDtIC+ikBI6LTrOgPcCr9veK3NAIkq+BcbaxTQ=; b=UeL4EV5jSAQZjuqShqICmJE8w/gf1FStt33hj/Bu9MdZ1rO8y2KVEcTNo/L+Z/4kQx uapqN+sf6RDBCd/9S+WZZ0GMiwog5jQN+5riHmSRoaenL1w0S1GjcqyN3J5R+ggjj13/ LK4iwhUCtwoD8jgKqBKSTndb0bIfjdnwdviHeQQA6GGcHZqaVp+3Ykdlxy+Rp3r5y1j8 yLY2TGgFHI/OUbNXk/J/LLvRBRgz1AmET55M5wOIMZSeabMGcIqPlZCL39Oe+5/dhtzh 9fPYxq4yE3nErnLpCyo/sQBnAv94rQBWn/lanoRKmLq13KezjKBhDTIe+bb4TSQsJGgh H+zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702507301; x=1703112101; 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=U4QR2jDtIC+ikBI6LTrOgPcCr9veK3NAIkq+BcbaxTQ=; b=ld1zvf04jXDEzRsXzN/kKTLEdUVa2ZgrivjfVC1z0zxXJfh84LJfc4dUbkQ7I/OuHY uQAs1Kb5S0ePf2otG1/m6T2gsFrfgtntvcjtYDONjB4Ki7/8vuVWtlko65y++83n1upH MKIFKdIBoHxLtNK7Jmq10+sXItqwS4k7Xl4680hCIxz708A4u7BjAJ2ClDbjhsSMOwgB IjUXPOtWNuop7HkQ7uYs9tWUqsPK+HqvSilwuboHUfbvZMfQ04hruHxy2lBFx2oh+3wC JMOXCr+JBOMWbFaNKSvGbEi+NFQLHctLpDe2W815AFIWHd7IDr/QgblES5QJ430wjhyy nwfw== X-Gm-Message-State: AOJu0YxaT4MXYovCOBl/sSabag+hQbLVczCIn8Uc0I1Ct0VRVAcdojYP tyumhwwV2pZxtw/WGRqKJAll2peoJh65 X-Google-Smtp-Source: AGHT+IG7mjm0IPg0D7fmIm8AkvF7mNG28UanvvgL+esS/wgjp8mAFvBKRta+iW0orbRcGIGVlRjnHQ== X-Received: by 2002:a81:7305:0:b0:5d7:1941:356c with SMTP id o5-20020a817305000000b005d71941356cmr5853964ywc.83.1702507300902; Wed, 13 Dec 2023 14:41:40 -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.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 14:41:40 -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 , Frank van der Linden Subject: [PATCH v3 10/11] mm/mempolicy: add the mbind2 syscall Date: Wed, 13 Dec 2023 17:41:17 -0500 Message-Id: <20231213224118.1949-11-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 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: DFC9940016 X-Stat-Signature: a6g8zipr855qkmajb4m5si1gwjapdd3g X-Rspam-User: X-HE-Tag: 1702507301-756198 X-HE-Meta: U2FsdGVkX1+pjDqqYYtpgigsvegrfg/r9U1pcF1ZlDJZWTHkHvxOi3NYF+ZuWIg4GvVyCK9oCmUdfBimcS6u6mLQbUJJ6mzTZBCh8yMpZq4GPWlaFpgFs/nbn+EvRacNKTdoxrlvSuE0upKHniAEaOP7dmciHN2oiOl3Su1VqMyHAv2Ef7oI0j96yA0tkO7HC5ohYsaBYr81pM0/l0Xwb+qPLPkE2lHWYED5Yk0JjOAB3EFO9NR0o2vn1vsRXVnhj5C/WLIckaeUvKZETfVg/1wFneYEK9KPtLyabzSASgF/fXRvZXJoWUfWQX/xKr/rVnGQgDP5xqgtxc1ot6te6aYBKsnvBurbKbbqOdeyJMwhAF1vWj0EzpvF8FeIiIe1/X2D1RtJVwBiG6jDKQf/VVMseQkvTZdZSKtWs0os8ort/s/BPn3Eomvh6V2pK10jxkLqhwowL0mVyvHKiA7UFDPp9zoDp3Zn08FzxkPFGezgrDPgydXjWtp/Pesc5JjS14cG5E02rrrrYZ5ikUGIFQfBAJfB/0hOR2Hht4gWg/1T2L1j+PMlZVQnme1uK1PcR0lnXkxTUeer1CswdAlLJiEkYky/PW6F5PWJupyLy0lWhmawwpvKDGOcnNoI4oG3bbECYktHzH2G1T+sOotHcfXmRYf6fPIK7cakfHqR9fGhGm1HdL6mJP5WCmkV6vUXlQUqG7b54jdLUMZ0V8+IIZV/cj+OzrLYelGmegTaEimLVrfcYBPA2xhqf3TZWsWkWLqnYBBe6iRIyO34ynZ8VzbIfhfSlFohqqua8G+N/Xu7O55EpV8NJgrdaIndxQDPVpJ1C1TCYgO3LGtoR4oyjNy5JTrbrQR3IS7zKKaLSY//VLB+1bJ5H/o6/qi0B5kOu9K0KDahcTwBwP5zU9mi9YwSZU5wDoNEAehZcb98aPnQoJTlGsfVuTJF72S9KSSuvpbh2jD4hEE+3st5WVu HYejwi8l 3CMlng/gRO5hNGzcqp/8TSC+fx/tZgtw+Yi1nYZQ4AklGxrdKQsEg/Ypi/pnofxuWYxrdxJXHZXVzlJKrOkaCxoV93ggWvu6kR8+5f9TA/r0tm4MrwzcOpD0VfmLhnUWxKOSX05iBDLu1puCAfna8bsv6+noQwS1q9c4ZJ6hWHLsLR5cP/yojmZJxsXrxgFw5aHJGeP1+zkJ5O90pdrWwrUQK9oOTb9gBVS0KOrwvF1gsYi91vQ/mbKibSrBm6iuTSHpYQqZYXbkwwSpt6E8qiM+2HVAUySsUypamrsDsWMgRY9PYe9NyEmEPWmt6e1svEY2xs+0WB4ksdfCb+BR6oQ2HI17T/iyCWSumy0/HoRwTJSQweKPct7pe9/KCk1/4nFBLIqi5X6xoHmmN1RzAU6ut0bYtvTm2Ii3eWBlsI/vJkw4uXi/YB51jsl3Xb5ZXmthIHUFhfwOlss0C/F3UCFN4AxJkGZeNGboyNWPdWJ7kybwAtDH75nF9uSB72n4mqsNOvkuI2raE/7w2RcDrUdIQw0FYGTnYoLwNP4PrnA4wocjbQ1Oe7t/t2IRYEh6MK54WlfyfpX+sIdJVslnvfRzMKoiKUYprkDRW2jLo01i0g9Ay67f9ARBpolG3lVX0DP6V+H9QUaXV7vLTZxCUlTV29lF5wrZtDiavtBYxTZfbWT7b15EOGDmFyLlQsQCxnI/Dj5lxtGUh5aC8DhAS6M+ICQZX14Ig9waz 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: mbind2 is an extensible mbind interface which allows a user to set the mempolicy for one or more address ranges. Defined as: mbind2(unsigned long addr, unsigned long len, struct mpol_args *args, size_t size, unsigned long flags) addr: address of the memory range to operate on len: length of the memory range flags: MPOL_MF_HOME_NODE + original mbind() flags Input values include the following fields of mpol_args: mode: The MPOL_* policy (DEFAULT, INTERLEAVE, etc.) mode_flags: The MPOL_F_* flags that were previously passed in or'd into the mode. This was split to hopefully allow future extensions additional mode/flag space. pol_nodes: the nodemask to apply for the memory policy pol_maxnodes: The max number of nodes described by pol_nodes home_node: if MPOL_MF_HOME_NODE, set home node of policy to this otherwise it is ignored. The semantics are otherwise the same as mbind(), except that the home_node can be set. Suggested-by: Michal Hocko Suggested-by: Frank van der Linden Suggested-by: Vinicius Tavares Petrucci Suggested-by: Rakie Kim Suggested-by: Hyeongtak Ji Suggested-by: Honggyu Kim Signed-off-by: Gregory Price Co-developed-by: Vinicius Tavares Petrucci --- .../admin-guide/mm/numa_memory_policy.rst | 12 +++++- 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 | 3 ++ include/uapi/asm-generic/unistd.h | 4 +- include/uapi/linux/mempolicy.h | 5 ++- mm/mempolicy.c | 43 +++++++++++++++++++ 19 files changed, 77 insertions(+), 4 deletions(-) diff --git a/Documentation/admin-guide/mm/numa_memory_policy.rst b/Documentation/admin-guide/mm/numa_memory_policy.rst index 8c1fcdb30602..99e1f732cade 100644 --- a/Documentation/admin-guide/mm/numa_memory_policy.rst +++ b/Documentation/admin-guide/mm/numa_memory_policy.rst @@ -477,12 +477,18 @@ Install VMA/Shared Policy for a Range of Task's Address Space:: long mbind(void *start, unsigned long len, int mode, const unsigned long *nmask, unsigned long maxnode, unsigned flags); + long mbind2(void* start, unsigned long len, struct mpol_args args, + size_t size, unsigned long flags); mbind() installs the policy specified by (mode, nmask, maxnodes) as a VMA policy for the range of the calling task's address space specified by the 'start' and 'len' arguments. Additional actions may be requested via the 'flags' argument. +mbind2() is an extended version of mbind() capable of setting extended +mempolicy features. For example, one can set the home node for the memory +policy without an additional call to set_mempolicy_home_node(). + See the mbind(2) man page for more details. Set home node for a Range of Task's Address Spacec:: @@ -498,6 +504,9 @@ closest to which page allocation will come from. Specifying the home node overri the default allocation policy to allocate memory close to the local node for an executing CPU. +mbind2() also provides a way for the home node to be set at the time the +mempolicy is set. See the mbind(2) man page for more details. + Extended Mempolicy Arguments:: struct mpol_args { @@ -512,7 +521,8 @@ 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 and get_mempolicy2) use this structure. +Extended interfaces (set_mempolicy2, get_mempolicy2, and mbind2) use this +this argument 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 0301a8b0a262..e8239293c35a 100644 --- a/arch/alpha/kernel/syscalls/syscall.tbl +++ b/arch/alpha/kernel/syscalls/syscall.tbl @@ -498,3 +498,4 @@ 566 common futex_requeue sys_futex_requeue 567 common set_mempolicy2 sys_set_mempolicy2 568 common get_mempolicy2 sys_get_mempolicy2 +569 common mbind2 sys_mbind2 diff --git a/arch/arm/tools/syscall.tbl b/arch/arm/tools/syscall.tbl index 771a33446e8e..a3f39750257a 100644 --- a/arch/arm/tools/syscall.tbl +++ b/arch/arm/tools/syscall.tbl @@ -472,3 +472,4 @@ 456 common futex_requeue sys_futex_requeue 457 common set_mempolicy2 sys_set_mempolicy2 458 common get_mempolicy2 sys_get_mempolicy2 +459 common mbind2 sys_mbind2 diff --git a/arch/m68k/kernel/syscalls/syscall.tbl b/arch/m68k/kernel/syscalls/syscall.tbl index 048a409e684c..9a12dface18e 100644 --- a/arch/m68k/kernel/syscalls/syscall.tbl +++ b/arch/m68k/kernel/syscalls/syscall.tbl @@ -458,3 +458,4 @@ 456 common futex_requeue sys_futex_requeue 457 common set_mempolicy2 sys_set_mempolicy2 458 common get_mempolicy2 sys_get_mempolicy2 +459 common mbind2 sys_mbind2 diff --git a/arch/microblaze/kernel/syscalls/syscall.tbl b/arch/microblaze/kernel/syscalls/syscall.tbl index 327b01bd6793..6cb740123137 100644 --- a/arch/microblaze/kernel/syscalls/syscall.tbl +++ b/arch/microblaze/kernel/syscalls/syscall.tbl @@ -464,3 +464,4 @@ 456 common futex_requeue sys_futex_requeue 457 common set_mempolicy2 sys_set_mempolicy2 458 common get_mempolicy2 sys_get_mempolicy2 +459 common mbind2 sys_mbind2 diff --git a/arch/mips/kernel/syscalls/syscall_n32.tbl b/arch/mips/kernel/syscalls/syscall_n32.tbl index 921d58e1da23..52cf720f8ae2 100644 --- a/arch/mips/kernel/syscalls/syscall_n32.tbl +++ b/arch/mips/kernel/syscalls/syscall_n32.tbl @@ -397,3 +397,4 @@ 456 n32 futex_requeue sys_futex_requeue 457 n32 set_mempolicy2 sys_set_mempolicy2 458 n32 get_mempolicy2 sys_get_mempolicy2 +459 n32 mbind2 sys_mbind2 diff --git a/arch/mips/kernel/syscalls/syscall_o32.tbl b/arch/mips/kernel/syscalls/syscall_o32.tbl index 9271c83c9993..fd37c5301a48 100644 --- a/arch/mips/kernel/syscalls/syscall_o32.tbl +++ b/arch/mips/kernel/syscalls/syscall_o32.tbl @@ -446,3 +446,4 @@ 456 o32 futex_requeue sys_futex_requeue 457 o32 set_mempolicy2 sys_set_mempolicy2 458 o32 get_mempolicy2 sys_get_mempolicy2 +459 o32 mbind2 sys_mbind2 diff --git a/arch/parisc/kernel/syscalls/syscall.tbl b/arch/parisc/kernel/syscalls/syscall.tbl index 0654f3f89fc7..fcd67bc405b1 100644 --- a/arch/parisc/kernel/syscalls/syscall.tbl +++ b/arch/parisc/kernel/syscalls/syscall.tbl @@ -457,3 +457,4 @@ 456 common futex_requeue sys_futex_requeue 457 common set_mempolicy2 sys_set_mempolicy2 458 common get_mempolicy2 sys_get_mempolicy2 +459 common mbind2 sys_mbind2 diff --git a/arch/powerpc/kernel/syscalls/syscall.tbl b/arch/powerpc/kernel/syscalls/syscall.tbl index ac11d2064e7a..89715417014c 100644 --- a/arch/powerpc/kernel/syscalls/syscall.tbl +++ b/arch/powerpc/kernel/syscalls/syscall.tbl @@ -545,3 +545,4 @@ 456 common futex_requeue sys_futex_requeue 457 common set_mempolicy2 sys_set_mempolicy2 458 common get_mempolicy2 sys_get_mempolicy2 +459 common mbind2 sys_mbind2 diff --git a/arch/s390/kernel/syscalls/syscall.tbl b/arch/s390/kernel/syscalls/syscall.tbl index 1cdcafe1ccca..c8304e0d0aa7 100644 --- a/arch/s390/kernel/syscalls/syscall.tbl +++ b/arch/s390/kernel/syscalls/syscall.tbl @@ -461,3 +461,4 @@ 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 +459 common mbind2 sys_mbind2 sys_mbind2 diff --git a/arch/sh/kernel/syscalls/syscall.tbl b/arch/sh/kernel/syscalls/syscall.tbl index f71742024c29..e5c51b6c367f 100644 --- a/arch/sh/kernel/syscalls/syscall.tbl +++ b/arch/sh/kernel/syscalls/syscall.tbl @@ -461,3 +461,4 @@ 456 common futex_requeue sys_futex_requeue 457 common set_mempolicy2 sys_set_mempolicy2 458 common get_mempolicy2 sys_get_mempolicy2 +459 common mbind2 sys_mbind2 diff --git a/arch/sparc/kernel/syscalls/syscall.tbl b/arch/sparc/kernel/syscalls/syscall.tbl index 2fbf5dbe0620..74527f585500 100644 --- a/arch/sparc/kernel/syscalls/syscall.tbl +++ b/arch/sparc/kernel/syscalls/syscall.tbl @@ -504,3 +504,4 @@ 456 common futex_requeue sys_futex_requeue 457 common set_mempolicy2 sys_set_mempolicy2 458 common get_mempolicy2 sys_get_mempolicy2 +459 common mbind2 sys_mbind2 diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl index 0af813b9a118..be2e2aa17dd8 100644 --- a/arch/x86/entry/syscalls/syscall_32.tbl +++ b/arch/x86/entry/syscalls/syscall_32.tbl @@ -463,3 +463,4 @@ 456 i386 futex_requeue sys_futex_requeue 457 i386 set_mempolicy2 sys_set_mempolicy2 458 i386 get_mempolicy2 sys_get_mempolicy2 +459 i386 mbind2 sys_mbind2 diff --git a/arch/x86/entry/syscalls/syscall_64.tbl b/arch/x86/entry/syscalls/syscall_64.tbl index 0b777876fc15..6e2347eb8773 100644 --- a/arch/x86/entry/syscalls/syscall_64.tbl +++ b/arch/x86/entry/syscalls/syscall_64.tbl @@ -380,6 +380,7 @@ 456 common futex_requeue sys_futex_requeue 457 common set_mempolicy2 sys_set_mempolicy2 458 common get_mempolicy2 sys_get_mempolicy2 +459 common mbind2 sys_mbind2 # # 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 4536c9a4227d..f00a21317dc0 100644 --- a/arch/xtensa/kernel/syscalls/syscall.tbl +++ b/arch/xtensa/kernel/syscalls/syscall.tbl @@ -429,3 +429,4 @@ 456 common futex_requeue sys_futex_requeue 457 common set_mempolicy2 sys_set_mempolicy2 458 common get_mempolicy2 sys_get_mempolicy2 +459 common mbind2 sys_mbind2 diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index f696855cbe8c..b42622ea9ed9 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h @@ -817,6 +817,9 @@ asmlinkage long sys_mbind(unsigned long start, unsigned long len, const unsigned long __user *nmask, unsigned long maxnode, unsigned flags); +asmlinkage long sys_mbind2(unsigned long start, unsigned long len, + const struct mpol_args __user *uargs, size_t usize, + unsigned long flags); asmlinkage long sys_get_mempolicy(int __user *policy, unsigned long __user *nmask, unsigned long maxnode, diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h index 719accc731db..cd31599bb9cc 100644 --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h @@ -832,9 +832,11 @@ __SYSCALL(__NR_futex_requeue, sys_futex_requeue) __SYSCALL(__NR_set_mempolicy2, sys_set_mempolicy2) #define __NR_get_mempolicy2 458 __SYSCALL(__NR_get_mempolicy2, sys_get_mempolicy2) +#define __NR_mbind2 459 +__SYSCALL(__NR_mbind2, sys_mbind2) #undef __NR_syscalls -#define __NR_syscalls 459 +#define __NR_syscalls 460 /* * 32 bit systems traditionally used different diff --git a/include/uapi/linux/mempolicy.h b/include/uapi/linux/mempolicy.h index c06f2afa7fe3..ec1402dae35b 100644 --- a/include/uapi/linux/mempolicy.h +++ b/include/uapi/linux/mempolicy.h @@ -54,13 +54,14 @@ struct mpol_args { #define MPOL_F_ADDR (1<<1) /* look up vma using address */ #define MPOL_F_MEMS_ALLOWED (1<<2) /* return allowed memories */ -/* Flags for mbind */ +/* Flags for mbind/mbind2 */ #define MPOL_MF_STRICT (1<<0) /* Verify existing pages in the mapping */ #define MPOL_MF_MOVE (1<<1) /* Move pages owned by this process to conform to policy */ #define MPOL_MF_MOVE_ALL (1<<2) /* Move every page to conform to policy */ #define MPOL_MF_LAZY (1<<3) /* UNSUPPORTED FLAG: Lazy migrate on fault */ -#define MPOL_MF_INTERNAL (1<<4) /* Internal flags start here */ +#define MPOL_MF_HOME_NODE (1<<4) /* mbind2: set home node */ +#define MPOL_MF_INTERNAL (1<<5) /* Internal flags start here */ #define MPOL_MF_VALID (MPOL_MF_STRICT | \ MPOL_MF_MOVE | \ diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 09c613113c7c..68ea8e177217 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -1603,6 +1603,49 @@ SYSCALL_DEFINE6(mbind, unsigned long, start, unsigned long, len, return kernel_mbind(start, len, mode, nmask, maxnode, flags); } +SYSCALL_DEFINE5(mbind2, unsigned long, start, unsigned long, len, + const struct mpol_args __user *, uargs, size_t, usize, + unsigned long, flags) +{ + struct mpol_args kargs; + struct mempolicy_args margs; + nodemask_t policy_nodes; + unsigned long __user *nodes_ptr; + int err; + + if (!start || !len) + return -EINVAL; + + err = copy_struct_from_user(&kargs, sizeof(kargs), uargs, usize); + if (err) + return -EINVAL; + + err = validate_mpol_flags(kargs.mode, &kargs.mode_flags); + if (err) + return err; + + margs.mode = kargs.mode; + margs.mode_flags = kargs.mode_flags; + + /* if home node given, validate it is online */ + if (flags & MPOL_MF_HOME_NODE) { + if ((kargs.home_node >= MAX_NUMNODES) || + !node_online(kargs.home_node)) + return -EINVAL; + margs.home_node = kargs.home_node; + } else + margs.home_node = NUMA_NO_NODE; + flags &= ~MPOL_MF_HOME_NODE; + + nodes_ptr = u64_to_user_ptr(kargs.pol_nodes); + err = get_nodes(&policy_nodes, nodes_ptr, kargs.pol_maxnodes); + if (err) + return err; + margs.policy_nodes = &policy_nodes; + + return do_mbind(untagged_addr(start), len, &margs, flags); +} + /* Set the process memory policy */ static long kernel_set_mempolicy(int mode, const unsigned long __user *nmask, unsigned long maxnode) -- 2.39.1