Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp378178pxf; Thu, 25 Mar 2021 06:20:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwz28S9+wnoSqMoAJ9HMe4oWTu/xWjS3sIJ9k8ytg5qm433NQLmntIh9NDCOsHjos/SEmf1 X-Received: by 2002:aa7:d484:: with SMTP id b4mr9092178edr.63.1616678432064; Thu, 25 Mar 2021 06:20:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616678432; cv=none; d=google.com; s=arc-20160816; b=XAtmO1CQOw2VMzzlhxNlJ0wSbbgk7QNYbjdh95wPBEuPOZov6cO2xaylWHUR3gvqMY 1bZ+8XW/pqPia+hbtdIZg0JGKIlJJ44GSehkIDgoVILPQOcFwc/uj09N5R0hdMYiGYSy iirqgHbN53niuV2LkdG9pjOOKm+pMN6smI/v3/7z6bZbVkJpy/YUa5WMrp8rHj5bUsKb ACBrSv2DwOJknzCiSmwk3jovSTY05LVIjLPNhOX1o/4LOZOlVOMPFaP0kDipY7Uqj4St tJEzyfReFmGasmZwi7cncDFyoTYvKB7VtnsjfRwfPP1/cNKE6Vz3mLjxz3gyG196g0I4 fqOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :in-reply-to:mime-version:user-agent:date:message-id:organization :from:references:cc:to:subject:dkim-signature; bh=uSM6XsoCExKe4rLBLCAD8bfv90jOFRgqC0PeCEkln9I=; b=JzNNf43PAO0L/Fw8oE/7vcl7eaedF1GWkSzpv5CylZeUN8SyqGSkL/A5H9UJqiuvvq 2NEQSBYk1+Lvgh5X5lbJaJCEK/Jv8gV5AFp/ABXximjfJsOC/y0PE1hYNw0GaIONl9dc u5u6Je4aDRJxjotl+EUKFqgnCu82hbcrw6eJj76E2QvDoO0t7c4KgpM5DZnjRELr3VZB JduEh/aCRfir5U8G6hk6ALDQ8pZFYfDQBbyoK++MJCc4DEJUYiuJVdm8BTx+S7LY/8e2 GXGq00yAbCMsRALJOtRQNng9WHjxy4DQALYH4oWt4BfRJ0mmV+sZualBEaHcqJoM/vnm aKVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZzSAdBbg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id hs2si4328838ejc.566.2021.03.25.06.20.08; Thu, 25 Mar 2021 06:20:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZzSAdBbg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230377AbhCYNSy (ORCPT + 99 others); Thu, 25 Mar 2021 09:18:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:51028 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231136AbhCYNSY (ORCPT ); Thu, 25 Mar 2021 09:18:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616678302; 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=uSM6XsoCExKe4rLBLCAD8bfv90jOFRgqC0PeCEkln9I=; b=ZzSAdBbgU+owxcKbG7FNQzhbEW7soZXbmTDD0otZc5kNOB+bX/amZSjC2NzzEO5Q6D3u46 qn698I3m3brxBUERkijP1wuQygSwhA4feQ2xKdKC036c9TWLG70gl51cMHFnf5Gzjyad01 i/ezEI8R0z+bDRjLgzJnEf253ujzqbk= 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-149-Djy4CsTBNNiX3Lo24tAg5g-1; Thu, 25 Mar 2021 09:18:18 -0400 X-MC-Unique: Djy4CsTBNNiX3Lo24tAg5g-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2975994F1A; Thu, 25 Mar 2021 13:17:19 +0000 (UTC) Received: from [10.36.115.72] (ovpn-115-72.ams2.redhat.com [10.36.115.72]) by smtp.corp.redhat.com (Postfix) with ESMTP id EEC605D9CA; Thu, 25 Mar 2021 13:17:16 +0000 (UTC) Subject: Re: [PATCH v3 1/5] mm/migrate.c: make putback_movable_page() static To: Miaohe Lin , akpm@linux-foundation.org Cc: jglisse@redhat.com, shy828301@gmail.com, aquini@redhat.com, apopple@nvidia.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org References: <20210325131524.48181-1-linmiaohe@huawei.com> <20210325131524.48181-2-linmiaohe@huawei.com> From: David Hildenbrand Organization: Red Hat GmbH Message-ID: Date: Thu, 25 Mar 2021 14:17:15 +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: <20210325131524.48181-2-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.14 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 25.03.21 14:15, Miaohe Lin wrote: > The putback_movable_page() is just called by putback_movable_pages() and > we know the page is locked and both PageMovable() and PageIsolated() is > checked right before calling putback_movable_page(). So we make it static > and remove all the 3 VM_BUG_ON_PAGE(). > > Signed-off-by: Miaohe Lin > --- > include/linux/migrate.h | 1 - > mm/migrate.c | 7 +------ > 2 files changed, 1 insertion(+), 7 deletions(-) > > diff --git a/include/linux/migrate.h b/include/linux/migrate.h > index fdf65f23acec..1d8095069b1c 100644 > --- a/include/linux/migrate.h > +++ b/include/linux/migrate.h > @@ -44,7 +44,6 @@ extern int migrate_pages(struct list_head *l, new_page_t new, free_page_t free, > unsigned long private, enum migrate_mode mode, int reason); > extern struct page *alloc_migration_target(struct page *page, unsigned long private); > extern int isolate_movable_page(struct page *page, isolate_mode_t mode); > -extern void putback_movable_page(struct page *page); > > extern void migrate_prep(void); > extern void migrate_prep_local(void); > diff --git a/mm/migrate.c b/mm/migrate.c > index 47df0df8f21a..61e7f848b554 100644 > --- a/mm/migrate.c > +++ b/mm/migrate.c > @@ -140,15 +140,10 @@ int isolate_movable_page(struct page *page, isolate_mode_t mode) > return -EBUSY; > } > > -/* It should be called on page which is PG_movable */ > -void putback_movable_page(struct page *page) > +static void putback_movable_page(struct page *page) > { > struct address_space *mapping; > > - VM_BUG_ON_PAGE(!PageLocked(page), page); > - VM_BUG_ON_PAGE(!PageMovable(page), page); > - VM_BUG_ON_PAGE(!PageIsolated(page), page); > - > mapping = page_mapping(page); > mapping->a_ops->putback_page(page); > __ClearPageIsolated(page); > Reviewed-by: David Hildenbrand -- Thanks, David / dhildenb