From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 528FAC433FF for ; Tue, 30 Jul 2019 17:05:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 195B3206E0 for ; Tue, 30 Jul 2019 17:05:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=fb.com header.i=@fb.com header.b="kD42B98R"; dkim=pass (1024-bit key) header.d=fb.onmicrosoft.com header.i=@fb.onmicrosoft.com header.b="Eq1svsfJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727556AbfG3RFF (ORCPT ); Tue, 30 Jul 2019 13:05:05 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:32486 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727201AbfG3RFE (ORCPT ); Tue, 30 Jul 2019 13:05:04 -0400 Received: from pps.filterd (m0001255.ppops.net [127.0.0.1]) by mx0b-00082601.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x6UH2A3a012729; Tue, 30 Jul 2019 10:02:23 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-id : content-transfer-encoding : mime-version; s=facebook; bh=sMqUNkLrDohNl43QagJ/TUpqn2DtW2DHAtvXZU/8Dz8=; b=kD42B98RvpZPd6BW80M2pOHOA253iTABFHXppvSMZCywuj5pqVwnsv24nOvlgqghQ5o8 FjuJYEYVobVeMai3l8QY2Z52sSq0z35E+J6aauwH8DrEvtTSd7n+dXdAIgAe6qZkdPQF 34pMfZsJCzmRhSprwbnT8OJu30NLXqubgqQ= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0b-00082601.pphosted.com with ESMTP id 2u2gk2sx31-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Tue, 30 Jul 2019 10:02:23 -0700 Received: from ash-exhub202.TheFacebook.com (2620:10d:c0a8:83::6) by ash-exhub103.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; Tue, 30 Jul 2019 10:02:22 -0700 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (100.104.31.183) by o365-in.thefacebook.com (100.104.36.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Tue, 30 Jul 2019 10:02:22 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RPwy0mTcuEEw+AirnRvcy5ShNuBRcE7Rjf8W0A+LFoIyJ+eDG309VP52N6zdxveZEIrlA1k30W1MDUVm9aK+ycE4mcJyDyGQf1BhtJosXWZD8R83+T4yesJKE5jPzAmkg4Dg4Nx9aonKxCgiZ202kN5M1nh4PfuLGXKvk2IpPwJ7/Wd+uQFYkhwAEP4evAceyQgNuWkWCqGU0J++9vlu9wt9EHe5VVKWvFOlrHW+1Ji3fF5iusESvDRT0e8/RwXsnPXf1alsy8bNLBqPq47a8pyIFscm3//fahcPfs3ulql4k0c+On5/THP0KROlSjOj88Oau1G5Nl2GxieGk71v9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sMqUNkLrDohNl43QagJ/TUpqn2DtW2DHAtvXZU/8Dz8=; b=Sp/y/GNvVXxZYtdJhYGhAjRgqA9Pn28NpZ+Yum65QAT8P7Kc6hB46g4BVmPaeHtbwGHn9PaLuYrM5KGwn+TYt9JNNdB8uI2+ztu94B1mSF8UiCtWgo7G7AiUP7mXiG4sKFBY50i+CDYbTCux/ROUAzRu5A9+xAXUZLZd7TJA3pOImBbXGl4BmlIHyrmp0hwe7l2qrW5ViZo6NA/HwkNF6DCagTusq+Pk6czm86Oa0HBN5yfkfrudnOdLfkwLOFvfDbymAIqayi+nUfxGQFYz+Pcu6yYFAYrk3C084Lhx18LYCZq1zvwJHkxtteNJ9VAfAb6NXSST2ZT3Yby5nUJJDg== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass smtp.mailfrom=fb.com;dmarc=pass action=none header.from=fb.com;dkim=pass header.d=fb.com;arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.onmicrosoft.com; s=selector2-fb-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sMqUNkLrDohNl43QagJ/TUpqn2DtW2DHAtvXZU/8Dz8=; b=Eq1svsfJUplpQQGFFgGQdP3vhup8UieSq43HZSxr0v044Ap4n5yNcQastHrluWhYmsjfftPV65vqfXUoEY85Q8Ra6UlYRjOlXhtYJztv3h5kmsCPt6s839P7wQsDLHswkR2mPM7anGygVl9aDIN0hH3gxrJ6WbECqHMOiSDcscQ= Received: from MWHPR15MB1165.namprd15.prod.outlook.com (10.175.3.22) by MWHPR15MB1262.namprd15.prod.outlook.com (10.175.3.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2115.14; Tue, 30 Jul 2019 17:02:20 +0000 Received: from MWHPR15MB1165.namprd15.prod.outlook.com ([fe80::d4fc:70c0:79a5:f41b]) by MWHPR15MB1165.namprd15.prod.outlook.com ([fe80::d4fc:70c0:79a5:f41b%2]) with mapi id 15.20.2115.005; Tue, 30 Jul 2019 17:02:20 +0000 From: Song Liu To: "Kirill A. Shutemov" CC: lkml , Linux-MM , "Andrew Morton" , Matthew Wilcox , "Kirill A. Shutemov" , Oleg Nesterov , "Kernel Team" , William Kucharski , "srikar@linux.vnet.ibm.com" Subject: Re: [PATCH 2/2] uprobe: collapse THP pmd after removing all uprobes Thread-Topic: [PATCH 2/2] uprobe: collapse THP pmd after removing all uprobes Thread-Index: AQHVRdClSGoRT5gntEqzOPZk9S20/6bjQ50AgAAh2YA= Date: Tue, 30 Jul 2019 17:02:19 +0000 Message-ID: <4C2B6C8C-963A-422F-B419-5D794BAAEB0B@fb.com> References: <20190729054335.3241150-1-songliubraving@fb.com> <20190729054335.3241150-3-songliubraving@fb.com> <20190730150110.yqib7bawsude2vqt@box> In-Reply-To: <20190730150110.yqib7bawsude2vqt@box> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: Apple Mail (2.3445.104.11) x-originating-ip: [2620:10d:c090:200::3:5cb8] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: b75d4a47-e33e-4dd3-0f7c-08d7150faef5 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328)(7193020);SRVR:MWHPR15MB1262; x-ms-traffictypediagnostic: MWHPR15MB1262: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:6790; x-forefront-prvs: 0114FF88F6 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39860400002)(376002)(346002)(136003)(396003)(366004)(199004)(189003)(46003)(68736007)(71200400001)(81156014)(71190400001)(25786009)(486006)(6116002)(81166006)(53936002)(6506007)(186003)(57306001)(102836004)(14454004)(8676002)(478600001)(8936002)(5660300002)(36756003)(53546011)(14444005)(476003)(33656002)(2616005)(7736002)(316002)(54906003)(6246003)(66446008)(6486002)(76176011)(229853002)(256004)(446003)(99286004)(6436002)(76116006)(50226002)(86362001)(6512007)(2906002)(4326008)(66946007)(64756008)(11346002)(66476007)(66556008)(305945005)(6916009);DIR:OUT;SFP:1102;SCL:1;SRVR:MWHPR15MB1262;H:MWHPR15MB1165.namprd15.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: fb.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: r67VQm7lYo5A6WQW9iw096lINAIe3dwEzvHSIU1bvioJ9+Bnk1mpeODMl4mMWerx8SpPg/oM4udeyX21a+EfwRbLmX21XaX0py7w31uJvYmMoVIQ0EudXgjl+Ljts5Sw1weNZ4etf4A0i5cL8FY7H0rWneVTtx5HazEkGfTNuthF9Em/7bqTooXgE+759GzEdxpXZLlLascJ1TDaNJlCCxluH6pUJZoTW1qS0HS3J41dFY6NahSc9QfvZHaHDHgtkC5DhnxXZassohj9XNp4U6z8IAMpnrA1J6eAYKogfZRJpeqPL3BW1FTeEDI6vf6fuyGW6zQ9Ga/Tg31TfnMd/kHk6Y8ZDsbPcIFF5+SdKS9LQAtn+FOcYpK054lz9X3elWbSSzxtJj/S7+jqCgdji5PZHBfVauLJ/2mV9K5U+fE= Content-Type: text/plain; charset="us-ascii" Content-ID: <4E8DDDB46EDD4A47B58E21AE800ED803@namprd15.prod.outlook.com> Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: b75d4a47-e33e-4dd3-0f7c-08d7150faef5 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jul 2019 17:02:19.8171 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: songliubraving@fb.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR15MB1262 X-OriginatorOrg: fb.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-07-30_07:,, 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=840 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1907300178 X-FB-Internal: deliver Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > On Jul 30, 2019, at 8:01 AM, Kirill A. Shutemov wr= ote: >=20 > On Sun, Jul 28, 2019 at 10:43:35PM -0700, Song Liu wrote: >> After all uprobes are removed from the huge page (with PTE pgtable), it >> is possible to collapse the pmd and benefit from THP again. This patch >> does the collapse by calling khugepaged_add_pte_mapped_thp(). >>=20 >> Signed-off-by: Song Liu >> --- >> kernel/events/uprobes.c | 9 +++++++++ >> 1 file changed, 9 insertions(+) >>=20 >> diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c >> index 58ab7fc7272a..cc53789fefc6 100644 >> --- a/kernel/events/uprobes.c >> +++ b/kernel/events/uprobes.c >> @@ -26,6 +26,7 @@ >> #include >> #include >> #include >> +#include >>=20 >> #include >>=20 >> @@ -470,6 +471,7 @@ int uprobe_write_opcode(struct arch_uprobe *auprobe,= struct mm_struct *mm, >> struct page *old_page, *new_page; >> struct vm_area_struct *vma; >> int ret, is_register, ref_ctr_updated =3D 0; >> + bool orig_page_huge =3D false; >>=20 >> is_register =3D is_swbp_insn(&opcode); >> uprobe =3D container_of(auprobe, struct uprobe, arch); >> @@ -525,6 +527,9 @@ int uprobe_write_opcode(struct arch_uprobe *auprobe,= struct mm_struct *mm, >>=20 >> /* dec_mm_counter for old_page */ >> dec_mm_counter(mm, MM_ANONPAGES); >> + >> + if (PageCompound(orig_page)) >> + orig_page_huge =3D true; >> } >> put_page(orig_page); >> } >> @@ -543,6 +548,10 @@ int uprobe_write_opcode(struct arch_uprobe *auprobe= , struct mm_struct *mm, >> if (ret && is_register && ref_ctr_updated) >> update_ref_ctr(uprobe, mm, -1); >>=20 >> + /* try collapse pmd for compound page */ >> + if (!ret && orig_page_huge) >> + khugepaged_add_pte_mapped_thp(mm, vaddr & HPAGE_PMD_MASK); >> + >=20 > IIUC, here you have all locks taken, so you should be able to call > collapse_pte_mapped_thp() directly, shouldn't you? >=20 Yes, we can call it directly. I had it that way in a very early=20 version.=20 Let me do that in the next version.=20 Thanks, Song