From patchwork Fri Apr 8 04:48:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brenden Blanco X-Patchwork-Id: 607828 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 3qh6S94zNCz9t4c for ; Fri, 8 Apr 2016 14:49:13 +1000 (AEST) 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=i34EmYhB; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756556AbcDHEtD (ORCPT ); Fri, 8 Apr 2016 00:49:03 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:34715 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755381AbcDHEs6 (ORCPT ); Fri, 8 Apr 2016 00:48:58 -0400 Received: by mail-pa0-f50.google.com with SMTP id fe3so67865800pab.1 for ; Thu, 07 Apr 2016 21:48:57 -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=2vdbcrIYnx/Y+G2TMPr7b8h69Y3Lj2hUwUup6Y84Kss=; b=i34EmYhBnQHAK/UWI27VN+aYdoWCvL5te7QcjUeQUm/Ul9lAoDMbq2khtXHbwsaZMc YzvsS9igHNFcmqwtXTgrMinEAo1oklMwGiYqXhWS0UfEP0wSdfa8rn+F01iuqFYZ6DgI dMF67RHTLj2m4rmH8eK2WRJb074jl3tI41BrO8PsQLrR9H2YtkGTgn8xHc7fw5POnTAl 4Imyjm+an3NTFhY4kj/iYH4cJIsJjhXl14UCtIT9yAjb1JDm8i0e8z6MHopjvcxu5lYV zQKh5f3LGWfUjXCYw4vyu/Cjob2+h1crI2M1EvC2KXfa7sVYFKBv7u03G0KmoTwXn25S XH+A== 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=2vdbcrIYnx/Y+G2TMPr7b8h69Y3Lj2hUwUup6Y84Kss=; b=gSPkobS0PiLThCe4KSyejJ0UtmkoOJuq+Ae++tU9egerjlBIXugGRbC8/Am7JxzGGU yu3HM+t65dg38ROPq+qOkvzerx3jAnyV6ptmKuJNC9cS1nacwBf/oF3Obe/8s3hSYSDX 4dJIMhNf2+uGHOqfAn5D/aRodRl7KFm8LNM2gKRRRpE/3s4yFpxL5mGT+auo3MDTon14 ICdzRSV4enNQ4Joe+VXwi5aGy4DJZFPBsjtsG2gYMX7dyDYrCCctJCLULQjnyKiXlzwT AE4pI0ddmSwu9Oc9TvBfQzUTLm3mDksUCJIUYXXIPJsWxj9LbyyhyNlpx8TzlRHbNJB5 juoQ== X-Gm-Message-State: AD7BkJLhUp4RN6PM+dqEABzipthHTmJZHvKjDSAOVsnnIr36KnR4hPR+4gsqq7gTENew5F1x X-Received: by 10.66.66.108 with SMTP id e12mr9912055pat.92.1460090937412; Thu, 07 Apr 2016 21:48:57 -0700 (PDT) Received: from iovisor-test1.plumgrid.com ([12.97.19.201]) by smtp.gmail.com with ESMTPSA id r88sm15523595pfi.9.2016.04.07.21.48.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Apr 2016 21:48:56 -0700 (PDT) From: Brenden Blanco To: davem@davemloft.net Cc: Brenden Blanco , netdev@vger.kernel.org, tom@herbertland.com, alexei.starovoitov@gmail.com, ogerlitz@mellanox.com, daniel@iogearbox.net, brouer@redhat.com, eric.dumazet@gmail.com, ecree@solarflare.com, john.fastabend@gmail.com, tgraf@suug.ch, johannes@sipsolutions.net, eranlinuxmellanox@gmail.com, lorenzo@google.com Subject: [RFC PATCH v2 3/5] rtnl: add option for setting link bpf prog Date: Thu, 7 Apr 2016 21:48:48 -0700 Message-Id: <1460090930-11219-3-git-send-email-bblanco@plumgrid.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1460090930-11219-1-git-send-email-bblanco@plumgrid.com> References: <1460090930-11219-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 | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h index 9427f17..ccad234 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 a75f7e9..96579ce 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -910,6 +910,7 @@ static noinline size_t if_nlmsg_size(const struct net_device *dev, + 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(IFNAMSIZ) /* IFLA_PHYS_PORT_NAME */ + + nla_total_size(4) /* IFLA_BPF_FD */ + nla_total_size(1); /* IFLA_PROTO_DOWN */ } @@ -1242,6 +1243,9 @@ 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)) || + (dev->netdev_ops->ndo_bpf_get && + nla_put_s32(skb, IFLA_BPF_FD, + dev->netdev_ops->ndo_bpf_get(dev))) || nla_put_u8(skb, IFLA_PROTO_DOWN, dev->proto_down)) goto nla_put_failure; @@ -1375,6 +1379,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] = { @@ -2029,6 +2034,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)