From patchwork Tue Mar 14 17:44:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Nguyen X-Patchwork-Id: 13174819 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9ED02C6FD1F for ; Tue, 14 Mar 2023 17:46:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230329AbjCNRqT (ORCPT ); Tue, 14 Mar 2023 13:46:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230350AbjCNRqS (ORCPT ); Tue, 14 Mar 2023 13:46:18 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49FC4AFB87 for ; Tue, 14 Mar 2023 10:46:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678815967; x=1710351967; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Lq8TvvP/JHxHP0VYQpJjFskZxO/zd7qONhVd+ZGt6GQ=; b=RPQcVyZ5ALv9HMZDItI3nKHK9+Dhbl7jfBpssl6T4FuJNSX4XYL45M1m oPNZy9z/9sxDvGboIUWXYTTyo9BzCcey7E7YIgP+Z56pMiDOrrH5Uue7J m/GaEu/cUGRCUOu4Y7WXTJnS53ugOyYY4pVrdno+hkmIf0hws6ZC4QHnx cW2OLuIaq6+ckf0OJ2/eVAsdZcgm+vazBrkFI9awUr6jLdEWdxEwCoZFT P2cbNnis5TGP/7tw1vA4LrAvLUkqB0KSmyfHQHkOsOL+AvrLNEAI3eSO+ KA9+RrUu8PZq5/2QJUb54Fjr0beeoVj1cALzmy3eQZ6JgHP5RQ1U/4h16 A==; X-IronPort-AV: E=McAfee;i="6500,9779,10649"; a="317148703" X-IronPort-AV: E=Sophos;i="5.98,260,1673942400"; d="scan'208";a="317148703" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Mar 2023 10:46:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10649"; a="1008516914" X-IronPort-AV: E=Sophos;i="5.98,260,1673942400"; d="scan'208";a="1008516914" Received: from anguy11-upstream.jf.intel.com ([10.166.9.133]) by fmsmga005.fm.intel.com with ESMTP; 14 Mar 2023 10:46:05 -0700 From: Tony Nguyen To: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, netdev@vger.kernel.org Cc: Alexander Lobakin , anthony.l.nguyen@intel.com, Larysa Zaremba , Michal Kubiak , Rafal Romanowski Subject: [PATCH net 1/3] iavf: fix inverted Rx hash condition leading to disabled hash Date: Tue, 14 Mar 2023 10:44:21 -0700 Message-Id: <20230314174423.1048526-2-anthony.l.nguyen@intel.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230314174423.1048526-1-anthony.l.nguyen@intel.com> References: <20230314174423.1048526-1-anthony.l.nguyen@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Alexander Lobakin Condition, which checks whether the netdev has hashing enabled is inverted. Basically, the tagged commit effectively disabled passing flow hash from descriptor to skb, unless user *disables* it via Ethtool. Commit a876c3ba59a6 ("i40e/i40evf: properly report Rx packet hash") fixed this problem, but only for i40e. Invert the condition now in iavf and unblock passing hash to skbs again. Fixes: 857942fd1aa1 ("i40e: Fix Rx hash reported to the stack by our driver") Reviewed-by: Larysa Zaremba Reviewed-by: Michal Kubiak Signed-off-by: Alexander Lobakin Tested-by: Rafal Romanowski Signed-off-by: Tony Nguyen Reviewed-by: Leon Romanovsky --- drivers/net/ethernet/intel/iavf/iavf_txrx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/iavf/iavf_txrx.c b/drivers/net/ethernet/intel/iavf/iavf_txrx.c index 18b6a702a1d6..e989feda133c 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_txrx.c +++ b/drivers/net/ethernet/intel/iavf/iavf_txrx.c @@ -1096,7 +1096,7 @@ static inline void iavf_rx_hash(struct iavf_ring *ring, cpu_to_le64((u64)IAVF_RX_DESC_FLTSTAT_RSS_HASH << IAVF_RX_DESC_STATUS_FLTSTAT_SHIFT); - if (ring->netdev->features & NETIF_F_RXHASH) + if (!(ring->netdev->features & NETIF_F_RXHASH)) return; if ((rx_desc->wb.qword1.status_error_len & rss_mask) == rss_mask) {