From: Greg Kroah-Hartman Date: Mon, 4 Jan 2021 10:34:23 +0000 (+0100) Subject: 4.19-stable patches X-Git-Tag: v4.19.165~27 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c9250e442cceff81318117e5bda2ab5545214db;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: uapi-move-constants-from-linux-kernel.h-to-linux-const.h.patch xen-gntdev.c-mark-pages-as-dirty.patch --- diff --git a/queue-4.19/series b/queue-4.19/series index 9d883547fa1..609c8e42cd6 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -5,6 +5,8 @@ f2fs-prevent-creating-duplicate-encrypted-filenames.patch ubifs-prevent-creating-duplicate-encrypted-filenames.patch vfio-pci-move-dummy_resources_list-init-in-vfio_pci_.patch ext4-don-t-remount-read-only-with-errors-continue-on.patch +uapi-move-constants-from-linux-kernel.h-to-linux-const.h.patch kvm-svm-relax-conditions-for-allowing-msr_ia32_spec_.patch kvm-x86-reinstate-vendor-agnostic-check-on-spec_ctrl.patch powerpc-bitops-fix-possible-undefined-behaviour-with.patch +xen-gntdev.c-mark-pages-as-dirty.patch diff --git a/queue-4.19/uapi-move-constants-from-linux-kernel.h-to-linux-const.h.patch b/queue-4.19/uapi-move-constants-from-linux-kernel.h-to-linux-const.h.patch new file mode 100644 index 00000000000..1bc9a9fc8c3 --- /dev/null +++ b/queue-4.19/uapi-move-constants-from-linux-kernel.h-to-linux-const.h.patch @@ -0,0 +1,147 @@ +From a85cbe6159ffc973e5702f70a3bd5185f8f3c38d Mon Sep 17 00:00:00 2001 +From: Petr Vorel +Date: Mon, 14 Dec 2020 19:03:21 -0800 +Subject: uapi: move constants from to + +From: Petr Vorel + +commit a85cbe6159ffc973e5702f70a3bd5185f8f3c38d upstream. + +and include in UAPI headers instead of . + +The reason is to avoid indirect include when using +some network headers: or others -> +-> . + +This indirect include causes on MUSL redefinition of struct sysinfo when +included both and some of UAPI headers: + + In file included from x86_64-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:5, + from x86_64-buildroot-linux-musl/sysroot/usr/include/linux/netlink.h:5, + from ../include/tst_netlink.h:14, + from tst_crypto.c:13: + x86_64-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:8:8: error: redefinition of `struct sysinfo' + struct sysinfo { + ^~~~~~~ + In file included from ../include/tst_safe_macros.h:15, + from ../include/tst_test.h:93, + from tst_crypto.c:11: + x86_64-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here + +Link: https://lkml.kernel.org/r/20201015190013.8901-1-petr.vorel@gmail.com +Signed-off-by: Petr Vorel +Suggested-by: Rich Felker +Acked-by: Rich Felker +Cc: Peter Korsgaard +Cc: Baruch Siach +Cc: Florian Weimer +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + include/uapi/linux/const.h | 5 +++++ + include/uapi/linux/ethtool.h | 2 +- + include/uapi/linux/kernel.h | 9 +-------- + include/uapi/linux/lightnvm.h | 2 +- + include/uapi/linux/mroute6.h | 2 +- + include/uapi/linux/netfilter/x_tables.h | 2 +- + include/uapi/linux/netlink.h | 2 +- + include/uapi/linux/sysctl.h | 2 +- + 8 files changed, 12 insertions(+), 14 deletions(-) + +--- a/include/uapi/linux/const.h ++++ b/include/uapi/linux/const.h +@@ -28,4 +28,9 @@ + #define _BITUL(x) (_UL(1) << (x)) + #define _BITULL(x) (_ULL(1) << (x)) + ++#define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1) ++#define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask)) ++ ++#define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) ++ + #endif /* _UAPI_LINUX_CONST_H */ +--- a/include/uapi/linux/ethtool.h ++++ b/include/uapi/linux/ethtool.h +@@ -14,7 +14,7 @@ + #ifndef _UAPI_LINUX_ETHTOOL_H + #define _UAPI_LINUX_ETHTOOL_H + +-#include ++#include + #include + #include + +--- a/include/uapi/linux/kernel.h ++++ b/include/uapi/linux/kernel.h +@@ -3,13 +3,6 @@ + #define _UAPI_LINUX_KERNEL_H + + #include +- +-/* +- * 'kernel.h' contains some often-used function prototypes etc +- */ +-#define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1) +-#define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask)) +- +-#define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) ++#include + + #endif /* _UAPI_LINUX_KERNEL_H */ +--- a/include/uapi/linux/lightnvm.h ++++ b/include/uapi/linux/lightnvm.h +@@ -21,7 +21,7 @@ + #define _UAPI_LINUX_LIGHTNVM_H + + #ifdef __KERNEL__ +-#include ++#include + #include + #else /* __KERNEL__ */ + #include +--- a/include/uapi/linux/mroute6.h ++++ b/include/uapi/linux/mroute6.h +@@ -2,7 +2,7 @@ + #ifndef _UAPI__LINUX_MROUTE6_H + #define _UAPI__LINUX_MROUTE6_H + +-#include ++#include + #include + #include + #include /* For struct sockaddr_in6. */ +--- a/include/uapi/linux/netfilter/x_tables.h ++++ b/include/uapi/linux/netfilter/x_tables.h +@@ -1,7 +1,7 @@ + /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ + #ifndef _UAPI_X_TABLES_H + #define _UAPI_X_TABLES_H +-#include ++#include + #include + + #define XT_FUNCTION_MAXNAMELEN 30 +--- a/include/uapi/linux/netlink.h ++++ b/include/uapi/linux/netlink.h +@@ -2,7 +2,7 @@ + #ifndef _UAPI__LINUX_NETLINK_H + #define _UAPI__LINUX_NETLINK_H + +-#include ++#include + #include /* for __kernel_sa_family_t */ + #include + +--- a/include/uapi/linux/sysctl.h ++++ b/include/uapi/linux/sysctl.h +@@ -23,7 +23,7 @@ + #ifndef _UAPI_LINUX_SYSCTL_H + #define _UAPI_LINUX_SYSCTL_H + +-#include ++#include + #include + #include + diff --git a/queue-4.19/xen-gntdev.c-mark-pages-as-dirty.patch b/queue-4.19/xen-gntdev.c-mark-pages-as-dirty.patch new file mode 100644 index 00000000000..4671c247741 --- /dev/null +++ b/queue-4.19/xen-gntdev.c-mark-pages-as-dirty.patch @@ -0,0 +1,97 @@ +From 779055842da5b2e508f3ccf9a8153cb1f704f566 Mon Sep 17 00:00:00 2001 +From: Souptick Joarder +Date: Sun, 6 Sep 2020 12:21:53 +0530 +Subject: xen/gntdev.c: Mark pages as dirty + +From: Souptick Joarder + +commit 779055842da5b2e508f3ccf9a8153cb1f704f566 upstream. + +There seems to be a bug in the original code when gntdev_get_page() +is called with writeable=true then the page needs to be marked dirty +before being put. + +To address this, a bool writeable is added in gnt_dev_copy_batch, set +it in gntdev_grant_copy_seg() (and drop `writeable` argument to +gntdev_get_page()) and then, based on batch->writeable, use +set_page_dirty_lock(). + +Fixes: a4cdb556cae0 (xen/gntdev: add ioctl for grant copy) +Suggested-by: Boris Ostrovsky +Signed-off-by: Souptick Joarder +Cc: John Hubbard +Cc: Boris Ostrovsky +Cc: Juergen Gross +Cc: David Vrabel +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/r/1599375114-32360-1-git-send-email-jrdr.linux@gmail.com +Reviewed-by: Boris Ostrovsky +Signed-off-by: Boris Ostrovsky +[jinoh: backport accounting for missing + commit 73b0140bf0fe ("mm/gup: change GUP fast to use flags rather than a write 'bool'")] +Signed-off-by: Jinoh Kang +Signed-off-by: Greg Kroah-Hartman +--- + drivers/xen/gntdev.c | 17 ++++++++++++----- + 1 file changed, 12 insertions(+), 5 deletions(-) + +--- a/drivers/xen/gntdev.c ++++ b/drivers/xen/gntdev.c +@@ -842,17 +842,18 @@ struct gntdev_copy_batch { + s16 __user *status[GNTDEV_COPY_BATCH]; + unsigned int nr_ops; + unsigned int nr_pages; ++ bool writeable; + }; + + static int gntdev_get_page(struct gntdev_copy_batch *batch, void __user *virt, +- bool writeable, unsigned long *gfn) ++ unsigned long *gfn) + { + unsigned long addr = (unsigned long)virt; + struct page *page; + unsigned long xen_pfn; + int ret; + +- ret = get_user_pages_fast(addr, 1, writeable, &page); ++ ret = get_user_pages_fast(addr, 1, batch->writeable, &page); + if (ret < 0) + return ret; + +@@ -868,9 +869,13 @@ static void gntdev_put_pages(struct gntd + { + unsigned int i; + +- for (i = 0; i < batch->nr_pages; i++) ++ for (i = 0; i < batch->nr_pages; i++) { ++ if (batch->writeable && !PageDirty(batch->pages[i])) ++ set_page_dirty_lock(batch->pages[i]); + put_page(batch->pages[i]); ++ } + batch->nr_pages = 0; ++ batch->writeable = false; + } + + static int gntdev_copy(struct gntdev_copy_batch *batch) +@@ -959,8 +964,9 @@ static int gntdev_grant_copy_seg(struct + virt = seg->source.virt + copied; + off = (unsigned long)virt & ~XEN_PAGE_MASK; + len = min(len, (size_t)XEN_PAGE_SIZE - off); ++ batch->writeable = false; + +- ret = gntdev_get_page(batch, virt, false, &gfn); ++ ret = gntdev_get_page(batch, virt, &gfn); + if (ret < 0) + return ret; + +@@ -978,8 +984,9 @@ static int gntdev_grant_copy_seg(struct + virt = seg->dest.virt + copied; + off = (unsigned long)virt & ~XEN_PAGE_MASK; + len = min(len, (size_t)XEN_PAGE_SIZE - off); ++ batch->writeable = true; + +- ret = gntdev_get_page(batch, virt, true, &gfn); ++ ret = gntdev_get_page(batch, virt, &gfn); + if (ret < 0) + return ret; +