From patchwork Thu Jun 6 11:58:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13688379 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 BEE60C25B75 for ; Thu, 6 Jun 2024 11:59:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 622EB6B009E; Thu, 6 Jun 2024 07:59:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 583646B009F; Thu, 6 Jun 2024 07:59:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 426026B00A0; Thu, 6 Jun 2024 07:59:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 0A7216B009E for ; Thu, 6 Jun 2024 07:59:20 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id BDB35140545 for ; Thu, 6 Jun 2024 11:59:19 +0000 (UTC) X-FDA: 82200318438.22.CD77BF3 Received: from out30-132.freemail.mail.aliyun.com (out30-132.freemail.mail.aliyun.com [115.124.30.132]) by imf18.hostedemail.com (Postfix) with ESMTP id B7E4F1C001E for ; Thu, 6 Jun 2024 11:59:17 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=xsYDLQZl; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf18.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.132 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1717675158; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=7zHkhAgm6YTME5U/JXdAOzuXxbjqoNiOEPH5oon2/bk=; b=7YW0c4liQwBEfXNFOjKh4vsgP/xfTxCn7N+d84S2c/m8fa9GhzTCDnt1c0aqDHruS1Npti +bIPTB9ZX3w60RuKnI1TLPs8bXlIoCwRYKIwAJvl86hx5JwN+nnGWbpetcj0z+fCROdB6J eXBSj3ePGr4OXl5UT3BPcaIx6GA9baQ= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=xsYDLQZl; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf18.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.132 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717675158; a=rsa-sha256; cv=none; b=LvdQQoAp2Nqgbo32jA89o4ZDpsKQpJIEeKGcEN9ajW82sCBkoPlgoufzub9y6PHT8HBbgl 9gKvZix7k1/OewjXy0XwXPixaT3ihHRQDkJXe2mpOaHfdtgLwoXE6byvJfKaO6NZSb2FV+ 0ASf6xEPpKLXxAbLcvreri1VhrBOdYQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1717675154; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=7zHkhAgm6YTME5U/JXdAOzuXxbjqoNiOEPH5oon2/bk=; b=xsYDLQZl63Y4HRu7ffDwKA0NFWjlAQRMSBQB9ac8eiLrJ4TFsqm6zCEl8way1RoOuRUJcv5FW5X9d3ANF/WUhPEJGsJi/DX+z4ckUCm5Ml3Vv2uNhn1TmYe6t3GrFeDlkQSqawBj+RBBFdnXiXHc5/qTYFVqcFpYRzxx0CbNA50= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R161e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033068173054;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=17;SR=0;TI=SMTPD_---0W7y6tpB_1717675152; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0W7y6tpB_1717675152) by smtp.aliyun-inc.com; Thu, 06 Jun 2024 19:59:12 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, wangkefeng.wang@huawei.com, chrisl@kernel.org, ying.huang@intel.com, 21cnbao@gmail.com, ryan.roberts@arm.com, shy828301@gmail.com, ziy@nvidia.com, ioworker0@gmail.com, da.gomez@samsung.com, p.raghav@samsung.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/7] mm: swap: extend swap_shmem_alloc() to support batch SWAP_MAP_SHMEM flag setting Date: Thu, 6 Jun 2024 19:58:52 +0800 Message-Id: X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: B7E4F1C001E X-Stat-Signature: s6m6pfz4fdernhwrreh4fwz7ih1mtg4g X-Rspam-User: X-Rspamd-Server: rspam04 X-HE-Tag: 1717675157-345548 X-HE-Meta: U2FsdGVkX19bUvhzj/G+c0oB9m5cOkJVOhz5dyPcplNq2+JfXzLQs2uDB2JqZmiMYdB6PirDEc2NYo405SyhusC7Z7NC+ZV/4up6Ud+KdwudcvRXL9AhEPfm/0bd6sTYNjvB3XexXNETEdEZ2VTgU1ioLVW/rimVip9KixOQL9PGPy0jfA2O908h8l6eLlVtdT2xOsDwV3kdt1tNX+F/1pFkLAlziuXXbk1oA0xBy8IJpOEFpTszTb/TmXQEt5xe4DIoq1IcP5AL7FbAIvWz/+EDeM9OVc8X+q4vcPk+2ThrMYvA5QN2VzIXUx1uEdzcG24ZneeXEEpc6v+nfISx2DMwjnJEzGwAEE4BwEhqErdEV0nKNg0zRYxkDMN0Q5l/6tTa3Y5Azu1z9hR15SfpD8I4jzIT+44HjAIFxMDZB74OKqhEIYWJHYk01p56M5lZKtv+0n1btMBfdkt1S/H2hDWfg7pQWUCg+k1XSKyh5e/EouRi+V+MrjlhGKmueUfAFfYCEaiKxrevX8PavvhVeyiJl04IBxjPHmH9inAxMo4jGHjPuyZwhynKesovlhx3uWqlvZpsDsOSsMdd9QjXmutlmfU7WaZtIpvknwrR0lsjfp2RrAKBkuS9ovzBK5s+h2uYomnuo3Tars1XZ+GNQhIBh4P3NSO6al2tvFro+XpobVM9GqXpoE9EWMoZgQxeHmEqRl39gVJAQVZGaBNN+sjZMDIqGbn+bSxlRWNAxUWRFoy1m4u5CAUpwPlvY6dVblkhq5olOXySZTMBiTJSWYBxxWUic8G0k2Ks+LoSx3nxyOHzjrEIc6KjrKVzqqL9yrAjsjNusfSpPIHyAABeqepKYEt7wSvcZ0s+Z4z5pIeA3+ikm2qomgjnn/shM8BmJxTW/XYHu+Kjc/fddWAHt4rSas2QIDGCjj1DE3Lxh9gcxTZ55WRMJoEjSSerTKLFSmw79xnlYFdV837WBTx RF+bweo2 YmdVy9d/xxKHr+nvB410lF4ixWix5w/nLlwWg+NaKjij0NhXaQTzr+qnDnpYrZNjXyt5jpCNcr6uTzovt0HOCyW7Eh2Ju2HcspECJR/KPtrrcUWp132lwMvmPIyBBkmZ57BirJ5dNBzCzFjUGBEaR3RueeI7DCIbL40kIEYRPvfTmFsRD8Y9oiPu3bnDpQFwt72aK4CWeFUba2/J6onBOkWoVzt21Nw6kHtNqMmLgQKoNFVwdy2njw7DQ/xb4TL/pZfINP9x++uBgObkvLd92u5KeyECiCsvOMwli 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: To support shmem large folio swap operations, add a new parameter to swap_shmem_alloc() that allows batch SWAP_MAP_SHMEM flag setting for shmem swap entries. While we are at it, using folio_nr_pages() to get the number of pages of the folio as a preparation. Signed-off-by: Baolin Wang --- include/linux/swap.h | 4 +- mm/shmem.c | 6 ++- mm/swapfile.c | 98 +++++++++++++++++++++++--------------------- 3 files changed, 57 insertions(+), 51 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index 3df75d62a835..4a76ab0b4a7f 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -477,7 +477,7 @@ 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); +extern void swap_shmem_alloc(swp_entry_t, int); extern int swap_duplicate(swp_entry_t); extern int swapcache_prepare(swp_entry_t); extern void swap_free_nr(swp_entry_t entry, int nr_pages); @@ -544,7 +544,7 @@ static inline int add_swap_count_continuation(swp_entry_t swp, gfp_t gfp_mask) return 0; } -static inline void swap_shmem_alloc(swp_entry_t swp) +static inline void swap_shmem_alloc(swp_entry_t swp, int nr) { } diff --git a/mm/shmem.c b/mm/shmem.c index d9a11950c586..174d8ae25b9b 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1433,6 +1433,7 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc) struct shmem_sb_info *sbinfo = SHMEM_SB(inode->i_sb); swp_entry_t swap; pgoff_t index; + int nr_pages; /* * Our capabilities prevent regular writeback or sync from ever calling @@ -1465,6 +1466,7 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc) } index = folio->index; + nr_pages = folio_nr_pages(folio); /* * This is somewhat ridiculous, but without plumbing a SWAP_MAP_FALLOC @@ -1517,8 +1519,8 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc) if (add_to_swap_cache(folio, swap, __GFP_HIGH | __GFP_NOMEMALLOC | __GFP_NOWARN, NULL) == 0) { - shmem_recalc_inode(inode, 0, 1); - swap_shmem_alloc(swap); + shmem_recalc_inode(inode, 0, nr_pages); + swap_shmem_alloc(swap, nr_pages); shmem_delete_from_page_cache(folio, swp_to_radix_entry(swap)); mutex_unlock(&shmem_swaplist_mutex); diff --git a/mm/swapfile.c b/mm/swapfile.c index 9c6d8e557c0f..1dde413264e2 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -3362,62 +3362,58 @@ void si_swapinfo(struct sysinfo *val) * - swap-cache reference is requested but the entry is not used. -> ENOENT * - swap-mapped reference requested but needs continued swap count. -> ENOMEM */ -static int __swap_duplicate(swp_entry_t entry, unsigned char usage) +static int __swap_duplicate(struct swap_info_struct *p, unsigned long offset, + int nr, unsigned char usage) { - struct swap_info_struct *p; struct swap_cluster_info *ci; - unsigned long offset; unsigned char count; unsigned char has_cache; - int err; + int err, i; - p = swp_swap_info(entry); - - offset = swp_offset(entry); ci = lock_cluster_or_swap_info(p, offset); - count = p->swap_map[offset]; - - /* - * swapin_readahead() doesn't check if a swap entry is valid, so the - * swap entry could be SWAP_MAP_BAD. Check here with lock held. - */ - if (unlikely(swap_count(count) == SWAP_MAP_BAD)) { - err = -ENOENT; - goto unlock_out; - } - - has_cache = count & SWAP_HAS_CACHE; - count &= ~SWAP_HAS_CACHE; - err = 0; - - if (usage == SWAP_HAS_CACHE) { + for (i = 0; i < nr; i++) { + count = p->swap_map[offset + i]; - /* set SWAP_HAS_CACHE if there is no cache and entry is used */ - if (!has_cache && count) - has_cache = SWAP_HAS_CACHE; - else if (has_cache) /* someone else added cache */ - err = -EEXIST; - else /* no users remaining */ + /* + * swapin_readahead() doesn't check if a swap entry is valid, so the + * swap entry could be SWAP_MAP_BAD. Check here with lock held. + */ + if (unlikely(swap_count(count) == SWAP_MAP_BAD)) { err = -ENOENT; + break; + } - } else if (count || has_cache) { + has_cache = count & SWAP_HAS_CACHE; + count &= ~SWAP_HAS_CACHE; + err = 0; + + if (usage == SWAP_HAS_CACHE) { + /* set SWAP_HAS_CACHE if there is no cache and entry is used */ + if (!has_cache && count) + has_cache = SWAP_HAS_CACHE; + else if (has_cache) /* someone else added cache */ + err = -EEXIST; + else /* no users remaining */ + err = -ENOENT; + } else if (count || has_cache) { + if ((count & ~COUNT_CONTINUED) < SWAP_MAP_MAX) + count += usage; + else if ((count & ~COUNT_CONTINUED) > SWAP_MAP_MAX) + err = -EINVAL; + else if (swap_count_continued(p, offset + i, count)) + count = COUNT_CONTINUED; + else + err = -ENOMEM; + } else + err = -ENOENT; /* unused swap entry */ - if ((count & ~COUNT_CONTINUED) < SWAP_MAP_MAX) - count += usage; - else if ((count & ~COUNT_CONTINUED) > SWAP_MAP_MAX) - err = -EINVAL; - else if (swap_count_continued(p, offset, count)) - count = COUNT_CONTINUED; - else - err = -ENOMEM; - } else - err = -ENOENT; /* unused swap entry */ + if (err) + break; - if (!err) - WRITE_ONCE(p->swap_map[offset], count | has_cache); + WRITE_ONCE(p->swap_map[offset + i], count | has_cache); + } -unlock_out: unlock_cluster_or_swap_info(p, ci); return err; } @@ -3426,9 +3422,12 @@ static int __swap_duplicate(swp_entry_t entry, unsigned char usage) * Help swapoff by noting that swap entry belongs to shmem/tmpfs * (in which case its reference count is never incremented). */ -void swap_shmem_alloc(swp_entry_t entry) +void swap_shmem_alloc(swp_entry_t entry, int nr) { - __swap_duplicate(entry, SWAP_MAP_SHMEM); + struct swap_info_struct *p = swp_swap_info(entry); + unsigned long offset = swp_offset(entry); + + __swap_duplicate(p, offset, nr, SWAP_MAP_SHMEM); } /* @@ -3440,9 +3439,11 @@ void swap_shmem_alloc(swp_entry_t entry) */ int swap_duplicate(swp_entry_t entry) { + struct swap_info_struct *p = swp_swap_info(entry); + unsigned long offset = swp_offset(entry); int err = 0; - while (!err && __swap_duplicate(entry, 1) == -ENOMEM) + while (!err && __swap_duplicate(p, offset, 1, 1) == -ENOMEM) err = add_swap_count_continuation(entry, GFP_ATOMIC); return err; } @@ -3457,7 +3458,10 @@ int swap_duplicate(swp_entry_t entry) */ int swapcache_prepare(swp_entry_t entry) { - return __swap_duplicate(entry, SWAP_HAS_CACHE); + struct swap_info_struct *p = swp_swap_info(entry); + unsigned long offset = swp_offset(entry); + + return __swap_duplicate(p, offset, 1, SWAP_HAS_CACHE); } void swapcache_clear(struct swap_info_struct *si, swp_entry_t entry)