From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) (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 32C653E44ED for ; Thu, 2 Jul 2026 11:30:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.21 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782991844; cv=none; b=ih80wwY77z72Of16V+mBNq4WfWPlYMYjDPP3ZXVsTQs0K40yq1VsFHB7pTbakGSSiTs7WeWlNG96h3H5Lasb4Y1gEc1WF7q7p9LwAzJhZvmjrrOPXP3Llgb+UKvkELHEwZAqv8oOoLrPKoZUFxdM9P4QeXIT8G2VD3K3hEeJkQk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782991844; c=relaxed/simple; bh=tsOvU55Wa5GshsxWQ5WMDWxSuR2NJyurfXuOdjkFFao=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HdC7b/6Zc3AmRksbHRAwttGXzB10D9I2qc85WS04xWzpYgtGddjdro2Wcoy8QQdI5c/Zop4luOrGEwPf3OH5SuvnbiUypj5TpNrWEjgeDksMfDTn76n/zP3JNgHD4Hwf+Q1mDQeVWN0LCCL6YPW6n1b65DXa+Akm4Akyf0MT5sI= 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=OdPGpdm4; arc=none smtp.client-ip=198.175.65.21 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="OdPGpdm4" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1782991843; x=1814527843; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tsOvU55Wa5GshsxWQ5WMDWxSuR2NJyurfXuOdjkFFao=; b=OdPGpdm44WxCE1ym/LB3tcHRAsVkhqRWf4phT3tFQvbNA4HWnC0eS7pH JWW/RyFwMzilwaE5qBtukqInR7+978UkHpyzt9HOrl/jr+pqM11QrZQ8L SYX0rn7J9v53VeRczZ7gNp1+LxdHWJJVrSl3gdN72/fEtPRhLx4w+5662 RKDQBRheb/zfjcM+pFEuNGbXy5DCO2UZeWPhvaPPEw7Uh25atcK3SPTje X7IrYKzWCUvonzQnLoXPPU4cYFMakZq2iF7MhbDjrDkSM15rMHCnjB365 Yt+lhvcTbG/C3kiIpWIHcEXmB76jBj0izJaoEOfnVTlFIkJRgaWOqPZ05 g==; X-CSE-ConnectionGUID: ovnxkNFmSFe5QVkFGhF3og== X-CSE-MsgGUID: Y4b9p+8xSKKQCnIpkMGTPQ== X-IronPort-AV: E=McAfee;i="6800,10657,11834"; a="83611735" X-IronPort-AV: E=Sophos;i="6.25,143,1779174000"; d="scan'208";a="83611735" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jul 2026 04:30:42 -0700 X-CSE-ConnectionGUID: Vb+DnyQJTHGIxMXGZ7nBsg== X-CSE-MsgGUID: X+iE56arRHCuZCJvAZcRXg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,143,1779174000"; d="scan'208";a="251788411" Received: from irvmail002.ir.intel.com ([10.43.11.120]) by orviesa010.jf.intel.com with ESMTP; 02 Jul 2026 04:30:41 -0700 Received: from gond.igk.intel.com (gond.igk.intel.com [10.123.220.52]) by irvmail002.ir.intel.com (Postfix) with ESMTP id 616B928762; Thu, 2 Jul 2026 12:30:39 +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, anthony.l.nguyen@intel.com, Marcin Szycik , Aleksandr Loktionov , Przemek Kitszel Subject: [PATCH iwl-next v5 06/12] Revert "ice: remove unused ice_flow_entry fields" Date: Thu, 2 Jul 2026 12:30:00 +0200 Message-ID: <20260702103007.97020-7-marcin.szycik@linux.intel.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260702103007.97020-1-marcin.szycik@linux.intel.com> References: <20260702103007.97020-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 7357088091bd..23e366ee1f79 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 855d296aeed8..e42367853253 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