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 3EB26C77B75 for ; Mon, 22 May 2023 11:54:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8EEF26B0074; Mon, 22 May 2023 07:54:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 89EF86B0075; Mon, 22 May 2023 07:54:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7411F900002; Mon, 22 May 2023 07:54:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 628286B0074 for ; Mon, 22 May 2023 07:54:09 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 2A6E2AEACA for ; Mon, 22 May 2023 11:54:09 +0000 (UTC) X-FDA: 80817732618.23.D0DA61F 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 7206A1C000B for ; Mon, 22 May 2023 11:54:05 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fBOAjSzw; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf18.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684756445; a=rsa-sha256; cv=none; b=EkXjru/ARc/eReZCNOrwspWX8Tjdl7QiL0KxuRhWOs3LK7CUb6M0bVjNmx3G4prQv7L9AB wMVqIhmex1psIVVSAum3o8zRmcrUnL3bb8+jJSnMXfBxVAJ0JgCxPmn82q/d9X4OYQDfK8 5pApdUR7nmwgK2HQ8uHDmCm9CKmgCio= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fBOAjSzw; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf18.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684756445; 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=CmC7PRo1R7ZhJzowWuw/vFq8NrjJylR4K7gsroB369c=; b=ZGS16SXztyUdT/Fy8oTtPbxa3P/HBQZ5pvxO2bGyWmXKCkbLhS8leu6NbHuzun2llUJ4tc 9+HTD/+zQ+6DlJHqKLw05Jp0obKjvSB1pmdeZ8jxhpsHfXp6UkC/MtT0487umAYWooim1E ndNaCEPIcN6ZYpzdCrFxNDXSzc78Dn4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684756444; 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=CmC7PRo1R7ZhJzowWuw/vFq8NrjJylR4K7gsroB369c=; b=fBOAjSzwz15pUukHZwZP9+9pm+Ju1apQLlCGtxl/PJf79F6jxWs0VbuviIUz+JVHd1RsmH TB4+ObX80AJ9LkWAiWTQr52sBt+GNKoF8WJ+57O9pHodCpzZhWJGIgjLQgEFI/bjNMi0Hi xQejeAkkM4tL+8J1z2fHhnc/UPmGChI= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-484--YF1hftvPh2-Cdi0MD3UVg-1; Mon, 22 May 2023 07:54:03 -0400 X-MC-Unique: -YF1hftvPh2-Cdi0MD3UVg-1 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-3f422dc5fafso35793985e9.0 for ; Mon, 22 May 2023 04:54:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684756442; x=1687348442; 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=CmC7PRo1R7ZhJzowWuw/vFq8NrjJylR4K7gsroB369c=; b=fanW5x/Mxv+Qfo38+kcSxcOoJHGOOzCAAHwTZfyAQqUyYJCoQlqc8sQ+DnuC/43KfW ZnP9ugMaxEdrjRgrBm9pIwcfn7Ps4NLfCEu+tvDAdbfK20+qnnnDSmwKCoKvraXy/M95 LF3Yfqjy2BdSBAyk8ulRaBzGXefbbU6G8tu+9EussENgkc4Q5/kVem6fNeQpfwTuhCpz vloU3HcZtcmYMrd9o/WFy5OBtdlFjHKbq9A/vvUX1Z8nifu39wBkQfr1/PLDkmLhNOkU P9+Cj+wfGfU5R7XiRuoZQQHCajXw2/glffMMq9aNA1h64o2enYli7xnPgpQgoXYchgCZ Xzyw== X-Gm-Message-State: AC+VfDwW781vG1fN3oYwix0JdwmO/C8Qu3FDNjyi7YJSpyDIE1ddy+yi a/1GIAqnNotdIsexqpmg3D6J7NXhizTVEmyq7fIWrdes1Eum4r1tl73jhsvr+HUcFkTlt2/FDV+ yZtudaTQ6BpE= X-Received: by 2002:a1c:7c19:0:b0:3f4:2374:3512 with SMTP id x25-20020a1c7c19000000b003f423743512mr6552767wmc.18.1684756442344; Mon, 22 May 2023 04:54:02 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4EPlHuucVkDjDnagnkVzUlBwaBGqffjMZWuezvJJQlG5N32bC3QNWJX63pbfCrWjUb7Cmuzg== X-Received: by 2002:a1c:7c19:0:b0:3f4:2374:3512 with SMTP id x25-20020a1c7c19000000b003f423743512mr6552753wmc.18.1684756442017; Mon, 22 May 2023 04:54:02 -0700 (PDT) Received: from ?IPV6:2003:cb:c742:c800:d74f:aec6:f8ac:558? (p200300cbc742c800d74faec6f8ac0558.dip0.t-ipconnect.de. [2003:cb:c742:c800:d74f:aec6:f8ac:558]) by smtp.gmail.com with ESMTPSA id n6-20020a7bcbc6000000b003f42d8dd7ffsm8028624wmi.19.2023.05.22.04.54.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 22 May 2023 04:54:01 -0700 (PDT) Message-ID: <09cee859-6510-ed3c-67da-c1452a534460@redhat.com> Date: Mon, 22 May 2023 13:54:00 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: [PATCH -V2 1/5] swap: Remove get/put_swap_device() in __swap_count() 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: <20230522070905.16773-1-ying.huang@intel.com> <20230522070905.16773-2-ying.huang@intel.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: <20230522070905.16773-2-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-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 7206A1C000B X-Stat-Signature: hd4kfttf834fjxhy9h8uksncuf4tzkak X-HE-Tag: 1684756445-262415 X-HE-Meta: U2FsdGVkX18YxmOarTnSgGjZs+SqIBB/d+t48xewru/XqvWiCtbvKJwCeb4wYDgz+iZDw3i9ndwpKO0o3YfKmLfltD4Sg9Ac+DxVqXCChokCy+qn1XIlwSeoxaraUZsebWTu/a5+Qey9P33eB9CxNNL/obk1nQQ2xicv/vrnDX7Gdu55qKvt3N4hBjlU+DlLlXZ7XcdPL/9x0p7QlOWU1+1sZqTDrjmDI0xt+q/vaEfJkT+hlWr3LeisKc2E1k09jLioX8DaoBIVY3N+FlOEhScV0SJ0cfO5DS5xvw2SViPVP6vTYNamvsYEPl71amW+oZlHM4BxQRtOIMQpT3EZ2BPK2Ng35Wi8GqNGpy7QDz+QOIyJtlLZSfnlC23hJGzvIOLt0tODdssK/ghdGOPcwC/9L/Bb8ZBezlYGzK3h+NVYGLmNso3QMycb1LVxaTrxItYxR0yfZHAbQGdjIY4uDplmA9FDFHDbjPSZX9P5jQZqbxI0DasdsPdnFyO4zFkqa2M3FBAa3n6jm074hB7+dTvTgORlP0KX6OUK4xGPV0WSzfsB0D7e9ddnX6RLfrKouezuvo/pFKiJ1vyAaXKGT8QdCA1q5kwdaYRa3Zp2x5gF0VLyYwGg65miUgus0sD4WbGThtCUx1q6GiHMT7WrdpgXRkxakwtbeQ3GnOst7x3iGGYaDucrCc8AoOWIjqdDXg2uqW7vck9BJm2B6d+I1bOiGl7oNP7ZCG1+yV0E85UREEtTxzfGXxid5pp/+E47gF6Q467ogF2IG7xh1rWsg2x30FEToNOXNfx2fyRc6SP8HSavOibsTt7bTG8BN/tsrZK+FDc9ZcJ9WTYxrlS1MqhAuQBQrw25mXnnQjMK9aB97iE9PrX8QTdH6+xZ00/OkOaS/sZ2UvPUjkzHebEGX7IQt2NuC0th3v4oHAKbCCeGGb49OIaGzFJCpB+qktgL0dE6yNxkcAMCwktCbIX fnzsQtAd etF48EZM+5Yj2ZA78kWNMfvxM+VOsWPsDMyiGv+amUz76gtaxnfgFyNy7SRNO6OTgCb58TIK7OjBtKp4TbMixFYG2TnHDzdEck9yPM/yRQpU/mWhPhWyrrPrVtd3LqtcX+DBqFFfAtVy+kPgV6XPd1uiMxNX52qbb7o0Ff9POC+Ea0cJYaD+v6TiSLCnP42/osqCYDQCwlMQe/l0j7BY415DXqBE0pbYpaNhzJOi3+gLfRwCzzHnRG+3qg7sQqxv7sieBu6q8QDkhOr/pLvHK0D2GAd7tOJ39/0HPT31Hd/dD73M89duMVgdHeaG+iX28Xi63g4f0T/QRn/Sk2ctZI+w04T8q69qWgiQRt69ZCiEWxLesQOmE9gS/fn3Y0iVkmiCqDqiiKEGskb+HPEoxP+4y+QoqnE+kgI9rjQ2/WULQK+/ZUQ1k9Aky1aEs3xKfDdaJRbbzZQkxtOfaUU6MqEQe6g6PekExR0w0rwGbzBhX7xrsKP/Ro4lSZiz4Pv90taRvJDPWken6OgolvT0PYEGkoyBo+t9RjynHCeWWBxDVizL5VS2CoDxQCEsyYFaM5q4tvjhZSzAHHLXqx6azlsDDJ2JQokTJfDULRCp7HIkmb5l1D36doh3sj9aF86DfZZLdly+9m7MJJzPlJbsSn7WkeYouY54BI08C0yPvUj4qLw/74ygP4+3bTAQwR8bPtP7VEvx9dNj+iTMqoLEoZ74oN3b6pXI19EwCuQsABRTqXm97QHSaUeHmNm/7R6zaU2M2 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: On 22.05.23 09:09, Huang Ying wrote: > __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 > --- > 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]); > } > > /* That locking was added in eb085574a752 ("mm, swap: fix race between swapoff and some swap operations"). Before 2799e77529c ("swap: fix do_swap_page() race with swapoff") added the get_swap_device() to do_swap_page(). Reviewed-by: David Hildenbrand -- Thanks, David / dhildenb