From patchwork Tue Jun 27 00:23:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 780931 X-Patchwork-Delegate: shemminger@vyatta.com 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 3wxRW36Hwkz9s8N for ; Tue, 27 Jun 2017 10:24:15 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="lxeZsd2U"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751574AbdF0AYK (ORCPT ); Mon, 26 Jun 2017 20:24:10 -0400 Received: from mail-pf0-f181.google.com ([209.85.192.181]:34998 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751454AbdF0AYE (ORCPT ); Mon, 26 Jun 2017 20:24:04 -0400 Received: by mail-pf0-f181.google.com with SMTP id c73so7786544pfk.2 for ; Mon, 26 Jun 2017 17:24:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nAXsinvfalvkdBSvt81ZNRrrdZnHw8M+8MG9thEaL4U=; b=lxeZsd2UsizTq+k3VVlaDCwzhyd2tB1Zf699+sQNI2yyr7qTiXE6Spo39UOElaNt24 G93G+299G56Yi5z4t+Yj+mhR8jZnDUciRSi3Sd0rZ/JY1vzdkqc3DOZX9HDS4dWvY3Zt D1nltWFXuf/zyUAnBQlxo2TRkkFcvEmfR7OJW6BpwDGc10WjrtQJYNaLEq82BqPI6Wc/ 6QHqHE1Amuh1ABfEU2ldaC5+9icTkGUZDm0iWtNckzyrGrWuKL2tWyPlBMB7Zglr2aM1 fSS2CmzpCgai0n3sdfYaBV4Gqv7hzzgx/tIYLeMfYt0e1YCra2FTcH40ZK9aT/LksU3R yLWg== 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; bh=nAXsinvfalvkdBSvt81ZNRrrdZnHw8M+8MG9thEaL4U=; b=htCydXghWYsIQdY19LP8tWzS09FaLE+0R8X1ZY2jTw6JdkQdk5dW1XJw4QSPVpiMB5 zICFfei2Dr3pZshl9yEWZ8URVKv1en512/t6YJh/5XwjnN9424Ww8XXL83mPE9xQNSD+ opengGjDVbg7DUyEWQE8ebfUWB7FTj0pkWHiCR/p2SIWvVL7AjwLhQymWfKQZU37Y90J rAL1AabcBVT4Mt8hTuQCS7g9lWVsRm17tBENdghj7bCl9tREqEodQ9LonXG+GX3BUE4I 03jkb+qYUsoLjjWs/vrvT4TZ358RMu7ge53vercraOg4O5lrm8zKLrqEa04FDkdJ/XaH iRGg== X-Gm-Message-State: AKS2vOwV49UzCgTxbnFKd3YXdZEKKB+kulflEdkPAO+clkv98jSAXpxa ojeoAekzk8zRmZllt5E= X-Received: by 10.84.198.67 with SMTP id o61mr2882307pld.98.1498523043398; Mon, 26 Jun 2017 17:24:03 -0700 (PDT) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id 28sm2208366pfq.125.2017.06.26.17.24.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Jun 2017 17:24:03 -0700 (PDT) From: Jakub Kicinski To: netdev@vger.kernel.org Cc: daniel@iogearbox.net, oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH iproute2 3/3] bpf: allow requesting XDP HW offload Date: Mon, 26 Jun 2017 17:23:53 -0700 Message-Id: <20170627002353.12292-4-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170627002353.12292-1-jakub.kicinski@netronome.com> References: <20170627002353.12292-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Let XDP link set command request that the program be offloaded. Signed-off-by: Jakub Kicinski Acked-by: Daniel Borkmann --- include/linux/if_link.h | 1 + ip/iplink.c | 5 ++++- ip/iplink_xdp.c | 4 +++- ip/xdp.h | 2 +- man/man8/ip-link.8.in | 7 ++++++- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/include/linux/if_link.h b/include/linux/if_link.h index 8a41b3bafcd4..3c0b2d365bcb 100644 --- a/include/linux/if_link.h +++ b/include/linux/if_link.h @@ -888,6 +888,7 @@ enum { #define XDP_FLAGS_UPDATE_IF_NOEXIST (1U << 0) #define XDP_FLAGS_SKB_MODE (1U << 1) #define XDP_FLAGS_DRV_MODE (1U << 2) +#define XDP_FLAGS_HW_MODE (1U << 3) #define XDP_FLAGS_MASK (XDP_FLAGS_UPDATE_IF_NOEXIST | \ XDP_FLAGS_SKB_MODE | \ XDP_FLAGS_DRV_MODE) diff --git a/ip/iplink.c b/ip/iplink.c index 811513c01c25..9674cb657322 100644 --- a/ip/iplink.c +++ b/ip/iplink.c @@ -616,12 +616,15 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req, addattr_l(&req->n, sizeof(*req), IFLA_MTU, &mtu, 4); } else if (strcmp(*argv, "xdpgeneric") == 0 || strcmp(*argv, "xdpdrv") == 0 || + strcmp(*argv, "xdpoffload") == 0 || strcmp(*argv, "xdp") == 0) { bool generic = strcmp(*argv, "xdpgeneric") == 0; bool drv = strcmp(*argv, "xdpdrv") == 0; + bool offload = strcmp(*argv, "xdpoffload") == 0; NEXT_ARG(); - if (xdp_parse(&argc, &argv, req, generic, drv)) + if (xdp_parse(&argc, &argv, req, generic, drv, + offload)) exit(-1); } else if (strcmp(*argv, "netns") == 0) { NEXT_ARG(); diff --git a/ip/iplink_xdp.c b/ip/iplink_xdp.c index cabb2348562e..9ae9ee5d0665 100644 --- a/ip/iplink_xdp.c +++ b/ip/iplink_xdp.c @@ -48,7 +48,7 @@ static int xdp_delete(struct xdp_req *xdp) } int xdp_parse(int *argc, char ***argv, struct iplink_req *req, bool generic, - bool drv) + bool drv, bool offload) { struct bpf_cfg_in cfg = { .argc = *argc, @@ -64,6 +64,8 @@ int xdp_parse(int *argc, char ***argv, struct iplink_req *req, bool generic, xdp.flags |= XDP_FLAGS_SKB_MODE; if (drv) xdp.flags |= XDP_FLAGS_DRV_MODE; + if (offload) + xdp.flags |= XDP_FLAGS_HW_MODE; if (*argc == 1) { if (strcmp(**argv, "none") == 0 || diff --git a/ip/xdp.h b/ip/xdp.h index 5f594132f494..ba897a29af58 100644 --- a/ip/xdp.h +++ b/ip/xdp.h @@ -4,7 +4,7 @@ #include "utils.h" int xdp_parse(int *argc, char ***argv, struct iplink_req *req, bool generic, - bool drv); + bool drv, bool offload); void xdp_dump(FILE *fp, struct rtattr *tb); #endif /* __XDP__ */ diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in index 326002d95e87..141d3597f945 100644 --- a/man/man8/ip-link.8.in +++ b/man/man8/ip-link.8.in @@ -126,7 +126,7 @@ ip-link \- network device configuration .RB "[ " port_guid " eui64 ] ]" .br .in -9 -.RB "[ { " xdp " | " xdpgeneric " | " xdpdrv " } { " off " | " +.RB "[ { " xdp " | " xdpgeneric " | " xdpdrv " | " xdpoffload " } { " off " | " .br .in +8 .BR object @@ -1595,6 +1595,11 @@ generic XDP variant be disabled and in case driver is not XDP-capable error should be returned. .B xdpdrv also disables hardware offloads. +.B xdpoffload +in ip link output indicates that the program has been offloaded to hardware +and can also be used to request the "offload" mode, much like +.B xdpgeneric +it forces program to be installed specifically in HW/FW of the apater. .B off (or