From patchwork Fri Aug 4 06:50:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 131030 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:44a:b0:3f2:4152:657d with SMTP id ez10csp130070vqb; Fri, 4 Aug 2023 02:13:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHZU+ZntbK7/4Il0bGfn7yac9yFvF6pRQeOx6n19EbkY0rVIatv8HjmgeLTA/33fgLU2+Mq X-Received: by 2002:a17:907:2c44:b0:99b:57f0:68b5 with SMTP id hf4-20020a1709072c4400b0099b57f068b5mr929445ejc.75.1691140437600; Fri, 04 Aug 2023 02:13:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691140437; cv=none; d=google.com; s=arc-20160816; b=bmapScRwzIQWjBVGv9DN6yevybZcslnn5Zaf+bZMuUDTsXbrxTIvaTHWd4SBC3/URz EY/O3alZrCU6ZPHrALOrg8uBThBTvUQnyQiPWc9VMNCnFgmpadX3Nygn6EBOSAiDSYh3 N/perbOMJAUHvqMn9UaR/5B1J6qZQrJ7fY8cVHAnNPMkK5g+D3txkpIJy/feyOIotAz1 02n5LoSwvARvfI2l9ucVZbFSvf1N46ZB32WC7b5CQ0BpIlnWEqwX/cszH8k5RGq3TQVZ lS04RUL94G5U9nuimjjC9K7+xJ0FvNx03f94qggc/7SXAR/AAbdnd/ZzmySNXquiOuE1 jXxg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=zxLKOBj7wIHNRdSalkXgxfxEOVasPtHv6AvF944bYZE=; fh=trl8IP3/IStrfUzErWPHTQPip+nFa0aNkVvc3yxpI3E=; b=ie0BCstQRT1I8CygQ2RtpsCKBA5K6WqOI1RnpEem44Nl1onbuF/08uZd6Etlk8BzuC OQ5+a5hBPyLFw9KaORITw8Ze3iwXGFFGptDzuJC4nZP9kPJGDQmwKVuIadVb3JOp5IgR 2FzmzGBEajjJcPNPsbo9uco3OHM1V524lZcC+LsFondF2WNqj6bZTDKc+PneDldtmINO LV2cCIyW/yMbarQKJwgPpWqr57HoiRGkB4yT5qh5BoolL0/vs+WNZu89FX3MtoMVxb58 9F4WavfJoKEpjOQN/jooBMTu8yoMTMCFlDnSDGe3ZIV8oazdVJzPuUqj/t4wXPAMRTDR /YGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=mvpRv1+b; 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 i21-20020a170906091500b0099bcec1f1bbsi1301697ejd.182.2023.08.04.02.13.34; Fri, 04 Aug 2023 02:13:57 -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=mvpRv1+b; 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 S233884AbjHDGvp (ORCPT + 99 others); Fri, 4 Aug 2023 02:51:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46126 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233949AbjHDGvT (ORCPT ); Fri, 4 Aug 2023 02:51:19 -0400 Received: from out-118.mta1.migadu.com (out-118.mta1.migadu.com [IPv6:2001:41d0:203:375::76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 260A55248 for ; Thu, 3 Aug 2023 23:50:55 -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=1691131854; 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; bh=zxLKOBj7wIHNRdSalkXgxfxEOVasPtHv6AvF944bYZE=; b=mvpRv1+bRyyifvUHQhFtMF1aGHzLQjXFyxTvOLG+1OCmGKyUN5wltRQBi2683v1N8R0pMd BLqR1EhtekRy4twLO9hfzdbukyI/ftgRrfhhToFBwJQ8nai5u73FuuNR9iYKTf5ZnjtCkh B5q3OUTb6CVz3SOgAxzRw6kb9w9c3hw= From: chengming.zhou@linux.dev To: axboe@kernel.dk, tj@kernel.org Cc: linux-kernel@vger.kernel.org, zhouchengming@bytedance.com Subject: [PATCH 1/3] iocost_monitor: fix kernel queue kobj changes Date: Fri, 4 Aug 2023 14:50:37 +0800 Message-ID: <20230804065039.8885-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,RCVD_IN_DNSWL_BLOCKED, 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: INBOX X-GMAIL-THRID: 1773289275732217759 X-GMAIL-MSGID: 1773289275732217759 From: Chengming Zhou When I use iocost_monitor on nvme0n1, this error shows up: "Could not find ioc for nvme0n1" There is no kobj in struct queue in recent kernel, it seems that the commit 2bd85221a625 ("block: untangle request_queue refcounting from sysfs") move the queue kobj to struct gendisk. Fix it by using mq_kobj which is at the same level with queue kobj. Signed-off-by: Chengming Zhou --- tools/cgroup/iocost_monitor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cgroup/iocost_monitor.py b/tools/cgroup/iocost_monitor.py index 0dbbc67400fc..7aa076cb559e 100644 --- a/tools/cgroup/iocost_monitor.py +++ b/tools/cgroup/iocost_monitor.py @@ -221,7 +221,7 @@ ioc = None for i, ptr in radix_tree_for_each(blkcg_root.blkg_tree.address_of_()): blkg = drgn.Object(prog, 'struct blkcg_gq', address=ptr) try: - if devname == blkg.q.kobj.parent.name.string_().decode('utf-8'): + if devname == blkg.q.mq_kobj.parent.name.string_().decode('utf-8'): q_id = blkg.q.id.value_() if blkg.pd[plid]: root_iocg = container_of(blkg.pd[plid], 'struct ioc_gq', 'pd')