diff options
author | Richard Yao <ryao@gentoo.org> | 2012-09-18 22:12:45 +0000 |
---|---|---|
committer | Richard Yao <ryao@gentoo.org> | 2012-09-18 22:12:45 +0000 |
commit | b1c7e500c0f5bd7be298b5d181facd07a94993d7 (patch) | |
tree | cefdee0a9a7899a8451d274ac082a85d455ec138 /sys-kernel/spl | |
parent | Remove sys-kernel/spl-0.6.0_rc9-r2 (diff) | |
download | historical-b1c7e500c0f5bd7be298b5d181facd07a94993d7.tar.gz historical-b1c7e500c0f5bd7be298b5d181facd07a94993d7.tar.bz2 historical-b1c7e500c0f5bd7be298b5d181facd07a94993d7.zip |
Remove sys-kernel/spl-0.6.0_rc9-r2 patch files
Package-Manager: portage-2.1.11.9/cvs/Linux x86_64
Diffstat (limited to 'sys-kernel/spl')
5 files changed, 8 insertions, 242 deletions
diff --git a/sys-kernel/spl/ChangeLog b/sys-kernel/spl/ChangeLog index 62d8a7231789..9b35557bc0de 100644 --- a/sys-kernel/spl/ChangeLog +++ b/sys-kernel/spl/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-kernel/spl # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.27 2012/09/18 22:09:30 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.28 2012/09/18 22:12:45 ryao Exp $ + + 18 Sep 2012; Richard Yao <ryao@gentoo.org> + -files/spl-0.6.0_rc9-alias-km-sleep-with-km-pushpage.patch, + -files/spl-0.6.0_rc9-constify-free-functions.patch, + -files/spl-0.6.0_rc9-detect-kernel-honors-gfp-flags.patch: + Remove sys-kernel/spl-0.6.0_rc9-r2 patch files 18 Sep 2012; Richard Yao <ryao@gentoo.org> -spl-0.6.0_rc9-r2.ebuild: Remove sys-kernel/spl-0.6.0_rc9-r2 diff --git a/sys-kernel/spl/Manifest b/sys-kernel/spl/Manifest index bfd5cefc6d9b..5a007c530906 100644 --- a/sys-kernel/spl/Manifest +++ b/sys-kernel/spl/Manifest @@ -1,5 +1,5 @@ DIST spl-0.6.0-rc10.tar.gz 523189 SHA256 b25a748b18522f38b495f3577905ccd296f2782d1180140a05bd1efa19113ea0 SHA512 c5a01c9d42afcc3c4069b771fed2cbdc20d621994d2709a06057d93aeecc1b15c442cf5bce4cced90ecf7ac841f610e0b55b678e2bde8b853aeefac4402baf19 WHIRLPOOL 961edac42c35b1ecf65748eb2fc9876ed8cf1207307eedaba41a381e519589859ad5bbe468f7b94d563ec954e10c47237b4540f63a7ea211bbf9d92158f06b11 EBUILD spl-0.6.0_rc10.ebuild 2173 SHA256 22f79dcb950c2e5747d0808950eb0140b57f5addb25830a51cb432f0cb0c477b SHA512 fd8b303a4b5bb34a418e59d00c396541c9655607b113ed29b5185eed74aed52b819723a5f56a7c3f0330a89f25e83c6b1f9899f26494d015f1e6129b592f03c0 WHIRLPOOL 37c213e141f6f1d08921d48944498c4e789f713e905b716c52ba73ee914ecf4d9fd2adc6921af0ad3cda754e51c534b1a1f1ac04df7b9ecfb23459e01299a03e EBUILD spl-9999.ebuild 2168 SHA256 f56720f8a26bb0e972df3d506ef9af7b4058027f852e1ef795143d44349986c4 SHA512 da93832f6e7945c07efd35eeeefa5056783734d5b0c7eb5ff0b3a06296c3ea7274b13d60fe6923990d80c229706e71a1d02725733e0ce49177c7f2e38a455b82 WHIRLPOOL c34dc8c2460c823b963cd932a7b34de2d65bf57c9789c69aa43d722acef368c8c0b2eb53e22afe63b2f37036e5b3169ed50a69343a60dcbb581069039a3e59ea -MISC ChangeLog 3936 SHA256 b886a1617345238cb366bdb38bfa10ae53ab670e27b6b0a44447c2ecc0c05441 SHA512 322178ca8badd5769466013066b636823fd1782727ecd1b73fd81e8c828b616502383c9e2302438db90a876d229b60820513af90078b6c225d0b0b0cfd998e32 WHIRLPOOL 3ba1514e196e4e5c18e7a8700e1a28a849ce0a8504eadc14de272c95bed689dab5879ab09882e6b5ee7c7ad523c6a8f513b63e7f6b971e8d4bacdade0ea81b1e +MISC ChangeLog 4208 SHA256 9949517c572f2ace38bc301f07bc2ca48ab7e2ca38aeaa14219ef36534f11728 SHA512 290e3d1629df2a509eb77e0092a1d3419868e6ddcca227e8803de4da6d1d0285b198ab5b80e3b51b531d2da700c82f2af31f933b7f80dea3680b7df67adec669 WHIRLPOOL 4c91e5a490ca6831433ef5a62f03d2949fcbf9146a25e27ba8ba9bf488c7af539c0c07c98355217beb5fb986a366e90bcecdc8a32a26125b30f012a5ef445c11 MISC metadata.xml 228 SHA256 a317cd066ed83c5b5acf9d49869cb2f153499bb90cee389334bee9781534f5e8 SHA512 1638d4580908d32ad6fad71d109a58d699c9111d26c1073ae95b20248fc2a5da91a1f73153f01942df25c64865586e970e6532a312cd374d9866bf21264ddc54 WHIRLPOOL 11e5655c66af420e31f60d3ab19ef3ff55222271dd63bca94b548c7a63bbc73e8edfb4d80648d143c7d8315f8ba66bc4140dcf97ff85ea472e2a7cab1de98264 diff --git a/sys-kernel/spl/files/spl-0.6.0_rc9-alias-km-sleep-with-km-pushpage.patch b/sys-kernel/spl/files/spl-0.6.0_rc9-alias-km-sleep-with-km-pushpage.patch deleted file mode 100644 index fb0e5914e773..000000000000 --- a/sys-kernel/spl/files/spl-0.6.0_rc9-alias-km-sleep-with-km-pushpage.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 5c072b45b66e841ebc7952db7860c2ee7b024b08 Mon Sep 17 00:00:00 2001 -From: Richard Yao <ryao@cs.stonybrook.edu> -Date: Mon, 25 Jun 2012 20:05:00 -0400 -Subject: [PATCH] Make KM_SLEEP an alias of KM_PUSHPAGE Use GFP_NOIO in - KM_SLEEP - -This should prevent direct reclaim issues without requiring -Linux-specific changes to code from Solaris. This is what is done in -FreeBSD. - -Note that a change to __taskq_dispatch() module/spl/spl-taskq.c is -needed to make this work. Changing KM_PUSHPAGE to use GFP_NOIO is fine, -but adding __GFP_HIGH to that triggers a hard-coded panic in -__taskq_dispatch() during zvol initialization. Removing the hard coded -panic has no ill effects. - -Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu> ---- - include/sys/kmem.h | 2 +- - module/spl/spl-taskq.c | 7 ++++--- - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/include/sys/kmem.h b/include/sys/kmem.h -index 796af44..633278b 100644 ---- a/include/sys/kmem.h -+++ b/include/sys/kmem.h -@@ -41,7 +41,7 @@ - /* - * Memory allocation interfaces - */ --#define KM_SLEEP GFP_KERNEL /* Can sleep, never fails */ -+#define KM_SLEEP (GFP_NOIO | __GFP_HIGH) /* Can sleep, never fails */ - #define KM_NOSLEEP GFP_ATOMIC /* Can not sleep, may fail */ - #define KM_PUSHPAGE (GFP_NOIO | __GFP_HIGH) /* Use reserved memory */ - #define KM_NODEBUG __GFP_NOWARN /* Suppress warnings */ -diff --git a/module/spl/spl-taskq.c b/module/spl/spl-taskq.c -index 0c546c7..5ab387e 100644 ---- a/module/spl/spl-taskq.c -+++ b/module/spl/spl-taskq.c -@@ -255,9 +255,10 @@ - if (!(flags & (TQ_SLEEP | TQ_NOSLEEP))) - flags |= TQ_SLEEP; - -- if (unlikely(in_atomic() && (flags & TQ_SLEEP))) -- PANIC("May schedule while atomic: %s/0x%08x/%d\n", -- current->comm, preempt_count(), current->pid); -+ /* FIXME: Why does this fail when KM_SLEEP contains __GFP_HIGHMEM? */ -+ //if (unlikely(in_atomic() && (flags & TQ_SLEEP))) -+ // PANIC("May schedule while atomic: %s/0x%08x/%d\n", -+ // current->comm, preempt_count(), current->pid); - - spin_lock_irqsave(&tq->tq_lock, tq->tq_lock_flags); - --- -1.7.10 - diff --git a/sys-kernel/spl/files/spl-0.6.0_rc9-constify-free-functions.patch b/sys-kernel/spl/files/spl-0.6.0_rc9-constify-free-functions.patch deleted file mode 100644 index fdf2acf66aa4..000000000000 --- a/sys-kernel/spl/files/spl-0.6.0_rc9-constify-free-functions.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 9517a46638c8b2c22a69903e24081de4f608fde7 Mon Sep 17 00:00:00 2001 -From: Richard Yao <ryao@cs.stonybrook.edu> -Date: Mon, 25 Jun 2012 13:22:21 -0400 -Subject: [PATCH] Constify memory management functions - -This avoids build failures on Linux 3.3.y and later. - -Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu> ---- - include/sys/kmem.h | 8 ++++---- - module/spl/spl-kmem.c | 10 +++++----- - 2 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/include/sys/kmem.h b/include/sys/kmem.h -index eda4eee..796af44 100644 ---- a/include/sys/kmem.h -+++ b/include/sys/kmem.h -@@ -214,9 +214,9 @@ - # define vmem_free(ptr, sz) vmem_free_track((ptr), (sz)) - - extern void *kmem_alloc_track(size_t, int, const char *, int, int, int); --extern void kmem_free_track(void *, size_t); -+extern void kmem_free_track(const void *, size_t); - extern void *vmem_alloc_track(size_t, int, const char *, int); --extern void vmem_free_track(void *, size_t); -+extern void vmem_free_track(const void *, size_t); - - # else /* DEBUG_KMEM_TRACKING */ - /* -@@ -243,9 +243,9 @@ - # define vmem_free(ptr, sz) vmem_free_debug((ptr), (sz)) - - extern void *kmem_alloc_debug(size_t, int, const char *, int, int, int); --extern void kmem_free_debug(void *, size_t); -+extern void kmem_free_debug(const void *, size_t); - extern void *vmem_alloc_debug(size_t, int, const char *, int); --extern void vmem_free_debug(void *, size_t); -+extern void vmem_free_debug(const void *, size_t); - - # endif /* DEBUG_KMEM_TRACKING */ - #else /* DEBUG_KMEM */ -diff --git a/module/spl/spl-kmem.c b/module/spl/spl-kmem.c -index a50927c..448297a 100644 ---- a/module/spl/spl-kmem.c -+++ b/module/spl/spl-kmem.c -@@ -385,7 +385,7 @@ char *kvasprintf(gfp_t gfp, const char *fmt, va_list ap) - EXPORT_SYMBOL(vmem_list); - - static kmem_debug_t * --kmem_del_init(spinlock_t *lock, struct hlist_head *table, int bits, void *addr) -+kmem_del_init(spinlock_t *lock, struct hlist_head *table, int bits, const void *addr) - { - struct hlist_head *head; - struct hlist_node *node; -@@ -504,7 +504,7 @@ char *kvasprintf(gfp_t gfp, const char *fmt, va_list ap) - EXPORT_SYMBOL(kmem_alloc_track); - - void --kmem_free_track(void *ptr, size_t size) -+kmem_free_track(const void *ptr, size_t size) - { - kmem_debug_t *dptr; - SENTRY; -@@ -619,7 +619,7 @@ char *kvasprintf(gfp_t gfp, const char *fmt, va_list ap) - EXPORT_SYMBOL(vmem_alloc_track); - - void --vmem_free_track(void *ptr, size_t size) -+vmem_free_track(const void *ptr, size_t size) - { - kmem_debug_t *dptr; - SENTRY; -@@ -706,7 +706,7 @@ char *kvasprintf(gfp_t gfp, const char *fmt, va_list ap) - EXPORT_SYMBOL(kmem_alloc_debug); - - void --kmem_free_debug(void *ptr, size_t size) -+kmem_free_debug(const void *ptr, size_t size) - { - SENTRY; - -@@ -758,7 +758,7 @@ char *kvasprintf(gfp_t gfp, const char *fmt, va_list ap) - EXPORT_SYMBOL(vmem_alloc_debug); - - void --vmem_free_debug(void *ptr, size_t size) -+vmem_free_debug(const void *ptr, size_t size) - { - SENTRY; - --- -1.7.10 - diff --git a/sys-kernel/spl/files/spl-0.6.0_rc9-detect-kernel-honors-gfp-flags.patch b/sys-kernel/spl/files/spl-0.6.0_rc9-detect-kernel-honors-gfp-flags.patch deleted file mode 100644 index ac10de7a8f17..000000000000 --- a/sys-kernel/spl/files/spl-0.6.0_rc9-detect-kernel-honors-gfp-flags.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 35f75553b720037eb7ef6ac9954c14f7d9c1b4e5 Mon Sep 17 00:00:00 2001 -From: Richard Yao <ryao@cs.stonybrook.edu> -Date: Wed, 6 Jun 2012 22:38:12 -0400 -Subject: [PATCH] Detect kernels that honor gfp flags passed to vmalloc() - -zfsonlinux/spl@2092cf68d89a51eb0d6193aeadabb579dfc4b4a0 used PF_MEMALLOC -to workaround a bug in the Linux kernel where allocations did not honor -the gfp flags passed to vmalloc(). Unfortunately, PF_MEMALLOC has the -side effect of permitting allocations to allocate pages outside of -ZONE_NORMAL. This has been observed to result in the depletion of -ZONE_DMA32 on Gentoo Linux. A kernel patch is available in the Gentoo -bug tracker for this issue: - -https://bugs.gentoo.org/show_bug.cgi?id=416685 - -This negates any benefit PF_MEMALLOC provides, so we introduce an -autotools check to disable the use of PF_MEMALLOC on systems with -patched kernels. - -Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu> ---- - config/spl-build.m4 | 26 ++++++++++++++++++++++++++ - module/spl/spl-kmem.c | 4 ++++ - 2 files changed, 30 insertions(+) - -diff --git a/config/spl-build.m4 b/config/spl-build.m4 -index 6605b82..29c7ae4 100644 ---- a/config/spl-build.m4 -+++ b/config/spl-build.m4 -@@ -87,6 +87,7 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [ - SPL_AC_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE - SPL_AC_SHRINK_CONTROL_STRUCT - SPL_AC_RWSEM_SPINLOCK_IS_RAW -+ SPL_AC_PMD_ALLOC_WITH_MASK - ]) - - AC_DEFUN([SPL_AC_MODULE_SYMVERS], [ -@@ -2056,3 +2057,28 @@ AC_DEFUN([SPL_AC_RWSEM_SPINLOCK_IS_RAW], [ - ]) - EXTRA_KCFLAGS="$tmp_flags" - ]) -+ -+dnl # -+dnl # 2.6.20 API change, -+dnl # INIT_WORK use 2 args and not store data inside -+dnl # -+AC_DEFUN([SPL_AC_PMD_ALLOC_WITH_MASK], -+ [AC_MSG_CHECKING([whether pmd_alloc_with_mask exists]) -+ SPL_LINUX_TRY_COMPILE([ -+ #define CONFIG_MMU -+ #undef RCH_HAS_4LEVEL_HACK -+ #include <linux/mm.h> -+ ],[ -+ struct mm_struct init_mm; -+ pud_t pud; -+ unsigned long addr; -+ gfp_t gfp_mask; -+ pmd_alloc_with_mask(&init_mm, &pud, addr, gfp_mask); -+ ],[ -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_PMD_ALLOC_WITH_MASK, 1, -+ [pmd_alloc_with_mask exists]) -+ ],[ -+ AC_MSG_RESULT(no) -+ ]) -+]) -diff --git a/module/spl/spl-kmem.c b/module/spl/spl-kmem.c -index e1d74d3..c640779 100644 ---- a/module/spl/spl-kmem.c -+++ b/module/spl/spl-kmem.c -@@ -843,6 +843,9 @@ static int spl_cache_flush(spl_kmem_cache_t *skc, - if (skc->skc_flags & KMC_KMEM) { - ptr = (void *)__get_free_pages(flags, get_order(size)); - } else { -+#ifdef HAVE_PMD_ALLOC_WITH_MASK -+ ptr = __vmalloc(size, flags|__GFP_HIGHMEM, PAGE_KERNEL); -+#else - /* - * As part of vmalloc() an __pte_alloc_kernel() allocation - * may occur. This internal allocation does not honor the -@@ -866,6 +869,7 @@ static int spl_cache_flush(spl_kmem_cache_t *skc, - } else { - ptr = __vmalloc(size, flags|__GFP_HIGHMEM, PAGE_KERNEL); - } -+#endif - } - - /* Resulting allocated memory will be page aligned */ --- -1.7.10 - |