From patchwork Thu Dec 7 00:27:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Price X-Patchwork-Id: 13482530 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 D9247C4167B for ; Thu, 7 Dec 2023 00:28:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E5F876B0078; Wed, 6 Dec 2023 19:28:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DE0976B007B; Wed, 6 Dec 2023 19:28:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C59396B007E; Wed, 6 Dec 2023 19:28:18 -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 AECFF6B0078 for ; Wed, 6 Dec 2023 19:28:18 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 7F21CC0311 for ; Thu, 7 Dec 2023 00:28:18 +0000 (UTC) X-FDA: 81538135476.20.F3DDD1F Received: from mail-yw1-f193.google.com (mail-yw1-f193.google.com [209.85.128.193]) by imf24.hostedemail.com (Postfix) with ESMTP id A7B5B18000D for ; Thu, 7 Dec 2023 00:28:16 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="H4u/hoXB"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf24.hostedemail.com: domain of gourry.memverge@gmail.com designates 209.85.128.193 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=1701908896; 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=Flml1UNmBLLzB1/s7Z9Ivu1nW91eSQVCRu4FPg3vOUU=; b=hxbs7ZoUMsboHiNdENxulxD7EImxoFSFcgZliIL++gfFP43QWsPja5qQuO2y0xFgZMwoNK Vhzs6yZswm7qJNe+y4XRqZ3ScDLLnnYXCMkCo4u56QJcj9hQyCOMjGQun45AQ2bWw1sAQb TI4AVs7WE1gJ4JvDFxqZZXyo8X9jKUk= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="H4u/hoXB"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf24.hostedemail.com: domain of gourry.memverge@gmail.com designates 209.85.128.193 as permitted sender) smtp.mailfrom=gourry.memverge@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701908896; a=rsa-sha256; cv=none; b=weJKcXVmMXg5EPP6ME7a86MtGTSH/d0ZvNUxWjPIsQsD6qy9/rBHomQ3BKNxF/zrEfYtPo hJajAxzSIJTmNZ5xN80XeR3D5z4tLI/o8s0WcsuSZ1eHH9AR0h22eE8OhEir5IugVMgq1Q liR0TkF4ncZUtBLEQLNg+hY9WxwpEYc= Received: by mail-yw1-f193.google.com with SMTP id 00721157ae682-5d279bcce64so833237b3.3 for ; Wed, 06 Dec 2023 16:28:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701908895; x=1702513695; 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=Flml1UNmBLLzB1/s7Z9Ivu1nW91eSQVCRu4FPg3vOUU=; b=H4u/hoXB154q016Gnelay8GzDMfikO4PY5PfNheXj5HNK7hNzBJ8hxPgXgyov3/b6C KU1DC8McFjI6XB79KHvtUlltav6MFi0HMJUaBx0P7dylIG8sMrCuPZTf4G8T23y4McxN z6Dol/3lS5mZn2sIKZTgHfT6x7yPaI2Utm5edvnS5ADr+9sDyL/xgED2RfU0ph0+flSW 223xwBJekzD0NgCbyzdHFZG5klHqXH1UTd8xbEV4tpH88CKUOwMBKB+dueX50/UvngSG pANAQDztR1kavilfeWo1INk98CnYHUnyC9uqM9J7HGxRt+dGljAON3kpKeWmQSoDesVg yjbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701908895; x=1702513695; 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=Flml1UNmBLLzB1/s7Z9Ivu1nW91eSQVCRu4FPg3vOUU=; b=vbFyr0ZdVjfh/KyBuP6FIrbk7swjkWbWnk9VGEiVZ5+Cd03LnnOml1nRCUEpx8hXwo 2Q1RS4KG87iLjmJARoxZfkVji+y3tN8ydx7RCLPwQ10IvCDssgdvbfgpuepRqFMEB1ZQ jmWrzhfSb3m9oFi1Xb6IFUhNWZpScg0eAQfLIigzw/kF5SacUgC7ahKLh1Au8HLMatby ciQT92sG9Cxhh9UYzPhaIiyUqJzA6lZhNxDQgIdTaBysjnVifDhbOQsftcZt/QVPXOrv sxu2nLHWWW9zM8VJyPfaj6s3wQ8hTzuE0Z6syW3MVpWbOWYPKobwindIs3KwNoU9Y6NZ 1iWQ== X-Gm-Message-State: AOJu0YxAokG3GuYTk/wM7mY7s9UayEMOj/dejOLP2I1OOnVNZtVtE0/a kJhPtssgpcnDHOoHeifiNwIFP8ahfLxP X-Google-Smtp-Source: AGHT+IE51TPShPAvD20Fk8hXysJ2a1fAapf0M/BF9W0GPAFus7ZCfhCYhR2w/eyZazXAbFkHfg63dQ== X-Received: by 2002:a05:690c:fc3:b0:5d3:9f2d:658c with SMTP id dg3-20020a05690c0fc300b005d39f2d658cmr1911791ywb.24.1701908895635; Wed, 06 Dec 2023 16:28:15 -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 x145-20020a81a097000000b005d82fc8cc92sm19539ywg.105.2023.12.06.16.28.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Dec 2023 16:28:15 -0800 (PST) From: Gregory Price X-Google-Original-From: Gregory Price To: linux-mm@kvack.org, jgroves@micron.com, ravis.opensrc@micron.com, sthanneeru@micron.com, emirakhur@micron.com, Hasan.Maruf@amd.com Cc: linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.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, x86@kernel.org, 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 Subject: [RFC PATCH 03/11] mm/mempolicy: refactor sanitize_mpol_flags for reuse Date: Wed, 6 Dec 2023 19:27:51 -0500 Message-Id: <20231207002759.51418-4-gregory.price@memverge.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231207002759.51418-1-gregory.price@memverge.com> References: <20231207002759.51418-1-gregory.price@memverge.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: A7B5B18000D X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: j36xrb347f5ucbuiq195poiq9ngshd1i X-HE-Tag: 1701908896-799547 X-HE-Meta: U2FsdGVkX1+kDiJrUzBRECZ8YND9LhQ/EWBlQgGhtr0zmH0A9Rd8Lk9/xMv59DK5Xu3YKVs2v6COT/GlOqEvotz3hqP6ewhLo86G4qI5mWeJ/SabCZWBALUdKmXPoRkSiuTsZo3kz/e3EZXzMm7M4KO3/dAt812QKqeEr1FKuV1v1NXGrxeNSKOz7ukB3gg10/Vftq2REC2dafqcaQxtGQv/wuC7lsAY441ZtyOgiv9QG/dUVAQsBvJ6NvU0QrOfKnM+ebT/wEwYs3adEtzvTNWeZqpBgZggsHe5UY/MXKwSEYImH7In2sQ1qyg2dcTYGUlx57ATGUTiSGbHE4MI/yQZRXi8uhKbbCrh0AUDEfuQHZ4jBK9ZpxDD9OkxrtWSE0KA7eHnmfDuSzpmSN6ajIjWvf67YLuaVclJ66mRND3pFNaG1cq3q55NM1bCQ2t8vySaPnMDNz40EQcBzdYc7H9Ortq/UNHlCDBA7GYtLKzaKW10iqZZ+g0GFgVTwXLIgfdVtMbKyANyZynaCzoc2ZI4l0Awhy4vPC+saPg4leR1bWKlua6YFng7z8QFaGZSVfsdoQgD12zXT1E83J36LZACIRy7/T3D7vkHs8qybu7+4MJ9JUoPST59x5JOZHSJ0+ZhApMgnGtF9BszhcvsSrDSVizXXKb/cUWNDXKwFapQk/FjQs71UYdFjM8phMC7LU/M0GLmZ6PDPwSG8i8rLACMIJOEa9VvFa2XrsnEu1koeYDeaVyR8QFnKsv4scrSYeQk+Bj0the81ox1VnDVrmbB0ZwJ1RjWmY9GTdnWIGa9x/56ZG7rMU1k+aGVgZQjY61VBF7znVVF7m9V58OU07PGzz71Z4QO9qjupdcu1ntjcoqmWtU7OgAM+o8XQTRH4QfGJ2hYFAVR6B8YajCqRm3/L//OtNHE8vLgh13ZmJfoSUokRfJl96hkmTW66uYDAvxQKnXgHgUwUBuHcPR cnKmwH+J qRFs9PF3DOLqERQCciCzqOSqi2KsDQNYXfRYAN4vd30QU9GtR2u7Ge4StJNnuE7Jwk348PjFKGyHYwAmuBLlpYCv4AUgEJxScuTc9yB0CcmtXZpBPolWZJbFnn5jnxzSA5ET6ChM+cbaDokYBkyAEKr8xaAYFFTPNU5SFxWCv973yED8mDKXA4w6AqnzhPMytOZJH/FUZ84oLA/UJL0Hy00PHqzjvUxcJhsEITv4nwVZ0TRTemjipAsLbxItSPK1GdiMNRMtRPHgIHRdYBIfF8hxO9PluLb6+mTVDgbRcgHGR+bZwYcAIKXUrdd2j8N3gjVhVd/EvmjN+JdeNBFl9knUuNOl/SYMF7ha/TX077DmJ4NkZr13tDPNByeqksGCDcSoaYAUU3fX9CKtfx5D7kiMWDFGWZW2eSwQK90NSf5TQjuR4xwWKDC5Kv3NlPJ/ruCug63oU3vnPUHeKihkUosZ0S4/8KgCJFDEnKP+5FrDLXuF3V/eCmqOFeaBYUhXyvJHZ3Zn0YtNCLr4= 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: split sanitize_mpol_flags into sanitize and validate. Sanitize is used by set_mempolicy to split (int mode) into mode and mode_flags, and then validates them. Validate validates already split flags. Validate will be reused for new syscalls that accept already split mode and mode_flags. Signed-off-by: Gregory Price --- mm/mempolicy.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 65e0334a1a18..eec807d0c6a1 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -1466,24 +1466,39 @@ static int copy_nodes_to_user(unsigned long __user *mask, unsigned long maxnode, return copy_to_user(mask, nodes_addr(*nodes), copy) ? -EFAULT : 0; } -/* Basic parameter sanity check used by both mbind() and set_mempolicy() */ -static inline int sanitize_mpol_flags(int *mode, unsigned short *flags) +/* + * Basic parameter sanity check used by mbind/set_mempolicy + * May modify flags to include internal flags (e.g. MPOL_F_MOF/F_MORON) + */ +static inline int validate_mpol_flags(unsigned short mode, unsigned short *flags) { - *flags = *mode & MPOL_MODE_FLAGS; - *mode &= ~MPOL_MODE_FLAGS; - - if ((unsigned int)(*mode) >= MPOL_MAX) + if ((unsigned int)(mode) >= MPOL_MAX) return -EINVAL; if ((*flags & MPOL_F_STATIC_NODES) && (*flags & MPOL_F_RELATIVE_NODES)) return -EINVAL; if (*flags & MPOL_F_NUMA_BALANCING) { - if (*mode != MPOL_BIND) + if (mode != MPOL_BIND) return -EINVAL; *flags |= (MPOL_F_MOF | MPOL_F_MORON); } return 0; } +/* + * Used by mbind/set_memplicy to split and validate mode/flags + * set_mempolicy combines (mode | flags), split them out into separate + * fields and return just the mode in mode_arg and flags in flags. + */ +static inline int sanitize_mpol_flags(int *mode_arg, unsigned short *flags) +{ + unsigned short mode = (*mode_arg & ~MPOL_MODE_FLAGS); + + *flags = *mode_arg & MPOL_MODE_FLAGS; + *mode_arg = mode; + + return validate_mpol_flags(mode, flags); +} + static long kernel_mbind(unsigned long start, unsigned long len, unsigned long mode, const unsigned long __user *nmask, unsigned long maxnode, unsigned int flags)