| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20220907004935.3971173-6-adel.abushaev@gmail.com>
Date: Tue, 6 Sep 2022 17:49:34 -0700
From: Adel Abouchaev <adel.abushaev@...il.com>
To: davem@...emloft.net, edumazet@...gle.com, kuba@...nel.org,
pabeni@...hat.com, corbet@....net, dsahern@...nel.org,
shuah@...nel.org, netdev@...r.kernel.org,
linux-doc@...r.kernel.org, linux-kselftest@...r.kernel.org
Subject: [net-next v3 5/6] net: Add flow counters and Tx processing error counter
Added flow counters. Total flow counter is accumulative, the current shows
the number of flows currently in flight, the error counters is accumulating
the number of errors during Tx processing.
Signed-off-by: Adel Abouchaev <adel.abushaev@...il.com>
---
Updated enum bracket to follow enum keyword. Removed extra blank lines.
---
include/net/netns/mib.h | 3 +++
include/net/quic.h | 10 +++++++++
include/net/snmp.h | 6 +++++
include/uapi/linux/snmp.h | 9 ++++++++
net/quic/Makefile | 2 +-
net/quic/quic_main.c | 46 +++++++++++++++++++++++++++++++++++++++
net/quic/quic_proc.c | 45 ++++++++++++++++++++++++++++++++++++++
7 files changed, 120 insertions(+), 1 deletion(-)
create mode 100644 net/quic/quic_proc.c
diff --git a/include/net/netns/mib.h b/include/net/netns/mib.h
index 7e373664b1e7..dcbba3d1ceec 100644
--- a/include/net/netns/mib.h
+++ b/include/net/netns/mib.h
@@ -24,6 +24,9 @@ struct netns_mib {
#if IS_ENABLED(CONFIG_TLS)
DEFINE_SNMP_STAT(struct linux_tls_mib, tls_statistics);
#endif
+#if IS_ENABLED(CONFIG_QUIC)
+ DEFINE_SNMP_STAT(struct linux_quic_mib, quic_statistics);
+#endif
#ifdef CONFIG_MPTCP
DEFINE_SNMP_STAT(struct mptcp_mib, mptcp_statistics);
#endif
diff --git a/include/net/quic.h b/include/net/quic.h
index cafe01174e60..6362d827d266 100644
--- a/include/net/quic.h
+++ b/include/net/quic.h
@@ -25,6 +25,16 @@
#define QUIC_MAX_PLAIN_PAGES 16
#define QUIC_MAX_CIPHER_PAGES_ORDER 4
+#define __QUIC_INC_STATS(net, field) \
+ __SNMP_INC_STATS((net)->mib.quic_statistics, field)
+#define QUIC_INC_STATS(net, field) \
+ SNMP_INC_STATS((net)->mib.quic_statistics, field)
+#define QUIC_DEC_STATS(net, field) \
+ SNMP_DEC_STATS((net)->mib.quic_statistics, field)
+
+int __net_init quic_proc_init(struct net *net);
+void __net_exit quic_proc_fini(struct net *net);
+
struct quic_internal_crypto_context {
struct quic_connection_info conn_info;
struct crypto_skcipher *header_tfm;
diff --git a/include/net/snmp.h b/include/net/snmp.h
index 468a67836e2f..f94680a3e9e8 100644
--- a/include/net/snmp.h
+++ b/include/net/snmp.h
@@ -117,6 +117,12 @@ struct linux_tls_mib {
unsigned long mibs[LINUX_MIB_TLSMAX];
};
+/* Linux QUIC */
+#define LINUX_MIB_QUICMAX __LINUX_MIB_QUICMAX
+struct linux_quic_mib {
+ unsigned long mibs[LINUX_MIB_QUICMAX];
+};
+
#define DEFINE_SNMP_STAT(type, name) \
__typeof__(type) __percpu *name
#define DEFINE_SNMP_STAT_ATOMIC(type, name) \
diff --git a/include/uapi/linux/snmp.h b/include/uapi/linux/snmp.h
index 4d7470036a8b..ca1e626dbdb4 100644
--- a/include/uapi/linux/snmp.h
+++ b/include/uapi/linux/snmp.h
@@ -349,4 +349,13 @@ enum
__LINUX_MIB_TLSMAX
};
+/* linux QUIC mib definitions */
+enum {
+ LINUX_MIB_QUICNUM = 0,
+ LINUX_MIB_QUICCURRTXSW, /* QuicCurrTxSw */
+ LINUX_MIB_QUICTXSW, /* QuicTxSw */
+ LINUX_MIB_QUICTXSWERROR, /* QuicTxSwError */
+ __LINUX_MIB_QUICMAX
+};
+
#endif /* _LINUX_SNMP_H */
diff --git a/net/quic/Makefile b/net/quic/Makefile
index 928239c4d08c..a885cd8bc4e0 100644
--- a/net/quic/Makefile
+++ b/net/quic/Makefile
@@ -5,4 +5,4 @@
obj-$(CONFIG_QUIC) += quic.o
-quic-y := quic_main.o
+quic-y := quic_main.o quic_proc.o
diff --git a/net/quic/quic_main.c b/net/quic/quic_main.c
index a43d989a1c8e..1fda1083ee25 100644
--- a/net/quic/quic_main.c
+++ b/net/quic/quic_main.c
@@ -359,6 +359,8 @@ static int do_quic_conn_add_tx(struct sock *sk, sockptr_t optval,
if (rc < 0)
goto err_free_ciphers;
+ QUIC_INC_STATS(sock_net(sk), LINUX_MIB_QUICCURRTXSW);
+ QUIC_INC_STATS(sock_net(sk), LINUX_MIB_QUICTXSW);
return 0;
err_free_ciphers:
@@ -416,6 +418,7 @@ static int do_quic_conn_del_tx(struct sock *sk, sockptr_t optval,
crypto_free_aead(crypto_ctx->packet_aead);
memzero_explicit(crypto_ctx, sizeof(*crypto_ctx));
kfree(connhash);
+ QUIC_DEC_STATS(sock_net(sk), LINUX_MIB_QUICCURRTXSW);
return 0;
}
@@ -441,6 +444,9 @@ static int do_quic_setsockopt(struct sock *sk, int optname, sockptr_t optval,
break;
}
+ if (rc)
+ QUIC_INC_STATS(sock_net(sk), LINUX_MIB_QUICTXSWERROR);
+
return rc;
}
@@ -1329,6 +1335,9 @@ static int quic_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
quic_put_plain_user_pages(plain_pages, nr_plain_pages);
out:
+ if (unlikely(ret < 0))
+ QUIC_INC_STATS(sock_net(sk), LINUX_MIB_QUICTXSWERROR);
+
return ret;
}
@@ -1461,6 +1470,36 @@ static void quic_release(struct sock *sk)
release_sock(sk);
}
+static int __net_init quic_init_net(struct net *net)
+{
+ int err;
+
+ net->mib.quic_statistics = alloc_percpu(struct linux_quic_mib);
+ if (!net->mib.quic_statistics)
+ return -ENOMEM;
+
+ err = quic_proc_init(net);
+ if (err)
+ goto err_free_stats;
+
+ return 0;
+
+err_free_stats:
+ free_percpu(net->mib.quic_statistics);
+ return err;
+}
+
+static void __net_exit quic_exit_net(struct net *net)
+{
+ quic_proc_fini(net);
+ free_percpu(net->mib.quic_statistics);
+}
+
+static struct pernet_operations quic_proc_ops = {
+ .init = quic_init_net,
+ .exit = quic_exit_net,
+};
+
static struct udp_ulp_ops quic_ulp_ops __read_mostly = {
.name = "quic-crypto",
.owner = THIS_MODULE,
@@ -1470,6 +1509,12 @@ static struct udp_ulp_ops quic_ulp_ops __read_mostly = {
static int __init quic_register(void)
{
+ int err;
+
+ err = register_pernet_subsys(&quic_proc_ops);
+ if (err)
+ return err;
+
udp_register_ulp(&quic_ulp_ops);
return 0;
}
@@ -1477,6 +1522,7 @@ static int __init quic_register(void)
static void __exit quic_unregister(void)
{
udp_unregister_ulp(&quic_ulp_ops);
+ unregister_pernet_subsys(&quic_proc_ops);
}
module_init(quic_register);
diff --git a/net/quic/quic_proc.c b/net/quic/quic_proc.c
new file mode 100644
index 000000000000..cb4fe7a589b5
--- /dev/null
+++ b/net/quic/quic_proc.c
@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+/* Copyright (C) 2019 Meta Platforms, Inc. */
+
+#include <linux/proc_fs.h>
+#include <linux/seq_file.h>
+#include <net/snmp.h>
+#include <net/quic.h>
+
+#ifdef CONFIG_PROC_FS
+static const struct snmp_mib quic_mib_list[] = {
+ SNMP_MIB_ITEM("QuicCurrTxSw", LINUX_MIB_QUICCURRTXSW),
+ SNMP_MIB_ITEM("QuicTxSw", LINUX_MIB_QUICTXSW),
+ SNMP_MIB_ITEM("QuicTxSwError", LINUX_MIB_QUICTXSWERROR),
+ SNMP_MIB_SENTINEL
+};
+
+static int quic_statistics_seq_show(struct seq_file *seq, void *v)
+{
+ unsigned long buf[LINUX_MIB_QUICMAX] = {};
+ struct net *net = seq->private;
+ int i;
+
+ snmp_get_cpu_field_batch(buf, quic_mib_list, net->mib.quic_statistics);
+ for (i = 0; quic_mib_list[i].name; i++)
+ seq_printf(seq, "%-32s\t%lu\n", quic_mib_list[i].name, buf[i]);
+
+ return 0;
+}
+#endif
+
+int __net_init quic_proc_init(struct net *net)
+{
+#ifdef CONFIG_PROC_FS
+ if (!proc_create_net_single("quic_stat", 0444, net->proc_net,
+ quic_statistics_seq_show, NULL))
+ return -ENOMEM;
+#endif /* CONFIG_PROC_FS */
+
+ return 0;
+}
+
+void __net_exit quic_proc_fini(struct net *net)
+{
+ remove_proc_entry("quic_stat", net->proc_net);
+}
--
2.30.2
Powered by blists - more mailing lists