From patchwork Thu Jun 22 08:39:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13288502 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB8ABEB64DA for ; Thu, 22 Jun 2023 08:41:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5EC648D0009; Thu, 22 Jun 2023 04:41:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 576E98D0001; Thu, 22 Jun 2023 04:41:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 43D8B8D0009; Thu, 22 Jun 2023 04:41:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 350AE8D0001 for ; Thu, 22 Jun 2023 04:41:22 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 151AE16074D for ; Thu, 22 Jun 2023 08:41:22 +0000 (UTC) X-FDA: 80929739604.03.DD737F6 Received: from out-53.mta1.migadu.com (out-53.mta1.migadu.com [95.215.58.53]) by imf20.hostedemail.com (Postfix) with ESMTP id 4EC641C0009 for ; Thu, 22 Jun 2023 08:41:20 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=sVEpWPhm; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf20.hostedemail.com: domain of qi.zheng@linux.dev designates 95.215.58.53 as permitted sender) smtp.mailfrom=qi.zheng@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687423280; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=HcTjqzLQd71ZVb4pzslJvUSmaexvFgNd/hk+/QuqHC8=; b=DnCeiCfU46Lkc1fSsO7O30tNRXF8EBTUmmFxRdX1D5MiGxIG31JMj77lA1HyZaYhVC76aO T06Iwn801ul5FxGtbAPlZphtCS0Ov6ZKyDRxHMReDLs3gcsAWs/yRVL+1cf6vtlYDbFtpB Ui4vLSYaORyqIcxQrEHBVFWIbSmzX1Q= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=sVEpWPhm; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf20.hostedemail.com: domain of qi.zheng@linux.dev designates 95.215.58.53 as permitted sender) smtp.mailfrom=qi.zheng@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687423280; a=rsa-sha256; cv=none; b=59VuqCGgD20kMjlbDnClt4tXn8F1hC4Ny9o+GwpvmqCe3rhKb5S24zywvBvTMiRu3RvPfO yTB5RCjeS9oNfw2L0FE97RyL85Wny8VTsSO5/vo13556mQl6+RGiulDyf5Pa08T8+24Tot +QgZQBhNAe0LheSgRPzw/N2qy+455H8= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1687423279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HcTjqzLQd71ZVb4pzslJvUSmaexvFgNd/hk+/QuqHC8=; b=sVEpWPhmhMKCP77bE/ObQ4vh36qd8p86S9YTJ/PP2t7O5H1rqOFnAADJATnE/Im2pGl6K+ faUcWupfoFI2g9i9atXE0VwhccNnX7/0UsnRt6J1CWpSBlTlvvvrCKJ9m/IyCeNWLYDiY/ S/WTlid4FLB0IXUx+GwQRgK3ap17RFE= From: Qi Zheng To: akpm@linux-foundation.org, david@fromorbit.com, tkhai@ya.ru, vbabka@suse.cz, roman.gushchin@linux.dev, djwong@kernel.org, brauner@kernel.org, paulmck@kernel.org, tytso@mit.edu Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, dm-devel@redhat.com, linux-raid@vger.kernel.org, linux-bcache@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-nfs@vger.kernel.org, linux-xfs@vger.kernel.org, linux-btrfs@vger.kernel.org, Qi Zheng Subject: [PATCH 11/29] virtio_balloon: dynamically allocate the virtio-balloon shrinker Date: Thu, 22 Jun 2023 08:39:14 +0000 Message-Id: <20230622083932.4090339-12-qi.zheng@linux.dev> In-Reply-To: <20230622083932.4090339-1-qi.zheng@linux.dev> References: <20230622083932.4090339-1-qi.zheng@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Stat-Signature: ckyfz3jwyf7iapdzu5p99stiuokkeqjd X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 4EC641C0009 X-HE-Tag: 1687423280-834561 X-HE-Meta: U2FsdGVkX1/MkdoY94SGhV1xo1w8TOPjWblHLdT9JEfg5dxH3cpXqqnLxGSstUIO1QDLshnetfvZCFrkGYJTAxy9kODogSQt+LJ+tIMYULlqeG0ewzPXY/nAxnS/sRjZWs93dfr5QFtYEcz0ye9Mu33/OR8BC9piI01rxiI4+Je7YVmp106j5IoJ6Cc/o0hqGEzX0+pGU6PcKq2UoaCWaMNXkLDSCGmQ7R7cMgGjiO1Q4hNYb/jZIIsOgnynsAGr0QgDPlK8eh7q5D881not/phhgjweC8fIkrRYjzVPg9g9eL886uvehvKIrz3x4jr+yuytmndFmLr9+RRBPfWQqWJ6VPeUJfhbekYK5/s0eHkY98yJX0SRjSHbEl76f6x0OKX5toMnsQSOTS7M7REYJvoNvW09RLOJuMkD40/C8rx0gqkTQLYAsym29ksxectP6AbJtIg+m9u5Yb33XHG+fKIoYKRZeUnx4k46bnyr79PimcCQH/XpzY8l7zDPYa+RwIqSVKXQV57mNAS71zM5vhZB5gG9U4IMt5LtKq/T3QLfXaVdIkeC/ygetw5/tY7QhyXJqroVACklI5nXJx66haCGlLl9W7ofDMKMAc2oqtvSqx+522qpH7vq2TDogRCChGj/iO6O8vgA5gnlEo9kkTmGXLK62+7XECZD30an9CEPZIlPWDqDASnqug6Neq4dDOHwHuV/CG+SkqmuX5w/WoBUXo5mnn2yd/QFytmiBmISb/aJppieSi+6YKG03fhZ5SQdszzPy3Pt+2V1ajnLlSVPLtpOjXqtjTBcxCAjqi03yhjcvsfZez7Wk1O2bKQ73YW2qoYIcVGqEi1J4e+Kt/B65jUAf3dsZXWUK262xOtS/DfmzRYv7O6Zc1+sHCeX3kGXzV9swlaU3qHgvtRuHSm+sgQpWafturinex4DgF+8wfH9oW7r6N3W4JnuIGOZ2/m9WLGVu+hpzmHY7Xs V7o73d59 A72y8dAQa5+eRcm6beW3fEHnLSZeTxqyRFUrGFwp3WrdY4vVaGAtMEovRRlcO5ndtsM7gNgHH/z9GVKNXgyM6lZQD/Ltu/Mftrnk/Bbp4kIf9/pBMMueGGxoJFZ76+vIF/t8X32TRoBlOjDA3LfMPTq82eJidU+uVCKhMmMTCA4gV92NWQa2lJRPeGg== 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: From: Qi Zheng In preparation for implementing lockless slab shrink, we need to dynamically allocate the virtio-balloon shrinker, so that it can be freed asynchronously using kfree_rcu(). Then it doesn't need to wait for RCU read-side critical section when releasing the struct virtio_balloon. Signed-off-by: Qi Zheng --- drivers/virtio/virtio_balloon.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index 5b15936a5214..fa051bff8d90 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c @@ -111,7 +111,7 @@ struct virtio_balloon { struct virtio_balloon_stat stats[VIRTIO_BALLOON_S_NR]; /* Shrinker to return free pages - VIRTIO_BALLOON_F_FREE_PAGE_HINT */ - struct shrinker shrinker; + struct shrinker *shrinker; /* OOM notifier to deflate on OOM - VIRTIO_BALLOON_F_DEFLATE_ON_OOM */ struct notifier_block oom_nb; @@ -816,8 +816,7 @@ static unsigned long shrink_free_pages(struct virtio_balloon *vb, static unsigned long virtio_balloon_shrinker_scan(struct shrinker *shrinker, struct shrink_control *sc) { - struct virtio_balloon *vb = container_of(shrinker, - struct virtio_balloon, shrinker); + struct virtio_balloon *vb = shrinker->private_data; return shrink_free_pages(vb, sc->nr_to_scan); } @@ -825,8 +824,7 @@ static unsigned long virtio_balloon_shrinker_scan(struct shrinker *shrinker, static unsigned long virtio_balloon_shrinker_count(struct shrinker *shrinker, struct shrink_control *sc) { - struct virtio_balloon *vb = container_of(shrinker, - struct virtio_balloon, shrinker); + struct virtio_balloon *vb = shrinker->private_data; return vb->num_free_page_blocks * VIRTIO_BALLOON_HINT_BLOCK_PAGES; } @@ -847,16 +845,24 @@ static int virtio_balloon_oom_notify(struct notifier_block *nb, static void virtio_balloon_unregister_shrinker(struct virtio_balloon *vb) { - unregister_shrinker(&vb->shrinker); + unregister_and_free_shrinker(vb->shrinker); } static int virtio_balloon_register_shrinker(struct virtio_balloon *vb) { - vb->shrinker.scan_objects = virtio_balloon_shrinker_scan; - vb->shrinker.count_objects = virtio_balloon_shrinker_count; - vb->shrinker.seeks = DEFAULT_SEEKS; + int ret; + + vb->shrinker = shrinker_alloc_and_init(virtio_balloon_shrinker_count, + virtio_balloon_shrinker_scan, + 0, DEFAULT_SEEKS, 0, vb); + if (!vb->shrinker) + return -ENOMEM; + + ret = register_shrinker(vb->shrinker, "virtio-balloon"); + if (ret) + shrinker_free(vb->shrinker); - return register_shrinker(&vb->shrinker, "virtio-balloon"); + return ret; } static int virtballoon_probe(struct virtio_device *vdev)