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 58EB9CF6493 for ; Sat, 28 Sep 2024 08:14:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B658D6B019E; Sat, 28 Sep 2024 04:13:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B15C56B019F; Sat, 28 Sep 2024 04:13:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9B64D6B01A0; Sat, 28 Sep 2024 04:13:59 -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 7D09B6B019E for ; Sat, 28 Sep 2024 04:13:59 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 1D65E407EB for ; Sat, 28 Sep 2024 08:13:59 +0000 (UTC) X-FDA: 82613433798.22.0B1E2AF Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) by imf03.hostedemail.com (Postfix) with ESMTP id 4162020008 for ; Sat, 28 Sep 2024 08:13:57 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=X4RiSogz; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf03.hostedemail.com: domain of yosryahmed@google.com designates 209.85.218.43 as permitted sender) smtp.mailfrom=yosryahmed@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1727511146; a=rsa-sha256; cv=none; b=6b6/xCYpcYKP44rd+CggMLguhfmXNqqQbB/mUAgTylcYADSh9KsLTEIJuYcwJjM7FiAWay bcZq52QQ1X9zC3zvJdMugb1W90dQ70sRpgSm4yFBSg1VsUi/BNZCZOVCv6HxJ8r1QWnr7m hTOgRfpOpPz+6mUAkR346aGsU7B3eQw= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=X4RiSogz; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf03.hostedemail.com: domain of yosryahmed@google.com designates 209.85.218.43 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=1727511146; 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=0ex55oB2RndkmTH+vNm3pK4T3zGQ1Bq6pi9mDoc4Yk8=; b=6F/g9IS9TsGEyQZYJc3nXt58QRYuRoA+Pe+ttsKdD14FKT2wYk3q/zl7pvXXT1COtnMFAa 4BHt+/XCHnm35FiIw5ez4zm5w3IZsAucA+g3A2JHpqVySP9FXWSJKF9qrVNF2s825+AFFl KOuhbX04OsqoeVZ1aM+vfm/BaecQF7U= Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-a8b155b5e9eso423782666b.1 for ; Sat, 28 Sep 2024 01:13:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1727511236; x=1728116036; darn=kvack.org; 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=0ex55oB2RndkmTH+vNm3pK4T3zGQ1Bq6pi9mDoc4Yk8=; b=X4RiSogzZ5/6hMnZhvbY3KREQsts5TIXYf2PO0cw66lh1sTxTRsoV1xB5ROxSh10vD 1r3bCUj9UBaS3yEnK+5xkDreG59EIx37jtvKiTP8HSb/Vk28WmajzphWWigxbDi28cBw E93eO7zUsiR6KaTwKYzsDq4Kh6DH4PLh66WFKL8pWAN1NU0XKmt5KgW2tJUe9EYcZFqg 2n7ykiQ4ACpLUu9XnVyzAkTc7JlAQfyRsOudSBvIRcGYCMvb6gI3n9ZCa4Ya4fut44OX FhUfAcx6U4aAzj1jA32oDq9XUTMKuvlKZuz8eN4LZIDSpNJoR/FNhTdGa/CbJ+zKJ59w A78w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727511236; x=1728116036; 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=0ex55oB2RndkmTH+vNm3pK4T3zGQ1Bq6pi9mDoc4Yk8=; b=RqW0Xh1r9SvHfRohglbRVlgSg5X1aiF9Mp0MnqMuWEfoUcoWzjXJT03YaG4Cqb/IeZ s84bcdFSekE0d9lxYMjbFn+18kgwm+O5zqA/kzN78LzyunxxPY5VFgYxThBhu3JdvOBM 2F6wcvs/CAuSE8NZBepKFAjjZfiGMFzc6uKBwC7Al2ZoZ57F1ZPMLDlvKAvbGvN9Jq0/ Ij+tW/yhBMN3/ppUA3GeE2GHdMG98KHsaqEa6TFvNAbekHSeyHHXEI7wRA3LLK7Ulf6t sC+rQ7Ux3KkV+Nd72di+f4s2e7ZA5CAcELw9NO6kjQCRGTMY5u+6KLyICFmpO6u3h8JC gd2g== X-Forwarded-Encrypted: i=1; AJvYcCVT1ST7ZJresjmn3CAm/6sdiV/Ek6xiLaGMpqi6Gt01FsLCjMttqmIw9Im39jpAC0PTwnduNcmvDQ==@kvack.org X-Gm-Message-State: AOJu0Yy5bV0ymyYoEmLe4KJLSkYau0aU56L9EoMzOyI0Ct2RpfdHRq2j IM1zcjXCdPEqx7D+SIZJTDFaWlQLMlhutNSvttzreRPwLzyf6rItuLgR/mIM/9+3Pmo/HihZ+HS FoY67yv+y+FLcGWh7tI8bUv3DNWlWdpdd53dK X-Google-Smtp-Source: AGHT+IHJoQNvj4WuoG3BEUT6h2Z59xll4tEIN5d4r+tn2ZgXb1kCmUqkyjV2H8FNdl5OuW8kQgZzNUWmgeCCug3TXqw= X-Received: by 2002:a17:907:9344:b0:a8d:55ce:fb7f with SMTP id a640c23a62f3a-a93c4c40561mr475735066b.62.1727511235478; Sat, 28 Sep 2024 01:13:55 -0700 (PDT) MIME-Version: 1.0 References: <20240928021620.8369-1-kanchana.p.sridhar@intel.com> <20240928021620.8369-6-kanchana.p.sridhar@intel.com> In-Reply-To: <20240928021620.8369-6-kanchana.p.sridhar@intel.com> From: Yosry Ahmed Date: Sat, 28 Sep 2024 01:13:19 -0700 Message-ID: Subject: Re: [PATCH v8 5/8] mm: zswap: Modify zswap_stored_pages to be atomic_long_t. To: Kanchana P Sridhar Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, hannes@cmpxchg.org, nphamcs@gmail.com, chengming.zhou@linux.dev, usamaarif642@gmail.com, shakeel.butt@linux.dev, ryan.roberts@arm.com, ying.huang@intel.com, 21cnbao@gmail.com, akpm@linux-foundation.org, nanhai.zou@intel.com, wajdi.k.feghali@intel.com, vinodh.gopal@intel.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4162020008 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 5zw89k57415w5x9gdmrktkebgxibx9zk X-HE-Tag: 1727511237-539800 X-HE-Meta: U2FsdGVkX19GfUCZ9289TR/YG4f5EXT5B9F/tnAKIq249QI8fp//hY9+IRbvgWxx3YTT7PbkoZPm+QB7uz6xSxkE0ObDdOwQahInUnFls/116zatXe6rZl4+Tq2f9h3LLQwtc2Fxb/byowpIVYKX24lJ0Qh8qeGjboQYZ+erY3CiLGphT3wOKh5ZUi0UDfnus+gk3HdCc1QH9qDsXtNo0pcbdS99JjEdbZ284zsufyO2gfjakGNOBXtanfmkNRDX7sZtspOpygjus7L6I0yab9XUW3IKkz5Z1wFpqmVqyuMAYqzz/8/QDkNjfJ0OShBoeB+Mkinm4oYtV+57+R9r4C8yufWMOEOwrA4u/4YM6capOITCZ17fMIzDena0KGJBKlIYbNywYkO39GFnTwVQxf5Wo0Jck5rHjskOFkjefOJvVSi0JVMYTap/SuD1f1gbyjFNO+jjnwoGoOpKuIv1ZKwX63axAy0Nvswtb84Ehg15+cKOEcnLk+PM+ve4Zr9cUDHTkF7tiiMRVJKEQ6DaNnh6v3fBPdPd9MYyMGnptsPEasR0eA4JP3YeH9YfIFS2mmJ3ywXTZO8e3S6O+SERMDGHv7nvWQmUgdGy0+jJ70eDj5o80NBrkGxykdOJmiF7ab+NBcKXy3F5ufPGbuxxjyW1v2JOh+zP08xoxvGIjn7kKnSPnVsGwUPDevv6S3kD3OQd95YmY0odgBrW4SR/cX6d1ZOgrI2VEJZuVQk+0nGTC01XmgPQUPMa2RyH30HwpkyLSsJtPNd+moklZ26yTsnGud+KNVse0N6LHyVlrVzhRslX3f6rrA0hYp0xmZAuwNl0SgnpFNiruGePX2JzV+XqpJ6o/xY8XI6+4jyGEqq38/NAhMjT6ciGkhM7Mdo7tr7E+jXtEqZCVWG+JkPh6oyzA4fiCeRVPg97e1nHUSRkfLRJb9QV7G8YS1HWpevkkTADW2MZdwqUYTzQkma gnZ95Bht JmyGJ56Rh7UmzFmE+0J6eJWWl/1eAv1H9G9hi9OYIQVWVXzN87vmld8n149CvsvesF4cAyXGMkrdtlWO2QaIL4U59ykT1GqwxJlHpfUkErqBYXHTiWEBo/ZfUgem4F64/pJ8PsKy5ixnDKJr9I5U8bn2ToZk5/xeEwb5aGdex5ca1fSpyBaFRMTXe344zBO+zuenRFCVvCXFiYsbjcYke4qvHFc6wNYXS+p2Xm+ABidzMCQUQ+NR/L5j41u1lgI8qFxgtiU2WYVnoylSSIozt13gS8fAeYSigxU2p 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: List-Subscribe: List-Unsubscribe: On Fri, Sep 27, 2024 at 7:16=E2=80=AFPM Kanchana P Sridhar wrote: > > For zswap_store() to support large folios, we need to be able to do > a batch update of zswap_stored_pages upon successful store of all pages > in the folio. For this, we need to add folio_nr_pages(), which returns > a long, to zswap_stored_pages. > > Signed-off-by: Kanchana P Sridhar > --- > fs/proc/meminfo.c | 2 +- > include/linux/zswap.h | 2 +- > mm/zswap.c | 19 +++++++++++++------ > 3 files changed, 15 insertions(+), 8 deletions(-) > > diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c > index 245171d9164b..8ba9b1472390 100644 > --- a/fs/proc/meminfo.c > +++ b/fs/proc/meminfo.c > @@ -91,7 +91,7 @@ static int meminfo_proc_show(struct seq_file *m, void *= v) > #ifdef CONFIG_ZSWAP > show_val_kb(m, "Zswap: ", zswap_total_pages()); > seq_printf(m, "Zswapped: %8lu kB\n", > - (unsigned long)atomic_read(&zswap_stored_pages) << > + (unsigned long)atomic_long_read(&zswap_stored_pages) <= < Do we still need this cast? "HardwareCorrupted" seems to be using atomic_long_read() without a cast. Otherwise this LGTM: Acked-by: Yosry Ahmed > (PAGE_SHIFT - 10)); > #endif > show_val_kb(m, "Dirty: ", > diff --git a/include/linux/zswap.h b/include/linux/zswap.h > index 9cd1beef0654..d961ead91bf1 100644 > --- a/include/linux/zswap.h > +++ b/include/linux/zswap.h > @@ -7,7 +7,7 @@ > > struct lruvec; > > -extern atomic_t zswap_stored_pages; > +extern atomic_long_t zswap_stored_pages; > > #ifdef CONFIG_ZSWAP > > diff --git a/mm/zswap.c b/mm/zswap.c > index 0f281e50a034..43e4e216db41 100644 > --- a/mm/zswap.c > +++ b/mm/zswap.c > @@ -43,7 +43,7 @@ > * statistics > **********************************/ > /* The number of compressed pages currently stored in zswap */ > -atomic_t zswap_stored_pages =3D ATOMIC_INIT(0); > +atomic_long_t zswap_stored_pages =3D ATOMIC_INIT(0); > > /* > * The statistics below are not protected from concurrent access for > @@ -802,7 +802,7 @@ static void zswap_entry_free(struct zswap_entry *entr= y) > obj_cgroup_put(entry->objcg); > } > zswap_entry_cache_free(entry); > - atomic_dec(&zswap_stored_pages); > + atomic_long_dec(&zswap_stored_pages); > } > > /********************************* > @@ -1232,7 +1232,7 @@ static unsigned long zswap_shrinker_count(struct sh= rinker *shrinker, > nr_stored =3D memcg_page_state(memcg, MEMCG_ZSWAPPED); > } else { > nr_backing =3D zswap_total_pages(); > - nr_stored =3D atomic_read(&zswap_stored_pages); > + nr_stored =3D atomic_long_read(&zswap_stored_pages); > } > > if (!nr_stored) > @@ -1501,7 +1501,7 @@ bool zswap_store(struct folio *folio) > } > > /* update stats */ > - atomic_inc(&zswap_stored_pages); > + atomic_long_inc(&zswap_stored_pages); > count_vm_event(ZSWPOUT); > > return true; > @@ -1650,6 +1650,13 @@ static int debugfs_get_total_size(void *data, u64 = *val) > } > DEFINE_DEBUGFS_ATTRIBUTE(total_size_fops, debugfs_get_total_size, NULL, = "%llu\n"); > > +static int debugfs_get_stored_pages(void *data, u64 *val) > +{ > + *val =3D atomic_long_read(&zswap_stored_pages); > + return 0; > +} > +DEFINE_DEBUGFS_ATTRIBUTE(stored_pages_fops, debugfs_get_stored_pages, NU= LL, "%llu\n"); > + > static int zswap_debugfs_init(void) > { > if (!debugfs_initialized()) > @@ -1673,8 +1680,8 @@ static int zswap_debugfs_init(void) > zswap_debugfs_root, &zswap_written_back_pages)= ; > debugfs_create_file("pool_total_size", 0444, > zswap_debugfs_root, NULL, &total_size_fops); > - debugfs_create_atomic_t("stored_pages", 0444, > - zswap_debugfs_root, &zswap_stored_pages); > + debugfs_create_file("stored_pages", 0444, > + zswap_debugfs_root, NULL, &stored_pages_fops)= ; > > return 0; > } > -- > 2.27.0 >