1. 18 5月, 2016 18 次提交
  2. 09 5月, 2016 9 次提交
  3. 05 4月, 2016 1 次提交
    • K
      mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros · 09cbfeaf
      Kirill A. Shutemov 提交于
      PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
      ago with promise that one day it will be possible to implement page
      cache with bigger chunks than PAGE_SIZE.
      
      This promise never materialized.  And unlikely will.
      
      We have many places where PAGE_CACHE_SIZE assumed to be equal to
      PAGE_SIZE.  And it's constant source of confusion on whether
      PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
      especially on the border between fs and mm.
      
      Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
      breakage to be doable.
      
      Let's stop pretending that pages in page cache are special.  They are
      not.
      
      The changes are pretty straight-forward:
      
       - <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
      
       - <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
      
       - PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
      
       - page_cache_get() -> get_page();
      
       - page_cache_release() -> put_page();
      
      This patch contains automated changes generated with coccinelle using
      script below.  For some reason, coccinelle doesn't patch header files.
      I've called spatch for them manually.
      
      The only adjustment after coccinelle is revert of changes to
      PAGE_CAHCE_ALIGN definition: we are going to drop it later.
      
      There are few places in the code where coccinelle didn't reach.  I'll
      fix them manually in a separate patch.  Comments and documentation also
      will be addressed with the separate patch.
      
      virtual patch
      
      @@
      expression E;
      @@
      - E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
      + E
      
      @@
      expression E;
      @@
      - E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
      + E
      
      @@
      @@
      - PAGE_CACHE_SHIFT
      + PAGE_SHIFT
      
      @@
      @@
      - PAGE_CACHE_SIZE
      + PAGE_SIZE
      
      @@
      @@
      - PAGE_CACHE_MASK
      + PAGE_MASK
      
      @@
      expression E;
      @@
      - PAGE_CACHE_ALIGN(E)
      + PAGE_ALIGN(E)
      
      @@
      expression E;
      @@
      - page_cache_get(E)
      + get_page(E)
      
      @@
      expression E;
      @@
      - page_cache_release(E)
      + put_page(E)
      Signed-off-by: NKirill A. Shutemov <kirill.shutemov@linux.intel.com>
      Acked-by: NMichal Hocko <mhocko@suse.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      09cbfeaf
  4. 27 3月, 2016 1 次提交
  5. 22 3月, 2016 1 次提交
  6. 18 3月, 2016 1 次提交
    • C
      nfs/blocklayout: add SCSI layout support · d9186c03
      Christoph Hellwig 提交于
      This is a trivial extension to the block layout driver to support the
      new SCSI layouts draft.  There are three changes:
      
       - device identifcation through the SCSI VPD page.  This allows us to
         directly use the udev generated persistent device names instead of
         requiring an expensive lookup by crawling every block device node
         in /dev and reading a signature for it.
       - use of SCSI persistent reservations to protect device access and
         allow for robust fencing.  On the client sides this just means
         registering and unregistering a server supplied key.
       - an optimized LAYOUTCOMMIT payload that doesn't send unessecary
         fields to the server.
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Acked-by: NTrond Myklebust <trond.myklebust@primarydata.com>
      Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>
      d9186c03
  7. 17 3月, 2016 3 次提交
    • J
      nfs4: nfs4_ff_layout_prepare_ds should return NULL if connection failed · 849dc324
      Jeff Layton 提交于
      I hit the following oops out of the blue while testing with flexfiles:
      
      BUG: unable to handle kernel NULL pointer dereference at 00000000000000e8
      IP: [<ffffffffa048f6b8>] nfs4_ff_find_or_create_ds_client+0x48/0x50 [nfs_layout_flexfiles]
      PGD 44031067 PUD 5062d067 PMD 0
      Oops: 0000 [#1] SMP
      Modules linked in: nfsv3 nfs_layout_flexfiles tun rpcsec_gss_krb5 nfsv4 dns_resolver nfs fscache dcdbas nfsd auth_rpcgss nfs_acl lockd grace sunrpc ip6t_rpfilter ip6t_REJECT nf_reject_ipv6 xt_conntrack ebtable_nat ebtable_broute bridge stp llc ebtable_filter ebtables ip6table_nat nf_conntrack_ipv6 nf_defrag_ipv6 nf_nat_ipv6 ip6table_mangle ip6table_security ip6table_raw ip6table_filter ip6_tables iptable_nat nf_conntrack_ipv4 nf_defrag_ipv4 nf_nat_ipv4 nf_nat nf_conntrack iptable_mangle iptable_security iptable_raw bonding ipmi_devintf ipmi_msghandler snd_hda_codec_generic virtio_balloon ppdev snd_hda_intel snd_hda_controller snd_hda_codec iosf_mbi crct10dif_pclmul crc32_pclmul ghash_clmulni_intel snd_hda_core parport_pc snd_hwdep parport snd_seq snd_seq_device snd_pcm snd_timer acpi_cpufreq
       snd soundcore i2c_piix4 xfs libcrc32c joydev virtio_net virtio_console qxl drm_kms_helper ttm crc32c_intel drm virtio_pci serio_raw ata_generic virtio_ring virtio pata_acpi
      CPU: 0 PID: 19138 Comm: test5 Not tainted 4.1.9-100.pd.90.el7.x86_64 #1
      Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.8.2-20150714_191134- 04/01/2014
      task: ffff88007b70cf00 ti: ffff88004cc44000 task.ti: ffff88004cc44000
      RIP: 0010:[<ffffffffa048f6b8>]  [<ffffffffa048f6b8>] nfs4_ff_find_or_create_ds_client+0x48/0x50 [nfs_layout_flexfiles]
      RSP: 0018:ffff88004cc47890  EFLAGS: 00010246
      RAX: 0000000000000003 RBX: ffff880050932300 RCX: ffff88006978f488
      RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff88003e0e8540
      RBP: ffff88004cc47908 R08: 0000000000000000 R09: 0000000000000000
      R10: ffff88007ff8c758 R11: 0000000000000005 R12: ffff88003e0e8540
      R13: 0000000000000000 R14: ffff88006978f488 R15: ffff88004431cc80
      FS:  00007fea40c7c740(0000) GS:ffff88007fc00000(0000) knlGS:0000000000000000
      CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
      CR2: 00000000000000e8 CR3: 0000000044318000 CR4: 00000000000406f0
      Stack:
       ffffffffa048c934 ffff880050932310 0000000100000001 ffff88006978f510
       ffff88006978f3c8 ffff88003e56cd90 ffff88004cc479d0 00000020a052aff0
       000000000004b000 ffff88004cc47908 ffff880050932300 ffff88004cc479d0
      Call Trace:
       [<ffffffffa048c934>] ? ff_layout_write_pagelist+0x64/0x220 [nfs_layout_flexfiles]
       [<ffffffffa057a3bf>] pnfs_generic_pg_writepages+0xaf/0x1b0 [nfsv4]
       [<ffffffffa051ab57>] nfs_pageio_doio+0x27/0x60 [nfs]
       [<ffffffffa051bfe4>] nfs_pageio_complete_mirror+0x54/0xa0 [nfs]
       [<ffffffffa051c7ad>] nfs_pageio_complete+0x2d/0x90 [nfs]
       [<ffffffffa052032d>] nfs_writepage_locked+0x8d/0xe0 [nfs]
       [<ffffffff811e4630>] ? page_referenced_one+0x1a0/0x1a0
       [<ffffffffa05210e7>] nfs_wb_single_page+0xf7/0x190 [nfs]
       [<ffffffffa05108d1>] nfs_launder_page+0x41/0x90 [nfs]
       [<ffffffff811b8930>] invalidate_inode_pages2_range+0x340/0x3a0
       [<ffffffff811b89a7>] invalidate_inode_pages2+0x17/0x20
       [<ffffffffa0513e1e>] nfs_release+0x9e/0xb0 [nfs]
       [<ffffffffa050fa1d>] nfs_file_release+0x3d/0x60 [nfs]
       [<ffffffff8122481c>] __fput+0xdc/0x1e0
       [<ffffffff8122496e>] ____fput+0xe/0x10
       [<ffffffff810bde67>] task_work_run+0xa7/0xe0
       [<ffffffff810af735>] get_signal+0x565/0x600
       [<ffffffff811a9815>] ? __filemap_fdatawrite_range+0x65/0x90
       [<ffffffff810144a7>] do_signal+0x37/0x730
       [<ffffffffa0569921>] ? nfs4_file_fsync+0x81/0x150 [nfsv4]
       [<ffffffff81254dbb>] ? vfs_fsync_range+0x3b/0xb0
       [<ffffffff811446a6>] ? __audit_syscall_exit+0x1e6/0x280
       [<ffffffff81014bff>] do_notify_resume+0x5f/0xa0
       [<ffffffff8178ec3c>] int_signal+0x12/0x17
      Code: 48 8b 40 70 8b 00 83 f8 03 74 20 83 f8 04 75 13 55 48 89 ce 48 89 d7 48 89 e5 e8 14 0f 0e 00 5d c3 66 90 0f 0b 66 0f 1f 44 00 00 <48> 8b 82 e8 00 00 00 c3 66 66 66 66 90 55 48 89 e5 41 57 41 56
      RIP  [<ffffffffa048f6b8>] nfs4_ff_find_or_create_ds_client+0x48/0x50 [nfs_layout_flexfiles]
       RSP <ffff88004cc47890>
      CR2: 00000000000000e8
      
      When the DS connection attempt fails, nfs4_ff_layout_prepare_ds marks it
      for the error but then just returns the ds as if it were usable. The
      comments though say:
      
        /* Upon return, either ds is connected, or ds is NULL */
      
      Ensure that we set the return pointer to NULL in the event that the
      connection attempt fails.
      Signed-off-by: NJeff Layton <jeff.layton@primarydata.com>
      Signed-off-by: NTrond Myklebust <trond.myklebust@primarydata.com>
      849dc324
    • C
      nfs: remove nfs_inode_dio_wait · 95d9f6c3
      Christoph Hellwig 提交于
      Just call inode_dio_wait directly instead of through a pointless wrapper.
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Signed-off-by: NTrond Myklebust <trond.myklebust@primarydata.com>
      95d9f6c3
    • C
      nfs: remove nfs4_file_fsync · 4ff79bc7
      Christoph Hellwig 提交于
      The only difference to nfs_file_fsync is the call to pnfs_sync_inode.  But
      pnfs_sync_inode is just an inline that calls a pNFS layout driver method
      if CONFIG_PNFS is designed, and thus can be called just fine from the core
      NFS module.
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Signed-off-by: NTrond Myklebust <trond.myklebust@primarydata.com>
      4ff79bc7
  8. 14 3月, 2016 2 次提交
  9. 23 2月, 2016 2 次提交
  10. 18 2月, 2016 2 次提交
    • K
      pnfs/blocklayout: fix a memeory leak when using,vmalloc_to_page · c8975706
      Kinglong Mee 提交于
      unreferenced object 0xffffc90000abf000 (size 16900):
        comm "fsync02", pid 15765, jiffies 4297431627 (age 423.772s)
        hex dump (first 32 bytes):
          00 00 00 00 00 00 00 00 00 a0 c2 19 00 88 ff ff  ................
          00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
        backtrace:
          [<ffffffff8174d54e>] kmemleak_alloc+0x4e/0xb0
          [<ffffffff811b9b91>] __vmalloc_node_range+0x231/0x280
          [<ffffffff811b9c2a>] __vmalloc+0x4a/0x50
          [<ffffffffa02c9ec1>] ext_tree_prepare_commit+0x231/0x2e0 [blocklayoutdriver]
          [<ffffffffa02c700e>] bl_prepare_layoutcommit+0xe/0x10 [blocklayoutdriver]
          [<ffffffffa0596a6c>] pnfs_layoutcommit_inode+0x29c/0x330 [nfsv4]
          [<ffffffffa0596b13>] pnfs_generic_sync+0x13/0x20 [nfsv4]
          [<ffffffffa0585188>] nfs4_file_fsync+0x58/0x150 [nfsv4]
          [<ffffffff81228e5b>] vfs_fsync_range+0x4b/0xb0
          [<ffffffff81228f1d>] do_fsync+0x3d/0x70
          [<ffffffff812291d0>] SyS_fsync+0x10/0x20
          [<ffffffff81757def>] entry_SYSCALL_64_fastpath+0x12/0x76
          [<ffffffffffffffff>] 0xffffffffffffffff
      
      v2, add missing include header
      Signed-off-by: NKinglong Mee <kinglongmee@gmail.com>
      Signed-off-by: NTrond Myklebust <trond.myklebust@primarydata.com>
      c8975706
    • C
      nfs4: fix stateid handling for the NFS v4.2 operations · 4bdf87eb
      Christoph Hellwig 提交于
      The newly added NFS v4.2 operations (ALLOCATE, DEALLOCATE, SEEK and CLONE)
      use a helper called nfs42_set_rw_stateid to select a stateid that is sent
      to the server.  But they don't set the inode and state fields in the
      nfs4_exception structure, and this don't partake in the stateid recovery
      protocol.  Because of this they will simply return errors insted of trying
      to recover a stateid when the server return a BAD_STATEID error.
      
      Additionally CLONE has the problem that it operates on two files and thus
      two stateids, and thus needs to call the exception handler twice to
      recover stateids.
      
      While we're at it stop grabbing an addititional reference to the open
      context in all these operations - having the file open guarantees that
      the open context won't go away.
      
      All this can be produces with the generic/168 and generic/170 tests in
      xfstests which stress the CLONE stateid handling.
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Signed-off-by: NTrond Myklebust <trond.myklebust@primarydata.com>
      4bdf87eb