From patchwork Tue May 26 11:03:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emanuele Giuseppe Esposito X-Patchwork-Id: 218546 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8235C433DF for ; Tue, 26 May 2020 11:04:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BD78120899 for ; Tue, 26 May 2020 11:04:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="HUNhtVuW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388902AbgEZLEC (ORCPT ); Tue, 26 May 2020 07:04:02 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:30634 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2388903AbgEZLEA (ORCPT ); Tue, 26 May 2020 07:04:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590491036; 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=tHhJ8BBQRZ0iPlyD+IrpnOZUd0hkhRFRJvdSxd1ueEk=; b=HUNhtVuWCWZ8k8s/3pL1Gqg70H2VI46jkebIQOqyU86ICeTgjoRdUy/72k2VbjR1Yyy2PL ENRs5H86dO2/OTju1nSCAARaAo0R4FqBooWS5NgP+p5ATepaQJf748ipoJ5Yo16+x6H+DZ CrgPjHDZLuoceBTJJfRzSPI4eFewWvM= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-384-xrS2zvHXMaW3yvxmWuet2Q-1; Tue, 26 May 2020 07:03:54 -0400 X-MC-Unique: xrS2zvHXMaW3yvxmWuet2Q-1 Received: by mail-wr1-f72.google.com with SMTP id w16so1454975wru.18 for ; Tue, 26 May 2020 04:03:54 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=tHhJ8BBQRZ0iPlyD+IrpnOZUd0hkhRFRJvdSxd1ueEk=; b=nEYxtjfku0iTDrJ3lfp7NhcU0W/82gVWy1e8JI6G1hZbm83Loyi1dvQCCyfatkChAE DMbu4ZK+ETEaWGB50sUO/2YnGDE6nD2oIhuJ6HMnjbScPCsXPqKPdicrP2ncmfqE7m2w wUu/YjLgkBlW+ujHKsiMUH7uCwZY3jruMepleOQKYaWGbCRJ/5sxAzyA2h3llDpj1OF3 FxYfDQoNbAmivMlda4mTpDvZSvyT7iU6QX4dldOFnifapJr7MajOyUyfImp2Tf3oVVgp perKjc3Ta4RWuY/HSjfcZ3KyeWP/hstGS7mYAEJ9MmcCVj40pgRB/io2CHzj0nH4XRAl cIkQ== X-Gm-Message-State: AOAM531oI8EQa0XGagQWQTOp0gYBDF0bZG0qcPiFoeR1lO5+7P61qKCo azoBPH62YpOHxeDEgS+3xpW//Qp68gTPm8xnJlW30zFGxZXfadMnRc9QPFjARR8nHvoZIhYl/l0 L2SGCW+j0sKOjeQCJ X-Received: by 2002:a5d:6145:: with SMTP id y5mr18412212wrt.195.1590491031226; Tue, 26 May 2020 04:03:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwOY0Un9v5V7lkYHdpZvdgxIzFdEx42az92mapDCM2lLdpSXBwr8ImUoRA4WoT7/mpKmTjABA== X-Received: by 2002:a5d:6145:: with SMTP id y5mr18412163wrt.195.1590491030475; Tue, 26 May 2020 04:03:50 -0700 (PDT) Received: from localhost.localdomain.com ([194.230.155.118]) by smtp.gmail.com with ESMTPSA id d6sm22928240wrj.90.2020.05.26.04.03.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 04:03:44 -0700 (PDT) From: Emanuele Giuseppe Esposito To: kvm@vger.kernel.org Cc: Christian Borntraeger , Paolo Bonzini , Jim Mattson , Alexander Viro , Emanuele Giuseppe Esposito , David Rientjes , Jonathan Adams , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, kvm-ppc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-fsdevel@vger.kernel.org, netdev@vger.kernel.org, Emanuele Giuseppe Esposito Subject: [PATCH v3 1/7] stats_fs API: create, add and remove stats_fs sources and values Date: Tue, 26 May 2020 13:03:11 +0200 Message-Id: <20200526110318.69006-2-eesposit@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200526110318.69006-1-eesposit@redhat.com> References: <20200526110318.69006-1-eesposit@redhat.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Introduction to the stats_fs API, that allows to easily create, add and remove stats_fs sources and values. The API allows to easily building the statistics directory tree to automatically gather them for the linux kernel. The main functionalities are: create a source, add child sources/values/aggregates, register it to the root source (that on the virtual fs would be /sys/kernel/stats), ad perform a search for a value/aggregate. Each source and value has an optional flag parameter: in a value, it represent whether the statistic is cumulative or floating, in a source whether it should be visible from the filesystem or not. Defaults are respectively cumulative and visible. Both flags fields are represented as an uint32_t to offer portability for future flags. Each value also takes a struct stats_fs_type pointer that defines get and clear function for that stat, allowing custom types handling. The API also provides default get and clear types for the supported standard types (stats_fs_type_*). The API representation is only logical and will be backed up by a virtual file system in patch 4. Its usage will be shared between the stats_fs file system and the end-users like kvm, the former calling it when it needs to display and clear statistics, the latter to add values and sources. Signed-off-by: Emanuele Giuseppe Esposito --- MAINTAINERS | 7 + fs/Kconfig | 14 + fs/Makefile | 1 + fs/stats_fs/Makefile | 5 + fs/stats_fs/internal.h | 19 ++ fs/stats_fs/stats_fs.c | 552 +++++++++++++++++++++++++++++++++++++++ fs/stats_fs/stub.c | 13 + include/linux/stats_fs.h | 363 +++++++++++++++++++++++++ 8 files changed, 974 insertions(+) create mode 100644 fs/stats_fs/Makefile create mode 100644 fs/stats_fs/internal.h create mode 100644 fs/stats_fs/stats_fs.c create mode 100644 fs/stats_fs/stub.c create mode 100644 include/linux/stats_fs.h diff --git a/MAINTAINERS b/MAINTAINERS index b816a453b10e..a8403d07cee5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5229,6 +5229,13 @@ F: include/linux/debugfs.h F: include/linux/kobj* F: lib/kobj* +STATS_FS +M: Paolo Bonzini +R: Emanuele Giuseppe Esposito +S: Supported +F: include/linux/stats_fs.h +F: fs/stats_fs + DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS) M: Kevin Hilman M: Nishanth Menon diff --git a/fs/Kconfig b/fs/Kconfig index f08fbbfafd9a..684ad61129ab 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -221,6 +221,20 @@ config MEMFD_CREATE config ARCH_HAS_GIGANTIC_PAGE bool +config STATS_FS + bool "Statistics Filesystem" + help + stats_fs is a virtual file system that provides counters and + other statistics about the running kernel. + +config STATS_FS_API + bool + imply STATS_FS + +config STATS_FS_STUB + bool + default y if STATS_FS_API && !STATS_FS + source "fs/configfs/Kconfig" source "fs/efivarfs/Kconfig" diff --git a/fs/Makefile b/fs/Makefile index 2ce5112b02c8..91558eca0cf7 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -125,6 +125,7 @@ obj-$(CONFIG_BEFS_FS) += befs/ obj-$(CONFIG_HOSTFS) += hostfs/ obj-$(CONFIG_CACHEFILES) += cachefiles/ obj-$(CONFIG_DEBUG_FS) += debugfs/ +obj-$(CONFIG_STATS_FS) += stats_fs/ obj-$(CONFIG_TRACING) += tracefs/ obj-$(CONFIG_OCFS2_FS) += ocfs2/ obj-$(CONFIG_BTRFS_FS) += btrfs/ diff --git a/fs/stats_fs/Makefile b/fs/stats_fs/Makefile new file mode 100644 index 000000000000..bd988daa4c39 --- /dev/null +++ b/fs/stats_fs/Makefile @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-only +stats_fs-objs := stats_fs.o + +obj-$(CONFIG_STATS_FS) += stats_fs.o +obj-$(CONFIG_STATS_FS_STUB) += stub.o diff --git a/fs/stats_fs/internal.h b/fs/stats_fs/internal.h new file mode 100644 index 000000000000..4993afbb1e45 --- /dev/null +++ b/fs/stats_fs/internal.h @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _STATS_FS_INTERNAL_H_ +#define _STATS_FS_INTERNAL_H_ + +#include +#include +#include +#include + +/* values, grouped by base */ +struct stats_fs_value_source { + void *base_addr; + bool files_created; + uint32_t common_flags; + struct stats_fs_value *values; + struct list_head list_element; +}; + +#endif /* _STATS_FS_INTERNAL_H_ */ diff --git a/fs/stats_fs/stats_fs.c b/fs/stats_fs/stats_fs.c new file mode 100644 index 000000000000..b76ee44f6dac --- /dev/null +++ b/fs/stats_fs/stats_fs.c @@ -0,0 +1,552 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "internal.h" + +struct stats_fs_aggregate_value { + uint64_t sum, min, max; + uint32_t count, count_zero; +}; + +#define STATS_FS_DEFINE_TYPE_STRUCT(gtype, stype, si) \ + const struct stats_fs_type stats_fs_type_##gtype = \ + { \ + .get = stats_fs_get_##gtype, \ + .clear = stats_fs_clear_##stype, \ + .sign = si, \ + }; \ + EXPORT_SYMBOL_GPL(stats_fs_type_##gtype); + +#define STATS_FS_TYPE_STRUCT_US(len) \ + STATS_FS_DEFINE_TYPE_STRUCT(u##len, len, false) \ + STATS_FS_DEFINE_TYPE_STRUCT(s##len, len, true) + +#define STATS_FS_TYPE_STRUCT(type) \ + STATS_FS_DEFINE_TYPE_STRUCT(type, type, false) + +STATS_FS_TYPE_STRUCT_US(8) +STATS_FS_TYPE_STRUCT_US(16) +STATS_FS_TYPE_STRUCT_US(32) +STATS_FS_TYPE_STRUCT_US(64) +STATS_FS_TYPE_STRUCT(bool) + +static int is_val_signed(struct stats_fs_value *val) +{ + return val->type->sign; +} + +static struct stats_fs_value *find_value(struct stats_fs_value_source *src, + struct stats_fs_value *val) +{ + struct stats_fs_value *entry; + + for (entry = src->values; entry->name; entry++) { + if (entry == val) + return entry; + } + return NULL; +} + +static struct stats_fs_value * +search_value_in_source(struct stats_fs_source *src, struct stats_fs_value *arg, + struct stats_fs_value_source **val_src) +{ + struct stats_fs_value *entry; + struct stats_fs_value_source *src_entry; + + list_for_each_entry (src_entry, &src->values_head, list_element) { + entry = find_value(src_entry, arg); + if (entry) { + *val_src = src_entry; + return entry; + } + } + + return NULL; +} + +/* Called with rwsem held for writing */ +static struct stats_fs_value_source *create_value_source(void *base, uint32_t flags) +{ + struct stats_fs_value_source *val_src; + + val_src = kzalloc(sizeof(struct stats_fs_value_source), GFP_KERNEL); + if (!val_src) + return ERR_PTR(-ENOMEM); + + val_src->base_addr = base; + val_src->common_flags = flags; + INIT_LIST_HEAD(&val_src->list_element); + + return val_src; +} + +int stats_fs_source_add_values(struct stats_fs_source *source, + struct stats_fs_value *stat, void *ptr, + uint32_t flags) +{ + struct stats_fs_value_source *val_src; + struct stats_fs_value_source *entry; + + down_write(&source->rwsem); + + list_for_each_entry (entry, &source->values_head, list_element) { + if (entry->base_addr == ptr && entry->values == stat) { + up_write(&source->rwsem); + return -EEXIST; + } + } + + val_src = create_value_source(ptr, flags); + val_src->values = (struct stats_fs_value *)stat; + + /* add the val_src to the source list */ + list_add(&val_src->list_element, &source->values_head); + + up_write(&source->rwsem); + + return 0; +} +EXPORT_SYMBOL_GPL(stats_fs_source_add_values); + +void stats_fs_source_add_subordinate(struct stats_fs_source *source, + struct stats_fs_source *sub) +{ + down_write(&source->rwsem); + + stats_fs_source_get(sub); + list_add(&sub->list_element, &source->subordinates_head); + + up_write(&source->rwsem); +} +EXPORT_SYMBOL_GPL(stats_fs_source_add_subordinate); + +/* Called with rwsem held for writing */ +static void +stats_fs_source_remove_subordinate_locked(struct stats_fs_source *source, + struct stats_fs_source *sub) +{ + struct stats_fs_source *src_entry; + + list_for_each_entry (src_entry, &source->subordinates_head, + list_element) { + if (src_entry == sub) { + list_del_init(&src_entry->list_element); + stats_fs_source_put(src_entry); + return; + } + } +} + +void stats_fs_source_remove_subordinate(struct stats_fs_source *source, + struct stats_fs_source *sub) +{ + down_write(&source->rwsem); + stats_fs_source_remove_subordinate_locked(source, sub); + up_write(&source->rwsem); +} +EXPORT_SYMBOL_GPL(stats_fs_source_remove_subordinate); + +/* Called with rwsem held for reading */ +static uint64_t get_simple_value(struct stats_fs_value_source *src, + struct stats_fs_value *val) +{ + if (val->type->get) + return val->type->get(val, src->base_addr); + return 0; +} + +/* Called with rwsem held for reading */ +static void +search_all_simple_values(struct stats_fs_source *src, + struct stats_fs_value_source *ref_src_entry, + struct stats_fs_value *val, + struct stats_fs_aggregate_value *agg) +{ + struct stats_fs_value_source *src_entry; + uint64_t value_found; + + list_for_each_entry (src_entry, &src->values_head, list_element) { + /* skip aggregates */ + if (src_entry->base_addr == NULL) + continue; + + /* useless to search here */ + if (src_entry->values != ref_src_entry->values) + continue; + + /* must be here */ + value_found = get_simple_value(src_entry, val); + + agg->sum += value_found; + agg->count++; + agg->count_zero += (value_found == 0); + + if (is_val_signed(val)) { + agg->max = (((int64_t)value_found) >= + ((int64_t)agg->max)) ? + value_found : + agg->max; + agg->min = (((int64_t)value_found) <= + ((int64_t)agg->min)) ? + value_found : + agg->min; + } else { + agg->max = (value_found >= agg->max) ? value_found : + agg->max; + agg->min = (value_found <= agg->min) ? value_found : + agg->min; + } + } +} + +/* Called with rwsem held for reading */ +static void +do_recursive_aggregation(struct stats_fs_source *root, + struct stats_fs_value_source *ref_src_entry, + struct stats_fs_value *val, + struct stats_fs_aggregate_value *agg) +{ + struct stats_fs_source *subordinate; + + /* search all simple values in this folder */ + search_all_simple_values(root, ref_src_entry, val, agg); + + /* recursively search in all subfolders */ + list_for_each_entry (subordinate, &root->subordinates_head, + list_element) { + down_read(&subordinate->rwsem); + do_recursive_aggregation(subordinate, ref_src_entry, val, agg); + up_read(&subordinate->rwsem); + } +} + +/* Called with rwsem held for reading */ +static void init_aggregate_value(struct stats_fs_aggregate_value *agg, + struct stats_fs_value *val) +{ + agg->count = agg->count_zero = agg->sum = 0; + if (is_val_signed(val)) { + agg->max = S64_MIN; + agg->min = S64_MAX; + } else { + agg->max = 0; + agg->min = U64_MAX; + } +} + +/* Called with rwsem held for reading */ +static void store_final_value(struct stats_fs_aggregate_value *agg, + struct stats_fs_value *val, uint64_t *ret) +{ + switch (val->aggr_kind) { + case STATS_FS_AVG:{ + if (is_val_signed(val)) + *ret = agg->count ? ((int64_t)agg->sum) / agg->count : 0; + else + *ret = agg->count ? agg->sum / agg->count : 0; + break; + } + case STATS_FS_SUM: + *ret = agg->sum; + break; + case STATS_FS_MIN: + *ret = agg->min; + break; + case STATS_FS_MAX: + *ret = agg->max; + break; + case STATS_FS_COUNT_ZERO: + *ret = agg->count_zero; + break; + default: + break; + } +} + +/* Called with rwsem held for reading */ +static int stats_fs_source_get_value_locked(struct stats_fs_source *source, + struct stats_fs_value *arg, + uint64_t *ret) +{ + struct stats_fs_value_source *src_entry; + struct stats_fs_value *found; + struct stats_fs_aggregate_value aggr; + + *ret = 0; + + if (!arg) + return -ENOENT; + + /* look in simple values */ + found = search_value_in_source(source, arg, &src_entry); + + if (!found) { + printk(KERN_ERR "Stats_fs: Value in source \"%s\" not found!\n", + source->name); + return -ENOENT; + } + + if (src_entry->base_addr != NULL) { + *ret = get_simple_value(src_entry, found); + return 0; + } + + /* look in aggregates */ + init_aggregate_value(&aggr, found); + do_recursive_aggregation(source, src_entry, found, &aggr); + store_final_value(&aggr, found, ret); + + return 0; +} + +int stats_fs_source_get_value(struct stats_fs_source *source, + struct stats_fs_value *arg, uint64_t *ret) +{ + int retval; + + down_read(&source->rwsem); + retval = stats_fs_source_get_value_locked(source, arg, ret); + up_read(&source->rwsem); + + return retval; +} +EXPORT_SYMBOL_GPL(stats_fs_source_get_value); + +/* Called with rwsem held for reading */ +static void set_all_simple_values(struct stats_fs_source *src, + struct stats_fs_value_source *ref_src_entry, + struct stats_fs_value *val) +{ + struct stats_fs_value_source *src_entry; + + list_for_each_entry (src_entry, &src->values_head, list_element) { + /* skip aggregates */ + if (src_entry->base_addr == NULL) + continue; + + /* wrong to search here */ + if (src_entry->values != ref_src_entry->values) + continue; + + if (src_entry->base_addr && + src_entry->values == ref_src_entry->values && + val->type->clear) + val->type->clear(val, src_entry->base_addr); + } +} + +/* Called with rwsem held for reading */ +static void do_recursive_clean(struct stats_fs_source *root, + struct stats_fs_value_source *ref_src_entry, + struct stats_fs_value *val) +{ + struct stats_fs_source *subordinate; + + /* search all simple values in this folder */ + set_all_simple_values(root, ref_src_entry, val); + + /* recursively search in all subfolders */ + list_for_each_entry (subordinate, &root->subordinates_head, + list_element) { + down_read(&subordinate->rwsem); + do_recursive_clean(subordinate, ref_src_entry, val); + up_read(&subordinate->rwsem); + } +} + +/* Called with rwsem held for reading */ +static int stats_fs_source_clear_locked(struct stats_fs_source *source, + struct stats_fs_value *val) +{ + struct stats_fs_value_source *src_entry; + struct stats_fs_value *found; + + if (!val) + return -ENOENT; + + /* look in simple values */ + found = search_value_in_source(source, val, &src_entry); + + if (!found) { + printk(KERN_ERR "Stats_fs: Value in source \"%s\" not found!\n", + source->name); + return -ENOENT; + } + + if (!(stats_fs_val_get_mode(val) & 0222)) + return -EPERM; + + if (src_entry->base_addr != NULL && found->type->clear) { + found->type->clear(found, src_entry->base_addr); + return 0; + } + + /* look in aggregates */ + do_recursive_clean(source, src_entry, found); + + return 0; +} + +int stats_fs_source_clear(struct stats_fs_source *source, + struct stats_fs_value *val) +{ + int retval; + + down_read(&source->rwsem); + retval = stats_fs_source_clear_locked(source, val); + up_read(&source->rwsem); + + return retval; +} + +/* Called with rwsem held for reading */ +static struct stats_fs_value * +find_value_by_name(struct stats_fs_value_source *src, char *val) +{ + struct stats_fs_value *entry; + + for (entry = src->values; entry->name; entry++) + if (!strcmp(entry->name, val)) + return entry; + + return NULL; +} + +/* Called with rwsem held for reading */ +static struct stats_fs_value * +search_in_source_by_name(struct stats_fs_source *src, char *name) +{ + struct stats_fs_value *entry; + struct stats_fs_value_source *src_entry; + + list_for_each_entry (src_entry, &src->values_head, list_element) { + entry = find_value_by_name(src_entry, name); + if (entry) + return entry; + } + + return NULL; +} + +int stats_fs_source_get_value_by_name(struct stats_fs_source *source, + char *name, uint64_t *ret) +{ + struct stats_fs_value *val; + int retval; + + down_read(&source->rwsem); + val = search_in_source_by_name(source, name); + + if (!val) { + *ret = 0; + up_read(&source->rwsem); + return -ENOENT; + } + + retval = stats_fs_source_get_value_locked(source, val, ret); + up_read(&source->rwsem); + + return retval; +} +EXPORT_SYMBOL_GPL(stats_fs_source_get_value_by_name); + +void stats_fs_source_get(struct stats_fs_source *source) +{ + kref_get(&source->refcount); +} +EXPORT_SYMBOL_GPL(stats_fs_source_get); + +void stats_fs_source_revoke(struct stats_fs_source *source) +{ + struct stats_fs_value_source *val_src_entry; + + down_write(&source->rwsem); + + list_for_each_entry (val_src_entry, &source->values_head, list_element) + val_src_entry->base_addr = NULL; + + up_write(&source->rwsem); +} +EXPORT_SYMBOL_GPL(stats_fs_source_revoke); + +/* Called with rwsem held for writing + * + * The refcount is 0 and the lock was taken before refcount + * went from 1 to 0 + */ +static void stats_fs_source_destroy(struct kref *kref_source) +{ + struct stats_fs_value_source *val_src_entry; + struct list_head *it, *safe; + struct stats_fs_source *child, *source; + + source = container_of(kref_source, struct stats_fs_source, refcount); + + /* iterate through the values and delete them */ + list_for_each_safe (it, safe, &source->values_head) { + val_src_entry = list_entry(it, struct stats_fs_value_source, + list_element); + kfree(val_src_entry); + } + + /* iterate through the subordinates and delete them */ + list_for_each_safe (it, safe, &source->subordinates_head) { + child = list_entry(it, struct stats_fs_source, list_element); + stats_fs_source_remove_subordinate_locked(source, child); + } + + up_write(&source->rwsem); + kfree(source->name); + kfree(source); +} + +void stats_fs_source_put(struct stats_fs_source *source) +{ + kref_put_rwsem(&source->refcount, stats_fs_source_destroy, + &source->rwsem); +} +EXPORT_SYMBOL_GPL(stats_fs_source_put); + +struct stats_fs_source *stats_fs_source_create(uint32_t flags, const char *fmt, ...) +{ + va_list ap; + char buf[100]; + struct stats_fs_source *ret; + int char_needed; + + va_start(ap, fmt); + char_needed = vsnprintf(buf, 100, fmt, ap); + va_end(ap); + + ret = kzalloc(sizeof(struct stats_fs_source), GFP_KERNEL); + if (!ret) + return ERR_PTR(-ENOMEM); + + ret->name = kstrdup(buf, GFP_KERNEL); + if (!ret->name) { + kfree(ret); + return ERR_PTR(-ENOMEM); + } + + ret->common_flags = flags; + + kref_init(&ret->refcount); + init_rwsem(&ret->rwsem); + + INIT_LIST_HEAD(&ret->values_head); + INIT_LIST_HEAD(&ret->subordinates_head); + INIT_LIST_HEAD(&ret->list_element); + + return ret; +} +EXPORT_SYMBOL_GPL(stats_fs_source_create); diff --git a/fs/stats_fs/stub.c b/fs/stats_fs/stub.c new file mode 100644 index 000000000000..0843b58ad3be --- /dev/null +++ b/fs/stats_fs/stub.c @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +const struct stats_fs_type stats_fs_type_stub; diff --git a/include/linux/stats_fs.h b/include/linux/stats_fs.h new file mode 100644 index 000000000000..93847383f597 --- /dev/null +++ b/include/linux/stats_fs.h @@ -0,0 +1,363 @@ +/* SPDX-License-Identifier: GPL-2.0 + * + * stats_fs.h - a tiny little statistics file system + * + * Copyright (C) 2020 Emanuele Giuseppe Esposito + * Copyright (C) 2020 Redhat. + * + */ + +#ifndef _STATS_FS_H_ +#define _STATS_FS_H_ + +#include + +enum stat_aggr { + STATS_FS_NONE = 0, + STATS_FS_SUM, + STATS_FS_MIN, + STATS_FS_MAX, + STATS_FS_COUNT_ZERO, + STATS_FS_AVG, +}; + +/* flags used by source and internal source_value structure */ +enum source_value_common_flags { + STATS_FS_HIDDEN = 0x1, +}; + +enum stat_fs_value_flag { + STATS_FS_FLOATING_VALUE = 0x1, +}; + +struct stats_fs_value; + +struct stats_fs_type { + uint64_t (*get)(struct stats_fs_value *, void *); + void (*clear)(struct stats_fs_value *, void *); + bool sign; +}; + +struct stats_fs_value { + /* Name of the stat */ + char *name; + + /* Offset from base address to field containing the value */ + int offset; + + /* Type of the stat BOOL,U64,... */ + const struct stats_fs_type *type; + + /* Aggregate type: MIN, MAX, SUM,... */ + enum stat_aggr aggr_kind; + + uint32_t value_flag; +}; + +struct stats_fs_source { + struct kref refcount; + + char *name; + + uint32_t common_flags; + + /* list of source stats_fs_value_source*/ + struct list_head values_head; + + /* list of struct stats_fs_source for subordinate sources */ + struct list_head subordinates_head; + + struct list_head list_element; + + struct rw_semaphore rwsem; + + struct dentry *source_dentry; +}; + +static inline int stats_fs_val_get_mode(struct stats_fs_value *val) +{ + return (val->value_flag & STATS_FS_FLOATING_VALUE || !val->type->clear) + ? 0444 : 0644; +} + +#define STATS_FS_DEFINE_GET(name, type) \ + static inline uint64_t stats_fs_get_##name(struct stats_fs_value *val, \ + void *base) \ + { \ + return *((type *)(base + (uintptr_t)val->offset)); \ + } + +#define STATS_FS_DEFINE_CLEAR(name, type) \ + static inline void stats_fs_clear_##name(struct stats_fs_value *val, \ + void *base) \ + { \ + *((type *)(base + (uintptr_t)val->offset)) = 0; \ + } + +#define STATS_FS_DEFINE_FUNCT_US(len) \ + STATS_FS_DEFINE_GET(u##len, u##len) \ + STATS_FS_DEFINE_GET(s##len, s##len) \ + STATS_FS_DEFINE_CLEAR(len, u##len) + +#define STATS_FS_DEFINE_FUNCT(type) \ + STATS_FS_DEFINE_GET(type, type) \ + STATS_FS_DEFINE_CLEAR(type, type) + +STATS_FS_DEFINE_FUNCT_US(8) +STATS_FS_DEFINE_FUNCT_US(16) +STATS_FS_DEFINE_FUNCT_US(32) +STATS_FS_DEFINE_FUNCT_US(64) +STATS_FS_DEFINE_FUNCT(bool) + +#undef STATS_FS_DEFINE_FUNCT +#undef STATS_FS_DEFINE_FUNCT_US +#undef STATS_FS_DEFINE_GET +#undef STATS_FS_DEFINE_CLEAR + +#if defined(CONFIG_STATS_FS) + +extern const struct stats_fs_type stats_fs_type_u8; +extern const struct stats_fs_type stats_fs_type_s8; +extern const struct stats_fs_type stats_fs_type_u16; +extern const struct stats_fs_type stats_fs_type_s16; +extern const struct stats_fs_type stats_fs_type_u32; +extern const struct stats_fs_type stats_fs_type_s32; +extern const struct stats_fs_type stats_fs_type_u64; +extern const struct stats_fs_type stats_fs_type_s64; +extern const struct stats_fs_type stats_fs_type_bool; + +/** + * stats_fs_source_create - create a stats_fs_source + * @flags: an integer containing all source flags (STATS_FS_HIDDEN, ...) + * @fmt: source name format + * + * Creates a stats_fs_source with the given name. This + * does not mean it will be backed by the filesystem yet, it will only + * be visible to the user once one of its parents (or itself) are + * registered in stats_fs. + * + * Returns a pointer to a stats_fs_source if it succeeds. + * This or one of the parents' pointer must be passed to the stats_fs_put() + * function when the file is to be removed. If an error occurs, + * ERR_PTR(-ERROR) will be returned. + */ +struct stats_fs_source *stats_fs_source_create(uint32_t flags, const char *fmt, + ...); + +/** + * stats_fs_source_add_values - adds values to the given source + * @source: a pointer to the source that will receive the values + * @val: a pointer to the NULL terminated stats_fs_value array to add + * @base_ptr: a pointer to the base pointer used by these values + * @flags: an integer containing common value flags (STATS_FS_HIDDEN, ...) + * + * In addition to adding values to the source, also create the + * files in the filesystem if the source already is backed up by a directory. + * + * Returns 0 it succeeds. If the value are already in the + * source and have the same base_ptr, -EEXIST is returned. + */ +int stats_fs_source_add_values(struct stats_fs_source *source, + struct stats_fs_value *val, void *base_ptr, + uint32_t flags); + +/** + * stats_fs_source_add_subordinate - adds a child to the given source + * @parent: a pointer to the parent source + * @child: a pointer to child source to add + * + * Recursively create all files in the stats_fs filesystem + * only if the parent has already a dentry (created with + * stats_fs_source_register). + * This avoids the case where this function is called before register. + */ +void stats_fs_source_add_subordinate(struct stats_fs_source *parent, + struct stats_fs_source *child); + +/** + * stats_fs_source_remove_subordinate - removes a child from the given source + * @parent: a pointer to the parent source + * @child: a pointer to child source to remove + * + * Look if there is such child in the parent. If so, + * it will remove all its files and call stats_fs_put on the child. + */ +void stats_fs_source_remove_subordinate(struct stats_fs_source *parent, + struct stats_fs_source *child); + +/** + * stats_fs_source_get_value - search a value in the source (and + * subordinates) + * @source: a pointer to the source that will be searched + * @val: a pointer to the stats_fs_value to search + * @ret: a pointer to the uint64_t that will hold the found value + * + * Look up in the source if a value with same value pointer + * exists. + * If not, it will return -ENOENT. If it exists and it's a simple value + * (not an aggregate), the value that it points to will be returned. + * If it exists and it's an aggregate (aggr_type != STATS_FS_NONE), all + * subordinates will be recursively searched and every simple value match + * will be used to aggregate the final result. For example if it's a sum, + * all suboordinates having the same value will be sum together. + * + * This function will return 0 it succeeds. + */ +int stats_fs_source_get_value(struct stats_fs_source *source, + struct stats_fs_value *val, uint64_t *ret); + +/** + * stats_fs_source_get_value_by_name - search a value in the source (and + * subordinates) + * @source: a pointer to the source that will be searched + * @name: a pointer to the string representing the value to search + * (for example "exits") + * @ret: a pointer to the uint64_t that will hold the found value + * + * Same as stats_fs_source_get_value, but initially the name is used + * to search in the given source if there is a value with a matching + * name. If so, stats_fs_source_get_value will be called with the found + * value, otherwise -ENOENT will be returned. + */ +int stats_fs_source_get_value_by_name(struct stats_fs_source *source, + char *name, uint64_t *ret); + +/** + * stats_fs_source_clear - search and clears a value in the source (and + * subordinates) + * @source: a pointer to the source that will be searched + * @val: a pointer to the stats_fs_value to search + * + * Look up in the source if a value with same value pointer + * exists. + * If not, it will return -ENOENT. If it exists and it's a simple value + * (not an aggregate), the value that it points to will be set to 0. + * If it exists and it's an aggregate (aggr_type != STATS_FS_NONE), all + * subordinates will be recursively searched and every simple value match + * will be set to 0. + * + * This function will return 0 it succeeds. + */ +int stats_fs_source_clear(struct stats_fs_source *source, + struct stats_fs_value *val); + +/** + * stats_fs_source_revoke - disconnect the source from its backing data + * @source: a pointer to the source that will be revoked + * + * Ensure that stats_fs will not access the data that were passed to + * stats_fs_source_add_value for this source. + * + * Because open files increase the reference count for a stats_fs_source, + * the source can end up living longer than the data that provides the + * values for the source. Calling stats_fs_source_revoke just before the + * backing data is freed avoids accesses to freed data structures. The + * sources will return 0. + */ +void stats_fs_source_revoke(struct stats_fs_source *source); + +/** + * stats_fs_source_get - increases refcount of source + * @source: a pointer to the source whose refcount will be increased + */ +void stats_fs_source_get(struct stats_fs_source *source); + +/** + * stats_fs_source_put - decreases refcount of source and deletes if needed + * @source: a pointer to the source whose refcount will be decreased + * + * If refcount arrives to zero, take care of deleting + * and free the source resources and files, by firstly recursively calling + * stats_fs_source_remove_subordinate to the child and then deleting + * its own files and allocations. + */ +void stats_fs_source_put(struct stats_fs_source *source); + +/** + * stats_fs_initialized - returns true if stats_fs fs has been registered + */ +bool stats_fs_initialized(void); + +#else + +#include + +#define stats_fs_type_u8 stats_fs_type_stub +#define stats_fs_type_s8 stats_fs_type_stub +#define stats_fs_type_u16 stats_fs_type_stub +#define stats_fs_type_s16 stats_fs_type_stub +#define stats_fs_type_u32 stats_fs_type_stub +#define stats_fs_type_s32 stats_fs_type_stub +#define stats_fs_type_u64 stats_fs_type_stub +#define stats_fs_type_s64 stats_fs_type_stub +#define stats_fs_type_bool stats_fs_type_stub + +extern const struct stats_fs_type stats_fs_type_stub; + +/* + * We do not return NULL from these functions if CONFIG_STATS_FS is not enabled + * so users have a chance to detect if there was a real error or not. We don't + * want to duplicate the design decision mistakes of procfs and devfs again. + */ + +static inline struct stats_fs_source *stats_fs_source_create(uint32_t flags, + const char *fmt, + ...) +{ + return ERR_PTR(-ENODEV); +} + +static inline int stats_fs_source_add_values(struct stats_fs_source *source, + struct stats_fs_value *val, + void *base_ptr, uint32_t flags) +{ + return -ENODEV; +} + +static inline void +stats_fs_source_add_subordinate(struct stats_fs_source *parent, + struct stats_fs_source *child) +{ } + +static inline void +stats_fs_source_remove_subordinate(struct stats_fs_source *parent, + struct stats_fs_source *child) +{ } + +static inline int stats_fs_source_get_value(struct stats_fs_source *source, + struct stats_fs_value *val, + uint64_t *ret) +{ + return -ENODEV; +} + +static inline int +stats_fs_source_get_value_by_name(struct stats_fs_source *source, char *name, + uint64_t *ret) +{ + return -ENODEV; +} + +static inline int stats_fs_source_clear(struct stats_fs_source *source, + struct stats_fs_value *val) +{ + return -ENODEV; +} + +static inline void stats_fs_source_revoke(struct stats_fs_source *source) +{ } + +static inline void stats_fs_source_get(struct stats_fs_source *source) +{ } + +static inline void stats_fs_source_put(struct stats_fs_source *source) +{ } + +static inline bool stats_fs_initialized(void) +{ + return false; +} + +#endif + +#endif From patchwork Tue May 26 11:03:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emanuele Giuseppe Esposito X-Patchwork-Id: 218545 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6EF2C433E0 for ; Tue, 26 May 2020 11:05:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A36112084C for ; Tue, 26 May 2020 11:05:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="CDAPYAXx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389063AbgEZLE7 (ORCPT ); Tue, 26 May 2020 07:04:59 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:52000 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2388953AbgEZLEt (ORCPT ); Tue, 26 May 2020 07:04:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590491086; 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=5O6wmB+OtEgOpdTgMhwmvMej/HndgSjcssxfpqUYQvo=; b=CDAPYAXx8VjJzCPRfvfkZOaH0Adt1owKDq7K9reCkr2w/r6y2r8kim2HhRg/RcGLrAEYJz bQPCjD1yBCUvvqXIQpCbrdwYwFEwjT/NAtvP5VoWBxB+ZRvcLGfVBkUBT+LjcG6Yq8CCQR +4vQFFEOO7R/jgErBsof9Q6KTagCOCc= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-95-0dsxdid-Pg2H2dcfxtj-gw-1; Tue, 26 May 2020 07:04:44 -0400 X-MC-Unique: 0dsxdid-Pg2H2dcfxtj-gw-1 Received: by mail-wm1-f69.google.com with SMTP id s15so704873wmc.8 for ; Tue, 26 May 2020 04:04:44 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=5O6wmB+OtEgOpdTgMhwmvMej/HndgSjcssxfpqUYQvo=; b=ePYwNLjCc+IQucKIGE8BfVBtYYm3fqt+UeAyJj5x3RZ3OmqnGhQn6EJ0wUZGSdoV3K tGg+hFrWSxftuDT32aCraJ1Qxc8UZoHKlIs7GTCc8THEc47M8TG/80Pa4jHrvf+9G21H Wx0XcyQEAERHBS7l1jfG1yOQrxb9vKh7RQB/TwMqPnjVgkBdm4OuLKLxmyRfraACH/Sq 7o3Rv2mn3auyzaxH+JDf3YVK2soNvjGqcNXnIF9fyB9ujc9H2c33TQGsUfpBheotDtDI IMff3BUSqggujxmnspKTzxjsvPeeCriOhnyjKhNhrccjBrRprQtoamno08CyRWG8W8+N n37A== X-Gm-Message-State: AOAM533cohdlhmn8y4C8tXRrBwmZi62MAG1gd77supDPgNpzlN7dXm8t 1xZfcWSiEpojqZatbknRDe4Xh1hX/wivV3vCQ30XPKzPMEkwDeXSAQyKmtrrwLjxhh0nID8QmrL CdqyM/COcmpCfUvTv X-Received: by 2002:a1c:c2c5:: with SMTP id s188mr923808wmf.18.1590491082938; Tue, 26 May 2020 04:04:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5nQZudivZ6Pr1hFC05FMBitfCfMfBgLsi4yLshtoZEJ/TmA0F8Yn3yi1E4u4AmyKLDArSrw== X-Received: by 2002:a1c:c2c5:: with SMTP id s188mr923747wmf.18.1590491082186; Tue, 26 May 2020 04:04:42 -0700 (PDT) Received: from localhost.localdomain.com ([194.230.155.118]) by smtp.gmail.com with ESMTPSA id d6sm22928240wrj.90.2020.05.26.04.04.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 04:04:30 -0700 (PDT) From: Emanuele Giuseppe Esposito To: kvm@vger.kernel.org Cc: Christian Borntraeger , Paolo Bonzini , Jim Mattson , Alexander Viro , Emanuele Giuseppe Esposito , David Rientjes , Jonathan Adams , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, kvm-ppc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-fsdevel@vger.kernel.org, netdev@vger.kernel.org, Emanuele Giuseppe Esposito Subject: [PATCH v3 3/7] kunit: tests for stats_fs API Date: Tue, 26 May 2020 13:03:13 +0200 Message-Id: <20200526110318.69006-4-eesposit@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200526110318.69006-1-eesposit@redhat.com> References: <20200526110318.69006-1-eesposit@redhat.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add kunit tests to extensively test the stats_fs API functionality. In order to run them, the kernel .config must set CONFIG_KUNIT=y and a new .kunitconfig file must be created with CONFIG_STATS_FS=y and CONFIG_STATS_FS_TEST=y Tests can be then started by running the following command from the root directory of the linux kernel source tree: ./tools/testing/kunit/kunit.py run --timeout=30 --jobs=`nproc --all` Signed-off-by: Emanuele Giuseppe Esposito --- fs/Kconfig | 6 + fs/stats_fs/Makefile | 2 + fs/stats_fs/stats_fs-tests.c | 1097 ++++++++++++++++++++++++++++++++++ 3 files changed, 1105 insertions(+) create mode 100644 fs/stats_fs/stats_fs-tests.c diff --git a/fs/Kconfig b/fs/Kconfig index 684ad61129ab..02bbb0e4cdf7 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -227,6 +227,12 @@ config STATS_FS stats_fs is a virtual file system that provides counters and other statistics about the running kernel. +config STATS_FS_TEST + bool "Tests for stats_fs" + depends on STATS_FS && KUNIT + help + tests for the stats_fs API. + config STATS_FS_API bool imply STATS_FS diff --git a/fs/stats_fs/Makefile b/fs/stats_fs/Makefile index bd988daa4c39..bc59a54d5721 100644 --- a/fs/stats_fs/Makefile +++ b/fs/stats_fs/Makefile @@ -1,5 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only stats_fs-objs := stats_fs.o +stats_fs-tests-objs := stats_fs-tests.o obj-$(CONFIG_STATS_FS) += stats_fs.o obj-$(CONFIG_STATS_FS_STUB) += stub.o +obj-$(CONFIG_STATS_FS_TEST) += stats_fs-tests.o diff --git a/fs/stats_fs/stats_fs-tests.c b/fs/stats_fs/stats_fs-tests.c new file mode 100644 index 000000000000..bbac133d7fe7 --- /dev/null +++ b/fs/stats_fs/stats_fs-tests.c @@ -0,0 +1,1097 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include "internal.h" + +#define STATS_FS_STAT(el, x, ...) \ + { \ + .name = #x, .offset = offsetof(struct container, el.x), \ + ##__VA_ARGS__ \ + } + +#define ARR_SIZE(el) ((int)(sizeof(el) / sizeof(struct stats_fs_value) - 1)) + +struct test_values_struct { + uint64_t u64; + int32_t s32; + bool bo; + uint8_t u8; + int16_t s16; +}; + +struct container { + struct test_values_struct vals; +}; + +struct stats_fs_value test_values[6] = { + STATS_FS_STAT(vals, u64, .type = &stats_fs_type_u64, + .aggr_kind = STATS_FS_NONE, + .value_flag = STATS_FS_FLOATING_VALUE), + STATS_FS_STAT(vals, s32, .type = &stats_fs_type_s32, + .aggr_kind = STATS_FS_NONE), + STATS_FS_STAT(vals, bo, .type = &stats_fs_type_bool, + .aggr_kind = STATS_FS_NONE, + .value_flag = STATS_FS_FLOATING_VALUE), + STATS_FS_STAT(vals, u8, .type = &stats_fs_type_u8, + .aggr_kind = STATS_FS_NONE), + STATS_FS_STAT(vals, s16, .type = &stats_fs_type_s16, + .aggr_kind = STATS_FS_NONE, + .value_flag = STATS_FS_FLOATING_VALUE), + { NULL }, +}; + +struct stats_fs_value test_aggr[4] = { + STATS_FS_STAT(vals, s32, .type = &stats_fs_type_s32, + .aggr_kind = STATS_FS_MIN, + .value_flag = STATS_FS_FLOATING_VALUE), + STATS_FS_STAT(vals, bo, .type = &stats_fs_type_bool, + .aggr_kind = STATS_FS_MAX, + .value_flag = STATS_FS_FLOATING_VALUE), + STATS_FS_STAT(vals, u64, .type = &stats_fs_type_u64, + .aggr_kind = STATS_FS_SUM, + .value_flag = STATS_FS_FLOATING_VALUE), + { NULL }, +}; + +struct stats_fs_value test_same_name[3] = { + STATS_FS_STAT(vals, s32, .type = &stats_fs_type_s32, + .aggr_kind = STATS_FS_NONE), + STATS_FS_STAT(vals, s32, .type = &stats_fs_type_s32, + .aggr_kind = STATS_FS_MIN), + { NULL }, +}; + +struct stats_fs_value test_all_aggr[6] = { + STATS_FS_STAT(vals, s32, .type = &stats_fs_type_s32, + .aggr_kind = STATS_FS_MIN), + STATS_FS_STAT(vals, bo, .type = &stats_fs_type_bool, + .aggr_kind = STATS_FS_COUNT_ZERO, + .value_flag = STATS_FS_FLOATING_VALUE), + STATS_FS_STAT(vals, u64, .type = &stats_fs_type_u64, + .aggr_kind = STATS_FS_SUM), + STATS_FS_STAT(vals, u8, .type = &stats_fs_type_u8, + .aggr_kind = STATS_FS_AVG, + .value_flag = STATS_FS_FLOATING_VALUE), + STATS_FS_STAT(vals, s16, .type = &stats_fs_type_s16, + .aggr_kind = STATS_FS_MAX, + .value_flag = STATS_FS_FLOATING_VALUE), + { NULL }, +}; + +#define def_u64 ((uint64_t)64) + +#define def_val_s32 ((int32_t)S32_MIN) +#define def_val_bool ((bool)true) +#define def_val_u8 ((uint8_t)127) +#define def_val_s16 ((int16_t)10000) + +#define def_val2_s32 ((int32_t)S16_MAX) +#define def_val2_bool ((bool)false) +#define def_val2_u8 ((uint8_t)255) +#define def_val2_s16 ((int16_t)-20000) + +struct container cont = { + .vals = { + .u64 = def_u64, + .s32 = def_val_s32, + .bo = def_val_bool, + .u8 = def_val_u8, + .s16 = def_val_s16, + }, +}; + +struct container cont2 = { + .vals = { + .u64 = def_u64, + .s32 = def_val2_s32, + .bo = def_val2_bool, + .u8 = def_val2_u8, + .s16 = def_val2_s16, + }, +}; + +static void get_stats_at_addr(struct stats_fs_source *src, void *addr, + int *aggr, int *val, int use_addr) +{ + struct stats_fs_value *entry; + struct stats_fs_value_source *src_entry; + int counter_val = 0, counter_aggr = 0; + + list_for_each_entry (src_entry, &src->values_head, list_element) { + if (use_addr && src_entry->base_addr != addr) + continue; + + for (entry = src_entry->values; entry->name; entry++) { + if (entry->aggr_kind == STATS_FS_NONE) + counter_val++; + else + counter_aggr++; + } + } + + if (aggr) + *aggr = counter_aggr; + + if (val) + *val = counter_val; +} + +int source_has_subsource(struct stats_fs_source *src, + struct stats_fs_source *sub) +{ + struct stats_fs_source *entry; + + list_for_each_entry (entry, &src->subordinates_head, list_element) { + if (entry == sub) + return 1; + } + return 0; +} + +int get_number_subsources(struct stats_fs_source *src) +{ + struct stats_fs_source *entry; + int counter = 0; + + list_for_each_entry (entry, &src->subordinates_head, list_element) { + counter++; + } + return counter; +} + +int get_number_values(struct stats_fs_source *src) +{ + int counter = 0; + + get_stats_at_addr(src, NULL, NULL, &counter, 0); + return counter; +} + +int get_total_number_values(struct stats_fs_source *src) +{ + struct stats_fs_source *sub_entry; + int counter = 0; + + get_stats_at_addr(src, NULL, NULL, &counter, 0); + + list_for_each_entry (sub_entry, &src->subordinates_head, list_element) { + counter += get_total_number_values(sub_entry); + } + + return counter; +} + +int get_number_aggregates(struct stats_fs_source *src) +{ + int counter = 0; + + get_stats_at_addr(src, NULL, &counter, NULL, 1); + return counter; +} + +int get_number_values_with_base(struct stats_fs_source *src, void *addr) +{ + int counter = 0; + + get_stats_at_addr(src, addr, NULL, &counter, 1); + return counter; +} + +int get_number_aggr_with_base(struct stats_fs_source *src, void *addr) +{ + int counter = 0; + + get_stats_at_addr(src, addr, &counter, NULL, 1); + return counter; +} + +static void test_empty_folder(struct kunit *test) +{ + struct stats_fs_source *src; + + src = stats_fs_source_create(0, "kvm_%d", 123); + KUNIT_EXPECT_EQ(test, strcmp(src->name, "kvm_123"), 0); + KUNIT_EXPECT_EQ(test, get_number_subsources(src), 0); + KUNIT_EXPECT_EQ(test, get_number_values(src), 0); + KUNIT_EXPECT_EQ(test, get_number_aggregates(src), 0); + stats_fs_source_put(src); +} + +static void test_add_subfolder(struct kunit *test) +{ + struct stats_fs_source *src, *sub; + + src = stats_fs_source_create(0, "parent"); + sub = stats_fs_source_create(0, "child"); + stats_fs_source_add_subordinate(src, sub); + KUNIT_EXPECT_EQ(test, source_has_subsource(src, sub), true); + KUNIT_EXPECT_EQ(test, get_number_subsources(src), 1); + KUNIT_EXPECT_EQ(test, get_number_values(src), 0); + KUNIT_EXPECT_EQ(test, get_number_aggregates(src), 0); + KUNIT_EXPECT_EQ(test, get_number_values(sub), 0); + KUNIT_EXPECT_EQ(test, get_number_aggregates(sub), 0); + KUNIT_EXPECT_EQ(test, get_total_number_values(src), 0); + + stats_fs_source_put(sub); + sub = stats_fs_source_create(0, "not a child"); + KUNIT_EXPECT_EQ(test, source_has_subsource(src, sub), false); + KUNIT_EXPECT_EQ(test, get_number_subsources(src), 1); + + stats_fs_source_put(sub); + stats_fs_source_put(src); +} + +static void test_add_value(struct kunit *test) +{ + struct stats_fs_source *src; + int n; + + src = stats_fs_source_create(0, "parent"); + + // add values + n = stats_fs_source_add_values(src, test_values, &cont, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_values_with_base(src, &cont); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_values)); + + // add same values, nothing happens + n = stats_fs_source_add_values(src, test_values, &cont, 0); + KUNIT_EXPECT_EQ(test, n, -EEXIST); + n = get_number_values_with_base(src, &cont); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_values)); + + // size is invaried + KUNIT_EXPECT_EQ(test, get_number_values(src), ARR_SIZE(test_values)); + + // no aggregates + n = get_number_aggr_with_base(src, &cont); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, get_number_values(src), ARR_SIZE(test_values)); + KUNIT_EXPECT_EQ(test, get_number_aggregates(src), 0); + + stats_fs_source_put(src); +} + +static void test_add_value_in_subfolder(struct kunit *test) +{ + struct stats_fs_source *src, *sub, *sub_not; + int n; + + src = stats_fs_source_create(0, "parent"); + sub = stats_fs_source_create(0, "child"); + + // src -> sub + stats_fs_source_add_subordinate(src, sub); + + // add values + n = stats_fs_source_add_values(sub, test_values, &cont, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_values_with_base(sub, &cont); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_values)); + KUNIT_EXPECT_EQ(test, get_number_values(src), 0); + KUNIT_EXPECT_EQ(test, get_number_aggregates(src), 0); + KUNIT_EXPECT_EQ(test, get_total_number_values(src), + ARR_SIZE(test_values)); + + KUNIT_EXPECT_EQ(test, get_number_values(sub), ARR_SIZE(test_values)); + // no values in sub + KUNIT_EXPECT_EQ(test, get_number_aggregates(sub), 0); + + // different folder + sub_not = stats_fs_source_create(0, "not a child"); + + // add values + n = stats_fs_source_add_values(sub_not, test_values, &cont, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_values_with_base(sub_not, &cont); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_values)); + KUNIT_EXPECT_EQ(test, get_number_values(src), 0); + KUNIT_EXPECT_EQ(test, get_number_aggregates(src), 0); + KUNIT_EXPECT_EQ(test, get_total_number_values(src), + ARR_SIZE(test_values)); + + // remove sub, check values is 0 + stats_fs_source_remove_subordinate(src, sub); + KUNIT_EXPECT_EQ(test, get_total_number_values(src), 0); + + // re-add sub, check value are added + stats_fs_source_add_subordinate(src, sub); + KUNIT_EXPECT_EQ(test, get_total_number_values(src), + ARR_SIZE(test_values)); + + // add sub_not, check value are twice as many + stats_fs_source_add_subordinate(src, sub_not); + KUNIT_EXPECT_EQ(test, get_total_number_values(src), + ARR_SIZE(test_values) * 2); + + KUNIT_EXPECT_EQ(test, get_number_values(sub_not), + ARR_SIZE(test_values)); + KUNIT_EXPECT_EQ(test, get_number_aggregates(sub_not), 0); + + stats_fs_source_put(sub); + stats_fs_source_put(sub_not); + stats_fs_source_put(src); +} + +static void test_search_value(struct kunit *test) +{ + struct stats_fs_source *src; + uint64_t ret; + int n; + + src = stats_fs_source_create(0, "parent"); + + // add values + n = stats_fs_source_add_values(src, test_values, &cont, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_values_with_base(src, &cont); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_values)); + + // get u64 + n = stats_fs_source_get_value_by_name(src, "u64", &ret); + KUNIT_EXPECT_EQ(test, ret, def_u64); + KUNIT_EXPECT_EQ(test, n, 0); + + n = stats_fs_source_get_value_by_name(src, "s32", &ret); + KUNIT_EXPECT_EQ(test, ((int32_t)ret), def_val_s32); + KUNIT_EXPECT_EQ(test, n, 0); + + n = stats_fs_source_get_value_by_name(src, "bo", &ret); + KUNIT_EXPECT_EQ(test, ((bool)ret), def_val_bool); + KUNIT_EXPECT_EQ(test, n, 0); + + // get a non-added value + n = stats_fs_source_get_value_by_name(src, "does not exist", &ret); + KUNIT_EXPECT_EQ(test, ret, 0ull); + KUNIT_EXPECT_EQ(test, n, -ENOENT); + + stats_fs_source_put(src); +} + +static void test_search_value_in_subfolder(struct kunit *test) +{ + struct stats_fs_source *src, *sub; + uint64_t ret; + int n; + + src = stats_fs_source_create(0, "parent"); + sub = stats_fs_source_create(0, "child"); + + // src -> sub + stats_fs_source_add_subordinate(src, sub); + + // add values to sub + n = stats_fs_source_add_values(sub, test_values, &cont, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_values_with_base(sub, &cont); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_values)); + + n = stats_fs_source_get_value_by_name(sub, "u64", &ret); + KUNIT_EXPECT_EQ(test, ret, def_u64); + KUNIT_EXPECT_EQ(test, n, 0); + n = stats_fs_source_get_value_by_name(src, "u64", &ret); + KUNIT_EXPECT_EQ(test, ret, 0ull); + KUNIT_EXPECT_EQ(test, n, -ENOENT); + + n = stats_fs_source_get_value_by_name(sub, "s32", &ret); + KUNIT_EXPECT_EQ(test, ((int32_t)ret), def_val_s32); + KUNIT_EXPECT_EQ(test, n, 0); + n = stats_fs_source_get_value_by_name(src, "s32", &ret); + KUNIT_EXPECT_EQ(test, ret, 0ull); + KUNIT_EXPECT_EQ(test, n, -ENOENT); + + n = stats_fs_source_get_value_by_name(sub, "bo", &ret); + KUNIT_EXPECT_EQ(test, ((bool)ret), def_val_bool); + KUNIT_EXPECT_EQ(test, n, 0); + n = stats_fs_source_get_value_by_name(src, "bo", &ret); + KUNIT_EXPECT_EQ(test, ret, 0ull); + KUNIT_EXPECT_EQ(test, n, -ENOENT); + + n = stats_fs_source_get_value_by_name(sub, "does not exist", &ret); + KUNIT_EXPECT_EQ(test, ret, 0ull); + KUNIT_EXPECT_EQ(test, n, -ENOENT); + n = stats_fs_source_get_value_by_name(src, "does not exist", &ret); + KUNIT_EXPECT_EQ(test, ret, 0ull); + KUNIT_EXPECT_EQ(test, n, -ENOENT); + + stats_fs_source_put(sub); + stats_fs_source_put(src); +} + +static void test_search_value_in_empty_folder(struct kunit *test) +{ + struct stats_fs_source *src; + uint64_t ret; + int n; + + src = stats_fs_source_create(0, "empty folder"); + KUNIT_EXPECT_EQ(test, get_number_aggregates(src), 0); + KUNIT_EXPECT_EQ(test, get_number_subsources(src), 0); + KUNIT_EXPECT_EQ(test, get_number_values(src), 0); + + n = stats_fs_source_get_value_by_name(src, "u64", &ret); + KUNIT_EXPECT_EQ(test, ret, 0ull); + KUNIT_EXPECT_EQ(test, n, -ENOENT); + + n = stats_fs_source_get_value_by_name(src, "s32", &ret); + KUNIT_EXPECT_EQ(test, ret, 0ull); + KUNIT_EXPECT_EQ(test, n, -ENOENT); + + n = stats_fs_source_get_value_by_name(src, "bo", &ret); + KUNIT_EXPECT_EQ(test, ret, 0ull); + KUNIT_EXPECT_EQ(test, n, -ENOENT); + + n = stats_fs_source_get_value_by_name(src, "does not exist", &ret); + KUNIT_EXPECT_EQ(test, ret, 0ull); + KUNIT_EXPECT_EQ(test, n, -ENOENT); + + stats_fs_source_put(src); +} + +static void test_add_aggregate(struct kunit *test) +{ + struct stats_fs_source *src; + int n; + + src = stats_fs_source_create(0, "parent"); + + // add aggr to src, no values + n = stats_fs_source_add_values(src, test_aggr, NULL, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_values_with_base(src, NULL); + KUNIT_EXPECT_EQ(test, n, 0); + + // count values + n = get_number_aggr_with_base(src, NULL); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_aggr)); + + // add same array again, should not be added + n = stats_fs_source_add_values(src, test_aggr, NULL, 0); + KUNIT_EXPECT_EQ(test, n, -EEXIST); + n = get_number_aggr_with_base(src, NULL); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_aggr)); + + KUNIT_EXPECT_EQ(test, get_number_values(src), 0); + KUNIT_EXPECT_EQ(test, get_number_aggregates(src), ARR_SIZE(test_aggr)); + + stats_fs_source_put(src); +} + +static void test_add_aggregate_in_subfolder(struct kunit *test) +{ + struct stats_fs_source *src, *sub, *sub_not; + int n; + + src = stats_fs_source_create(0, "parent"); + sub = stats_fs_source_create(0, "child"); + // src->sub + stats_fs_source_add_subordinate(src, sub); + + // add aggr to sub + n = stats_fs_source_add_values(sub, test_aggr, NULL, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_aggr_with_base(sub, NULL); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_aggr)); + KUNIT_EXPECT_EQ(test, get_number_values(src), 0); + KUNIT_EXPECT_EQ(test, get_number_aggregates(src), 0); + KUNIT_EXPECT_EQ(test, get_total_number_values(src), 0); + + KUNIT_EXPECT_EQ(test, get_number_values(sub), 0); + KUNIT_EXPECT_EQ(test, get_number_aggregates(sub), ARR_SIZE(test_aggr)); + + // not a child + sub_not = stats_fs_source_create(0, "not a child"); + + // add aggr to "not a child" + n = stats_fs_source_add_values(sub_not, test_aggr, NULL, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_aggr_with_base(sub_not, NULL); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_aggr)); + KUNIT_EXPECT_EQ(test, get_number_values(src), 0); + KUNIT_EXPECT_EQ(test, get_number_aggregates(src), 0); + KUNIT_EXPECT_EQ(test, get_total_number_values(src), 0); + + // remove sub + stats_fs_source_remove_subordinate(src, sub); + KUNIT_EXPECT_EQ(test, get_total_number_values(src), 0); + + // re-add both + stats_fs_source_add_subordinate(src, sub); + KUNIT_EXPECT_EQ(test, get_total_number_values(src), 0); + stats_fs_source_add_subordinate(src, sub_not); + KUNIT_EXPECT_EQ(test, get_total_number_values(src), 0); + + KUNIT_EXPECT_EQ(test, get_number_values(sub_not), 0); + KUNIT_EXPECT_EQ(test, get_number_aggregates(sub_not), + ARR_SIZE(test_aggr)); + + stats_fs_source_put(sub); + stats_fs_source_put(sub_not); + stats_fs_source_put(src); +} + +static void test_search_aggregate(struct kunit *test) +{ + struct stats_fs_source *src; + uint64_t ret; + int n; + + src = stats_fs_source_create(0, "parent"); + n = stats_fs_source_add_values(src, test_aggr, NULL, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_aggr_with_base(src, NULL); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_aggr)); + n = get_number_aggr_with_base(src, &cont); + KUNIT_EXPECT_EQ(test, n, 0); + n = stats_fs_source_get_value_by_name(src, "u64", &ret); + KUNIT_EXPECT_EQ(test, ret, 0ull); + KUNIT_EXPECT_EQ(test, n, 0); + + n = stats_fs_source_get_value_by_name(src, "s32", &ret); + KUNIT_EXPECT_EQ(test, (int64_t)ret, S64_MAX); + KUNIT_EXPECT_EQ(test, n, 0); + + n = stats_fs_source_get_value_by_name(src, "bo", &ret); + KUNIT_EXPECT_EQ(test, ret, 0ull); + KUNIT_EXPECT_EQ(test, n, 0); + + n = stats_fs_source_get_value_by_name(src, "does not exist", &ret); + KUNIT_EXPECT_EQ(test, ret, 0ull); + KUNIT_EXPECT_EQ(test, n, -ENOENT); + stats_fs_source_put(src); +} + +static void test_search_aggregate_in_subfolder(struct kunit *test) +{ + struct stats_fs_source *src, *sub; + uint64_t ret; + int n; + + src = stats_fs_source_create(0, "parent"); + sub = stats_fs_source_create(0, "child"); + + stats_fs_source_add_subordinate(src, sub); + + n = stats_fs_source_add_values(sub, test_aggr, NULL, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_aggr_with_base(sub, NULL); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_aggr)); + n = get_number_aggr_with_base(sub, &cont); + KUNIT_EXPECT_EQ(test, n, 0); + + // no u64 in test_aggr + n = stats_fs_source_get_value_by_name(sub, "u64", &ret); + KUNIT_EXPECT_EQ(test, ret, 0ull); + KUNIT_EXPECT_EQ(test, n, 0); + n = stats_fs_source_get_value_by_name(src, "u64", &ret); + KUNIT_EXPECT_EQ(test, ret, 0ull); + KUNIT_EXPECT_EQ(test, n, -ENOENT); + + n = stats_fs_source_get_value_by_name(sub, "s32", &ret); + KUNIT_EXPECT_EQ(test, (int64_t)ret, S64_MAX); + KUNIT_EXPECT_EQ(test, n, 0); + n = stats_fs_source_get_value_by_name(src, "s32", &ret); + KUNIT_EXPECT_EQ(test, ret, 0ull); + KUNIT_EXPECT_EQ(test, n, -ENOENT); + + n = stats_fs_source_get_value_by_name(sub, "bo", &ret); + KUNIT_EXPECT_EQ(test, ret, 0ull); + KUNIT_EXPECT_EQ(test, n, 0); + n = stats_fs_source_get_value_by_name(src, "bo", &ret); + KUNIT_EXPECT_EQ(test, ret, 0ull); + KUNIT_EXPECT_EQ(test, n, -ENOENT); + + n = stats_fs_source_get_value_by_name(sub, "does not exist", &ret); + KUNIT_EXPECT_EQ(test, ret, 0ull); + KUNIT_EXPECT_EQ(test, n, -ENOENT); + n = stats_fs_source_get_value_by_name(src, "does not exist", &ret); + KUNIT_EXPECT_EQ(test, ret, 0ull); + KUNIT_EXPECT_EQ(test, n, -ENOENT); + + stats_fs_source_put(sub); + stats_fs_source_put(src); +} + +void test_search_same(struct kunit *test) +{ + struct stats_fs_source *src; + uint64_t ret; + int n; + + src = stats_fs_source_create(0, "parent"); + n = stats_fs_source_add_values(src, test_same_name, &cont, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_values_with_base(src, &cont); + KUNIT_EXPECT_EQ(test, n, 1); + n = get_number_aggr_with_base(src, &cont); + KUNIT_EXPECT_EQ(test, n, 1); + + n = stats_fs_source_add_values(src, test_same_name, &cont, 0); + KUNIT_EXPECT_EQ(test, n, -EEXIST); + n = get_number_values_with_base(src, &cont); + KUNIT_EXPECT_EQ(test, n, 1); + n = get_number_aggr_with_base(src, &cont); + KUNIT_EXPECT_EQ(test, n, 1); + + // returns first the value + n = stats_fs_source_get_value_by_name(src, "s32", &ret); + KUNIT_EXPECT_EQ(test, ((int32_t)ret), def_val_s32); + KUNIT_EXPECT_EQ(test, n, 0); + + stats_fs_source_put(src); +} + +static void test_add_mixed(struct kunit *test) +{ + struct stats_fs_source *src; + int n; + + src = stats_fs_source_create(0, "parent"); + + n = stats_fs_source_add_values(src, test_aggr, NULL, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_values_with_base(src, NULL); + KUNIT_EXPECT_EQ(test, n, 0); + n = stats_fs_source_add_values(src, test_values, &cont, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_aggr_with_base(src, NULL); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_aggr)); + + n = stats_fs_source_add_values(src, test_values, &cont, 0); + KUNIT_EXPECT_EQ(test, n, -EEXIST); + n = get_number_values_with_base(src, &cont); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_values)); + n = stats_fs_source_add_values(src, test_aggr, NULL, 0); + KUNIT_EXPECT_EQ(test, n, -EEXIST); + n = get_number_aggr_with_base(src, NULL); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_aggr)); + + KUNIT_EXPECT_EQ(test, get_number_values(src), ARR_SIZE(test_values)); + KUNIT_EXPECT_EQ(test, get_number_aggregates(src), ARR_SIZE(test_aggr)); + stats_fs_source_put(src); +} + +static void test_search_mixed(struct kunit *test) +{ + struct stats_fs_source *src, *sub; + uint64_t ret; + int n; + + src = stats_fs_source_create(0, "parent"); + sub = stats_fs_source_create(0, "child"); + stats_fs_source_add_subordinate(src, sub); + + // src has the aggregates, sub the values. Just search + n = stats_fs_source_add_values(sub, test_values, &cont, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_values_with_base(sub, &cont); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_values)); + n = stats_fs_source_add_values(src, test_aggr, &cont, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_aggr_with_base(src, &cont); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_aggr)); + + // u64 is sum so again same value + n = stats_fs_source_get_value_by_name(sub, "u64", &ret); + KUNIT_EXPECT_EQ(test, ret, def_u64); + KUNIT_EXPECT_EQ(test, n, 0); + n = stats_fs_source_get_value_by_name(src, "u64", &ret); + KUNIT_EXPECT_EQ(test, ret, def_u64); + KUNIT_EXPECT_EQ(test, n, 0); + + // s32 is min so return the value also in the aggregate + n = stats_fs_source_get_value_by_name(sub, "s32", &ret); + KUNIT_EXPECT_EQ(test, ((int32_t)ret), def_val_s32); + KUNIT_EXPECT_EQ(test, n, 0); + n = stats_fs_source_get_value_by_name(src, "s32", &ret); + KUNIT_EXPECT_EQ(test, ((int32_t)ret), def_val_s32); + KUNIT_EXPECT_EQ(test, n, 0); + + // bo is max + n = stats_fs_source_get_value_by_name(sub, "bo", &ret); + KUNIT_EXPECT_EQ(test, (bool)ret, def_val_bool); + KUNIT_EXPECT_EQ(test, n, 0); + n = stats_fs_source_get_value_by_name(src, "bo", &ret); + KUNIT_EXPECT_EQ(test, (bool)ret, def_val_bool); + KUNIT_EXPECT_EQ(test, n, 0); + + n = stats_fs_source_get_value_by_name(sub, "does not exist", &ret); + KUNIT_EXPECT_EQ(test, ret, 0ull); + KUNIT_EXPECT_EQ(test, n, -ENOENT); + n = stats_fs_source_get_value_by_name(src, "does not exist", &ret); + KUNIT_EXPECT_EQ(test, ret, 0ull); + KUNIT_EXPECT_EQ(test, n, -ENOENT); + + stats_fs_source_put(sub); + stats_fs_source_put(src); +} + +static void test_all_aggregations_agg_val_val(struct kunit *test) +{ + struct stats_fs_source *src, *sub1, *sub2; + uint64_t ret; + int n; + + src = stats_fs_source_create(0, "parent"); + sub1 = stats_fs_source_create(0, "child1"); + sub2 = stats_fs_source_create(0, "child2"); + stats_fs_source_add_subordinate(src, sub1); + stats_fs_source_add_subordinate(src, sub2); + + n = stats_fs_source_add_values(sub1, test_all_aggr, &cont, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_aggr_with_base(sub1, &cont); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_all_aggr)); + n = stats_fs_source_add_values(sub2, test_all_aggr, &cont2, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_aggr_with_base(sub2, &cont2); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_all_aggr)); + + n = stats_fs_source_add_values(src, test_all_aggr, NULL, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_aggr_with_base(src, NULL); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_all_aggr)); + + // sum + n = stats_fs_source_get_value_by_name(src, "u64", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, ret, def_u64 * 2); + + // min + n = stats_fs_source_get_value_by_name(src, "s32", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, ((int32_t)ret), def_val_s32); + + // count_0 + n = stats_fs_source_get_value_by_name(src, "bo", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, ret, 1ull); + + // avg + n = stats_fs_source_get_value_by_name(src, "u8", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, ret, 191ull); + + // max + n = stats_fs_source_get_value_by_name(src, "s16", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, (int16_t)ret, def_val_s16); + + stats_fs_source_put(sub1); + stats_fs_source_put(sub2); + stats_fs_source_put(src); +} + +static void test_all_aggregations_val_agg_val(struct kunit *test) +{ + struct stats_fs_source *src, *sub1, *sub2; + uint64_t ret; + int n; + + src = stats_fs_source_create(0, "parent"); + sub1 = stats_fs_source_create(0, "child1"); + sub2 = stats_fs_source_create(0, "child2"); + stats_fs_source_add_subordinate(src, sub1); + stats_fs_source_add_subordinate(src, sub2); + + n = stats_fs_source_add_values(src, test_all_aggr, &cont, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_aggr_with_base(src, &cont); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_all_aggr)); + n = stats_fs_source_add_values(sub2, test_all_aggr, &cont2, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_aggr_with_base(sub2, &cont2); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_all_aggr)); + + n = stats_fs_source_add_values(sub1, test_all_aggr, NULL, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_aggr_with_base(sub1, NULL); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_all_aggr)); + + n = stats_fs_source_get_value_by_name(src, "u64", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, ret, def_u64); + n = stats_fs_source_get_value_by_name(sub1, "u64", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, ret, 0ull); + n = stats_fs_source_get_value_by_name(sub2, "u64", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, ret, def_u64); + + n = stats_fs_source_get_value_by_name(src, "s32", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, ((int32_t)ret), def_val_s32); + n = stats_fs_source_get_value_by_name(sub1, "s32", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, (int64_t)ret, S64_MAX); // MIN + n = stats_fs_source_get_value_by_name(sub2, "s32", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, ((int32_t)ret), def_val2_s32); + + n = stats_fs_source_get_value_by_name(src, "bo", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, (bool)ret, def_val_bool); + n = stats_fs_source_get_value_by_name(sub1, "bo", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, ret, 0ull); + n = stats_fs_source_get_value_by_name(sub2, "bo", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, (bool)ret, def_val2_bool); + + n = stats_fs_source_get_value_by_name(src, "u8", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, (uint8_t)ret, def_val_u8); + n = stats_fs_source_get_value_by_name(sub1, "u8", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, ret, 0ull); + n = stats_fs_source_get_value_by_name(sub2, "u8", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, (uint8_t)ret, def_val2_u8); + + n = stats_fs_source_get_value_by_name(src, "s16", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, (int16_t)ret, def_val_s16); + n = stats_fs_source_get_value_by_name(sub1, "s16", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, (int64_t)ret, S64_MIN); // MAX + n = stats_fs_source_get_value_by_name(sub2, "s16", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, (int16_t)ret, def_val2_s16); + + stats_fs_source_put(sub1); + stats_fs_source_put(sub2); + stats_fs_source_put(src); +} + +static void test_all_aggregations_agg_val_val_sub(struct kunit *test) +{ + struct stats_fs_source *src, *sub1, *sub11; + uint64_t ret; + int n; + + src = stats_fs_source_create(0, "parent"); + sub1 = stats_fs_source_create(0, "child1"); + sub11 = stats_fs_source_create(0, "child11"); + stats_fs_source_add_subordinate(src, sub1); + stats_fs_source_add_subordinate(sub1, sub11); // changes here! + + n = stats_fs_source_add_values(sub1, test_values, &cont, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_values_with_base(sub1, &cont); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_values)); + n = stats_fs_source_add_values(sub11, test_values, &cont2, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_values_with_base(sub11, &cont2); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_values)); + + KUNIT_EXPECT_EQ(test, get_total_number_values(src), + ARR_SIZE(test_values) * 2); + + n = stats_fs_source_add_values(sub1, test_all_aggr, &cont, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_aggr_with_base(sub1, &cont); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_all_aggr)); + n = stats_fs_source_add_values(sub11, test_all_aggr, &cont2, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_aggr_with_base(sub11, &cont2); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_all_aggr)); + + n = stats_fs_source_add_values(src, test_all_aggr, NULL, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_aggr_with_base(src, NULL); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_all_aggr)); + + // sum + n = stats_fs_source_get_value_by_name(src, "u64", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, ret, def_u64 * 2); + + // min + n = stats_fs_source_get_value_by_name(src, "s32", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, ((int32_t)ret), def_val_s32); + + // count_0 + n = stats_fs_source_get_value_by_name(src, "bo", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, ret, 1ull); + + // avg + n = stats_fs_source_get_value_by_name(src, "u8", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, ret, 191ull); + + // max + n = stats_fs_source_get_value_by_name(src, "s16", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, (int16_t)ret, def_val_s16); + + stats_fs_source_put(sub1); + stats_fs_source_put(sub11); + stats_fs_source_put(src); +} + +static void test_all_aggregations_agg_no_val_sub(struct kunit *test) +{ + struct stats_fs_source *src, *sub1, *sub11; + uint64_t ret; + int n; + + src = stats_fs_source_create(0, "parent"); + sub1 = stats_fs_source_create(0, "child1"); + sub11 = stats_fs_source_create(0, "child11"); + stats_fs_source_add_subordinate(src, sub1); + stats_fs_source_add_subordinate(sub1, sub11); + + n = stats_fs_source_add_values(sub11, test_all_aggr, &cont2, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_aggr_with_base(sub11, &cont2); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_all_aggr)); + + KUNIT_EXPECT_EQ(test, get_total_number_values(src), 0); + + n = stats_fs_source_add_values(src, test_all_aggr, NULL, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_aggr_with_base(src, NULL); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_all_aggr)); + + // sum + n = stats_fs_source_get_value_by_name(src, "u64", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, ret, def_u64); + + // min + n = stats_fs_source_get_value_by_name(src, "s32", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, ((int32_t)ret), def_val2_s32); + + // count_0 + n = stats_fs_source_get_value_by_name(src, "bo", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, ret, 1ull); + + // avg + n = stats_fs_source_get_value_by_name(src, "u8", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, (uint8_t)ret, def_val2_u8); + + // max + n = stats_fs_source_get_value_by_name(src, "s16", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, (int16_t)ret, def_val2_s16); + + stats_fs_source_put(sub1); + stats_fs_source_put(sub11); + stats_fs_source_put(src); +} + +static void test_all_aggregations_agg_agg_val_sub(struct kunit *test) +{ + struct stats_fs_source *src, *sub1, *sub11, *sub12; + uint64_t ret; + int n; + + src = stats_fs_source_create(0, "parent"); + sub1 = stats_fs_source_create(0, "child1"); + sub11 = stats_fs_source_create(0, "child11"); + sub12 = stats_fs_source_create(0, "child12"); + stats_fs_source_add_subordinate(src, sub1); + stats_fs_source_add_subordinate(sub1, sub11); + stats_fs_source_add_subordinate(sub1, sub12); + + n = stats_fs_source_add_values(sub11, test_all_aggr, &cont2, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_aggr_with_base(sub11, &cont2); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_all_aggr)); + + n = stats_fs_source_add_values(sub12, test_all_aggr, &cont, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_aggr_with_base(sub12, &cont); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_all_aggr)); + + KUNIT_EXPECT_EQ(test, get_total_number_values(src), 0); + + n = stats_fs_source_add_values(src, test_all_aggr, NULL, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_aggr_with_base(src, NULL); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_all_aggr)); + + n = stats_fs_source_add_values(sub1, test_all_aggr, NULL, 0); + KUNIT_EXPECT_EQ(test, n, 0); + n = get_number_aggr_with_base(sub1, NULL); + KUNIT_EXPECT_EQ(test, n, ARR_SIZE(test_all_aggr)); + + // sum + n = stats_fs_source_get_value_by_name(src, "u64", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, ret, def_u64 * 2); + + // min + n = stats_fs_source_get_value_by_name(src, "s32", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, ((int32_t)ret), def_val_s32); + + // count_0 + n = stats_fs_source_get_value_by_name(src, "bo", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, ret, 1ull); + + // avg + n = stats_fs_source_get_value_by_name(src, "u8", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, (uint8_t)ret, + (uint8_t)((def_val2_u8 + def_val_u8) / 2)); + + // max + n = stats_fs_source_get_value_by_name(src, "s16", &ret); + KUNIT_EXPECT_EQ(test, n, 0); + KUNIT_EXPECT_EQ(test, (int16_t)ret, def_val_s16); + + stats_fs_source_put(sub1); + stats_fs_source_put(sub11); + stats_fs_source_put(sub12); + stats_fs_source_put(src); +} + +static struct kunit_case stats_fs_test_cases[] = { + KUNIT_CASE(test_empty_folder), + KUNIT_CASE(test_add_subfolder), + KUNIT_CASE(test_add_value), + KUNIT_CASE(test_add_value_in_subfolder), + KUNIT_CASE(test_search_value), + KUNIT_CASE(test_search_value_in_subfolder), + KUNIT_CASE(test_search_value_in_empty_folder), + KUNIT_CASE(test_add_aggregate), + KUNIT_CASE(test_add_aggregate_in_subfolder), + KUNIT_CASE(test_search_aggregate), + KUNIT_CASE(test_search_aggregate_in_subfolder), + KUNIT_CASE(test_search_same), + KUNIT_CASE(test_add_mixed), + KUNIT_CASE(test_search_mixed), + KUNIT_CASE(test_all_aggregations_agg_val_val), + KUNIT_CASE(test_all_aggregations_val_agg_val), + KUNIT_CASE(test_all_aggregations_agg_val_val_sub), + KUNIT_CASE(test_all_aggregations_agg_no_val_sub), + KUNIT_CASE(test_all_aggregations_agg_agg_val_sub), + {} +}; + +static struct kunit_suite stats_fs_test_suite = { + .name = "stats_fs", + .test_cases = stats_fs_test_cases, +}; + +kunit_test_suite(stats_fs_test_suite); From patchwork Tue May 26 11:03:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emanuele Giuseppe Esposito X-Patchwork-Id: 218544 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66A6DC433E1 for ; Tue, 26 May 2020 11:05:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2A68420899 for ; Tue, 26 May 2020 11:05:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="YM/tQ1Sq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388846AbgEZLF3 (ORCPT ); Tue, 26 May 2020 07:05:29 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:27126 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2389069AbgEZLF2 (ORCPT ); Tue, 26 May 2020 07:05:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590491124; 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=cVHdNQU2pG5JsjI+O7F4lH1T4l3qPmdhggFK9TwNLhM=; b=YM/tQ1SqKP+1Uj9Q8mF6zl3pNMV4SVsGxLSKc4apVqdKVHAztmc9KTX3yyJJxHRSqGN4vA h4qP6TXESkc8Yd4J3eAlQdymisD6D5kPoQGjNYiM5fdNpSjZJhzrSMGE1ev3s+BGvmnRjD tw++GkWl/TsiaNwfGp1pdEUSPfiiNow= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-408-m03gRTiAOK-SwE7_MRMBZw-1; Tue, 26 May 2020 07:05:22 -0400 X-MC-Unique: m03gRTiAOK-SwE7_MRMBZw-1 Received: by mail-wm1-f72.google.com with SMTP id l26so708894wmh.3 for ; Tue, 26 May 2020 04:05:22 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=cVHdNQU2pG5JsjI+O7F4lH1T4l3qPmdhggFK9TwNLhM=; b=t0aOAoXjTEz97ZnXbsJJTYvnw35MNSJWlYLmATEWriB20CtTHvdugHzF3j/jYf00OF F2Q1gLMWu/YgsWT/fKAV3fr6NgokeEM8KN1iP3VaGJQRQ8+ix2r97CvsThqnfCK1j42Q /EUuwOXXXQU3VsHTXEp8Q6HOUZKBs53DEEPfyL31E91OuIuQQx8LqVERjssXN2jTR/1n TErBn3Wds80cXJphhxt2zC3t2KSaC6Dl4sZeu9maRBgRIkp5I3Wxo/whiI71jTgJLgCS nNOM4Qzahnjfekn6scwO1MuN1R1l2GJMk9tIm/jEy7HmmiH7M+YvxPQcCtZWl8qo357h OPlw== X-Gm-Message-State: AOAM530kx2q8jUE/oUtd2RCsArMy/Ejp/9dXmEZYPXfRrBAVUqO7bkPw 6x3Y75+++QUsw6/3/tce0/OFu/QOeKNcLkhfZXmAzUVTPh1fRKtsNE/P9HB5MZU0deEsJAeL1RK eXivYcE9glWZ/LpJG X-Received: by 2002:adf:d0d0:: with SMTP id z16mr6293938wrh.308.1590491121166; Tue, 26 May 2020 04:05:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw8Y2ZFD5zqHo8l4FYUC8Cf2oYYd4M2l+ciCMGzVGYFxI8O0oOj7CHNe3KH+jp1w+n4JXBczA== X-Received: by 2002:adf:d0d0:: with SMTP id z16mr6293832wrh.308.1590491119788; Tue, 26 May 2020 04:05:19 -0700 (PDT) Received: from localhost.localdomain.com ([194.230.155.118]) by smtp.gmail.com with ESMTPSA id d6sm22928240wrj.90.2020.05.26.04.04.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 04:05:04 -0700 (PDT) From: Emanuele Giuseppe Esposito To: kvm@vger.kernel.org Cc: Christian Borntraeger , Paolo Bonzini , Jim Mattson , Alexander Viro , Emanuele Giuseppe Esposito , David Rientjes , Jonathan Adams , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, kvm-ppc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-fsdevel@vger.kernel.org, netdev@vger.kernel.org, Emanuele Giuseppe Esposito Subject: [PATCH v3 5/7] kvm_main: replace debugfs with stats_fs Date: Tue, 26 May 2020 13:03:15 +0200 Message-Id: <20200526110318.69006-6-eesposit@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200526110318.69006-1-eesposit@redhat.com> References: <20200526110318.69006-1-eesposit@redhat.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use stats_fs API instead of debugfs to create sources and add values. This also requires to change all architecture files to replace the old debugfs_entries with stats_fs_vcpu_entries and statsfs_vm_entries. The files/folders name and organization is kept unchanged, and a symlink in sys/kernel/debugfs/kvm is left for backward compatibility. Signed-off-by: Emanuele Giuseppe Esposito --- arch/arm64/kvm/Kconfig | 1 + arch/arm64/kvm/guest.c | 2 +- arch/mips/kvm/Kconfig | 1 + arch/mips/kvm/mips.c | 2 +- arch/powerpc/kvm/Kconfig | 1 + arch/powerpc/kvm/book3s.c | 12 +- arch/powerpc/kvm/booke.c | 8 +- arch/s390/kvm/Kconfig | 1 + arch/s390/kvm/kvm-s390.c | 16 +- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/Kconfig | 1 + arch/x86/kvm/Makefile | 2 +- arch/x86/kvm/debugfs.c | 64 ------- arch/x86/kvm/stats_fs.c | 60 ++++++ arch/x86/kvm/x86.c | 11 +- include/linux/kvm_host.h | 45 ++--- virt/kvm/arm/arm.c | 2 +- virt/kvm/kvm_main.c | 318 +++++--------------------------- 18 files changed, 161 insertions(+), 388 deletions(-) delete mode 100644 arch/x86/kvm/debugfs.c create mode 100644 arch/x86/kvm/stats_fs.c diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig index 449386d76441..f95f6d1c3610 100644 --- a/arch/arm64/kvm/Kconfig +++ b/arch/arm64/kvm/Kconfig @@ -23,6 +23,7 @@ config KVM depends on OF # for TASKSTATS/TASK_DELAY_ACCT: depends on NET && MULTIUSER + select STATS_FS_API select MMU_NOTIFIER select PREEMPT_NOTIFIERS select HAVE_KVM_CPU_RELAX_INTERCEPT diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c index 8417b200bec9..235ed44e4353 100644 --- a/arch/arm64/kvm/guest.c +++ b/arch/arm64/kvm/guest.c @@ -29,7 +29,7 @@ #include "trace.h" -struct kvm_stats_debugfs_item debugfs_entries[] = { +struct stats_fs_value stats_fs_vcpu_entries[] = { VCPU_STAT("halt_successful_poll", halt_successful_poll), VCPU_STAT("halt_attempted_poll", halt_attempted_poll), VCPU_STAT("halt_poll_invalid", halt_poll_invalid), diff --git a/arch/mips/kvm/Kconfig b/arch/mips/kvm/Kconfig index b91d145aa2d5..b19fbc5297b4 100644 --- a/arch/mips/kvm/Kconfig +++ b/arch/mips/kvm/Kconfig @@ -19,6 +19,7 @@ config KVM tristate "Kernel-based Virtual Machine (KVM) support" depends on HAVE_KVM depends on MIPS_FP_SUPPORT + select STATS_FS_API select EXPORT_UASM select PREEMPT_NOTIFIERS select KVM_GENERIC_DIRTYLOG_READ_PROTECT diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c index fdf1c14d9205..a47d21f35444 100644 --- a/arch/mips/kvm/mips.c +++ b/arch/mips/kvm/mips.c @@ -39,7 +39,7 @@ #define VECTORSPACING 0x100 /* for EI/VI mode */ #endif -struct kvm_stats_debugfs_item debugfs_entries[] = { +struct stats_fs_value stats_fs_vcpu_entries[] = { VCPU_STAT("wait", wait_exits), VCPU_STAT("cache", cache_exits), VCPU_STAT("signal", signal_exits), diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig index 12885eda324e..6f0675edfe7c 100644 --- a/arch/powerpc/kvm/Kconfig +++ b/arch/powerpc/kvm/Kconfig @@ -19,6 +19,7 @@ if VIRTUALIZATION config KVM bool + select STATS_FS_API select PREEMPT_NOTIFIERS select HAVE_KVM_EVENTFD select HAVE_KVM_VCPU_ASYNC_IOCTL diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c index 37508a356f28..e3346b3087d0 100644 --- a/arch/powerpc/kvm/book3s.c +++ b/arch/powerpc/kvm/book3s.c @@ -38,7 +38,7 @@ /* #define EXIT_DEBUG */ -struct kvm_stats_debugfs_item debugfs_entries[] = { +struct stats_fs_value stats_fs_vcpu_entries[] = { VCPU_STAT("exits", sum_exits), VCPU_STAT("mmio", mmio_exits), VCPU_STAT("sig", signal_exits), @@ -66,8 +66,14 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { VCPU_STAT("pthru_all", pthru_all), VCPU_STAT("pthru_host", pthru_host), VCPU_STAT("pthru_bad_aff", pthru_bad_aff), - VM_STAT("largepages_2M", num_2M_pages, .mode = 0444), - VM_STAT("largepages_1G", num_1G_pages, .mode = 0444), + { NULL } +}; + +struct stats_fs_value stats_fs_vm_entries[] = { + VM_STAT("largepages_2M", num_2M_pages, + .value_flag = STATS_FS_FLOATING_VALUE), + VM_STAT("largepages_1G", num_1G_pages, + .value_flag = STATS_FS_FLOATING_VALUE), { NULL } }; diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c index c2984cb6dfa7..b14c07786cc8 100644 --- a/arch/powerpc/kvm/booke.c +++ b/arch/powerpc/kvm/booke.c @@ -35,7 +35,12 @@ unsigned long kvmppc_booke_handlers; -struct kvm_stats_debugfs_item debugfs_entries[] = { +struct stats_fs_value stats_fs_vm_entries[] = { + VM_STAT("remote_tlb_flush", remote_tlb_flush), + { NULL } +}; + +struct stats_fs_value stats_fs_vcpu_entries[] = { VCPU_STAT("mmio", mmio_exits), VCPU_STAT("sig", signal_exits), VCPU_STAT("itlb_r", itlb_real_miss_exits), @@ -54,7 +59,6 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { VCPU_STAT("halt_wakeup", halt_wakeup), VCPU_STAT("doorbell", dbell_exits), VCPU_STAT("guest doorbell", gdbell_exits), - VM_STAT("remote_tlb_flush", remote_tlb_flush), { NULL } }; diff --git a/arch/s390/kvm/Kconfig b/arch/s390/kvm/Kconfig index def3b60f1fe8..ec8b2e04d698 100644 --- a/arch/s390/kvm/Kconfig +++ b/arch/s390/kvm/Kconfig @@ -20,6 +20,7 @@ config KVM def_tristate y prompt "Kernel-based Virtual Machine (KVM) support" depends on HAVE_KVM + select STATS_FS_API select PREEMPT_NOTIFIERS select HAVE_KVM_CPU_RELAX_INTERCEPT select HAVE_KVM_VCPU_ASYNC_IOCTL diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index dbeb7da07f18..f2f090b78529 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -57,7 +57,16 @@ #define VCPU_IRQS_MAX_BUF (sizeof(struct kvm_s390_irq) * \ (KVM_MAX_VCPUS + LOCAL_IRQS)) -struct kvm_stats_debugfs_item debugfs_entries[] = { +struct stats_fs_value stats_fs_vm_entries[] = { + VM_STAT("inject_float_mchk", inject_float_mchk), + VM_STAT("inject_io", inject_io), + VM_STAT("inject_pfault_done", inject_pfault_done), + VM_STAT("inject_service_signal", inject_service_signal), + VM_STAT("inject_virtio", inject_virtio), + { NULL } +}; + +struct stats_fs_value stats_fs_vcpu_entries[] = { VCPU_STAT("userspace_handled", exit_userspace), VCPU_STAT("exit_null", exit_null), VCPU_STAT("exit_validity", exit_validity), @@ -95,18 +104,13 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { VCPU_STAT("inject_ckc", inject_ckc), VCPU_STAT("inject_cputm", inject_cputm), VCPU_STAT("inject_external_call", inject_external_call), - VM_STAT("inject_float_mchk", inject_float_mchk), VCPU_STAT("inject_emergency_signal", inject_emergency_signal), - VM_STAT("inject_io", inject_io), VCPU_STAT("inject_mchk", inject_mchk), - VM_STAT("inject_pfault_done", inject_pfault_done), VCPU_STAT("inject_program", inject_program), VCPU_STAT("inject_restart", inject_restart), - VM_STAT("inject_service_signal", inject_service_signal), VCPU_STAT("inject_set_prefix", inject_set_prefix), VCPU_STAT("inject_stop_signal", inject_stop_signal), VCPU_STAT("inject_pfault_init", inject_pfault_init), - VM_STAT("inject_virtio", inject_virtio), VCPU_STAT("instruction_epsw", instruction_epsw), VCPU_STAT("instruction_gs", instruction_gs), VCPU_STAT("instruction_io_other", instruction_io_other), diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 42a2d0d3984a..6a04f590963f 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -35,7 +35,7 @@ #include #include -#define __KVM_HAVE_ARCH_VCPU_DEBUGFS +#define __KVM_HAVE_ARCH_VCPU_STATS_FS #define KVM_MAX_VCPUS 288 #define KVM_SOFT_MAX_VCPUS 240 diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig index d8154e0684b6..0b53bb14c97e 100644 --- a/arch/x86/kvm/Kconfig +++ b/arch/x86/kvm/Kconfig @@ -25,6 +25,7 @@ config KVM # for TASKSTATS/TASK_DELAY_ACCT: depends on NET && MULTIUSER depends on X86_LOCAL_APIC + select STATS_FS_API select PREEMPT_NOTIFIERS select MMU_NOTIFIER select HAVE_KVM_IRQCHIP diff --git a/arch/x86/kvm/Makefile b/arch/x86/kvm/Makefile index a789759b7261..18285a382eba 100644 --- a/arch/x86/kvm/Makefile +++ b/arch/x86/kvm/Makefile @@ -11,7 +11,7 @@ kvm-$(CONFIG_KVM_ASYNC_PF) += $(KVM)/async_pf.o kvm-y += x86.o emulate.o i8259.o irq.o lapic.o \ i8254.o ioapic.o irq_comm.o cpuid.o pmu.o mtrr.o \ - hyperv.o debugfs.o mmu/mmu.o mmu/page_track.o + hyperv.o stats_fs.o mmu/mmu.o mmu/page_track.o kvm-intel-y += vmx/vmx.o vmx/vmenter.o vmx/pmu_intel.o vmx/vmcs12.o vmx/evmcs.o vmx/nested.o kvm-amd-y += svm/svm.o svm/vmenter.o svm/pmu.o svm/nested.o svm/avic.o svm/sev.o diff --git a/arch/x86/kvm/debugfs.c b/arch/x86/kvm/debugfs.c deleted file mode 100644 index 018aebce33ff..000000000000 --- a/arch/x86/kvm/debugfs.c +++ /dev/null @@ -1,64 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Kernel-based Virtual Machine driver for Linux - * - * Copyright 2016 Red Hat, Inc. and/or its affiliates. - */ -#include -#include -#include "lapic.h" - -static int vcpu_get_timer_advance_ns(void *data, u64 *val) -{ - struct kvm_vcpu *vcpu = (struct kvm_vcpu *) data; - *val = vcpu->arch.apic->lapic_timer.timer_advance_ns; - return 0; -} - -DEFINE_SIMPLE_ATTRIBUTE(vcpu_timer_advance_ns_fops, vcpu_get_timer_advance_ns, NULL, "%llu\n"); - -static int vcpu_get_tsc_offset(void *data, u64 *val) -{ - struct kvm_vcpu *vcpu = (struct kvm_vcpu *) data; - *val = vcpu->arch.tsc_offset; - return 0; -} - -DEFINE_SIMPLE_ATTRIBUTE(vcpu_tsc_offset_fops, vcpu_get_tsc_offset, NULL, "%lld\n"); - -static int vcpu_get_tsc_scaling_ratio(void *data, u64 *val) -{ - struct kvm_vcpu *vcpu = (struct kvm_vcpu *) data; - *val = vcpu->arch.tsc_scaling_ratio; - return 0; -} - -DEFINE_SIMPLE_ATTRIBUTE(vcpu_tsc_scaling_fops, vcpu_get_tsc_scaling_ratio, NULL, "%llu\n"); - -static int vcpu_get_tsc_scaling_frac_bits(void *data, u64 *val) -{ - *val = kvm_tsc_scaling_ratio_frac_bits; - return 0; -} - -DEFINE_SIMPLE_ATTRIBUTE(vcpu_tsc_scaling_frac_fops, vcpu_get_tsc_scaling_frac_bits, NULL, "%llu\n"); - -void kvm_arch_create_vcpu_debugfs(struct kvm_vcpu *vcpu) -{ - debugfs_create_file("tsc-offset", 0444, vcpu->debugfs_dentry, vcpu, - &vcpu_tsc_offset_fops); - - if (lapic_in_kernel(vcpu)) - debugfs_create_file("lapic_timer_advance_ns", 0444, - vcpu->debugfs_dentry, vcpu, - &vcpu_timer_advance_ns_fops); - - if (kvm_has_tsc_control) { - debugfs_create_file("tsc-scaling-ratio", 0444, - vcpu->debugfs_dentry, vcpu, - &vcpu_tsc_scaling_fops); - debugfs_create_file("tsc-scaling-ratio-frac-bits", 0444, - vcpu->debugfs_dentry, vcpu, - &vcpu_tsc_scaling_frac_fops); - } -} diff --git a/arch/x86/kvm/stats_fs.c b/arch/x86/kvm/stats_fs.c new file mode 100644 index 000000000000..f6edebb9c559 --- /dev/null +++ b/arch/x86/kvm/stats_fs.c @@ -0,0 +1,60 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Kernel-based Virtual Machine driver for Linux + * + * Copyright 2016 Red Hat, Inc. and/or its affiliates. + */ +#include +#include +#include "lapic.h" + +#define VCPU_ARCH_STATS_FS(n, s, x, ...) \ + { n, offsetof(struct s, x), .aggr_kind = STATS_FS_SUM, \ + ##__VA_ARGS__ } + +struct stats_fs_value stats_fs_vcpu_tsc_offset[] = { + VCPU_ARCH_STATS_FS("tsc-offset", kvm_vcpu_arch, tsc_offset, + .type = &stats_fs_type_s64, + .value_flag = STATS_FS_FLOATING_VALUE), + { NULL } +}; + +struct stats_fs_value stats_fs_vcpu_arch_lapic_timer[] = { + VCPU_ARCH_STATS_FS("lapic_timer_advance_ns", kvm_timer, timer_advance_ns, + .type = &stats_fs_type_u64, + .value_flag = STATS_FS_FLOATING_VALUE), + { NULL } +}; + +struct stats_fs_value stats_fs_vcpu_arch_tsc_ratio[] = { + VCPU_ARCH_STATS_FS("tsc-scaling-ratio", kvm_vcpu_arch, tsc_scaling_ratio, + .type = &stats_fs_type_u64, + .value_flag = STATS_FS_FLOATING_VALUE), + { NULL } +}; + +struct stats_fs_value stats_fs_vcpu_arch_tsc_frac[] = { + { "tsc-scaling-ratio-frac-bits", 0, .type = &stats_fs_type_u64, + .value_flag = STATS_FS_FLOATING_VALUE }, + { NULL } /* base is &kvm_tsc_scaling_ratio_frac_bits */ +}; + +void kvm_arch_create_vcpu_stats_fs(struct kvm_vcpu *vcpu) +{ + stats_fs_source_add_values(vcpu->stats_fs_src, stats_fs_vcpu_tsc_offset, + &vcpu->arch, 0); + + if (lapic_in_kernel(vcpu)) + stats_fs_source_add_values(vcpu->stats_fs_src, + stats_fs_vcpu_arch_lapic_timer, + &vcpu->arch.apic->lapic_timer, 0); + + if (kvm_has_tsc_control) { + stats_fs_source_add_values(vcpu->stats_fs_src, + stats_fs_vcpu_arch_tsc_ratio, + &vcpu->arch, 0); + stats_fs_source_add_values(vcpu->stats_fs_src, + stats_fs_vcpu_arch_tsc_frac, + &kvm_tsc_scaling_ratio_frac_bits, 0); + } +} diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 35723dafedeb..e441fbc00c03 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -190,7 +190,7 @@ static u64 __read_mostly host_xss; u64 __read_mostly supported_xss; EXPORT_SYMBOL_GPL(supported_xss); -struct kvm_stats_debugfs_item debugfs_entries[] = { +struct stats_fs_value stats_fs_vcpu_entries[] = { VCPU_STAT("pf_fixed", pf_fixed), VCPU_STAT("pf_guest", pf_guest), VCPU_STAT("tlb_flush", tlb_flush), @@ -217,6 +217,10 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { VCPU_STAT("nmi_injections", nmi_injections), VCPU_STAT("req_event", req_event), VCPU_STAT("l1d_flush", l1d_flush), + { NULL } +}; + +struct stats_fs_value stats_fs_vm_entries[] = { VM_STAT("mmu_shadow_zapped", mmu_shadow_zapped), VM_STAT("mmu_pte_write", mmu_pte_write), VM_STAT("mmu_pte_updated", mmu_pte_updated), @@ -226,8 +230,9 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { VM_STAT("mmu_cache_miss", mmu_cache_miss), VM_STAT("mmu_unsync", mmu_unsync), VM_STAT("remote_tlb_flush", remote_tlb_flush), - VM_STAT("largepages", lpages, .mode = 0444), - VM_STAT("nx_largepages_splitted", nx_lpage_splits, .mode = 0444), + VM_STAT("largepages", lpages, .value_flag = STATS_FS_FLOATING_VALUE), + VM_STAT("nx_largepages_splitted", nx_lpage_splits, + .value_flag = STATS_FS_FLOATING_VALUE), VM_STAT("max_mmu_page_hash_collisions", max_mmu_page_hash_collisions), { NULL } }; diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 3845f857ef7b..f7b6a48bac8f 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -318,7 +319,7 @@ struct kvm_vcpu { bool preempted; bool ready; struct kvm_vcpu_arch arch; - struct dentry *debugfs_dentry; + struct stats_fs_source *stats_fs_src; }; static inline int kvm_vcpu_exiting_guest_mode(struct kvm_vcpu *vcpu) @@ -498,8 +499,7 @@ struct kvm { long tlbs_dirty; struct list_head devices; u64 manual_dirty_log_protect; - struct dentry *debugfs_dentry; - struct kvm_stat_data **debugfs_stat_data; + struct stats_fs_source *stats_fs_src; struct srcu_struct srcu; struct srcu_struct irq_srcu; pid_t userspace_pid; @@ -880,8 +880,8 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu); void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu); void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu); -#ifdef __KVM_HAVE_ARCH_VCPU_DEBUGFS -void kvm_arch_create_vcpu_debugfs(struct kvm_vcpu *vcpu); +#ifdef __KVM_HAVE_ARCH_VCPU_STATS_FS +void kvm_arch_create_vcpu_stats_fs(struct kvm_vcpu *vcpu); #endif int kvm_arch_hardware_enable(void); @@ -1110,33 +1110,16 @@ static inline bool kvm_is_error_gpa(struct kvm *kvm, gpa_t gpa) return kvm_is_error_hva(hva); } -enum kvm_stat_kind { - KVM_STAT_VM, - KVM_STAT_VCPU, -}; - -struct kvm_stat_data { - struct kvm *kvm; - struct kvm_stats_debugfs_item *dbgfs_item; -}; - -struct kvm_stats_debugfs_item { - const char *name; - int offset; - enum kvm_stat_kind kind; - int mode; -}; - -#define KVM_DBGFS_GET_MODE(dbgfs_item) \ - ((dbgfs_item)->mode ? (dbgfs_item)->mode : 0644) - -#define VM_STAT(n, x, ...) \ - { n, offsetof(struct kvm, stat.x), KVM_STAT_VM, ## __VA_ARGS__ } -#define VCPU_STAT(n, x, ...) \ - { n, offsetof(struct kvm_vcpu, stat.x), KVM_STAT_VCPU, ## __VA_ARGS__ } +#define VM_STAT(n, x, ...) \ + { n, offsetof(struct kvm, stat.x), &stats_fs_type_u64, \ + STATS_FS_SUM, ## __VA_ARGS__ } +#define VCPU_STAT(n, x, ...) \ + { n, offsetof(struct kvm_vcpu, stat.x), &stats_fs_type_u64, \ + STATS_FS_SUM, ## __VA_ARGS__ } -extern struct kvm_stats_debugfs_item debugfs_entries[]; -extern struct dentry *kvm_debugfs_dir; +extern struct stats_fs_value stats_fs_vcpu_entries[]; +extern struct stats_fs_value stats_fs_vm_entries[]; +extern struct stats_fs_source *kvm_stats_fs_dir; #if defined(CONFIG_MMU_NOTIFIER) && defined(KVM_ARCH_WANT_MMU_NOTIFIER) static inline int mmu_notifier_retry(struct kvm *kvm, unsigned long mmu_seq) diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c index 48d0ec44ad77..4171f92fa473 100644 --- a/virt/kvm/arm/arm.c +++ b/virt/kvm/arm/arm.c @@ -140,7 +140,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) return ret; } -int kvm_arch_create_vcpu_debugfs(struct kvm_vcpu *vcpu) +int kvm_arch_create_vcpu_stats_fs(struct kvm_vcpu *vcpu) { return 0; } diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 74bdb7bf3295..3d2dccb5234e 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -109,11 +110,8 @@ static struct kmem_cache *kvm_vcpu_cache; static __read_mostly struct preempt_ops kvm_preempt_ops; static DEFINE_PER_CPU(struct kvm_vcpu *, kvm_running_vcpu); -struct dentry *kvm_debugfs_dir; -EXPORT_SYMBOL_GPL(kvm_debugfs_dir); - -static int kvm_debugfs_num_entries; -static const struct file_operations stat_fops_per_vm; +struct stats_fs_source *kvm_stats_fs_dir; +EXPORT_SYMBOL_GPL(kvm_stats_fs_dir); static long kvm_vcpu_ioctl(struct file *file, unsigned int ioctl, unsigned long arg); @@ -356,6 +354,8 @@ static void kvm_vcpu_init(struct kvm_vcpu *vcpu, struct kvm *kvm, unsigned id) void kvm_vcpu_destroy(struct kvm_vcpu *vcpu) { + stats_fs_source_revoke(vcpu->stats_fs_src); + stats_fs_source_put(vcpu->stats_fs_src); kvm_arch_vcpu_destroy(vcpu); /* @@ -601,52 +601,29 @@ static void kvm_free_memslots(struct kvm *kvm, struct kvm_memslots *slots) kvfree(slots); } -static void kvm_destroy_vm_debugfs(struct kvm *kvm) +static void kvm_destroy_vm_stats_fs(struct kvm *kvm) { - int i; - - if (!kvm->debugfs_dentry) - return; - - debugfs_remove_recursive(kvm->debugfs_dentry); - - if (kvm->debugfs_stat_data) { - for (i = 0; i < kvm_debugfs_num_entries; i++) - kfree(kvm->debugfs_stat_data[i]); - kfree(kvm->debugfs_stat_data); - } + stats_fs_source_remove_subordinate(kvm_stats_fs_dir, kvm->stats_fs_src); + stats_fs_source_revoke(kvm->stats_fs_src); + stats_fs_source_put(kvm->stats_fs_src); } -static int kvm_create_vm_debugfs(struct kvm *kvm, int fd) +static int kvm_create_vm_stats_fs(struct kvm *kvm, int fd) { char dir_name[ITOA_MAX_LEN * 2]; - struct kvm_stat_data *stat_data; - struct kvm_stats_debugfs_item *p; - if (!debugfs_initialized()) + if (!stats_fs_initialized()) return 0; snprintf(dir_name, sizeof(dir_name), "%d-%d", task_pid_nr(current), fd); - kvm->debugfs_dentry = debugfs_create_dir(dir_name, kvm_debugfs_dir); + kvm->stats_fs_src = stats_fs_source_create(0, dir_name); + stats_fs_source_add_subordinate(kvm_stats_fs_dir, kvm->stats_fs_src); - kvm->debugfs_stat_data = kcalloc(kvm_debugfs_num_entries, - sizeof(*kvm->debugfs_stat_data), - GFP_KERNEL_ACCOUNT); - if (!kvm->debugfs_stat_data) - return -ENOMEM; + stats_fs_source_add_values(kvm->stats_fs_src, stats_fs_vm_entries, + kvm, 0); - for (p = debugfs_entries; p->name; p++) { - stat_data = kzalloc(sizeof(*stat_data), GFP_KERNEL_ACCOUNT); - if (!stat_data) - return -ENOMEM; - - stat_data->kvm = kvm; - stat_data->dbgfs_item = p; - kvm->debugfs_stat_data[p - debugfs_entries] = stat_data; - debugfs_create_file(p->name, KVM_DBGFS_GET_MODE(p), - kvm->debugfs_dentry, stat_data, - &stat_fops_per_vm); - } + stats_fs_source_add_values(kvm->stats_fs_src, stats_fs_vcpu_entries, + NULL, 0); return 0; } @@ -783,7 +760,7 @@ static void kvm_destroy_vm(struct kvm *kvm) struct mm_struct *mm = kvm->mm; kvm_uevent_notify_change(KVM_EVENT_DESTROY_VM, kvm); - kvm_destroy_vm_debugfs(kvm); + kvm_destroy_vm_stats_fs(kvm); kvm_arch_sync_events(kvm); mutex_lock(&kvm_lock); list_del(&kvm->vm_list); @@ -2946,7 +2923,6 @@ static int kvm_vcpu_release(struct inode *inode, struct file *filp) { struct kvm_vcpu *vcpu = filp->private_data; - debugfs_remove_recursive(vcpu->debugfs_dentry); kvm_put_kvm(vcpu->kvm); return 0; } @@ -2970,19 +2946,23 @@ static int create_vcpu_fd(struct kvm_vcpu *vcpu) return anon_inode_getfd(name, &kvm_vcpu_fops, vcpu, O_RDWR | O_CLOEXEC); } -static void kvm_create_vcpu_debugfs(struct kvm_vcpu *vcpu) +static void kvm_create_vcpu_stats_fs(struct kvm_vcpu *vcpu) { -#ifdef __KVM_HAVE_ARCH_VCPU_DEBUGFS char dir_name[ITOA_MAX_LEN * 2]; - if (!debugfs_initialized()) + if (!stats_fs_initialized()) return; snprintf(dir_name, sizeof(dir_name), "vcpu%d", vcpu->vcpu_id); - vcpu->debugfs_dentry = debugfs_create_dir(dir_name, - vcpu->kvm->debugfs_dentry); - kvm_arch_create_vcpu_debugfs(vcpu); + vcpu->stats_fs_src = stats_fs_source_create(0, dir_name); + stats_fs_source_add_subordinate(vcpu->kvm->stats_fs_src, vcpu->stats_fs_src); + + stats_fs_source_add_values(vcpu->stats_fs_src, stats_fs_vcpu_entries, vcpu, + STATS_FS_HIDDEN); + +#ifdef __KVM_HAVE_ARCH_VCPU_STATS_FS + kvm_arch_create_vcpu_stats_fs(vcpu); #endif } @@ -3031,8 +3011,6 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id) if (r) goto vcpu_free_run_page; - kvm_create_vcpu_debugfs(vcpu); - mutex_lock(&kvm->lock); if (kvm_get_vcpu_by_id(kvm, id)) { r = -EEXIST; @@ -3061,11 +3039,11 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id) mutex_unlock(&kvm->lock); kvm_arch_vcpu_postcreate(vcpu); + kvm_create_vcpu_stats_fs(vcpu); return r; unlock_vcpu_destroy: mutex_unlock(&kvm->lock); - debugfs_remove_recursive(vcpu->debugfs_dentry); kvm_arch_vcpu_destroy(vcpu); vcpu_free_run_page: free_page((unsigned long)vcpu->run); @@ -3839,7 +3817,7 @@ static int kvm_dev_ioctl_create_vm(unsigned long type) * cases it will be called by the final fput(file) and will take * care of doing kvm_put_kvm(kvm). */ - if (kvm_create_vm_debugfs(kvm, r) < 0) { + if (kvm_create_vm_stats_fs(kvm, r) < 0) { put_unused_fd(r); fput(file); return -ENOMEM; @@ -4295,214 +4273,6 @@ struct kvm_io_device *kvm_io_bus_get_dev(struct kvm *kvm, enum kvm_bus bus_idx, } EXPORT_SYMBOL_GPL(kvm_io_bus_get_dev); -static int kvm_debugfs_open(struct inode *inode, struct file *file, - int (*get)(void *, u64 *), int (*set)(void *, u64), - const char *fmt) -{ - struct kvm_stat_data *stat_data = (struct kvm_stat_data *) - inode->i_private; - - /* The debugfs files are a reference to the kvm struct which - * is still valid when kvm_destroy_vm is called. - * To avoid the race between open and the removal of the debugfs - * directory we test against the users count. - */ - if (!refcount_inc_not_zero(&stat_data->kvm->users_count)) - return -ENOENT; - - if (simple_attr_open(inode, file, get, - KVM_DBGFS_GET_MODE(stat_data->dbgfs_item) & 0222 - ? set : NULL, - fmt)) { - kvm_put_kvm(stat_data->kvm); - return -ENOMEM; - } - - return 0; -} - -static int kvm_debugfs_release(struct inode *inode, struct file *file) -{ - struct kvm_stat_data *stat_data = (struct kvm_stat_data *) - inode->i_private; - - simple_attr_release(inode, file); - kvm_put_kvm(stat_data->kvm); - - return 0; -} - -static int kvm_get_stat_per_vm(struct kvm *kvm, size_t offset, u64 *val) -{ - *val = *(ulong *)((void *)kvm + offset); - - return 0; -} - -static int kvm_clear_stat_per_vm(struct kvm *kvm, size_t offset) -{ - *(ulong *)((void *)kvm + offset) = 0; - - return 0; -} - -static int kvm_get_stat_per_vcpu(struct kvm *kvm, size_t offset, u64 *val) -{ - int i; - struct kvm_vcpu *vcpu; - - *val = 0; - - kvm_for_each_vcpu(i, vcpu, kvm) - *val += *(u64 *)((void *)vcpu + offset); - - return 0; -} - -static int kvm_clear_stat_per_vcpu(struct kvm *kvm, size_t offset) -{ - int i; - struct kvm_vcpu *vcpu; - - kvm_for_each_vcpu(i, vcpu, kvm) - *(u64 *)((void *)vcpu + offset) = 0; - - return 0; -} - -static int kvm_stat_data_get(void *data, u64 *val) -{ - int r = -EFAULT; - struct kvm_stat_data *stat_data = (struct kvm_stat_data *)data; - - switch (stat_data->dbgfs_item->kind) { - case KVM_STAT_VM: - r = kvm_get_stat_per_vm(stat_data->kvm, - stat_data->dbgfs_item->offset, val); - break; - case KVM_STAT_VCPU: - r = kvm_get_stat_per_vcpu(stat_data->kvm, - stat_data->dbgfs_item->offset, val); - break; - } - - return r; -} - -static int kvm_stat_data_clear(void *data, u64 val) -{ - int r = -EFAULT; - struct kvm_stat_data *stat_data = (struct kvm_stat_data *)data; - - if (val) - return -EINVAL; - - switch (stat_data->dbgfs_item->kind) { - case KVM_STAT_VM: - r = kvm_clear_stat_per_vm(stat_data->kvm, - stat_data->dbgfs_item->offset); - break; - case KVM_STAT_VCPU: - r = kvm_clear_stat_per_vcpu(stat_data->kvm, - stat_data->dbgfs_item->offset); - break; - } - - return r; -} - -static int kvm_stat_data_open(struct inode *inode, struct file *file) -{ - __simple_attr_check_format("%llu\n", 0ull); - return kvm_debugfs_open(inode, file, kvm_stat_data_get, - kvm_stat_data_clear, "%llu\n"); -} - -static const struct file_operations stat_fops_per_vm = { - .owner = THIS_MODULE, - .open = kvm_stat_data_open, - .release = kvm_debugfs_release, - .read = simple_attr_read, - .write = simple_attr_write, - .llseek = no_llseek, -}; - -static int vm_stat_get(void *_offset, u64 *val) -{ - unsigned offset = (long)_offset; - struct kvm *kvm; - u64 tmp_val; - - *val = 0; - mutex_lock(&kvm_lock); - list_for_each_entry(kvm, &vm_list, vm_list) { - kvm_get_stat_per_vm(kvm, offset, &tmp_val); - *val += tmp_val; - } - mutex_unlock(&kvm_lock); - return 0; -} - -static int vm_stat_clear(void *_offset, u64 val) -{ - unsigned offset = (long)_offset; - struct kvm *kvm; - - if (val) - return -EINVAL; - - mutex_lock(&kvm_lock); - list_for_each_entry(kvm, &vm_list, vm_list) { - kvm_clear_stat_per_vm(kvm, offset); - } - mutex_unlock(&kvm_lock); - - return 0; -} - -DEFINE_SIMPLE_ATTRIBUTE(vm_stat_fops, vm_stat_get, vm_stat_clear, "%llu\n"); - -static int vcpu_stat_get(void *_offset, u64 *val) -{ - unsigned offset = (long)_offset; - struct kvm *kvm; - u64 tmp_val; - - *val = 0; - mutex_lock(&kvm_lock); - list_for_each_entry(kvm, &vm_list, vm_list) { - kvm_get_stat_per_vcpu(kvm, offset, &tmp_val); - *val += tmp_val; - } - mutex_unlock(&kvm_lock); - return 0; -} - -static int vcpu_stat_clear(void *_offset, u64 val) -{ - unsigned offset = (long)_offset; - struct kvm *kvm; - - if (val) - return -EINVAL; - - mutex_lock(&kvm_lock); - list_for_each_entry(kvm, &vm_list, vm_list) { - kvm_clear_stat_per_vcpu(kvm, offset); - } - mutex_unlock(&kvm_lock); - - return 0; -} - -DEFINE_SIMPLE_ATTRIBUTE(vcpu_stat_fops, vcpu_stat_get, vcpu_stat_clear, - "%llu\n"); - -static const struct file_operations *stat_fops[] = { - [KVM_STAT_VCPU] = &vcpu_stat_fops, - [KVM_STAT_VM] = &vm_stat_fops, -}; - static void kvm_uevent_notify_change(unsigned int type, struct kvm *kvm) { struct kobj_uevent_env *env; @@ -4537,34 +4307,33 @@ static void kvm_uevent_notify_change(unsigned int type, struct kvm *kvm) } add_uevent_var(env, "PID=%d", kvm->userspace_pid); - if (!IS_ERR_OR_NULL(kvm->debugfs_dentry)) { + if (!IS_ERR_OR_NULL(kvm->stats_fs_src->source_dentry)) { char *tmp, *p = kmalloc(PATH_MAX, GFP_KERNEL_ACCOUNT); if (p) { - tmp = dentry_path_raw(kvm->debugfs_dentry, p, PATH_MAX); + tmp = dentry_path_raw(kvm->stats_fs_src->source_dentry, + p, PATH_MAX); if (!IS_ERR(tmp)) add_uevent_var(env, "STATS_PATH=%s", tmp); kfree(p); } } + /* no need for checks, since we are adding at most only 5 keys */ env->envp[env->envp_idx++] = NULL; kobject_uevent_env(&kvm_dev.this_device->kobj, KOBJ_CHANGE, env->envp); kfree(env); } -static void kvm_init_debug(void) +static void kvm_init_stats_fs(void) { - struct kvm_stats_debugfs_item *p; + kvm_stats_fs_dir = stats_fs_source_create(0, "kvm"); + /* symlink to debugfs */ + debugfs_create_symlink("kvm", NULL, "/sys/kernel/stats/kvm"); + stats_fs_source_register(kvm_stats_fs_dir); - kvm_debugfs_dir = debugfs_create_dir("kvm", NULL); - - kvm_debugfs_num_entries = 0; - for (p = debugfs_entries; p->name; ++p, kvm_debugfs_num_entries++) { - debugfs_create_file(p->name, KVM_DBGFS_GET_MODE(p), - kvm_debugfs_dir, (void *)(long)p->offset, - stat_fops[p->kind]); - } + stats_fs_source_add_values(kvm_stats_fs_dir, stats_fs_vcpu_entries, NULL, 0); + stats_fs_source_add_values(kvm_stats_fs_dir, stats_fs_vm_entries, NULL, 0); } static int kvm_suspend(void) @@ -4738,7 +4507,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, kvm_preempt_ops.sched_in = kvm_sched_in; kvm_preempt_ops.sched_out = kvm_sched_out; - kvm_init_debug(); + kvm_init_stats_fs(); r = kvm_vfio_ops_init(); WARN_ON(r); @@ -4767,7 +4536,8 @@ EXPORT_SYMBOL_GPL(kvm_init); void kvm_exit(void) { - debugfs_remove_recursive(kvm_debugfs_dir); + stats_fs_source_revoke(kvm_stats_fs_dir); + stats_fs_source_put(kvm_stats_fs_dir); misc_deregister(&kvm_dev); kmem_cache_destroy(kvm_vcpu_cache); kvm_async_pf_deinit(); From patchwork Tue May 26 11:03:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emanuele Giuseppe Esposito X-Patchwork-Id: 218543 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 790DCC433DF for ; Tue, 26 May 2020 11:05:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 50850207CB for ; Tue, 26 May 2020 11:05:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="WfzmWy96" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389175AbgEZLFw (ORCPT ); Tue, 26 May 2020 07:05:52 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:26744 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2389115AbgEZLFu (ORCPT ); Tue, 26 May 2020 07:05:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590491148; 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=YL7I5JCIHEnCOMA27cTClA3wSdtYCHTGXJdbbFxfa+8=; b=WfzmWy96QKi5ekA1JKgXSwX1RSnZgHvJV9OKmTWFVTJ2AcC/9OXXOQLZ8XucgHO6QRPaXs 1WgMwR71vkLGummXyeYBN2SsJ8tVPqE82xyBGByetceYpsMmPd2baKkh5KbYKJLXoRmuZO zfPLY7fRDwn8fzeQk7TK3/zu6GUlB0c= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-396-ubjJvmOMPZ-jK9NwQv-IaA-1; Tue, 26 May 2020 07:05:46 -0400 X-MC-Unique: ubjJvmOMPZ-jK9NwQv-IaA-1 Received: by mail-wm1-f70.google.com with SMTP id b63so504250wme.1 for ; Tue, 26 May 2020 04:05:46 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=YL7I5JCIHEnCOMA27cTClA3wSdtYCHTGXJdbbFxfa+8=; b=iJ3BnMTdNGdKHIQlgR+4ZtV0KoznmKKS616DWFh5QeA3rW/EJi9Sgx0Nnu/fCOAnGA X1NxnAo0wf+lLTcjZMEnwv8Xdp+1gblsqsOzCnt62flb6PzuqkDKVvWCvY2Y0K5TqHUU lY9DbzitUwPFZbRX8faLdCtAwtr60/0nLG6wPWwaf7XEJytHFJ7c890Ywd9KcJp+4Eue z73ba2D+rpUB31t8ehgtQ0aLzO8fbVc05QOghSs1M/rDD6TzLp2b6VsJUrTLpIg/gW1x TpXJuSV9LlAwEP/b6J9t741MYJ44g11FMs3hra1wZgWQd00/YyDj0X82Kk9MyYjgogEs fXpw== X-Gm-Message-State: AOAM533tvnUbLWncC9ozUblepyZztu625u7OhTVYKQV9VUMtS6sllQE/ 7KcdUG18iAJyB0xtRHKLTrxW1Ipc6aqAo7z+Nsx/EowSIg50v7cXOtUKeVQURPr8iBnDu+10Iov l8z+qBSs6Z++xVsIu X-Received: by 2002:a5d:484b:: with SMTP id n11mr18085344wrs.356.1590491145438; Tue, 26 May 2020 04:05:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyo4BV3xWVL52mX4Nu+TG9ys/JSV0Y3savYX2kM7iRzxuz+P1aX7wtkuMtb+MvbeCMZqXp14Q== X-Received: by 2002:a5d:484b:: with SMTP id n11mr18085316wrs.356.1590491145188; Tue, 26 May 2020 04:05:45 -0700 (PDT) Received: from localhost.localdomain.com ([194.230.155.118]) by smtp.gmail.com with ESMTPSA id d6sm22928240wrj.90.2020.05.26.04.05.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 04:05:36 -0700 (PDT) From: Emanuele Giuseppe Esposito To: kvm@vger.kernel.org Cc: Christian Borntraeger , Paolo Bonzini , Jim Mattson , Alexander Viro , Emanuele Giuseppe Esposito , David Rientjes , Jonathan Adams , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, kvm-ppc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-fsdevel@vger.kernel.org, netdev@vger.kernel.org, Emanuele Giuseppe Esposito Subject: [PATCH v3 7/7] [not for merge] netstats: example use of stats_fs API Date: Tue, 26 May 2020 13:03:17 +0200 Message-Id: <20200526110318.69006-8-eesposit@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200526110318.69006-1-eesposit@redhat.com> References: <20200526110318.69006-1-eesposit@redhat.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Apply stats_fs on the networking statistics subsystem. Currently it only works with disabled network namespace (CONFIG_NET_NS=n), because multiple namespaces will have the same device name under the same root source that will cause a conflict in stats_fs. Signed-off-by: Emanuele Giuseppe Esposito --- include/linux/netdevice.h | 2 ++ net/Kconfig | 1 + net/core/dev.c | 66 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 130a668049ab..408c4e7b0e21 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -48,6 +48,7 @@ #include #include #include +#include struct netpoll_info; struct device; @@ -2117,6 +2118,7 @@ struct net_device { unsigned wol_enabled:1; struct list_head net_notifier_list; + struct stats_fs_source *stats_fs_src; #if IS_ENABLED(CONFIG_MACSEC) /* MACsec management functions */ diff --git a/net/Kconfig b/net/Kconfig index df8d8c9bd021..3441d5bb6107 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -8,6 +8,7 @@ menuconfig NET select NLATTR select GENERIC_NET_UTILS select BPF + select STATS_FS_API ---help--- Unless you really know what you are doing, you should say Y here. The reason is that some programs need kernel networking support even diff --git a/net/core/dev.c b/net/core/dev.c index 522288177bbd..3db48cd1a097 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -142,6 +142,7 @@ #include #include #include +#include #include "net-sysfs.h" @@ -150,6 +151,11 @@ /* This should be increased if a protocol with a bigger head is added. */ #define GRO_MAX_HEAD (MAX_HEADER + 128) +#define NETDEV_STAT(str, m, ...) \ + { str, offsetof(struct rtnl_link_stats64, m), \ + &stats_fs_type_netdev_u64, \ + STATS_FS_SUM, ## __VA_ARGS__ } + static DEFINE_SPINLOCK(ptype_lock); static DEFINE_SPINLOCK(offload_lock); struct list_head ptype_base[PTYPE_HASH_SIZE] __read_mostly; @@ -196,6 +202,53 @@ static DEFINE_READ_MOSTLY_HASHTABLE(napi_hash, 8); static seqcount_t devnet_rename_seq; +static uint64_t stats_fs_get_netdev_u64(struct stats_fs_value *val, + void *base) +{ + struct net_device *netdev = (struct net_device *)base; + struct rtnl_link_stats64 net_stats; + + dev_get_stats(netdev, &net_stats); + + return stats_fs_get_u64(val, &net_stats); +} + +static struct stats_fs_type stats_fs_type_netdev_u64 = { + .get = stats_fs_get_netdev_u64, + .clear = NULL, + .sign = false +}; + +static struct stats_fs_source *netdev_root; + +static struct stats_fs_value stats_fs_netdev_entries[] = { + NETDEV_STAT("rx_packets", rx_packets), + NETDEV_STAT("tx_packets", tx_packets), + NETDEV_STAT("rx_bytes", rx_bytes), + NETDEV_STAT("tx_bytes", tx_bytes), + NETDEV_STAT("rx_errors", rx_errors), + NETDEV_STAT("tx_errors", tx_errors), + NETDEV_STAT("rx_dropped", rx_dropped), + NETDEV_STAT("tx_dropped", tx_dropped), + NETDEV_STAT("multicast", multicast), + NETDEV_STAT("collisions", collisions), + NETDEV_STAT("rx_length_errors", rx_length_errors), + NETDEV_STAT("rx_over_errors", rx_over_errors), + NETDEV_STAT("rx_crc_errors", rx_crc_errors), + NETDEV_STAT("rx_frame_errors", rx_frame_errors), + NETDEV_STAT("rx_fifo_errors", rx_fifo_errors), + NETDEV_STAT("rx_missed_errors", rx_missed_errors), + NETDEV_STAT("tx_aborted_errors", tx_aborted_errors), + NETDEV_STAT("tx_carrier_errors", tx_carrier_errors), + NETDEV_STAT("tx_fifo_errors", tx_fifo_errors), + NETDEV_STAT("tx_heartbeat_errors", tx_heartbeat_errors), + NETDEV_STAT("tx_window_errors", tx_window_errors), + NETDEV_STAT("rx_compressed", rx_compressed), + NETDEV_STAT("tx_compressed", tx_compressed), + NETDEV_STAT("rx_nohandler", rx_nohandler), + { NULL } +}; + static inline void dev_base_seq_inc(struct net *net) { while (++net->dev_base_seq == 0) @@ -8783,6 +8836,11 @@ static void rollback_registered_many(struct list_head *head) ASSERT_RTNL(); list_for_each_entry_safe(dev, tmp, head, unreg_list) { + stats_fs_source_remove_subordinate(netdev_root, + dev->stats_fs_src); + stats_fs_source_revoke(dev->stats_fs_src); + stats_fs_source_put(dev->stats_fs_src); + /* Some devices call without registering * for initialization unwind. Remove those * devices and proceed with the remaining. @@ -9436,6 +9494,11 @@ int register_netdevice(struct net_device *dev) dev->rtnl_link_state == RTNL_LINK_INITIALIZED) rtmsg_ifinfo(RTM_NEWLINK, dev, ~0U, GFP_KERNEL); + dev->stats_fs_src = stats_fs_source_create(0, dev->name); + stats_fs_source_add_subordinate(netdev_root, dev->stats_fs_src); + stats_fs_source_add_values(dev->stats_fs_src, stats_fs_netdev_entries, + dev, 0); + out: return ret; @@ -10500,6 +10563,9 @@ static int __init net_dev_init(void) if (netdev_kobject_init()) goto out; + netdev_root = stats_fs_source_create(0, "net"); + stats_fs_source_register(netdev_root); + INIT_LIST_HEAD(&ptype_all); for (i = 0; i < PTYPE_HASH_SIZE; i++) INIT_LIST_HEAD(&ptype_base[i]);