From patchwork Thu Dec 10 00:43:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pasha Tatashin X-Patchwork-Id: 11962963 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.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 6B7A5C433FE for ; Thu, 10 Dec 2020 00:43:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 2358223B98 for ; Thu, 10 Dec 2020 00:43:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2358223B98 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=soleen.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id E9AB56B006C; Wed, 9 Dec 2020 19:43:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D64576B006E; Wed, 9 Dec 2020 19:43:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BFB9A6B0070; Wed, 9 Dec 2020 19:43:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0007.hostedemail.com [216.40.44.7]) by kanga.kvack.org (Postfix) with ESMTP id A78B56B006C for ; Wed, 9 Dec 2020 19:43:44 -0500 (EST) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 77C698249980 for ; Thu, 10 Dec 2020 00:43:44 +0000 (UTC) X-FDA: 77575524768.07.plot91_5c108c7273f4 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin07.hostedemail.com (Postfix) with ESMTP id 5ED6F1803F9AF for ; Thu, 10 Dec 2020 00:43:44 +0000 (UTC) X-HE-Tag: plot91_5c108c7273f4 X-Filterd-Recvd-Size: 4757 Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by imf02.hostedemail.com (Postfix) with ESMTP for ; Thu, 10 Dec 2020 00:43:43 +0000 (UTC) Received: by mail-qk1-f193.google.com with SMTP id 1so3324061qka.0 for ; Wed, 09 Dec 2020 16:43:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=wKF1vMMrBlL3Nf1z4M/UQUVU8LetyRUPTbIEfnAIYlQ=; b=gqbd9DoMaRvvzvvMIqaS5F41tXsvEg/1IPa7tX68ji4V8ZFM0lAhGyUZ1CmiVZXVSh biDr/Ej0RPp58RM/ATaFiF2WLnZCp9mVyqJVF8saPqoaMIdnbxPdA9IzLH1s2jY1UK4Y H2lHueaV79j1DW3rTXM50YMPOTq29GTP2KnfVIJxkLxzhdbc+fjGIE2Eq7Ue0jnYz0A/ cW2to2nIGGjeyaZYDoshUaphaprRyBhQwGVqtTeymXkz9SP2YoPNh3LxiaImeY19SgbI w5Q+FiKl6hlqVYo0yVw5f3cEDEQ9eba8GOePohl4kJKP3tZk/EQx4jdfOaSRMeVu6A09 tSPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wKF1vMMrBlL3Nf1z4M/UQUVU8LetyRUPTbIEfnAIYlQ=; b=pzp9bJUgixc8xHcoLKDZKpDl8/VOHI7i52rFKIl5JsbFxfIJwWslQLronVt0SsUUV4 EdgnqRf6mwBB2d+MCeJqD1VMPfEohA1paXrzm7OgxNjJfNeq2sEAyqBEKjne03dzz44r Xr4D09kKwv0KsklXki1IQ5QC3YEeKDwjuf2hZMZiO1lKS0ocBa+31KtdLc5S9zYBPx0C XUl6/5ihglM8ro2pClWZDGw+7134OWW/FGbS4eluDlZbcLLLg/q8J0URqltv6I7MZJmg 1DdGRMZkVB9mtHjxFfNkakNSe4d9Nhhbv0xD8MSv8GNOPvOR05JXP8DMHo8/F8DwppJa vpPA== X-Gm-Message-State: AOAM533yklU9dSBDCT/v/ZUkn/Nb1iQD7+d6B+I1e6y5BM5Uo0Gwxdij gsc1AHCYphRKrJVktsw9Rf2IKA== X-Google-Smtp-Source: ABdhPJwVjQblG8lz4nHLZuO6EXQnNDMXKQRm0jhOeWrGTKeTLfE1Ij+ZT0B/O2DFXL+mzXgo5kPtBQ== X-Received: by 2002:a37:8384:: with SMTP id f126mr5922627qkd.500.1607561023216; Wed, 09 Dec 2020 16:43:43 -0800 (PST) Received: from localhost.localdomain (c-73-69-118-222.hsd1.nh.comcast.net. [73.69.118.222]) by smtp.gmail.com with ESMTPSA id y1sm2538745qky.63.2020.12.09.16.43.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Dec 2020 16:43:42 -0800 (PST) From: Pavel Tatashin To: pasha.tatashin@soleen.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, akpm@linux-foundation.org, vbabka@suse.cz, mhocko@suse.com, david@redhat.com, osalvador@suse.de, dan.j.williams@intel.com, sashal@kernel.org, tyhicks@linux.microsoft.com, iamjoonsoo.kim@lge.com, mike.kravetz@oracle.com, rostedt@goodmis.org, mingo@redhat.com, jgg@ziepe.ca, peterz@infradead.org, mgorman@suse.de, willy@infradead.org, rientjes@google.com, jhubbard@nvidia.com, linux-doc@vger.kernel.org Subject: [PATCH v2 3/8] mm/gup: make __gup_longterm_locked common Date: Wed, 9 Dec 2020 19:43:30 -0500 Message-Id: <20201210004335.64634-4-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201210004335.64634-1-pasha.tatashin@soleen.com> References: <20201210004335.64634-1-pasha.tatashin@soleen.com> MIME-Version: 1.0 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000022, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: __gup_longterm_locked() has CMA || FS_DAX version and a common stub version. In the preparation of prohibiting longterm pinning of pages from movable zone make the CMA || FS_DAX version common, and delete the stub version. Signed-off-by: Pavel Tatashin Reviewed-by: John Hubbard Reviewed-by: Ira Weiny --- mm/gup.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index 3a76c005a3e2..0e2de888a8b0 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -1567,7 +1567,6 @@ struct page *get_dump_page(unsigned long addr) } #endif /* CONFIG_ELF_CORE */ -#if defined(CONFIG_FS_DAX) || defined (CONFIG_CMA) #ifdef CONFIG_FS_DAX static bool check_dax_vmas(struct vm_area_struct **vmas, long nr_pages) { @@ -1757,18 +1756,6 @@ static long __gup_longterm_locked(struct mm_struct *mm, kfree(vmas_tmp); return rc; } -#else /* !CONFIG_FS_DAX && !CONFIG_CMA */ -static __always_inline long __gup_longterm_locked(struct mm_struct *mm, - unsigned long start, - unsigned long nr_pages, - struct page **pages, - struct vm_area_struct **vmas, - unsigned int flags) -{ - return __get_user_pages_locked(mm, start, nr_pages, pages, vmas, - NULL, flags); -} -#endif /* CONFIG_FS_DAX || CONFIG_CMA */ static bool is_valid_gup_flags(unsigned int gup_flags) {