Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp307032iog; Fri, 17 Jun 2022 04:07:42 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vlHR0M721au4D0GQxpL7oeInBBAYmAN6LPUTJqjydU0JPHZd8kbOZbHDcHLmcCE+16kRIr X-Received: by 2002:aa7:92c3:0:b0:522:93a7:e68c with SMTP id k3-20020aa792c3000000b0052293a7e68cmr9556080pfa.66.1655464062138; Fri, 17 Jun 2022 04:07:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655464062; cv=none; d=google.com; s=arc-20160816; b=LdiyknU44K1/Ebncs1HHiapEhUcqN4d51JdfLr8XWNvL/tJcgkJcrz5IgyUg8H+08A WcW1DyFYIl+TjKco3MHw6P5q37i7qyJeqR3UAZHol8jMdNopvMtYwLCHZqT0vDyMzvFs h6AgUc3+jQaDcNHutbDd4Ea+1vkFHzvWbYvorm0Nj+Eepfz2gWpwqw0ozQeVH9y7qxlJ C+E7BZZgefIQC1VrGT7EMZ9JinsUW4qZStjORhaHrtbNPAJt7+f2B7deeCmpIorhOwlI nN1LaLgeqNbpSHp8nRtBPewNurTvI+2fXdimDpULcR9JtzHC/avqH9PZnmOvMV0FC7va FvsA== 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=Ed/hGBxdblS+cfPtDIgU9PXN7n7FNAnF74cOMgD13qA=; b=LmGvx0zyEFGM0tBqZ2GTY44thj6+nphkfH0KuaQI2DJHdICZ5c2gtNMvVJM48Kd0zd cq20TvXkBWlF3A9wsBlhBe396IvM6Y5RAbr1hQqHSdrDyxOhjUFaa0waJrAFDs2WN7aB 7iRQkL2chdGb5DGEbp17o0S8r+Fe3oGqcyDStYpbRKzjNTihzaDmuF9irv4qzme6nX/u CNX51UMyVRLJY9E2dHmR26Zxp2WQNDuDDWAkIIAV/T3OkDi9woCbt3CMFB7JkWXZagNE 5w2kWoSTC//qstL7HVSO3+9T7Mvvaa3/2vG/9A4Xc1uIXkq+/Hp6lRVEOX1bqmJY35OT xB6g== 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 o9-20020a17090a55c900b001eb162f3c40si3293837pjm.17.2022.06.17.04.07.24; Fri, 17 Jun 2022 04:07:42 -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 S1382288AbiFQLB4 (ORCPT + 99 others); Fri, 17 Jun 2022 07:01:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1381563AbiFQLBq (ORCPT ); Fri, 17 Jun 2022 07:01:46 -0400 Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 369F36C0CF; Fri, 17 Jun 2022 04:01:45 -0700 (PDT) Received: from fraeml710-chm.china.huawei.com (unknown [172.18.147.206]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4LPbhC6ZMMz689NN; Fri, 17 Jun 2022 19:01:31 +0800 (CST) Received: from lhreml724-chm.china.huawei.com (10.201.108.75) by fraeml710-chm.china.huawei.com (10.206.15.59) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Fri, 17 Jun 2022 13:01:43 +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; Fri, 17 Jun 2022 12:01:38 +0100 From: John Garry To: , , , , , , , , , CC: , , , , , , , , , John Garry Subject: [PATCH 2/5] blk-mq: Add a flag for reserved requests Date: Fri, 17 Jun 2022 18:55:17 +0800 Message-ID: <1655463320-241202-3-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1655463320-241202-1-git-send-email-john.garry@huawei.com> References: <1655463320-241202-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 --- 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 7a5558bbc7f6..15e66416de60 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. */ @@ -586,6 +589,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.35.3