From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CE2EA3C345F for ; Thu, 9 Apr 2026 13:00:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775739630; cv=none; b=HskWl0MHa5PglQJZdjrWognxx9ezDa+Dh3o+uCF7hKEzKHsibntLvITLxG11/qyuCSDAb9c4lx/+h2Y+NJ2OUfECSTz9FP95jAMRmTtbZ+TZwRfw4okzGtRUgRxQOrADnvJpDMjwvxbTHooYKypQa8flXG96rJ7sJ6Fo5AqAfxo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775739630; c=relaxed/simple; bh=ZRnY5TXUwvFbakhMxEVnbZ2PSapzU7VKIrFMcYMCcHk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j/lKJPcFiRR1JY27vDBcCxwe6R6YeakFW10sKME9T8ShJlU474justzcJTGJjkGL6cQa4WqteK+pZ4MezhJgdXpi2NHGoq2Gp2wB6A69rbHzB6cRPeBxGd2foVU5YJXDtbpsM6R6vlWJPxNCgC68VX9sB9M4HUVNDG2NfLF/u9o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=ZM4oDe3x; arc=none smtp.client-ip=192.198.163.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="ZM4oDe3x" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1775739628; x=1807275628; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ZRnY5TXUwvFbakhMxEVnbZ2PSapzU7VKIrFMcYMCcHk=; b=ZM4oDe3xloX51JCW35bEvDLxNOSmPpHC46rIO+HeqrnSfAFVA97nJlg6 QU87erJcJRfSYXRynUSWVls7vp2K3qxkqdc660/q5rQPmQ94qfDNlht8P HD+QZzJgxUepqK2lWXrEbrvAtp9vnkWgVvkyXM6DiV4WPgPwYyPtnkB4s YOO8v6qdJ+0PbTzmvGjVayFcSu2o6WpVsxHFc5ZVns2HqdPhAaH8kyxJk HsQeW9VJOOdcP6nW+jT6dIS88k2idVkZkJhDtFXBHjEMXwFAEuu/EeV1N CqSXlG4FBZ5Wr2SjiI0zp876GnFmxjosRA3bNL0tNH9cwDmAEm3D/uf/0 g==; X-CSE-ConnectionGUID: VPMLaw1CRFam42pzY1w98g== X-CSE-MsgGUID: hkjETYtbSISagbOWbe9VFA== X-IronPort-AV: E=McAfee;i="6800,10657,11753"; a="75777522" X-IronPort-AV: E=Sophos;i="6.23,169,1770624000"; d="scan'208";a="75777522" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Apr 2026 06:00:18 -0700 X-CSE-ConnectionGUID: 73/b5M7dQtWJ7Iw0fGK/2g== X-CSE-MsgGUID: li2IRPxBQO6NZ+mzARpZcw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,169,1770624000"; d="scan'208";a="259208111" Received: from irvmail002.ir.intel.com ([10.43.11.120]) by orviesa002.jf.intel.com with ESMTP; 09 Apr 2026 06:00:16 -0700 Received: from gond.igk.intel.com (gond.igk.intel.com [10.123.220.52]) by irvmail002.ir.intel.com (Postfix) with ESMTP id 139D82FC60; Thu, 9 Apr 2026 14:00:15 +0100 (IST) From: Marcin Szycik To: intel-wired-lan@lists.osuosl.org Cc: netdev@vger.kernel.org, sandeep.penigalapati@intel.com, ananth.s@intel.com, alexander.duyck@gmail.com, Marcin Szycik , Aleksandr Loktionov , Przemek Kitszel Subject: [PATCH iwl-next v2 05/10] Revert "ice: remove unused ice_flow_entry fields" Date: Thu, 9 Apr 2026 13:59:58 +0200 Message-ID: <20260409120003.2719-6-marcin.szycik@linux.intel.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260409120003.2719-1-marcin.szycik@linux.intel.com> References: <20260409120003.2719-1-marcin.szycik@linux.intel.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This reverts commit 4cd7bc7144ec2c0bb27208c3bb1f153dfd44b1c7. These fields will be needed in the following commits. Signed-off-by: Marcin Szycik Reviewed-by: Aleksandr Loktionov Reviewed-by: Przemek Kitszel --- v2: * Add this patch --- drivers/net/ethernet/intel/ice/ice_flow.h | 3 +++ drivers/net/ethernet/intel/ice/ice_flow.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/ice/ice_flow.h b/drivers/net/ethernet/intel/ice/ice_flow.h index bbfc7b4a432e..ff6af6589862 100644 --- a/drivers/net/ethernet/intel/ice/ice_flow.h +++ b/drivers/net/ethernet/intel/ice/ice_flow.h @@ -458,8 +458,11 @@ struct ice_flow_entry { u64 id; struct ice_flow_prof *prof; + /* Flow entry's content */ + void *entry; enum ice_flow_priority priority; u16 vsi_handle; + u16 entry_sz; }; #define ICE_FLOW_ENTRY_HNDL(e) ((u64)(uintptr_t)e) diff --git a/drivers/net/ethernet/intel/ice/ice_flow.c b/drivers/net/ethernet/intel/ice/ice_flow.c index 864bbda7e880..440e9fdb6b5b 100644 --- a/drivers/net/ethernet/intel/ice/ice_flow.c +++ b/drivers/net/ethernet/intel/ice/ice_flow.c @@ -1604,6 +1604,7 @@ ice_flow_rem_entry_sync(struct ice_hw *hw, enum ice_block __always_unused blk, list_del(&entry->l_entry); + devm_kfree(ice_hw_to_dev(hw), entry->entry); devm_kfree(ice_hw_to_dev(hw), entry); return 0; @@ -2024,8 +2025,10 @@ ice_flow_add_entry(struct ice_hw *hw, enum ice_block blk, u64 prof_id, *entry_h = ICE_FLOW_ENTRY_HNDL(e); out: - if (status) + if (status && e) { + devm_kfree(ice_hw_to_dev(hw), e->entry); devm_kfree(ice_hw_to_dev(hw), e); + } return status; } -- 2.49.0