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 7B2F6C25B74 for ; Wed, 8 May 2024 06:30:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 975B86B0088; Wed, 8 May 2024 02:30:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 925CF6B0089; Wed, 8 May 2024 02:30:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7ED166B008A; Wed, 8 May 2024 02:30:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 5CFD26B0088 for ; Wed, 8 May 2024 02:30:39 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id B6DC91C05C6 for ; Wed, 8 May 2024 06:30:38 +0000 (UTC) X-FDA: 82094254956.02.4FC0AD9 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) by imf15.hostedemail.com (Postfix) with ESMTP id E49A8A0007 for ; Wed, 8 May 2024 06:30:35 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=BCOU3YFs; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf15.hostedemail.com: domain of ying.huang@intel.com designates 192.198.163.19 as permitted sender) smtp.mailfrom=ying.huang@intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715149836; 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=a/0KRJikDbNf3c1Kz0LM/oyki79vliBCuZIzFCCoLto=; b=CMNJvlCwo3v0HQhVLkQup0mpsqCRWyXqzs+E+OradtgFWVylt1vgscPP+vZy6SBMSO8sC5 6eEpOgLhc+1ZBPh32FSzAmeaYKQkLqXSZza9ZuxQQbhg5PeBOq2uHkplq35Ar5c0+WsBdb Bc5D7KYNii1WsosOYfch+gAuEOb6V+E= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=BCOU3YFs; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf15.hostedemail.com: domain of ying.huang@intel.com designates 192.198.163.19 as permitted sender) smtp.mailfrom=ying.huang@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715149836; a=rsa-sha256; cv=none; b=i5Xww/eRuiaGQJopKqFM3gH8HgPkM3MEi6ZMnu0MN9v4TOLfJUxmhxpprFtTDveWfqdl8N Ld8iNJXw7AZHqHyqqprQT04GfdB390u0lBsNlLclk3ftZbBhjNpHtlI31XFue8TmkzGgdb NH3Km2G0driVgBKSrPq+PsDiOv84yqo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1715149836; x=1746685836; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=5jxRy94UaFRt03ZEYe2d4KvQGZLYJ8qOnRbCZ8mahzk=; b=BCOU3YFsKW2Q2e1U/vc1N/acsj+kotoMCff+4+8aWvw5nIk0YmxAfslh 6JIX2//82LFdZx62CTNc/FvwsZWmi8zyeje8FHurqSM6DQDqDaBtU2sS6 F3tGxcWgMtGKQxTh1oS4ZehIr0Cl8hWqRNXPqz3L4iXk/kqsYUrEhhhkU C1YmaRcHSlXAf7jtHflnT+80kreUDsYI/Y8eQpx1ZYlmBBY+tTCX/0lSP pdqBG962+77zQZ8zTLQj1im9evhgIxu7WmuJZ9jvxV8mLFGy/pr1h3khk e+1iiZPvvNCJp9sMqpRk71EIz+AUr3Bw7PiuSDvZv3+6CrzULN1Ry43ej Q==; X-CSE-ConnectionGUID: N/G6LET/SZyAy2QWbJTzEQ== X-CSE-MsgGUID: SIODe6ZBSI6Xvzdw2EdJmA== X-IronPort-AV: E=McAfee;i="6600,9927,11066"; a="10856019" X-IronPort-AV: E=Sophos;i="6.08,144,1712646000"; d="scan'208";a="10856019" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 May 2024 23:30:34 -0700 X-CSE-ConnectionGUID: aQ/0s7eNRzG6JHjbKHdLBg== X-CSE-MsgGUID: dak9a4neSL+mA6jf6j99og== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,144,1712646000"; d="scan'208";a="33330313" Received: from unknown (HELO yhuang6-desk2.ccr.corp.intel.com) ([10.238.208.55]) by fmviesa004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 May 2024 23:30:30 -0700 From: "Huang, Ying" To: Kairui Song Cc: linux-mm@kvack.org, Kairui Song , Andrew Morton , Matthew Wilcox , Chris Li , Barry Song , Ryan Roberts , Neil Brown , Minchan Kim , Hugh Dickins , David Hildenbrand , Yosry Ahmed , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v4 09/12] mm/swap: get the swap device offset directly In-Reply-To: <20240502084939.30250-2-ryncsn@gmail.com> (Kairui Song's message of "Thu, 2 May 2024 16:49:36 +0800") References: <20240502084609.28376-1-ryncsn@gmail.com> <20240502084939.30250-2-ryncsn@gmail.com> Date: Wed, 08 May 2024 14:28:38 +0800 Message-ID: <87edaclsvd.fsf@yhuang6-desk2.ccr.corp.intel.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=ascii X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: E49A8A0007 X-Stat-Signature: oytwxi8grf4auu3dyhkpo5z59repcedi X-Rspam-User: X-HE-Tag: 1715149835-832710 X-HE-Meta: U2FsdGVkX19KZ9tf4RkO6WtWw/LTyL90qtN07pTiGt8CgfQ7Q6bCwcsbDOt9AcJN/WDtdrRCrZkLgpX++5h81PoZZGQFhPux1N7RuY55G3Wg+DuomszaqsETcH5nd7apuFk3Vm/7aODfspwzNk5mlX6Xl6sbln9ScsAxf2JtysnbG284JtdhdpnVRZtei9OWBsdZep87q8IBVMqDV7QKxm3X7w1P55Czxt/Iu7uPwXXnJ+I0RrTsWoDyIwj3M2xaiwUtwW+5kgpVCtqq64zcZfmgXaZiG5HByZFUkYxuxFmjBwdALatfhM7Ih8nVdS+yKoqbYcG8uPvhyKsrLZYHbziARWdAUr9Y6raMzdTjhxBkRvEmDrf/ElcMzRGgM+bavHu2LGSl1KPV3yzr3fOthdt3vYesNCJH77PI3RPZJV+Lzzre7u7OjtZPwkhBskblSIpcxoOQIco57PrTpYJpTsK5gIHv6QHMgZgv6ChTXK4qNWRrl4Y3tcInQSgwi1VZTR0Hvq3QmvsXQU83Qq7JQKQ/BFBF7PqoMCC+jJzzch8vsmqCN498yC658+vdTHa4kNSBIFNvuwUBtXvInGRaz416ZGpc9nT34EOMkIxTU8fHs07PeNOEd0u2UZ3OCSxyeOJwET9o1PwtY462rXqn+4OyTbHmJk/f8kt2FiTfkvq4TKFhRDlGS7UF3PEIW3RoJUAx3DZoJLNmvhK/qceHki6IZUjlXVJ9YyWeBHH6X1A2fbcsEUwqbb+RnSSiimiENCpNIAfi3aKKXPanLp9nhcxLQ5DomzO4hQZ6B6YqvLkNtyMrYqEpAoxEEfIgacvGkCq1jREA3iroJHvirzG0YgOBzVB2vqNeCe81nOFzU9dK+o+ydUMJWSv1SEkDqmfptgKh0FS0X2ncxqWOq9yjRUbwTCVthS4g2FtYRfWUZKqSNlAtpyTfEvv+wo6qIYvQahr6JPQcKXAlMqbRfg2 Q0lPJaOW 92lyguyu8sB3K5SlmWHqytaey/aZHPTE55LMHL6+EniuNqeRdYWFj5mx8zw6aIa3zaxK75Ze6kdg8PqTv5P9Ryj5paghyHEdgjNP5Pf6lu3G444HLrxmp0M0WyqpGA8AJkyDOha5sH/18j1EojbTsNiZoa1CzZETwuZnEfOsHr+t6U/rcAtVYRq0stLXLTFNtf7eFq4GZgTCildsyAuKSud0HISS72j21kl966pXeckw71QydM3NiOuOpKT6I1u4+TXhRwHGH6E2d97Pk3dKA6cdYpA== 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: Kairui Song writes: > From: Kairui Song > > 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. > > Signed-off-by: Kairui Song LGTM! Thanks! Reviewed-by: "Huang, Ying" > --- > mm/page_io.c | 6 +++--- > mm/swap.h | 9 +++++++++ > 2 files changed, 12 insertions(+), 3 deletions(-) > > diff --git a/mm/page_io.c b/mm/page_io.c > index 46c603dddf04..a360857cf75d 100644 > --- a/mm/page_io.c > +++ b/mm/page_io.c > @@ -280,7 +280,7 @@ static void sio_write_complete(struct kiocb *iocb, long ret) > * 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 folio *folio, struct writeback_control *wbc > 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 folio *folio, struct swap_iocb **plug) > { > 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; > diff --git a/mm/swap.h b/mm/swap.h > index fc2f6ade7f80..82023ab93205 100644 > --- a/mm/swap.h > +++ b/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_spaces[]; > (&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);