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 D7324C77B73 for ; Tue, 23 May 2023 00:51:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5F4CC900002; Mon, 22 May 2023 20:51:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5A52F6B0074; Mon, 22 May 2023 20:51:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 493ED900002; Mon, 22 May 2023 20:51:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 3A0846B0072 for ; Mon, 22 May 2023 20:51:34 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 0572AC052A for ; Tue, 23 May 2023 00:51:33 +0000 (UTC) X-FDA: 80819691708.22.A6D6027 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by imf30.hostedemail.com (Postfix) with ESMTP id B5A7480015 for ; Tue, 23 May 2023 00:51:31 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=UvOmnUX5; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf30.hostedemail.com: domain of ying.huang@intel.com designates 192.55.52.88 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=1684803091; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Vvn7RwZI85Zwmh5VytgxMY1dsYiynnvsHDigHSYigxk=; b=hyixD47aKeY83yxyeAMq/F7m2YIQPNA0fk4ngxsrEVxvP7TM1J9UJX/L7TTCAu/gto5b5P HEKiIjkPAoVmkefMQn0rHIfN9UgA6aDwGXAUIJis5Yq2JkY4WEri+WnhPzhXKufZJdlsKv Fo6RMTxq3Ymn42JCzrHDa8i5/glzkeg= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=UvOmnUX5; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf30.hostedemail.com: domain of ying.huang@intel.com designates 192.55.52.88 as permitted sender) smtp.mailfrom=ying.huang@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684803092; a=rsa-sha256; cv=none; b=SJnsIllVm1L8+O6nXOIXCJGyjvo2DjNtUVuddUnGMHjvwuETU7wkhcqCi8zEE5/d+fYBbw 0Ib9rMui6CwlNz6XYfX/XOXx6NpM5972AUYsPFUZ3BaAZcTASOf63sPUi4HmsvC4CpnM5Z 6/U2SuJ00eZbUIn0PN3aBqIDCY7UTKE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1684803091; x=1716339091; h=from:to:cc:subject:references:date:in-reply-to: message-id:mime-version; bh=diFwzbT3OxeffISLG2blwOVUHxqT8mdCxf9vNwSn2po=; b=UvOmnUX5nMhExB3dagdK2VfNvA/dWpp6s8JzNDP0jpS3Zvwz3OyzLZb7 f09NTI3EOlZnmIwKNUz7pD0e1SP9+o0d8lNQ1FUAWsnVie6utBbtqq414 /0PbDDTbuZTPA40p3zMpTykFYXT/zA/mlXdLo1XUdsnBG3v0tATgEGw41 sbDdutrs215DfSzbjAcuP+AM8tkE7ut+PyYimKB5Zes0ToFG3ngf3wZ4w XehBXEL8fCibgYfiMFPr5gjI37oXwq/BYZM86DZD3yYGL3gHtytjKtC66 9FFL48+j2kj5JtT/dk213UuFPc+QYIwUnSfUAmX1ofuOCpEsZws0TBjj8 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10718"; a="381328609" X-IronPort-AV: E=Sophos;i="6.00,184,1681196400"; d="scan'208";a="381328609" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2023 17:51:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10718"; a="848055285" X-IronPort-AV: E=Sophos;i="6.00,184,1681196400"; d="scan'208";a="848055285" Received: from yhuang6-desk2.sh.intel.com (HELO yhuang6-desk2.ccr.corp.intel.com) ([10.238.208.55]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2023 17:51:27 -0700 From: "Huang, Ying" To: David Hildenbrand Cc: Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Hugh Dickins , Johannes Weiner , Matthew Wilcox , Michal Hocko , Minchan Kim , Tim Chen , Yang Shi , Yu Zhao Subject: Re: [PATCH -V2 3/5] swap: remove __swp_swapcount() References: <20230522070905.16773-1-ying.huang@intel.com> <20230522070905.16773-4-ying.huang@intel.com> <200a094f-7ca9-8a64-1c9b-7cf2e546f3eb@redhat.com> Date: Tue, 23 May 2023 08:50:24 +0800 In-Reply-To: <200a094f-7ca9-8a64-1c9b-7cf2e546f3eb@redhat.com> (David Hildenbrand's message of "Mon, 22 May 2023 14:03:36 +0200") Message-ID: <87sfbnyipb.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=ascii X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: B5A7480015 X-Stat-Signature: 6szt146nzgxrfm56iz6oyb7m6z3y1coz X-Rspam-User: X-HE-Tag: 1684803091-299098 X-HE-Meta: U2FsdGVkX1+vOy/Q2mqU7wxCKO5t8NeGPAChHpanTl9NotGNQZtT2FFIPZCVzkfJLqaPrIHWyGhhGMd9SIj1yXae7gTnxHtOhV4v00QJuYhhrAZicKPcSahXwt76+NmJGCe260MJFIwTfxfU2LSF0CjYOQ85bDtl+4yygbWaIz0fCBmNXOR2IDKbaR6mt8jzY39gtZEerDOihl/t0MNCsnyjcm6+uIN9yotC5GMOyXAdS0wrQiIbKVDLCb8n8oeo47NQUWJqjshc1G3Dx9+V2V0eeCE9lej9CvUr0a0vVdmZwTz//3NiScDZ1BZ04Qm4gjKQQuFu3WjLB9jeCSZE+MSsCN7IzjcERDuTEWsclmAvSvN3QeqOpKfyeCk72UiLYYXz+izqkYQQdIBDH1cq/DipqP6NmDw+kM7bVht3c5eirh+hul9fTA5Lb+rUws+4DFVnIheXpDhgyVGcg1NGuCiPfT84lh8MHT53ZvebeIe7brsT0wkno7y9zDAV10euhp/0IUQjVhq/rtgowgJK1+TUW8JGrZRImtseo74I7vLnAaW5P+xoUi61AB3RCEWajEoDPA3VQk0SBrvyVR2c9pFPefDKmdimEqERIc0pOjo0ElDQUYs9/1cE3xtN8pFViPy7SatVKLmWvn2Upu2qWDKhoCKjd45CK0KWfX9GxVxifbzZmO+9kjc2agYU7jq/K1USMltq6lcCwVR9LsipVoXebQBpImr8GRqJ/NR7+qCi29wW722KdggRQkBxFC/3G1RNv4MZlTO79ZxugFAT29AtcjwQ0rNJisIIqCjje0YI5cI/cdH77Dc5JcKDcJ+bFywFexPAafX7T17LBjLcgnsj10Ynl9ji/v8wUZxU7cDThcmd4OiTB/j0Z0/xDINl8oDumvj3w3DWHY/NVsY29Q4NbdfZk9qQw93paVW1OwHayCodg1dMICmVBf/h54rgbkOhamrFNiEkNrRCnq7 sj7FvZLB KeXFy1o7AV/bSZ5EymswPjX3L+07eoSjcxOg0JAD5DUwDJq/36FSlCReF3SxQVQzpng9fSB3IiSlj/GXUSCIBG3ccZZ0w7Ut4KuanfQejKZuMg8uAL2GYba+lwR51NHdtlyw30Hggqa3Lhr51K2yWLJtL0FlVz6BqF5qGf4X4iuaxXucjt+Mb8spgTi3zu0MaYwe/JXvbfPttB4eapreh9UrKcu+HXp5OKK/uEpuWCwhj/D90IMu7TxA7VxeDSvdNa/1plPJ4dqT7WrcDk2R8qaOxsqsJ0Z9ew65S5EP4vwHUw2uNeQAykId7Nd6hrb8vpoMNlmnPVkmtDquThfM9XCF2OKjmmOZbyMgWLjl4sh/hMVLEo9TtFwUWJkb2RMqUQDU3BhF8RDaT+Pv3kmDxIvVgqGbo4ZjZu/l+jsAfTBfCBcTldNE1V4pmMY3QTp1gyGBeZQXcjn/ka9astj6l1i30EsN0P+pWOTDvoWBI30qQ+9zG3b1jitPa5O3a1iGsPgOThg9xe6XYg+FqUqnBR68rVQ== 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: David Hildenbrand writes: > On 22.05.23 09:09, Huang Ying wrote: >> __swp_swapcount() just encloses the calling to swap_swapcount() with >> get/put_swap_device(). It is called in __read_swap_cache_async() >> only, which encloses the calling with get/put_swap_device() already. >> So, __read_swap_cache_async() can call swap_swapcount() directly. > > The previous patch contained the hunk > > - if (!__swp_swapcount(entry) && swap_slot_cache_enabled) > - return NULL; > + if (!swap_swapcount(si, entry) && swap_slot_cache_enabled) > + goto fail; > > So something is a bit off here. Either that hunk should go here, or > this patch description has to be adjusted. > > > But I guess patch #2 doesn't compile on its own because this patch > here adds swap_swapcount() to include/linux/swap.h ? Good catch! Will change this in the next version. Best Regards, Huang, Ying >> 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 >> --- >> include/linux/swap.h | 4 ++-- >> mm/swapfile.c | 20 +------------------- >> 2 files changed, 3 insertions(+), 21 deletions(-) >> diff --git a/include/linux/swap.h b/include/linux/swap.h >> index 3c69cb653cb9..f6bd51aa05ea 100644 >> --- a/include/linux/swap.h >> +++ b/include/linux/swap.h >> @@ -512,7 +512,7 @@ int find_first_swap(dev_t *device); >> extern unsigned int count_swap_pages(int, int); >> extern sector_t swapdev_block(int, pgoff_t); >> extern int __swap_count(swp_entry_t entry); >> -extern int __swp_swapcount(swp_entry_t entry); >> +extern int swap_swapcount(struct swap_info_struct *si, swp_entry_t entry); >> extern int swp_swapcount(swp_entry_t entry); >> extern struct swap_info_struct *page_swap_info(struct page *); >> extern struct swap_info_struct *swp_swap_info(swp_entry_t entry); >> @@ -590,7 +590,7 @@ static inline int __swap_count(swp_entry_t entry) >> return 0; >> } >> -static inline int __swp_swapcount(swp_entry_t entry) >> +static inline int swap_swapcount(struct swap_info_struct *si, swp_entry_t entry) >> { >> return 0; >> } >> diff --git a/mm/swapfile.c b/mm/swapfile.c >> index 8419cba9c192..e9cce775fb25 100644 >> --- a/mm/swapfile.c >> +++ b/mm/swapfile.c >> @@ -1443,7 +1443,7 @@ int __swap_count(swp_entry_t entry) >> * This does not give an exact answer when swap count is continued, >> * but does include the high COUNT_CONTINUED flag to allow for that. >> */ >> -static int swap_swapcount(struct swap_info_struct *si, swp_entry_t entry) >> +int swap_swapcount(struct swap_info_struct *si, swp_entry_t entry) >> { >> pgoff_t offset = swp_offset(entry); >> struct swap_cluster_info *ci; >> @@ -1455,24 +1455,6 @@ static int swap_swapcount(struct swap_info_struct *si, swp_entry_t entry) >> return count; >> } >> -/* >> - * How many references to @entry are currently swapped out? >> - * This does not give an exact answer when swap count is continued, >> - * but does include the high COUNT_CONTINUED flag to allow for that. >> - */ >> -int __swp_swapcount(swp_entry_t entry) >> -{ >> - int count = 0; >> - struct swap_info_struct *si; >> - >> - si = get_swap_device(entry); >> - if (si) { >> - count = swap_swapcount(si, entry); >> - put_swap_device(si); >> - } >> - return count; >> -} >> - >> /* >> * How many references to @entry are currently swapped out? >> * This considers COUNT_CONTINUED so it returns exact answer.