From nobody Wed Nov 27 12:36:45 2024 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 06A7B1F9425; Fri, 11 Oct 2024 04:03:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728619442; cv=none; b=rgp5KFEYlTSy0VFmGiBMrEzhdWJiY4fg2qXhi79XnEg1nD5mg0hEeqNSzUKuZ1DmoeJ6mTSCIUVWjYJA9oZpVL6g3uCV2h9dqFov9P+Tb0y2Omkp4UaMTUVnEIrmwfW14wD4CwceQh+BvKIeAv55VD/tdnIRNBdcSs9irm5C5NE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728619442; c=relaxed/simple; bh=AQATHK/PV8Tfdyb7cN93ExUjgpXhpm0zBzQn24ocW14=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FTSxEhvGtkb2dBMgQJ3TwEyF4twfVgq6l46tf/o+RJsojHQOK3qIkUCkGtvEky0S7Jg96326IDJlS0t8ZWfStBP+JeLawkrqxZxSBro94HFPkYuUEwDllkL/LbNVLRbls4sCkpLWq9TNuj+rosGISfysP0AEkeT2lgE8j8Mk1Qw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=gOlyMWFk; arc=none smtp.client-ip=209.85.214.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gOlyMWFk" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-20c544d345cso11761285ad.1; Thu, 10 Oct 2024 21:03:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728619439; x=1729224239; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1yWZPLkwxKJjT9XbDV5CM9kU8hB23DKMJ7kKlzBt4Tw=; b=gOlyMWFklEi56kCaPAFTbF1r6bxjs7+8bqr9PWgFd+3xJ8SjKeCpfmMAHF9i/tqWO1 obV69Qi9MWuGtw3ZhjOf1KdvyngyNLJJvLi56gR9SwS7jjfqp0kNEZi0jkzMU5b7gN4I 7PJQwrYFfGesZhkZJU+B6oy+WjKYh0XtnQa0m7rqL0ACOr7L1M3VZK0lAzw/qYf72EGf QQhPwtcXapcknlSLf7Q3wn1/MIHqtHjQ+sks9k/h39MtsQV5SOY3gu4dz9F1eZQ5V89D xp7Gr7SK6kNutFPJNStUwe76imyfylAjUbLB3LF5M71UOPzLNRnb+Zi5FYQMi/O/W8Sl EQEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728619439; x=1729224239; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1yWZPLkwxKJjT9XbDV5CM9kU8hB23DKMJ7kKlzBt4Tw=; b=j/GPnl6twDlJmM1Dku6iNJXUU8T/Ed1VCcc6ki1m72ZMdmLPbuVVR8dLCfJFi9X1J9 aIjPzkUcSQrbiepRzk5B5XoPRqH/CPn6FyZ6zWXEZZHqT1jDGC1zBM4nWdME0cux28p3 YUEyiULFJTgmxIsCw+KMExpY5iAfU07AhBKzNToKxxmVBai+0t35LiZwGQ+bkm6Z4peI RU4qtg38oU76QUkPwipvummXAmJwTqIYPhxZeAOnI6C15eGMrX2ebVd+DJPexBzzJuih KNEA2BMFa0j0h29K+bRRXSFyvTmVtekxEyxc93FmHPGOtTZy2xVUjmyJPES869CWZN/z 0ZKA== X-Forwarded-Encrypted: i=1; AJvYcCWCZtVd8jQuswxc2Z6Ld8I/3sDv26osCJ/WTelC9ElJVUYOOcUc7+A+Zk3ZpiFg/Jw0MGPIWul4@vger.kernel.org, AJvYcCWp7OW96M5sgkNa0nEQ666bbCaOhpeDqA9GehxQ6fh5bRjkWwuz8POt8cYZPhZu9BmnlNL3iZNtcfcXNDM=@vger.kernel.org, AJvYcCXIsIlov51OQQsVrEEHTUL4kscGNT8D67i8siB9J2493nYMLbtlqbG5Iz6lyCE/6rrTfaeFKRCvdHxMdlH4iCZJ@vger.kernel.org X-Gm-Message-State: AOJu0Yws1D/ZQrTwMqR9yRLoLF6QD87LJ6TgdFcWsQEqb3wnD2qQsvIG a366wjsWOlFgIZg/zqCochJKjr6yGYaANjGoKkgYeZmFKMiZ7ow= X-Google-Smtp-Source: AGHT+IEEEnRKLgzFFdBq/zn0wRKgzex1j9t0io38f7LpuN1U6vTIpBWICa2mVGkEPp5c71R0iTdwJA== X-Received: by 2002:a17:903:284:b0:20b:51c2:d792 with SMTP id d9443c01a7336-20ca017819cmr24888185ad.2.1728619439118; Thu, 10 Oct 2024 21:03:59 -0700 (PDT) Received: from vagrant.. ([114.71.48.94]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20c8c0e7716sm16443865ad.122.2024.10.10.21.03.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Oct 2024 21:03:58 -0700 (PDT) From: "Daniel T. Lee" To: Daniel Borkmann , Alexei Starovoitov , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Mykola Lysenko , Shuah Khan Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, LKML Subject: [PATCH,bpf-next v2 1/4] selftests/bpf: migrate cgroup sock create test for setting iface/mark/prio Date: Fri, 11 Oct 2024 04:03:45 +0000 Message-ID: <20241011040348.98042-2-danieltimlee@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241011040348.98042-1-danieltimlee@gmail.com> References: <20241011040348.98042-1-danieltimlee@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This patch migrates the old test for cgroup BPF that sets sk_bound_dev_if, mark, and priority when AF_INET{6} sockets are created. The most closely related tests under selftests are 'test_sock' and 'sockopt'. However, these existing tests serve different purposes. 'test_sock' focuses mainly on verifying the socket binding process, while 'sockopt' concentrates on testing the behavior of getsockopt and setsockopt operations for various socket options. Neither of these existing tests directly covers the ability of cgroup BPF to set socket attributes such as sk_bound_dev_if, mark, and priority during socket creation. To address this gap, this patch introduces a migration of the old cgroup socket attribute test, now included as the 'sock_create' test in selftests/bpf. This ensures that the ability to configure these attributes during socket creation is properly tested. Signed-off-by: Daniel T. Lee --- samples/bpf/Makefile | 2 - samples/bpf/test_cgrp2_sock.c | 296 ------------------ samples/bpf/test_cgrp2_sock.sh | 137 -------- .../selftests/bpf/prog_tests/sock_create.c | 256 +++++++++++++++ 4 files changed, 256 insertions(+), 435 deletions(-) delete mode 100644 samples/bpf/test_cgrp2_sock.c delete mode 100755 samples/bpf/test_cgrp2_sock.sh create mode 100644 tools/testing/selftests/bpf/prog_tests/sock_create.c diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile index 7afe040cf43b..f514c6fb1ae2 100644 --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile @@ -27,7 +27,6 @@ tprogs-y +=3D map_perf_test tprogs-y +=3D test_overhead tprogs-y +=3D test_cgrp2_array_pin tprogs-y +=3D test_cgrp2_attach -tprogs-y +=3D test_cgrp2_sock tprogs-y +=3D test_cgrp2_sock2 tprogs-y +=3D xdp_router_ipv4 tprogs-y +=3D test_current_task_under_cgroup @@ -76,7 +75,6 @@ map_perf_test-objs :=3D map_perf_test_user.o test_overhead-objs :=3D test_overhead_user.o test_cgrp2_array_pin-objs :=3D test_cgrp2_array_pin.o test_cgrp2_attach-objs :=3D test_cgrp2_attach.o -test_cgrp2_sock-objs :=3D test_cgrp2_sock.o test_cgrp2_sock2-objs :=3D test_cgrp2_sock2.o test_current_task_under_cgroup-objs :=3D $(CGROUP_HELPERS) \ test_current_task_under_cgroup_user.o diff --git a/samples/bpf/test_cgrp2_sock.c b/samples/bpf/test_cgrp2_sock.c deleted file mode 100644 index 8ca2a445ffa1..000000000000 --- a/samples/bpf/test_cgrp2_sock.c +++ /dev/null @@ -1,296 +0,0 @@ -/* eBPF example program: - * - * - Loads eBPF program - * - * The eBPF program sets the sk_bound_dev_if index in new AF_INET{6} - * sockets opened by processes in the cgroup. - * - * - Attaches the new program to a cgroup using BPF_PROG_ATTACH - */ - -#define _GNU_SOURCE - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "bpf_insn.h" - -char bpf_log_buf[BPF_LOG_BUF_SIZE]; - -static int prog_load(__u32 idx, __u32 mark, __u32 prio) -{ - /* save pointer to context */ - struct bpf_insn prog_start[] =3D { - BPF_MOV64_REG(BPF_REG_6, BPF_REG_1), - }; - struct bpf_insn prog_end[] =3D { - BPF_MOV64_IMM(BPF_REG_0, 1), /* r0 =3D verdict */ - BPF_EXIT_INSN(), - }; - - /* set sk_bound_dev_if on socket */ - struct bpf_insn prog_dev[] =3D { - BPF_MOV64_IMM(BPF_REG_3, idx), - BPF_MOV64_IMM(BPF_REG_2, offsetof(struct bpf_sock, bound_dev_if)), - BPF_STX_MEM(BPF_W, BPF_REG_1, BPF_REG_3, offsetof(struct bpf_sock, bound= _dev_if)), - }; - - /* set mark on socket */ - struct bpf_insn prog_mark[] =3D { - /* get uid of process */ - BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, - BPF_FUNC_get_current_uid_gid), - BPF_ALU64_IMM(BPF_AND, BPF_REG_0, 0xffffffff), - - /* if uid is 0, use given mark, else use the uid as the mark */ - BPF_MOV64_REG(BPF_REG_3, BPF_REG_0), - BPF_JMP_IMM(BPF_JNE, BPF_REG_0, 0, 1), - BPF_MOV64_IMM(BPF_REG_3, mark), - - /* set the mark on the new socket */ - BPF_MOV64_REG(BPF_REG_1, BPF_REG_6), - BPF_MOV64_IMM(BPF_REG_2, offsetof(struct bpf_sock, mark)), - BPF_STX_MEM(BPF_W, BPF_REG_1, BPF_REG_3, offsetof(struct bpf_sock, mark)= ), - }; - - /* set priority on socket */ - struct bpf_insn prog_prio[] =3D { - BPF_MOV64_REG(BPF_REG_1, BPF_REG_6), - BPF_MOV64_IMM(BPF_REG_3, prio), - BPF_MOV64_IMM(BPF_REG_2, offsetof(struct bpf_sock, priority)), - BPF_STX_MEM(BPF_W, BPF_REG_1, BPF_REG_3, offsetof(struct bpf_sock, prior= ity)), - }; - LIBBPF_OPTS(bpf_prog_load_opts, opts, - .log_buf =3D bpf_log_buf, - .log_size =3D BPF_LOG_BUF_SIZE, - ); - - struct bpf_insn *prog; - size_t insns_cnt; - void *p; - int ret; - - insns_cnt =3D sizeof(prog_start) + sizeof(prog_end); - if (idx) - insns_cnt +=3D sizeof(prog_dev); - - if (mark) - insns_cnt +=3D sizeof(prog_mark); - - if (prio) - insns_cnt +=3D sizeof(prog_prio); - - p =3D prog =3D malloc(insns_cnt); - if (!prog) { - fprintf(stderr, "Failed to allocate memory for instructions\n"); - return EXIT_FAILURE; - } - - memcpy(p, prog_start, sizeof(prog_start)); - p +=3D sizeof(prog_start); - - if (idx) { - memcpy(p, prog_dev, sizeof(prog_dev)); - p +=3D sizeof(prog_dev); - } - - if (mark) { - memcpy(p, prog_mark, sizeof(prog_mark)); - p +=3D sizeof(prog_mark); - } - - if (prio) { - memcpy(p, prog_prio, sizeof(prog_prio)); - p +=3D sizeof(prog_prio); - } - - memcpy(p, prog_end, sizeof(prog_end)); - p +=3D sizeof(prog_end); - - insns_cnt /=3D sizeof(struct bpf_insn); - - ret =3D bpf_prog_load(BPF_PROG_TYPE_CGROUP_SOCK, NULL, "GPL", - prog, insns_cnt, &opts); - - free(prog); - - return ret; -} - -static int get_bind_to_device(int sd, char *name, size_t len) -{ - socklen_t optlen =3D len; - int rc; - - name[0] =3D '\0'; - rc =3D getsockopt(sd, SOL_SOCKET, SO_BINDTODEVICE, name, &optlen); - if (rc < 0) - perror("setsockopt(SO_BINDTODEVICE)"); - - return rc; -} - -static unsigned int get_somark(int sd) -{ - unsigned int mark =3D 0; - socklen_t optlen =3D sizeof(mark); - int rc; - - rc =3D getsockopt(sd, SOL_SOCKET, SO_MARK, &mark, &optlen); - if (rc < 0) - perror("getsockopt(SO_MARK)"); - - return mark; -} - -static unsigned int get_priority(int sd) -{ - unsigned int prio =3D 0; - socklen_t optlen =3D sizeof(prio); - int rc; - - rc =3D getsockopt(sd, SOL_SOCKET, SO_PRIORITY, &prio, &optlen); - if (rc < 0) - perror("getsockopt(SO_PRIORITY)"); - - return prio; -} - -static int show_sockopts(int family) -{ - unsigned int mark, prio; - char name[16]; - int sd; - - sd =3D socket(family, SOCK_DGRAM, 17); - if (sd < 0) { - perror("socket"); - return 1; - } - - if (get_bind_to_device(sd, name, sizeof(name)) < 0) { - close(sd); - return 1; - } - - mark =3D get_somark(sd); - prio =3D get_priority(sd); - - close(sd); - - printf("sd %d: dev %s, mark %u, priority %u\n", sd, name, mark, prio); - - return 0; -} - -static int usage(const char *argv0) -{ - printf("Usage:\n"); - printf(" Attach a program\n"); - printf(" %s -b bind-to-dev -m mark -p prio cg-path\n", argv0); - printf("\n"); - printf(" Detach a program\n"); - printf(" %s -d cg-path\n", argv0); - printf("\n"); - printf(" Show inherited socket settings (mark, priority, and device)\n"); - printf(" %s [-6]\n", argv0); - return EXIT_FAILURE; -} - -int main(int argc, char **argv) -{ - __u32 idx =3D 0, mark =3D 0, prio =3D 0; - const char *cgrp_path =3D NULL; - int cg_fd, prog_fd, ret; - int family =3D PF_INET; - int do_attach =3D 1; - int rc; - - while ((rc =3D getopt(argc, argv, "db:m:p:6")) !=3D -1) { - switch (rc) { - case 'd': - do_attach =3D 0; - break; - case 'b': - idx =3D if_nametoindex(optarg); - if (!idx) { - idx =3D strtoumax(optarg, NULL, 0); - if (!idx) { - printf("Invalid device name\n"); - return EXIT_FAILURE; - } - } - break; - case 'm': - mark =3D strtoumax(optarg, NULL, 0); - break; - case 'p': - prio =3D strtoumax(optarg, NULL, 0); - break; - case '6': - family =3D PF_INET6; - break; - default: - return usage(argv[0]); - } - } - - if (optind =3D=3D argc) - return show_sockopts(family); - - cgrp_path =3D argv[optind]; - if (!cgrp_path) { - fprintf(stderr, "cgroup path not given\n"); - return EXIT_FAILURE; - } - - if (do_attach && !idx && !mark && !prio) { - fprintf(stderr, - "One of device, mark or priority must be given\n"); - return EXIT_FAILURE; - } - - cg_fd =3D open(cgrp_path, O_DIRECTORY | O_RDONLY); - if (cg_fd < 0) { - printf("Failed to open cgroup path: '%s'\n", strerror(errno)); - return EXIT_FAILURE; - } - - if (do_attach) { - prog_fd =3D prog_load(idx, mark, prio); - if (prog_fd < 0) { - printf("Failed to load prog: '%s'\n", strerror(errno)); - printf("Output from kernel verifier:\n%s\n-------\n", - bpf_log_buf); - return EXIT_FAILURE; - } - - ret =3D bpf_prog_attach(prog_fd, cg_fd, - BPF_CGROUP_INET_SOCK_CREATE, 0); - if (ret < 0) { - printf("Failed to attach prog to cgroup: '%s'\n", - strerror(errno)); - return EXIT_FAILURE; - } - } else { - ret =3D bpf_prog_detach(cg_fd, BPF_CGROUP_INET_SOCK_CREATE); - if (ret < 0) { - printf("Failed to detach prog from cgroup: '%s'\n", - strerror(errno)); - return EXIT_FAILURE; - } - } - - close(cg_fd); - return EXIT_SUCCESS; -} diff --git a/samples/bpf/test_cgrp2_sock.sh b/samples/bpf/test_cgrp2_sock.sh deleted file mode 100755 index 36bd7cb46f06..000000000000 --- a/samples/bpf/test_cgrp2_sock.sh +++ /dev/null @@ -1,137 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: GPL-2.0 - -# Test various socket options that can be set by attaching programs to cgr= oups. - -MY_DIR=3D$(dirname $0) -TEST=3D$MY_DIR/test_cgrp2_sock -CGRP_MNT=3D"/tmp/cgroupv2-test_cgrp2_sock" - -##########################################################################= ###### -# -print_result() -{ - local rc=3D$1 - local status=3D" OK " - - [ $rc -ne 0 ] && status=3D"FAIL" - - printf "%-50s [%4s]\n" "$2" "$status" -} - -check_sock() -{ - out=3D$($TEST) - echo $out | grep -q "$1" - if [ $? -ne 0 ]; then - print_result 1 "IPv4: $2" - echo " expected: $1" - echo " have: $out" - rc=3D1 - else - print_result 0 "IPv4: $2" - fi -} - -check_sock6() -{ - out=3D$($TEST -6) - echo $out | grep -q "$1" - if [ $? -ne 0 ]; then - print_result 1 "IPv6: $2" - echo " expected: $1" - echo " have: $out" - rc=3D1 - else - print_result 0 "IPv6: $2" - fi -} - -##########################################################################= ###### -# - -cleanup() -{ - echo $$ >> ${CGRP_MNT}/cgroup.procs - rmdir ${CGRP_MNT}/sockopts -} - -cleanup_and_exit() -{ - local rc=3D$1 - local msg=3D"$2" - - [ -n "$msg" ] && echo "ERROR: $msg" - - $TEST -d ${CGRP_MNT}/sockopts - ip li del cgrp2_sock - umount ${CGRP_MNT} - - exit $rc -} - - -##########################################################################= ###### -# main - -rc=3D0 - -ip li add cgrp2_sock type dummy 2>/dev/null - -set -e -mkdir -p ${CGRP_MNT} -mount -t cgroup2 none ${CGRP_MNT} -set +e - - -# make sure we have a known start point -cleanup 2>/dev/null - -mkdir -p ${CGRP_MNT}/sockopts -[ $? -ne 0 ] && cleanup_and_exit 1 "Failed to create cgroup hierarchy" - - -# set pid into cgroup -echo $$ > ${CGRP_MNT}/sockopts/cgroup.procs - -# no bpf program attached, so socket should show no settings -check_sock "dev , mark 0, priority 0" "No programs attached" -check_sock6 "dev , mark 0, priority 0" "No programs attached" - -# verify device is set -# -$TEST -b cgrp2_sock ${CGRP_MNT}/sockopts -if [ $? -ne 0 ]; then - cleanup_and_exit 1 "Failed to install program to set device" -fi -check_sock "dev cgrp2_sock, mark 0, priority 0" "Device set" -check_sock6 "dev cgrp2_sock, mark 0, priority 0" "Device set" - -# verify mark is set -# -$TEST -m 666 ${CGRP_MNT}/sockopts -if [ $? -ne 0 ]; then - cleanup_and_exit 1 "Failed to install program to set mark" -fi -check_sock "dev , mark 666, priority 0" "Mark set" -check_sock6 "dev , mark 666, priority 0" "Mark set" - -# verify priority is set -# -$TEST -p 123 ${CGRP_MNT}/sockopts -if [ $? -ne 0 ]; then - cleanup_and_exit 1 "Failed to install program to set priority" -fi -check_sock "dev , mark 0, priority 123" "Priority set" -check_sock6 "dev , mark 0, priority 123" "Priority set" - -# all 3 at once -# -$TEST -b cgrp2_sock -m 666 -p 123 ${CGRP_MNT}/sockopts -if [ $? -ne 0 ]; then - cleanup_and_exit 1 "Failed to install program to set device, mark and pri= ority" -fi -check_sock "dev cgrp2_sock, mark 666, priority 123" "Priority set" -check_sock6 "dev cgrp2_sock, mark 666, priority 123" "Priority set" - -cleanup_and_exit $rc diff --git a/tools/testing/selftests/bpf/prog_tests/sock_create.c b/tools/t= esting/selftests/bpf/prog_tests/sock_create.c new file mode 100644 index 000000000000..072910c05c99 --- /dev/null +++ b/tools/testing/selftests/bpf/prog_tests/sock_create.c @@ -0,0 +1,256 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include "cgroup_helpers.h" + +static char bpf_log_buf[4096]; +static bool verbose; + +static struct sock_create_test { + const char *descr; + const struct bpf_insn insns[64]; + enum bpf_attach_type attach_type; + enum bpf_attach_type expected_attach_type; + + int domain; + int type; + + int optname; + int optval; +} tests[] =3D { + { + .descr =3D "AF_INET set priority", + .insns =3D { + /* r3 =3D 123 (priority) */ + BPF_MOV64_IMM(BPF_REG_3, 123), + BPF_STX_MEM(BPF_W, BPF_REG_1, BPF_REG_3, + offsetof(struct bpf_sock, priority)), + + /* return 1 */ + BPF_MOV64_IMM(BPF_REG_0, 1), + BPF_EXIT_INSN(), + }, + .expected_attach_type =3D BPF_CGROUP_INET_SOCK_CREATE, + .attach_type =3D BPF_CGROUP_INET_SOCK_CREATE, + + .domain =3D AF_INET, + .type =3D SOCK_DGRAM, + + .optname =3D SO_PRIORITY, + .optval =3D 123, + }, + { + .descr =3D "AF_INET6 set priority", + .insns =3D { + /* r3 =3D 123 (priority) */ + BPF_MOV64_IMM(BPF_REG_3, 123), + BPF_STX_MEM(BPF_W, BPF_REG_1, BPF_REG_3, + offsetof(struct bpf_sock, priority)), + + /* return 1 */ + BPF_MOV64_IMM(BPF_REG_0, 1), + BPF_EXIT_INSN(), + }, + .expected_attach_type =3D BPF_CGROUP_INET_SOCK_CREATE, + .attach_type =3D BPF_CGROUP_INET_SOCK_CREATE, + + .domain =3D AF_INET6, + .type =3D SOCK_DGRAM, + + .optname =3D SO_PRIORITY, + .optval =3D 123, + }, + { + .descr =3D "AF_INET set mark", + .insns =3D { + BPF_MOV64_REG(BPF_REG_6, BPF_REG_1), + + /* get uid of process */ + BPF_EMIT_CALL(BPF_FUNC_get_current_uid_gid), + BPF_ALU64_IMM(BPF_AND, BPF_REG_0, 0xffffffff), + + /* if uid is 0, use given mark(666), else use uid as the mark */ + BPF_MOV64_REG(BPF_REG_3, BPF_REG_0), + BPF_JMP_IMM(BPF_JNE, BPF_REG_0, 0, 1), + BPF_MOV64_IMM(BPF_REG_3, 666), + + BPF_MOV64_REG(BPF_REG_1, BPF_REG_6), + BPF_STX_MEM(BPF_W, BPF_REG_1, BPF_REG_3, + offsetof(struct bpf_sock, mark)), + + /* return 1 */ + BPF_MOV64_IMM(BPF_REG_0, 1), + BPF_EXIT_INSN(), + }, + .expected_attach_type =3D BPF_CGROUP_INET_SOCK_CREATE, + .attach_type =3D BPF_CGROUP_INET_SOCK_CREATE, + + .domain =3D AF_INET, + .type =3D SOCK_DGRAM, + + .optname =3D SO_MARK, + .optval =3D 666, + }, + { + .descr =3D "AF_INET6 set mark", + .insns =3D { + BPF_MOV64_REG(BPF_REG_6, BPF_REG_1), + + /* get uid of process */ + BPF_EMIT_CALL(BPF_FUNC_get_current_uid_gid), + BPF_ALU64_IMM(BPF_AND, BPF_REG_0, 0xffffffff), + + /* if uid is 0, use given mark(666), else use uid as the mark */ + BPF_MOV64_REG(BPF_REG_3, BPF_REG_0), + BPF_JMP_IMM(BPF_JNE, BPF_REG_0, 0, 1), + BPF_MOV64_IMM(BPF_REG_3, 666), + + BPF_MOV64_REG(BPF_REG_1, BPF_REG_6), + BPF_STX_MEM(BPF_W, BPF_REG_1, BPF_REG_3, + offsetof(struct bpf_sock, mark)), + + /* return 1 */ + BPF_MOV64_IMM(BPF_REG_0, 1), + BPF_EXIT_INSN(), + }, + .expected_attach_type =3D BPF_CGROUP_INET_SOCK_CREATE, + .attach_type =3D BPF_CGROUP_INET_SOCK_CREATE, + + .domain =3D AF_INET6, + .type =3D SOCK_DGRAM, + + .optname =3D SO_MARK, + .optval =3D 666, + }, + { + .descr =3D "AF_INET bound to iface", + .insns =3D { + /* r3 =3D 1 (lo interface) */ + BPF_MOV64_IMM(BPF_REG_3, 1), + BPF_STX_MEM(BPF_W, BPF_REG_1, BPF_REG_3, + offsetof(struct bpf_sock, bound_dev_if)), + + /* return 1 */ + BPF_MOV64_IMM(BPF_REG_0, 1), + BPF_EXIT_INSN(), + }, + .expected_attach_type =3D BPF_CGROUP_INET_SOCK_CREATE, + .attach_type =3D BPF_CGROUP_INET_SOCK_CREATE, + + .domain =3D AF_INET, + .type =3D SOCK_DGRAM, + + .optname =3D SO_BINDTOIFINDEX, + .optval =3D 1, + }, + { + .descr =3D "AF_INET6 bound to iface", + .insns =3D { + /* r3 =3D 1 (lo interface) */ + BPF_MOV64_IMM(BPF_REG_3, 1), + BPF_STX_MEM(BPF_W, BPF_REG_1, BPF_REG_3, + offsetof(struct bpf_sock, bound_dev_if)), + + /* return 1 */ + BPF_MOV64_IMM(BPF_REG_0, 1), + BPF_EXIT_INSN(), + }, + .expected_attach_type =3D BPF_CGROUP_INET_SOCK_CREATE, + .attach_type =3D BPF_CGROUP_INET_SOCK_CREATE, + + .domain =3D AF_INET6, + .type =3D SOCK_DGRAM, + + .optname =3D SO_BINDTOIFINDEX, + .optval =3D 1, + }, +}; + +static int load_prog(const struct bpf_insn *insns, + enum bpf_attach_type expected_attach_type) +{ + LIBBPF_OPTS(bpf_prog_load_opts, opts, + .expected_attach_type =3D expected_attach_type, + .log_level =3D 2, + .log_buf =3D bpf_log_buf, + .log_size =3D sizeof(bpf_log_buf), + ); + int fd, insns_cnt =3D 0; + + for (; + insns[insns_cnt].code !=3D (BPF_JMP | BPF_EXIT); + insns_cnt++) { + } + insns_cnt++; + + fd =3D bpf_prog_load(BPF_PROG_TYPE_CGROUP_SOCK, NULL, "GPL", insns, + insns_cnt, &opts); + if (verbose && fd < 0) + fprintf(stderr, "%s\n", bpf_log_buf); + + return fd; +} + +static int run_test(int cgroup_fd, struct sock_create_test *test) +{ + int sock_fd, err, prog_fd, optval, ret =3D -1; + socklen_t optlen =3D sizeof(optval); + + prog_fd =3D load_prog(test->insns, test->expected_attach_type); + if (prog_fd < 0) { + log_err("Failed to load BPF program"); + return -1; + } + + err =3D bpf_prog_attach(prog_fd, cgroup_fd, test->attach_type, 0); + if (err < 0) { + log_err("Failed to attach BPF program"); + goto close_prog_fd; + } + + sock_fd =3D socket(test->domain, test->type, 0); + if (sock_fd < 0) { + log_err("Failed to create socket"); + goto detach_prog; + } + + err =3D getsockopt(sock_fd, SOL_SOCKET, test->optname, &optval, &optlen); + if (err) { + log_err("Failed to call getsockopt"); + goto cleanup; + } + + if (optval !=3D test->optval) { + errno =3D 0; + log_err("getsockopt returned unexpected optval"); + goto cleanup; + } + + ret =3D 0; + +cleanup: + close(sock_fd); +detach_prog: + bpf_prog_detach2(prog_fd, cgroup_fd, test->attach_type); +close_prog_fd: + close(prog_fd); + return ret; +} + +void test_sock_create(void) +{ + int cgroup_fd, i; + + cgroup_fd =3D test__join_cgroup("/sock_create"); + if (!ASSERT_GE(cgroup_fd, 0, "join_cgroup")) + return; + + for (i =3D 0; i < ARRAY_SIZE(tests); i++) { + if (!test__start_subtest(tests[i].descr)) + continue; + + ASSERT_OK(run_test(cgroup_fd, &tests[i]), tests[i].descr); + } + + close(cgroup_fd); +} --=20 2.43.0