From patchwork Thu May 11 12:39:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 99641 Delivered-To: patches@linaro.org Received: by 10.140.96.100 with SMTP id j91csp708983qge; Thu, 11 May 2017 05:39:09 -0700 (PDT) X-Received: by 10.28.103.3 with SMTP id b3mr720566wmc.5.1494506349764; Thu, 11 May 2017 05:39:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494506349; cv=none; d=google.com; s=arc-20160816; b=wcLu1fMNPkzcThrMk1Y+841xScMtKWD27iV3oULmED/oxFXwbBExM6602UPzsfmsFL bzju1iGE+7cpsVhTOwY7My+P8eeuSWAJG0c4v0SzHj335kmPB/8kyybNQVsukuSL48dD QtF+/GiNYfoMRWMmt+IOaltf2UTgR2629XmA33DlnEtGsHGbVA+b/LDQAEILAXpzLchD HiP5lRQd5ExGXZDCT1havhhna2S3xNXR8Qwfyl6JZ/wbh4/F1SEogHTlYzKIynbNWHzF 8VhRNV5j/4unLNg4YnvHM7TV4A9wCjIYdI5yAUUPkmnMRvaWSMcCyy01j30BiaOa4luE JEog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=4dPoyW1Q25bFcFdk/CwHC/dXRZb6eYQA9pRjDQsrLds=; b=trtsDT4F1En7ZomNoOL9Bwj30LcrvJsOzTI/LxfOkM3mRYtKT8RJjMQXYNfpR39tsd iJpOkBmkANHUccBTWVOSY50my64KV3uZQwn1Q+T/oWhTHcoj3t+GPpCvB2w9UtyTwkdq OE2vTTxfodigzGe3EL6TE4bBBOcTYHvRJFiY0avTIqDKksbZdbSkCiOqwyoh1IZah6iR bmnsimO8d19aUzFGAPcT2zTjzt2nfoPNVdGajnUhxk3oQnTkxT8III9b/S2YrxLFKvCx c09FQ1aJW7dBTICBFfFEi43MKTBXiwu54rwi2/ZUUhR1cNhJlfLp7wZLGt1olxsHCtyo t1Xg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:400c:c0c::22b as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-wr0-x22b.google.com (mail-wr0-x22b.google.com. [2a00:1450:400c:c0c::22b]) by mx.google.com with ESMTPS id 3si32648wrj.209.2017.05.11.05.39.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 May 2017 05:39:09 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:400c:c0c::22b as permitted sender) client-ip=2a00:1450:400c:c0c::22b; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:400c:c0c::22b as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by mail-wr0-x22b.google.com with SMTP id w50so19594557wrc.0 for ; Thu, 11 May 2017 05:39:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4dPoyW1Q25bFcFdk/CwHC/dXRZb6eYQA9pRjDQsrLds=; b=GTZKcRjW4O5pcqM/GSNbJTN0QwvgS3vhtwlZLTWnUtEx2NQUjSPUd38y9TMqzPxHII grJQjOpgr0xrMsjp5n/6RjLs1/jVePMKM01vPXbMxV/CRKvm0/ECxbYvff0T5rO3Zpay x2Tmp5PgaLLahohKgVnLoKlYijsDDo47IOeIU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4dPoyW1Q25bFcFdk/CwHC/dXRZb6eYQA9pRjDQsrLds=; b=la/w1hVx867t/1XzyLQvA03yaUVJi15QLZNUFMQ0/XsCwKQJFQFAXibVC7uIZyqce1 UyM7aK57CjUIGe1xo8kxqxIYXWraNiXNjJ5Q+GtvLzEMiwIA/h+34Wmb0xjEK7Naby6B Xh6/gtX20zWgJ+REya/Z4nz4LE6P07tF3Vfkwu345e8qzVtqb/B97EXXqXabf1XhutIp LklpiIQEkZZj6bRn830cqQ6x0EndwK2S9pAkgfEnX0VgTwHH/23LUc8ZfeAC0NUDnb8a k23pj96WG2p1gNTGqNWHVlMnOv2ziRYYM6F8RHWtsR7og30Fv98LnSwOnxwY0iH04nB/ ZdbQ== X-Gm-Message-State: AODbwcBCZUxRt8vuLzK31xVbgwVlJDgjNYoA2NChFr7dJvJEPbqOrMmr uy9Z6Cx+97ZY33JEgRQ= X-Received: by 10.46.33.146 with SMTP id h18mr43495lji.86.1494506349341; Thu, 11 May 2017 05:39:09 -0700 (PDT) Return-Path: Received: from localhost.localdomain (h-155-4-221-67.na.cust.bahnhof.se. [155.4.221.67]) by smtp.gmail.com with ESMTPSA id h13sm13935ljh.5.2017.05.11.05.39.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 11 May 2017 05:39:08 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Jens Axboe , Paolo Valente , linux-block@vger.kernel.org, Linus Walleij , Mark Brown , Adrian Hunter Subject: [RFC PATCH 3/3] mmc: core: Allow mmc block device to re-claim the host Date: Thu, 11 May 2017 14:39:02 +0200 Message-Id: <1494506343-28572-4-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494506343-28572-1-git-send-email-ulf.hansson@linaro.org> References: <1494506343-28572-1-git-send-email-ulf.hansson@linaro.org> The current mmc block device implementation is tricky when it comes to claim and release of the host, while processing I/O requests. In principle we need to claim the host at the first request entering the queue and then we need to release the host, as soon as the queue becomes empty. This complexity relates to the asynchronous request mechanism that the mmc block device driver implements. For the legacy block interface that we currently implements, the above issue can be addressed, as we can find out when the queue really becomes empty. However, to find out whether the queue is empty, isn't really an applicable method when using the new blk-mq interface, as requests are instead pushed to us via the struct struct blk_mq_ops and its function pointers. Being able to support the asynchronous request method using the blk-mq interface, means we have to allow the mmc block device driver to re-claim the host from different tasks/contexts, as we may have > 1 request to operate upon. Therefore, let's extend the mmc_claim_host() API to support reference counting for the mmc block device. Signed-off-by: Ulf Hansson --- drivers/mmc/core/core.c | 14 ++++++++++---- drivers/mmc/core/core.h | 7 ++++++- include/linux/mmc/host.h | 1 + 3 files changed, 17 insertions(+), 5 deletions(-) -- 2.7.4 diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 0701e30..3633699 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1019,12 +1019,12 @@ unsigned int mmc_align_data_size(struct mmc_card *card, unsigned int sz) EXPORT_SYMBOL(mmc_align_data_size); /** - * mmc_claim_host - exclusively claim a host + * __mmc_claim_host - exclusively claim a host * @host: mmc host to claim * * Claim a host for a set of operations. */ -void mmc_claim_host(struct mmc_host *host) +void __mmc_claim_host(struct mmc_host *host, bool is_blkdev) { DECLARE_WAITQUEUE(wait, current); unsigned long flags; @@ -1036,7 +1036,11 @@ void mmc_claim_host(struct mmc_host *host) spin_lock_irqsave(&host->lock, flags); while (1) { set_current_state(TASK_UNINTERRUPTIBLE); - if (!host->claimed || host->claimer == current) + if (!host->claimed) + break; + if (host->claimer_is_blkdev && is_blkdev) + break; + if (host->claimer == current) break; spin_unlock_irqrestore(&host->lock, flags); schedule(); @@ -1045,6 +1049,7 @@ void mmc_claim_host(struct mmc_host *host) set_current_state(TASK_RUNNING); host->claimed = 1; host->claimer = current; + host->claimer_is_blkdev = is_blkdev; host->claim_cnt += 1; if (host->claim_cnt == 1) pm = true; @@ -1054,7 +1059,7 @@ void mmc_claim_host(struct mmc_host *host) if (pm) pm_runtime_get_sync(mmc_dev(host)); } -EXPORT_SYMBOL(mmc_claim_host); +EXPORT_SYMBOL(__mmc_claim_host); /** * mmc_release_host - release a host @@ -1076,6 +1081,7 @@ void mmc_release_host(struct mmc_host *host) } else { host->claimed = 0; host->claimer = NULL; + host->claimer_is_blkdev = 0; spin_unlock_irqrestore(&host->lock, flags); wake_up(&host->wq); pm_runtime_mark_last_busy(mmc_dev(host)); diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h index b247b1f..1598a37 100644 --- a/drivers/mmc/core/core.h +++ b/drivers/mmc/core/core.h @@ -122,9 +122,14 @@ int mmc_set_blocklen(struct mmc_card *card, unsigned int blocklen); int mmc_set_blockcount(struct mmc_card *card, unsigned int blockcount, bool is_rel_write); -void mmc_claim_host(struct mmc_host *host); +void __mmc_claim_host(struct mmc_host *host, bool is_blkdev); void mmc_release_host(struct mmc_host *host); void mmc_get_card(struct mmc_card *card); void mmc_put_card(struct mmc_card *card); +static inline void mmc_claim_host(struct mmc_host *host) +{ + __mmc_claim_host(host, 0); +} + #endif diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 8a4131f..7199817 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -347,6 +347,7 @@ struct mmc_host { wait_queue_head_t wq; struct task_struct *claimer; /* task that has host claimed */ + bool claimer_is_blkdev; /* claimer is blkdev */ int claim_cnt; /* "claim" nesting count */ struct delayed_work detect;