From patchwork Mon May 22 07:09:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 13249898 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 EAB07C7EE23 for ; Mon, 22 May 2023 07:09:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 60266900005; Mon, 22 May 2023 03:09:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 58BB4900002; Mon, 22 May 2023 03:09:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 42993900005; Mon, 22 May 2023 03:09:41 -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 3425F900002 for ; Mon, 22 May 2023 03:09:41 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 02A821A0C98 for ; Mon, 22 May 2023 07:09:40 +0000 (UTC) X-FDA: 80817015762.07.EC23784 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by imf25.hostedemail.com (Postfix) with ESMTP id BC565A0004 for ; Mon, 22 May 2023 07:09:37 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=ngMp+7ta; spf=pass (imf25.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.126 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684739378; 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=AL/AHAqtFJKsPwKJ9HgR1WU6kXa6VgMjAHwiDhHscpI=; b=RFIeiziInRUuroWz+/r+bq8TY7YlgvoQ+uSpsgmf99QQCWPmqcbZKuU7R0nTYKVYuXsLPg Ks1Vq+nFh4tv0t1jxvlt57KyGR//CxoUNuQK/VVYRYgkgfuFLMXEhPZs3wgvjShv9qrsJH D1NqNj1nzS+WHV7qp6netOYyWeA1L/o= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684739378; a=rsa-sha256; cv=none; b=BpxPv1H+JdcPBs5a/N/AGmSuW1MMNIakA0rXYkEVwpg5v5L8pw94+dCPgLwGPsOW9ta6qu WQD81OHADc8pGswrWXo1MArOODX2ZumZPK3YPab2r2NOGyQXQ5DFPkjYEcjCqlVJQrrQtF xgKM0niTQvrjtUNfq3Lo2Cmu8Mx6RSw= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=ngMp+7ta; spf=pass (imf25.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.126 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1684739377; x=1716275377; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CAvLy4/ErwSMMyC1M2gR5vND9soNKvGVJOF+Oh8rPBI=; b=ngMp+7taahfz2Gj2rdoCaQIiAYJF/B4ezUz51G/nmfzobvFj4mpxdpPs eZ5TuApTdJ2LegBlR+uMzFq9C5X8INSxlC5abwfsPOaDZE+iZE4PKvqcu KRSRgH5Fq6TZAGmEUDXnsbEYZbQZMdXPPUWQ5OtkJpOurOnXxikeJj0jJ 1jIiuUWE5zjrbtTPZfxpqeK3XeiwoB5t0ui34oseEemWRBk73fVz4oGOl sT2W9jquA2IMmAtL98K3euRvX6ODEyKVbQCvGZj2g2zEdUW6x5JQgFubD TqcxPwymoYEXT1MWATYktSGdJdenuenoUfOoFCbVwaG/DbdBTG7tW8uGy w==; X-IronPort-AV: E=McAfee;i="6600,9927,10717"; a="337436977" X-IronPort-AV: E=Sophos;i="6.00,183,1681196400"; d="scan'208";a="337436977" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2023 00:09:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10717"; a="773212678" X-IronPort-AV: E=Sophos;i="6.00,183,1681196400"; d="scan'208";a="773212678" Received: from yhuang6-mobl2.sh.intel.com ([10.238.5.152]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2023 00:09:22 -0700 From: Huang Ying To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Huang Ying , David Hildenbrand , Hugh Dickins , Johannes Weiner , Matthew Wilcox , Michal Hocko , Minchan Kim , Tim Chen , Yang Shi , Yu Zhao Subject: [PATCH -V2 1/5] swap: Remove get/put_swap_device() in __swap_count() Date: Mon, 22 May 2023 15:09:01 +0800 Message-Id: <20230522070905.16773-2-ying.huang@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230522070905.16773-1-ying.huang@intel.com> References: <20230522070905.16773-1-ying.huang@intel.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: BC565A0004 X-Rspam-User: X-Stat-Signature: hy57i3zqtxmj1ynziq9usg97xs9krokb X-Rspamd-Server: rspam03 X-HE-Tag: 1684739377-909223 X-HE-Meta: U2FsdGVkX1/it46SbmOOFoOnsyjmzoT/1Pr6+oqTLKpJ6hCPWoKogGmaeKWLsEwRrlwJAwEGyLgNOjfkVYDd+jrxrb/BFxwncrl4f3f/819iYVo099DJkkJ0c3z7077xaJWAwTwZzX8MDUVvl1VE2QjybWLqxGdKHhVSrFYOVlj0IfTvtEruT9qhC9m3zc4/lLjFpno9taMiqhyHL5LrnVj+O7hIQtmJDigs/waKtcyK728HBz7WQdvjCwLQ5ii5ow8f87LIOWRsGIZjwKpJh9CGL3oVtKUXo2vWQqCU1JgyoQhG4XuYZouCeEP7VwZHfpuXwmtlVMG1Jc8sX5jenh75PpQavSzyRzdur6w4BAapKrzrEMjjh2eDIejGHYWAw5HG00W/RH2sBlj4AUppDgTvn8lFmR0g5GwCj7Tn9LAYgNpKJJYDYf9QDTW9CNazLDFyWvAg/L6QcmFHijOSPtS0qmq5j+2Wa2UJnqQxYdnllP93SO5rdAAa0Mo/Skw6+/P+8prXHELQkj//Il0m8xhaIffTVjA0J8LuCqeAISlYWRGIrQU4Aphn1oQK8Qhn4cjKCBq9phMaO1DwliPjQmsVARkvsPac1pymBN0KCIAdX17Ykkg5Zf33aq2QqCTp3u1xvqxdphtzl+35NniPaRVct5MSwCVMa3VhdMFp7yr8CQxUjL2Z39A1ol/nLAswKRQVeKGo/r76c10H7iz12Lrqbl9JNWoBZFU6GJ5aWGUKRt/rGTVmidQrOMAmaPvSN6eiuRuawpWCilQcDhcjH9D8qoS9W8rNqvDiLtaK8n82yFGAueDuUlyV5xblgUuRbx9tD1wxHXQec7GNt4R1A9QRUk86hxF4wj2v1+dLcjMnfI4KUfL1q+E8vPMEFrMx/OsCE4F/Z0Z8zuzuatOEgr6iqZ4u5a0cATvUBYwt5OQF37f2HykfsTBDShRoqFW4VBLWKdGM5WRTHLIhE8F LgbgAbub kPff9zcWQzTmQ+ULUMOoL8awXFoacF1+w8dTkSog87VgsA/QGYX+WvkFCrwwhv40pOWb8U0ZcZXYTf/50pxGP/UX7fWkoDnrgV2gZxfdoxEx75GxC6NEfSRmDSXxyEKpIL3pSfUOHZaA5j4ibp8X7wMpb8Q9gzjtmTNHJskKRUnLLPDsgSy7g0QYNluBTbiZ30K/iekXVgsvGH61BYFQGiwXD4471X6Ven1Vo/l9pkY3NYnOMNFpNGEHAJ8mgyMdD9tqYImoHJK02CQYzqzJc5V2RdEDIRMtiXYQB5s6il+gm70GY+JPtz9w/TXzTX8CxH87IB7nxyZG/t6e90KwKZ1J2kizlPEH35JBIww4dQQIWaF4I1yx3XPQm3pSHpU3hFdOq0eUCJiwdvqv/uIal9sS3xJYqPJYXQU6wzrNPaTpIf3EmCxovqNJfv8gtSwDKypoDmTWscpcXHCg6AARxBjO6tcLhWtcaHWxoYhBqyTsS2ewq/fTaoINhmmK/25Lg+hU88UQXAl6KGgg= 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: __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 Reviewed-by: David Hildenbrand Reviewed-by: Yosry Ahmed --- 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) int __swap_count(swp_entry_t entry) { - struct swap_info_struct *si; + struct swap_info_struct *si = swp_swap_info(entry); pgoff_t offset = swp_offset(entry); - int count = 0; - si = get_swap_device(entry); - if (si) { - count = swap_count(si->swap_map[offset]); - put_swap_device(si); - } - return count; + return swap_count(si->swap_map[offset]); } /*