From patchwork Tue Jan 10 13:08:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrien Mazarguil X-Patchwork-Id: 19080 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 6B4705589; Tue, 10 Jan 2017 15:31:55 +0100 (CET) Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com [74.125.82.44]) by dpdk.org (Postfix) with ESMTP id 08E8E1E2F for ; Tue, 10 Jan 2017 14:09:03 +0100 (CET) Received: by mail-wm0-f44.google.com with SMTP id f73so20129941wmf.1 for ; Tue, 10 Jan 2017 05:09:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=M97VWm6dE2LKGSJ+OzTpTTHBfjqDYzKJVsx1yW2ZFs4=; b=QEDZM34Qbvi1ksRa2DUJ6dJGFMQM6klTIkBBr2K4n2GUnYpny/fDVOZNChnDx7oQaq Wz7OWVdPe9mLoTxPeJEkC4S7JNetIsSJc1K9THeROenSsyLbNsmRJriypVoP29SLc4Z3 6DLlgKQnYDJlh8ZWU1kqi30uhuh1DMi45h/09Cfui1ZGIDehOfmnYBqk0LYLJiwpX8wi hsCf97/02v64yMNzoN+TffitGvynZQWcr4iXCvgtkbj+ET8g8kMPxJiEEICyMTLKNp8X RUadR9qUR3EsSNiQ6xlp166pUb0bIoFIyVj9fANq1k82CYFgjVny68RtsjeKRf2+pVL9 aC8w== 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=M97VWm6dE2LKGSJ+OzTpTTHBfjqDYzKJVsx1yW2ZFs4=; b=FLnoKxtNDxObp81OV28bGImPfj/iMZlyx7XpK9CSFeiz0iCyB2C7kuT8Ycrlt9elW5 356IJ1F0bI4hnu+Pb3F4g2beBrgnwjar8zs+dR4Fi1o1XdZVmwOuDA0AYoNWD9RH/WHX EubdgMfCJF+f1XEIkjI0JWkeYO3cmrcW91bNsS0K5o3sagMC0ef5wm1dmEBs4LxBdujL ff8gAUWbJEuYKl3B8z+MOJ9WWbgTE0a6iNjzH1JUyXFLn+5cZeJUbe1y9KyxuDOwzM7w dBz2A6j2/EBougPesaxihHG/bHNCXwGSXYXBdQsFqfot4RFkeq980YgW2be0VEY0jTSy 6Eyw== X-Gm-Message-State: AIkVDXJXgwOO3WRpAO1oyeJEOYNKrlEUHQ86xXB2QyWJH4VTJg10NWovJ4MWedCTudPZxkiM X-Received: by 10.223.129.163 with SMTP id 32mr1890778wra.140.1484053743468; Tue, 10 Jan 2017 05:09:03 -0800 (PST) Received: from 6wind.com (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by smtp.gmail.com with ESMTPSA id jm6sm3209247wjb.27.2017.01.10.05.09.02 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 10 Jan 2017 05:09:02 -0800 (PST) From: Adrien Mazarguil To: dev@dpdk.org Cc: Jingjing Wu , John McNamara Date: Tue, 10 Jan 2017 14:08:29 +0100 Message-Id: <2a68f227b03d2f58a2fc438466659b64a7f5741a.1484046037.git.adrien.mazarguil@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: Subject: [dpdk-dev] [PATCH 4/5] ethdev: clarify RSS action in flow API X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Contrary to the current description, mbuf RSS hash result storage does not overlap with the returned MARK value (hash.fdir.lo vs. hash.fdir.hi), and both may be combined. Reflect this change by allowing testpmd to display both values simultaneously. Signed-off-by: Adrien Mazarguil Cc: Jingjing Wu Cc: John McNamara --- app/test-pmd/rxonly.c | 3 ++- doc/guides/prog_guide/rte_flow.rst | 8 +++----- lib/librte_ether/rte_flow.h | 8 +++----- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/app/test-pmd/rxonly.c b/app/test-pmd/rxonly.c index cf00576..dcc8346 100644 --- a/app/test-pmd/rxonly.c +++ b/app/test-pmd/rxonly.c @@ -148,7 +148,8 @@ pkt_burst_receive(struct fwd_stream *fs) if (ol_flags & PKT_RX_RSS_HASH) { printf(" - RSS hash=0x%x", (unsigned) mb->hash.rss); printf(" - RSS queue=0x%x",(unsigned) fs->rx_queue); - } else if (ol_flags & PKT_RX_FDIR) { + } + if (ol_flags & PKT_RX_FDIR) { printf(" - FDIR matched "); if (ol_flags & PKT_RX_FDIR_ID) printf("ID=0x%x", diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst index a6acbbf..93d0dc2 100644 --- a/doc/guides/prog_guide/rte_flow.rst +++ b/doc/guides/prog_guide/rte_flow.rst @@ -1187,11 +1187,9 @@ Action: ``RSS`` Similar to QUEUE, except RSS is additionally performed on packets to spread them among several queues according to the provided parameters. -Note: RSS hash result is normally stored in the ``hash.rss`` mbuf field, -however it conflicts with `Action: MARK`_ as they share the same space. When -both actions are specified, the RSS hash is discarded and -``PKT_RX_RSS_HASH`` is not set in ``ol_flags``. MARK has priority. The mbuf -structure should eventually evolve to store both. +Note: RSS hash result is stored in the ``hash.rss`` mbuf field which +overlaps ``hash.fdir.lo``. Since `Action: MARK`_ sets the ``hash.fdir.hi`` +field only, both can be requested simultaneously. - Terminating by default. diff --git a/lib/librte_ether/rte_flow.h b/lib/librte_ether/rte_flow.h index c2b9fc5..59dc1ef 100644 --- a/lib/librte_ether/rte_flow.h +++ b/lib/librte_ether/rte_flow.h @@ -696,11 +696,9 @@ struct rte_flow_action_dup { * Similar to QUEUE, except RSS is additionally performed on packets to * spread them among several queues according to the provided parameters. * - * Note: RSS hash result is normally stored in the hash.rss mbuf field, - * however it conflicts with the MARK action as they share the same - * space. When both actions are specified, the RSS hash is discarded and - * PKT_RX_RSS_HASH is not set in ol_flags. MARK has priority. The mbuf - * structure should eventually evolve to store both. + * Note: RSS hash result is stored in the hash.rss mbuf field which overlaps + * hash.fdir.lo. Since the MARK action sets the hash.fdir.hi field only, + * both can be requested simultaneously. * * Terminating by default. */