---- linux-2.6.33/scripts/mod/modpost.c~ 2010-02-24 19:52:17.000000000 +0100
-+++ linux-2.6.33/scripts/mod/modpost.c 2010-03-07 14:26:47.242168558 +0100
-@@ -15,7 +15,8 @@
- #include <stdio.h>
- #include <ctype.h>
- #include "modpost.h"
--#include "../../include/generated/autoconf.h"
-+// PLD architectures don't use CONFIG_SYMBOL_PREFIX
-+//#include "../../include/generated/autoconf.h"
- #include "../../include/linux/license.h"
-
- /* Some toolchains use a `_' prefix for all user symbols. */
-
---- linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh~ 2011-07-22 04:17:23.000000000 +0200
-+++ linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh 2011-08-25 21:26:04.799150642 +0200
-@@ -9,6 +9,12 @@
- $cc -print-file-name=lib${lib}.${ext} | grep -q /
- if [ $? -eq 0 ]; then
- echo "-l${lib}"
-+ for libt in tinfow tinfo ; do
-+ $cc -print-file-name=lib${libt}.${ext} | grep -q /
-+ if [ $? -eq 0 ]; then
-+ echo "-l${libt}"
-+ fi
-+ done
- exit
- fi
- done
-
-diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
-index 7a0c800..ec5ebbb 100644
---- a/drivers/net/ethernet/realtek/r8169.c
-+++ b/drivers/net/ethernet/realtek/r8169.c
-@@ -6927,6 +6927,14 @@ rtl_init_one(struct pci_dev *pdev, const
- for (i = 0; i < ETH_ALEN; i++)
- dev->dev_addr[i] = RTL_R8(MAC0 + i);
-
-+ if (!is_valid_ether_addr(dev->dev_addr)) {
-+ /* Report it and use a random ethernet address instead */
-+ netdev_err(dev, "Invalid MAC address: %pM\n", dev->dev_addr);
-+ random_ether_addr(dev->dev_addr);
-+ netdev_info(dev, "Using random MAC address: %pM\n",
-+ dev->dev_addr);
-+ }
-+
- SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops);
- dev->watchdog_timeo = RTL8169_TX_TIMEOUT;
-
-[PATCH] SCSI: Don't attempt to send extended INQUIRY command if skip_vpd_pages is set
-
-If a device has the skip_vpd_pages flag set we should simply fail the
-scsi_get_vpd_page() call.
-
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-Acked-by: Alan Stern <stern@rowland.harvard.edu>
-Tested-by: Stuart Foster <smf.linux@ntlworld.com>
-Cc: stable@vger.kernel.org
-
-diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
-index 3b1ea34..eaa808e 100644
---- a/drivers/scsi/scsi.c
-+++ b/drivers/scsi/scsi.c
-@@ -1031,6 +1031,9 @@
- {
- int i, result;
-
-+ if (sdev->skip_vpd_pages)
-+ goto fail;
-+
- /* Ask for all the pages supported by this device */
- result = scsi_vpd_inquiry(sdev, buf, 0, buf_len);
- if (result)
+From: Shaohua Li <shli@fb.com>
-David Vrabel identified a regression when using automatic NUMA balancing
-under Xen whereby page table entries were getting corrupted due to the
-use of native PTE operations. Quoting him
+Basically this is a copy of commit 001e4a8775f6(ext4: implement cgroup
+writeback support). Tested with a fio test, verified writeback is
+throttled against cgroup io.max write bandwidth, also verified moving
+the fio test to another cgroup and the writeback is throttled against
+new cgroup setting.
- Xen PV guest page tables require that their entries use machine
- addresses if the preset bit (_PAGE_PRESENT) is set, and (for
- successful migration) non-present PTEs must use pseudo-physical
- addresses. This is because on migration MFNs in present PTEs are
- translated to PFNs (canonicalised) so they may be translated back
- to the new MFN in the destination domain (uncanonicalised).
-
- pte_mknonnuma(), pmd_mknonnuma(), pte_mknuma() and pmd_mknuma()
- set and clear the _PAGE_PRESENT bit using pte_set_flags(),
- pte_clear_flags(), etc.
-
- In a Xen PV guest, these functions must translate MFNs to PFNs
- when clearing _PAGE_PRESENT and translate PFNs to MFNs when setting
- _PAGE_PRESENT.
-
-His suggested fix converted p[te|md]_[set|clear]_flags to using
-paravirt-friendly ops but this is overkill. He suggested an alternative of
-using p[te|md]_modify in the NUMA page table operations but this is does
-more work than necessary and would require looking up a VMA for protections.
-
-This patch modifies the NUMA page table operations to use paravirt friendly
-operations to set/clear the flags of interest. Unfortunately this will take
-a performance hit when updating the PTEs on CONFIG_PARAVIRT but I do not
-see a way around it that does not break Xen.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Mel Gorman <mgorman@suse.de>
-Acked-by: David Vrabel <david.vrabel@citrix.com>
-Tested-by: David Vrabel <david.vrabel@citrix.com>
+Cc: Tejun Heo <tj@kernel.org>
+Signed-off-by: Shaohua Li <shli@fb.com>
---
- include/asm-generic/pgtable.h | 31 +++++++++++++++++++++++--------
- 1 file changed, 23 insertions(+), 8 deletions(-)
-
-diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
-index 34c7bdc..38a7437 100644
---- a/include/asm-generic/pgtable.h
-+++ b/include/asm-generic/pgtable.h
-@@ -680,24 +680,35 @@ static inline int pmd_numa(pmd_t pmd)
- #ifndef pte_mknonnuma
- static inline pte_t pte_mknonnuma(pte_t pte)
- {
-- pte = pte_clear_flags(pte, _PAGE_NUMA);
-- return pte_set_flags(pte, _PAGE_PRESENT|_PAGE_ACCESSED);
-+ pteval_t val = pte_val(pte);
-+
-+ val &= ~_PAGE_NUMA;
-+ val |= (_PAGE_PRESENT|_PAGE_ACCESSED);
-+ return __pte(val);
- }
- #endif
-
- #ifndef pmd_mknonnuma
- static inline pmd_t pmd_mknonnuma(pmd_t pmd)
- {
-- pmd = pmd_clear_flags(pmd, _PAGE_NUMA);
-- return pmd_set_flags(pmd, _PAGE_PRESENT|_PAGE_ACCESSED);
-+ pmdval_t val = pmd_val(pmd);
-+
-+ val &= ~_PAGE_NUMA;
-+ val |= (_PAGE_PRESENT|_PAGE_ACCESSED);
-+
-+ return __pmd(val);
- }
- #endif
-
- #ifndef pte_mknuma
- static inline pte_t pte_mknuma(pte_t pte)
- {
-- pte = pte_set_flags(pte, _PAGE_NUMA);
-- return pte_clear_flags(pte, _PAGE_PRESENT);
-+ pteval_t val = pte_val(pte);
-+
-+ val &= ~_PAGE_PRESENT;
-+ val |= _PAGE_NUMA;
-+
-+ return __pte(val);
- }
- #endif
-
-@@ -716,8 +727,12 @@ static inline void ptep_set_numa(struct mm_struct *mm, unsigned long addr,
- #ifndef pmd_mknuma
- static inline pmd_t pmd_mknuma(pmd_t pmd)
- {
-- pmd = pmd_set_flags(pmd, _PAGE_NUMA);
-- return pmd_clear_flags(pmd, _PAGE_PRESENT);
-+ pmdval_t val = pmd_val(pmd);
-+
-+ val &= ~_PAGE_PRESENT;
-+ val |= _PAGE_NUMA;
-+
-+ return __pmd(val);
- }
- #endif
-
---
-1.8.4.5
-
---
-To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at http://vger.kernel.org/majordomo-info.html
-Please read the FAQ at http://www.tux.org/lkml/
-From 1e2ee49f7f1b79f0b14884fe6a602f0411b39552 Mon Sep 17 00:00:00 2001
-From: Will Woods <wwoods@redhat.com>
-Date: Tue, 6 May 2014 12:50:10 -0700
-Subject: fanotify: fix -EOVERFLOW with large files on 64-bit
-
-On 64-bit systems, O_LARGEFILE is automatically added to flags inside
-the open() syscall (also openat(), blkdev_open(), etc). Userspace
-therefore defines O_LARGEFILE to be 0 - you can use it, but it's a
-no-op. Everything should be O_LARGEFILE by default.
-
-But: when fanotify does create_fd() it uses dentry_open(), which skips
-all that. And userspace can't set O_LARGEFILE in fanotify_init()
-because it's defined to 0. So if fanotify gets an event regarding a
-large file, the read() will just fail with -EOVERFLOW.
-
-This patch adds O_LARGEFILE to fanotify_init()'s event_f_flags on 64-bit
-systems, using the same test as open()/openat()/etc.
-
-Addresses https://bugzilla.redhat.com/show_bug.cgi?id=696821
-
-Signed-off-by: Will Woods <wwoods@redhat.com>
-Acked-by: Eric Paris <eparis@redhat.com>
-Reviewed-by: Jan Kara <jack@suse.cz>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-
-diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
-index 4e565c8..732648b 100644
---- a/fs/notify/fanotify/fanotify_user.c
-+++ b/fs/notify/fanotify/fanotify_user.c
-@@ -698,6 +698,8 @@ SYSCALL_DEFINE2(fanotify_init, unsigned int, flags, unsigned int, event_f_flags)
+ fs/xfs/xfs_aops.c | 2 ++
+ fs/xfs/xfs_super.c | 1 +
+ 2 files changed, 3 insertions(+)
+
+--- linux-4.19/fs/xfs/xfs_aops.c.org 2018-11-21 10:31:12.348955352 +0100
++++ linux-4.19/fs/xfs/xfs_aops.c 2018-11-21 10:34:35.241764742 +0100
+@@ -613,8 +613,10 @@ xfs_add_to_ioend(
+ list_add(&wpc->ioend->io_list, iolist);
+ wpc->ioend = xfs_alloc_ioend(inode, wpc->io_type, offset,
+ bdev, sector);
++ wbc_init_bio(wbc, wpc->ioend->io_bio);
}
- group->overflow_event = &oevent->fse;
-
-+ if (force_o_largefile())
-+ event_f_flags |= O_LARGEFILE;
- group->fanotify_data.f_flags = event_f_flags;
- #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
- spin_lock_init(&group->fanotify_data.access_lock);
---
-cgit v0.10.1
-
-From 50c6e282bdf5e8dabf8d7cf7b162545a55645fd9 Mon Sep 17 00:00:00 2001
-From: Christoph Hellwig <hch@lst.de>
-Date: Sun, 4 May 2014 13:03:32 +0200
-Subject: posix_acl: handle NULL ACL in posix_acl_equiv_mode
-
-Various filesystems don't bother checking for a NULL ACL in
-posix_acl_equiv_mode, and thus can dereference a NULL pointer when it
-gets passed one. This usually happens from the NFS server, as the ACL tools
-never pass a NULL ACL, but instead of one representing the mode bits.
-
-Instead of adding boilerplat to all filesystems put this check into one place,
-which will allow us to remove the check from other filesystems as well later
-on.
-
-Signed-off-by: Christoph Hellwig <hch@lst.de>
-Reported-by: Ben Greear <greearb@candelatech.com>
-Reported-by: Marco Munderloh <munderl@tnt.uni-hannover.de>,
-Cc: Chuck Lever <chuck.lever@oracle.com>
-Cc: stable@vger.kernel.org
-Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-
-diff --git a/fs/posix_acl.c b/fs/posix_acl.c
-index 9e363e4..0855f77 100644
---- a/fs/posix_acl.c
-+++ b/fs/posix_acl.c
-@@ -246,6 +246,12 @@ posix_acl_equiv_mode(const struct posix_acl *acl, umode_t *mode_p)
- umode_t mode = 0;
- int not_equiv = 0;
-+ /*
-+ * A null ACL can always be presented as mode bits.
-+ */
-+ if (!acl)
-+ return 0;
-+
- FOREACH_ACL_ENTRY(pa, acl, pe) {
- switch (pa->e_tag) {
- case ACL_USER_OBJ:
---
-cgit v0.10.1
-
++ wbc_account_io(wbc, page, len);
+ if (!__bio_try_merge_page(wpc->ioend->io_bio, page, len, poff)) {
+ if (iop)
+ atomic_inc(&iop->write_count);
+diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
+index 584cf2d..aea3bc2 100644
+--- a/fs/xfs/xfs_super.c
++++ b/fs/xfs/xfs_super.c
+@@ -1634,6 +1634,7 @@ xfs_fs_fill_super(
+ sb->s_max_links = XFS_MAXLINK;
+ sb->s_time_gran = 1;
+ set_posix_acl_flag(sb);
++ sb->s_iflags |= SB_I_CGROUPWB;
+
+ /* version 5 superblocks support inode version counters. */
+ if (XFS_SB_VERSION_NUM(&mp->m_sb) == XFS_SB_VERSION_5)
projects / packages / kernel.git / blobdiff