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 87B4BC7EE23 for ; Tue, 16 May 2023 11:06:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0C23B280002; Tue, 16 May 2023 07:06:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 04B3B280001; Tue, 16 May 2023 07:06:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E06DB280002; Tue, 16 May 2023 07:06:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id CD398280001 for ; Tue, 16 May 2023 07:06:11 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 8F1941401C8 for ; Tue, 16 May 2023 11:06:11 +0000 (UTC) X-FDA: 80795838942.21.6B09679 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf18.hostedemail.com (Postfix) with ESMTP id 059A71C0016 for ; Tue, 16 May 2023 11:06:08 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=OhQ1obOw; spf=pass (imf18.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684235169; 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=cffqgY240u6LKhQiohGL7llXzs3YEJD7Cg0tf+vxCaM=; b=eT1d+Rc3MrE5Xexhpdszy7JWA9lL5/FexFkFuTwy8TJeLk/g49xtYx5gRt3gk1nmRc+4lh ICP50nuAhoEa1Febk+AmxPGdM5732JoHe57hto0rkhQftHWH0USlbUDxr61//RpwC5+5Bc jlgq79eem5kQAlRxSezxrAK/evyHlZI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684235169; a=rsa-sha256; cv=none; b=jpRTkkK05hgyZUwgVGwX7o2aZ1+OpJTfiPWPmvKNPavsEdxfukisJaj5gDw6TNvf1u6XY+ B/fdLk+Ge0g0uM/QpnvkGLa5kPIx1BeOEDOcrPEaWy6T2Nqmzcru2VRM3gE7K0rij52oFT Slnf2mvcKjudyDV3u8mUyqriIWtc7kU= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=OhQ1obOw; spf=pass (imf18.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684235168; h=from:from: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; bh=cffqgY240u6LKhQiohGL7llXzs3YEJD7Cg0tf+vxCaM=; b=OhQ1obOw3rykwQW9wW0fjL/ZJgDQtWccLQmSZLxIjDVLXBAdwUHsZp2Z/RsQCiOSCjky3j VChE17bIzDlAutV8spRM8/rbMG92rr/Fk2ko9OVMXwPwkVytf5m8KxaN1ookzehinUL5eL ym2gs9/2OHlylqa4FzVK30vrVURd+SI= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-464-EOujO7LcM_qhdCpI1n26Qg-1; Tue, 16 May 2023 07:06:06 -0400 X-MC-Unique: EOujO7LcM_qhdCpI1n26Qg-1 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-3062dedf7d9so8354548f8f.2 for ; Tue, 16 May 2023 04:06:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684235165; x=1686827165; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=cffqgY240u6LKhQiohGL7llXzs3YEJD7Cg0tf+vxCaM=; b=Q6KPTbaLrDqZAXDbAmOP2jCy8GTJA8IB1aGgvFuLlswn34xlXQzf2Afg8UmCYKw7F7 KmxZ2fVrOV6767g8LGPAYf+zeY173tl24+ngbHGGdMJ44sZPU/Qem2boZBhIa+O0rMWR RpddDGjXPPV2p3FYZxCy097r+QZ9vZ7cZe+ly3dvzHrpPvEyHmbfafWwNp6Qp81Jz8/p 5zQfpjKND+2ihKYbwShneXmnGLFNmzYEnRHK3vKxIwo9cM0mZ4N3HpuYSycfks927VU6 Uj6rj1he8QXBspIDkPSqMxIeqQypxE9Sgd/6wzol00EuY802T/Jq2ElUQDeXXtWDqDCg 0Quw== X-Gm-Message-State: AC+VfDw13sV11jb0wVQDH+YXULyQFt7l0bagA6/HwwyYzUNkEynfsqof rI0z8chqFtnmZUp28kwhcPGQiUiILgr4P1kmziHFZwC3RUMvgwPTN4gxA8ea7EiN/wyQxGK9n59 780ODsOXI18Gs4ETzE4A= X-Received: by 2002:adf:e547:0:b0:2e4:bfa0:8c30 with SMTP id z7-20020adfe547000000b002e4bfa08c30mr27781225wrm.47.1684235165597; Tue, 16 May 2023 04:06:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4K9rbW0popZUr4vxTzQqMSMKba7jC9OqdpcSblcqHA+87lbMWIehFQ7VRpuGfRuPp2LzRt5Q== X-Received: by 2002:adf:e547:0:b0:2e4:bfa0:8c30 with SMTP id z7-20020adfe547000000b002e4bfa08c30mr27781204wrm.47.1684235165222; Tue, 16 May 2023 04:06:05 -0700 (PDT) Received: from ?IPV6:2003:cb:c74f:2500:1e3a:9ee0:5180:cc13? (p200300cbc74f25001e3a9ee05180cc13.dip0.t-ipconnect.de. [2003:cb:c74f:2500:1e3a:9ee0:5180:cc13]) by smtp.gmail.com with ESMTPSA id y12-20020a5d614c000000b003062c609115sm2222988wrt.21.2023.05.16.04.06.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 16 May 2023 04:06:04 -0700 (PDT) Message-ID: Date: Tue, 16 May 2023 13:06:03 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: [PATCH] swap: cleanup get/put_swap_device usage To: Huang Ying , Andrew Morton Cc: 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 References: <20230516052957.175432-1-ying.huang@intel.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: <20230516052957.175432-1-ying.huang@intel.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 059A71C0016 X-Stat-Signature: tqfchfq3nqp19te35g6eap3xmkz8a83u X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1684235168-131679 X-HE-Meta: U2FsdGVkX1+QCtjTgihLCCnrNZ/SO0B5k/BOl4PdiiV7gmUBHvVPwk6WeDtG8iYTfQxbbLEEhAnjxgM3jVnqmHkc3vJVvEkaUG4e99SOFrAC3qMO6VsIdaDl4NbJDvFaH/jtskswyyL5B8Nzf1QGEwlQj79zcMxBB1HR9azLQLgIRzWUql7IVje5gIFrRhg/27vlyDdr03xON96pd+hnUExj1xsn0jKq7wUZLGaWbMuMuLokRcJZfHObG+RgG+0jF25a84pICNIeqWMAazMflqDdXv9cjDg8JSwDbB1VSknfbLwM21T42NzOeFvxPOQo+2vbzf+MJ5H/woodq+tCUeTjZd+vxY+jh929hvlkGOH76lhIetSDe7f6VMFxmhvumh+2FUZYVj+NIKIdobhaKlQqyxHwTy5DuztJUyvoNHrxvnYtv55TeUOgV38zCkyo5LDNir5SUvC8bjZ0Qk3jUuCsoaV292YSjYG3aMEfrl/ftIii5xcDEbe2dSHshjuDI3qsyoSLmE9d7ri7CYv4apZJ4F+uLO+M9bwsSoP0OTR1kSkEh57VS4dhE9e7z5wtIAnQzlX9ZxL0HX7Xk4Xq4/ffWJjnztOIi2SfF7AGR+VMIDJcjn13aV9j2KylNX88RvaSQyKOljU9EFK5JbgiiGN4MPdp8P+sz62KMps+ca2bqGm93qSeSHeKxQINMvWHUG5nMPY2wbHZDQuQmL8bbb2gpCQGlexWWdtZ7VAfwSf+heOndMKLE8bpL8aIMyXywph+47PDHgzXHoMsGYjSOTBSWaUPsitsyCkaqxwFYEwuHyusNrAXtekaM6BzgfJKzW+FvcAMZQScGVcFbHoAxY9XXMm0fgh8zogjptJEooHGzbflqR67tok0BbagG6aXtgQ4YCt3VUJGbR+a/XrCaFJg6UEm92pR6I37dA4jyDDbiQGQO/OU38TLXBgld88rjlE6iyyij1lHMV6qb4Q P0GG9tKm 4zYUsWQTFJS694bACaN+YRHzTXAL1BOFdrQ8zlVvJJckmhic/JoXkNplz61hj2ggFyZ1aJJWRG9sJMXn/J52GuLszA17Qgvpy1FNhEAjFrNFSksFsChUF4tejwGkkHQ3odJCLwDEJBOVhhA8sA+9mIyBTLs4Ctmf2GBlPTsw1UE/NC2kMZcpPt2anupY3CBdzf1EqXiabC5DGldoasHAx+7Xd74nKMrMFVEv3t+0+G9Ro6HhQ2r5enQIFhL396UjYs6Oa/zAqAbRK14SPzQy+0N58R9NruqZCkL7aC9Y/yKNhibkpVvsGlzlm3M1oDT3VjMV3w6C2GExBp4F9WptIPehorEGLRD8q8nK7kE3xX0v1chp40PvJvDv7NVep0vYyze1ne0zbxEmzibqJlH7jbsarM/gkEngpnkyIgSV4khHDHNM= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000019, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On 16.05.23 07:29, Huang Ying wrote: > The general rule to use a swap entry is as follows. > > When we get a swap entry, if there isn't some other way to prevent > swapoff, such as page lock for swap cache, page table lock, etc., the > swap entry may become invalid because of swapoff. Then, we need to > enclose all swap related functions with get_swap_device() and > put_swap_device(), unless the swap functions call > get/put_swap_device() by themselves. > > Add the rule as comments of get_swap_device(), and cleanup some > functions which call get/put_swap_device(). > > 1. Enlarge the get/put_swap_device() protection range in > __read_swap_cache_async(). This makes the function a little easier to > be understood because we don't need to consider swapoff. And this > makes it possible to remove get/put_swap_device() calling in some > function called by __read_swap_cache_async(). > > 2. Remove get/put_swap_device() in __swap_count(). Which is call in > do_swap_page() only, which encloses the call with get/put_swap_device() > already. > > 3. Remove get/put_swap_device() in __swp_swapcount(). Which is call > in __read_swap_cache_async() only, which encloses the call with > get/put_swap_device() already. > > 4. Remove get/put_swap_device() in __swap_duplicate(). Which is called > by > > - swap_shmem_alloc(): the 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() already. > > Other get/put_swap_device() usages are checked too. I suggest splitting this patch up into logical pieces as outlined here by you already. -- Thanks, David / dhildenb