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 DFE73C369D3 for ; Tue, 22 Apr 2025 14:41:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 36C086B0005; Tue, 22 Apr 2025 10:41:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 31A4E6B0006; Tue, 22 Apr 2025 10:41:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 20A506B0007; Tue, 22 Apr 2025 10:41:41 -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 035DF6B0005 for ; Tue, 22 Apr 2025 10:41:40 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id A2B46C1C92 for ; Tue, 22 Apr 2025 14:41:41 +0000 (UTC) X-FDA: 83361943602.19.0E9BEF6 Received: from out-173.mta1.migadu.com (out-173.mta1.migadu.com [95.215.58.173]) by imf08.hostedemail.com (Postfix) with ESMTP id BDCE6160004 for ; Tue, 22 Apr 2025 14:41:39 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=KkmYdZRA; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf08.hostedemail.com: domain of yosry.ahmed@linux.dev designates 95.215.58.173 as permitted sender) smtp.mailfrom=yosry.ahmed@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745332900; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Vyd+N7ix2s2qiHf7u+8PYPa1V/Nz2f9Sgk8z0rzIogw=; b=p6Jx4tzEMLlHOTb1MeeYsYoZk45YsbXP+9cLtTuXnBs5kXuY1M1BBOAxr6B20S4FqRjwUH AvHHkaieKNWUZILq57JHDPqsQPO2khW0VkUC256GqpIYH/r69a3jtOvGf0p2jEIWyrROqB kfQbCbECcxbsg6LWF/NH4BxSbFhopwA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745332900; a=rsa-sha256; cv=none; b=wkotNWfQwGpZKSn5Toed38VJy1PgnadMQ8xHkpVnRYKbcav3n6NxoxBeQtJqhLHVmlJmji swqxWiWjt1dhnj/W1T/lO4lcKSaXgOaufJqJGwurzkY/N68H0v9PDMG7B7NqzENge4hfP4 T37TxCNFLbNAHp72bCI7QEan4Zunh5I= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=KkmYdZRA; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf08.hostedemail.com: domain of yosry.ahmed@linux.dev designates 95.215.58.173 as permitted sender) smtp.mailfrom=yosry.ahmed@linux.dev Date: Tue, 22 Apr 2025 07:41:24 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1745332896; 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: in-reply-to:in-reply-to:references:references; bh=Vyd+N7ix2s2qiHf7u+8PYPa1V/Nz2f9Sgk8z0rzIogw=; b=KkmYdZRAY57gqhIHaTcv3T4asZSyWxp+41awkJRHBMwHupZ+Ny0P8O25Uj98mqp2/XNb5v zgkEyJxfgTh7/dSUqRKZapHjKrUx8FURAEQcPkl1WQ4KndYhUNMmqHi1i1JsRoKRF6YSs7 hQ6pA4setMf7aM/il45tyGApQfXsNCY= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Yosry Ahmed To: Johannes Weiner Cc: Nhat Pham , linux-mm@kvack.org, akpm@linux-foundation.org, hughd@google.com, mhocko@kernel.org, roman.gushchin@linux.dev, shakeel.butt@linux.dev, muchun.song@linux.dev, len.brown@intel.com, chengming.zhou@linux.dev, kasong@tencent.com, chrisl@kernel.org, huang.ying.caritas@gmail.com, ryan.roberts@arm.com, viro@zeniv.linux.org.uk, baohua@kernel.org, osalvador@suse.de, lorenzo.stoakes@oracle.com, christophe.leroy@csgroup.eu, pavel@kernel.org, kernel-team@meta.com, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-pm@vger.kernel.org Subject: Re: [RFC PATCH 03/14] mm: swap: add a separate type for physical swap slots Message-ID: References: <20250407234223.1059191-1-nphamcs@gmail.com> <20250407234223.1059191-4-nphamcs@gmail.com> <20250408141555.GA816@cmpxchg.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250408141555.GA816@cmpxchg.org> X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: BDCE6160004 X-Rspam-User: X-Stat-Signature: gnen1ynjecow6hpx5ninyxkyhrwe5c57 X-HE-Tag: 1745332899-56607 X-HE-Meta: U2FsdGVkX1/7sbVqvt1Buxf/H5aZopf87HTX5+S/BvvWwhQnVrsO9O2WqnWQi8g81D8l6ApizqX+vBfoyuE8hZ2nkiCMaFnuO0V2NFm8Q2+OueHUvauV1HEHusqOS5aZYsdas/VUnnrpzjJs5BKtksqj0c/kOw0Odey3ckbjbWKliMSwS+BwzDl7Lg19DzrBsGXatdBQrG2NzsqPYgFG5YSvkslD6Jk7OqYpZcGwb/5AOkNKw3nRfI53khtfM8jflb+zWnzskIbxu6ny+JDPp7Bv0/dcV85zFnON1VMuWbv0zsXDwH9BtTSE+z3xQ+8h6qfaaqcxuJGR8ZrMlFXL6aIAqcMB68NisooyIf4sbnlP52MOOQ8BqGmV2q7QxPgHtc1dQb7F1jt+Sia2Vo8dBPRGzEz01pdLv0za8vKxzJv1NlxOEzJqiYR4ZxDqF6MAVvkzc1diXm16XLMKvqxeGABcnTTiQlQSv+WqE+EcP7LQWDRVDLf1r3xEqX5RzjgI5/V/F980QNfCNk43kUdTamY1puJkV7jrvvZVo9yxtHEnsaorfOeKrjvy3NaG9fjsweP7xN4U4uZ5Ozp8ZXhayeBNTBPqkEta5CHdV28l3epnLhKFXIzllLkkdt6ENQgBtxGcboPVWQFVpxa0ADFzr3m7pYy++56BQFnPrUFyE3qhw6CPMujIveOKTfGyylkV8m5vBEUpDbEj044Kcyz+MyyYAhh56IFD2XAUQqslly5WxN2xdJYnYzX9PZs6wGKhFyUOqzV7rm5RD5ce2lD33KKT4HjJfPCnfCdRLx46wKPPUL6AR64NzBd10iEDpyOOgEBtOqTiul8oFTFbgzWU90gbPIU33KkNs2ArSmfGv3GaZL0FmF60vowLrIbb2lIU5Pyc703SnliCyAB6EFMYy7Aw8bIfEkxVwstzzSQL+VGlCs2m2bXsv8u+hRgSbYBS 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 Tue, Apr 08, 2025 at 10:15:55AM -0400, Johannes Weiner wrote: > On Mon, Apr 07, 2025 at 04:42:04PM -0700, Nhat Pham wrote: > > In preparation for swap virtualization, add a new type to represent the > > physical swap slots of swapfile. This allows us to separates: > > > > 1. The logical view of the swap entry (i.e what is stored in page table > > entries and used to index into the swap cache), represented by the > > old swp_entry_t type. > > > > from: > > > > 2. Its physical backing state (i.e the actual backing slot on the swap > > device), represented by the new swp_slot_t type. > > > > The functions that operate at the physical level (i.e on the swp_slot_t > > types) are also renamed where appropriate (prefixed with swp_slot_* for > > e.g). We also take this opportunity to re-arrange the header files > > (include/linux/swap.h and swapops.h), grouping the swap API into the > > following categories: > > > > 1. Virtual swap API (i.e functions on swp_entry_t type). > > > > 2. Swap cache API (mm/swap_state.c) > > > > 3. Swap slot cache API (mm/swap_slots.c) > > > > 4. Physical swap slots and device API (mm/swapfile.c). > > This all makes sense. > > However, > > > @@ -483,50 +503,37 @@ static inline long get_nr_swap_pages(void) > > return atomic_long_read(&nr_swap_pages); > > } > > > > -extern void si_swapinfo(struct sysinfo *); > > -swp_entry_t folio_alloc_swap(struct folio *folio); > > -bool folio_free_swap(struct folio *folio); > > -void put_swap_folio(struct folio *folio, swp_entry_t entry); > > -extern swp_entry_t get_swap_page_of_type(int); > > -extern int get_swap_pages(int n, swp_entry_t swp_entries[], int order); > > -extern int add_swap_count_continuation(swp_entry_t, gfp_t); > > -extern void swap_shmem_alloc(swp_entry_t, int); > > -extern int swap_duplicate(swp_entry_t); > > -extern int swapcache_prepare(swp_entry_t entry, int nr); > > -extern void swap_free_nr(swp_entry_t entry, int nr_pages); > > -extern void swapcache_free_entries(swp_entry_t *entries, int n); > > -extern void free_swap_and_cache_nr(swp_entry_t entry, int nr); > > +void si_swapinfo(struct sysinfo *); > > +swp_slot_t swap_slot_alloc_of_type(int); > > +int swap_slot_alloc(int n, swp_slot_t swp_slots[], int order); > > +void swap_slot_free_nr(swp_slot_t slot, int nr_pages); > > +void swap_slot_cache_free_slots(swp_slot_t *slots, int n); > > int swap_type_of(dev_t device, sector_t offset); > > +sector_t swapdev_block(int, pgoff_t); > > int find_first_swap(dev_t *device); > > -extern unsigned int count_swap_pages(int, int); > > -extern sector_t swapdev_block(int, pgoff_t); > > -extern int __swap_count(swp_entry_t entry); > > -extern int swap_swapcount(struct swap_info_struct *si, swp_entry_t entry); > > -extern int swp_swapcount(swp_entry_t entry); > > -struct swap_info_struct *swp_swap_info(swp_entry_t entry); > > +unsigned int count_swap_pages(int, int); > > +struct swap_info_struct *swap_slot_swap_info(swp_slot_t slot); > > struct backing_dev_info; > > -extern int init_swap_address_space(unsigned int type, unsigned long nr_pages); > > -extern void exit_swap_address_space(unsigned int type); > > -extern struct swap_info_struct *get_swap_device(swp_entry_t entry); > > +struct swap_info_struct *swap_slot_tryget_swap_info(swp_slot_t slot); > > sector_t swap_folio_sector(struct folio *folio); > > this is difficult to review. > > Can you please split out: > > 1. Code moves / cut-and-paste > > 2. Renames > > 3. New code > > into three separate steps +1, I agree with the fundamental change (and is something that I attempted before), but it's really difficult to parse :) Also, weren't the swap slots scheduled for removal or is my brain making stuff up again?