From patchwork Wed Dec 11 18:10:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: SeongJae Park X-Patchwork-Id: 11285915 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 A67F9138C for ; Wed, 11 Dec 2019 18:10:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8613622527 for ; Wed, 11 Dec 2019 18:10:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QMcrM/a9" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730754AbfLKSKq (ORCPT ); Wed, 11 Dec 2019 13:10:46 -0500 Received: from mail-pj1-f65.google.com ([209.85.216.65]:33389 "EHLO mail-pj1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726242AbfLKSKp (ORCPT ); Wed, 11 Dec 2019 13:10:45 -0500 Received: by mail-pj1-f65.google.com with SMTP id r67so9235247pjb.0; Wed, 11 Dec 2019 10:10:45 -0800 (PST) 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=CBFLhKYtbh2VNxkOJ2giC+Rjy+sK84fG3vM0BZU3YDk=; b=QMcrM/a96I5Df0ev6kPioTowBPg7nQtSm25XTPzV65EE/zQ3OmHVEy0LDH1zwUwlEL WocnaZHNhWvI505kCWkRM7qEqPoSCuxqWy3L4IZTn/VBcOAE0s9oWz//mECw6uFQSqv7 Vkg5IamM1U2zAwps7yvMkYYeY92CEHV/n0FqAfsU9bCe762GpCg1cnhPn2bTXCdoUz0X R/YEMYmM2MnLsL+akDxFpEOhsLzlzPFVL5pIUjmfzT+3xv12DgEKrQWVnW6RfDDltrhn U6Ifr4h64BP5I7iuey/Qnxead+Q+Gwh8m0qZddJNc543r4mdPM3cR6Hxq3P2AaRPx6CD +u+w== 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=CBFLhKYtbh2VNxkOJ2giC+Rjy+sK84fG3vM0BZU3YDk=; b=c1sJ3hAbBPv6Wvqz0JDKaQkEBz1Zlzfv9eUcMPprq7d0EzF1JHkv+LlGWz7rQuNqh4 mnIOi4NK+AboQnrNVQD7XN6CiVCUYowicSRFKYdH/JuCVvstrlCaisxy4WGJTvNPA8av LFrRgKAnbXfvymGFNW8SCVwbP/YJDAN3FeBOhjOkx4jnMhYMF9jgCeYao5iW98zISCQs X8rSH3azyn9JC6idYyuTAujeHOK/0zCL+ejr3AYhovXmkS5CSfDcpjE0LCCF5Edsj+oF zf2ze7W5K6isCujyjHJf8b1I/LEDhLi2Rg8lYx+4hR5un3HLgp6e+UwPh+hlGUsjHfa7 9GSw== X-Gm-Message-State: APjAAAWJ3bk/GeuudAr2g0+hjw4VqujiYSHAjZti7JrPjwQ5yRAs0VNe 5vn5McyGeuucW2KfPssUsLo= X-Google-Smtp-Source: APXvYqz35OSt4NjHe0So4NySEyGwPj/l9mTgQdCNzqEjQgdPCD/iwfZ5caUyI2FonkHxWKhbHyr5Sw== X-Received: by 2002:a17:902:d907:: with SMTP id c7mr4778687plz.40.1576087845001; Wed, 11 Dec 2019 10:10:45 -0800 (PST) Received: from localhost.localdomain (campus-094-212.ucdavis.edu. [168.150.94.212]) by smtp.gmail.com with ESMTPSA id x33sm3552651pga.86.2019.12.11.10.10.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 10:10:44 -0800 (PST) From: SeongJae Park X-Google-Original-From: SeongJae Park To: jgross@suse.com, axboe@kernel.dk, konrad.wilk@oracle.com Cc: SeongJae Park , pdurrant@amazon.com, sjpark@amazon.com, sj38.park@gmail.com, xen-devel@lists.xenproject.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v7 1/3] xenbus/backend: Add memory pressure handler callback Date: Wed, 11 Dec 2019 18:10:14 +0000 Message-Id: <20191211181016.14366-2-sjpark@amazon.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191211181016.14366-1-sjpark@amazon.de> References: <20191211181016.14366-1-sjpark@amazon.de> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Granting pages consumes backend system memory. In systems configured with insufficient spare memory for those pages, it can cause a memory pressure situation. However, finding the optimal amount of the spare memory is challenging for large systems having dynamic resource utilization patterns. Also, such a static configuration might lack flexibility. To mitigate such problems, this commit adds a memory reclaim callback to 'xenbus_driver'. If a memory pressure is detected, 'xenbus' requests every backend driver to volunarily release its memory. Note that it would be able to improve the callback facility for more sophisticated handlings of general pressures. For example, it would be possible to monitor the memory consumption of each device and issue the release requests to only devices which causing the pressure. Also, the callback could be extended to handle not only memory, but general resources. Nevertheless, this version of the implementation defers such sophisticated goals as a future work. Reviewed-by: Juergen Gross Signed-off-by: SeongJae Park Reviewed-by: Roger Pau Monné --- drivers/xen/xenbus/xenbus_probe_backend.c | 32 +++++++++++++++++++++++ include/xen/xenbus.h | 1 + 2 files changed, 33 insertions(+) diff --git a/drivers/xen/xenbus/xenbus_probe_backend.c b/drivers/xen/xenbus/xenbus_probe_backend.c index b0bed4faf44c..7e78ebef7c54 100644 --- a/drivers/xen/xenbus/xenbus_probe_backend.c +++ b/drivers/xen/xenbus/xenbus_probe_backend.c @@ -248,6 +248,35 @@ static int backend_probe_and_watch(struct notifier_block *notifier, return NOTIFY_DONE; } +static int backend_reclaim_memory(struct device *dev, void *data) +{ + const struct xenbus_driver *drv; + + if (!dev->driver) + return 0; + drv = to_xenbus_driver(dev->driver); + if (drv && drv->reclaim_memory) + drv->reclaim_memory(to_xenbus_device(dev)); + return 0; +} + +/* + * Returns 0 always because we are using shrinker to only detect memory + * pressure. + */ +static unsigned long backend_shrink_memory_count(struct shrinker *shrinker, + struct shrink_control *sc) +{ + bus_for_each_dev(&xenbus_backend.bus, NULL, NULL, + backend_reclaim_memory); + return 0; +} + +static struct shrinker backend_memory_shrinker = { + .count_objects = backend_shrink_memory_count, + .seeks = DEFAULT_SEEKS, +}; + static int __init xenbus_probe_backend_init(void) { static struct notifier_block xenstore_notifier = { @@ -264,6 +293,9 @@ static int __init xenbus_probe_backend_init(void) register_xenstore_notifier(&xenstore_notifier); + if (register_shrinker(&backend_memory_shrinker)) + pr_warn("shrinker registration failed\n"); + return 0; } subsys_initcall(xenbus_probe_backend_init); diff --git a/include/xen/xenbus.h b/include/xen/xenbus.h index 869c816d5f8c..c861cfb6f720 100644 --- a/include/xen/xenbus.h +++ b/include/xen/xenbus.h @@ -104,6 +104,7 @@ struct xenbus_driver { struct device_driver driver; int (*read_otherend_details)(struct xenbus_device *dev); int (*is_ready)(struct xenbus_device *dev); + void (*reclaim_memory)(struct xenbus_device *dev); }; static inline struct xenbus_driver *to_xenbus_driver(struct device_driver *drv) From patchwork Wed Dec 11 18:10:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SeongJae Park X-Patchwork-Id: 11285917 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 A9730109A for ; Wed, 11 Dec 2019 18:10:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 75F0422527 for ; Wed, 11 Dec 2019 18:10:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dMz7hqKi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730065AbfLKSKy (ORCPT ); Wed, 11 Dec 2019 13:10:54 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:43753 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726242AbfLKSKy (ORCPT ); Wed, 11 Dec 2019 13:10:54 -0500 Received: by mail-pf1-f195.google.com with SMTP id h14so2175651pfe.10; Wed, 11 Dec 2019 10:10:54 -0800 (PST) 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=H8zS3WPczvmZQ0VfAWj0iPbsB+8YM/87wWFzDicbOGs=; b=dMz7hqKiU8gYER0U8PXmUZ+3tdJyKMAUlKZIlDlNTOxSH/MHEODnPGGJZVVBrJ9bOf 2S9VjLhBusfcUJkwMaRRi1+DYmto4D26INRvuKtb7BzRbTv115+lMiktdtm/lFuGs+vm A5NI5Ja7Dd048lW/6qUilWWwLfi4p3yvHuTplKZgIB2B9DUfYVWDVg9g+J9SHomr8oum fAfx5PWjKPO+ForIWgEseQNwPlqf061VdaG6SOlKsqiybJ8hzXFdML2CXyl/HnVkmiyl f4jpSfBZ/3IIPDaO2H3dNi+KEPlaJdsNlQCa1zGhrCBaA8FB9KVz1JL4lmV2MvDhmhKw DSMg== 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=H8zS3WPczvmZQ0VfAWj0iPbsB+8YM/87wWFzDicbOGs=; b=n0RTlCx7cCdI09X5klaaaQogs7wrxJdGSr/kwv4BOBb6N0s6/FbE2QEMTYkni51Ndp AeLsYIgCPeQtdtpzAigZq0PAA3z5iSzmVXVUu4T+HZaZ4pvzr6t0NBM9nofTOjTq6ymI hkjbxgJniUoxD/VAo59pefcWpSlwH84vKsAABW8Hkedwo9QHsR+UqGwE7i3ZNHZOroxb jMv3oLRImYWJJ0AtzfYtcJ04tXS13wLcUIBHr/jTX1xntGNtgsfe3d/sFgofwI/KCGuH 6neQX+RIV4l4Y+itd/C1seXXqZrCcj65NDVRV4m3uH1s3YkuRqltADm+FBCiId4gCOD3 LMJg== X-Gm-Message-State: APjAAAX6b+fg1W0YQFfcp54bSOGoJY2NyL854FkwlIr/V3E22vFEXbkQ xU8Td+zXZ5sBYhXmMGWyWh4= X-Google-Smtp-Source: APXvYqwe8fg/JTOI34kRlAHKKKdNqz921JndK7Jp8Z9L6EAFy1lgAjHinYZEqa+2WDp73V9YqtO0xQ== X-Received: by 2002:a63:ed4a:: with SMTP id m10mr4979110pgk.99.1576087853596; Wed, 11 Dec 2019 10:10:53 -0800 (PST) Received: from localhost.localdomain (campus-094-212.ucdavis.edu. [168.150.94.212]) by smtp.gmail.com with ESMTPSA id x33sm3552651pga.86.2019.12.11.10.10.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 10:10:52 -0800 (PST) From: SeongJae Park X-Google-Original-From: SeongJae Park To: jgross@suse.com, axboe@kernel.dk, konrad.wilk@oracle.com Cc: SeongJae Park , pdurrant@amazon.com, sjpark@amazon.com, sj38.park@gmail.com, xen-devel@lists.xenproject.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v7 2/3] xen/blkback: Squeeze page pools if a memory pressure is detected Date: Wed, 11 Dec 2019 18:10:15 +0000 Message-Id: <20191211181016.14366-3-sjpark@amazon.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191211181016.14366-1-sjpark@amazon.de> References: <20191211181016.14366-1-sjpark@amazon.de> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Each `blkif` has a free pages pool for the grant mapping. The size of the pool starts from zero and be increased on demand while processing the I/O requests. If current I/O requests handling is finished or 100 milliseconds has passed since last I/O requests handling, it checks and shrinks the pool to not exceed the size limit, `max_buffer_pages`. Therefore, host administrators can cause memory pressure in blkback by attaching a large number of block devices and inducing I/O. Such problematic situations can be avoided by limiting the maximum number of devices that can be attached, but finding the optimal limit is not so easy. Improper set of the limit can results in the memory pressure or a resource underutilization. This commit avoids such problematic situations by squeezing the pools (returns every free page in the pool to the system) for a while (users can set this duration via a module parameter) if a memory pressure is detected. Discussions =========== The `blkback`'s original shrinking mechanism returns only pages in the pool, which are not currently be used by `blkback`, to the system. In other words, the pages that are not mapped with granted pages. Because this commit is changing only the shrink limit but still uses the same freeing mechanism it does not touch pages which are currently mapping grants. Once a memory pressure is detected, this commit keeps the squeezing limit for a user-specified time duration. The duration should be neither too long nor too short. If it is too long, the squeezing incurring overhead can reduce the I/O performance. If it is too short, `blkback` will not free enough pages to reduce the memory pressure. This commit sets the value as `10 milliseconds` by default because it is a short time in terms of I/O while it is a long time in terms of memory operations. Also, as the original shrinking mechanism works for at least every 100 milliseconds, this could be a somewhat reasonable choice. I also tested other durations (refer to the below section for more details) and confirmed that 10 milliseconds is the one that works best with the test. That said, the proper duration depends on actual configurations and workloads. That's why this commit allows users to set the duration as a module parameter. Memory Pressure Test ==================== To show how this commit fixes the memory pressure situation well, I configured a test environment on a xen-running virtualization system. On the `blkfront` running guest instances, I attach a large number of network-backed volume devices and induce I/O to those. Meanwhile, I measure the number of pages that swapped in (pswpin) and out (pswpout) on the `blkback` running guest. The test ran twice, once for the `blkback` before this commit and once for that after this commit. As shown below, this commit has dramatically reduced the memory pressure: pswpin pswpout before 76,672 185,799 after 212 3,325 Optimal Aggressive Shrinking Duration ------------------------------------- To find a best squeezing duration, I repeated the test with three different durations (1ms, 10ms, and 100ms). The results are as below: duration pswpin pswpout 1 852 6,424 10 212 3,325 100 203 3,340 As expected, the memory pressure has decreased as the duration is increased, but the reduction stopped from the `10ms`. Based on this results, I chose the default duration as 10ms. Performance Overhead Test ========================= This commit could incur I/O performance degradation under severe memory pressure because the squeezing will require more page allocations per I/O. To show the overhead, I artificially made a worst-case squeezing situation and measured the I/O performance of a `blkfront` running guest. For the artificial squeezing, I set the `blkback.max_buffer_pages` using the `/sys/module/xen_blkback/parameters/max_buffer_pages` file. In this test, I set the value to `1024` and `0`. The `1024` is the default value. Setting the value as `0` is same to a situation doing the squeezing always (worst-case). For the I/O performance measurement, I run a simple `dd` command 5 times as below and collect the 'MB/s' results. $ for i in {1..5}; do dd if=/dev/zero of=file \ bs=4k count=$((256*512)); sync; done If the underlying block device is slow enough, the squeezing overhead could be hidden. For the reason, I do this test for both a slow block device and a fast block device. I use a popular cloud block storage service, ebs[1] as a slow device and the ramdisk block device[2] for the fast device. The results are as below. 'max_pgs' represents the value of the `blkback.max_buffer_pages` parameter. On the slow block device ------------------------ max_pgs Min Max Median Avg Stddev 0 38.7 45.8 38.7 40.12 3.1752165 1024 38.7 45.8 38.7 40.12 3.1752165 No difference proven at 95.0% confidence On the fast block device ------------------------ max_pgs Min Max Median Avg Stddev 0 417 423 420 419.4 2.5099801 1024 414 425 416 417.8 4.4384682 No difference proven at 95.0% confidence In short, even worst case squeezing on ramdisk based fast block device makes no visible performance degradation. Please note that this is just a very simple and minimal test. On systems using super-fast block devices and a special I/O workload, the results might be different. If you have any doubt, test on your machine for your workload to find the optimal squeezing duration for you. [1] https://aws.amazon.com/ebs/ [2] https://www.kernel.org/doc/html/latest/admin-guide/blockdev/ramdisk.html Reviewed-by: Juergen Gross Signed-off-by: SeongJae Park --- drivers/block/xen-blkback/blkback.c | 22 ++++++++++++++++++++-- drivers/block/xen-blkback/common.h | 1 + drivers/block/xen-blkback/xenbus.c | 3 ++- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c index fd1e19f1a49f..98823d150905 100644 --- a/drivers/block/xen-blkback/blkback.c +++ b/drivers/block/xen-blkback/blkback.c @@ -142,6 +142,21 @@ static inline bool persistent_gnt_timeout(struct persistent_gnt *persistent_gnt) HZ * xen_blkif_pgrant_timeout); } +/* Once a memory pressure is detected, squeeze free page pools for a while. */ +static unsigned int buffer_squeeze_duration_ms = 10; +module_param_named(buffer_squeeze_duration_ms, + buffer_squeeze_duration_ms, int, 0644); +MODULE_PARM_DESC(buffer_squeeze_duration_ms, +"Duration in ms to squeeze pages buffer when a memory pressure is detected"); + +static unsigned long buffer_squeeze_end; + +void xen_blkbk_reclaim_memory(struct xenbus_device *dev) +{ + buffer_squeeze_end = jiffies + + msecs_to_jiffies(buffer_squeeze_duration_ms); +} + static inline int get_free_page(struct xen_blkif_ring *ring, struct page **page) { unsigned long flags; @@ -656,8 +671,11 @@ int xen_blkif_schedule(void *arg) ring->next_lru = jiffies + msecs_to_jiffies(LRU_INTERVAL); } - /* Shrink if we have more than xen_blkif_max_buffer_pages */ - shrink_free_pagepool(ring, xen_blkif_max_buffer_pages); + /* Shrink the free pages pool if it is too large. */ + if (time_before(jiffies, buffer_squeeze_end)) + shrink_free_pagepool(ring, 0); + else + shrink_free_pagepool(ring, xen_blkif_max_buffer_pages); if (log_stats && time_after(jiffies, ring->st_print)) print_stats(ring); diff --git a/drivers/block/xen-blkback/common.h b/drivers/block/xen-blkback/common.h index 1d3002d773f7..1e0df86cb941 100644 --- a/drivers/block/xen-blkback/common.h +++ b/drivers/block/xen-blkback/common.h @@ -383,6 +383,7 @@ irqreturn_t xen_blkif_be_int(int irq, void *dev_id); int xen_blkif_schedule(void *arg); int xen_blkif_purge_persistent(void *arg); void xen_blkbk_free_caches(struct xen_blkif_ring *ring); +void xen_blkbk_reclaim_memory(struct xenbus_device *dev); int xen_blkbk_flush_diskcache(struct xenbus_transaction xbt, struct backend_info *be, int state); diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c index b90dbcd99c03..0477f910b018 100644 --- a/drivers/block/xen-blkback/xenbus.c +++ b/drivers/block/xen-blkback/xenbus.c @@ -1115,7 +1115,8 @@ static struct xenbus_driver xen_blkbk_driver = { .ids = xen_blkbk_ids, .probe = xen_blkbk_probe, .remove = xen_blkbk_remove, - .otherend_changed = frontend_changed + .otherend_changed = frontend_changed, + .reclaim_memory = xen_blkbk_reclaim_memory, }; int xen_blkif_xenbus_init(void) From patchwork Wed Dec 11 18:10:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: SeongJae Park X-Patchwork-Id: 11285919 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 2EAD4109A for ; Wed, 11 Dec 2019 18:11:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 04D0922527 for ; Wed, 11 Dec 2019 18:11:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="p7erjCGJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731035AbfLKSK5 (ORCPT ); Wed, 11 Dec 2019 13:10:57 -0500 Received: from mail-pl1-f195.google.com ([209.85.214.195]:37595 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726242AbfLKSK5 (ORCPT ); Wed, 11 Dec 2019 13:10:57 -0500 Received: by mail-pl1-f195.google.com with SMTP id c23so1730094plz.4; Wed, 11 Dec 2019 10:10:56 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=DC1lDQTVGWiZyc47Vd2HTq0B83lbDHqEnIy5EBZ8fmk=; b=p7erjCGJxie+gsJ5gNv6yyP8UEGIYUryfLkT29PiTkBlTy7xUvH/z4836TdtoFqPq6 0kOWqjKUKyWnLANLIGaOHzDqbrdrWlOmRopA+hPWSbLHxR2eGdkmQCCOTkoFtbYDtOH4 bJplBxvgrKhTSHyhjWkW7YpCMQ3fRG3/9l2OX7+94y3Jx+vwERpZNctRhm74MclskxZL gvEb1jhOflVXMbmRLWEua5gQukz1S+5ZzpF32hTXB58kY0e0e/zWIPSO2ZSi39JzYJ2g cSg7TMCr64sRse8S0sDD6tvApA/BUFO50Op3h/HKX359SzJPJco26MfKBSaDllzz0K5u tlVQ== 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:mime-version:content-transfer-encoding; bh=DC1lDQTVGWiZyc47Vd2HTq0B83lbDHqEnIy5EBZ8fmk=; b=rCj1jp/DLjKRzU1vEhbSU6l1Q7qffWWs7aMa8q53KOBH3+btqWtoMWoO00/xAMLFTg AD5EPx3PJvsq7hz/3yzJDlrH9HkmS90d9yJ7DaNfllzWNTLbvEpnPut//xw/IfubkCLf jTrw0RIVFPQRdHhzD2ablptrbjmg4XU2IRG7aTwV0rphK0/iAgUiu1VXabJwgzGNSI3H DiMUhNdS02jW5h3eJl5xiKRxJ3WHyRLh8Y4Er0HUwQ3qV0++sh8EHWhKQGCbJv8a/skB 8sxXZQB6ZithtN2CUnQGqIpMOoA1svZnNqo2sknHF8MINDNwN5j2dfcQxDLnDSnwm4uU 7YlQ== X-Gm-Message-State: APjAAAW837VGV43UP6GZELhfjwQVnDFNzcLDpjJs5Brr7tCKA6rzZ+XJ GvxQzh+OsnBA74Spsogyfcs= X-Google-Smtp-Source: APXvYqzKPe/LoYUjpZuEEK8kE1cO8ArSTwWZ2pZ6pRISRy4Kk7cykjY8qZRi1VdlMlV9HSKs3WQKqw== X-Received: by 2002:a17:902:6bc3:: with SMTP id m3mr4555759plt.185.1576087856306; Wed, 11 Dec 2019 10:10:56 -0800 (PST) Received: from localhost.localdomain (campus-094-212.ucdavis.edu. [168.150.94.212]) by smtp.gmail.com with ESMTPSA id x33sm3552651pga.86.2019.12.11.10.10.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 10:10:55 -0800 (PST) From: SeongJae Park X-Google-Original-From: SeongJae Park To: jgross@suse.com, axboe@kernel.dk, konrad.wilk@oracle.com Cc: SeongJae Park , pdurrant@amazon.com, sjpark@amazon.com, sj38.park@gmail.com, xen-devel@lists.xenproject.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v7 3/3] xen/blkback: Remove unnecessary static variable name prefixes Date: Wed, 11 Dec 2019 18:10:16 +0000 Message-Id: <20191211181016.14366-4-sjpark@amazon.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191211181016.14366-1-sjpark@amazon.de> References: <20191211181016.14366-1-sjpark@amazon.de> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org A few of static variables in blkback have 'xen_blkif_' prefix, though it is unnecessary for static variables. This commit removes such prefixes. Reviewed-by: Roger Pau Monné Signed-off-by: SeongJae Park --- drivers/block/xen-blkback/blkback.c | 37 +++++++++++++---------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c index 98823d150905..f41c698dd854 100644 --- a/drivers/block/xen-blkback/blkback.c +++ b/drivers/block/xen-blkback/blkback.c @@ -62,8 +62,8 @@ * IO workloads. */ -static int xen_blkif_max_buffer_pages = 1024; -module_param_named(max_buffer_pages, xen_blkif_max_buffer_pages, int, 0644); +static int max_buffer_pages = 1024; +module_param_named(max_buffer_pages, max_buffer_pages, int, 0644); MODULE_PARM_DESC(max_buffer_pages, "Maximum number of free pages to keep in each block backend buffer"); @@ -78,8 +78,8 @@ MODULE_PARM_DESC(max_buffer_pages, * algorithm. */ -static int xen_blkif_max_pgrants = 1056; -module_param_named(max_persistent_grants, xen_blkif_max_pgrants, int, 0644); +static int max_pgrants = 1056; +module_param_named(max_persistent_grants, max_pgrants, int, 0644); MODULE_PARM_DESC(max_persistent_grants, "Maximum number of grants to map persistently"); @@ -88,8 +88,8 @@ MODULE_PARM_DESC(max_persistent_grants, * use. The time is in seconds, 0 means indefinitely long. */ -static unsigned int xen_blkif_pgrant_timeout = 60; -module_param_named(persistent_grant_unused_seconds, xen_blkif_pgrant_timeout, +static unsigned int pgrant_timeout = 60; +module_param_named(persistent_grant_unused_seconds, pgrant_timeout, uint, 0644); MODULE_PARM_DESC(persistent_grant_unused_seconds, "Time in seconds an unused persistent grant is allowed to " @@ -137,9 +137,8 @@ module_param(log_stats, int, 0644); static inline bool persistent_gnt_timeout(struct persistent_gnt *persistent_gnt) { - return xen_blkif_pgrant_timeout && - (jiffies - persistent_gnt->last_used >= - HZ * xen_blkif_pgrant_timeout); + return pgrant_timeout && (jiffies - persistent_gnt->last_used >= + HZ * pgrant_timeout); } /* Once a memory pressure is detected, squeeze free page pools for a while. */ @@ -249,7 +248,7 @@ static int add_persistent_gnt(struct xen_blkif_ring *ring, struct persistent_gnt *this; struct xen_blkif *blkif = ring->blkif; - if (ring->persistent_gnt_c >= xen_blkif_max_pgrants) { + if (ring->persistent_gnt_c >= max_pgrants) { if (!blkif->vbd.overflow_max_grants) blkif->vbd.overflow_max_grants = 1; return -EBUSY; @@ -412,14 +411,13 @@ static void purge_persistent_gnt(struct xen_blkif_ring *ring) goto out; } - if (ring->persistent_gnt_c < xen_blkif_max_pgrants || - (ring->persistent_gnt_c == xen_blkif_max_pgrants && + if (ring->persistent_gnt_c < max_pgrants || + (ring->persistent_gnt_c == max_pgrants && !ring->blkif->vbd.overflow_max_grants)) { num_clean = 0; } else { - num_clean = (xen_blkif_max_pgrants / 100) * LRU_PERCENT_CLEAN; - num_clean = ring->persistent_gnt_c - xen_blkif_max_pgrants + - num_clean; + num_clean = (max_pgrants / 100) * LRU_PERCENT_CLEAN; + num_clean = ring->persistent_gnt_c - max_pgrants + num_clean; num_clean = min(ring->persistent_gnt_c, num_clean); pr_debug("Going to purge at least %u persistent grants\n", num_clean); @@ -614,8 +612,7 @@ static void print_stats(struct xen_blkif_ring *ring) current->comm, ring->st_oo_req, ring->st_rd_req, ring->st_wr_req, ring->st_f_req, ring->st_ds_req, - ring->persistent_gnt_c, - xen_blkif_max_pgrants); + ring->persistent_gnt_c, max_pgrants); ring->st_print = jiffies + msecs_to_jiffies(10 * 1000); ring->st_rd_req = 0; ring->st_wr_req = 0; @@ -675,7 +672,7 @@ int xen_blkif_schedule(void *arg) if (time_before(jiffies, buffer_squeeze_end)) shrink_free_pagepool(ring, 0); else - shrink_free_pagepool(ring, xen_blkif_max_buffer_pages); + shrink_free_pagepool(ring, max_buffer_pages); if (log_stats && time_after(jiffies, ring->st_print)) print_stats(ring); @@ -902,7 +899,7 @@ static int xen_blkbk_map(struct xen_blkif_ring *ring, continue; } if (use_persistent_gnts && - ring->persistent_gnt_c < xen_blkif_max_pgrants) { + ring->persistent_gnt_c < max_pgrants) { /* * We are using persistent grants, the grant is * not mapped but we might have room for it. @@ -929,7 +926,7 @@ static int xen_blkbk_map(struct xen_blkif_ring *ring, pages[seg_idx]->persistent_gnt = persistent_gnt; pr_debug("grant %u added to the tree of persistent grants, using %u/%u\n", persistent_gnt->gnt, ring->persistent_gnt_c, - xen_blkif_max_pgrants); + max_pgrants); goto next; } if (use_persistent_gnts && !blkif->vbd.overflow_max_grants) {