linux-kernel - RE: [EXTERNAL] [PATCH v3 05/12] cifs: drop usage of page_file

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID:
 <SA0PR21MB1898817BA920C2A45660DE65E41B2@SA0PR21MB1898.namprd21.prod.outlook.com>
Date: Mon, 29 Apr 2024 20:19:31 +0000
From: Steven French <Steven.French@...rosoft.com>
To: Kairui Song <kasong@...cent.com>, "linux-mm@...ck.org"
	<linux-mm@...ck.org>
CC: Andrew Morton <akpm@...ux-foundation.org>, "Huang, Ying"
	<ying.huang@...el.com>, Matthew Wilcox <willy@...radead.org>, Chris Li
	<chrisl@...nel.org>, Barry Song <v-songbaohua@...o.com>, Ryan Roberts
	<ryan.roberts@....com>, Neil Brown <neilb@...e.de>, Minchan Kim
	<minchan@...nel.org>, Hugh Dickins <hughd@...gle.com>, David Hildenbrand
	<david@...hat.com>, Yosry Ahmed <yosryahmed@...gle.com>,
	"linux-fsdevel@...r.kernel.org" <linux-fsdevel@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>, Namjae Jeon
	<linkinjeon@...nel.org>, "Paulo Alcantara (SUSE)" <pc@...guebit.com>, Shyam
 Prasad <Shyam.Prasad@...rosoft.com>, Bharath S M <bharathsm@...rosoft.com>
Subject: RE: [EXTERNAL] [PATCH v3 05/12] cifs: drop usage of page_file_offset

Wouldn't this make it harder to fix the regression when swap file support was temporarily removed from cifs.ko (due to the folio migration)?   I was hoping to come back to fixing swapfile support for cifs.ko in 6.10-rc (which used to pass the various xfstests for this but code got removed with folios/netfs changes).

-----Original Message-----
From: Kairui Song <ryncsn@...il.com> 
Sent: Monday, April 29, 2024 2:05 PM
To: linux-mm@...ck.org
Cc: Andrew Morton <akpm@...ux-foundation.org>; Huang, Ying <ying.huang@...el.com>; Matthew Wilcox <willy@...radead.org>; Chris Li <chrisl@...nel.org>; Barry Song <v-songbaohua@...o.com>; Ryan Roberts <ryan.roberts@....com>; Neil Brown <neilb@...e.de>; Minchan Kim <minchan@...nel.org>; Hugh Dickins <hughd@...gle.com>; David Hildenbrand <david@...hat.com>; Yosry Ahmed <yosryahmed@...gle.com>; linux-fsdevel@...r.kernel.org; linux-kernel@...r.kernel.org; Kairui Song <kasong@...cent.com>; Steven French <Steven.French@...rosoft.com>; Namjae Jeon <linkinjeon@...nel.org>; Paulo Alcantara (SUSE) <pc@...guebit.com>; Shyam Prasad <Shyam.Prasad@...rosoft.com>; Bharath S M <bharathsm@...rosoft.com>
Subject: [EXTERNAL] [PATCH v3 05/12] cifs: drop usage of page_file_offset

[Some people who received this message don't often get email from ryncsn@...il.com. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]

From: Kairui Song <kasong@...cent.com>

page_file_offset is only needed for mixed usage of page cache and swap cache, for pure page cache usage, the caller can just use page_offset instead.

It can't be a swap cache page here, so just drop it and convert it to use folio.

Signed-off-by: Kairui Song <kasong@...cent.com>
Cc: Steve French <stfrench@...rosoft.com>
Cc: Namjae Jeon <linkinjeon@...nel.org>
Cc: Paulo Alcantara <pc@...guebit.com>
Cc: Shyam Prasad N <sprasad@...rosoft.com>
Cc: Bharath SM <bharathsm@...rosoft.com>
---
 fs/smb/client/file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/smb/client/file.c b/fs/smb/client/file.c index 9be37d0fe724.388343b0fceb 100644
--- a/fs/smb/client/file.c
+++ b/fs/smb/client/file.c
@@ -4828,7 +4828,7 @@ static int cifs_readpage_worker(struct file *file, struct page *page,  static int cifs_read_folio(struct file *file, struct folio *folio)  {
        struct page *page = &folio->page;
-       loff_t offset = page_file_offset(page);
+       loff_t offset = folio_pos(folio);
        int rc = -EACCES;
        unsigned int xid;

--
2.44.0