Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 0eb8e885726a3a93206510092bbc7e39e272f6ef

Authored by Jens Axboe
2 parents af75cd3c67 0a58e077eb
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

Merge branch 'for-linus' into for-2.6.40/core 

This patch merges in a fix that missed 2.6.39 final.

Conflicts:
	block/blk.h

Showing 1 changed file Inline Diff

1 #ifndef BLK_INTERNAL_H 1 #ifndef BLK_INTERNAL_H
2 #define BLK_INTERNAL_H 2 #define BLK_INTERNAL_H
3 3
4 /* Amount of time in which a process may batch requests */ 4 /* Amount of time in which a process may batch requests */
5 #define BLK_BATCH_TIME (HZ/50UL) 5 #define BLK_BATCH_TIME (HZ/50UL)
6 6
7 /* Number of requests a "batching" process may submit */ 7 /* Number of requests a "batching" process may submit */
8 #define BLK_BATCH_REQ 32 8 #define BLK_BATCH_REQ 32
9 9
10 extern struct kmem_cache *blk_requestq_cachep; 10 extern struct kmem_cache *blk_requestq_cachep;
11 extern struct kobj_type blk_queue_ktype; 11 extern struct kobj_type blk_queue_ktype;
12 12
13 void init_request_from_bio(struct request *req, struct bio *bio); 13 void init_request_from_bio(struct request *req, struct bio *bio);
14 void blk_rq_bio_prep(struct request_queue *q, struct request *rq, 14 void blk_rq_bio_prep(struct request_queue *q, struct request *rq,
15 struct bio *bio); 15 struct bio *bio);
16 int blk_rq_append_bio(struct request_queue *q, struct request *rq, 16 int blk_rq_append_bio(struct request_queue *q, struct request *rq,
17 struct bio *bio); 17 struct bio *bio);
18 void blk_dequeue_request(struct request *rq); 18 void blk_dequeue_request(struct request *rq);
19 void __blk_queue_free_tags(struct request_queue *q); 19 void __blk_queue_free_tags(struct request_queue *q);
20 20
21 void blk_rq_timed_out_timer(unsigned long data); 21 void blk_rq_timed_out_timer(unsigned long data);
22 void blk_delete_timer(struct request *); 22 void blk_delete_timer(struct request *);
23 void blk_add_timer(struct request *); 23 void blk_add_timer(struct request *);
24 void __generic_unplug_device(struct request_queue *); 24 void __generic_unplug_device(struct request_queue *);
25 25
26 /* 26 /*
27 * Internal atomic flags for request handling 27 * Internal atomic flags for request handling
28 */ 28 */
29 enum rq_atomic_flags { 29 enum rq_atomic_flags {
30 REQ_ATOM_COMPLETE = 0, 30 REQ_ATOM_COMPLETE = 0,
31 }; 31 };
32 32
33 /* 33 /*
34 * EH timer and IO completion will both attempt to 'grab' the request, make 34 * EH timer and IO completion will both attempt to 'grab' the request, make
35 * sure that only one of them succeeds 35 * sure that only one of them succeeds
36 */ 36 */
37 static inline int blk_mark_rq_complete(struct request *rq) 37 static inline int blk_mark_rq_complete(struct request *rq)
38 { 38 {
39 return test_and_set_bit(REQ_ATOM_COMPLETE, &rq->atomic_flags); 39 return test_and_set_bit(REQ_ATOM_COMPLETE, &rq->atomic_flags);
40 } 40 }
41 41
42 static inline void blk_clear_rq_complete(struct request *rq) 42 static inline void blk_clear_rq_complete(struct request *rq)
43 { 43 {
44 clear_bit(REQ_ATOM_COMPLETE, &rq->atomic_flags); 44 clear_bit(REQ_ATOM_COMPLETE, &rq->atomic_flags);
45 } 45 }
46 46
47 /* 47 /*
48 * Internal elevator interface 48 * Internal elevator interface
49 */ 49 */
50 #define ELV_ON_HASH(rq) (!hlist_unhashed(&(rq)->hash)) 50 #define ELV_ON_HASH(rq) (!hlist_unhashed(&(rq)->hash))
51 51
52 void blk_insert_flush(struct request *rq); 52 void blk_insert_flush(struct request *rq);
53 void blk_abort_flushes(struct request_queue *q); 53 void blk_abort_flushes(struct request_queue *q);
54 54
55 static inline struct request *__elv_next_request(struct request_queue *q) 55 static inline struct request *__elv_next_request(struct request_queue *q)
56 { 56 {
57 struct request *rq; 57 struct request *rq;
58 58
59 while (1) { 59 while (1) {
60 if (!list_empty(&q->queue_head)) { 60 if (!list_empty(&q->queue_head)) {
61 rq = list_entry_rq(q->queue_head.next); 61 rq = list_entry_rq(q->queue_head.next);
62 return rq; 62 return rq;
63 } 63 }
64
64 /* 65 /*
65 * Flush request is running and flush request isn't queueable 66 * Flush request is running and flush request isn't queueable
66 * in the drive, we can hold the queue till flush request is 67 * in the drive, we can hold the queue till flush request is
67 * finished. Even we don't do this, driver can't dispatch next 68 * finished. Even we don't do this, driver can't dispatch next
68 * requests and will requeue them. And this can improve 69 * requests and will requeue them. And this can improve
69 * throughput too. For example, we have request flush1, write1, 70 * throughput too. For example, we have request flush1, write1,
70 * flush 2. flush1 is dispatched, then queue is hold, write1 71 * flush 2. flush1 is dispatched, then queue is hold, write1
71 * isn't inserted to queue. After flush1 is finished, flush2 72 * isn't inserted to queue. After flush1 is finished, flush2
72 * will be dispatched. Since disk cache is already clean, 73 * will be dispatched. Since disk cache is already clean,
73 * flush2 will be finished very soon, so looks like flush2 is 74 * flush2 will be finished very soon, so looks like flush2 is
74 * folded to flush1. 75 * folded to flush1.
75 * Since the queue is hold, a flag is set to indicate the queue 76 * Since the queue is hold, a flag is set to indicate the queue
76 * should be restarted later. Please see flush_end_io() for 77 * should be restarted later. Please see flush_end_io() for
77 * details. 78 * details.
78 */ 79 */
79 if (q->flush_pending_idx != q->flush_running_idx && 80 if (q->flush_pending_idx != q->flush_running_idx &&
80 !queue_flush_queueable(q)) { 81 !queue_flush_queueable(q)) {
81 q->flush_queue_delayed = 1; 82 q->flush_queue_delayed = 1;
82 return NULL; 83 return NULL;
83 } 84 }
84 if (!q->elevator->ops->elevator_dispatch_fn(q, 0)) 85 if (test_bit(QUEUE_FLAG_DEAD, &q->queue_flags) ||
86 !q->elevator->ops->elevator_dispatch_fn(q, 0))
85 return NULL; 87 return NULL;
86 } 88 }
87 } 89 }
88 90
89 static inline void elv_activate_rq(struct request_queue *q, struct request *rq) 91 static inline void elv_activate_rq(struct request_queue *q, struct request *rq)
90 { 92 {
91 struct elevator_queue *e = q->elevator; 93 struct elevator_queue *e = q->elevator;
92 94
93 if (e->ops->elevator_activate_req_fn) 95 if (e->ops->elevator_activate_req_fn)
94 e->ops->elevator_activate_req_fn(q, rq); 96 e->ops->elevator_activate_req_fn(q, rq);
95 } 97 }
96 98
97 static inline void elv_deactivate_rq(struct request_queue *q, struct request *rq) 99 static inline void elv_deactivate_rq(struct request_queue *q, struct request *rq)
98 { 100 {
99 struct elevator_queue *e = q->elevator; 101 struct elevator_queue *e = q->elevator;
100 102
101 if (e->ops->elevator_deactivate_req_fn) 103 if (e->ops->elevator_deactivate_req_fn)
102 e->ops->elevator_deactivate_req_fn(q, rq); 104 e->ops->elevator_deactivate_req_fn(q, rq);
103 } 105 }
104 106
105 #ifdef CONFIG_FAIL_IO_TIMEOUT 107 #ifdef CONFIG_FAIL_IO_TIMEOUT
106 int blk_should_fake_timeout(struct request_queue *); 108 int blk_should_fake_timeout(struct request_queue *);
107 ssize_t part_timeout_show(struct device *, struct device_attribute *, char *); 109 ssize_t part_timeout_show(struct device *, struct device_attribute *, char *);
108 ssize_t part_timeout_store(struct device *, struct device_attribute *, 110 ssize_t part_timeout_store(struct device *, struct device_attribute *,
109 const char *, size_t); 111 const char *, size_t);
110 #else 112 #else
111 static inline int blk_should_fake_timeout(struct request_queue *q) 113 static inline int blk_should_fake_timeout(struct request_queue *q)
112 { 114 {
113 return 0; 115 return 0;
114 } 116 }
115 #endif 117 #endif
116 118
117 struct io_context *current_io_context(gfp_t gfp_flags, int node); 119 struct io_context *current_io_context(gfp_t gfp_flags, int node);
118 120
119 int ll_back_merge_fn(struct request_queue *q, struct request *req, 121 int ll_back_merge_fn(struct request_queue *q, struct request *req,
120 struct bio *bio); 122 struct bio *bio);
121 int ll_front_merge_fn(struct request_queue *q, struct request *req, 123 int ll_front_merge_fn(struct request_queue *q, struct request *req,
122 struct bio *bio); 124 struct bio *bio);
123 int attempt_back_merge(struct request_queue *q, struct request *rq); 125 int attempt_back_merge(struct request_queue *q, struct request *rq);
124 int attempt_front_merge(struct request_queue *q, struct request *rq); 126 int attempt_front_merge(struct request_queue *q, struct request *rq);
125 int blk_attempt_req_merge(struct request_queue *q, struct request *rq, 127 int blk_attempt_req_merge(struct request_queue *q, struct request *rq,
126 struct request *next); 128 struct request *next);
127 void blk_recalc_rq_segments(struct request *rq); 129 void blk_recalc_rq_segments(struct request *rq);
128 void blk_rq_set_mixed_merge(struct request *rq); 130 void blk_rq_set_mixed_merge(struct request *rq);
129 131
130 void blk_queue_congestion_threshold(struct request_queue *q); 132 void blk_queue_congestion_threshold(struct request_queue *q);
131 133
132 int blk_dev_init(void); 134 int blk_dev_init(void);
133 135
134 void elv_quiesce_start(struct request_queue *q); 136 void elv_quiesce_start(struct request_queue *q);
135 void elv_quiesce_end(struct request_queue *q); 137 void elv_quiesce_end(struct request_queue *q);
136 138
137 139
138 /* 140 /*
139 * Return the threshold (number of used requests) at which the queue is 141 * Return the threshold (number of used requests) at which the queue is
140 * considered to be congested. It include a little hysteresis to keep the 142 * considered to be congested. It include a little hysteresis to keep the
141 * context switch rate down. 143 * context switch rate down.
142 */ 144 */
143 static inline int queue_congestion_on_threshold(struct request_queue *q) 145 static inline int queue_congestion_on_threshold(struct request_queue *q)
144 { 146 {
145 return q->nr_congestion_on; 147 return q->nr_congestion_on;
146 } 148 }
147 149
148 /* 150 /*
149 * The threshold at which a queue is considered to be uncongested 151 * The threshold at which a queue is considered to be uncongested
150 */ 152 */
151 static inline int queue_congestion_off_threshold(struct request_queue *q) 153 static inline int queue_congestion_off_threshold(struct request_queue *q)
152 { 154 {
153 return q->nr_congestion_off; 155 return q->nr_congestion_off;
154 } 156 }
155 157
156 static inline int blk_cpu_to_group(int cpu) 158 static inline int blk_cpu_to_group(int cpu)
157 { 159 {
158 int group = NR_CPUS; 160 int group = NR_CPUS;
159 #ifdef CONFIG_SCHED_MC 161 #ifdef CONFIG_SCHED_MC
160 const struct cpumask *mask = cpu_coregroup_mask(cpu); 162 const struct cpumask *mask = cpu_coregroup_mask(cpu);
161 group = cpumask_first(mask); 163 group = cpumask_first(mask);
162 #elif defined(CONFIG_SCHED_SMT) 164 #elif defined(CONFIG_SCHED_SMT)
163 group = cpumask_first(topology_thread_cpumask(cpu)); 165 group = cpumask_first(topology_thread_cpumask(cpu));
164 #else 166 #else
165 return cpu; 167 return cpu;
166 #endif 168 #endif
167 if (likely(group < NR_CPUS)) 169 if (likely(group < NR_CPUS))
168 return group; 170 return group;
169 return cpu; 171 return cpu;
170 } 172 }
171 173
172 /* 174 /*
173 * Contribute to IO statistics IFF: 175 * Contribute to IO statistics IFF:
174 * 176 *
175 * a) it's attached to a gendisk, and 177 * a) it's attached to a gendisk, and
176 * b) the queue had IO stats enabled when this request was started, and 178 * b) the queue had IO stats enabled when this request was started, and
177 * c) it's a file system request or a discard request 179 * c) it's a file system request or a discard request
178 */ 180 */
179 static inline int blk_do_io_stat(struct request *rq) 181 static inline int blk_do_io_stat(struct request *rq)
180 { 182 {
181 return rq->rq_disk && 183 return rq->rq_disk &&
182 (rq->cmd_flags & REQ_IO_STAT) && 184 (rq->cmd_flags & REQ_IO_STAT) &&
183 (rq->cmd_type == REQ_TYPE_FS || 185 (rq->cmd_type == REQ_TYPE_FS ||
184 (rq->cmd_flags & REQ_DISCARD)); 186 (rq->cmd_flags & REQ_DISCARD));
185 } 187 }
186 188
187 #endif 189 #endif
188 190