From patchwork Mon Dec 21 16:29:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liang Li X-Patchwork-Id: 11984881 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=-14.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 9F41EC433DB for ; Mon, 21 Dec 2020 16:29:44 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 57E9322CA1 for ; Mon, 21 Dec 2020 16:29:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 57E9322CA1 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 D6ABD6B0036; Mon, 21 Dec 2020 11:29:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D40BC6B005D; Mon, 21 Dec 2020 11:29:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BE2166B006C; Mon, 21 Dec 2020 11:29:43 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0093.hostedemail.com [216.40.44.93]) by kanga.kvack.org (Postfix) with ESMTP id 9FC3E6B0036 for ; Mon, 21 Dec 2020 11:29:43 -0500 (EST) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 5E682180AD83B for ; Mon, 21 Dec 2020 16:29:43 +0000 (UTC) X-FDA: 77617825446.14.bulb63_1707a6e27458 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin14.hostedemail.com (Postfix) with ESMTP id 3802318021DAA for ; Mon, 21 Dec 2020 16:29:43 +0000 (UTC) X-HE-Tag: bulb63_1707a6e27458 X-Filterd-Recvd-Size: 9743 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by imf38.hostedemail.com (Postfix) with ESMTP for ; Mon, 21 Dec 2020 16:29:42 +0000 (UTC) Received: by mail-pf1-f180.google.com with SMTP id 11so6730594pfu.4 for ; Mon, 21 Dec 2020 08:29:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:date:to:cc:subject:message-id:mail-followup-to:mime-version :content-disposition:user-agent; bh=5kDglcd6VQIqjjNw+a1FSAU9ly8u5KobZD9sJqfzmhY=; b=DFhcmrJPOlYHNP1sMevkV/MJhv/j7/xlyEEaaigvep8rnOXypKxqL6sSndgMJHPfDV /VGqHeHZNOPGVLtc17wQ1soRflBwrZVLAqFrKavH4+dXC7h88ctWw7iMFcbzqa4G+Vyr qdZckrzp3v9MysXO0JIpuyu21vuTICM16rPXehkCwbImep5wXGYzmhRP4SfhKEywCKHn wkn0tF18a7OoBcCtstBFNASOR/LJAyJJgRGNfBKwap+f6sJaIB5pypH+CSw3lvOOf2X/ wqdJbJG58gqVQPncHESPYy5TxLsx6e84nNTsNlbYoXtVuLJnucYBfmkrCXvmy9zCosk5 60xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:cc:subject:message-id :mail-followup-to:mime-version:content-disposition:user-agent; bh=5kDglcd6VQIqjjNw+a1FSAU9ly8u5KobZD9sJqfzmhY=; b=XayEpheczUdFZIt/Q/IsyJEekV3qv56XUN4JG3cu7T5+a9na2ob6JDphnKMEVyRSOo H6MaEv36H9j/sP38B5EkTgV/QJ/QHINTW2TlXTR6ErTpvri9Omy+FV+Tw6qPoaEWK1Bb Qr5xt5RBuZ4Ii3cU5JaUgMW9igYzqUlYvpo4h37WTZIQ0++H42uGu83hKXubdAsyxx0B AODSQR2ihdzd63SD7lVtfLKoChyj7bTfOq2gK7f6UErssbcZJtPMGW3WbzPo2c89xFpI +N/eVM1gn1ck5bsfBeUS/UsKQaic6yo5qQ/xgdgblVA6jJ7PXRbQYfcCyAqMrzUeoLAK //0w== X-Gm-Message-State: AOAM532NPfKBQJfNFGS32C5KfZDLTaKlK8pCueZqj43W8+hAkptjipjj vzns5Vt+CcatGCOACalatks= X-Google-Smtp-Source: ABdhPJyuienqAJue8qcDSJAHs+Vi+ADg974Xm4zu7z826xU1FeXUDlKlvmq8JBTXgMScbLS/qUASkw== X-Received: by 2002:a63:d855:: with SMTP id k21mr4931948pgj.399.1608568181980; Mon, 21 Dec 2020 08:29:41 -0800 (PST) Received: from open-light-1.localdomain (66.98.113.28.16clouds.com. [66.98.113.28]) by smtp.gmail.com with ESMTPSA id mr7sm15551570pjb.31.2020.12.21.08.29.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Dec 2020 08:29:41 -0800 (PST) From: Liang Li X-Google-Original-From: Liang Li Date: Mon, 21 Dec 2020 11:29:39 -0500 To: Alexander Duyck , Mel Gorman , Andrew Morton , Andrea Arcangeli , Dan Williams , "Michael S. Tsirkin" , David Hildenbrand , Jason Wang , Dave Hansen , Michal Hocko , Liang Li Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org Subject: [RFC v2 PATCH 3/4] mm: let user decide page reporting option Message-ID: <20201221162937.GA22530@open-light-1.localdomain> Mail-Followup-To: Alexander Duyck , Mel Gorman , Andrew Morton , Andrea Arcangeli , Dan Williams , "Michael S. Tsirkin" , David Hildenbrand , Jason Wang , Dave Hansen , Michal Hocko , Liang Li , linux-mm@kvack.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) 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: Some key parameters for page reporting are now hard coded, different users of the framework may have their special requirements, make these parameter configrable and let the user decide them. Cc: Alexander Duyck Cc: Mel Gorman Cc: Andrea Arcangeli Cc: Dan Williams Cc: Dave Hansen Cc: David Hildenbrand Cc: Michal Hocko Cc: Andrew Morton Cc: Alex Williamson Cc: Michael S. Tsirkin Signed-off-by: Liang Li --- drivers/virtio/virtio_balloon.c | 3 +++ include/linux/page_reporting.h | 3 +++ mm/page_reporting.c | 18 ++++++++++-------- mm/page_reporting.h | 6 +++--- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index 8985fc2cea86..a298517079bb 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c @@ -993,6 +993,9 @@ static int virtballoon_probe(struct virtio_device *vdev) goto out_unregister_oom; } + vb->pr_dev_info.mini_order = 6; + vb->pr_dev_info.batch_size = 32 * 1024 * 1024; /* 32M */ + vb->pr_dev_info.delay_jiffies = 2 * HZ; /* 2 seconds */ err = page_reporting_register(&vb->pr_dev_info); if (err) goto out_unregister_oom; diff --git a/include/linux/page_reporting.h b/include/linux/page_reporting.h index 3b99e0ec24f2..63e1e9fbcaa2 100644 --- a/include/linux/page_reporting.h +++ b/include/linux/page_reporting.h @@ -13,6 +13,9 @@ struct page_reporting_dev_info { int (*report)(struct page_reporting_dev_info *prdev, struct scatterlist *sg, unsigned int nents); + unsigned long batch_size; + unsigned long delay_jiffies; + int mini_order; /* work struct for processing reports */ struct delayed_work work; diff --git a/mm/page_reporting.c b/mm/page_reporting.c index 2f8e3d032fab..20ec3fb1afc4 100644 --- a/mm/page_reporting.c +++ b/mm/page_reporting.c @@ -11,12 +11,10 @@ #include "page_reporting.h" #include "internal.h" -#define PAGE_REPORTING_DELAY (2 * HZ) #define MAX_SCAN_NUM 1024 - -unsigned long page_report_batch_size __read_mostly = 4 * 1024 * 1024UL; - static struct page_reporting_dev_info __rcu *pr_dev_info __read_mostly; +int page_report_mini_order = pageblock_order; +unsigned long page_report_batch_size = 32 * 1024 * 1024; enum { PAGE_REPORTING_IDLE = 0, @@ -48,7 +46,7 @@ __page_reporting_request(struct page_reporting_dev_info *prdev) * now we are limiting this to running no more than once every * couple of seconds. */ - schedule_delayed_work(&prdev->work, PAGE_REPORTING_DELAY); + schedule_delayed_work(&prdev->work, prdev->delay_jiffies); } /* notify prdev of free page reporting request */ @@ -260,7 +258,7 @@ page_reporting_process_zone(struct page_reporting_dev_info *prdev, /* Generate minimum watermark to be able to guarantee progress */ watermark = low_wmark_pages(zone) + - (PAGE_REPORTING_CAPACITY << PAGE_REPORTING_MIN_ORDER); + (PAGE_REPORTING_CAPACITY << prdev->mini_order); /* * Cancel request if insufficient free memory or if we failed @@ -270,7 +268,7 @@ page_reporting_process_zone(struct page_reporting_dev_info *prdev, return err; /* Process each free list starting from lowest order/mt */ - for (order = PAGE_REPORTING_MIN_ORDER; order < MAX_ORDER; order++) { + for (order = prdev->mini_order; order < MAX_ORDER; order++) { for (mt = 0; mt < MIGRATE_TYPES; mt++) { /* We do not pull pages from the isolate free list */ if (is_migrate_isolate(mt)) @@ -337,7 +335,7 @@ static void page_reporting_process(struct work_struct *work) */ state = atomic_cmpxchg(&prdev->state, state, PAGE_REPORTING_IDLE); if (state == PAGE_REPORTING_REQUESTED) - schedule_delayed_work(&prdev->work, PAGE_REPORTING_DELAY); + schedule_delayed_work(&prdev->work, prdev->delay_jiffies); } static DEFINE_MUTEX(page_reporting_mutex); @@ -365,6 +363,8 @@ int page_reporting_register(struct page_reporting_dev_info *prdev) /* Assign device to allow notifications */ rcu_assign_pointer(pr_dev_info, prdev); + page_report_mini_order = prdev->mini_order; + page_report_batch_size = prdev->batch_size; /* enable page reporting notification */ if (!static_key_enabled(&page_reporting_enabled)) { static_branch_enable(&page_reporting_enabled); @@ -382,6 +382,8 @@ void page_reporting_unregister(struct page_reporting_dev_info *prdev) mutex_lock(&page_reporting_mutex); if (rcu_access_pointer(pr_dev_info) == prdev) { + if (static_key_enabled(&page_reporting_enabled)) + static_branch_disable(&page_reporting_enabled); /* Disable page reporting notification */ RCU_INIT_POINTER(pr_dev_info, NULL); synchronize_rcu(); diff --git a/mm/page_reporting.h b/mm/page_reporting.h index b8fb3bbb345f..86ac6ffad970 100644 --- a/mm/page_reporting.h +++ b/mm/page_reporting.h @@ -9,9 +9,9 @@ #include #include #include +#include -#define PAGE_REPORTING_MIN_ORDER pageblock_order - +extern int page_report_mini_order; extern unsigned long page_report_batch_size; #ifdef CONFIG_PAGE_REPORTING @@ -42,7 +42,7 @@ static inline void page_reporting_notify_free(unsigned int order) return; /* Determine if we have crossed reporting threshold */ - if (order < PAGE_REPORTING_MIN_ORDER) + if (order < page_report_mini_order) return; batch_size += (1 << order) << PAGE_SHIFT;