From patchwork Thu May 14 16:36:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Fastabend X-Patchwork-Id: 472412 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 035501402B2 for ; Fri, 15 May 2015 02:37:00 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=XkHMWSYC; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B5692953B4; Thu, 14 May 2015 16:36:59 +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 UtT9kK8evm4H; Thu, 14 May 2015 16:36:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id F11EC95397; Thu, 14 May 2015 16:36:58 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id E48A41C2351 for ; Thu, 14 May 2015 16:36:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E4B8AA24D5 for ; Thu, 14 May 2015 16:36:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id a5kLdYnOjEJQ for ; Thu, 14 May 2015 16:36:57 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-oi0-f50.google.com (mail-oi0-f50.google.com [209.85.218.50]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 420CAA24A6 for ; Thu, 14 May 2015 16:36:57 +0000 (UTC) Received: by oica37 with SMTP id a37so59950938oic.0 for ; Thu, 14 May 2015 09:36:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:subject:to:cc:date:message-id:user-agent:mime-version :content-type:content-transfer-encoding; bh=0IkjOMjdNCjQ9TTw1U8wmINXEDWbfEi7Q91KZRTFGq0=; b=XkHMWSYCt+s9kox2ib5G0DuSFJGeZKTbsT8WDs7KDFlNjZdhFae4Zv+3jEUowHXjqV ykIP+MGUmlK44eDHcfxxUv4tXrar2neU3A/6KCRhHu0UH8A1VOnHR1Q/MzTNwNN12HqO 42bX3JxLHc145RkDQBuxa6TwfZqUlr/zpkqk6kc/AieWib2bVt/ZKYaE3VPoEgvZJCuU b1Ijds0wQppSAsg9O6N2MIDU2+abxD+305T9+z5Sx3RneBM3rTwLeXa7Jl3eBjEpFbLm wMiyRda/X99lThu0zzLxexydFmTurKGDZnCNmirg1k23X45Tn/KH0paMEIYk4/rAPOdC 3X0A== X-Received: by 10.60.52.19 with SMTP id p19mr4296654oeo.37.1431621416566; Thu, 14 May 2015 09:36:56 -0700 (PDT) Received: from nitbit.x32 ([72.168.134.52]) by mx.google.com with ESMTPSA id zk5sm14980660obc.22.2015.05.14.09.36.49 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 14 May 2015 09:36:55 -0700 (PDT) From: John Fastabend X-Google-Original-From: John Fastabend To: alexander.h.duyck@redhat.com Date: Thu, 14 May 2015 09:36:28 -0700 Message-ID: <20150514163616.14473.66892.stgit@nitbit.x32> User-Agent: StGit/0.16 MIME-Version: 1.0 Cc: intel-wired-lan@lists.osuosl.org Subject: [Intel-wired-lan] [net-next PATCH v2] ixgbe: Allow flow director to use entire queue space X-BeenThere: intel-wired-lan@lists.osuosl.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-wired-lan-bounces@lists.osuosl.org Sender: "Intel-wired-lan" Flow director is exported to user space using the ethtool ntuple support. However, currently it only supports steering traffic to a subset of the queues in use by the hardware. This change allows flow director to specify queues that have been assigned to virtual functions by partitioning the ring_cookie into a 8bit vf specifier followed by 32bit queue index. At the moment we don't have any ethernet drivers with more than 2^32 queues on a single function as best I can tell and nor do I expect this to happen anytime soon. This way the ring_cookie's normal use for specifying a queue on a specific PCI function continues to work as expected. Signed-off-by: John Fastabend --- drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 32 ++++++++++++++++------ include/uapi/linux/ethtool.h | 20 ++++++++++++++ 2 files changed, 43 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c index eafa9ec..1bb8ddc 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c @@ -2595,18 +2595,35 @@ static int ixgbe_add_ethtool_fdir_entry(struct ixgbe_adapter *adapter, struct ixgbe_fdir_filter *input; union ixgbe_atr_input mask; int err; + u8 ring, vf, queue; if (!(adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE)) return -EOPNOTSUPP; - /* - * Don't allow programming if the action is a queue greater than - * the number of online Rx queues. + /* ring_cookie is a masked into a set of queues and ixgbe pools. */ + ring = ethtool_get_flow_spec_ring(fsp->ring_cookie); + vf = ethtool_get_flow_spec_ring_vf(fsp->ring_cookie); + + /* The input is validated to ensure the pool is valid and the queue + * selection is valid for the specified pool. */ - if ((fsp->ring_cookie != RX_CLS_FLOW_DISC) && - (fsp->ring_cookie >= adapter->num_rx_queues)) + if (!vf && + (ring != RX_CLS_FLOW_DISC) && + (ring >= adapter->num_rx_queues)) + return -EINVAL; + + if (vf && + ((vf > adapter->num_vfs) || + ring >= adapter->num_rx_queues_per_pool)) return -EINVAL; + if (ring == IXGBE_FDIR_DROP_QUEUE) + queue = IXGBE_FDIR_DROP_QUEUE; + else if (!vf) + queue = adapter->rx_ring[ring]->reg_idx; + else + queue = ((vf - 1) * adapter->num_rx_queues_per_pool) + ring; + /* Don't allow indexes to exist outside of available space */ if (fsp->location >= ((1024 << adapter->fdir_pballoc) - 2)) { e_err(drv, "Location out of range\n"); @@ -2683,10 +2700,7 @@ static int ixgbe_add_ethtool_fdir_entry(struct ixgbe_adapter *adapter, /* program filters to filter memory */ err = ixgbe_fdir_write_perfect_filter_82599(hw, - &input->filter, input->sw_idx, - (input->action == IXGBE_FDIR_DROP_QUEUE) ? - IXGBE_FDIR_DROP_QUEUE : - adapter->rx_ring[input->action]->reg_idx); + &input->filter, input->sw_idx, queue); if (err) goto err_out_w_lock; diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h index 2e49fc8..ecc658d 100644 --- a/include/uapi/linux/ethtool.h +++ b/include/uapi/linux/ethtool.h @@ -796,6 +796,26 @@ struct ethtool_rx_flow_spec { __u32 location; }; +/* How rings are layed out when accessing virtual functions or + * offloaded queues is device specific. To allow users to flow + * steering and specify these queues though break the ring cookie + * into a 32bit queue index with an 8 bit virtual function id. + * This also leaves the 3bytes for further specifiers. + */ +#define ETHTOOL_RX_FLOW_SPEC_RING 0x00000000FFFFFFFF +#define ETHTOOL_RX_FLOW_SPEC_RING_VF 0x000000FF00000000 +#define ETHTOOL_RX_FLOW_SPEC_RING_VF_OFF 32 +static inline __u64 ethtool_get_flow_spec_ring(__u64 ring_cookie) +{ + return ETHTOOL_RX_FLOW_SPEC_RING & ring_cookie; +}; + +static inline __u64 ethtool_get_flow_spec_ring_vf(__u64 ring_cookie) +{ + return (ETHTOOL_RX_FLOW_SPEC_RING_VF & ring_cookie) >> + ETHTOOL_RX_FLOW_SPEC_RING_VF_OFF; +}; + /** * struct ethtool_rxnfc - command to get or set RX flow classification rules * @cmd: Specific command number - %ETHTOOL_GRXFH, %ETHTOOL_SRXFH,