From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by dpdk.org (Postfix) with ESMTP id 0D7B35B20 for ; Tue, 27 Feb 2018 10:49:51 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 9F49C20BA9; Tue, 27 Feb 2018 04:49:50 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute1.internal (MEProxy); Tue, 27 Feb 2018 04:49:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=q97EJOxRL6hSJv0U17K3QMfivVObY9rNMy26pszaHJ0=; b=hAWyPV1h 5AYpq8IivYnofMf0LpH77WjthbaaXFOWaGHDsfpPaVSBaO1IJJlS4kGNUA/NpThe 2C4MkrD36eWb767SyBBvKJaAbqKpJGmKAdrJIEl2/CE1Dx6St3/zrOaIP31t5USG KC3ax+ZKmjD7stIsNl4h2+YfUC5rAWCwQIXVzaEVvYVfiy1IL6U+ZV2KUS6gJ+5p OMIrqvdCYA7TbZUjwCCX/EJHlRE3247+ZaLc7t3GxYvi8vV6Lb6U4XPDkxsVx1j5 lwLzsifw8t1Obm8enKs3DDCzy8l0MrtfVvs4I6bYoZ48cGRtWCMDV+4guFHI6guA Tg9il0nccdQIZg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; bh=q97EJOxRL6hSJv0U17K3QMfivVObY 9rNMy26pszaHJ0=; b=cwSHsBJJhuUKes4q/0QHeXlQI4kP7DsiSczKyzcGIoA0c L4VHOuXpwgyICs1xjWkV/ka8WOjkujIuxT2jDGO7l9/X8rK2Gkn4evZe/7tNI+71 T0wiIp4hBivQ7wtOYTMqgLr9JthEcovXNxMb2gzMOWmBQV7u486x+lmIoNGbs9mw fXwtl/DSePXb4FqgW6XVGhDHff0rs3xPOiKRua5z6nrh/LxAIGQigetXAkyAHQpZ SOhLluLFEtHQ7q9PftHb6N88PPJcSQLU+dhnJVQGEdxlZaH0/3jd5PaFuKYXez83 Ge8D2bqSgFrf3kTGcffPtMOXn7PEQoc8KdwIMS28Q== X-ME-Sender: Received: from yliu-mob (unknown [182.84.161.214]) by mail.messagingengine.com (Postfix) with ESMTPA id 7B05F7E188; Tue, 27 Feb 2018 04:49:48 -0500 (EST) Date: Tue, 27 Feb 2018 17:49:46 +0800 From: Yuanhan Liu To: Nelio Laranjeiro Cc: stable@dpdk.org, Adrien Mazarguil , Yongseok Koh Message-ID: <20180227094946.GH11744@yliu-mob> References: <20180207093155.GA31542@yliu-mob> <7b8e3cb89da9d10b3afffa2c297a417c59c6d82b.1519724131.git.nelio.laranjeiro@6wind.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <7b8e3cb89da9d10b3afffa2c297a417c59c6d82b.1519724131.git.nelio.laranjeiro@6wind.com> User-Agent: Mutt/1.5.24 (2015-08-30) Subject: Re: [dpdk-stable] [PATCH 1/3] Revert "net/mlx5: fix flow priority on queue action" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Feb 2018 09:49:51 -0000 On Tue, Feb 27, 2018 at 10:36:43AM +0100, Nelio Laranjeiro wrote: > This patch depends on another one not backported. For now it should be > reverted to backport first the one missing and then re-apply this one. > > This reverts commit 0ec3529b056a826cee94104e20dfd3d58d64ab67. Series Applied to dpdk-stable/17.11. Thanks for the backporting! --yliu > --- > drivers/net/mlx5/mlx5_flow.c | 30 +++++++++++++++++++++++++++++- > 1 file changed, 29 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c > index 82efddc5a..c18c77d48 100644 > --- a/drivers/net/mlx5/mlx5_flow.c > +++ b/drivers/net/mlx5/mlx5_flow.c > @@ -882,6 +882,8 @@ priv_flow_convert_items_validate(struct priv *priv, > } > if (parser->drop) { > parser->drop_q.offset += cur_item->dst_sz; > + } else if (parser->queues_n == 1) { > + parser->queue[HASH_RXQ_ETH].offset += cur_item->dst_sz; > } else { > for (n = 0; n != hash_rxq_init_n; ++n) > parser->queue[n].offset += cur_item->dst_sz; > @@ -1124,6 +1126,19 @@ priv_flow_convert(struct priv *priv, > if (!parser->drop_q.ibv_attr) > return ENOMEM; > parser->drop_q.offset = sizeof(struct ibv_flow_attr); > + } else if (parser->queues_n == 1) { > + unsigned int priority = > + attr->priority + > + hash_rxq_init[HASH_RXQ_ETH].flow_priority; > + unsigned int offset = parser->queue[HASH_RXQ_ETH].offset; > + > + parser->queue[HASH_RXQ_ETH].ibv_attr = > + priv_flow_convert_allocate(priv, priority, > + offset, error); > + if (!parser->queue[HASH_RXQ_ETH].ibv_attr) > + return ENOMEM; > + parser->queue[HASH_RXQ_ETH].offset = > + sizeof(struct ibv_flow_attr); > } else { > for (i = 0; i != hash_rxq_init_n; ++i) { > unsigned int priority = > @@ -1173,9 +1188,22 @@ priv_flow_convert(struct priv *priv, > * Last step. Complete missing specification to reach the RSS > * configuration. > */ > - if (!parser->drop) { > + if (parser->drop) { > + /* > + * Drop queue priority needs to be adjusted to > + * their most specific layer priority. > + */ > + parser->drop_q.ibv_attr->priority = > + attr->priority + > + hash_rxq_init[parser->layer].flow_priority; > + } else if (parser->queues_n > 1) { > priv_flow_convert_finalise(priv, parser); > } else { > + /* > + * Action queue have their priority overridden with > + * Ethernet priority, this priority needs to be adjusted to > + * their most specific layer priority. > + */ > parser->queue[HASH_RXQ_ETH].ibv_attr->priority = > attr->priority + > hash_rxq_init[parser->layer].flow_priority; > -- > 2.11.0