Received: by 2002:a25:f815:0:0:0:0:0 with SMTP id u21csp4029884ybd; Tue, 25 Jun 2019 12:45:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqwortRFKJF3h6wPP6Pg9D6Zp3O7XtVYMUR7m99PoHv+i09RfXmbm3i+GXY3kPblbTymnoW2 X-Received: by 2002:a63:6ec6:: with SMTP id j189mr18317501pgc.168.1561491950930; Tue, 25 Jun 2019 12:45:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561491950; cv=none; d=google.com; s=arc-20160816; b=mBO7AM0VPgcECte0WRxMT4Ad7hy9PCXJJK02sF0mSnuRAwogpJqtQBxo6oeckM816E OfSK/7dA0ICED1dcYJQwj0Zi6esqgWMBCI+eJFTKNfKjxJevDeAbW+u4YoZpZGbrXEju FKq3Eie3l9X5Zt5InEynttOmZcOCkNXfByjqryeafJJVUUxL5bNUIMLlvb7HY6BL41Mo r+rP8dPAYROzYcPG74pOlvp2X+xqDVgMpYXBvJNtImrw/wuJdXJyrS+N/rS9OB29FxGw o0Tginy/+TFizZQPdzlTjzNGny6edyBBkmZkrhub5HpIDfyKkET5/FgEgI8WBLqSONaS QWSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:dkim-signature; bh=OhecESP0ZYVvsQksEMIl7M9g/EECExAnf6+cs2HZy6c=; b=HkKfHbhp7L3C8+zM7hs+6zKkAVvXAKNT/M4rjtFW/HZKJiIvYOCOdkRkKtrx26YEfi 1fHyIFV3h1wBvq8QcR2c1QYQ99lWFQ7SkfXUlAp9Q1G4lhhQ/NPjhYfsiALwI8oia6K+ Eoj9048IAiMssO0++yxA9jhmtc9q/Bjonof2tW8/LPLkxB8tVAad8BHP5yKB/IVozhCc L3GaD3kB43WS7UwOth9TS18e6Fv1bMaz7q6+O8UFxS+YHdcbEhg+Vhrb2M2+5a/jTsK2 pVGkfZgoksEXzXFIC7n1k5pns/MJjCmQUsr3DcAsUgPOE8SVHvmuW8THdsM81FfB2acW pE8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=eNjOQGZA; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y3si623919pgi.125.2019.06.25.12.45.35; Tue, 25 Jun 2019 12:45:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=eNjOQGZA; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731805AbfFYR1a (ORCPT + 99 others); Tue, 25 Jun 2019 13:27:30 -0400 Received: from mail-pl1-f201.google.com ([209.85.214.201]:40588 "EHLO mail-pl1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731657AbfFYR13 (ORCPT ); Tue, 25 Jun 2019 13:27:29 -0400 Received: by mail-pl1-f201.google.com with SMTP id 91so9570466pla.7 for ; Tue, 25 Jun 2019 10:27:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=OhecESP0ZYVvsQksEMIl7M9g/EECExAnf6+cs2HZy6c=; b=eNjOQGZAYlR2hSjV/zWM0cTvt3ZSohvJKbByBBByJFVzjkrR+WjfvPPnyL0rx1LsBs UJWXhdri+ztjLR1JJlxjYtMzgzlwKnWVeemHVo06IHLsn9shDuySOHtWRq1zPSVWxJRJ SMrV/1J86BOj/tvTKUo26eOGBvNDat/6ksf0226vlglPWSjUgdwCQ6RVFI8tlCsHOw1b OEnqGh1l8SIDQRimt7TdL0SrLxLPGTNunS/IN4B21FKqLnWePdRMJ+jiBNxj9VsH/mP4 ndv6gKoG1OAudkljm3IWOIzQ/0BHJRgJyyWzThyZplBL9x7Us+MzeGWr1RijFs6Ex77S Y3OQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=OhecESP0ZYVvsQksEMIl7M9g/EECExAnf6+cs2HZy6c=; b=DCayhs0Hryv5/n6381YAfTeaj0jysp+DJ73PVZ9tx1Ycd/iEhge3bW9PmL9EogNxNO uxv4j8F6nb+hVoxHUJMQHIqzwGSlgi3i0Jb+jeCBalgOZC86kNpjrdgn0a+Wy3MGBht+ UiheVPQ5rfCZEtR+2oDnDcbWp8Woxc8ad0uTNRIxX2NdIJ+lMu3CfmW7s++w6+PGa6eB TW/lGizXSkiylchOL139WwandXUdN9mdAv7nPdwDf7rN0oWOF85RzpwaYt/QovCmZ9bA y9ZoGPDp627onSM5cFpBYs/rJzNDrVzhhfm3d4/JhZR+HAMepKotw7W1Fc4qztQPQxtM kWTA== X-Gm-Message-State: APjAAAUTw6jzqeNxf3fRRHmh3lR0kRIfagqLetK1xCNYsv6gRyuusBDc vDV+AcsxjZHq2sh7TfTG0Lf7Ksak96TmGDu6 X-Received: by 2002:a63:735d:: with SMTP id d29mr27178922pgn.276.1561483648390; Tue, 25 Jun 2019 10:27:28 -0700 (PDT) Date: Tue, 25 Jun 2019 10:27:17 -0700 In-Reply-To: <20190625172717.158613-1-allanzhang@google.com> Message-Id: <20190625172717.158613-3-allanzhang@google.com> Mime-Version: 1.0 References: <20190625172717.158613-1-allanzhang@google.com> X-Mailer: git-send-email 2.22.0.410.gd8fdbe21b5-goog Subject: [PATCH bpf-next v4 2/2] bpf: Add selftests for bpf_perf_event_output From: allanzhang To: Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , "David S. Miller" , netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org Cc: allanzhang Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Software event output is only enabled by a few prog types. This test is to ensure that all supported types are enbled for bpf_perf_event_output sucessfully. v4: * Reformating log message v3: * Reformating log message v2: * Reformating log message Signed-off-by: allanzhang --- tools/testing/selftests/bpf/test_verifier.c | 33 ++++++- .../selftests/bpf/verifier/event_output.c | 94 +++++++++++++++++++ 2 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/bpf/verifier/event_output.c diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testing/selftests/bpf/test_verifier.c index c5514daf8865..901a188e1eea 100644 --- a/tools/testing/selftests/bpf/test_verifier.c +++ b/tools/testing/selftests/bpf/test_verifier.c @@ -50,7 +50,7 @@ #define MAX_INSNS BPF_MAXINSNS #define MAX_TEST_INSNS 1000000 #define MAX_FIXUPS 8 -#define MAX_NR_MAPS 18 +#define MAX_NR_MAPS 19 #define MAX_TEST_RUNS 8 #define POINTER_VALUE 0xcafe4all #define TEST_DATA_LEN 64 @@ -84,6 +84,7 @@ struct bpf_test { int fixup_map_array_wo[MAX_FIXUPS]; int fixup_map_array_small[MAX_FIXUPS]; int fixup_sk_storage_map[MAX_FIXUPS]; + int fixup_map_event_output[MAX_FIXUPS]; const char *errstr; const char *errstr_unpriv; uint32_t retval, retval_unpriv, insn_processed; @@ -604,6 +605,28 @@ static int create_sk_storage_map(void) return fd; } +static int create_event_output_map(void) +{ + struct bpf_create_map_attr attr = { + .name = "test_map", + .map_type = BPF_MAP_TYPE_PERF_EVENT_ARRAY, + .key_size = 4, + .value_size = 4, + .max_entries = 1, + }; + int fd, btf_fd; + + btf_fd = load_btf(); + if (btf_fd < 0) + return -1; + attr.btf_fd = btf_fd; + fd = bpf_create_map_xattr(&attr); + close(attr.btf_fd); + if (fd < 0) + printf("Failed to create event_output\n"); + return fd; +} + static char bpf_vlog[UINT_MAX >> 8]; static void do_test_fixup(struct bpf_test *test, enum bpf_prog_type prog_type, @@ -627,6 +650,7 @@ static void do_test_fixup(struct bpf_test *test, enum bpf_prog_type prog_type, int *fixup_map_array_wo = test->fixup_map_array_wo; int *fixup_map_array_small = test->fixup_map_array_small; int *fixup_sk_storage_map = test->fixup_sk_storage_map; + int *fixup_map_event_output = test->fixup_map_event_output; if (test->fill_helper) { test->fill_insns = calloc(MAX_TEST_INSNS, sizeof(struct bpf_insn)); @@ -788,6 +812,13 @@ static void do_test_fixup(struct bpf_test *test, enum bpf_prog_type prog_type, fixup_sk_storage_map++; } while (*fixup_sk_storage_map); } + if (*fixup_map_event_output) { + map_fds[18] = create_event_output_map(); + do { + prog[*fixup_map_event_output].imm = map_fds[18]; + fixup_map_event_output++; + } while (*fixup_map_event_output); + } } static int set_admin(bool admin) diff --git a/tools/testing/selftests/bpf/verifier/event_output.c b/tools/testing/selftests/bpf/verifier/event_output.c new file mode 100644 index 000000000000..b25eabcfaa56 --- /dev/null +++ b/tools/testing/selftests/bpf/verifier/event_output.c @@ -0,0 +1,94 @@ +/* instructions used to output a skb based software event, produced + * from code snippet: +struct TMP { + uint64_t tmp; +} tt; +tt.tmp = 5; +bpf_perf_event_output(skb, &connection_tracking_event_map, 0, + &tt, sizeof(tt)); +return 1; + +the bpf assembly from llvm is: + 0: b7 02 00 00 05 00 00 00 r2 = 5 + 1: 7b 2a f8 ff 00 00 00 00 *(u64 *)(r10 - 8) = r2 + 2: bf a4 00 00 00 00 00 00 r4 = r10 + 3: 07 04 00 00 f8 ff ff ff r4 += -8 + 4: 18 02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 r2 = 0ll + 6: b7 03 00 00 00 00 00 00 r3 = 0 + 7: b7 05 00 00 08 00 00 00 r5 = 8 + 8: 85 00 00 00 19 00 00 00 call 25 + 9: b7 00 00 00 01 00 00 00 r0 = 1 + 10: 95 00 00 00 00 00 00 00 exit + + The reason I put the code here instead of fill_helpers is that map fixup is + against the insns, instead of filled prog. +*/ + +#define __PERF_EVENT_INSNS__ \ + BPF_MOV64_IMM(BPF_REG_2, 5), \ + BPF_STX_MEM(BPF_DW, BPF_REG_10, BPF_REG_2, -8), \ + BPF_MOV64_REG(BPF_REG_4, BPF_REG_10), \ + BPF_ALU64_IMM(BPF_ADD, BPF_REG_4, -8), \ + BPF_LD_MAP_FD(BPF_REG_2, 0), \ + BPF_MOV64_IMM(BPF_REG_3, 0), \ + BPF_MOV64_IMM(BPF_REG_5, 8), \ + BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, \ + BPF_FUNC_perf_event_output), \ + BPF_MOV64_IMM(BPF_REG_0, 1), \ + BPF_EXIT_INSN(), +{ + "perfevent for sockops", + .insns = { __PERF_EVENT_INSNS__ }, + .prog_type = BPF_PROG_TYPE_SOCK_OPS, + .fixup_map_event_output = { 4 }, + .result = ACCEPT, + .retval = 1, +}, +{ + "perfevent for tc", + .insns = { __PERF_EVENT_INSNS__ }, + .prog_type = BPF_PROG_TYPE_SCHED_CLS, + .fixup_map_event_output = { 4 }, + .result = ACCEPT, + .retval = 1, +}, +{ + "perfevent for lwt out", + .insns = { __PERF_EVENT_INSNS__ }, + .prog_type = BPF_PROG_TYPE_LWT_OUT, + .fixup_map_event_output = { 4 }, + .result = ACCEPT, + .retval = 1, +}, +{ + "perfevent for xdp", + .insns = { __PERF_EVENT_INSNS__ }, + .prog_type = BPF_PROG_TYPE_XDP, + .fixup_map_event_output = { 4 }, + .result = ACCEPT, + .retval = 1, +}, +{ + "perfevent for socket filter", + .insns = { __PERF_EVENT_INSNS__ }, + .prog_type = BPF_PROG_TYPE_SOCKET_FILTER, + .fixup_map_event_output = { 4 }, + .result = ACCEPT, + .retval = 1, +}, +{ + "perfevent for sk_skb", + .insns = { __PERF_EVENT_INSNS__ }, + .prog_type = BPF_PROG_TYPE_SK_SKB, + .fixup_map_event_output = { 4 }, + .result = ACCEPT, + .retval = 1, +}, +{ + "perfevent for cgroup skb", + .insns = { __PERF_EVENT_INSNS__ }, + .prog_type = BPF_PROG_TYPE_CGROUP_SKB, + .fixup_map_event_output = { 4 }, + .result = ACCEPT, + .retval = 1, +}, -- 2.22.0.410.gd8fdbe21b5-goog