From patchwork Mon May 22 07:09:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 13249901 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 72E3EC7EE23 for ; Mon, 22 May 2023 07:09:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5B278900008; Mon, 22 May 2023 03:09:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 56472900002; Mon, 22 May 2023 03:09:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 36714900008; Mon, 22 May 2023 03:09:43 -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 25998900002 for ; Mon, 22 May 2023 03:09:43 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id EE0F14078E for ; Mon, 22 May 2023 07:09:42 +0000 (UTC) X-FDA: 80817015804.21.019AA88 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by imf25.hostedemail.com (Postfix) with ESMTP id EDD58A000D for ; Mon, 22 May 2023 07:09:40 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=SNsypHif; 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=1684739381; 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=sjCFICrNEpFD8ElUYu8UV6KGjbGawES3QAvpursbOxw=; b=EoMJBvAJ5jFTrH4JtbtUPhK6TpZU/N3UkfZNjnwBZdeg77TJc/YVPXIedgRfLcSEuP7sM5 rjYRvvUOdTaqYMN5oc8OM1a9LNcWQz44wzsZ7B40w129/SDdBL7KZ5724iBODjpGyxl7W8 2TckMGJSNVSCeAeE8lT1MxA7JH+dBlI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684739381; a=rsa-sha256; cv=none; b=ORWo82sUU4b+Nn5x3sfaQkOjASOr8SNRRAa52wYdjlRla6W9O2bBEh/7uhlxMQBvPyitw5 cssqkMFSjOmKmzndyaYMMkT4oQ731nopVBzs3kTvp5cANMkz2P5OWNBDmMyAE/UPpn048X Q0RcVlgEX6aGvpcjw4G0O9XfdCoMGJY= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=SNsypHif; 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=1684739381; x=1716275381; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YSumEPT2C3HRRYpGGamb3AFAC7MiJLIPce/70xDMyEY=; b=SNsypHifbFMgMlBEQ8+4CceJoFnh2kmeI+HwHzjlTBtGHm3vB+DigMxZ XOfDi6GltJu+dYz1xgc66qWlbGT/e0ljwVfGkZkRBqgOWavMZnPAe7iKO YiLHdsCuvHglghKfF43vC3Ef7hGJPAE/Dh8QHjKVw6yA0DMsG2sWQ60Cl r8nt8HeQPxbD0fy1oTPwMxzMq542uZ1jJqu6JPHycvvC6pU3CZi2v5z2l vdRvM9EfE3TKLiJdUHmAfA2Ou/P1Bf2l/zEAXblQ4hAm7watAX5cHjRfa /piQ56/HTGDzQvg+5wt9hMliviKcHliQbWdrFAfdYwMcC3/PpnWTUPSJu w==; X-IronPort-AV: E=McAfee;i="6600,9927,10717"; a="337437040" X-IronPort-AV: E=Sophos;i="6.00,183,1681196400"; d="scan'208";a="337437040" 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:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10717"; a="773212723" X-IronPort-AV: E=Sophos;i="6.00,183,1681196400"; d="scan'208";a="773212723" 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:31 -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 4/5] swap: remove get/put_swap_device() in __swap_duplicate() Date: Mon, 22 May 2023 15:09:04 +0800 Message-Id: <20230522070905.16773-5-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: EDD58A000D X-Rspam-User: X-Stat-Signature: hb5mubkg17ummtq4tfeabrhgd1yayu8z X-Rspamd-Server: rspam03 X-HE-Tag: 1684739380-434839 X-HE-Meta: U2FsdGVkX1/KXLYu8dePzOJOkTh03y4KYytJvwBWDpTMBvSI868RrWWDQ8o//bRsmu7Qul7Yze9Awitojq4dcOGiPlOKdPqiVQfRPF+k0IO+sseAk1pBny2d6u6T4/PcaS8OPdwbZlfM+x9CHcFpRO2kLD5PrH+Nk0kalfB4M5OG5bRZP9TgExtEVXYNxMHKePfcLA4Ep/XOfQKr7zJQ4mI0KmTGFMhTw3yvxqR3rZPPXAeDQntZo5UCHHUEMKLd1mBbBDhh4S9+avs+f11GUbBQLGkZr1p6SfDL99T01X7uu7o94WcOnF09ulPkhivsUGwAPDEqQQTZV+wamb48GAE/rR8K1fwWW9ywHpRf3GkrIc78hwk/5973BqlsB6cH0wqqHtLHQxsiiWDvI/++Jsy2kzPqAcSxVXYa8qvl/U6VgSWojQbs977Y0Wz09PjoCfG5pV+agas38He66opV/uKnq9wJtKod+/plBxTa++stu0M6385CJsP3rY2eKNQfQg/yGdsPVbF2Ii5aL62U6IZGcJ5XL4/tuHZxGyMSUVYmgeRcq+JpTrF6M38TP9Dd9qyfgB6EhYHwIWXvfGMkmLa+X6dgV3bijCs5ieje7CuworvjolLV3+1yhREZDFZ+0bmJ7OotL2amG9WsldqDkqUD8mQUyjSRZ6Ojtqea7lilw8+68tPdYRCwlAiYTXSocAlZ3AZCx6qOCFXDAzfLY6SH+6/frcngRl+DY7zRr6+krBRKRPt5SNJfz3Sdrovqh5+EvT1tuiPYuacOXSqvwqi2Us/73NQKfEiOGGHo7j62+Moa011pCD77tiX59XbdV0f0p5rwGMzWwYDy6Rf1b/8thRtVSE2b2vJyCYFdvS1j3msJLcib4VUewA9QhUx9A6dwyrBWG3k7Ta8dFkGQvBwCAR0hEo4fbGpPImvE8LBcsPBNs1PsNDpX6hoxl/IssiKdZSaF4HGQFWOlZ44 zounMD+E h/YF2FktUCiHMADwwOAQfhBPClFHKDTXOmv4eEI0fsQa5eEe+sUsgEQ/rW4WIIY3ej2dO4vx/hJpynjNUIjXCRRv1KtLWCIhFyDIBDHkjxAK0X0y4eqVXp2jTGE08XeE8U2avbvRd95P4IYxlCbUESeuDdTYKvQ8/sZjGw+TfkNXvFRGOgAYXGndLzKxcoM8mjAhvLGMLZH1ehBB6k1kxyji7jNHbxIvyaZfsTKfaQ8KXijJ7N6SCRv+Y/ZY67MV2X9Rj3EHFdcnkk88HlHDrfDdIzrqAEMZBoe3EfqCaxxpJNfXdyN0hI1MInaTMwXiOWakfHpX1gbrTlJ2GaA9QeVuMxluk0d9+k+1nbAQGx3fgV08SOX3LTtBbeVhtZiSMHRvr8D7Dl3Q3H29rk4BIR8yi+sOfVuDcKhnR7xOygFUcS7luvXmoEvoBkghQcV4cCefSgWVuJIi/O5y1dkeQaSv4jctPN/WmfgSIHEdLYaH8Qsr9Cv4blTL0xWJYN3lnYU2SrZ2dDxhPFLk= 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 page lock of the swap cache is held. - 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" 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: Yosry Ahmed --- 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; }