Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp7041716ybi; Thu, 13 Jun 2019 08:35:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqz3Fe+9ICDwDuwV6Sm2Gr64FD4jXRsBdf/FRfxYXqhO25EbebBgvtCdQLtvug7u5MebYXoY X-Received: by 2002:a17:902:8489:: with SMTP id c9mr8262698plo.327.1560440136762; Thu, 13 Jun 2019 08:35:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560440136; cv=none; d=google.com; s=arc-20160816; b=xcfvIJEVpLrMqQfosuPTmG2otSTU7TORal9AKY1WXyEn/OAxinnFKo8zr+7dM1DlPz vp28TTPwGmCHFSNtiyRiet9OzNnURibklqTbb3pLfrFbV/F/mX0Gs7aUHBjBTkkDZo2p T2hFrZOGjUxOhC67MuAWCofQyHXDumtDwfL49BBLIKjWRBLeb8J/py4P+3jtak/B8tZx QzpBg9T4ApJH3j7Whu+iBE0u4Y8/B3MeZNzAEau5UphwjgLckgPZs9330L3Z4b7WaJnL i22pLzmBEp+DIgYCZUZJxUKSHoznKhMGHG2TfyZzpeksjZja9GB1GWYHnE/plLd/xol5 NCsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=uCwWLrWN30s9tONuGry7ZPwH/e/7xLPMQjqyo7O5eBk=; b=t40WPaPxQ/ggAgdtUS9c8LwVyDJEeYWFpFcXQ7nQDVVW8jO3tpCronBWcm1S3PMEMM XlD9BebGVQ+2OYB143+nXkop+UGU2MqAHYW8sQO8K4JXoKCZRFQCSmU7IEfHn/W1h2KB Rhq4SvVB2vP8Qc6RLN+9WCC+qJBNl9EqJZgc5xasNrRaTV1nFJlxNmgxKi+Yz7X0jLRz d2rvn5auNY9c8QXUomEP0wV28baeP5mDaS1Fd4bwcOZ/EwV5NvyaBTZh6cFlgYNYJ3Ut hRcSZ0PdQecSNPKGajVt7CaN20Yqb2H7gEG/hcXavWoCLTZj9i36IJ0BngiosgnntCkW 7WMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=OP0W8yRl; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 14si96890pgw.267.2019.06.13.08.35.19; Thu, 13 Jun 2019 08:35:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=OP0W8yRl; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731110AbfFMPdD (ORCPT + 99 others); Thu, 13 Jun 2019 11:33:03 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:36876 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728434AbfFMKp7 (ORCPT ); Thu, 13 Jun 2019 06:45:59 -0400 Received: by mail-pl1-f196.google.com with SMTP id bh12so7981453plb.4 for ; Thu, 13 Jun 2019 03:45:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uCwWLrWN30s9tONuGry7ZPwH/e/7xLPMQjqyo7O5eBk=; b=OP0W8yRlUthFREqCxHMZcGfrR7ObjX7GSg3sDYQOctNsRHbm2Lqcb/opmbujosV95J Kh99aG4N5q3cD8Qe5BzWR9WJEMlx27hM+S6fiT/SGbKF6lFXXfH5hU2LKUg7g4jKajV7 i+CpumuA89UHiI+0KEwM0sEc8xCFxvGVPnOo/wSJ+eHrjcMmDLkXIKzRiOrMhUlW3xX2 0j2845eItLsOowqgOEDPMtCStDCTisuEjva0X94eD9UD6KLLzhjtMkuZ7kqhppDiaS4C nwXrzRFqbHigTy4SOi86TzPaELfID3cNgUHIFdnNBPTaW8jZPP1i+VQqes+JkhBDgzO0 JNAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=uCwWLrWN30s9tONuGry7ZPwH/e/7xLPMQjqyo7O5eBk=; b=txuhHFlXMOL7Wyj+JgexdUvajS8CoU/nBr842TiNLMnWVOYzh5qXof8RgR4ze2SuBU 6ib9yeYRlxs0/EUpdlnLvIFPwBWvMPoE7CDSKIPoWHBwyQgtjHpVYA1lb/21j/9BgkaY oFSU+QWZLVxJOloIlXZD4sOfeHwkJz/NwkGuSl+s86ctcjSFxPM1z/SdjHR1IVKHdh6I qzLrk0IVng5+pQsLExfuSj6scFxyexk6/JcAvSuup0aE8KzZGuPVbSQyXpeBjztiqQ7J SPABW9ZS8fV9izCkGuuyaVuxznkkDbDDpZc3p1DoRC5qVyz8VUcwxkt5+5VM44Ec46xd UVvg== X-Gm-Message-State: APjAAAUsvPHGaIDCYTLvZiqQSidLYf6FjoFfCrTnhfbVvpKtcoYDrNaK JhdAYW33I1HobhhQPNvZaA== X-Received: by 2002:a17:902:a506:: with SMTP id s6mr12547789plq.87.1560422758789; Thu, 13 Jun 2019 03:45:58 -0700 (PDT) Received: from mylaptop.redhat.com ([2408:8207:7825:dd90:9051:d949:55f9:678b]) by smtp.gmail.com with ESMTPSA id a13sm2813285pgh.6.2019.06.13.03.45.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jun 2019 03:45:58 -0700 (PDT) From: Pingfan Liu To: linux-mm@kvack.org Cc: Pingfan Liu , Ira Weiny , Andrew Morton , Mike Rapoport , Dan Williams , Matthew Wilcox , John Hubbard , "Aneesh Kumar K.V" , Keith Busch , Christoph Hellwig , Shuah Khan , linux-kernel@vger.kernel.org Subject: [PATCHv4 2/3] mm/gup: fix omission of check on FOLL_LONGTERM in gup fast path Date: Thu, 13 Jun 2019 18:45:01 +0800 Message-Id: <1560422702-11403-3-git-send-email-kernelfans@gmail.com> X-Mailer: git-send-email 2.7.5 In-Reply-To: <1560422702-11403-1-git-send-email-kernelfans@gmail.com> References: <1560422702-11403-1-git-send-email-kernelfans@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 gup_pte_range() in the fast path. 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 Cc: linux-kernel@vger.kernel.org --- mm/gup.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/mm/gup.c b/mm/gup.c index 766ae54..de1b03f 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -1757,6 +1757,14 @@ 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); + /* + * FOLL_LONGTERM suggests a pin given to hardware. Prevent it + * from truncating CMA area + */ + if (unlikely(flags & FOLL_LONGTERM) && + is_migrate_cma_page(page)) + goto pte_unmap; + head = try_get_compound_head(page, 1); if (!head) goto pte_unmap; @@ -1900,6 +1908,12 @@ static int gup_huge_pmd(pmd_t orig, pmd_t *pmdp, unsigned long addr, refs++; } while (addr += PAGE_SIZE, addr != end); + if (unlikely(flags & FOLL_LONGTERM) && + is_migrate_cma_page(page)) { + *nr -= refs; + return 0; + } + head = try_get_compound_head(pmd_page(orig), refs); if (!head) { *nr -= refs; @@ -1941,6 +1955,12 @@ static int gup_huge_pud(pud_t orig, pud_t *pudp, unsigned long addr, refs++; } while (addr += PAGE_SIZE, addr != end); + if (unlikely(flags & FOLL_LONGTERM) && + is_migrate_cma_page(page)) { + *nr -= refs; + return 0; + } + head = try_get_compound_head(pud_page(orig), refs); if (!head) { *nr -= refs; @@ -1978,6 +1998,12 @@ static int gup_huge_pgd(pgd_t orig, pgd_t *pgdp, unsigned long addr, refs++; } while (addr += PAGE_SIZE, addr != end); + if (unlikely(flags & FOLL_LONGTERM) && + is_migrate_cma_page(page)) { + *nr -= refs; + return 0; + } + head = try_get_compound_head(pgd_page(orig), refs); if (!head) { *nr -= refs; -- 2.7.5