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=-17.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 6CBDCC433C1 for ; Tue, 23 Mar 2021 10:29:32 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 057E6619B7 for ; Tue, 23 Mar 2021 10:29:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 057E6619B7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 7AB1C6B0149; Tue, 23 Mar 2021 06:29:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 734846B014A; Tue, 23 Mar 2021 06:29:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5873F6B014B; Tue, 23 Mar 2021 06:29:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0070.hostedemail.com [216.40.44.70]) by kanga.kvack.org (Postfix) with ESMTP id 39C966B0149 for ; Tue, 23 Mar 2021 06:29:31 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id EF92E688E for ; Tue, 23 Mar 2021 10:29:30 +0000 (UTC) X-FDA: 77950767300.15.B1F3C12 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by imf11.hostedemail.com (Postfix) with ESMTP id 2A3232000241 for ; Tue, 23 Mar 2021 10:29:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616495369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yv7PG4QWv9fYzw7ppRGgMc3QDAT6qa+i0kHDZN8WyOo=; b=AErX3VJzzsils++CzLdfxQhNjVBRcq71kjam9wxDEFr5rb5KgU9DYvewJPl9CFj5HiC/M0 ejeReoFmQ9Y4Irgm9ZCvXDJQFKGLpZsee0R1mIZ+pqToKLCrMQaQRrrITpYaTOdBTlm3pn ePq5SKKuT0GuAYAIIuaEZiy9qtVmkz4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-502-HEzIDiXMPcGtuWXjeS5idw-1; Tue, 23 Mar 2021 06:29:28 -0400 X-MC-Unique: HEzIDiXMPcGtuWXjeS5idw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D9F169CC1A; Tue, 23 Mar 2021 10:29:26 +0000 (UTC) Received: from [10.36.115.54] (ovpn-115-54.ams2.redhat.com [10.36.115.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8965D6E6F5; Tue, 23 Mar 2021 10:29:25 +0000 (UTC) Subject: Re: [PATCH 4/5] mm/migrate.c: use helper migrate_vma_collect_skip() in migrate_vma_collect_hole() To: Miaohe Lin , akpm@linux-foundation.org Cc: jglisse@redhat.com, shy828301@gmail.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org References: <20210320093701.12829-1-linmiaohe@huawei.com> <20210320093701.12829-5-linmiaohe@huawei.com> From: David Hildenbrand Organization: Red Hat GmbH Message-ID: Date: Tue, 23 Mar 2021 11:29:24 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 MIME-Version: 1.0 In-Reply-To: <20210320093701.12829-5-linmiaohe@huawei.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Stat-Signature: rqr5yg5pd6bra6xas7ssj6ruogu6yjgm X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 2A3232000241 Received-SPF: none (redhat.com>: No applicable sender policy available) receiver=imf11; identity=mailfrom; envelope-from=""; helo=us-smtp-delivery-124.mimecast.com; client-ip=63.128.21.124 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1616495368-310471 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 20.03.21 10:37, Miaohe Lin wrote: > It's more recommended to use helper function migrate_vma_collect_skip() to > skip the unexpected case and it also helps remove some duplicated codes. > Move migrate_vma_collect_skip() above migrate_vma_collect_hole() to avoid > compiler warning. > > Signed-off-by: Miaohe Lin > --- > mm/migrate.c | 28 +++++++++++----------------- > 1 file changed, 11 insertions(+), 17 deletions(-) > > diff --git a/mm/migrate.c b/mm/migrate.c > index 271081b014cb..3e169b72d7b2 100644 > --- a/mm/migrate.c > +++ b/mm/migrate.c > @@ -2315,44 +2315,38 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm, > #endif /* CONFIG_NUMA */ > > #ifdef CONFIG_DEVICE_PRIVATE > -static int migrate_vma_collect_hole(unsigned long start, > +static int migrate_vma_collect_skip(unsigned long start, > unsigned long end, > - __always_unused int depth, > struct mm_walk *walk) > { > struct migrate_vma *migrate = walk->private; > unsigned long addr; > > - /* Only allow populating anonymous memory. */ > - if (!vma_is_anonymous(walk->vma)) { > - for (addr = start; addr < end; addr += PAGE_SIZE) { > - migrate->src[migrate->npages] = 0; > - migrate->dst[migrate->npages] = 0; > - migrate->npages++; > - } > - return 0; > - } > - > for (addr = start; addr < end; addr += PAGE_SIZE) { > - migrate->src[migrate->npages] = MIGRATE_PFN_MIGRATE; > migrate->dst[migrate->npages] = 0; > - migrate->npages++; > - migrate->cpages++; > + migrate->src[migrate->npages++] = 0; > } > > return 0; > } > > -static int migrate_vma_collect_skip(unsigned long start, > +static int migrate_vma_collect_hole(unsigned long start, > unsigned long end, > + __always_unused int depth, > struct mm_walk *walk) > { > struct migrate_vma *migrate = walk->private; > unsigned long addr; > > + /* Only allow populating anonymous memory. */ > + if (!vma_is_anonymous(walk->vma)) > + return migrate_vma_collect_skip(start, end, walk); > + > for (addr = start; addr < end; addr += PAGE_SIZE) { > + migrate->src[migrate->npages] = MIGRATE_PFN_MIGRATE; > migrate->dst[migrate->npages] = 0; > - migrate->src[migrate->npages++] = 0; > + migrate->npages++; > + migrate->cpages++; > } > > return 0; > Reviewed-by: David Hildenbrand -- Thanks, David / dhildenb