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 91BF2C7EE26 for ; Tue, 23 May 2023 01:23:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D898F280001; Mon, 22 May 2023 21:23:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D39B7900003; Mon, 22 May 2023 21:23:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C0B1C280001; Mon, 22 May 2023 21:23:00 -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 ACAFF900003 for ; Mon, 22 May 2023 21:23:00 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 636A2ADF47 for ; Tue, 23 May 2023 01:22:59 +0000 (UTC) X-FDA: 80819770878.26.FB2013E Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) by imf24.hostedemail.com (Postfix) with ESMTP id 85A1918000A for ; Tue, 23 May 2023 01:22:57 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=RRV+ShNn; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf24.hostedemail.com: domain of yosryahmed@google.com designates 209.85.218.53 as permitted sender) smtp.mailfrom=yosryahmed@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684804977; 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=brU7RQ+GWstmWehtBp5kHdxVU+aQOyCqzRRA2KYgsys=; b=aCKItOkx/sxszlcgBk+nuabaSyZwrOBAdxpi4IJ5yJOJBW0/PpcuiEkCg2SmhFNsrMgknN Nv+JcPFeaYYY0wGi88cb6z11LT8GutOX2qig9tTAWrFZM8Vv1HY2a5YHeWLuRjDq79+/Jy qliCuneDynD1B2h+eOqRETANRyzSp5w= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=RRV+ShNn; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf24.hostedemail.com: domain of yosryahmed@google.com designates 209.85.218.53 as permitted sender) smtp.mailfrom=yosryahmed@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684804977; a=rsa-sha256; cv=none; b=Z9rIBiOiEwvpFegQslN9XxY1hYjI8oFh+W44ZGvFoHaC2jboJlCBon5Er6SaUDDSIf45mX 8LlgnnJfGF18aiWckaS6kbqKz/ng1fLYlG55N7uQVqu2xmeB43rexgQ8VA4bY0GqtYvuPV Ed7BP2KxRn9H3blzcqgpRDrM8Ok2CO8= Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-96f6e83e12fso615465766b.1 for ; Mon, 22 May 2023 18:22:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1684804976; x=1687396976; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=brU7RQ+GWstmWehtBp5kHdxVU+aQOyCqzRRA2KYgsys=; b=RRV+ShNnaIytj43cNL5DxFfWwXEiYfEI7QHTDKpHRkbSd1GQcbSL1FqifpijmGHxdJ SrgtyBtpHkWrdbZ4Nl2Fy/ELKSGOjjdnpPfyDdYG4znYVFyjcGYUumQrWTsvWXLErY6K Ru8DVX4ruvl2p8ryeViFmKk0jtnpz0bsFgrpC8GQLCt67Z1AhS/UuGd4E3EdX9o7i2ZJ GgpxXz28uGthrYFU2BpA0fqoNJKB7U9M0spjC9wBRj0Paw3KkDY+G4bzGsSqUqLrXkAy LGEHY0/vSJw8cd/HMCe/AF95cH9B7LY2UviFcrp2pgnEZyZGesPvN09Ll5lNEbSZmpvI PMtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684804976; x=1687396976; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=brU7RQ+GWstmWehtBp5kHdxVU+aQOyCqzRRA2KYgsys=; b=X7jbv8+UvP2RTf8fmurZjsGSMkzPBJfm3ZbYUCt9wQurZhVXFak4yha56shxlE8i8m WI7aizaAFKBiFFtiGr0wAnfK51DsK2WZg+Y5OHFmdbGpXwnbJVVzDIfw4HCbzrlEiCUz rKQXRnm0/oFV9scKb84d4vWqFZxabJWx79TNfCTXdfb9XvNnQ8FihUTqzWDpdEGj4awM U10J6dbLTsjQa14m0bAEor10aIQbl1lm/LlxSJOYBasRTqo8wD47SitXIPB+eankgafY oQJ+xbkbDPQYVcD17V3MBdjb1Q4ysxIhqVBMvwiwfxxqrRrmfLhkyfCFw7TH7NoRnaQG AHkg== X-Gm-Message-State: AC+VfDwWYBMC7sE0PgugZU6gzz8+FZdnh/06kKW9x/QL6J5pFeuaFNQG BMgp7mvaWMOSiXKgECpGuErx8j2iA9YYLkci5PEsZg== X-Google-Smtp-Source: ACHHUZ4y4eYO3dT+yBTX+IfB46arPDMcmuSL1VHTRV+iyzATjKCFPYc6PESatSozz+jwgsS3NuvXDsBv0svGb0jc50k= X-Received: by 2002:a17:907:7e9c:b0:96f:7483:529c with SMTP id qb28-20020a1709077e9c00b0096f7483529cmr12197989ejc.30.1684804975982; Mon, 22 May 2023 18:22:55 -0700 (PDT) MIME-Version: 1.0 References: <20230522070905.16773-1-ying.huang@intel.com> <20230522070905.16773-2-ying.huang@intel.com> In-Reply-To: <20230522070905.16773-2-ying.huang@intel.com> From: Yosry Ahmed Date: Mon, 22 May 2023 18:22:19 -0700 Message-ID: Subject: Re: [PATCH -V2 1/5] swap: Remove get/put_swap_device() in __swap_count() To: Huang Ying Cc: Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, David Hildenbrand , Hugh Dickins , Johannes Weiner , Matthew Wilcox , Michal Hocko , Minchan Kim , Tim Chen , Yang Shi , Yu Zhao Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 85A1918000A X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 9zd1bnogrfqp1t5ba9sf7yznqpkpsjcr X-HE-Tag: 1684804977-800808 X-HE-Meta: U2FsdGVkX19xvoI483mge/CO5kPBKYBoH7OZLljJUAosNNyV34/R50rp6ydt3K8LdnWDKEb/psxeyo5aO44oejFFELBrgXweQRZEyBljlLGoYem8xt7m7ydodzjA2Lw/Bi3kRmYgwHrW+hQ004BSdyRpCRoPeOXhY5oX4vsd+7SX7ge7J5fFYYojXE6pUzS9+eZ65WYHrzsM+Fmfzd1wSWguGb3x2J5mQcvH8V6CymxqwxuWG3hqjTaHe3YoR9HSlbSMsytlmQ5DOk8PU9htY8cY3EacFA9wq4XLLd/gHhvmq5ugqSSFZRPB8KcJWtLXt/d1+YHlX1uzc67TRIWYNA9k8Sv38HK7UDpzZCoGkWrZWljl6YJ10Yzii9pNs05ZYU7lT79qwZv9S19dlRG8sGJchmDorrB+L1Nv04iGIuFvjw2vn3frJtI+nNJhm+E+n/xoR5Qu+Iqb+OvBajItCTlN2aAaDRz/q9xTwZ4YJyNowdAwVh5cMIqWlFQ5i3eFWQURBZzBN75GYgXNKqXOLo3ZOZaXZ13sCSzdcpyA2GPf8xvVY5qeKEzq6+uSbzqxOn464+6sPqgimOeL2YHokDIN+n2JWSvtlcs1HgiGxt+ubBBv7KPvFeLpgx1jbbA3Ks7THtaI4q9PUDSJiWvPNSAIdnsk7KpfOxIJNfeKrwP6obzO8M8md9DwCmH33nh8/xcPUTVd7Ke6LSKgh2ShG3VRzmkziEz8Ts5uBgSmLKEdwaORE13aVRXS+6si6UCvp+ZuJW5B9G759G3uo/iHb57v1HAFFPYapg0ozaKr8jg/KiozaiVvgJWHNIooNcPWSneGIMtyL7GjTCZsafAcnhbNwlzAmSX3tB2p8ZPBQagC94g4JGebVCex/1/mL4PyRkl1s3oL/+6w4/c/MGICqCetf8LvMZy6lqlL+WW9X07VJT895ICU3JIk3hC4yc5V0K4jVU+jQBJXje4gEzi GfzEsU5o eiTeR4spRFjKn1JxTL3pIYUknqpQVCUgSbpAGJ+H9O8ynlllKehsQWan7vgNqEya9rVq6YlBZK2gLk5Aix9G+LwpsIqwmnWOpS48+JSLYKraOztQIcMs9ieZ9HuEjaVzCfh9Dq2p/WeDPSq/KHgoO9z6+7t/rZmBY+MwCkKNYvILv4NqiF4mtgxYYkQ3vk+8knn8sBB/8eBqk8gYcls5pamLINx7yrBssKEhTf6usKLGDfP1WNxqDKExPDr0NQRCzjIbt3oMyuevz+NsQ83c63IjCY5M0nBZSuJIOl/citqxg/Sm9xWnjinePtXYg2iXUHlpYOfr3LQ54fpge2jkkMUFd1t2HPBEEbGALnn7sitgUlAnN1/p/fddqjY0nboFmKKKJOP3U5TtXVL+YWNBE5Tyhcqx30FBVrn38xwC4I/0dZNW0pRj6N5GQlwHpuvhtspTnC1hjZnPFD8MzAJnsA3+sZ0nPdpm+mYGbrjexPoIyKERsPDuPJDnGN8/fMeTp9jzMzKJoMndaZjanbXsCIOT1DPH3vqerqNodaf7BLcS4QLzHiUcnWcFOMUZVH/DO/ovjB9B++ll4iQzsdzygXIz3uQFMBmAtCaUnbugKpr1s+wk= 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 Mon, May 22, 2023 at 12:09=E2=80=AFAM 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) > nit: I would add a comment here that the caller needs get/put_swap_device()= . Reviewed-by: Yosry Ahmed > int __swap_count(swp_entry_t entry) > { > - struct swap_info_struct *si; > + struct swap_info_struct *si =3D swp_swap_info(entry); > pgoff_t offset =3D swp_offset(entry); > - int count =3D 0; > > - si =3D get_swap_device(entry); > - if (si) { > - count =3D swap_count(si->swap_map[offset]); > - put_swap_device(si); > - } > - return count; > + return swap_count(si->swap_map[offset]); > } > > /* > -- > 2.39.2 > >