{"id":2221402,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2221402/?format=json","project":{"id":46,"url":"http://patchwork.ozlabs.org/api/1.0/projects/46/?format=json","name":"Intel Wired Ethernet development","link_name":"intel-wired-lan","list_id":"intel-wired-lan.osuosl.org","list_email":"intel-wired-lan@osuosl.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260409120003.2719-6-marcin.szycik@linux.intel.com>","date":"2026-04-09T11:59:58","name":"[iwl-next,v2,05/10] Revert \"ice: remove unused ice_flow_entry fields\"","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"f0f34d24d1b7970b5d0aa74207a63659d4873e1c","submitter":{"id":82782,"url":"http://patchwork.ozlabs.org/api/1.0/people/82782/?format=json","name":"Marcin Szycik","email":"marcin.szycik@linux.intel.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20260409120003.2719-6-marcin.szycik@linux.intel.com/mbox/","series":[{"id":499287,"url":"http://patchwork.ozlabs.org/api/1.0/series/499287/?format=json","date":"2026-04-09T11:59:53","name":"Add ACL support","version":2,"mbox":"http://patchwork.ozlabs.org/series/499287/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2221402/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":["incoming@patchwork.ozlabs.org","intel-wired-lan@lists.osuosl.org"],"Delivered-To":["patchwork-incoming@legolas.ozlabs.org","intel-wired-lan@lists.osuosl.org"],"Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=osuosl.org header.i=@osuosl.org header.a=rsa-sha256\n header.s=default header.b=hSCgcKwy;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=140.211.166.136; helo=smtp3.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fs0R36bG3z1yCv\n\tfor ; Thu, 09 Apr 2026 23:00:31 +1000 (AEST)","from localhost (localhost [127.0.0.1])\n\tby smtp3.osuosl.org (Postfix) with ESMTP id EF8A3607DB;\n\tThu, 9 Apr 2026 13:00:29 +0000 (UTC)","from smtp3.osuosl.org ([127.0.0.1])\n by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id qMSbw0ppkfi9; Thu, 9 Apr 2026 13:00:29 +0000 (UTC)","from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142])\n\tby smtp3.osuosl.org (Postfix) with ESMTP id 6D9B96082A;\n\tThu, 9 Apr 2026 13:00:29 +0000 (UTC)","from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n by lists1.osuosl.org (Postfix) with ESMTP id 008501F6\n for ; Thu, 9 Apr 2026 13:00:27 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n by smtp1.osuosl.org (Postfix) with ESMTP id E6A1E81B14\n for ; Thu, 9 Apr 2026 13:00:27 +0000 (UTC)","from smtp1.osuosl.org ([127.0.0.1])\n by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id xjH4QzaRO13Q for ;\n Thu, 9 Apr 2026 13:00:27 +0000 (UTC)","from mgamail.intel.com (mgamail.intel.com [192.198.163.19])\n by smtp1.osuosl.org (Postfix) with ESMTPS id 3D90080BA3\n for ; Thu, 9 Apr 2026 13:00:27 +0000 (UTC)","from orviesa002.jf.intel.com ([10.64.159.142])\n by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 09 Apr 2026 06:00:18 -0700","from irvmail002.ir.intel.com ([10.43.11.120])\n by orviesa002.jf.intel.com with ESMTP; 09 Apr 2026 06:00:16 -0700","from gond.igk.intel.com (gond.igk.intel.com [10.123.220.52])\n by irvmail002.ir.intel.com (Postfix) with ESMTP id 139D82FC60;\n Thu, 9 Apr 2026 14:00:15 +0100 (IST)"],"X-Virus-Scanned":["amavis at osuosl.org","amavis at osuosl.org"],"X-Comment":"SPF check N/A for local connections - client-ip=140.211.166.142;\n helo=lists1.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org;\n receiver= ","DKIM-Filter":["OpenDKIM Filter v2.11.0 smtp3.osuosl.org 6D9B96082A","OpenDKIM Filter v2.11.0 smtp1.osuosl.org 3D90080BA3"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org;\n\ts=default; t=1775739629;\n\tbh=0Jw7aGBgjDIFCT0bJC4sX7NRFgTYXAuNubt/9jV3vk0=;\n\th=From:To:Cc:Date:In-Reply-To:References:Subject:List-Id:\n\t List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe:\n\t From;\n\tb=hSCgcKwyvs923JMbzC/NjTAPkkmCpcfNoWEOvvJlhR8F+JOEsJ0SNLJ/xn4LzarGs\n\t 4bxQ7DXnY2QvG6svDT9wHgvE65VmrLjwpUg65ZQ3DovYgmymNWGv+yBDp3L+cbasUg\n\t 2N2QdiKcRHM+PLKneFwSrZb6/Bgnpp3n0eutGwGl8/P6q/HRTPXelP67iCc9dUUyad\n\t J3IrePoDl+35AAOJUvURQI3qj+AqLwkM/xuhyfxNhVp0bMX+11ql8N2vJRaiimBprr\n\t abfarDsjmlj9yPkAa2le9FB7E0Lcv76L0g0wNnp9Uumt0HJ7GX//Peayvvcwhbt2vi\n\t DFX+N7UFy1jsQ==","Received-SPF":"Pass (mailfrom) identity=mailfrom; client-ip=192.198.163.19;\n helo=mgamail.intel.com; envelope-from=marcin.szycik@linux.intel.com;\n receiver=","DMARC-Filter":"OpenDMARC Filter v1.4.2 smtp1.osuosl.org 3D90080BA3","X-CSE-ConnectionGUID":["7r891M6KSGi2M7ruSEDT8Q==","73/b5M7dQtWJ7Iw0fGK/2g=="],"X-CSE-MsgGUID":["VzA8GckXQY2+sNWGyhG8GA==","li2IRPxBQO6NZ+mzARpZcw=="],"X-IronPort-AV":["E=McAfee;i=\"6800,10657,11753\"; a=\"75777523\"","E=Sophos;i=\"6.23,169,1770624000\"; d=\"scan'208\";a=\"75777523\"","E=Sophos;i=\"6.23,169,1770624000\"; d=\"scan'208\";a=\"259208111\""],"X-ExtLoop1":"1","From":"Marcin Szycik ","To":"intel-wired-lan@lists.osuosl.org","Cc":"netdev@vger.kernel.org, sandeep.penigalapati@intel.com,\n ananth.s@intel.com,\n alexander.duyck@gmail.com, Marcin Szycik ,\n Aleksandr Loktionov ,\n Przemek Kitszel ","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>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Mailman-Original-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1775739627; x=1807275627;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=ZRnY5TXUwvFbakhMxEVnbZ2PSapzU7VKIrFMcYMCcHk=;\n b=csYPM+8DIFZCDhHuzsD9VMHm68dkEer2JuSkOGH5UtFQWDn1Yie3sCNu\n fZKzCkgjytwGrLl3RH1UUmPosYe9Eh722szWTBF4pJHNW9UXb4KANEn14\n RQwFNYTm4WIQRA+oONntFzf4pjV0YdvyghvxJWioIM/BHPUwi7LebuM31\n QawbO1KWmogxlIka4+NDQ7IcCE7IiZ69qJmGTs8GNRNkA11PXirvfhWe2\n zcpDfYKyBZ9PH3heNLkfGpJnJ+KhiSE/BAsNHJ2TjHOjzOevvVZliMHJb\n W8kVt2eNSAzZI1d3vLJvntg17w9Cnmngs/ULb2eFrsf9U4oRdiLyLhz+Q\n g==;","X-Mailman-Original-Authentication-Results":["smtp1.osuosl.org;\n dmarc=none (p=none dis=none)\n header.from=linux.intel.com","smtp1.osuosl.org;\n dkim=pass (2048-bit key,\n unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256\n header.s=Intel header.b=csYPM+8D"],"Subject":"[Intel-wired-lan] [PATCH iwl-next v2 05/10] Revert \"ice: remove\n unused ice_flow_entry fields\"","X-BeenThere":"intel-wired-lan@osuosl.org","X-Mailman-Version":"2.1.30","Precedence":"list","List-Id":"Intel Wired Ethernet Linux Kernel Driver Development\n ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"intel-wired-lan-bounces@osuosl.org","Sender":"\"Intel-wired-lan\" "},"content":"This reverts commit 4cd7bc7144ec2c0bb27208c3bb1f153dfd44b1c7.\nThese fields will be needed in the following commits.\n\nSigned-off-by: Marcin Szycik \nReviewed-by: Aleksandr Loktionov \nReviewed-by: Przemek Kitszel \n---\nv2:\n* Add this patch\n---\n drivers/net/ethernet/intel/ice/ice_flow.h | 3 +++\n drivers/net/ethernet/intel/ice/ice_flow.c | 5 ++++-\n 2 files changed, 7 insertions(+), 1 deletion(-)","diff":"diff --git a/drivers/net/ethernet/intel/ice/ice_flow.h b/drivers/net/ethernet/intel/ice/ice_flow.h\nindex bbfc7b4a432e..ff6af6589862 100644\n--- a/drivers/net/ethernet/intel/ice/ice_flow.h\n+++ b/drivers/net/ethernet/intel/ice/ice_flow.h\n@@ -458,8 +458,11 @@ struct ice_flow_entry {\n \n \tu64 id;\n \tstruct ice_flow_prof *prof;\n+\t/* Flow entry's content */\n+\tvoid *entry;\n \tenum ice_flow_priority priority;\n \tu16 vsi_handle;\n+\tu16 entry_sz;\n };\n \n #define ICE_FLOW_ENTRY_HNDL(e)\t((u64)(uintptr_t)e)\ndiff --git a/drivers/net/ethernet/intel/ice/ice_flow.c b/drivers/net/ethernet/intel/ice/ice_flow.c\nindex 864bbda7e880..440e9fdb6b5b 100644\n--- a/drivers/net/ethernet/intel/ice/ice_flow.c\n+++ b/drivers/net/ethernet/intel/ice/ice_flow.c\n@@ -1604,6 +1604,7 @@ ice_flow_rem_entry_sync(struct ice_hw *hw, enum ice_block __always_unused blk,\n \n \tlist_del(&entry->l_entry);\n \n+\tdevm_kfree(ice_hw_to_dev(hw), entry->entry);\n \tdevm_kfree(ice_hw_to_dev(hw), entry);\n \n \treturn 0;\n@@ -2024,8 +2025,10 @@ ice_flow_add_entry(struct ice_hw *hw, enum ice_block blk, u64 prof_id,\n \t*entry_h = ICE_FLOW_ENTRY_HNDL(e);\n \n out:\n-\tif (status)\n+\tif (status && e) {\n+\t\tdevm_kfree(ice_hw_to_dev(hw), e->entry);\n \t\tdevm_kfree(ice_hw_to_dev(hw), e);\n+\t}\n \n \treturn status;\n }\n","prefixes":["iwl-next","v2","05/10"]}