From patchwork Thu Dec 6 18:18:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Valente X-Patchwork-Id: 153052 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp10857251ljp; Thu, 6 Dec 2018 10:18:42 -0800 (PST) X-Google-Smtp-Source: AFSGD/Uz1mZH9ITYyN3V11jtWjfYb1is9hv5YvRoLrWfH+jSslb9Mghhfo3OeD9HwsBEswLUGCo5 X-Received: by 2002:a63:fc05:: with SMTP id j5mr25466853pgi.434.1544120322622; Thu, 06 Dec 2018 10:18:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544120322; cv=none; d=google.com; s=arc-20160816; b=FltGH5Sipib/9zC/AEs/5p+F/yBEEn7XjZ8Eurf5eIDXKwiO66rc1YDBXYONSZXklE ff3Ah1jiWOHLrmHBqoMtg82l4Kt6PfYys/M583XEhxVQk8WdAHpE6RjJAhjjr/UjrfvW jFNDlEAB/2sQq2xZDQS7bMSu4jKsJaFzIuS2eE/o7ZZ0NJZsQyK2NZjVHIP6KAO5xuPY GUXZRtlnpNMom8xAJNKqSLtYvE7KE8537o2LmmFsXFEj5GHZ0yiycpfayCj15Gcxci7m ksy1p2J0C7zo075sGUMjJCP9lAWlyWmPsvsq0uhv3Je1YzyjR45TsSjLUMlOAHOWGzx8 n8KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=RfVPSbe8COb3JfBcyAa/yaISs2N1Qoc4T/gKzQMBMBc=; b=p9xJFSCqiJWE805XTj+jzPfWLB29PSKiePqR09sIwl9FHnmwkYPbBDIU3xwc46KGam VxLlHdQrJrdaWxpyp+EtNTS/otFC4mKgKbIeyqBBdoknWSrfPQio7A4wAaoxFb1PZ7GY REwC9/UA5oRKfTAIkB7uTKpDY3z40ex+6DXz2BrhaaG+gywTrqaT6j6AQAISY/AYH4f3 mXxn9aBbaZzjGKEPRp5322YphBsdVfOMv9fGZGAOqjWaDHEZbCaDUEIkO+4jrdXtTop+ RPVUbLxdLEUAjwGLIwdFYCBxNIDu+GApSG2I5AH0TPy6ydjJbv551N+LdZ/LDlWE5c+1 b1Sw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VA9RMPgO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a90si778787plc.314.2018.12.06.10.18.42; Thu, 06 Dec 2018 10:18:42 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VA9RMPgO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726073AbeLFSSl (ORCPT + 31 others); Thu, 6 Dec 2018 13:18:41 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:40160 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726011AbeLFSSg (ORCPT ); Thu, 6 Dec 2018 13:18:36 -0500 Received: by mail-wr1-f68.google.com with SMTP id p4so1435336wrt.7 for ; Thu, 06 Dec 2018 10:18:34 -0800 (PST) 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=RfVPSbe8COb3JfBcyAa/yaISs2N1Qoc4T/gKzQMBMBc=; b=VA9RMPgOdFcTDws5kwhkDGg5hNmYuVJC8XxTFUhD2NuBAfGrVlVJ9X3hTCG+Smtxlt aLrB59gGuyo15j7yMiWi2NGnls05UYpe1yu0NMBaoC+CkmYSexzCFLVb2y/xQgQTAZf2 Jqb1bhkgP++dxt9tyrlh+X0BufXuK6Lt9L0YM= 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=RfVPSbe8COb3JfBcyAa/yaISs2N1Qoc4T/gKzQMBMBc=; b=fZzU8RM9xAV5iTGNHnSAzyL2kkbK9tJVvGL9pGeJPLrw/5d1sssYbHCGdexOEjLLqt AHR82G1FvTIOI5CMA4L0AEoGca3VO3NEuOdO7A8xmbTligDmVqk4dcGjyfXx/oTJaOTf bQ83pJbUgQIARbBsNViasFZ+4daKESTVtGa6Eaa7/Iw6npMtkF4qw95h9LLUh8oB5pew VdVOxhkxhO8OlF0FYLeUCgwG+2rY7LiOg1mclduz6Q55XNcDgzuixcJBTOt+tLYh743b cS1pKiyQq4hEjdeCVXtjpAIacFNU0Mo4TbqkiJoPfxdOdVNzPNnGDJRbYyKYUDeEo8EM 7iMA== X-Gm-Message-State: AA+aEWb6PB2YCBsI2OnFGVsJFkGuRq6TGlf1yLrRoJhN74/dqZSZX52r i94kokLLEJZeCEnpiPUYijDTEA== X-Received: by 2002:a5d:5607:: with SMTP id l7mr26615236wrv.25.1544120313858; Thu, 06 Dec 2018 10:18:33 -0800 (PST) Received: from localhost.localdomain (146-241-0-214.dyn.eolo.it. [146.241.0.214]) by smtp.gmail.com with ESMTPSA id w18sm727733wru.54.2018.12.06.10.18.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Dec 2018 10:18:33 -0800 (PST) From: Paolo Valente To: Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, ulf.hansson@linaro.org, linus.walleij@linaro.org, broonie@kernel.org, bfq-iosched@googlegroups.com, oleksandr@natalenko.name, federico@willer.it, Paolo Valente Subject: [PATCH BUGFIX 2/2] block, bfq: fix comments on __bfq_deactivate_entity Date: Thu, 6 Dec 2018 19:18:19 +0100 Message-Id: <20181206181819.11148-3-paolo.valente@linaro.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20181206181819.11148-1-paolo.valente@linaro.org> References: <20181206181819.11148-1-paolo.valente@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Comments on function __bfq_deactivate_entity contains two imprecise or wrong statements: 1) The function performs the deactivation of the entity. 2) The function must be invoked only if the entity is on a service tree. This commits replaces both statements with the correct ones: 1) The functions updates sched_data and service trees for the entity, so as to represent entity as inactive (which is only part of the steps needed for the deactivation of the entity). 2) The function must be invoked on every entity being deactivated. Signed-off-by: Paolo Valente --- block/bfq-wf2q.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) -- 2.16.1 diff --git a/block/bfq-wf2q.c b/block/bfq-wf2q.c index 63e0f12be7c9..72adbbe975d5 100644 --- a/block/bfq-wf2q.c +++ b/block/bfq-wf2q.c @@ -1154,15 +1154,14 @@ static void bfq_activate_requeue_entity(struct bfq_entity *entity, } /** - * __bfq_deactivate_entity - deactivate an entity from its service tree. - * @entity: the entity to deactivate. + * __bfq_deactivate_entity - update sched_data and service trees for + * entity, so as to represent entity as inactive + * @entity: the entity being deactivated. * @ins_into_idle_tree: if false, the entity will not be put into the * idle tree. * - * Deactivates an entity, independently of its previous state. Must - * be invoked only if entity is on a service tree. Extracts the entity - * from that tree, and if necessary and allowed, puts it into the idle - * tree. + * If necessary and allowed, puts entity into the idle tree. NOTE: + * entity may be on no tree if in service. */ bool __bfq_deactivate_entity(struct bfq_entity *entity, bool ins_into_idle_tree) {