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=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 BEC20C3F2D1 for ; Mon, 2 Mar 2020 23:51:05 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7046B20866 for ; Mon, 2 Mar 2020 23:51:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=nvidia.com header.i=@nvidia.com header.b="Lh9u7d2O" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7046B20866 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nvidia.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 1B8D46B0005; Mon, 2 Mar 2020 18:51:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 169826B0006; Mon, 2 Mar 2020 18:51:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 07F3D6B0007; Mon, 2 Mar 2020 18:51:05 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0228.hostedemail.com [216.40.44.228]) by kanga.kvack.org (Postfix) with ESMTP id E1BC16B0005 for ; Mon, 2 Mar 2020 18:51:04 -0500 (EST) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id BDBA1181AC9BF for ; Mon, 2 Mar 2020 23:51:04 +0000 (UTC) X-FDA: 76552070448.13.gate35_95485443c31b X-HE-Tag: gate35_95485443c31b X-Filterd-Recvd-Size: 7689 Received: from hqnvemgate25.nvidia.com (hqnvemgate25.nvidia.com [216.228.121.64]) by imf26.hostedemail.com (Postfix) with ESMTP for ; Mon, 2 Mar 2020 23:51:03 +0000 (UTC) Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate25.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Mon, 02 Mar 2020 15:50:22 -0800 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Mon, 02 Mar 2020 15:51:02 -0800 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Mon, 02 Mar 2020 15:51:02 -0800 Received: from [10.110.48.28] (10.124.1.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Mon, 2 Mar 2020 23:51:02 +0000 Subject: Re: [PATCHv5 2/3] mm/gup: fix omission of check on FOLL_LONGTERM in gup fast path To: Pingfan Liu , CC: Ira Weiny , Andrew Morton , Mike Rapoport , Dan Williams , Matthew Wilcox , Aneesh Kumar K.V , Keith Busch , Christoph Hellwig , Shuah Khan , References: <1582889550-9101-1-git-send-email-kernelfans@gmail.com> <1582889550-9101-3-git-send-email-kernelfans@gmail.com> From: John Hubbard X-Nvconfidentiality: public Message-ID: <1433456b-733c-02dc-d4fd-50e5b2be50bc@nvidia.com> Date: Mon, 2 Mar 2020 15:51:01 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <1582889550-9101-3-git-send-email-kernelfans@gmail.com> X-Originating-IP: [10.124.1.5] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1583193022; bh=uwIe6HAsPNsBLV9rN95JkXbJR2Ax6ScBeL5FYM1Vnuk=; h=X-PGP-Universal:Subject:To:CC:References:From:X-Nvconfidentiality: Message-ID:Date:User-Agent:MIME-Version:In-Reply-To: X-Originating-IP:X-ClientProxiedBy:Content-Type:Content-Language: Content-Transfer-Encoding; b=Lh9u7d2OABvBMwkQrWdECRY/BfFIkUsLlbZlXyzJUYTrzA/FoRbBLl7tuAGIZQK6p zKKKP2XUJwLN3u7MWKkjHvu33lIG8DRs7MztcUHQ8aN7hsfzcN0fH/2Xk/uZDEw/Jf u4eUTBJ4yFzYKvW+jMfQWBEvGQDRgTsqbdLkor4SyL8z1lGTkqJdDTE7X0l8/0XDjF 5hJWIC0bHsne67oOaHrAmaESIUu8wMQlcZTKt/LdN/CkdSxwUHnZq59IHs/hEZH/zY 0mhpb+qFHIc0q4aRTwIV1S12bUQH3rlfrqBzKEzrFfhxNlv1LItumCo3UE3B86f17z DoiVtNgoAyoTw== 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: On 2/28/20 3:32 AM, Pingfan Liu wrote: > FOLL_LONGTERM suggests a pin which is going to be given to hardware and > can't move. It would truncate CMA permanently and should be excluded. > > FOLL_LONGTERM has already been checked in the slow path, but not checked in > the fast path, which means a possible leak of CMA page to longterm pinned > requirement through this crack. > > Place a check in try_get_compound_head() in the fast path. > > Some note about the check: > Huge page's subpages have the same migrate type due to either > allocation from a free_list[] or alloc_contig_range() with param > MIGRATE_MOVABLE. So it is enough to check on a single subpage > by is_migrate_cma_page(subpage) > > Signed-off-by: Pingfan Liu > Cc: Ira Weiny > Cc: Andrew Morton > Cc: Mike Rapoport > Cc: Dan Williams > Cc: Matthew Wilcox > Cc: John Hubbard > Cc: "Aneesh Kumar K.V" > Cc: Keith Busch > Cc: Christoph Hellwig > Cc: Shuah Khan > To: linux-mm@kvack.org > Cc: linux-kernel@vger.kernel.org > --- > mm/gup.c | 26 +++++++++++++++++++------- > 1 file changed, 19 insertions(+), 7 deletions(-) > > diff --git a/mm/gup.c b/mm/gup.c > index cd8075e..f0d6804 100644 > --- a/mm/gup.c > +++ b/mm/gup.c > @@ -33,9 +33,21 @@ struct follow_page_context { > * Return the compound head page with ref appropriately incremented, > * or NULL if that failed. > */ > -static inline struct page *try_get_compound_head(struct page *page, int refs) > +static inline struct page *try_get_compound_head(struct page *page, int refs, > + unsigned int flags) ohhh...please please look at the latest gup.c in mmotm, and this one in particular: commit 0ea2781c3de4 mm/gup: track FOLL_PIN pages ...where you'll see that there is a concept of "try_get*" vs. "try_grab*"). This is going to be a huge mess if we do it as above, from a code structure point of view. The "grab" functions take gup flags, the "get" functions do not. Anyway, as I said in reply to the cover letter, I'm really uncomfortable with this being applied to linux.git. So maybe if we see a fix to mmotm, it will be clearer how to port that back to linux.git (assuming that you need 5.6 fixed--do you though?) thanks, -- John Hubbard NVIDIA > { > - struct page *head = compound_head(page); > + struct page *head; > + > + /* > + * Huge page's subpages have the same migrate type due to either > + * allocation from a free_list[] or alloc_contig_range() with param > + * MIGRATE_MOVABLE. So it is enough to check on a single subpage. > + */ > + if (unlikely(flags & FOLL_LONGTERM) && > + is_migrate_cma_page(page)) > + return NULL; > + > + head = compound_head(page); > > if (WARN_ON_ONCE(page_ref_count(head) < 0)) > return NULL; > @@ -1908,7 +1920,7 @@ static int gup_pte_range(pmd_t pmd, unsigned long addr, unsigned long end, > VM_BUG_ON(!pfn_valid(pte_pfn(pte))); > page = pte_page(pte); > > - head = try_get_compound_head(page, 1); > + head = try_get_compound_head(page, 1, flags); > if (!head) > goto pte_unmap; > > @@ -2083,7 +2095,7 @@ static int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long addr, > page = head + ((addr & (sz-1)) >> PAGE_SHIFT); > refs = record_subpages(page, addr, end, pages + *nr); > > - head = try_get_compound_head(head, refs); > + head = try_get_compound_head(head, refs, flags); > if (!head) > return 0; > > @@ -2142,7 +2154,7 @@ static int gup_huge_pmd(pmd_t orig, pmd_t *pmdp, unsigned long addr, > page = pmd_page(orig) + ((addr & ~PMD_MASK) >> PAGE_SHIFT); > refs = record_subpages(page, addr, end, pages + *nr); > > - head = try_get_compound_head(pmd_page(orig), refs); > + head = try_get_compound_head(pmd_page(orig), refs, flags); > if (!head) > return 0; > > @@ -2174,7 +2186,7 @@ static int gup_huge_pud(pud_t orig, pud_t *pudp, unsigned long addr, > page = pud_page(orig) + ((addr & ~PUD_MASK) >> PAGE_SHIFT); > refs = record_subpages(page, addr, end, pages + *nr); > > - head = try_get_compound_head(pud_page(orig), refs); > + head = try_get_compound_head(pud_page(orig), refs, flags); > if (!head) > return 0; > > @@ -2203,7 +2215,7 @@ static int gup_huge_pgd(pgd_t orig, pgd_t *pgdp, unsigned long addr, > page = pgd_page(orig) + ((addr & ~PGDIR_MASK) >> PAGE_SHIFT); > refs = record_subpages(page, addr, end, pages + *nr); > > - head = try_get_compound_head(pgd_page(orig), refs); > + head = try_get_compound_head(pgd_page(orig), refs, flags); > if (!head) > return 0; > >