From patchwork Tue Oct 6 00:05:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Simmons X-Patchwork-Id: 11817917 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DBD7B1752 for ; Tue, 6 Oct 2020 00:07:11 +0000 (UTC) Received: from pdx1-mailman02.dreamhost.com (pdx1-mailman02.dreamhost.com [64.90.62.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B753720760 for ; Tue, 6 Oct 2020 00:07:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B753720760 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lustre-devel-bounces@lists.lustre.org Received: from pdx1-mailman02.dreamhost.com (localhost [IPv6:::1]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id 527A02FA4C3; Mon, 5 Oct 2020 17:06:54 -0700 (PDT) X-Original-To: lustre-devel@lists.lustre.org Delivered-To: lustre-devel-lustre.org@pdx1-mailman02.dreamhost.com Received: from smtp4.ccs.ornl.gov (smtp4.ccs.ornl.gov [160.91.203.40]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id B092D21FDBB for ; Mon, 5 Oct 2020 17:06:32 -0700 (PDT) Received: from star.ccs.ornl.gov (star.ccs.ornl.gov [160.91.202.134]) by smtp4.ccs.ornl.gov (Postfix) with ESMTP id 27EF210087DA; Mon, 5 Oct 2020 20:06:25 -0400 (EDT) Received: by star.ccs.ornl.gov (Postfix, from userid 2004) id 263D82F0E2; Mon, 5 Oct 2020 20:06:25 -0400 (EDT) From: James Simmons To: Andreas Dilger , Oleg Drokin , NeilBrown Date: Mon, 5 Oct 2020 20:05:57 -0400 Message-Id: <1601942781-24950-19-git-send-email-jsimmons@infradead.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1601942781-24950-1-git-send-email-jsimmons@infradead.org> References: <1601942781-24950-1-git-send-email-jsimmons@infradead.org> Subject: [lustre-devel] [PATCH 18/42] lustre: llite: report client stats sumsq X-BeenThere: lustre-devel@lists.lustre.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "For discussing Lustre software development." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wang Shilong , Lustre Development List MIME-Version: 1.0 Errors-To: lustre-devel-bounces@lists.lustre.org Sender: "lustre-devel" From: Wang Shilong Commit 2eeb tries to account sumsq for every client operation, but lprocfs_counter_init() did not init them properly, also add a test case to verify new format of client stats. Fixes: 2eeb6dba81bc ("lustre: obd: add new LPROCFS_TYPE_*") WC-bug-id: https://jira.whamcloud.com/browse/LU-13733 Lustre-commit: 8a1334626ec2f ("LU-13733 llite: report client stats sumsq") Signed-off-by: Wang Shilong Reviewed-on: https://review.whamcloud.com/39223 Reviewed-by: Andreas Dilger Reviewed-by: Emoly Liu Reviewed-by: Patrick Farrell Signed-off-by: James Simmons --- fs/lustre/llite/lproc_llite.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/fs/lustre/llite/lproc_llite.c b/fs/lustre/llite/lproc_llite.c index a742200..54db7eb 100644 --- a/fs/lustre/llite/lproc_llite.c +++ b/fs/lustre/llite/lproc_llite.c @@ -1673,19 +1673,16 @@ int ll_debugfs_register_super(struct super_block *sb, const char *name) /* do counter init */ for (id = 0; id < LPROC_LL_FILE_OPCODES; id++) { u32 type = llite_opcode_table[id].type; - void *ptr = NULL; + void *ptr = "unknown"; if (type & LPROCFS_TYPE_REQS) ptr = "reqs"; else if (type & LPROCFS_TYPE_BYTES) ptr = "bytes"; - else if (type & LPROCFS_TYPE_PAGES) - ptr = "pages"; else if (type & LPROCFS_TYPE_USEC) ptr = "usec"; lprocfs_counter_init(sbi->ll_stats, - llite_opcode_table[id].opcode, - (type & LPROCFS_CNTR_AVGMINMAX), + llite_opcode_table[id].opcode, type, llite_opcode_table[id].opname, ptr); }