From patchwork Fri Mar 20 16:56:08 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: 1259082 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=WHRC4s/w; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48kVKZ4LM7z9sRf for ; Sat, 21 Mar 2020 03:56:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727724AbgCTQ4R (ORCPT ); Fri, 20 Mar 2020 12:56:17 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:25284 "EHLO us-smtp-delivery-74.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727101AbgCTQ4Q (ORCPT ); Fri, 20 Mar 2020 12:56:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584723374; 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=S9dQQJfPBhUeIWFV8KV9YVZfHde/FPEePPpdR7SsJHY=; b=WHRC4s/wq6fs3B9n4kcni9q/8csp7m2UPXWtelxCLgyumaM0Ra1uKMbAYpj9ZmR8Ks2SC9 y5UesL6HKV/SoYqON5DAd0xvCl8pA4sMluz6/uBhZy3GLn8pBwwEfC0V2eQtLr6/FED7go KLpRyjIhwqON3TDU6S3k8n5oLOkgSj0= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-457-KHhCeOAMOPS5K8xzqu5fpg-1; Fri, 20 Mar 2020 12:56:12 -0400 X-MC-Unique: KHhCeOAMOPS5K8xzqu5fpg-1 Received: by mail-wr1-f72.google.com with SMTP id i18so2892996wrx.17 for ; Fri, 20 Mar 2020 09:56:12 -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=S9dQQJfPBhUeIWFV8KV9YVZfHde/FPEePPpdR7SsJHY=; b=WstjOrqm5Ztbff7G/vPAQTjsha3y3msbr2NVViAMQNGcK2kHQOWrb6iu3j3blhkjkh 37oJWELdPopPaKLyYAit6fjE38rJb+uFlbbOiGwjuoYMJAcao3E2PI3e6LgIXZVpnOcG 4WBlzFxvcGFAZKB4DUJTmGh3Jm6/v3SbTuD4WXcilmgVAqgZQWYi3CN4pjofmBRDbjlD /KSM6c4MlA4dzMQumcxANUyynOfsGs9uGtAVDibXg1kXVA546QkxE9q1XAUGWVgyMtCP 9mzX34wvkeclsVVYxxqtpE0FZ7dPSH/J6LP2V1tRQHvUj0l//hVnKhX1z1E+HLboKwUw qq7Q== X-Gm-Message-State: ANhLgQ26/z/Vhhbfvc9Q80M+rkiK9Nm0dE3akw0+YDUA4jBwFpn16hXL ed+2cgXfkg57H7UuUZGBuNC+SxY2PdTfS1yiby+5aXk5/+p+bRFH67krGLW4JRFyqPggFhPokfs 4Fd/8Hbv75LLfCBf8 X-Received: by 2002:a7b:ce85:: with SMTP id q5mr11942785wmj.83.1584723370939; Fri, 20 Mar 2020 09:56:10 -0700 (PDT) X-Google-Smtp-Source: ADFU+vu4yZTJwQ3mAKlGvVZRRcb4h5OLyMWcLt9+g5qVaoU+Xl4+Zdd4Suh/3fd4cvULYvMO62uG7A== X-Received: by 2002:a7b:ce85:: with SMTP id q5mr11942758wmj.83.1584723370688; Fri, 20 Mar 2020 09:56:10 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([2a0c:4d80:42:443::2]) by smtp.gmail.com with ESMTPSA id l8sm8330730wmj.2.2020.03.20.09.56.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2020 09:56:09 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id A597918038E; Fri, 20 Mar 2020 17:56:08 +0100 (CET) Subject: [PATCH bpf-next v2 1/4] xdp: Support specifying expected existing program when attaching XDP From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= To: Alexei Starovoitov Cc: 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 , netdev@vger.kernel.org, bpf@vger.kernel.org Date: Fri, 20 Mar 2020 17:56:08 +0100 Message-ID: <158472336858.296548.9181798318254282268.stgit@toke.dk> In-Reply-To: <158472336748.296548.5028326196275429565.stgit@toke.dk> References: <158472336748.296548.5028326196275429565.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 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_EXPECT_FD, 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. 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 | 13 +++++++++++++ 4 files changed, 38 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..314173f8079e 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_EXPECT_FD (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_EXPECT_FD) /* 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..370122ed2d83 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 (expected_fd >= 0 || (flags & XDP_FLAGS_EXPECT_FD)) { + 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..d78e6463b67e 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,19 @@ static int do_setlink(const struct sk_buff *skb, } if (xdp[IFLA_XDP_FD]) { + int expected_fd = -1; + + if (xdp[IFLA_XDP_EXPECTED_FD]) { + expected_fd = + nla_get_s32(xdp[IFLA_XDP_EXPECTED_FD]); + } else if (xdp_flags & XDP_FLAGS_EXPECT_FD) { + err = -EINVAL; + goto errout; + } + err = dev_change_xdp_fd(dev, extack, nla_get_s32(xdp[IFLA_XDP_FD]), + expected_fd, xdp_flags); if (err) goto errout; From patchwork Fri Mar 20 16:56:09 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: 1259080 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=XMojtfyC; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48kVKX4Rx1z9sSL for ; Sat, 21 Mar 2020 03:56:16 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727618AbgCTQ4Q (ORCPT ); Fri, 20 Mar 2020 12:56:16 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:31238 "EHLO us-smtp-delivery-74.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727613AbgCTQ4P (ORCPT ); Fri, 20 Mar 2020 12:56:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584723374; 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=uWJEiu/Z2FQlJcrWSPoV5kXif2wXXa5HAsBAGFtr6yE=; b=XMojtfyCiZ5ka5JPZxMKwNs1jKq8q2Tf4DWUVZeV7AyV8Pq+nSTdT7xo6dEqh9X1naXy2n Aj5OxtOGbygmJIc85nLGvTte01eof4tmQaX9ZuWDjBt+rNwAr743did09y9fom5f0B47Uh IGEA+TEy4y3srPrmnhX4tQWItHIJYEw= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-340-zNs06LrENY2wADCULAwRQw-1; Fri, 20 Mar 2020 12:56:13 -0400 X-MC-Unique: zNs06LrENY2wADCULAwRQw-1 Received: by mail-wr1-f72.google.com with SMTP id o9so2906604wrw.14 for ; Fri, 20 Mar 2020 09:56:12 -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=uWJEiu/Z2FQlJcrWSPoV5kXif2wXXa5HAsBAGFtr6yE=; b=SlncS2mZyNUkB9NrBhptJ49dYb3u5SDhqHEp+J96YrV7gV6iH8/vfigr9XbihMdAUA qxNUq0DjV3Dwxc2m16dZuCWAtXsTEB5twe8xOMsX3wkyEtoxTinx909WndyoZR1fe181 9u0yF2fYxYWMJtUht/9ZL71wo/r9A+Jsxuo1JMQxH3hL609XJ2FAZ2AazLG9bEqA/cVi RyMnnk4s2rv8U7/gNemoMnwYdDmmqwbdIhJ1KX/hVu3F75tRIHqXXkYvoSPJLE9WayIg wTPdK4+qn0Z3ew91LOK0NfhqhjKCqaUdw2nWlhXo7zxGEXoSXTChou3/LtOOO3c5avZp AIKA== X-Gm-Message-State: ANhLgQ2mNT8yb/01qiTkfLIbhoKNLvNPOF67ETdGuTbktcf/no4of/FR /klEZk4mp4/DaECnyZdliFsuZmQgo7LSP3DVpKPGxwNyaDkFhhPISOLI/iCeW+suqJMoCHReu1J HuKIwub17pgPP X-Received: by 2002:adf:e611:: with SMTP id p17mr12092539wrm.212.1584723371686; Fri, 20 Mar 2020 09:56:11 -0700 (PDT) X-Google-Smtp-Source: ADFU+vt5dnElraEJukrxRAzOrRHyD+59sIcO9ulFVjI/M6bi9ifQambJe+0n3+1b74F6Lzxu/qzP6A== X-Received: by 2002:adf:e611:: with SMTP id p17mr12092512wrm.212.1584723371442; Fri, 20 Mar 2020 09:56:11 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([2a0c:4d80:42:443::2]) by smtp.gmail.com with ESMTPSA id 9sm8345504wmo.38.2020.03.20.09.56.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2020 09:56:10 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id BC07C180371; Fri, 20 Mar 2020 17:56:09 +0100 (CET) Subject: [PATCH bpf-next v2 2/4] tools: Add EXPECTED_FD-related definitions in if_link.h From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= To: Alexei Starovoitov Cc: 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 , netdev@vger.kernel.org, bpf@vger.kernel.org Date: Fri, 20 Mar 2020 17:56:09 +0100 Message-ID: <158472336968.296548.5222057372093911700.stgit@toke.dk> In-Reply-To: <158472336748.296548.5028326196275429565.stgit@toke.dk> References: <158472336748.296548.5028326196275429565.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 the IFLA_XDP_EXPECTED_FD netlink attribute definition and the XDP_FLAGS_EXPECT_FD 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..e5eced1c28f4 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_EXPECT_FD (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_EXPECT_FD) /* 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 Fri Mar 20 16:56:10 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: 1259086 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=OnG56Iue; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48kVKg1hf2z9sSL for ; Sat, 21 Mar 2020 03:56:23 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727764AbgCTQ4W (ORCPT ); Fri, 20 Mar 2020 12:56:22 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:51768 "EHLO us-smtp-delivery-74.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727636AbgCTQ4Q (ORCPT ); Fri, 20 Mar 2020 12:56:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584723375; 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=/kUFoLbkDwJxBHQR60+eXJpgtbwabFaqSxr61HTPqBQ=; b=OnG56IueNrkGCOhcs4pnMKU3/VcYZrShM/H9Qj1PkINm8Q8wPPrP8541F1H1Fpi/VQtC3l Jkh01pSRORY9WnV4Whk/rH7Mj2jdKa2XHO+NDZD5Cpcv/Sb6AhLBTRI/WWjXmzAHhauPLR ByCGSfihvWD7JArw8QaW7jjKptCjasE= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-116-JfQmE8B3PN2iZF6WsQXsHA-1; Fri, 20 Mar 2020 12:56:14 -0400 X-MC-Unique: JfQmE8B3PN2iZF6WsQXsHA-1 Received: by mail-wr1-f69.google.com with SMTP id d1so1760831wru.15 for ; Fri, 20 Mar 2020 09:56:14 -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=/kUFoLbkDwJxBHQR60+eXJpgtbwabFaqSxr61HTPqBQ=; b=tuI2gkHnTGk48urIjJvHxoYX5oTVznPEo/dHLMHdyNv53GDTtE7Q9n45k0T+7ppEIw IPx7uKPXgwbpP3JNYkVX6Mo0CSrMHQJB6XTw1Z6CXmVXrLlwd4ZnnsqKGkff7yKdvVv4 ko2D2g4VpKfVAmpDcM+wipEUcU5Flty1ZT82YHVRdXzbUJHlkHlsxjv7JB/OMf9jh1eZ sKRcveAkZgRFZoxNVthdi37/arxVTD+KEHj5tVy+pJ6TEKQp8jIpbYVcIck3aT/yY0/h LMsF5fkNB5ZTfD0lZ9UYVk+7VOfsRGCNZ8Dp7mejffs2i4ES1OxP09Z0H8t36Id0F52b 6Vww== X-Gm-Message-State: ANhLgQ25tASssXYuQnCcA7ajN1NRMBW37mWsocAKmpx80dvpOsRFo9Dw ZztCZF2xwtiB2sSwLbccU3T2Tms8fjBHi2iFvWOJH3k7ge5wOpvLomx5+qK1S2206VSW4vB0Anu svI9y5wsPV3VJHAgG X-Received: by 2002:a1c:a950:: with SMTP id s77mr11146310wme.176.1584723373328; Fri, 20 Mar 2020 09:56:13 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvMik0iRmwMBQj7DF+lo8d9S6Cpw8oix9vIJUrN9OJKTqhA7yQP5oBoFaedtovYEOzOwWkxaw== X-Received: by 2002:a1c:a950:: with SMTP id s77mr11146273wme.176.1584723373070; Fri, 20 Mar 2020 09:56:13 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([2a0c:4d80:42:443::2]) by smtp.gmail.com with ESMTPSA id x24sm8328196wmc.36.2020.03.20.09.56.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2020 09:56:11 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id D3A0218038E; Fri, 20 Mar 2020 17:56:10 +0100 (CET) Subject: [PATCH bpf-next v2 3/4] libbpf: Add function to set link XDP fd while specifying old fd From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= To: Alexei Starovoitov Cc: 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 , netdev@vger.kernel.org, bpf@vger.kernel.org Date: Fri, 20 Mar 2020 17:56:10 +0100 Message-ID: <158472337077.296548.4666186362987360141.stgit@toke.dk> In-Reply-To: <158472336748.296548.5028326196275429565.stgit@toke.dk> References: <158472336748.296548.5028326196275429565.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 old fd to replace, using the newly added IFLA_XDP_EXPECTED_FD netlink parameter. Signed-off-by: Toke Høiland-Jørgensen --- tools/lib/bpf/libbpf.h | 2 ++ tools/lib/bpf/libbpf.map | 1 + tools/lib/bpf/netlink.c | 22 +++++++++++++++++++++- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h index d38d7a629417..b5ca4f741e28 100644 --- a/tools/lib/bpf/libbpf.h +++ b/tools/lib/bpf/libbpf.h @@ -445,6 +445,8 @@ struct xdp_link_info { }; LIBBPF_API int bpf_set_link_xdp_fd(int ifindex, int fd, __u32 flags); +LIBBPF_API int bpf_set_link_xdp_fd_replace(int ifindex, int fd, int old_fd, + __u32 flags); 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..154f1d94fa63 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_replace; } LIBBPF_0.0.7; diff --git a/tools/lib/bpf/netlink.c b/tools/lib/bpf/netlink.c index 431bd25c6cdb..39bd0ead1546 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_EXPECT_FD) { + nla_xdp = (struct nlattr *)((char *)nla + nla->nla_len); + nla_xdp->nla_type = IFLA_XDP_EXPECTED_FD; + nla_xdp->nla_len = NLA_HDRLEN + sizeof(int); + 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,17 @@ int bpf_set_link_xdp_fd(int ifindex, int fd, __u32 flags) return ret; } +int bpf_set_link_xdp_fd_replace(int ifindex, int fd, int old_fd, __u32 flags) +{ + return __bpf_set_link_xdp_fd_replace(ifindex, fd, old_fd, + flags | XDP_FLAGS_EXPECT_FD); +} + +int bpf_set_link_xdp_fd(int ifindex, int fd, __u32 flags) +{ + return __bpf_set_link_xdp_fd_replace(ifindex, fd, -1, flags); +} + static int __dump_link_nlmsg(struct nlmsghdr *nlh, libbpf_dump_nlmsg_t dump_link_nlmsg, void *cookie) { From patchwork Fri Mar 20 16:56:11 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: 1259083 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=ef9BLUra; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48kVKc5FZMz9sNg for ; Sat, 21 Mar 2020 03:56:20 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727755AbgCTQ4T (ORCPT ); Fri, 20 Mar 2020 12:56:19 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:52123 "EHLO us-smtp-delivery-74.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727692AbgCTQ4R (ORCPT ); Fri, 20 Mar 2020 12:56:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584723376; 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=+kdxHN4Aw50ZGEywCIGDQ0nEgiFhegivX0saPcWODnM=; b=ef9BLUrazRdvc+2jr+PN6JeUSS74MWybjreEbS9t/BQhw4ENtT6fqW8+6vS8PwE84YLEht 02+XReBcbQYAbYPxERRssaXnZocg5yif1xMkITqqCu68EMUnpK6kdeVyDjQ0d6gadOuJp0 fGcWwL3a3ir4iaUFJCHH76GsegyYAJE= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-355-XYGYUnGIMTCEvG78IdeSkw-1; Fri, 20 Mar 2020 12:56:15 -0400 X-MC-Unique: XYGYUnGIMTCEvG78IdeSkw-1 Received: by mail-wr1-f71.google.com with SMTP id q18so2907207wrw.5 for ; Fri, 20 Mar 2020 09:56:14 -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=+kdxHN4Aw50ZGEywCIGDQ0nEgiFhegivX0saPcWODnM=; b=PHm2SR6AHYc9eMB7T2wmKAe32qd/6/AO4sKP9R+rK/jLrhG84GFm8oWkvoqx34cfIX SoROBlcB9sDtnyyoPCHtF+6uklT8qXxoakIWoi5ac0bKh46KSoYg5eUieBYs7TcmRoKk DOkCZs7zdpFTJ/eJOwR5xM3rKxEL6RHAn4P9577IU2L5CqGzdCwGaEfrnbqyqgG1dESp P2ewIBXy+cWMSiovG69QKsYggxPNTRuECCR/C+SMsqtV5P6mX95uBkuZD4WLL2BETaLM GjXVt/1JYpt5vzUHXs5wnTom8RRHYp/VBj74AFEFT2kkW/fa9U4dLktXsZBgZh3HI9Z5 XJvA== X-Gm-Message-State: ANhLgQ2sBkdfwUWkWMiAmjmqFdtM4YRnwBtYWI7D1S40WEDWOYMtoF8Z fEpQjQIAEA0EdXajYBsRFk+A8DQd47nEZB7lHbaEfGmL+DP2Ojhpvy13ST4V4BsgRPmIK5fHEVX ofwsaZcJPHu1QEa5k X-Received: by 2002:adf:ea88:: with SMTP id s8mr12837494wrm.124.1584723373940; Fri, 20 Mar 2020 09:56:13 -0700 (PDT) X-Google-Smtp-Source: ADFU+vscFIY04jprprjlJLR1NfOFn1MpsCnzxlnKZCA45VXaWrGMdR3TawMLC1jO5YaRNHWBwCwptw== X-Received: by 2002:adf:ea88:: with SMTP id s8mr12837475wrm.124.1584723373764; Fri, 20 Mar 2020 09:56:13 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([45.145.92.2]) by smtp.gmail.com with ESMTPSA id c5sm11981008wma.3.2020.03.20.09.56.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2020 09:56:13 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id EB344180371; Fri, 20 Mar 2020 17:56:11 +0100 (CET) Subject: [PATCH bpf-next v2 4/4] selftests/bpf: Add tests for attaching XDP programs From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= To: Alexei Starovoitov Cc: 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 , netdev@vger.kernel.org, bpf@vger.kernel.org Date: Fri, 20 Mar 2020 17:56:11 +0100 Message-ID: <158472337187.296548.15379933456613894354.stgit@toke.dk> In-Reply-To: <158472336748.296548.5028326196275429565.stgit@toke.dk> References: <158472336748.296548.5028326196275429565.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 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 | 55 ++++++++++++++++++++ 1 file changed, 55 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..c41d9a1d4eb1 --- /dev/null +++ b/tools/testing/selftests/bpf/prog_tests/xdp_attach.c @@ -0,0 +1,55 @@ +// SPDX-License-Identifier: GPL-2.0 +#include + +#define IFINDEX_LO 1 + +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; + + 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_replace(IFINDEX_LO, fd1, -1, 0); + if (CHECK(err, "load_ok", "initial load failed")) + goto out_close; + + err = bpf_set_link_xdp_fd_replace(IFINDEX_LO, fd2, -1, 0); + if (CHECK(!err, "load_fail", "load with expected fd didn't fail")) + goto out; + + err = bpf_set_link_xdp_fd_replace(IFINDEX_LO, fd2, fd1, 0); + if (CHECK(err, "replace_ok", "replace valid old_fd failed")) + goto out; + + err = bpf_set_link_xdp_fd_replace(IFINDEX_LO, fd3, fd1, 0); + if (CHECK(!err, "replace_fail", "replace invalid old_fd didn't fail")) + goto out; + + err = bpf_set_link_xdp_fd_replace(IFINDEX_LO, -1, fd1, 0); + if (CHECK(!err, "remove_fail", "remove invalid old_fd didn't fail")) + goto out; + + err = bpf_set_link_xdp_fd_replace(IFINDEX_LO, -1, fd2, 0); + 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); +}