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 796FEC10F09 for ; Sat, 9 Dec 2023 06:59:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 15B396B0075; Sat, 9 Dec 2023 01:59:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0E3386B007D; Sat, 9 Dec 2023 01:59:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E9FD86B007E; Sat, 9 Dec 2023 01:59:43 -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 D66E86B0075 for ; Sat, 9 Dec 2023 01:59:43 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 9EE86C049A for ; Sat, 9 Dec 2023 06:59:43 +0000 (UTC) X-FDA: 81546379446.03.5B280C9 Received: from mail-yw1-f193.google.com (mail-yw1-f193.google.com [209.85.128.193]) by imf29.hostedemail.com (Postfix) with ESMTP id CB4E4120020 for ; Sat, 9 Dec 2023 06:59:41 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=eBKXOAxa; spf=pass (imf29.hostedemail.com: domain of gourry.memverge@gmail.com designates 209.85.128.193 as permitted sender) smtp.mailfrom=gourry.memverge@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702105181; 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=i7HyyIuO4SKyKyBceL5BuQSQ5m+etdZ0u+23B3P6Igo=; b=7sHnShAF4FPVzIsPCu8S1DSCOmmf+6KAp4tGHJcsDj5n/2CfmpJzIRdA5rEolvlwdFltUV 3E1c7rpX/5JIIlH8SsBJRz26zUMp/p0NRSC0bZN5sdmNAsngFKVu5MVuN9OcthDO+kUgTG UN3NCTa1OhNGwVrLzpXQErDt8v+6ZVw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702105181; a=rsa-sha256; cv=none; b=XZ4P3T5o4k6ZV9G9KcAKsNcfFBO6gdHjDvrVK/CvjhoyQjNp7ZHK3Qf+uTxv3Tp6QZwd0A rzIzU0eGoI4VW0BCq8Igsy8ll4Jn5mHna+N+lx33GTIbed+oiakveSoYbLfx7KaFeu6nlm zPG7RR1F48IdpIGdQkfdZD3yHOVb+Rc= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=eBKXOAxa; spf=pass (imf29.hostedemail.com: domain of gourry.memverge@gmail.com designates 209.85.128.193 as permitted sender) smtp.mailfrom=gourry.memverge@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-yw1-f193.google.com with SMTP id 00721157ae682-5cdc0b3526eso21582207b3.1 for ; Fri, 08 Dec 2023 22:59:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702105181; x=1702709981; 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=i7HyyIuO4SKyKyBceL5BuQSQ5m+etdZ0u+23B3P6Igo=; b=eBKXOAxaBx1vvZiKkqNI6xHsDgucnrpEnNFUlky5vocZCkpbDL+Fffi0GTZ4aDMT3u ziZGmo5VfKJja/vt6lLPwnt7yIjB4JtvonkAc1TVHcr3UKw/j3eAaIejPNUxxuK4lbsV qXoeTSI5ju5kRuu0iwp4PwvG1AWG8mMU+MnSiE1T5Hqe27NDYFjPlflc/AnTEL/ptUpb PND2CCZQttA7yHTtiBmHosRLknuwJae5xfX8YkYjp309cc13/5gFxkfuNeoZJEeB0pEy FoIN/ZkEgFiyJiiQI/qXPzieC0R0/0vQN7Odt79NPrj8q2mkVG4z9UrspPDqZvYMuAjw NfEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702105181; x=1702709981; 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=i7HyyIuO4SKyKyBceL5BuQSQ5m+etdZ0u+23B3P6Igo=; b=AGRuQQZZ0Ah7ZO8XvRblem39fAVR7PGGe8+ZnsS+5lbo8vQK0kECDiXg2yxAkushUH Os5+AJOf0ARESPZjYIimLGG2ZdIaWz1eIaX4JRmr5uDNSvorIuZt+wYZXue3ARYDhAfK xOihFMcXgRc6B2ZHttYi08d4AvHM9Nag8DwmjfvvPrZx/gioJkd2qdecAbhA9IGO8fr2 pKIlAK+iL3PpFBQSf9qxTdtnz8/j9SV+oqJYZ6PJbqE7lcPZmMSj8ARD/2eHU1eGGIWW 6Sx1WahnDH/xOdkDdTGNMue4bw9grVIySL1VsRCPLy3hwq4pQEviX4bJlHr/z7SBglun FiYg== X-Gm-Message-State: AOJu0YzS1uQ1HYTCUQWzQ2X98IbBGaeY9oeLMmIwUwX6P2VQpUTpuiAu 1yzyXN+Ho1ichyhUnbzIjTCqey/J+Ni5 X-Google-Smtp-Source: AGHT+IGteQ1CEjfgmNHOonmlymj7glCZN8Z626LEQR0OLvqtfJs+kc+S7pyWNN9I9wFIiUm8ZkYGCg== X-Received: by 2002:a0d:c405:0:b0:5d7:1940:3efe with SMTP id g5-20020a0dc405000000b005d719403efemr1025990ywd.47.1702105180858; Fri, 08 Dec 2023 22:59: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 x8-20020a81b048000000b005df5d592244sm326530ywk.78.2023.12.08.22.59.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 22:59: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-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, jgroves@micron.com, ravis.opensrc@micron.com, sthanneeru@micron.com, emirakhur@micron.com, Hasan.Maruf@amd.com, seungjun.ha@samsung.com Subject: [PATCH v2 03/11] mm/mempolicy: refactor sanitize_mpol_flags for reuse Date: Sat, 9 Dec 2023 01:59:23 -0500 Message-Id: <20231209065931.3458-4-gregory.price@memverge.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231209065931.3458-1-gregory.price@memverge.com> References: <20231209065931.3458-1-gregory.price@memverge.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: CB4E4120020 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: x31zfgitkw3a1wpk3o4zmu6b8gdwni5s X-HE-Tag: 1702105181-508963 X-HE-Meta: U2FsdGVkX1/sAd6AiOwsYl214SPtrM+DbKG2CNTsn+4LfHstHiQo8Y6VLwVpHPp43RzSktphG8TbLbB2k1zCq/+aG0En6iwFIIRZrpGdL8A/nqAxlEnc+ZN5KTA+IPe2CfqWB35/s6gGB9Xvy4a8iJivqEF/99nzQ92y4UA6MxwT40rA2opSa/1dA/Q+q01ulBQmahj0XJYNil76Ir73d+Jw18py/nrIULI76PtOpYBw9ZZSGoxczHVNliBn1j1N3z286TENAZvvgG1rkz8FTSp8JAztlT5y0LzUdHX0LvObT7qh1H6f4QWHTAMjhAF5uqimWm0JwaS1xtythAxHBlM2iDkvuCmkdCofFL+xuXCzW6UkALjgnVaR1ykXdG6IX280Exq28EVhj3GlkmLngKTeg9DUeAxGf0qRWHul+iAs8gjVe/UY8oPA4xjZXs9ALMrWtLpiq9ItebGn4t1gVAc2EtF6atjlsn47gealmL687YrahpGImPgPwaJL95ygidD5MW2Cigq2g5IiSH6rMJjze2by82R3ShFqkdwrvBpvufbtriMFFZEPNlaZdzQx5Ko4OuyU+BiQOAfs6XA/1L8MzZYq2GsPQgct2Z/BBRgfZla89v4+2wJmDEpx4LOnidG4EpH8tknzidL6aD1wb4eO2c88/QESdN8T9a0XGRNGKbfWlKCWoftCHsUT25Wc7G9oFfuo1KTeyle61BvvDDPmEykep4F22t9LR+B6cMn24n7h80xcDQ8NPll40Pmd8MUvfX9e+0vLuz8GyR92/HFtmzToHIFRco9j15z7RTB3+UCvyDSlQ+U44vqxB6ExDCaZc3xFfxYEmTl71RcpRTHdll1HE9c2se1FQ/q+dE4+hhxgg4u9yx/pctHAOQXScv7pE0vSiFx8di89W/ysHtgB9SimcrMbHP5GM3S++R1oegI73/FKYGa2dDQ+OpOt9VcQIuJpj2sdSGNCVqf wBE9We/3 Uv2chXayPIpOieBZS8pxTmX5OOntf+H9OnAHkEFXooTBbGyvHd6ZPAUPnIxo+ZOxNavI5l07h//3pKfCvBjWv1d12ico02FxXExKQs0l0ngz5rnVPNtojrigrXkN1O54do3CUUDFkq2us08EDLkNvdd2Y4SKNW5hBsiaafdApDx6ydo9LYP/fDMKNy40Ej6J9wJeSYgf3K+c3iy7HxBgzH5DGdcRdI+RqO9VEOcYQuD6i/npFpez6GGSPQgEzu9wRXssMmTxrzWmiZytymfNzbEBuYt5T24jzf/abszf+/MKmOXwOF7BWXWmTluA/d6zqbIy57bdy9FZ2psUXn0LSWL6k2JM0AJsXaVB3NK5lTVyy2fCnWjmvEe2UosjSnc3OCK8NdU0bstgqEFAL50rpxY9y2M6z3nB7efSTFj6zjtzqOKXGx6K7Oa2TKTe1AEat2NYvtQkS06cCYzhLh+nrICJX69bCEooSf9shCNYMd2B8jX71wp6jJVZkVHi0BpS9jNBlISnqCjjFp1c= 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 b4d94646e6a2..65d023720e83 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -1463,24 +1463,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) -- 2.39.1