From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7FABFC282C4 for ; Tue, 12 Feb 2019 08:52:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4EFE920675 for ; Tue, 12 Feb 2019 08:52:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Hv+oBV37" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728593AbfBLIwe (ORCPT ); Tue, 12 Feb 2019 03:52:34 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:33106 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727234AbfBLIwe (ORCPT ); Tue, 12 Feb 2019 03:52:34 -0500 Received: by mail-pf1-f196.google.com with SMTP id c123so994749pfb.0 for ; Tue, 12 Feb 2019 00:52:33 -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=2BpwbKu37r4ICnJFpO01tcc8bs7Y4w/gT82xHbJR6nE=; b=Hv+oBV37sFyZRwsaM/K+qfnkEv9JTCqCQldESCX9sfi1UILd+lQDwh0ZJYi+GSfdKM AjB/utikFbjt7M0n0/DWVttdRqrJ6CSw5+i4hm0AgN7D1mtFVp7xdU99JWvVGjgbweig q3Ys23M6Z6r6CdffGn6COOVOAJ2/xefAsV2CILymKqr2NPEdakyNgWfwMZczVe02rH8W 81oWomvO6lJ+mPj+3MiVEBXwpbaPv5hzNXPQRVz1DNfwMGQUD15ZOs8Jgy/iMfIRTZos U2nywZ0IfLvD6gqLdiJKeJQ/QPOcjsegLr8p8bEq00raxngI+uF+uPdO5lHXfYMrvDsn pVrg== 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=2BpwbKu37r4ICnJFpO01tcc8bs7Y4w/gT82xHbJR6nE=; b=AzoTlxnIPXSsx0L9/h0EzbIl3FArC4m6RTs6pvNAhPjN7hpK3iVXE+czRh9IZtkWrh VhIWFG1NfBi7qStF9guRGqG5GYovQbLKqB8Z4h2YXPwpuHr/kOymL9bGog16GwIqhNfq NvKT36LXgwxo7ZiB3b2XInMYFsNZmZx8upQ14wvUsWPNvFbnzUWMCn5k3imVyqmeeDYl GHKGHA8JfxP/oOsjfyFICYVfpYw3VTkPgT8BhoRr0pGwkBwlwfXEWetr5W7mF7j1qDYD ommYvLhn6Mtjupna4H3/ubWOpwdWYOp5uU7Y9vT3/ak4EIQ9L/5S7n2GS1t2hXNTmqtE 8/5g== X-Gm-Message-State: AHQUAuZ4fWLZtfeGplemLZqGV6SQVRCIyTehTE6093eOEmlwH0fQWPFi hgEgRy4k3Zz4AlcA714cRz8= X-Google-Smtp-Source: AHgI3IYaLRItC9NcP5n4GOF6YSA0x3A/OyOt+WRZvUOKJzY4Y6lMu3XG+u4IHZt6ES5sM5WgQvueEA== X-Received: by 2002:a62:569b:: with SMTP id h27mr2815161pfj.163.1549961553643; Tue, 12 Feb 2019 00:52:33 -0800 (PST) Received: from btopel-mobl.ger.intel.com ([134.134.139.83]) by smtp.gmail.com with ESMTPSA id u73sm24461606pfa.169.2019.02.12.00.52.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Feb 2019 00:52:33 -0800 (PST) From: =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= To: intel-wired-lan@lists.osuosl.org Cc: =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , magnus.karlsson@intel.com, magnus.karlsson@gmail.com, netdev@vger.kernel.org, jan.sokolowski@intel.com Subject: [PATCH 1/2] i40e: move i40e_xsk_umem function Date: Tue, 12 Feb 2019 09:52:04 +0100 Message-Id: <20190212085205.7848-2-bjorn.topel@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190212085205.7848-1-bjorn.topel@gmail.com> References: <20190212085205.7848-1-bjorn.topel@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Björn Töpel The i40e_xsk_umem function was explicitly inlined in i40e.h. There is no reason for that, so move it to i40e_main.c instead. Signed-off-by: Björn Töpel --- drivers/net/ethernet/intel/i40e/i40e.h | 14 -------------- drivers/net/ethernet/intel/i40e/i40e_main.c | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h index d684998ba2b0..cc583ad5236b 100644 --- a/drivers/net/ethernet/intel/i40e/i40e.h +++ b/drivers/net/ethernet/intel/i40e/i40e.h @@ -1096,20 +1096,6 @@ static inline bool i40e_enabled_xdp_vsi(struct i40e_vsi *vsi) return !!vsi->xdp_prog; } -static inline struct xdp_umem *i40e_xsk_umem(struct i40e_ring *ring) -{ - bool xdp_on = i40e_enabled_xdp_vsi(ring->vsi); - int qid = ring->queue_index; - - if (ring_is_xdp(ring)) - qid -= ring->vsi->alloc_queue_pairs; - - if (!xdp_on) - return NULL; - - return xdp_get_umem_from_qid(ring->vsi->netdev, qid); -} - int i40e_create_queue_channel(struct i40e_vsi *vsi, struct i40e_channel *ch); int i40e_set_bw_limit(struct i40e_vsi *vsi, u16 seid, u64 max_tx_rate); int i40e_add_del_cloud_filter(struct i40e_vsi *vsi, diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index 44856a84738d..ba1a84a2c8e5 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -3063,6 +3063,26 @@ static void i40e_config_xps_tx_ring(struct i40e_ring *ring) ring->queue_index); } +/** + * i40e_xsk_umem - Retrieve the AF_XDP ZC if XDP and ZC is enabled + * @ring: The Tx or Rx ring + * + * Returns the UMEM or NULL. + **/ +static struct xdp_umem *i40e_xsk_umem(struct i40e_ring *ring) +{ + bool xdp_on = i40e_enabled_xdp_vsi(ring->vsi); + int qid = ring->queue_index; + + if (ring_is_xdp(ring)) + qid -= ring->vsi->alloc_queue_pairs; + + if (!xdp_on) + return NULL; + + return xdp_get_umem_from_qid(ring->vsi->netdev, qid); +} + /** * i40e_configure_tx_ring - Configure a transmit ring context and rest * @ring: The Tx ring to configure -- 2.19.1