Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp5906874ybp; Tue, 8 Oct 2019 10:00:10 -0700 (PDT) X-Google-Smtp-Source: APXvYqxj002e/mJ6hGAweq1WGLCPdG3LdoNz2HrlJOIWwUKw15DnIDkVb7XmwxBl4Qre36BwjGUT X-Received: by 2002:a50:ce53:: with SMTP id k19mr34994776edj.2.1570554010718; Tue, 08 Oct 2019 10:00:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570554010; cv=none; d=google.com; s=arc-20160816; b=T+eoEwLfEm7fulvfwCOAlX1B3fTpbE6k68NdUEfxI2jFSRiLiMJT1ePxdBezDPe+uN +1rc6RV+IGithjF49gJrWFOBIHL8KQ4z7hASgvkD1uskRWpVhF/Vr+Pq+28KpkKzuCcw 676dQpGsXsrRGbaK9ImHbHVTvnky3nKyC/1WPJVou6dc2vQBxDEmnpsDqVrj7MqH4FV1 8AzTKy+DaSZlL52JPhecAbcmEarOaaSv0f4+E7T+5lPkND6V1l08BBCQbSHGC+lSnKM2 ueyPMkctxy9HtroGzLJF15oTv9y8Oe1sYk/W0n37FTthB/77gBuqkr6DTBjzZsH4dEhw P2HQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=kZ03H+qhlgW0YO4gWzSfYLlWKY2j7omqfMdJATRwHOA=; b=f3RSU6wlNs0CZJu/++xDUXCjrmuSSWHngQGi/jPHayOejy/m07J75+bngO8nY+EYWC MwktMLevBT/iTEL9eiJ5ATtEz9C950Ghk7FPXaUOHHGiWDK5z1fmAh2ITsdcoD1/z8NB uIbVSnphB7997wW97MRr9TcCgtfFYx1qDvftVFdLpxY4brERhvKhzisiwY+3QHxZN3AE 9jRHaknAAObs8BpdXfXDZpblhccIjmoo/o7nOcNkiaHn9df8WPPd7QO1rqerNM8eyw4n rnhnlE9nRW1E2JCI6/yCCfu7q6bYRimvvdHJBzi6Pxl+Oz0OiRPdA9w9/bRcAxYybpfo 0ZhA== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=vmware.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a3si10125568edr.20.2019.10.08.09.59.46; Tue, 08 Oct 2019 10:00:10 -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; 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=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=vmware.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728561AbfJHQ7W (ORCPT + 99 others); Tue, 8 Oct 2019 12:59:22 -0400 Received: from ex13-edg-ou-001.vmware.com ([208.91.0.189]:28433 "EHLO EX13-EDG-OU-001.vmware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726822AbfJHQ7W (ORCPT ); Tue, 8 Oct 2019 12:59:22 -0400 Received: from sc9-mailhost3.vmware.com (10.113.161.73) by EX13-EDG-OU-001.vmware.com (10.113.208.155) with Microsoft SMTP Server id 15.0.1156.6; Tue, 8 Oct 2019 09:44:13 -0700 Received: from akaher-lnx-dev.eng.vmware.com (unknown [10.110.19.203]) by sc9-mailhost3.vmware.com (Postfix) with ESMTP id 1580B40C00; Tue, 8 Oct 2019 09:44:08 -0700 (PDT) From: Ajay Kaher To: CC: , , , , , , , , , , , , , , , , , , , "Aneesh Kumar K . V" , Catalin Marinas , Naoya Horiguchi , Mark Rutland , Hillf Danton , Michal Hocko , Mike Kravetz Subject: [PATCH v2 4/8] mm, gup: remove broken VM_BUG_ON_PAGE compound check for hugepages Date: Wed, 9 Oct 2019 06:14:19 +0530 Message-ID: <1570581863-12090-5-git-send-email-akaher@vmware.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1570581863-12090-1-git-send-email-akaher@vmware.com> References: <1570581863-12090-1-git-send-email-akaher@vmware.com> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: None (EX13-EDG-OU-001.vmware.com: akaher@vmware.com does not designate permitted sender hosts) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Will Deacon commit a3e328556d41bb61c55f9dfcc62d6a826ea97b85 upstream. When operating on hugepages with DEBUG_VM enabled, the GUP code checks the compound head for each tail page prior to calling page_cache_add_speculative. This is broken, because on the fast-GUP path (where we don't hold any page table locks) we can be racing with a concurrent invocation of split_huge_page_to_list. split_huge_page_to_list deals with this race by using page_ref_freeze to freeze the page and force concurrent GUPs to fail whilst the component pages are modified. This modification includes clearing the compound_head field for the tail pages, so checking this prior to a successful call to page_cache_add_speculative can lead to false positives: In fact, page_cache_add_speculative *already* has this check once the page refcount has been successfully updated, so we can simply remove the broken calls to VM_BUG_ON_PAGE. Link: http://lkml.kernel.org/r/20170522133604.11392-2-punit.agrawal@arm.com Signed-off-by: Will Deacon Signed-off-by: Punit Agrawal Acked-by: Steve Capper Acked-by: Kirill A. Shutemov Cc: Aneesh Kumar K.V Cc: Catalin Marinas Cc: Naoya Horiguchi Cc: Mark Rutland Cc: Hillf Danton Cc: Michal Hocko Cc: Mike Kravetz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Srivatsa S. Bhat (VMware) Signed-off-by: Ajay Kaher --- mm/gup.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index 45c544b..6e7cfaa 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -1136,7 +1136,6 @@ static int gup_huge_pmd(pmd_t orig, pmd_t *pmdp, unsigned long addr, page = head + ((addr & ~PMD_MASK) >> PAGE_SHIFT); tail = page; do { - VM_BUG_ON_PAGE(compound_head(page) != head, page); pages[*nr] = page; (*nr)++; page++; @@ -1183,7 +1182,6 @@ static int gup_huge_pud(pud_t orig, pud_t *pudp, unsigned long addr, page = head + ((addr & ~PUD_MASK) >> PAGE_SHIFT); tail = page; do { - VM_BUG_ON_PAGE(compound_head(page) != head, page); pages[*nr] = page; (*nr)++; page++; @@ -1226,7 +1224,6 @@ static int gup_huge_pgd(pgd_t orig, pgd_t *pgdp, unsigned long addr, page = head + ((addr & ~PGDIR_MASK) >> PAGE_SHIFT); tail = page; do { - VM_BUG_ON_PAGE(compound_head(page) != head, page); pages[*nr] = page; (*nr)++; page++; -- 2.7.4