From patchwork Wed Dec 14 03:31:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 33032 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp508289wrn; Tue, 13 Dec 2022 19:15:15 -0800 (PST) X-Google-Smtp-Source: AA0mqf6CM/VR1uireMg7Fxq3HEhrhzGmLWsSC9jN/Dzg4KQHybR1vQPXJSw2qO+isBXPrPgyIaeH X-Received: by 2002:a05:6a20:3c93:b0:a4:63fd:ef1e with SMTP id b19-20020a056a203c9300b000a463fdef1emr33122114pzj.3.1670987715361; Tue, 13 Dec 2022 19:15:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670987715; cv=none; d=google.com; s=arc-20160816; b=gz/PxKepnDA1/4kvyTOlJuof7t03jDRPQ52awXEl0KBsXkbI/hVjkYnijPcRboy9YG fzJS5pjNL0GBX6bXGBufqNwdayYUpg7tmcnckqPntnDm0WGZnosIMbT8qGToPjuKNsN8 03Cjl4u6OVP+D6sTpB1tP/UrJPKwAxCyHvtE0s5CkkKvX/rBY7bUOCntTZhK+yCTbe57 zfJhYTwoSJ8s/BAANHqVMYRw7cu1WIzrN+/OmUCU9+Kgu4OOUMSvgsGY6xeWSoMKHvb9 IgS6a4I2T24XvbknoAyf74rPhLKd2qBdiJZXUZubLomtTCfAWLY18ETcKAErFzVLe6er H/1w== 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; bh=TPPVFAdlSzA3DU//kLDk4xbL/TwLQYERysh14YM9yCA=; b=D9Oe4CztslEm0+i38nl412aoSkAYgtvjuSnOlRSNTJGRLINa4YklA+uJiDYV18pj9z tcnJbtVSr5aJLWQbGBHYzrVoa9bndwAxY9ljfe0jID9Q3gEY/aAYJxDx2u4wAIzhd20p BzPGzOyB3VvqvO1F1DWHj5UqXGYds+pn7OXtWnw9u0bqVHLMg9BR3udusfiy5rMCAVq8 2/04ERqCtuMAlWUeNbt2IACCjw6LoqrEjWag+Bw7tyf4nzlOMr+r3UM8cvRBmtowNcoj GBL7zdLF6hULMa81EtKoSDbKEB51Q+snZ6xIIe7MWW6MP8d61su9K121R6hVE/ZEY2cM RPuQ== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s11-20020a63f04b000000b004785b00c5b7si14454156pgj.143.2022.12.13.19.15.01; Tue, 13 Dec 2022 19:15:15 -0800 (PST) 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237215AbiLNDLT (ORCPT + 99 others); Tue, 13 Dec 2022 22:11:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236646AbiLNDLO (ORCPT ); Tue, 13 Dec 2022 22:11:14 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 038432BEB; Tue, 13 Dec 2022 19:11:14 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4NX0kM3QQwz4f3jMX; Wed, 14 Dec 2022 11:11:07 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP4 (Coremail) with SMTP id gCh0CgDHONbMPpljNSzJCA--.62944S5; Wed, 14 Dec 2022 11:11:10 +0800 (CST) From: Yu Kuai To: paolo.valente@linaro.org, axboe@kernel.dk, tj@kernel.org, josef@toxicpanda.com Cc: linux-block@vger.kernel.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com Subject: [PATCH 1/2] block, bfq: don't return bfqg from __bfq_bic_change_cgroup() Date: Wed, 14 Dec 2022 11:31:54 +0800 Message-Id: <20221214033155.3455754-2-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221214033155.3455754-1-yukuai1@huaweicloud.com> References: <20221214033155.3455754-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgDHONbMPpljNSzJCA--.62944S5 X-Coremail-Antispam: 1UD129KBjvdXoWruFyktFWfZF47tw1UtFyUGFg_yoWkWrg_Aa s5K3W8tryUAFyfJr1qyrnIya92k3y3XwsruF15K3sxXF1DJa95Awnrtr47Wrs5uF48GF9x Zr98Ww4xJF4IqjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb6kFF20E14v26ryj6rWUM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUGwA2048vs2IY02 0Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xv wVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVWxJr0_GcWl84 ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I2 62IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcV AFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG 0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lFIxGxcIEc7CjxVA2Y2ka0xkIwI 1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWU JVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7V AKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j 6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42 IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjfU5SoXUUUUU X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS 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?1752157614475275375?= X-GMAIL-MSGID: =?utf-8?q?1752157614475275375?= From: Yu Kuai The return value is not used, hence remove it. Signed-off-by: Yu Kuai --- block/bfq-cgroup.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c index 627476bc6495..23dc355a106d 100644 --- a/block/bfq-cgroup.c +++ b/block/bfq-cgroup.c @@ -724,9 +724,9 @@ void bfq_bfqq_move(struct bfq_data *bfqd, struct bfq_queue *bfqq, * sure that the reference to cgroup is valid across the call (see * comments in bfq_bic_update_cgroup on this issue) */ -static void *__bfq_bic_change_cgroup(struct bfq_data *bfqd, - struct bfq_io_cq *bic, - struct bfq_group *bfqg) +static void __bfq_bic_change_cgroup(struct bfq_data *bfqd, + struct bfq_io_cq *bic, + struct bfq_group *bfqg) { struct bfq_queue *async_bfqq = bic_to_bfqq(bic, 0); struct bfq_queue *sync_bfqq = bic_to_bfqq(bic, 1); @@ -776,8 +776,6 @@ static void *__bfq_bic_change_cgroup(struct bfq_data *bfqd, } } } - - return bfqg; } void bfq_bic_update_cgroup(struct bfq_io_cq *bic, struct bio *bio) From patchwork Wed Dec 14 03:31:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 33029 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp507810wrn; Tue, 13 Dec 2022 19:14:05 -0800 (PST) X-Google-Smtp-Source: AA0mqf7NE6WMk3flSz2zOOBJbhXviZ/KOd1WCz1vXqzfSQoV+QTpgZ6XCP6BnA39kdfu68FssxM+ X-Received: by 2002:a17:90a:6985:b0:21e:dec6:fc38 with SMTP id s5-20020a17090a698500b0021edec6fc38mr19088394pjj.46.1670987644805; Tue, 13 Dec 2022 19:14:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670987644; cv=none; d=google.com; s=arc-20160816; b=ClNfVtLM73no1hH4vOHhFzfRu1PelhBNRjcxHn1/cYdlOr/LsBVORI9L9X+PsOCJXS a6LWNjRKUMWi4J2kL/y3YB+wNa8lQSKXV5o8oBejonPTt3bnxRfx/RPyhB1AN/OoUZYG BSOj4IUaQWQgZN8+FFlc6LC1/0cO4or2iLCZW63IdwxwjC6+qAxTYko80vhIorcExbtx YthkgUMSbYd6wnx60cswSSyl1SiAmwS25GBcaWuts3rNXnuocQ6o8ChMIRJ6pJ5svb+U kAwm27IAVMHoxAS02OCm0ML4pKboD8CNO3UJH072gDok/wqWxCRiLKdyMs62axrHiwVQ 0X9A== 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; bh=/LdfR69sFmSD1Y5Mo+nKpFF2j5IhJJNTPw91HCuaXLU=; b=B0nR4UDEL5E8bS9w1TflrXt62dVGDSGXnqjqqQG6Zla+GQ8MhU6Gd5ekvHJSTAeCkn VDYL4uSAp8aE0ytrPT7LsmlYTk3TD5ijKyiae6d16yZpwT0sii/p7oV9KOMYFOHyQ6rr YqL9EHSpEAwwUZMosoF5dS83VwZydz79rgNgNMUVtqiAOw9H58mJlxGJ0j788MinaKtN NqPcia19TUwp/EtCaihdmZJR1Yw2fG2df5P7PKTgOxP14NI9c6FQRjg79BvQx6a2Vbeg y+ci0er50vB5gHJJNBVjw/zmVnjP6LdtN2iuTk1u5vDTRfe/zMEGOsvsAc7pQ8eGGF9h 0E8w== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j191-20020a6380c8000000b00478595d02a9si14107432pgd.324.2022.12.13.19.13.50; Tue, 13 Dec 2022 19:14:04 -0800 (PST) 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237230AbiLNDLW (ORCPT + 99 others); Tue, 13 Dec 2022 22:11:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55654 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236626AbiLNDLO (ORCPT ); Tue, 13 Dec 2022 22:11:14 -0500 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5E942AE6; Tue, 13 Dec 2022 19:11:13 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4NX0kN0kgQz4f3pFb; Wed, 14 Dec 2022 11:11:08 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP4 (Coremail) with SMTP id gCh0CgDHONbMPpljNSzJCA--.62944S6; Wed, 14 Dec 2022 11:11:11 +0800 (CST) From: Yu Kuai To: paolo.valente@linaro.org, axboe@kernel.dk, tj@kernel.org, josef@toxicpanda.com Cc: linux-block@vger.kernel.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com Subject: [PATCH 2/2] block, bfq: replace 0/1 with false/true in bic apis Date: Wed, 14 Dec 2022 11:31:55 +0800 Message-Id: <20221214033155.3455754-3-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221214033155.3455754-1-yukuai1@huaweicloud.com> References: <20221214033155.3455754-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgDHONbMPpljNSzJCA--.62944S6 X-Coremail-Antispam: 1UD129KBjvJXoW7KFyUJryrtFWfKFW5Cr1DGFg_yoW8ZFyfp3 ZFqwsruw18Xr4rXr1UG3WqqF1xJ3Z5A34vyFy3X3yavry7WrnFqF4qv348Zrs2grs3CrW3 Zry09ayvqr13GrUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBK14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_Jryl82xGYIkIc2 x26xkF7I0E14v26r4j6ryUM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Cr1j6rxdM2 8EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AI xVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20x vE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xv r2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7M4IIrI8v6xkF7I0E8cxan2IY04 v7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_ Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x 0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8 JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIx AIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUjYiiDUUUUU= = X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS 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?1752157540500719115?= X-GMAIL-MSGID: =?utf-8?q?1752157540500719115?= From: Yu Kuai Just to make the code a litter cleaner, there are no functional changes. Signed-off-by: Yu Kuai --- block/bfq-cgroup.c | 8 ++++---- block/bfq-iosched.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c index 23dc355a106d..1b2829e99dad 100644 --- a/block/bfq-cgroup.c +++ b/block/bfq-cgroup.c @@ -728,15 +728,15 @@ static void __bfq_bic_change_cgroup(struct bfq_data *bfqd, struct bfq_io_cq *bic, struct bfq_group *bfqg) { - struct bfq_queue *async_bfqq = bic_to_bfqq(bic, 0); - struct bfq_queue *sync_bfqq = bic_to_bfqq(bic, 1); + struct bfq_queue *async_bfqq = bic_to_bfqq(bic, false); + struct bfq_queue *sync_bfqq = bic_to_bfqq(bic, true); struct bfq_entity *entity; if (async_bfqq) { entity = &async_bfqq->entity; if (entity->sched_data != &bfqg->sched_data) { - bic_set_bfqq(bic, NULL, 0); + bic_set_bfqq(bic, NULL, false); bfq_release_process_ref(bfqd, async_bfqq); } } @@ -772,7 +772,7 @@ static void __bfq_bic_change_cgroup(struct bfq_data *bfqd, */ bfq_put_cooperator(sync_bfqq); bfq_release_process_ref(bfqd, sync_bfqq); - bic_set_bfqq(bic, NULL, 1); + bic_set_bfqq(bic, NULL, true); } } } diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index b111a7b8dca6..dc576b90ddfe 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -3114,7 +3114,7 @@ bfq_merge_bfqqs(struct bfq_data *bfqd, struct bfq_io_cq *bic, /* * Merge queues (that is, let bic redirect its requests to new_bfqq) */ - bic_set_bfqq(bic, new_bfqq, 1); + bic_set_bfqq(bic, new_bfqq, true); bfq_mark_bfqq_coop(new_bfqq); /* * new_bfqq now belongs to at least two bics (it is a shared queue): @@ -6562,7 +6562,7 @@ bfq_split_bfqq(struct bfq_io_cq *bic, struct bfq_queue *bfqq) return bfqq; } - bic_set_bfqq(bic, NULL, 1); + bic_set_bfqq(bic, NULL, true); bfq_put_cooperator(bfqq);