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 1AE44C369A4 for ; Tue, 8 Apr 2025 14:16:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7CE72280002; Tue, 8 Apr 2025 10:16:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 77B33280001; Tue, 8 Apr 2025 10:16:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 643C7280002; Tue, 8 Apr 2025 10:16:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 45B9B280001 for ; Tue, 8 Apr 2025 10:16:03 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id A932880FFA for ; Tue, 8 Apr 2025 14:16:03 +0000 (UTC) X-FDA: 83311075806.04.5C1CC1C Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) by imf25.hostedemail.com (Postfix) with ESMTP id 546F9A001B for ; Tue, 8 Apr 2025 14:16:01 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=c8hCsf7W; dmarc=pass (policy=none) header.from=cmpxchg.org; spf=pass (imf25.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.160.176 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744121761; a=rsa-sha256; cv=none; b=LuTZnZHKkkRRoWbfOwHD/3XdERLCrnPlYESpiZMzbVrIns1Po1OUQJCIL5NI4uadXw1QPD 6eiMlmBn4Kyvb/4DWcDA5QhQPiMisTCBRC2fqfqZ2RjGYP68DvQ3sTw9oCO9s64TJFrQZX zYSPvHNi9O6k0ZTxFf53M8G98tfnAow= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=c8hCsf7W; dmarc=pass (policy=none) header.from=cmpxchg.org; spf=pass (imf25.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.160.176 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744121761; 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=ah6YTymBCtd5GZI1uE1J8/OvCttX8CmH9zAIXWl9EoY=; b=FRz1vptgAefCedhsxnQumbcg06YGOs+MkLOqvLr7fE1f5MrIXVLh9Gld2MT5rxZ/veelW/ AUuKYuusrgMy4YWJ5ci3mxNcsVOJotef/GEn4oX42TCpVwyRDAYTh9y+dzxdkoVhxE2lJc ii9HEsoxS5EHamqMWbj7y0deVaI2xG4= Received: by mail-qt1-f176.google.com with SMTP id d75a77b69052e-4772f48f516so63857381cf.1 for ; Tue, 08 Apr 2025 07:16:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20230601.gappssmtp.com; s=20230601; t=1744121760; x=1744726560; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=ah6YTymBCtd5GZI1uE1J8/OvCttX8CmH9zAIXWl9EoY=; b=c8hCsf7W4kdNqrEWnjzW0ZCbpFboQmnOeJg9bkN+NSaGMIx5fnxchN3TlRsziL1mmy hwdjWVEPH8tmd8+wpJcSXN5rHsah/IUJblJPoUKzt75kosxm34Hbw9uE8M3SsPXEwjpB UgIPzTseEEMlxxArnX3utxywcArAoCbc1/8PkZ1ljKi9nBl9drihJpaxW3SFoiriwfsq /FZXjf3iAPIbVB71KoTuxJD51iv8cfymM3pWTkxJtLKCiTsCeHsOMpnQZaJRy8EO6wDT IZd/auNfWbO1yL+2WHc1H/AGreHSMVQMVgT7y5wVg+pxSfIfH543YVBrc3n0lyQAl7OA WJTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744121760; x=1744726560; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ah6YTymBCtd5GZI1uE1J8/OvCttX8CmH9zAIXWl9EoY=; b=tDrMpv7R9EF1kX305SGXGy6jLt2S/l5fEbsNodity52+XA8cg47V68OBjcNbfBMSCj XnJsOhA9F3IiHmqDMKtZxIlQgxdRIoXoVOQgyq2quySIYrgQe+m3kCqQgoFHffUT05aP pXr7ETSyioyC7Q+NBEJlNKzH1p3xV12i8hFsOxarKtw5Q+y/a77JxjpxWuRpmXjUsJB7 taRQqLK7HRd5OGD/lR0rzqmUz5W5bNl3wFbNTLBAmbM810qBEGzGqQqXNk3AdQ31uJEz dsWSScuVIqL09ulagQVF6e0SsfVv2kxzi/WCOAvIazD0S0zmZIDz4bQ3T4DAG87dSVMY 3XiQ== X-Gm-Message-State: AOJu0Yyz/p8t69kbP9oda4TGEHaU+Yr1FAzGjrLTsbY2iSKnx4nGlS5R akHlBmXK9is8Q85je72VKouR357po4B7UrZnESDmBgc0O9gikeFy48ZLiUyCzzA= X-Gm-Gg: ASbGncuw+gNfN1JEh/yTc5JyVVFEqfx1u9QcP4Ma2HVMAMZMZYkoo7mpxySRhzv55oR 9WNUH/H7VHDmanTdtJoW2Ug0i9DktvxmLqp4l8pGc25ME/fCbNlFmnk6kYMxpsOrpDAOXiCGVaV Y7wO11HDbTHTb1rgDrc4MV7CNJLy1tUT/mJmti3ZRbud37pTEipHzbFDdCpyOOg7PHUsbWAPEkj 8yzknhI56oQ6CPFEWWdHWW/EGPyKhjDzmn12g6F7bU+R/yTDE5gEBbgmpKdTUiJgpMTKdY8wPpE ECRkQKAQYl7xoSoIuTeAefQr7dk+ZeVEco/SD8HIO1I= X-Google-Smtp-Source: AGHT+IHjj4MgbYS8ZxVYXdi4tjA8mIF1AgEuXmh5FbR2yMsDFWAWr9GN3UnFHbHD2D1SbT1qBgClxA== X-Received: by 2002:ac8:5e12:0:b0:479:1a0:3448 with SMTP id d75a77b69052e-47953ea88bfmr52199611cf.10.1744121760367; Tue, 08 Apr 2025 07:16:00 -0700 (PDT) Received: from localhost ([2603:7000:c01:2716:365a:60ff:fe62:ff29]) by smtp.gmail.com with UTF8SMTPSA id d75a77b69052e-4791b057a6esm76771061cf.16.2025.04.08.07.15.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Apr 2025 07:15:59 -0700 (PDT) Date: Tue, 8 Apr 2025 10:15:55 -0400 From: Johannes Weiner To: Nhat Pham Cc: linux-mm@kvack.org, akpm@linux-foundation.org, hughd@google.com, yosry.ahmed@linux.dev, 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: <20250408141555.GA816@cmpxchg.org> References: <20250407234223.1059191-1-nphamcs@gmail.com> <20250407234223.1059191-4-nphamcs@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250407234223.1059191-4-nphamcs@gmail.com> X-Rspamd-Queue-Id: 546F9A001B X-Stat-Signature: a5noa9ueharnt8omgp65wwyxegcc1jdj X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1744121761-146729 X-HE-Meta: U2FsdGVkX1/P+S/GtXUlDmKXgNT8muoGCYvSx1iAqAvWL0EjgY02HZeacNsRQHPXQmziEoargv+/FXKwXyMhfeTwpCBDAH20WmfbMmPGopBgPrXZB9R93jE/Awf4w5sEKdOLX3aXel+Naa5vBPuUH5g7+FJAK1RUWkjPX4etl0slRCGZa7YoaOlODWVS9Pi7D1hTe9vWAeAgjJ9z42DRRYWWJwZFf9+d0afCzIiDp+SqZcFBdJu2CeQsCSkP09V6hDXRXUlDmZhEBhu2xxtIxgGs8R2S2Rsrzq07S5rJd/Z09+tJyKbjMSKLyQyOJS4tlR+nA/ALLbFfo6zFeQt2JymehI5n4Y9pIh2ACQpFLdq0I9ItE5x8pYO7UJXahme9S8Y/Dik6M8GT9+YBnwC0cQpe9Ot5EtI3rprcRH86IiK4qEDDNZ7WWZHG0HCJBfevbL/3h5yNNETeVlSjYSSu8DPsamqd+bJ46uqnvYX6cC/J2VSqsaI7c+7FEXCKV+4isIUTN23RGTNXcRaYP1C5vV8L0IO/ixkcYHTR3omTjGNW1CxQwb6Q/7v0W69cilnSvWX7xedZJlh9N+1w9tYhJayW0FBmzS0jBbQA6GT80ceZY1VUhC/zPU89M4gWM7clsSSsit6qCIcHQIZQAHRyoO8QJvYfrgVMnaVfyLnxU2ftwIt2cQ8QqmJMA/rL3ak0GQr4dcHoGotZGMC1lSEM74mi/PUnAeFUfSPXoeLj1HITJdTMWMYvEMCroR7Z2otP6nMdAa58Hycn+ygVf2x10UsoXLJvWsC8tBsGF6v4adrBAHdGE01IvurzsE22Fa5pl9l1kLw0HlZ6dWIRbRXQlpWsBiPjmtLiyQHBTj49hew1zHnGS57iUpyXLe16XT4dzhads50w9dam/y/DYN31bDvukzkZBk9pCxE0ovdzX/L0OYpjC5vbkAHqKDmHZIqkjJrNMVGFe/mCj415GD3 0YJXyD0S 3yolrBfZGFipyWI3IXeSF5hGBgso5nyVd/RpeM82XWQ+RyMBSxkv8GSdsISOkFUn81Oe80oR7FKGJuqb4Fp4HuO7oEqqNXEvshlapj2ZoBlHU5Stuqg3jNzyDKRP8nIwHZeUoDvcfDAvOo9QnvzMBhLKT1U0gHnJjcoJBQUUyEE+OoeTGnUgV8P9DriTMXRD8d37B+VqAOmRxkpuAUMwLq4WGS37qRlBXZLjz1C+MG0Svb1jl3rxPl8q42EFR+3hGW6WTy8DNE5USTG3hsZwA65H1bs4eU4UWqhSyU7sLtAhB1EwcqqstlJzUUA99uzmOHOnDIqSIZq7+kQlgdo0upmU8jf1mUFOtlGwYgDgHf6/qCK0+hAmxQyrOb55nL/46grapa8Qr4u8/GTUwUX5+Yf0DXRXgymDApKEIoyk4a5nmhlsafarY29YsbJeWfkhUiI2k4cFy/VhEfibhSLen38wgeEZ6+RpNILfD+yO2uZ7FKyvt+KFXKG9kWkwK7S45fpKbAIhxijCjn0FT9ZM3YWv2/AEEf8Va+zU+ 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 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