From patchwork Sat Apr 2 01:21:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brenden Blanco X-Patchwork-Id: 605378 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3qcL8f3dbXz9sDG for ; Sat, 2 Apr 2016 12:22:42 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=plumgrid-com.20150623.gappssmtp.com header.i=@plumgrid-com.20150623.gappssmtp.com header.b=J82THBNW; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757042AbcDBBWl (ORCPT ); Fri, 1 Apr 2016 21:22:41 -0400 Received: from mail-pf0-f179.google.com ([209.85.192.179]:34466 "EHLO mail-pf0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757062AbcDBBWO (ORCPT ); Fri, 1 Apr 2016 21:22:14 -0400 Received: by mail-pf0-f179.google.com with SMTP id x3so102265971pfb.1 for ; Fri, 01 Apr 2016 18:22:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=plumgrid-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=f1p46Uo0r0BINfVIgUEx8oA+5t8x6+AfCcGaEFLusZ0=; b=J82THBNWzmULku+FoafGI5NodrL7joqVYj6JalmI35Zyv6LspCdHpTAQ9pCDzqaCpS xYipoPbnP6b1hqPJ5AclTQO9q+HkEnCLYtZTiWk0PWpAY8l+mf7OeJxx0ZRXyJkzxR0W NpaT3iO5m/d9MMj4M8bhKOxj2WdvtrOZh7Ev5cyq0fFI2PQOl2K0wyPvCrLhxmTXEklz SG273MdQzWJAgVfk+fU/W+TEUZa3Sd0b2XlmE3IXJsw7nnRX0WKkcPievPMNjZS3q2H8 RJ4yeNK/Yd7aOGRJzvpQZ6DPjSpkPXI7COHQvVdnF+x1rwcAt/t2QX5kmYDEWtO2s1Ms 8v4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=f1p46Uo0r0BINfVIgUEx8oA+5t8x6+AfCcGaEFLusZ0=; b=LlmMgQ4Fa5A2eHKLq+2uJVhhTFcClXtt227YJ7dCJ+KPGKfn2RIixJ5zXObFiMteFr NyHfBgQwwhkZEKKyEYPoS3umpdPYTbcNAaOylVXpoLJp+Y6DvQwKLSiKra56mjOfJvAf tigZAJRrxTuG4i0MI4zKPdTHqdV3KWuVfiZUnF5KeDm1CMQd0FoicgwENDg3Bs6Bueqz oD8HhC7TsOWMyOKVs4WT8sYpBhcepzgKovpd+xq8YX8jKZhPQ0RUxWdDgXl0ef7RNhc1 CGdZdaQXlqF2xOHHGJtOkpGKa/uSaqiFC5YVrFQUl2LFm3Vk/Nm7Nzv8e5MqzXgHKBgP otcQ== X-Gm-Message-State: AD7BkJJULvJWc2Js/q7QNCMdMnU9RL7s6Bb5a3LD2LCyxmUJsoArpJu6JvD7XvA9a0rnfqTM X-Received: by 10.98.71.156 with SMTP id p28mr33989825pfi.139.1459560134220; Fri, 01 Apr 2016 18:22:14 -0700 (PDT) Received: from iovisor-test1.plumgrid.com ([12.97.19.201]) by smtp.gmail.com with ESMTPSA id kl14sm24742480pab.23.2016.04.01.18.22.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Apr 2016 18:22:13 -0700 (PDT) From: Brenden Blanco To: davem@davemloft.net Cc: Brenden Blanco , netdev@vger.kernel.org, tom@herbertland.com, alexei.starovoitov@gmail.com, gerlitz@mellanox.com, daniel@iogearbox.net, john.fastabend@gmail.com, brouer@redhat.com Subject: [RFC PATCH 3/5] rtnl: add option for setting link bpf prog Date: Fri, 1 Apr 2016 18:21:56 -0700 Message-Id: <1459560118-5582-4-git-send-email-bblanco@plumgrid.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1459560118-5582-1-git-send-email-bblanco@plumgrid.com> References: <1459560118-5582-1-git-send-email-bblanco@plumgrid.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Sets the bpf program represented by fd as an early filter in the rx path of the netdev. The fd must have been created as BPF_PROG_TYPE_PHYS_DEV. Providing a negative value as fd clears the program. Getting the fd back via rtnl is not possible, therefore reading of this value merely provides a bool whether the program is valid on the link or not. Signed-off-by: Brenden Blanco --- include/uapi/linux/if_link.h | 1 + net/core/rtnetlink.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h index c488066..08d66a3 100644 --- a/include/uapi/linux/if_link.h +++ b/include/uapi/linux/if_link.h @@ -155,6 +155,7 @@ enum { IFLA_PROTO_DOWN, IFLA_GSO_MAX_SEGS, IFLA_GSO_MAX_SIZE, + IFLA_BPF_FD, __IFLA_MAX }; diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index f206677..1c4a603 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -909,6 +909,7 @@ static noinline size_t if_nlmsg_size(const struct net_device *dev, + rtnl_link_get_af_size(dev, ext_filter_mask) /* IFLA_AF_SPEC */ + nla_total_size(MAX_PHYS_ITEM_ID_LEN) /* IFLA_PHYS_PORT_ID */ + nla_total_size(MAX_PHYS_ITEM_ID_LEN) /* IFLA_PHYS_SWITCH_ID */ + + nla_total_size(4) /* IFLA_BPF_FD */ + nla_total_size(1); /* IFLA_PROTO_DOWN */ } @@ -1241,6 +1242,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev, nla_put_string(skb, IFLA_IFALIAS, dev->ifalias)) || nla_put_u32(skb, IFLA_CARRIER_CHANGES, atomic_read(&dev->carrier_changes)) || + nla_put_s32(skb, IFLA_BPF_FD, dev->bpf_valid) || nla_put_u8(skb, IFLA_PROTO_DOWN, dev->proto_down)) goto nla_put_failure; @@ -1374,6 +1376,7 @@ static const struct nla_policy ifla_policy[IFLA_MAX+1] = { [IFLA_PHYS_SWITCH_ID] = { .type = NLA_BINARY, .len = MAX_PHYS_ITEM_ID_LEN }, [IFLA_LINK_NETNSID] = { .type = NLA_S32 }, [IFLA_PROTO_DOWN] = { .type = NLA_U8 }, + [IFLA_BPF_FD] = { .type = NLA_S32 }, }; static const struct nla_policy ifla_info_policy[IFLA_INFO_MAX+1] = { @@ -2028,6 +2031,13 @@ static int do_setlink(const struct sk_buff *skb, status |= DO_SETLINK_NOTIFY; } + if (tb[IFLA_BPF_FD]) { + err = dev_change_bpf_fd(dev, nla_get_s32(tb[IFLA_BPF_FD])); + if (err) + goto errout; + status |= DO_SETLINK_NOTIFY; + } + errout: if (status & DO_SETLINK_MODIFIED) { if (status & DO_SETLINK_NOTIFY)