From patchwork Thu Feb 20 15:53:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 11394343 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9C8BE13A4 for ; Thu, 20 Feb 2020 15:54:07 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 68A7A24656 for ; Thu, 20 Feb 2020 15:54:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="D857xTym" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 68A7A24656 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id BD4626B0006; Thu, 20 Feb 2020 10:54:05 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B83CE6B0007; Thu, 20 Feb 2020 10:54:05 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A999C6B0008; Thu, 20 Feb 2020 10:54:05 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0023.hostedemail.com [216.40.44.23]) by kanga.kvack.org (Postfix) with ESMTP id 9359C6B0006 for ; Thu, 20 Feb 2020 10:54:05 -0500 (EST) Received: from smtpin10.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 43FEF181AC537 for ; Thu, 20 Feb 2020 15:54:05 +0000 (UTC) X-FDA: 76510951650.10.rice17_6859ea58cd43 X-Spam-Summary: 1,0,0,,d41d8cd98f00b204,peterx@redhat.com,::linux-kernel@vger.kernel.org:aarcange@redhat.com:cracauer@cons.org:torvalds@linux-foundation.org:rppt@linux.vnet.ibm.com:kirill@shutemov.name:hannes@cmpxchg.org:dgilbert@redhat.com:david@redhat.com:bobbypowers@gmail.com:gokhale2@llnl.gov:jglisse@redhat.com:mike.kravetz@oracle.com:willy@infradead.org:mcfadden8@llnl.gov:mgorman@suse.de:peterx@redhat.com:hughd@google.com:bgeffon@google.com:dplotnikov@virtuozzo.com:xemul@virtuozzo.com,RULES_HIT:30054:30070,0,RBL:205.139.110.120:@redhat.com:.lbl8.mailshell.net-66.10.201.10 62.18.0.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:ft,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:25,LUA_SUMMARY:none X-HE-Tag: rice17_6859ea58cd43 X-Filterd-Recvd-Size: 5179 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by imf19.hostedemail.com (Postfix) with ESMTP for ; Thu, 20 Feb 2020 15:54:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582214044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pC83s6/oCw9UYO0HRmtCBYiP7WO47JpUOZG4bdgeobM=; b=D857xTymEWBXPkv5GyQrXsCX2celtXi/zUNX4WExX/7DipdZKyO1hLMTWh+8BmPnfKVmyO s6pdXiCdXzmDvzeUXnfRrVHWSzXSflwRDg1Fqz19lCt6VjDvM/Q+3kzc1rVFSqSOsC7OAW zRfSA1X9altxWiSKxDL1wJSeyxYCT/0= Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-180-jUUBS21iPHWL5idPzx4N0Q-1; Thu, 20 Feb 2020 10:54:01 -0500 Received: by mail-qt1-f197.google.com with SMTP id t9so2888240qtn.2 for ; Thu, 20 Feb 2020 07:54:01 -0800 (PST) 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:mime-version:content-transfer-encoding; bh=GuXFXQMyc7fgJvuGyXbyHcTTw4JLf36BXSP5cKDpRYA=; b=YFEhFu3ENBr5IpNP/eixYw7R6zbjJotep62rrl+a/nqL2VZ+JyUSkQmiIrwi41Bnb4 jjPXUngKgivAclAs1iL17K13m25j/hiXnqfIkoBnFfeTzCUmi3FXTn4TQOmTHmRC1yev BACxhfoYjNhGxW6hmrFS3UOPQEVb20O8HwAN/4RuykkRzYd4I45A7jEBxR+43JP5s2Vr uFLz2PLoFbjv9tUxqK9HwT/UR7tAXDvesyyX4DRW5GZiCjrCCkHxIrn3Xj/gj2ARdm2e ovzy4lAu0CLqWxHDVludOb+AzgDsZLbAm+vLDibi+EcpjIhqqbh6fLURPMg7ZrKRrhZ8 wnTg== X-Gm-Message-State: APjAAAUR/5XoAm0DVtnC/x1bPNHYCKMNuZQvtA8xop6Sn0WXMsK2ux4A SoRD1yx7C094uGDACqAJj+RByoI8jNu2HuWz6wDl1hOIypPInX9mYZ2/C6OT/9ecO4dnQsRorSS VyD/AGBXujCo= X-Received: by 2002:a37:b243:: with SMTP id b64mr30229662qkf.164.1582214040818; Thu, 20 Feb 2020 07:54:00 -0800 (PST) X-Google-Smtp-Source: APXvYqxOpnl2xacnwHQN84MUWW8xiECJGKgV8PkqrlFanjY7RRrr5hucN1qNxpFi65Q4ia+dNtkpeQ== X-Received: by 2002:a37:b243:: with SMTP id b64mr30229632qkf.164.1582214040609; Thu, 20 Feb 2020 07:54:00 -0800 (PST) Received: from xz-x1.redhat.com ([104.156.64.75]) by smtp.gmail.com with ESMTPSA id h20sm1807430qkk.64.2020.02.20.07.53.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 07:53:59 -0800 (PST) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Andrea Arcangeli , Martin Cracauer , Linus Torvalds , Mike Rapoport , "Kirill A . Shutemov" , Johannes Weiner , "Dr . David Alan Gilbert" , David Hildenbrand , Bobby Powers , Maya Gokhale , Jerome Glisse , Mike Kravetz , Matthew Wilcox , Marty McFadden , Mel Gorman , peterx@redhat.com, Hugh Dickins , Brian Geffon , Denis Plotnikov , Pavel Emelyanov Subject: [PATCH RESEND v6 02/16] mm/gup: Fix __get_user_pages() on fault retry of hugetlb Date: Thu, 20 Feb 2020 10:53:39 -0500 Message-Id: <20200220155353.8676-3-peterx@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200220155353.8676-1-peterx@redhat.com> References: <20200220155353.8676-1-peterx@redhat.com> MIME-Version: 1.0 X-MC-Unique: jUUBS21iPHWL5idPzx4N0Q-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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: When follow_hugetlb_page() returns with *locked==0, it means we've got a VM_FAULT_RETRY within the fauling process and we've released the mmap_sem. When that happens, we should stop and bail out. Signed-off-by: Peter Xu --- mm/gup.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mm/gup.c b/mm/gup.c index 1b4411bd0042..76cb420c0fb7 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -849,6 +849,16 @@ static long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, i = follow_hugetlb_page(mm, vma, pages, vmas, &start, &nr_pages, i, gup_flags, locked); + if (locked && *locked == 0) { + /* + * We've got a VM_FAULT_RETRY + * and we've lost mmap_sem. + * We must stop here. + */ + BUG_ON(gup_flags & FOLL_NOWAIT); + BUG_ON(ret != 0); + goto out; + } continue; } }