Received: by 2002:a25:c205:0:0:0:0:0 with SMTP id s5csp792065ybf; Fri, 28 Feb 2020 07:43:52 -0800 (PST) X-Google-Smtp-Source: APXvYqy6+aT2yGqjCUR17o23nHBAHbygwqYYk0aY9M+4uGTUwx4FwV0gIQzY/kahYFjjOFf7X0DC X-Received: by 2002:a9d:4c14:: with SMTP id l20mr3823526otf.125.1582904632674; Fri, 28 Feb 2020 07:43:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582904632; cv=none; d=google.com; s=arc-20160816; b=TvO6QKfeTW0a2709NuvaIP90RmzU78KYQItoUF7Z9hi+/qLNaaVqjsX9iRE5JMejR0 5OK0u7AORZa6siLJvcTRaqFot0RC/Mvu+1R2jvQ2l+cwoQnjiFZDMakQnQlI4sN3IlF0 Sm5E6bUGOSmb5tQT0Imc5sZK5gsd1Ctxdo/PhoihY3LTs0q9Xd5D+3Dshb5PBo3cDGfg /gS8SHgTCs76W5CQtIqrtmLOBA2id+lKLENQEfi2v690Ln2oEQfeF8WBpJiCqOl/Figw yqZX2ypjZkRnJTSIz6yXrN3avXLOyoCowPRG+lIf9cMS/z80fnTy7QWnWPNhO/XpqQBd ZOoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:content-transfer-encoding :mime-version:references:in-reply-to:date:subject:cc:to:from; bh=bakvWBO5ivbFjLmENqcS7ZPMwbtZT7eiyOwC1worNuc=; b=CWPP34TlYpauylH5So6o9AX4WbADVo8kVYdiMgET+0AYf34hs0RDMhkVgvN0NnKpzb 9ZANd6bIQkqrBzx2VsXJlAi+3qrUJZ5kq+UdaT6ia7rHYtGUFdoMTuECIDTgwtI5YE/H 2J7cC6oyKgT99aorDg51pPLLjOQyj/uwcIvgrIP9A711N0oW8XvoEXKyNdk1MWpneb1a o9+L4znfq+0KknobtrIhoknakRHZwEMftGOeFw1G4Q+617mjC45aogEALpwg3uqGzPfc I2weLm18m6KRID/ft4Fx4j8QlVByQErqDkRhhFQJzcZ/FAVnGh9kcNibGdjYh8zWVmOL 0dmA== 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=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o6si1986271oic.34.2020.02.28.07.43.40; Fri, 28 Feb 2020 07:43:52 -0800 (PST) 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=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727267AbgB1Png (ORCPT + 99 others); Fri, 28 Feb 2020 10:43:36 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:5422 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727164AbgB1Pnd (ORCPT ); Fri, 28 Feb 2020 10:43:33 -0500 Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 01SFZVs2118029 for ; Fri, 28 Feb 2020 10:43:32 -0500 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0b-001b2d01.pphosted.com with ESMTP id 2yepy2kh35-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 28 Feb 2020 10:43:32 -0500 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 28 Feb 2020 15:43:30 -0000 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp05.uk.ibm.com (192.168.101.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Fri, 28 Feb 2020 15:43:26 -0000 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 01SFhPPO56557788 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 28 Feb 2020 15:43:25 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 32B8CAE045; Fri, 28 Feb 2020 15:43:25 +0000 (GMT) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 52F6EAE04D; Fri, 28 Feb 2020 15:43:24 +0000 (GMT) Received: from p-imbrenda.emea.ibm.com (unknown [9.145.11.131]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTP; Fri, 28 Feb 2020 15:43:24 +0000 (GMT) From: Claudio Imbrenda To: linux-next@vger.kernel.org, akpm@linux-foundation.org Cc: borntraeger@de.ibm.com, david@redhat.com, aarcange@redhat.com, linux-mm@kvack.org, frankja@linux.ibm.com, sfr@canb.auug.org.au, jhubbard@nvidia.com, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Subject: [RFC v1 1/2] fixup for 9947ea2c1e608e32669d5caeb67b3e3fba3309e8 "mm/gup: track FOLL_PIN pages" Date: Fri, 28 Feb 2020 16:43:20 +0100 X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200228154322.329228-1-imbrenda@linux.ibm.com> References: <20200228154322.329228-1-imbrenda@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 x-cbid: 20022815-0020-0000-0000-000003AE8451 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 20022815-0021-0000-0000-00002206A875 Message-Id: <20200228154322.329228-2-imbrenda@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.572 definitions=2020-02-28_04:2020-02-28,2020-02-28 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 suspectscore=0 mlxscore=0 spamscore=0 mlxlogscore=868 bulkscore=0 malwarescore=0 priorityscore=1501 clxscore=1015 adultscore=0 phishscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2001150001 definitions=main-2002280124 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org in case pin fails, we need to unpin, just a put_page will not be enough Signed-off-by: Claudio Imbrenda --- mm/gup.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mm/gup.c b/mm/gup.c index f589299b0d4a..0b9a806898f3 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -2134,7 +2134,10 @@ static int gup_pte_range(pmd_t pmd, unsigned long addr, unsigned long end, goto pte_unmap; if (unlikely(pte_val(pte) != pte_val(*ptep))) { - put_page(head); + if (flags & FOLL_GET) + put_page(head); + else if (flags & FOLL_PIN) + unpin_user_page(head); goto pte_unmap; } -- 2.24.1