From patchwork Mon Nov 16 09:34:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Majtyka X-Patchwork-Id: 1400753 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=cDPHv24o; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CZP7k2flGz9sSs for ; Mon, 16 Nov 2020 20:35:30 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C02758680E; Mon, 16 Nov 2020 09:35:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id I60LnbO6hivo; Mon, 16 Nov 2020 09:35:27 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id A18D28671E; Mon, 16 Nov 2020 09:35:27 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id CB9241BF470 for ; Mon, 16 Nov 2020 09:35:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C25F18675E for ; Mon, 16 Nov 2020 09:35:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Vy5wIWV6AJlK for ; Mon, 16 Nov 2020 09:35:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lj1-f195.google.com (mail-lj1-f195.google.com [209.85.208.195]) by whitealder.osuosl.org (Postfix) with ESMTPS id B18C68671E for ; Mon, 16 Nov 2020 09:35:25 +0000 (UTC) Received: by mail-lj1-f195.google.com with SMTP id s9so19301360ljo.11 for ; Mon, 16 Nov 2020 01:35:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xjKI+uXD1rIyIentr7mrBSJHdfu/MHgatUlVOaWAXlI=; b=cDPHv24oTHEX7YQkY8mjQ96GdRrPcLLdcQW+iC1k+iB5T5OzEUbdvWgM1BlXtDb4dn pcicfUlNOTdMMIMHbbc/8JLzdEY/JcZghKW9qbiM8y3murdRmvEgx76f18JM/mvHnFEK dEZqDy6Akif9d4N+7jXJy6FB6A8Tus5N1BUBwpa6cZiQAw0j89J+064FeuSLF45dGU6m oESyyAhOroxTSx3/CUSXJDf+2zl6ezS0DglUTcTu2waFS/8/1ozE+JjpJTOjtPYg3uEQ c3eCrQcl2rfFATqMhBdOrXL0HaKuhndXVZ90OhAK5xVwzkUBI1kz4PatN2L6lpjBrsuT kPjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xjKI+uXD1rIyIentr7mrBSJHdfu/MHgatUlVOaWAXlI=; b=piO7WAP/rO7XgpsMWkD09UGwSL4I4wNpNOiOREHeIRjchRxb7XaT8ATcCHQD5fQtQY PI+wgdAiH2T37gYg/AESe+EuDoyHqTUOMbz7coPNFRNrDQ8FigfWQ13MEX9alPgyJzpW R0r13AtAZ+6z2Ftq6Vrumqctg2527OR+UR2L2VPqvpRQK8uMarhmcSpka75oBSGhzDJV 1/4unlmKKbuNZZlP78EMYzWch9QGnxA86hw/HObsykmM98CG5T2shtkxGVXfB9gI+/90 uhDAij+lzuTDydv5dc03pebNlE4UaDuXDyfdAB4o7nmcqKhuYOVb0isG005zRXlL+BkU N/zQ== X-Gm-Message-State: AOAM53006HTRS+DqGFcdlcZlLbKz0TzR0vxHL8n78ndWvCG70iCKBOiX 2krBmNkH0LbfiJazURnkRYw= X-Google-Smtp-Source: ABdhPJxB2RvKVk0J2Cs9J1O5tFxnkHr1WM/Lod9LC5+VROtR/Hhp0o7RgpJd4PJ1RwuHVfIOm+qtdA== X-Received: by 2002:a05:651c:1075:: with SMTP id y21mr5421055ljm.330.1605519324005; Mon, 16 Nov 2020 01:35:24 -0800 (PST) Received: from localhost.localdomain (87-205-71-93.adsl.inetia.pl. [87.205.71.93]) by smtp.gmail.com with ESMTPSA id t26sm2667986lfp.296.2020.11.16.01.35.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 01:35:23 -0800 (PST) From: alardam@gmail.com X-Google-Original-From: marekx.majtyka@intel.com To: magnus.karlsson@intel.com, bjorn.topel@intel.com, andrii.nakryiko@gmail.com, kuba@kernel.org, ast@kernel.org, daniel@iogearbox.net, netdev@vger.kernel.org, davem@davemloft.net, john.fastabend@gmail.com, hawk@kernel.org, toke@redhat.com Date: Mon, 16 Nov 2020 10:34:51 +0100 Message-Id: <20201116093452.7541-8-marekx.majtyka@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201116093452.7541-1-marekx.majtyka@intel.com> References: <20201116093452.7541-1-marekx.majtyka@intel.com> MIME-Version: 1.0 Subject: [Intel-wired-lan] [PATCH 7/8] libbpf: add API to get XSK/XDP caps X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: maciejromanfijalkowski@gmail.com, Marek Majtyka , intel-wired-lan@lists.osuosl.org, jonathan.lemon@gmail.com, bpf@vger.kernel.org Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" From: Marek Majtyka Add public xsk API to read supported XDP functions of a netdev: - XDP driver mode (SKB, DRV), - XSK bind mode (COPY, ZEROCOPY). Signed-off-by: Marek Majtyka --- tools/lib/bpf/libbpf.map | 1 + tools/lib/bpf/xsk.c | 51 +++++++++++++++++++++++++++++++++++++++- tools/lib/bpf/xsk.h | 3 ++- 3 files changed, 53 insertions(+), 2 deletions(-) diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map index 29ff4807b909..0867dd078a65 100644 --- a/tools/lib/bpf/libbpf.map +++ b/tools/lib/bpf/libbpf.map @@ -345,4 +345,5 @@ LIBBPF_0.3.0 { btf__parse_split; btf__new_empty_split; btf__new_split; + xsk_socket__get_caps; } LIBBPF_0.2.0; diff --git a/tools/lib/bpf/xsk.c b/tools/lib/bpf/xsk.c index 7951f7ea6db3..433c58fbed68 100644 --- a/tools/lib/bpf/xsk.c +++ b/tools/lib/bpf/xsk.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include @@ -31,6 +30,7 @@ #include #include "bpf.h" +#include "ethtool.h" #include "libbpf.h" #include "libbpf_internal.h" #include "xsk.h" @@ -931,3 +931,52 @@ void xsk_socket__delete(struct xsk_socket *xsk) close(xsk->fd); free(xsk); } + +int xsk_socket__get_caps(const char *ifname, __u32 *xdp_caps, __u16 *bind_caps) +{ + struct ethnl_params param; + int ret; + + if (!xdp_caps || !bind_caps || !ifname || + (strnlen(ifname, IFNAMSIZ) >= IFNAMSIZ)) + return -EINVAL; + + param.nl_family = ETHTOOL_GENL_NAME; + param.xdp_zc_flags = 0; + param.ifname = ifname; + param.xdp_flags = 0; + + /* First, get the netlink family id */ + ret = libbpf_ethnl_get_ethtool_family_id(¶m); + if (ret) + return ret; + + /* Second, get number of features */ + param.features = 0; + ret = libbpf_ethnl_get_netdev_features(¶m); + if (ret) + return ret; + + /* Third, get the features description */ + ret = libbpf_ethnl_get_netdev_features(¶m); + if (ret) + return ret; + + *xdp_caps = XDP_FLAGS_SKB_MODE; + *bind_caps = XDP_COPY; + + if (param.xdp_idx == -1 || param.xdp_zc_idx == -1) + return 0; + + /* Finally, get features flags and process it */ + ret = libbpf_ethnl_get_active_bits(¶m); + if (!ret) { + if (param.xdp_flags) { + *xdp_caps |= XDP_FLAGS_DRV_MODE; + if (param.xdp_zc_flags) + *bind_caps |= XDP_ZEROCOPY; + } + } + + return ret; +} diff --git a/tools/lib/bpf/xsk.h b/tools/lib/bpf/xsk.h index 1069c46364ff..ae29004570b2 100644 --- a/tools/lib/bpf/xsk.h +++ b/tools/lib/bpf/xsk.h @@ -247,7 +247,8 @@ xsk_socket__create_shared(struct xsk_socket **xsk_ptr, /* Returns 0 for success and -EBUSY if the umem is still in use. */ LIBBPF_API int xsk_umem__delete(struct xsk_umem *umem); LIBBPF_API void xsk_socket__delete(struct xsk_socket *xsk); - +LIBBPF_API int xsk_socket__get_caps(const char *ifname, __u32 *xdp_caps, + __u16 *bind_caps); #ifdef __cplusplus } /* extern "C" */ #endif