| 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
| ||
|
Date: Sat, 29 May 2021 05:22:42 +0530
From: Kumar Kartikeya Dwivedi <memxor@...il.com>
To: bpf@...r.kernel.org
Cc: Kumar Kartikeya Dwivedi <memxor@...il.com>,
Alexei Starovoitov <ast@...nel.org>,
Daniel Borkmann <daniel@...earbox.net>,
Andrii Nakryiko <andrii@...nel.org>,
Martin KaFai Lau <kafai@...com>,
Song Liu <songliubraving@...com>, Yonghong Song <yhs@...com>,
John Fastabend <john.fastabend@...il.com>,
KP Singh <kpsingh@...nel.org>,
"David S. Miller" <davem@...emloft.net>,
Jakub Kicinski <kuba@...nel.org>,
Jesper Dangaard Brouer <brouer@...hat.com>,
Toke Høiland-Jørgensen <toke@...hat.com>,
netdev@...r.kernel.org
Subject: [PATCH RFC bpf-next 07/15] samples: bpf: add extended reporting for xdp redirect error
This again is needed for xdp_monitor support. We also record the most
common errnos, but don't report for now. A future commit that modifies
output format will arrange for printing it properly.
Signed-off-by: Kumar Kartikeya Dwivedi <memxor@...il.com>
---
samples/bpf/xdp_sample_kern.h | 53 +++++++++++++++++++++++++++---
samples/bpf/xdp_sample_user.c | 62 +++++++++++++++++++++++++++--------
samples/bpf/xdp_sample_user.h | 13 +++++++-
3 files changed, 108 insertions(+), 20 deletions(-)
diff --git a/samples/bpf/xdp_sample_kern.h b/samples/bpf/xdp_sample_kern.h
index 3b85d71434d3..4131b9cb1ec4 100644
--- a/samples/bpf/xdp_sample_kern.h
+++ b/samples/bpf/xdp_sample_kern.h
@@ -7,6 +7,11 @@
#define MAX_CPUS 64
+#define EINVAL 22
+#define ENETDOWN 100
+#define EMSGSIZE 90
+#define EOPNOTSUPP 95
+
/* Common stats data record to keep userspace more simple */
struct datarec {
__u64 processed;
@@ -35,8 +40,11 @@ struct {
__uint(type, BPF_MAP_TYPE_PERCPU_ARRAY);
__type(key, u32);
__type(value, struct datarec);
- __uint(max_entries, 2);
- /* TODO: have entries for all possible errno's */
+ __uint(max_entries, 2
+ + 1 /* EINVAL */
+ + 1 /* ENETDOWN */
+ + 1 /* EMSGSIZE */
+ + 1 /* EOPNOTSUPP */);
} redirect_err_cnt SEC(".maps");
/* Used by trace point */
@@ -91,6 +99,25 @@ enum {
XDP_REDIRECT_ERROR = 1
};
+static __always_inline
+__u32 xdp_get_err_key(int err)
+{
+ switch (err) {
+ case 0:
+ return 0;
+ case -EINVAL:
+ return 2;
+ case -ENETDOWN:
+ return 3;
+ case -EMSGSIZE:
+ return 4;
+ case -EOPNOTSUPP:
+ return 5;
+ default:
+ return 1;
+ }
+}
+
static __always_inline
int xdp_redirect_collect_stat(struct xdp_redirect_ctx *ctx)
{
@@ -98,13 +125,15 @@ int xdp_redirect_collect_stat(struct xdp_redirect_ctx *ctx)
struct datarec *rec;
int err = ctx->err;
- if (!err)
- key = XDP_REDIRECT_SUCCESS;
+ key = xdp_get_err_key(err);
rec = bpf_map_lookup_elem(&redirect_err_cnt, &key);
if (!rec)
return 0;
- rec->dropped += 1;
+ if (key)
+ rec->dropped++;
+ else
+ rec->processed++;
return 0; /* Indicate event was filtered (no further processing)*/
/*
@@ -127,6 +156,20 @@ int trace_xdp_redirect_map_err(struct xdp_redirect_ctx *ctx)
return xdp_redirect_collect_stat(ctx);
}
+/* Likely unloaded when prog starts */
+SEC("tracepoint/xdp/xdp_redirect")
+int trace_xdp_redirect(struct xdp_redirect_ctx *ctx)
+{
+ return xdp_redirect_collect_stat(ctx);
+}
+
+/* Likely unloaded when prog starts */
+SEC("tracepoint/xdp/xdp_redirect_map")
+int trace_xdp_redirect_map(struct xdp_redirect_ctx *ctx)
+{
+ return xdp_redirect_collect_stat(ctx);
+}
+
/* Tracepoint format: /sys/kernel/debug/tracing/events/xdp/xdp_exception/format
* Code in: kernel/include/trace/events/xdp.h
*/
diff --git a/samples/bpf/xdp_sample_user.c b/samples/bpf/xdp_sample_user.c
index 56cd79ba303a..29410d551574 100644
--- a/samples/bpf/xdp_sample_user.c
+++ b/samples/bpf/xdp_sample_user.c
@@ -121,7 +121,8 @@ struct stats_record *alloc_stats_record(void)
}
memset(rec, 0, size);
rec->rx_cnt.cpu = alloc_record_per_cpu();
- rec->redir_err.cpu = alloc_record_per_cpu();
+ rec->redir_err[0].cpu = alloc_record_per_cpu();
+ rec->redir_err[1].cpu = alloc_record_per_cpu();
rec->kthread.cpu = alloc_record_per_cpu();
rec->exception.cpu = alloc_record_per_cpu();
rec->devmap_xmit.cpu = alloc_record_per_cpu();
@@ -140,7 +141,8 @@ void free_stats_record(struct stats_record *r)
free(r->devmap_xmit.cpu);
free(r->exception.cpu);
free(r->kthread.cpu);
- free(r->redir_err.cpu);
+ free(r->redir_err[1].cpu);
+ free(r->redir_err[0].cpu);
free(r->rx_cnt.cpu);
free(r);
}
@@ -332,31 +334,54 @@ static void stats_print_cpumap_kthread(struct stats_record *stats_rec,
printf(fm2_k, "cpumap_kthread", "total", pps, drop, err, e_str);
}
+static void stats_print_redirect_cnt(struct stats_record *stats_rec,
+ struct stats_record *stats_prev,
+ unsigned int nr_cpus)
+{
+ char *fmt1 = "%-15s %-7d %'-14.0f %'-11.0f %s\n";
+ char *fmt2 = "%-15s %-7s %'-14.0f %'-11.0f %s\n";
+ struct record *rec, *prev;
+ double t, pps;
+ int i;
+
+ rec = &stats_rec->redir_err[0];
+ prev = &stats_prev->redir_err[0];
+ t = calc_period(rec, prev);
+ for (i = 0; i < nr_cpus; i++) {
+ struct datarec *r = &rec->cpu[i];
+ struct datarec *p = &prev->cpu[i];
+
+ pps = calc_pps(r, p, t);
+ if (pps > 0)
+ printf(fmt1, "redirect", i, pps, 0.0, "Success");
+ }
+ pps = calc_pps(&rec->total, &prev->total, t);
+ printf(fmt2, "redirect", "total", pps, 0.0, "Success");
+}
+
static void stats_print_redirect_err_cnt(struct stats_record *stats_rec,
struct stats_record *stats_prev,
unsigned int nr_cpus)
{
- char *fmt_err = "%-15s %-7d %'-14.0f %'-11.0f\n";
- char *fm2_err = "%-15s %-7s %'-14.0f %'-11.0f\n";
+ char *fmt1 = "%-15s %-7d %'-14.0f %'-11.0f %s\n";
+ char *fmt2 = "%-15s %-7s %'-14.0f %'-11.0f %s\n";
struct record *rec, *prev;
- double t, pps, drop;
+ double t, drop;
int i;
- rec = &stats_rec->redir_err;
- prev = &stats_prev->redir_err;
+ rec = &stats_rec->redir_err[1];
+ prev = &stats_prev->redir_err[1];
t = calc_period(rec, prev);
for (i = 0; i < nr_cpus; i++) {
struct datarec *r = &rec->cpu[i];
struct datarec *p = &prev->cpu[i];
- pps = calc_pps(r, p, t);
drop = calc_drop_pps(r, p, t);
- if (pps > 0)
- printf(fmt_err, "redirect_err", i, pps, drop);
+ if (drop > 0)
+ printf(fmt1, "redirect", i, 0.0, drop, "Error");
}
- pps = calc_pps(&rec->total, &prev->total, t);
drop = calc_drop_pps(&rec->total, &prev->total, t);
- printf(fm2_err, "redirect_err", "total", pps, drop);
+ printf(fmt2, "redirect", "total", 0.0, drop, "Error");
}
static void stats_print_exception_cnt(struct stats_record *stats_rec,
@@ -522,8 +547,14 @@ void sample_stats_collect(int mask, struct stats_record *rec)
if (mask & SAMPLE_RX_CNT)
map_collect_percpu(map_fds[RX_CNT], 0, &rec->rx_cnt);
- if (mask & SAMPLE_REDIRECT_ERR_CNT)
- map_collect_percpu(map_fds[REDIRECT_ERR_CNT], 1, &rec->redir_err);
+ /* Success case */
+ if (mask & SAMPLE_REDIRECT_CNT)
+ map_collect_percpu(map_fds[REDIRECT_ERR_CNT], 0, &rec->redir_err[0]);
+
+ if (mask & SAMPLE_REDIRECT_ERR_CNT) {
+ for (i = 1; i < XDP_REDIRECT_ERR_MAX; i++)
+ map_collect_percpu(map_fds[REDIRECT_ERR_CNT], i, &rec->redir_err[i]);
+ }
if (mask & SAMPLE_CPUMAP_ENQUEUE_CNT)
for (i = 0; i < n_cpus; i++)
@@ -551,6 +582,9 @@ void sample_stats_print(int mask, struct stats_record *cur,
if (mask & SAMPLE_RX_CNT)
stats_print_rx_cnt(cur, prev, nr_cpus);
+ if (mask & SAMPLE_REDIRECT_CNT)
+ stats_print_redirect_cnt(cur, prev, nr_cpus);
+
if (mask & SAMPLE_REDIRECT_ERR_CNT)
stats_print_redirect_err_cnt(cur, prev, nr_cpus);
diff --git a/samples/bpf/xdp_sample_user.h b/samples/bpf/xdp_sample_user.h
index 75a4ea4b55ad..a3a3c746e73e 100644
--- a/samples/bpf/xdp_sample_user.h
+++ b/samples/bpf/xdp_sample_user.h
@@ -14,6 +14,8 @@ enum map_type {
};
enum tp_type {
+ TP_REDIRECT_CNT,
+ TP_REDIRECT_MAP_CNT,
TP_REDIRECT_ERR_CNT,
TP_REDIRECT_MAP_ERR_CNT,
TP_CPUMAP_ENQUEUE_CNT,
@@ -30,6 +32,7 @@ enum stats_mask {
SAMPLE_CPUMAP_KTHREAD_CNT = 1U << 4,
SAMPLE_EXCEPTION_CNT = 1U << 5,
SAMPLE_DEVMAP_XMIT_CNT = 1U << 6,
+ SAMPLE_REDIRECT_CNT = 1U << 7,
};
static const char *const map_type_strings[] = {
@@ -54,6 +57,14 @@ extern int tp_cnt;
#define EXIT_FAIL_BPF 4
#define EXIT_FAIL_MEM 5
+#define XDP_REDIRECT_ERR_MAX 6
+
+static const char *xdp_redirect_err_names[XDP_REDIRECT_ERR_MAX] = {
+ /* Key=1 keeps unknown errors */
+ "Success", "Unknown", "EINVAL", "ENETDOWN", "EMSGSIZE",
+ "EOPNOTSUPP",
+};
+
/* Common stats data record shared with _kern.c */
struct datarec {
__u64 processed;
@@ -75,7 +86,7 @@ struct record {
struct stats_record {
struct record rx_cnt;
- struct record redir_err;
+ struct record redir_err[XDP_REDIRECT_ERR_MAX];
struct record kthread;
struct record exception;
struct record devmap_xmit;
--
2.31.1
Powered by blists - more mailing lists