From patchwork Thu May 20 08:30:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feng Tang X-Patchwork-Id: 12269451 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0516C433B4 for ; Thu, 20 May 2021 08:30:21 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 45005610A2 for ; Thu, 20 May 2021 08:30:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 45005610A2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id DA5906B007D; Thu, 20 May 2021 04:30:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D55CF6B007E; Thu, 20 May 2021 04:30:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BF9746B0080; Thu, 20 May 2021 04:30:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0024.hostedemail.com [216.40.44.24]) by kanga.kvack.org (Postfix) with ESMTP id 8C4216B007D for ; Thu, 20 May 2021 04:30:20 -0400 (EDT) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 21497181AC9CB for ; Thu, 20 May 2021 08:30:20 +0000 (UTC) X-FDA: 78160937400.24.09F62E0 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by imf05.hostedemail.com (Postfix) with ESMTP id 85D7EE00200D for ; Thu, 20 May 2021 08:30:17 +0000 (UTC) IronPort-SDR: AHn/qQoplbrfMQ1RIeXCMCnMVH6UP7kmVAGHf3pdE32gIm7dvyJTgfsEmANtd+oEnArdf9CePz AlDDh7QXs9zQ== X-IronPort-AV: E=McAfee;i="6200,9189,9989"; a="181454397" X-IronPort-AV: E=Sophos;i="5.82,313,1613462400"; d="scan'208";a="181454397" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2021 01:30:18 -0700 IronPort-SDR: d/xtzwRVWrQjMJ24low5iOQu84fAtGYY0Mt7lk4Nz5Gyq5OK7ikeHhBhVMP0UNo1SSNsxw/lph koUNTsCRD74Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,313,1613462400"; d="scan'208";a="473899333" Received: from shbuild999.sh.intel.com ([10.239.147.94]) by orsmga001.jf.intel.com with ESMTP; 20 May 2021 01:30:15 -0700 From: Feng Tang To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton , Michal Hocko Cc: Andrea Arcangeli , David Rientjes , Mel Gorman , Mike Kravetz , Randy Dunlap , Vlastimil Babka , Dave Hansen , Ben Widawsky , Andi Kleen , Dan Williams , ying.huang@intel.com, Feng Tang Subject: [RFC Patch v2 2/4] mm/mempolicy: unify the preprocessing for mbind and set_mempolicy Date: Thu, 20 May 2021 16:30:02 +0800 Message-Id: <1621499404-67756-3-git-send-email-feng.tang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1621499404-67756-1-git-send-email-feng.tang@intel.com> References: <1621499404-67756-1-git-send-email-feng.tang@intel.com> Authentication-Results: imf05.hostedemail.com; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=intel.com (policy=none); spf=none (imf05.hostedemail.com: domain of feng.tang@intel.com has no SPF policy when checking 192.55.52.151) smtp.mailfrom=feng.tang@intel.com X-Stat-Signature: g1fxq6yqefciydoda6ejkxmax7gjbqz5 X-Rspamd-Queue-Id: 85D7EE00200D X-Rspamd-Server: rspam02 X-HE-Tag: 1621499417-50140 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: Currently the kernel_mbind() and kernel_set_mempolicy() do almost the same operation for parameter sanity check and preprocessing. Add a macro to unify the code to reduce the redundancy, and make it easier for changing the pre-processing code in future. Signed-off-by: Feng Tang --- mm/mempolicy.c | 46 +++++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 27 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 1964cca..0f5bf60 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -1460,25 +1460,29 @@ static int copy_nodes_to_user(unsigned long __user *mask, unsigned long maxnode, return copy_to_user(mask, nodes_addr(*nodes), copy) ? -EFAULT : 0; } +#define MPOL_PRE_PROCESS() \ + \ + nodemask_t nodes; \ + int err; \ + unsigned short mode_flags; \ + mode_flags = mode & MPOL_MODE_FLAGS; \ + mode &= ~MPOL_MODE_FLAGS; \ + if (mode >= MPOL_MAX) \ + return -EINVAL; \ + if ((mode_flags & MPOL_F_STATIC_NODES) && \ + (mode_flags & MPOL_F_RELATIVE_NODES)) \ + return -EINVAL; \ + err = get_nodes(&nodes, nmask, maxnode); \ + if (err) \ + return err; + static long kernel_mbind(unsigned long start, unsigned long len, unsigned long mode, const unsigned long __user *nmask, unsigned long maxnode, unsigned int flags) { - nodemask_t nodes; - int err; - unsigned short mode_flags; + MPOL_PRE_PROCESS(); start = untagged_addr(start); - mode_flags = mode & MPOL_MODE_FLAGS; - mode &= ~MPOL_MODE_FLAGS; - if (mode >= MPOL_MAX) - return -EINVAL; - if ((mode_flags & MPOL_F_STATIC_NODES) && - (mode_flags & MPOL_F_RELATIVE_NODES)) - return -EINVAL; - err = get_nodes(&nodes, nmask, maxnode); - if (err) - return err; return do_mbind(start, len, mode, mode_flags, &nodes, flags); } @@ -1493,20 +1497,8 @@ SYSCALL_DEFINE6(mbind, unsigned long, start, unsigned long, len, static long kernel_set_mempolicy(int mode, const unsigned long __user *nmask, unsigned long maxnode) { - int err; - nodemask_t nodes; - unsigned short flags; - - flags = mode & MPOL_MODE_FLAGS; - mode &= ~MPOL_MODE_FLAGS; - if ((unsigned int)mode >= MPOL_MAX) - return -EINVAL; - if ((flags & MPOL_F_STATIC_NODES) && (flags & MPOL_F_RELATIVE_NODES)) - return -EINVAL; - err = get_nodes(&nodes, nmask, maxnode); - if (err) - return err; - return do_set_mempolicy(mode, flags, &nodes); + MPOL_PRE_PROCESS(); + return do_set_mempolicy(mode, mode_flags, &nodes); } SYSCALL_DEFINE3(set_mempolicy, int, mode, const unsigned long __user *, nmask,