From mboxrd@z Thu Jan 1 00:00:00 1970 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 D7F60C46CD2 for ; Wed, 24 Jan 2024 07:35:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 650BB6B0083; Wed, 24 Jan 2024 02:35:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5FF446B0085; Wed, 24 Jan 2024 02:35:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4A04A6B0087; Wed, 24 Jan 2024 02:35:30 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 3991E6B0083 for ; Wed, 24 Jan 2024 02:35:30 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 10C43A03C7 for ; Wed, 24 Jan 2024 07:35:30 +0000 (UTC) X-FDA: 81713394420.07.996C587 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by imf11.hostedemail.com (Postfix) with ESMTP id 524F940006 for ; Wed, 24 Jan 2024 07:35:27 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=YEtMBWP7; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf11.hostedemail.com: domain of zhouchengming@bytedance.com designates 209.85.210.172 as permitted sender) smtp.mailfrom=zhouchengming@bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706081728; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=jrYIexCVj3lzhdPHs2GVu+eB/KVIh/KA/cEwlOXWa5Y=; b=5Kdfl5dJTdb3r8gTuZnHFV6Lr8zX112CYxCk0SFVdkYULT8VK/zqgy921Wvu1qXPt3vlWC atdupJ7v/QhR000ILlK3dPwID5LPAqF+I6/bJKEL2XKHM4lcpCQDD5zKQaKZUg9I+itQrz tp5dMr69UUJUfckxErvskJMnce3qURQ= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=YEtMBWP7; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf11.hostedemail.com: domain of zhouchengming@bytedance.com designates 209.85.210.172 as permitted sender) smtp.mailfrom=zhouchengming@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706081728; a=rsa-sha256; cv=none; b=c5d1xilkBKnIxN2iYqniid6ZDvQ7w8WTxOYuNa/yZKvWYSSCS+45XR1VO7CuggB3tdgcMd 7E8A+JMfvOdfefy/Hr9IG6B3Nu3j+KDOx16K9oi1ZpW9tvgjiYbRNyg12QYbCyXoqwJiaI yxC7Ql+8r1B6OB1hQLzuugmY5+M7ePE= Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-6dd85328325so969123b3a.1 for ; Tue, 23 Jan 2024 23:35:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1706081726; x=1706686526; darn=kvack.org; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=jrYIexCVj3lzhdPHs2GVu+eB/KVIh/KA/cEwlOXWa5Y=; b=YEtMBWP7kuhXj7r+jNPFGK8rdZ+EEI4kRFWB3wPaTKSBcutQZOiGzz0N6KSXSpC0W+ gFgT6PzIdiNVCQpM/ESIIST57y4AaHpjiJ3SI00TYlrt7Pt2jgVDtKNfExc8RwnuDjpg ylnV03HrxEfZHnfikpu/p/pMN4nP/vXaC44VyAcpff97Rj23Dpgp0C7Ovgurl1zHggNS 2EtL8KFkvoGKArB6laONGk8h7jj7uIjQmBILxSiplGi/uFwciDXYoRU6K92rtyHnCvDQ yMKeFJMnjqBvVLsLIXmYLtRPCn4d6Zw3Y87Qu3mMCgHrKKhYSknvD+V5DbfANPKL0oFy 3F9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706081726; x=1706686526; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=jrYIexCVj3lzhdPHs2GVu+eB/KVIh/KA/cEwlOXWa5Y=; b=iu3PHSnd6I4xASJihPK2lkRI2OJ3QmASAtQlniLFgYDpYfgDYcUPf17MRi3RZ5dnvn /qYZ/3ZVQKsP0T5crC8nmdqZuEV5m2Tp2KNwILkkM6Lphx0JGQBXI7cvS8+YomxqhSyL JOtv9gvcNT7RCaQYNYfYJvVFJvA2PDVpL/VGBosAY5qbJ8RoThDhBqrO49kr/ri1mhCI eEWWGGPGdS6D5dPDWTVO4bT/5I+zQmgprrJaHN6Qmk5UU2r/fqG6t5IC0Y5C5Ee9XyKw Y8lVR/meSoGbQeY2I0Bc2obDKgDDd0gKuioVUkCv0kkyBm4F2+piegZecHeYMyCtTgap c+xQ== X-Gm-Message-State: AOJu0YwT5/pDmRRwympWn3jed/F+C2nWa7bAEOEbKGtQLSVLBuGPOKZ7 iop39PPsqrwgkRB2t1E0xE888IVzfGWdXkSZzchhzdDUUP7QyoZM1z57KaWvYuU= X-Google-Smtp-Source: AGHT+IGANFpffkj8tc/P+jpEtAje5dviG98IqRAe0TQSVQXLPD2xpinmlx/2k3Q0UO2Wql2Lixq82A== X-Received: by 2002:a05:6a00:ad1:b0:6da:d27b:7c52 with SMTP id c17-20020a056a000ad100b006dad27b7c52mr9084585pfl.53.1706081725994; Tue, 23 Jan 2024 23:35:25 -0800 (PST) Received: from [10.255.203.131] ([139.177.225.236]) by smtp.gmail.com with ESMTPSA id ei29-20020a056a0080dd00b006d9ae6fe867sm13051948pfb.110.2024.01.23.23.35.22 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 23 Jan 2024 23:35:25 -0800 (PST) Message-ID: <305078e5-b31e-43ed-825d-7b634c9c9f58@bytedance.com> Date: Wed, 24 Jan 2024 15:34:05 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 2/2] mm: zswap: remove unnecessary trees cleanups in zswap_swapoff() Content-Language: en-US To: Yosry Ahmed , Andrew Morton Cc: Johannes Weiner , Nhat Pham , Chris Li , Huang Ying , linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20240124045113.415378-1-yosryahmed@google.com> <20240124045113.415378-3-yosryahmed@google.com> From: Chengming Zhou In-Reply-To: <20240124045113.415378-3-yosryahmed@google.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspam-User: X-Stat-Signature: ifktet3zaaq3nu6j6up1f395bwkexfk4 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 524F940006 X-HE-Tag: 1706081727-809957 X-HE-Meta: U2FsdGVkX1/B9vfFDJu4L3JMecrr36vNPypxCSlV4Gl7grdYGZLVBmlAZKy2dj8MPwG2GMSXl0J38DQ7yrtZsTYPo64CKVYHe80XfNSLtEX9SslBVVwGu1wewcCpja0NMvjycpwgIHWXtY+lmKM96y8iloLIKu7hcGUILRaKVa1BqvrJ81/JLXrvuNj2ykDQrwIbwJyReSdLMcc1l/sF9YwAsM5rjDr6kFukTPhpHPbRngDiWkRpTHRe3cYdKLNXKKaqVK/WrKXyp01DXg1KRlHYUYVE9x8oBzB4VF4QpHEIwfbLRkOsgXHL/YEprZZlS67ltEK50k+82tmzOg6JiFqGGSg937w51HMnyfUmkpaUzO3QbXXS5uFQYDqN3E94F3SngqnqK40g9Wj+Ll+yI2mIgw0nDbNIQiLylpQugCCHsFO9WLEtHJykq+FrAGLkjSvXTS9gNipUMZao4uUndjuG6N8wP7ujCaGy6Wi0ZauhZOVuYeGULkfSzQZ8v699hfUZqtRwuKGB199B+ciyaHxSXcviGGxyVXySJVUB+DI8VAU2qWuKinIDf7VK1f7LnfRlaZP0jEN6v0EaL9w5esgLADftZh8IzzTmKDAshfjPWwyQDK2+wsXs7HVE/WNi2OOBL42fKf5tHJOPXMa5t3x1GnSST2c4YgnOyReX5WkToSjnbshevaUJ9D8+XBD7sOkwvStsJpzxbThfaF/mM9RkzcZsVlYdmk+KTa37ajNk9lEWvQneARQXTIO0zy+TMk5E6wbv5sFGhW2yuQYAMwn6VDsxQpEOQeGshcregVZM4mG7XxcGrdWA1b7lURghNYaKeUaii6iNmnCRNVimMTkws+z5gALCDXMWbWz+QjuvCS4yVJ1OHaPoIhaAW2tDs5EUK8A9LcXjes2VcNyKCwuzjDptFTHUNcsUstf7AWR9g85okWpd2fRPjMr6GjWWxrjuUrBKsk4N/yc4V+N Rus8Upto msfQH0BzGRe5gzdh662J06VLfjAHHu1YDnFO+eKW73fqRl7GwqB4K0+26qxVRy3jDYQB3xPD9sOeIFp+wSFTErOWHr/oxPjS9ImFJN9GfaHzgn9TEzhhaX1rXYiiDdod4AWFWTAfwHiYdKD2DH48dOzZyoNyleMax766OUoilBiIop2rQqWMFmtJFLxIWo+y8PI2udXQn8cTnq3gvat4uryrKKiH8HRid2CDWIQEbU4v0jdEk2WKDl52VLmB8JeKwWNys5h8YoMpw54S5r7wdBYsQXZgXUc2aSx3f8k7ZA46uIaMJqnGMPZ1J5mwzHC3Z30mJ8B498BrMlye90qVOSlPPGDwOxo3DixIG3jUJzmN8lt5kgLPZXP9syEV95qFEv+yOmWVb6n/cnqYijlatQ9fdNoCvKZjVN/l9AsT39bt0IwhRO/JdbpsGavNhnkvIWCBxTV02c/l0dPr7suaeoZSpmZZDWQ1bqoaBop0D5/rxyhmw9lbnELn866cn6Imb3FL6cQlczbiHne62Bp9JlbugIw== 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: List-Subscribe: List-Unsubscribe: On 2024/1/24 12:51, Yosry Ahmed wrote: > During swapoff, try_to_unuse() makes sure that zswap_invalidate() is > called for all swap entries before zswap_swapoff() is called. This means > that all zswap entries should already be removed from the tree. Simplify > zswap_swapoff() by removing the trees cleanup code, and leave an > assertion in its place. > > Signed-off-by: Yosry Ahmed Looks good to me, thanks! Reviewed-by: Chengming Zhou > --- > mm/zswap.c | 16 +++------------- > 1 file changed, 3 insertions(+), 13 deletions(-) > > diff --git a/mm/zswap.c b/mm/zswap.c > index dcdd5ecfedb09..78df16d307aa8 100644 > --- a/mm/zswap.c > +++ b/mm/zswap.c > @@ -1808,19 +1808,9 @@ void zswap_swapoff(int type) > if (!trees) > return; > > - for (i = 0; i < nr_zswap_trees[type]; i++) { > - struct zswap_tree *tree = trees + i; > - struct zswap_entry *entry, *n; > - > - /* walk the tree and free everything */ > - spin_lock(&tree->lock); > - rbtree_postorder_for_each_entry_safe(entry, n, > - &tree->rbroot, > - rbnode) > - zswap_free_entry(entry); > - tree->rbroot = RB_ROOT; > - spin_unlock(&tree->lock); > - } > + /* try_to_unuse() invalidated all the entries already */ > + for (i = 0; i < nr_zswap_trees[type]; i++) > + WARN_ON_ONCE(!RB_EMPTY_ROOT(&trees[i].rbroot)); > > kvfree(trees); > nr_zswap_trees[type] = 0;