From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f170.google.com (mail-wr0-f170.google.com [209.85.128.170]) by dpdk.org (Postfix) with ESMTP id 6B13F1B018 for ; Wed, 9 May 2018 12:27:47 +0200 (CEST) Received: by mail-wr0-f170.google.com with SMTP id p5-v6so35130583wre.12 for ; Wed, 09 May 2018 03:27:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:content-transfer-encoding:mime-version; bh=7p+zMj/+n4JwwP/LzAzGC4cjQTcztg0zREo3p4u19lw=; b=Jc9VgiSDr0wFWK12WhjXdx75wRPvjQbt7/UGzYfhw1tTADgAJ1EN2qnY2x5h9/Y0Eq HSLlzRPTJrMWQLdHAuvXUBV25FCPZioBe6/3wO53EV+WOwUGazCfYUb8pNHMRS2QOGqn NsqllYx7ODipspcrop2n7PYTLUQLjKDrRHzuOuLTvvIGnopbc4PHEwfBrI9zDxINmfRt Giq6wMS00Wyw82WsUzoQPDAA0F+VxUVwxmt7yt6XDaGbcPJytfraw3Hu5/s8FRn8XvG5 pjYIF9FzzYGgEafn7JcOyZU852eUkyV0ReYvz6xlXg6Gtvuq0Tw5xHlrqXAQZ5SAG1Cx S7Wg== X-Gm-Message-State: ALQs6tCA1+Mz3agdREoTKpcmFnIN/HZldM0ortYoKMgQXBCPVqyjjIxt Ii43I5KoNTyQj0pHGaUE0RQ= X-Google-Smtp-Source: AB8JxZp7wkR7CXaePmoM2FcaUCwCHEd2Ypqnv5KlSHogxANrZqFw4a3fhtq+PArdbi55aMwjYYsuWA== X-Received: by 2002:adf:b859:: with SMTP id u25-v6mr35671285wrf.162.1525861667022; Wed, 09 May 2018 03:27:47 -0700 (PDT) Received: from localhost ([2a00:23c5:be9a:5200:ce4c:82c0:d567:ecbb]) by smtp.gmail.com with ESMTPSA id 131-v6sm18213158wms.34.2018.05.09.03.27.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 May 2018 03:27:45 -0700 (PDT) Message-ID: <1525861664.23337.85.camel@debian.org> From: Luca Boccassi To: Shahaf Shuler Cc: "stable@dpdk.org" , =?ISO-8859-1?Q?N=E9lio?= Laranjeiro , Yongseok Koh , Adrien Mazarguil Date: Wed, 09 May 2018 11:27:44 +0100 In-Reply-To: References: <1525772984.23337.77.camel@debian.org> <1525773362.23337.79.camel@debian.org> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Mailer: Evolution 3.22.6-1+deb9u1 Mime-Version: 1.0 Subject: Re: [dpdk-stable] [PATCH 00/33] mlx5 backports for 18.02.2 stable 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: Wed, 09 May 2018 10:27:47 -0000 On Wed, 2018-05-09 at 07:51 +0000, Shahaf Shuler wrote: > Hi Luca, >=20 > Tuesday, May 8, 2018 12:56 PM, Luca Boccassi: > > Subject: Re: [PATCH 00/33] mlx5 backports for 18.02.2 stable > >=20 > > On Tue, 2018-05-08 at 10:49 +0100, Luca Boccassi wrote: > > > On Sun, 2018-05-06 at 09:05 +0300, Shahaf Shuler wrote: > > > > Below are patches rebased on top of 18.02.1 to be backported to > > > > 18.02.2 > > > > stable version. > > >=20 > > > Hello Shahaf, > > >=20 > > > Patches 30, 31, 32 and 33 of the series seem to be missing? > > >=20 > >=20 > > https://emea01.safelinks.protection.outlook.com/?url=3Dhttps%3A%2F%2F > > dp > > d > > > k.org%2Fml%2Farchives%2Fstable%2F2018- > >=20 > > May%2Fthread.html&data=3D02%7C01%7 > > >=20 > >=20 > > Cshahafs%40mellanox.com%7C300c9faee52548b161fa08d5b4c9ea00%7Ca652 > > 971c7 > > >=20 > >=20 > > d2e4d9ba6a4d149256f461b%7C0%7C0%7C636613701699555207&sdata=3D2IOc5 > > MTO06S > > > N3WbrmUfvaKxHrsLLyE8ieTodFKy9Mnw%3D&reserved=3D0 there's only up > >=20 > > to > > > 29/33 > >=20 > > Also many of the patches do not apply. Have you checked out the > > dpdk- > > stable/18.02 branch? I've already backported many fixes, as > > mentioned in > > the email series sent to stable@dpdk.org >=20 > Yes I see this now. Looks like there is some mess in the stable > branch for mlx5. Some of the patches you integrated breaks the > compilation.=C2=A0 > My suggestion is to revert the mlx5 patches you already applied > (starting from 18.02.1) , and apply the series I sent. >=20 > If you agree I will send the remaining missing 30-33. Let me know.=C2=A0 Yes a DRV_LOG sneaked in one of the patches, didn't notice it, sorry about that. Nobody noticed either when I sent the backports to stable@d pdk.org last week for review. It's a trivial fix though, so I'd much rather fix it than redo the whole lot, see the diff at the bottom. --=20 Kind regards, Luca Boccassi diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.= c index 7284dfdee..d8286295e 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -514,7 +514,7 @@ dev_configure(struct rte_eth_dev *dev) if (use_app_rss_key && (dev->data->dev_conf.rx_adv_conf.rss_conf.rss_key_len !=3D rss_hash_default_key_len)) { - DRV_LOG(ERR, "port %u RSS key len must be %zu Bytes long", + ERROR("port %u RSS key len must be %zu Bytes long", dev->data->port_id, rss_hash_default_key_len); return EINVAL; } diff --git a/drivers/net/mlx5/mlx5_rss.c b/drivers/net/mlx5/mlx5_rss.c index c9db2a64f..27a579148 100644 --- a/drivers/net/mlx5/mlx5_rss.c +++ b/drivers/net/mlx5/mlx5_rss.c @@ -51,11 +51,9 @@ mlx5_rss_hash_update(struct rte_eth_dev *dev, } if (rss_conf->rss_key && rss_conf->rss_key_len) { if (rss_conf->rss_key_len !=3D rss_hash_default_key_len) { - DRV_LOG(ERR, - "port %u RSS key len must be %zu Bytes long= ", + ERROR("port %u RSS key len must be %zu Bytes long", dev->data->port_id, rss_hash_default_key_le= n); - rte_errno =3D EINVAL; - return -rte_errno; + return EINVAL; } priv->rss_conf.rss_key =3D rte_realloc(priv->rss_conf.rss_k= ey, rss_conf->rss_key_len,= 0);