{"id":806001,"url":"http://patchwork.ozlabs.org/api/1.2/patches/806001/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1503687941-626-3-git-send-email-dsahern@gmail.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/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,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1503687941-626-3-git-send-email-dsahern@gmail.com>","list_archive_url":null,"date":"2017-08-25T19:05:35","name":"[v2,net-next,2/8] bpf: Add mark and priority to sock options that can be set","commit_ref":null,"pull_url":null,"state":"deferred","archived":true,"hash":"08a532c9c5b55fb3f2f782d5aca3c072e3772372","submitter":{"id":6918,"url":"http://patchwork.ozlabs.org/api/1.2/people/6918/?format=json","name":"David Ahern","email":"dsahern@gmail.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1503687941-626-3-git-send-email-dsahern@gmail.com/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/806001/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806001/checks/","tags":{},"related":[],"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=\"s2R2yVOz\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xf9cg20nLz9t1m\n\tfor ;\n\tSat, 26 Aug 2017 05:06:27 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1758165AbdHYTGZ (ORCPT );\n\tFri, 25 Aug 2017 15:06:25 -0400","from mail-pg0-f66.google.com ([74.125.83.66]:37643 \"EHLO\n\tmail-pg0-f66.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1755040AbdHYTFw (ORCPT\n\t); Fri, 25 Aug 2017 15:05:52 -0400","by mail-pg0-f66.google.com with SMTP id a7so887760pgn.4\n\tfor ; Fri, 25 Aug 2017 12:05:52 -0700 (PDT)","from kenny.it.cumulusnetworks.com. (fw.cumulusnetworks.com.\n\t[216.129.126.126]) by smtp.googlemail.com with ESMTPSA id\n\t16sm16642137pfn.188.2017.08.25.12.05.50\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tFri, 25 Aug 2017 12:05:50 -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=DsfUy9tGm2wgOg8hch2/xgJi5vj/BRyBNe81z9WnQBc=;\n\tb=s2R2yVOzRhhCQedFArCmkNS/SS+Ky18mpblcwhMXNEFqZTlg16amHwCwN4OwkkO9oI\n\tBEJTgveWzfPXw1TzJIivUEZB1VTZzQa1olVjx1akMsQsoocQTBhGrSKLfKla6Qow43jM\n\tnoL7TMA2wT+nV3aSkjPjMzEHRDBB0OTsd4Nf7aTr5YRJHABAbU61XraVDAc3Ubaf6lIm\n\tZH9VACdaU8zBT+GxhGbtPxQrLmrUKp3TClca4oE1yrk8aO+OVNqGjuEEQ1IQAMt++qZQ\n\tu4kjQC6N5t62pl55XNqPrSUROIjjz3yxAMbI5SIy9YZ5X1+VpdSxg8Up6xJiQJNOmiUo\n\tpA8w==","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=DsfUy9tGm2wgOg8hch2/xgJi5vj/BRyBNe81z9WnQBc=;\n\tb=D2RHa8rStHlJmlZsl172iqcTAUoMXW8acVctZbZfvH7lDA1i2UVO1GtXQ2OAhLlk/Z\n\tkrmnSwM3CYgS8AmRF/T4zmYHZ8xAHdOpD9/vVVtEq18hrfWfyXDolcWmNtGaAAscj/Fy\n\tisaBx+DUmLK5hxiA74ChfYu3SehHdGEZXjzS+f+llTfo9yG8yfeuufv76RvFBVt4k7fb\n\tsUm8JMUp+jmpSkrMEvIredQmad44evzJ0UkzUpC2S8zL46uajwv+q7Ua98BjJ+jrJyrO\n\tpPndBpnUABu+ZnPV++xi4yIskqd184tWHv0/8EMT884r5xcmw783k+ZkumunZm942ivr\n\tcG7A==","X-Gm-Message-State":"AHYfb5g8Yv3T9bU6RKzI+gZEgh9+UPsBxlqQ3t2H3GZ4L5q66cRgamSM\n\tRTMuuol3AglHF152","X-Received":"by 10.84.140.129 with SMTP id 1mr11660259plt.379.1503687951725; \n\tFri, 25 Aug 2017 12:05:51 -0700 (PDT)","From":"David Ahern ","To":"netdev@vger.kernel.org, daniel@iogearbox.net, ast@kernel.org,\n\ttj@kernel.org, davem@davemloft.net","Cc":"David Ahern ","Subject":"[PATCH v2 net-next 2/8] bpf: Add mark and priority to sock options\n\tthat can be set","Date":"Fri, 25 Aug 2017 12:05:35 -0700","Message-Id":"<1503687941-626-3-git-send-email-dsahern@gmail.com>","X-Mailer":"git-send-email 2.1.4","In-Reply-To":"<1503687941-626-1-git-send-email-dsahern@gmail.com>","References":"<1503687941-626-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":"Add socket mark and priority to fields that can be set by\nebpf program when a socket is created.\n\nSigned-off-by: David Ahern \nAcked-by: Alexei Starovoitov \n---\n include/uapi/linux/bpf.h | 2 ++\n net/core/filter.c | 26 ++++++++++++++++++++++++++\n 2 files changed, 28 insertions(+)","diff":"diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h\nindex 595e31b30f23..f72b957580cd 100644\n--- a/include/uapi/linux/bpf.h\n+++ b/include/uapi/linux/bpf.h\n@@ -773,6 +773,8 @@ struct bpf_sock {\n \t__u32 family;\n \t__u32 type;\n \t__u32 protocol;\n+\t__u32 mark;\n+\t__u32 priority;\n };\n \n #define XDP_PACKET_HEADROOM 256\ndiff --git a/net/core/filter.c b/net/core/filter.c\nindex 4bcd6baa80c9..d582d1b1e533 100644\n--- a/net/core/filter.c\n+++ b/net/core/filter.c\n@@ -3444,6 +3444,10 @@ static bool sock_filter_is_valid_access(int off, int size,\n \t\tswitch (off) {\n \t\tcase offsetof(struct bpf_sock, bound_dev_if):\n \t\t\tbreak;\n+\t\tcase offsetof(struct bpf_sock, mark):\n+\t\t\tbreak;\n+\t\tcase offsetof(struct bpf_sock, priority):\n+\t\t\tbreak;\n \t\tdefault:\n \t\t\treturn false;\n \t\t}\n@@ -3947,6 +3951,28 @@ static u32 sock_filter_convert_ctx_access(enum bpf_access_type type,\n \t\t\t\t offsetof(struct sock, sk_bound_dev_if));\n \t\tbreak;\n \n+\tcase offsetof(struct bpf_sock, mark):\n+\t\tBUILD_BUG_ON(FIELD_SIZEOF(struct sock, sk_mark) != 4);\n+\n+\t\tif (type == BPF_WRITE)\n+\t\t\t*insn++ = BPF_STX_MEM(BPF_W, si->dst_reg, si->src_reg,\n+\t\t\t\t\toffsetof(struct sock, sk_mark));\n+\t\telse\n+\t\t\t*insn++ = BPF_LDX_MEM(BPF_W, si->dst_reg, si->src_reg,\n+\t\t\t\t offsetof(struct sock, sk_mark));\n+\t\tbreak;\n+\n+\tcase offsetof(struct bpf_sock, priority):\n+\t\tBUILD_BUG_ON(FIELD_SIZEOF(struct sock, sk_priority) != 4);\n+\n+\t\tif (type == BPF_WRITE)\n+\t\t\t*insn++ = BPF_STX_MEM(BPF_W, si->dst_reg, si->src_reg,\n+\t\t\t\t\toffsetof(struct sock, sk_priority));\n+\t\telse\n+\t\t\t*insn++ = BPF_LDX_MEM(BPF_W, si->dst_reg, si->src_reg,\n+\t\t\t\t offsetof(struct sock, sk_priority));\n+\t\tbreak;\n+\n \tcase offsetof(struct bpf_sock, family):\n \t\tBUILD_BUG_ON(FIELD_SIZEOF(struct sock, sk_family) != 2);\n \n","prefixes":["v2","net-next","2/8"]}