From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A555F13CF9E for ; Tue, 25 Jun 2024 04:59:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719291556; cv=none; b=eDRX34ZylGku73aUSslTY8GdcTtuQECmeww6myjMVohJTTb7HLeUv6ro4gu6UefJuX9heM1AGa4au9H/moqDnCi0pTjaWpilVggoQ23MvQQDZKqQEd2tkRxIxmt4PBnnJcEkSE1VMx7VzxqqoHKotY9PH08Aj7z6SSS5oMGEdOY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719291556; c=relaxed/simple; bh=MVGWDrn6rcLfM89GSy5nzkoHvAR5PF1z1I2vHWOW6Bo=; h=Date:To:From:Subject:Message-Id; b=LN+bBYKGAebFBs1KAOOI3wURMSK8LBJTcgw/hv7OlQNHOUeiypO0+ChiBA3qvQH05ojkJj1fQU2gY6yQ/oDHOWeH4TsZbtvyPJqUrBrjn+CtxGdn6NbsV+7oIt61P0DprGSqJP5DAh9+rrFtUiNbR6Zcxw8Vtury28C592tup1s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=1JxpwLYO; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="1JxpwLYO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7718DC32782; Tue, 25 Jun 2024 04:59:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1719291556; bh=MVGWDrn6rcLfM89GSy5nzkoHvAR5PF1z1I2vHWOW6Bo=; h=Date:To:From:Subject:From; b=1JxpwLYO8oD0TDtPZkwegKF4M4lSEJkkFl/Hypuq2FGPeeHbM9Ut/StC9VFggJcof e7kJlirQvmxz7yUS/cYhZ4gH1OUrCOcsOWYux+8oQ6QV2EYtd9pkiUXgc6Uw9Z7ruQ sgMkNu4lol589lxwMw0mG++0XFKxWy+M1Yy8Wxg0= Date: Mon, 24 Jun 2024 21:59:15 -0700 To: mm-commits@vger.kernel.org,yosryahmed@google.com,ying.huang@intel.com,xiubli@redhat.com,willy@infradead.org,v-songbaohua@oppo.com,trond.myklebust@hammerspace.com,ryan.roberts@arm.com,neilb@suse.de,minchan@kernel.org,marc.dionne@auristor.com,konishi.ryusuke@gmail.com,jlayton@kernel.org,jaegeuk@kernel.org,idryomov@gmail.com,hughd@google.com,dhowells@redhat.com,david@redhat.com,chrisl@kernel.org,chao@kernel.org,anna@kernel.org,kasong@tencent.com,akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] mm-swap-get-the-swap-device-offset-directly.patch removed from -mm tree Message-Id: <20240625045916.7718DC32782@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: mm/swap: get the swap device offset directly has been removed from the -mm tree. Its filename was mm-swap-get-the-swap-device-offset-directly.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Kairui Song Subject: mm/swap: get the swap device offset directly Date: Wed, 22 May 2024 01:58:50 +0800 folio_file_pos and page_file_offset are for mixed usage of swap cache and page cache, it can't be page cache here, so introduce a new helper to get the swap offset in swap device directly. Need to include swapops.h in mm/swap.h to ensure swp_offset is always defined before use. Link: https://lkml.kernel.org/r/20240521175854.96038-9-ryncsn@gmail.com Signed-off-by: Kairui Song Reviewed-by: "Huang, Ying" Cc: Anna Schumaker Cc: Barry Song Cc: Chao Yu Cc: Chris Li Cc: David Hildenbrand Cc: David Howells Cc: Hugh Dickins Cc: Ilya Dryomov Cc: Jaegeuk Kim Cc: Jeff Layton Cc: Marc Dionne Cc: Matthew Wilcox (Oracle) Cc: Minchan Kim Cc: NeilBrown Cc: Ryan Roberts Cc: Ryusuke Konishi Cc: Trond Myklebust Cc: Xiubo Li Cc: Yosry Ahmed Signed-off-by: Andrew Morton --- mm/page_io.c | 6 +++--- mm/swap.h | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) --- a/mm/page_io.c~mm-swap-get-the-swap-device-offset-directly +++ a/mm/page_io.c @@ -280,7 +280,7 @@ static void sio_write_complete(struct ki * be temporary. */ pr_err_ratelimited("Write error %ld on dio swapfile (%llu)\n", - ret, page_file_offset(page)); + ret, swap_dev_pos(page_swap_entry(page))); for (p = 0; p < sio->pages; p++) { page = sio->bvec[p].bv_page; set_page_dirty(page); @@ -299,7 +299,7 @@ static void swap_writepage_fs(struct fol struct swap_iocb *sio = NULL; struct swap_info_struct *sis = swp_swap_info(folio->swap); struct file *swap_file = sis->swap_file; - loff_t pos = folio_file_pos(folio); + loff_t pos = swap_dev_pos(folio->swap); count_swpout_vm_event(folio); folio_start_writeback(folio); @@ -430,7 +430,7 @@ static void swap_read_folio_fs(struct fo { struct swap_info_struct *sis = swp_swap_info(folio->swap); struct swap_iocb *sio = NULL; - loff_t pos = folio_file_pos(folio); + loff_t pos = swap_dev_pos(folio->swap); if (plug) sio = *plug; --- a/mm/swap.h~mm-swap-get-the-swap-device-offset-directly +++ a/mm/swap.h @@ -5,6 +5,7 @@ struct mempolicy; #ifdef CONFIG_SWAP +#include /* for swp_offset */ #include /* for bio_end_io_t */ /* linux/mm/page_io.c */ @@ -31,6 +32,14 @@ extern struct address_space *swapper_spa (&swapper_spaces[swp_type(entry)][swp_offset(entry) \ >> SWAP_ADDRESS_SPACE_SHIFT]) +/* + * Return the swap device position of the swap entry. + */ +static inline loff_t swap_dev_pos(swp_entry_t entry) +{ + return ((loff_t)swp_offset(entry)) << PAGE_SHIFT; +} + void show_swap_cache_info(void); bool add_to_swap(struct folio *folio); void *get_shadow_from_swap_cache(swp_entry_t entry); _ Patches currently in -mm which might be from kasong@tencent.com are