31 Jan, 2020

1 commit

  • Pull UDF, quota, reiserfs, ext2 fixes and cleanups from Jan Kara:
    "A few assorted fixes and cleanups for udf, quota, reiserfs, and ext2"

    * tag 'for_v5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
    fs/reiserfs: remove unused macros
    fs/quota: remove unused macro
    udf: Clarify meaning of f_files in udf_statfs
    udf: Allow writing to 'Rewritable' partitions
    udf: Disallow R/W mode for disk with Metadata partition
    udf: Fix meaning of ENTITYID_FLAGS_* macros to be really bitwise-or flags
    udf: Fix free space reporting for metadata and virtual partitions
    udf: Update header files to UDF 2.60
    udf: Move OSTA Identifier Suffix macros from ecma_167.h to osta_udf.h
    udf: Fix spelling in EXT_NEXT_EXTENT_ALLOCDESCS
    ext2: Adjust indentation in ext2_fill_super
    quota: avoid time_t in v1_disk_dqblk definition
    reiserfs: Fix spurious unlock in reiserfs_fill_super() error handling
    reiserfs: Fix memory leak of journal device string
    ext2: set proper errno in error case of ext2_fill_super()

    Linus Torvalds
     

22 Jan, 2020

1 commit

  • __QUOTA_V2_PARANOIA macro is never used. better to remove it.

    Link: https://lore.kernel.org/r/1579602334-57039-1-git-send-email-alex.shi@linux.alibaba.com
    Signed-off-by: Alex Shi
    Cc: Jan Kara
    Cc: linux-kernel@vger.kernel.org
    Signed-off-by: Jan Kara

    Alex Shi
     

18 Dec, 2019

1 commit

  • Anything that walks all inodes on sb->s_inodes list without rescheduling
    risks softlockups.

    Previous efforts were made in 2 functions, see:

    c27d82f fs/drop_caches.c: avoid softlockups in drop_pagecache_sb()
    ac05fbb inode: don't softlockup when evicting inodes

    but there hasn't been an audit of all walkers, so do that now. This
    also consistently moves the cond_resched() calls to the bottom of each
    loop in cases where it already exists.

    One loop remains: remove_dquot_ref(), because I'm not quite sure how
    to deal with that one w/o taking the i_lock.

    Signed-off-by: Eric Sandeen
    Reviewed-by: Jan Kara
    Signed-off-by: Al Viro

    Eric Sandeen
     

16 Dec, 2019

1 commit

  • The time_t type is part of the user interface and not always the
    same, with the move to 64-bit timestamps and the difference between
    architectures.

    Make the quota format definition independent of this type and use
    a basic type of the same length. Make it unsigned in the process
    to keep the v1 format working until year 2106 instead of 2038
    on 32-bit architectures.

    Hopefully, everybody has already moved to a newer format long
    ago (v2 was introduced with linux-2.4), but it's hard to be sure.

    Link: https://lore.kernel.org/r/20191213205221.3787308-6-arnd@arndb.de
    Signed-off-by: Arnd Bergmann
    Signed-off-by: Jan Kara

    Arnd Bergmann
     

07 Dec, 2019

1 commit

  • Pull vfs d_inode/d_flags memory ordering fixes from Al Viro:
    "Fallout from tree-wide audit for ->d_inode/->d_flags barriers use.
    Basically, the problem is that negative pinned dentries require
    careful treatment - unless ->d_lock is locked or parent is held at
    least shared, another thread can make them positive right under us.

    Most of the uses turned out to be safe - the main surprises as far as
    filesystems are concerned were

    - race in dget_parent() fastpath, that might end up with the caller
    observing the returned dentry _negative_, due to insufficient
    barriers. It is positive in memory, but we could end up seeing the
    wrong value of ->d_inode in CPU cache. Fixed.

    - manual checks that result of lookup_one_len_unlocked() is positive
    (and rejection of negatives). Again, insufficient barriers (we
    might end up with inconsistent observed values of ->d_inode and
    ->d_flags). Fixed by switching to a new primitive that does the
    checks itself and returns ERR_PTR(-ENOENT) instead of a negative
    dentry. That way we get rid of boilerplate converting negatives
    into ERR_PTR(-ENOENT) in the callers and have a single place to
    deal with the barrier-related mess - inside fs/namei.c rather than
    in every caller out there.

    The guts of pathname resolution *do* need to be careful - the race
    found by Ritesh is real, as well as several similar races.
    Fortunately, it turns out that we can take care of that with fairly
    local changes in there.

    The tree-wide audit had not been fun, and I hate the idea of repeating
    it. I think the right approach would be to annotate the places where
    we are _not_ guaranteed ->d_inode/->d_flags stability and have sparse
    catch regressions. But I'm still not sure what would be the least
    invasive way of doing that and it's clearly the next cycle fodder"

    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
    fs/namei.c: fix missing barriers when checking positivity
    fix dget_parent() fastpath race
    new helper: lookup_positive_unlocked()
    fs/namei.c: pull positivity check into follow_managed()

    Linus Torvalds
     

16 Nov, 2019

1 commit

  • Most of the callers of lookup_one_len_unlocked() treat negatives are
    ERR_PTR(-ENOENT). Provide a helper that would do just that. Note
    that a pinned positive dentry remains positive - it's ->d_inode is
    stable, etc.; a pinned _negative_ dentry can become positive at any
    point as long as you are not holding its parent at least shared.
    So using lookup_one_len_unlocked() needs to be careful;
    lookup_positive_unlocked() is safer and that's what the callers
    end up open-coding anyway.

    Signed-off-by: Al Viro

    Al Viro
     

11 Nov, 2019

1 commit

  • Quota statistics counted as 64-bit per-cpu counter. Reading sums per-cpu
    fractions as signed 64-bit int, filters negative values and then reports
    lower half as signed 32-bit int.

    Result may looks like:

    fs.quota.allocated_dquots = 22327
    fs.quota.cache_hits = -489852115
    fs.quota.drops = -487288718
    fs.quota.free_dquots = 22083
    fs.quota.lookups = -486883485
    fs.quota.reads = 22327
    fs.quota.syncs = 335064
    fs.quota.writes = 3088689

    Values bigger than 2^31-1 reported as negative.

    All counters except "allocated_dquots" and "free_dquots" are monotonic,
    thus they should be reported as is without filtering negative values.

    Kernel doesn't have generic helper for 64-bit sysctl yet,
    let's use at least unsigned long.

    Link: https://lore.kernel.org/r/157337934693.2078.9842146413181153727.stgit@buzz
    Signed-off-by: Konstantin Khlebnikov
    Signed-off-by: Jan Kara

    Konstantin Khlebnikov
     

06 Nov, 2019

1 commit


04 Nov, 2019

6 commits

  • Make dquot_get_state() gracefully handle a situation when there are no
    quota files present even though quotas are enabled.

    Signed-off-by: Jan Kara

    Jan Kara
     
  • Quota on and quota off are protected by s_umount semaphore held in
    exclusive mode since commit 7d6cd73d33b6 "quota: Hold s_umount in
    exclusive mode when enabling / disabling quotas". This makes it
    impossible for dquot_disable() to race with other enabling or disabling
    of quotas. Simplify the cleanup done by dquot_disable() based on this
    fact and also remove some stale comments. As a bonus this cleanup makes
    dquot_disable() properly handle a case when there are no quota inodes.

    Signed-off-by: Jan Kara

    Jan Kara
     
  • Now dquot_enable() has only two internal callers and both of them just
    need to update quota flags and don't need most of checks. Just drop
    dquot_enable() and fold necessary functionality into the two calling
    places.

    Signed-off-by: Jan Kara

    Jan Kara
     
  • Rename vfs_load_quota_inode() to dquot_load_quota_inode() to be
    consistent with naming of other functions used for enabling quota
    accounting from filesystems. Also export the function and add some
    sanity checks to assure filesystems are calling the function properly.

    Signed-off-by: Jan Kara

    Jan Kara
     
  • We already have quota inode loaded when resuming quotas. Use
    vfs_load_quota() to avoid some pointless churn with the quota inode.

    Signed-off-by: Jan Kara

    Jan Kara
     
  • Factor out setting up of quota inode and eventual error cleanup from
    vfs_load_quota_inode(). This will simplify situation for filesystems
    that don't have any quota inodes.

    Signed-off-by: Jan Kara

    Jan Kara
     

01 Nov, 2019

2 commits

  • There is a race window where quota was redirted once we drop dq_list_lock inside dqput(),
    but before we grab dquot->dq_lock inside dquot_release()

    TASK1 TASK2 (chowner)
    ->dqput()
    we_slept:
    spin_lock(&dq_list_lock)
    if (dquot_dirty(dquot)) {
    spin_unlock(&dq_list_lock);
    dquot->dq_sb->dq_op->write_dquot(dquot);
    goto we_slept
    if (test_bit(DQ_ACTIVE_B, &dquot->dq_flags)) {
    spin_unlock(&dq_list_lock);
    dquot->dq_sb->dq_op->release_dquot(dquot);
    dqget()
    mark_dquot_dirty()
    dqput()
    goto we_slept;
    }
    So dquot dirty quota will be released by TASK1, but on next we_sleept loop
    we detect this and call ->write_dquot() for it.
    XFSTEST: https://github.com/dmonakhov/xfstests/commit/440a80d4cbb39e9234df4d7240aee1d551c36107

    Link: https://lore.kernel.org/r/20191031103920.3919-2-dmonakhov@openvz.org
    CC: stable@vger.kernel.org
    Signed-off-by: Dmitry Monakhov
    Signed-off-by: Jan Kara

    Dmitry Monakhov
     
  • Write only quotas which are dirty at entry.

    XFSTEST: https://github.com/dmonakhov/xfstests/commit/b10ad23566a5bf75832a6f500e1236084083cddc

    Link: https://lore.kernel.org/r/20191031103920.3919-1-dmonakhov@openvz.org
    CC: stable@vger.kernel.org
    Signed-off-by: Konstantin Khlebnikov
    Signed-off-by: Dmitry Monakhov
    Signed-off-by: Jan Kara

    Dmitry Monakhov
     

17 Oct, 2019

1 commit


08 Oct, 2019

1 commit


04 Oct, 2019

2 commits


31 Jul, 2019

1 commit


11 Jul, 2019

1 commit

  • Pull ext2, udf and quota updates from Jan Kara:

    - some ext2 fixes and cleanups

    - a fix of udf bug when extending files

    - a fix of quota Q_XGETQSTAT[V] handling

    * tag 'for_v5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
    udf: Fix incorrect final NOT_ALLOCATED (hole) extent length
    ext2: Use kmemdup rather than duplicating its implementation
    quota: honor quota type in Q_XGETQSTAT[V] calls
    ext2: Always brelse bh on failure in ext2_iget()
    ext2: add missing brelse() in ext2_iget()
    ext2: Fix a typo in ext2_getattr argument
    ext2: fix a typo in comment
    ext2: add missing brelse() in ext2_new_inode()
    ext2: optimize ext2_xattr_get()
    ext2: introduce new helper for xattr entry comparison
    ext2: merge xattr next entry check to ext2_xattr_entry_valid()
    ext2: code cleanup for ext2_preread_inode()
    ext2: code cleanup by using test_opt() and clear_opt()
    doc: ext2: update description of quota options for ext2
    ext2: Strengthen xattr block checks
    ext2: Merge loops in ext2_xattr_set()
    ext2: introduce helper for xattr entry validation
    ext2: introduce helper for xattr header validation
    quota: add dqi_dirty_list description to comment of Dquot List Management

    Linus Torvalds
     

25 Jun, 2019

1 commit

  • The code in quota_getstate and quota_getstatev is strange; it
    says the returned fs_quota_stat[v] structure has room for only
    one type of time limits, so fills it in with the first enabled
    quota, even though every quotactl command must have a type sent
    in by the user.

    Instead of just picking the first enabled quota, fill in the
    reply with the timers for the quota type that was actually
    requested.

    Reviewed-by: Christoph Hellwig
    Signed-off-by: Eric Sandeen
    Signed-off-by: Jan Kara

    Eric Sandeen
     

19 Jun, 2019

1 commit

  • Run below script as root, dquot_add_space will return -EDQUOT since
    __dquot_transfer call dquot_add_space with flags=0, and dquot_add_space
    think it's a preallocation. Fix it by set flags as DQUOT_SPACE_WARN.

    mkfs.ext4 -O quota,project /dev/vdb
    mount -o prjquota /dev/vdb /mnt
    setquota -P 23 1 1 0 0 /dev/vdb
    dd if=/dev/zero of=/mnt/test-file bs=4K count=1
    chattr -p 23 test-file

    Fixes: 7b9ca4c61bc2 ("quota: Reduce contention on dq_data_lock")
    Signed-off-by: yangerkun
    Signed-off-by: Jan Kara

    yangerkun
     

21 May, 2019

2 commits


20 May, 2019

1 commit


01 May, 2019

1 commit


25 Apr, 2019

2 commits

  • Local variable *reserved* of remove_dquot_ref() is only used if
    define CONFIG_QUOTA_DEBUG, but not ebraced in CONFIG_QUOTA_DEBUG
    macro, which leads to unused-but-set-variable warning when compiling.

    This patch ebrace it into CONFIG_QUOTA_DEBUG macro like what is done
    in add_dquot_ref().

    Signed-off-by: Jiang Biao
    Signed-off-by: Jan Kara

    Jiang Biao
     
  • We need to check return code only when calling ->read_dqblk(),
    so fix it properly.

    Signed-off-by: Chengguang Xu
    Signed-off-by: Jan Kara

    Chengguang Xu
     

26 Mar, 2019

2 commits


19 Dec, 2018

1 commit

  • Commit 1fa5efe3622db58cb8c7b9a50665e9eb9a6c7e97 (ext4: Use generic helpers for quotaon
    and quotaoff) made possible to call quotactl(Q_XQUOTAON/OFF) on ext4 filesystems
    with sysfile quota support. This leads to calling dquot_enable/disable without s_umount
    held in excl. mode, because quotactl_cmd_onoff checks only for Q_QUOTAON/OFF.

    The following WARN_ON_ONCE triggers (in this case for dquot_enable, ext4, latest Linus' tree):

    [ 117.807056] EXT4-fs (dm-0): mounted filesystem with ordered data mode. Opts: quota,prjquota

    [...]

    [ 155.036847] WARNING: CPU: 0 PID: 2343 at fs/quota/dquot.c:2469 dquot_enable+0x34/0xb9
    [ 155.036851] Modules linked in: quota_v2 quota_tree ipv6 af_packet joydev mousedev psmouse serio_raw pcspkr i2c_piix4 intel_agp intel_gtt e1000 ttm drm_kms_helper drm agpgart fb_sys_fops syscopyarea sysfillrect sysimgblt i2c_core input_leds kvm_intel kvm irqbypass qemu_fw_cfg floppy evdev parport_pc parport button crc32c_generic dm_mod ata_generic pata_acpi ata_piix libata loop ext4 crc16 mbcache jbd2 usb_storage usbcore sd_mod scsi_mod
    [ 155.036901] CPU: 0 PID: 2343 Comm: qctl Not tainted 4.20.0-rc6-00025-gf5d582777bcb #9
    [ 155.036903] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1ubuntu1 04/01/2014
    [ 155.036911] RIP: 0010:dquot_enable+0x34/0xb9
    [ 155.036915] Code: 41 56 41 55 41 54 55 53 4c 8b 6f 28 74 02 0f 0b 4d 8d 7d 70 49 89 fc 89 cb 41 89 d6 89 f5 4c 89 ff e8 23 09 ea ff 85 c0 74 0a 0b 4c 89 ff e8 8b 09 ea ff 85 db 74 6a 41 8b b5 f8 00 00 00 0f
    [ 155.036918] RSP: 0018:ffffb09b00493e08 EFLAGS: 00010202
    [ 155.036922] RAX: 0000000000000001 RBX: 0000000000000008 RCX: 0000000000000008
    [ 155.036924] RDX: 0000000000000001 RSI: 0000000000000002 RDI: ffff9781b67cd870
    [ 155.036926] RBP: 0000000000000002 R08: 0000000000000000 R09: 61c8864680b583eb
    [ 155.036929] R10: ffffb09b00493e48 R11: ffffffffff7ce7d4 R12: ffff9781b7ee8d78
    [ 155.036932] R13: ffff9781b67cd800 R14: 0000000000000004 R15: ffff9781b67cd870
    [ 155.036936] FS: 00007fd813250b88(0000) GS:ffff9781ba000000(0000) knlGS:0000000000000000
    [ 155.036939] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
    [ 155.036942] CR2: 00007fd812ff61d6 CR3: 000000007c882000 CR4: 00000000000006b0
    [ 155.036951] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
    [ 155.036953] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
    [ 155.036955] Call Trace:
    [ 155.037004] dquot_quota_enable+0x8b/0xd0
    [ 155.037011] kernel_quotactl+0x628/0x74e
    [ 155.037027] ? do_mprotect_pkey+0x2a6/0x2cd
    [ 155.037034] __x64_sys_quotactl+0x1a/0x1d
    [ 155.037041] do_syscall_64+0x55/0xe4
    [ 155.037078] entry_SYSCALL_64_after_hwframe+0x44/0xa9
    [ 155.037105] RIP: 0033:0x7fd812fe1198
    [ 155.037109] Code: 02 77 0d 48 89 c1 48 c1 e9 3f 75 04 48 8b 04 24 48 83 c4 50 5b c3 48 83 ec 08 49 89 ca 48 63 d2 48 63 ff b8 b3 00 00 00 0f 05 89 c7 e8 c1 eb ff ff 5a c3 48 63 ff b8 bb 00 00 00 0f 05 48 89
    [ 155.037112] RSP: 002b:00007ffe8cd7b050 EFLAGS: 00000206 ORIG_RAX: 00000000000000b3
    [ 155.037116] RAX: ffffffffffffffda RBX: 00007ffe8cd7b148 RCX: 00007fd812fe1198
    [ 155.037119] RDX: 0000000000000000 RSI: 00007ffe8cd7cea9 RDI: 0000000000580102
    [ 155.037121] RBP: 00007ffe8cd7b0f0 R08: 000055fc8eba8a9d R09: 0000000000000000
    [ 155.037124] R10: 00007ffe8cd7b074 R11: 0000000000000206 R12: 00007ffe8cd7b168
    [ 155.037126] R13: 000055fc8eba8897 R14: 0000000000000000 R15: 0000000000000000
    [ 155.037131] ---[ end trace 210f864257175c51 ]---

    and then the syscall proceeds without s_umount locking.

    This patch locks the superblock ->s_umount sem. in exclusive mode for all Q_XQUOTAON/OFF
    quotactls too in addition to Q_QUOTAON/OFF.

    AFAICT, other than ext4, only xfs and ocfs2 are affected by this change.
    The VFS will now call in xfs_quota_* functions with s_umount held, which wasn't the case
    before. This looks good to me but I can not say for sure. Ext4 and ocfs2 where already
    beeing called with s_umount exclusive via quota_quotaon/off which is basically the same.

    Signed-off-by: Javier Barrio
    Signed-off-by: Jan Kara

    Javier Barrio
     

23 Aug, 2018

2 commits

  • 'type' is user-controlled, so sanitize it after the bounds check to
    avoid using it in speculative execution. This covers the following
    potential gadgets detected with the help of smatch:

    * fs/ext4/super.c:5741 ext4_quota_read() warn: potential spectre issue
    'sb_dqopt(sb)->files' [r]
    * fs/ext4/super.c:5778 ext4_quota_write() warn: potential spectre issue
    'sb_dqopt(sb)->files' [r]
    * fs/f2fs/super.c:1552 f2fs_quota_read() warn: potential spectre issue
    'sb_dqopt(sb)->files' [r]
    * fs/f2fs/super.c:1608 f2fs_quota_write() warn: potential spectre issue
    'sb_dqopt(sb)->files' [r]
    * fs/quota/dquot.c:412 mark_info_dirty() warn: potential spectre issue
    'sb_dqopt(sb)->info' [w]
    * fs/quota/dquot.c:933 dqinit_needed() warn: potential spectre issue
    'dquots' [r]
    * fs/quota/dquot.c:2112 dquot_commit_info() warn: potential spectre
    issue 'dqopt->ops' [r]
    * fs/quota/dquot.c:2362 vfs_load_quota_inode() warn: potential spectre
    issue 'dqopt->files' [w] (local cap)
    * fs/quota/dquot.c:2369 vfs_load_quota_inode() warn: potential spectre
    issue 'dqopt->ops' [w] (local cap)
    * fs/quota/dquot.c:2370 vfs_load_quota_inode() warn: potential spectre
    issue 'dqopt->info' [w] (local cap)
    * fs/quota/quota.c:110 quota_getfmt() warn: potential spectre issue
    'sb_dqopt(sb)->info' [r]
    * fs/quota/quota_v2.c:84 v2_check_quota_file() warn: potential spectre
    issue 'quota_magics' [w]
    * fs/quota/quota_v2.c:85 v2_check_quota_file() warn: potential spectre
    issue 'quota_versions' [w]
    * fs/quota/quota_v2.c:96 v2_read_file_info() warn: potential spectre
    issue 'dqopt->info' [r]
    * fs/quota/quota_v2.c:172 v2_write_file_info() warn: potential spectre
    issue 'dqopt->info' [r]

    Additionally, a quick inspection indicates there are array accesses with
    'type' in quota_on() and quota_off() functions which are also addressed
    by this.

    Cc: Josh Poimboeuf
    Cc: stable@vger.kernel.org
    Signed-off-by: Jeremy Cline
    Signed-off-by: Jan Kara

    Jeremy Cline
     
  • XQM_MAXQUOTAS and MAXQUOTAS are, it appears, equivalent. Replace all
    usage of XQM_MAXQUOTAS and remove it along with the unused XQM_*QUOTA
    definitions.

    Signed-off-by: Jeremy Cline
    Signed-off-by: Jan Kara

    Jeremy Cline
     

20 Jun, 2018

2 commits


09 Apr, 2018

1 commit

  • dquot_init() is never called in atomic context.
    This function is only set as a parameter of fs_initcall().

    Despite never getting called from atomic context,
    dquot_init() calls __get_free_pages() with GFP_ATOMIC,
    which waits busily for allocation.
    GFP_ATOMIC is not necessary and can be replaced with GFP_KERNEL,
    to avoid busy waiting and improve the possibility of sucessful allocation.

    This is found by a static analysis tool named DCNS written by myself.
    And I also manually check it.

    Signed-off-by: Jia-Ju Bai
    Signed-off-by: Jan Kara

    Jia-Ju Bai
     

03 Apr, 2018

2 commits