Skip to contentSkip to conversation

2.6.23 regression: second access of empty ntfs file leads to D state hang

DISCUSSION Mike Galbraith 2 participants 14 messages Oct 29, 2007 – Nov 3, 2007 NTFS filesystem

lore
Share & tools
lore
#0 lore raw

Greetings,

I've stumbled across a 2.6.22->2.6.23 regression. First md5sum access of an empty NTFS file leads to kernel I/O error gripe, a second access leaves md5sum hung. 2.6.22.10 has no trouble accessing this file.

Looking at the 22->23 diff, I don't see a quick and dirty stab candidate, and since I'm preparing for a 5 week separation from my box <twitch>, I doubt I'll have time to do a bisect. /me punts.

root@Homer: md5sum '/windows/C/Dokumente und Einstellungen/All Users/Anwendungsdaten/Microsoft/Network/Connections/Pbk/rasphone.pbk'
md5sum: /windows/C/Dokumente und Einstellungen/All Users/Anwendungsdaten/Microsoft/Network/Connections/Pbk/rasphone.pbk: Input/output error

[  228.551859] NTFS-fs error (device hda1): ntfs_read_compressed_block(): ntfs_map_runlist() failed. Cannot read compression block.
[  401.721890] md5sum        D eee53d64     0  7249   7019
[  401.727155]        eee53d78 00200082 00000002 eee53d64 eee53d5c 00000000 e9b006b0 e9b00700 
[  401.735469]        5f6b3463 c0677060 c067a080 e9b00860 c180d080 00000000 c180d080 c180d108 
[  401.743991]        00000001 00200086 e9b006e0 00200086 f79ca640 eee53d94 0000b4d3 00200202 
[  401.752514] Call Trace:
[  401.755155]  [<c04b57bf>] io_schedule+0x1e/0x28
[  401.759711]  [<c015a269>] sync_page+0x34/0x3f
[  401.764102]  [<c04b5b78>] __wait_on_bit_lock+0x40/0x63
[  401.769281]  [<c015a221>] __lock_page+0x54/0x5c
[  401.773845]  [<c015a826>] do_generic_mapping_read+0x236/0x4e7
[  401.779629]  [<c015c165>] generic_file_aio_read+0xff/0x198
[  401.785138]  [<c017851c>] do_sync_read+0xd0/0x106
[  401.789873]  [<c0178cff>] vfs_read+0x89/0x11d
[  401.794266]  [<c0179164>] sys_read+0x3d/0x64
[  401.798569]  [<c01041ba>] syscall_call+0x7/0xb
[  401.803039]  =======================
#1 lore raw

hrmph, CC to members only list removed.

Quoted 38 lines · Mike Galbraith

Greetings,

I've stumbled across a 2.6.22->2.6.23 regression. First md5sum access of an empty NTFS file leads to kernel I/O error gripe, a second access leaves md5sum hung. 2.6.22.10 has no trouble accessing this file.

Looking at the 22->23 diff, I don't see a quick and dirty stab candidate, and since I'm preparing for a 5 week separation from my box <twitch>, I doubt I'll have time to do a bisect. /me punts.

root@Homer: md5sum '/windows/C/Dokumente und Einstellungen/All Users/Anwendungsdaten/Microsoft/Network/Connections/Pbk/rasphone.pbk'
md5sum: /windows/C/Dokumente und Einstellungen/All Users/Anwendungsdaten/Microsoft/Network/Connections/Pbk/rasphone.pbk: Input/output error

[  228.551859] NTFS-fs error (device hda1): ntfs_read_compressed_block(): ntfs_map_runlist() failed. Cannot read compression block.
[  401.721890] md5sum        D eee53d64     0  7249   7019
[  401.727155]        eee53d78 00200082 00000002 eee53d64 eee53d5c 00000000 e9b006b0 e9b00700 
[  401.735469]        5f6b3463 c0677060 c067a080 e9b00860 c180d080 00000000 c180d080 c180d108 
[  401.743991]        00000001 00200086 e9b006e0 00200086 f79ca640 eee53d94 0000b4d3 00200202 
[  401.752514] Call Trace:
[  401.755155]  [<c04b57bf>] io_schedule+0x1e/0x28
[  401.759711]  [<c015a269>] sync_page+0x34/0x3f
[  401.764102]  [<c04b5b78>] __wait_on_bit_lock+0x40/0x63
[  401.769281]  [<c015a221>] __lock_page+0x54/0x5c
[  401.773845]  [<c015a826>] do_generic_mapping_read+0x236/0x4e7
[  401.779629]  [<c015c165>] generic_file_aio_read+0xff/0x198
[  401.785138]  [<c017851c>] do_sync_read+0xd0/0x106
[  401.789873]  [<c0178cff>] vfs_read+0x89/0x11d
[  401.794266]  [<c0179164>] sys_read+0x3d/0x64
[  401.798569]  [<c01041ba>] syscall_call+0x7/0xb
[  401.803039]  =======================

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

#2 lore raw
Quoted 1 line · Mike Galbraith

hrmph, CC to members only list removed.

What makes you think it is members only?!? NTFS-dev is not members only at all. It is moderated which is a very different thing. Most list members have to be approved for posting, too... And the only reason it is moderated is spam filtering. We delete 99.9% of emails going to the list by hand as moderators because they are all spam. That means the list and the list archives only contain NTFS related messages and not thousands of posts trying to sell you pills and what not...

Best regards,

Anton

Quoted 32 lines · Mike Galbraith
Quoted 31 lines

Greetings,

I've stumbled across a 2.6.22->2.6.23 regression. First md5sum access of an empty NTFS file leads to kernel I/O error gripe, a second access leaves md5sum hung. 2.6.22.10 has no trouble accessing this file.

Looking at the 22->23 diff, I don't see a quick and dirty stab candidate, and since I'm preparing for a 5 week separation from my box <twitch>, I doubt I'll have time to do a bisect. /me punts.

root@Homer: md5sum '/windows/C/Dokumente und Einstellungen/All Users/Anwendungsdaten/Microsoft/Network/Connections/Pbk/rasphone.pbk'
md5sum: /windows/C/Dokumente und Einstellungen/All Users/Anwendungsdaten/Microsoft/Network/Connections/Pbk/rasphone.pbk: Input/output error

[  228.551859] NTFS-fs error (device hda1): ntfs_read_compressed_block(): ntfs_map_runlist() failed. Cannot read compression block.
[  401.721890] md5sum        D eee53d64     0  7249   7019
[  401.727155]        eee53d78 00200082 00000002 eee53d64 eee53d5c 00000000 e9b006b0 e9b00700
[  401.735469]        5f6b3463 c0677060 c067a080 e9b00860 c180d080 00000000 c180d080 c180d108
[  401.743991]        00000001 00200086 e9b006e0 00200086 f79ca640 eee53d94 0000b4d3 00200202
[  401.752514] Call Trace:
[  401.755155]  [<c04b57bf>] io_schedule+0x1e/0x28
[  401.759711]  [<c015a269>] sync_page+0x34/0x3f
[  401.764102]  [<c04b5b78>] __wait_on_bit_lock+0x40/0x63
[  401.769281]  [<c015a221>] __lock_page+0x54/0x5c
[  401.773845]  [<c015a826>] do_generic_mapping_read+0x236/0x4e7
[  401.779629]  [<c015c165>] generic_file_aio_read+0xff/0x198
[  401.785138]  [<c017851c>] do_sync_read+0xd0/0x106
[  401.789873]  [<c0178cff>] vfs_read+0x89/0x11d
[  401.794266]  [<c0179164>] sys_read+0x3d/0x64
[  401.798569]  [<c01041ba>] syscall_call+0x7/0xb
[  401.803039]  =======================
Signature · 3 lines
Anton Altaparmakov <aia21 at cam.ac.uk> (replace at with @)
Unix Support, Computing Service, University of Cambridge, CB2 3QH, UK
Linux NTFS maintainer, http://www.linux-ntfs.org/
#3 lore raw
In reply to Mike Galbraith

Hi,

Quoted 13 lines · Mike Galbraith

I've stumbled across a 2.6.22->2.6.23 regression. First md5sum access of an empty NTFS file leads to kernel I/O error gripe, a second access leaves md5sum hung. 2.6.22.10 has no trouble accessing this file.

Looking at the 22->23 diff, I don't see a quick and dirty stab candidate, and since I'm preparing for a 5 week separation from my box <twitch>, I doubt I'll have time to do a bisect. /me punts.

root@Homer: md5sum '/windows/C/Dokumente und Einstellungen/All Users/Anwendungsdaten/Microsoft/Network/Connections/Pbk/rasphone.pbk'
md5sum: /windows/C/Dokumente und Einstellungen/All Users/Anwendungsdaten/Microsoft/Network/Connections/Pbk/rasphone.pbk: Input/output error

[  228.551859] NTFS-fs error (device hda1): ntfs_read_compressed_block(): ntfs_map_runlist() failed. Cannot read compression block.
Quoted 16 lines
[  401.721890] md5sum        D eee53d64     0  7249   7019
[  401.727155]        eee53d78 00200082 00000002 eee53d64 eee53d5c 00000000 e9b006b0 e9b00700
[  401.735469]        5f6b3463 c0677060 c067a080 e9b00860 c180d080 00000000 c180d080 c180d108
[  401.743991]        00000001 00200086 e9b006e0 00200086 f79ca640 eee53d94 0000b4d3 00200202
[  401.752514] Call Trace:
[  401.755155]  [<c04b57bf>] io_schedule+0x1e/0x28
[  401.759711]  [<c015a269>] sync_page+0x34/0x3f
[  401.764102]  [<c04b5b78>] __wait_on_bit_lock+0x40/0x63
[  401.769281]  [<c015a221>] __lock_page+0x54/0x5c
[  401.773845]  [<c015a826>] do_generic_mapping_read+0x236/0x4e7
[  401.779629]  [<c015c165>] generic_file_aio_read+0xff/0x198
[  401.785138]  [<c017851c>] do_sync_read+0xd0/0x106
[  401.789873]  [<c0178cff>] vfs_read+0x89/0x11d
[  401.794266]  [<c0179164>] sys_read+0x3d/0x64
[  401.798569]  [<c01041ba>] syscall_call+0x7/0xb
[  401.803039]  =======================

Could you post the complete dmesg output, please?

Nothing related has changed in the NTFS driver between 2.6.22.10 and 2.6.23 so I expect something else to be at fault here.

Could you post your .config as well, please?

Best regards,

Anton

Signature · 3 lines
Anton Altaparmakov <aia21 at cam.ac.uk> (replace at with @)
Unix Support, Computing Service, University of Cambridge, CB2 3QH, UK
Linux NTFS maintainer, http://www.linux-ntfs.org/
#4 lore raw
Quoted 1 line · Anton Altaparmakov

Could you post the complete dmesg output, please?

Attached. This is after a reboot though, but a fresh attempt to sum the 0 length file, so the NTFS message is there.

Quoted 4 lines

Nothing related has changed in the NTFS driver between 2.6.22.10 and 2.6.23 so I expect something else to be at fault here.

Could you post your .config as well, please?

Also attached.

-Mike

#5 lore raw

Hi Mike,

Thanks for the files. That is really odd. And you are sure this just works with 2.6.22.10 on the exact same file? Have you run "chkdsk /f /v /x" on the NTFS volume from Windows?

Would you be able to apply the attached patch to your 2.6.23.1 kernel and try again and then send me the NTFS error messages? The patch should cause more verbose error reporting to happen... Thanks!

Best regards,

Anton

Quoted 15 lines · Mike Galbraith
Quoted 1 line · Anton Altaparmakov

Could you post the complete dmesg output, please?

Attached. This is after a reboot though, but a fresh attempt to sum the 0 length file, so the NTFS message is there.

Quoted 4 lines

Nothing related has changed in the NTFS driver between 2.6.22.10 and 2.6.23 so I expect something else to be at fault here.

Could you post your .config as well, please?

Also attached.

-Mike

Signature · 3 lines
Anton Altaparmakov <aia21 at cam.ac.uk> (replace at with @)
Unix Support, Computing Service, University of Cambridge, CB2 3QH, UK
Linux NTFS maintainer, http://www.linux-ntfs.org/
#6 lore raw

oops. forgot to attach the patch... Here it is...

Best regards,

Anton

fs/ntfs/attrib.c +23 -3
diff -urNp linux-2.6.23.1/fs/ntfs/attrib.c linux-2.6.23.1.new/fs/ntfs/attrib.c
@@ -102,11 +102,19 @@ int ntfs_map_runlist_nolock(ntfs_inode *
 	if (!ctx) {
 		ctx_is_temporary = ctx_needs_reset = true;
 		m = map_mft_record(base_ni);
-		if (IS_ERR(m))
+		if (IS_ERR(m)) {
+			ntfs_error(ni->vol->sb, "map_mft_record() failed for "
+					"inode 0x%lx, vcn 0x%llx, error %d.",
+					ni->mft_no, (unsigned long long)vcn,
+					PTR_ERR(m));
 			return PTR_ERR(m);
+		}
 		ctx = ntfs_attr_get_search_ctx(base_ni, m);
 		if (unlikely(!ctx)) {
 			err = -ENOMEM;
+			ntfs_error(ni->vol->sb, "Failed to allocate search "
+					"context for inode 0x%lx, vcn 0x%llx.",
+					ni->mft_no, (unsigned long long)vcn);
 			goto err_out;
 		}
 	} else {
@@ -165,6 +173,10 @@ int ntfs_map_runlist_nolock(ntfs_inode *
 		err = ntfs_attr_lookup(ni->type, ni->name, ni->name_len,
 				CASE_SENSITIVE, vcn, NULL, 0, ctx);
 		if (unlikely(err)) {
+			ntfs_error(ni->vol->sb, "ntfs_attr_lookup() failed for "
+					"inode 0x%lx, vcn 0x%llx, error %d.",
+					ni->mft_no, (unsigned long long)vcn,
+					err);
 			if (err == -ENOENT)
 				err = -EIO;
 			goto err_out;
@@ -183,13 +195,21 @@ int ntfs_map_runlist_nolock(ntfs_inode *
 		end_vcn = sle64_to_cpu(a->data.non_resident.allocated_size) >>
 				ni->vol->cluster_size_bits;
 	if (unlikely(vcn >= end_vcn)) {
+		ntfs_error(ni->vol->sb, "vcn 0x%llx >= end_vcn 0x%llx for "
+				"inode 0x%lx, error %d.",
+				(unsigned long long)vcn,
+				(unsigned long long)end_vcn, ni->mft_no, err);
 		err = -ENOENT;
 		goto err_out;
 	}
 	rl = ntfs_mapping_pairs_decompress(ni->vol, a, ni->runlist.rl);
-	if (IS_ERR(rl))
+	if (IS_ERR(rl)) {
 		err = PTR_ERR(rl);
-	else
+		ntfs_error(ni->vol->sb, "ntfs_mapping_pairs_decompress() "
+				"failed for inode 0x%lx, vcn 0x%llx, error "
+				"%d.", ni->mft_no, (unsigned long long)vcn,
+				err);
+	} else
 		ni->runlist.rl = rl;
 err_out:
 	if (ctx_is_temporary) {
Quoted 18 lines · Anton Altaparmakov

Hi Mike,

Thanks for the files. That is really odd. And you are sure this just works with 2.6.22.10 on the exact same file? Have you run "chkdsk /f /v /x" on the NTFS volume from Windows?

Would you be able to apply the attached patch to your 2.6.23.1 kernel and try again and then send me the NTFS error messages? The patch should cause more verbose error reporting to happen... Thanks!

Best regards,

Anton

Quoted 7 lines · Mike Galbraith
Quoted 1 line · Anton Altaparmakov

Could you post the complete dmesg output, please?

Attached. This is after a reboot though, but a fresh attempt to sum the 0 length file, so the NTFS message is there.

Quoted 14 lines
Quoted 8 lines
Quoted 4 lines

Nothing related has changed in the NTFS driver between 2.6.22.10 and 2.6.23 so I expect something else to be at fault here.

Could you post your .config as well, please?

Also attached.

-Mike

Signature · 3 lines
Anton Altaparmakov <aia21 at cam.ac.uk> (replace at with @)
Unix Support, Computing Service, University of Cambridge, CB2 3QH, UK
Linux NTFS maintainer, http://www.linux-ntfs.org/

Best regards,

Anton

Signature · 3 lines
Anton Altaparmakov <aia21 at cam.ac.uk> (replace at with @)
Unix Support, Computing Service, University of Cambridge, CB2 3QH, UK
Linux NTFS maintainer, http://www.linux-ntfs.org/
#7 lore raw
In reply to Anton Altaparmakov
Quoted 5 lines · Anton Altaparmakov

Hi Mike,

Thanks for the files. That is really odd. And you are sure this just works with 2.6.22.10 on the exact same file? Have you run "chkdsk / f /v /x" on the NTFS volume from Windows?

Yes, 2.6.22.10 can md5sum that file just fine, did it several times. I haven't run chkdsk.

Quoted 3 lines

Would you be able to apply the attached patch to your 2.6.23.1 kernel and try again and then send me the NTFS error messages? The patch should cause more verbose error reporting to happen... Thanks!

[  249.009250] NTFS-fs error (device hda1): ntfs_map_runlist_nolock(): vcn 0x0 >= end_vcn 0x0 for inode 0x490f, error 0.
[  249.020142] NTFS-fs error (device hda1): ntfs_read_compressed_block(): ntfs_map_runlist() failed. Cannot read compression block.

-Mike

#8 lore raw
Quoted 9 lines · Mike Galbraith
Quoted 5 lines · Anton Altaparmakov

Hi Mike,

Thanks for the files. That is really odd. And you are sure this just works with 2.6.22.10 on the exact same file? Have you run "chkdsk / f /v /x" on the NTFS volume from Windows?

Yes, 2.6.22.10 can md5sum that file just fine, did it several times. I haven't run chkdsk.

I now have fun chkdsk, it didn't gripe, and the error is still present.

-Mike

#9 lore raw
Quoted 4 lines · Mike Galbraith
Quoted 3 lines · Mike Galbraith
Quoted 2 lines · Anton Altaparmakov

Hi Mike,

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

Thanks for the files. That is really odd. And you are sure this just works with 2.6.22.10 on the exact same file? Have you run "chkdsk / f /v /x" on the NTFS volume from Windows?

Yes, 2.6.22.10 can md5sum that file just fine, did it several times. I haven't run chkdsk.

I now have fun chkdsk, it didn't gripe, and the error is still present.

Not being very good at walking away from unsolved mysteries, I chased it down. The problem is that...

	commit[a32ea1e1f925399e0d81ca3f7394a44a6dafa12c] Fix read/truncate race

...calls ntfs_readpage() for a zero i_size inode, which it isn't accustomed to.

Below is the hammer which made my box a happy camper again.

fs/ntfs/aops.c +13 -1
index 6e5c253..ddab5a3 100644
@@ -401,7 +401,7 @@ static int ntfs_readpage(struct file *file, struct page *page)
 	MFT_RECORD *mrec;
 	unsigned long flags;
 	u32 attr_len;
-	int err = 0;
+	int err = 0, once = 0;
 
 retry_readpage:
 	BUG_ON(!PageLocked(page));
@@ -414,6 +414,18 @@ retry_readpage:
 		return 0;
 	}
 	vi = page->mapping->host;
+	/*
+	 * If we've been called to read a zero sized inode, zero and bail.
+	 */
+	if (!once) {
+		loff_t i_size = i_size_read(vi);
+
+		once++;
+		if (!i_size) {
+			zero_user_page(page, 0, PAGE_CACHE_SIZE, KM_USER0);
+			goto done;
+		}
+	}
 	ni = NTFS_I(vi);
 	/*
 	 * Only $DATA attributes can be encrypted and only unnamed $DATA
#10 lore raw

Hi,

Quoted 12 lines · Mike Galbraith
Quoted 11 lines · Mike Galbraith
Quoted 9 lines · Mike Galbraith
Quoted 5 lines · Anton Altaparmakov

Hi Mike,

Thanks for the files. That is really odd. And you are sure this just works with 2.6.22.10 on the exact same file? Have you run "chkdsk / f /v /x" on the NTFS volume from Windows?

Yes, 2.6.22.10 can md5sum that file just fine, did it several times. I haven't run chkdsk.

Quoted 8 lines
Quoted 1 line

I now have fun chkdsk, it didn't gripe, and the error is still present.

Not being very good at walking away from unsolved mysteries, I chased it down. The problem is that...

	commit[a32ea1e1f925399e0d81ca3f7394a44a6dafa12c] Fix read/truncate  

race
...calls ntfs_readpage() for a zero i_size inode, which it isn't accustomed to.

Great, thanks for doing that!

Quoted 1 line

Below is the hammer which made my box a happy camper again.

Yes that will fix it but the complete solution is more involved as there are three related bugs which explain why you were getting the hangs after the error... I will make a patch for all of these in the next few days...

Best regards,

Anton

Quoted 33 lines
fs/ntfs/aops.c +1 -1
index 6e5c253..ddab5a3 100644
@@ -401,7 +401,7 @@ static int ntfs_readpage(struct file *file,  
 struct page *page)
 	MFT_RECORD *mrec;
 	unsigned long flags;
 	u32 attr_len;
-	int err = 0;
+	int err = 0, once = 0;
 

retry_readpage:

	BUG_ON(!PageLocked(page));
fs/ntfs/aops.c +12 -0
@@ -414,6 +414,18 @@ retry_readpage:
 		return 0;
 	}
 	vi = page->mapping->host;
+	/*
+	 * If we've been called to read a zero sized inode, zero and bail.
+	 */
+	if (!once) {
+		loff_t i_size = i_size_read(vi);
+
+		once++;
+		if (!i_size) {
+			zero_user_page(page, 0, PAGE_CACHE_SIZE, KM_USER0);
+			goto done;
+		}
+	}
 	ni = NTFS_I(vi);
 	/*
 	 * Only $DATA attributes can be encrypted and only unnamed $DATA
Signature · 3 lines
Anton Altaparmakov <aia21 at cam.ac.uk> (replace at with @)
Unix Support, Computing Service, University of Cambridge, CB2 3QH, UK
Linux NTFS maintainer, http://www.linux-ntfs.org/
#11 lore raw

Hi Mike,

Quoted 9 lines · Anton Altaparmakov
Quoted 7 lines · Mike Galbraith

On Mon, 2007-10-29 at 16:18 +0100, Mike Galbraith wrote:
Not being very good at walking away from unsolved mysteries, I chased it down. The problem is that...

	commit[a32ea1e1f925399e0d81ca3f7394a44a6dafa12c] Fix read/truncate  

race
...calls ntfs_readpage() for a zero i_size inode, which it isn't accustomed to.

Quoted 5 lines

Great, thanks for doing that!

Quoted 1 line

Below is the hammer which made my box a happy camper again.

Yes that will fix it but the complete solution is more involved as there are three related bugs which explain why you were getting the hangs after the error... I will make a patch for all of these in the next few days...

Attached is a patch that should fix this and the other related issues I found.

Would you be able to test it in your setup? Thanks a lot in advance!

Best regards,

Anton

Signature · 3 lines
Anton Altaparmakov <aia21 at cam.ac.uk> (replace at with @)
Unix Support, Computing Service, University of Cambridge, CB2 3QH, UK
Linux NTFS maintainer, http://www.linux-ntfs.org/
fs/ntfs/aops.c +8 -0
index cfdc790..4e42d4e 100644
@@ -405,6 +405,14 @@ static int ntfs_readpage(struct file *file, struct page *page)
 
 retry_readpage:
 	BUG_ON(!PageLocked(page));
+	i_size = i_size_read(vi);
+	/* Is the page fully outside i_size? (truncate in progress) */
+	if (unlikely(page->index >= (i_size + PAGE_CACHE_SIZE - 1) >>
+			PAGE_CACHE_SHIFT)) {
+		zero_user_page(page, 0, PAGE_CACHE_SIZE, KM_USER0);
+		ntfs_debug("Read outside i_size - truncated?");
+		goto done;
+	}
 	/*
 	 * This can potentially happen because we clear PageUptodate() during
 	 * ntfs_writepage() of MstProtected() attributes.
fs/ntfs/attrib.c +1 -4
index 92dabdc..50d3b0c 100644
@@ -179,10 +179,7 @@ int ntfs_map_runlist_nolock(ntfs_inode *ni, VCN vcn, ntfs_attr_search_ctx *ctx)
 	 * ntfs_mapping_pairs_decompress() fails.
 	 */
 	end_vcn = sle64_to_cpu(a->data.non_resident.highest_vcn) + 1;
-	if (!a->data.non_resident.lowest_vcn && end_vcn == 1)
-		end_vcn = sle64_to_cpu(a->data.non_resident.allocated_size) >>
-				ni->vol->cluster_size_bits;
-	if (unlikely(vcn >= end_vcn)) {
+	if (unlikely(vcn && vcn >= end_vcn)) {
 		err = -ENOENT;
 		goto err_out;
 	}
fs/ntfs/compress.c +10 -0
index d98daf5..d1619d0 100644
@@ -561,6 +561,16 @@ int ntfs_read_compressed_block(struct page *page)
 	read_unlock_irqrestore(&ni->size_lock, flags);
 	max_page = ((i_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT) -
 			offset;
+	/* Is the page fully outside i_size? (truncate in progress) */
+	if (xpage >= max_page) {
+		kfree(bhs);
+		kfree(pages);
+		zero_user_page(page, 0, PAGE_CACHE_SIZE, KM_USER0);
+		ntfs_debug("Compressed read outside i_size - truncated?");
+		SetPageUptodate(page);
+		unlock_page(page);
+		return 0;
+	}
 	if (nr_pages < max_page)
 		max_page = nr_pages;
 	for (i = 0; i < max_page; i++, offset++) {
author Tested-by
#12 lore raw
Quoted 1 line · Anton Altaparmakov

Would you be able to test it in your setup? Thanks a lot in advance!

Modulo uninitialized vi, works fine. I moved it up, and all is well. Thanks.

fs/ntfs/aops.c +9 -1
index cfdc790..ad87cb0 100644
@@ -405,6 +405,15 @@ static int ntfs_readpage(struct file *file, struct page *page)
 
 retry_readpage:
 	BUG_ON(!PageLocked(page));
+	vi = page->mapping->host;
+	i_size = i_size_read(vi);
+	/* Is the page fully outside i_size? (truncate in progress) */
+	if (unlikely(page->index >= (i_size + PAGE_CACHE_SIZE - 1) >>
+			PAGE_CACHE_SHIFT)) {
+		zero_user_page(page, 0, PAGE_CACHE_SIZE, KM_USER0);
+		ntfs_debug("Read outside i_size - truncated?");
+		goto done;
+	}
 	/*
 	 * This can potentially happen because we clear PageUptodate() during
 	 * ntfs_writepage() of MstProtected() attributes.
@@ -413,7 +422,6 @@ retry_readpage:
 		unlock_page(page);
 		return 0;
 	}
-	vi = page->mapping->host;
 	ni = NTFS_I(vi);
 	/*
 	 * Only $DATA attributes can be encrypted and only unnamed $DATA
fs/ntfs/attrib.c +1 -4
index 92dabdc..50d3b0c 100644
@@ -179,10 +179,7 @@ int ntfs_map_runlist_nolock(ntfs_inode *ni, VCN vcn, ntfs_attr_search_ctx *ctx)
 	 * ntfs_mapping_pairs_decompress() fails.
 	 */
 	end_vcn = sle64_to_cpu(a->data.non_resident.highest_vcn) + 1;
-	if (!a->data.non_resident.lowest_vcn && end_vcn == 1)
-		end_vcn = sle64_to_cpu(a->data.non_resident.allocated_size) >>
-				ni->vol->cluster_size_bits;
-	if (unlikely(vcn >= end_vcn)) {
+	if (unlikely(vcn && vcn >= end_vcn)) {
 		err = -ENOENT;
 		goto err_out;
 	}
fs/ntfs/compress.c +10 -0
index d98daf5..d1619d0 100644
@@ -561,6 +561,16 @@ int ntfs_read_compressed_block(struct page *page)
 	read_unlock_irqrestore(&ni->size_lock, flags);
 	max_page = ((i_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT) -
 			offset;
+	/* Is the page fully outside i_size? (truncate in progress) */
+	if (xpage >= max_page) {
+		kfree(bhs);
+		kfree(pages);
+		zero_user_page(page, 0, PAGE_CACHE_SIZE, KM_USER0);
+		ntfs_debug("Compressed read outside i_size - truncated?");
+		SetPageUptodate(page);
+		unlock_page(page);
+		return 0;
+	}
 	if (nr_pages < max_page)
 		max_page = nr_pages;
 	for (i = 0; i < max_page; i++, offset++) {
#13 lore raw

Great, thanks! I will submit it to Linus.

Best regards,

Anton

Quoted 76 lines · Mike Galbraith
Quoted 1 line · Anton Altaparmakov

Would you be able to test it in your setup? Thanks a lot in advance!

Modulo uninitialized vi, works fine. I moved it up, and all is well. Thanks.

fs/ntfs/aops.c +0 -0
index cfdc790..ad87cb0 100644
@@ -405,6 +405,15 @@ static int ntfs_readpage(struct file *file,  
 struct page *page)
 

retry_readpage:

	BUG_ON(!PageLocked(page));
fs/ntfs/aops.c +9 -0
+	vi = page->mapping->host;
+	i_size = i_size_read(vi);
+	/* Is the page fully outside i_size? (truncate in progress) */
+	if (unlikely(page->index >= (i_size + PAGE_CACHE_SIZE - 1) >>
+			PAGE_CACHE_SHIFT)) {
+		zero_user_page(page, 0, PAGE_CACHE_SIZE, KM_USER0);
+		ntfs_debug("Read outside i_size - truncated?");
+		goto done;
+	}

/*
* This can potentially happen because we clear PageUptodate() during
* ntfs_writepage() of MstProtected() attributes.

fs/ntfs/aops.c +0 -1
@@ -413,7 +422,6 @@ retry_readpage:
 		unlock_page(page);
 		return 0;
 	}
-	vi = page->mapping->host;
 	ni = NTFS_I(vi);
 	/*
 	 * Only $DATA attributes can be encrypted and only unnamed $DATA
fs/ntfs/attrib.c +1 -4
index 92dabdc..50d3b0c 100644
@@ -179,10 +179,7 @@ int ntfs_map_runlist_nolock(ntfs_inode *ni, VCN  
 vcn, ntfs_attr_search_ctx *ctx)
 	 * ntfs_mapping_pairs_decompress() fails.
 	 */
 	end_vcn = sle64_to_cpu(a->data.non_resident.highest_vcn) + 1;
-	if (!a->data.non_resident.lowest_vcn && end_vcn == 1)
-		end_vcn = sle64_to_cpu(a->data.non_resident.allocated_size) >>
-				ni->vol->cluster_size_bits;
-	if (unlikely(vcn >= end_vcn)) {
+	if (unlikely(vcn && vcn >= end_vcn)) {
 		err = -ENOENT;
 		goto err_out;
	}
fs/ntfs/compress.c +10 -0
index d98daf5..d1619d0 100644
@@ -561,6 +561,16 @@ int ntfs_read_compressed_block(struct page *page)
 	read_unlock_irqrestore(&ni->size_lock, flags);
 	max_page = ((i_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT) -
 			offset;
+	/* Is the page fully outside i_size? (truncate in progress) */
+	if (xpage >= max_page) {
+		kfree(bhs);
+		kfree(pages);
+		zero_user_page(page, 0, PAGE_CACHE_SIZE, KM_USER0);
+		ntfs_debug("Compressed read outside i_size - truncated?");
+		SetPageUptodate(page);
+		unlock_page(page);
+		return 0;
+	}
 	if (nr_pages < max_page)
 		max_page = nr_pages;
 	for (i = 0; i < max_page; i++, offset++) {
Signature · 3 lines
Anton Altaparmakov <aia21 at cam.ac.uk> (replace at with @)
Unix Support, Computing Service, University of Cambridge, CB2 3QH, UK
Linux NTFS maintainer, http://www.linux-ntfs.org/