ext4: avoid Y2038 overflow in recently_deleted()

Avoid a 32-bit time overflow in recently_deleted() since i_dtime
(inode deletion time) is stored only as a 32-bit value on disk.
Since i_dtime isn't used for much beyond a boolean value in e2fsck
and is otherwise only used in this function in the kernel, there is
no benefit to use more space in the inode for this field on disk.

Instead, compare only the relative deletion time with the low
32 bits of the time using the newly-added time_before32() helper,
which is similar to time_before() and time_after() for jiffies.

Increase RECENTCY_DIRTY to 300s based on Ted's comments about
usage experience at Google.

Signed-off-by: Andreas Dilger <adilger@dilger.ca>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index fb83a36b9723b64476aa55e377067143dd2d846a..71e93a23cec3b6fa50a10f214a41309218c85eba 100644 (file)
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -692,16 +692,17 @@ static int find_group_other(struct super_block *sb, struct inode *parent,
  * somewhat arbitrary...)
  */
 #define RECENTCY_MIN   5
-#define RECENTCY_DIRTY 30
+#define RECENTCY_DIRTY 300
 
 static int recently_deleted(struct super_block *sb, ext4_group_t group, int ino)
 {
        struct ext4_group_desc  *gdp;
        struct ext4_inode       *raw_inode;
        struct buffer_head      *bh;
-       unsigned long           dtime, now;
-       int     inodes_per_block = EXT4_SB(sb)->s_inodes_per_block;
-       int     offset, ret = 0, recentcy = RECENTCY_MIN;
+       int inodes_per_block = EXT4_SB(sb)->s_inodes_per_block;
+       int offset, ret = 0;
+       int recentcy = RECENTCY_MIN;
+       u32 dtime, now;
 
        gdp = ext4_get_group_desc(sb, group, NULL);
        if (unlikely(!gdp))
@@ -718,12 +719,18 @@ static int recently_deleted(struct super_block *sb, ext4_group_t group, int ino)
 
        offset = (ino % inodes_per_block) * EXT4_INODE_SIZE(sb);
        raw_inode = (struct ext4_inode *) (bh->b_data + offset);
+
+       /* i_dtime is only 32 bits on disk, but we only care about relative
+        * times in the range of a few minutes (i.e. long enough to sync a
+        * recently-deleted inode to disk), so using the low 32 bits of the
+        * clock (a 68 year range) is enough, see time_before32() */
        dtime = le32_to_cpu(raw_inode->i_dtime);
-       now = get_seconds();
+       now = ktime_get_real_seconds();
        if (buffer_dirty(bh))
                recentcy += RECENTCY_DIRTY;
 
-       if (dtime && (dtime < now) && (now < dtime + recentcy))
+       if (dtime && time_before32(dtime, now) &&
+           time_before32(now, dtime + recentcy))
                ret = 1;
 out:
        brelse(bh);

diff --git a/include/linux/time.h b/include/linux/time.h
index 4abb32d4c6b853fa3030703d9458689b875e713c..3877136bbdf8381fed3b2998644e9f62aba8b643 100644 (file)
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -285,4 +285,19 @@ static inline bool itimerspec64_valid(const struct itimerspec64 *its)
        return true;
 }
 
+/**
+ * time_after32 - compare two 32-bit relative times
+ * @a: the time which may be after @b
+ * @b: the time which may be before @a
+ *
+ * time_after32(a, b) returns true if the time @a is after time @b.
+ * time_before32(b, a) returns true if the time @b is before time @a.
+ *
+ * Similar to time_after(), compare two 32-bit timestamps for relative
+ * times.  This is useful for comparing 32-bit seconds values that can't
+ * be converted to 64-bit values (e.g. due to disk format or wire protocol
+ * issues) when it is known that the times are less than 68 years apart.
+ */
+#define time_after32(a, b)     ((s32)((u32)(b) - (u32)(a)) < 0)
+#define time_before32(b, a)    time_after32(a, b)
 #endif