From patchwork Tue Jan 29 09:57:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= X-Patchwork-Id: 1032643 X-Patchwork-Delegate: jeffrey.t.kirsher@intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=osuosl.org (client-ip=140.211.166.136; helo=silver.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.b="YwfZ5CBF"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43phlv5hQmz9sNG for ; Tue, 29 Jan 2019 20:58:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 35A1B25351; Tue, 29 Jan 2019 09:58:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id E8MCqC070uoS; Tue, 29 Jan 2019 09:58:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 9B4AC252B7; Tue, 29 Jan 2019 09:58:47 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 66B581BF310 for ; Tue, 29 Jan 2019 09:58:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 63815878CD for ; Tue, 29 Jan 2019 09:58:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cQCpjwqGb7Mn for ; Tue, 29 Jan 2019 09:58:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by hemlock.osuosl.org (Postfix) with ESMTPS id DCF62878AF for ; Tue, 29 Jan 2019 09:58:44 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id h3so9448548pfg.1 for ; Tue, 29 Jan 2019 01:58:44 -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:mime-version :content-transfer-encoding; bh=zkJaUa3stfodSZXjp+o1bTcTQJJVzBq5ClMQzEHkfvU=; b=YwfZ5CBFhALx0SusT+g/i71QTy98mrftde8L13a+/w9eatIcf3a2hBa4q+SKakk9uE ydFyyMif6rD9B3sbhEOzt4p+E9o29In+lPnqf2yLjCHha8HmRp9aj35AVUOP3rpeLyZb PAaxfeYSieoI7UUPi5Vf4m9OBm7ikKsVQi1bcP/1kjcy9BKLgH/2g8dSmxpi/KN/1MPJ 6BVqBRwIVXSOOw8FAVIUfGQ9AZ748Lm65IjozBEejmayxvG6ntIvLdtUe5U5gW6Ud4je 79W3fq41RmgKBMxAYHa/ATJlw3kjxnPrQ9EY3YwKwbylx4In0mJ6Yy73i2FWM8M5VVuN /71w== 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:mime-version :content-transfer-encoding; bh=zkJaUa3stfodSZXjp+o1bTcTQJJVzBq5ClMQzEHkfvU=; b=BiJBgWPR+f7LmqypWHExaeQFCWo5mk9HKoUf0eSkT/NeqMkqigzgb7c/3vgXlCExew HoQiqJ3S2GjhvB1qfJhIBHwNrD2kgYBYLpAC3XGtktiDpMz683p2T80bO4feCoESzmGQ JYT4nZzKzP50l0c9XgbiQ5iF7KlQ3j6cv25rMBDG7UjKpl7kvXV4DfSs/Nk9O63hWzIN XwMgWt0i1gwIHViCeAr1KOqRRHO5qM/u4pCNSuoeaUCzr2uzPtsH4YcjvEyLvMForQdl 7Mjqq/X7GXtTNXjT60XIxlcbVny0k+GsIsd7UOqKaBd/D4dPT+DKLjcC2EvwZqk9g+9R eWIw== X-Gm-Message-State: AJcUukdPV4R4Z42XFT3kTXjLEBJcmcTftElXP3O1HfM4Nfj/GRXHStAM 2bIGW+J3XBP0psoBV7PcfRe6gtCty9pBPw== X-Google-Smtp-Source: ALg8bN7Wve+5n9GnGP+gbGcXiTeVGynNi7nD5M9gTdZ9Nyu23Kc1/AXhfuHyj1WZHO2Fmhy4xk3qfQ== X-Received: by 2002:a63:65c7:: with SMTP id z190mr23191417pgb.249.1548755924058; Tue, 29 Jan 2019 01:58:44 -0800 (PST) Received: from btopel-mobl.isw.intel.com ([192.55.54.45]) by smtp.gmail.com with ESMTPSA id a17sm42299156pgm.26.2019.01.29.01.58.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Jan 2019 01:58:43 -0800 (PST) From: bjorn.topel@gmail.com To: intel-wired-lan@lists.osuosl.org Date: Tue, 29 Jan 2019 10:57:54 +0100 Message-Id: <20190129095754.9390-1-bjorn.topel@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Subject: [Intel-wired-lan] [PATCH v2] i40e: replace switch-statement to speed-up retpoline-enabled builds 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: pmenzel@molgen.mpg.de, netdev@vger.kernel.org, brouer@redhat.com, =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , magnus.karlsson@gmail.com, magnus.karlsson@intel.com Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" From: Björn Töpel GCC will generate jump tables for switch-statements with more than 5 case statements. An entry into the jump table is an indirect call, which means that for CONFIG_RETPOLINE builds, this is rather expensive. This commit replaces the switch-statement that acts on the XDP program result with an if-clause. The if-clause was also refactored into a common function that can be used by AF_XDP zero-copy and non-zero-copy code. Performance prior this patch: $ sudo ./xdp_rxq_info --dev enp134s0f0 --action XDP_DROP Running XDP on dev:enp134s0f0 (ifindex:7) action:XDP_DROP options:no_touch XDP stats CPU pps issue-pps XDP-RX CPU 20 18983018 0 XDP-RX CPU total 18983018 RXQ stats RXQ:CPU pps issue-pps rx_queue_index 20:20 18983012 0 rx_queue_index 20:sum 18983012 $ sudo ./xdpsock -i enp134s0f0 -q 20 -n 2 -z -r sock0@enp134s0f0:20 rxdrop pps pkts 2.00 rx 14,641,496 144,751,092 tx 0 0 And after: $ sudo ./xdp_rxq_info --dev enp134s0f0 --action XDP_DROP Running XDP on dev:enp134s0f0 (ifindex:7) action:XDP_DROP options:no_touch XDP stats CPU pps issue-pps XDP-RX CPU 20 24000986 0 XDP-RX CPU total 24000986 RXQ stats RXQ:CPU pps issue-pps rx_queue_index 20:20 24000985 0 rx_queue_index 20:sum 24000985 +26% $ sudo ./xdpsock -i enp134s0f0 -q 20 -n 2 -z -r sock0@enp134s0f0:20 rxdrop pps pkts 2.00 rx 17,623,578 163,503,263 tx 0 0 +20% Signed-off-by: Björn Töpel --- v1->v2: * Fixed build error on alpha "error: implicit declaration of function 'unlikely'; did you mean 'inline'? " (kbuild test robot) * Improved commit message (Paul Menzel) --- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 32 ++++--------------- .../ethernet/intel/i40e/i40e_txrx_common.h | 27 ++++++++++++++++ drivers/net/ethernet/intel/i40e/i40e_xsk.c | 24 ++------------ 3 files changed, 36 insertions(+), 47 deletions(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c index a7e14e98889f..4f530427ce61 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c +++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c @@ -2,7 +2,7 @@ /* Copyright(c) 2013 - 2018 Intel Corporation. */ #include -#include +#include #include #include "i40e.h" #include "i40e_trace.h" @@ -2195,41 +2195,23 @@ int i40e_xmit_xdp_tx_ring(struct xdp_buff *xdp, struct i40e_ring *xdp_ring) static struct sk_buff *i40e_run_xdp(struct i40e_ring *rx_ring, struct xdp_buff *xdp) { - int err, result = I40E_XDP_PASS; - struct i40e_ring *xdp_ring; struct bpf_prog *xdp_prog; + int result; u32 act; rcu_read_lock(); xdp_prog = READ_ONCE(rx_ring->xdp_prog); - if (!xdp_prog) + if (!xdp_prog) { + result = I40E_XDP_PASS; goto xdp_out; + } prefetchw(xdp->data_hard_start); /* xdp_frame write */ act = bpf_prog_run_xdp(xdp_prog, xdp); - switch (act) { - case XDP_PASS: - break; - case XDP_TX: - xdp_ring = rx_ring->vsi->xdp_rings[rx_ring->queue_index]; - result = i40e_xmit_xdp_tx_ring(xdp, xdp_ring); - break; - case XDP_REDIRECT: - err = xdp_do_redirect(rx_ring->netdev, xdp, xdp_prog); - result = !err ? I40E_XDP_REDIR : I40E_XDP_CONSUMED; - break; - default: - bpf_warn_invalid_xdp_action(act); - /* fall through */ - case XDP_ABORTED: - trace_xdp_exception(rx_ring->netdev, xdp_prog, act); - /* fall through -- handle aborts by dropping packet */ - case XDP_DROP: - result = I40E_XDP_CONSUMED; - break; - } + i40e_xdp_do_action(act, &result, rx_ring, xdp, xdp_prog); + xdp_out: rcu_read_unlock(); return ERR_PTR(-result); diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx_common.h b/drivers/net/ethernet/intel/i40e/i40e_txrx_common.h index 8af0e99c6c0d..8cc4d8365f9e 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_txrx_common.h +++ b/drivers/net/ethernet/intel/i40e/i40e_txrx_common.h @@ -4,6 +4,8 @@ #ifndef I40E_TXRX_COMMON_ #define I40E_TXRX_COMMON_ +#include + void i40e_fd_handle_status(struct i40e_ring *rx_ring, union i40e_rx_desc *rx_desc, u8 prog_id); int i40e_xmit_xdp_tx_ring(struct xdp_buff *xdp, struct i40e_ring *xdp_ring); @@ -88,4 +90,29 @@ void i40e_xsk_clean_rx_ring(struct i40e_ring *rx_ring); void i40e_xsk_clean_tx_ring(struct i40e_ring *tx_ring); bool i40e_xsk_any_rx_ring_enabled(struct i40e_vsi *vsi); +static inline void i40e_xdp_do_action(u32 act, int *result, + struct i40e_ring *rx_ring, + struct xdp_buff *xdp, + struct bpf_prog *xdp_prog) +{ + struct i40e_ring *xdp_ring; + int err; + + if (act == XDP_TX) { + xdp_ring = rx_ring->vsi->xdp_rings[rx_ring->queue_index]; + *result = i40e_xmit_xdp_tx_ring(xdp, xdp_ring); + } else if (act == XDP_REDIRECT) { + err = xdp_do_redirect(rx_ring->netdev, xdp, xdp_prog); + *result = !err ? I40E_XDP_REDIR : I40E_XDP_CONSUMED; + } else if (act == XDP_PASS) { + *result = I40E_XDP_PASS; + } else if (act == XDP_DROP) { + *result = I40E_XDP_CONSUMED; + } else { + if (act != XDP_ABORTED) + bpf_warn_invalid_xdp_action(act); + trace_xdp_exception(rx_ring->netdev, xdp_prog, act); + *result = I40E_XDP_CONSUMED; + } +} #endif /* I40E_TXRX_COMMON_ */ diff --git a/drivers/net/ethernet/intel/i40e/i40e_xsk.c b/drivers/net/ethernet/intel/i40e/i40e_xsk.c index 96d849460d9b..c9d58f49f7a2 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_xsk.c +++ b/drivers/net/ethernet/intel/i40e/i40e_xsk.c @@ -210,9 +210,8 @@ int i40e_xsk_umem_setup(struct i40e_vsi *vsi, struct xdp_umem *umem, **/ static int i40e_run_xdp_zc(struct i40e_ring *rx_ring, struct xdp_buff *xdp) { - int err, result = I40E_XDP_PASS; - struct i40e_ring *xdp_ring; struct bpf_prog *xdp_prog; + int result; u32 act; rcu_read_lock(); @@ -222,26 +221,7 @@ static int i40e_run_xdp_zc(struct i40e_ring *rx_ring, struct xdp_buff *xdp) xdp_prog = READ_ONCE(rx_ring->xdp_prog); act = bpf_prog_run_xdp(xdp_prog, xdp); xdp->handle += xdp->data - xdp->data_hard_start; - switch (act) { - case XDP_PASS: - break; - case XDP_TX: - xdp_ring = rx_ring->vsi->xdp_rings[rx_ring->queue_index]; - result = i40e_xmit_xdp_tx_ring(xdp, xdp_ring); - break; - case XDP_REDIRECT: - err = xdp_do_redirect(rx_ring->netdev, xdp, xdp_prog); - result = !err ? I40E_XDP_REDIR : I40E_XDP_CONSUMED; - break; - default: - bpf_warn_invalid_xdp_action(act); - case XDP_ABORTED: - trace_xdp_exception(rx_ring->netdev, xdp_prog, act); - /* fallthrough -- handle aborts by dropping packet */ - case XDP_DROP: - result = I40E_XDP_CONSUMED; - break; - } + i40e_xdp_do_action(act, &result, rx_ring, xdp, xdp_prog); rcu_read_unlock(); return result; }