> -----Original Message----- > From: Johannes Weiner <hannes@xxxxxxxxxxx> > Sent: Monday, September 30, 2024 6:14 PM > To: Sridhar, Kanchana P <kanchana.p.sridhar@xxxxxxxxx> > Cc: linux-kernel@xxxxxxxxxxxxxxx; linux-mm@xxxxxxxxx; > yosryahmed@xxxxxxxxxx; nphamcs@xxxxxxxxx; > chengming.zhou@xxxxxxxxx; usamaarif642@xxxxxxxxx; > shakeel.butt@xxxxxxxxx; ryan.roberts@xxxxxxx; Huang, Ying > <ying.huang@xxxxxxxxx>; 21cnbao@xxxxxxxxx; akpm@xxxxxxxxxxxxxxxxxxxx; > willy@xxxxxxxxxxxxx; Zou, Nanhai <nanhai.zou@xxxxxxxxx>; Feghali, Wajdi K > <wajdi.k.feghali@xxxxxxxxx>; Gopal, Vinodh <vinodh.gopal@xxxxxxxxx> > Subject: Re: [PATCH v9 6/7] mm: zswap: Support large folios in zswap_store(). > > On Mon, Sep 30, 2024 at 03:12:20PM -0700, Kanchana P Sridhar wrote: > > /********************************* > > * main API > > **********************************/ > > -bool zswap_store(struct folio *folio) > > + > > +/* > > + * Stores the page at specified "index" in a folio. > > There is no more index and no folio in this function. > > > + * > > + * @page: The page to store in zswap. > > + * @objcg: The folio's objcg. Caller has a reference. > > + * @pool: The zswap_pool to store the compressed data for the page. > > + * The caller should have obtained a reference to a valid > > + * zswap_pool by calling zswap_pool_tryget(), to pass as this > > + * argument. > > + * @tree: The xarray for the @page's folio's swap. > > This doesn't look safe. > > If the entries were to span a SWAP_ADDRESS_SPACE_SHIFT boundary, the > subpage entries would need to be spread out to different trees also. > Otherwise, it would break loading and writeback down the line. > > I *think* it works right now, but at best it's not very future proof. > Please look up the tree inside the function for the specific > swp_entry_t that is being stored. > > Same for the unwind/check_old: section. > > > + * @compressed_bytes: The compressed entry->length value is added > > + * to this, so that the caller can get the total > > + * compressed lengths of all sub-pages in a folio. > > + */ > > With just one caller, IMO the function comment can be dropped... > > > /* allocate entry */ > > - entry = zswap_entry_cache_alloc(GFP_KERNEL, folio_nid(folio)); > > + entry = zswap_entry_cache_alloc(GFP_KERNEL, > folio_nid(page_folio(page))); > > page_to_nid() is safe to use here. > > > +bool zswap_store(struct folio *folio) > > +{ > > + long nr_pages = folio_nr_pages(folio); > > + swp_entry_t swp = folio->swap; > > + struct xarray *tree = swap_zswap_tree(swp); > > + struct obj_cgroup *objcg = NULL; > > + struct mem_cgroup *memcg = NULL; > > + struct zswap_pool *pool; > > + size_t compressed_bytes = 0; > > + bool ret = false; > > + long index; > > + > > + VM_WARN_ON_ONCE(!folio_test_locked(folio)); > > + VM_WARN_ON_ONCE(!folio_test_swapcache(folio)); > > + > > + if (!zswap_enabled) > > + goto check_old; > > + > > + /* > > + * Check cgroup zswap limits: > > + * > > + * The cgroup zswap limit check is done once at the beginning of > > + * zswap_store(). The cgroup charging is done once, at the end > > + * of a successful folio store. What this means is, if the cgroup > > + * was within the zswap_max limit at the beginning of a large folio > > + * store, it could go over the limit by at most (HPAGE_PMD_NR - 1) > > + * pages due to this store. > > + */ > > + objcg = get_obj_cgroup_from_folio(folio); > > + if (objcg && !obj_cgroup_may_zswap(objcg)) { > > + memcg = get_mem_cgroup_from_objcg(objcg); > > + if (shrink_memcg(memcg)) { > > + mem_cgroup_put(memcg); > > + goto put_objcg; > > + } > > + mem_cgroup_put(memcg); > > + } > > + > > + /* > > + * Check zpool utilization against zswap limits: > > + * > > + * The zswap zpool utilization is also checked against the limits > > + * just once, at the start of zswap_store(). If the check passes, > > + * any breaches of the limits set by zswap_max_pages() or > > + * zswap_accept_thr_pages() that may happen while storing this > > + * folio, will only be detected during the next call to > > + * zswap_store() by any process. > > + */ > > + if (zswap_check_limits()) > > + goto put_objcg; > > There has been some back and forth on those comments. Both checks are > non-atomic and subject to races, so mentioning the HPAGE_PMD_NR - 1 > overrun is somewhat misleading - it's much higher in the worst case. > > Honestly, I would just get rid of the comments. You're not changing > anything fundamental in this regard, so I don't think there is a > burden to add new comments either. > > > + > > + pool = zswap_pool_current_get(); > > + if (!pool) > > + goto put_objcg; > > + > > + if (objcg) { > > + memcg = get_mem_cgroup_from_objcg(objcg); > > + if (memcg_list_lru_alloc(memcg, &zswap_list_lru, > GFP_KERNEL)) { > > + mem_cgroup_put(memcg); > > + goto put_pool; > > + } > > + mem_cgroup_put(memcg); > > + } > > + > > + /* > > + * Store each page of the folio as a separate entry. If we fail to > > + * store a page, unwind by deleting all the pages for this folio > > + * currently in zswap. > > + */ > > The first sentence explains something that is internal to > zswap_store_page(). The second sentence IMO is obvious from the code > itself. I think you can delete this comment. > > > + for (index = 0; index < nr_pages; ++index) { > > + if (!zswap_store_page(folio_page(folio, index), objcg, pool, > tree, &compressed_bytes)) > > + goto put_pool; > > Hah, I'm not a stickler for the 80 column line limit, but this is > pushing it ;) > > Please grab the page up front. > > Yosry had also suggested replacing the compressed_bytes return > parameter with an actual return value. Basically, return compressed > bytes on success, -errno on error. I think this comment was missed > among the page_swap_entry() discussion. > > for (index = 0; index < nr_pages; index++) { > struct page *page = folio_page(folio, index); > int bytes; > > bytes = zswap_store_page(page, object, pool, tree); > if (bytes < 0) > goto put_pool; > total_bytes += bytes; > } Thanks Johannes! Appreciate your detailed code review comments. I will incorporate all the comments and submit v10. Thanks, Kanchana