From patchwork Fri Dec 13 15:35:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: SeongJae Park X-Patchwork-Id: 11291121 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 81F6D6C1 for ; Fri, 13 Dec 2019 21:00:06 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 513BC2465E for ; Fri, 13 Dec 2019 21:00:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Ixr1uzWS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 513BC2465E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ifmzC-00030l-7F; Fri, 13 Dec 2019 15:36:10 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ifmzB-00030X-4s for xen-devel@lists.xenproject.org; Fri, 13 Dec 2019 15:36:09 +0000 X-Inumbo-ID: 4775d780-1dbe-11ea-b6f1-bc764e2007e4 Received: from mail-pf1-x441.google.com (unknown [2607:f8b0:4864:20::441]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 4775d780-1dbe-11ea-b6f1-bc764e2007e4; Fri, 13 Dec 2019 15:36:07 +0000 (UTC) Received: by mail-pf1-x441.google.com with SMTP id y206so1671737pfb.0 for ; Fri, 13 Dec 2019 07:36:07 -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=pxUD+VmkH1xxeAkPK92Cf10G5edui36/X8Za7R/dfvU=; b=Ixr1uzWSZhFf+lN6eqJRIzN6Nk/Q8MV4OUDFeqLklPVBvYba8reW18kTv4gIt2ty7W YFl4vqgRekirFS4RrCr28ScdT33deONmVd7zkU6xVyc+pjs87f8I9KQSebt2RinCiIiJ IfsHoNp5B9Ph+o7K1MKkspCPMOY4lSrYC654aGCs18gfIgwl29eKV9qlUoT3BDhB9au/ creQfHb91b5xQ36j0Sl3Vr7OGSEXrM0cP+Re4OLVvxeOzKspYWT8Yso1bdSDNp2MZ7St R2iaDm9wu9Ez8nhDb4+Ailbv3qEUPdfnayJsJGNSy650S5txnbwbgw3OJG1/RK52m3K4 zZaQ== 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=pxUD+VmkH1xxeAkPK92Cf10G5edui36/X8Za7R/dfvU=; b=D4lX5Rs3VFWqCZc5QTqGVluG/O4lkCaBa761IgohxJ9AC+b6jRhBPaP8zh76RUdh9p RDmZKBh90Y1j/b7LLiLaCF3pATfiFsmCh+uRYump3zinW4c++J/0KOaHjmVupaUzc6KY lnsDUf/4/34Q9S7hI8ILcY/HPdMbme2MqXRj4/GwcLt/qW76p9UVR2EeqQMqUx7cVhf/ Qmc3IZaVUADqBIv1UNy96335n1gIJQzxL6H28MRbVKtK0QHyxfIrtBPDqp5fWVdojlwq izOyxQcxlKvTh1lF7AtFBv2Mtc9gt2zo6j/XBe0dOupJr9xUwa8FopflJ8KS64VqnqYo 6CiQ== X-Gm-Message-State: APjAAAWypmI8HIYPiPEy80xRD+xslN6GSEx0H8WPLnrAHl2Y0P54vQdU 1rPnVpT70oIVw1qN/fidr/4= X-Google-Smtp-Source: APXvYqxeZnSOB6LMFmDPGKrs65/NbWggTkEtyDaKTMLASFru59pOpOU1EFfyJv/RlrSyRw6JhLA9uw== X-Received: by 2002:a65:6245:: with SMTP id q5mr17688689pgv.347.1576251366306; Fri, 13 Dec 2019 07:36:06 -0800 (PST) Received: from localhost.localdomain ([12.176.148.120]) by smtp.gmail.com with ESMTPSA id w131sm12039217pfc.16.2019.12.13.07.36.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Dec 2019 07:36:05 -0800 (PST) From: SeongJae Park X-Google-Original-From: SeongJae Park To: jgross@suse.com, axboe@kernel.dk, konrad.wilk@oracle.com, roger.pau@citrix.com Date: Fri, 13 Dec 2019 15:35:43 +0000 Message-Id: <20191213153546.17425-2-sjpark@amazon.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191213153546.17425-1-sjpark@amazon.de> References: <20191213153546.17425-1-sjpark@amazon.de> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v9 1/4] xenbus/backend: Add memory pressure handler callback X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: linux-block@vger.kernel.org, sjpark@amazon.com, pdurrant@amazon.com, SeongJae Park , linux-kernel@vger.kernel.org, sj38.park@gmail.com, xen-devel@lists.xenproject.org Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" 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 Reviewed-by: Roger Pau Monné Signed-off-by: SeongJae Park --- 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 Fri Dec 13 15:35:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: SeongJae Park X-Patchwork-Id: 11291141 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 E750514BD for ; Fri, 13 Dec 2019 21:00:37 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ACA3A246A9 for ; Fri, 13 Dec 2019 21:00:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Qp+aEwOG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ACA3A246A9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ifmzL-00034X-U8; Fri, 13 Dec 2019 15:36:19 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ifmzL-00034D-5H for xen-devel@lists.xenproject.org; Fri, 13 Dec 2019 15:36:19 +0000 X-Inumbo-ID: 4a0ea65c-1dbe-11ea-a1e1-bc764e2007e4 Received: from mail-pl1-x642.google.com (unknown [2607:f8b0:4864:20::642]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 4a0ea65c-1dbe-11ea-a1e1-bc764e2007e4; Fri, 13 Dec 2019 15:36:11 +0000 (UTC) Received: by mail-pl1-x642.google.com with SMTP id s10so1397063plp.2 for ; Fri, 13 Dec 2019 07:36:11 -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=TMzbAvFP3yWT6YAfy9bgu7F+ker5oB+nrGJ42qyGAXA=; b=Qp+aEwOGyOZbqJRFS0g2YNqq/vGtD86zDnL9veckvgQbfMeyHYCtLk5T4tugaTMvO3 WLqKda2xqpV803MmsBSd4k+i3mwCscmJjmere0orczPqXD5hPpm++QxlnFSOEWktxEAZ DRxGQz6ca0TGrEfrYq+zw4Pv4RRuFdzc7wN6eKDX8m+lMqAuxhmO2WhAv8Cd2w+S47rg izwTVFYZuT1Kc8oJ1Z5dGTq+Ki0uSezlcmWs7VuiRf25gY5EHphnSsOdtitR4Ti4bRu2 mmK0d1Xc8PJ//z7A26bX/Sh4CEfVYiWsDcFg2s8AV+Q8c6EAxephCiGsSvdzKnwLtjeh YyDg== 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=TMzbAvFP3yWT6YAfy9bgu7F+ker5oB+nrGJ42qyGAXA=; b=RyvKS5Go9KV4LbwltcEcojH0mjsyip5Q/Dd5Yn/Z075dCCS2hhfqkvt08kFjLu7Eri EDex0G/O2bEwuXSv+UG8M0OTCCnNUDuF081keVVvZaJCsbaU/fpYmSb9RML9CAeOGDSc 6qBpqBqIUG4jyZtxqh+kg2eyR6SudLzUerpMekrMVaCjeqJrcpS35wjLm0Rwcuu787RQ Plk7LOlsbzndPDLSbEEsDNyfdd+EYE6q/pYiAocQNRuXy8vrNlj3n0Va5YTSBcV3EFKu OvEOzZj3Lpcji9t2aW3AM3rzPWM9w4ayPwbDj6e7VisPQ1Yut1OGT8vO3vPMxe+X1O/W esFQ== X-Gm-Message-State: APjAAAWTdnE59qOkZmEfGbw34NBL4QcMBTAyvdq8RAmPJ6qf57SSdFKF uf/OrQwWCt8DLoGmQ3eaPHk= X-Google-Smtp-Source: APXvYqx/tTThM4N8APNQHLuc1ZTNOdmNUUvYzcgT2iO5rANQjtbhDryyAcZQW3n5eq1V6wjE4DENeg== X-Received: by 2002:a17:90a:e4f:: with SMTP id p15mr16868630pja.90.1576251370516; Fri, 13 Dec 2019 07:36:10 -0800 (PST) Received: from localhost.localdomain ([12.176.148.120]) by smtp.gmail.com with ESMTPSA id w131sm12039217pfc.16.2019.12.13.07.36.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Dec 2019 07:36:09 -0800 (PST) From: SeongJae Park X-Google-Original-From: SeongJae Park To: jgross@suse.com, axboe@kernel.dk, konrad.wilk@oracle.com, roger.pau@citrix.com Date: Fri, 13 Dec 2019 15:35:44 +0000 Message-Id: <20191213153546.17425-3-sjpark@amazon.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191213153546.17425-1-sjpark@amazon.de> References: <20191213153546.17425-1-sjpark@amazon.de> Subject: [Xen-devel] [PATCH v9 2/4] xen/blkback: Squeeze page pools if a memory pressure is detected X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: linux-block@vger.kernel.org, sjpark@amazon.com, pdurrant@amazon.com, SeongJae Park , linux-kernel@vger.kernel.org, sj38.park@gmail.com, xen-devel@lists.xenproject.org MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Each `blkif` has a free pages pool for the grant mapping. The size of the pool starts from zero and is 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 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 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 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 with 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 Signed-off-by: SeongJae Park Reviewed-by: Roger Pau Monné --- .../ABI/testing/sysfs-driver-xen-blkback | 10 +++++++++ drivers/block/xen-blkback/blkback.c | 7 +++++-- drivers/block/xen-blkback/common.h | 1 + drivers/block/xen-blkback/xenbus.c | 21 ++++++++++++++++++- 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-driver-xen-blkback b/Documentation/ABI/testing/sysfs-driver-xen-blkback index 4e7babb3ba1f..f01224231f3f 100644 --- a/Documentation/ABI/testing/sysfs-driver-xen-blkback +++ b/Documentation/ABI/testing/sysfs-driver-xen-blkback @@ -25,3 +25,13 @@ Description: allocated without being in use. The time is in seconds, 0 means indefinitely long. The default is 60 seconds. + +What: /sys/module/xen_blkback/parameters/buffer_squeeze_duration_ms +Date: December 2019 +KernelVersion: 5.5 +Contact: SeongJae Park +Description: + When memory pressure is reported to blkback this option + controls the duration in milliseconds that blkback will not + cache any page not backed by a grant mapping. + The default is 10ms. diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c index fd1e19f1a49f..79f677aeb5cc 100644 --- a/drivers/block/xen-blkback/blkback.c +++ b/drivers/block/xen-blkback/blkback.c @@ -656,8 +656,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, blkif->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..536c84f61fed 100644 --- a/drivers/block/xen-blkback/common.h +++ b/drivers/block/xen-blkback/common.h @@ -319,6 +319,7 @@ struct xen_blkif { /* All rings for this device. */ struct xen_blkif_ring *rings; unsigned int nr_rings; + unsigned long buffer_squeeze_end; }; struct seg_buf { diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c index b90dbcd99c03..4f6ea4feca79 100644 --- a/drivers/block/xen-blkback/xenbus.c +++ b/drivers/block/xen-blkback/xenbus.c @@ -824,6 +824,24 @@ static void frontend_changed(struct xenbus_device *dev, } +/* 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"); + +/* + * Callback received when the memory pressure is detected. + */ +static void reclaim_memory(struct xenbus_device *dev) +{ + struct backend_info *be = dev_get_drvdata(&dev->dev); + + be->blkif->buffer_squeeze_end = jiffies + + msecs_to_jiffies(buffer_squeeze_duration_ms); +} + /* ** Connection ** */ @@ -1115,7 +1133,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 = reclaim_memory, }; int xen_blkif_xenbus_init(void) From patchwork Fri Dec 13 15:35:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: SeongJae Park X-Patchwork-Id: 11291181 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 42E0D6C1 for ; Fri, 13 Dec 2019 21:01:45 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 14A0F24682 for ; Fri, 13 Dec 2019 21:01:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="F6KbOGPx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 14A0F24682 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ifmzR-00036t-7Q; Fri, 13 Dec 2019 15:36:25 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ifmzQ-00036Q-5E for xen-devel@lists.xenproject.org; Fri, 13 Dec 2019 15:36:24 +0000 X-Inumbo-ID: 4b2df9a2-1dbe-11ea-88e7-bc764e2007e4 Received: from mail-pg1-x544.google.com (unknown [2607:f8b0:4864:20::544]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 4b2df9a2-1dbe-11ea-88e7-bc764e2007e4; Fri, 13 Dec 2019 15:36:13 +0000 (UTC) Received: by mail-pg1-x544.google.com with SMTP id x8so1750617pgk.8 for ; Fri, 13 Dec 2019 07:36:13 -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=N8r0QuiHzZhPzfXlIr3nAqSHS8c9llEbC1GhekqiE10=; b=F6KbOGPx9PVaGCWYDfVXZx0Wv7bgIr2InYBmwwmVHz7OsqUOdNn+QmBhB60xZZUEzT K1dSiIkwkC1r4wVbZDRdrMmRyFXlcMGj3ozzjTSYcMReoiUy2Gk6+DqQQ418KK9CMEsz Aqlc3o8+YQsXwSHjletUicIS8++zUDtiR2i/IXAAwpvXepoYr5Ei+qyTOproxaELNVup /ez4bQo06+8BIKFqoitV7RaE6Rqxkj6ljCtgfYm3DmUNKwhefwyX12hxAMdbCYWUR/82 7zVJgiqDLsDAqk1WsNPCLfSgZZ95BG3ahSRisvyPG4BswayY/e5EP/Z1zYqqG8+8V5p2 1QHA== 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=N8r0QuiHzZhPzfXlIr3nAqSHS8c9llEbC1GhekqiE10=; b=L/XwWotZut26XoP1g7smCVpmVjYuimtFK0ltyNde4Fl0oJ77yPAEoz9NkczDPlnIc1 +7cle7erPTpgZBoH2N9KSaa5zHApFaERpfo0+s/6uMYhraFDTlV+D8Q5Cq0yRSOqQ5iB s9wJFhqyawFes3znD2kSsJ6drmptnqm6znDWF7bANb4y4H/QLVx8kVapHLV9ka9JYube 7oS3A2ytvNuCt1u9AVuqshHaCO0YakcRD+/sHQID79IR1tRK8JhCKGBIm3Ua1mOvelk3 pLNjon8jPUBOSJBn/DYqWYCt7m5L9ag4tYmbZufdiFahKELDFu3qXm8icov0sCdXMy8D wxBA== X-Gm-Message-State: APjAAAVHjxLtCCz8HfUWLZ+IX3Jg9uFrpHPuruzohGg45p7c9fY3lAMB NqEH/itUu5iP9smQPBwyhJQfa/L8Iw0= X-Google-Smtp-Source: APXvYqygsPRpbMLO/A1yYDbfioOjb6ABqIJmU2FZN9TZsgdl7rEoOalqmpWjBkl8yfYRTwYIP1KSnw== X-Received: by 2002:aa7:8699:: with SMTP id d25mr4488pfo.139.1576251372654; Fri, 13 Dec 2019 07:36:12 -0800 (PST) Received: from localhost.localdomain ([12.176.148.120]) by smtp.gmail.com with ESMTPSA id w131sm12039217pfc.16.2019.12.13.07.36.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Dec 2019 07:36:12 -0800 (PST) From: SeongJae Park X-Google-Original-From: SeongJae Park To: jgross@suse.com, axboe@kernel.dk, konrad.wilk@oracle.com, roger.pau@citrix.com Date: Fri, 13 Dec 2019 15:35:45 +0000 Message-Id: <20191213153546.17425-4-sjpark@amazon.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191213153546.17425-1-sjpark@amazon.de> References: <20191213153546.17425-1-sjpark@amazon.de> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v9 3/4] xen/blkback: Remove unnecessary static variable name prefixes X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: linux-block@vger.kernel.org, sjpark@amazon.com, pdurrant@amazon.com, SeongJae Park , linux-kernel@vger.kernel.org, sj38.park@gmail.com, xen-devel@lists.xenproject.org Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" 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 79f677aeb5cc..fbd67f8e4e4e 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); } static inline int get_free_page(struct xen_blkif_ring *ring, struct page **page) @@ -234,7 +233,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; @@ -397,14 +396,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); @@ -599,8 +597,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; @@ -660,7 +657,7 @@ int xen_blkif_schedule(void *arg) if (time_before(jiffies, blkif->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); @@ -887,7 +884,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. @@ -914,7 +911,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) { From patchwork Fri Dec 13 15:35:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: SeongJae Park X-Patchwork-Id: 11291137 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 68B0814BD for ; Fri, 13 Dec 2019 21:00:30 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 38B9B2465E for ; Fri, 13 Dec 2019 21:00:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WGmHyUFR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 38B9B2465E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ifmzW-00039H-H1; Fri, 13 Dec 2019 15:36:30 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ifmzV-00038j-80 for xen-devel@lists.xenproject.org; Fri, 13 Dec 2019 15:36:29 +0000 X-Inumbo-ID: 4cac3b86-1dbe-11ea-b6f1-bc764e2007e4 Received: from mail-pg1-x542.google.com (unknown [2607:f8b0:4864:20::542]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 4cac3b86-1dbe-11ea-b6f1-bc764e2007e4; Fri, 13 Dec 2019 15:36:15 +0000 (UTC) Received: by mail-pg1-x542.google.com with SMTP id b9so1732741pgk.12 for ; Fri, 13 Dec 2019 07:36:15 -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=HItEjzDojjooTRgp7O+9O0H7zbWi0kBed0e15OEYpt0=; b=WGmHyUFRPZ2ZOsbgcmAPSFO/Jexvz5NhLELGWHpv4Tl7qQZg36Vg1cx8oxxQ1a/E/l EpkpKqjdaGAGiWyOm+O7jp87MuU04zC2UgwiOV71LLy4XY6o2Ai499milKGvgTZClPXd 8cXbdDeNoLvi/fBx35UA9HHFm8dpmuGDNYDAltfHpPiutYGj2dPxtvwOEBxRyti/aA89 l3D1qL3yyee9OuIAkYTHYJP/KJoLRnMdh4oqoE5+3R0TrgiP0pLEbjmjX/nLxEVtgcZx n4PYI+yrps2gpGDaMFk8KaqSqtDKEQaECLkTtO1OIuv5l43esfdmWGkDyuEwfX9MJgHf o0Ng== 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=HItEjzDojjooTRgp7O+9O0H7zbWi0kBed0e15OEYpt0=; b=Ft7ronezrrwFXp6XUQoWdLJiLm5f5JhXjAg74Tan40coELZaEdo54PezwGZPbfD7Gt 6l2aHqnOhR8FNKgZViNkiyz7IOBqd7WJtV/euxCmrC7Uzvmx3XXBXqBMAsHpGwA9DbQy sUfwi8C2d8rAdhudNAOOfKsMahuHpVg1RNik4N8QMuqQaY38yQuxthf0GhGsr8ERJ5Pg 8De3zj3h09metNYbiS6NyVr8idrOqzEtu3H4i2kEcAaPZhFm/kqq5OZzMrOPqz2YnH5R kjomYUKPPshM3RKDQTUz4VIB+NhlUKc9Nwg0ROLskkXkIyQCZaZy6Pb3/6d3RatcbZl0 GdDA== X-Gm-Message-State: APjAAAVMW0JGx9TZBjvvz0nXkoKeYTWIMhayvQLSSVO/xtY6pVhdbp4p rFrTKTmJ0l8p9N71RBtXqEY= X-Google-Smtp-Source: APXvYqxC4ktjLQPkeK71MAy6/aFEcGoWvqtBT2iJQcTdeQzmCeLS4XtlZzU1Y8SN2p03/7qGvSO/4A== X-Received: by 2002:a62:1a16:: with SMTP id a22mr69199pfa.34.1576251375146; Fri, 13 Dec 2019 07:36:15 -0800 (PST) Received: from localhost.localdomain ([12.176.148.120]) by smtp.gmail.com with ESMTPSA id w131sm12039217pfc.16.2019.12.13.07.36.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Dec 2019 07:36:14 -0800 (PST) From: SeongJae Park X-Google-Original-From: SeongJae Park To: jgross@suse.com, axboe@kernel.dk, konrad.wilk@oracle.com, roger.pau@citrix.com Date: Fri, 13 Dec 2019 15:35:46 +0000 Message-Id: <20191213153546.17425-5-sjpark@amazon.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191213153546.17425-1-sjpark@amazon.de> References: <20191213153546.17425-1-sjpark@amazon.de> Subject: [Xen-devel] [PATCH v9 4/4] xen/blkback: Consistently insert one empty line between functions X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: linux-block@vger.kernel.org, sjpark@amazon.com, pdurrant@amazon.com, SeongJae Park , linux-kernel@vger.kernel.org, sj38.park@gmail.com, xen-devel@lists.xenproject.org MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" The number of empty lines between functions in the xenbus.c is inconsistent. This trivial style cleanup commit fixes the file to consistently place only one empty line. Signed-off-by: SeongJae Park Acked-by: Roger Pau Monné --- drivers/block/xen-blkback/xenbus.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c index 4f6ea4feca79..dc0ea123c74c 100644 --- a/drivers/block/xen-blkback/xenbus.c +++ b/drivers/block/xen-blkback/xenbus.c @@ -432,7 +432,6 @@ static void xenvbd_sysfs_delif(struct xenbus_device *dev) device_remove_file(&dev->dev, &dev_attr_physical_device); } - static void xen_vbd_free(struct xen_vbd *vbd) { if (vbd->bdev) @@ -489,6 +488,7 @@ static int xen_vbd_create(struct xen_blkif *blkif, blkif_vdev_t handle, handle, blkif->domid); return 0; } + static int xen_blkbk_remove(struct xenbus_device *dev) { struct backend_info *be = dev_get_drvdata(&dev->dev); @@ -572,6 +572,7 @@ static void xen_blkbk_discard(struct xenbus_transaction xbt, struct backend_info if (err) dev_warn(&dev->dev, "writing feature-discard (%d)", err); } + int xen_blkbk_barrier(struct xenbus_transaction xbt, struct backend_info *be, int state) { @@ -656,7 +657,6 @@ static int xen_blkbk_probe(struct xenbus_device *dev, return err; } - /* * Callback received when the hotplug scripts have placed the physical-device * node. Read it and the mode node, and create a vbd. If the frontend is @@ -748,7 +748,6 @@ static void backend_changed(struct xenbus_watch *watch, } } - /* * Callback received when the frontend's state changes. */ @@ -823,7 +822,6 @@ static void frontend_changed(struct xenbus_device *dev, } } - /* 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, @@ -844,7 +842,6 @@ static void reclaim_memory(struct xenbus_device *dev) /* ** Connection ** */ - /* * Write the physical details regarding the block device to the store, and * switch to Connected state.