From patchwork Tue Jun 23 06:13:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joonsoo Kim X-Patchwork-Id: 11619835 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 0CC536C1 for ; Tue, 23 Jun 2020 06:14:55 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CE25D20772 for ; Tue, 23 Jun 2020 06:14:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="uu36BHU3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CE25D20772 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id D53BA6B000E; Tue, 23 Jun 2020 02:14:53 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id CD6556B0010; Tue, 23 Jun 2020 02:14:53 -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 B9CBB6B0022; Tue, 23 Jun 2020 02:14:53 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0039.hostedemail.com [216.40.44.39]) by kanga.kvack.org (Postfix) with ESMTP id 9DA3D6B000E for ; Tue, 23 Jun 2020 02:14:53 -0400 (EDT) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 6A90C2C8F for ; Tue, 23 Jun 2020 06:14:53 +0000 (UTC) X-FDA: 76959463266.26.edge34_4102ac726e39 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin26.hostedemail.com (Postfix) with ESMTP id 967B51804B66B for ; Tue, 23 Jun 2020 06:14:52 +0000 (UTC) X-Spam-Summary: 2,0,0,d163ba763163e2cc,d41d8cd98f00b204,js1304@gmail.com,,RULES_HIT:41:69:355:379:541:800:960:973:988:989:1260:1345:1359:1535:1541:1711:1730:1747:1777:1792:2393:2559:2562:3138:3139:3140:3141:3142:3353:3871:3872:3876:4321:5007:6119:6261:6653:7576:7903:9413:9592:10004:11026:11473:11658:11914:12043:12114:12296:12297:12438:12517:12519:12555:12679:12895:12986:13069:13161:13229:13311:13357:14181:14384:14394:14721:21080:21444:21451:21627:21666:21990:30054,0,RBL:209.85.215.194:@gmail.com:.lbl8.mailshell.net-62.18.0.100 66.100.201.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:23,LUA_SUMMARY:none X-HE-Tag: edge34_4102ac726e39 X-Filterd-Recvd-Size: 5031 Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by imf32.hostedemail.com (Postfix) with ESMTP for ; Tue, 23 Jun 2020 06:14:52 +0000 (UTC) Received: by mail-pg1-f194.google.com with SMTP id u128so9373699pgu.13 for ; Mon, 22 Jun 2020 23:14:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=aLO5MtRfj6NH9QBTrO4jlGsPPU/dMtpy8l2hw8EHd8U=; b=uu36BHU3hicW3omtidDGbKh1z20N5PY/FyKfczJGKsarHZz2s5tqDM6OUsoJlatpeI Hh2dRkvpIjOOd6o+qsz98mpMljkhw5jJAwR5WEHy8DRwJRG1AnIYxMdUAFW6HL6Q60Hu 3FeI8hZGfv/M8Q6Zddcws0/dSei6zWG4eBxFRwOmYu+RF6oCwxlKdapSYTlW1kltblf1 XuTKA5+TzvNBkfUfiN//Vs/prf6pgOIW0KAInT2Huu7abktcC8c47Iw0fraysYSIR5ce RmaASndb3OpgmfeDEQU/7qGPx4QbUMoX2T4fm01E5WmVOyW8mZ+fy0cxVtMRHgVPQsaN lfrw== 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; bh=aLO5MtRfj6NH9QBTrO4jlGsPPU/dMtpy8l2hw8EHd8U=; b=H6L3EIvp0GXEN+H36p/cdPZx6VqVvor+RXVx1slNHmIb3wqxx0gXmwz607fJJMNQJa jiR2vbPGsH077JSZn4fxPskM3sNan9eXM8RUleeIwRg2xhmCGFyunkDedH+CKBppouQ2 M+av8xy6CM5zN10KFW1VbdRX5lOkHZn4pdIrChjwX3+hFY89/hjGC5QkhzR9lnrJOFHg exocRnzRYRdzWM7EmeDjJh/0kwV/YKiHvb6YRRdW3mMCV285FXzmau+NwKwwnvbP7i4G CHEmAFtRMW0Wc0WePNAdL8H2kT0hFL4J0aQGl/uigVLlmq15x/VCLtdfT85IExehlufn 7fkQ== X-Gm-Message-State: AOAM533Z7zRRtnD89gtg1i08rUl0QbARWc/WGa4ib+XXo7AA4diW1P/g uhLehLK2/PBeA291rTdPyjg= X-Google-Smtp-Source: ABdhPJyg2kZv3M0fSNkQ/Ab+6Tn54VFlyrQjmn6jE7KelDWuKlXnOv58fbhblhQQO1wRtkS0b4xn/g== X-Received: by 2002:a62:2acf:: with SMTP id q198mr24689706pfq.48.1592892891379; Mon, 22 Jun 2020 23:14:51 -0700 (PDT) Received: from localhost.localdomain ([114.206.198.176]) by smtp.gmail.com with ESMTPSA id m15sm12801093pgv.45.2020.06.22.23.14.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jun 2020 23:14:50 -0700 (PDT) From: js1304@gmail.com X-Google-Original-From: iamjoonsoo.kim@lge.com To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-team@lge.com, Vlastimil Babka , Christoph Hellwig , Roman Gushchin , Mike Kravetz , Naoya Horiguchi , Michal Hocko , Joonsoo Kim Subject: [PATCH v3 8/8] mm/page_alloc: remove a wrapper for alloc_migration_target() Date: Tue, 23 Jun 2020 15:13:48 +0900 Message-Id: <1592892828-1934-9-git-send-email-iamjoonsoo.kim@lge.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1592892828-1934-1-git-send-email-iamjoonsoo.kim@lge.com> References: <1592892828-1934-1-git-send-email-iamjoonsoo.kim@lge.com> X-Rspamd-Queue-Id: 967B51804B66B X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 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: From: Joonsoo Kim There is a well-defined standard migration target callback. Use it directly. Signed-off-by: Joonsoo Kim Acked-by: Michal Hocko Acked-by: Vlastimil Babka --- mm/page_alloc.c | 9 +++++++-- mm/page_isolation.c | 11 ----------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 9808339..884dfb5 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -8359,6 +8359,11 @@ static int __alloc_contig_migrate_range(struct compact_control *cc, unsigned long pfn = start; unsigned int tries = 0; int ret = 0; + struct migration_target_control mtc = { + .nid = zone_to_nid(cc->zone), + .nmask = &node_states[N_MEMORY], + .gfp_mask = GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL, + }; migrate_prep(); @@ -8385,8 +8390,8 @@ static int __alloc_contig_migrate_range(struct compact_control *cc, &cc->migratepages); cc->nr_migratepages -= nr_reclaimed; - ret = migrate_pages(&cc->migratepages, alloc_migrate_target, - NULL, 0, cc->mode, MR_CONTIG_RANGE); + ret = migrate_pages(&cc->migratepages, alloc_migration_target, + NULL, (unsigned long)&mtc, cc->mode, MR_CONTIG_RANGE); } if (ret < 0) { putback_movable_pages(&cc->migratepages); diff --git a/mm/page_isolation.c b/mm/page_isolation.c index adba031..242c031 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c @@ -306,14 +306,3 @@ int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn, return pfn < end_pfn ? -EBUSY : 0; } - -struct page *alloc_migrate_target(struct page *page, unsigned long private) -{ - struct migration_target_control mtc = { - .nid = page_to_nid(page), - .nmask = &node_states[N_MEMORY], - .gfp_mask = GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL, - }; - - return alloc_migration_target(page, (unsigned long)&mtc); -}