From patchwork Fri Jul 7 09:37:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 117066 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp3155855vqx; Fri, 7 Jul 2023 03:13:48 -0700 (PDT) X-Google-Smtp-Source: APBJJlH5I6tH4Ff9camOlJXYE1SrVL/oP5g1BJg3rf8T+EO+diG3Mz2MMx03B0upU1bR0LK/vqBA X-Received: by 2002:a05:6a00:2d04:b0:668:82fe:16e2 with SMTP id fa4-20020a056a002d0400b0066882fe16e2mr4074180pfb.16.1688724827678; Fri, 07 Jul 2023 03:13:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688724827; cv=none; d=google.com; s=arc-20160816; b=Xc3bO8hsOt3chADnOsVL4Ja3hVylFTY4dxxMKsAK6tWxg+pTQp2GX4LXOi38u/9HS2 hGKMRCzAVV+C653+e3xJb3+IiUEpjyrCf/6wFZ0/T9UbnBVhxiudWHwzJ+uNJRG9fu+W PpQMNGH/GNWbwj5GIOBwYcuXNRB/3MJELA9wu6I0qHfEwHbbl5cul7viJ5jY7h/UYq3c m7NnhQ3RRwnT3qO+hNTI6JoP4nmQY3UPMZuGqtVTQmY+MQRkfm0phJBMZhaWZPkjq3W3 qNpbAAYM50UJpAfR+iqEtPotR8vb9ah8/LXRH/VIikvdNJrp6WlK9zcAQTo7QB4LXY67 3mgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GNQffBpvwsnQY1EH1HZ//XhBWHXASFg3WNRxajHHe/k=; fh=btCu08YPIkaMnzl/TLHoNK175CbmOVbtuBRLd+sKXQY=; b=pNWgSADo+KAOTxw0m74eX+aw/upIsun4jL+5aOfaFdTWoICp0Ec1+g8pcHP5KCP9ND EmCwOt5AjOlztUX36f7bKGsLnUFRKrgyThhQ70KLjuMLrbKcPUn1hgL8EtU0V6YFXHeb ZDBbBUdB+LYwLzGtM2CRJJFutfPcZRjralQjYAbEbmS0KUrPaOfnPo9LySpOlUphN8op 1UmlchBgazKl4Sw14qCtbL3mvhpyIjZSzraToI56JStKiMw6RHd22loK3PmJcJXa4c3v 42PztfqpJQprEWTcn9IKuqQmp5hFaVPHsIx3trqrx1EhR00nvvkc36Shm6FCxRqN61Ld l0+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=fp2imDnj; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j187-20020a638bc4000000b00542d3727da9si3659081pge.464.2023.07.07.03.13.33; Fri, 07 Jul 2023 03:13:47 -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; dkim=pass header.i=@linux.dev header.s=key1 header.b=fp2imDnj; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232732AbjGGJjK (ORCPT + 99 others); Fri, 7 Jul 2023 05:39:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232619AbjGGJjG (ORCPT ); Fri, 7 Jul 2023 05:39:06 -0400 Received: from out-39.mta0.migadu.com (out-39.mta0.migadu.com [91.218.175.39]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26B9B2105 for ; Fri, 7 Jul 2023 02:39:05 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1688722743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GNQffBpvwsnQY1EH1HZ//XhBWHXASFg3WNRxajHHe/k=; b=fp2imDnjRIdA+x9yfGUVEx9Y742YG+UA7+IZVdK3KPoej92hyEUCPCVKDxZqMwCTvu5NL3 Zu3ekiHzUtwtu4U58i2kJhJPALPiW46XLqCLscWSUWuLbKxiG7aAHJ5ClJ55+Uferx91IR VfmYznnkwG3bzfKDSBnmb11Vz7eBwwI= From: chengming.zhou@linux.dev To: axboe@kernel.dk, ming.lei@redhat.com, hch@lst.de, tj@kernel.org Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, zhouchengming@bytedance.com Subject: [PATCH v3 1/4] blk-mq: delete unused completion_data in struct request Date: Fri, 7 Jul 2023 17:37:19 +0800 Message-ID: <20230707093722.1338589-2-chengming.zhou@linux.dev> In-Reply-To: <20230707093722.1338589-1-chengming.zhou@linux.dev> References: <20230707093722.1338589-1-chengming.zhou@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770756324885536502?= X-GMAIL-MSGID: =?utf-8?q?1770756324885536502?= From: Chengming Zhou After global search, I found "completion_data" in struct request is not used anywhere, so just clean it up by the way. Signed-off-by: Chengming Zhou Reviewed-by: Christoph Hellwig Reviewed-by: Ming Lei --- include/linux/blk-mq.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index f401067ac03a..0a1c404e6c7a 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -158,13 +158,11 @@ struct request { /* * The rb_node is only used inside the io scheduler, requests - * are pruned when moved to the dispatch queue. So let the - * completion_data share space with the rb_node. + * are pruned when moved to the dispatch queue. */ union { struct rb_node rb_node; /* sort/lookup */ struct bio_vec special_vec; - void *completion_data; }; /* From patchwork Fri Jul 7 09:37:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 117062 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp3154888vqx; Fri, 7 Jul 2023 03:11:50 -0700 (PDT) X-Google-Smtp-Source: APBJJlGMX5yKkkK31yCNHS93TWK/udYbGtEmyWc6MvCymvxf6L8UfTJQ9wIrRtev+vzTRbJfxq/9 X-Received: by 2002:a17:90b:46cf:b0:262:fe3e:a7c4 with SMTP id jx15-20020a17090b46cf00b00262fe3ea7c4mr3446713pjb.4.1688724710556; Fri, 07 Jul 2023 03:11:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688724710; cv=none; d=google.com; s=arc-20160816; b=PFmiS9greGDK9nx72DrzqetMRW0ifEV+jKNmjXYXp+QkJUiSEU1T5L6+FxF7TniF2D 2a1d1ZSUpk3mUj7dNr7uL4maRtbChSO857n20/2yeGqGOZY5S7162mgyieiHAVyy0WGh SdaCTy4c75sj3L9fhvS64PL4fwQhVCD73lOYeEYqawJlzpndccw6chvaonNfJeLPSeoz C1bf97JQTCWGjZqXUi9b1dV4IB/QqqniKmXrggQX8b0PW/ZgvNM/25gT6xefQdUt77oP dBa2Es7vyoPBdyIzB0qajDU4M9S//YAJVUWEDcflbfFQCRA+/9XoKyn/FYnIB0XBWVNF jIAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=QGerpK1V1ctRjZC2+PWM/5ULJ+kFtEXJRRHXssQgmz0=; fh=btCu08YPIkaMnzl/TLHoNK175CbmOVbtuBRLd+sKXQY=; b=MzlMcGyu/zXHQi6ro6TiHtA4ohcilX9pTDGaZTobsVcn36c7QBU8Jg8VjZ3AAKP4g4 vUvKuuaC2eE4lRwMreE3QKPFAK8v6xVUlHLlYa0eLslaP3P/hWLmsMIEOQB7KYULk2FV +8XKkMUm0L2KsuvbxtRVio5VWxA8ZTGZLMd5lCaLW9G7TMUdbsd/nDfNpaYCSvYvzD/+ K+KW42x4EB9DIwFOGLweRlEaEZokeYEnhSdiQCXf0a7c4/z1NRiWMyJ1irTrPlhNEpkg pdrPDa/CGw37KW/F4hW+qMZ0/jbas+VeLAPRJr3NKhhchsJIFlpHJ6tA6pQAFcO89huZ heSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=tp5iOy0v; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i4-20020a63e444000000b0055bc30ae086si3500743pgk.594.2023.07.07.03.11.35; Fri, 07 Jul 2023 03:11:50 -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; dkim=pass header.i=@linux.dev header.s=key1 header.b=tp5iOy0v; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232745AbjGGJjP (ORCPT + 99 others); Fri, 7 Jul 2023 05:39:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232716AbjGGJjK (ORCPT ); Fri, 7 Jul 2023 05:39:10 -0400 Received: from out-57.mta0.migadu.com (out-57.mta0.migadu.com [IPv6:2001:41d0:1004:224b::39]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DBAE42106 for ; Fri, 7 Jul 2023 02:39:08 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1688722747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QGerpK1V1ctRjZC2+PWM/5ULJ+kFtEXJRRHXssQgmz0=; b=tp5iOy0v8KgRa4hlqo8i924ZQp+iuFTBITRyHheniNvm5f7NmrOMXW4w4tbs8LhaNFMRTr u3lRyyu1yPeaQba0mTC5uet5FJCdOQ9dHpoIkFx8chDvgjoQzwIsBEavz0pb5IPAvA0Lrr dV8vx/Z4HH10KBrOU8IKjaxyHix3Ppk= From: chengming.zhou@linux.dev To: axboe@kernel.dk, ming.lei@redhat.com, hch@lst.de, tj@kernel.org Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, zhouchengming@bytedance.com Subject: [PATCH v3 2/4] blk-mq: use percpu csd to remote complete instead of per-rq csd Date: Fri, 7 Jul 2023 17:37:20 +0800 Message-ID: <20230707093722.1338589-3-chengming.zhou@linux.dev> In-Reply-To: <20230707093722.1338589-1-chengming.zhou@linux.dev> References: <20230707093722.1338589-1-chengming.zhou@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770756202062938224?= X-GMAIL-MSGID: =?utf-8?q?1770756202062938224?= From: Chengming Zhou If request need to be completed remotely, we insert it into percpu llist, and smp_call_function_single_async() if llist is empty previously. We don't need to use per-rq csd, percpu csd is enough. And the size of struct request is decreased by 24 bytes. This way is cleaner, and looks correct, given block softirq is guaranteed to be scheduled to consume the list if one new request is added to this percpu list, either smp_call_function_single_async() returns -EBUSY or 0. Signed-off-by: Chengming Zhou Reviewed-by: Ming Lei Reviewed-by: Christoph Hellwig --- v3: - Remove the list and csd variables as they are only used once, as suggested by Christoph Hellwig. v2: - Change to use call_single_data_t, which avoid to use 2 cache lines for 1 csd, as suggested by Ming Lei. - Improve the commit log, the explanation is copied from Ming Lei. --- block/blk-mq.c | 12 ++++++------ include/linux/blk-mq.h | 5 +---- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index decb6ab2d508..7d013588077a 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -43,6 +43,7 @@ #include "blk-ioprio.h" static DEFINE_PER_CPU(struct llist_head, blk_cpu_done); +static DEFINE_PER_CPU(call_single_data_t, blk_cpu_csd); static void blk_mq_insert_request(struct request *rq, blk_insert_t flags); static void blk_mq_request_bypass_insert(struct request *rq, @@ -1154,15 +1155,11 @@ static inline bool blk_mq_complete_need_ipi(struct request *rq) static void blk_mq_complete_send_ipi(struct request *rq) { - struct llist_head *list; unsigned int cpu; cpu = rq->mq_ctx->cpu; - list = &per_cpu(blk_cpu_done, cpu); - if (llist_add(&rq->ipi_list, list)) { - INIT_CSD(&rq->csd, __blk_mq_complete_request_remote, rq); - smp_call_function_single_async(cpu, &rq->csd); - } + if (llist_add(&rq->ipi_list, &per_cpu(blk_cpu_done, cpu))) + smp_call_function_single_async(cpu, &per_cpu(blk_cpu_csd, cpu)); } static void blk_mq_raise_softirq(struct request *rq) @@ -4796,6 +4793,9 @@ static int __init blk_mq_init(void) for_each_possible_cpu(i) init_llist_head(&per_cpu(blk_cpu_done, i)); + for_each_possible_cpu(i) + INIT_CSD(&per_cpu(blk_cpu_csd, i), + __blk_mq_complete_request_remote, NULL); open_softirq(BLOCK_SOFTIRQ, blk_done_softirq); cpuhp_setup_state_nocalls(CPUHP_BLOCK_SOFTIRQ_DEAD, diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 0a1c404e6c7a..34d400171b3e 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -180,10 +180,7 @@ struct request { rq_end_io_fn *saved_end_io; } flush; - union { - struct __call_single_data csd; - u64 fifo_time; - }; + u64 fifo_time; /* * completion callback. From patchwork Fri Jul 7 09:37:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 117051 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp3144560vqx; Fri, 7 Jul 2023 02:52:18 -0700 (PDT) X-Google-Smtp-Source: APBJJlHvILzjh09Oq/B2qbplF+0lz/6xstcmskSbVfYRiaFJ41SnREWtksROfHYxaH91k89qsm/R X-Received: by 2002:a05:6a00:39a9:b0:667:e17e:85b7 with SMTP id fi41-20020a056a0039a900b00667e17e85b7mr5217357pfb.1.1688723537663; Fri, 07 Jul 2023 02:52:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688723537; cv=none; d=google.com; s=arc-20160816; b=zAhYrTh1Se8bNJu+ZA9HbBfGZyXEcWu6he33YSJUVSVdCO8XuIRdXNenxUGhWl8bAV cvw6dB60HK15fSa3OwPW+9wThYkgDS36E2bbDWe5Agok/AO2vXEk861/6mbuhStDGWOR +UjwrtTaxpEscTCd0vUmFAjkk11c5RGiEQFM/T/UfqaFnHCyxQayESHeHCet2+0J8Tx3 6/XRfhkWCp/MVG34jKj3yu8clpmuMO1Z50rD77Gx6Er6W9OQI8EH+sZtIC+6alghwrLJ q+ThwBBi4x2B0k/gw2LC2hyjGFiNSQsI7gyVYdQ4h3XDXsEnxMU/fZ7U1aZvnlzqYErQ N3QQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=wQHKRGRlsyTFKhwuew2Tx6TZYS0qTNQ4+BQ+yG3MTOA=; fh=btCu08YPIkaMnzl/TLHoNK175CbmOVbtuBRLd+sKXQY=; b=TuCs4cLroL28zShAiouYrafNfa+b1tneZmbYfta4Muzhki0nn/OhZi4F2/pmTop5JA qVPSD/lzS7p/DlDxEc78OB9to7L/Rx0VMCGl8QWoDKru0WzUMh+s9mzUpnhVfRaLqCmw iSxCxMIziJ8z7cNESssBjlBI35fFmbz6YlNT5uD5z7KUCeW5V0pHWVJlBp+uLHDQYLYE LXXcoqceVDXu7oUQKDCv3EegrtygIjaTPCKcU6N7D8XXn/GXFo89lYmWRsvpwMt4ekK5 h5BJYSWLDRMLD7T2nXmpsnB1df15Vf4mR/6b4FldwbLubOJfUxxr2HyO+69lZZ5HBgw/ WgCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=J9GTLIgt; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e12-20020a056a001a8c00b0066e4ceca38fsi3433605pfv.283.2023.07.07.02.52.04; Fri, 07 Jul 2023 02:52:17 -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; dkim=pass header.i=@linux.dev header.s=key1 header.b=J9GTLIgt; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232744AbjGGJjU (ORCPT + 99 others); Fri, 7 Jul 2023 05:39:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232734AbjGGJjO (ORCPT ); Fri, 7 Jul 2023 05:39:14 -0400 Received: from out-20.mta0.migadu.com (out-20.mta0.migadu.com [91.218.175.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01F5D211D for ; Fri, 7 Jul 2023 02:39:12 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1688722750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wQHKRGRlsyTFKhwuew2Tx6TZYS0qTNQ4+BQ+yG3MTOA=; b=J9GTLIgtqXNmw32UYmkN+AmXUu2QT9b46HjAnrAm16JK3khPLzs/wyFmc80OM5ua/1Vfpt O8swy4FMJbbbViRW7/evIiozhfHZWBiwf3B+ODkDRccMKbLUyV7+w8DAT90Mcd79ZE9eTj tpzJ+zJA3AG5ELF1BpJkrTo/NgnGgio= From: chengming.zhou@linux.dev To: axboe@kernel.dk, ming.lei@redhat.com, hch@lst.de, tj@kernel.org Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, zhouchengming@bytedance.com Subject: [PATCH v3 3/4] blk-flush: count inflight flush_data requests Date: Fri, 7 Jul 2023 17:37:21 +0800 Message-ID: <20230707093722.1338589-4-chengming.zhou@linux.dev> In-Reply-To: <20230707093722.1338589-1-chengming.zhou@linux.dev> References: <20230707093722.1338589-1-chengming.zhou@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770754971980315280?= X-GMAIL-MSGID: =?utf-8?q?1770754971980315280?= From: Chengming Zhou The flush state machine use a double list to link all inflight flush_data requests, to avoid issuing separate post-flushes for these flush_data requests which shared PREFLUSH. So we can't reuse rq->queuelist, this is why we need rq->flush.list In preparation of the next patch that reuse rq->queuelist for flush state machine, we change the double linked list to unsigned long counter, which count all inflight flush_data requests. This is ok since we only need to know if there is any inflight flush_data request, so unsigned long counter is good. Signed-off-by: Chengming Zhou Reviewed-by: Ming Lei Reviewed-by: Christoph Hellwig --- block/blk-flush.c | 9 +++++---- block/blk.h | 5 ++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/block/blk-flush.c b/block/blk-flush.c index dba392cf22be..bb7adfc2a5da 100644 --- a/block/blk-flush.c +++ b/block/blk-flush.c @@ -187,7 +187,8 @@ static void blk_flush_complete_seq(struct request *rq, break; case REQ_FSEQ_DATA: - list_move_tail(&rq->flush.list, &fq->flush_data_in_flight); + list_del_init(&rq->flush.list); + fq->flush_data_in_flight++; spin_lock(&q->requeue_lock); list_add_tail(&rq->queuelist, &q->flush_list); spin_unlock(&q->requeue_lock); @@ -299,7 +300,7 @@ static void blk_kick_flush(struct request_queue *q, struct blk_flush_queue *fq, return; /* C2 and C3 */ - if (!list_empty(&fq->flush_data_in_flight) && + if (fq->flush_data_in_flight && time_before(jiffies, fq->flush_pending_since + FLUSH_PENDING_TIMEOUT)) return; @@ -374,6 +375,7 @@ static enum rq_end_io_ret mq_flush_data_end_io(struct request *rq, * the comment in flush_end_io(). */ spin_lock_irqsave(&fq->mq_flush_lock, flags); + fq->flush_data_in_flight--; blk_flush_complete_seq(rq, fq, REQ_FSEQ_DATA, error); spin_unlock_irqrestore(&fq->mq_flush_lock, flags); @@ -445,7 +447,7 @@ bool blk_insert_flush(struct request *rq) blk_rq_init_flush(rq); rq->flush.seq |= REQ_FSEQ_POSTFLUSH; spin_lock_irq(&fq->mq_flush_lock); - list_move_tail(&rq->flush.list, &fq->flush_data_in_flight); + fq->flush_data_in_flight++; spin_unlock_irq(&fq->mq_flush_lock); return false; default: @@ -496,7 +498,6 @@ struct blk_flush_queue *blk_alloc_flush_queue(int node, int cmd_size, INIT_LIST_HEAD(&fq->flush_queue[0]); INIT_LIST_HEAD(&fq->flush_queue[1]); - INIT_LIST_HEAD(&fq->flush_data_in_flight); return fq; diff --git a/block/blk.h b/block/blk.h index 608c5dcc516b..686712e13835 100644 --- a/block/blk.h +++ b/block/blk.h @@ -15,15 +15,14 @@ struct elevator_type; extern struct dentry *blk_debugfs_root; struct blk_flush_queue { + spinlock_t mq_flush_lock; unsigned int flush_pending_idx:1; unsigned int flush_running_idx:1; blk_status_t rq_status; unsigned long flush_pending_since; struct list_head flush_queue[2]; - struct list_head flush_data_in_flight; + unsigned long flush_data_in_flight; struct request *flush_rq; - - spinlock_t mq_flush_lock; }; bool is_flush_rq(struct request *req); From patchwork Fri Jul 7 09:37:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 117052 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp3144718vqx; Fri, 7 Jul 2023 02:52:41 -0700 (PDT) X-Google-Smtp-Source: APBJJlEswAebA/CcaCfcccFjtMkhbYnzZ5RKAYnu7Ogz6KJL+GYSxIlqwNt9iZxJX+CUcP3Q0NwP X-Received: by 2002:a05:6870:7389:b0:1b0:2c27:c958 with SMTP id z9-20020a056870738900b001b02c27c958mr6580058oam.17.1688723561192; Fri, 07 Jul 2023 02:52:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688723561; cv=none; d=google.com; s=arc-20160816; b=Rqf/nW61AmFcR9YRkwhyL1vrXapOwaEAeX5Ik3qNn5HfBjRVfn1J0EKhb1Ay2imO4U oayVtxHOe2jwd2idtSReFfNdF5IJPiFDGIbLB9Vr/LTAyckbbYDDGd7YIboVWbzCvxtv 9uKxtu43WR7UgONRotrleS2T9iMs875t0Y1nUny8Wnrkuea+1UVE8cIUDYDxJMhGjMhz +uajOQhxxFRmN01RXhNAA5hN033Kx58baKFKVcPQ2vxwoc+B5CQyYwieZQ0sSteQHmvH Dx68SZrwm0y8efgWsb6o+GNeNJdrrQ0vJvCJflMIH4zk9J7oqop8ow0PZrbc6Ih9jUh0 RURQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=znByHfzQSpvrPQaReH7yflCmK5TREu8Z0tH8P3jgNog=; fh=btCu08YPIkaMnzl/TLHoNK175CbmOVbtuBRLd+sKXQY=; b=h45L6SdN/CPjsyjZxdVqL2ID7ISDWpMtQAyp4L3dOgMqw62bkp+SPuCuax0GaSw8EC a1fraJtZfWVwVcktUFRoY7GrZHrVlKwja5+jWOGflneKfF/y5T2cQA91PF80EH0HDi3i +fJsCu+oIMccsFkuwJ6793U+U3ZrMqRETky2WsAYYWxpPgkgmuYx71wACXMkQ9iL+gZu 3FHAXwqHG1P3jo0M/dTAY5CHlkW5o9Er5qrBYsW0zC5S1Hjc+Kgg0+EuNHcL48JpHdSH ndgqje8kyBrfCJTAFZN7n6duYZVT5W7PSS++5unmsfMKY9dIEfpGdD+eKA8J4UBQjAkL Ek1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=k7qzuLrF; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o20-20020a17090b0c9400b00263b9233a57si1632156pjz.64.2023.07.07.02.52.28; Fri, 07 Jul 2023 02:52:41 -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; dkim=pass header.i=@linux.dev header.s=key1 header.b=k7qzuLrF; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232782AbjGGJjh (ORCPT + 99 others); Fri, 7 Jul 2023 05:39:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232728AbjGGJja (ORCPT ); Fri, 7 Jul 2023 05:39:30 -0400 Received: from out-43.mta0.migadu.com (out-43.mta0.migadu.com [91.218.175.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B11CB2128 for ; Fri, 7 Jul 2023 02:39:16 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1688722754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=znByHfzQSpvrPQaReH7yflCmK5TREu8Z0tH8P3jgNog=; b=k7qzuLrFyLTHZjTplLwK1pIMWbb8ID0RsNUs4Ol1S8PtEC8M5suueKCd3IbrWN5ymFPn7L nJb+qDCU2VhjmBkz7x9+mo5G5TP4+RPaHNpqlbB807FYEBzpT5x7zerC5w8JMfDl0HLH20 ZkBK7AQ8c03WwQMbsn4KP4k8L1ZAzrI= From: chengming.zhou@linux.dev To: axboe@kernel.dk, ming.lei@redhat.com, hch@lst.de, tj@kernel.org Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, zhouchengming@bytedance.com Subject: [PATCH v3 4/4] blk-flush: reuse rq queuelist in flush state machine Date: Fri, 7 Jul 2023 17:37:22 +0800 Message-ID: <20230707093722.1338589-5-chengming.zhou@linux.dev> In-Reply-To: <20230707093722.1338589-1-chengming.zhou@linux.dev> References: <20230707093722.1338589-1-chengming.zhou@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770754996878111717?= X-GMAIL-MSGID: =?utf-8?q?1770754996878111717?= From: Chengming Zhou Since we don't need to maintain inflight flush_data requests list anymore, we can reuse rq->queuelist for flush pending list. Note in mq_flush_data_end_io(), we need to re-initialize rq->queuelist before reusing it in the state machine when end, since the rq->rq_next also reuse it, may have corrupted rq->queuelist by the driver. This patch decrease the size of struct request by 16 bytes. Signed-off-by: Chengming Zhou Reviewed-by: Christoph Hellwig Reviewed-by: Ming Lei --- v3: - fix a bug report of blktests nvme/012, we need to re-initialize rq->queuelist before reusing it in the state machine when end. Because rq->rq_next reuse may have corrupted it. Thanks Ming Lei. --- block/blk-flush.c | 17 ++++++++++------- include/linux/blk-mq.h | 1 - 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/block/blk-flush.c b/block/blk-flush.c index bb7adfc2a5da..4826d2d61a23 100644 --- a/block/blk-flush.c +++ b/block/blk-flush.c @@ -183,14 +183,13 @@ static void blk_flush_complete_seq(struct request *rq, /* queue for flush */ if (list_empty(pending)) fq->flush_pending_since = jiffies; - list_move_tail(&rq->flush.list, pending); + list_move_tail(&rq->queuelist, pending); break; case REQ_FSEQ_DATA: - list_del_init(&rq->flush.list); fq->flush_data_in_flight++; spin_lock(&q->requeue_lock); - list_add_tail(&rq->queuelist, &q->flush_list); + list_move_tail(&rq->queuelist, &q->flush_list); spin_unlock(&q->requeue_lock); blk_mq_kick_requeue_list(q); break; @@ -202,7 +201,7 @@ static void blk_flush_complete_seq(struct request *rq, * flush data request completion path. Restore @rq for * normal completion and end it. */ - list_del_init(&rq->flush.list); + list_del_init(&rq->queuelist); blk_flush_restore_request(rq); blk_mq_end_request(rq, error); break; @@ -258,7 +257,7 @@ static enum rq_end_io_ret flush_end_io(struct request *flush_rq, fq->flush_running_idx ^= 1; /* and push the waiting requests to the next stage */ - list_for_each_entry_safe(rq, n, running, flush.list) { + list_for_each_entry_safe(rq, n, running, queuelist) { unsigned int seq = blk_flush_cur_seq(rq); BUG_ON(seq != REQ_FSEQ_PREFLUSH && seq != REQ_FSEQ_POSTFLUSH); @@ -292,7 +291,7 @@ static void blk_kick_flush(struct request_queue *q, struct blk_flush_queue *fq, { struct list_head *pending = &fq->flush_queue[fq->flush_pending_idx]; struct request *first_rq = - list_first_entry(pending, struct request, flush.list); + list_first_entry(pending, struct request, queuelist); struct request *flush_rq = fq->flush_rq; /* C1 described at the top of this file */ @@ -376,6 +375,11 @@ static enum rq_end_io_ret mq_flush_data_end_io(struct request *rq, */ spin_lock_irqsave(&fq->mq_flush_lock, flags); fq->flush_data_in_flight--; + /* + * May have been corrupted by rq->rq_next reuse, we need to + * re-initialize rq->queuelist before reusing it here. + */ + INIT_LIST_HEAD(&rq->queuelist); blk_flush_complete_seq(rq, fq, REQ_FSEQ_DATA, error); spin_unlock_irqrestore(&fq->mq_flush_lock, flags); @@ -386,7 +390,6 @@ static enum rq_end_io_ret mq_flush_data_end_io(struct request *rq, static void blk_rq_init_flush(struct request *rq) { rq->flush.seq = 0; - INIT_LIST_HEAD(&rq->flush.list); rq->rq_flags |= RQF_FLUSH_SEQ; rq->flush.saved_end_io = rq->end_io; /* Usually NULL */ rq->end_io = mq_flush_data_end_io; diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 34d400171b3e..ab790eba5fcf 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -176,7 +176,6 @@ struct request { struct { unsigned int seq; - struct list_head list; rq_end_io_fn *saved_end_io; } flush;