{"id":808439,"url":"http://patchwork.ozlabs.org/api/1.0/patches/808439/?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-8-git-send-email-dsahern@gmail.com>","date":"2017-08-31T22:05:50","name":"[v3,net-next,7/7] samples/bpf: Update cgroup socket examples to use uid gid helper","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"f81670df062694598b2e5cc44b578ad4b2124cf5","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-8-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/808439/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=\"CL44LtyS\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xjxKd08Y3z9s81\n\tfor ;\n\tFri, 1 Sep 2017 08:06:29 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751796AbdHaWGZ (ORCPT );\n\tThu, 31 Aug 2017 18:06:25 -0400","from mail-pg0-f67.google.com ([74.125.83.67]:33285 \"EHLO\n\tmail-pg0-f67.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751623AbdHaWGP (ORCPT\n\t); Thu, 31 Aug 2017 18:06:15 -0400","by mail-pg0-f67.google.com with SMTP id m15so571247pgc.0\n\tfor ; Thu, 31 Aug 2017 15:06:15 -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.14\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tThu, 31 Aug 2017 15:06:14 -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=1mSgRaf+0pbxZOrxYOwKN6sg9BR5be3s9dUy0PTvBnE=;\n\tb=CL44LtySNjXaQuodsTQzsXCCT60w9eis4IyKZdlMPAezVtStG1MBur63fFLN/or29s\n\tipIJeumZYcQCEqrMDuu/joMqiskDgpUgdvW0RHPS6+lLpzcAj6KNRnerB5ZSmeU0VhcW\n\tUuAUCdY3ckbB+uwGUGcXosRwQA/to9b79LEJtVLmwYjdkNPVY6B07N45VlmrBsIyw9n+\n\tqwMGZsFVnugjO8fUv8EIvLfh3XXVqfU2OPb2I+knYoq8Z5EUwS0AkXEw0IDIHhk/RMOg\n\thCfz/lc14sBBBtpDnMSpNlWiCHSxZpkJv3Pe14gTxxkH/aYxF/oJHMb1fHj8CQwaen4X\n\tBTNw==","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=1mSgRaf+0pbxZOrxYOwKN6sg9BR5be3s9dUy0PTvBnE=;\n\tb=h/pPhEcdoDdZrDXBG46D6w2vMbKBOEzFknqYR3rsWQLjsUzX6Lntm5+3cc16IJNRfI\n\tliWqbUbqNSDSGbdmvi2Emeq7vJWsA1s9D43oeyaBDj42sqlp3KvR6IgcLQzi2L5IhTXM\n\tJi94VYVmqqnO3xUR4RGW3wnjgY2YiG2WOzawuYcOGdLm0wi8c1MDA1XEuUwBzhmJOU3G\n\tepzcjQFvN7RVKFf3IgJad2a0VL3pg5o7Vacd6IFLyo5+gfBmRjiGrQFRjC1J+zcPB8E/\n\tUFXS53rrk+c0FHaGAd8xnyFNuyU7ez/4YpjM/1ZU6vMRIbPmJ9aaZdGsievRHefCShwR\n\tMaHw==","X-Gm-Message-State":"AHYfb5gLFMjthnTYjnHQM0oXCLc2oWXOo7OfBxwaB0wrnt3bhh2LjnnZ\n\t8JhPyrK+/wz33OyA","X-Google-Smtp-Source":"ADKCNb6Bs5y/b+2M4/f5QThoRK1Kl7/VFYKVmUO2DcuYRjlCmcugdqyOFC5GcrR2+Bhh2vCjbo7glA==","X-Received":"by 10.101.86.68 with SMTP id m4mr4048246pgs.79.1504217174919;\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 7/7] samples/bpf: Update cgroup socket examples\n\tto use uid gid helper","Date":"Thu, 31 Aug 2017 15:05:50 -0700","Message-Id":"<1504217150-16151-8-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":"Signed-off-by: David Ahern \n---\n samples/bpf/sock_flags_kern.c | 5 +++++\n samples/bpf/test_cgrp2_sock.c | 12 +++++++++++-\n 2 files changed, 16 insertions(+), 1 deletion(-)","diff":"diff --git a/samples/bpf/sock_flags_kern.c b/samples/bpf/sock_flags_kern.c\nindex 533dd11a6baa..05dcdf8a4baa 100644\n--- a/samples/bpf/sock_flags_kern.c\n+++ b/samples/bpf/sock_flags_kern.c\n@@ -9,8 +9,13 @@ SEC(\"cgroup/sock1\")\n int bpf_prog1(struct bpf_sock *sk)\n {\n \tchar fmt[] = \"socket: family %d type %d protocol %d\\n\";\n+\tchar fmt2[] = \"socket: uid %u gid %u\\n\";\n+\t__u64 gid_uid = bpf_get_current_uid_gid();\n+\t__u32 uid = gid_uid & 0xffffffff;\n+\t__u32 gid = gid_uid >> 32;\n \n \tbpf_trace_printk(fmt, sizeof(fmt), sk->family, sk->type, sk->protocol);\n+\tbpf_trace_printk(fmt2, sizeof(fmt2), uid, gid);\n \n \t/* block PF_INET6, SOCK_RAW, IPPROTO_ICMPV6 sockets\n \t * ie., make ping6 fail\ndiff --git a/samples/bpf/test_cgrp2_sock.c b/samples/bpf/test_cgrp2_sock.c\nindex 5a688837720c..e79594dd629b 100644\n--- a/samples/bpf/test_cgrp2_sock.c\n+++ b/samples/bpf/test_cgrp2_sock.c\n@@ -46,8 +46,18 @@ static int prog_load(__u32 idx, __u32 mark, __u32 prio)\n \n \t/* set mark on socket */\n \tstruct bpf_insn prog_mark[] = {\n-\t\tBPF_MOV64_REG(BPF_REG_1, BPF_REG_6),\n+\t\t/* get uid of process */\n+\t\tBPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,\n+\t\t\t BPF_FUNC_get_current_uid_gid),\n+\t\tBPF_ALU64_IMM(BPF_AND, BPF_REG_0, 0xffffffff),\n+\n+\t\t/* if uid is 0, use given mark, else use the uid as the mark */\n+\t\tBPF_MOV64_REG(BPF_REG_3, BPF_REG_0),\n+\t\tBPF_JMP_IMM(BPF_JNE, BPF_REG_0, 0, 1),\n \t\tBPF_MOV64_IMM(BPF_REG_3, mark),\n+\n+\t\t/* set the mark on the new socket */\n+\t\tBPF_MOV64_REG(BPF_REG_1, BPF_REG_6),\n \t\tBPF_MOV64_IMM(BPF_REG_2, offsetof(struct bpf_sock, mark)),\n \t\tBPF_STX_MEM(BPF_W, BPF_REG_1, BPF_REG_3, offsetof(struct bpf_sock, mark)),\n \t};\n","prefixes":["v3","net-next","7/7"]}