Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp3732018iog; Tue, 21 Jun 2022 05:00:31 -0700 (PDT) X-Google-Smtp-Source: AGRyM1ud4Niij3ETI8tadPtRag3WxQEoCM6JVJEu5wL3uwRneSJaUv2nG61IeSA5nQE/SQURaIWr X-Received: by 2002:a17:902:a701:b0:16a:65b:f9f1 with SMTP id w1-20020a170902a70100b0016a065bf9f1mr21519642plq.73.1655812831203; Tue, 21 Jun 2022 05:00:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655812831; cv=none; d=google.com; s=arc-20160816; b=YxL0GnFBluK4IXo4zINCBN7//VqmCZJEKJxQMdg5PeyE8QnH5NErLCiBTko4d0pfBW eRY2Zx6G1HzaFTvsHhuPyjcgGo+cxj3JZJKy6vnJhhW0TUWU08iBtqDknQoJzW3dB9h9 Bzsj0urqX/N9xDz0YgkxbPA+J1JJOsvOMGvbcX3DLrsr9TFScegUvG9vkcoCpi6BESth kSortk5p16PnuQGQcwVMSznPyj6fwCXWWbQPuo/hcQlyCAXIJ7NC0vf+YgZfgAP3TscH T9us7zMzzzgkkb4d6zi810ERd4mzu/iYac7mNloSdRHbUGeQ6kQw+7+q598tq63AkwAO M7YQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=tycmKxVKcU9O/iAG9UdP9GRWtyIedZHEa8v6sPek/Ew=; b=Gh17C4xYxc2hGij013rL424Qo6N729GKzQuwBtqlys/rlcJuc8fcuLeyU82RSDjSPy CkzOa0tjqAzjB8p0WJYXiejrZXCLwboN04iLV1iOA9Ruib+DCpDomFlMHj2wzZPCVSu6 7Bx7sWuynnrI/mI24gYAE267EVBex1q41cSietoM9yuxxDJfzrHQWsOoZ/rG+GkIYZsi kePLT6BnxZ3QbDsy31jwVCfp6mrBnQRdzDLdDY+JeLlVcQ8SA5xs9DtG+ZuXzC65bA/H meUlfbPrzW0/7pxwnu26i+lxNoIvu+PczBHw9tnOteR2dDUMbIGosRR8mEjNbdHsZ1mO Mt2w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 186-20020a6302c3000000b0040c8f8fecb6si11091540pgc.593.2022.06.21.05.00.18; Tue, 21 Jun 2022 05:00:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349319AbiFULWV (ORCPT + 99 others); Tue, 21 Jun 2022 07:22:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349204AbiFULWP (ORCPT ); Tue, 21 Jun 2022 07:22:15 -0400 Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC9302A272; Tue, 21 Jun 2022 04:22:13 -0700 (PDT) Received: from fraeml744-chm.china.huawei.com (unknown [172.18.147.226]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4LS3xn14Wbz689td; Tue, 21 Jun 2022 19:21:49 +0800 (CST) Received: from lhreml724-chm.china.huawei.com (10.201.108.75) by fraeml744-chm.china.huawei.com (10.206.15.225) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 21 Jun 2022 13:22:11 +0200 Received: from localhost.localdomain (10.69.192.58) by lhreml724-chm.china.huawei.com (10.201.108.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 21 Jun 2022 12:22:06 +0100 From: John Garry To: , , , , , , , , , CC: , , , , , , , , , , John Garry Subject: [PATCH v2 2/6] blk-mq: Add a flag for reserved requests Date: Tue, 21 Jun 2022 19:15:39 +0800 Message-ID: <1655810143-67784-3-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1655810143-67784-1-git-send-email-john.garry@huawei.com> References: <1655810143-67784-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.69.192.58] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To lhreml724-chm.china.huawei.com (10.201.108.75) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a flag for reserved requests so that drivers may know this for any special handling. Signed-off-by: John Garry Reviewed-by: Christoph Hellwig Reviewed-by: Bart Van Assche Reviewed-by: Hannes Reinecke --- block/blk-mq.c | 6 ++++++ include/linux/blk-mq.h | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/block/blk-mq.c b/block/blk-mq.c index 5aa95964191b..d38c97fe89f5 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -474,6 +474,9 @@ static struct request *__blk_mq_alloc_requests(struct blk_mq_alloc_data *data) if (!(data->rq_flags & RQF_ELV)) blk_mq_tag_busy(data->hctx); + if (data->flags & BLK_MQ_REQ_RESERVED) + data->rq_flags |= RQF_RESV; + /* * Try batched alloc if we want more than 1 tag. */ @@ -588,6 +591,9 @@ struct request *blk_mq_alloc_request_hctx(struct request_queue *q, else data.rq_flags |= RQF_ELV; + if (flags & BLK_MQ_REQ_RESERVED) + data.rq_flags |= RQF_RESV; + ret = -EWOULDBLOCK; tag = blk_mq_get_tag(&data); if (tag == BLK_MQ_NO_TAG) diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index e2d9daf7e8dd..6d81fe10e850 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -57,6 +57,7 @@ typedef __u32 __bitwise req_flags_t; #define RQF_TIMED_OUT ((__force req_flags_t)(1 << 21)) /* queue has elevator attached */ #define RQF_ELV ((__force req_flags_t)(1 << 22)) +#define RQF_RESV ((__force req_flags_t)(1 << 23)) /* flags that prevent us from merging requests: */ #define RQF_NOMERGE_FLAGS \ @@ -823,6 +824,11 @@ static inline bool blk_mq_need_time_stamp(struct request *rq) return (rq->rq_flags & (RQF_IO_STAT | RQF_STATS | RQF_ELV)); } +static inline bool blk_mq_is_reserved_rq(struct request *rq) +{ + return rq->rq_flags & RQF_RESV; +} + /* * Batched completions only work when there is no I/O error and no special * ->end_io handler. -- 2.25.1