From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA21CC432C0 for ; Wed, 27 Nov 2019 20:33:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BBCA321569 for ; Wed, 27 Nov 2019 20:33:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574886830; bh=sph2R7pishUgeqOmCYzrLpe0s/ZA4/j+OqsawcNw1Uw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=aDmL7R8h8sVpH8AtIgTZw0H/xKrsL7il59FGNftyE4LQRyDSrDu06Xa53dpEBJ9A2 +6RKEBAlto+SMTiNFq64Ryi4bKo6mY1ZqEXQGEsOdbHPFgY8dOG8AQ93oz/BXvc1am jiY9DQDWePyd1mzBLJ3bWYIeFDtCD/RxxjhdUTLQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727016AbfK0Udu (ORCPT ); Wed, 27 Nov 2019 15:33:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:33800 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727010AbfK0Udu (ORCPT ); Wed, 27 Nov 2019 15:33:50 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 93BBF207DD; Wed, 27 Nov 2019 20:33:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574886828; bh=sph2R7pishUgeqOmCYzrLpe0s/ZA4/j+OqsawcNw1Uw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yS5eNp9eTl6SH8mOXb7dSMlSwfPsl7Cps2If09fqcWOJer1M7HQfJLFdiZnEt2S4h cyy5a8GupBu5Pp/EW6WPyz7NMdvSViM+LVDG1t6lmnJF3v717Sk0gnwJAZMeakMNZO 8jTVOau2IrdblK3sZB9+1toq56Lnkp2FTKTdjzB4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Luigi Rizzo , Tariq Toukan Subject: [PATCH 4.4 001/132] net/mlx4_en: fix mlx4 ethtool -N insertion Date: Wed, 27 Nov 2019 21:29:52 +0100 Message-Id: <20191127202858.337504458@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127202857.270233486@linuxfoundation.org> References: <20191127202857.270233486@linuxfoundation.org> User-Agent: quilt/0.66 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Luigi Rizzo [ Upstream commit 34e59836565e36fade1464e054a3551c1a0364be ] ethtool expects ETHTOOL_GRXCLSRLALL to set ethtool_rxnfc->data with the total number of entries in the rx classifier table. Surprisingly, mlx4 is missing this part (in principle ethtool could still move forward and try the insert). Tested: compiled and run command: phh13:~# ethtool -N eth1 flow-type udp4 queue 4 Added rule with ID 255 Signed-off-by: Luigi Rizzo Reviewed-by: Tariq Toukan Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c @@ -1667,6 +1667,7 @@ static int mlx4_en_get_rxnfc(struct net_ err = mlx4_en_get_flow(dev, cmd, cmd->fs.location); break; case ETHTOOL_GRXCLSRLALL: + cmd->data = MAX_NUM_OF_FS_RULES; while ((!err || err == -ENOENT) && priority < cmd->rule_cnt) { err = mlx4_en_get_flow(dev, cmd, i); if (!err)