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 X-Spam-Level: X-Spam-Status: No, score=-16.6 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,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 50577C83013 for ; Wed, 2 Dec 2020 05:23:43 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C6C962065C for ; Wed, 2 Dec 2020 05:23:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C6C962065C 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 2548D8D0008; Wed, 2 Dec 2020 00:23:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1B1E08D0002; Wed, 2 Dec 2020 00:23:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0A40C8D0008; Wed, 2 Dec 2020 00:23:42 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0213.hostedemail.com [216.40.44.213]) by kanga.kvack.org (Postfix) with ESMTP id E9B508D0002 for ; Wed, 2 Dec 2020 00:23:41 -0500 (EST) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id BA986181AEF1A for ; Wed, 2 Dec 2020 05:23:41 +0000 (UTC) X-FDA: 77547199842.01.look84_1a0c2a6273b0 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin01.hostedemail.com (Postfix) with ESMTP id 9E9B310046463 for ; Wed, 2 Dec 2020 05:23:41 +0000 (UTC) X-HE-Tag: look84_1a0c2a6273b0 X-Filterd-Recvd-Size: 4682 Received: from mail-il1-f195.google.com (mail-il1-f195.google.com [209.85.166.195]) by imf33.hostedemail.com (Postfix) with ESMTP for ; Wed, 2 Dec 2020 05:23:41 +0000 (UTC) Received: by mail-il1-f195.google.com with SMTP id z14so429768ilm.10 for ; Tue, 01 Dec 2020 21:23:40 -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=vWbivB19k0h8/AlP1XM1Nmc7af9oF18AMBG0uJjqBZg=; b=g96m6GkPZHfEbSkiqZwo4JVs7jb4V5m6B/E80Zsyu24GkvrsPZp7AWEJhI//1ghTWN 5NLAv8o3wcP/KZpZQmNSbfpDFqZdUUVJjfkMerBm1X/+ACWSdy3aELusEZYv6b7yhiB7 xXf+WbsGmnygy23Xtkg0rrAJSR4ApXWWUWpH9P6mRfqmGZGMmqJZwL4rI1Dpc5Btmo2j 3QTXixFypX+bc0zrN6L05FqlHYHxxx57GyOhX0pEAvYLw28iOO7qbYYIOeFby7eDuglc oeeGldegA6vLLJ/FQvIVi3vDW1lkYcV72cVcRusrIxeiCzIDe90yPtpiRDj8k6F0UaS6 Bxag== 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=vWbivB19k0h8/AlP1XM1Nmc7af9oF18AMBG0uJjqBZg=; b=FzjK57Tw8hRtEufMvhJFBfD+8kEekOhJ/clPUR3LEc0/gTAC+zxaua8Ehcg5sZjV3A bocWDUPckQ4GS0dSQO+AyAYin7sHLfiF4whdZvOe607gEETVmnZqD6+mU7Nku4vn+yXf GQEevulEf5eBQL9ijbGbQ56cJ8Wie6X7S7Q0mAfRsDi64gi8kPTwJeEq6Wp3yhRjKnpw szCEE7cwXXqWbJB0RQ67GuYF0vSG2WnqyVl0HyGPEdkQBf3+lZUj+ZiIn0bQiQbVbX7B hWsjCUuFwx1onjI7U6fLTcQqBI/mV6zcs4eQTgGHguD0f2D5xgSjY8umVAwwmzvwRQ4I k/KA== X-Gm-Message-State: AOAM530zs92ZzKOYD/Lg7utTSXc4BN+NLgiusWdOXetuu8i+UleCpDMX cr9iVHOrwbN4QWrkSEAq+TUH5w== X-Google-Smtp-Source: ABdhPJxgs+HxskX0uhoP9WOG8kbRPPRX02QP9Wypzqg6Mj5iS3wfXYkcKGeLH1LvMeVA4mW5Ql4yNA== X-Received: by 2002:a05:6e02:80b:: with SMTP id u11mr925843ilm.43.1606886620616; Tue, 01 Dec 2020 21:23:40 -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 m19sm295938ila.81.2020.12.01.21.23.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 21:23:40 -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 Subject: [PATCH 3/6] mm/gup: make __gup_longterm_locked common Date: Wed, 2 Dec 2020 00:23:27 -0500 Message-Id: <20201202052330.474592-4-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201202052330.474592-1-pasha.tatashin@soleen.com> References: <20201202052330.474592-1-pasha.tatashin@soleen.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: __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 --- 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 */ =20 -#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 */ =20 static bool is_valid_gup_flags(unsigned int gup_flags) { --=20 2.25.1