1. 11 Dec, 2012 38 commits
    • Jaegeuk Kim's avatar
      f2fs: cleanup the f2fs_bio_alloc routine · 3cd8a239
      Jaegeuk Kim authored
      Do cleanup more for better code readability.
      
      - Change the parameter set of f2fs_bio_alloc()
        This function should allocate a bio only since it is not something like
        f2fs_bio_init(). Instead, the caller should initialize the allocated bio.
      
      - Introduce SECTOR_FROM_BLOCK
        This macro translates a block address to its sector address.
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      Reviewed-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
      3cd8a239
    • Namjae Jeon's avatar
      f2fs: introduce accessor to retrieve number of dentry slots · 457d08ee
      Namjae Jeon authored
      Simplify code by providing the accessor macro to retrieve the
      number of dentry slots for a given filename length.
      Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
      Signed-off-by: default avatarAmit Sahrawat <a.sahrawat@samsung.com>
      457d08ee
    • Namjae Jeon's avatar
      f2fs: remove redundant call to f2fs_put_page in delete entry · 508198be
      Namjae Jeon authored
      Since, we anyway need to put the page after deleting entry. So, there is no
      need to make same call under different conditions.
      Move out the f2fs_put_page from the two conditions and call at once.
      Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
      Signed-off-by: default avatarAmit Sahrawat <a.sahrawat@samsung.com>
      508198be
    • Namjae Jeon's avatar
      f2fs: make use of GFP_F2FS_ZERO for setting gfp_mask · a0d42539
      Namjae Jeon authored
      Since, GFP_NOFS and __GFP_ZERO is being used to set gfp_mask.
      We can instead make use of already predefined macro GFP_F2FS_ZERO.
      Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
      Signed-off-by: default avatarAmit Sahrawat <a.sahrawat@samsung.com>
      a0d42539
    • Namjae Jeon's avatar
      f2fs: rewrite f2fs_bio_alloc to make it simpler · c212991a
      Namjae Jeon authored
      Since, GFP_NOFS(__GFP_WAIT) is used for allocation requests of bio in f2fs.
      So, there is no chance of returning NULL from the BIO allocation.
      
      Making the bio allocation routine for f2fs simpler.
      Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
      Signed-off-by: default avatarAmit Sahrawat <a.sahrawat@samsung.com>
      c212991a
    • Huajun Li's avatar
      f2fs: fix a typo in f2fs documentation · d08ab08d
      Huajun Li authored
      In f2fs_fs.h, one f2fs inode contains 923 data block pointers, while
      f2fs documentation says it is 929. Fix this inconsistence.
      Signed-off-by: default avatarHuajun Li <huajun.li.lee@gmail.com>
      d08ab08d
    • Wei Yongjun's avatar
      f2fs: remove unused variable · 705f814e
      Wei Yongjun authored
      The variables node_page and page_offset are initialized but never used
      otherwise, so remove those unused variables.
      Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
      705f814e
    • Namjae Jeon's avatar
      f2fs: move error condition for mkdir at proper place · 61412b64
      Namjae Jeon authored
      In function f2fs_mkdir, err is being initialized without even checking
      if there was any error in new inode creation. So, instead check the
      inode error and make use of error/return condition.
      Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
      Signed-off-by: default avatarAmit Sahrawat <a.sahrawat@samsung.com>
      61412b64
    • Namjae Jeon's avatar
      f2fs: remove unneeded initialization · 1042d60f
      Namjae Jeon authored
      No need to initialize  "struct f2fs_gc_kthread *gc_th = NULL",
      as gc_th = NULL, will be taken care by the return values of kmalloc().
      And fix codes in other places.
      Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
      Signed-off-by: default avatarAmit Sahrawat <a.sahrawat@samsung.com>
      1042d60f
    • Namjae Jeon's avatar
      f2fs: check read only condition before beginning write out · 1fa95b0b
      Namjae Jeon authored
      If the filesystem is mounted as read-only then return from that point itself
      instead of first doing a writeout/wait and then checking for read-only
      condition.
      Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
      Signed-off-by: default avatarAmit Sahrawat <a.sahrawat@samsung.com>
      1fa95b0b
    • Namjae Jeon's avatar
      f2fs: remove unneeded memset from init_once · 154a0865
      Namjae Jeon authored
      Since, __GFP_ZERO is used while f2fs inode allocation, so we do not
      need memset for f2fs_inode_info, as this is already zeroed out.
      Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
      Signed-off-by: default avatarAmit Sahrawat <a.sahrawat@samsung.com>
      154a0865
    • Namjae Jeon's avatar
      f2fs: show error in case of invalid mount arguments · 72ce6094
      Namjae Jeon authored
      print the invalid argument/value from parse_options in case of
      mount failure.
      Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
      Signed-off-by: default avatarAmit Sahrawat <a.sahrawat@samsung.com>
      72ce6094
    • Namjae Jeon's avatar
      f2fs: fix the compiler warning for uninitialized use of variable · be4124f8
      Namjae Jeon authored
      When CONFIG_CC_OPTIMIZE_FOR_SIZE is enabled in the kernel, -Os optimisation
      flag is passed to gcc for compilation, and somehow while trying to optimize
      the code, compiler is might not able to see the initialisation of variable
      ne struct variable inside the get_node_info() function and results into
      following warning:
      
      fs/f2fs/node.c: In function 'get_node_info':
      fs/f2fs/node.c:175:3: warning: 'ne.block_addr' may be used uninitialized in
      this function [-Wuninitialized]
      fs/f2fs/node.c:265:24: note: 'ne.block_addr' was declared here
      fs/f2fs/node.c:176:3: warning: 'ne.ino' may be used uninitialized in this
      function [-Wuninitialized]
      fs/f2fs/node.c:265:24: note: 'ne.ino' was declared here
      fs/f2fs/node.c:177:3: warning: 'ne.version' may be used uninitialized in
      this function [-Wuninitialized]
      fs/f2fs/node.c:265:24: note: 'ne.version' was declared here
      
      Hence, lets initialise the ne struct variable to zero, which will remove
      this warning and also doing this does not seems to making any impact on the
      code behavior.
      Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
      Signed-off-by: default avatarPankaj Kumar <pankaj.km@samsung.com>
      be4124f8
    • Jaegeuk Kim's avatar
      f2fs: resolve build failures · 573ea5fc
      Jaegeuk Kim authored
      There exist two build failures reported by Randy Dunlap as follows.
      
      (on i386)
       a. (config-r8857)
      	ERROR: "f2fs_xattr_advise_handler" [fs/f2fs/f2fs.ko] undefined!
      
      Key configs in (config-r8857) are as follows.
       CONFIG_F2FS_FS=m
       # CONFIG_F2FS_STAT_FS is not set
       CONFIG_F2FS_FS_XATTR=y
       # CONFIG_F2FS_FS_POSIX_ACL is not set
      
      The error was occurred due to the function location that we made a mistake.
      Recently we added a new functionality for users to indicate cold files
      explicitly through xattr operations (i.e., f2fs_xattr_advise_handler).
      
      This handler should have been added in xattr.c instead of acl.c in order
      to avoid an undefined operation like in this case where XATTR is set and
      ACL is not set.
      
       b. (config-r8855)
      	fs/f2fs/file.c: In function 'f2fs_vm_page_mkwrite':
      	fs/f2fs/file.c:97:2: error: implicit declaration of function
      	'block_page_mkwrite_return'
      
      Key config in (config-r8855) is CONFIG_BLOCK.
      
      Obviously, f2fs works on top of the block device so that we should consider
      carefully a sort of config dependencies.
      
      The reason why this error was occurred was that f2fs_vm_page_mkwrite() calls
      block_page_mkwrite_return() which is enalbed only if CONFIG_BLOCK is set.
      Reported-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      Acked-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
      573ea5fc
    • Jaegeuk Kim's avatar
      f2fs: adjust kernel coding style · 0a8165d7
      Jaegeuk Kim authored
      As pointed out by Randy Dunlap, this patch removes all usage of "/**" for comment
      blocks. Instead, just use "/*".
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      0a8165d7
    • Jaegeuk Kim's avatar
      f2fs: fix endian conversion bugs reported by sparse · 25ca923b
      Jaegeuk Kim authored
      This patch should resolve the bugs reported by the sparse tool.
      Initial reports were written by "kbuild test robot" managed by fengguang.wu.
      
      In my local machines, I've tested also by running:
      > make C=2 CF="-D__CHECK_ENDIAN__"
      
      Accordingly, I've found lots of warnings and bugs related to the endian
      conversion. And I've fixed all at this moment.
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      25ca923b
    • Sachin Kamat's avatar
      f2fs: remove unneeded version.h header file from f2fs.h · cf0e3a64
      Sachin Kamat authored
      Including <linux/version.h> is not necessary.
      Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
      cf0e3a64
    • Jaegeuk Kim's avatar
      f2fs: update the f2fs document · 5bb446a2
      Jaegeuk Kim authored
      I moved the f2fs-tools.git into kernel.org.
      And I added a new mailing list, linux-f2fs-devel@lists.sourceforge.net.
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      5bb446a2
    • Jaegeuk Kim's avatar
      f2fs: update Kconfig and Makefile · a14d5393
      Jaegeuk Kim authored
      This adds Makefile and Kconfig for f2fs, and updates Makefile and Kconfig files
      in the fs directory.
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      a14d5393
    • Greg Kroah-Hartman's avatar
      f2fs: move proc files to debugfs · 902829aa
      Greg Kroah-Hartman authored
      This moves all of the f2fs debugging files into debugfs. The files are
      located in /sys/kernel/debug/f2fs/
      
      Note, I think we are generating all of the same information in each of
      the files for every unique f2fs filesystem in the machine.  This copies
      the functionality that was present in the proc files, but this should be
      fixed up in the future.
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      [jaegeuk.kim@samsung.com: merged 3 debugfs entries into a *status* entry]
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      902829aa
    • Jaegeuk Kim's avatar
      f2fs: add recovery routines for roll-forward · d624c96f
      Jaegeuk Kim authored
      This adds roll-forward routines to recover fsynced data.
      
      - F2FS uses basically roll-back model with checkpointing.
      
      - In order to implement fsync(), there are two approaches as follows.
      
      1. A roll-back model with checkpointing at every fsync()
       : This is a naive method, but suffers from very low performance.
      
      2. A roll-forward model
       : F2FS adopts this model where all the fsynced data should be recovered, which
         were written after checkpointing was done. In order to figure out the data,
         F2FS keeps a "fsync" mark in direct node blocks. In addition, F2FS remains
         the location of next node block in each direct node block for reconstructing
         the chain of node blocks during the recovery.
      
      - In order to enhance the performance, F2FS keeps a "dentry" mark also in direct
        node blocks. If this is set during the recovery, F2FS replays adding a dentry.
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      d624c96f
    • Jaegeuk Kim's avatar
      f2fs: add garbage collection functions · 7bc09003
      Jaegeuk Kim authored
      This adds on-demand and background cleaning functions.
      
      - The basic background cleaning policy is trying to do cleaning jobs as much as
        possible whenever the system is idle. Once the background cleaning is done,
        the cleaner sleeps an amount of time not to interfere with VFS calls. The time
        is dynamically adjusted according to the status of whole segments, which is
        decreased when the following conditions are satisfied.
      
        . GC is not conducted currently, and
        . IO subsystem is idle by checking the number of requets in bdev's request
           list, and
        . There are enough dirty segments.
      
        Otherwise, the time is increased incrementally until to the maximum time.
        Note that, min and max times are 10 secs and 30 secs by default.
      
      - F2FS adopts a default victim selection policy where background cleaning uses
        a cost-benefit algorithm, while on-demand cleaning uses a greedy algorithm.
      
      - The method of moving data during the cleaning is slightly different between
        background and on-demand cleaning schemes. In the case of background cleaning,
        F2FS loads the data, and marks them as dirty. Then, F2FS expects that the data
        will be moved by flusher or VM. In the case of on-demand cleaning, F2FS should
        move the data right away.
      
      - In order to identify valid blocks in a victim segment, F2FS scans the bitmap
        of the segment managed as an SIT entry.
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      7bc09003
    • Jaegeuk Kim's avatar
      f2fs: add xattr and acl functionalities · af48b85b
      Jaegeuk Kim authored
      This implements xattr and acl functionalities.
      
      - F2FS uses a node page to contain use extended attributes.
      Signed-off-by: default avatarChangman Lee <cm224.lee@samsung.com>
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      af48b85b
    • Jaegeuk Kim's avatar
      f2fs: add core directory operations · 6b4ea016
      Jaegeuk Kim authored
      this adds core functions to find, add, delete, and link dentries.
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      6b4ea016
    • Jaegeuk Kim's avatar
      f2fs: add inode operations for special inodes · 57397d86
      Jaegeuk Kim authored
      This adds inode operations for directory, symlink, and special inodes.
      Signed-off-by: default avatarChangman Lee <cm224.lee@samsung.com>
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      57397d86
    • Jaegeuk Kim's avatar
      f2fs: add core inode operations · 19f99cee
      Jaegeuk Kim authored
      This adds core functions to get, read, write, and evict an inode.
      Signed-off-by: default avatarChangman Lee <cm224.lee@samsung.com>
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      19f99cee
    • Jaegeuk Kim's avatar
      f2fs: add address space operations for data · eb47b800
      Jaegeuk Kim authored
      This adds address space operations for data.
      
      - F2FS supports readpages(), writepages(), and direct_IO().
      
      - Because of out-of-place writes, f2fs_direct_IO() does not write data in place.
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      eb47b800
    • Jaegeuk Kim's avatar
      f2fs: add file operations · fbfa2cc5
      Jaegeuk Kim authored
      This adds memory operations and file/file_inode operations.
      
      - F2FS supports fallocate(), mmap(), fsync(), and basic ioctl().
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      fbfa2cc5
    • Jaegeuk Kim's avatar
      f2fs: add segment operations · 351df4b2
      Jaegeuk Kim authored
      This adds specific functions not only to manage dirty/free segments, SIT pages,
      a cache for SIT entries, and summary entries, but also to allocate free blocks
      and write three types of pages: data, node, and meta.
      
      - F2FS maintains three types of bitmaps in memory, which indicate free, prefree,
        and dirty segments respectively.
      
      - The key information of an SIT entry consists of a segment number, the number
        of valid blocks in the segment, a bitmap to identify there-in valid or invalid
        blocks.
      
      - An SIT page is composed of a certain range of SIT entries, which is maintained
        by the address space of meta_inode.
      
      - To cache SIT entries, a simple array is used. The index for the array is the
        segment number.
      
      - A summary entry for data contains the parent node information. A summary entry
        for node contains its node offset from the inode.
      
      - F2FS manages information about six active logs and those summary entries in
        memory. Whenever one of them is changed, its summary entries are flushed to
        its SIT page maintained by the address space of meta_inode.
      
      - This patch adds a default block allocation function which supports heap-based
        allocation policy.
      
      - This patch adds core functions to write data, node, and meta pages. Since LFS
        basically produces a series of sequential writes, F2FS merges sequential bios
        with a single one as much as possible to reduce the IO scheduling overhead.
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      351df4b2
    • Jaegeuk Kim's avatar
      f2fs: add node operations · e05df3b1
      Jaegeuk Kim authored
      This adds specific functions to manage NAT pages, a cache for NAT entries, free
      nids, direct/indirect node blocks for indexing data, and address space for node
      pages.
      
      - The key information of an NAT entry consists of a node id and a block address.
      
      - An NAT page is composed of block addresses covered by a certain range of NAT
        entries, which is maintained by the address space of meta_inode.
      
      - A radix tree structure is used to cache NAT entries. The index for the tree
        is a node id.
      
      - When there is no free nid, F2FS should scan NAT entries to find new one. In
        order to avoid scanning frequently, F2FS manages a list containing a number of
        free nids in memory. Only when free nids in the list are exhausted, scanning
        process, build_free_nids(), is triggered.
      
      - F2FS has direct and indirect node blocks for indexing data. This patch adds
        fuctions related to the node block management such as getting, allocating, and
        truncating node blocks to index data.
      
      - In order to cache node blocks in memory, F2FS has a node_inode with an address
        space for node pages. This patch also adds the address space operations for
        node_inode.
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      e05df3b1
    • Jaegeuk Kim's avatar
      f2fs: add checkpoint operations · 127e670a
      Jaegeuk Kim authored
      This adds functions required by the checkpoint operations.
      
      Basically, f2fs adopts a roll-back model with checkpoint blocks written in the
      CP area. The checkpoint procedure includes as follows.
      
      - write_checkpoint()
      1. block_operations() freezes VFS calls.
      2. submit cached bios.
      3. flush_nat_entries() writes NAT pages updated by dirty NAT entries.
      4. flush_sit_entries() writes SIT pages updated by dirty SIT entries.
      5. do_checkpoint() writes,
        - checkpoint block (#0)
        - orphan inode blocks
        - summary blocks made by active logs
        - checkpoint block (copy of #0)
      6. unblock_opeations()
      
      In order to provide an address space for meta pages, f2fs_sb_info has a special
      inode, namely meta_inode. This patch also adds the address space operations for
      meta_inode.
      Signed-off-by: default avatarChul Lee <chur.lee@samsung.com>
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      127e670a
    • Jaegeuk Kim's avatar
      f2fs: add super block operations · aff063e2
      Jaegeuk Kim authored
      This adds the implementation of superblock operations for f2fs, which includes
      - init_f2fs_fs/exit_f2fs_fs
      - f2fs_mount
      - super_operations of f2fs
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      aff063e2
    • Jaegeuk Kim's avatar
      f2fs: add superblock and major in-memory structure · 39a53e0c
      Jaegeuk Kim authored
      This adds the following major in-memory structures in f2fs.
      
      - f2fs_sb_info:
        contains f2fs-specific information, two special inode pointers for node and
        meta address spaces, and orphan inode management.
      
      - f2fs_inode_info:
        contains vfs_inode and other fs-specific information.
      
      - f2fs_nm_info:
        contains node manager information such as NAT entry cache, free nid list,
        and NAT page management.
      
      - f2fs_node_info:
        represents a node as node id, inode number, block address, and its version.
      
      - f2fs_sm_info:
        contains segment manager information such as SIT entry cache, free segment
        map, current active logs, dirty segment management, and segment utilization.
        The specific structures are sit_info, free_segmap_info, dirty_seglist_info,
        curseg_info.
      
      In addition, add F2FS_SUPER_MAGIC in magic.h.
      Signed-off-by: default avatarChul Lee <chur.lee@samsung.com>
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      39a53e0c
    • Jaegeuk Kim's avatar
      f2fs: add on-disk layout · dd31866b
      Jaegeuk Kim authored
      This adds a header file describing the on-disk layout of f2fs.
      Signed-off-by: default avatarChangman Lee <cm224.lee@samsung.com>
      Signed-off-by: default avatarChul Lee <chur.lee@samsung.com>
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      dd31866b
    • Jaegeuk Kim's avatar
      f2fs: add document · 98e4da8c
      Jaegeuk Kim authored
      This adds a document describing the mount options, proc entries, usage, and
      design of Flash-Friendly File System, namely F2FS.
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      98e4da8c
    • Linus Torvalds's avatar
      Linux 3.7 · 29594404
      Linus Torvalds authored
      29594404
    • Florian Fainelli's avatar
      Input: matrix-keymap - provide proper module license · 55220bb3
      Florian Fainelli authored
      The matrix-keymap module is currently lacking a proper module license,
      add one so we don't have this module tainting the entire kernel.  This
      issue has been present since commit 1932811f ("Input: matrix-keymap
      - uninline and prepare for device tree support")
      Signed-off-by: default avatarFlorian Fainelli <florian@openwrt.org>
      CC: stable@vger.kernel.org # v3.5+
      Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      55220bb3
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 2c68bc72
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Netlink socket dumping had several missing verifications and checks.
      
          In particular, address comparisons in the request byte code
          interpreter could access past the end of the address in the
          inet_request_sock.
      
          Also, address family and address prefix lengths were not validated
          properly at all.
      
          This means arbitrary applications can read past the end of certain
          kernel data structures.
      
          Fixes from Neal Cardwell.
      
       2) ip_check_defrag() operates in contexts where we're in the process
          of, or about to, input the packet into the real protocols
          (specifically macvlan and AF_PACKET snooping).
      
          Unfortunately, it does a pskb_may_pull() which can modify the
          backing packet data which is not legal if the SKB is shared.  It
          very much can be shared in this context.
      
          Deal with the possibility that the SKB is segmented by using
          skb_copy_bits().
      
          Fix from Johannes Berg based upon a report by Eric Leblond.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        ipv4: ip_check_defrag must not modify skb before unsharing
        inet_diag: validate port comparison byte code to prevent unsafe reads
        inet_diag: avoid unsafe and nonsensical prefix matches in inet_diag_bc_run()
        inet_diag: validate byte code to prevent oops in inet_diag_bc_run()
        inet_diag: fix oops for IPv4 AF_INET6 TCP SYN-RECV state
      2c68bc72
  2. 10 Dec, 2012 2 commits
    • Linus Torvalds's avatar
      Revert "revert "Revert "mm: remove __GFP_NO_KSWAPD""" and associated damage · caf49191
      Linus Torvalds authored
      This reverts commits a5091539 and
      d7c3b937.
      
      This is a revert of a revert of a revert.  In addition, it reverts the
      even older i915 change to stop using the __GFP_NO_KSWAPD flag due to the
      original commits in linux-next.
      
      It turns out that the original patch really was bogus, and that the
      original revert was the correct thing to do after all.  We thought we
      had fixed the problem, and then reverted the revert, but the problem
      really is fundamental: waking up kswapd simply isn't the right thing to
      do, and direct reclaim sometimes simply _is_ the right thing to do.
      
      When certain allocations fail, we simply should try some direct reclaim,
      and if that fails, fail the allocation.  That's the right thing to do
      for THP allocations, which can easily fail, and the GPU allocations want
      to do that too.
      
      So starting kswapd is sometimes simply wrong, and removing the flag that
      said "don't start kswapd" was a mistake.  Let's hope we never revisit
      this mistake again - and certainly not this many times ;)
      Acked-by: default avatarMel Gorman <mgorman@suse.de>
      Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
      Cc: Rik van Riel <riel@redhat.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      caf49191
    • Johannes Berg's avatar
      ipv4: ip_check_defrag must not modify skb before unsharing · 1bf3751e
      Johannes Berg authored
      ip_check_defrag() might be called from af_packet within the
      RX path where shared SKBs are used, so it must not modify
      the input SKB before it has unshared it for defragmentation.
      Use skb_copy_bits() to get the IP header and only pull in
      everything later.
      
      The same is true for the other caller in macvlan as it is
      called from dev->rx_handler which can also get a shared SKB.
      Reported-by: default avatarEric Leblond <eric@regit.org>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1bf3751e