From patchwork Wed Mar 25 17:23:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= X-Patchwork-Id: 1261556 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: incoming-bpf@patchwork.ozlabs.org Delivered-To: patchwork-incoming-bpf@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=bpf-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=hvkQ3XF0; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48nZhk6R41z9sPk for ; Thu, 26 Mar 2020 04:23:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727685AbgCYRXd (ORCPT ); Wed, 25 Mar 2020 13:23:33 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:51583 "EHLO us-smtp-delivery-74.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727574AbgCYRXd (ORCPT ); Wed, 25 Mar 2020 13:23:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585157011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=k5hr2aQZeEb8hZ8qYomsvDOaw9krebjQTQ3Tidf7gec=; b=hvkQ3XF0gB7HvSXQpgQZQQv0YmkxU2gYvh2tJjVJjx56PB/bAt1RVCHXG96zApx7LU9vAt JqbdlcXoyoZYwctCEh3w6N+lcbexMsXIsRAOXPXQETzE4NY/bSPmOBntuO+OA5jkBTZuZA +nfkkMdofN71XmwFyyZ8a7iStDSTWkE= Received: from mail-lf1-f69.google.com (mail-lf1-f69.google.com [209.85.167.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-116-t6NJ2HY2NjG5m6ehcak2Ng-1; Wed, 25 Mar 2020 13:23:29 -0400 X-MC-Unique: t6NJ2HY2NjG5m6ehcak2Ng-1 Received: by mail-lf1-f69.google.com with SMTP id 144so1116875lfj.1 for ; Wed, 25 Mar 2020 10:23:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=k5hr2aQZeEb8hZ8qYomsvDOaw9krebjQTQ3Tidf7gec=; b=AkEXDYNKFuobmFQF5cssHmFrj4WJGItrQYG80YM+sbLFyOvSZsjN9IUERktKLtzXeC vVMf5159UF/GedLQN7BIeX/jFSewBBFdS+8R1rq14Vzk0joitJJsUFpiAckmGrhp2XRa SoA/A1GYvSM0bLulRkmAJElRrymIM4TLva+oc1OsVD9SY6MrvZ7dV5GPv1wg6q2eV5Lc 92xFFxiIDFYgJ/Sfd4Xg+im6o9+/Uj4DRUbx4RW7W1s/AAb55YRZXoQfeLAOwr/iFUVL vDThIYV74vaLD9mQ7+CvcV7fBB3knNHtvPnyqRSVNuYJcYCFAZxA/bKfmD+gqxEU20l/ CC0Q== X-Gm-Message-State: ANhLgQ3T/Tml8JoqEXcyi5zkpE3Z0K7H9o9qvk6p+MFMNmMWGqEWClGg M4fQ8K6F/VPt7AMsDg6FXqpUVZWmhv9rk+bJL31jYV3JFqX7Fx0ftB1ABkBCcdAAEeqSZQb0nAN 409slbUUeadm/ X-Received: by 2002:ac2:4309:: with SMTP id l9mr2949728lfh.65.1585157007977; Wed, 25 Mar 2020 10:23:27 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvw94eQR7JpRbshHnHYbaZ3gUDI6xS3iCk74YM8ZCWpwuGcETt3HjsTv47oTnIA5Vo5fzRPzQ== X-Received: by 2002:ac2:4309:: with SMTP id l9mr2949714lfh.65.1585157007734; Wed, 25 Mar 2020 10:23:27 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([2a0c:4d80:42:443::2]) by smtp.gmail.com with ESMTPSA id m21sm12313936ljb.89.2020.03.25.10.23.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2020 10:23:27 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 72D0018158C; Wed, 25 Mar 2020 18:23:26 +0100 (CET) Subject: [PATCH bpf-next v4 1/4] xdp: Support specifying expected existing program when attaching XDP From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= To: netdev@vger.kernel.org Cc: bpf@vger.kernel.org, Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , Andrii Nakryiko , "David S. Miller" , Jakub Kicinski , Jesper Dangaard Brouer , John Fastabend , Lorenz Bauer , Andrey Ignatov Date: Wed, 25 Mar 2020 18:23:26 +0100 Message-ID: <158515700640.92963.3551295145441017022.stgit@toke.dk> In-Reply-To: <158515700529.92963.17609642163080084530.stgit@toke.dk> References: <158515700529.92963.17609642163080084530.stgit@toke.dk> User-Agent: StGit/0.22 MIME-Version: 1.0 Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org From: Toke Høiland-Jørgensen While it is currently possible for userspace to specify that an existing XDP program should not be replaced when attaching to an interface, there is no mechanism to safely replace a specific XDP program with another. This patch adds a new netlink attribute, IFLA_XDP_EXPECTED_FD, which can be set along with IFLA_XDP_FD. If set, the kernel will check that the program currently loaded on the interface matches the expected one, and fail the operation if it does not. This corresponds to a 'cmpxchg' memory operation. Setting the new attribute with a negative value means that no program is expected to be attached, which corresponds to setting the UPDATE_IF_NOEXIST flag. A new companion flag, XDP_FLAGS_REPLACE, is also added to explicitly request checking of the EXPECTED_FD attribute. This is needed for userspace to discover whether the kernel supports the new attribute. Reviewed-by: Jakub Kicinski Signed-off-by: Toke Høiland-Jørgensen --- include/linux/netdevice.h | 2 +- include/uapi/linux/if_link.h | 4 +++- net/core/dev.c | 26 +++++++++++++++++++++----- net/core/rtnetlink.c | 14 ++++++++++++++ 4 files changed, 39 insertions(+), 7 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 654808bfad83..b503d468f0df 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -3768,7 +3768,7 @@ struct sk_buff *dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev, typedef int (*bpf_op_t)(struct net_device *dev, struct netdev_bpf *bpf); int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack, - int fd, u32 flags); + int fd, int expected_fd, u32 flags); u32 __dev_xdp_query(struct net_device *dev, bpf_op_t xdp_op, enum bpf_netdev_command cmd); int xdp_umem_query(struct net_device *dev, u16 queue_id); diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h index 61e0801c82df..c2f768c8d65b 100644 --- a/include/uapi/linux/if_link.h +++ b/include/uapi/linux/if_link.h @@ -972,11 +972,12 @@ enum { #define XDP_FLAGS_SKB_MODE (1U << 1) #define XDP_FLAGS_DRV_MODE (1U << 2) #define XDP_FLAGS_HW_MODE (1U << 3) +#define XDP_FLAGS_REPLACE (1U << 4) #define XDP_FLAGS_MODES (XDP_FLAGS_SKB_MODE | \ XDP_FLAGS_DRV_MODE | \ XDP_FLAGS_HW_MODE) #define XDP_FLAGS_MASK (XDP_FLAGS_UPDATE_IF_NOEXIST | \ - XDP_FLAGS_MODES) + XDP_FLAGS_MODES | XDP_FLAGS_REPLACE) /* These are stored into IFLA_XDP_ATTACHED on dump. */ enum { @@ -996,6 +997,7 @@ enum { IFLA_XDP_DRV_PROG_ID, IFLA_XDP_SKB_PROG_ID, IFLA_XDP_HW_PROG_ID, + IFLA_XDP_EXPECTED_FD, __IFLA_XDP_MAX, }; diff --git a/net/core/dev.c b/net/core/dev.c index d84541c24446..651a3c28d33a 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -8655,15 +8655,17 @@ static void dev_xdp_uninstall(struct net_device *dev) * @dev: device * @extack: netlink extended ack * @fd: new program fd or negative value to clear + * @expected_fd: old program fd that userspace expects to replace or clear * @flags: xdp-related flags * * Set or clear a bpf program for a device */ int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack, - int fd, u32 flags) + int fd, int expected_fd, u32 flags) { const struct net_device_ops *ops = dev->netdev_ops; enum bpf_netdev_command query; + u32 prog_id, expected_id = 0; struct bpf_prog *prog = NULL; bpf_op_t bpf_op, bpf_chk; bool offload; @@ -8684,15 +8686,29 @@ int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack, if (bpf_op == bpf_chk) bpf_chk = generic_xdp_install; - if (fd >= 0) { - u32 prog_id; + prog_id = __dev_xdp_query(dev, bpf_op, query); + if (flags & XDP_FLAGS_REPLACE) { + if (expected_fd >= 0) { + prog = bpf_prog_get_type_dev(expected_fd, + BPF_PROG_TYPE_XDP, + bpf_op == ops->ndo_bpf); + if (IS_ERR(prog)) + return PTR_ERR(prog); + expected_id = prog->aux->id; + bpf_prog_put(prog); + } + if (prog_id != expected_id) { + NL_SET_ERR_MSG(extack, "Active program does not match expected"); + return -EEXIST; + } + } + if (fd >= 0) { if (!offload && __dev_xdp_query(dev, bpf_chk, XDP_QUERY_PROG)) { NL_SET_ERR_MSG(extack, "native and generic XDP can't be active at the same time"); return -EEXIST; } - prog_id = __dev_xdp_query(dev, bpf_op, query); if ((flags & XDP_FLAGS_UPDATE_IF_NOEXIST) && prog_id) { NL_SET_ERR_MSG(extack, "XDP program already attached"); return -EBUSY; @@ -8715,7 +8731,7 @@ int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack, return 0; } } else { - if (!__dev_xdp_query(dev, bpf_op, query)) + if (!prog_id) return 0; } diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 14e6ea21c378..709ebbf8ab5b 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -1872,7 +1872,9 @@ static const struct nla_policy ifla_port_policy[IFLA_PORT_MAX+1] = { }; static const struct nla_policy ifla_xdp_policy[IFLA_XDP_MAX + 1] = { + [IFLA_XDP_UNSPEC] = { .strict_start_type = IFLA_XDP_EXPECTED_FD }, [IFLA_XDP_FD] = { .type = NLA_S32 }, + [IFLA_XDP_EXPECTED_FD] = { .type = NLA_S32 }, [IFLA_XDP_ATTACHED] = { .type = NLA_U8 }, [IFLA_XDP_FLAGS] = { .type = NLA_U32 }, [IFLA_XDP_PROG_ID] = { .type = NLA_U32 }, @@ -2799,8 +2801,20 @@ static int do_setlink(const struct sk_buff *skb, } if (xdp[IFLA_XDP_FD]) { + int expected_fd = -1; + + if (xdp_flags & XDP_FLAGS_REPLACE) { + if (!xdp[IFLA_XDP_EXPECTED_FD]) { + err = -EINVAL; + goto errout; + } + expected_fd = + nla_get_s32(xdp[IFLA_XDP_EXPECTED_FD]); + } + err = dev_change_xdp_fd(dev, extack, nla_get_s32(xdp[IFLA_XDP_FD]), + expected_fd, xdp_flags); if (err) goto errout; From patchwork Wed Mar 25 17:23:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= X-Patchwork-Id: 1261557 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=V6SZyKGL; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48nZhl1bYfz9sPR for ; Thu, 26 Mar 2020 04:23:35 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727743AbgCYRXe (ORCPT ); Wed, 25 Mar 2020 13:23:34 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:25618 "EHLO us-smtp-delivery-74.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727402AbgCYRXc (ORCPT ); Wed, 25 Mar 2020 13:23:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585157012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TlIK1duIZ7CYV2AfLDt7G96gJTgpzGhibeBunBKnLEI=; b=V6SZyKGL1y4cP1zYDqGWMiTTwXgqUZvKMnLgkohir5X7t4MLaawdfphHMnmq229INNB7Qa xqZ+/aSVFlu56hqHLaL5QCmjtONFjhu5E30TrU9LirTzB/FYn/tidi00nnHHXSQh7Fzns/ hIC7sxIbI7v4DS4VgjD2OT/PhxH9Jn8= Received: from mail-lf1-f69.google.com (mail-lf1-f69.google.com [209.85.167.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-88-eZY5f1PgMwSFaxValv-Sog-1; Wed, 25 Mar 2020 13:23:30 -0400 X-MC-Unique: eZY5f1PgMwSFaxValv-Sog-1 Received: by mail-lf1-f69.google.com with SMTP id c20so1109811lfh.6 for ; Wed, 25 Mar 2020 10:23:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=TlIK1duIZ7CYV2AfLDt7G96gJTgpzGhibeBunBKnLEI=; b=GFleHYgJ3P5LDibFQejoZZWWVg0FLUEEnMebOh6sRuwTb0/HKqj1gx4Sb48A1Tvk2d VfNF1OvY1zIcBXH6slpT4ifcpnLOxGDusLp3hY+8kthLZXDv0N9Zaoye/pQWTSOqWrsB IFrctxB4ohUtB0GdWUs5lnmjRk1hIvRexlWdl2OGofIZDcoLyoO+maDuIwMM0rfvIzcx gbcZTCMbKcI6bCc+EEK98HAhcBAeUXZhbMMO4RAE5KPosMEWSMT3/gWCWzF7QsbUr3RM lENu2oOlGR1Rb+EqXgYDPLQv/5sVl6ldC29g7WkZeopxuDg2UJJDB6MYJbMcdU0pwzHS wmmw== X-Gm-Message-State: ANhLgQ2mYhII3E+ZpPh6Wgw3ghmwc5FBCA2MijZWVUKz+ZyLglJz6d3r d/jt+3H81pKvRD1qaFFnwvWc3LLhaHnrz3day72B9SAeldXl+/tTP2v7IdKsZYX0t2Ztb5GvNhQ CD6taUmG6Fv/KrXGk X-Received: by 2002:ac2:4191:: with SMTP id z17mr2949492lfh.73.1585157008956; Wed, 25 Mar 2020 10:23:28 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtU/I5xdrBBmAGhgc7MLv/GeIi0iKmzDAYbK+bUgcCbZzQoZ5CS8YyG/sPMh+D1mu96844NTg== X-Received: by 2002:ac2:4191:: with SMTP id z17mr2949479lfh.73.1585157008760; Wed, 25 Mar 2020 10:23:28 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([2a0c:4d80:42:443::2]) by smtp.gmail.com with ESMTPSA id f26sm6601752lja.102.2020.03.25.10.23.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2020 10:23:28 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 8AEC818158B; Wed, 25 Mar 2020 18:23:27 +0100 (CET) Subject: [PATCH bpf-next v4 2/4] tools: Add EXPECTED_FD-related definitions in if_link.h From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= To: netdev@vger.kernel.org Cc: bpf@vger.kernel.org, Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , Andrii Nakryiko , "David S. Miller" , Jakub Kicinski , Jesper Dangaard Brouer , John Fastabend , Lorenz Bauer , Andrey Ignatov Date: Wed, 25 Mar 2020 18:23:27 +0100 Message-ID: <158515700747.92963.8615391897417388586.stgit@toke.dk> In-Reply-To: <158515700529.92963.17609642163080084530.stgit@toke.dk> References: <158515700529.92963.17609642163080084530.stgit@toke.dk> User-Agent: StGit/0.22 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Toke Høiland-Jørgensen This adds the IFLA_XDP_EXPECTED_FD netlink attribute definition and the XDP_FLAGS_REPLACE flag to if_link.h in tools/include. Signed-off-by: Toke Høiland-Jørgensen --- tools/include/uapi/linux/if_link.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/include/uapi/linux/if_link.h b/tools/include/uapi/linux/if_link.h index 024af2d1d0af..b1ec7c949e6a 100644 --- a/tools/include/uapi/linux/if_link.h +++ b/tools/include/uapi/linux/if_link.h @@ -960,11 +960,12 @@ enum { #define XDP_FLAGS_SKB_MODE (1U << 1) #define XDP_FLAGS_DRV_MODE (1U << 2) #define XDP_FLAGS_HW_MODE (1U << 3) +#define XDP_FLAGS_REPLACE (1U << 4) #define XDP_FLAGS_MODES (XDP_FLAGS_SKB_MODE | \ XDP_FLAGS_DRV_MODE | \ XDP_FLAGS_HW_MODE) #define XDP_FLAGS_MASK (XDP_FLAGS_UPDATE_IF_NOEXIST | \ - XDP_FLAGS_MODES) + XDP_FLAGS_MODES | XDP_FLAGS_REPLACE) /* These are stored into IFLA_XDP_ATTACHED on dump. */ enum { @@ -984,6 +985,7 @@ enum { IFLA_XDP_DRV_PROG_ID, IFLA_XDP_SKB_PROG_ID, IFLA_XDP_HW_PROG_ID, + IFLA_XDP_EXPECTED_FD, __IFLA_XDP_MAX, }; From patchwork Wed Mar 25 17:23:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= X-Patchwork-Id: 1261559 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ckRPF3rT; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48nZhn2YVJz9sPk for ; Thu, 26 Mar 2020 04:23:37 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727770AbgCYRXg (ORCPT ); Wed, 25 Mar 2020 13:23:36 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:38783 "EHLO us-smtp-delivery-74.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727574AbgCYRXf (ORCPT ); Wed, 25 Mar 2020 13:23:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585157013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NDMd/O5PBic7ScwKqsNYeSm5DDRpZ5R5RdB8Gtorr4U=; b=ckRPF3rT4mSskdqvZU5uClk/XZOWmeq6LehPQUGOAljF9q2BueG1OEQrRwQnozUBeKr7oU 6a++1hufeefMfX9QD0H+QCw2UtdtidesBN3U+rceSrt4s1kNJlEZs8U4v01THIwON8FUMj k1BRJdsnXSjb23VKCBM821tWh4TEcnI= Received: from mail-lf1-f71.google.com (mail-lf1-f71.google.com [209.85.167.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-164-JrbHgkPIN1WnOv2eGJ14RA-1; Wed, 25 Mar 2020 13:23:32 -0400 X-MC-Unique: JrbHgkPIN1WnOv2eGJ14RA-1 Received: by mail-lf1-f71.google.com with SMTP id b25so1093979lfi.21 for ; Wed, 25 Mar 2020 10:23:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=NDMd/O5PBic7ScwKqsNYeSm5DDRpZ5R5RdB8Gtorr4U=; b=BjgXoUe5MQKJRz+gi47bDrZMey9D7Tm/aFkAEVYHwg7tqCebPs5NwzWcAOx9Q6BaPH 9x7tJF+h25PJFaYzN1vwhM7YHwYEFSArSM3EESzUOc7Wc9i62ct6tOmgexgwFYW1Y3bG VWqBFRSyHPfGlOUyM5BCd/LQo3szch3o3oKxKX1x8NNBdv/D/RsLb2eeDOaRDrdHijak h81BU7Ww5RojI97E3OVHOzaytT8WyVIrolROSZTgfWPCMf6Uv0Oz4tf6CK883UMDywJr 4LepOPUs05W+C5lD255fO/v12JFfqYkS7SENkKd8uRO96M3aw6aaEsBEbn65k0uLRTBW CHEw== X-Gm-Message-State: ANhLgQ117Z0mIMRy11ctPklmene/78DaNkQ4418YcBxQjv4fnojb21NC rpVNU3//wO8A+NBRmS6568Oj4z2m0EaN1Xy7P3PC6Ih6QsxQ4KdoX0scaRlIgKHoDSd9QVxLS1l +vzVq61Wo/2SKkSXh X-Received: by 2002:ac2:4110:: with SMTP id b16mr3000199lfi.211.1585157010496; Wed, 25 Mar 2020 10:23:30 -0700 (PDT) X-Google-Smtp-Source: ADFU+vsI4ZwpZvLe1BczzDPdX2U8bgqkoW2Rlp0IxzLY/XYR7NnqnDW+rzbbj7Jd8j0pYX2duWIENw== X-Received: by 2002:ac2:4110:: with SMTP id b16mr3000175lfi.211.1585157010253; Wed, 25 Mar 2020 10:23:30 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([2a0c:4d80:42:443::2]) by smtp.gmail.com with ESMTPSA id b13sm5145733lfp.14.2020.03.25.10.23.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2020 10:23:29 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id A4AE018158D; Wed, 25 Mar 2020 18:23:28 +0100 (CET) Subject: [PATCH bpf-next v4 3/4] libbpf: Add function to set link XDP fd while specifying old program From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= To: netdev@vger.kernel.org Cc: bpf@vger.kernel.org, Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , Andrii Nakryiko , "David S. Miller" , Jakub Kicinski , Jesper Dangaard Brouer , John Fastabend , Lorenz Bauer , Andrey Ignatov Date: Wed, 25 Mar 2020 18:23:28 +0100 Message-ID: <158515700857.92963.7052131201257841700.stgit@toke.dk> In-Reply-To: <158515700529.92963.17609642163080084530.stgit@toke.dk> References: <158515700529.92963.17609642163080084530.stgit@toke.dk> User-Agent: StGit/0.22 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Toke Høiland-Jørgensen This adds a new function to set the XDP fd while specifying the FD of the program to replace, using the newly added IFLA_XDP_EXPECTED_FD netlink parameter. The new function uses the opts struct mechanism to be extendable in the future. Signed-off-by: Toke Høiland-Jørgensen --- tools/lib/bpf/libbpf.h | 8 ++++++++ tools/lib/bpf/libbpf.map | 1 + tools/lib/bpf/netlink.c | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h index d38d7a629417..bf7a35a9556d 100644 --- a/tools/lib/bpf/libbpf.h +++ b/tools/lib/bpf/libbpf.h @@ -444,7 +444,15 @@ struct xdp_link_info { __u8 attach_mode; }; +struct bpf_xdp_set_link_opts { + size_t sz; + __u32 old_fd; +}; +#define bpf_xdp_set_link_opts__last_field old_fd + LIBBPF_API int bpf_set_link_xdp_fd(int ifindex, int fd, __u32 flags); +LIBBPF_API int bpf_set_link_xdp_fd_opts(int ifindex, int fd, __u32 flags, + const struct bpf_xdp_set_link_opts *opts); LIBBPF_API int bpf_get_link_xdp_id(int ifindex, __u32 *prog_id, __u32 flags); LIBBPF_API int bpf_get_link_xdp_info(int ifindex, struct xdp_link_info *info, size_t info_size, __u32 flags); diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map index 5129283c0284..dcc87db3ca8a 100644 --- a/tools/lib/bpf/libbpf.map +++ b/tools/lib/bpf/libbpf.map @@ -244,4 +244,5 @@ LIBBPF_0.0.8 { bpf_link__pin_path; bpf_link__unpin; bpf_program__set_attach_target; + bpf_set_link_xdp_fd_opts; } LIBBPF_0.0.7; diff --git a/tools/lib/bpf/netlink.c b/tools/lib/bpf/netlink.c index 431bd25c6cdb..18b5319025e1 100644 --- a/tools/lib/bpf/netlink.c +++ b/tools/lib/bpf/netlink.c @@ -132,7 +132,8 @@ static int bpf_netlink_recv(int sock, __u32 nl_pid, int seq, return ret; } -int bpf_set_link_xdp_fd(int ifindex, int fd, __u32 flags) +static int __bpf_set_link_xdp_fd_replace(int ifindex, int fd, int old_fd, + __u32 flags) { int sock, seq = 0, ret; struct nlattr *nla, *nla_xdp; @@ -178,6 +179,14 @@ int bpf_set_link_xdp_fd(int ifindex, int fd, __u32 flags) nla->nla_len += nla_xdp->nla_len; } + if (flags & XDP_FLAGS_REPLACE) { + nla_xdp = (struct nlattr *)((char *)nla + nla->nla_len); + nla_xdp->nla_type = IFLA_XDP_EXPECTED_FD; + nla_xdp->nla_len = NLA_HDRLEN + sizeof(old_fd); + memcpy((char *)nla_xdp + NLA_HDRLEN, &old_fd, sizeof(old_fd)); + nla->nla_len += nla_xdp->nla_len; + } + req.nh.nlmsg_len += NLA_ALIGN(nla->nla_len); if (send(sock, &req, req.nh.nlmsg_len, 0) < 0) { @@ -191,6 +200,29 @@ int bpf_set_link_xdp_fd(int ifindex, int fd, __u32 flags) return ret; } +int bpf_set_link_xdp_fd_opts(int ifindex, int fd, __u32 flags, + const struct bpf_xdp_set_link_opts *opts) +{ + int old_fd = -1; + + if (!OPTS_VALID(opts, bpf_xdp_set_link_opts)) + return -EINVAL; + + if (OPTS_HAS(opts, old_fd)) { + old_fd = OPTS_GET(opts, old_fd, -1); + flags |= XDP_FLAGS_REPLACE; + } + + return __bpf_set_link_xdp_fd_replace(ifindex, fd, + old_fd, + flags); +} + +int bpf_set_link_xdp_fd(int ifindex, int fd, __u32 flags) +{ + return __bpf_set_link_xdp_fd_replace(ifindex, fd, 0, flags); +} + static int __dump_link_nlmsg(struct nlmsghdr *nlh, libbpf_dump_nlmsg_t dump_link_nlmsg, void *cookie) { From patchwork Wed Mar 25 17:23:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= X-Patchwork-Id: 1261558 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: incoming-bpf@patchwork.ozlabs.org Delivered-To: patchwork-incoming-bpf@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=bpf-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=F3sKMeOx; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48nZhm58bWz9sPR for ; Thu, 26 Mar 2020 04:23:36 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727752AbgCYRXf (ORCPT ); Wed, 25 Mar 2020 13:23:35 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:46541 "EHLO us-smtp-delivery-74.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727402AbgCYRXf (ORCPT ); Wed, 25 Mar 2020 13:23:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585157014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sYbu9ArKUYiZYJ7/mh+zIxZoPNWoNLkztPFMuDHvDWc=; b=F3sKMeOxMo6T5u3eDxFoXUGVPrmSuZcqEwanwJtjrwLVxuxqUuiW20/JRIOlOO/AAWw9cM klPylbKnzce7xisKYW/w1k3dOvvqYudPshuNv0HSm1gNPeG+dGKaIo6WW8CBj/1T4dsUFu aO2E744iddkSLV/zC2H9vl97uL1SQ0M= Received: from mail-lf1-f71.google.com (mail-lf1-f71.google.com [209.85.167.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-6-TozU3gexPJqBlofe_RQoKg-1; Wed, 25 Mar 2020 13:23:32 -0400 X-MC-Unique: TozU3gexPJqBlofe_RQoKg-1 Received: by mail-lf1-f71.google.com with SMTP id 144so1116928lfj.1 for ; Wed, 25 Mar 2020 10:23:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=sYbu9ArKUYiZYJ7/mh+zIxZoPNWoNLkztPFMuDHvDWc=; b=gMGVGU7aCCZ3nc+YLMPBqId42cZpJLhz2WSQqqloMquGcdAUSDJnUa6IHn7mmBuSUa YHq+94ex6D5N87QKPfOKn9gI0KljgScmqtnxmdEG2LRGUq340XiQp54JfacCI0F9+swo MdWcii15GfFkQnaqtMZ5/snQkyY7sfEFTTyZjq/CVm5H1JaoaTSWzs9B2QnLPhOLodWj Sj31SGAY30Xzn2GyD0fYfc0NlQHE+RjPr05RX0GT3RHiX1CHvfuv7kapXi0/MgXWF0ae nSiR5QeJnEvi1Vy+L/lmgzasf1YOY7ytZST/uTBnlNC6SMl0pqALTgtV2uecJILelM/8 HRTQ== X-Gm-Message-State: AGi0PuZYKob8CkIDb6ipyycZ6EeGaN+SCKTIJIB0TubYdLGMshagD3D9 URmjjf1BTV1phybY4TVpPudf2I+mXjJRlAo7xyw87P/KfCE0xebT8pzc38Ltqp2oHpqk63umwv1 ODxl7sNL0fZKH X-Received: by 2002:a2e:b521:: with SMTP id z1mr2698825ljm.19.1585157011200; Wed, 25 Mar 2020 10:23:31 -0700 (PDT) X-Google-Smtp-Source: APiQypIZUF0t5NXTTUZDr3I2FqJitHTR0+clgh7Avsu79NvNFB36sTuhhdFGQvRHW4WpR+am3tROkA== X-Received: by 2002:a2e:b521:: with SMTP id z1mr2698804ljm.19.1585157010967; Wed, 25 Mar 2020 10:23:30 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([2a0c:4d80:42:443::2]) by smtp.gmail.com with ESMTPSA id j14sm1277899lfc.32.2020.03.25.10.23.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2020 10:23:30 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id BEA6418158B; Wed, 25 Mar 2020 18:23:29 +0100 (CET) Subject: [PATCH bpf-next v4 4/4] selftests/bpf: Add tests for attaching XDP programs From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= To: netdev@vger.kernel.org Cc: bpf@vger.kernel.org, Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , Andrii Nakryiko , "David S. Miller" , Jakub Kicinski , Jesper Dangaard Brouer , John Fastabend , Lorenz Bauer , Andrey Ignatov Date: Wed, 25 Mar 2020 18:23:29 +0100 Message-ID: <158515700967.92963.15098921624731968356.stgit@toke.dk> In-Reply-To: <158515700529.92963.17609642163080084530.stgit@toke.dk> References: <158515700529.92963.17609642163080084530.stgit@toke.dk> User-Agent: StGit/0.22 MIME-Version: 1.0 Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org From: Toke Høiland-Jørgensen This adds tests for the various replacement operations using IFLA_XDP_EXPECTED_FD. Signed-off-by: Toke Høiland-Jørgensen --- .../testing/selftests/bpf/prog_tests/xdp_attach.c | 62 ++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_attach.c diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_attach.c b/tools/testing/selftests/bpf/prog_tests/xdp_attach.c new file mode 100644 index 000000000000..05b294d6b923 --- /dev/null +++ b/tools/testing/selftests/bpf/prog_tests/xdp_attach.c @@ -0,0 +1,62 @@ +// SPDX-License-Identifier: GPL-2.0 +#include + +#define IFINDEX_LO 1 +#define XDP_FLAGS_REPLACE (1U << 4) + +void test_xdp_attach(void) +{ + struct bpf_object *obj1, *obj2, *obj3; + const char *file = "./test_xdp.o"; + int err, fd1, fd2, fd3; + __u32 duration = 0; + DECLARE_LIBBPF_OPTS(bpf_xdp_set_link_opts, opts, + .old_fd = -1); + + err = bpf_prog_load(file, BPF_PROG_TYPE_XDP, &obj1, &fd1); + if (CHECK_FAIL(err)) + return; + err = bpf_prog_load(file, BPF_PROG_TYPE_XDP, &obj2, &fd2); + if (CHECK_FAIL(err)) + goto out_1; + err = bpf_prog_load(file, BPF_PROG_TYPE_XDP, &obj3, &fd3); + if (CHECK_FAIL(err)) + goto out_2; + + err = bpf_set_link_xdp_fd_opts(IFINDEX_LO, fd1, XDP_FLAGS_REPLACE, + &opts); + if (CHECK(err, "load_ok", "initial load failed")) + goto out_close; + + err = bpf_set_link_xdp_fd_opts(IFINDEX_LO, fd2, XDP_FLAGS_REPLACE, + &opts); + if (CHECK(!err, "load_fail", "load with expected id didn't fail")) + goto out; + + opts.old_fd = fd1; + err = bpf_set_link_xdp_fd_opts(IFINDEX_LO, fd2, 0, &opts); + if (CHECK(err, "replace_ok", "replace valid old_fd failed")) + goto out; + + err = bpf_set_link_xdp_fd_opts(IFINDEX_LO, fd3, 0, &opts); + if (CHECK(!err, "replace_fail", "replace invalid old_fd didn't fail")) + goto out; + + err = bpf_set_link_xdp_fd_opts(IFINDEX_LO, -1, 0, &opts); + if (CHECK(!err, "remove_fail", "remove invalid old_fd didn't fail")) + goto out; + + opts.old_fd = fd2; + err = bpf_set_link_xdp_fd_opts(IFINDEX_LO, -1, 0, &opts); + if (CHECK(err, "remove_ok", "remove valid old_fd failed")) + goto out; + +out: + bpf_set_link_xdp_fd(IFINDEX_LO, -1, 0); +out_close: + bpf_object__close(obj3); +out_2: + bpf_object__close(obj2); +out_1: + bpf_object__close(obj1); +}