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 6A62DC47DB3 for ; Tue, 30 Jan 2024 03:37:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F11206B00A8; Mon, 29 Jan 2024 22:37:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EC0FF6B00AC; Mon, 29 Jan 2024 22:37:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D3A4C6B00BB; Mon, 29 Jan 2024 22:37:47 -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 C09216B00A8 for ; Mon, 29 Jan 2024 22:37:47 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id A16811C13FA for ; Tue, 30 Jan 2024 03:37:47 +0000 (UTC) X-FDA: 81734568174.07.D24ED83 Received: from mail-oa1-f49.google.com (mail-oa1-f49.google.com [209.85.160.49]) by imf17.hostedemail.com (Postfix) with ESMTP id EC4474000E for ; Tue, 30 Jan 2024 03:37:44 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=P6YDx4Ky; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf17.hostedemail.com: domain of zhouchengming@bytedance.com designates 209.85.160.49 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=1706585865; 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=JzebWaKZk+94ZRx2c2YdGPDF8CZwvmTVymWHqzMMxBc=; b=a7bQvzwrXhRSkbZiUqoLPG7USSX+4fnXdL8koPYgI2P6XtMAKLFDpBLjbSSkV+SwhsWoJx q5V/abq0Pc4xDs/qd1HntopGz8CTYmTH/fXvxqIakHYanXlYKdFonYvjAfZfL7lPpXWNs+ Fh1V8Lkdw3+230KRb7AjgaV8s9c5M5U= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=P6YDx4Ky; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf17.hostedemail.com: domain of zhouchengming@bytedance.com designates 209.85.160.49 as permitted sender) smtp.mailfrom=zhouchengming@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706585865; a=rsa-sha256; cv=none; b=h10GF3PPPTe7keHdteqcN3nH5CVJxXtiDPdZwHB0uE3TQ0JUvJc+man35Fd2+xTXTVQ1pW PDRX7iNWSk5lAYfzouIlsdet+OdzO9GrVNl/hcQgt9xoHsSag+Xl75K3wUHNscCUvwhVsp kawNgi3EzaSOAUML6OM9qfDQ1jCMX1c= Received: by mail-oa1-f49.google.com with SMTP id 586e51a60fabf-21481a3de56so2179078fac.2 for ; Mon, 29 Jan 2024 19:37:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1706585864; x=1707190664; 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=JzebWaKZk+94ZRx2c2YdGPDF8CZwvmTVymWHqzMMxBc=; b=P6YDx4KyEQPTNDIrVO1ORDWLtGJsBIDKEhi1IRlMknG9vRE5mNcD82cxNrT2+HJz/G 3LgYAT7E9pFOKfhksYQSqumwl9xHFdMgMShYtTGMwc+3QjzQDaQyG3yh1VMXICoEmeNf P0MQCt9WlzhHAVF8k668NgL/o1Us6+JgHKKSjNRdb0as2L4tBvI/lcxhxvlPFihEsUMO 15LdSq26TVUlRwG/Mafg9h98xJbB9Wx2xtG1r9IEep2a2tMHbq0v2cpHUlEXx7+O10v2 CU/z/pZoHlclwGfV5sGhSdn3cbqtqg8fNJseoDEeiVhLph1sAMR6nG+JgrEJZ9KRZR9h PkoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706585864; x=1707190664; 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=JzebWaKZk+94ZRx2c2YdGPDF8CZwvmTVymWHqzMMxBc=; b=h78kH+mzphcbRs8mOTJDpqDWqCTFWLNiy+LOv9hc9dKFE4CZJutNs3/aAPnYFVdGMJ /+i0aECegn9lp+DbJgU6bNNXt8e0b2+DHm80XmtUhcUmreGPUosHPTqDKZuWvaAQGQ52 unet6t3kG9k/yMOQrfO5qtNw/+144LkH3HytzA30P17bM6q/C9Q9OAt0vSV7Zm73m1KX EC2pJe4Nr+2400jWiF98BWgVb9e9BO8xpG8ZY9TYVh9pNdfBsNxycqmOwZquvzoOYXW7 sAn6vyGm00blp2nDxaHxzL4a4Z3E4JkBRXTN7/xrY0I89ffdszrji6FwwNMSP+JvZQrV Rq6Q== X-Gm-Message-State: AOJu0YyoaXYBzlQj1tOTk89WIHN5hocWQZUy1X/saZTC6AL7J9AztLIp +QWj8LgQ92tuNrbWqVJ3jHxgVu0FViITaVPKreHr/wzLQGTnPzQIpyAmlQYj1FM= X-Google-Smtp-Source: AGHT+IEVWupfuhowGp0+yx9osJSBEspj8CvQktKmSZlvjG1elawu5cahWZXPJ90uuRxiYk4IBk/5QQ== X-Received: by 2002:a05:6870:1254:b0:214:2886:705b with SMTP id 20-20020a056870125400b002142886705bmr6895796oao.11.1706585864169; Mon, 29 Jan 2024 19:37:44 -0800 (PST) Received: from [10.4.207.234] ([139.177.225.234]) by smtp.gmail.com with ESMTPSA id y17-20020a63b511000000b005d8b481c4d3sm5561909pge.87.2024.01.29.19.37.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 29 Jan 2024 19:37:43 -0800 (PST) Message-ID: Date: Tue, 30 Jan 2024 11:37:40 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 02/20] mm: zswap: inline and remove zswap_entry_find_get() Content-Language: en-US To: Johannes Weiner , Andrew Morton Cc: Nhat Pham , Yosry Ahmed , linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20240130014208.565554-1-hannes@cmpxchg.org> <20240130014208.565554-3-hannes@cmpxchg.org> From: Chengming Zhou In-Reply-To: <20240130014208.565554-3-hannes@cmpxchg.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: EC4474000E X-Stat-Signature: c7yhpuczqbp3w59tymq3w88akipr4tti X-Rspam-User: X-HE-Tag: 1706585864-621940 X-HE-Meta: U2FsdGVkX1+V4ngWq9AWG/UPL2EFXfLa7jDEYA1edDWh6KrMcStu74wRvBMuQCaRdk2XEoV8Bpt8bfq/Duiq5SvyvNYudHzenHrdXyMNRSuAiuvuEq1t1FY6pbpsA5nQ7wUn+iFRumsj2Of/ct8UuVi8nA+Cb77qypAJVcoN6ZZZ4l9W2yCIt4Mq77rwsDTU7wXfwFjz3jTMg1lshlls1i210Gd7SiMZZNKsXc6edmCQEIyjg8uwLcRQZdYJr1rk3Sa40Wzgo2SnG6ZKHWWFzFl6RyJBIDGpgbl/E9zSBnkIAuua6uR4xf1DVkH0/NxW3vVDQq1CzVPGOkjYj6ZWKvKNNsczDuPUbwjaOmmFZHYSTH1rdWw+cTJLr5pEGxQ5+IxjEJ9LFBoiVoG+3aaINxuuuiW6ssO7gTyBWDVTZCafBydQqmjZNdSrKbD8Cpzli6Dncy3h0V+ZOqAPLCOYUyuox7118ymix68CW0C4FYt2ok/b1iet8SsCED9Ia7/98X2z5qZDH1RyrH+FTOZlAycm34uMf8CTxeQhQYmFUQ8pNcsDJEuPxLY1h2pT6FPpovqZXIVhaGecNLJjuqJ34OSURXX39I2WNLquiYq2G8ao+gRywf9y3/N62vT3T8JTryf7+IbE55qE81pe3Ty0kYczxwXhfcteEvDJO+kyPx9FvXUsZX/paV9fSSR3LoLXGGNTbQYNVvMKDjf3H9i1MlkqhrCd1auPXxbaFWZyoruwMeaMjnvwREMS4jimR3ExJJkQUOXwQPpZcnM960Csl8Qvsfug46NzSMZOVnUnfARjVqIA/rEe95v0CQNBc5HYHacwuO+NYFOI+rYTPaRx7pTTEUFZjFZUvSEydhFKrf2qgnzqqH3xnPVRIfzCoQM8tj7pn9IMDdac+xdAu17HAeGWy5ABFP+oKHKol+wGudDtl6QhbtXdIT+KzazyyiMco7uD938676XlFNAHxt2 tN2kgadr 84a5srnJIkSVxEN6+e29VajElSmr9EvvfDKi8+G2rYQiiod0eUHkjJ7MjBIXvdyV58deLWKhpJATv7unZym2rB6MV2g== 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/30 09:36, Johannes Weiner wrote: > There is only one caller and the function is trivial. Inline it. > > Signed-off-by: Johannes Weiner Reviewed-by: Chengming Zhou > --- > mm/zswap.c | 17 ++--------------- > 1 file changed, 2 insertions(+), 15 deletions(-) > > diff --git a/mm/zswap.c b/mm/zswap.c > index 173f2e6657de..cf864aaa214d 100644 > --- a/mm/zswap.c > +++ b/mm/zswap.c > @@ -559,19 +559,6 @@ static void zswap_entry_put(struct zswap_entry *entry) > } > } > > -/* caller must hold the tree lock */ > -static struct zswap_entry *zswap_entry_find_get(struct rb_root *root, > - pgoff_t offset) > -{ > - struct zswap_entry *entry; > - > - entry = zswap_rb_search(root, offset); > - if (entry) > - zswap_entry_get(entry); > - > - return entry; > -} > - > /********************************* > * shrinker functions > **********************************/ > @@ -1708,13 +1695,13 @@ bool zswap_load(struct folio *folio) > > VM_WARN_ON_ONCE(!folio_test_locked(folio)); > > - /* find */ > spin_lock(&tree->lock); > - entry = zswap_entry_find_get(&tree->rbroot, offset); > + entry = zswap_rb_search(&tree->rbroot, offset); > if (!entry) { > spin_unlock(&tree->lock); > return false; > } > + zswap_entry_get(entry); > spin_unlock(&tree->lock); > > if (entry->length)