1 |
commit: b04e5ed88450f6754b6e63fc87af6e0daac5fe29 |
2 |
Author: Jonathan Vasquez <fearedbliss <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 12 16:31:26 2017 +0000 |
4 |
Commit: Jonathan Vasquez <fearedbliss <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 12 16:32:16 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b04e5ed8 |
7 |
|
8 |
sys-fs/zfs-kmod: removing unused patches |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
...zfs-kmod-0.6.0_rc9-remove-pfmalloc-1-of-3.patch | 44 -------------- |
13 |
...zfs-kmod-0.6.0_rc9-remove-pfmalloc-2-of-3.patch | 56 ----------------- |
14 |
...zfs-kmod-0.6.0_rc9-remove-pfmalloc-3-of-3.patch | 70 ---------------------- |
15 |
3 files changed, 170 deletions(-) |
16 |
|
17 |
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc9-remove-pfmalloc-1-of-3.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc9-remove-pfmalloc-1-of-3.patch |
18 |
deleted file mode 100644 |
19 |
index 51a81363ea..0000000000 |
20 |
--- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc9-remove-pfmalloc-1-of-3.patch |
21 |
+++ /dev/null |
22 |
@@ -1,44 +0,0 @@ |
23 |
-From e2060f922f8526aecf437de4cc4dff4c3cdfae16 Mon Sep 17 00:00:00 2001 |
24 |
-From: Richard Yao <ryao@×××××××××××××.edu> |
25 |
-Date: Tue, 15 May 2012 23:19:32 -0400 |
26 |
-Subject: [PATCH] Revert Fix ASSERTION(!dsl_pool_sync_context(tx->tx_pool)) |
27 |
- |
28 |
-Commit eec8164771bee067c3cd55ed0a16dadeeba276de worked around an issue |
29 |
-involving direct reclaim through the use of PF_MEMALLOC. Since we |
30 |
-are reworking thing to use KM_PUSHPAGE so that swap works, we revert |
31 |
-this patch in favor of the use of KM_PUSHPAGE in the affected areas. |
32 |
- |
33 |
-Signed-off-by: Richard Yao <ryao@×××××××××××××.edu> |
34 |
-Signed-off-by: Brian Behlendorf <behlendorf1@××××.gov> |
35 |
-Issue #726 |
36 |
---- |
37 |
- module/zfs/txg.c | 13 ------------- |
38 |
- 1 file changed, 13 deletions(-) |
39 |
- |
40 |
-diff --git a/module/zfs/txg.c b/module/zfs/txg.c |
41 |
-index 5021e44..8d037f7 100644 |
42 |
---- a/module/zfs/txg.c |
43 |
-+++ b/module/zfs/txg.c |
44 |
-@@ -372,19 +372,6 @@ |
45 |
- callb_cpr_t cpr; |
46 |
- uint64_t start, delta; |
47 |
- |
48 |
--#ifdef _KERNEL |
49 |
-- /* |
50 |
-- * Disable the normal reclaim path for the txg_sync thread. This |
51 |
-- * ensures the thread will never enter dmu_tx_assign() which can |
52 |
-- * otherwise occur due to direct reclaim. If this is allowed to |
53 |
-- * happen the system can deadlock. Direct reclaim call path: |
54 |
-- * |
55 |
-- * ->shrink_icache_memory->prune_icache->dispose_list-> |
56 |
-- * clear_inode->zpl_clear_inode->zfs_inactive->dmu_tx_assign |
57 |
-- */ |
58 |
-- current->flags |= PF_MEMALLOC; |
59 |
--#endif /* _KERNEL */ |
60 |
-- |
61 |
- txg_thread_enter(tx, &cpr); |
62 |
- |
63 |
- start = delta = 0; |
64 |
--- |
65 |
-1.7.10 |
66 |
- |
67 |
|
68 |
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc9-remove-pfmalloc-2-of-3.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc9-remove-pfmalloc-2-of-3.patch |
69 |
deleted file mode 100644 |
70 |
index 0a4fd26040..0000000000 |
71 |
--- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc9-remove-pfmalloc-2-of-3.patch |
72 |
+++ /dev/null |
73 |
@@ -1,56 +0,0 @@ |
74 |
-From 78d26b8497b3845fc8130981c76214d6788f7a9d Mon Sep 17 00:00:00 2001 |
75 |
-From: Richard Yao <ryao@×××××××××××××.edu> |
76 |
-Date: Mon, 7 May 2012 14:14:45 -0400 |
77 |
-Subject: [PATCH] Revert Fix zpl_writepage() deadlock |
78 |
- |
79 |
-The commit, cfc9a5c88f91f7b4d606fce89505e1f404691ea5, to fix deadlocks |
80 |
-in zpl_writepage() relied on PF_MEMALLOC. That had the effect of |
81 |
-disabling the direct reclaim path on all allocations originating from |
82 |
-calls to this function, but it failed to address the actual cause of |
83 |
-those deadlocks. This led to the same deadlocks being observed with |
84 |
-swap on zvols, but not with swap on the loop device, which exercises |
85 |
-this code. |
86 |
- |
87 |
-The use of PF_MEMALLOC also had the side effect of permitting |
88 |
-allocations to be made from ZONE_DMA in instances that did not require |
89 |
-it. This contributes to the possibility of panics caused by depletion |
90 |
-of pages from ZONE_DMA. |
91 |
- |
92 |
-As such, we revert this patch in favor of a proper fix for both issues. |
93 |
- |
94 |
-Signed-off-by: Richard Yao <ryao@×××××××××××××.edu> |
95 |
-Signed-off-by: Brian Behlendorf <behlendorf1@××××.gov> |
96 |
-Issue #726 |
97 |
---- |
98 |
- module/zfs/zpl_file.c | 15 +-------------- |
99 |
- 1 file changed, 1 insertion(+), 14 deletions(-) |
100 |
- |
101 |
-diff --git a/module/zfs/zpl_file.c b/module/zfs/zpl_file.c |
102 |
-index 5ac41c9..2e9f72a 100644 |
103 |
---- a/module/zfs/zpl_file.c |
104 |
-+++ b/module/zfs/zpl_file.c |
105 |
-@@ -358,20 +358,7 @@ |
106 |
- ASSERT(PageLocked(pp)); |
107 |
- ASSERT(!PageWriteback(pp)); |
108 |
- |
109 |
-- /* |
110 |
-- * Disable the normal reclaim path for zpl_putpage(). This |
111 |
-- * ensures that all memory allocations under this call path |
112 |
-- * will never enter direct reclaim. If this were to happen |
113 |
-- * the VM might try to write out additional pages by calling |
114 |
-- * zpl_putpage() again resulting in a deadlock. |
115 |
-- */ |
116 |
-- if (current->flags & PF_MEMALLOC) { |
117 |
-- (void) zfs_putpage(mapping->host, pp, wbc); |
118 |
-- } else { |
119 |
-- current->flags |= PF_MEMALLOC; |
120 |
-- (void) zfs_putpage(mapping->host, pp, wbc); |
121 |
-- current->flags &= ~PF_MEMALLOC; |
122 |
-- } |
123 |
-+ (void) zfs_putpage(mapping->host, pp, wbc); |
124 |
- |
125 |
- return (0); |
126 |
- } |
127 |
--- |
128 |
-1.7.10 |
129 |
- |
130 |
|
131 |
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc9-remove-pfmalloc-3-of-3.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc9-remove-pfmalloc-3-of-3.patch |
132 |
deleted file mode 100644 |
133 |
index 2eb85754b0..0000000000 |
134 |
--- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc9-remove-pfmalloc-3-of-3.patch |
135 |
+++ /dev/null |
136 |
@@ -1,70 +0,0 @@ |
137 |
-From a1c889dd6fb04d70439074a9399c9ea8f29f2cdb Mon Sep 17 00:00:00 2001 |
138 |
-From: Richard Yao <ryao@×××××××××××××.edu> |
139 |
-Date: Wed, 16 May 2012 18:16:02 -0400 |
140 |
-Subject: [PATCH] Revert Disable direct reclaim for z_wr_* threads |
141 |
- |
142 |
-This commit used PF_MEMALLOC to prevent a memory reclaim deadlock. |
143 |
-However, commit 49be0ccf1fdc2ce852271d4d2f8b7a9c2c4be6db eliminated |
144 |
-the invocation of __cv_init(), which was the cause of the deadlock. |
145 |
-PF_MEMALLOC has the side effect of permitting pages from ZONE_DMA |
146 |
-to be allocated. The use of PF_MEMALLOC was found to cause stability |
147 |
-problems when doing swap on zvols. Since this technique is known to |
148 |
-cause problems and no longer fixes anything, we revert it. |
149 |
- |
150 |
-Signed-off-by: Richard Yao <ryao@×××××××××××××.edu> |
151 |
-Signed-off-by: Brian Behlendorf <behlendorf1@××××.gov> |
152 |
-Issue #726 |
153 |
---- |
154 |
- include/sys/zfs_context.h | 1 - |
155 |
- module/zfs/spa.c | 9 +++------ |
156 |
- 2 files changed, 3 insertions(+), 7 deletions(-) |
157 |
- |
158 |
-diff --git a/include/sys/zfs_context.h b/include/sys/zfs_context.h |
159 |
-index e4af6fc..77dded3 100644 |
160 |
---- a/include/sys/zfs_context.h |
161 |
-+++ b/include/sys/zfs_context.h |
162 |
-@@ -382,7 +382,6 @@ extern kstat_t *kstat_create(char *, int, |
163 |
- #define TASKQ_DYNAMIC 0x0004 /* Use dynamic thread scheduling */ |
164 |
- #define TASKQ_THREADS_CPU_PCT 0x0008 /* Scale # threads by # cpus */ |
165 |
- #define TASKQ_DC_BATCH 0x0010 /* Mark threads as batch */ |
166 |
--#define TASKQ_NORECLAIM 0x0020 /* Disable direct memory reclaim */ |
167 |
- |
168 |
- #define TQ_SLEEP KM_SLEEP /* Can block for memory */ |
169 |
- #define TQ_NOSLEEP KM_NOSLEEP /* cannot block for memory; may fail */ |
170 |
-diff --git a/module/zfs/spa.c b/module/zfs/spa.c |
171 |
-index c33a33a..436cd26 100644 |
172 |
---- a/module/zfs/spa.c |
173 |
-+++ b/module/zfs/spa.c |
174 |
-@@ -617,8 +617,9 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config, |
175 |
- |
176 |
- static taskq_t * |
177 |
- spa_taskq_create(spa_t *spa, const char *name, enum zti_modes mode, |
178 |
-- uint_t value, uint_t flags) |
179 |
-+ uint_t value) |
180 |
- { |
181 |
-+ uint_t flags = TASKQ_PREPOPULATE; |
182 |
- boolean_t batch = B_FALSE; |
183 |
- |
184 |
- switch (mode) { |
185 |
-@@ -668,17 +669,13 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config, |
186 |
- const zio_taskq_info_t *ztip = &zio_taskqs[t][q]; |
187 |
- enum zti_modes mode = ztip->zti_mode; |
188 |
- uint_t value = ztip->zti_value; |
189 |
-- uint_t flags = 0; |
190 |
- char name[32]; |
191 |
- |
192 |
-- if (t == ZIO_TYPE_WRITE) |
193 |
-- flags |= TASKQ_NORECLAIM; |
194 |
-- |
195 |
- (void) snprintf(name, sizeof (name), |
196 |
- "%s_%s", zio_type_name[t], zio_taskq_types[q]); |
197 |
- |
198 |
- spa->spa_zio_taskq[t][q] = |
199 |
-- spa_taskq_create(spa, name, mode, value, flags); |
200 |
-+ spa_taskq_create(spa, name, mode, value); |
201 |
- } |
202 |
- } |
203 |
- } |
204 |
--- |
205 |
-1.7.10 |
206 |
- |