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=-8.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,RCVD_ILLEGAL_IP,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 EAC7AC433E2 for ; Tue, 1 Sep 2020 22:05:03 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7FAC7206C0 for ; Tue, 1 Sep 2020 22:05:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=fb.com header.i=@fb.com header.b="p6h2bA42"; dkim=pass (1024-bit key) header.d=fb.onmicrosoft.com header.i=@fb.onmicrosoft.com header.b="RbFStaYb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7FAC7206C0 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=fb.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id CCF6D6B0070; Tue, 1 Sep 2020 18:05:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C808E6B0071; Tue, 1 Sep 2020 18:05:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B47D56B0073; Tue, 1 Sep 2020 18:05:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0109.hostedemail.com [216.40.44.109]) by kanga.kvack.org (Postfix) with ESMTP id 9C3EB6B0070 for ; Tue, 1 Sep 2020 18:05:02 -0400 (EDT) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 502E53633 for ; Tue, 1 Sep 2020 22:05:02 +0000 (UTC) X-FDA: 77215873644.30.pail03_0403f3b2709b Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin30.hostedemail.com (Postfix) with ESMTP id ECAC8180B3C85 for ; Tue, 1 Sep 2020 22:05:01 +0000 (UTC) X-HE-Tag: pail03_0403f3b2709b X-Filterd-Recvd-Size: 10033 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by imf37.hostedemail.com (Postfix) with ESMTP for ; Tue, 1 Sep 2020 22:05:01 +0000 (UTC) Received: from pps.filterd (m0089730.ppops.net [127.0.0.1]) by m0089730.ppops.net (8.16.0.42/8.16.0.42) with SMTP id 081M4X8d004567; Tue, 1 Sep 2020 15:04:57 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=date : from : to : cc : subject : message-id : references : content-type : in-reply-to : mime-version; s=facebook; bh=cZcAyfriv+cBLBdolyxuS1Z/VGwzNYT0DxHtwPgBDwM=; b=p6h2bA42jgXYknXIKPnPiTo80Q0Xvae82/SSrdWSlNULuFFJJeDIb+KkK7iAV8j0g4qX vUjYlwHj0xRB/Wl7+FGhaWj1FfIVyc8vb7zHEQHHsgubyDmdOWg4OC4B0uW9UKezVWJs 0UkqjEdZoFvmwUEWwy6W21VNKCmZgeyFdII= Received: from mail.thefacebook.com ([163.114.132.120]) by m0089730.ppops.net with ESMTP id 337jh08t6k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Tue, 01 Sep 2020 15:04:57 -0700 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (100.104.98.9) by o365-in.thefacebook.com (100.104.94.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Tue, 1 Sep 2020 15:04:56 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ft43bcGOT1c1vbn9bDZ5nGwXN1DAcqmjJtyWbS77ba7nfD2qd/gPC85Gs2MXloyllcUfTUt9UNlb69t6OqwS3LjyRz/1eaWJtfNarXgzE2Hel9KGv8WdH+DwfoQZGvYyyweTZD547HOC+ij0iED5JC1rm2DVoh/bSF3a5nP1gx849el8Zcc9jSajfGe3dLLqRZUmr6+iaAUWPTOFvQIAoe+dU+XzDXuERx2T5Th3/Y+Rap74SO1VxzA/6cK11/icuOvY7cSsGd0CSWRVd5/zn6/nIlLRmDPa0vycfkYgFQiUEsuD3h6f/TMVes+mleGLCIZDnMaP56AtLqfjr4/vOw== 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=cZcAyfriv+cBLBdolyxuS1Z/VGwzNYT0DxHtwPgBDwM=; b=iX/kUbM6QnkG+z6n3UP5ZLzC1pGtpdapM581rHdVZJe2Y/u894a9uuKNWno3nyLlbutAy+8yQOsH0CraDGlauDUXKksVL3QmO6zNNtbazUe5S+uFFFwqJYmgorQ69Yf3+L7X21YBYhtF8hn85AEWTcuA9K1AkiraZIDnA97NEe2tgKMZG10PFCPk96qTyYDRNZSnAo8QLCEoda+AGnvQ2tBm8ufOj++iUCMHrP9VocuBrN9mDe+n1FtyMz+BUuAA1nEBNeHpops0HuzYC10Riu2Tw8cNdmE2+/hS+TUDQmEfb79wKH9APLT6hBYPBfhVRGfdSkPYiJSnLAWsFq+PWA== 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=cZcAyfriv+cBLBdolyxuS1Z/VGwzNYT0DxHtwPgBDwM=; b=RbFStaYbVLhI6leiHWN7HiTHUhtjfTTjXR/bK3TTnjuP/HWlkYCD9fjMyjUsj39E9mjMk4ZD+pQ1wV0074t6oDrz6KAdk18Ihct/1tcyVf04VO/lmS9072bI6QN7IEdLJVhZWW+tD1FiPD1LQROZOBE87+GMLhQTl9733WRLtpI= Authentication-Results: gmail.com; dkim=none (message not signed) header.d=none;gmail.com; dmarc=none action=none header.from=fb.com; Received: from BYAPR15MB4136.namprd15.prod.outlook.com (2603:10b6:a03:96::24) by BYAPR15MB2501.namprd15.prod.outlook.com (2603:10b6:a02:88::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3326.23; Tue, 1 Sep 2020 22:04:52 +0000 Received: from BYAPR15MB4136.namprd15.prod.outlook.com ([fe80::354d:5296:6a28:f55e]) by BYAPR15MB4136.namprd15.prod.outlook.com ([fe80::354d:5296:6a28:f55e%6]) with mapi id 15.20.3326.025; Tue, 1 Sep 2020 22:04:52 +0000 Date: Tue, 1 Sep 2020 15:04:49 -0700 From: Roman Gushchin To: Li Xinhai CC: , , Mike Kravetz , Michal Hocko Subject: Re: [PATCH V2] mm/hugetlb: try preferred node first when alloc gigantic page from cma Message-ID: <20200901220449.GC60440@carbon.dhcp.thefacebook.com> References: <20200901144924.678195-1-lixinhai.lxh@gmail.com> Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200901144924.678195-1-lixinhai.lxh@gmail.com> X-ClientProxiedBy: BYAPR04CA0004.namprd04.prod.outlook.com (2603:10b6:a03:40::17) To BYAPR15MB4136.namprd15.prod.outlook.com (2603:10b6:a03:96::24) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from 255.255.255.255 (255.255.255.255) by BYAPR04CA0004.namprd04.prod.outlook.com (2603:10b6:a03:40::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3348.15 via Frontend Transport; Tue, 1 Sep 2020 22:04:52 +0000 X-Originating-IP: [2620:10d:c090:400::5:6fe8] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 19598581-e9c7-4156-0d77-08d84ec30d5c X-MS-TrafficTypeDiagnostic: BYAPR15MB2501: X-Microsoft-Antispam-PRVS: X-FB-Source: Internal X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +PhAMtZlR3Ms8iXO1vkMFlt6B0vyMP63COVjWKtdZDR4Afn1HimLFvfhCknGfbKlbyZVXqoSdrF+S3L5EhcpFURDbLXC5/QMXJUY7y9YwaVi0N/DrNc/qMEQ62Wcy0qfc0eOD8dQoqUNflqHyvf0b8E3UiN5nlf5r7eZqPI/fohq6iLjJGJjw08yXg3KFVFD6eLbh02dpKtlEJOD0Znl2geZ71FLR5Sl48HPBgifQEfUNpBBs5x9TmkspFdNTldxDcKkxehqth1IR2/3O5V5olB4Be9kknsNsy4or92IbG476Ma2sRODyhNmCQI3888a X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR15MB4136.namprd15.prod.outlook.com;PTR:;CAT:NONE;SFS:(346002)(366004)(39860400002)(376002)(396003)(136003)(66556008)(86362001)(66476007)(52116002)(8676002)(8936002)(5660300002)(33656002)(54906003)(16576012)(83380400001)(4326008)(66946007)(316002)(1076003)(186003)(6666004)(956004)(6486002)(6916009)(2906002)(9686003)(478600001);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData: S/x1XMJzpu/x9L3awFRAdcNiYBUXHRFWmiOI5euAhR6+J7U57OzHG5tUxXg84pj43PgWekcLBl6pJius+yb8fvpMzunR8sd06X4e2sLvGcU1G7Owa+hp84J/uNWIh0+/hUH6Onu49WJXCx+wECfgp/idqYhiP4pSMo7MRu7PzJcv/+WOIuI46WMhdUh/6fU586Mk320eQgVS+qjciqarT/6ezZDvrrdjTMlrOs/PyW9gCL9yWO8TEQ+xXwcLrUkBghCK+vncAhqTDYWz7QdcF/r5yOl7lDcXFpVL0bNbo1tl5cyf1EPedSG2dm7sugSMdEuDiEGc9r1JFq1VSA0U1srCkyyWCGXMMXgUSJzsiZMb+g8uZazkjWZBVLboqjzQdFsIfFtCOD4Cn/7URXozor5LN7DnoYTA0BTYFoQxQRfQ1+HnEHUw92+T2nAI0oA2gZ+Yjs6UKlS7g5/Uv1Obtt47ZV9HSI6Ed6aOwy6qRscaE59iPZStEmw/WtVpurrbU9Hj3uNkQq6IwEquBJypvMAnCcqNOmogyJqrB/vQxF1IFlgrjwMsZqz8YeICEAbEbuUns3EZb4+UmmS7oOpV0SFhyXvK0xgrXTDfY3GwvHtZ/Q+ZPrj/I027OSmy7qFvOXcruZ71JdPGWHius4OctRX7WHJ/NcWv2jTAM8+DnIk= X-MS-Exchange-CrossTenant-Network-Message-Id: 19598581-e9c7-4156-0d77-08d84ec30d5c X-MS-Exchange-CrossTenant-AuthSource: BYAPR15MB4136.namprd15.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2020 22:04:52.5089 (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: 1hoaBNqHgcIAZFOhqCTaC8QXC2QjK9Lv16QzpjruR9cnnnvGTSPgrZqxbsmBsKDU X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR15MB2501 X-OriginatorOrg: fb.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235,18.0.687 definitions=2020-09-01_10:2020-09-01,2020-09-01 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 mlxscore=0 malwarescore=0 spamscore=0 lowpriorityscore=0 bulkscore=0 adultscore=0 priorityscore=1501 phishscore=0 suspectscore=1 impostorscore=0 mlxlogscore=999 clxscore=1011 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2009010186 X-FB-Internal: deliver X-Rspamd-Queue-Id: ECAC8180B3C85 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 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: On Tue, Sep 01, 2020 at 10:49:24PM +0800, Li Xinhai wrote: > Since commit cf11e85fc08cc6a4 ("mm: hugetlb: optionally allocate gigantic > hugepages using cma"), the gigantic page would be allocated from node > which is not the preferred node, although there are pages available from > that node. The reason is that the nid parameter has been ignored in > alloc_gigantic_page(). > > Besides, the __GFP_THISNODE also need be checked if user required to > alloc only from the preferred node. > > After this patch, the preferred node is tried first before other allowed > nodes, and don't try to allocate from other nodes if __GFP_THISNODE is > specified. > > Fixes: cf11e85fc08cc6a4 ("mm: hugetlb: optionally allocate gigantic hugepages using cma") > Cc: Roman Gushchin > Cc: Mike Kravetz > Cc: Michal Hocko > Signed-off-by: Li Xinhai > --- > v1->v2: > With review by Mike and Michal, need to check __GFP_THISNODE to avoid > allocate from other nodes. Acked-by: Roman Gushchin Thank you! > > mm/hugetlb.c | 21 +++++++++++++++------ > 1 file changed, 15 insertions(+), 6 deletions(-) > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index a301c2d672bf..d24986145087 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -1256,15 +1256,24 @@ static struct page *alloc_gigantic_page(struct hstate *h, gfp_t gfp_mask, > struct page *page; > int node; > > - for_each_node_mask(node, *nodemask) { > - if (!hugetlb_cma[node]) > - continue; > - > - page = cma_alloc(hugetlb_cma[node], nr_pages, > - huge_page_order(h), true); > + if (nid != NUMA_NO_NODE && hugetlb_cma[nid]) { > + page = cma_alloc(hugetlb_cma[nid], nr_pages, > + huge_page_order(h), true); > if (page) > return page; > } > + > + if (!(gfp_mask & __GFP_THISNODE)) { > + for_each_node_mask(node, *nodemask) { > + if (node == nid || !hugetlb_cma[node]) > + continue; > + > + page = cma_alloc(hugetlb_cma[node], nr_pages, > + huge_page_order(h), true); > + if (page) > + return page; > + } > + } > } > #endif > > -- > 2.18.4 >