From patchwork Thu Mar 19 13:13:15 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: 1258225 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=gzoM4e5E; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48jnt764DHzB3wL for ; Fri, 20 Mar 2020 00:33:35 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727775AbgCSNNX (ORCPT ); Thu, 19 Mar 2020 09:13:23 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:37994 "EHLO us-smtp-delivery-74.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728699AbgCSNNW (ORCPT ); Thu, 19 Mar 2020 09:13:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584623601; 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=gzoM4e5EzuXRHopDWmPeHxvhYL0czNMG+ZXb7AVWfTKfrrO7y3hwUziiwYoyBE+m4338hH gfmjdWr7FYLS0h8clUwpduqv97ptgVOb67mFGqHZbcxSbCaS/eoJvS4+txn750dEjNHcf2 qSh3eWE3EjLpEW/PzMhW/qbTpPXPPXk= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-362-0ESsztorO7ScY93oYkfReA-1; Thu, 19 Mar 2020 09:13:19 -0400 X-MC-Unique: 0ESsztorO7ScY93oYkfReA-1 Received: by mail-wr1-f70.google.com with SMTP id t4so987323wrv.9 for ; Thu, 19 Mar 2020 06:13:19 -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=ZwgYyEDinmWgo2Mno7OZ4jLJS+IP4U6rVjQ7NTlU2K4xXbirCkUbKmGUaEvavx0YnX PVHtFJKuScsYe9WQLT/VpTnRbmh8J7mUxOBG+b4DMRD5XXb+FRJnGnI0rBbINDHdKQAf qpI7JSnVyBi4rMcIpUGClA8c1nbpjq2IDV2KQS9GXPdsW5p+mZd/S7V7r1jVBfxfAwsJ p0G+jr2IZ9yEihRb33iSFPGzs4SdQ4mpU0DoHHiOwQqOKnI9lr28qGI6AjG1XVtZjME5 tJVO5tkJVcml+TB+3pgDcvhPe/ypcpxemh2yqtvNcRG2zkWk4/oxjH/848q0psJeP6tg nwuA== X-Gm-Message-State: ANhLgQ23RiCKzz9ef9T84IbtNkk01ElgKtmDBE5kJt+hoJ0gFNNj0ndm cdkzoACoa1PGODsZn66J8n1RVH1nWVq5Zuhnmx90r2YH6hmRIwWtm0w/oXQ7qloOwUYZA2ZEpTA gxQVDpOQ8h5mI X-Received: by 2002:a1c:b144:: with SMTP id a65mr3924143wmf.54.1584623598207; Thu, 19 Mar 2020 06:13:18 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtb4AFemoXjuxCguui6x5/tVwN8upTBqzpFjs8i3B/Neo6gumRxsaU0uvtR50TUfxR1z1K9zw== X-Received: by 2002:a1c:b144:: with SMTP id a65mr3924119wmf.54.1584623598017; Thu, 19 Mar 2020 06:13:18 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([45.145.92.2]) by smtp.gmail.com with ESMTPSA id f15sm3429776wru.83.2020.03.19.06.13.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2020 06:13:17 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 621DE18038E; Thu, 19 Mar 2020 14:13:15 +0100 (CET) Subject: [PATCH bpf-next 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: Thu, 19 Mar 2020 14:13:15 +0100 Message-ID: <158462359530.164779.12468969809718921559.stgit@toke.dk> In-Reply-To: <158462359206.164779.15902346296781033076.stgit@toke.dk> References: <158462359206.164779.15902346296781033076.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 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) {