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 E7A75C77B73 for ; Tue, 23 May 2023 01:48:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 800D6900003; Mon, 22 May 2023 21:48:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7B1526B0074; Mon, 22 May 2023 21:48:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 678DD900003; Mon, 22 May 2023 21:48:31 -0400 (EDT) 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 54D3C6B0072 for ; Mon, 22 May 2023 21:48:31 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 2A0741605DA for ; Tue, 23 May 2023 01:48:31 +0000 (UTC) X-FDA: 80819835222.16.7AA2137 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by imf03.hostedemail.com (Postfix) with ESMTP id E0FD120009 for ; Tue, 23 May 2023 01:48:26 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=oFeGAxVU; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf03.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=ying.huang@intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684806507; 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=v/ysz0m9K8upLxsnjBn5gPkMw3jO/AnECG9ClJL7W5g=; b=O3HH2aUPpux/YefGxohiw4/7Whv3cj3MEZRlSjEd9PkqlCejuku7MMcdqC+UOxppZwn0wW qn1KHp9JDp2nIbjlKJzBo/8/oPiFXSJZrF3N7ciMFocbe74fyAUVjDZZkffVEtu8AAau+e W69NBFFynTXqZYNrTTAm+rkSC2EoJLQ= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=oFeGAxVU; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf03.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=ying.huang@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684806507; a=rsa-sha256; cv=none; b=61WCwgV82q35oCrDcqnpJ7f/AKp8jLmDpAXdYW/+hUU4krCo40SZL1GoxR1cuKrx5LwGkn KhKbTCRZKDBPjnaqO2SR3MTLd3/4QcxXGlkU7g4DOqotQqNiRuf7Orr80dwEKJAbnCsLgt lx2WUuHbgGYikn1QwPW0zDQtqskXkHo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1684806506; x=1716342506; h=from:to:cc:subject:references:date:in-reply-to: message-id:mime-version:content-transfer-encoding; bh=pC1qgCUA4kll5pSGP8kAgZmxkcD7TSslSEEJcM/0PRo=; b=oFeGAxVUIaDkcDxTYdmSnGGIscxpCKImzqSsIBhSvwngd0mU3YDrXQGy /qxowtTYHEmclD97zjnGuisFNDpK3ufMz0SAcMSVHweDpKiGz1HE5KF4O ESvSbnZ91wi3oNEJCNs7wIR8aVgTb4jZ6qxDx0Ux8TzF3zV9RyNAaSBgk 5ovHwmLG360XUrmWMC8C0M6CZllhAHVg3oUR4o5hJgsgE6EfetH95p4S6 WEEao6I24IN7NgtFBZ2PZ7HzOvwn29oR6T9pgnwN1UF+2Z3G/UYH00hry wWhb/1N7/rw7YZoif+fImBSfJtu5zk1p9CXWYSG23eXUBZYEP9riZ0qEZ Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10718"; a="355447378" X-IronPort-AV: E=Sophos;i="6.00,184,1681196400"; d="scan'208";a="355447378" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2023 18:48:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10718"; a="768778546" X-IronPort-AV: E=Sophos;i="6.00,184,1681196400"; d="scan'208";a="768778546" Received: from yhuang6-desk2.sh.intel.com (HELO yhuang6-desk2.ccr.corp.intel.com) ([10.238.208.55]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2023 18:48:16 -0700 From: "Huang, Ying" To: Yosry Ahmed Cc: Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, David Hildenbrand , Hugh Dickins , Johannes Weiner , Matthew Wilcox , Michal Hocko , Minchan Kim , Tim Chen , Yang Shi , Yu Zhao Subject: Re: [PATCH -V2 1/5] swap: Remove get/put_swap_device() in __swap_count() References: <20230522070905.16773-1-ying.huang@intel.com> <20230522070905.16773-2-ying.huang@intel.com> Date: Tue, 23 May 2023 09:47:13 +0800 In-Reply-To: (Yosry Ahmed's message of "Mon, 22 May 2023 18:22:19 -0700") Message-ID: <877cszyg2m.fsf@yhuang6-desk2.ccr.corp.intel.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspam-User: X-Stat-Signature: 33fes11kn71nmu3q18t3wgz3f37yx5km X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: E0FD120009 X-HE-Tag: 1684806506-807969 X-HE-Meta: U2FsdGVkX1865ke/bV6YrvYo40A6sKeQwLiMr2bsnB3AeYZaH/SvP1rbpDNxqZ/g+HWhlvOKnTAAurZU3C9v7f6iPLiN0HZYNEEq77i4XBe9QLah9XSDexN0m6t4aZWaneUw2xOCh2i+BOFbLe5zEdTdWYENXZFEv+eIG36j3bunaqoghUZhYMskK/+FMUj5QwJRsb8ieb81LSbdUx2Mv+8N9MWr+v+tSicTbUG3KMHvND2B0dMi1ywZwSJ0apGo470s5L5ZX232v6KvYDQ5tUR7aiD4NSsVmzdTB5Vy07kYJUloMCGaGkXsYuOKNDHPk4zxIE/WFJmKNjz1JFnDsnDqC5q7bUWIpFVLPa+UYOxohek3wPUD+GDODSE/wxaWSi/Qam1mFpoYmE2mzDV4QRTszlq4SSNfLVvDKib232tgN+L6IJPZgRudPoeZ31Wq3ZJUcZib2FfDgbBfhRRCph+0nbCBj3dMrR8hlozZxfRu//dHVKHmGuis+tqAcdIbk+2t1E1WJezzGoBSYeArL6/+uR8kGxi2w+bup/TT1ywitoTCOlRbofzTUMWI1lPcIyDb+aHMlLTKIBtCz0sbep2q9xt1H70KK8iAOYBS+forMNQFO3UBZQZPHp46nGDfz5G9EG7p8ghB6tl0hn+7gxMQWwdBHebr8D631t66abkTnQVcJIWz10xPM7TjpcsrfZqPoSZ1UZLDplF72/wZlhg//DDP3fTjgWR/dBgbNcgznW6sdK/qtuSyoU7LslaashIRmGyIB2C43oe8cV6jkHGDCzseenOqGiuw6wWXWd8/Q6I3R70rWVq5JfSRmU9FyxSlP7UWSSnnim/+aBBYFwfyzXLybfkn/VgI1lzhTp8gPCRCWogZ5zRHjzWxEoYJrKfM6pfp7htBF8b6uxpNk0py6b2CE1OIz/9/bGm8n/b/juH445vJntJZUdSi5QOlITyhL+SR4USoDt/yGuO MtBkC8MM 6sQenDw1gO5sPiBnBycSRdG04Eb4UMff/OBSvv5F9PsC34ATph9BWmEkSoK0kWtCUlGz/yF9h2H8Xrz2AjjSLqZ5YTWaZwLsYQODv2qX/JzBSEj7Hh7NF/RZvX8MXKvh8TnRubcjbw9nmRgdAh9H2kagA7Bv3llvDXw13R8xPHhSVJ90Ke3DczFvNGfsyLM4xr/MkfMNvguQttuviBNO1jRDpd80E/0Y0D18Lhyx+Ulfa5iPRRM6RQdgsrA0cx0F7pWLq7tQmQJwYH1AaMweLlhkKh7d5ZkQmOHOH4/LkLbb5uCFykk4i6OtJ0yBNxdBIizGk+O6owrNZGkYHutTAu1fyGV6fup1Jx4TghK72AFibaLMETlPuB9u2crO2r4S4aGQJ6dd3Vzpe1w7RFy2fIFBi7GiF0UR4B188abpaDT3h5uRPVOKZmAT7VgkeVavjekotpv2EGDaI2/S/0ANzdTPqiBg2TDx7rFF4rYrSZEcBi1apaoFdg32WAy4xbR6syCGqAIq+/sdXvdUZvPs4iJD8/w== 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: Yosry Ahmed writes: > On Mon, May 22, 2023 at 12:09=E2=80=AFAM Huang Ying wrote: >> >> __swap_count() is called in do_swap_page() only, which encloses the >> call site with get/put_swap_device() already. >> >> Signed-off-by: "Huang, Ying" >> Cc: David Hildenbrand >> Cc: Hugh Dickins >> Cc: Johannes Weiner >> Cc: Matthew Wilcox >> Cc: Michal Hocko >> Cc: Minchan Kim >> Cc: Tim Chen >> Cc: Yang Shi >> Cc: Yu Zhao >> --- >> mm/swapfile.c | 10 ++-------- >> 1 file changed, 2 insertions(+), 8 deletions(-) >> >> diff --git a/mm/swapfile.c b/mm/swapfile.c >> index 274bbf797480..8419cba9c192 100644 >> --- a/mm/swapfile.c >> +++ b/mm/swapfile.c >> @@ -1432,16 +1432,10 @@ void swapcache_free_entries(swp_entry_t *entries= , int n) >> > > nit: I would add a comment here that the caller needs get/put_swap_device= (). It's default behavior to call get/put_swap_device() in the caller for all almost all swap functions. I would rather comment the swap functions needn't to do that, as the comments for read_swap_cache_async() in [2/5]. > Reviewed-by: Yosry Ahmed Thanks! >> int __swap_count(swp_entry_t entry) >> { >> - struct swap_info_struct *si; >> + struct swap_info_struct *si =3D swp_swap_info(entry); >> pgoff_t offset =3D swp_offset(entry); >> - int count =3D 0; >> >> - si =3D get_swap_device(entry); >> - if (si) { >> - count =3D swap_count(si->swap_map[offset]); >> - put_swap_device(si); >> - } >> - return count; >> + return swap_count(si->swap_map[offset]); >> } >> >> /* Best Regards, Huang, Ying