2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
|
* Copyright (C) 2003 Russell King, All Rights Reserved.
|
2006-12-24 03:03:02 +08:00
|
|
|
* Copyright 2006-2007 Pierre Ossman
|
2005-04-17 06:20:36 +08:00
|
|
|
*
|
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
|
|
|
* published by the Free Software Foundation.
|
|
|
|
|
*
|
|
|
|
|
*/
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 16:04:11 +08:00
|
|
|
#include <linux/slab.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/module.h>
|
|
|
|
|
#include <linux/blkdev.h>
|
2007-07-17 19:03:35 +08:00
|
|
|
#include <linux/freezer.h>
|
2006-11-14 03:23:52 +08:00
|
|
|
#include <linux/kthread.h>
|
2007-10-23 03:19:53 +08:00
|
|
|
#include <linux/scatterlist.h>
|
2013-07-29 21:20:15 +08:00
|
|
|
#include <linux/dma-mapping.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
#include <linux/mmc/card.h>
|
|
|
|
|
#include <linux/mmc/host.h>
|
2016-09-20 17:34:38 +08:00
|
|
|
|
2006-12-24 03:03:02 +08:00
|
|
|
#include "queue.h"
|
2016-09-20 17:34:38 +08:00
|
|
|
#include "block.h"
|
2017-01-13 21:14:08 +08:00
|
|
|
#include "core.h"
|
2017-01-13 21:14:14 +08:00
|
|
|
#include "card.h"
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
/*
|
2007-05-16 23:29:21 +08:00
|
|
|
* Prepare a MMC request. This just filters out odd stuff.
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
|
|
|
|
static int mmc_prep_request(struct request_queue *q, struct request *req)
|
|
|
|
|
{
|
2011-12-08 16:35:50 +08:00
|
|
|
struct mmc_queue *mq = q->queuedata;
|
|
|
|
|
|
2017-09-20 16:02:01 +08:00
|
|
|
if (mq && mmc_card_removed(mq->card))
|
2011-12-08 16:35:50 +08:00
|
|
|
return BLKPREP_KILL;
|
|
|
|
|
|
2016-10-20 21:12:13 +08:00
|
|
|
req->rq_flags |= RQF_DONTPREP;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-05-16 23:29:21 +08:00
|
|
|
return BLKPREP_OK;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int mmc_queue_thread(void *d)
|
|
|
|
|
{
|
|
|
|
|
struct mmc_queue *mq = d;
|
|
|
|
|
struct request_queue *q = mq->queue;
|
2016-11-29 18:09:10 +08:00
|
|
|
struct mmc_context_info *cntx = &mq->card->host->context_info;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-07-17 19:03:35 +08:00
|
|
|
current->flags |= PF_MEMALLOC;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
down(&mq->thread_sem);
|
|
|
|
|
do {
|
2017-03-13 20:36:35 +08:00
|
|
|
struct request *req;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
spin_lock_irq(q->queue_lock);
|
|
|
|
|
set_current_state(TASK_INTERRUPTIBLE);
|
2011-03-10 15:52:07 +08:00
|
|
|
req = blk_fetch_request(q);
|
2016-11-29 18:09:10 +08:00
|
|
|
mq->asleep = false;
|
|
|
|
|
cntx->is_waiting_last_req = false;
|
|
|
|
|
cntx->is_new_req = false;
|
|
|
|
|
if (!req) {
|
|
|
|
|
/*
|
|
|
|
|
* Dispatch queue is empty so set flags for
|
|
|
|
|
* mmc_request_fn() to wake us up.
|
|
|
|
|
*/
|
2017-03-13 20:36:35 +08:00
|
|
|
if (mq->qcnt)
|
2016-11-29 18:09:10 +08:00
|
|
|
cntx->is_waiting_last_req = true;
|
|
|
|
|
else
|
|
|
|
|
mq->asleep = true;
|
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
spin_unlock_irq(q->queue_lock);
|
|
|
|
|
|
2017-03-13 20:36:35 +08:00
|
|
|
if (req || mq->qcnt) {
|
2011-07-02 00:55:33 +08:00
|
|
|
set_current_state(TASK_RUNNING);
|
2016-09-20 17:34:38 +08:00
|
|
|
mmc_blk_issue_rq(mq, req);
|
2015-06-15 01:26:11 +08:00
|
|
|
cond_resched();
|
2011-07-02 00:55:33 +08:00
|
|
|
} else {
|
2006-12-08 03:08:02 +08:00
|
|
|
if (kthread_should_stop()) {
|
|
|
|
|
set_current_state(TASK_RUNNING);
|
2005-04-17 06:20:36 +08:00
|
|
|
break;
|
2006-12-08 03:08:02 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
up(&mq->thread_sem);
|
|
|
|
|
schedule();
|
|
|
|
|
down(&mq->thread_sem);
|
|
|
|
|
}
|
|
|
|
|
} while (1);
|
|
|
|
|
up(&mq->thread_sem);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Generic MMC request handler. This is called for any queue on a
|
|
|
|
|
* particular host. When the host is not busy, we look for a request
|
|
|
|
|
* on any queue on this host, and attempt to issue it. This may
|
|
|
|
|
* not be the queue we were asked to process.
|
|
|
|
|
*/
|
2012-04-13 20:24:11 +08:00
|
|
|
static void mmc_request_fn(struct request_queue *q)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
|
struct mmc_queue *mq = q->queuedata;
|
2006-11-15 05:08:16 +08:00
|
|
|
struct request *req;
|
2013-01-15 03:28:17 +08:00
|
|
|
struct mmc_context_info *cntx;
|
2006-11-15 05:08:16 +08:00
|
|
|
|
|
|
|
|
if (!mq) {
|
2010-01-09 06:43:00 +08:00
|
|
|
while ((req = blk_fetch_request(q)) != NULL) {
|
2016-10-20 21:12:13 +08:00
|
|
|
req->rq_flags |= RQF_QUIET;
|
2017-06-03 15:38:04 +08:00
|
|
|
__blk_end_request_all(req, BLK_STS_IOERR);
|
2010-01-09 06:43:00 +08:00
|
|
|
}
|
2006-11-15 05:08:16 +08:00
|
|
|
return;
|
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2013-01-15 03:28:17 +08:00
|
|
|
cntx = &mq->card->host->context_info;
|
2016-11-29 18:09:10 +08:00
|
|
|
|
|
|
|
|
if (cntx->is_waiting_last_req) {
|
|
|
|
|
cntx->is_new_req = true;
|
|
|
|
|
wake_up_interruptible(&cntx->wait);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (mq->asleep)
|
2006-11-14 03:23:52 +08:00
|
|
|
wake_up_process(mq->thread);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
mmc: core: Allocate per-request data using the block layer core
The mmc_queue_req is a per-request state container the MMC core uses
to carry bounce buffers, pointers to asynchronous requests and so on.
Currently allocated as a static array of objects, then as a request
comes in, a mmc_queue_req is assigned to it, and used during the
lifetime of the request.
This is backwards compared to how other block layer drivers work:
they usally let the block core provide a per-request struct that get
allocated right beind the struct request, and which can be obtained
using the blk_mq_rq_to_pdu() helper. (The _mq_ infix in this function
name is misleading: it is used by both the old and the MQ block
layer.)
The per-request struct gets allocated to the size stored in the queue
variable .cmd_size initialized using the .init_rq_fn() and
cleaned up using .exit_rq_fn().
The block layer code makes the MMC core rely on this mechanism to
allocate the per-request mmc_queue_req state container.
Doing this make a lot of complicated queue handling go away. We only
need to keep the .qnct that keeps count of how many request are
currently being processed by the MMC layer. The MQ block layer will
replace also this once we transition to it.
Doing this refactoring is necessary to move the ioctl() operations
into custom block layer requests tagged with REQ_OP_DRV_[IN|OUT]
instead of the custom code using the BigMMCHostLock that we have
today: those require that per-request data be obtainable easily from
a request after creating a custom request with e.g.:
struct request *rq = blk_get_request(q, REQ_OP_DRV_IN, __GFP_RECLAIM);
struct mmc_queue_req *mq_rq = req_to_mq_rq(rq);
And this is not possible with the current construction, as the request
is not immediately assigned the per-request state container, but
instead it gets assigned when the request finally enters the MMC
queue, which is way too late for custom requests.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
[Ulf: Folded in the fix to drop a call to blk_cleanup_queue()]
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Heiner Kallweit <hkallweit1@gmail.com>
2017-05-18 17:29:32 +08:00
|
|
|
static struct scatterlist *mmc_alloc_sg(int sg_len, gfp_t gfp)
|
2011-07-10 05:12:36 +08:00
|
|
|
{
|
|
|
|
|
struct scatterlist *sg;
|
|
|
|
|
|
mmc: core: Allocate per-request data using the block layer core
The mmc_queue_req is a per-request state container the MMC core uses
to carry bounce buffers, pointers to asynchronous requests and so on.
Currently allocated as a static array of objects, then as a request
comes in, a mmc_queue_req is assigned to it, and used during the
lifetime of the request.
This is backwards compared to how other block layer drivers work:
they usally let the block core provide a per-request struct that get
allocated right beind the struct request, and which can be obtained
using the blk_mq_rq_to_pdu() helper. (The _mq_ infix in this function
name is misleading: it is used by both the old and the MQ block
layer.)
The per-request struct gets allocated to the size stored in the queue
variable .cmd_size initialized using the .init_rq_fn() and
cleaned up using .exit_rq_fn().
The block layer code makes the MMC core rely on this mechanism to
allocate the per-request mmc_queue_req state container.
Doing this make a lot of complicated queue handling go away. We only
need to keep the .qnct that keeps count of how many request are
currently being processed by the MMC layer. The MQ block layer will
replace also this once we transition to it.
Doing this refactoring is necessary to move the ioctl() operations
into custom block layer requests tagged with REQ_OP_DRV_[IN|OUT]
instead of the custom code using the BigMMCHostLock that we have
today: those require that per-request data be obtainable easily from
a request after creating a custom request with e.g.:
struct request *rq = blk_get_request(q, REQ_OP_DRV_IN, __GFP_RECLAIM);
struct mmc_queue_req *mq_rq = req_to_mq_rq(rq);
And this is not possible with the current construction, as the request
is not immediately assigned the per-request state container, but
instead it gets assigned when the request finally enters the MMC
queue, which is way too late for custom requests.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
[Ulf: Folded in the fix to drop a call to blk_cleanup_queue()]
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Heiner Kallweit <hkallweit1@gmail.com>
2017-05-18 17:29:32 +08:00
|
|
|
sg = kmalloc_array(sg_len, sizeof(*sg), gfp);
|
2017-03-13 20:36:36 +08:00
|
|
|
if (sg)
|
2011-07-10 05:12:36 +08:00
|
|
|
sg_init_table(sg, sg_len);
|
|
|
|
|
|
|
|
|
|
return sg;
|
|
|
|
|
}
|
|
|
|
|
|
2011-06-28 22:16:02 +08:00
|
|
|
static void mmc_queue_setup_discard(struct request_queue *q,
|
|
|
|
|
struct mmc_card *card)
|
|
|
|
|
{
|
|
|
|
|
unsigned max_discard;
|
|
|
|
|
|
|
|
|
|
max_discard = mmc_calc_max_discard(card);
|
|
|
|
|
if (!max_discard)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, q);
|
2015-07-14 22:15:12 +08:00
|
|
|
blk_queue_max_discard_sectors(q, max_discard);
|
2011-06-28 22:16:02 +08:00
|
|
|
q->limits.discard_granularity = card->pref_erase << 9;
|
|
|
|
|
/* granularity must not be greater than max. discard */
|
|
|
|
|
if (card->pref_erase > max_discard)
|
|
|
|
|
q->limits.discard_granularity = 0;
|
2013-04-18 20:41:55 +08:00
|
|
|
if (mmc_can_secure_erase_trim(card))
|
2016-06-09 22:00:36 +08:00
|
|
|
queue_flag_set_unlocked(QUEUE_FLAG_SECERASE, q);
|
2011-06-28 22:16:02 +08:00
|
|
|
}
|
|
|
|
|
|
mmc: core: Allocate per-request data using the block layer core
The mmc_queue_req is a per-request state container the MMC core uses
to carry bounce buffers, pointers to asynchronous requests and so on.
Currently allocated as a static array of objects, then as a request
comes in, a mmc_queue_req is assigned to it, and used during the
lifetime of the request.
This is backwards compared to how other block layer drivers work:
they usally let the block core provide a per-request struct that get
allocated right beind the struct request, and which can be obtained
using the blk_mq_rq_to_pdu() helper. (The _mq_ infix in this function
name is misleading: it is used by both the old and the MQ block
layer.)
The per-request struct gets allocated to the size stored in the queue
variable .cmd_size initialized using the .init_rq_fn() and
cleaned up using .exit_rq_fn().
The block layer code makes the MMC core rely on this mechanism to
allocate the per-request mmc_queue_req state container.
Doing this make a lot of complicated queue handling go away. We only
need to keep the .qnct that keeps count of how many request are
currently being processed by the MMC layer. The MQ block layer will
replace also this once we transition to it.
Doing this refactoring is necessary to move the ioctl() operations
into custom block layer requests tagged with REQ_OP_DRV_[IN|OUT]
instead of the custom code using the BigMMCHostLock that we have
today: those require that per-request data be obtainable easily from
a request after creating a custom request with e.g.:
struct request *rq = blk_get_request(q, REQ_OP_DRV_IN, __GFP_RECLAIM);
struct mmc_queue_req *mq_rq = req_to_mq_rq(rq);
And this is not possible with the current construction, as the request
is not immediately assigned the per-request state container, but
instead it gets assigned when the request finally enters the MMC
queue, which is way too late for custom requests.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
[Ulf: Folded in the fix to drop a call to blk_cleanup_queue()]
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Heiner Kallweit <hkallweit1@gmail.com>
2017-05-18 17:29:32 +08:00
|
|
|
/**
|
|
|
|
|
* mmc_init_request() - initialize the MMC-specific per-request data
|
|
|
|
|
* @q: the request queue
|
|
|
|
|
* @req: the request
|
|
|
|
|
* @gfp: memory allocation policy
|
|
|
|
|
*/
|
|
|
|
|
static int mmc_init_request(struct request_queue *q, struct request *req,
|
|
|
|
|
gfp_t gfp)
|
2016-11-29 18:09:13 +08:00
|
|
|
{
|
mmc: core: Allocate per-request data using the block layer core
The mmc_queue_req is a per-request state container the MMC core uses
to carry bounce buffers, pointers to asynchronous requests and so on.
Currently allocated as a static array of objects, then as a request
comes in, a mmc_queue_req is assigned to it, and used during the
lifetime of the request.
This is backwards compared to how other block layer drivers work:
they usally let the block core provide a per-request struct that get
allocated right beind the struct request, and which can be obtained
using the blk_mq_rq_to_pdu() helper. (The _mq_ infix in this function
name is misleading: it is used by both the old and the MQ block
layer.)
The per-request struct gets allocated to the size stored in the queue
variable .cmd_size initialized using the .init_rq_fn() and
cleaned up using .exit_rq_fn().
The block layer code makes the MMC core rely on this mechanism to
allocate the per-request mmc_queue_req state container.
Doing this make a lot of complicated queue handling go away. We only
need to keep the .qnct that keeps count of how many request are
currently being processed by the MMC layer. The MQ block layer will
replace also this once we transition to it.
Doing this refactoring is necessary to move the ioctl() operations
into custom block layer requests tagged with REQ_OP_DRV_[IN|OUT]
instead of the custom code using the BigMMCHostLock that we have
today: those require that per-request data be obtainable easily from
a request after creating a custom request with e.g.:
struct request *rq = blk_get_request(q, REQ_OP_DRV_IN, __GFP_RECLAIM);
struct mmc_queue_req *mq_rq = req_to_mq_rq(rq);
And this is not possible with the current construction, as the request
is not immediately assigned the per-request state container, but
instead it gets assigned when the request finally enters the MMC
queue, which is way too late for custom requests.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
[Ulf: Folded in the fix to drop a call to blk_cleanup_queue()]
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Heiner Kallweit <hkallweit1@gmail.com>
2017-05-18 17:29:32 +08:00
|
|
|
struct mmc_queue_req *mq_rq = req_to_mmc_queue_req(req);
|
|
|
|
|
struct mmc_queue *mq = q->queuedata;
|
|
|
|
|
struct mmc_card *card = mq->card;
|
|
|
|
|
struct mmc_host *host = card->host;
|
2016-11-29 18:09:13 +08:00
|
|
|
|
2017-09-20 16:56:14 +08:00
|
|
|
mq_rq->sg = mmc_alloc_sg(host->max_segs, gfp);
|
|
|
|
|
if (!mq_rq->sg)
|
|
|
|
|
return -ENOMEM;
|
2016-11-29 18:09:13 +08:00
|
|
|
|
2016-11-29 18:09:15 +08:00
|
|
|
return 0;
|
|
|
|
|
}
|
2016-11-29 18:09:13 +08:00
|
|
|
|
mmc: core: Allocate per-request data using the block layer core
The mmc_queue_req is a per-request state container the MMC core uses
to carry bounce buffers, pointers to asynchronous requests and so on.
Currently allocated as a static array of objects, then as a request
comes in, a mmc_queue_req is assigned to it, and used during the
lifetime of the request.
This is backwards compared to how other block layer drivers work:
they usally let the block core provide a per-request struct that get
allocated right beind the struct request, and which can be obtained
using the blk_mq_rq_to_pdu() helper. (The _mq_ infix in this function
name is misleading: it is used by both the old and the MQ block
layer.)
The per-request struct gets allocated to the size stored in the queue
variable .cmd_size initialized using the .init_rq_fn() and
cleaned up using .exit_rq_fn().
The block layer code makes the MMC core rely on this mechanism to
allocate the per-request mmc_queue_req state container.
Doing this make a lot of complicated queue handling go away. We only
need to keep the .qnct that keeps count of how many request are
currently being processed by the MMC layer. The MQ block layer will
replace also this once we transition to it.
Doing this refactoring is necessary to move the ioctl() operations
into custom block layer requests tagged with REQ_OP_DRV_[IN|OUT]
instead of the custom code using the BigMMCHostLock that we have
today: those require that per-request data be obtainable easily from
a request after creating a custom request with e.g.:
struct request *rq = blk_get_request(q, REQ_OP_DRV_IN, __GFP_RECLAIM);
struct mmc_queue_req *mq_rq = req_to_mq_rq(rq);
And this is not possible with the current construction, as the request
is not immediately assigned the per-request state container, but
instead it gets assigned when the request finally enters the MMC
queue, which is way too late for custom requests.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
[Ulf: Folded in the fix to drop a call to blk_cleanup_queue()]
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Heiner Kallweit <hkallweit1@gmail.com>
2017-05-18 17:29:32 +08:00
|
|
|
static void mmc_exit_request(struct request_queue *q, struct request *req)
|
2016-11-29 18:09:15 +08:00
|
|
|
{
|
mmc: core: Allocate per-request data using the block layer core
The mmc_queue_req is a per-request state container the MMC core uses
to carry bounce buffers, pointers to asynchronous requests and so on.
Currently allocated as a static array of objects, then as a request
comes in, a mmc_queue_req is assigned to it, and used during the
lifetime of the request.
This is backwards compared to how other block layer drivers work:
they usally let the block core provide a per-request struct that get
allocated right beind the struct request, and which can be obtained
using the blk_mq_rq_to_pdu() helper. (The _mq_ infix in this function
name is misleading: it is used by both the old and the MQ block
layer.)
The per-request struct gets allocated to the size stored in the queue
variable .cmd_size initialized using the .init_rq_fn() and
cleaned up using .exit_rq_fn().
The block layer code makes the MMC core rely on this mechanism to
allocate the per-request mmc_queue_req state container.
Doing this make a lot of complicated queue handling go away. We only
need to keep the .qnct that keeps count of how many request are
currently being processed by the MMC layer. The MQ block layer will
replace also this once we transition to it.
Doing this refactoring is necessary to move the ioctl() operations
into custom block layer requests tagged with REQ_OP_DRV_[IN|OUT]
instead of the custom code using the BigMMCHostLock that we have
today: those require that per-request data be obtainable easily from
a request after creating a custom request with e.g.:
struct request *rq = blk_get_request(q, REQ_OP_DRV_IN, __GFP_RECLAIM);
struct mmc_queue_req *mq_rq = req_to_mq_rq(rq);
And this is not possible with the current construction, as the request
is not immediately assigned the per-request state container, but
instead it gets assigned when the request finally enters the MMC
queue, which is way too late for custom requests.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
[Ulf: Folded in the fix to drop a call to blk_cleanup_queue()]
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Heiner Kallweit <hkallweit1@gmail.com>
2017-05-18 17:29:32 +08:00
|
|
|
struct mmc_queue_req *mq_rq = req_to_mmc_queue_req(req);
|
2017-03-13 20:36:36 +08:00
|
|
|
|
mmc: core: Allocate per-request data using the block layer core
The mmc_queue_req is a per-request state container the MMC core uses
to carry bounce buffers, pointers to asynchronous requests and so on.
Currently allocated as a static array of objects, then as a request
comes in, a mmc_queue_req is assigned to it, and used during the
lifetime of the request.
This is backwards compared to how other block layer drivers work:
they usally let the block core provide a per-request struct that get
allocated right beind the struct request, and which can be obtained
using the blk_mq_rq_to_pdu() helper. (The _mq_ infix in this function
name is misleading: it is used by both the old and the MQ block
layer.)
The per-request struct gets allocated to the size stored in the queue
variable .cmd_size initialized using the .init_rq_fn() and
cleaned up using .exit_rq_fn().
The block layer code makes the MMC core rely on this mechanism to
allocate the per-request mmc_queue_req state container.
Doing this make a lot of complicated queue handling go away. We only
need to keep the .qnct that keeps count of how many request are
currently being processed by the MMC layer. The MQ block layer will
replace also this once we transition to it.
Doing this refactoring is necessary to move the ioctl() operations
into custom block layer requests tagged with REQ_OP_DRV_[IN|OUT]
instead of the custom code using the BigMMCHostLock that we have
today: those require that per-request data be obtainable easily from
a request after creating a custom request with e.g.:
struct request *rq = blk_get_request(q, REQ_OP_DRV_IN, __GFP_RECLAIM);
struct mmc_queue_req *mq_rq = req_to_mq_rq(rq);
And this is not possible with the current construction, as the request
is not immediately assigned the per-request state container, but
instead it gets assigned when the request finally enters the MMC
queue, which is way too late for custom requests.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
[Ulf: Folded in the fix to drop a call to blk_cleanup_queue()]
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Heiner Kallweit <hkallweit1@gmail.com>
2017-05-18 17:29:32 +08:00
|
|
|
kfree(mq_rq->sg);
|
|
|
|
|
mq_rq->sg = NULL;
|
2016-11-29 18:09:14 +08:00
|
|
|
}
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/**
|
|
|
|
|
* mmc_init_queue - initialise a queue structure.
|
|
|
|
|
* @mq: mmc queue
|
|
|
|
|
* @card: mmc card to attach this queue
|
|
|
|
|
* @lock: queue lock
|
2011-06-23 18:40:28 +08:00
|
|
|
* @subname: partition subname
|
2005-04-17 06:20:36 +08:00
|
|
|
*
|
|
|
|
|
* Initialise a MMC card request queue.
|
|
|
|
|
*/
|
2011-06-23 18:40:28 +08:00
|
|
|
int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card,
|
|
|
|
|
spinlock_t *lock, const char *subname)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
|
struct mmc_host *host = card->host;
|
|
|
|
|
u64 limit = BLK_BOUNCE_HIGH;
|
2016-11-29 18:09:15 +08:00
|
|
|
int ret = -ENOMEM;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-09-12 23:00:10 +08:00
|
|
|
if (mmc_dev(host)->dma_mask && *mmc_dev(host)->dma_mask)
|
2014-02-12 01:11:04 +08:00
|
|
|
limit = (u64)dma_max_pfn(mmc_dev(host)) << PAGE_SHIFT;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
mq->card = card;
|
mmc: core: Allocate per-request data using the block layer core
The mmc_queue_req is a per-request state container the MMC core uses
to carry bounce buffers, pointers to asynchronous requests and so on.
Currently allocated as a static array of objects, then as a request
comes in, a mmc_queue_req is assigned to it, and used during the
lifetime of the request.
This is backwards compared to how other block layer drivers work:
they usally let the block core provide a per-request struct that get
allocated right beind the struct request, and which can be obtained
using the blk_mq_rq_to_pdu() helper. (The _mq_ infix in this function
name is misleading: it is used by both the old and the MQ block
layer.)
The per-request struct gets allocated to the size stored in the queue
variable .cmd_size initialized using the .init_rq_fn() and
cleaned up using .exit_rq_fn().
The block layer code makes the MMC core rely on this mechanism to
allocate the per-request mmc_queue_req state container.
Doing this make a lot of complicated queue handling go away. We only
need to keep the .qnct that keeps count of how many request are
currently being processed by the MMC layer. The MQ block layer will
replace also this once we transition to it.
Doing this refactoring is necessary to move the ioctl() operations
into custom block layer requests tagged with REQ_OP_DRV_[IN|OUT]
instead of the custom code using the BigMMCHostLock that we have
today: those require that per-request data be obtainable easily from
a request after creating a custom request with e.g.:
struct request *rq = blk_get_request(q, REQ_OP_DRV_IN, __GFP_RECLAIM);
struct mmc_queue_req *mq_rq = req_to_mq_rq(rq);
And this is not possible with the current construction, as the request
is not immediately assigned the per-request state container, but
instead it gets assigned when the request finally enters the MMC
queue, which is way too late for custom requests.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
[Ulf: Folded in the fix to drop a call to blk_cleanup_queue()]
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Heiner Kallweit <hkallweit1@gmail.com>
2017-05-18 17:29:32 +08:00
|
|
|
mq->queue = blk_alloc_queue(GFP_KERNEL);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (!mq->queue)
|
|
|
|
|
return -ENOMEM;
|
mmc: core: Allocate per-request data using the block layer core
The mmc_queue_req is a per-request state container the MMC core uses
to carry bounce buffers, pointers to asynchronous requests and so on.
Currently allocated as a static array of objects, then as a request
comes in, a mmc_queue_req is assigned to it, and used during the
lifetime of the request.
This is backwards compared to how other block layer drivers work:
they usally let the block core provide a per-request struct that get
allocated right beind the struct request, and which can be obtained
using the blk_mq_rq_to_pdu() helper. (The _mq_ infix in this function
name is misleading: it is used by both the old and the MQ block
layer.)
The per-request struct gets allocated to the size stored in the queue
variable .cmd_size initialized using the .init_rq_fn() and
cleaned up using .exit_rq_fn().
The block layer code makes the MMC core rely on this mechanism to
allocate the per-request mmc_queue_req state container.
Doing this make a lot of complicated queue handling go away. We only
need to keep the .qnct that keeps count of how many request are
currently being processed by the MMC layer. The MQ block layer will
replace also this once we transition to it.
Doing this refactoring is necessary to move the ioctl() operations
into custom block layer requests tagged with REQ_OP_DRV_[IN|OUT]
instead of the custom code using the BigMMCHostLock that we have
today: those require that per-request data be obtainable easily from
a request after creating a custom request with e.g.:
struct request *rq = blk_get_request(q, REQ_OP_DRV_IN, __GFP_RECLAIM);
struct mmc_queue_req *mq_rq = req_to_mq_rq(rq);
And this is not possible with the current construction, as the request
is not immediately assigned the per-request state container, but
instead it gets assigned when the request finally enters the MMC
queue, which is way too late for custom requests.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
[Ulf: Folded in the fix to drop a call to blk_cleanup_queue()]
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Heiner Kallweit <hkallweit1@gmail.com>
2017-05-18 17:29:32 +08:00
|
|
|
mq->queue->queue_lock = lock;
|
|
|
|
|
mq->queue->request_fn = mmc_request_fn;
|
|
|
|
|
mq->queue->init_rq_fn = mmc_init_request;
|
|
|
|
|
mq->queue->exit_rq_fn = mmc_exit_request;
|
|
|
|
|
mq->queue->cmd_size = sizeof(struct mmc_queue_req);
|
2005-04-17 06:20:36 +08:00
|
|
|
mq->queue->queuedata = mq;
|
mmc: core: Allocate per-request data using the block layer core
The mmc_queue_req is a per-request state container the MMC core uses
to carry bounce buffers, pointers to asynchronous requests and so on.
Currently allocated as a static array of objects, then as a request
comes in, a mmc_queue_req is assigned to it, and used during the
lifetime of the request.
This is backwards compared to how other block layer drivers work:
they usally let the block core provide a per-request struct that get
allocated right beind the struct request, and which can be obtained
using the blk_mq_rq_to_pdu() helper. (The _mq_ infix in this function
name is misleading: it is used by both the old and the MQ block
layer.)
The per-request struct gets allocated to the size stored in the queue
variable .cmd_size initialized using the .init_rq_fn() and
cleaned up using .exit_rq_fn().
The block layer code makes the MMC core rely on this mechanism to
allocate the per-request mmc_queue_req state container.
Doing this make a lot of complicated queue handling go away. We only
need to keep the .qnct that keeps count of how many request are
currently being processed by the MMC layer. The MQ block layer will
replace also this once we transition to it.
Doing this refactoring is necessary to move the ioctl() operations
into custom block layer requests tagged with REQ_OP_DRV_[IN|OUT]
instead of the custom code using the BigMMCHostLock that we have
today: those require that per-request data be obtainable easily from
a request after creating a custom request with e.g.:
struct request *rq = blk_get_request(q, REQ_OP_DRV_IN, __GFP_RECLAIM);
struct mmc_queue_req *mq_rq = req_to_mq_rq(rq);
And this is not possible with the current construction, as the request
is not immediately assigned the per-request state container, but
instead it gets assigned when the request finally enters the MMC
queue, which is way too late for custom requests.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
[Ulf: Folded in the fix to drop a call to blk_cleanup_queue()]
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Heiner Kallweit <hkallweit1@gmail.com>
2017-05-18 17:29:32 +08:00
|
|
|
mq->qcnt = 0;
|
|
|
|
|
ret = blk_init_allocated_queue(mq->queue);
|
|
|
|
|
if (ret) {
|
|
|
|
|
blk_cleanup_queue(mq->queue);
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-05-12 06:26:16 +08:00
|
|
|
blk_queue_prep_rq(mq->queue, mmc_prep_request);
|
2008-10-15 02:04:46 +08:00
|
|
|
queue_flag_set_unlocked(QUEUE_FLAG_NONROT, mq->queue);
|
2014-10-05 00:55:32 +08:00
|
|
|
queue_flag_clear_unlocked(QUEUE_FLAG_ADD_RANDOM, mq->queue);
|
2011-06-28 22:16:02 +08:00
|
|
|
if (mmc_can_erase(card))
|
|
|
|
|
mmc_queue_setup_discard(mq->queue, card);
|
2007-05-12 06:26:16 +08:00
|
|
|
|
2017-09-20 16:56:14 +08:00
|
|
|
blk_queue_bounce_limit(mq->queue, limit);
|
|
|
|
|
blk_queue_max_hw_sectors(mq->queue,
|
|
|
|
|
min(host->max_blk_count, host->max_req_size / 512));
|
|
|
|
|
blk_queue_max_segments(mq->queue, host->max_segs);
|
|
|
|
|
blk_queue_max_segment_size(mq->queue, host->max_seg_size);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-09-14 19:12:35 +08:00
|
|
|
sema_init(&mq->thread_sem, 1);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2011-06-23 18:40:28 +08:00
|
|
|
mq->thread = kthread_run(mmc_queue_thread, mq, "mmcqd/%d%s",
|
|
|
|
|
host->index, subname ? subname : "");
|
2010-10-01 06:40:27 +08:00
|
|
|
|
2006-11-14 03:23:52 +08:00
|
|
|
if (IS_ERR(mq->thread)) {
|
|
|
|
|
ret = PTR_ERR(mq->thread);
|
2016-11-29 18:09:14 +08:00
|
|
|
goto cleanup_queue;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
2006-11-14 03:23:52 +08:00
|
|
|
return 0;
|
2011-07-10 05:12:36 +08:00
|
|
|
|
2017-03-13 20:36:36 +08:00
|
|
|
cleanup_queue:
|
2005-04-17 06:20:36 +08:00
|
|
|
blk_cleanup_queue(mq->queue);
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void mmc_cleanup_queue(struct mmc_queue *mq)
|
|
|
|
|
{
|
2007-07-24 15:28:11 +08:00
|
|
|
struct request_queue *q = mq->queue;
|
2006-11-15 05:08:16 +08:00
|
|
|
unsigned long flags;
|
|
|
|
|
|
2007-04-28 22:52:12 +08:00
|
|
|
/* Make sure the queue isn't suspended, as that will deadlock */
|
|
|
|
|
mmc_queue_resume(mq);
|
|
|
|
|
|
2006-11-15 05:08:16 +08:00
|
|
|
/* Then terminate our worker thread */
|
2006-11-14 03:23:52 +08:00
|
|
|
kthread_stop(mq->thread);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-01-09 06:43:00 +08:00
|
|
|
/* Empty the queue */
|
|
|
|
|
spin_lock_irqsave(q->queue_lock, flags);
|
|
|
|
|
q->queuedata = NULL;
|
|
|
|
|
blk_start_queue(q);
|
|
|
|
|
spin_unlock_irqrestore(q->queue_lock, flags);
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
mq->card = NULL;
|
|
|
|
|
}
|
|
|
|
|
EXPORT_SYMBOL(mmc_cleanup_queue);
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* mmc_queue_suspend - suspend a MMC request queue
|
|
|
|
|
* @mq: MMC queue to suspend
|
|
|
|
|
*
|
|
|
|
|
* Stop the block request queue, and wait for our thread to
|
|
|
|
|
* complete any outstanding requests. This ensures that we
|
|
|
|
|
* won't suspend while a request is being processed.
|
|
|
|
|
*/
|
|
|
|
|
void mmc_queue_suspend(struct mmc_queue *mq)
|
|
|
|
|
{
|
2007-07-24 15:28:11 +08:00
|
|
|
struct request_queue *q = mq->queue;
|
2005-04-17 06:20:36 +08:00
|
|
|
unsigned long flags;
|
|
|
|
|
|
2017-02-01 20:47:56 +08:00
|
|
|
if (!mq->suspended) {
|
|
|
|
|
mq->suspended |= true;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
spin_lock_irqsave(q->queue_lock, flags);
|
|
|
|
|
blk_stop_queue(q);
|
|
|
|
|
spin_unlock_irqrestore(q->queue_lock, flags);
|
|
|
|
|
|
|
|
|
|
down(&mq->thread_sem);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* mmc_queue_resume - resume a previously suspended MMC request queue
|
|
|
|
|
* @mq: MMC queue to resume
|
|
|
|
|
*/
|
|
|
|
|
void mmc_queue_resume(struct mmc_queue *mq)
|
|
|
|
|
{
|
2007-07-24 15:28:11 +08:00
|
|
|
struct request_queue *q = mq->queue;
|
2005-04-17 06:20:36 +08:00
|
|
|
unsigned long flags;
|
|
|
|
|
|
2017-02-01 20:47:56 +08:00
|
|
|
if (mq->suspended) {
|
|
|
|
|
mq->suspended = false;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
up(&mq->thread_sem);
|
|
|
|
|
|
|
|
|
|
spin_lock_irqsave(q->queue_lock, flags);
|
|
|
|
|
blk_start_queue(q);
|
|
|
|
|
spin_unlock_irqrestore(q->queue_lock, flags);
|
|
|
|
|
}
|
|
|
|
|
}
|
2006-12-24 03:03:02 +08:00
|
|
|
|
2008-07-22 20:35:42 +08:00
|
|
|
/*
|
|
|
|
|
* Prepare the sg list(s) to be handed of to the host driver
|
|
|
|
|
*/
|
2011-07-10 05:12:36 +08:00
|
|
|
unsigned int mmc_queue_map_sg(struct mmc_queue *mq, struct mmc_queue_req *mqrq)
|
2007-05-12 06:26:16 +08:00
|
|
|
{
|
2017-05-19 21:37:27 +08:00
|
|
|
struct request *req = mmc_queue_req_to_req(mqrq);
|
2007-05-12 06:26:16 +08:00
|
|
|
|
2017-09-20 16:56:14 +08:00
|
|
|
return blk_rq_map_sg(mq->queue, req, mqrq->sg);
|
2007-05-12 06:26:16 +08:00
|
|
|
}
|