From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leon Romanovsky Subject: Re: [PATCH net] net/mlx4: Fix the check in attaching steering rules Date: Tue, 23 May 2017 16:15:13 +0300 Message-ID: <20170523131513.GN17751@mtr-leonro.local> References: <1495543807-14956-1-git-send-email-tariqt@mellanox.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="AQNmCumFClRcGgHG" Cc: "David S. Miller" , netdev@vger.kernel.org, Eran Ben Elisha , Or Gerlitz , Talat Batheesh To: Tariq Toukan Return-path: Received: from mail.kernel.org ([198.145.29.99]:33826 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967585AbdEWNP1 (ORCPT ); Tue, 23 May 2017 09:15:27 -0400 Content-Disposition: inline In-Reply-To: <1495543807-14956-1-git-send-email-tariqt@mellanox.com> Sender: netdev-owner@vger.kernel.org List-ID: --AQNmCumFClRcGgHG Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, May 23, 2017 at 03:50:07PM +0300, Tariq Toukan wrote: > From: Talat Batheesh > > Our previous patch (cited below) introduced a regression > for RAW Eth QPs. > > Fix it by checking if the QP number provided by user-space > exists, hence allowing steering rules to be added for valid > QPs only. > > Fixes: 89c557687a32 ("net/mlx4_en: Avoid adding steering rules with ...") > Reported-by: Or Gerlitz > Signed-off-by: Talat Batheesh > Signed-off-by: Tariq Toukan > --- > drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 3 +-- > drivers/net/ethernet/mellanox/mlx4/qp.c | 14 ++++++++++++++ > include/linux/mlx4/qp.h | 1 + > 3 files changed, 16 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c > index ae5fdc2df654..00a7cd3dcc2e 100644 > --- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c > +++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c > @@ -1562,8 +1562,7 @@ static int mlx4_en_flow_replace(struct net_device *dev, > qpn = priv->drop_qp.qpn; > else if (cmd->fs.ring_cookie & EN_ETHTOOL_QP_ATTACH) { > qpn = cmd->fs.ring_cookie & (EN_ETHTOOL_QP_ATTACH - 1); > - if (qpn < priv->rss_map.base_qpn || > - qpn >= priv->rss_map.base_qpn + priv->rx_ring_num) { > + if (!mlx4_qp_lookup(priv->mdev->dev, qpn)) { > en_warn(priv, "rxnfc: QP (0x%x) doesn't exist\n", qpn); > return -EINVAL; > } > diff --git a/drivers/net/ethernet/mellanox/mlx4/qp.c b/drivers/net/ethernet/mellanox/mlx4/qp.c > index 2d6abd4662b1..1eff2fe32a8b 100644 > --- a/drivers/net/ethernet/mellanox/mlx4/qp.c > +++ b/drivers/net/ethernet/mellanox/mlx4/qp.c > @@ -384,6 +384,20 @@ static void mlx4_qp_free_icm(struct mlx4_dev *dev, int qpn) > __mlx4_qp_free_icm(dev, qpn); > } > > +struct mlx4_qp *mlx4_qp_lookup(struct mlx4_dev *dev, u32 qpn) > +{ > + struct mlx4_qp_table *qp_table = &mlx4_priv(dev)->qp_table; > + struct mlx4_qp *qp; > + > + spin_lock(&qp_table->lock); > + > + qp = __mlx4_qp_lookup(dev, qpn); > + > + spin_unlock(&qp_table->lock); > + return qp; > +} > +EXPORT_SYMBOL_GPL(mlx4_qp_lookup); Tariq, Why do you need this export and header fils? You are using this function in one place only. Thanks > + > int mlx4_qp_alloc(struct mlx4_dev *dev, int qpn, struct mlx4_qp *qp, gfp_t gfp) > { > struct mlx4_priv *priv = mlx4_priv(dev); > diff --git a/include/linux/mlx4/qp.h b/include/linux/mlx4/qp.h > index b4ee8f62ce8d..8e2828d48d7f 100644 > --- a/include/linux/mlx4/qp.h > +++ b/include/linux/mlx4/qp.h > @@ -470,6 +470,7 @@ struct mlx4_update_qp_params { > u16 rate_val; > }; > > +struct mlx4_qp *mlx4_qp_lookup(struct mlx4_dev *dev, u32 qpn); > int mlx4_update_qp(struct mlx4_dev *dev, u32 qpn, > enum mlx4_update_qp_attr attr, > struct mlx4_update_qp_params *params); > -- > 1.8.3.1 > --AQNmCumFClRcGgHG Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEkhr/r4Op1/04yqaB5GN7iDZyWKcFAlkkNeAACgkQ5GN7iDZy WKfa+g//SF1PBZHFXWFlDsFbnasfBlwwZG7IynGhc5esni+L0SgatZawIhrD49es 0qutrO1dCQU513mag/gvqhH2TSyUr6yfGonh1dY5t/NHEKGUZA8OZNcFBD9KH6CV Vvw89g71cuKOYU2a5Diir7RaEDWnqQjAEAdH4kC2RkaSdbc0wEIvaKZtuPwhVIcm 7TOYixKkEbzdGI2v0x+BGfoBLEBgevIvowPXPSkC1zlsfY8yPhPw+9CgjglC+Qes cbH+4DaHri9/Hcg/l3rFaxFI5dmG1Roejsrp9JM9pAwqwHac+QmA6a2lkVNrKSeC Urq9cM407vbHysXL1rAuYMXj0zyp2WivvKJTV+BjbxC7Z81S5V46gAZ3W3YO+oBx xOtwSC3UImPgz5ZiU1nLmjb9daiy5euYIWtenH5p3zO+0V9Uckv0WXPxf/J4aE4M hB5NjW6CnG+F/Px4YVbrSgc4HnyMcMzTJ+QI9vi5Nz88Cdrug8rqcau5G8G5rT/h sx3O3XTwz7tHW8jx01CJ0GH8Zqm8V0a7tWkfk6g7jTzr9jIEL+1f/HTFyMaCtG9W kPdft61ewhOOW0yu7gdfTAtFujZr6d+/Bwn7STNE8fJZXGg5UwRZguWE3IJouw9L ivjoS7RI7YpX+6acgxw9tzxHL5LHRU/R5iBCXMQpvjZntfkleZc= =iymV -----END PGP SIGNATURE----- --AQNmCumFClRcGgHG--