From patchwork Wed Jun 12 22:03:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Song Liu X-Patchwork-Id: 10990911 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 79FD513AF for ; Wed, 12 Jun 2019 22:06:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6809E28A6A for ; Wed, 12 Jun 2019 22:06:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5BA3F28AA2; Wed, 12 Jun 2019 22:06:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D5ECD28A6A for ; Wed, 12 Jun 2019 22:06:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 367386B026A; Wed, 12 Jun 2019 18:06:28 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 27E2E6B026B; Wed, 12 Jun 2019 18:06:28 -0400 (EDT) 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 0D2196B026C; Wed, 12 Jun 2019 18:06:28 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-yw1-f69.google.com (mail-yw1-f69.google.com [209.85.161.69]) by kanga.kvack.org (Postfix) with ESMTP id DC8886B026A for ; Wed, 12 Jun 2019 18:06:27 -0400 (EDT) Received: by mail-yw1-f69.google.com with SMTP id b75so18905180ywh.8 for ; Wed, 12 Jun 2019 15:06:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:smtp-origin-hostprefix:from :smtp-origin-hostname:to:cc:smtp-origin-cluster:subject:date :message-id:in-reply-to:references:mime-version; bh=kq4OSN4555gAGkuBdC1pCdofeLuUMnKNDEdg6BpuyMo=; b=kzzcEjo8S5h/lXJnpu7BaffayCCIleyjivja1eD3kryqwifj4UFaJaQJ9wM+JtN+FS d/wS2ZlTmuDaljXUYpcsxhx96IrPW6tqm4qCHLAQDnnkXisTAI4nVShXohG9gC8xTot9 UK2ahi0WPBH5xInWNMysk92oRpyGxYarCQADZVVyqNqvGyu9188/15In8AJRnvGHn97A v4GqMW0njyS/zB2SI97w9invtY7uI7GMi2wQj2RjjAgmLJdZhASeMs946SzBa+HVmajA oybZlKndeKi4D+SCd15GYki9bnAaZWSnz06q0HOp/T+/uM/i3AKAplCuB1iE8HRS/LHf AFFw== X-Gm-Message-State: APjAAAXO7+eqDk/rvadEhUwz9E1Tuuip3wZOL9nzOBrJs5XzkWQsGtXv ZBGF2A0bwn46l4yfQf6vK0wrpEXHPaWgPTSJ0dHEA5WGfHrmFvxGkpk5VDtN3VmAhKOw+habSB7 8U//Y+/rCqPm8E2W9uBjfYITa8nVFPSSRG9rWKW2D+ls25mZP5F0z4v2Xqfpuk/enKg== X-Received: by 2002:a25:1ed6:: with SMTP id e205mr41147803ybe.467.1560377187648; Wed, 12 Jun 2019 15:06:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqyPkUVAcaLZDtmJBZmpfVtb8/GXMmPtZkSJTnseSSkHel2jdLrJtCLQB72J0NrNQNN5wAYU X-Received: by 2002:a25:1ed6:: with SMTP id e205mr41147773ybe.467.1560377187011; Wed, 12 Jun 2019 15:06:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560377187; cv=none; d=google.com; s=arc-20160816; b=0oFS6SJe8lNr2Pl4vFWlmh44+ib/0FqXW+40tydeStvfHn+URXgVccTowWMIWqKn85 tcl8bwqJxkszxnuWk9jKZSo1LHt0zrzQJW0tymS+K8lecJznMkiaM2zxeQxS9q7xtgFY Px5Oav7/PhtlfnbxNZByudI9xKLnn21fb2DJKP4RQYowtcTteCt+jwLSUh7BjSLp/f7i B++pFhsn5j6IJq+kXqCsjD4UQXONLebJxrdsXJVHJB7VlIh1gxOOD5qB069S4mwtXKZg OrDDrq2XMEQk+b41rtA2csFVggymGmw50iOrRKrDNcXk06hp6BiayuVQvgNBQhVMyOAx ue3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject :smtp-origin-cluster:cc:to:smtp-origin-hostname:from :smtp-origin-hostprefix:dkim-signature; bh=kq4OSN4555gAGkuBdC1pCdofeLuUMnKNDEdg6BpuyMo=; b=aMA2pTT743GflljnqMlgx6wlG9Veh3SWeIlrFQHEdbd92nqcV+IeUMeMwMMDBB8EA/ ec6ACrVAXXDgdTx0sjglWYB3R7FJeljsMQezffDdCl20YzOOH2EbRxmlBORv84Vu1BjH 4X4RgQH/k7d+RYEe3dNIiZdjMhB9XdBWWxSjV+mEVdndXGkGSlD2ur43YTFBO2bKgJ02 3Gb8wCPbyanwaENBo6XWRPFcBUtONH3JjTgaMQsVi4cEKdjLVrSHLYPVzQcOo3sDbWf8 qvyzARs9iEvm6Kd0ACcOfV7/RQV07VGbBO15PAYFd23oGVBNgc5WU3mBBpQVYuuP2r85 z+Tg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fb.com header.s=facebook header.b=QsXbYSHh; spf=pass (google.com: domain of prvs=106696cf5d=songliubraving@fb.com designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=106696cf5d=songliubraving@fb.com"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fb.com Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com. [67.231.153.30]) by mx.google.com with ESMTPS id j3si272721ywj.185.2019.06.12.15.06.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Jun 2019 15:06:26 -0700 (PDT) Received-SPF: pass (google.com: domain of prvs=106696cf5d=songliubraving@fb.com designates 67.231.153.30 as permitted sender) client-ip=67.231.153.30; Authentication-Results: mx.google.com; dkim=pass header.i=@fb.com header.s=facebook header.b=QsXbYSHh; spf=pass (google.com: domain of prvs=106696cf5d=songliubraving@fb.com designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=106696cf5d=songliubraving@fb.com"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fb.com Received: from pps.filterd (m0109331.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x5CM2iuU014732 for ; Wed, 12 Jun 2019 15:06:26 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=facebook; bh=kq4OSN4555gAGkuBdC1pCdofeLuUMnKNDEdg6BpuyMo=; b=QsXbYSHh7Y5nBOQGU5AcXSPjzNbulwnUiVKVn4jp8cyv/Sun086cx62N7Oj2+KZockvL Iu3MBR/K0+kNPbUTu56QRZL6PRnM0hC2pE5hbR9H48TdrYnMeLVN21e0V3wGkfpAX+b5 TeEzKzk714BjKog4pauweFFXys5ukhy9A8o= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com with ESMTP id 2t37b0gj76-19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 12 Jun 2019 15:06:26 -0700 Received: from mx-out.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::c) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 12 Jun 2019 15:06:17 -0700 Received: by devbig006.ftw2.facebook.com (Postfix, from userid 4523) id 2694F62E2CCC; Wed, 12 Jun 2019 15:03:39 -0700 (PDT) Smtp-Origin-Hostprefix: devbig From: Song Liu Smtp-Origin-Hostname: devbig006.ftw2.facebook.com To: , CC: , , , , , , , , Song Liu Smtp-Origin-Cluster: ftw2c04 Subject: [PATCH v3 3/5] mm, thp: introduce FOLL_SPLIT_PMD Date: Wed, 12 Jun 2019 15:03:17 -0700 Message-ID: <20190612220320.2223898-4-songliubraving@fb.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190612220320.2223898-1-songliubraving@fb.com> References: <20190612220320.2223898-1-songliubraving@fb.com> X-FB-Internal: Safe MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-06-12_13:,, signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1906120153 X-FB-Internal: deliver 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: X-Virus-Scanned: ClamAV using ClamSMTP This patches introduces a new foll_flag: FOLL_SPLIT_PMD. As the name says FOLL_SPLIT_PMD splits huge pmd for given mm_struct, the underlining huge page stays as-is. FOLL_SPLIT_PMD is useful for cases where we need to use regular pages, but would switch back to huge page and huge pmd on. One of such example is uprobe. The following patches use FOLL_SPLIT_PMD in uprobe. Signed-off-by: Song Liu --- include/linux/mm.h | 1 + mm/gup.c | 38 +++++++++++++++++++++++++++++++++++--- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 0ab8c7d84cd0..e605acc4fc81 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2642,6 +2642,7 @@ struct page *follow_page(struct vm_area_struct *vma, unsigned long address, #define FOLL_COW 0x4000 /* internal GUP flag */ #define FOLL_ANON 0x8000 /* don't do file mappings */ #define FOLL_LONGTERM 0x10000 /* mapping lifetime is indefinite: see below */ +#define FOLL_SPLIT_PMD 0x20000 /* split huge pmd before returning */ /* * NOTE on FOLL_LONGTERM: diff --git a/mm/gup.c b/mm/gup.c index ddde097cf9e4..3d05bddb56c9 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -398,7 +398,7 @@ static struct page *follow_pmd_mask(struct vm_area_struct *vma, spin_unlock(ptl); return follow_page_pte(vma, address, pmd, flags, &ctx->pgmap); } - if (flags & FOLL_SPLIT) { + if (flags & (FOLL_SPLIT | FOLL_SPLIT_PMD)) { int ret; page = pmd_page(*pmd); if (is_huge_zero_page(page)) { @@ -407,7 +407,7 @@ static struct page *follow_pmd_mask(struct vm_area_struct *vma, split_huge_pmd(vma, pmd, address); if (pmd_trans_unstable(pmd)) ret = -EBUSY; - } else { + } else if (flags & FOLL_SPLIT) { if (unlikely(!try_get_page(page))) { spin_unlock(ptl); return ERR_PTR(-ENOMEM); @@ -419,8 +419,40 @@ static struct page *follow_pmd_mask(struct vm_area_struct *vma, put_page(page); if (pmd_none(*pmd)) return no_page_table(vma, flags); - } + } else { /* flags & FOLL_SPLIT_PMD */ + unsigned long addr; + pgprot_t prot; + pte_t *pte; + int i; + + spin_unlock(ptl); + split_huge_pmd(vma, pmd, address); + lock_page(page); + pte = get_locked_pte(mm, address, &ptl); + if (!pte) { + unlock_page(page); + return no_page_table(vma, flags); + } + /* get refcount for every small page */ + page_ref_add(page, HPAGE_PMD_NR); + + prot = READ_ONCE(vma->vm_page_prot); + for (i = 0, addr = address & PMD_MASK; + i < HPAGE_PMD_NR; i++, addr += PAGE_SIZE) { + struct page *p = page + i; + + pte = pte_offset_map(pmd, addr); + VM_BUG_ON(!pte_none(*pte)); + set_pte_at(mm, addr, pte, mk_pte(p, prot)); + page_add_file_rmap(p, false); + } + + spin_unlock(ptl); + unlock_page(page); + add_mm_counter(mm, mm_counter_file(page), HPAGE_PMD_NR); + ret = 0; + } return ret ? ERR_PTR(ret) : follow_page_pte(vma, address, pmd, flags, &ctx->pgmap); }