From patchwork Thu Jul 27 08:04:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13329220 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 AD551C0015E for ; Thu, 27 Jul 2023 08:12:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5283E8D0002; Thu, 27 Jul 2023 04:12:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4D7DB8D0001; Thu, 27 Jul 2023 04:12:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 39FF98D0002; Thu, 27 Jul 2023 04:12:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 2ACF68D0001 for ; Thu, 27 Jul 2023 04:12:21 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id F2189160FA4 for ; Thu, 27 Jul 2023 08:12:20 +0000 (UTC) X-FDA: 81056674440.30.EA9D40F Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by imf24.hostedemail.com (Postfix) with ESMTP id 15DE1180011 for ; Thu, 27 Jul 2023 08:12:18 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=P3BNYmrn; spf=pass (imf24.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.210.172 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1690445539; 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=nhs5C6wYTK112tB0Y3rKeCsMBEmGx3fQoCnqZ3HCCLA=; b=7jeVF8hdrYu0pkMtGmowVnHtCZoWZPjDAI9GDEdkus2SbDsYHZBAIlul+b7bAvhqRay3AG 6mlxU3L61+fae/l6+XYWfl1mfINnZvHnocAfMJgXwAHRFtwT3UeMm0qvLe9ZCMCeMTxDwt Nsr+s5/r6v7Q0Em8rATomj1JGL8y5sM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690445539; a=rsa-sha256; cv=none; b=6d4MhfIgUlDekm3JEca+eVedz0twnR1jeviS7mTsj978kim7zZCOdPqobTnjsInYKO3T2G QMO/MeAos0Uimif9YjFKDNvkU7yaUteqPBZfjfMHP34YmteKXVFEBzEiLmAU4golICEbg3 Bj0KsCFWRq6etkr0k0T5MxQCrl6GkOA= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=P3BNYmrn; spf=pass (imf24.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.210.172 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-686f6231bdeso113614b3a.1 for ; Thu, 27 Jul 2023 01:12:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1690445538; x=1691050338; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nhs5C6wYTK112tB0Y3rKeCsMBEmGx3fQoCnqZ3HCCLA=; b=P3BNYmrnn+aNeQX6tJNAWjBR47qoFVwe6V1hXSSWwFyS61HuOjfx1CldC/bVPLDS4b tBSPVcIpokpC1gG54dPeypV2gv1H1PsrEki/AFkEglXm+WyAmzSAHFAjlypTbwzHUkTv XwwWUlwnKhA8sSKQw+cOvBa/dT3CBu+sYvYNSpbwNT6pp20knmU+insJC0lJR8d7KNA/ XFw3RfaoZY9/IU0U207vkdiCmyduxENHuADRmTAqpUtqVvF1N7pwLKXyEsFC4IstCLHw nMtpKLIm0n/1aYuhmB1FsTVe4JczwGUa2wEUGkSK8KQu0Fafs8lJ3mpNN+7ETdaWOSMf 16qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690445538; x=1691050338; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nhs5C6wYTK112tB0Y3rKeCsMBEmGx3fQoCnqZ3HCCLA=; b=YUBNa0nz80WPY/qfaR3boOg+beR+Zx8GXPy6ZX0T6BGNA1UXy3oDdTXklzS/fDK2gd nvT8Hosd/xLagh9BV49DUizsJ4CZNxBZ1TuJWA5pSTTH5VP7i3JKyWO24lSYirBZYPDT pJPa6l4mcxlNniSHNiwSG5BtkQzTyNdWA0u/fkrxsiekl85N7M4POH72OZQUBrQH80/d x7l+sxxS1jVNCtDkqRhTJZrVx4W7/zCcJ/IsSysK5fxWaNFQ/nnDwfez8jG8QybTOm+K lAo7TCk6hx8+eNvFFhooJAO0QMUNbw2uQEUpn/PbojPFr+b15pBcfZNC/1Wa+lvdkVAy 0QnQ== X-Gm-Message-State: ABy/qLbVTiIGUdecUOLfIYwqsdp9JclitdBE3Q1+p47ml5nsCosuDhfM rG76c59/y0genIIzKvZTz75LgQ== X-Google-Smtp-Source: APBJJlELYJ+VP3jkb44itFX28rq7UhufR3zr/NDN3xCao+bv4nVfpqzapahZiZsalg40ZmAEO1GP5Q== X-Received: by 2002:a05:6a00:13a3:b0:676:2a5c:7bc5 with SMTP id t35-20020a056a0013a300b006762a5c7bc5mr5236670pfg.1.1690445537850; Thu, 27 Jul 2023 01:12:17 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.147]) by smtp.gmail.com with ESMTPSA id j8-20020aa78d08000000b006828e49c04csm885872pfe.75.2023.07.27.01.12.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 01:12:17 -0700 (PDT) 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, steven.price@arm.com, cel@kernel.org, senozhatsky@chromium.org, yujie.liu@intel.com, gregkh@linuxfoundation.org, muchun.song@linux.dev Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org, linux-erofs@lists.ozlabs.org, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com, linux-nfs@vger.kernel.org, linux-mtd@lists.infradead.org, rcu@vger.kernel.org, netdev@vger.kernel.org, dri-devel@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-xfs@vger.kernel.org, linux-btrfs@vger.kernel.org, Qi Zheng , Muchun Song Subject: [PATCH v3 32/49] virtio_balloon: dynamically allocate the virtio-balloon shrinker Date: Thu, 27 Jul 2023 16:04:45 +0800 Message-Id: <20230727080502.77895-33-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230727080502.77895-1-zhengqi.arch@bytedance.com> References: <20230727080502.77895-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 15DE1180011 X-Rspam-User: X-Stat-Signature: 8o6pfne95xk3u5yy36kf1r4zmictjusz X-Rspamd-Server: rspam03 X-HE-Tag: 1690445538-280206 X-HE-Meta: U2FsdGVkX18jFXbC74VyFXipYTm0V9u/Kuq+vEWzuztcR99MpH9KYoSJOe/sDwbJgd15WCYU78LI0J1LQiYFp1WR2p+sm/FqKdBhMPh020j4L3jTCaeX4e86nQmO/Dk4tLnu8mE0Jyz7+0wXysBRrAhdpq6xYtiqmlD4su+q+EEsFVoAyZSRxPoLXhrl9/6ZlNMwZbLowJbV/mRFKXyDMjQHwLWjLhLHKE6hGJsCe5eNJsI07t/aOKGP3Ui2p6kDALckzTwPKn83MZRisVZYUpcO7ma/29XH77AjE0Vjh24iPR+gfONCyb9sgjBn5xBkYLf9gZlWSnBzgZLK+Ry83h7V+n2vKN1k8y5VNFsch6plLkuWazPwVqGFtDn8Xi0lknIChtOWSyk24nlDPDxH5xlyaO4loCk5VTVKVf+mW++ucu7pnwan3so+PQaootLkv+dZV/1PrQuX1B9GmQnMCQaRIYDkkp/vjCf1tWqfCNVWyFXsuhtarDTSA74d71kEFMkdG5cmSrgwthVv+K0mO/iJ91uNBRgrJMSl16paGu7dnX+XVPKP3CTOi734Zh0c92VJ0l2Ztlfx7OhJ+xFjkPyWP499WjS6q1HRTcirb2PRfZHHeLDtqskicztvU9NhOKwzjD9J9wCVyB0h8PqDHeazGQGiPk8PuKlWfnhEG5VyOja88V8Haq0emwWEYH3Fd1QC69piNRV+2PoH2ns8XvC+iyr9n801J4AuN7AE/QxywN+jYvCNUasu7Iw1oIC4puri6pdNLoCwnJeRtSGU7VHFju7fE98ZIRYbvOsyBGOTnShxpZREaLiH2bQXG/kk1bF5FTqIISbEjy4pIea0El01YhcjNzn0VFKdHg1FiQghkGI0DfTa1Y70atQ0ExQH1LFZcb1KBk4zJqZ6GkLBVpSZVdQzKd4vXBkkUYZLFsmdl1YnvjT6zm/UkT1gDLjh6UlAOMVKCcDXjvHlOPf zrCC+M05 2uTzuhs3X4ONiKL+s8WoEd3kr4nI6KqEMgxLiyk+XoWTQ0uqrcuXzhhArS5SCbPGvPEbH2nZRvrwbh0H/0PPhfpO21j1jDBK4eCtdYOY/JXIPeisqTQ7/iRMAX6UT3MvhUKAOv6gEon4DhCTQcgRVUt4oVzVsxirFTgAwEtgDAcIJiRy7TjI2aLS1GRK6wMSKsWWmDYeZl0toct8RCmPfsLerJo0Pe3NdP54xGn27kklXHzy3DxDCRzZ7YMNn+INjXYOGFQm0yzPCwHD1AcsWQAG9Gf4Tg7gB7OYUEzH3AvpivAoy4rEk9BfXKxy3kXGTAxIYBK57+KAkmwxgIyTvJ9vOXz7lExm1f9e3RbaHcC940S8MqJ0Mrtb7zMfkKsPX2YvOYZx73IgQN51EuXzFhfBl0qc0qIzqgJnLfoixA5EJmnNeuXlh82gecscUhSPY5qxp74p3XVpyaQHwmHaghrmT0Q== 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: In preparation for implementing lockless slab shrink, use new APIs 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 Reviewed-by: Muchun Song --- drivers/virtio/virtio_balloon.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index 5b15936a5214..82e6087073a9 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,23 @@ static int virtio_balloon_oom_notify(struct notifier_block *nb, static void virtio_balloon_unregister_shrinker(struct virtio_balloon *vb) { - unregister_shrinker(&vb->shrinker); + shrinker_free(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; + vb->shrinker = shrinker_alloc(0, "virtio-balloon"); + if (!vb->shrinker) + return -ENOMEM; - return register_shrinker(&vb->shrinker, "virtio-balloon"); + vb->shrinker->scan_objects = virtio_balloon_shrinker_scan; + vb->shrinker->count_objects = virtio_balloon_shrinker_count; + vb->shrinker->seeks = DEFAULT_SEEKS; + vb->shrinker->private_data = vb; + + shrinker_register(vb->shrinker); + + return 0; } static int virtballoon_probe(struct virtio_device *vdev)