{"id":808440,"url":"http://patchwork.ozlabs.org/api/1.0/patches/808440/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<1504217150-16151-7-git-send-email-dsahern@gmail.com>","date":"2017-08-31T22:05:49","name":"[v3,net-next,6/7] samples/bpf: Update cgrp2 socket tests","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"b0295271687a8f36945ba23e22518e704ca07c34","submitter":{"id":6918,"url":"http://patchwork.ozlabs.org/api/1.0/people/6918/?format=json","name":"David Ahern","email":"dsahern@gmail.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.0/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1504217150-16151-7-git-send-email-dsahern@gmail.com/mbox/","series":[{"id":913,"url":"http://patchwork.ozlabs.org/api/1.0/series/913/?format=json","date":"2017-08-31T22:05:43","name":"bpf: Add option to set mark and priority in cgroup sock programs","version":3,"mbox":"http://patchwork.ozlabs.org/series/913/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808440/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"pAA0gc0I\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xjxKj3n3Pz9s8J\n\tfor ;\n\tFri, 1 Sep 2017 08:06:33 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751792AbdHaWGY (ORCPT );\n\tThu, 31 Aug 2017 18:06:24 -0400","from mail-pf0-f169.google.com ([209.85.192.169]:33346 \"EHLO\n\tmail-pf0-f169.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751205AbdHaWGP (ORCPT\n\t); Thu, 31 Aug 2017 18:06:15 -0400","by mail-pf0-f169.google.com with SMTP id n73so2711417pfj.0\n\tfor ; Thu, 31 Aug 2017 15:06:14 -0700 (PDT)","from kenny.it.cumulusnetworks.com. (fw.cumulusnetworks.com.\n\t[216.129.126.126]) by smtp.googlemail.com with ESMTPSA id\n\tx12sm845336pfk.42.2017.08.31.15.06.13\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tThu, 31 Aug 2017 15:06:13 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=bCqCikMluhfsZKsDQbhhqB/XB71kdY8RgBG0Y3ompwc=;\n\tb=pAA0gc0INTdkoo87IjgGU1NPnuB/dDN1EA5gPPtE9DFfbK8jt36M8yrPBWPDxMnV63\n\tobLA3ki4P68rMy2b9VbsQlRyOMeFeN3gqmhV6w29DL3xuQ5Ef2O2RXJS/KD6X3LdlAwt\n\t1I4mRnRVvbEdE3+otrUI6YsKCOQN7ZFy2jv1aaMqL6Ysq1CNxIEjuMeoL/+kRW2yA6c2\n\tObROmB3r4ez0vEff87kPuNpK1DcwFdtm9BRWsb95lovieu9LX8NVZJwANCTm3lwUEL8N\n\tcEOUaOm2fG3fOcCMkGJRsHpsqWvdDK0LwTdbcz+wV4qAmZcCe9Lc7LBBLBUhUhjjApnW\n\tC2Ng==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=bCqCikMluhfsZKsDQbhhqB/XB71kdY8RgBG0Y3ompwc=;\n\tb=hkEEHqjeBCZmW3FxwyJNKAViW3z8jpy6PDiDnmvnPPVQ1SMAHQu6FnRpkXAhrS0tS6\n\taXFTQP03D75YpciyVgPSka9ce1ewgu+z/5i2Wmr825PvGwXqoBj6HZATfw4hHoP8B1yl\n\tT6mpGraDTgWtcm1ce+cdajpir3bkneIIoYYbinNMw4/H+2kqkStkRr6krXi3oWlIiusr\n\twnRMSNBwTpjCYWIy/8ORJOI5IPHAs4yExgrOyicPSC/kvR1QKA4lAudctfDt7mN2PIzj\n\tLjAFhyK+6s8YCXoQ2kLhMM+n53XIacau6QCE0Uw1vEhESVO1HZ8/xowqmFzHcgt6yTkY\n\tLrVg==","X-Gm-Message-State":"AHYfb5iRjNQEbkq9EzB44rpEzZVpfJTI//oj8VBUpxWVhqxqRpPHghLp\n\tolKQE82PyzNoWFUb","X-Google-Smtp-Source":"ADKCNb5Qw1WodjVK0nVZUnJK050FGjraOzjMASNkDCvCRAr0Tcd9XDI+NNycPMqEbJv7Qiq+bbz4Xw==","X-Received":"by 10.99.168.72 with SMTP id i8mr4197053pgp.281.1504217174076;\n\tThu, 31 Aug 2017 15:06:14 -0700 (PDT)","From":"David Ahern ","To":"netdev@vger.kernel.org, daniel@iogearbox.net, ast@kernel.org","Cc":"David Ahern ","Subject":"[PATCH v3 net-next 6/7] samples/bpf: Update cgrp2 socket tests","Date":"Thu, 31 Aug 2017 15:05:49 -0700","Message-Id":"<1504217150-16151-7-git-send-email-dsahern@gmail.com>","X-Mailer":"git-send-email 2.1.4","In-Reply-To":"<1504217150-16151-1-git-send-email-dsahern@gmail.com>","References":"<1504217150-16151-1-git-send-email-dsahern@gmail.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Update cgrp2 bpf sock tests to check that device, mark and priority\ncan all be set on a socket via bpf programs attached to a cgroup.\n\nSigned-off-by: David Ahern \n---\n samples/bpf/test_cgrp2_sock.sh | 162 +++++++++++++++++++++++++++++++----------\n 1 file changed, 124 insertions(+), 38 deletions(-)","diff":"diff --git a/samples/bpf/test_cgrp2_sock.sh b/samples/bpf/test_cgrp2_sock.sh\nindex 1153c33e8964..a81f38eef417 100755\n--- a/samples/bpf/test_cgrp2_sock.sh\n+++ b/samples/bpf/test_cgrp2_sock.sh\n@@ -1,47 +1,133 @@\n-#!/bin/bash\n-\n-function config_device {\n-\tip netns add at_ns0\n-\tip link add veth0 type veth peer name veth0b\n-\tip link set veth0b up\n-\tip link set veth0 netns at_ns0\n-\tip netns exec at_ns0 ip addr add 172.16.1.100/24 dev veth0\n-\tip netns exec at_ns0 ip addr add 2401:db00::1/64 dev veth0 nodad\n-\tip netns exec at_ns0 ip link set dev veth0 up\n-\tip link add foo type vrf table 1234\n-\tip link set foo up\n-\tip addr add 172.16.1.101/24 dev veth0b\n-\tip addr add 2401:db00::2/64 dev veth0b nodad\n-\tip link set veth0b master foo\n+#!/bin/sh\n+\n+# Test various socket options that can be set by attaching programs to cgroups.\n+\n+CGRP_MNT=\"/tmp/cgroupv2-test_cgrp2_sock\"\n+\n+################################################################################\n+#\n+print_result()\n+{\n+\tlocal rc=$1\n+\tlocal status=\" OK \"\n+\n+\t[ $rc -ne 0 ] && status=\"FAIL\"\n+\n+\tprintf \"%-50s [%4s]\\n\" \"$2\" \"$status\"\n }\n \n-function attach_bpf {\n-\trm -rf /tmp/cgroupv2\n-\tmkdir -p /tmp/cgroupv2\n-\tmount -t cgroup2 none /tmp/cgroupv2\n-\tmkdir -p /tmp/cgroupv2/foo\n-\ttest_cgrp2_sock -b foo /tmp/cgroupv2/foo\n-\techo $$ >> /tmp/cgroupv2/foo/cgroup.procs\n+check_sock()\n+{\n+\tout=$(test_cgrp2_sock)\n+\techo $out | grep -q \"$1\"\n+\tif [ $? -ne 0 ]; then\n+\t\tprint_result 1 \"IPv4: $2\"\n+\t\techo \" expected: $1\"\n+\t\techo \" have: $out\"\n+\t\trc=1\n+\telse\n+\t\tprint_result 0 \"IPv4: $2\"\n+\tfi\n }\n \n-function cleanup {\n-\tset +ex\n-\tip netns delete at_ns0\n-\tip link del veth0\n-\tip link del foo\n-\tumount /tmp/cgroupv2\n-\trm -rf /tmp/cgroupv2\n-\tset -ex\n+check_sock6()\n+{\n+\tout=$(test_cgrp2_sock -6)\n+\techo $out | grep -q \"$1\"\n+\tif [ $? -ne 0 ]; then\n+\t\tprint_result 1 \"IPv6: $2\"\n+\t\techo \" expected: $1\"\n+\t\techo \" have: $out\"\n+\t\trc=1\n+\telse\n+\t\tprint_result 0 \"IPv6: $2\"\n+\tfi\n }\n \n-function do_test {\n-\tping -c1 -w1 172.16.1.100\n-\tping6 -c1 -w1 2401:db00::1\n+################################################################################\n+#\n+\n+cleanup()\n+{\n+\techo $$ >> ${CGRP_MNT}/cgroup.procs\n+\trmdir ${CGRP_MNT}/sockopts\n }\n \n+cleanup_and_exit()\n+{\n+\tlocal rc=$1\n+\tlocal msg=\"$2\"\n+\n+\t[ -n \"$msg\" ] && echo \"ERROR: $msg\"\n+\n+\tip li del cgrp2_sock\n+\tumount ${CGRP_MNT}\n+\n+\texit $rc\n+}\n+\n+\n+################################################################################\n+# main\n+\n+rc=0\n+\n+ip li add cgrp2_sock type dummy 2>/dev/null\n+\n+set -e\n+mkdir -p ${CGRP_MNT}\n+mount -t cgroup2 none ${CGRP_MNT}\n+set +e\n+\n+\n+# make sure we have a known start point\n cleanup 2>/dev/null\n-config_device\n-attach_bpf\n-do_test\n-cleanup\n-echo \"*** PASS ***\"\n+\n+mkdir -p ${CGRP_MNT}/sockopts\n+[ $? -ne 0 ] && cleanup_and_exit 1 \"Failed to create cgroup hierarchy\"\n+\n+\n+# set pid into cgroup\n+echo $$ > ${CGRP_MNT}/sockopts/cgroup.procs\n+\n+# no bpf program attached, so socket should show no settings\n+check_sock \"dev , mark 0, priority 0\" \"No programs attached\"\n+check_sock6 \"dev , mark 0, priority 0\" \"No programs attached\"\n+\n+# verify device is set\n+#\n+test_cgrp2_sock -b cgrp2_sock ${CGRP_MNT}/sockopts\n+if [ $? -ne 0 ]; then\n+\tcleanup_and_exit 1 \"Failed to install program to set device\"\n+fi\n+check_sock \"dev cgrp2_sock, mark 0, priority 0\" \"Device set\"\n+check_sock6 \"dev cgrp2_sock, mark 0, priority 0\" \"Device set\"\n+\n+# verify mark is set\n+#\n+test_cgrp2_sock -m 666 ${CGRP_MNT}/sockopts\n+if [ $? -ne 0 ]; then\n+\tcleanup_and_exit 1 \"Failed to install program to set mark\"\n+fi\n+check_sock \"dev , mark 666, priority 0\" \"Mark set\"\n+check_sock6 \"dev , mark 666, priority 0\" \"Mark set\"\n+\n+# verify priority is set\n+#\n+test_cgrp2_sock -p 123 ${CGRP_MNT}/sockopts\n+if [ $? -ne 0 ]; then\n+\tcleanup_and_exit 1 \"Failed to install program to set priority\"\n+fi\n+check_sock \"dev , mark 0, priority 123\" \"Priority set\"\n+check_sock6 \"dev , mark 0, priority 123\" \"Priority set\"\n+\n+# all 3 at once\n+#\n+test_cgrp2_sock -b cgrp2_sock -m 666 -p 123 ${CGRP_MNT}/sockopts\n+if [ $? -ne 0 ]; then\n+\tcleanup_and_exit 1 \"Failed to install program to set device, mark and priority\"\n+fi\n+check_sock \"dev cgrp2_sock, mark 666, priority 123\" \"Priority set\"\n+check_sock6 \"dev cgrp2_sock, mark 666, priority 123\" \"Priority set\"\n+\n+cleanup_and_exit $rc\n","prefixes":["v3","net-next","6/7"]}