From patchwork Mon May 29 06:13:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 13258143 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 4A295C7EE23 for ; Mon, 29 May 2023 06:14:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D4798280004; Mon, 29 May 2023 02:14:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CD089280001; Mon, 29 May 2023 02:14:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B23E4280004; Mon, 29 May 2023 02:14:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 9BAC5280001 for ; Mon, 29 May 2023 02:14:31 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 6E38F1A01DC for ; Mon, 29 May 2023 06:14:31 +0000 (UTC) X-FDA: 80842278342.25.0791023 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by imf14.hostedemail.com (Postfix) with ESMTP id 69FF4100011 for ; Mon, 29 May 2023 06:14:29 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=cJxrFtlC; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf14.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.65 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=1685340869; 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=OXQpXUyD3R4+lamxgQGM0SaoDtlSH6lRmsX6AawfPEk=; b=X9fHl9/mLUafP0LUHO3BKt0RbEJPMfDNp2RikwooBjMmAZ0O/yT5zOLjpVzOwAolQTUT9G L4BXJVt8eaNhlTZED5mTDYe3NgyVYkWQcrM9PD6XhhEG8mqBq91Z+4Ii58H0/SLceyk6Uv k4w1IzoUeH2+T4/FKEmS/MqN6Em5M8A= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=cJxrFtlC; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf14.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.65 as permitted sender) smtp.mailfrom=ying.huang@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1685340869; a=rsa-sha256; cv=none; b=NfPwZ5j5VNYpINSFPQZfT9gPZQivEralJ8iO1U8VVs+PCHzWkjJBqxTd1gFxZuSli/ceMw wFQODh1Bmr9zj0a47pJmSfG+QQ0ee/MbingowfOeC1Mlc4WLEFyesgx2cfJVF6aPjzvoL0 apdYiSKaFYX1UTmndNiqcb6wCj2Y99s= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685340869; x=1716876869; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BU9rFfysv4elNLJ2GHzqi2liUatC3EzDYJWAUuFdw+0=; b=cJxrFtlCwIuI2Qjv4t0svwIYrYf8UN4laXVC3qIsq+xZpAtNS+1bPG4V w2QJ0pcsaEAY83MpX20jynYcuQx85NV01amjXU4pw5N6Wce5yK3+ICZco 41D0VgIKfZ9U9tBkRoE7eoSFx7zxvflNl4lFRqZMY45WpwvyXiKECzKYT elWTHgSozyruFTewpFqcuPxnm6cR/8d9Em19AQ7PGiPVR9H9wt/F3wPRA 2g10+RcObIGDHtdXWDAVaetUpmjRsxIdChk2PtJOWHZ0/DvM+vgpYAjU6 bVaEpse+rgKHOv+FqDZRH/c4SEyvpOKupgPB0uKd3jBU92DGtOy9Zzq3I A==; X-IronPort-AV: E=McAfee;i="6600,9927,10724"; a="357881862" X-IronPort-AV: E=Sophos;i="6.00,200,1681196400"; d="scan'208";a="357881862" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 May 2023 23:14:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10724"; a="1036080010" X-IronPort-AV: E=Sophos;i="6.00,200,1681196400"; d="scan'208";a="1036080010" Received: from azhao3-mobl1.ccr.corp.intel.com (HELO yhuang6-mobl2.ccr.corp.intel.com) ([10.255.28.126]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 May 2023 23:14:25 -0700 From: Huang Ying To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Huang Ying , Yosry Ahmed , David Hildenbrand , Hugh Dickins , Johannes Weiner , Matthew Wilcox , Michal Hocko , Minchan Kim , Tim Chen , Yang Shi , Yu Zhao , Chris Li Subject: [PATCH -V3 4/5] swap: remove get/put_swap_device() in __swap_duplicate() Date: Mon, 29 May 2023 14:13:54 +0800 Message-Id: <20230529061355.125791-5-ying.huang@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230529061355.125791-1-ying.huang@intel.com> References: <20230529061355.125791-1-ying.huang@intel.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 69FF4100011 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: b458kkhjceimscpjz5oh8zou1g5en6nx X-HE-Tag: 1685340869-737623 X-HE-Meta: U2FsdGVkX19E/mxfg79st+yASorWuCoeFduDRSWeI7wnhKgufOUBHYhMmY6yf0kMAbrMRzcZ4Xa9tVhaCppHkdctUUmfP9zDA8g2nLYx+BYmA8xSthNSs9U8KgH7z9FCtV7P/5vdp4rVdkb975YA0U70Idq4GWoRAsjlAgNnRZksae7QLRvlI47v0L5+7BG0+xh+N1JFDsMTGtIKhDtK23+bQIhX0dZEmWcvMwveUvAeSsRFX+HMkHhLemlIrrJnA84Rv69ZAN1uR43WDaGRwCa1oCRVj7jSQmhBcPNUxqL/Uyli4U1KhEujC3fStDeCYgArBkA75Q1z5MXD6zlFhf3Z/s/seHEDe8ibWgX04fGmP8fL/hJXnl+G4Nw9zYeG/V/fHp3gvRoHOzN7E0lHeg8FVggbjnredDX8561omzFjg+rz3TOpCdtvE7syjekK7tDZEyUidXTijZ3Z5e4/5et1dxghfCobpGBkOb6Aax//hs4NerumPJwmS+Xap3R7/cg2SbLTuJN6X71e75bYH5TXF9LPPJDL9ejFwDDXHIL1Txf57rHzVxNZ6RgEEGbZzK7sWcPWaUbJLCAfh9j8kxb+UQIarpKmWMseGjziaHMGqol285jtpkW1TH8/QbTISRxRaBuvenjcrwLmlY4966KIez0dLRxDt3T89allP9RT/w+FCzdC/msZrKXVENdPyiSUzKAVK+sxk/dCoYSvSrNbWrSkS9cL9N/eb0+q0LkX9Zol5G6+Q0yRqz1iRY0rhdRGgIhDhnjxE+o606rY5xWCgde8B2birKkbZeIRKYYN3afJVRNRgZbhIsKWAneZuSru/zNJ9AlAO634UUahxXw4aHqJ1sAo6LGz3KNLISW+HeY/rkHC+AOD3TqqhUxO4jHO1oqWm7xIwdf7MO0rsrBF9Vab2Uh+XxFS4OKBO6V8klH5FLvoYnUtqpwIb6I1j1tPOyb5vNDf4p46ndv km9MeJ4s BBCpVtzXn9b/ER0xdeqjnGxstNQErPB7/67dnXhZKZinRZkU8u1SNyzZf8FRA961Co3tfbrP0wqqQbe8NqJJD1Q4ZSavb1rFdnVqsV1FdzA78iRDhrhtOXgtzCDKactitGqJ2J989wqGk2q8O8Qhd88r81MsZnJtimiI3GdqnbGpjpF1k5sRFxCT4K7Gc/S8TYuJuNCnzvu1ZEvFNivE6sHCE2MBnZrn87brqAeFIBtfbY6PmuyK0tIUgh4SUGAJs6nta3Kp2boW0sNCL3Cdj7es5QiOqrLIKSzo94EogkVlSORdOLoSSe1gQfHFFGWb2I5LfbPPaRJA2/h21vFZ643ayyzRFjTxD6tIdGOQQtc+jTlOSu7Dlu3GhqaFUOcKVOldL6BK507Vf5DeSRUVtFRlHYv+VT3Y28VSpmAi9EnncwoWuaTUFFuTQgjzKl8nsu2HYPsYzNsScl9lqKrajTMcFn4T/Yi6elawDx0J/lodP7tcOebiaVxd86iKYtTBpmSW1bNJHgBX2o40= 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_duplicate() is called by - swap_shmem_alloc(): the folio in swap cache is locked. - copy_nonpresent_pte() -> swap_duplicate() and try_to_unmap_one() -> swap_duplicate(): the page table lock is held. - __read_swap_cache_async() -> swapcache_prepare(): enclosed with get/put_swap_device() in __read_swap_cache_async() already. So, it's safe to remove get/put_swap_device() in __swap_duplicate(). Signed-off-by: "Huang, Ying" Reviewed-by: Yosry Ahmed 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 Cc: Chris Li Reviewed-by: David Hildenbrand --- mm/swapfile.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index e9cce775fb25..4dbaea64635d 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -3264,9 +3264,7 @@ static int __swap_duplicate(swp_entry_t entry, unsigned char usage) unsigned char has_cache; int err; - p = get_swap_device(entry); - if (!p) - return -EINVAL; + p = swp_swap_info(entry); offset = swp_offset(entry); ci = lock_cluster_or_swap_info(p, offset); @@ -3313,7 +3311,6 @@ static int __swap_duplicate(swp_entry_t entry, unsigned char usage) unlock_out: unlock_cluster_or_swap_info(p, ci); - put_swap_device(p); return err; }